diff --git a/compiler-rt/lib/abi.h b/compiler-rt/lib/abi.h
deleted file mode 100644
index 2534317ac8f6..000000000000
--- a/compiler-rt/lib/abi.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ===------ abi.h - configuration header for compiler-rt  -----------------===
- *
- *                     The LLVM Compiler Infrastructure
- *
- * This file is dual licensed under the MIT and the University of Illinois Open
- * Source Licenses. See LICENSE.TXT for details.
- *
- * ===----------------------------------------------------------------------===
- *
- * This file is a configuration header for compiler-rt.
- * This file is not part of the interface of this library.
- *
- * ===----------------------------------------------------------------------===
- */
-
-#if __ARM_EABI__
-# define ARM_EABI_FNALIAS(aeabi_name, name)         \
-  void __aeabi_##aeabi_name() __attribute__((alias("__" #name)));
-# define COMPILER_RT_ABI __attribute__((pcs("aapcs")))
-#else
-# define ARM_EABI_FNALIAS(aeabi_name, name)
-# define COMPILER_RT_ABI
-#endif
diff --git a/compiler-rt/lib/absvdi2.c b/compiler-rt/lib/absvdi2.c
index 9c5d4a299baa..09c77b8a14fa 100644
--- a/compiler-rt/lib/absvdi2.c
+++ b/compiler-rt/lib/absvdi2.c
@@ -11,7 +11,6 @@
  *
  *===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 #include <stdlib.h>
diff --git a/compiler-rt/lib/absvsi2.c b/compiler-rt/lib/absvsi2.c
index 80a1a78984a8..fd7fc40c350e 100644
--- a/compiler-rt/lib/absvsi2.c
+++ b/compiler-rt/lib/absvsi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 #include <stdlib.h>
diff --git a/compiler-rt/lib/adddf3.c b/compiler-rt/lib/adddf3.c
index 3cc997b71a3b..7eb40a15d2ae 100644
--- a/compiler-rt/lib/adddf3.c
+++ b/compiler-rt/lib/adddf3.c
@@ -12,8 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "abi.h"
-
 #define DOUBLE_PRECISION
 #include "fp_lib.h"
 
diff --git a/compiler-rt/lib/addsf3.c b/compiler-rt/lib/addsf3.c
index 20610ef31fa2..e57270a1e28d 100644
--- a/compiler-rt/lib/addsf3.c
+++ b/compiler-rt/lib/addsf3.c
@@ -12,8 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "abi.h"
-
 #define SINGLE_PRECISION
 #include "fp_lib.h"
 
diff --git a/compiler-rt/lib/addvdi3.c b/compiler-rt/lib/addvdi3.c
index 51ad397f5710..8df8aabae1e4 100644
--- a/compiler-rt/lib/addvdi3.c
+++ b/compiler-rt/lib/addvdi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 #include <stdlib.h>
diff --git a/compiler-rt/lib/addvsi3.c b/compiler-rt/lib/addvsi3.c
index c18f7bd45986..f8101eabe7ef 100644
--- a/compiler-rt/lib/addvsi3.c
+++ b/compiler-rt/lib/addvsi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 #include <stdlib.h>
diff --git a/compiler-rt/lib/ashldi3.c b/compiler-rt/lib/ashldi3.c
index adce4e2cb755..6c558fe65576 100644
--- a/compiler-rt/lib/ashldi3.c
+++ b/compiler-rt/lib/ashldi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/ashrdi3.c b/compiler-rt/lib/ashrdi3.c
index 03692a31d823..38ab7164527f 100644
--- a/compiler-rt/lib/ashrdi3.c
+++ b/compiler-rt/lib/ashrdi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/clzdi2.c b/compiler-rt/lib/clzdi2.c
index c281945ffdff..b9e64da492bd 100644
--- a/compiler-rt/lib/clzdi2.c
+++ b/compiler-rt/lib/clzdi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/clzsi2.c b/compiler-rt/lib/clzsi2.c
index d0a6aeabcb32..25b8ed2c4c24 100644
--- a/compiler-rt/lib/clzsi2.c
+++ b/compiler-rt/lib/clzsi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/cmpdi2.c b/compiler-rt/lib/cmpdi2.c
index 999c3d2a662f..c2b1f69f4fc2 100644
--- a/compiler-rt/lib/cmpdi2.c
+++ b/compiler-rt/lib/cmpdi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/ctzdi2.c b/compiler-rt/lib/ctzdi2.c
index b3d37d01b0c6..db3c6fdc08f1 100644
--- a/compiler-rt/lib/ctzdi2.c
+++ b/compiler-rt/lib/ctzdi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/ctzsi2.c b/compiler-rt/lib/ctzsi2.c
index 2ff0e5d7655f..c69486ea445f 100644
--- a/compiler-rt/lib/ctzsi2.c
+++ b/compiler-rt/lib/ctzsi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/divdf3.c b/compiler-rt/lib/divdf3.c
index 925abd509e12..cc034dd7acb6 100644
--- a/compiler-rt/lib/divdf3.c
+++ b/compiler-rt/lib/divdf3.c
@@ -15,7 +15,6 @@
 // underflow with correct rounding.
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define DOUBLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/divdi3.c b/compiler-rt/lib/divdi3.c
index d62df56f6783..2c2bcc26d581 100644
--- a/compiler-rt/lib/divdi3.c
+++ b/compiler-rt/lib/divdi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/divmoddi4.c b/compiler-rt/lib/divmoddi4.c
index d3ca745ac695..a2b8714b4c69 100644
--- a/compiler-rt/lib/divmoddi4.c
+++ b/compiler-rt/lib/divmoddi4.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/divmodsi4.c b/compiler-rt/lib/divmodsi4.c
index 4dc1978282a4..c7f7b1a7c322 100644
--- a/compiler-rt/lib/divmodsi4.c
+++ b/compiler-rt/lib/divmodsi4.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/divsf3.c b/compiler-rt/lib/divsf3.c
index b73330793a08..a8230e4a0246 100644
--- a/compiler-rt/lib/divsf3.c
+++ b/compiler-rt/lib/divsf3.c
@@ -15,7 +15,6 @@
 // underflow with correct rounding.
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define SINGLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/divsi3.c b/compiler-rt/lib/divsi3.c
index 01ef27473004..0d81cb80c37c 100644
--- a/compiler-rt/lib/divsi3.c
+++ b/compiler-rt/lib/divsi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/extendsfdf2.c b/compiler-rt/lib/extendsfdf2.c
index c0b628dffcdd..a63015430b1e 100644
--- a/compiler-rt/lib/extendsfdf2.c
+++ b/compiler-rt/lib/extendsfdf2.c
@@ -41,7 +41,7 @@
 #include <stdint.h>
 #include <limits.h>
 
-#include "abi.h"
+#include "int_lib.h"
 
 typedef float src_t;
 typedef uint32_t src_rep_t;
diff --git a/compiler-rt/lib/ffsdi2.c b/compiler-rt/lib/ffsdi2.c
index 89f1b7bf478a..a5ac9900ff10 100644
--- a/compiler-rt/lib/ffsdi2.c
+++ b/compiler-rt/lib/ffsdi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/fixdfdi.c b/compiler-rt/lib/fixdfdi.c
index 85a456d11229..c6732dbbb72d 100644
--- a/compiler-rt/lib/fixdfdi.c
+++ b/compiler-rt/lib/fixdfdi.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/fixdfsi.c b/compiler-rt/lib/fixdfsi.c
index fbcf1470b719..3d4379e8f902 100644
--- a/compiler-rt/lib/fixdfsi.c
+++ b/compiler-rt/lib/fixdfsi.c
@@ -12,7 +12,6 @@
 // conversion is undefined for out of range values in the C standard.
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define DOUBLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/fixsfdi.c b/compiler-rt/lib/fixsfdi.c
index d80e33eb74c5..81ceab024809 100644
--- a/compiler-rt/lib/fixsfdi.c
+++ b/compiler-rt/lib/fixsfdi.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/fixsfsi.c b/compiler-rt/lib/fixsfsi.c
index 67749a56778d..f6de609541e0 100644
--- a/compiler-rt/lib/fixsfsi.c
+++ b/compiler-rt/lib/fixsfsi.c
@@ -12,7 +12,6 @@
 // conversion is undefined for out of range values in the C standard.
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define SINGLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/fixunsdfdi.c b/compiler-rt/lib/fixunsdfdi.c
index d80b84a8d669..c0ff1606ab3f 100644
--- a/compiler-rt/lib/fixunsdfdi.c
+++ b/compiler-rt/lib/fixunsdfdi.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/fixunsdfsi.c b/compiler-rt/lib/fixunsdfsi.c
index ecdfb5d622e6..2ce4999752fa 100644
--- a/compiler-rt/lib/fixunsdfsi.c
+++ b/compiler-rt/lib/fixunsdfsi.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/fixunssfdi.c b/compiler-rt/lib/fixunssfdi.c
index 150642045bdc..09078db2c507 100644
--- a/compiler-rt/lib/fixunssfdi.c
+++ b/compiler-rt/lib/fixunssfdi.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 /* Returns: convert a to a unsigned long long, rounding toward zero.
diff --git a/compiler-rt/lib/fixunssfsi.c b/compiler-rt/lib/fixunssfsi.c
index dbaa5115b2ba..d80ed1824748 100644
--- a/compiler-rt/lib/fixunssfsi.c
+++ b/compiler-rt/lib/fixunssfsi.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/floatdidf.c b/compiler-rt/lib/floatdidf.c
index 5ba952635030..958077032725 100644
--- a/compiler-rt/lib/floatdidf.c
+++ b/compiler-rt/lib/floatdidf.c
@@ -11,7 +11,6 @@
  *
  *===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 #include <float.h>
diff --git a/compiler-rt/lib/floatdisf.c b/compiler-rt/lib/floatdisf.c
index 4dc13cab4778..5a213c091f03 100644
--- a/compiler-rt/lib/floatdisf.c
+++ b/compiler-rt/lib/floatdisf.c
@@ -12,7 +12,6 @@
  *===----------------------------------------------------------------------===
  */
 
-#include "abi.h"
 #include <float.h>
 
 /* Returns: convert a to a float, rounding toward even.*/
diff --git a/compiler-rt/lib/floatsidf.c b/compiler-rt/lib/floatsidf.c
index 72273353ac55..74cb66b2aacf 100644
--- a/compiler-rt/lib/floatsidf.c
+++ b/compiler-rt/lib/floatsidf.c
@@ -12,7 +12,6 @@
 // mode.
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define DOUBLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/floatsisf.c b/compiler-rt/lib/floatsisf.c
index e5250ffd6021..a981391b0c0f 100644
--- a/compiler-rt/lib/floatsisf.c
+++ b/compiler-rt/lib/floatsisf.c
@@ -12,7 +12,6 @@
 // mode.
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define SINGLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/floatundidf.c b/compiler-rt/lib/floatundidf.c
index e74e9d8d2fdd..5848f8d241af 100644
--- a/compiler-rt/lib/floatundidf.c
+++ b/compiler-rt/lib/floatundidf.c
@@ -12,7 +12,6 @@
  * ===----------------------------------------------------------------------===
  */
 
-#include "abi.h"
 #include <float.h>
 
 /* Returns: convert a to a double, rounding toward even. */
diff --git a/compiler-rt/lib/floatundisf.c b/compiler-rt/lib/floatundisf.c
index eea45a745949..9ddafc38f568 100644
--- a/compiler-rt/lib/floatundisf.c
+++ b/compiler-rt/lib/floatundisf.c
@@ -12,7 +12,6 @@
  *===----------------------------------------------------------------------===
  */
 
-#include "abi.h"
 #include <float.h>
 
 /* Returns: convert a to a float, rounding toward even. */
diff --git a/compiler-rt/lib/floatunsidf.c b/compiler-rt/lib/floatunsidf.c
index 37562996a41b..0722248ddfeb 100644
--- a/compiler-rt/lib/floatunsidf.c
+++ b/compiler-rt/lib/floatunsidf.c
@@ -12,7 +12,6 @@
 // mode.
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define DOUBLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/floatunsisf.c b/compiler-rt/lib/floatunsisf.c
index 14ef10307f79..3dc1cd442ba5 100644
--- a/compiler-rt/lib/floatunsisf.c
+++ b/compiler-rt/lib/floatunsisf.c
@@ -12,7 +12,6 @@
 // mode.
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define SINGLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/fp_lib.h b/compiler-rt/lib/fp_lib.h
index 6c9455ace0e6..de5f17fde191 100644
--- a/compiler-rt/lib/fp_lib.h
+++ b/compiler-rt/lib/fp_lib.h
@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <limits.h>
+#include "int_lib.h"
 
 #if defined SINGLE_PRECISION
 
diff --git a/compiler-rt/lib/int_lib.h b/compiler-rt/lib/int_lib.h
index e1fd6b73dc7f..27d01fdbb49b 100644
--- a/compiler-rt/lib/int_lib.h
+++ b/compiler-rt/lib/int_lib.h
@@ -16,6 +16,17 @@
 #ifndef INT_LIB_H
 #define INT_LIB_H
 
+/* ABI macro definitions */
+
+#if __ARM_EABI__
+# define ARM_EABI_FNALIAS(aeabi_name, name)         \
+  void __aeabi_##aeabi_name() __attribute__((alias("__" #name)));
+# define COMPILER_RT_ABI __attribute__((pcs("aapcs")))
+#else
+# define ARM_EABI_FNALIAS(aeabi_name, name)
+# define COMPILER_RT_ABI
+#endif
+
 /* Assumption:  signed integral is 2's complement */
 /* Assumption:  right shift of signed negative is arithmetic shift */
 
diff --git a/compiler-rt/lib/lshrdi3.c b/compiler-rt/lib/lshrdi3.c
index 911edb191422..8af3e0c1a61b 100644
--- a/compiler-rt/lib/lshrdi3.c
+++ b/compiler-rt/lib/lshrdi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/moddi3.c b/compiler-rt/lib/moddi3.c
index af0a80832aef..2f3b9cc4f291 100644
--- a/compiler-rt/lib/moddi3.c
+++ b/compiler-rt/lib/moddi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/modsi3.c b/compiler-rt/lib/modsi3.c
index 05ce806f7105..d16213c49038 100644
--- a/compiler-rt/lib/modsi3.c
+++ b/compiler-rt/lib/modsi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/muldf3.c b/compiler-rt/lib/muldf3.c
index f402cfb39d38..86d72d883e23 100644
--- a/compiler-rt/lib/muldf3.c
+++ b/compiler-rt/lib/muldf3.c
@@ -11,7 +11,6 @@
 // with the IEEE-754 default rounding (to nearest, ties to even).
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define DOUBLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/muldi3.c b/compiler-rt/lib/muldi3.c
index e6322bf5df82..3e996302d359 100644
--- a/compiler-rt/lib/muldi3.c
+++ b/compiler-rt/lib/muldi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/mulsf3.c b/compiler-rt/lib/mulsf3.c
index bf46e148167b..fce2fd4fb2a3 100644
--- a/compiler-rt/lib/mulsf3.c
+++ b/compiler-rt/lib/mulsf3.c
@@ -11,7 +11,6 @@
 // with the IEEE-754 default rounding (to nearest, ties to even).
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define SINGLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/negdf2.c b/compiler-rt/lib/negdf2.c
index b47f3978b41e..b11b4806c04a 100644
--- a/compiler-rt/lib/negdf2.c
+++ b/compiler-rt/lib/negdf2.c
@@ -10,7 +10,6 @@
 // This file implements double-precision soft-float negation.
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define DOUBLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/negsf2.c b/compiler-rt/lib/negsf2.c
index 98f9fc0c0a3a..f8ef2d1da6ae 100644
--- a/compiler-rt/lib/negsf2.c
+++ b/compiler-rt/lib/negsf2.c
@@ -10,7 +10,6 @@
 // This file implements single-precision soft-float negation.
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define SINGLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/negvdi2.c b/compiler-rt/lib/negvdi2.c
index aafaa9dc5ea3..3ea0030ac5ed 100644
--- a/compiler-rt/lib/negvdi2.c
+++ b/compiler-rt/lib/negvdi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 #include <stdlib.h>
diff --git a/compiler-rt/lib/negvsi2.c b/compiler-rt/lib/negvsi2.c
index 559ea18e48b4..9e441ccdb819 100644
--- a/compiler-rt/lib/negvsi2.c
+++ b/compiler-rt/lib/negvsi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 #include <stdlib.h>
diff --git a/compiler-rt/lib/paritydi2.c b/compiler-rt/lib/paritydi2.c
index e7bebf68524b..2ded54c90b93 100644
--- a/compiler-rt/lib/paritydi2.c
+++ b/compiler-rt/lib/paritydi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/paritysi2.c b/compiler-rt/lib/paritysi2.c
index 64d509fa7954..599984663849 100644
--- a/compiler-rt/lib/paritysi2.c
+++ b/compiler-rt/lib/paritysi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/popcountdi2.c b/compiler-rt/lib/popcountdi2.c
index 136fc0486fd0..5e8a62f075eb 100644
--- a/compiler-rt/lib/popcountdi2.c
+++ b/compiler-rt/lib/popcountdi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/popcountsi2.c b/compiler-rt/lib/popcountsi2.c
index bfaa3fff2ee4..44544ff49890 100644
--- a/compiler-rt/lib/popcountsi2.c
+++ b/compiler-rt/lib/popcountsi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/powidf2.c b/compiler-rt/lib/powidf2.c
index 2e211eb3dcb8..ac13b172b043 100644
--- a/compiler-rt/lib/powidf2.c
+++ b/compiler-rt/lib/powidf2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/powisf2.c b/compiler-rt/lib/powisf2.c
index e6b43b3a3cc4..0c400ec6dd6a 100644
--- a/compiler-rt/lib/powisf2.c
+++ b/compiler-rt/lib/powisf2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/subdf3.c b/compiler-rt/lib/subdf3.c
index 825e3c662973..5eb1853ef79b 100644
--- a/compiler-rt/lib/subdf3.c
+++ b/compiler-rt/lib/subdf3.c
@@ -11,7 +11,6 @@
 // IEEE-754 default rounding (to nearest, ties to even).
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define DOUBLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/subsf3.c b/compiler-rt/lib/subsf3.c
index 625376acc376..351be0ef46a2 100644
--- a/compiler-rt/lib/subsf3.c
+++ b/compiler-rt/lib/subsf3.c
@@ -11,7 +11,6 @@
 // IEEE-754 default rounding (to nearest, ties to even).
 //
 //===----------------------------------------------------------------------===//
-#include "abi.h"
 
 #define SINGLE_PRECISION
 #include "fp_lib.h"
diff --git a/compiler-rt/lib/subvdi3.c b/compiler-rt/lib/subvdi3.c
index 36b51ad979ac..bcbee0bbb6d1 100644
--- a/compiler-rt/lib/subvdi3.c
+++ b/compiler-rt/lib/subvdi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 #include <stdlib.h>
diff --git a/compiler-rt/lib/subvsi3.c b/compiler-rt/lib/subvsi3.c
index 03983f747e49..88d446e9017d 100644
--- a/compiler-rt/lib/subvsi3.c
+++ b/compiler-rt/lib/subvsi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 #include <stdlib.h>
diff --git a/compiler-rt/lib/truncdfsf2.c b/compiler-rt/lib/truncdfsf2.c
index 1dbf02f5ef63..2353b9b407cf 100644
--- a/compiler-rt/lib/truncdfsf2.c
+++ b/compiler-rt/lib/truncdfsf2.c
@@ -41,7 +41,7 @@
 #include <limits.h>
 #include <stdbool.h>
 
-#include "abi.h"
+#include "int_lib.h"
 
 typedef double src_t;
 typedef uint64_t src_rep_t;
diff --git a/compiler-rt/lib/ucmpdi2.c b/compiler-rt/lib/ucmpdi2.c
index f2d3f99f880e..3242bbf08046 100644
--- a/compiler-rt/lib/ucmpdi2.c
+++ b/compiler-rt/lib/ucmpdi2.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/udivdi3.c b/compiler-rt/lib/udivdi3.c
index bbd551ac7111..6c0303df3d40 100644
--- a/compiler-rt/lib/udivdi3.c
+++ b/compiler-rt/lib/udivdi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/udivmoddi4.c b/compiler-rt/lib/udivmoddi4.c
index dcf186df111b..73043d421fc3 100644
--- a/compiler-rt/lib/udivmoddi4.c
+++ b/compiler-rt/lib/udivmoddi4.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/udivmodsi4.c b/compiler-rt/lib/udivmodsi4.c
index 2a3ee27f8dcf..5b49089fccc4 100644
--- a/compiler-rt/lib/udivmodsi4.c
+++ b/compiler-rt/lib/udivmodsi4.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/udivsi3.c b/compiler-rt/lib/udivsi3.c
index 721ae89e4bfc..39ef48bea651 100644
--- a/compiler-rt/lib/udivsi3.c
+++ b/compiler-rt/lib/udivsi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/umoddi3.c b/compiler-rt/lib/umoddi3.c
index 9de1a64fdad1..3541ab6e91d8 100644
--- a/compiler-rt/lib/umoddi3.c
+++ b/compiler-rt/lib/umoddi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"
 
diff --git a/compiler-rt/lib/umodsi3.c b/compiler-rt/lib/umodsi3.c
index 569b7fcb1685..aae741d896d2 100644
--- a/compiler-rt/lib/umodsi3.c
+++ b/compiler-rt/lib/umodsi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"