diff --git a/iwyu_ast_util.h b/iwyu_ast_util.h
index 3275acd..7a5cf34 100644
--- a/iwyu_ast_util.h
+++ b/iwyu_ast_util.h
@@ -9,8 +9,8 @@
 
 // Utilities that make it easier to work with Clang's AST.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_AST_UTIL_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_AST_UTIL_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_AST_UTIL_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_AST_UTIL_H_
 
 #include <map>                          // for map
 #include <set>                          // for set
@@ -803,4 +803,4 @@ clang::TemplateArgumentListInfo GetExplicitTplArgs(const clang::Expr* expr);
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_AST_UTIL_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_AST_UTIL_H_
diff --git a/iwyu_cache.h b/iwyu_cache.h
index 3671cd6..fa5f456 100644
--- a/iwyu_cache.h
+++ b/iwyu_cache.h
@@ -12,8 +12,8 @@
 // is the 'instantiation cache': when instantiating a template, what
 // methods are called, and what template arguments are fully used?
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_CACHE_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_CACHE_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_CACHE_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_CACHE_H_
 
 #include <map>                          // for map
 #include <set>                          // for set
@@ -169,4 +169,4 @@ class CacheStoringScope {
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_CACHE_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_CACHE_H_
diff --git a/iwyu_driver.h b/iwyu_driver.h
index 1efeb8e..73f5d26 100644
--- a/iwyu_driver.h
+++ b/iwyu_driver.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_DRIVER_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_DRIVER_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_DRIVER_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_DRIVER_H_
 
 namespace clang {
 class CompilerInstance;
@@ -22,4 +22,4 @@ clang::CompilerInstance* CreateCompilerInstance(int argc, const char **argv);
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_DRIVER_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_DRIVER_H_
diff --git a/iwyu_getopt.h b/iwyu_getopt.h
index 5cae8d8..1a0c697 100644
--- a/iwyu_getopt.h
+++ b/iwyu_getopt.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_GETOPT_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_GETOPT_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_GETOPT_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_GETOPT_H_
 
 #if defined(_MSC_VER)
 
@@ -38,4 +38,4 @@ int getopt_long(int argc, char* const argv[],
 
 #endif  // #if defined(_MSC_VER)
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_GETOPT_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_GETOPT_H_
diff --git a/iwyu_globals.h b/iwyu_globals.h
index 56a88aa..bbd02d0 100644
--- a/iwyu_globals.h
+++ b/iwyu_globals.h
@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 // The source manager is used in just too many places.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_GLOBALS_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_GLOBALS_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_GLOBALS_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_GLOBALS_H_
 
 #include <set>                          // for set
 #include <string>                       // for string
@@ -133,4 +133,4 @@ bool ShouldReportIWYUViolationsFor(const clang::FileEntry* file);
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_GLOBALS_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_GLOBALS_H_
diff --git a/iwyu_include_picker.h b/iwyu_include_picker.h
index ed40a16..387e044 100644
--- a/iwyu_include_picker.h
+++ b/iwyu_include_picker.h
@@ -41,8 +41,8 @@
 // converting from file-paths to #include paths, including, routines to
 // normalize a file-path to get rid of /usr/include/ prefixes.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_INCLUDE_PICKER_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_INCLUDE_PICKER_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_INCLUDE_PICKER_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_INCLUDE_PICKER_H_
 
 #include <map>                          // for map, map<>::value_compare
 #include <set>                          // for set
@@ -247,4 +247,4 @@ class IncludePicker {
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_INCLUDE_PICKER_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_INCLUDE_PICKER_H_
diff --git a/iwyu_lexer_utils.h b/iwyu_lexer_utils.h
index 279e3a6..3c5daf3 100644
--- a/iwyu_lexer_utils.h
+++ b/iwyu_lexer_utils.h
@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_LEXER_UTILS_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_LEXER_UTILS_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_LEXER_UTILS_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_LEXER_UTILS_H_
 
 #include <string>                       // for string
 #include <vector>                       // for vector
@@ -84,4 +84,4 @@ string GetTokenText(const clang::Token& token,
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_LEXER_UTILS_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_LEXER_UTILS_H_
diff --git a/iwyu_location_util.h b/iwyu_location_util.h
index af2b772..8e6e4e6 100644
--- a/iwyu_location_util.h
+++ b/iwyu_location_util.h
@@ -37,8 +37,8 @@
 // file path, line number, column number, and which file (if any)
 // #includes the file.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_FILE_UTIL_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_FILE_UTIL_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_LOCATION_UTIL_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_LOCATION_UTIL_H_
 
 #include <string>                       // for string
 
@@ -231,4 +231,4 @@ inline bool IsBeforeInSameFile(const T& a, const U& b) {
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_FILE_UTIL_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_LOCATION_UTIL_H_
diff --git a/iwyu_output.h b/iwyu_output.h
index 71b3f37..7d69045 100644
--- a/iwyu_output.h
+++ b/iwyu_output.h
@@ -13,8 +13,8 @@
 // to sanitize symbol names, to emit desired include-lines properly,
 // etc.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_OUTPUT_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_OUTPUT_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_OUTPUT_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_OUTPUT_H_
 
 #include <map>                          // for map
 #include <set>                          // for set
@@ -378,4 +378,4 @@ class FakeNamedDecl : public clang::NamedDecl {
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_OUTPUT_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_OUTPUT_H_
diff --git a/iwyu_path_util.h b/iwyu_path_util.h
index 1359de8..33ee9fb 100644
--- a/iwyu_path_util.h
+++ b/iwyu_path_util.h
@@ -9,8 +9,8 @@
 
 // File-path utilities for the IWYU checker.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_PATH_UTIL_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_PATH_UTIL_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_PATH_UTIL_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_PATH_UTIL_H_
 
 #include <string>                       // for string, allocator, etc
 #include <vector>
@@ -88,4 +88,4 @@ bool IsThirdPartyFile(string quoted_path);
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_PATH_UTIL_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_PATH_UTIL_H_
diff --git a/iwyu_preprocessor.h b/iwyu_preprocessor.h
index 27a5982..3aaaf24 100644
--- a/iwyu_preprocessor.h
+++ b/iwyu_preprocessor.h
@@ -55,8 +55,8 @@
 //      of the information about public vs private headers.
 //    * Testing and reporting membership in the main compilation unit.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_PREPROCESSOR_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_PREPROCESSOR_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_PREPROCESSOR_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_PREPROCESSOR_H_
 
 #include <map>                          // for map
 #include <set>                          // for set
@@ -361,4 +361,4 @@ class IwyuPreprocessorInfo : public clang::PPCallbacks,
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_PREPROCESSOR_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_PREPROCESSOR_H_
diff --git a/iwyu_stl_util.h b/iwyu_stl_util.h
index f156886..a0ada81 100644
--- a/iwyu_stl_util.h
+++ b/iwyu_stl_util.h
@@ -9,8 +9,8 @@
 
 // Utilities that make it easier to work with STL.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_STL_UTIL_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_STL_UTIL_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_STL_UTIL_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_STL_UTIL_H_
 
 #include <stddef.h>                     // for NULL
 #include <algorithm>                    // for find
@@ -237,4 +237,4 @@ class Each : public Each<pair<const Key, Value> > {
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_STL_UTIL_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_STL_UTIL_H_
diff --git a/iwyu_string_util.h b/iwyu_string_util.h
index a414851..cc1d5eb 100644
--- a/iwyu_string_util.h
+++ b/iwyu_string_util.h
@@ -10,8 +10,8 @@
 // String utilities for the IWYU checker.
 //
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_STRING_UTIL_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_STRING_UTIL_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_STRING_UTIL_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_STRING_UTIL_H_
 
 #include <ctype.h>
 #include <stddef.h>
@@ -203,4 +203,4 @@ inline vector<string> SplitOnWhiteSpacePreservingQuotes(
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_STRING_UTIL_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_STRING_UTIL_H_
diff --git a/iwyu_verrs.h b/iwyu_verrs.h
index 4160454..7455f0e 100644
--- a/iwyu_verrs.h
+++ b/iwyu_verrs.h
@@ -9,8 +9,8 @@
 
 // This module controls logging and verbosity levels for include-what-you-use.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_VERRS_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_VERRS_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_VERRS_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_VERRS_H_
 
 #include "llvm/Support/raw_ostream.h"
 
@@ -42,4 +42,4 @@ bool ShouldPrintSymbolFromFile(const clang::FileEntry* file);
 
 }  // namespace include_what_you_use
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_VERRS_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_VERRS_H_
diff --git a/iwyu_version.h b/iwyu_version.h
index 719b426..85c12a9 100644
--- a/iwyu_version.h
+++ b/iwyu_version.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_VERSION_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_VERSION_H_
+#ifndef INCLUDE_WHAT_YOU_USE_IWYU_VERSION_H_
+#define INCLUDE_WHAT_YOU_USE_IWYU_VERSION_H_
 
 #define IWYU_VERSION_STRING "0.7"
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_IWYU_VERSION_H_
+#endif  // INCLUDE_WHAT_YOU_USE_IWYU_VERSION_H_
diff --git a/port.h b/port.h
index 379b5a7..8127c7a 100644
--- a/port.h
+++ b/port.h
@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 // Source file for architecture-specific logic.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_PORT_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_PORT_H_
+#ifndef INCLUDE_WHAT_YOU_USE_PORT_H_
+#define INCLUDE_WHAT_YOU_USE_PORT_H_
 
 #include <stdlib.h>  // for abort
 #include <iostream>
@@ -87,4 +87,4 @@ inline bool GlobMatchesPath(const char *glob, const char *path) {
 
 #endif  // #if defined(_WIN32)
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_PORT_H_
+#endif  // INCLUDE_WHAT_YOU_USE_PORT_H_
diff --git a/tests/cxx/badinc-d1.h b/tests/cxx/badinc-d1.h
index 46c76e0..eb566c8 100644
--- a/tests/cxx/badinc-d1.h
+++ b/tests/cxx/badinc-d1.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_D1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_D1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_D1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_D1_H_
 
 #include <stdlib.h>
 #include <errno.h>    // not used, but iwyu shouldn't warn about that
@@ -105,4 +105,4 @@ D1_CopyClass D1CopyClassFn(I1_Enum i) {
 D1_Enum d1_d1_enum;
 I1_Class d1_i1_class;
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_D1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_D1_H_
diff --git a/tests/cxx/badinc-d2.h b/tests/cxx/badinc-d2.h
index ede137f..c3c0ff3 100644
--- a/tests/cxx/badinc-d2.h
+++ b/tests/cxx/badinc-d2.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_D2_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_D2_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_D2_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_D2_H_
 
 // Forward-declare classes from badinc-i1.h before #including them.
 // This tests that we find the real class definition, not the
@@ -56,4 +56,4 @@ I2_Enum D2_Function(D2_Class* c) {
 
 class D2_ForwardDeclareClass;
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_D2_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_D2_H_
diff --git a/tests/cxx/badinc-d3.h b/tests/cxx/badinc-d3.h
index d0c5ccb..b128a5e 100644
--- a/tests/cxx/badinc-d3.h
+++ b/tests/cxx/badinc-d3.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_D3_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_D3_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_D3_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_D3_H_
 
 #include <stdio.h>
 #include "tests/cxx/badinc-i3.h"
@@ -23,4 +23,4 @@ D3_Enum D3_Function(d3_namespace::D3_Struct* c) {
   return D31;
 }
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_D3_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_D3_H_
diff --git a/tests/cxx/badinc-d4.h b/tests/cxx/badinc-d4.h
index 8488f2e..c2e71d9 100644
--- a/tests/cxx/badinc-d4.h
+++ b/tests/cxx/badinc-d4.h
@@ -11,8 +11,8 @@
 // badinc.cc only uses D4_ClassForOperator as a reference,
 // we still need to #include this file to get operator<<.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_D4_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_D4_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_D4_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_D4_H_
 
 class D4_ClassForOperator {
  public:
@@ -23,4 +23,4 @@ int operator<<(int i, const D4_ClassForOperator& d4) {
   return i;
 }
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_D4_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_D4_H_
diff --git a/tests/cxx/badinc-i1.h b/tests/cxx/badinc-i1.h
index e786526..1d3b12b 100644
--- a/tests/cxx/badinc-i1.h
+++ b/tests/cxx/badinc-i1.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I1_H_
 
 #include <stddef.h>  // For offsetof (in badinc.cc).
 #include <stdlib.h>  // also included from badinc-d1.h -- before this file
@@ -287,4 +287,4 @@ namespace i1_ns4 { namespace i1_subns { int i1_int_global4sub; } }
 namespace i1_ns5 { int i1_unused_global; }
 int i1_GlobalFunction(void) { return 1; }
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I1_H_
diff --git a/tests/cxx/badinc-i2-inl.h b/tests/cxx/badinc-i2-inl.h
index 48d4461..f196ab4 100644
--- a/tests/cxx/badinc-i2-inl.h
+++ b/tests/cxx/badinc-i2-inl.h
@@ -12,8 +12,8 @@
 // sure that badinc.cc realizes it needs these definitios, and not
 // just the declarations in badinc-i2.h.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I2_INL_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I2_INL_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I2_INL_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I2_INL_H_
 
 #include "tests/cxx/badinc-i2.h"
 
@@ -71,4 +71,4 @@ template<> int InlFileFreeTemplateFn<int>() {
 
 int inlfile_var;
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I2_INL_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I2_INL_H_
diff --git a/tests/cxx/badinc-i2.h b/tests/cxx/badinc-i2.h
index a1e8de0..421ca61 100644
--- a/tests/cxx/badinc-i2.h
+++ b/tests/cxx/badinc-i2.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I2_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I2_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I2_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I2_H_
 
 #include <vector>
 #include <list>    // I only ever use a pointer to stuff in this file
@@ -143,4 +143,4 @@ extern int inlfile_var;   // defined in badinc-d1-inl.h
   # define MACRO_CALLING_I2_FUNCTION  I2_Function(NULL)
 #endif
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I2_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I2_H_
diff --git a/tests/cxx/badinc-i3.h b/tests/cxx/badinc-i3.h
index fd37db3..9866635 100644
--- a/tests/cxx/badinc-i3.h
+++ b/tests/cxx/badinc-i3.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I3_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I3_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I3_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I3_H_
 
 // I only forward-declare things from this file.
 
@@ -58,4 +58,4 @@ struct I3_ForwardDeclareNamespaceTemplateStruct {
 }
 }
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I3_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I3_H_
diff --git a/tests/cxx/badinc-i4.h b/tests/cxx/badinc-i4.h
index aacac72..0a90c51 100644
--- a/tests/cxx/badinc-i4.h
+++ b/tests/cxx/badinc-i4.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I4_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I4_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I4_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I4_H_
 
 int I4_Function() { return 1; }
 
-#endif // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I4_H_
+#endif // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I4_H_
diff --git a/tests/cxx/badinc-i5.h b/tests/cxx/badinc-i5.h
index 183767e..3c240de 100644
--- a/tests/cxx/badinc-i5.h
+++ b/tests/cxx/badinc-i5.h
@@ -11,10 +11,10 @@
 // included in real life (it's protected by '#if 0').  We want
 // to make sure we don't take these macros seriously.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I5_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I5_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I5_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I5_H_
 
 #define hash_map map
 #define printf   fabs
 
-#endif // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I5_H_
+#endif // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I5_H_
diff --git a/tests/cxx/badinc-i6.h b/tests/cxx/badinc-i6.h
index 7facf7f..7304df2 100644
--- a/tests/cxx/badinc-i6.h
+++ b/tests/cxx/badinc-i6.h
@@ -11,9 +11,9 @@
 // macros from other files.  It's used to test a second codepath for
 // the macro handling code (the "some more macro handling" in iwyu.js).
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I6_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I6_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I6_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I6_H_
 
 int I6_Function() { return 1; }
 
-#endif // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_I6_H_
+#endif // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_I6_H_
diff --git a/tests/cxx/badinc-inl.h b/tests/cxx/badinc-inl.h
index 99a0944..58c5147 100644
--- a/tests/cxx/badinc-inl.h
+++ b/tests/cxx/badinc-inl.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_INL_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_INL_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_INL_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_INL_H_
 
 #include <locale.h>   // the way to get NULL without size_t
 #include "tests/cxx/badinc-private.h"
@@ -22,7 +22,7 @@ InlH_FunctionPtr InlH_Function(class InlH_Class* c=NULL) {
 
 HPrivate_Enum InlH_PrivateFunction() { return HP1; }
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_INL_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_INL_H_
 
 
 /**** IWYU_SUMMARY
diff --git a/tests/cxx/badinc-private.h b/tests/cxx/badinc-private.h
index 0e67bbb..89ee461 100644
--- a/tests/cxx/badinc-private.h
+++ b/tests/cxx/badinc-private.h
@@ -10,9 +10,9 @@
 // This is a 'private' header file re-exported by badinc-inl.h
 // (the relevant mapping is in iwyu_include_picker.cc).
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_PRIVATE_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_PRIVATE_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_PRIVATE_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_PRIVATE_H_
 
 enum HPrivate_Enum { HP1, HP2, HP3 };
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_PRIVATE_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_PRIVATE_H_
diff --git a/tests/cxx/badinc-private2.h b/tests/cxx/badinc-private2.h
index 44eb959..b6a7dc9 100644
--- a/tests/cxx/badinc-private2.h
+++ b/tests/cxx/badinc-private2.h
@@ -11,9 +11,9 @@
 // (the relevant mapping is in iwyu_include_picker.cc),
 // that badinc-inl.h never uses any symbols from.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_PRIVATE2_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_PRIVATE2_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_PRIVATE2_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_PRIVATE2_H_
 
 #define UNUSED_BADINC_PRIVATE2_MACRO  true
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_PRIVATE2_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_PRIVATE2_H_
diff --git a/tests/cxx/badinc.h b/tests/cxx/badinc.h
index eac2a70..c20dd33 100644
--- a/tests/cxx/badinc.h
+++ b/tests/cxx/badinc.h
@@ -8,8 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_H_
 
 #include <ctype.h>  // used only in badinc.cc
 #include <errno.h>  // used both here and in badinc.cc
@@ -374,7 +374,7 @@ H_TemplateClass<I2_Enum> h_i2_template_class(I22);
 H_TemplateTemplateClass<> h_templatetemlpate_class;
 H_TemplateTemplateClass<H_TemplateClass> h_i2_templatetemlpate_class;
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_BADINC_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_BADINC_H_
 
 
 /**** IWYU_SUMMARY
diff --git a/tests/cxx/catch-byptr.h b/tests/cxx/catch-byptr.h
index 677c343..746aaba 100644
--- a/tests/cxx/catch-byptr.h
+++ b/tests/cxx/catch-byptr.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_BYPTR_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_BYPTR_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_BYPTR_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_BYPTR_H_
 
 class CatchByPtr {};
 
-#endif // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_BYPTR_H_
+#endif // INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_BYPTR_H_
diff --git a/tests/cxx/catch-byref.h b/tests/cxx/catch-byref.h
index 196cd7c..0ecb47f 100644
--- a/tests/cxx/catch-byref.h
+++ b/tests/cxx/catch-byref.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_BYREF_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_BYREF_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_BYREF_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_BYREF_H_
 
 class CatchByRef {};
 
-#endif // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_BYREF_H_
+#endif // INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_BYREF_H_
diff --git a/tests/cxx/catch-byvalue.h b/tests/cxx/catch-byvalue.h
index 24c5577..1b492d6 100644
--- a/tests/cxx/catch-byvalue.h
+++ b/tests/cxx/catch-byvalue.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_BYVALUE_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_BYVALUE_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_BYVALUE_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_BYVALUE_H_
 
 class CatchByValue {};
 
-#endif // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_BYVALUE_H_
+#endif // INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_BYVALUE_H_
diff --git a/tests/cxx/catch-elab.h b/tests/cxx/catch-elab.h
index e114212..b452eaf 100644
--- a/tests/cxx/catch-elab.h
+++ b/tests/cxx/catch-elab.h
@@ -7,11 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_ELAB_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_ELAB_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_ELAB_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_ELAB_H_
 
 namespace Namespace {
 class CatchElab {};
 }
 
-#endif // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_ELAB_H_
+#endif // INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_ELAB_H_
diff --git a/tests/cxx/catch-exceptions.h b/tests/cxx/catch-exceptions.h
index 9bd9259..a46af7c 100644
--- a/tests/cxx/catch-exceptions.h
+++ b/tests/cxx/catch-exceptions.h
@@ -10,8 +10,8 @@
 // Facade header for exception types. We include this in catch.cc to provoke
 // IWYU warnings and replacements.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_EXCEPTIONS_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_EXCEPTIONS_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_EXCEPTIONS_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_EXCEPTIONS_H_
 
 #include "tests/cxx/catch-byptr.h"    // for CatchByPtr
 #include "tests/cxx/catch-byref.h"    // for CatchByRef
@@ -22,4 +22,4 @@
 
 #include <stdio.h>
 
-#endif // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_EXCEPTIONS_H_
+#endif // INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_EXCEPTIONS_H_
diff --git a/tests/cxx/catch-logex.h b/tests/cxx/catch-logex.h
index 50174a5..84dc919 100644
--- a/tests/cxx/catch-logex.h
+++ b/tests/cxx/catch-logex.h
@@ -7,12 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_LOGEX_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_LOGEX_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_LOGEX_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_LOGEX_H_
 
 template<class ExceptionType>
 inline void LogException(const ExceptionType&) {
   // log exception
 }
 
-#endif // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_LOGEX_H_
+#endif // INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_LOGEX_H_
diff --git a/tests/cxx/catch-thrown.h b/tests/cxx/catch-thrown.h
index fd8df18..9f8f24d 100644
--- a/tests/cxx/catch-thrown.h
+++ b/tests/cxx/catch-thrown.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_THROWN_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_THROWN_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_THROWN_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_THROWN_H_
 
 class Thrown {};
 
-#endif // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_CATCH_THROWN_H_
+#endif // INCLUDE_WHAT_YOU_USE_TESTS_CXX_CATCH_THROWN_H_
diff --git a/tests/cxx/check_also-d1.h b/tests/cxx/check_also-d1.h
index e0bc3a2..b0e3a36 100644
--- a/tests/cxx/check_also-d1.h
+++ b/tests/cxx/check_also-d1.h
@@ -9,15 +9,15 @@
 
 // Tests the '--check_also' flag.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_CHECK_ALSO_D1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_CHECK_ALSO_D1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_CHECK_ALSO_D1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_CHECK_ALSO_D1_H_
 
 #include "check_also-i1.h"
 
 // IWYU: NULL is...*<stddef.h>
 int* unused = NULL;   // NULL comes from check_also-i1.h
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_CHECK_ALSO_D1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_CHECK_ALSO_D1_H_
 
 /**** IWYU_SUMMARY
 
diff --git a/tests/cxx/check_also-i1.h b/tests/cxx/check_also-i1.h
index 4593688..1009c0e 100644
--- a/tests/cxx/check_also-i1.h
+++ b/tests/cxx/check_also-i1.h
@@ -9,11 +9,11 @@
 
 // Tests the '--check_also' flag.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_CHECK_ALSO_I1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_CHECK_ALSO_I1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_CHECK_ALSO_I1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_CHECK_ALSO_I1_H_
 
 #include <stddef.h>   // for NULL
 
 const int kI1 = 1;
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_CHECK_ALSO_I1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_CHECK_ALSO_I1_H_
diff --git a/tests/cxx/check_also-n1.h b/tests/cxx/check_also-n1.h
index 5d4f7e4..cfa1cae 100644
--- a/tests/cxx/check_also-n1.h
+++ b/tests/cxx/check_also-n1.h
@@ -12,11 +12,11 @@
 // This file is identical to check_also-d1.h, but has no iwyu summary,
 // since 'n1.h' isn't part of the --see_also glob.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_CHECK_ALSO_D1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_CHECK_ALSO_D1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_CHECK_ALSO_D1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_CHECK_ALSO_D1_H_
 
 #include "check_also-i1.h"
 
 int* unused = NULL;   // NULL comes from check_also-i1.h
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_CHECK_ALSO_D1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_CHECK_ALSO_D1_H_
diff --git a/tests/cxx/comment_pragmas-d1.h b/tests/cxx/comment_pragmas-d1.h
index 296d8e6..1aa0f34 100644
--- a/tests/cxx/comment_pragmas-d1.h
+++ b/tests/cxx/comment_pragmas-d1.h
@@ -7,11 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D1_H_
 
 #include "tests/cxx/comment_pragmas-i1.h"
 #include "tests/cxx/comment_pragmas-i6.h"
 #include "tests/cxx/comment_pragmas-i7.h"
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D1_H_
diff --git a/tests/cxx/comment_pragmas-d10.h b/tests/cxx/comment_pragmas-d10.h
index ef69ca5..13bb1a5 100644
--- a/tests/cxx/comment_pragmas-d10.h
+++ b/tests/cxx/comment_pragmas-d10.h
@@ -15,9 +15,9 @@
  *  @headername{some_system_header_file, some_other_sytem_header_file}
  */
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D10_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D10_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D10_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D10_H_
 
 #include "tests/cxx/comment_pragmas-i9.h"
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D10_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D10_H_
diff --git a/tests/cxx/comment_pragmas-d11.h b/tests/cxx/comment_pragmas-d11.h
index 93c0abd..707b506 100644
--- a/tests/cxx/comment_pragmas-d11.h
+++ b/tests/cxx/comment_pragmas-d11.h
@@ -9,12 +9,12 @@
 
 // This is a private file included directly by comment_pragmas.cc.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D11_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D11_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D11_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D11_H_
 
 // Note: there is no file no_such_file2.h. It isn't needed for this test.
 // IWYU pragma: private, include "tests/cxx/no_such_file2.h"
 // IWYU pragma: friend tests/cxx/comment_pragmas.cc
 class CommentPragmasD11 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D11_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D11_H_
diff --git a/tests/cxx/comment_pragmas-d12.h b/tests/cxx/comment_pragmas-d12.h
index 392b403..53012bd 100644
--- a/tests/cxx/comment_pragmas-d12.h
+++ b/tests/cxx/comment_pragmas-d12.h
@@ -9,11 +9,11 @@
 
 // This is a private file included directly by comment_pragmas.cc.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D12_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D12_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D12_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D12_H_
 
 // IWYU pragma: private
 // IWYU pragma: friend tests/cxx/comment_pragmas.cc
 class CommentPragmasD12 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D12_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D12_H_
diff --git a/tests/cxx/comment_pragmas-d13.h b/tests/cxx/comment_pragmas-d13.h
index 75697c0..84453d4 100644
--- a/tests/cxx/comment_pragmas-d13.h
+++ b/tests/cxx/comment_pragmas-d13.h
@@ -9,9 +9,9 @@
 
 // This is a private file included directly by comment_pragmas.cc.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D13_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D13_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D13_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D13_H_
 
 #include "tests/cxx/comment_pragmas-i10.h"  // IWYU pragma: export
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D13_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D13_H_
diff --git a/tests/cxx/comment_pragmas-d14.h b/tests/cxx/comment_pragmas-d14.h
index 59a9679..959808a 100644
--- a/tests/cxx/comment_pragmas-d14.h
+++ b/tests/cxx/comment_pragmas-d14.h
@@ -8,12 +8,12 @@
 //===----------------------------------------------------------------------===//
 
 // A public header file exporting the symbol CommentPragmasD14.
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D14_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D14_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D14_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D14_H_
 
 // IWYU pragma: private
 // IWYU pragma: friend nobody
 
 class CommentPragmasD14 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D14_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D14_H_
diff --git a/tests/cxx/comment_pragmas-d15.h b/tests/cxx/comment_pragmas-d15.h
index cb766bf..b38781b 100644
--- a/tests/cxx/comment_pragmas-d15.h
+++ b/tests/cxx/comment_pragmas-d15.h
@@ -8,9 +8,9 @@
 //===----------------------------------------------------------------------===//
 
 // A public header file exporting the symbol CommentPragmasD15.
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D15_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D15_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D15_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D15_H_
 
 class CommentPragmasD15 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D15_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D15_H_
diff --git a/tests/cxx/comment_pragmas-d16.h b/tests/cxx/comment_pragmas-d16.h
index 55b53ed..7e9cf49 100644
--- a/tests/cxx/comment_pragmas-d16.h
+++ b/tests/cxx/comment_pragmas-d16.h
@@ -9,9 +9,9 @@
 
 // This is a private file included directly by comment_pragmas.cc.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D16_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D16_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D16_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D16_H_
 
 #include "tests/cxx/comment_pragmas-i11.h"  /* IWYU pragma: export */
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D16_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D16_H_
diff --git a/tests/cxx/comment_pragmas-d17.h b/tests/cxx/comment_pragmas-d17.h
index ed87668..85e42b7 100644
--- a/tests/cxx/comment_pragmas-d17.h
+++ b/tests/cxx/comment_pragmas-d17.h
@@ -9,11 +9,11 @@
 
 // This is a private file included directly by comment_pragmas.cc.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D17_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D17_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D17_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D17_H_
 
 // Note: there is no file no_such_file_d17.h. It isn't needed for this test.
 // IWYU pragma: private, include "tests/cxx/no_such_file_d17.h"
 class CommentPragmasD17 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D17_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D17_H_
diff --git a/tests/cxx/comment_pragmas-d18.h b/tests/cxx/comment_pragmas-d18.h
index 6bdc342..e4dc1dc 100644
--- a/tests/cxx/comment_pragmas-d18.h
+++ b/tests/cxx/comment_pragmas-d18.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D18_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D18_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D18_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D18_H_
 
 class CommentPragmasD18 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D18_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D18_H_
diff --git a/tests/cxx/comment_pragmas-d19.h b/tests/cxx/comment_pragmas-d19.h
index d09339c..e2b5af0 100644
--- a/tests/cxx/comment_pragmas-d19.h
+++ b/tests/cxx/comment_pragmas-d19.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D19_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D19_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D19_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D19_H_
 
 class CommentPragmasD19 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D19_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D19_H_
diff --git a/tests/cxx/comment_pragmas-d2.h b/tests/cxx/comment_pragmas-d2.h
index 4a4a123..1fa67d7 100644
--- a/tests/cxx/comment_pragmas-d2.h
+++ b/tests/cxx/comment_pragmas-d2.h
@@ -9,12 +9,12 @@
 
 // This is a private file included directly by comment_pragmas.cc.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D2_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D2_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D2_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D2_H_
 
 // Note: there is no file no_such_file.h. It isn't needed for this test.
 // IWYU pragma: private, include "tests/cxx/no_such_file.h"
 
 class CommentPragmasD2 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D2_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D2_H_
diff --git a/tests/cxx/comment_pragmas-d20.h b/tests/cxx/comment_pragmas-d20.h
index 3a95a6a..37861bc 100644
--- a/tests/cxx/comment_pragmas-d20.h
+++ b/tests/cxx/comment_pragmas-d20.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D20_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D20_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D20_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D20_H_
 
 namespace { class CommentPragmasD20a {}; }
 
@@ -16,4 +16,4 @@ namespace Foo { namespace { class CommentPragmasD20b {}; } }
 
 namespace { class CommentPragmasD20c {}; }
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D20_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D20_H_
diff --git a/tests/cxx/comment_pragmas-d21.h b/tests/cxx/comment_pragmas-d21.h
index 9e83d5e..872041b 100644
--- a/tests/cxx/comment_pragmas-d21.h
+++ b/tests/cxx/comment_pragmas-d21.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D21_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D21_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D21_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D21_H_
 
 class CommentPragmasD21 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D21_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D21_H_
diff --git a/tests/cxx/comment_pragmas-d22.h b/tests/cxx/comment_pragmas-d22.h
index db69513..975d79f 100644
--- a/tests/cxx/comment_pragmas-d22.h
+++ b/tests/cxx/comment_pragmas-d22.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D22_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D22_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D22_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D22_H_
 
 class CommentPragmasD22 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D22_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D22_H_
diff --git a/tests/cxx/comment_pragmas-d3.h b/tests/cxx/comment_pragmas-d3.h
index 1bb7f52..b336d45 100644
--- a/tests/cxx/comment_pragmas-d3.h
+++ b/tests/cxx/comment_pragmas-d3.h
@@ -9,12 +9,12 @@
 
 // This is a private file included directly by comment_pragmas.cc.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D3_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D3_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D3_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D3_H_
 
 // NOTE: comment_pragmas-i6.h explicitly exports this file.
 // IWYU pragma: private, include "tests/cxx/comment_pragmas-i6.h"
 
 class CommentPragmasD3 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D3_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D3_H_
diff --git a/tests/cxx/comment_pragmas-d4.h b/tests/cxx/comment_pragmas-d4.h
index 7d218c7..63d6719 100644
--- a/tests/cxx/comment_pragmas-d4.h
+++ b/tests/cxx/comment_pragmas-d4.h
@@ -9,12 +9,12 @@
 
 // This is a private file included directly by comment_pragmas.cc.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D4_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D4_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D4_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D4_H_
 
 // NOTE: comment_pragmas-i7.h includes but doesn't export this file.
 // IWYU pragma: private, include "tests/cxx/comment_pragmas-i7.h"
 
 class CommentPragmasD4 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D4_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D4_H_
diff --git a/tests/cxx/comment_pragmas-d5.h b/tests/cxx/comment_pragmas-d5.h
index 68a6de8..b70502a 100644
--- a/tests/cxx/comment_pragmas-d5.h
+++ b/tests/cxx/comment_pragmas-d5.h
@@ -10,7 +10,7 @@
 // This is a file needlessly included directly by comment_pragmas.cc
 // with a "keep" pragma.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D5_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D5_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D5_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D5_H_
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D5_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D5_H_
diff --git a/tests/cxx/comment_pragmas-d6.h b/tests/cxx/comment_pragmas-d6.h
index 6aa4a4b..8cf8f15 100644
--- a/tests/cxx/comment_pragmas-d6.h
+++ b/tests/cxx/comment_pragmas-d6.h
@@ -10,9 +10,9 @@
 // This is a file included directly by comment_pragmas.cc with a
 // "keep" pragma.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D6_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D6_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D6_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D6_H_
 
 #include "tests/cxx/comment_pragmas-i8.h"
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D6_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D6_H_
diff --git a/tests/cxx/comment_pragmas-d7.h b/tests/cxx/comment_pragmas-d7.h
index fcc6a89..ea5ffdf 100644
--- a/tests/cxx/comment_pragmas-d7.h
+++ b/tests/cxx/comment_pragmas-d7.h
@@ -15,8 +15,8 @@
 /*  @headername{missing_close_brace
 */
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D7_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D7_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D7_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D7_H_
 
 // IWYU: end_exports without a begin_exports
 // IWYU pragma: end_exports
@@ -32,4 +32,4 @@
 // IWYU: begin_exports without an end_exports
 // IWYU pragma: begin_exports
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D7_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D7_H_
diff --git a/tests/cxx/comment_pragmas-d8.h b/tests/cxx/comment_pragmas-d8.h
index ca98eae..28197ad 100644
--- a/tests/cxx/comment_pragmas-d8.h
+++ b/tests/cxx/comment_pragmas-d8.h
@@ -14,9 +14,9 @@
  *  Do not attempt to use it directly. @headername{some_system_header_file}
  */
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D8_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D8_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D8_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D8_H_
 
 class CommentPragmasD8 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D8_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D8_H_
diff --git a/tests/cxx/comment_pragmas-d9.h b/tests/cxx/comment_pragmas-d9.h
index db5e8d5..ec1a784 100644
--- a/tests/cxx/comment_pragmas-d9.h
+++ b/tests/cxx/comment_pragmas-d9.h
@@ -15,9 +15,9 @@
  *  @headername{some_system_header_file, some_other_system_header_file}
  */
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D9_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D9_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D9_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D9_H_
 
 class CommentPragmasD9 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_D9_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_D9_H_
diff --git a/tests/cxx/comment_pragmas-i1.h b/tests/cxx/comment_pragmas-i1.h
index ee65bbd..6524f68 100644
--- a/tests/cxx/comment_pragmas-i1.h
+++ b/tests/cxx/comment_pragmas-i1.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I1_H_
 
 // Verify that pragma that don't start comments are ignored.
 /*
@@ -37,4 +37,4 @@ const char kIgnoreThis[] = "// IWYU pragma: private, include \"baz\"";
 // Include a file after 'end_exports' that we don't re-export.
 #include "tests/cxx/indirect.h"
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I1_H_
diff --git a/tests/cxx/comment_pragmas-i10.h b/tests/cxx/comment_pragmas-i10.h
index 0da1f0c..afadfb9 100644
--- a/tests/cxx/comment_pragmas-i10.h
+++ b/tests/cxx/comment_pragmas-i10.h
@@ -8,12 +8,12 @@
 //===----------------------------------------------------------------------===//
 
 // A public header file exporting the symbol CommentPragmasI10.
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I10_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I10_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I10_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I10_H_
 
 // IWYU pragma: private
 // IWYU pragma: friend tests/cxx/.*-d13.h
 
 class CommentPragmasI10 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I10_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I10_H_
diff --git a/tests/cxx/comment_pragmas-i11.h b/tests/cxx/comment_pragmas-i11.h
index e33ed98..a1f4e74 100644
--- a/tests/cxx/comment_pragmas-i11.h
+++ b/tests/cxx/comment_pragmas-i11.h
@@ -8,12 +8,12 @@
 //===----------------------------------------------------------------------===//
 
 // A public header file exporting the symbol CommentPragmasI11.
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I11_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I11_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I11_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I11_H_
 
 /* IWYU pragma: private */
 /* IWYU pragma: friend tests/cxx/.*-d16.h */
 
 class CommentPragmasI11 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I11_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I11_H_
diff --git a/tests/cxx/comment_pragmas-i2.h b/tests/cxx/comment_pragmas-i2.h
index e2b4027..55aa59a 100644
--- a/tests/cxx/comment_pragmas-i2.h
+++ b/tests/cxx/comment_pragmas-i2.h
@@ -8,11 +8,11 @@
 //===----------------------------------------------------------------------===//
 
 // A private header file exporting the symbol CommentPragmasI2.
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I2_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I2_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I2_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I2_H_
 
 // IWYU pragma: private, include "tests/cxx/comment_pragmas-i1.h"
 
 class CommentPragmasI2 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I2_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I2_H_
diff --git a/tests/cxx/comment_pragmas-i3.h b/tests/cxx/comment_pragmas-i3.h
index 0c71ec4..7471abd 100644
--- a/tests/cxx/comment_pragmas-i3.h
+++ b/tests/cxx/comment_pragmas-i3.h
@@ -9,9 +9,9 @@
 
 // A public header file re-exported by comment_pragmas-i1.h exporting
 // the symbol CommentPragmasI3.
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I3_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I3_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I3_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I3_H_
 
 class CommentPragmasI3 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I3_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I3_H_
diff --git a/tests/cxx/comment_pragmas-i4.h b/tests/cxx/comment_pragmas-i4.h
index bfc4dfd..b2aa734 100644
--- a/tests/cxx/comment_pragmas-i4.h
+++ b/tests/cxx/comment_pragmas-i4.h
@@ -9,9 +9,9 @@
 
 // A public header file re-exported by comment_pragmas-i1.h exporting
 // the symbol CommentPragmasI4.
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I4_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I4_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I4_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I4_H_
 
 class CommentPragmasI4 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I4_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I4_H_
diff --git a/tests/cxx/comment_pragmas-i5.h b/tests/cxx/comment_pragmas-i5.h
index c699bc6..07fe40e 100644
--- a/tests/cxx/comment_pragmas-i5.h
+++ b/tests/cxx/comment_pragmas-i5.h
@@ -9,9 +9,9 @@
 
 // A public header file re-exported by comment_pragmas-i1.h exporting
 // the symbol CommentPragmasI5.
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I5_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I5_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I5_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I5_H_
 
 class CommentPragmasI5 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I5_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I5_H_
diff --git a/tests/cxx/comment_pragmas-i6.h b/tests/cxx/comment_pragmas-i6.h
index 93f62f8..47416dc 100644
--- a/tests/cxx/comment_pragmas-i6.h
+++ b/tests/cxx/comment_pragmas-i6.h
@@ -10,11 +10,11 @@
 // This is a private file included directly by comment_pragmas.cc which
 // exports the private file d3.h.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I6_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I6_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I6_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I6_H_
 
 // IWYU pragma: begin_exports
 #include "tests/cxx/comment_pragmas-d3.h"
 // IWYU pragma: end_exports
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I6_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I6_H_
diff --git a/tests/cxx/comment_pragmas-i7.h b/tests/cxx/comment_pragmas-i7.h
index db030a2..6ba7039 100644
--- a/tests/cxx/comment_pragmas-i7.h
+++ b/tests/cxx/comment_pragmas-i7.h
@@ -10,9 +10,9 @@
 // This is a private file included directly by comment_pragmas.cc which
 // includes but doesn't explicity export the private file d4.h.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I7_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I7_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I7_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I7_H_
 
 #include "tests/cxx/comment_pragmas-d4.h"
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I7_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I7_H_
diff --git a/tests/cxx/comment_pragmas-i8.h b/tests/cxx/comment_pragmas-i8.h
index 397f2e1..4b385c9 100644
--- a/tests/cxx/comment_pragmas-i8.h
+++ b/tests/cxx/comment_pragmas-i8.h
@@ -8,9 +8,9 @@
 //===----------------------------------------------------------------------===//
 
 // A public header file exporting the symbol CommentPragmasI8.
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I8_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I8_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I8_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I8_H_
 
 class CommentPragmasI8 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I8_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I8_H_
diff --git a/tests/cxx/comment_pragmas-i9.h b/tests/cxx/comment_pragmas-i9.h
index 4128856..c0353dc 100644
--- a/tests/cxx/comment_pragmas-i9.h
+++ b/tests/cxx/comment_pragmas-i9.h
@@ -8,9 +8,9 @@
 //===----------------------------------------------------------------------===//
 
 // A public header file exporting the symbol CommentPragmasI9.
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I9_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I9_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I9_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I9_H_
 
 class CommentPragmasI9 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_COMMENT_PRAGMAS_I9_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_COMMENT_PRAGMAS_I9_H_
diff --git a/tests/cxx/depopulated_h_file-i1.h b/tests/cxx/depopulated_h_file-i1.h
index 4bfb1c1..c359a3e 100644
--- a/tests/cxx/depopulated_h_file-i1.h
+++ b/tests/cxx/depopulated_h_file-i1.h
@@ -7,12 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_DEPOPULATED_H_FILE_I1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_DEPOPULATED_H_FILE_I1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_DEPOPULATED_H_FILE_I1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_DEPOPULATED_H_FILE_I1_H_
 
 class Foo {
  public:
   static void Bar();
 };
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_DEPOPULATED_H_FILE_I1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_DEPOPULATED_H_FILE_I1_H_
diff --git a/tests/cxx/depopulated_h_file.h b/tests/cxx/depopulated_h_file.h
index ecc93f7..952fd82 100644
--- a/tests/cxx/depopulated_h_file.h
+++ b/tests/cxx/depopulated_h_file.h
@@ -7,12 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_DEPOPULATED_H_FILE_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_DEPOPULATED_H_FILE_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_DEPOPULATED_H_FILE_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_DEPOPULATED_H_FILE_H_
 
 #include "tests/cxx/depopulated_h_file-i1.h"
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_DEPOPULATED_H_FILE_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_DEPOPULATED_H_FILE_H_
 
 /**** IWYU_SUMMARY
 
diff --git a/tests/cxx/direct.h b/tests/cxx/direct.h
index 91836ce..cca2483 100644
--- a/tests/cxx/direct.h
+++ b/tests/cxx/direct.h
@@ -11,12 +11,12 @@
 // does is #include another file (which the .cc file is thus
 // #including indirectly).
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_DIRECT_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_DIRECT_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_DIRECT_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_DIRECT_H_
 
 #include "tests/cxx/indirect.h"
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_DIRECT_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_DIRECT_H_
 
 /**** IWYU_SUMMARY
 
diff --git a/tests/cxx/fullinfo_for_templates-d1.h b/tests/cxx/fullinfo_for_templates-d1.h
index 2f9992a..76a7613 100644
--- a/tests/cxx/fullinfo_for_templates-d1.h
+++ b/tests/cxx/fullinfo_for_templates-d1.h
@@ -7,10 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_FULLINFO_FOR_TEMPLATES_D1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_FULLINFO_FOR_TEMPLATES_D1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_FULLINFO_FOR_TEMPLATES_D1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_FULLINFO_FOR_TEMPLATES_D1_H_
 
 // Template definition.
 template <typename T> class TemplateClass {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_FULLINFO_FOR_TEMPLATES_D1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_FULLINFO_FOR_TEMPLATES_D1_H_
diff --git a/tests/cxx/fullinfo_for_templates-d2.h b/tests/cxx/fullinfo_for_templates-d2.h
index 4a18690..825dfd1 100644
--- a/tests/cxx/fullinfo_for_templates-d2.h
+++ b/tests/cxx/fullinfo_for_templates-d2.h
@@ -7,10 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_FULLINFO_FOR_TEMPLATES_D2_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_FULLINFO_FOR_TEMPLATES_D2_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_FULLINFO_FOR_TEMPLATES_D2_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_FULLINFO_FOR_TEMPLATES_D2_H_
 
 // Template forward declaration.
 template <typename T> class TemplateClass;
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_FULLINFO_FOR_TEMPLATES_D2_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_FULLINFO_FOR_TEMPLATES_D2_H_
diff --git a/tests/cxx/fwd_decl_class_template-i1.h b/tests/cxx/fwd_decl_class_template-i1.h
index 4cf72f6..2add1c4 100644
--- a/tests/cxx/fwd_decl_class_template-i1.h
+++ b/tests/cxx/fwd_decl_class_template-i1.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_FWD_DECL_CLASS_TEMPLATE_I1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_FWD_DECL_CLASS_TEMPLATE_I1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_FWD_DECL_CLASS_TEMPLATE_I1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_FWD_DECL_CLASS_TEMPLATE_I1_H_
 
 template <typename T> class ClassTemplateI1 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_FWD_DECL_CLASS_TEMPLATE_I1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_FWD_DECL_CLASS_TEMPLATE_I1_H_
diff --git a/tests/cxx/fwd_decl_class_template.h b/tests/cxx/fwd_decl_class_template.h
index 4e5db57..d98be49 100644
--- a/tests/cxx/fwd_decl_class_template.h
+++ b/tests/cxx/fwd_decl_class_template.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_FWD_DECL_CLASS_TEMPLATE_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_FWD_DECL_CLASS_TEMPLATE_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_FWD_DECL_CLASS_TEMPLATE_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_FWD_DECL_CLASS_TEMPLATE_H_
 
 #include "tests/cxx/fwd_decl_class_template-i1.h"
 
@@ -31,4 +31,4 @@ template <typename T> class ClassTemplateI1;
 
 ***** IWYU_SUMMARY */
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_FWD_DECL_CLASS_TEMPLATE_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_FWD_DECL_CLASS_TEMPLATE_H_
diff --git a/tests/cxx/indirect.h b/tests/cxx/indirect.h
index ebfbff4..ad43d5f 100644
--- a/tests/cxx/indirect.h
+++ b/tests/cxx/indirect.h
@@ -12,8 +12,8 @@
 // definition of a symbol that will cause an iwyu violation in a .cc
 // file.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_INDIRECT_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_INDIRECT_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_INDIRECT_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_INDIRECT_H_
 
 class IndirectClass {
  public:
@@ -24,4 +24,4 @@ class IndirectClass {
 };
 
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_INDIRECT_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_INDIRECT_H_
diff --git a/tests/cxx/lateparsed_template-notchecked.h b/tests/cxx/lateparsed_template-notchecked.h
index 8a825e0..90a642f 100644
--- a/tests/cxx/lateparsed_template-notchecked.h
+++ b/tests/cxx/lateparsed_template-notchecked.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_LATEPARSED_NOTCHECKED_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_LATEPARSED_NOTCHECKED_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_LATEPARSED_NOTCHECKED_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_LATEPARSED_NOTCHECKED_H_
 
 // A crazy late-parsed function template.
 // IWYU should not attempt to parse it, since it's not in a file signed up for
@@ -21,4 +21,4 @@ void unchecked() {
 // Here's a symbol we reference from the main test file.
 const int kUsableSymbol = 100;
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_LATEPARSED_NOTCHECKED_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_LATEPARSED_NOTCHECKED_H_
diff --git a/tests/cxx/overloaded_class-d1.h b/tests/cxx/overloaded_class-d1.h
index 713e232..7b50b44 100644
--- a/tests/cxx/overloaded_class-d1.h
+++ b/tests/cxx/overloaded_class-d1.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_OVERLOADED_CLASS_D1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_OVERLOADED_CLASS_D1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_OVERLOADED_CLASS_D1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_OVERLOADED_CLASS_D1_H_
 
 #include "tests/cxx/overloaded_class-i1.h"
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_OVERLOADED_CLASS_D1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_OVERLOADED_CLASS_D1_H_
diff --git a/tests/cxx/overloaded_class-i1.h b/tests/cxx/overloaded_class-i1.h
index 42ab1bd..7375846 100644
--- a/tests/cxx/overloaded_class-i1.h
+++ b/tests/cxx/overloaded_class-i1.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_OVERLOADED_CLASS_I1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_OVERLOADED_CLASS_I1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_OVERLOADED_CLASS_I1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_OVERLOADED_CLASS_I1_H_
 
 #include <vector>
 
@@ -21,7 +21,7 @@ template<class T> void MyFunc() {
   v.resize(10);
 }
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_OVERLOADED_CLASS_I1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_OVERLOADED_CLASS_I1_H_
 
 /**** IWYU_SUMMARY
 
diff --git a/tests/cxx/prefix_header_attribution-d1.h b/tests/cxx/prefix_header_attribution-d1.h
index f138daf..305b4ad 100644
--- a/tests/cxx/prefix_header_attribution-d1.h
+++ b/tests/cxx/prefix_header_attribution-d1.h
@@ -7,10 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_ATTRIBUTION_D1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_ATTRIBUTION_D1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_ATTRIBUTION_D1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_ATTRIBUTION_D1_H_
 
 #include "tests/cxx/prefix_header_attribution-i1.h"
 #include <new>
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_ATTRIBUTION_D1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_ATTRIBUTION_D1_H_
diff --git a/tests/cxx/prefix_header_attribution-i1.h b/tests/cxx/prefix_header_attribution-i1.h
index 9ed3374..2d6b9bb 100644
--- a/tests/cxx/prefix_header_attribution-i1.h
+++ b/tests/cxx/prefix_header_attribution-i1.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_ATTRIBUTION_I1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_ATTRIBUTION_I1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_ATTRIBUTION_I1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_ATTRIBUTION_I1_H_
 
 #define MACRO_IN_PREFIX_HEADER
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_ATTRIBUTION_I1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_ATTRIBUTION_I1_H_
diff --git a/tests/cxx/prefix_header_includes-d1.h b/tests/cxx/prefix_header_includes-d1.h
index a2dc024..45626d6 100644
--- a/tests/cxx/prefix_header_includes-d1.h
+++ b/tests/cxx/prefix_header_includes-d1.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_D1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_D1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_D1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_D1_H_
 
 class CommandLineIncludeD1 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_D1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_D1_H_
diff --git a/tests/cxx/prefix_header_includes-d2.h b/tests/cxx/prefix_header_includes-d2.h
index d0859d6..d5338c4 100644
--- a/tests/cxx/prefix_header_includes-d2.h
+++ b/tests/cxx/prefix_header_includes-d2.h
@@ -7,11 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_D2_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_D2_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_D2_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_D2_H_
 
 #include "tests/cxx/prefix_header_includes-i1.h"
 
 class CommandLineIncludeD2 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_D2_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_D2_H_
diff --git a/tests/cxx/prefix_header_includes-d3.h b/tests/cxx/prefix_header_includes-d3.h
index 8581ce7..b200b21 100644
--- a/tests/cxx/prefix_header_includes-d3.h
+++ b/tests/cxx/prefix_header_includes-d3.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_D3_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_D3_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_D3_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_D3_H_
 
 class CommandLineIncludeD3 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_D3_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_D3_H_
diff --git a/tests/cxx/prefix_header_includes-d4.h b/tests/cxx/prefix_header_includes-d4.h
index 8f1d7bc..8c2bd68 100644
--- a/tests/cxx/prefix_header_includes-d4.h
+++ b/tests/cxx/prefix_header_includes-d4.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_D4_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_D4_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_D4_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_D4_H_
 
 class CommandLineIncludeD4 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_D4_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_D4_H_
diff --git a/tests/cxx/prefix_header_includes-i1.h b/tests/cxx/prefix_header_includes-i1.h
index 3b276c6..8422341 100644
--- a/tests/cxx/prefix_header_includes-i1.h
+++ b/tests/cxx/prefix_header_includes-i1.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_I1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_I1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_I1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_I1_H_
 
 class CommandLineIncludeI1 {};
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_PREFIX_HEADER_INCLUDES_I1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_PREFIX_HEADER_INCLUDES_I1_H_
diff --git a/tests/cxx/typedef_chain_class.h b/tests/cxx/typedef_chain_class.h
index 7b3f3c6..ec65fdc 100644
--- a/tests/cxx/typedef_chain_class.h
+++ b/tests/cxx/typedef_chain_class.h
@@ -10,12 +10,12 @@
 // Simple class to use in typedef chains.  Similar to IndirectClass but without
 // concerns if it is a direct include or indirect.
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_TYPEDEF_CHAIN_CLASS_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_TYPEDEF_CHAIN_CLASS_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_TYPEDEF_CHAIN_CLASS_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_TYPEDEF_CHAIN_CLASS_H_
 
 class TypedefChainClass {
  public:
   void Method() const { };
 };
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_TYPEDEF_CHAIN_CLASS_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_TYPEDEF_CHAIN_CLASS_H_
diff --git a/tests/cxx/unused_class_template_ctor-d1.h b/tests/cxx/unused_class_template_ctor-d1.h
index 59c2753..8e660f6 100644
--- a/tests/cxx/unused_class_template_ctor-d1.h
+++ b/tests/cxx/unused_class_template_ctor-d1.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_UNUSED_CLASS_TEMPLATE_CTOR_D1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_UNUSED_CLASS_TEMPLATE_CTOR_D1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_UNUSED_CLASS_TEMPLATE_CTOR_D1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_UNUSED_CLASS_TEMPLATE_CTOR_D1_H_
 
 template <class T1, class T2>
 class pair {
@@ -25,4 +25,4 @@ class pair {
   pair(T1 t1, T2 t2) : first_(t1), second_(t2) {}
 };
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_UNUSED_CLASS_TEMPLATE_CTOR_D1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_UNUSED_CLASS_TEMPLATE_CTOR_D1_H_
diff --git a/tests/cxx/uses_printf-d1.h b/tests/cxx/uses_printf-d1.h
index 67ad193..e80eb80 100644
--- a/tests/cxx/uses_printf-d1.h
+++ b/tests/cxx/uses_printf-d1.h
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_USES_PRINTF_D1_H_
-#define DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_USES_PRINTF_D1_H_
+#ifndef INCLUDE_WHAT_YOU_USE_TESTS_CXX_USES_PRINTF_D1_H_
+#define INCLUDE_WHAT_YOU_USE_TESTS_CXX_USES_PRINTF_D1_H_
 
 #include <cstdio>
 
-#endif  // DEVTOOLS_MAINTENANCE_INCLUDE_WHAT_YOU_USE_TESTS_USES_PRINTF_D1_H_
+#endif  // INCLUDE_WHAT_YOU_USE_TESTS_CXX_USES_PRINTF_D1_H_