diff --git a/src/api/exceptions.cc b/src/api/exceptions.cc
index 4d1cca8b6512..897a4de36528 100644
--- a/src/api/exceptions.cc
+++ b/src/api/exceptions.cc
@@ -7,7 +7,7 @@
 #include "uv.h"
 #include "v8.h"
 
-#include <string.h>
+#include <cstring>
 
 namespace node {
 
diff --git a/src/api/utils.cc b/src/api/utils.cc
index e6993f33b006..b0998b6fb769 100644
--- a/src/api/utils.cc
+++ b/src/api/utils.cc
@@ -1,7 +1,7 @@
 #include "node.h"
 #include "node_internals.h"
 
-#include <signal.h>
+#include <csignal>
 
 namespace node {
 
diff --git a/src/async_wrap.h b/src/async_wrap.h
index f7fc149c941e..687d40cdf666 100644
--- a/src/async_wrap.h
+++ b/src/async_wrap.h
@@ -27,7 +27,7 @@
 #include "base_object.h"
 #include "v8.h"
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace node {
 
diff --git a/src/base64.h b/src/base64.h
index aedec375eba5..ba609704319d 100644
--- a/src/base64.h
+++ b/src/base64.h
@@ -5,8 +5,8 @@
 
 #include "util.h"
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 namespace node {
 //// Base 64 ////
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index de05123c22cf..eca008de36e4 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -28,8 +28,8 @@
 #include "util-inl.h"
 #include "uv.h"
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 #include <vector>
 #include <unordered_set>
 
diff --git a/src/debug_utils.cc b/src/debug_utils.cc
index fadcaa50619f..f1024183cdae 100644
--- a/src/debug_utils.cc
+++ b/src/debug_utils.cc
@@ -19,7 +19,7 @@
 #include <execinfo.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include <stdio.h>
+#include <cstdio>
 #endif
 
 #else  // __POSIX__
diff --git a/src/env-inl.h b/src/env-inl.h
index 60dafc04e165..f4e04351956b 100644
--- a/src/env-inl.h
+++ b/src/env-inl.h
@@ -34,8 +34,8 @@
 #include "node_context_data.h"
 #include "node_worker.h"
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 namespace node {
 
diff --git a/src/env.cc b/src/env.cc
index 94fe595ac596..80efe3e701c3 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -14,7 +14,7 @@
 #include "tracing/traced_value.h"
 #include "v8-profiler.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 #include <atomic>
 
diff --git a/src/env.h b/src/env.h
index 5cf2ee2c8b49..90f5026e3f43 100644
--- a/src/env.h
+++ b/src/env.h
@@ -38,7 +38,7 @@
 #include "uv.h"
 #include "v8.h"
 
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
 #include <list>
 #include <unordered_map>
diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
index ef5646eb5669..9963c2413d8f 100644
--- a/src/inspector_agent.cc
+++ b/src/inspector_agent.cc
@@ -16,13 +16,13 @@
 
 #include "libplatform/libplatform.h"
 
-#include <string.h>
+#include <cstring>
 #include <sstream>
 #include <unordered_map>
 #include <vector>
 
 #ifdef __POSIX__
-#include <limits.h>  // PTHREAD_STACK_MIN
+#include <climits>  // PTHREAD_STACK_MIN
 #include <pthread.h>
 #endif  // __POSIX__
 
diff --git a/src/inspector_agent.h b/src/inspector_agent.h
index 905b1e2841eb..b8b03b2edc33 100644
--- a/src/inspector_agent.h
+++ b/src/inspector_agent.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 
-#include <stddef.h>
+#include <cstddef>
 
 #if !HAVE_INSPECTOR
 #error("This header can only be used when inspector is enabled")
diff --git a/src/inspector_io.cc b/src/inspector_io.cc
index 7686294b2e28..961d0411234a 100644
--- a/src/inspector_io.cc
+++ b/src/inspector_io.cc
@@ -13,7 +13,7 @@
 #include "zlib.h"
 
 #include <deque>
-#include <string.h>
+#include <cstring>
 #include <vector>
 
 namespace node {
diff --git a/src/inspector_io.h b/src/inspector_io.h
index bc09afdd3df5..e4b4ee44f81d 100644
--- a/src/inspector_io.h
+++ b/src/inspector_io.h
@@ -8,7 +8,7 @@
 #include "uv.h"
 
 #include <memory>
-#include <stddef.h>
+#include <cstddef>
 
 #if !HAVE_INSPECTOR
 #error("This header can only be used when inspector is enabled")
diff --git a/src/inspector_socket.cc b/src/inspector_socket.cc
index 7be9a01e0c43..fd10231af7c5 100644
--- a/src/inspector_socket.cc
+++ b/src/inspector_socket.cc
@@ -11,7 +11,7 @@
 #include "openssl/sha.h"  // Sha-1 hash
 
 #include <map>
-#include <string.h>
+#include <cstring>
 
 #define ACCEPT_KEY_LENGTH base64_encoded_size(20)
 #define BUFFER_GROWTH_CHUNK_SIZE 1024
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
index 4414e874ffa6..cf2fa64e9239 100644
--- a/src/module_wrap.cc
+++ b/src/module_wrap.cc
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include <limits.h>  // PATH_MAX
+#include <climits>  // PATH_MAX
 #include <sys/stat.h>  // S_IFDIR
 #include "module_wrap.h"
 
diff --git a/src/node.cc b/src/node.cc
index 7d9075b5e0a1..0bf5753d4778 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -71,13 +71,13 @@
 #include "large_pages/node_large_page.h"
 #endif
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>  // _O_RDWR
-#include <limits.h>  // PATH_MAX
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <climits>  // PATH_MAX
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/types.h>
 
 #include <string>
diff --git a/src/node.h b/src/node.h
index 0bdd37421b15..6686a09424ac 100644
--- a/src/node.h
+++ b/src/node.h
@@ -178,8 +178,8 @@ NODE_DEPRECATED("Use MakeCallback(..., async_context)",
 
 }  // namespace node
 
-#include <assert.h>
-#include <stdint.h>
+#include <cassert>
+#include <cstdint>
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)
diff --git a/src/node_buffer.cc b/src/node_buffer.cc
index 39727fcdd141..f15f2cffb4dc 100644
--- a/src/node_buffer.cc
+++ b/src/node_buffer.cc
@@ -31,8 +31,8 @@
 #include "v8-profiler.h"
 #include "v8.h"
 
-#include <string.h>
-#include <limits.h>
+#include <cstring>
+#include <climits>
 
 #define THROW_AND_RETURN_UNLESS_BUFFER(env, obj)                            \
   THROW_AND_RETURN_IF_NOT_BUFFER(env, obj, "argument")                      \
diff --git a/src/node_constants.cc b/src/node_constants.cc
index debcf0e10045..e4eae1727cb6 100644
--- a/src/node_constants.cc
+++ b/src/node_constants.cc
@@ -24,12 +24,12 @@
 
 #include "zlib.h"
 
-#include <errno.h>
+#include <cerrno>
 #if !defined(_MSC_VER)
 #include <unistd.h>
 #endif
 #include <fcntl.h>
-#include <signal.h>
+#include <csignal>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <limits>
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 9bd557f9ac3f..49227a55317c 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -37,9 +37,9 @@
 #include "util-inl.h"
 #include "v8.h"
 
-#include <errno.h>
-#include <limits.h>  // INT_MAX
-#include <string.h>
+#include <cerrno>
+#include <climits>  // INT_MAX
+#include <cstring>
 
 #include <algorithm>
 #include <memory>
diff --git a/src/node_crypto_bio.cc b/src/node_crypto_bio.cc
index baa90204f2f9..31165b7c988a 100644
--- a/src/node_crypto_bio.cc
+++ b/src/node_crypto_bio.cc
@@ -22,8 +22,8 @@
 #include "node_crypto_bio.h"
 #include "openssl/bio.h"
 #include "util-inl.h"
-#include <limits.h>
-#include <string.h>
+#include <climits>
+#include <cstring>
 
 namespace node {
 namespace crypto {
diff --git a/src/node_crypto_clienthello.h b/src/node_crypto_clienthello.h
index 48f49771fdf4..d1661735f5dc 100644
--- a/src/node_crypto_clienthello.h
+++ b/src/node_crypto_clienthello.h
@@ -24,8 +24,8 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include <stddef.h>  // size_t
-#include <stdint.h>
+#include <cstddef>  // size_t
+#include <cstdint>
 
 namespace node {
 namespace crypto {
diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc
index 0f33f59b338a..59d1f9d143ac 100644
--- a/src/node_dtrace.cc
+++ b/src/node_dtrace.cc
@@ -44,7 +44,7 @@
 
 #include "node_errors.h"
 
-#include <string.h>
+#include <cstring>
 
 namespace node {
 
diff --git a/src/node_errors.cc b/src/node_errors.cc
index 42e19f690514..207d808b2552 100644
--- a/src/node_errors.cc
+++ b/src/node_errors.cc
@@ -1,5 +1,5 @@
-#include <errno.h>
-#include <stdarg.h>
+#include <cerrno>
+#include <cstdarg>
 
 #include "node_errors.h"
 #include "node_internals.h"
diff --git a/src/node_file.cc b/src/node_file.cc
index 606900f22738..09d4ad34c50c 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -36,9 +36,9 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
+#include <cstring>
+#include <cerrno>
+#include <climits>
 
 #if defined(__MINGW32__) || defined(_MSC_VER)
 # include <io.h>
diff --git a/src/node_http2.h b/src/node_http2.h
index 660a713d19e7..a22ee04de675 100644
--- a/src/node_http2.h
+++ b/src/node_http2.h
@@ -4,7 +4,7 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 // FIXME(joyeecheung): nghttp2.h needs stdint.h to compile on Windows
-#include <stdint.h>
+#include <cstdint>
 #include "nghttp2/nghttp2.h"
 
 #include "node_http2_state.h"
diff --git a/src/node_http_parser_impl.h b/src/node_http_parser_impl.h
index 7d5ea347202c..2ef1f94f2696 100644
--- a/src/node_http_parser_impl.h
+++ b/src/node_http_parser_impl.h
@@ -35,8 +35,8 @@
 #include "util-inl.h"
 #include "v8.h"
 
-#include <stdlib.h>  // free()
-#include <string.h>  // strdup(), strchr()
+#include <cstdlib>  // free()
+#include <cstring>  // strdup(), strchr()
 
 #include "http_parser_adaptor.h"
 
diff --git a/src/node_internals.h b/src/node_internals.h
index c94be6ebe915..ea40de9770b8 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -34,8 +34,8 @@
 #include "uv.h"
 #include "v8.h"
 
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 
 #include <string>
 #include <vector>
diff --git a/src/node_main.cc b/src/node_main.cc
index 7107aea8c1a4..e92c0df94297 100644
--- a/src/node_main.cc
+++ b/src/node_main.cc
@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "node.h"
-#include <stdio.h>
+#include <cstdio>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/src/node_options.cc b/src/node_options.cc
index e68487a2bf9a..2ef0eabff516 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -1,4 +1,4 @@
-#include <errno.h>
+#include <cerrno>
 #include "env-inl.h"
 #include "node_binding.h"
 #include "node_options-inl.h"
diff --git a/src/node_os.cc b/src/node_os.cc
index fa27b7bac51b..2e97abca2d0c 100644
--- a/src/node_os.cc
+++ b/src/node_os.cc
@@ -24,15 +24,15 @@
 #include "util.h"
 
 #include <array>
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 #ifdef __MINGW32__
 # include <io.h>
 #endif  // __MINGW32__
 
 #ifdef __POSIX__
-# include <limits.h>        // PATH_MAX on Solaris.
+# include <climits>         // PATH_MAX on Solaris.
 # include <unistd.h>        // gethostname, sysconf
 #endif  // __POSIX__
 
diff --git a/src/node_process_events.cc b/src/node_process_events.cc
index ccc40b65753d..440e67d41232 100644
--- a/src/node_process_events.cc
+++ b/src/node_process_events.cc
@@ -1,4 +1,4 @@
-#include <stdarg.h>
+#include <cstdarg>
 
 #include "env-inl.h"
 #include "node_process.h"
diff --git a/src/node_process_methods.cc b/src/node_process_methods.cc
index be91a11f566b..f8f982f35bb9 100644
--- a/src/node_process_methods.cc
+++ b/src/node_process_methods.cc
@@ -15,8 +15,8 @@
 #include "inspector_io.h"
 #endif
 
-#include <limits.h>  // PATH_MAX
-#include <stdio.h>
+#include <climits>  // PATH_MAX
+#include <cstdio>
 
 #if defined(_MSC_VER)
 #include <direct.h>
diff --git a/src/node_process_object.cc b/src/node_process_object.cc
index 2f47b21f699d..cbec233c27d7 100644
--- a/src/node_process_object.cc
+++ b/src/node_process_object.cc
@@ -1,4 +1,4 @@
-#include <limits.h>  // PATH_MAX
+#include <climits>  // PATH_MAX
 
 #include "env-inl.h"
 #include "node_internals.h"
diff --git a/src/node_report.cc b/src/node_report.cc
index d4e332f607ab..674f1714fe5f 100644
--- a/src/node_report.cc
+++ b/src/node_report.cc
@@ -27,12 +27,12 @@
 #endif
 #include <cxxabi.h>
 #include <dlfcn.h>
-#include <inttypes.h>
+#include <cinttypes>
 #endif
 
 #include <fcntl.h>
-#include <string.h>
-#include <time.h>
+#include <cstring>
+#include <ctime>
 #include <iomanip>
 
 #ifndef _MSC_VER
diff --git a/src/node_report.h b/src/node_report.h
index c83c52eb395a..2aa55151d87d 100644
--- a/src/node_report.h
+++ b/src/node_report.h
@@ -14,8 +14,8 @@
 #include <vector>
 #include "v8.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
diff --git a/src/node_stat_watcher.cc b/src/node_stat_watcher.cc
index 9564a0a2b32a..f673c4085e54 100644
--- a/src/node_stat_watcher.cc
+++ b/src/node_stat_watcher.cc
@@ -25,8 +25,8 @@
 #include "node_file.h"
 #include "util.h"
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 
 namespace node {
 
diff --git a/src/node_url.cc b/src/node_url.cc
index d7402c4d0434..2070b713ac3d 100644
--- a/src/node_url.cc
+++ b/src/node_url.cc
@@ -6,7 +6,7 @@
 
 #include <string>
 #include <vector>
-#include <stdio.h>
+#include <cstdio>
 #include <cmath>
 
 namespace node {
diff --git a/src/node_zlib.cc b/src/node_zlib.cc
index 639d7f87c5ab..badac08449ee 100644
--- a/src/node_zlib.cc
+++ b/src/node_zlib.cc
@@ -32,9 +32,9 @@
 #include "brotli/decode.h"
 #include "zlib.h"
 
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
 #include <sys/types.h>
 #include <atomic>
 
diff --git a/src/process_wrap.cc b/src/process_wrap.cc
index 37afaf8ff961..583851cdbb53 100644
--- a/src/process_wrap.cc
+++ b/src/process_wrap.cc
@@ -24,8 +24,8 @@
 #include "stream_wrap.h"
 #include "util-inl.h"
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 
 namespace node {
 
diff --git a/src/spawn_sync.cc b/src/spawn_sync.cc
index 749e628fbdfe..6e5c3360cd49 100644
--- a/src/spawn_sync.cc
+++ b/src/spawn_sync.cc
@@ -25,7 +25,7 @@
 #include "node_internals.h"
 #include "string_bytes.h"
 
-#include <string.h>
+#include <cstring>
 
 
 namespace node {
diff --git a/src/stream_base.cc b/src/stream_base.cc
index a55cb60cfc53..14ab9d18b109 100644
--- a/src/stream_base.cc
+++ b/src/stream_base.cc
@@ -10,7 +10,7 @@
 #include "util-inl.h"
 #include "v8.h"
 
-#include <limits.h>  // INT_MAX
+#include <climits>  // INT_MAX
 
 namespace node {
 
diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc
index d126f90eef82..3247a604b436 100644
--- a/src/stream_wrap.cc
+++ b/src/stream_wrap.cc
@@ -31,8 +31,8 @@
 #include "udp_wrap.h"
 #include "util-inl.h"
 
-#include <string.h>  // memcpy()
-#include <limits.h>  // INT_MAX
+#include <cstring>  // memcpy()
+#include <climits>  // INT_MAX
 
 
 namespace node {
diff --git a/src/string_bytes.cc b/src/string_bytes.cc
index 53bb95d80dab..041868cb1e74 100644
--- a/src/string_bytes.cc
+++ b/src/string_bytes.cc
@@ -27,8 +27,8 @@
 #include "node_errors.h"
 #include "util.h"
 
-#include <limits.h>
-#include <string.h>  // memcpy
+#include <climits>
+#include <cstring>  // memcpy
 
 #include <algorithm>
 #include <vector>
diff --git a/src/string_search.h b/src/string_search.h
index 95c746ea89e0..3968c8c86903 100644
--- a/src/string_search.h
+++ b/src/string_search.h
@@ -9,7 +9,7 @@
 
 #include "util.h"
 
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 
 namespace node {
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
index cb6e63400670..43c6ea5958fa 100644
--- a/src/tcp_wrap.cc
+++ b/src/tcp_wrap.cc
@@ -31,7 +31,7 @@
 #include "stream_wrap.h"
 #include "util-inl.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 
 namespace node {
diff --git a/src/timers.cc b/src/timers.cc
index f80e9e6be4d2..b11df62be21e 100644
--- a/src/timers.cc
+++ b/src/timers.cc
@@ -2,7 +2,7 @@
 #include "util.h"
 #include "v8.h"
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace node {
 namespace {
diff --git a/src/tracing/node_trace_writer.cc b/src/tracing/node_trace_writer.cc
index b93688cc958f..3b07504acc44 100644
--- a/src/tracing/node_trace_writer.cc
+++ b/src/tracing/node_trace_writer.cc
@@ -1,6 +1,6 @@
 #include "tracing/node_trace_writer.h"
 
-#include <string.h>
+#include <cstring>
 #include <fcntl.h>
 
 #include "util-inl.h"
diff --git a/src/tracing/traced_value.cc b/src/tracing/traced_value.cc
index b2a1badad124..3eb21a11c939 100644
--- a/src/tracing/traced_value.cc
+++ b/src/tracing/traced_value.cc
@@ -6,7 +6,7 @@
 
 #include <cmath>
 #include <sstream>
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 
 #if defined(NODE_HAVE_I18N_SUPPORT)
diff --git a/src/tracing/traced_value.h b/src/tracing/traced_value.h
index 7507978408f6..955d62dfe6c7 100644
--- a/src/tracing/traced_value.h
+++ b/src/tracing/traced_value.h
@@ -9,7 +9,7 @@
 #include "util.h"
 #include "v8.h"
 
-#include <stddef.h>
+#include <cstddef>
 #include <memory>
 #include <string>
 
diff --git a/src/util.cc b/src/util.cc
index 81070c239d8a..3cdc222a9607 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -19,7 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include <stdio.h>
+#include <cstdio>
 #include <sstream>
 #include "node_buffer.h"
 #include "node_errors.h"
diff --git a/src/util.h b/src/util.h
index b199476aa246..c6daaf981ea1 100644
--- a/src/util.h
+++ b/src/util.h
@@ -27,12 +27,12 @@
 #include "node_persistent.h"
 #include "v8.h"
 
-#include <assert.h>
-#include <signal.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cassert>
+#include <csignal>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <functional>  // std::function
 #include <limits>
diff --git a/test/cctest/node_test_fixture.h b/test/cctest/node_test_fixture.h
index f4c97b050278..e06bcd84893a 100644
--- a/test/cctest/node_test_fixture.h
+++ b/test/cctest/node_test_fixture.h
@@ -1,7 +1,7 @@
 #ifndef TEST_CCTEST_NODE_TEST_FIXTURE_H_
 #define TEST_CCTEST_NODE_TEST_FIXTURE_H_
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "gtest/gtest.h"
 #include "node.h"
 #include "node_platform.h"
diff --git a/test/cctest/test_base64.cc b/test/cctest/test_base64.cc
index fbdb969b4cbe..5e39a1052bc0 100644
--- a/test/cctest/test_base64.cc
+++ b/test/cctest/test_base64.cc
@@ -1,7 +1,7 @@
 #include "base64.h"
 
-#include <stddef.h>
-#include <string.h>
+#include <cstddef>
+#include <cstring>
 
 #include "gtest/gtest.h"
 
diff --git a/test/cctest/test_traced_value.cc b/test/cctest/test_traced_value.cc
index 5329c78446ca..fa938c881ef0 100644
--- a/test/cctest/test_traced_value.cc
+++ b/test/cctest/test_traced_value.cc
@@ -1,8 +1,8 @@
 #include "tracing/traced_value.h"
 
-#include <math.h>
-#include <stddef.h>
-#include <string.h>
+#include <cmath>
+#include <cstddef>
+#include <cstring>
 
 #include "gtest/gtest.h"
 
diff --git a/tools/icu/iculslocs.cc b/tools/icu/iculslocs.cc
index f086724a8487..8b1fa527c2c9 100644
--- a/tools/icu/iculslocs.cc
+++ b/tools/icu/iculslocs.cc
@@ -50,12 +50,12 @@ Japanese, it doesn't *claim* to have Japanese.
 
 */
 
-#include "string.h"
+#include <cstring>
 #include "charstr.h"  // ICU internal header
 #include <unicode/ures.h>
 #include <unicode/udata.h>
 #include <unicode/putil.h>
-#include <stdio.h>
+#include <cstdio>
 
 const char* PROG = "iculslocs";
 const char* NAME = U_ICUDATA_NAME;  // assume ICU data