diff --git a/lib/floatdidf.c b/lib/floatdidf.c
index fd12c30..2af9e10 100644
--- a/lib/floatdidf.c
+++ b/lib/floatdidf.c
@@ -13,7 +13,6 @@
  */
 
 #include "int_lib.h"
-#include <float.h>
 
 /* Returns: convert a to a double, rounding toward even. */
 
diff --git a/lib/floatdisf.c b/lib/floatdisf.c
index 5a213c0..6607307 100644
--- a/lib/floatdisf.c
+++ b/lib/floatdisf.c
@@ -12,8 +12,6 @@
  *===----------------------------------------------------------------------===
  */
 
-#include <float.h>
-
 /* Returns: convert a to a float, rounding toward even.*/
 
 /* Assumption: float is a IEEE 32 bit floating point type 
diff --git a/lib/floattidf.c b/lib/floattidf.c
index f61844d..3cafea8 100644
--- a/lib/floattidf.c
+++ b/lib/floattidf.c
@@ -15,7 +15,6 @@
 #if __x86_64
 
 #include "int_lib.h"
-#include <float.h>
 
 /* Returns: convert a to a double, rounding toward even.*/
 
diff --git a/lib/floattisf.c b/lib/floattisf.c
index 7eb761d..ab33e4a 100644
--- a/lib/floattisf.c
+++ b/lib/floattisf.c
@@ -15,7 +15,6 @@
 #if __x86_64
 
 #include "int_lib.h"
-#include <float.h>
 
 /* Returns: convert a to a float, rounding toward even. */
 
diff --git a/lib/floattixf.c b/lib/floattixf.c
index e4bcb5f..852acc7 100644
--- a/lib/floattixf.c
+++ b/lib/floattixf.c
@@ -15,7 +15,6 @@
 #if __x86_64
 
 #include "int_lib.h"
-#include <float.h>
 
 /* Returns: convert a to a long double, rounding toward even. */
 
diff --git a/lib/floatundidf.c b/lib/floatundidf.c
index 0b328d0..6791701 100644
--- a/lib/floatundidf.c
+++ b/lib/floatundidf.c
@@ -12,8 +12,6 @@
  * ===----------------------------------------------------------------------===
  */
 
-#include <float.h>
-
 /* Returns: convert a to a double, rounding toward even. */
 
 /* Assumption: double is a IEEE 64 bit floating point type 
diff --git a/lib/floatundisf.c b/lib/floatundisf.c
index 9ddafc3..1bf5fbb 100644
--- a/lib/floatundisf.c
+++ b/lib/floatundisf.c
@@ -12,8 +12,6 @@
  *===----------------------------------------------------------------------===
  */
 
-#include <float.h>
-
 /* Returns: convert a to a float, rounding toward even. */
 
 /* Assumption: float is a IEEE 32 bit floating point type 
diff --git a/lib/floatuntidf.c b/lib/floatuntidf.c
index bab7483..d0889a0 100644
--- a/lib/floatuntidf.c
+++ b/lib/floatuntidf.c
@@ -15,7 +15,6 @@
 #if __x86_64
 
 #include "int_lib.h"
-#include <float.h>
 
 /* Returns: convert a to a double, rounding toward even. */
 
diff --git a/lib/floatuntisf.c b/lib/floatuntisf.c
index 0ab6d7e..f552758 100644
--- a/lib/floatuntisf.c
+++ b/lib/floatuntisf.c
@@ -15,7 +15,6 @@
 #if __x86_64
 
 #include "int_lib.h"
-#include <float.h>
 
 /* Returns: convert a to a float, rounding toward even. */
 
diff --git a/lib/floatuntixf.c b/lib/floatuntixf.c
index a84709a..00c07d8 100644
--- a/lib/floatuntixf.c
+++ b/lib/floatuntixf.c
@@ -15,7 +15,6 @@
 #if __x86_64
 
 #include "int_lib.h"
-#include <float.h>
 
 /* Returns: convert a to a long double, rounding toward even. */
 
diff --git a/lib/int_lib.h b/lib/int_lib.h
index e265ced..9725f6e 100644
--- a/lib/int_lib.h
+++ b/lib/int_lib.h
@@ -31,9 +31,13 @@
 # define COMPILER_RT_ABI
 #endif
 
+/* Include the standard compiler builtin headers we use functionality from. */
 #include <limits.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <float.h>
+
+/* Include the system math.h, which we use in a number of places. */
 #include <math.h>
 
 /* If compiling for kernel use, call panic() instead of abort(). */