diff --git a/src/e_fmodl.c b/src/e_fmodl.c
index 052cae8..96aef52 100644
--- a/src/e_fmodl.c
+++ b/src/e_fmodl.c
@@ -23,13 +23,13 @@
 #define	BIAS (LDBL_MAX_EXP - 1)
 
 #if LDBL_MANL_SIZE > 32
-typedef	uint64_t manl_t;
+typedef	u_int64_t manl_t;
 #else
 typedef	u_int32_t manl_t;
 #endif
 
 #if LDBL_MANH_SIZE > 32
-typedef	uint64_t manh_t;
+typedef	u_int64_t manh_t;
 #else
 typedef	u_int32_t manh_t;
 #endif
diff --git a/src/e_hypotl.c b/src/e_hypotl.c
index 0a7b5c9..d4910f9 100644
--- a/src/e_hypotl.c
+++ b/src/e_hypotl.c
@@ -40,7 +40,7 @@
 #define	MAX_EXP		LDBL_MAX_EXP
 
 #if LDBL_MANL_SIZE > 32
-typedef	uint64_t man_t;
+typedef	u_int64_t man_t;
 #else
 typedef	u_int32_t man_t;
 #endif
diff --git a/src/s_cbrt.c b/src/s_cbrt.c
index f6850f6..03c766f 100644
--- a/src/s_cbrt.c
+++ b/src/s_cbrt.c
@@ -39,7 +39,7 @@ cbrt(double x)
 	int32_t	hx;
 	union {
 	    double value;
-	    uint64_t bits;
+	    u_int64_t bits;
 	} u;
 	double r,s,t=0.0,w;
 	u_int32_t sign;
diff --git a/src/s_cbrtl.c b/src/s_cbrtl.c
index 8d59d0f..c1f124f 100644
--- a/src/s_cbrtl.c
+++ b/src/s_cbrtl.c
@@ -38,7 +38,7 @@ cbrtl(long double x)
 	double dr, dt, dx;
 	float ft, fx;
 	u_int32_t hx;
-	uint16_t expsign;
+	u_int16_t expsign;
 	int k;
 
 	u.e = x;
diff --git a/src/s_ceill.c b/src/s_ceill.c
index b1c9f94..026d5e6 100644
--- a/src/s_ceill.c
+++ b/src/s_ceill.c
@@ -25,6 +25,7 @@
 
 #include <float.h>
 #include <openlibm.h>
+#include "math_private.h"
 #include <stdint.h>
 
 #include "fpmath.h"
@@ -32,7 +33,7 @@
 #ifdef LDBL_IMPLICIT_NBIT
 #define	MANH_SIZE	(LDBL_MANH_SIZE + 1)
 #define	INC_MANH(u, c)	do {					\
-	uint64_t o = u.bits.manh;				\
+	u_int64_t o = u.bits.manh;				\
 	u.bits.manh += (c);					\
 	if (u.bits.manh < o)					\
 		u.bits.exp++;					\
@@ -40,7 +41,7 @@
 #else
 #define	MANH_SIZE	LDBL_MANH_SIZE
 #define	INC_MANH(u, c)	do {					\
-	uint64_t o = u.bits.manh;				\
+	u_int64_t o = u.bits.manh;				\
 	u.bits.manh += (c);					\
 	if (u.bits.manh < o) {					\
 		u.bits.exp++;					\
@@ -64,7 +65,7 @@ ceill(long double x)
 				    (u.bits.manh | u.bits.manl) != 0)
 					u.e = u.bits.sign ? -0.0 : 1.0;
 		} else {
-			uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
+			u_int64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
 			if (((u.bits.manh & m) | u.bits.manl) == 0)
 				return (x);	/* x is integral */
 			if (!u.bits.sign) {
@@ -81,14 +82,14 @@ ceill(long double x)
 			}
 		}
 	} else if (e < LDBL_MANT_DIG - 1) {
-		uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1);
+		u_int64_t m = (u_int64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1);
 		if ((u.bits.manl & m) == 0)
 			return (x);	/* x is integral */
 		if (!u.bits.sign) {
 			if (e == MANH_SIZE - 1)
 				INC_MANH(u, 1);
 			else {
-				uint64_t o = u.bits.manl;
+				u_int64_t o = u.bits.manl;
 				u.bits.manl += 1llu << (LDBL_MANT_DIG - e - 1);
 				if (u.bits.manl < o)	/* got a carry */
 					INC_MANH(u, 1);
diff --git a/src/s_floorl.c b/src/s_floorl.c
index 544c6f1..30f40a8 100644
--- a/src/s_floorl.c
+++ b/src/s_floorl.c
@@ -32,7 +32,7 @@
 #ifdef LDBL_IMPLICIT_NBIT
 #define	MANH_SIZE	(LDBL_MANH_SIZE + 1)
 #define	INC_MANH(u, c)	do {					\
-	uint64_t o = u.bits.manh;				\
+	u_int64_t o = u.bits.manh;				\
 	u.bits.manh += (c);					\
 	if (u.bits.manh < o)					\
 		u.bits.exp++;					\
@@ -40,7 +40,7 @@
 #else
 #define	MANH_SIZE	LDBL_MANH_SIZE
 #define	INC_MANH(u, c)	do {					\
-	uint64_t o = u.bits.manh;				\
+	u_int64_t o = u.bits.manh;				\
 	u.bits.manh += (c);					\
 	if (u.bits.manh < o) {					\
 		u.bits.exp++;					\
@@ -64,7 +64,7 @@ floorl(long double x)
 				    (u.bits.manh | u.bits.manl) != 0)
 					u.e = u.bits.sign ? -1.0 : 0.0;
 		} else {
-			uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
+			u_int64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
 			if (((u.bits.manh & m) | u.bits.manl) == 0)
 				return (x);	/* x is integral */
 			if (u.bits.sign) {
@@ -81,14 +81,14 @@ floorl(long double x)
 			}
 		}
 	} else if (e < LDBL_MANT_DIG - 1) {
-		uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1);
+		u_int64_t m = (u_int64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1);
 		if ((u.bits.manl & m) == 0)
 			return (x);	/* x is integral */
 		if (u.bits.sign) {
 			if (e == MANH_SIZE - 1)
 				INC_MANH(u, 1);
 			else {
-				uint64_t o = u.bits.manl;
+				u_int64_t o = u.bits.manl;
 				u.bits.manl += 1llu << (LDBL_MANT_DIG - e - 1);
 				if (u.bits.manl < o)	/* got a carry */
 					INC_MANH(u, 1);
diff --git a/src/s_fma.c b/src/s_fma.c
index 616f4a4..4da9b22 100644
--- a/src/s_fma.c
+++ b/src/s_fma.c
@@ -75,7 +75,7 @@ static inline double
 add_adjusted(double a, double b)
 {
 	struct dd sum;
-	uint64_t hibits, lobits;
+	u_int64_t hibits, lobits;
 
 	sum = dd_add(a, b);
 	if (sum.lo != 0) {
@@ -99,7 +99,7 @@ static inline double
 add_and_denormalize(double a, double b, int scale)
 {
 	struct dd sum;
-	uint64_t hibits, lobits;
+	u_int64_t hibits, lobits;
 	int bits_lost;
 
 	sum = dd_add(a, b);
diff --git a/src/s_modfl.c b/src/s_modfl.c
index e5def7e..a5bd53d 100644
--- a/src/s_modfl.c
+++ b/src/s_modfl.c
@@ -43,7 +43,7 @@
 #include "fpmath.h"
 
 #if LDBL_MANL_SIZE > 32
-#define	MASK	((uint64_t)-1)
+#define	MASK	((u_int64_t)-1)
 #else
 #define	MASK	((u_int32_t)-1)
 #endif
diff --git a/src/s_remquol.c b/src/s_remquol.c
index 4466337..1b29725 100644
--- a/src/s_remquol.c
+++ b/src/s_remquol.c
@@ -23,13 +23,13 @@
 #define	BIAS (LDBL_MAX_EXP - 1)
 
 #if LDBL_MANL_SIZE > 32
-typedef	uint64_t manl_t;
+typedef	u_int64_t manl_t;
 #else
 typedef	u_int32_t manl_t;
 #endif
 
 #if LDBL_MANH_SIZE > 32
-typedef	uint64_t manh_t;
+typedef	u_int64_t manh_t;
 #else
 typedef	u_int32_t manh_t;
 #endif
diff --git a/src/s_truncl.c b/src/s_truncl.c
index 03b15ea..8439fd9 100644
--- a/src/s_truncl.c
+++ b/src/s_truncl.c
@@ -49,7 +49,7 @@ truncl(long double x)
 			if (huge + x > 0.0)
 				u.e = zero[u.bits.sign];
 		} else {
-			uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
+			u_int64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
 			if (((u.bits.manh & m) | u.bits.manl) == 0)
 				return (x);	/* x is integral */
 			if (huge + x > 0.0) {	/* raise inexact flag */
@@ -58,7 +58,7 @@ truncl(long double x)
 			}
 		}
 	} else if (e < LDBL_MANT_DIG - 1) {
-		uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1);
+		u_int64_t m = (u_int64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1);
 		if ((u.bits.manl & m) == 0)
 			return (x);	/* x is integral */
 		if (huge + x > 0.0)		/* raise inexact flag */