diff --git a/src/common/dwarf/cfi_assembler.h b/src/common/dwarf/cfi_assembler.h
index 3e8974de..6ee2557a 100644
--- a/src/common/dwarf/cfi_assembler.h
+++ b/src/common/dwarf/cfi_assembler.h
@@ -46,7 +46,6 @@
 
 namespace google_breakpad {
 
-using google_breakpad::test_assembler::Endianness;
 using google_breakpad::test_assembler::Label;
 using google_breakpad::test_assembler::Section;
 
@@ -94,7 +93,7 @@ class CFISection: public Section {
   // true, use the .eh_frame format, as described by the Linux
   // Standards Base Core Specification, instead of the DWARF CFI
   // format.
-  CFISection(Endianness endianness, size_t address_size,
+  CFISection(google_breakpad::test_assembler::Endianness endianness, size_t address_size,
              bool eh_frame = false)
       : Section(endianness), address_size_(address_size), eh_frame_(eh_frame),
         pointer_encoding_(DW_EH_PE_absptr),
diff --git a/src/common/dwarf_cu_to_module_unittest.cc b/src/common/dwarf_cu_to_module_unittest.cc
index 97d868e4..2ce69d73 100644
--- a/src/common/dwarf_cu_to_module_unittest.cc
+++ b/src/common/dwarf_cu_to_module_unittest.cc
@@ -49,7 +49,6 @@ using google_breakpad::DwarfTag;
 using google_breakpad::DwarfAttribute;
 using google_breakpad::DwarfForm;
 using google_breakpad::DwarfInline;
-using google_breakpad::RootDIEHandler;
 using google_breakpad::DwarfCUToModule;
 using google_breakpad::Module;