diff --git a/src/client/linux/handler/minidump_descriptor.h b/src/client/linux/handler/minidump_descriptor.h
index d822c9d92..1fbcaccfd 100644
--- a/src/client/linux/handler/minidump_descriptor.h
+++ b/src/client/linux/handler/minidump_descriptor.h
@@ -30,9 +30,9 @@
 #define CLIENT_LINUX_HANDLER_MINIDUMP_DESCRIPTOR_H_
 
 #include <assert.h>
+#include <stdint.h>
 #include <sys/types.h>
 
-#include <cstdint>
 #include <string>
 
 #include "client/linux/handler/microdump_extra_info.h"
diff --git a/src/client/linux/minidump_writer/pe_structs.h b/src/client/linux/minidump_writer/pe_structs.h
index 122cc2956..017ac0619 100644
--- a/src/client/linux/minidump_writer/pe_structs.h
+++ b/src/client/linux/minidump_writer/pe_structs.h
@@ -29,7 +29,7 @@
 #ifndef CLIENT_LINUX_MINIDUMP_WRITER_PE_STRUCTS_H_
 #define CLIENT_LINUX_MINIDUMP_WRITER_PE_STRUCTS_H_
 
-#include <cstdint>
+#include <stdint.h>
 
 namespace google_breakpad {
 
@@ -222,4 +222,4 @@ typedef struct _RSDS_DEBUG_FORMAT {
 
 }  // namespace google_breakpad
 
-#endif  // CLIENT_LINUX_MINIDUMP_WRITER_PE_STRUCTS_H_
\ No newline at end of file
+#endif  // CLIENT_LINUX_MINIDUMP_WRITER_PE_STRUCTS_H_
diff --git a/src/client/mac/crash_generation/Inspector.mm b/src/client/mac/crash_generation/Inspector.mm
index 8d4e3e98b..4c0a78062 100644
--- a/src/client/mac/crash_generation/Inspector.mm
+++ b/src/client/mac/crash_generation/Inspector.mm
@@ -28,26 +28,23 @@
 //
 // Utility that can inspect another process and write a crash dump
 
-#include <cstdio>
-#include <iostream>
+#import "client/mac/crash_generation/Inspector.h"
+
+#import <Foundation/Foundation.h>
 #include <servers/bootstrap.h>
 #include <stdio.h>
 #include <string.h>
-#include <string>
 
-#import "client/mac/crash_generation/Inspector.h"
+#include <iostream>
+#include <string>
 
+#import "GTMDefines.h"
 #import "client/mac/Framework/Breakpad.h"
 #import "client/mac/handler/minidump_generator.h"
-
 #import "common/mac/MachIPC.h"
 #include "common/mac/bootstrap_compat.h"
 #include "common/mac/launch_reporter.h"
 
-#import "GTMDefines.h"
-
-#import <Foundation/Foundation.h>
-
 namespace google_breakpad {
 
 //=============================================================================
@@ -358,4 +355,3 @@
 }
 
 } // namespace google_breakpad
-
diff --git a/src/client/mac/handler/minidump_generator.cc b/src/client/mac/handler/minidump_generator.cc
index fd863aea9..f30742160 100644
--- a/src/client/mac/handler/minidump_generator.cc
+++ b/src/client/mac/handler/minidump_generator.cc
@@ -30,20 +30,19 @@
 #include <config.h>  // Must come first
 #endif
 
-#include <algorithm>
-#include <cstdio>
+#include "client/mac/handler/minidump_generator.h"
 
+#include <CoreFoundation/CoreFoundation.h>
+#include <mach-o/dyld.h>
+#include <mach-o/loader.h>
 #include <mach/host_info.h>
 #include <mach/machine.h>
 #include <mach/vm_statistics.h>
-#include <mach-o/dyld.h>
-#include <mach-o/loader.h>
-#include <sys/sysctl.h>
+#include <stdio.h>
 #include <sys/resource.h>
+#include <sys/sysctl.h>
 
-#include <CoreFoundation/CoreFoundation.h>
-
-#include "client/mac/handler/minidump_generator.h"
+#include <algorithm>
 
 #if defined(HAS_ARM_SUPPORT) || defined(HAS_ARM64_SUPPORT)
 #include <mach/arm/thread_status.h>
@@ -1071,9 +1070,8 @@ bool MinidumpGenerator::WriteMemoryListStream(
         ip_memory_d.start_of_memory_range =
           std::max(uintptr_t(addr),
                    uintptr_t(ip - (kIPMemorySize / 2)));
-        uintptr_t end_of_range = 
-          std::min(uintptr_t(ip + (kIPMemorySize / 2)),
-                   uintptr_t(addr + size));
+        uintptr_t end_of_range = std::min(uintptr_t(ip + (kIPMemorySize / 2)),
+                                          uintptr_t(addr + size));
         uintptr_t range_diff = end_of_range -
             static_cast<uintptr_t>(ip_memory_d.start_of_memory_range);
         ip_memory_d.memory.data_size = static_cast<uint32_t>(range_diff);
diff --git a/src/client/solaris/handler/exception_handler.cc b/src/client/solaris/handler/exception_handler.cc
index 0e5f44976..e3688581a 100644
--- a/src/client/solaris/handler/exception_handler.cc
+++ b/src/client/solaris/handler/exception_handler.cc
@@ -32,16 +32,16 @@
 #include <config.h>  // Must come first
 #endif
 
+#include "client/solaris/handler/exception_handler.h"
+
+#include <assert.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <time.h>
 #include <unistd.h>
 
-#include <cassert>
-#include <cstdlib>
-#include <ctime>
-
-#include "client/solaris/handler/exception_handler.h"
 #include "common/solaris/guid_creator.h"
 #include "common/solaris/message_output.h"
 #include "google_breakpad/common/minidump_format.h"
diff --git a/src/client/solaris/handler/exception_handler_test.cc b/src/client/solaris/handler/exception_handler_test.cc
index 3d656820d..56ef94dd0 100644
--- a/src/client/solaris/handler/exception_handler_test.cc
+++ b/src/client/solaris/handler/exception_handler_test.cc
@@ -32,15 +32,15 @@
 #include <config.h>  // Must come first
 #endif
 
+#include "client/solaris/handler/exception_handler.h"
+
+#include <assert.h>
 #include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-
-#include "client/solaris/handler/exception_handler.h"
 #include "client/solaris/handler/solaris_lwp.h"
 
 using namespace google_breakpad;
diff --git a/src/client/solaris/handler/minidump_generator.cc b/src/client/solaris/handler/minidump_generator.cc
index 5d24d0ae8..f9e1adfc6 100644
--- a/src/client/solaris/handler/minidump_generator.cc
+++ b/src/client/solaris/handler/minidump_generator.cc
@@ -32,18 +32,18 @@
 #include <config.h>  // Must come first
 #endif
 
+#include "client/solaris/handler/minidump_generator.h"
+
 #include <fcntl.h>
+#include <stdlib.h>
 #include <sys/frame.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/wait.h>
+#include <time.h>
 #include <unistd.h>
 
-#include <cstdlib>
-#include <ctime>
-
-#include "client/solaris/handler/minidump_generator.h"
 #include "client/minidump_file_writer-inl.h"
 #include "common/solaris/file_id.h"
 
@@ -337,7 +337,7 @@ bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
   build = strchr(uts.version, '_');
   ++build;
   sys_info->build_number = atoi(build);
-  
+
   return true;
 }
 
@@ -596,8 +596,8 @@ bool WriteExceptionStream(MinidumpFileWriter* minidump_writer,
 
 #if TARGET_CPU_SPARC
   if (writer_args->sig_ctx != NULL) {
-    exception.get()->exception_record.exception_address = 
-      writer_args->sig_ctx->uc_mcontext.gregs[REG_PC];
+    exception.get()->exception_record.exception_address =
+        writer_args->sig_ctx->uc_mcontext.gregs[REG_PC];
   } else {
     return true;
   }
@@ -700,14 +700,14 @@ void* Write(void* argument) {
   if (writer_args->sighandler_ebp != 0 &&
       writer_args->lwp_lister->FindSigContext(writer_args->sighandler_ebp,
                                               &writer_args->sig_ctx)) {
-    writer_args->crashed_stack_bottom = 
-      writer_args->lwp_lister->GetLwpStackBottom(
+    writer_args->crashed_stack_bottom =
+        writer_args->lwp_lister->GetLwpStackBottom(
 #if TARGET_CPU_SPARC
-          writer_args->sig_ctx->uc_mcontext.gregs[REG_O6]
+            writer_args->sig_ctx->uc_mcontext.gregs[REG_O6]
 #elif TARGET_CPU_X86
-          writer_args->sig_ctx->uc_mcontext.gregs[UESP]
+            writer_args->sig_ctx->uc_mcontext.gregs[UESP]
 #endif
-      );
+        );
 
     int crashed_lwpid = FindCrashingLwp(writer_args->crashed_stack_bottom,
                                         writer_args->requester_pid,
diff --git a/src/client/solaris/handler/solaris_lwp.cc b/src/client/solaris/handler/solaris_lwp.cc
index 02f1c37e8..fec9e3f3e 100644
--- a/src/client/solaris/handler/solaris_lwp.cc
+++ b/src/client/solaris/handler/solaris_lwp.cc
@@ -32,11 +32,16 @@
 #include <config.h>  // Must come first
 #endif
 
+#include "client/solaris/handler/solaris_lwp.h"
+
+#include <assert.h>
 #include <dirent.h>
 #include <elf.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <sys/frame.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -44,12 +49,8 @@
 #include <unistd.h>
 
 #include <algorithm>
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
 #include <functional>
 
-#include "client/solaris/handler/solaris_lwp.h"
 #include "common/solaris/message_output.h"
 
 using namespace google_breakpad;
@@ -320,7 +321,7 @@ int SolarisLwp::ListModules(
     return -1;
 
   /*
-   * Determine number of mappings, this value must be 
+   * Determine number of mappings, this value must be
    * larger than the actual module count
    */
   size = status.st_size;
@@ -337,7 +338,7 @@ int SolarisLwp::ListModules(
   prmap_t* _maps;
   int _num;
   int module_count = 0;
-  
+
   /*
    * Scan each mapping - note it is assummed that the mappings are
    * presented in order.  We fill holes between mappings.  On intel
diff --git a/src/client/windows/crash_generation/crash_generation_client.cc b/src/client/windows/crash_generation/crash_generation_client.cc
index c3d6a2bc8..653fafdc2 100644
--- a/src/client/windows/crash_generation/crash_generation_client.cc
+++ b/src/client/windows/crash_generation/crash_generation_client.cc
@@ -31,8 +31,11 @@
 #endif
 
 #include "client/windows/crash_generation/crash_generation_client.h"
-#include <cassert>
+
+#include <assert.h>
+
 #include <utility>
+
 #include "client/windows/common/ipc_protocol.h"
 
 namespace google_breakpad {
diff --git a/src/client/windows/crash_generation/crash_generation_server.cc b/src/client/windows/crash_generation/crash_generation_server.cc
index 61b0cbc0b..1e7a6ca70 100644
--- a/src/client/windows/crash_generation/crash_generation_server.cc
+++ b/src/client/windows/crash_generation/crash_generation_server.cc
@@ -31,12 +31,15 @@
 #endif
 
 #include "client/windows/crash_generation/crash_generation_server.h"
+
 #include <windows.h>
-#include <cassert>
+
+#include <assert.h>
+
 #include <list>
+
 #include "client/windows/common/auto_critical_section.h"
 #include "common/scoped_ptr.h"
-
 #include "client/windows/crash_generation/client_info.h"
 
 namespace google_breakpad {
diff --git a/src/client/windows/handler/exception_handler.cc b/src/client/windows/handler/exception_handler.cc
index 64b297999..bc56bd80b 100644
--- a/src/client/windows/handler/exception_handler.cc
+++ b/src/client/windows/handler/exception_handler.cc
@@ -30,17 +30,17 @@
 #include <config.h>  // Must come first
 #endif
 
+#include "client/windows/handler/exception_handler.h"
+
+#include <assert.h>
 #include <objbase.h>
+#include <stdio.h>
 
 #include <algorithm>
-#include <cassert>
-#include <cstdio>
-
-#include "common/windows/string_utils-inl.h"
 
 #include "client/windows/common/ipc_protocol.h"
-#include "client/windows/handler/exception_handler.h"
 #include "common/windows/guid_string.h"
+#include "common/windows/string_utils-inl.h"
 
 namespace google_breakpad {
 
diff --git a/src/common/solaris/file_id.cc b/src/common/solaris/file_id.cc
index 5a9982bb4..73b6acc22 100644
--- a/src/common/solaris/file_id.cc
+++ b/src/common/solaris/file_id.cc
@@ -36,20 +36,19 @@
 #include <config.h>  // Must come first
 #endif
 
+#include "common/solaris/file_id.h"
+
+#include <assert.h>
 #include <elf.h>
 #include <fcntl.h>
 #include <gelf.h>
-#include <sys/mman.h>
-#include <sys/ksyms.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/ksyms.h>
+#include <sys/mman.h>
 #include <unistd.h>
 
-#include <cassert>
-#include <cstdio>
-
 #include "common/md5.h"
-#include "common/solaris/file_id.h"
 #include "common/solaris/message_output.h"
 #include "google_breakpad/common/minidump_format.h"
 
diff --git a/src/common/solaris/guid_creator.cc b/src/common/solaris/guid_creator.cc
index 998d24991..2cfe1b7b3 100644
--- a/src/common/solaris/guid_creator.cc
+++ b/src/common/solaris/guid_creator.cc
@@ -32,15 +32,14 @@
 #include <config.h>  // Must come first
 #endif
 
-#include <cassert>
-#include <ctime>
+#include "common/solaris/guid_creator.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 #include <unistd.h>
 
-#include "common/solaris/guid_creator.h"
-
 //
 // GUIDGenerator
 //
diff --git a/src/common/string_view.h b/src/common/string_view.h
index a8e15922d..8b9b19e6e 100644
--- a/src/common/string_view.h
+++ b/src/common/string_view.h
@@ -29,9 +29,13 @@
 #ifndef COMMON_STRING_VIEW_H__
 #define COMMON_STRING_VIEW_H__
 
-#include <cassert>
-#include <cstring>
+#include <assert.h>
+#include <stddef.h>
+#include <string.h>
+
+#include <cstddef>
 #include <ostream>
+
 #include "common/using_std_string.h"
 
 namespace google_breakpad {
diff --git a/src/common/windows/omap.cc b/src/common/windows/omap.cc
index 1ffcec765..e707e1268 100644
--- a/src/common/windows/omap.cc
+++ b/src/common/windows/omap.cc
@@ -106,10 +106,10 @@
 
 #include "common/windows/omap.h"
 
+#include <assert.h>
 #include <atlbase.h>
 
 #include <algorithm>
-#include <cassert>
 #include <set>
 
 #include "common/windows/dia_util.h"
diff --git a/src/common/windows/string_utils.cc b/src/common/windows/string_utils.cc
index 956ee9906..46d530ecf 100644
--- a/src/common/windows/string_utils.cc
+++ b/src/common/windows/string_utils.cc
@@ -30,13 +30,13 @@
 #include <config.h>  // Must come first
 #endif
 
+#include "common/windows/string_utils-inl.h"
+
+#include <assert.h>
 #include <stdlib.h>
 
-#include <cassert>
 #include <vector>
 
-#include "common/windows/string_utils-inl.h"
-
 namespace google_breakpad {
 
 // static
diff --git a/src/common/windows/sym_upload_v2_protocol.cc b/src/common/windows/sym_upload_v2_protocol.cc
index 450f3626b..ee3b1919e 100644
--- a/src/common/windows/sym_upload_v2_protocol.cc
+++ b/src/common/windows/sym_upload_v2_protocol.cc
@@ -32,7 +32,7 @@
 
 #include "common/windows/sym_upload_v2_protocol.h"
 
-#include <cstdio>
+#include <stdio.h>
 
 #include "common/windows/http_upload.h"
 #include "common/windows/symbol_collector_client.h"
diff --git a/src/google_breakpad/processor/call_stack.h b/src/google_breakpad/processor/call_stack.h
index 9bf062f83..a18f8f74b 100644
--- a/src/google_breakpad/processor/call_stack.h
+++ b/src/google_breakpad/processor/call_stack.h
@@ -44,7 +44,8 @@
 #ifndef GOOGLE_BREAKPAD_PROCESSOR_CALL_STACK_H__
 #define GOOGLE_BREAKPAD_PROCESSOR_CALL_STACK_H__
 
-#include <cstdint>
+#include <stdint.h>
+
 #include <vector>
 
 namespace google_breakpad {
diff --git a/src/processor/exploitability.cc b/src/processor/exploitability.cc
index 89064c9b1..e8b817449 100644
--- a/src/processor/exploitability.cc
+++ b/src/processor/exploitability.cc
@@ -37,7 +37,7 @@
 #include <config.h>  // Must come first
 #endif
 
-#include <cassert>
+#include <assert.h>
 
 #include "common/scoped_ptr.h"
 #include "google_breakpad/processor/exploitability.h"
diff --git a/src/processor/fast_source_line_resolver.cc b/src/processor/fast_source_line_resolver.cc
index 1c329772d..044eea356 100644
--- a/src/processor/fast_source_line_resolver.cc
+++ b/src/processor/fast_source_line_resolver.cc
@@ -41,16 +41,17 @@
 #endif
 
 #include "google_breakpad/processor/fast_source_line_resolver.h"
-#include "processor/fast_source_line_resolver_types.h"
 
-#include <cassert>
-#include <cstdint>
+#include <assert.h>
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <utility>
 
 #include "common/scoped_ptr.h"
 #include "common/using_std_string.h"
+#include "processor/fast_source_line_resolver_types.h"
 #include "processor/logging.h"
 #include "processor/module_factory.h"
 #include "processor/simple_serializer-inl.h"
diff --git a/src/processor/fast_source_line_resolver_types.h b/src/processor/fast_source_line_resolver_types.h
index 14913518b..ae58d7525 100644
--- a/src/processor/fast_source_line_resolver_types.h
+++ b/src/processor/fast_source_line_resolver_types.h
@@ -36,7 +36,8 @@
 #ifndef PROCESSOR_FAST_SOURCE_LINE_RESOLVER_TYPES_H__
 #define PROCESSOR_FAST_SOURCE_LINE_RESOLVER_TYPES_H__
 
-#include <cstdint>
+#include <stdint.h>
+
 #include <map>
 #include <string>
 
diff --git a/src/processor/map_serializers_unittest.cc b/src/processor/map_serializers_unittest.cc
index 855c4dae1..c5228d647 100644
--- a/src/processor/map_serializers_unittest.cc
+++ b/src/processor/map_serializers_unittest.cc
@@ -31,12 +31,15 @@
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
-#include <cstdint>
 #ifdef HAVE_CONFIG_H
 #include <config.h>  // Must come first
 #endif
 
-#include <climits>
+#include "map_serializers-inl.h"
+
+#include <limits.h>
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <utility>
@@ -44,8 +47,6 @@
 #include <sstream>
 
 #include "breakpad_googletest_includes.h"
-#include "map_serializers-inl.h"
-
 #include "processor/address_map-inl.h"
 #include "processor/range_map-inl.h"
 #include "processor/contained_range_map-inl.h"
diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc
index 22dce7626..d33522631 100644
--- a/src/processor/minidump.cc
+++ b/src/processor/minidump.cc
@@ -44,10 +44,10 @@
 #include "google_breakpad/processor/minidump.h"
 
 #include <assert.h>
-#include <cstdint>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 #include <time.h>
 
@@ -62,8 +62,6 @@
 #include <limits>
 #include <utility>
 
-#include "processor/range_map-inl.h"
-
 #include "common/macros.h"
 #include "common/scoped_ptr.h"
 #include "common/stdio_wrapper.h"
@@ -72,6 +70,7 @@
 #include "processor/basic_code_modules.h"
 #include "processor/convert_old_arm64_context.h"
 #include "processor/logging.h"
+#include "processor/range_map-inl.h"
 
 namespace google_breakpad {
 
diff --git a/src/processor/minidump_processor.cc b/src/processor/minidump_processor.cc
index 44e69c890..b2166e652 100644
--- a/src/processor/minidump_processor.cc
+++ b/src/processor/minidump_processor.cc
@@ -33,10 +33,10 @@
 #include "google_breakpad/processor/minidump_processor.h"
 
 #include <assert.h>
+#include <stdint.h>
+#include <stdio.h>
 
 #include <algorithm>
-#include <cstdint>
-#include <cstdio>
 #include <limits>
 #include <map>
 #include <string>
diff --git a/src/processor/module_serializer.cc b/src/processor/module_serializer.cc
index 33130353a..5a744a56c 100644
--- a/src/processor/module_serializer.cc
+++ b/src/processor/module_serializer.cc
@@ -38,8 +38,9 @@
 
 #include "processor/module_serializer.h"
 
-#include <cstdint>
-#include <cstring>
+#include <stdint.h>
+#include <string.h>
+
 #include <map>
 #include <string>
 
diff --git a/src/processor/module_serializer.h b/src/processor/module_serializer.h
index 675d78488..eefe2857d 100644
--- a/src/processor/module_serializer.h
+++ b/src/processor/module_serializer.h
@@ -36,7 +36,8 @@
 #ifndef PROCESSOR_MODULE_SERIALIZER_H__
 #define PROCESSOR_MODULE_SERIALIZER_H__
 
-#include <cstdint>
+#include <stdint.h>
+
 #include <map>
 #include <string>
 
diff --git a/src/processor/simple_serializer-inl.h b/src/processor/simple_serializer-inl.h
index bc2c8def2..30d0533bd 100644
--- a/src/processor/simple_serializer-inl.h
+++ b/src/processor/simple_serializer-inl.h
@@ -39,7 +39,8 @@
 
 #include "processor/simple_serializer.h"
 
-#include <cstdint>
+#include <stdint.h>
+
 #include <string>
 
 #include "google_breakpad/processor/basic_source_line_resolver.h"
diff --git a/src/processor/stackwalker_arm64.cc b/src/processor/stackwalker_arm64.cc
index 6c3168ecc..0fdc11018 100644
--- a/src/processor/stackwalker_arm64.cc
+++ b/src/processor/stackwalker_arm64.cc
@@ -36,7 +36,10 @@
 #include <config.h>  // Must come first
 #endif
 
-#include <cstdint>
+#include "processor/stackwalker_arm64.h"
+
+#include <stdint.h>
+
 #include <vector>
 
 #include "common/scoped_ptr.h"
@@ -46,7 +49,6 @@
 #include "google_breakpad/processor/stack_frame_cpu.h"
 #include "processor/cfi_frame_info.h"
 #include "processor/logging.h"
-#include "processor/stackwalker_arm64.h"
 
 namespace google_breakpad {
 
diff --git a/src/processor/stackwalker_arm64.h b/src/processor/stackwalker_arm64.h
index 193ab302a..933b557ff 100644
--- a/src/processor/stackwalker_arm64.h
+++ b/src/processor/stackwalker_arm64.h
@@ -41,6 +41,7 @@
 
 #include "google_breakpad/common/breakpad_types.h"
 #include "google_breakpad/common/minidump_format.h"
+#include "google_breakpad/processor/stack_frame_cpu.h"
 #include "google_breakpad/processor/stackwalker.h"
 
 namespace google_breakpad {
diff --git a/src/processor/static_address_map_unittest.cc b/src/processor/static_address_map_unittest.cc
index 2e8461675..d99833ce8 100644
--- a/src/processor/static_address_map_unittest.cc
+++ b/src/processor/static_address_map_unittest.cc
@@ -34,9 +34,12 @@
 #include <config.h>  // Must come first
 #endif
 
-#include <climits>
-#include <cstdlib>
-#include <ctime>
+#include "processor/static_address_map-inl.h"
+
+#include <limits.h>
+#include <stdlib.h>
+#include <time.h>
+
 #include <string>
 #include <iostream>
 #include <sstream>
@@ -44,7 +47,6 @@
 #include "breakpad_googletest_includes.h"
 #include "common/using_std_string.h"
 #include "processor/address_map-inl.h"
-#include "processor/static_address_map-inl.h"
 #include "processor/simple_serializer-inl.h"
 #include "map_serializers-inl.h"
 
diff --git a/src/processor/static_contained_range_map_unittest.cc b/src/processor/static_contained_range_map_unittest.cc
index c6d78400d..b9ed72489 100644
--- a/src/processor/static_contained_range_map_unittest.cc
+++ b/src/processor/static_contained_range_map_unittest.cc
@@ -31,15 +31,17 @@
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
-#include <cstdint>
 #ifdef HAVE_CONFIG_H
 #include <config.h>  // Must come first
 #endif
 
+#include "processor/static_contained_range_map-inl.h"
+
+#include <stdint.h>
+
 #include "breakpad_googletest_includes.h"
 #include "common/scoped_ptr.h"
 #include "processor/contained_range_map-inl.h"
-#include "processor/static_contained_range_map-inl.h"
 #include "processor/simple_serializer-inl.h"
 #include "processor/map_serializers-inl.h"
 #include "processor/logging.h"
diff --git a/src/processor/static_map_unittest.cc b/src/processor/static_map_unittest.cc
index 1fbb9a498..9308b04bd 100644
--- a/src/processor/static_map_unittest.cc
+++ b/src/processor/static_map_unittest.cc
@@ -30,17 +30,18 @@
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
-#include <cstdint>
 #ifdef HAVE_CONFIG_H
 #include <config.h>  // Must come first
 #endif
 
-#include <climits>
+#include "processor/static_map-inl.h"
+
+#include <limits.h>
+#include <stdint.h>
+
 #include <map>
 
 #include "breakpad_googletest_includes.h"
-#include "processor/static_map-inl.h"
-
 
 typedef int ValueType;
 typedef int KeyType;
diff --git a/src/tools/linux/dump_syms/dump_syms.cc b/src/tools/linux/dump_syms/dump_syms.cc
index 007b46094..f5f89f410 100644
--- a/src/tools/linux/dump_syms/dump_syms.cc
+++ b/src/tools/linux/dump_syms/dump_syms.cc
@@ -32,9 +32,9 @@
 
 #include <paths.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 
-#include <cstring>
 #include <iostream>
 #include <string>
 #include <vector>
diff --git a/src/tools/solaris/dump_syms/dump_syms.cc b/src/tools/solaris/dump_syms/dump_syms.cc
index ead160011..8f5924ae2 100644
--- a/src/tools/solaris/dump_syms/dump_syms.cc
+++ b/src/tools/solaris/dump_syms/dump_syms.cc
@@ -32,11 +32,12 @@
 #include <config.h>  // Must come first
 #endif
 
-#include <string>
-#include <cstdio>
-
 #include "common/solaris/dump_symbols.h"
 
+#include <stdio.h>
+
+#include <string>
+
 using namespace google_breakpad;
 
 int main(int argc, char** argv) {
diff --git a/src/tools/windows/converter/ms_symbol_server_converter.cc b/src/tools/windows/converter/ms_symbol_server_converter.cc
index f7d9d9431..d1a6b40d5 100644
--- a/src/tools/windows/converter/ms_symbol_server_converter.cc
+++ b/src/tools/windows/converter/ms_symbol_server_converter.cc
@@ -37,14 +37,15 @@
 #include <config.h>  // Must come first
 #endif
 
+#include "tools/windows/converter/ms_symbol_server_converter.h"
+
 #include <windows.h>
+
+#include <assert.h>
 #include <dbghelp.h>
 #include <pathcch.h>
+#include <stdio.h>
 
-#include <cassert>
-#include <cstdio>
-
-#include "tools/windows/converter/ms_symbol_server_converter.h"
 #include "common/windows/pdb_source_line_writer.h"
 #include "common/windows/pe_source_line_writer.h"
 #include "common/windows/string_utils-inl.h"
diff --git a/src/tools/windows/converter_exe/converter.cc b/src/tools/windows/converter_exe/converter.cc
index 92c41774a..6d7664774 100644
--- a/src/tools/windows/converter_exe/converter.cc
+++ b/src/tools/windows/converter_exe/converter.cc
@@ -35,9 +35,10 @@
 #include <config.h>  // Must come first
 #endif
 
-#include <cassert>
-#include <cstdio>
-#include <ctime>
+#include <assert.h>
+#include <stdio.h>
+#include <time.h>
+
 #include <map>
 #include <regex>
 #include <string>
diff --git a/src/tools/windows/symupload/symupload.cc b/src/tools/windows/symupload/symupload.cc
index 20f48a277..52a915c30 100644
--- a/src/tools/windows/symupload/symupload.cc
+++ b/src/tools/windows/symupload/symupload.cc
@@ -47,18 +47,18 @@
 #endif
 
 #include <windows.h>
+
 #include <dbghelp.h>
+#include <stdio.h>
 #include <wininet.h>
 
-#include <cstdio>
 #include <map>
 #include <string>
 #include <vector>
 
-#include "common/windows/string_utils-inl.h"
-
 #include "common/windows/http_upload.h"
 #include "common/windows/pdb_source_line_writer.h"
+#include "common/windows/string_utils-inl.h"
 #include "common/windows/sym_upload_v2_protocol.h"
 #include "common/windows/symbol_collector_client.h"