2 files changed, 4 insertions, 10 deletions
diff --git a/src/tools/linux/dump_syms/Makefile b/src/tools/linux/dump_syms/Makefile
index 59db7374..289dc4d8 100644
--- a/src/tools/linux/dump_syms/Makefile
+++ b/src/tools/linux/dump_syms/Makefile
@@ -16,8 +16,7 @@ BIN=dump_syms
 
 all:$(BIN)
 
-DUMP_OBJ=dump_symbols.o guid_creator.o dump_syms.o file_id.o md5.o \
-         stabs_reader.o module.o
+DUMP_OBJ=dump_symbols.o dump_syms.o file_id.o stabs_reader.o module.o
 
 dump_syms:$(DUMP_OBJ)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^
@@ -31,14 +30,8 @@ stabs_reader.o:../../../common/linux/stabs_reader.cc
 module.o:../../../common/linux/module.cc
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $^
 
-guid_creator.o:../../../common/linux/guid_creator.cc
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $^
-
 file_id.o:../../../common/linux/file_id.cc
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $^
 
-md5.o:../../../common/md5.c
-	$(CC) $(CPPFLAGS) $(CXXFLAGS) -c $^
-
 clean:
 	rm -f $(BIN) $(DUMP_OBJ)
diff --git a/src/tools/linux/md2core/minidump-2-core.cc b/src/tools/linux/md2core/minidump-2-core.cc
index e333d119..29ae3280 100644
--- a/src/tools/linux/md2core/minidump-2-core.cc
+++ b/src/tools/linux/md2core/minidump-2-core.cc
@@ -47,7 +47,8 @@
 
 #include "google_breakpad/common/minidump_format.h"
 #include "google_breakpad/common/minidump_cpu_x86.h"
-#include "breakpad/linux/minidump_format_linux.h"
+#include "common/linux/linux_syscall_support.h"
+#include "common/linux/minidump_format_linux.h"
 
 #if __WORDSIZE == 64
   #define ELF_CLASS ELFCLASS64
@@ -419,7 +420,7 @@ ParseModuleStream(CrashedProcess* crashinfo, MMappedRange range) {
     CrashedProcess::Mapping mapping;
     const MDRawModule* rawmodule =
         (MDRawModule*) range.GetArrayElement(sizeof(uint32_t),
-                                             sizeof(MDRawModule), i);
+                                             MD_MODULE_SIZE, i);
     mapping.start_address = rawmodule->base_of_image;
     mapping.end_address = rawmodule->size_of_image + rawmodule->base_of_image;