diff --git a/compiler-rt/lib/asan/asan_internal.h b/compiler-rt/lib/asan/asan_internal.h
index c242c973fec6..a4578a6f2d27 100644
--- a/compiler-rt/lib/asan/asan_internal.h
+++ b/compiler-rt/lib/asan/asan_internal.h
@@ -14,7 +14,7 @@
 #ifndef ASAN_INTERNAL_H
 #define ASAN_INTERNAL_H
 
-#include "sanitizer_common/sanitizer_defs.h"
+#include "sanitizer_common/sanitizer_internal_defs.h"
 #include "sanitizer_common/sanitizer_libc.h"
 
 #if !defined(__linux__) && !defined(__APPLE__) && !defined(_WIN32)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_defs.h b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
similarity index 96%
rename from compiler-rt/lib/sanitizer_common/sanitizer_defs.h
rename to compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
index ac220217ecf7..ed6ef6364f4a 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_defs.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
@@ -1,4 +1,4 @@
-//===-- sanitizer_defs.h ----------------------------------------*- C++ -*-===//
+//===-- sanitizer_internal_defs.h -------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_libc.cc b/compiler-rt/lib/sanitizer_common/sanitizer_libc.cc
index e213b528b145..fe91c9844784 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_libc.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_libc.cc
@@ -10,7 +10,7 @@
 // This file is shared between AddressSanitizer and ThreadSanitizer
 // run-time libraries. See sanitizer_libc.h for details.
 //===----------------------------------------------------------------------===//
-#include "sanitizer_defs.h"
+#include "sanitizer_internal_defs.h"
 #include "sanitizer_libc.h"
 
 namespace __sanitizer {
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_libc.h b/compiler-rt/lib/sanitizer_common/sanitizer_libc.h
index 9391e96118b9..5b42df997a32 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_libc.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_libc.h
@@ -18,7 +18,7 @@
 #ifndef SANITIZER_LIBC_H
 #define SANITIZER_LIBC_H
 
-#include "sanitizer_defs.h"
+#include "sanitizer_internal_defs.h"
 
 // No code here yet. Will move more code in the next changes.
 namespace __sanitizer {
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
index 153c0ca5099f..26270c3ae1ba 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 #ifdef __linux__
 
-#include "sanitizer_defs.h"
+#include "sanitizer_internal_defs.h"
 #include "sanitizer_libc.h"
 
 #include <fcntl.h>
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
index 80ecad2aae53..6e2c8c1f9f91 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
@@ -14,7 +14,7 @@
 
 #ifdef __APPLE__
 
-#include "sanitizer_defs.h"
+#include "sanitizer_internal_defs.h"
 #include "sanitizer_libc.h"
 
 #include <sys/mman.h>
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_posix.cc
index ac3d1ec8d63e..ca5c6fc1d958 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_posix.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_posix.cc
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 #if defined(__linux__) || defined(__APPLE__)
 
-#include "sanitizer_defs.h"
+#include "sanitizer_internal_defs.h"
 #include "sanitizer_libc.h"
 
 #include <stdarg.h>
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.h b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.h
index f487091f3152..17b3f6a97dd0 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer.h
@@ -24,7 +24,7 @@
 #ifndef SANITIZER_SYMBOLIZER_H
 #define SANITIZER_SYMBOLIZER_H
 
-#include "sanitizer_defs.h"
+#include "sanitizer_internal_defs.h"
 #include "sanitizer_libc.h"
 // WARNING: Do not include system headers here. See details above.
 
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_win.cc b/compiler-rt/lib/sanitizer_common/sanitizer_win.cc
index 98414dded45f..a70817de1608 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_win.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_win.cc
@@ -16,7 +16,7 @@
 
 #include <assert.h>
 
-#include "sanitizer_defs.h"
+#include "sanitizer_internal_defs.h"
 #include "sanitizer_libc.h"
 
 #define UNIMPLEMENTED_WIN() assert(false)
diff --git a/compiler-rt/lib/tsan/rtl/tsan_defs.h b/compiler-rt/lib/tsan/rtl/tsan_defs.h
index 94d9b645b96c..e761c787e610 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_defs.h
+++ b/compiler-rt/lib/tsan/rtl/tsan_defs.h
@@ -14,7 +14,7 @@
 #ifndef TSAN_DEFS_H
 #define TSAN_DEFS_H
 
-#include "sanitizer_common/sanitizer_defs.h"
+#include "sanitizer_common/sanitizer_internal_defs.h"
 #include "tsan_stat.h"
 
 #ifndef TSAN_DEBUG