diff --git a/src/ciabatta.c b/src/ciabatta.c
index 416d19f..f4687ec 100644
--- a/src/ciabatta.c
+++ b/src/ciabatta.c
@@ -4,6 +4,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fenv.h>
+#include <float.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <locale.h>
diff --git a/src/math/basic.c b/src/math/basic.c
index 522a8bf..74efc84 100644
--- a/src/math/basic.c
+++ b/src/math/basic.c
@@ -1,7 +1,4 @@
 
-#include <math.h>
-#include <stdint.h>
-
 double fabs(double x) {
     union {double f; uint64_t i;} u = {x};
     u.i &= -1ULL/2;
diff --git a/src/math/division.c b/src/math/division.c
index 16ec082..8932d6e 100644
--- a/src/math/division.c
+++ b/src/math/division.c
@@ -1,7 +1,4 @@
 
-#include <math.h>
-#include <stdint.h>
-
 double remquo(double x, double y, int *quo) {
     union {double f; uint64_t i;} ux = {x}, uy = {y};
     int ex = ux.i>>52 & 0x7ff;
diff --git a/src/math/gen_math.c b/src/math/gen_math.c
index 0ef25bb..700ad30 100644
--- a/src/math/gen_math.c
+++ b/src/math/gen_math.c
@@ -1,10 +1,4 @@
 
-#include <math.h>
-#include <fenv.h>
-#include <errno.h>
-#include <stdint.h>
-#include <stddef.h>
-
 static double LN2       = 0.693147180559945309417232121458176;
 static double HALF_PI   = 1.570796326794896619231321691639751;
 static double PI        = 3.141592653589793238462643383279502;
diff --git a/src/math/gen_math.h b/src/math/gen_math.h
index 2f22c93..23c97a5 100644
--- a/src/math/gen_math.h
+++ b/src/math/gen_math.h
@@ -1,5 +1,4 @@
 
-
 static ftype suffix(cordic)(
     ftype x0,  // x initial value
     ftype y0,  // y initial value
diff --git a/src/math/round.c b/src/math/round.c
index 28f0480..aa08d41 100644
--- a/src/math/round.c
+++ b/src/math/round.c
@@ -1,10 +1,4 @@
 
-#include <math.h>
-#include <stdint.h>
-#include <fenv.h>
-#include <float.h>
-#include <limits.h>
-
 #define asuint64(x) ((union {double f; uint64_t i;}){x}).i
 #define asdouble(x) ((union {double f; uint64_t i;}){x}).f