diff --git a/compiler-rt/.clang-tidy b/compiler-rt/.clang-tidy
--- a/compiler-rt/.clang-tidy
+++ b/compiler-rt/.clang-tidy
@@ -1,2 +1,2 @@
-# Checks enabled in the top-level .clang-tidy minus readability-identifier-naming
-Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-unused-parameters,-misc-non-private-member-variables-in-classes'
+# Checks enabled in the top-level .clang-tidy minus readability-identifier-naming and llvm-header-guard.
+Checks: '-*,clang-diagnostic-*,llvm-*,-llvm-header-guard,misc-*,-misc-unused-parameters,-misc-non-private-member-variables-in-classes'
diff --git a/compiler-rt/lib/sanitizer_common/.clang-tidy b/compiler-rt/lib/sanitizer_common/.clang-tidy
deleted file mode 100644
--- a/compiler-rt/lib/sanitizer_common/.clang-tidy
+++ /dev/null
@@ -1,16 +0,0 @@
-Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,readability-identifier-naming'
-CheckOptions:
-  - key:             readability-identifier-naming.ClassCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.EnumCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.FunctionCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.UnionCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.GlobalConstantCase
-    value:           CamelCase
-  - key:             readability-identifier-naming.GlobalConstantPrefix
-    value:           "k"
-  - key:             readability-identifier-naming.VariableCase
-    value:           lower_case
diff --git a/compiler-rt/test/.clang-tidy b/compiler-rt/test/.clang-tidy
new file mode 100644
--- /dev/null
+++ b/compiler-rt/test/.clang-tidy
@@ -0,0 +1 @@
+Checks: '-*'