10 files changed, 11 insertions, 11 deletions
diff --git a/src/common/dwarf/cfi_assembler.h b/src/common/dwarf/cfi_assembler.h
index f5bf9710..7ec1a109 100644
--- a/src/common/dwarf/cfi_assembler.h
+++ b/src/common/dwarf/cfi_assembler.h
@@ -40,8 +40,8 @@
 #include <string>
 
 #include "common/dwarf/dwarf2enums.h"
+#include "common/test_assembler.h"
 #include "google_breakpad/common/breakpad_types.h"
-#include "processor/test_assembler.h"
 
 namespace google_breakpad {
 
diff --git a/src/processor/test_assembler.cc b/src/common/test_assembler.cc
index 5a36166a..3fd7cad0 100644
--- a/src/processor/test_assembler.cc
+++ b/src/common/test_assembler.cc
@@ -36,7 +36,7 @@
 #include <cstdio>
 #include <iterator>
 
-#include "processor/test_assembler.h"
+#include "common/test_assembler.h"
 
 namespace google_breakpad {
 namespace TestAssembler {
diff --git a/src/processor/test_assembler.h b/src/common/test_assembler.h
index 560f7aef..560f7aef 100644
--- a/src/processor/test_assembler.h
+++ b/src/common/test_assembler.h
diff --git a/src/processor/test_assembler_unittest.cc b/src/common/test_assembler_unittest.cc
index 97009605..9b6990ce 100644
--- a/src/processor/test_assembler_unittest.cc
+++ b/src/common/test_assembler_unittest.cc
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include "breakpad_googletest_includes.h"
-#include "processor/test_assembler.h"
+#include "common/test_assembler.h"
 
 using google_breakpad::TestAssembler::Label;
 using google_breakpad::TestAssembler::Section;
diff --git a/src/processor/stackwalker_amd64_unittest.cc b/src/processor/stackwalker_amd64_unittest.cc
index 7b56fb1c..6db04ffc 100644
--- a/src/processor/stackwalker_amd64_unittest.cc
+++ b/src/processor/stackwalker_amd64_unittest.cc
@@ -36,6 +36,7 @@
 #include <vector>
 
 #include "breakpad_googletest_includes.h"
+#include "common/test_assembler.h"
 #include "google_breakpad/common/minidump_format.h"
 #include "google_breakpad/processor/basic_source_line_resolver.h"
 #include "google_breakpad/processor/call_stack.h"
@@ -43,7 +44,6 @@
 #include "google_breakpad/processor/stack_frame_cpu.h"
 #include "processor/stackwalker_unittest_utils.h"
 #include "processor/stackwalker_amd64.h"
-#include "processor/test_assembler.h"
 
 using google_breakpad::BasicSourceLineResolver;
 using google_breakpad::CallStack;
diff --git a/src/processor/stackwalker_arm_unittest.cc b/src/processor/stackwalker_arm_unittest.cc
index 37103241..036b322c 100644
--- a/src/processor/stackwalker_arm_unittest.cc
+++ b/src/processor/stackwalker_arm_unittest.cc
@@ -36,6 +36,7 @@
 #include <vector>
 
 #include "breakpad_googletest_includes.h"
+#include "common/test_assembler.h"
 #include "google_breakpad/common/minidump_format.h"
 #include "google_breakpad/processor/basic_source_line_resolver.h"
 #include "google_breakpad/processor/call_stack.h"
@@ -43,7 +44,6 @@
 #include "google_breakpad/processor/stack_frame_cpu.h"
 #include "processor/stackwalker_unittest_utils.h"
 #include "processor/stackwalker_arm.h"
-#include "processor/test_assembler.h"
 #include "processor/windows_frame_info.h"
 
 using google_breakpad::BasicSourceLineResolver;
diff --git a/src/processor/stackwalker_x86_unittest.cc b/src/processor/stackwalker_x86_unittest.cc
index 464b94ed..5af516d4 100644
--- a/src/processor/stackwalker_x86_unittest.cc
+++ b/src/processor/stackwalker_x86_unittest.cc
@@ -35,6 +35,7 @@
 #include <vector>
 
 #include "breakpad_googletest_includes.h"
+#include "common/test_assembler.h"
 #include "google_breakpad/common/minidump_format.h"
 #include "google_breakpad/processor/basic_source_line_resolver.h"
 #include "google_breakpad/processor/call_stack.h"
@@ -42,7 +43,6 @@
 #include "google_breakpad/processor/stack_frame_cpu.h"
 #include "processor/stackwalker_unittest_utils.h"
 #include "processor/stackwalker_x86.h"
-#include "processor/test_assembler.h"
 #include "processor/windows_frame_info.h"
 
 using google_breakpad::BasicSourceLineResolver;
diff --git a/src/processor/synth_minidump.h b/src/processor/synth_minidump.h
index 28677805..690ec399 100644
--- a/src/processor/synth_minidump.h
+++ b/src/processor/synth_minidump.h
@@ -112,9 +112,9 @@
 #include <iostream>
 #include <string>
 
+#include "common/test_assembler.h"
 #include "google_breakpad/common/breakpad_types.h"
 #include "google_breakpad/common/minidump_format.h"
-#include "processor/test_assembler.h"
 
 namespace google_breakpad {
 
diff --git a/src/processor/synth_minidump_unittest.cc b/src/processor/synth_minidump_unittest.cc
index 755468d5..888053bd 100644
--- a/src/processor/synth_minidump_unittest.cc
+++ b/src/processor/synth_minidump_unittest.cc
@@ -29,7 +29,8 @@
 
 // Original author: Jim Blandy <jimb@mozilla.com> <jimb@red-bean.com>
 
-// test_assembler_unittest.cc: Unit tests for google_breakpad::TestAssembler.
+// synth_minidump_unittest.cc: Unit tests for google_breakpad::SynthMinidump
+// classes.
 
 #include <sstream>
 #include <string>
diff --git a/src/tools/linux/dump_syms/Makefile b/src/tools/linux/dump_syms/Makefile
index 7a5673c9..3f8684d2 100644
--- a/src/tools/linux/dump_syms/Makefile
+++ b/src/tools/linux/dump_syms/Makefile
@@ -141,8 +141,7 @@ gmock-all.o: override CPPFLAGS += $(GTEST_CPPFLAGS) $(GMOCK_CPPFLAGS)
 
 
 ### google_breakpad::TestAssembler, for constructing binary test data
-VPATH += $(SRC)/processor
-TEST_ASSEMBLER_CPPFLAGS = -I$(SRC)/processor
+VPATH += $(SRC)/common
 test_assembler.o: test_assembler.cc
 test_assembler.o: override CPPFLAGS += $(TEST_ASSEMBLER_CPPFLAGS)
 
@@ -328,7 +327,7 @@ bytereader_unittest:				\
 CPP_EXECUTABLES += bytereader_unittest
 bytereader_unittest.o: bytereader_unittest.cc
 bytereader_unittest.o: override CPPFLAGS += $(GTEST_CPPFLAGS) \
-						$(GMOCK_CPPFLAGS)
+					    $(GMOCK_CPPFLAGS)
 clean::
 	rm -f bytereader_unittest