diff --git a/compiler-rt/lib/absvti2.c b/compiler-rt/lib/absvti2.c
index 8f2bddcb3b27..c1c7277986ab 100644
--- a/compiler-rt/lib/absvti2.c
+++ b/compiler-rt/lib/absvti2.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: absolute value */
 
 /* Effects: aborts if abs(x) < 0 */
diff --git a/compiler-rt/lib/addvti3.c b/compiler-rt/lib/addvti3.c
index 9105c178994e..2efcf3b408e4 100644
--- a/compiler-rt/lib/addvti3.c
+++ b/compiler-rt/lib/addvti3.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: a + b */
 
 /* Effects: aborts if a + b overflows */
diff --git a/compiler-rt/lib/ashlti3.c b/compiler-rt/lib/ashlti3.c
index 7042b53b9562..4bd8219b5278 100644
--- a/compiler-rt/lib/ashlti3.c
+++ b/compiler-rt/lib/ashlti3.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: a << b */
 
 /* Precondition:  0 <= b < bits_in_tword */
diff --git a/compiler-rt/lib/ashrti3.c b/compiler-rt/lib/ashrti3.c
index 4d16230273d9..ed43641c7ef7 100644
--- a/compiler-rt/lib/ashrti3.c
+++ b/compiler-rt/lib/ashrti3.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: arithmetic a >> b */
 
 /* Precondition:  0 <= b < bits_in_tword */
diff --git a/compiler-rt/lib/clzti2.c b/compiler-rt/lib/clzti2.c
index 7a650eb42544..355c20e4239c 100644
--- a/compiler-rt/lib/clzti2.c
+++ b/compiler-rt/lib/clzti2.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: the number of leading 0-bits */
 
 /* Precondition: a != 0 */
diff --git a/compiler-rt/lib/cmpti2.c b/compiler-rt/lib/cmpti2.c
index b156fce90bfa..d0aec452a466 100644
--- a/compiler-rt/lib/cmpti2.c
+++ b/compiler-rt/lib/cmpti2.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns:  if (a <  b) returns 0
  *           if (a == b) returns 1
  *           if (a >  b) returns 2
diff --git a/compiler-rt/lib/ctzti2.c b/compiler-rt/lib/ctzti2.c
index 1c9508fd5524..66dc01b7ad3e 100644
--- a/compiler-rt/lib/ctzti2.c
+++ b/compiler-rt/lib/ctzti2.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: the number of trailing 0-bits */
 
 /* Precondition: a != 0 */
diff --git a/compiler-rt/lib/divti3.c b/compiler-rt/lib/divti3.c
index 4ec3fa35ec58..0242c13683f8 100644
--- a/compiler-rt/lib/divti3.c
+++ b/compiler-rt/lib/divti3.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 tu_int __udivmodti4(tu_int a, tu_int b, tu_int* rem);
 
 /* Returns: a / b */
diff --git a/compiler-rt/lib/ffsti2.c b/compiler-rt/lib/ffsti2.c
index 948c696b6a10..27e15d5810ef 100644
--- a/compiler-rt/lib/ffsti2.c
+++ b/compiler-rt/lib/ffsti2.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: the index of the least significant 1-bit in a, or
  * the value zero if a is zero. The least significant bit is index one.
  */
diff --git a/compiler-rt/lib/fixdfti.c b/compiler-rt/lib/fixdfti.c
index 4140d144618a..b110a94b8427 100644
--- a/compiler-rt/lib/fixdfti.c
+++ b/compiler-rt/lib/fixdfti.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: convert a to a signed long long, rounding toward zero. */
 
 /* Assumption: double is a IEEE 64 bit floating point type 
diff --git a/compiler-rt/lib/fixsfti.c b/compiler-rt/lib/fixsfti.c
index c64e5aea5845..c730ae0467c4 100644
--- a/compiler-rt/lib/fixsfti.c
+++ b/compiler-rt/lib/fixsfti.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: convert a to a signed long long, rounding toward zero. */
 
 /* Assumption: float is a IEEE 32 bit floating point type 
diff --git a/compiler-rt/lib/fixunsdfti.c b/compiler-rt/lib/fixunsdfti.c
index 524a2078fa46..fb0336f69081 100644
--- a/compiler-rt/lib/fixunsdfti.c
+++ b/compiler-rt/lib/fixunsdfti.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: convert a to a unsigned long long, rounding toward zero.
  *          Negative values all become zero.
  */
diff --git a/compiler-rt/lib/fixunssfti.c b/compiler-rt/lib/fixunssfti.c
index b807910177a0..8f4c62627ca5 100644
--- a/compiler-rt/lib/fixunssfti.c
+++ b/compiler-rt/lib/fixunssfti.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: convert a to a unsigned long long, rounding toward zero.
  *          Negative values all become zero.
  */
diff --git a/compiler-rt/lib/fixunsxfti.c b/compiler-rt/lib/fixunsxfti.c
index f0e16dbfe4dd..260bfc01f647 100644
--- a/compiler-rt/lib/fixunsxfti.c
+++ b/compiler-rt/lib/fixunsxfti.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: convert a to a unsigned long long, rounding toward zero.
  *          Negative values all become zero.
  */
diff --git a/compiler-rt/lib/fixxfti.c b/compiler-rt/lib/fixxfti.c
index 1022770f1147..973dc31bf937 100644
--- a/compiler-rt/lib/fixxfti.c
+++ b/compiler-rt/lib/fixxfti.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: convert a to a signed long long, rounding toward zero. */
 
 /* Assumption: long double is an intel 80 bit floating point type padded with 6 bytes
diff --git a/compiler-rt/lib/floattidf.c b/compiler-rt/lib/floattidf.c
index 3cafea8a2e7d..77749f8d340b 100644
--- a/compiler-rt/lib/floattidf.c
+++ b/compiler-rt/lib/floattidf.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */ 
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: convert a to a double, rounding toward even.*/
 
 /* Assumption: double is a IEEE 64 bit floating point type 
diff --git a/compiler-rt/lib/floattisf.c b/compiler-rt/lib/floattisf.c
index ab33e4aada51..4776125ded79 100644
--- a/compiler-rt/lib/floattisf.c
+++ b/compiler-rt/lib/floattisf.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: convert a to a float, rounding toward even. */
 
 /* Assumption: float is a IEEE 32 bit floating point type 
diff --git a/compiler-rt/lib/floattixf.c b/compiler-rt/lib/floattixf.c
index 852acc707465..3813dc6b7754 100644
--- a/compiler-rt/lib/floattixf.c
+++ b/compiler-rt/lib/floattixf.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: convert a to a long double, rounding toward even. */
 
 /* Assumption: long double is a IEEE 80 bit floating point type padded to 128 bits
diff --git a/compiler-rt/lib/floatuntidf.c b/compiler-rt/lib/floatuntidf.c
index d0889a0744f0..4c1d3289f511 100644
--- a/compiler-rt/lib/floatuntidf.c
+++ b/compiler-rt/lib/floatuntidf.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: convert a to a double, rounding toward even. */
 
 /* Assumption: double is a IEEE 64 bit floating point type 
diff --git a/compiler-rt/lib/floatuntisf.c b/compiler-rt/lib/floatuntisf.c
index f5527583ce57..c8da2601ba8d 100644
--- a/compiler-rt/lib/floatuntisf.c
+++ b/compiler-rt/lib/floatuntisf.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: convert a to a float, rounding toward even. */
 
 /* Assumption: float is a IEEE 32 bit floating point type 
diff --git a/compiler-rt/lib/floatuntixf.c b/compiler-rt/lib/floatuntixf.c
index 00c07d8ed4e6..dbce80f16ee5 100644
--- a/compiler-rt/lib/floatuntixf.c
+++ b/compiler-rt/lib/floatuntixf.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: convert a to a long double, rounding toward even. */
 
 /* Assumption: long double is a IEEE 80 bit floating point type padded to 128 bits
diff --git a/compiler-rt/lib/lshrti3.c b/compiler-rt/lib/lshrti3.c
index 5fdd99eb7703..be768143b581 100644
--- a/compiler-rt/lib/lshrti3.c
+++ b/compiler-rt/lib/lshrti3.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: logical a >> b */
 
 /* Precondition:  0 <= b < bits_in_tword */
diff --git a/compiler-rt/lib/modti3.c b/compiler-rt/lib/modti3.c
index dbe5e949b9da..752202d45e01 100644
--- a/compiler-rt/lib/modti3.c
+++ b/compiler-rt/lib/modti3.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 tu_int __udivmodti4(tu_int a, tu_int b, tu_int* rem);
 
 /*Returns: a % b */
diff --git a/compiler-rt/lib/muloti4.c b/compiler-rt/lib/muloti4.c
index 1fcd0baf799f..f58dd074eea9 100644
--- a/compiler-rt/lib/muloti4.c
+++ b/compiler-rt/lib/muloti4.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: a * b */
 
 /* Effects: sets *overflow to 1  if a * b overflows */
diff --git a/compiler-rt/lib/multi3.c b/compiler-rt/lib/multi3.c
index ad8ab3fcbcb4..0b8730f08cec 100644
--- a/compiler-rt/lib/multi3.c
+++ b/compiler-rt/lib/multi3.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: a * b */
 
 static
diff --git a/compiler-rt/lib/mulvti3.c b/compiler-rt/lib/mulvti3.c
index ae65cf8fee19..31f7d2fd3746 100644
--- a/compiler-rt/lib/mulvti3.c
+++ b/compiler-rt/lib/mulvti3.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: a * b */
 
 /* Effects: aborts if a * b overflows */
diff --git a/compiler-rt/lib/negti2.c b/compiler-rt/lib/negti2.c
index 774e80829454..f7e4ad3b94af 100644
--- a/compiler-rt/lib/negti2.c
+++ b/compiler-rt/lib/negti2.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: -a */
 
 ti_int
diff --git a/compiler-rt/lib/negvti2.c b/compiler-rt/lib/negvti2.c
index ef766bb486b1..05df6152fcdf 100644
--- a/compiler-rt/lib/negvti2.c
+++ b/compiler-rt/lib/negvti2.c
@@ -12,10 +12,10 @@
  *===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: -a */
 
 /* Effects: aborts if -a overflows */
diff --git a/compiler-rt/lib/parityti2.c b/compiler-rt/lib/parityti2.c
index 8f857455a7b2..a1f47b1d931b 100644
--- a/compiler-rt/lib/parityti2.c
+++ b/compiler-rt/lib/parityti2.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */ 
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: 1 if number of bits is odd else returns 0 */
 
 si_int __paritydi2(di_int a);
diff --git a/compiler-rt/lib/popcountti2.c b/compiler-rt/lib/popcountti2.c
index 68d94270792f..95666738f721 100644
--- a/compiler-rt/lib/popcountti2.c
+++ b/compiler-rt/lib/popcountti2.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: count of 1 bits */
 
 si_int
diff --git a/compiler-rt/lib/powitf2.c b/compiler-rt/lib/powitf2.c
index 189632cf6304..d3b934924f3e 100644
--- a/compiler-rt/lib/powitf2.c
+++ b/compiler-rt/lib/powitf2.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if _ARCH_PPC
-
 #include "int_lib.h"
 
+#if _ARCH_PPC
+
 /* Returns: a ^ b */
 
 long double
diff --git a/compiler-rt/lib/subvti3.c b/compiler-rt/lib/subvti3.c
index 44127b73a9a9..b32df5e6c7e9 100644
--- a/compiler-rt/lib/subvti3.c
+++ b/compiler-rt/lib/subvti3.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns: a - b */
 
 /* Effects: aborts if a - b overflows */
diff --git a/compiler-rt/lib/ucmpti2.c b/compiler-rt/lib/ucmpti2.c
index 11137c5a5ee0..5466d217428f 100644
--- a/compiler-rt/lib/ucmpti2.c
+++ b/compiler-rt/lib/ucmpti2.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Returns:  if (a <  b) returns 0
  *           if (a == b) returns 1
  *           if (a >  b) returns 2
diff --git a/compiler-rt/lib/udivmodti4.c b/compiler-rt/lib/udivmodti4.c
index 427861b1e3d1..f619c74955e4 100644
--- a/compiler-rt/lib/udivmodti4.c
+++ b/compiler-rt/lib/udivmodti4.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */ 
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 /* Effects: if rem != 0, *rem = a % b 
  * Returns: a / b 
  */
diff --git a/compiler-rt/lib/udivti3.c b/compiler-rt/lib/udivti3.c
index 7405a0f98656..d9e1bb46f5c9 100644
--- a/compiler-rt/lib/udivti3.c
+++ b/compiler-rt/lib/udivti3.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 tu_int __udivmodti4(tu_int a, tu_int b, tu_int* rem);
 
 /* Returns: a / b */
diff --git a/compiler-rt/lib/umodti3.c b/compiler-rt/lib/umodti3.c
index 8f20c5fe35b9..8ebe7f0dcf03 100644
--- a/compiler-rt/lib/umodti3.c
+++ b/compiler-rt/lib/umodti3.c
@@ -12,10 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if __x86_64
-
 #include "int_lib.h"
 
+#if __x86_64
+
 tu_int __udivmodti4(tu_int a, tu_int b, tu_int* rem);
 
 /* Returns: a % b */