diff --git a/android_webview/browser/aw_render_process.h b/android_webview/browser/aw_render_process.h
index 05625e3e05599e..16d678d647e8d7 100644
--- a/android_webview/browser/aw_render_process.h
+++ b/android_webview/browser/aw_render_process.h
@@ -60,4 +60,4 @@ class AwRenderProcess : public content::RenderProcessHostObserver,
 
 }  // namespace android_webview
 
-#endif
+#endif  // ANDROID_WEBVIEW_BROWSER_AW_RENDER_PROCESS_H_
diff --git a/android_webview/browser/metrics/renderer_process_metrics_provider.h b/android_webview/browser/metrics/renderer_process_metrics_provider.h
index 6bf94865ed13a6..7eb7e88086a153 100644
--- a/android_webview/browser/metrics/renderer_process_metrics_provider.h
+++ b/android_webview/browser/metrics/renderer_process_metrics_provider.h
@@ -30,4 +30,4 @@ class RendererProcessMetricsProvider : public metrics::MetricsProvider {
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_BROWSER_METRICS_RENDERER_PROCESS_PROVIDER_H_
+#endif  // ANDROID_WEBVIEW_BROWSER_METRICS_RENDERER_PROCESS_METRICS_PROVIDER_H_
diff --git a/cloud_print/common/win/cloud_print_utils.h b/cloud_print/common/win/cloud_print_utils.h
index 75d47e85f2b30e..0d5d4b088a362e 100644
--- a/cloud_print/common/win/cloud_print_utils.h
+++ b/cloud_print/common/win/cloud_print_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CLOUD_PRINT_COMMON_CLOUD_PRINT_UTILS_H_
-#define CLOUD_PRINT_COMMON_CLOUD_PRINT_UTILS_H_
+#ifndef CLOUD_PRINT_COMMON_WIN_CLOUD_PRINT_UTILS_H_
+#define CLOUD_PRINT_COMMON_WIN_CLOUD_PRINT_UTILS_H_
 
 #include <wtypes.h>
 
@@ -27,4 +27,4 @@ void SetGoogleUpdateUsage(const std::wstring& product_id);
 
 }  // namespace cloud_print
 
-#endif  // CLOUD_PRINT_COMMON_CLOUD_PRINT_UTILS_H_
+#endif  // CLOUD_PRINT_COMMON_WIN_CLOUD_PRINT_UTILS_H_
diff --git a/cloud_print/common/win/install_utils.h b/cloud_print/common/win/install_utils.h
index c473b71baff88d..ec6a6a9397fbb0 100644
--- a/cloud_print/common/win/install_utils.h
+++ b/cloud_print/common/win/install_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CLOUD_PRINT_COMMON_INSTALL_UTILS_H_
-#define CLOUD_PRINT_COMMON_INSTALL_UTILS_H_
+#ifndef CLOUD_PRINT_COMMON_WIN_INSTALL_UTILS_H_
+#define CLOUD_PRINT_COMMON_WIN_INSTALL_UTILS_H_
 
 #include <wtypes.h>
 #include <string>
@@ -45,4 +45,4 @@ bool IsProgramsFilesParent(const base::FilePath& path);
 
 }  // namespace cloud_print
 
-#endif  // CLOUD_PRINT_COMMON_INSTALL_UTILS_H_
+#endif  // CLOUD_PRINT_COMMON_WIN_INSTALL_UTILS_H_
diff --git a/courgette/types_elf.h b/courgette/types_elf.h
index 78c67a07d9463c..3a53f407af00ac 100644
--- a/courgette/types_elf.h
+++ b/courgette/types_elf.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COURGETTE_ELF_TYPES_H_
-#define COURGETTE_ELF_TYPES_H_
+#ifndef COURGETTE_TYPES_ELF_H_
+#define COURGETTE_TYPES_ELF_H_
 
 #include <stdint.h>
 
@@ -173,4 +173,4 @@ enum elf32_rel_386_type_values {
   R_386_TLS_TPOFF = 14,
 };
 
-#endif  // COURGETTE_ELF_TYPES_H_
+#endif  // COURGETTE_TYPES_ELF_H_
diff --git a/fuchsia/engine/renderer/cast_streaming_demuxer.h b/fuchsia/engine/renderer/cast_streaming_demuxer.h
index 849320655bd37b..33167bfef9a837 100644
--- a/fuchsia/engine/renderer/cast_streaming_demuxer.h
+++ b/fuchsia/engine/renderer/cast_streaming_demuxer.h
@@ -81,4 +81,4 @@ class CastStreamingDemuxer : public media::Demuxer {
   CastStreamingReceiver* const receiver_;
 };
 
-#endif  // FUCHSIA_ENGINE_RENDERER_LIBCAST_STREAMING_DEMUXER_H_
+#endif  // FUCHSIA_ENGINE_RENDERER_CAST_STREAMING_DEMUXER_H_
diff --git a/fuchsia/runners/cast/fake_api_bindings.h b/fuchsia/runners/cast/fake_api_bindings.h
index 7247b8181c361c..bfe7f852d29db7 100644
--- a/fuchsia/runners/cast/fake_api_bindings.h
+++ b/fuchsia/runners/cast/fake_api_bindings.h
@@ -55,4 +55,4 @@ class FakeApiBindingsImpl : public chromium::cast::ApiBindings {
   base::OnceClosure on_expected_port_received_;
 };
 
-#endif  // FUCHSIA_RUNNERS_CAST_TEST_API_BINDINGS_H_
+#endif  // FUCHSIA_RUNNERS_CAST_FAKE_API_BINDINGS_H_
diff --git a/gin/debug_impl.h b/gin/debug_impl.h
index b0b7931f3e1059..fafb98cd8e052a 100644
--- a/gin/debug_impl.h
+++ b/gin/debug_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GIN_PUBLIC_DEBUG_IMPL_H_
-#define GIN_PUBLIC_DEBUG_IMPL_H_
+#ifndef GIN_DEBUG_IMPL_H_
+#define GIN_DEBUG_IMPL_H_
 
 #include "gin/public/debug.h"
 #include "v8/include/v8.h"
@@ -17,4 +17,4 @@ class DebugImpl {
 
 }  // namespace gin
 
-#endif  // GIN_PUBLIC_DEBUG_IMPL_H_
+#endif  // GIN_DEBUG_IMPL_H_
diff --git a/gin/v8_foreground_task_runner.h b/gin/v8_foreground_task_runner.h
index 2f8a6ffebf3ac6..bfc2c55f77ce27 100644
--- a/gin/v8_foreground_task_runner.h
+++ b/gin/v8_foreground_task_runner.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_FOREGROUND_TASK_RUNNER_H
-#define V8_FOREGROUND_TASK_RUNNER_H
+#ifndef GIN_V8_FOREGROUND_TASK_RUNNER_H_
+#define GIN_V8_FOREGROUND_TASK_RUNNER_H_
 
 #include "base/memory/ref_counted.h"
 #include "gin/v8_foreground_task_runner_base.h"
@@ -43,4 +43,4 @@ class V8ForegroundTaskRunner : public V8ForegroundTaskRunnerBase {
 
 }  // namespace gin
 
-#endif  // V8_FOREGROUND_TASK_RUNNER_H
+#endif  // GIN_V8_FOREGROUND_TASK_RUNNER_H_
diff --git a/gin/v8_foreground_task_runner_base.h b/gin/v8_foreground_task_runner_base.h
index 112727f0cee5aa..8aa6e1fb4789d2 100644
--- a/gin/v8_foreground_task_runner_base.h
+++ b/gin/v8_foreground_task_runner_base.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_FOREGROUND_TASK_RUNNER_BASE_H
-#define V8_FOREGROUND_TASK_RUNNER_BASE_H
+#ifndef GIN_V8_FOREGROUND_TASK_RUNNER_BASE_H_
+#define GIN_V8_FOREGROUND_TASK_RUNNER_BASE_H_
 
 #include "v8/include/v8-platform.h"
 
@@ -33,4 +33,4 @@ class V8ForegroundTaskRunnerBase : public v8::TaskRunner {
 
 }  // namespace gin
 
-#endif /* !V8_FOREGROUND_TASK_RUNNER_BASE_H */
+#endif  // GIN_V8_FOREGROUND_TASK_RUNNER_BASE_H_
diff --git a/gin/v8_foreground_task_runner_with_locker.h b/gin/v8_foreground_task_runner_with_locker.h
index 22bc10d67bfacc..9d1ebbdf68da1f 100644
--- a/gin/v8_foreground_task_runner_with_locker.h
+++ b/gin/v8_foreground_task_runner_with_locker.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_FOREGROUND_TASK_RUNNER_WITH_LOCKER_H
-#define V8_FOREGROUND_TASK_RUNNER_WITH_LOCKER_H
+#ifndef GIN_V8_FOREGROUND_TASK_RUNNER_WITH_LOCKER_H_
+#define GIN_V8_FOREGROUND_TASK_RUNNER_WITH_LOCKER_H_
 
 #include "base/memory/ref_counted.h"
 #include "gin/v8_foreground_task_runner_base.h"
@@ -41,4 +41,4 @@ class V8ForegroundTaskRunnerWithLocker : public V8ForegroundTaskRunnerBase {
 
 }  // namespace gin
 
-#endif  // V8_FOREGROUND_TASK_RUNNER_WITH_LOCKER_H
+#endif  // GIN_V8_FOREGROUND_TASK_RUNNER_WITH_LOCKER_H_
diff --git a/google_apis/gcm/base/encryptor.h b/google_apis/gcm/base/encryptor.h
index 898e7dba77e38d..a2deb2eea816ad 100644
--- a/google_apis/gcm/base/encryptor.h
+++ b/google_apis/gcm/base/encryptor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GOOGLE_APIS_GCM_ENCRYPTOR_H_
-#define GOOGLE_APIS_GCM_ENCRYPTOR_H_
+#ifndef GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
+#define GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
 
 #include <string>
 #include "google_apis/gcm/base/gcm_export.h"
@@ -24,4 +24,4 @@ class GCM_EXPORT Encryptor {
 
 }  // namespace gcm
 
-#endif  // GOOGLE_APIS_GCM_ENCRYPTOR_H_
+#endif  // GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
diff --git a/google_apis/gcm/base/fake_encryptor.h b/google_apis/gcm/base/fake_encryptor.h
index 4277292280eccf..06f4d4e134795b 100644
--- a/google_apis/gcm/base/fake_encryptor.h
+++ b/google_apis/gcm/base/fake_encryptor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
-#define GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
+#ifndef GOOGLE_APIS_GCM_BASE_FAKE_ENCRYPTOR_H_
+#define GOOGLE_APIS_GCM_BASE_FAKE_ENCRYPTOR_H_
 
 #include "base/compiler_specific.h"
 #include "google_apis/gcm/base/encryptor.h"
@@ -25,4 +25,4 @@ class FakeEncryptor : public Encryptor {
 
 }  // namespace gcm
 
-#endif  // GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
+#endif  // GOOGLE_APIS_GCM_BASE_FAKE_ENCRYPTOR_H_
diff --git a/google_apis/gcm/base/gcm_export.h b/google_apis/gcm/base/gcm_export.h
index b66eb8e54cfa67..0f801b974ebecc 100644
--- a/google_apis/gcm/base/gcm_export.h
+++ b/google_apis/gcm/base/gcm_export.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GOOGLE_APIS_GCM_GCM_EXPORT_H_
-#define GOOGLE_APIS_GCM_GCM_EXPORT_H_
+#ifndef GOOGLE_APIS_GCM_BASE_GCM_EXPORT_H_
+#define GOOGLE_APIS_GCM_BASE_GCM_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 #if defined(WIN32)
@@ -26,4 +26,4 @@
 #define GCM_EXPORT
 #endif
 
-#endif  // GOOGLE_APIS_GCM_GCM_EXPORT_H_
+#endif  // GOOGLE_APIS_GCM_BASE_GCM_EXPORT_H_
diff --git a/google_apis/gcm/engine/gservices_switches.h b/google_apis/gcm/engine/gservices_switches.h
index bd778c64032db9..72547bc4ddd6d7 100644
--- a/google_apis/gcm/engine/gservices_switches.h
+++ b/google_apis/gcm/engine/gservices_switches.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GOOGLE_APIS_GCM_ENGINE_GSERVICSE_SWITCHES_H_
-#define GOOGLE_APIS_GCM_ENGINE_GSERVICSE_SWITCHES_H_
+#ifndef GOOGLE_APIS_GCM_ENGINE_GSERVICES_SWITCHES_H_
+#define GOOGLE_APIS_GCM_ENGINE_GSERVICES_SWITCHES_H_
 
 namespace switches {
 
@@ -13,4 +13,4 @@ extern const char kGCMRegistrationURL[];
 
 }  // namespace switches
 
-#endif  // GOOGLE_APIS_GCM_ENGINE_GSERVICSE_SWITCHES_H_
+#endif  // GOOGLE_APIS_GCM_ENGINE_GSERVICES_SWITCHES_H_
diff --git a/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h b/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h
index a998a02cf58d10..f81dcf9aaffb36 100644
--- a/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h
+++ b/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECODER_H_
-#define GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECODER_H_
+#ifndef GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECORDER_H_
+#define GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECORDER_H_
 
 #include <stdint.h>
 
@@ -73,4 +73,4 @@ class FakeGCMStatsRecorder : public GCMStatsRecorder {
 
 }  // namespace gcm
 
-#endif  // GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECODER_H_
+#endif  // GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECORDER_H_
diff --git a/google_apis/google_api_keys_mac.h b/google_apis/google_api_keys_mac.h
index 6ee268eaae3980..53f512aeb08b1b 100644
--- a/google_apis/google_api_keys_mac.h
+++ b/google_apis/google_api_keys_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GOOGLE_API_KEYS_MAC_H_
-#define GOOGLE_API_KEYS_MAC_H_
+#ifndef GOOGLE_APIS_GOOGLE_API_KEYS_MAC_H_
+#define GOOGLE_APIS_GOOGLE_API_KEYS_MAC_H_
 
 #include <string>
 
@@ -13,4 +13,4 @@ std::string GetAPIKeyFromInfoPlist(const std::string& key_name);
 
 }  // namespace google_apis
 
-#endif  // GOOGLE_API_KEYS_MAC_H_
+#endif  // GOOGLE_APIS_GOOGLE_API_KEYS_MAC_H_
diff --git a/headless/lib/utility/headless_content_utility_client.h b/headless/lib/utility/headless_content_utility_client.h
index 87f34065594d43..8ea47a6eb5210a 100644
--- a/headless/lib/utility/headless_content_utility_client.h
+++ b/headless/lib/utility/headless_content_utility_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef HEADLESS_LIB_HEADLESS_CONTENT_UTILITY_CLIENT_H_
-#define HEADLESS_LIB_HEADLESS_CONTENT_UTILITY_CLIENT_H_
+#ifndef HEADLESS_LIB_UTILITY_HEADLESS_CONTENT_UTILITY_CLIENT_H_
+#define HEADLESS_LIB_UTILITY_HEADLESS_CONTENT_UTILITY_CLIENT_H_
 
 #include <string>
 
@@ -38,4 +38,4 @@ class HEADLESS_EXPORT HeadlessContentUtilityClient
 
 }  // namespace headless
 
-#endif  // HEADLESS_LIB_HEADLESS_CONTENT_UTILITY_CLIENT_H_
+#endif  // HEADLESS_LIB_UTILITY_HEADLESS_CONTENT_UTILITY_CLIENT_H_
diff --git a/printing/print_settings_initializer_mac.h b/printing/print_settings_initializer_mac.h
index 375eac01e26c55..9e73867d2dcb43 100644
--- a/printing/print_settings_initializer_mac.h
+++ b/printing/print_settings_initializer_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PRINTING_PRINTING_SETTINGS_INITIALIZER_MAC_H_
-#define PRINTING_PRINTING_SETTINGS_INITIALIZER_MAC_H_
+#ifndef PRINTING_PRINT_SETTINGS_INITIALIZER_MAC_H_
+#define PRINTING_PRINT_SETTINGS_INITIALIZER_MAC_H_
 
 #import <ApplicationServices/ApplicationServices.h>
 
@@ -28,4 +28,4 @@ class PRINTING_EXPORT PrintSettingsInitializerMac {
 
 }  // namespace printing
 
-#endif  // PRINTING_PRINTING_SETTINGS_INITIALIZER_MAC_H_
+#endif  // PRINTING_PRINT_SETTINGS_INITIALIZER_MAC_H_
diff --git a/printing/print_settings_initializer_win.h b/printing/print_settings_initializer_win.h
index 5180a339b0fb51..b92f3d33e5425b 100644
--- a/printing/print_settings_initializer_win.h
+++ b/printing/print_settings_initializer_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PRINTING_PRINTING_SETTINGS_INITIALIZER_WIN_H_
-#define PRINTING_PRINTING_SETTINGS_INITIALIZER_WIN_H_
+#ifndef PRINTING_PRINT_SETTINGS_INITIALIZER_WIN_H_
+#define PRINTING_PRINT_SETTINGS_INITIALIZER_WIN_H_
 
 #include <string>
 
@@ -31,4 +31,4 @@ class PRINTING_EXPORT PrintSettingsInitializerWin {
 
 }  // namespace printing
 
-#endif  // PRINTING_PRINTING_SETTINGS_INITIALIZER_WIN_H_
+#endif  // PRINTING_PRINT_SETTINGS_INITIALIZER_WIN_H_
diff --git a/rlz/lib/rlz_value_store.h b/rlz/lib/rlz_value_store.h
index 8f12048e1a1fc6..08189ee4a3c795 100644
--- a/rlz/lib/rlz_value_store.h
+++ b/rlz/lib/rlz_value_store.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef RLZ_VALUE_STORE_H_
-#define RLZ_VALUE_STORE_H_
+#ifndef RLZ_LIB_RLZ_VALUE_STORE_H_
+#define RLZ_LIB_RLZ_VALUE_STORE_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -120,4 +120,4 @@ std::string RlzStoreFilenameStr();
 
 }  // namespace rlz_lib
 
-#endif  // RLZ_VALUE_STORE_H_
+#endif  // RLZ_LIB_RLZ_VALUE_STORE_H_
diff --git a/rlz/test/rlz_test_helpers.h b/rlz/test/rlz_test_helpers.h
index 1a03e69613f627..d7689e7af67cad 100644
--- a/rlz/test/rlz_test_helpers.h
+++ b/rlz/test/rlz_test_helpers.h
@@ -4,8 +4,8 @@
 //
 // Helper functions used by the tests.
 
-#ifndef RLZ_TEST_RLZ_TEST_HELPERS_H
-#define RLZ_TEST_RLZ_TEST_HELPERS_H
+#ifndef RLZ_TEST_RLZ_TEST_HELPERS_H_
+#define RLZ_TEST_RLZ_TEST_HELPERS_H_
 
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
@@ -65,4 +65,4 @@ class RlzLibTestBase : public RlzLibTestNoMachineState {
 #endif
 };
 
-#endif  // RLZ_TEST_RLZ_TEST_HELPERS_H
+#endif  // RLZ_TEST_RLZ_TEST_HELPERS_H_
diff --git a/sql/sql_memory_dump_provider.h b/sql/sql_memory_dump_provider.h
index 57e88c67f1635a..190b802adf898c 100644
--- a/sql/sql_memory_dump_provider.h
+++ b/sql/sql_memory_dump_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SQL_SQL_MEMORY_DUMP_PROVIDER_H
-#define SQL_SQL_MEMORY_DUMP_PROVIDER_H
+#ifndef SQL_SQL_MEMORY_DUMP_PROVIDER_H_
+#define SQL_SQL_MEMORY_DUMP_PROVIDER_H_
 
 #include "base/component_export.h"
 #include "base/macros.h"
@@ -34,4 +34,4 @@ class COMPONENT_EXPORT(SQL) SqlMemoryDumpProvider
 
 }  // namespace sql
 
-#endif  // SQL_SQL_MEMORY_DUMP_PROVIDER_H
+#endif  // SQL_SQL_MEMORY_DUMP_PROVIDER_H_
diff --git a/testing/android/native_test/native_test_launcher.h b/testing/android/native_test/native_test_launcher.h
index d1270760148c73..f47a476110f5db 100644
--- a/testing/android/native_test/native_test_launcher.h
+++ b/testing/android/native_test/native_test_launcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TESTING_ANDROID_NATIVE_TEST_LAUNCHER_H_
-#define TESTING_ANDROID_NATIVE_TEST_LAUNCHER_H_
+#ifndef TESTING_ANDROID_NATIVE_TEST_NATIVE_TEST_LAUNCHER_H_
+#define TESTING_ANDROID_NATIVE_TEST_NATIVE_TEST_LAUNCHER_H_
 
 #include <jni.h>
 
@@ -15,4 +15,4 @@ void InstallHandlers();
 }  // namespace android
 }  // namespace testing
 
-#endif  // TESTING_ANDROID_NATIVE_TEST_LAUNCHER_H_
+#endif  // TESTING_ANDROID_NATIVE_TEST_NATIVE_TEST_LAUNCHER_H_
diff --git a/testing/android/native_test/native_test_util.h b/testing/android/native_test/native_test_util.h
index e647a92201df43..05198312833927 100644
--- a/testing/android/native_test/native_test_util.h
+++ b/testing/android/native_test/native_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TESTING_ANDROID_NATIVE_TEST_UTIL_
-#define TESTING_ANDROID_NATIVE_TEST_UTIL_
+#ifndef TESTING_ANDROID_NATIVE_TEST_NATIVE_TEST_UTIL_H_
+#define TESTING_ANDROID_NATIVE_TEST_NATIVE_TEST_UTIL_H_
 
 #include <stdio.h>
 #include <string>
@@ -36,4 +36,4 @@ int ArgsToArgv(const std::vector<std::string>& args, std::vector<char*>* argv);
 }  // namespace android
 }  // namespace testing
 
-#endif  // TESTING_ANDROID_NATIVE_TEST_UTIL_
+#endif  // TESTING_ANDROID_NATIVE_TEST_NATIVE_TEST_UTIL_H_
diff --git a/weblayer/browser/content_view_render_view.h b/weblayer/browser/content_view_render_view.h
index e7c26a02eaab7e..307e820bbcb082 100644
--- a/weblayer/browser/content_view_render_view.h
+++ b/weblayer/browser/content_view_render_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_EMBEDDER_SUPPORT_ANDROID_VIEW_CONTENT_VIEW_RENDER_VIEW_H_
-#define COMPONENTS_EMBEDDER_SUPPORT_ANDROID_VIEW_CONTENT_VIEW_RENDER_VIEW_H_
+#ifndef WEBLAYER_BROWSER_CONTENT_VIEW_RENDER_VIEW_H_
+#define WEBLAYER_BROWSER_CONTENT_VIEW_RENDER_VIEW_H_
 
 #include <memory>
 
@@ -96,4 +96,4 @@ class ContentViewRenderView : public content::CompositorClient {
 
 }  // namespace weblayer
 
-#endif  // COMPONENTS_EMBEDDER_SUPPORT_ANDROID_VIEW_CONTENT_VIEW_RENDER_VIEW_H_
+#endif  // WEBLAYER_BROWSER_CONTENT_VIEW_RENDER_VIEW_H_