trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject [trafficserver] branch master updated: Ran clang-tidy with modernize-deprecated-headers
Date Wed, 19 Apr 2017 18:44:51 GMT
This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  9a5c1d5   Ran clang-tidy with modernize-deprecated-headers
9a5c1d5 is described below

commit 9a5c1d5a565e1c8fd82bd6c7d95f545d0c471145
Author: Bryan Call <bcall@apache.org>
AuthorDate: Mon Apr 17 01:49:42 2017 -0700

    Ran clang-tidy with modernize-deprecated-headers
---
 cmd/traffic_ctl/config.cc                                  |  2 +-
 cmd/traffic_top/traffic_top.cc                             |  6 +++---
 cmd/traffic_via/traffic_via.cc                             |  4 ++--
 example/cache_scan/cache_scan.cc                           |  8 ++++----
 example/intercept/intercept.cc                             |  8 ++++----
 example/passthru/passthru.cc                               |  4 ++--
 example/protocol_stack/protocol_stack.cc                   |  2 +-
 example/remap/remap.cc                                     | 10 +++++-----
 example/remap_header_add/remap_header_add.cc               |  6 +++---
 example/replace-protoset/replace-protoset.cc               |  2 +-
 example/ssl-preaccept/ssl-preaccept.cc                     |  4 ++--
 example/ssl-sni-whitelist/ssl-sni-whitelist.cc             |  4 ++--
 example/ssl-sni/ssl-sni.cc                                 |  4 ++--
 example/statistic/statistic.cc                             |  4 ++--
 iocore/cache/CacheHttp.cc                                  |  2 +-
 iocore/net/SSLConfig.cc                                    |  2 +-
 lib/bindings/repl.cc                                       |  2 +-
 lib/cppapi/RemapPlugin.cc                                  |  2 +-
 lib/cppapi/Stat.cc                                         |  2 +-
 lib/ts/Arena.cc                                            |  4 ++--
 lib/ts/CompileParseRules.cc                                |  4 ++--
 lib/ts/InkErrno.cc                                         |  2 +-
 lib/ts/MMH.cc                                              |  4 ++--
 lib/ts/MemView.cc                                          |  2 +-
 lib/ts/SourceLocation.cc                                   |  4 ++--
 lib/ts/TextBuffer.cc                                       |  2 +-
 lib/ts/Vec.cc                                              |  2 +-
 lib/ts/ink_code.cc                                         |  4 ++--
 lib/ts/ink_error.cc                                        |  2 +-
 lib/ts/ink_file.cc                                         |  2 +-
 lib/ts/ink_memory.cc                                       |  6 +++---
 lib/ts/ink_mutex.cc                                        |  4 ++--
 lib/ts/ink_queue.cc                                        |  4 ++--
 lib/ts/ink_queue_utils.cc                                  |  2 +-
 lib/ts/ink_res_init.cc                                     |  8 ++++----
 lib/ts/ink_res_mkquery.cc                                  |  4 ++--
 lib/ts/ink_stack_trace.cc                                  |  6 +++---
 lib/ts/ink_string.cc                                       |  8 ++++----
 lib/ts/ink_time.cc                                         |  2 +-
 lib/ts/llqueue.cc                                          | 10 +++++-----
 lib/ts/test_Map.cc                                         |  2 +-
 lib/ts/test_PriorityQueue.cc                               |  2 +-
 lib/ts/test_Scalar.cc                                      |  2 +-
 lib/ts/test_Vec.cc                                         |  4 ++--
 lib/ts/test_arena.cc                                       |  2 +-
 lib/ts/test_atomic.cc                                      |  4 ++--
 lib/ts/test_freelist.cc                                    |  4 ++--
 lib/tsconfig/TsBuilder.cc                                  |  2 +-
 lib/tsconfig/TsErrataUtil.cc                               |  8 ++++----
 lib/tsconfig/TsValue.cc                                    |  4 ++--
 lib/tsconfig/test-tsconfig.cc                              |  2 +-
 mgmt/api/APITestCliRemote.cc                               |  6 +++---
 mgmt/api/INKMgmtAPI.cc                                     |  2 +-
 plugins/background_fetch/background_fetch.cc               |  8 ++++----
 plugins/background_fetch/headers.cc                        |  2 +-
 plugins/background_fetch/rules.cc                          |  2 +-
 plugins/conf_remap/conf_remap.cc                           |  8 ++++----
 plugins/esi/combo_handler.cc                               |  2 +-
 plugins/esi/esi.cc                                         |  8 ++++----
 plugins/esi/fetcher/HttpDataFetcherImpl.cc                 |  2 +-
 plugins/esi/lib/EsiGunzip.cc                               |  4 ++--
 plugins/esi/lib/EsiGzip.cc                                 |  4 ++--
 plugins/esi/lib/EsiParser.cc                               |  2 +-
 plugins/esi/lib/EsiProcessor.cc                            |  2 +-
 plugins/esi/lib/Variables.cc                               |  2 +-
 plugins/esi/lib/gzip.cc                                    |  2 +-
 plugins/esi/serverIntercept.cc                             |  4 ++--
 plugins/esi/test/StubIncludeHandler.cc                     |  2 +-
 plugins/esi/test/docnode_test.cc                           |  2 +-
 plugins/esi/test/gzip_test.cc                              |  4 ++--
 plugins/esi/test/parser_test.cc                            |  2 +-
 plugins/esi/test/print_funcs.cc                            |  4 ++--
 plugins/esi/test/processor_test.cc                         |  2 +-
 plugins/esi/test/utils_test.cc                             |  2 +-
 plugins/esi/test/vars_test.cc                              |  6 +++---
 plugins/experimental/balancer/balancer.cc                  |  6 +++---
 plugins/experimental/balancer/hash.cc                      |  4 ++--
 plugins/experimental/balancer/roundrobin.cc                |  4 ++--
 plugins/experimental/buffer_upload/buffer_upload.cc        | 14 +++++++-------
 plugins/experimental/cache_promote/cache_promote.cc        |  8 ++++----
 .../cache_range_requests/cache_range_requests.cc           |  4 ++--
 plugins/experimental/cachekey/cachekey.cc                  |  4 ++--
 .../collapsed_connection/collapsed_connection.cc           | 10 +++++-----
 .../collapsed_forwarding/collapsed_forwarding.cc           | 10 +++++-----
 plugins/experimental/custom_redirect/custom_redirect.cc    |  6 +++---
 plugins/experimental/epic/epic.cc                          | 14 +++++++-------
 plugins/experimental/escalate/escalate.cc                  |  6 +++---
 plugins/experimental/geoip_acl/geoip_acl.cc                |  4 ++--
 plugins/experimental/header_freq/header_freq.cc            |  4 ++--
 plugins/experimental/header_normalize/header_normalize.cc  |  8 ++++----
 plugins/experimental/hipes/hipes.cc                        |  6 +++---
 plugins/experimental/inliner/ats-inliner.cc                |  6 +++---
 plugins/experimental/inliner/chunk-decoder.cc              |  2 +-
 plugins/experimental/inliner/html-parser.cc                |  2 +-
 plugins/experimental/inliner/inliner-handler.cc            |  2 +-
 plugins/experimental/memcached_remap/memcached_remap.cc    |  4 ++--
 plugins/experimental/money_trace/money_trace.cc            |  4 ++--
 plugins/experimental/multiplexer/ats-multiplexer.cc        |  2 +-
 plugins/experimental/multiplexer/chunk-decoder.cc          |  2 +-
 plugins/experimental/multiplexer/dispatch.cc               |  2 +-
 plugins/experimental/multiplexer/post.cc                   |  2 +-
 plugins/experimental/mysql_remap/mysql_remap.cc            |  2 +-
 plugins/experimental/ssl_cert_loader/domain-tree.cc        |  4 ++--
 plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc    |  4 ++--
 plugins/experimental/sslheaders/test_sslheaders.cc         |  4 ++--
 plugins/experimental/stream_editor/stream_editor.cc        | 10 +++++-----
 plugins/generator/generator.cc                             | 12 ++++++------
 plugins/gzip/gzip.cc                                       |  2 +-
 plugins/gzip/misc.cc                                       |  4 ++--
 plugins/header_rewrite/conditions.cc                       |  2 +-
 plugins/header_rewrite/operators.cc                        |  2 +-
 plugins/regex_remap/regex_remap.cc                         | 10 +++++-----
 plugins/s3_auth/s3_auth.cc                                 | 12 ++++++------
 plugins/tcpinfo/tcpinfo.cc                                 | 10 +++++-----
 plugins/xdebug/xdebug.cc                                   |  6 +++---
 proxy/EventName.cc                                         |  4 ++--
 proxy/FetchSM.cc                                           |  2 +-
 proxy/InkAPI.cc                                            |  2 +-
 proxy/InkAPITest.cc                                        |  6 +++---
 proxy/Plugin.cc                                            |  2 +-
 proxy/hdrs/HTTP.cc                                         |  6 +++---
 proxy/hdrs/HdrToken.cc                                     |  2 +-
 proxy/hdrs/MIME.cc                                         |  6 +++---
 proxy/hdrs/URL.cc                                          |  2 +-
 proxy/http/HttpConfig.cc                                   |  4 ++--
 proxy/http/HttpTransact.cc                                 |  2 +-
 proxy/http/HttpTransactCache.cc                            |  2 +-
 proxy/http2/test_Http2DependencyTree.cc                    |  2 +-
 proxy/http2/test_Huffmancode.cc                            |  6 +++---
 proxy/logging/LogBuffer.cc                                 |  6 +++---
 proxy/logging/LogCollationClientSM.cc                      |  8 ++++----
 proxy/logging/LogCollationHostSM.cc                        |  8 ++++----
 proxy/logging/LogFile.cc                                   |  2 +-
 proxy/logging/LogFormat.cc                                 |  6 +++---
 proxy/logging/LogUtils.cc                                  | 12 ++++++------
 135 files changed, 299 insertions(+), 299 deletions(-)

diff --git a/cmd/traffic_ctl/config.cc b/cmd/traffic_ctl/config.cc
index 5a15946..5d4c3b0 100644
--- a/cmd/traffic_ctl/config.cc
+++ b/cmd/traffic_ctl/config.cc
@@ -22,7 +22,7 @@
  */
 
 #include "traffic_ctl.h"
-#include <time.h>
+#include <ctime>
 #include <I_RecDefs.h>
 #include <P_RecUtils.h>
 
diff --git a/cmd/traffic_top/traffic_top.cc b/cmd/traffic_top/traffic_top.cc
index 568b0fe..39861dc 100644
--- a/cmd/traffic_top/traffic_top.cc
+++ b/cmd/traffic_top/traffic_top.cc
@@ -25,10 +25,10 @@
 #include <map>
 #include <list>
 #include <string>
-#include <string.h>
+#include <cstring>
 #include <iostream>
-#include <assert.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstdlib>
 #include <unistd.h>
 #include <getopt.h>
 
diff --git a/cmd/traffic_via/traffic_via.cc b/cmd/traffic_via/traffic_via.cc
index f2fa01e..4a82b73 100644
--- a/cmd/traffic_via/traffic_via.cc
+++ b/cmd/traffic_via/traffic_via.cc
@@ -27,8 +27,8 @@
 #include "ts/Tokenizer.h"
 #include "ts/TextBuffer.h"
 #include "mgmtapi.h"
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "ts/Regex.h"
 
 /// XXX Use DFA or Regex wrappers?
diff --git a/example/cache_scan/cache_scan.cc b/example/cache_scan/cache_scan.cc
index cf53d73..dfc168c 100644
--- a/example/cache_scan/cache_scan.cc
+++ b/example/cache_scan/cache_scan.cc
@@ -25,10 +25,10 @@
  * cache_scan.cc:  use TSCacheScan to print URLs and headers for objects in
  *                 the cache when endpoint /show-cache is requested
  */
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <climits>
+#include <cstdlib>
 
 #include "ts/ts.h"
 #include "ts/experimental.h"
diff --git a/example/intercept/intercept.cc b/example/intercept/intercept.cc
index 50ec14c..cf9c2b8 100644
--- a/example/intercept/intercept.cc
+++ b/example/intercept/intercept.cc
@@ -22,10 +22,10 @@
  */
 
 #include <ts/ts.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <string.h>
+#include <cstdlib>
+#include <cerrno>
+#include <cinttypes>
+#include <cstring>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
diff --git a/example/passthru/passthru.cc b/example/passthru/passthru.cc
index 0b13e8a..a42ad20 100644
--- a/example/passthru/passthru.cc
+++ b/example/passthru/passthru.cc
@@ -32,8 +32,8 @@
  */
 
 #include <ts/ts.h>
-#include <inttypes.h>
-#include <string.h>
+#include <cinttypes>
+#include <cstring>
 
 #define PLUGIN_NAME "passthru"
 
diff --git a/example/protocol_stack/protocol_stack.cc b/example/protocol_stack/protocol_stack.cc
index 6bb603a..eb2b427 100644
--- a/example/protocol_stack/protocol_stack.cc
+++ b/example/protocol_stack/protocol_stack.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "ts/ts.h"
 #include "ts/ink_defs.h"
diff --git a/example/remap/remap.cc b/example/remap/remap.cc
index cc94c7f..ceb4aef 100644
--- a/example/remap/remap.cc
+++ b/example/remap/remap.cc
@@ -29,11 +29,11 @@
     # tsxs -i -o remap.so
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cstdarg>
+#include <cerrno>
 #include <pwd.h>
 #include <pthread.h>
 #include <unistd.h>
diff --git a/example/remap_header_add/remap_header_add.cc b/example/remap_header_add/remap_header_add.cc
index dc1690a..21feef0 100644
--- a/example/remap_header_add/remap_header_add.cc
+++ b/example/remap_header_add/remap_header_add.cc
@@ -27,9 +27,9 @@
     map /foo http://127.0.0.1/ @plugin=remap_header_add.so @pparam=foo:"x" @pparam=@test:"c" @pparam=a:"b"
 
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "ts/ts.h"
 #include "ts/remap.h"
diff --git a/example/replace-protoset/replace-protoset.cc b/example/replace-protoset/replace-protoset.cc
index 2f2bbe9..b5f4e1d 100644
--- a/example/replace-protoset/replace-protoset.cc
+++ b/example/replace-protoset/replace-protoset.cc
@@ -37,7 +37,7 @@
 #include <unordered_set>
 #include <iostream>
 #include <algorithm>
-#include <inttypes.h>
+#include <cinttypes>
 #include <openssl/ssl.h>
 #include <fcntl.h>
 #include <sys/types.h>
diff --git a/example/ssl-preaccept/ssl-preaccept.cc b/example/ssl-preaccept/ssl-preaccept.cc
index 8f10047..91435a4 100644
--- a/example/ssl-preaccept/ssl-preaccept.cc
+++ b/example/ssl-preaccept/ssl-preaccept.cc
@@ -25,9 +25,9 @@
   limitations under the License.
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <memory.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <ts/ts.h>
 #include <tsconfig/TsValue.h>
 #include <ts/ink_inet.h>
diff --git a/example/ssl-sni-whitelist/ssl-sni-whitelist.cc b/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
index 9f3d8f1..65e0a2b 100644
--- a/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
+++ b/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
@@ -23,9 +23,9 @@
   limitations under the License.
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <memory.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <ts/ts.h>
 #include "ts/ink_config.h"
 #include <tsconfig/TsValue.h>
diff --git a/example/ssl-sni/ssl-sni.cc b/example/ssl-sni/ssl-sni.cc
index f4015ee..9c0cca4 100644
--- a/example/ssl-sni/ssl-sni.cc
+++ b/example/ssl-sni/ssl-sni.cc
@@ -25,9 +25,9 @@
   limitations under the License.
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <memory.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <ts/ts.h>
 #include "ts/ink_config.h"
 #include <tsconfig/TsValue.h>
diff --git a/example/statistic/statistic.cc b/example/statistic/statistic.cc
index bf8dc1a..0414f86 100644
--- a/example/statistic/statistic.cc
+++ b/example/statistic/statistic.cc
@@ -28,8 +28,8 @@
 // doc/developer-guide/plugins/adding-statistics.en.rst
 
 #include <ts/ts.h>
-#include <inttypes.h>
-#include <time.h>
+#include <cinttypes>
+#include <ctime>
 
 #define PLUGIN_NAME "statistics"
 
diff --git a/iocore/cache/CacheHttp.cc b/iocore/cache/CacheHttp.cc
index b142125..da29ee3 100644
--- a/iocore/cache/CacheHttp.cc
+++ b/iocore/cache/CacheHttp.cc
@@ -22,7 +22,7 @@
  */
 
 #include "ts/ink_config.h"
-#include <string.h>
+#include <cstring>
 #include "P_Cache.h"
 
 /*-------------------------------------------------------------------------
diff --git a/iocore/net/SSLConfig.cc b/iocore/net/SSLConfig.cc
index e7ae554..0fbe4c2 100644
--- a/iocore/net/SSLConfig.cc
+++ b/iocore/net/SSLConfig.cc
@@ -32,7 +32,7 @@
 #include "ts/ink_platform.h"
 #include "ts/I_Layout.h"
 
-#include <string.h>
+#include <cstring>
 #include <cmath>
 #include "P_Net.h"
 #include "P_SSLConfig.h"
diff --git a/lib/bindings/repl.cc b/lib/bindings/repl.cc
index c6b73b5..8175a74 100644
--- a/lib/bindings/repl.cc
+++ b/lib/bindings/repl.cc
@@ -23,7 +23,7 @@
 
 #include "ink_autoconf.h"
 #include "bindings.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 #if HAVE_READLINE_H
 #include <readline.h>
diff --git a/lib/cppapi/RemapPlugin.cc b/lib/cppapi/RemapPlugin.cc
index ce58200..4c1e1f1 100644
--- a/lib/cppapi/RemapPlugin.cc
+++ b/lib/cppapi/RemapPlugin.cc
@@ -22,7 +22,7 @@
 #include "atscppapi/RemapPlugin.h"
 #include "logging_internal.h"
 #include "utils_internal.h"
-#include <assert.h>
+#include <cassert>
 #include <ts/remap.h>
 
 using namespace atscppapi;
diff --git a/lib/cppapi/Stat.cc b/lib/cppapi/Stat.cc
index 86bc645..e398030 100644
--- a/lib/cppapi/Stat.cc
+++ b/lib/cppapi/Stat.cc
@@ -21,7 +21,7 @@
 
 #include "atscppapi/Stat.h"
 #include <string>
-#include <stdint.h>
+#include <cstdint>
 #include <ts/ts.h>
 #include "logging_internal.h"
 
diff --git a/lib/ts/Arena.cc b/lib/ts/Arena.cc
index 8b03300..daa52b4 100644
--- a/lib/ts/Arena.cc
+++ b/lib/ts/Arena.cc
@@ -25,8 +25,8 @@
 #include "ts/ink_memory.h"
 #include "ts/Allocator.h"
 #include "ts/Arena.h"
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 #define DEFAULT_ALLOC_SIZE 1024
 #define DEFAULT_BLOCK_SIZE (DEFAULT_ALLOC_SIZE - (sizeof(ArenaBlock) - 8))
diff --git a/lib/ts/CompileParseRules.cc b/lib/ts/CompileParseRules.cc
index 52c12c8..1a1a5c0 100644
--- a/lib/ts/CompileParseRules.cc
+++ b/lib/ts/CompileParseRules.cc
@@ -33,8 +33,8 @@ unsigned int tparseRulesCType[256];
 char tparseRulesCTypeToUpper[256];
 char tparseRulesCTypeToLower[256];
 
-#include <stdio.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cctype>
 #include "ts/ink_string.h"
 
 static char *
diff --git a/lib/ts/InkErrno.cc b/lib/ts/InkErrno.cc
index ab788af..33301ce 100644
--- a/lib/ts/InkErrno.cc
+++ b/lib/ts/InkErrno.cc
@@ -23,7 +23,7 @@
 
 #include "InkErrno.h"
 #include "ink_assert.h"
-#include <string.h>
+#include <cstring>
 
 const char *
 InkStrerror(int ink_errno)
diff --git a/lib/ts/MMH.cc b/lib/ts/MMH.cc
index 0612fc6..31d9bd3 100644
--- a/lib/ts/MMH.cc
+++ b/lib/ts/MMH.cc
@@ -21,8 +21,8 @@
   limitations under the License.
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "ts/ink_assert.h"
 #include "ts/ink_platform.h"
 #include "ts/MMH.h"
diff --git a/lib/ts/MemView.cc b/lib/ts/MemView.cc
index bf0c1c9..19c24cb 100644
--- a/lib/ts/MemView.cc
+++ b/lib/ts/MemView.cc
@@ -25,7 +25,7 @@
 */
 #include <ts/MemView.h>
 #include <sstream>
-#include <ctype.h>
+#include <cctype>
 #include <ts/ink_platform.h>
 
 namespace ts
diff --git a/lib/ts/SourceLocation.cc b/lib/ts/SourceLocation.cc
index 2bcd0de..8621e9e 100644
--- a/lib/ts/SourceLocation.cc
+++ b/lib/ts/SourceLocation.cc
@@ -23,8 +23,8 @@
 
 #include "SourceLocation.h"
 #include "ink_defs.h"
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 // This method takes a SourceLocation source location data structure and
 // converts it to a human-readable representation, in the buffer <buf>
diff --git a/lib/ts/TextBuffer.cc b/lib/ts/TextBuffer.cc
index 1453c98..c24a86b 100644
--- a/lib/ts/TextBuffer.cc
+++ b/lib/ts/TextBuffer.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include <stdarg.h>
+#include <cstdarg>
 #include "ts/ink_platform.h"
 #include "ts/ink_memory.h"
 #include "ts/TextBuffer.h"
diff --git a/lib/ts/Vec.cc b/lib/ts/Vec.cc
index 8773b2f..43a1b60 100644
--- a/lib/ts/Vec.cc
+++ b/lib/ts/Vec.cc
@@ -22,7 +22,7 @@
 
 /* UnionFind after Tarjan */
 
-#include <stdint.h>
+#include <cstdint>
 #include "ts/Vec.h"
 
 const uintptr_t prime2[] = {1,       3,       7,       13,       31,       61,       127,       251,       509,      1021,
diff --git a/lib/ts/ink_code.cc b/lib/ts/ink_code.cc
index 1510005..bfd6724 100644
--- a/lib/ts/ink_code.cc
+++ b/lib/ts/ink_code.cc
@@ -21,8 +21,8 @@
   limitations under the License.
  */
 
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include "ts/ink_code.h"
 #include "ts/INK_MD5.h"
 #include "ts/ink_assert.h"
diff --git a/lib/ts/ink_error.cc b/lib/ts/ink_error.cc
index d38bafb..e0419fc 100644
--- a/lib/ts/ink_error.cc
+++ b/lib/ts/ink_error.cc
@@ -27,7 +27,7 @@
 #include "ts/ink_stack_trace.h"
 
 #include <syslog.h>
-#include <signal.h> /* MAGIC_EDITING_TAG */
+#include <csignal> /* MAGIC_EDITING_TAG */
 
 /**
   This routine prints/logs an error message given the printf format
diff --git a/lib/ts/ink_file.cc b/lib/ts/ink_file.cc
index 9f72c21..dcd46db 100644
--- a/lib/ts/ink_file.cc
+++ b/lib/ts/ink_file.cc
@@ -22,7 +22,7 @@
  */
 
 #include <unistd.h>
-#include <limits.h>
+#include <climits>
 #include "ts/ink_platform.h"
 #include "ts/ink_file.h"
 #include "ts/ink_string.h"
diff --git a/lib/ts/ink_memory.cc b/lib/ts/ink_memory.cc
index e17819e..dbce761 100644
--- a/lib/ts/ink_memory.cc
+++ b/lib/ts/ink_memory.cc
@@ -31,15 +31,15 @@
 #include <malloc_np.h> // for malloc_usable_size
 #endif
 
-#include <assert.h>
+#include <cassert>
 #if defined(linux)
 // XXX: SHouldn't that be part of CPPFLAGS?
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 600
 #endif
 #endif
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 void *
 ats_malloc(size_t size)
diff --git a/lib/ts/ink_mutex.cc b/lib/ts/ink_mutex.cc
index 34fe28d..a088189 100644
--- a/lib/ts/ink_mutex.cc
+++ b/lib/ts/ink_mutex.cc
@@ -23,8 +23,8 @@
 
 #include "ts/ink_error.h"
 #include "ts/ink_defs.h"
-#include <assert.h>
-#include "stdio.h"
+#include <cassert>
+#include <cstdio>
 #include "ts/ink_mutex.h"
 
 // Define the _g_mattr first to avoid static initialization order fiasco.
diff --git a/lib/ts/ink_queue.cc b/lib/ts/ink_queue.cc
index e9f1158..14a1220 100644
--- a/lib/ts/ink_queue.cc
+++ b/lib/ts/ink_queue.cc
@@ -37,9 +37,9 @@
   ****************************************************************************/
 
 #include "ts/ink_config.h"
-#include <assert.h>
+#include <cassert>
 #include <memory.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/lib/ts/ink_queue_utils.cc b/lib/ts/ink_queue_utils.cc
index 2fc547b..b37c0ab 100644
--- a/lib/ts/ink_queue_utils.cc
+++ b/lib/ts/ink_queue_utils.cc
@@ -22,7 +22,7 @@
  */
 
 #include "ts/ink_config.h"
-#include <assert.h>
+#include <cassert>
 
 #include "ts/ink_atomic.h"
 #include "ts/ink_queue.h"
diff --git a/lib/ts/ink_res_init.cc b/lib/ts/ink_res_init.cc
index 14c99d8..80c5c12 100644
--- a/lib/ts/ink_res_init.cc
+++ b/lib/ts/ink_res_init.cc
@@ -77,12 +77,12 @@
 #ifdef HAVE_ARPA_NAMESER_COMPAT_H
 #include <arpa/nameser_compat.h>
 #endif
-#include <stdio.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cctype>
 #include <resolv.h>
 #include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "ts/ink_string.h"
 #include "ts/ink_resolver.h"
diff --git a/lib/ts/ink_res_mkquery.cc b/lib/ts/ink_res_mkquery.cc
index f1e6f2c..63e012a 100644
--- a/lib/ts/ink_res_mkquery.cc
+++ b/lib/ts/ink_res_mkquery.cc
@@ -76,8 +76,8 @@
 #endif
 #include <netdb.h>
 #include <resolv.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "ts/ink_error.h"
 #include "ts/ink_resolver.h"
diff --git a/lib/ts/ink_stack_trace.cc b/lib/ts/ink_stack_trace.cc
index e5d157a..88cdd35 100644
--- a/lib/ts/ink_stack_trace.cc
+++ b/lib/ts/ink_stack_trace.cc
@@ -26,8 +26,8 @@
 #include "ts/ink_args.h"
 
 #include <strings.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <unistd.h>
 
 #ifndef STDERR_FILENO
@@ -37,7 +37,7 @@
 #if TS_HAS_BACKTRACE
 
 #include <execinfo.h> /* for backtrace_symbols, etc. */
-#include <signal.h>
+#include <csignal>
 
 void
 ink_stack_trace_dump()
diff --git a/lib/ts/ink_string.cc b/lib/ts/ink_string.cc
index a386c16..6556287 100644
--- a/lib/ts/ink_string.cc
+++ b/lib/ts/ink_string.cc
@@ -24,10 +24,10 @@
 #include "ts/ink_platform.h"
 #include "ts/ink_assert.h"
 
-#include <assert.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cassert>
+#include <cstdarg>
+#include <cstdlib>
+#include <cstring>
 
 #define INK_MAX_STRING_ARRAY_SIZE 128
 
diff --git a/lib/ts/ink_time.cc b/lib/ts/ink_time.cc
index 97da419..8741baa 100644
--- a/lib/ts/ink_time.cc
+++ b/lib/ts/ink_time.cc
@@ -34,7 +34,7 @@
 #include "ts/ink_assert.h"
 #include "ts/ink_string.h"
 
-#include <locale.h>
+#include <clocale>
 #include <sys/resource.h>
 
 /*===========================================================================*
diff --git a/lib/ts/llqueue.cc b/lib/ts/llqueue.cc
index 7eda019..e5b04fa 100644
--- a/lib/ts/llqueue.cc
+++ b/lib/ts/llqueue.cc
@@ -24,13 +24,13 @@
 #include "ts/ink_config.h"
 #include "ts/ink_memory.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <limits.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cassert>
+#include <climits>
 
 #include "ts/ink_llqueue.h"
-#include "errno.h"
+#include <cerrno>
 
 #define RECORD_CHUNK 1024
 
diff --git a/lib/ts/test_Map.cc b/lib/ts/test_Map.cc
index 97dac55..ca96ba7 100644
--- a/lib/ts/test_Map.cc
+++ b/lib/ts/test_Map.cc
@@ -20,7 +20,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-#include <stdint.h>
+#include <cstdint>
 #include "ts/Map.h"
 #include <list>
 
diff --git a/lib/ts/test_PriorityQueue.cc b/lib/ts/test_PriorityQueue.cc
index e13c33e..c8ebfb8 100644
--- a/lib/ts/test_PriorityQueue.cc
+++ b/lib/ts/test_PriorityQueue.cc
@@ -23,7 +23,7 @@
 
 #include <iostream>
 #include <utility>
-#include <string.h>
+#include <cstring>
 
 #include <ts/TestBox.h>
 
diff --git a/lib/ts/test_Scalar.cc b/lib/ts/test_Scalar.cc
index 72e014b..65946ae 100644
--- a/lib/ts/test_Scalar.cc
+++ b/lib/ts/test_Scalar.cc
@@ -23,7 +23,7 @@
 
 #include <ts/Scalar.h>
 #include <string>
-#include <stdarg.h>
+#include <cstdarg>
 #include <iostream>
 
 namespace ts
diff --git a/lib/ts/test_Vec.cc b/lib/ts/test_Vec.cc
index c1dc5e9..8109999 100644
--- a/lib/ts/test_Vec.cc
+++ b/lib/ts/test_Vec.cc
@@ -22,8 +22,8 @@
 
 /* UnionFind after Tarjan */
 
-#include <stdint.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>
 #include "ts/ink_assert.h"
 #include "ts/Vec.h"
 
diff --git a/lib/ts/test_arena.cc b/lib/ts/test_arena.cc
index 89abb2c..dbc0fad 100644
--- a/lib/ts/test_arena.cc
+++ b/lib/ts/test_arena.cc
@@ -34,7 +34,7 @@
  ****************************************************************************/
 
 #include "ts/Arena.h"
-#include <stdio.h>
+#include <cstdio>
 
 void
 fill_test_data(char *ptr, int size, int seed)
diff --git a/lib/ts/test_atomic.cc b/lib/ts/test_atomic.cc
index a02a91a..90f2347 100644
--- a/lib/ts/test_atomic.cc
+++ b/lib/ts/test_atomic.cc
@@ -22,8 +22,8 @@
  */
 
 #include <unistd.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cstdlib>
+#include <ctime>
 #include <poll.h>
 #include <pthread.h>
 
diff --git a/lib/ts/test_freelist.cc b/lib/ts/test_freelist.cc
index 33d8de0..19d269b 100644
--- a/lib/ts/test_freelist.cc
+++ b/lib/ts/test_freelist.cc
@@ -21,8 +21,8 @@
   limitations under the License.
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "ts/ink_thread.h"
 #include "ts/ink_queue.h"
 
diff --git a/lib/tsconfig/TsBuilder.cc b/lib/tsconfig/TsBuilder.cc
index f9af319..56a4e96 100644
--- a/lib/tsconfig/TsBuilder.cc
+++ b/lib/tsconfig/TsBuilder.cc
@@ -25,7 +25,7 @@
 # include "TsErrataUtil.h"
 # include "TsConfigLexer.h"
 # include "TsConfigGrammar.hpp"
-# include <stdlib.h>
+# include <cstdlib>
 
 // Prefix for text of our messages.
 # define PRE "Configuration Parser: "
diff --git a/lib/tsconfig/TsErrataUtil.cc b/lib/tsconfig/TsErrataUtil.cc
index fe24d50..d9b3373 100644
--- a/lib/tsconfig/TsErrataUtil.cc
+++ b/lib/tsconfig/TsErrataUtil.cc
@@ -22,11 +22,11 @@
  */
 
 # if !defined(_MSC_VER)
-# include <stdio.h>
-# include <string.h>
+# include <cstdio>
+# include <cstring>
 # endif
-# include <stdarg.h>
-# include <errno.h>
+# include <cstdarg>
+# include <cerrno>
 # include <TsErrataUtil.h>
 # include "ts/ink_string.h"
 # include "ts/ink_defs.h"
diff --git a/lib/tsconfig/TsValue.cc b/lib/tsconfig/TsValue.cc
index b9d9b7c..a453ac7 100644
--- a/lib/tsconfig/TsValue.cc
+++ b/lib/tsconfig/TsValue.cc
@@ -27,8 +27,8 @@
 
 # include <TsErrataUtil.h>
 # include <sys/stat.h>
-# include <stdio.h>
-# include <stdlib.h>
+# include <cstdio>
+# include <cstdlib>
 
 # if !defined(_MSC_VER)
 # define _fileno fileno
diff --git a/lib/tsconfig/test-tsconfig.cc b/lib/tsconfig/test-tsconfig.cc
index 5995e9f..8b507c3 100644
--- a/lib/tsconfig/test-tsconfig.cc
+++ b/lib/tsconfig/test-tsconfig.cc
@@ -19,7 +19,7 @@
 */
 
 # include "tsconfig/TsValue.h"
-# include <stdio.h>
+# include <cstdio>
 # include <iostream>
 
 using ts::config::Configuration;
diff --git a/mgmt/api/APITestCliRemote.cc b/mgmt/api/APITestCliRemote.cc
index 642b433..5f6aaad 100644
--- a/mgmt/api/APITestCliRemote.cc
+++ b/mgmt/api/APITestCliRemote.cc
@@ -95,9 +95,9 @@
 
 #include "ts/ink_config.h"
 #include "ts/ink_defs.h"
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #include <strings.h>
 #include "ts/ink_string.h"
 
diff --git a/mgmt/api/INKMgmtAPI.cc b/mgmt/api/INKMgmtAPI.cc
index f385721..bc05f64 100644
--- a/mgmt/api/INKMgmtAPI.cc
+++ b/mgmt/api/INKMgmtAPI.cc
@@ -32,7 +32,7 @@
 #include "ts/ink_platform.h"
 #include "ts/ink_code.h"
 #include "ts/ParseRules.h"
-#include <limits.h>
+#include <climits>
 #include "ts/I_Layout.h"
 
 #include "mgmtapi.h"
diff --git a/plugins/background_fetch/background_fetch.cc b/plugins/background_fetch/background_fetch.cc
index c80c79c..7103c69 100644
--- a/plugins/background_fetch/background_fetch.cc
+++ b/plugins/background_fetch/background_fetch.cc
@@ -21,10 +21,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <cstdarg>
 #include <getopt.h>
 
 #include <string>
diff --git a/plugins/background_fetch/headers.cc b/plugins/background_fetch/headers.cc
index 1d99017..4043993 100644
--- a/plugins/background_fetch/headers.cc
+++ b/plugins/background_fetch/headers.cc
@@ -21,7 +21,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "configs.h"
 #include "headers.h"
diff --git a/plugins/background_fetch/rules.cc b/plugins/background_fetch/rules.cc
index 8fcac32..fe4f7ed 100644
--- a/plugins/background_fetch/rules.cc
+++ b/plugins/background_fetch/rules.cc
@@ -22,7 +22,7 @@
     limitations under the License.
 */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "configs.h"
 #include "rules.h"
diff --git a/plugins/conf_remap/conf_remap.cc b/plugins/conf_remap/conf_remap.cc
index a2d0dba..d5dc7f4 100644
--- a/plugins/conf_remap/conf_remap.cc
+++ b/plugins/conf_remap/conf_remap.cc
@@ -20,10 +20,10 @@
 #include "ts/remap.h"
 #include "ts/ink_defs.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <cctype>
+#include <cstdlib>
 #include <string>
 
 static const char PLUGIN_NAME[] = "conf_remap";
diff --git a/plugins/esi/combo_handler.cc b/plugins/esi/combo_handler.cc
index 0b61ad7..8bf398d 100644
--- a/plugins/esi/combo_handler.cc
+++ b/plugins/esi/combo_handler.cc
@@ -26,7 +26,7 @@
 #include <sstream>
 #include <vector>
 #include <algorithm>
-#include <time.h>
+#include <ctime>
 #include <pthread.h>
 #include <arpa/inet.h>
 #include <limits>
diff --git a/plugins/esi/esi.cc b/plugins/esi/esi.cc
index e4cf93b..9a4e75b 100644
--- a/plugins/esi/esi.cc
+++ b/plugins/esi/esi.cc
@@ -23,10 +23,10 @@
 
 #include "ts/ink_defs.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <climits>
+#include <cstring>
 #include <string>
 #include <list>
 #include <arpa/inet.h>
diff --git a/plugins/esi/fetcher/HttpDataFetcherImpl.cc b/plugins/esi/fetcher/HttpDataFetcherImpl.cc
index 337b9a5..a569547 100644
--- a/plugins/esi/fetcher/HttpDataFetcherImpl.cc
+++ b/plugins/esi/fetcher/HttpDataFetcherImpl.cc
@@ -26,7 +26,7 @@
 #include "lib/gzip.h"
 
 #include <arpa/inet.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 using std::string;
 using namespace EsiLib;
diff --git a/plugins/esi/lib/EsiGunzip.cc b/plugins/esi/lib/EsiGunzip.cc
index 9ab41b8..139581c 100644
--- a/plugins/esi/lib/EsiGunzip.cc
+++ b/plugins/esi/lib/EsiGunzip.cc
@@ -23,8 +23,8 @@
 
 #include "EsiGunzip.h"
 #include "gzip.h"
-#include <ctype.h>
-#include <stdint.h>
+#include <cctype>
+#include <cstdint>
 
 using std::string;
 using namespace EsiLib;
diff --git a/plugins/esi/lib/EsiGzip.cc b/plugins/esi/lib/EsiGzip.cc
index 81408c0..35d2ff8 100644
--- a/plugins/esi/lib/EsiGzip.cc
+++ b/plugins/esi/lib/EsiGzip.cc
@@ -23,8 +23,8 @@
 
 #include "EsiGzip.h"
 #include "gzip.h"
-#include <ctype.h>
-#include <stdint.h>
+#include <cctype>
+#include <cstdint>
 
 using std::string;
 using namespace EsiLib;
diff --git a/plugins/esi/lib/EsiParser.cc b/plugins/esi/lib/EsiParser.cc
index 353c457..7c135ef 100644
--- a/plugins/esi/lib/EsiParser.cc
+++ b/plugins/esi/lib/EsiParser.cc
@@ -24,7 +24,7 @@
 #include "EsiParser.h"
 #include "Utils.h"
 
-#include <ctype.h>
+#include <cctype>
 
 using std::string;
 using namespace EsiLib;
diff --git a/plugins/esi/lib/EsiProcessor.cc b/plugins/esi/lib/EsiProcessor.cc
index 6cae156..59df2be 100644
--- a/plugins/esi/lib/EsiProcessor.cc
+++ b/plugins/esi/lib/EsiProcessor.cc
@@ -24,7 +24,7 @@
 #include "EsiProcessor.h"
 #include "Stats.h"
 #include "FailureInfo.h"
-#include <ctype.h>
+#include <cctype>
 
 using std::string;
 using namespace EsiLib;
diff --git a/plugins/esi/lib/Variables.cc b/plugins/esi/lib/Variables.cc
index 3cf933f..ef6020a 100644
--- a/plugins/esi/lib/Variables.cc
+++ b/plugins/esi/lib/Variables.cc
@@ -25,7 +25,7 @@
 #include "Attribute.h"
 #include "Utils.h"
 
-#include <errno.h>
+#include <cerrno>
 
 using std::list;
 using std::pair;
diff --git a/plugins/esi/lib/gzip.cc b/plugins/esi/lib/gzip.cc
index d89633c..802874c 100644
--- a/plugins/esi/lib/gzip.cc
+++ b/plugins/esi/lib/gzip.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "gzip.h"
 #include <zlib.h>
diff --git a/plugins/esi/serverIntercept.cc b/plugins/esi/serverIntercept.cc
index bdbe8bc..2ed4269 100644
--- a/plugins/esi/serverIntercept.cc
+++ b/plugins/esi/serverIntercept.cc
@@ -25,9 +25,9 @@
 #include "serverIntercept.h"
 
 #include <string>
-#include <limits.h>
+#include <climits>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 
 const char *ECHO_HEADER_PREFIX        = "Echo-";
 const int ECHO_HEADER_PREFIX_LEN      = 5;
diff --git a/plugins/esi/test/StubIncludeHandler.cc b/plugins/esi/test/StubIncludeHandler.cc
index 06ce32e..6968783 100644
--- a/plugins/esi/test/StubIncludeHandler.cc
+++ b/plugins/esi/test/StubIncludeHandler.cc
@@ -20,7 +20,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
-#include <stdio.h>
+#include <cstdio>
 #include "StubIncludeHandler.h"
 #include "TestHttpDataFetcher.h"
 
diff --git a/plugins/esi/test/docnode_test.cc b/plugins/esi/test/docnode_test.cc
index a497c81..e0af7b6 100644
--- a/plugins/esi/test/docnode_test.cc
+++ b/plugins/esi/test/docnode_test.cc
@@ -22,7 +22,7 @@
  */
 
 #include <iostream>
-#include <assert.h>
+#include <cassert>
 #include <string>
 
 #include "EsiParser.h"
diff --git a/plugins/esi/test/gzip_test.cc b/plugins/esi/test/gzip_test.cc
index 8dcf7ff..a8b9def 100644
--- a/plugins/esi/test/gzip_test.cc
+++ b/plugins/esi/test/gzip_test.cc
@@ -22,9 +22,9 @@
  */
 
 #include <iostream>
-#include <assert.h>
+#include <cassert>
 #include <string>
-#include <string.h>
+#include <cstring>
 
 #include "print_funcs.h"
 #include "Utils.h"
diff --git a/plugins/esi/test/parser_test.cc b/plugins/esi/test/parser_test.cc
index 22040f7..1bd5f7b 100644
--- a/plugins/esi/test/parser_test.cc
+++ b/plugins/esi/test/parser_test.cc
@@ -22,7 +22,7 @@
  */
 
 #include <iostream>
-#include <assert.h>
+#include <cassert>
 #include <string>
 
 #include "EsiParser.h"
diff --git a/plugins/esi/test/print_funcs.cc b/plugins/esi/test/print_funcs.cc
index a6e3b53..851545c 100644
--- a/plugins/esi/test/print_funcs.cc
+++ b/plugins/esi/test/print_funcs.cc
@@ -21,8 +21,8 @@
   limitations under the License.
  */
 
-#include <stdio.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdarg>
 
 #include "print_funcs.h"
 
diff --git a/plugins/esi/test/processor_test.cc b/plugins/esi/test/processor_test.cc
index b89c2b3..444dc5a 100644
--- a/plugins/esi/test/processor_test.cc
+++ b/plugins/esi/test/processor_test.cc
@@ -22,7 +22,7 @@
  */
 
 #include <iostream>
-#include <assert.h>
+#include <cassert>
 #include <string>
 
 #include "EsiProcessor.h"
diff --git a/plugins/esi/test/utils_test.cc b/plugins/esi/test/utils_test.cc
index c9273a9..481bfbc 100644
--- a/plugins/esi/test/utils_test.cc
+++ b/plugins/esi/test/utils_test.cc
@@ -22,7 +22,7 @@
  */
 
 #include <iostream>
-#include <assert.h>
+#include <cassert>
 #include <string>
 
 #include "print_funcs.h"
diff --git a/plugins/esi/test/vars_test.cc b/plugins/esi/test/vars_test.cc
index ba0ca88..5da39ee 100644
--- a/plugins/esi/test/vars_test.cc
+++ b/plugins/esi/test/vars_test.cc
@@ -20,11 +20,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
-#include <assert.h>
+#include <cassert>
 #include <string>
-#include <stdarg.h>
+#include <cstdarg>
 
 #include "print_funcs.h"
 #include "Variables.h"
diff --git a/plugins/experimental/balancer/balancer.cc b/plugins/experimental/balancer/balancer.cc
index 8f68ea2..e9f5981 100644
--- a/plugins/experimental/balancer/balancer.cc
+++ b/plugins/experimental/balancer/balancer.cc
@@ -23,10 +23,10 @@
 
 #include "balancer.h"
 #include <ts/remap.h>
-#include <stdio.h>
+#include <cstdio>
 #include <getopt.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include <iterator>
 
 // Using ink_inet API is cheating, but I was too lazy to write new IPv6 address parsing routines ;)
diff --git a/plugins/experimental/balancer/hash.cc b/plugins/experimental/balancer/hash.cc
index 2e7da28..a624d71 100644
--- a/plugins/experimental/balancer/hash.cc
+++ b/plugins/experimental/balancer/hash.cc
@@ -22,10 +22,10 @@
  */
 
 #include "balancer.h"
-#include <stdlib.h>
+#include <cstdlib>
 #include <openssl/md5.h>
 #include <netinet/in.h>
-#include <string.h>
+#include <cstring>
 #include <map>
 #include <string>
 #include <vector>
diff --git a/plugins/experimental/balancer/roundrobin.cc b/plugins/experimental/balancer/roundrobin.cc
index 2e1aa83..16f0ffd 100644
--- a/plugins/experimental/balancer/roundrobin.cc
+++ b/plugins/experimental/balancer/roundrobin.cc
@@ -22,8 +22,8 @@
  */
 
 #include "balancer.h"
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <map>
 #include <string>
 #include <vector>
diff --git a/plugins/experimental/buffer_upload/buffer_upload.cc b/plugins/experimental/buffer_upload/buffer_upload.cc
index f91d9f9..60877cb 100644
--- a/plugins/experimental/buffer_upload/buffer_upload.cc
+++ b/plugins/experimental/buffer_upload/buffer_upload.cc
@@ -27,19 +27,19 @@
  *
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
+#include <cstdio>
+#include <cstring>
+#include <cctype>
+#include <climits>
 #include <ts/ts.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
 #include <dirent.h>
 #include <unistd.h>
-#include <stdlib.h>
-#include <inttypes.h>
+#include <cstdlib>
+#include <cinttypes>
 
 /* #define DEBUG 1 */
 #define DEBUG_TAG "buffer_upload-dbg"
diff --git a/plugins/experimental/cache_promote/cache_promote.cc b/plugins/experimental/cache_promote/cache_promote.cc
index 3128bad..9455b8f 100644
--- a/plugins/experimental/cache_promote/cache_promote.cc
+++ b/plugins/experimental/cache_promote/cache_promote.cc
@@ -16,12 +16,12 @@
   limitations under the License.
 */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <getopt.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cstdlib>
+#include <ctime>
 #include <openssl/sha.h>
 
 #include <string>
diff --git a/plugins/experimental/cache_range_requests/cache_range_requests.cc b/plugins/experimental/cache_range_requests/cache_range_requests.cc
index a11003f..a50001f 100644
--- a/plugins/experimental/cache_range_requests/cache_range_requests.cc
+++ b/plugins/experimental/cache_range_requests/cache_range_requests.cc
@@ -26,8 +26,8 @@
  * requests.
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "ts/ts.h"
 #include "ts/remap.h"
 
diff --git a/plugins/experimental/cachekey/cachekey.cc b/plugins/experimental/cachekey/cachekey.cc
index 348bbb8..4779521 100644
--- a/plugins/experimental/cachekey/cachekey.cc
+++ b/plugins/experimental/cachekey/cachekey.cc
@@ -21,8 +21,8 @@
  * @brief Cache key manipulation.
  */
 
-#include <string.h> /* strlen() */
-#include <sstream>  /* istringstream */
+#include <cstring> /* strlen() */
+#include <sstream> /* istringstream */
 #include "cachekey.h"
 
 static void
diff --git a/plugins/experimental/collapsed_connection/collapsed_connection.cc b/plugins/experimental/collapsed_connection/collapsed_connection.cc
index e8e1eb7..eb3b928 100644
--- a/plugins/experimental/collapsed_connection/collapsed_connection.cc
+++ b/plugins/experimental/collapsed_connection/collapsed_connection.cc
@@ -21,16 +21,16 @@
   limitations under the License.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
 
 #include <ts/ts.h>
 #include <ts/remap.h>
 #include <ts/experimental.h>
 #include "MurmurHash3.h"
-#include <inttypes.h>
+#include <cinttypes>
 
 #include "P_collapsed_connection.h"
 
diff --git a/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc b/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
index 9e2d82c..7526a4d 100644
--- a/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
+++ b/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
@@ -56,11 +56,11 @@
 #include <ts/remap.h>
 #include <set>
 #include <string>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdarg.h>
+#include <cstring>
+#include <cstdlib>
+#include <cstdint>
+#include <cstdio>
+#include <cstdarg>
 #include <getopt.h>
 #include <netdb.h>
 #include <map>
diff --git a/plugins/experimental/custom_redirect/custom_redirect.cc b/plugins/experimental/custom_redirect/custom_redirect.cc
index 0ebf5f8..30ab622 100644
--- a/plugins/experimental/custom_redirect/custom_redirect.cc
+++ b/plugins/experimental/custom_redirect/custom_redirect.cc
@@ -24,15 +24,15 @@
 /* custom_redirect.cc: Allows read header set by origin for internal redirects
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 #include <iostream>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <ts/ts.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 
 static char *redirect_url_header   = nullptr;
 static int redirect_url_header_len = 0;
diff --git a/plugins/experimental/epic/epic.cc b/plugins/experimental/epic/epic.cc
index 867aeb9..e455085 100644
--- a/plugins/experimental/epic/epic.cc
+++ b/plugins/experimental/epic/epic.cc
@@ -17,16 +17,16 @@
  */
 
 #include <ts/ts.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <time.h>
+#include <cstdio>
+#include <cstdlib>
+#include <climits>
+#include <ctime>
 #include <getopt.h>
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 #include <unistd.h>
 #include <sys/param.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <set>
 #include <string>
 
diff --git a/plugins/experimental/escalate/escalate.cc b/plugins/experimental/escalate/escalate.cc
index 142de29..f6e8862 100644
--- a/plugins/experimental/escalate/escalate.cc
+++ b/plugins/experimental/escalate/escalate.cc
@@ -23,10 +23,10 @@
 #include <ts/ts.h>
 #include <ts/remap.h>
 #include <ts/experimental.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <getopt.h>
-#include <string.h>
+#include <cstring>
 #include <string>
 #include <iterator>
 #include <map>
diff --git a/plugins/experimental/geoip_acl/geoip_acl.cc b/plugins/experimental/geoip_acl/geoip_acl.cc
index 6c17343..f3a0d5c 100644
--- a/plugins/experimental/geoip_acl/geoip_acl.cc
+++ b/plugins/experimental/geoip_acl/geoip_acl.cc
@@ -22,8 +22,8 @@
 //
 #include <ts/ts.h>
 #include <ts/remap.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "lulu.h"
 #include "acl.h"
diff --git a/plugins/experimental/header_freq/header_freq.cc b/plugins/experimental/header_freq/header_freq.cc
index f8520fb..56f787a 100644
--- a/plugins/experimental/header_freq/header_freq.cc
+++ b/plugins/experimental/header_freq/header_freq.cc
@@ -25,8 +25,8 @@
 #include <iostream>
 #include <map>
 #include <fstream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <string>
 #include <ts/ts.h>
 
diff --git a/plugins/experimental/header_normalize/header_normalize.cc b/plugins/experimental/header_normalize/header_normalize.cc
index 5af6fbf..c4d9e6b 100644
--- a/plugins/experimental/header_normalize/header_normalize.cc
+++ b/plugins/experimental/header_normalize/header_normalize.cc
@@ -45,10 +45,10 @@ static char UNUSED rcsId__header_normalize_cc[] =
 #include <ts/remap.h>
 #include <set>
 #include <string>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdlib>
+#include <cstdint>
+#include <cstdio>
 #include <netdb.h>
 #include <map>
 
diff --git a/plugins/experimental/hipes/hipes.cc b/plugins/experimental/hipes/hipes.cc
index 6483a72..db2e3bf 100644
--- a/plugins/experimental/hipes/hipes.cc
+++ b/plugins/experimental/hipes/hipes.cc
@@ -18,10 +18,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-#include <stdio.h>
+#include <cstdio>
 #include <sys/time.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include <string>
 
 #include <ts/ts.h>
diff --git a/plugins/experimental/inliner/ats-inliner.cc b/plugins/experimental/inliner/ats-inliner.cc
index 164e174..48eaac3 100644
--- a/plugins/experimental/inliner/ats-inliner.cc
+++ b/plugins/experimental/inliner/ats-inliner.cc
@@ -20,12 +20,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
-#include <assert.h>
+#include <cassert>
 #include <cstring>
 #include <dlfcn.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <limits>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 
 #include "inliner-handler.h"
diff --git a/plugins/experimental/inliner/chunk-decoder.cc b/plugins/experimental/inliner/chunk-decoder.cc
index c16156d..455fa16 100644
--- a/plugins/experimental/inliner/chunk-decoder.cc
+++ b/plugins/experimental/inliner/chunk-decoder.cc
@@ -41,7 +41,7 @@
   limitations under the License.
  */
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
 #include <cstring>
 
 #include "chunk-decoder.h"
diff --git a/plugins/experimental/inliner/html-parser.cc b/plugins/experimental/inliner/html-parser.cc
index c11d950..09a3436 100644
--- a/plugins/experimental/inliner/html-parser.cc
+++ b/plugins/experimental/inliner/html-parser.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include <assert.h>
+#include <cassert>
 #include <locale>
 #include <string>
 
diff --git a/plugins/experimental/inliner/inliner-handler.cc b/plugins/experimental/inliner/inliner-handler.cc
index 461c2da..d4b1938 100644
--- a/plugins/experimental/inliner/inliner-handler.cc
+++ b/plugins/experimental/inliner/inliner-handler.cc
@@ -20,7 +20,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
-#include <assert.h>
+#include <cassert>
 #include <iostream>
 #include <sstream>
 
diff --git a/plugins/experimental/memcached_remap/memcached_remap.cc b/plugins/experimental/memcached_remap/memcached_remap.cc
index 4330897..23e5dc1 100644
--- a/plugins/experimental/memcached_remap/memcached_remap.cc
+++ b/plugins/experimental/memcached_remap/memcached_remap.cc
@@ -18,8 +18,8 @@
 
 #include <ts/ts.h>
 #include <ts/remap.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 
 // change this on your box
diff --git a/plugins/experimental/money_trace/money_trace.cc b/plugins/experimental/money_trace/money_trace.cc
index f76df7a..f24e7ef 100644
--- a/plugins/experimental/money_trace/money_trace.cc
+++ b/plugins/experimental/money_trace/money_trace.cc
@@ -19,8 +19,8 @@
 
 #include <iostream>
 #include <sstream>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include "ts/ts.h"
 #include "ts/remap.h"
 
diff --git a/plugins/experimental/multiplexer/ats-multiplexer.cc b/plugins/experimental/multiplexer/ats-multiplexer.cc
index 386c148..e89f23d 100644
--- a/plugins/experimental/multiplexer/ats-multiplexer.cc
+++ b/plugins/experimental/multiplexer/ats-multiplexer.cc
@@ -24,7 +24,7 @@
 #include <ts/ts.h>
 #include <ts/remap.h>
 
-#include <inttypes.h>
+#include <cinttypes>
 
 #include "dispatch.h"
 #include "fetcher.h"
diff --git a/plugins/experimental/multiplexer/chunk-decoder.cc b/plugins/experimental/multiplexer/chunk-decoder.cc
index 140a306..ce47156 100644
--- a/plugins/experimental/multiplexer/chunk-decoder.cc
+++ b/plugins/experimental/multiplexer/chunk-decoder.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
 
 #include "chunk-decoder.h"
 
diff --git a/plugins/experimental/multiplexer/dispatch.cc b/plugins/experimental/multiplexer/dispatch.cc
index 87a3d60..bdbd606 100644
--- a/plugins/experimental/multiplexer/dispatch.cc
+++ b/plugins/experimental/multiplexer/dispatch.cc
@@ -20,7 +20,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
-#include <inttypes.h>
+#include <cinttypes>
 #include <sys/time.h>
 
 #include "dispatch.h"
diff --git a/plugins/experimental/multiplexer/post.cc b/plugins/experimental/multiplexer/post.cc
index 89f8910..c3419b0 100644
--- a/plugins/experimental/multiplexer/post.cc
+++ b/plugins/experimental/multiplexer/post.cc
@@ -20,7 +20,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
-#include <assert.h>
+#include <cassert>
 #include <limits>
 
 #include "post.h"
diff --git a/plugins/experimental/mysql_remap/mysql_remap.cc b/plugins/experimental/mysql_remap/mysql_remap.cc
index da035df..a023023 100644
--- a/plugins/experimental/mysql_remap/mysql_remap.cc
+++ b/plugins/experimental/mysql_remap/mysql_remap.cc
@@ -18,7 +18,7 @@
 
 #include <ts/ts.h>
 #include <ts/remap.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 
 #include "mysql/mysql.h"
diff --git a/plugins/experimental/ssl_cert_loader/domain-tree.cc b/plugins/experimental/ssl_cert_loader/domain-tree.cc
index f9c0862..47324b3 100644
--- a/plugins/experimental/ssl_cert_loader/domain-tree.cc
+++ b/plugins/experimental/ssl_cert_loader/domain-tree.cc
@@ -20,9 +20,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-#include <stdio.h>
+#include <cstdio>
 #include <memory.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include "domain-tree.h"
 
 // return true if comparable.  Return type of compare in relative parameter
diff --git a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
index b47258b..817853e 100644
--- a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
+++ b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
@@ -22,9 +22,9 @@
     limitations under the License.
 */
 
-#include <stdio.h>
+#include <cstdio>
 #include <memory.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <ts/ts.h>
 #include <tsconfig/TsValue.h>
 #include <openssl/ssl.h>
diff --git a/plugins/experimental/sslheaders/test_sslheaders.cc b/plugins/experimental/sslheaders/test_sslheaders.cc
index 25ee1ea..fa925db 100644
--- a/plugins/experimental/sslheaders/test_sslheaders.cc
+++ b/plugins/experimental/sslheaders/test_sslheaders.cc
@@ -18,8 +18,8 @@
 
 #include "sslheaders.h"
 #include <ts/TestBox.h>
-#include <stdio.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdarg>
 #include <openssl/ssl.h>
 #include <openssl/bio.h>
 #include <openssl/pem.h>
diff --git a/plugins/experimental/stream_editor/stream_editor.cc b/plugins/experimental/stream_editor/stream_editor.cc
index 01286c8..5801f68 100644
--- a/plugins/experimental/stream_editor/stream_editor.cc
+++ b/plugins/experimental/stream_editor/stream_editor.cc
@@ -88,16 +88,16 @@
 #define MAX_RX_MATCH 10
 #define WHITESPACE " \t\r\n"
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <vector>
 #include <set>
 #include <regex.h>
-#include <ctype.h>
-#include <assert.h>
-#include <string.h>
+#include <cctype>
+#include <cassert>
+#include <cstring>
 #include <string>
-#include <stdio.h>
+#include <cstdio>
 #include "ts/ts.h"
 
 struct edit_t;
diff --git a/plugins/generator/generator.cc b/plugins/generator/generator.cc
index 421b45a..276313a 100644
--- a/plugins/generator/generator.cc
+++ b/plugins/generator/generator.cc
@@ -23,13 +23,13 @@
 
 #include <ts/ts.h>
 #include <ts/remap.h>
-#include <errno.h>
-#include <inttypes.h>
+#include <cerrno>
+#include <cinttypes>
 #include <iterator>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 #include <unistd.h>
 
 // Generator plugin
diff --git a/plugins/gzip/gzip.cc b/plugins/gzip/gzip.cc
index 64ac2e2..da12ddc 100644
--- a/plugins/gzip/gzip.cc
+++ b/plugins/gzip/gzip.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include <string.h>
+#include <cstring>
 #include <zlib.h>
 
 #if HAVE_BROTLI_ENCODE_H
diff --git a/plugins/gzip/misc.cc b/plugins/gzip/misc.cc
index c0d750e..646187d 100644
--- a/plugins/gzip/misc.cc
+++ b/plugins/gzip/misc.cc
@@ -25,8 +25,8 @@
 #include "ts/ink_defs.h"
 
 #include "misc.h"
-#include <string.h>
-#include <inttypes.h>
+#include <cstring>
+#include <cinttypes>
 #include "debug_macros.h"
 
 voidpf
diff --git a/plugins/header_rewrite/conditions.cc b/plugins/header_rewrite/conditions.cc
index 5efbf18..e18ffa0 100644
--- a/plugins/header_rewrite/conditions.cc
+++ b/plugins/header_rewrite/conditions.cc
@@ -22,7 +22,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <arpa/inet.h>
-#include <ctype.h>
+#include <cctype>
 #include <sstream>
 
 #include "ts/ts.h"
diff --git a/plugins/header_rewrite/operators.cc b/plugins/header_rewrite/operators.cc
index 5e91178..7462acc 100644
--- a/plugins/header_rewrite/operators.cc
+++ b/plugins/header_rewrite/operators.cc
@@ -20,7 +20,7 @@
 //
 //
 #include <arpa/inet.h>
-#include <string.h>
+#include <cstring>
 
 #include "ts/ts.h"
 
diff --git a/plugins/regex_remap/regex_remap.cc b/plugins/regex_remap/regex_remap.cc
index 65edb48..a6019e4 100644
--- a/plugins/regex_remap/regex_remap.cc
+++ b/plugins/regex_remap/regex_remap.cc
@@ -24,17 +24,17 @@
 #include "ts/remap.h"
 
 #include <sys/types.h>
-#include <stdio.h>
-#include <time.h>
-#include <string.h>
+#include <cstdio>
+#include <ctime>
+#include <cstring>
 
-#include <ctype.h>
+#include <cctype>
 #include <unistd.h>
 
 #include <iostream>
 #include <fstream>
 #include <string>
-#include <ctype.h>
+#include <cctype>
 
 // Get some specific stuff from libts, yes, we can do that now that we build inside the core.
 #include "ts/ink_platform.h"
diff --git a/plugins/s3_auth/s3_auth.cc b/plugins/s3_auth/s3_auth.cc
index a52b07f..f027b64 100644
--- a/plugins/s3_auth/s3_auth.cc
+++ b/plugins/s3_auth/s3_auth.cc
@@ -20,13 +20,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-#include <time.h>
-#include <string.h>
+#include <ctime>
+#include <cstring>
 #include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <climits>
+#include <cctype>
 
 #include <openssl/sha.h>
 #include <openssl/hmac.h>
diff --git a/plugins/tcpinfo/tcpinfo.cc b/plugins/tcpinfo/tcpinfo.cc
index 5de5815..b5e0a12 100644
--- a/plugins/tcpinfo/tcpinfo.cc
+++ b/plugins/tcpinfo/tcpinfo.cc
@@ -21,8 +21,8 @@
   limitations under the License.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <ts/ts.h>
 #include <unistd.h>
 #include <netinet/in.h>
@@ -31,9 +31,9 @@
 #include <sys/stat.h>
 #include <getopt.h>
 #include <fcntl.h>
-#include <limits.h>
-#include <string.h>
-#include <errno.h>
+#include <climits>
+#include <cstring>
+#include <cerrno>
 #include <sys/time.h>
 #include <arpa/inet.h>
 
diff --git a/plugins/xdebug/xdebug.cc b/plugins/xdebug/xdebug.cc
index 001041c..c5a48e8 100644
--- a/plugins/xdebug/xdebug.cc
+++ b/plugins/xdebug/xdebug.cc
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <strings.h>
-#include <string.h>
+#include <cstring>
 #include <getopt.h>
 
 #include "ts/ts.h"
diff --git a/proxy/EventName.cc b/proxy/EventName.cc
index b5e5412..341b44b 100644
--- a/proxy/EventName.cc
+++ b/proxy/EventName.cc
@@ -22,8 +22,8 @@
  */
 
 #include "ts/ink_config.h"
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "P_EventSystem.h"
 // #include "I_Disk.h" unused
diff --git a/proxy/FetchSM.cc b/proxy/FetchSM.cc
index 0b12623..d4e06ce 100644
--- a/proxy/FetchSM.cc
+++ b/proxy/FetchSM.cc
@@ -23,7 +23,7 @@
 
 #include "ts/ink_config.h"
 #include "FetchSM.h"
-#include <stdio.h>
+#include <cstdio>
 #include "HTTP.h"
 #include "PluginVC.h"
 #include "api/ts/ts.h" // Ugly, but we need a bunch of the public APIs here ... :-/
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 3f02193..5374058 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "ts/ink_platform.h"
 #include "ts/ink_base64.h"
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index 0db012f..d393ab3 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -32,13 +32,13 @@
 #include "ts/ink_file.h"
 #include <sys/types.h>
 
-#include <errno.h>
+#include <cerrno>
 // extern int errno;
 
 #include <pthread.h>
 #include <unistd.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "ts/Regression.h"
 #include "api/ts/ts.h"
diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc
index 4824a46..abbc77f 100644
--- a/proxy/Plugin.cc
+++ b/proxy/Plugin.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include "ts/ink_platform.h"
 #include "ts/ink_file.h"
 #include "ts/ParseRules.h"
diff --git a/proxy/hdrs/HTTP.cc b/proxy/hdrs/HTTP.cc
index 587f6fb..3be7064 100644
--- a/proxy/hdrs/HTTP.cc
+++ b/proxy/hdrs/HTTP.cc
@@ -24,9 +24,9 @@
 #include "ts/ink_defs.h"
 #include "ts/ink_platform.h"
 #include "ts/ink_inet.h"
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
+#include <cassert>
+#include <cstdio>
+#include <cstring>
 #include "HTTP.h"
 #include "HdrToken.h"
 #include "ts/Diags.h"
diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc
index 6978315..9efbaf2 100644
--- a/proxy/hdrs/HdrToken.cc
+++ b/proxy/hdrs/HdrToken.cc
@@ -25,7 +25,7 @@
 #include "ts/HashFNV.h"
 #include "ts/Diags.h"
 #include "ts/ink_memory.h"
-#include <stdio.h>
+#include <cstdio>
 #include "ts/Allocator.h"
 #include "HTTP.h"
 #include "HdrToken.h"
diff --git a/proxy/hdrs/MIME.cc b/proxy/hdrs/MIME.cc
index 1023e6f..fa3eec6 100644
--- a/proxy/hdrs/MIME.cc
+++ b/proxy/hdrs/MIME.cc
@@ -25,9 +25,9 @@
 #include "ts/ink_platform.h"
 #include "ts/ink_memory.h"
 #include "ts/TsBuffer.h"
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
+#include <cassert>
+#include <cstdio>
+#include <cstring>
 #include "MIME.h"
 #include "HdrHeap.h"
 #include "HdrToken.h"
diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc
index 8911c97..4adf680 100644
--- a/proxy/hdrs/URL.cc
+++ b/proxy/hdrs/URL.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include <assert.h>
+#include <cassert>
 #include <new>
 #include "ts/ink_platform.h"
 #include "ts/ink_memory.h"
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index a452d19..6732512 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -22,8 +22,8 @@
  */
 
 #include "ts/ink_config.h"
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
 #include "HttpConfig.h"
 #include "HTTP.h"
 #include "ProcessManager.h"
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 6508a16..16cb0af 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -31,7 +31,7 @@
 #include "HttpSM.h"
 #include "HttpCacheSM.h" //Added to get the scope of HttpCacheSM object - YTS Team, yamsat
 #include "HttpDebugNames.h"
-#include "time.h"
+#include <ctime>
 #include "ts/ParseRules.h"
 #include "HTTP.h"
 #include "HdrUtils.h"
diff --git a/proxy/http/HttpTransactCache.cc b/proxy/http/HttpTransactCache.cc
index c6a801c..af1adb5 100644
--- a/proxy/http/HttpTransactCache.cc
+++ b/proxy/http/HttpTransactCache.cc
@@ -26,7 +26,7 @@
 #include "HttpTransact.h"
 #include "HttpTransactHeaders.h"
 #include "HttpTransactCache.h"
-#include "time.h"
+#include <ctime>
 #include "HTTP.h"
 #include "HttpCompat.h"
 #include "ts/InkErrno.h"
diff --git a/proxy/http2/test_Http2DependencyTree.cc b/proxy/http2/test_Http2DependencyTree.cc
index c70180c..5e12f18 100644
--- a/proxy/http2/test_Http2DependencyTree.cc
+++ b/proxy/http2/test_Http2DependencyTree.cc
@@ -22,7 +22,7 @@
 */
 
 #include <iostream>
-#include <string.h>
+#include <cstring>
 #include <sstream>
 
 #include "ts/TestBox.h"
diff --git a/proxy/http2/test_Huffmancode.cc b/proxy/http2/test_Huffmancode.cc
index a8d6a64..394e174 100644
--- a/proxy/http2/test_Huffmancode.cc
+++ b/proxy/http2/test_Huffmancode.cc
@@ -22,10 +22,10 @@
 */
 
 #include "HuffmanCodec.h"
-#include <stdlib.h>
+#include <cstdlib>
 #include <iostream>
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 using namespace std;
 
diff --git a/proxy/logging/LogBuffer.cc b/proxy/logging/LogBuffer.cc
index 8d5c3d1..9f73277 100644
--- a/proxy/logging/LogBuffer.cc
+++ b/proxy/logging/LogBuffer.cc
@@ -27,9 +27,9 @@
  */
 #include "ts/ink_platform.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "P_EventSystem.h"
 #include "LogField.h"
diff --git a/proxy/logging/LogCollationClientSM.cc b/proxy/logging/LogCollationClientSM.cc
index 9c5efcb..1e68b0b 100644
--- a/proxy/logging/LogCollationClientSM.cc
+++ b/proxy/logging/LogCollationClientSM.cc
@@ -27,10 +27,10 @@
 
 #include "ts/ink_platform.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <climits>
+#include <cstring>
 #include <sys/types.h>
 
 #include "P_EventSystem.h"
diff --git a/proxy/logging/LogCollationHostSM.cc b/proxy/logging/LogCollationHostSM.cc
index 20e609d..4a96d07 100644
--- a/proxy/logging/LogCollationHostSM.cc
+++ b/proxy/logging/LogCollationHostSM.cc
@@ -27,10 +27,10 @@
 
 #include "ts/ink_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <climits>
+#include <cstring>
 #include <sys/types.h>
 
 #include "P_EventSystem.h"
diff --git a/proxy/logging/LogFile.cc b/proxy/logging/LogFile.cc
index d9dbd13..e6a5bb6 100644
--- a/proxy/logging/LogFile.cc
+++ b/proxy/logging/LogFile.cc
@@ -31,7 +31,7 @@
 #include "ts/SimpleTokenizer.h"
 #include "ts/ink_file.h"
 
-#include <errno.h>
+#include <cerrno>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/proxy/logging/LogFormat.cc b/proxy/logging/LogFormat.cc
index 0222759..c9e2ff7 100644
--- a/proxy/logging/LogFormat.cc
+++ b/proxy/logging/LogFormat.cc
@@ -28,9 +28,9 @@
  ***************************************************************************/
 #include "ts/ink_config.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 
 #include "ts/INK_MD5.h"
 
diff --git a/proxy/logging/LogUtils.cc b/proxy/logging/LogUtils.cc
index ee8bc4b..e841944 100644
--- a/proxy/logging/LogUtils.cc
+++ b/proxy/logging/LogUtils.cc
@@ -24,12 +24,12 @@
 #include "ts/ink_config.h"
 #include "ts/ink_string.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <time.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstdarg>
+#include <cstring>
+#include <ctime>
 
 #include <sys/time.h>
 #include <sys/types.h>

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].

Mime
View raw message