diff --git a/compiler-rt/lib/asan/.clang-format b/compiler-rt/lib/asan/.clang-format
--- a/compiler-rt/lib/asan/.clang-format
+++ b/compiler-rt/lib/asan/.clang-format
@@ -1,2 +1,3 @@
 BasedOnStyle: Google
 AllowShortIfStatementsOnASingleLine: false
+IndentPPDirectives: AfterHash
diff --git a/compiler-rt/lib/dfsan/.clang-format b/compiler-rt/lib/dfsan/.clang-format
--- a/compiler-rt/lib/dfsan/.clang-format
+++ b/compiler-rt/lib/dfsan/.clang-format
@@ -1,2 +1,3 @@
 BasedOnStyle: Google
 AllowShortIfStatementsOnASingleLine: false
+IndentPPDirectives: AfterHash
diff --git a/compiler-rt/lib/hwasan/.clang-format b/compiler-rt/lib/hwasan/.clang-format
--- a/compiler-rt/lib/hwasan/.clang-format
+++ b/compiler-rt/lib/hwasan/.clang-format
@@ -1,2 +1,3 @@
 BasedOnStyle: Google
 AllowShortIfStatementsOnASingleLine: false
+IndentPPDirectives: AfterHash
diff --git a/compiler-rt/lib/interception/.clang-format b/compiler-rt/lib/interception/.clang-format
--- a/compiler-rt/lib/interception/.clang-format
+++ b/compiler-rt/lib/interception/.clang-format
@@ -1,2 +1,3 @@
 BasedOnStyle: Google
 AllowShortIfStatementsOnASingleLine: false
+IndentPPDirectives: AfterHash
diff --git a/compiler-rt/lib/lsan/.clang-format b/compiler-rt/lib/lsan/.clang-format
--- a/compiler-rt/lib/lsan/.clang-format
+++ b/compiler-rt/lib/lsan/.clang-format
@@ -1,2 +1,3 @@
 BasedOnStyle: Google
 AllowShortIfStatementsOnASingleLine: false
+IndentPPDirectives: AfterHash
diff --git a/compiler-rt/lib/msan/.clang-format b/compiler-rt/lib/msan/.clang-format
--- a/compiler-rt/lib/msan/.clang-format
+++ b/compiler-rt/lib/msan/.clang-format
@@ -1,2 +1,3 @@
 BasedOnStyle: Google
 AllowShortIfStatementsOnASingleLine: false
+IndentPPDirectives: AfterHash
diff --git a/compiler-rt/lib/safestack/.clang-format b/compiler-rt/lib/safestack/.clang-format
--- a/compiler-rt/lib/safestack/.clang-format
+++ b/compiler-rt/lib/safestack/.clang-format
@@ -1,2 +1,3 @@
 BasedOnStyle: Google
 AllowShortIfStatementsOnASingleLine: false
+IndentPPDirectives: AfterHash
diff --git a/compiler-rt/lib/sanitizer_common/.clang-format b/compiler-rt/lib/sanitizer_common/.clang-format
--- a/compiler-rt/lib/sanitizer_common/.clang-format
+++ b/compiler-rt/lib/sanitizer_common/.clang-format
@@ -1,2 +1,3 @@
 BasedOnStyle: Google
 AllowShortIfStatementsOnASingleLine: false
+IndentPPDirectives: AfterHash
diff --git a/compiler-rt/lib/tsan/.clang-format b/compiler-rt/lib/tsan/.clang-format
--- a/compiler-rt/lib/tsan/.clang-format
+++ b/compiler-rt/lib/tsan/.clang-format
@@ -1,2 +1,3 @@
 BasedOnStyle: Google
 AllowShortIfStatementsOnASingleLine: false
+IndentPPDirectives: AfterHash
diff --git a/compiler-rt/test/.clang-format b/compiler-rt/test/.clang-format
--- a/compiler-rt/test/.clang-format
+++ b/compiler-rt/test/.clang-format
@@ -1,2 +1,3 @@
 BasedOnStyle: LLVM
 ColumnLimit: 0
+IndentPPDirectives: AfterHash