diff --git a/compiler-rt/lib/enable_execute_stack.c b/compiler-rt/lib/enable_execute_stack.c
index 7ab8e8d4155c..278ca246f537 100644
--- a/compiler-rt/lib/enable_execute_stack.c
+++ b/compiler-rt/lib/enable_execute_stack.c
@@ -8,7 +8,8 @@
  * ===----------------------------------------------------------------------===
  */
 
-#include <stdint.h>
+#include "int_lib.h"
+
 #include <sys/mman.h>
 
 /* #include "config.h"
diff --git a/compiler-rt/lib/extendsfdf2.c b/compiler-rt/lib/extendsfdf2.c
index a63015430b1e..9466de780808 100644
--- a/compiler-rt/lib/extendsfdf2.c
+++ b/compiler-rt/lib/extendsfdf2.c
@@ -38,9 +38,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <stdint.h>
-#include <limits.h>
-
 #include "int_lib.h"
 
 typedef float src_t;
diff --git a/compiler-rt/lib/floatdidf.c b/compiler-rt/lib/floatdidf.c
index 958077032725..fd12c3003816 100644
--- a/compiler-rt/lib/floatdidf.c
+++ b/compiler-rt/lib/floatdidf.c
@@ -29,7 +29,6 @@ ARM_EABI_FNALIAS(l2d, floatdidf);
 /* Support for systems that have hardware floating-point; we'll set the inexact flag
  * as a side-effect of this computation.
  */
-#include <stdint.h>
 
 COMPILER_RT_ABI double
 __floatdidf(di_int a)
diff --git a/compiler-rt/lib/floatundidf.c b/compiler-rt/lib/floatundidf.c
index 5848f8d241af..0b328d0cc8b1 100644
--- a/compiler-rt/lib/floatundidf.c
+++ b/compiler-rt/lib/floatundidf.c
@@ -31,7 +31,6 @@ ARM_EABI_FNALIAS(ul2d, floatundidf);
  * as a side-effect of this computation.
  */
 
-#include <stdint.h>
 
 COMPILER_RT_ABI double
 __floatundidf(du_int a)
diff --git a/compiler-rt/lib/gcc_personality_v0.c b/compiler-rt/lib/gcc_personality_v0.c
index c840eef4842a..9ad78cdc05ad 100644
--- a/compiler-rt/lib/gcc_personality_v0.c
+++ b/compiler-rt/lib/gcc_personality_v0.c
@@ -9,7 +9,6 @@
  *
  */
 
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/compiler-rt/lib/int_lib.h b/compiler-rt/lib/int_lib.h
index dd65b69db838..e265ced60149 100644
--- a/compiler-rt/lib/int_lib.h
+++ b/compiler-rt/lib/int_lib.h
@@ -33,6 +33,7 @@
 
 #include <limits.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <math.h>
 
 /* If compiling for kernel use, call panic() instead of abort(). */
diff --git a/compiler-rt/lib/trampoline_setup.c b/compiler-rt/lib/trampoline_setup.c
index ced119fb5833..75cc82a27494 100644
--- a/compiler-rt/lib/trampoline_setup.c
+++ b/compiler-rt/lib/trampoline_setup.c
@@ -8,7 +8,6 @@
  * ===----------------------------------------------------------------------===
  */
 
-#include <stdint.h>
 #include <stdlib.h>
 
 #include "int_lib.h"
diff --git a/compiler-rt/lib/truncdfsf2.c b/compiler-rt/lib/truncdfsf2.c
index 2353b9b407cf..f57af7e736dd 100644
--- a/compiler-rt/lib/truncdfsf2.c
+++ b/compiler-rt/lib/truncdfsf2.c
@@ -37,10 +37,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <stdint.h>
-#include <limits.h>
-#include <stdbool.h>
-
 #include "int_lib.h"
 
 typedef double src_t;