Breakpad: Avoid using the C++ <cfoo> headers.

This patch avoids unnecessary use of the <cfoo> headers in files that don't
actually use the identifiers they declare in the std:: namespace.

It also changes some files to better conform with the "Names and Order of
Includes" rules in the Google C++ Style Guide.

A=jimb R=mark

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@619 4c0a9323-5329-0410-9bdc-e9ce6186880e

46 files changed, 129 insertions, 100 deletions

diff --git a/src/common/dwarf/bytereader-inl.h b/src/common/dwarf/bytereader-inl.h
index 57fce448..3c167089 100644
--- a/src/common/dwarf/bytereader-inl.h
+++ b/src/common/dwarf/bytereader-inl.h
@@ -29,10 +29,10 @@
 #ifndef UTIL_DEBUGINFO_BYTEREADER_INL_H__
 #define UTIL_DEBUGINFO_BYTEREADER_INL_H__
 
-#include <cassert>
-
 #include "common/dwarf/bytereader.h"
 
+#include <assert.h>
+
 namespace dwarf2reader {
 
 inline uint8 ByteReader::ReadOneByte(const char* buffer) const {
diff --git a/src/common/dwarf/cfi_assembler.cc b/src/common/dwarf/cfi_assembler.cc
index 50e92e5a..a6a5aca6 100644
--- a/src/common/dwarf/cfi_assembler.cc
+++ b/src/common/dwarf/cfi_assembler.cc
@@ -32,11 +32,11 @@
 // cfi_assembler.cc: Implementation of google_breakpad::CFISection class.
 // See cfi_assembler.h for details.
 
-#include <cassert>
-#include <stdlib.h>
-
 #include "common/dwarf/cfi_assembler.h"
 
+#include <assert.h>
+#include <stdlib.h>
+
 namespace google_breakpad {
 
 using dwarf2reader::DwarfPointerEncoding;
diff --git a/src/common/dwarf/dwarf2diehandler.cc b/src/common/dwarf/dwarf2diehandler.cc
index 099f5193..5d019293 100644
--- a/src/common/dwarf/dwarf2diehandler.cc
+++ b/src/common/dwarf/dwarf2diehandler.cc
@@ -31,10 +31,10 @@
 // dwarf2diehandler.cc: Implement the dwarf2reader::DieDispatcher class.
 // See dwarf2diehandler.h for details.
 
-#include <cassert>
-
 #include "common/dwarf/dwarf2diehandler.h"
 
+#include <assert.h>
+
 namespace dwarf2reader {
 
 DIEDispatcher::~DIEDispatcher() {
diff --git a/src/common/dwarf/dwarf2reader.cc b/src/common/dwarf/dwarf2reader.cc
index 1a397019..a2915bad 100644
--- a/src/common/dwarf/dwarf2reader.cc
+++ b/src/common/dwarf/dwarf2reader.cc
@@ -31,16 +31,18 @@
 // Implementation of dwarf2reader::LineInfo, dwarf2reader::CompilationUnit,
 // and dwarf2reader::CallFrameInfo. See dwarf2reader.h for details.
 
-#include <cassert>
-#include <cstdio>
-#include <cstring>
+#include "common/dwarf/dwarf2reader.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
 #include <map>
 #include <memory>
 #include <stack>
 #include <utility>
 
 #include "common/dwarf/bytereader-inl.h"
-#include "common/dwarf/dwarf2reader.h"
 #include "common/dwarf/bytereader.h"
 #include "common/dwarf/line_state_machine.h"
 
diff --git a/src/common/dwarf/dwarf2reader_cfi_unittest.cc b/src/common/dwarf/dwarf2reader_cfi_unittest.cc
index 85889f88..1a2431c7 100644
--- a/src/common/dwarf/dwarf2reader_cfi_unittest.cc
+++ b/src/common/dwarf/dwarf2reader_cfi_unittest.cc
@@ -31,7 +31,8 @@
 
 // dwarf2reader_cfi_unittest.cc: Unit tests for dwarf2reader::CallFrameInfo
 
-#include <cstdlib>
+#include <stdlib.h>
+
 #include <vector>
 
 // The '.eh_frame' format, used by the Linux C++ ABI for exception
@@ -45,9 +46,9 @@
 // interpretation against the test's intentions. Each ELF file is named
 // "cfitest-TEST", where TEST identifies the particular test.
 #ifdef WRITE_ELF
-#include <cstdio>
-#include <cerrno>
-#include <cstring>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
 extern "C" {
 // To compile with WRITE_ELF, you should add the 'include' directory
 // of the binutils, gcc, or gdb source tree to your #include path;
diff --git a/src/common/dwarf_cfi_to_module.h b/src/common/dwarf_cfi_to_module.h
index 4f4ce0a2..dc11ec53 100644
--- a/src/common/dwarf_cfi_to_module.h
+++ b/src/common/dwarf_cfi_to_module.h
@@ -39,7 +39,8 @@
 #ifndef COMMON_LINUX_DWARF_CFI_TO_MODULE_H
 #define COMMON_LINUX_DWARF_CFI_TO_MODULE_H
 
-#include <cassert>
+#include <assert.h>
+
 #include <string>
 #include <vector>
 
diff --git a/src/common/dwarf_cu_to_module.cc b/src/common/dwarf_cu_to_module.cc
index 03206d22..4792d900 100644
--- a/src/common/dwarf_cu_to_module.cc
+++ b/src/common/dwarf_cu_to_module.cc
@@ -31,10 +31,12 @@
 
 // Implement the DwarfCUToModule class; see dwarf_cu_to_module.h.
 
+#include "common/dwarf_cu_to_module.h"
+
+#include <assert.h>
+
 #include <algorithm>
-#include <cassert>
 
-#include "common/dwarf_cu_to_module.h"
 #include "common/dwarf_line_to_module.h"
 
 namespace google_breakpad {
diff --git a/src/common/linux/dump_symbols.cc b/src/common/linux/dump_symbols.cc
index a9d2cb46..d8a78942 100644
--- a/src/common/linux/dump_symbols.cc
+++ b/src/common/linux/dump_symbols.cc
@@ -32,18 +32,20 @@
 // dump_symbols.cc: implement google_breakpad::WriteSymbolFile:
 // Find all the debugging info in a file and dump it as a Breakpad symbol file.
 
+#include "common/linux/dump_symbols.h"
+
+#include <assert.h>
 #include <elf.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <link.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <cassert>
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include <string>
 
 #include "common/dwarf/bytereader-inl.h"
@@ -51,7 +53,6 @@
 #include "common/dwarf_cfi_to_module.h"
 #include "common/dwarf_cu_to_module.h"
 #include "common/dwarf_line_to_module.h"
-#include "common/linux/dump_symbols.h"
 #include "common/linux/file_id.h"
 #include "common/module.h"
 #include "common/stabs_reader.h"
diff --git a/src/common/linux/dump_symbols.h b/src/common/linux/dump_symbols.h
index 0b6d0c02..5422b1c8 100644
--- a/src/common/linux/dump_symbols.h
+++ b/src/common/linux/dump_symbols.h
@@ -35,8 +35,9 @@
 #ifndef COMMON_LINUX_DUMP_SYMBOLS_H__
 #define COMMON_LINUX_DUMP_SYMBOLS_H__
 
+#include <stdio.h>
+
 #include <string>
-#include <cstdio>
 
 namespace google_breakpad {
 
diff --git a/src/common/linux/file_id.cc b/src/common/linux/file_id.cc
index e76d0b0a..d2461b9c 100644
--- a/src/common/linux/file_id.cc
+++ b/src/common/linux/file_id.cc
@@ -33,21 +33,22 @@
 //
 
 #include "common/linux/file_id.h"
-#include "common/linux/linux_libc_support.h"
-#include "common/linux/linux_syscall_support.h"
 
 #include <arpa/inet.h>
+#include <assert.h>
 #include <elf.h>
 #include <fcntl.h>
 #include <link.h>
+#include <stdio.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <algorithm>
-#include <cassert>
-#include <cstdio>
+
+#include "common/linux/linux_libc_support.h"
+#include "common/linux/linux_syscall_support.h"
 
 namespace google_breakpad {
 
diff --git a/src/common/linux/guid_creator.cc b/src/common/linux/guid_creator.cc
index 7611cc3e..678f5904 100644
--- a/src/common/linux/guid_creator.cc
+++ b/src/common/linux/guid_creator.cc
@@ -27,14 +27,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
-#include <ctime>
-#include <unistd.h>
-
 #include "common/linux/guid_creator.h"
 
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
 //
 // GUIDGenerator
 //
diff --git a/src/common/linux/http_upload.cc b/src/common/linux/http_upload.cc
index f0f9a6de..1ab4b12b 100644
--- a/src/common/linux/http_upload.cc
+++ b/src/common/linux/http_upload.cc
@@ -27,14 +27,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <cassert>
+#include "common/linux/http_upload.h"
+
+#include <assert.h>
 #include <dlfcn.h>
 #include <curl/curl.h>
 #include <curl/easy.h>
 #include <curl/types.h>
 
-#include "common/linux/http_upload.h"
-
 namespace {
 
 // Callback to get the response data from server.
diff --git a/src/common/linux/libcurl_wrapper.h b/src/common/linux/libcurl_wrapper.h
index 08aa9586..ce549889 100644
--- a/src/common/linux/libcurl_wrapper.h
+++ b/src/common/linux/libcurl_wrapper.h
@@ -30,9 +30,10 @@
 // A wrapper for libcurl to do HTTP Uploads, to support easy mocking
 // and unit testing of the HTTPUpload class.
 
+#include <curl/curl.h>
+
 #include <string>
 #include <map>
-#include <curl/curl.h>
 
 namespace google_breakpad {
 class LibcurlWrapper {
diff --git a/src/common/module.cc b/src/common/module.cc
index fd36f3f9..f7f5788e 100644
--- a/src/common/module.cc
+++ b/src/common/module.cc
@@ -31,11 +31,11 @@
 
 // module.cc: Implement google_breakpad::Module.  See module.h.
 
-#include <cerrno>
-#include <cstring>
-
 #include "common/module.h"
 
+#include <errno.h>
+#include <string.h>
+
 namespace google_breakpad {
 
 Module::Module(const string &name, const string &os,
diff --git a/src/common/module.h b/src/common/module.h
index 92012249..64707f3f 100644
--- a/src/common/module.h
+++ b/src/common/module.h
@@ -38,10 +38,11 @@
 #ifndef COMMON_LINUX_MODULE_H__
 #define COMMON_LINUX_MODULE_H__
 
+#include <stdio.h>
+
 #include <map>
 #include <string>
 #include <vector>
-#include <cstdio>
 
 #include "google_breakpad/common/breakpad_types.h"
 
diff --git a/src/common/module_unittest.cc b/src/common/module_unittest.cc
index dab0dac3..18c8ad61 100644
--- a/src/common/module_unittest.cc
+++ b/src/common/module_unittest.cc
@@ -31,10 +31,10 @@
 
 // module_unittest.cc: Unit tests for google_breakpad::Module.
 
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <algorithm>
 #include <string>
diff --git a/src/common/test_assembler.cc b/src/common/test_assembler.cc
index 261691b0..3271176c 100644
--- a/src/common/test_assembler.cc
+++ b/src/common/test_assembler.cc
@@ -32,13 +32,13 @@
 // test_assembler.cc: Implementation of google_breakpad::TestAssembler.
 // See test_assembler.h for details.
 
+#include "common/test_assembler.h"
+
 #include <assert.h>
 #include <stdio.h>
 
 #include <iterator>
 
-#include "common/test_assembler.h"
-
 namespace google_breakpad {
 namespace test_assembler {
 
diff --git a/src/google_breakpad/processor/minidump_processor.h b/src/google_breakpad/processor/minidump_processor.h
index 756a868b..8779b962 100644
--- a/src/google_breakpad/processor/minidump_processor.h
+++ b/src/google_breakpad/processor/minidump_processor.h
@@ -30,7 +30,7 @@
 #ifndef GOOGLE_BREAKPAD_PROCESSOR_MINIDUMP_PROCESSOR_H__
 #define GOOGLE_BREAKPAD_PROCESSOR_MINIDUMP_PROCESSOR_H__
 
-#include <cassert>
+#include <assert.h>
 #include <string>
 #include "google_breakpad/common/breakpad_types.h"
 
diff --git a/src/processor/address_map-inl.h b/src/processor/address_map-inl.h
index d88b4fcc..251c4478 100644
--- a/src/processor/address_map-inl.h
+++ b/src/processor/address_map-inl.h
@@ -36,9 +36,10 @@
 #ifndef PROCESSOR_ADDRESS_MAP_INL_H__
 #define PROCESSOR_ADDRESS_MAP_INL_H__
 
-#include <cassert>
-
 #include "processor/address_map.h"
+
+#include <assert.h>
+
 #include "processor/logging.h"
 
 namespace google_breakpad {
diff --git a/src/processor/address_map_unittest.cc b/src/processor/address_map_unittest.cc
index f64a8984..9b4095b1 100644
--- a/src/processor/address_map_unittest.cc
+++ b/src/processor/address_map_unittest.cc
@@ -31,8 +31,8 @@
 //
 // Author: Mark Mentovai
 
-#include <climits>
-#include <cstdio>
+#include <limits.h>
+#include <stdio.h>
 
 #include "processor/address_map-inl.h"
 #include "processor/linked_ptr.h"
diff --git a/src/processor/basic_code_modules.cc b/src/processor/basic_code_modules.cc
index a21491c4..63da8995 100644
--- a/src/processor/basic_code_modules.cc
+++ b/src/processor/basic_code_modules.cc
@@ -34,9 +34,10 @@
 //
 // Author: Mark Mentovai
 
-#include <cassert>
-
 #include "processor/basic_code_modules.h"
+
+#include <assert.h>
+
 #include "google_breakpad/processor/code_module.h"
 #include "processor/linked_ptr.h"
 #include "processor/logging.h"
diff --git a/src/processor/basic_source_line_resolver_unittest.cc b/src/processor/basic_source_line_resolver_unittest.cc
index 693a5ce5..c241ea0a 100644
--- a/src/processor/basic_source_line_resolver_unittest.cc
+++ b/src/processor/basic_source_line_resolver_unittest.cc
@@ -27,7 +27,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <cstdio>
+#include <stdio.h>
+
 #include <string>
 
 #include "breakpad_googletest_includes.h"
diff --git a/src/processor/cfi_frame_info.cc b/src/processor/cfi_frame_info.cc
index 135eee21..1ded99d3 100644
--- a/src/processor/cfi_frame_info.cc
+++ b/src/processor/cfi_frame_info.cc
@@ -32,10 +32,12 @@
 // cfi_frame_info.cc: Implementation of CFIFrameInfo class.
 // See cfi_frame_info.h for details.
 
-#include <cstring>
+#include "processor/cfi_frame_info.h"
+
+#include <string.h>
+
 #include <sstream>
 
-#include "processor/cfi_frame_info.h"
 #include "processor/postfix_evaluator-inl.h"
 #include "processor/scoped_ptr.h"
 
diff --git a/src/processor/contained_range_map-inl.h b/src/processor/contained_range_map-inl.h
index 5cc498df..4c0ad41f 100644
--- a/src/processor/contained_range_map-inl.h
+++ b/src/processor/contained_range_map-inl.h
@@ -36,10 +36,10 @@
 #ifndef PROCESSOR_CONTAINED_RANGE_MAP_INL_H__
 #define PROCESSOR_CONTAINED_RANGE_MAP_INL_H__
 
+#include "processor/contained_range_map.h"
 
-#include <cassert>
+#include <assert.h>
 
-#include "processor/contained_range_map.h"
 #include "processor/logging.h"
 
 
diff --git a/src/processor/contained_range_map_unittest.cc b/src/processor/contained_range_map_unittest.cc
index 6b65b4e1..e5910da0 100644
--- a/src/processor/contained_range_map_unittest.cc
+++ b/src/processor/contained_range_map_unittest.cc
@@ -31,7 +31,7 @@
 //
 // Author: Mark Mentovai
 
-#include <cstdio>
+#include <stdio.h>
 
 #include "processor/contained_range_map-inl.h"
 
diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc
index f3fb2942..2398e9b9 100644
--- a/src/processor/minidump.cc
+++ b/src/processor/minidump.cc
@@ -33,7 +33,9 @@
 //
 // Author: Mark Mentovai
 
+#include "google_breakpad/processor/minidump.h"
 
+#include <assert.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
@@ -49,7 +51,6 @@ typedef SSIZE_T ssize_t;
 #define O_BINARY 0
 #endif  // _WIN32
 
-#include <cassert>
 #include <fstream>
 #include <iostream>
 #include <limits>
@@ -58,7 +59,6 @@ typedef SSIZE_T ssize_t;
 
 #include "processor/range_map-inl.h"
 
-#include "google_breakpad/processor/minidump.h"
 #include "processor/basic_code_module.h"
 #include "processor/basic_code_modules.h"
 #include "processor/logging.h"
diff --git a/src/processor/minidump_dump.cc b/src/processor/minidump_dump.cc
index b586252f..6ec777f1 100644
--- a/src/processor/minidump_dump.cc
+++ b/src/processor/minidump_dump.cc
@@ -32,7 +32,7 @@
 //
 // Author: Mark Mentovai
 
-#include <cstdio>
+#include <stdio.h>
 
 #include "google_breakpad/processor/minidump.h"
 #include "processor/logging.h"
diff --git a/src/processor/minidump_processor.cc b/src/processor/minidump_processor.cc
index e1583f49..b090ecbd 100644
--- a/src/processor/minidump_processor.cc
+++ b/src/processor/minidump_processor.cc
@@ -27,10 +27,11 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <cassert>
-#include <cstdio>
-
 #include "google_breakpad/processor/minidump_processor.h"
+
+#include <assert.h>
+#include <stdio.h>
+
 #include "google_breakpad/processor/call_stack.h"
 #include "google_breakpad/processor/minidump.h"
 #include "google_breakpad/processor/process_state.h"
diff --git a/src/processor/minidump_processor_unittest.cc b/src/processor/minidump_processor_unittest.cc
index f93ee157..8fd21fbd 100644
--- a/src/processor/minidump_processor_unittest.cc
+++ b/src/processor/minidump_processor_unittest.cc
@@ -30,11 +30,13 @@
 // Unit test for MinidumpProcessor.  Uses a pre-generated minidump and
 // corresponding symbol file, and checks the stack frames for correctness.
 
-#include <cstdlib>
+#include <stdlib.h>
+
 #include <string>
 #include <iostream>
 #include <fstream>
 #include <map>
+
 #include "breakpad_googletest_includes.h"
 #include "google_breakpad/processor/basic_source_line_resolver.h"
 #include "google_breakpad/processor/call_stack.h"
diff --git a/src/processor/minidump_stackwalk.cc b/src/processor/minidump_stackwalk.cc
index 2c3ab359..66b12578 100644
--- a/src/processor/minidump_stackwalk.cc
+++ b/src/processor/minidump_stackwalk.cc
@@ -32,9 +32,10 @@
 //
 // Author: Mark Mentovai
 
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <string>
 #include <vector>
 
diff --git a/src/processor/network_source_line_resolver.cc b/src/processor/network_source_line_resolver.cc
index 5fc5b1ea..f342c7a4 100644
--- a/src/processor/network_source_line_resolver.cc
+++ b/src/processor/network_source_line_resolver.cc
@@ -27,14 +27,15 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include "google_breakpad/processor/network_source_line_resolver.h"
+
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <cassert>
 #include <sstream>
 #include <vector>
 
-#include "google_breakpad/processor/network_source_line_resolver.h"
 #include "google_breakpad/processor/stack_frame.h"
 #include "processor/binarystream.h"
 #include "processor/cfi_frame_info.h"
diff --git a/src/processor/pathname_stripper_unittest.cc b/src/processor/pathname_stripper_unittest.cc
index 54f04b78..1bff4cb0 100644
--- a/src/processor/pathname_stripper_unittest.cc
+++ b/src/processor/pathname_stripper_unittest.cc
@@ -27,7 +27,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <cstdio>
+#include <stdio.h>
 
 #include "processor/pathname_stripper.h"
 #include "processor/logging.h"
diff --git a/src/processor/postfix_evaluator-inl.h b/src/processor/postfix_evaluator-inl.h
index b1252f68..0ebb57d6 100644
--- a/src/processor/postfix_evaluator-inl.h
+++ b/src/processor/postfix_evaluator-inl.h
@@ -39,11 +39,12 @@
 #ifndef PROCESSOR_POSTFIX_EVALUATOR_INL_H__
 #define PROCESSOR_POSTFIX_EVALUATOR_INL_H__
 
+#include "processor/postfix_evaluator.h"
+
+#include <stdio.h>
 
-#include <cstdio>
 #include <sstream>
 
-#include "processor/postfix_evaluator.h"
 #include "google_breakpad/processor/memory_region.h"
 #include "processor/logging.h"
 
diff --git a/src/processor/postfix_evaluator_unittest.cc b/src/processor/postfix_evaluator_unittest.cc
index e20a2b8f..0c2d8ece 100644
--- a/src/processor/postfix_evaluator_unittest.cc
+++ b/src/processor/postfix_evaluator_unittest.cc
@@ -31,7 +31,8 @@
 //
 // Author: Mark Mentovai
 
-#include <cstdio>
+#include <stdio.h>
+
 #include <map>
 #include <string>
 
diff --git a/src/processor/range_map-inl.h b/src/processor/range_map-inl.h
index 71761915..e7bf4512 100644
--- a/src/processor/range_map-inl.h
+++ b/src/processor/range_map-inl.h
@@ -37,7 +37,7 @@
 #define PROCESSOR_RANGE_MAP_INL_H__
 
 
-#include <cassert>
+#include <assert.h>
 
 #include "processor/range_map.h"
 #include "processor/logging.h"
diff --git a/src/processor/range_map_unittest.cc b/src/processor/range_map_unittest.cc
index bcf87ce2..dd713fba 100644
--- a/src/processor/range_map_unittest.cc
+++ b/src/processor/range_map_unittest.cc
@@ -32,8 +32,8 @@
 // Author: Mark Mentovai
 
 
-#include <climits>
-#include <cstdio>
+#include <limits.h>
+#include <stdio.h>
 
 #include "processor/range_map-inl.h"
 
diff --git a/src/processor/simple_symbol_supplier.cc b/src/processor/simple_symbol_supplier.cc
index c593e955..544a42cb 100644
--- a/src/processor/simple_symbol_supplier.cc
+++ b/src/processor/simple_symbol_supplier.cc
@@ -33,15 +33,16 @@
 //
 // Author: Mark Mentovai
 
+#include "processor/simple_symbol_supplier.h"
+
+#include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <algorithm>
-#include <cassert>
 #include <iostream>
 #include <fstream>
 
-#include "processor/simple_symbol_supplier.h"
 #include "google_breakpad/processor/code_module.h"
 #include "google_breakpad/processor/system_info.h"
 #include "processor/logging.h"
diff --git a/src/processor/stackwalker.cc b/src/processor/stackwalker.cc
index a45407db..8552e2f3 100644
--- a/src/processor/stackwalker.cc
+++ b/src/processor/stackwalker.cc
@@ -33,10 +33,10 @@
 //
 // Author: Mark Mentovai
 
+#include "google_breakpad/processor/stackwalker.h"
 
-#include <cassert>
+#include <assert.h>
 
-#include "google_breakpad/processor/stackwalker.h"
 #include "google_breakpad/processor/call_stack.h"
 #include "google_breakpad/processor/code_module.h"
 #include "google_breakpad/processor/code_modules.h"
diff --git a/src/processor/stackwalker_selftest.cc b/src/processor/stackwalker_selftest.cc
index 6b71a6a8..fdd15270 100644
--- a/src/processor/stackwalker_selftest.cc
+++ b/src/processor/stackwalker_selftest.cc
@@ -62,7 +62,7 @@
     (defined(__i386__) || defined(__ppc__) || defined(__sparc__))
 
 
-#include <cstdio>
+#include <stdio.h>
 
 #include "google_breakpad/common/breakpad_types.h"
 #include "google_breakpad/common/minidump_format.h"
diff --git a/src/processor/synth_minidump.h b/src/processor/synth_minidump.h
index 690ec399..6219272d 100644
--- a/src/processor/synth_minidump.h
+++ b/src/processor/synth_minidump.h
@@ -108,7 +108,8 @@
 #ifndef PROCESSOR_SYNTH_MINIDUMP_H_
 #define PROCESSOR_SYNTH_MINIDUMP_H_
 
-#include <cassert>
+#include <assert.h>
+
 #include <iostream>
 #include <string>
 
diff --git a/src/processor/testdata/linux_test_app.cc b/src/processor/testdata/linux_test_app.cc
index 9a6a1940..f1617b76 100644
--- a/src/processor/testdata/linux_test_app.cc
+++ b/src/processor/testdata/linux_test_app.cc
@@ -39,9 +39,10 @@
 // generate an executable with STABS symbols (needs -m32), or -gdwarf-2 for one
 // with DWARF symbols (32- or 64-bit)
 
+#include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <cstdio>
+
 #include <string>
 
 #include "common/linux/linux_syscall_support.h"
diff --git a/src/processor/testdata/test_app.cc b/src/processor/testdata/test_app.cc
index f230ef3f..7882a8bd 100644
--- a/src/processor/testdata/test_app.cc
+++ b/src/processor/testdata/test_app.cc
@@ -32,7 +32,7 @@
 //   google_breakpad/src/client/windows/releasestaticcrt/exception_handler.lib
 // Then run test_app to generate a dump, and dump_syms to create the .sym file.
 
-#include <cstdio>
+#include <stdio.h>
 
 #include "client/windows/handler/exception_handler.h"
 
diff --git a/src/processor/udp_network.cc b/src/processor/udp_network.cc
index 52072841..0cb911e0 100644
--- a/src/processor/udp_network.cc
+++ b/src/processor/udp_network.cc
@@ -27,21 +27,23 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "processor/udp_network.h"
+
 #include <arpa/inet.h>
 #include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#include <stdio.h>
+#include <string.h>
 #include <sys/socket.h>
 
-#include <cstdio>
-#include <cstring>
 #include <string>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "processor/logging.h"
-#include "processor/udp_network.h"
 
 namespace google_breakpad {
 using std::string;
diff --git a/src/processor/windows_frame_info.h b/src/processor/windows_frame_info.h
index cca78b88..79e74638 100644
--- a/src/processor/windows_frame_info.h
+++ b/src/processor/windows_frame_info.h
@@ -38,7 +38,8 @@
 #ifndef PROCESSOR_WINDOWS_FRAME_INFO_H__
 #define PROCESSOR_WINDOWS_FRAME_INFO_H__
 
-#include <cstring>
+#include <string.h>
+
 #include <string>
 #include <vector>
 
diff --git a/src/tools/linux/dump_syms/dump_syms.cc b/src/tools/linux/dump_syms/dump_syms.cc
index 9667b38d..67f5ad53 100644
--- a/src/tools/linux/dump_syms/dump_syms.cc
+++ b/src/tools/linux/dump_syms/dump_syms.cc
@@ -27,8 +27,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <stdio.h>
 #include <string>
-#include <cstdio>
 
 #include "common/linux/dump_symbols.h"
 
diff --git a/src/tools/linux/symupload/sym_upload.cc b/src/tools/linux/symupload/sym_upload.cc
index bd040519..715218d6 100644
--- a/src/tools/linux/symupload/sym_upload.cc
+++ b/src/tools/linux/symupload/sym_upload.cc
@@ -39,11 +39,11 @@
 //  cpu: the CPU that the module was built for
 //  symbol_file: the contents of the breakpad-format symbol file
 
-#include <unistd.h>
+#include <assert.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
-#include <cstdio>
-#include <cassert>
 #include <functional>
 #include <iostream>
 #include <string>