diff --git a/include/fpmath.h b/include/fpmath.h
index f35e5f8..cb49928 100644
--- a/include/fpmath.h
+++ b/include/fpmath.h
@@ -28,11 +28,13 @@
  */
 
 // Currently assumes Intel platform
+#if defined (__i386__) || defined(__x86_64__)
 #ifdef __LP64__
 #include "amd64_fpmath.h"
 #else 
 #include "i386_fpmath.h"
 #endif
+#endif
 
 #ifdef __linux
 #include <features.h>
diff --git a/src/e_fmodl.c b/src/e_fmodl.c
index 40ba634..b9a9d99 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	uint32_t manl_t;
 #endif
 
 #if LDBL_MANH_SIZE > 32
-typedef	uint64_t manh_t;
+typedef	u_int64_t manh_t;
 #else
 typedef	uint32_t manh_t;
 #endif
diff --git a/src/e_hypotl.c b/src/e_hypotl.c
index ceaeec9..af54d6a 100644
--- a/src/e_hypotl.c
+++ b/src/e_hypotl.c
@@ -55,7 +55,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	uint32_t man_t;
 #endif
diff --git a/src/k_log.h b/src/k_log.h
index 456c5c6..7523134 100644
--- a/src/k_log.h
+++ b/src/k_log.h
@@ -12,7 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/k_log.h,v 1.1.2.2 2011/03/06 08:49:44 das Exp $");
 
 /* __kernel_log(x)
  * Return log(x) - (x-1) for x in ~[sqrt(2)/2, sqrt(2)].
diff --git a/src/k_logf.h b/src/k_logf.h
index 3945651..ebc5e40 100644
--- a/src/k_logf.h
+++ b/src/k_logf.h
@@ -10,7 +10,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/k_logf.h,v 1.2.2.2 2011/03/06 08:49:44 das Exp $");
 
 /* __kernel_logf(x)
  * Return log(x) - (x-1) for x in ~[sqrt(2)/2, sqrt(2)].
diff --git a/src/openlibm.h b/src/openlibm.h
index 5379f80..6c94267 100644
--- a/src/openlibm.h
+++ b/src/openlibm.h
@@ -18,8 +18,8 @@
 #define	_MATH_H_
 
 #include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <machine/_limits.h>
+#include <sys/types.h>
+#include <machine/limits.h>
 
 /*
  * ANSI/POSIX
@@ -134,7 +134,7 @@ typedef	__float_t	float_t;
 /*
  * XOPEN/SVID
  */
-#if __BSD_VISIBLE || __XSI_VISIBLE
+//#if __BSD_VISIBLE || __XSI_VISIBLE
 #define	M_E		2.7182818284590452354	/* e */
 #define	M_LOG2E		1.4426950408889634074	/* log 2e */
 #define	M_LOG10E	0.43429448190325182765	/* log 10e */
@@ -151,7 +151,7 @@ typedef	__float_t	float_t;
 
 #define	MAXFLOAT	((float)3.40282346638528860e+38)
 extern int signgam;
-#endif /* __BSD_VISIBLE || __XSI_VISIBLE */
+//#endif /* __BSD_VISIBLE || __XSI_VISIBLE */
 
 #if __BSD_VISIBLE
 #if 0
diff --git a/src/s_cbrt.c b/src/s_cbrt.c
index 1f81e95..b00e912 100644
--- a/src/s_cbrt.c
+++ b/src/s_cbrt.c
@@ -14,7 +14,6 @@
 
 #include <sys/cdefs.h>
 
-
 #include "openlibm.h"
 #include "math_private.h"
 
@@ -39,7 +38,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_ceill.c b/src/s_ceill.c
index 84d7ca0..d19bdd3 100644
--- a/src/s_ceill.c
+++ b/src/s_ceill.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 @@ 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 +81,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 7a099bc..40cf69e 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 = (uint64_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_modfl.c b/src/s_modfl.c
index 9d49e73..1d49b31 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	((uint32_t)-1)
 #endif
diff --git a/src/s_remquol.c b/src/s_remquol.c
index 9351157..b8277c7 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	uint32_t manl_t;
 #endif
 
 #if LDBL_MANH_SIZE > 32
-typedef	uint64_t manh_t;
+typedef	u_int64_t manh_t;
 #else
 typedef	uint32_t manh_t;
 #endif
diff --git a/src/s_truncl.c b/src/s_truncl.c
index b684ff9..f428b40 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 = (uint64_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 */