5 files changed, 26 insertions, 4 deletions
diff --git a/src/common/dwarf/dwarf2diehandler_unittest.cc b/src/common/dwarf/dwarf2diehandler_unittest.cc
index 67ccb95f..1e05fd5c 100644
--- a/src/common/dwarf/dwarf2diehandler_unittest.cc
+++ b/src/common/dwarf/dwarf2diehandler_unittest.cc
@@ -32,10 +32,16 @@
 
 // dwarf2diehander_unittest.cc: Unit tests for google_breakpad::DIEDispatcher.
 
+#include <string>
+#include <utility>
+
 #include "breakpad_googletest_includes.h"
 
 #include "common/dwarf/dwarf2diehandler.h"
 
+using std::make_pair;
+using std::string;
+
 using ::testing::_;
 using ::testing::ContainerEq;
 using ::testing::ElementsAreArray;
diff --git a/src/common/dwarf/dwarf2reader_cfi_unittest.cc b/src/common/dwarf/dwarf2reader_cfi_unittest.cc
index 1a2431c7..271d1b6a 100644
--- a/src/common/dwarf/dwarf2reader_cfi_unittest.cc
+++ b/src/common/dwarf/dwarf2reader_cfi_unittest.cc
@@ -33,6 +33,7 @@
 
 #include <stdlib.h>
 
+#include <string>
 #include <vector>
 
 // The '.eh_frame' format, used by the Linux C++ ABI for exception
@@ -75,6 +76,7 @@ using dwarf2reader::ENDIANNESS_LITTLE;
 using dwarf2reader::ByteReader;
 using dwarf2reader::CallFrameInfo;
 
+using std::string;
 using std::vector;
 using testing::InSequence;
 using testing::Return;
diff --git a/src/common/dwarf_cfi_to_module_unittest.cc b/src/common/dwarf_cfi_to_module_unittest.cc
index 9477296d..3d129490 100644
--- a/src/common/dwarf_cfi_to_module_unittest.cc
+++ b/src/common/dwarf_cfi_to_module_unittest.cc
@@ -31,9 +31,15 @@
 
 // dwarf_cfi_to_module_unittest.cc: Tests for google_breakpad::DwarfCFIToModule.
 
+#include <string>
+#include <vector>
+
 #include "breakpad_googletest_includes.h"
 #include "common/dwarf_cfi_to_module.h"
 
+using std::string;
+using std::vector;
+
 using google_breakpad::Module;
 using google_breakpad::DwarfCFIToModule;
 using testing::ContainerEq;
diff --git a/src/common/dwarf_cu_to_module_unittest.cc b/src/common/dwarf_cu_to_module_unittest.cc
index cea1a487..e88e381c 100644
--- a/src/common/dwarf_cu_to_module_unittest.cc
+++ b/src/common/dwarf_cu_to_module_unittest.cc
@@ -31,11 +31,15 @@
 
 // dwarf_cu_to_module.cc: Unit tests for google_breakpad::DwarfCUToModule.
 
+#include <string>
+#include <utility>
 #include <vector>
 
 #include "breakpad_googletest_includes.h"
 #include "common/dwarf_cu_to_module.h"
 
+using std::make_pair;
+using std::string;
 using std::vector;
 
 using dwarf2reader::AttributeList;
@@ -144,8 +148,8 @@ class CUFixtureBase {
 
     // The handler will consult this section map to decide what to
     // pass to our line reader.
-    file_context_.section_map[".debug_line"] = std::make_pair(dummy_line_program_, 
-                                                   dummy_line_size_);
+    file_context_.section_map[".debug_line"] = make_pair(dummy_line_program_,
+                                                         dummy_line_size_);
   }
 
   // Add a line with the given address, size, filename, and line
@@ -158,7 +162,7 @@ class CUFixtureBase {
   // Use LANGUAGE for the compilation unit. More precisely, arrange
   // for StartCU to pass the compilation unit's root DIE a
   // DW_AT_language attribute whose value is LANGUAGE.
-  void SetLanguage(dwarf2reader::DwarfLanguage language) { 
+  void SetLanguage(dwarf2reader::DwarfLanguage language) {
     language_ = language;
   }
 
diff --git a/src/common/dwarf_line_to_module_unittest.cc b/src/common/dwarf_line_to_module_unittest.cc
index 82bef685..1e123e97 100644
--- a/src/common/dwarf_line_to_module_unittest.cc
+++ b/src/common/dwarf_line_to_module_unittest.cc
@@ -31,9 +31,13 @@
 
 // dwarf_line_to_module.cc: Unit tests for google_breakpad::DwarfLineToModule.
 
+#include <vector>
+
 #include "breakpad_googletest_includes.h"
 #include "common/dwarf_line_to_module.h"
 
+using std::vector;
+
 using google_breakpad::DwarfLineToModule;
 using google_breakpad::Module;
 using google_breakpad::Module;
@@ -44,7 +48,7 @@ TEST(SimpleModule, One) {
   DwarfLineToModule h(&m, &lines);
 
   h.DefineFile("file1", 0x30bf0f27, 0, 0, 0);
-  h.AddLine(0x6fd126fbf74f2680LL, 0x63c9a14cf556712bLL, 0x30bf0f27, 
+  h.AddLine(0x6fd126fbf74f2680LL, 0x63c9a14cf556712bLL, 0x30bf0f27,
             0x4c090cbf, 0x1cf9fe0d);
 
   vector<Module::File *> files;