6 files changed, 17 insertions, 17 deletions
diff --git a/src/google/airbag_types.h b/src/google/airbag_types.h
index 758b09ed..027c367f 100644
--- a/src/google/airbag_types.h
+++ b/src/google/airbag_types.h
@@ -22,8 +22,8 @@
  *
  * Author: Mark Mentovai */
 
-#ifndef _AIRBAG_TYPES_H__
-#define _AIRBAG_TYPES_H__
+#ifndef GOOGLE_AIRBAG_TYPES_H__
+#define GOOGLE_AIRBAG_TYPES_H__
 
 
 #ifndef _WIN32
@@ -43,4 +43,4 @@ typedef unsigned __int64 u_int64_t;
 
 typedef u_int64_t airbag_time_t;
 
-#endif /* _AIRBAG_TYPES_H__ */
+#endif /* GOOGLE_AIRBAG_TYPES_H__ */
diff --git a/src/google/crash_report.h b/src/google/crash_report.h
index dd4bc916..96ba6f14 100644
--- a/src/google/crash_report.h
+++ b/src/google/crash_report.h
@@ -16,13 +16,13 @@
 // including data sent with the report and data derived by the minidump
 // processor (stack trace, etc.).
 
-#ifndef _CRASH_REPORT_H__
-#define _CRASH_REPORT_H__
+#ifndef GOOGLE_CRASH_REPORT_H__
+#define GOOGLE_CRASH_REPORT_H__
 
 #include <vector>
 #include <string>
-#include "airbag_types.h"
-#include "stack_frame.h"
+#include "google/airbag_types.h"
+#include "google/stack_frame.h"
 
 namespace google_airbag {
 
@@ -83,4 +83,4 @@ struct CrashReport {
 
 }  // namespace google_airbag
 
-#endif  // _CRASH_REPORT_H__
+#endif  // GOOGLE_CRASH_REPORT_H__
diff --git a/src/google/stack_frame.h b/src/google/stack_frame.h
index 1d06c972..dd3866fa 100644
--- a/src/google/stack_frame.h
+++ b/src/google/stack_frame.h
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _STACK_FRAME_H__
-#define _STACK_FRAME_H__
+#ifndef GOOGLE_STACK_FRAME_H__
+#define GOOGLE_STACK_FRAME_H__
 
 #include <vector>
-#include "airbag_types.h"
+#include "google/airbag_types.h"
 
 namespace google_airbag {
 
@@ -55,4 +55,4 @@ typedef std::vector<StackFrame> StackFrames;
 
 }  // namespace google_airbag
 
-#endif  // _STACK_FRAME_H__
+#endif  // GOOGLE_STACK_FRAME_H__
diff --git a/src/processor/source_line_resolver.cc b/src/processor/source_line_resolver.cc
index a99dc41f..6ee516ed 100644
--- a/src/processor/source_line_resolver.cc
+++ b/src/processor/source_line_resolver.cc
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <vector>
 #include <utility>
-#include "source_line_resolver.h"
+#include "processor/source_line_resolver.h"
 
 using std::map;
 using std::vector;
diff --git a/src/processor/source_line_resolver.h b/src/processor/source_line_resolver.h
index 97bfa1df..0d193894 100644
--- a/src/processor/source_line_resolver.h
+++ b/src/processor/source_line_resolver.h
@@ -16,8 +16,8 @@
 // It uses address map files produced by a compatible writer, e.g.
 // PDBSourceLineWriter.
 
-#ifndef _SOURCE_LINE_RESOLVER_H__
-#define _SOURCE_LINE_RESOLVER_H__
+#ifndef PROCESSOR_SOURCE_LINE_RESOLVER_H__
+#define PROCESSOR_SOURCE_LINE_RESOLVER_H__
 
 #include "config.h"
 #include <string>
@@ -85,4 +85,4 @@ class SourceLineResolver {
 
 } // namespace google_airbag
 
-#endif  // _SOLURCE_LINE_RESOLVER_H__
+#endif  // PROCESSOR_SOURCE_LINE_RESOLVER_H__
diff --git a/src/processor/source_line_resolver_unittest.cc b/src/processor/source_line_resolver_unittest.cc
index 8bfe662c..c47edce8 100644
--- a/src/processor/source_line_resolver_unittest.cc
+++ b/src/processor/source_line_resolver_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <stdio.h>
 #include <string>
-#include "source_line_resolver.h"
+#include "processor/source_line_resolver.h"
 
 using std::string;
 using google_airbag::SourceLineResolver;