--- client/linux/crash_generation/crash_generation_server.h	
+++ client/linux/crash_generation/crash_generation_server.h	
@@ -34,7 +34,7 @@
 
 #include <string>
 
-#include "common/using_std_string.h"
+#include "google-breakpad/common/using_std_string.h"
 
 namespace google_breakpad {
 

--- client/linux/handler/exception_handler.h	
+++ client/linux/handler/exception_handler.h	
@@ -41,11 +41,11 @@
 #if defined(__ANDROID__)
 #include "client/linux/android_ucontext.h"
 #endif
-#include "client/linux/crash_generation/crash_generation_client.h"
-#include "client/linux/minidump_writer/minidump_writer.h"
-#include "common/using_std_string.h"
-#include "google_breakpad/common/minidump_format.h"
-#include "processor/scoped_ptr.h"
+#include "google-breakpad/client/linux/crash_generation/crash_generation_client.h"
+#include "google-breakpad/client/linux/minidump_writer/minidump_writer.h"
+#include "google-breakpad/common/using_std_string.h"
+#include "google-breakpad/common/minidump_format.h"
+#include "google-breakpad/processor/scoped_ptr.h"
 
 struct sigaction;
 

--- client/linux/minidump_writer/directory_reader.h	
+++ client/linux/minidump_writer/directory_reader.h	
@@ -37,7 +37,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "third_party/lss/linux_syscall_support.h"
+#include "google-breakpad/lss/linux_syscall_support.h"
 
 namespace google_breakpad {
 

--- client/linux/minidump_writer/line_reader.h	
+++ client/linux/minidump_writer/line_reader.h	
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "third_party/lss/linux_syscall_support.h"
+#include "google-breakpad/lss/linux_syscall_support.h"
 
 namespace google_breakpad {
 

--- client/linux/minidump_writer/linux_core_dumper.h	
+++ client/linux/minidump_writer/linux_core_dumper.h	
@@ -34,9 +34,9 @@
 #ifndef CLIENT_LINUX_MINIDUMP_WRITER_LINUX_CORE_DUMPER_H_
 #define CLIENT_LINUX_MINIDUMP_WRITER_LINUX_CORE_DUMPER_H_
 
-#include "client/linux/minidump_writer/linux_dumper.h"
-#include "common/linux/elf_core_dump.h"
-#include "common/linux/memory_mapped_file.h"
+#include "google-breakpad/client/linux/minidump_writer/linux_dumper.h"
+#include "google-breakpad/common/linux/elf_core_dump.h"
+#include "google-breakpad/common/linux/memory_mapped_file.h"
 
 namespace google_breakpad {
 

--- client/linux/minidump_writer/linux_dumper.h	
+++ client/linux/minidump_writer/linux_dumper.h	
@@ -46,8 +46,8 @@
 #include <sys/user.h>
 #endif
 
-#include "common/memory.h"
-#include "google_breakpad/common/minidump_format.h"
+#include "google-breakpad/common/memory.h"
+#include "google-breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
 

--- client/linux/minidump_writer/linux_ptrace_dumper.h	
+++ client/linux/minidump_writer/linux_ptrace_dumper.h	
@@ -35,7 +35,7 @@
 #ifndef CLIENT_LINUX_MINIDUMP_WRITER_LINUX_PTRACE_DUMPER_H_
 #define CLIENT_LINUX_MINIDUMP_WRITER_LINUX_PTRACE_DUMPER_H_
 
-#include "client/linux/minidump_writer/linux_dumper.h"
+#include "google-breakpad/client/linux/minidump_writer/linux_dumper.h"
 
 namespace google_breakpad {
 

--- client/linux/minidump_writer/minidump_writer.h	
+++ client/linux/minidump_writer/minidump_writer.h	
@@ -36,8 +36,8 @@
 #include <list>
 #include <utility>
 
-#include "client/linux/minidump_writer/linux_dumper.h"
-#include "google_breakpad/common/minidump_format.h"
+#include "google-breakpad/client/linux/minidump_writer/linux_dumper.h"
+#include "google-breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
 

--- client/linux/minidump_writer/minidump_writer_unittest_utils.h	
+++ client/linux/minidump_writer/minidump_writer_unittest_utils.h	
@@ -35,7 +35,7 @@
 
 #include <string>
 
-#include "common/using_std_string.h"
+#include "google-breakpad/common/using_std_string.h"
 
 namespace google_breakpad {
 

--- common/byte_cursor.h	
+++ common/byte_cursor.h	
@@ -45,7 +45,7 @@
 #include <string.h>
 #include <string>
 
-#include "common/using_std_string.h"
+#include "google-breakpad/common/using_std_string.h"
 
 namespace google_breakpad {
 

--- common/dwarf_cfi_to_module.h	
+++ common/dwarf_cfi_to_module.h	
@@ -46,9 +46,9 @@
 #include <string>
 #include <vector>
 
-#include "common/module.h"
-#include "common/dwarf/dwarf2reader.h"
-#include "common/using_std_string.h"
+#include "google-breakpad/common/module.h"
+#include "google-breakpad/common/dwarf/dwarf2reader.h"
+#include "google-breakpad/common/using_std_string.h"
 
 namespace google_breakpad {
 

--- common/dwarf_cu_to_module.h	
+++ common/dwarf_cu_to_module.h	
@@ -41,12 +41,12 @@
 
 #include <string>
 
-#include "common/language.h"
-#include "common/module.h"
-#include "common/dwarf/bytereader.h"
-#include "common/dwarf/dwarf2diehandler.h"
-#include "common/dwarf/dwarf2reader.h"
-#include "common/using_std_string.h"
+#include "google-breakpad/common/language.h"
+#include "google-breakpad/common/module.h"
+#include "google-breakpad/common/dwarf/bytereader.h"
+#include "google-breakpad/common/dwarf/dwarf2diehandler.h"
+#include "google-breakpad/common/dwarf/dwarf2reader.h"
+#include "google-breakpad/common/using_std_string.h"
 
 namespace google_breakpad {
 

--- common/dwarf_line_to_module.h	
+++ common/dwarf_line_to_module.h	
@@ -40,9 +40,9 @@
 
 #include <string>
 
-#include "common/module.h"
-#include "common/dwarf/dwarf2reader.h"
-#include "common/using_std_string.h"
+#include "google-breakpad/common/module.h"
+#include "google-breakpad/common/dwarf/dwarf2reader.h"
+#include "google-breakpad/common/using_std_string.h"
 
 namespace google_breakpad {
 

--- common/language.h	
+++ common/language.h	
@@ -40,7 +40,7 @@
 
 #include <string>
 
-#include "common/using_std_string.h"
+#include "google-breakpad/common/using_std_string.h"
 
 namespace google_breakpad {
 

--- common/memory.h	
+++ common/memory.h	
@@ -41,7 +41,7 @@
 #define sys_munmap munmap
 #define MAP_ANONYMOUS MAP_ANON
 #else
-#include "third_party/lss/linux_syscall_support.h"
+#include "google-breakpad/lss/linux_syscall_support.h"
 #endif
 
 namespace google_breakpad {

--- common/memory_range.h	
+++ common/memory_range.h	
@@ -36,7 +36,7 @@
 
 #include <stddef.h>
 
-#include "google_breakpad/common/breakpad_types.h"
+#include "google-breakpad/common/breakpad_types.h"
 
 namespace google_breakpad {
 

--- common/minidump_exception_linux.h	
+++ common/minidump_exception_linux.h	
@@ -41,7 +41,7 @@
 
 #include <stddef.h>
 
-#include "google_breakpad/common/breakpad_types.h"
+#include "google-breakpad/common/breakpad_types.h"
 
 
 /* For (MDException).exception_code.  These values come from bits/signum.h.

--- common/minidump_exception_mac.h	
+++ common/minidump_exception_mac.h	
@@ -41,7 +41,7 @@
 
 #include <stddef.h>
 
-#include "google_breakpad/common/breakpad_types.h"
+#include "google-breakpad/common/breakpad_types.h"
 
 /* For (MDException).exception_code.  Breakpad minidump extension for Mac OS X
  * support.  Based on Darwin/Mac OS X' mach/exception_types.h.  This is

--- common/minidump_exception_solaris.h	
+++ common/minidump_exception_solaris.h	
@@ -41,7 +41,7 @@
 
 #include <stddef.h>
 
-#include "google_breakpad/common/breakpad_types.h"
+#include "google-breakpad/common/breakpad_types.h"
 
 /* For (MDException).exception_code.  These values come from sys/iso/signal_iso.h
  */

--- common/minidump_exception_win32.h	
+++ common/minidump_exception_win32.h	
@@ -41,7 +41,7 @@
 
 #include <stddef.h>
 
-#include "google_breakpad/common/breakpad_types.h"
+#include "google-breakpad/common/breakpad_types.h"
 
 
 /* For (MDException).exception_code.  These values come from WinBase.h

--- common/minidump_format.h	
+++ common/minidump_format.h	
@@ -63,7 +63,7 @@
 
 #include <stddef.h>
 
-#include "google_breakpad/common/breakpad_types.h"
+#include "google-breakpad/common/breakpad_types.h"
 
 
 #if defined(_MSC_VER)

--- common/minidump_size.h	
+++ common/minidump_size.h	
@@ -37,7 +37,7 @@
 
 #include <sys/types.h>
 
-#include "google_breakpad/common/minidump_format.h"
+#include "google-breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
 

--- common/module.h	
+++ common/module.h	
@@ -44,8 +44,8 @@
 #include <string>
 #include <vector>
 
-#include "common/using_std_string.h"
-#include "google_breakpad/common/breakpad_types.h"
+#include "google-breakpad/common/using_std_string.h"
+#include "google-breakpad/common/breakpad_types.h"
 
 namespace google_breakpad {
 

--- common/stabs_reader.h	
+++ common/stabs_reader.h	
@@ -63,8 +63,8 @@
 #include <string>
 #include <vector>
 
-#include "common/byte_cursor.h"
-#include "common/using_std_string.h"
+#include "google-breakpad/common/byte_cursor.h"
+#include "google-breakpad/common/using_std_string.h"
 
 namespace google_breakpad {
 

--- common/stabs_to_module.h	
+++ common/stabs_to_module.h	
@@ -43,9 +43,9 @@
 #include <string>
 #include <vector>
 
-#include "common/module.h"
-#include "common/stabs_reader.h"
-#include "common/using_std_string.h"
+#include "google-breakpad/common/module.h"
+#include "google-breakpad/common/stabs_reader.h"
+#include "google-breakpad/common/using_std_string.h"
 
 namespace google_breakpad {
 

--- common/string_conversion.h	
+++ common/string_conversion.h	
@@ -35,8 +35,8 @@
 #include <string>
 #include <vector>
 
-#include "common/using_std_string.h"
-#include "google_breakpad/common/breakpad_types.h"
+#include "google-breakpad/common/using_std_string.h"
+#include "google-breakpad/common/breakpad_types.h"
 
 namespace google_breakpad {
   

--- common/test_assembler.h	
+++ common/test_assembler.h	
@@ -60,8 +60,8 @@
 #include <vector>
 #include <string>
 
-#include "common/using_std_string.h"
-#include "google_breakpad/common/breakpad_types.h"
+#include "google-breakpad/common/using_std_string.h"
+#include "google-breakpad/common/breakpad_types.h"
 
 namespace google_breakpad {