diff --git a/src/poly/cxx_compat.h b/src/poly/cxx_compat.h
index f0ac6d8fb..080152245 100644
--- a/src/poly/cxx_compat.h
+++ b/src/poly/cxx_compat.h
@@ -7,8 +7,8 @@
  ******************************************************************************
  */
 
-#ifndef POLY_POLY_CXX_COMPAT_H_
-#define POLY_POLY_CXX_COMPAT_H_
+#ifndef POLY_CXX_COMPAT_H_
+#define POLY_CXX_COMPAT_H_
 
 #include <poly/config.h>
 
@@ -24,4 +24,4 @@
 
 namespace poly {}  // namespace poly
 
-#endif  // POLY_POLY_CXX_COMPAT_H_
+#endif  // POLY_CXX_COMPAT_H_
diff --git a/third_party/google-styleguide/cpplint/cpplint.py b/third_party/google-styleguide/cpplint/cpplint.py
index ebe576df4..d3159c627 100644
--- a/third_party/google-styleguide/cpplint/cpplint.py
+++ b/third_party/google-styleguide/cpplint/cpplint.py
@@ -1553,7 +1553,7 @@ def GetHeaderGuardCPPVariable(filename):
   fileinfo = FileInfo(filename)
   file_path_from_root = fileinfo.RepositoryName()
   if _root:
-    file_path_from_root = re.sub('^' + _root + os.sep, '', file_path_from_root)
+    file_path_from_root = re.sub('^' + _root + '\/', '', file_path_from_root)
   return re.sub(r'[-./\s]', '_', file_path_from_root).upper() + '_'