diff --git a/.gitignore b/.gitignore
index 7457333..35dad7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 *.o
 *~
 *.a
+*.dll
+*.so
+*.dylib
diff --git a/Make.inc b/Make.inc
index be08260..4c996de 100644
--- a/Make.inc
+++ b/Make.inc
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-O2 -fPIC -I. -I../include -I../ld128 -I../src -D__BSD_VISIBLE -Wno-implicit-function-declaration
+CFLAGS=-O2 -I. -I../include -I../ld128 -I../src -D__BSD_VISIBLE -Wno-implicit-function-declaration
 
 default: all
 
@@ -13,13 +13,28 @@ clean:
 OS = $(shell uname)
 ARCH = $(shell uname -m)
 
+
+ifeq ($(OS), MINGW32_NT-6.1)
+OS=WINNT
+endif
+
 ifeq ($(OS), Linux)
 SHLIB_EXT = so
+CFLAGS+=-fPIC
+endif
+
+ifeq ($(OS), FreeBSD)
+SHLIB_EXT = so
+CFLAGS+=-fPIC
 endif
 
 ifeq ($(OS), Darwin)
 SHLIB_EXT = dylib
-CFLAGS+=-std=c99
+CFLAGS+=-std=c99 -fPIC
+endif
+
+ifeq ($(OS), WINNT)
+SHLIB_EXT = dll
 endif
 
 # Colors for make
diff --git a/bsdsrc/b_exp.c b/bsdsrc/b_exp.c
index 2cfbc78..890007f 100644
--- a/bsdsrc/b_exp.c
+++ b/bsdsrc/b_exp.c
@@ -32,7 +32,7 @@
  */
 
 /* @(#)exp.c	8.1 (Berkeley) 6/4/93 */
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/bsdsrc/b_exp.c,v 1.9 2011/10/16 05:37:20 das Exp $");
 
 
diff --git a/bsdsrc/b_log.c b/bsdsrc/b_log.c
index c2d9ce5..1c3813c 100644
--- a/bsdsrc/b_log.c
+++ b/bsdsrc/b_log.c
@@ -32,7 +32,7 @@
  */
 
 /* @(#)log.c	8.2 (Berkeley) 11/30/93 */
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/bsdsrc/b_log.c,v 1.9 2008/02/22 02:26:51 das Exp $");
 
 #include <openlibm.h>
diff --git a/bsdsrc/b_tgamma.c b/bsdsrc/b_tgamma.c
index 8ce5d9a..1f66a22 100644
--- a/bsdsrc/b_tgamma.c
+++ b/bsdsrc/b_tgamma.c
@@ -32,7 +32,7 @@
  */
 
 /* @(#)gamma.c	8.1 (Berkeley) 6/4/93 */
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/bsdsrc/b_tgamma.c,v 1.10 2008/02/22 02:26:51 das Exp $");
 
 /*
diff --git a/bsdsrc/mathimpl.h b/bsdsrc/mathimpl.h
index 08885bd..aa71176 100644
--- a/bsdsrc/mathimpl.h
+++ b/bsdsrc/mathimpl.h
@@ -37,7 +37,7 @@
 #ifndef _MATHIMPL_H_
 #define	_MATHIMPL_H_
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 #include <openlibm.h>
 
 #include "../src/math_private.h"
diff --git a/include/cdefs-compat.h b/include/cdefs-compat.h
new file mode 100644
index 0000000..70a714b
--- /dev/null
+++ b/include/cdefs-compat.h
@@ -0,0 +1,64 @@
+#ifndef _CDEFS_COMPAT_H_
+#define	_CDEFS_COMPAT_H_
+
+#if (defined(_WIN32) || defined (_MSC_VER)) && !defined(__WIN32__)
+    #define __WIN32__
+#endif
+
+#ifndef __WIN32__
+#include "sys/cdefs.h"
+
+#else //__WIN32__
+
+#if defined(__cplusplus)
+#define	__BEGIN_DECLS	extern "C" {
+#define	__END_DECLS	}
+#else
+#define	__BEGIN_DECLS
+#define	__END_DECLS
+#endif
+
+#ifdef __GNUC__
+#define __strong_reference(sym,aliassym)	\
+	extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)));
+#ifdef __ELF__
+#ifdef __STDC__
+#define	__weak_reference(sym,alias)	\
+	__asm__(".weak " #alias);	\
+	__asm__(".equ "  #alias ", " #sym)
+#define	__warn_references(sym,msg)	\
+	__asm__(".section .gnu.warning." #sym);	\
+	__asm__(".asciz \"" msg "\"");	\
+	__asm__(".previous")
+#else
+#define	__weak_reference(sym,alias)	\
+	__asm__(".weak alias");		\
+	__asm__(".equ alias, sym")
+#define	__warn_references(sym,msg)	\
+	__asm__(".section .gnu.warning.sym"); \
+	__asm__(".asciz \"msg\"");	\
+	__asm__(".previous")
+#endif	/* __STDC__ */
+#else	/* !__ELF__ */
+#ifdef __STDC__
+#define __weak_reference(sym,alias)	\
+	__asm__(".stabs \"_" #alias "\",11,0,0,0");	\
+	__asm__(".stabs \"_" #sym "\",1,0,0,0")
+#define __warn_references(sym,msg)	\
+	__asm__(".stabs \"" msg "\",30,0,0,0");		\
+	__asm__(".stabs \"_" #sym "\",1,0,0,0")
+#else
+#define __weak_reference(sym,alias)	\
+	__asm__(".stabs \"_/**/alias\",11,0,0,0");	\
+	__asm__(".stabs \"_/**/sym\",1,0,0,0")
+#define __warn_references(sym,msg)	\
+	__asm__(".stabs msg,30,0,0,0");			\
+	__asm__(".stabs \"_/**/sym\",1,0,0,0")
+#endif	/* __STDC__ */
+#endif	/* __ELF__ */
+#endif	/* __GNUC__ */
+
+#endif
+
+
+#endif
\ No newline at end of file
diff --git a/include/fpmath.h b/include/fpmath.h
index cb49928..cb5819a 100644
--- a/include/fpmath.h
+++ b/include/fpmath.h
@@ -26,6 +26,8 @@
  *
  * $FreeBSD: src/lib/libc/include/fpmath.h,v 1.4 2008/12/23 22:20:59 marcel Exp $
  */
+#ifndef _FPMATH_H_
+#define _FPMATH_H_
 
 // Currently assumes Intel platform
 #if defined (__i386__) || defined(__x86_64__)
@@ -58,12 +60,12 @@
 #define _LITTLE_ENDIAN 1234
 #define _BIG_ENDIAN    4321
 #define _PDP_ENDIAN    3412
-#define _BYTE_ORDER       __LITTLE_ENDIAN
-#define _FLOAT_WORD_ORDER __LITTLE_ENDIAN
-#define LITTLE_ENDIAN  __LITTLE_ENDIAN
-#define BIG_ENDIAN     __BIG_ENDIAN
-#define PDP_ENDIAN     __PDP_ENDIAN
-#define BYTE_ORDER     __BYTE_ORDER
+#define _BYTE_ORDER       _LITTLE_ENDIAN
+#define _FLOAT_WORD_ORDER _LITTLE_ENDIAN
+#define LITTLE_ENDIAN  _LITTLE_ENDIAN
+#define BIG_ENDIAN     _BIG_ENDIAN
+#define PDP_ENDIAN     _PDP_ENDIAN
+#define BYTE_ORDER     _BYTE_ORDER
 #endif
 
 #ifndef _IEEE_WORD_ORDER
@@ -109,3 +111,5 @@ union IEEEd2bits {
 #endif
 	} bits;
 };
+
+#endif
\ No newline at end of file
diff --git a/include/types-compat.h b/include/types-compat.h
new file mode 100644
index 0000000..55de42d
--- /dev/null
+++ b/include/types-compat.h
@@ -0,0 +1,33 @@
+#ifndef _TYPES_COMPAT_H_
+#define	_TYPES_COMPAT_H_
+
+#if (defined(_WIN32) || defined (_MSC_VER)) && !defined(__WIN32__)
+    #define __WIN32__
+#endif
+
+#ifdef __APPLE__
+#include <sys/_types.h>
+#include <machine/_limits.h>
+#endif
+
+#ifdef __linux__
+/* Not sure what to do about __pure2 on linux */
+#define __pure2 
+#include <sys/types.h>
+#include <limits.h>
+#endif
+
+#ifdef __WIN32__
+/* Not sure what to do about __pure2 on linux */
+#define __pure2 
+#include <sys/types.h>
+#include <stdint.h>
+typedef uint8_t               u_int8_t;
+typedef uint16_t              u_int16_t;
+typedef uint32_t              u_int32_t;
+typedef uint64_t              u_int64_t;
+#include <limits.h>
+#endif
+
+
+#endif
\ No newline at end of file
diff --git a/ld128/e_rem_pio2l.h b/ld128/e_rem_pio2l.h
index 89b8821..8ca0b1e 100644
--- a/ld128/e_rem_pio2l.h
+++ b/ld128/e_rem_pio2l.h
@@ -13,7 +13,7 @@
  * Optimized by Bruce D. Evans.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/ld128/e_rem_pio2l.h,v 1.2 2011/05/30 19:41:28 kargl Exp $");
 
 /* ld128 version of __ieee754_rem_pio2l(x,y)
diff --git a/ld128/invtrig.c b/ld128/invtrig.c
index f83ae51..d89ced2 100644
--- a/ld128/invtrig.c
+++ b/ld128/invtrig.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/ld128/invtrig.c,v 1.1 2008/07/31 22:41:26 das Exp $");
 
 #include "invtrig.h"
diff --git a/ld128/k_cosl.c b/ld128/k_cosl.c
index 3292c65..37666dc 100644
--- a/ld128/k_cosl.c
+++ b/ld128/k_cosl.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/ld128/k_cosl.c,v 1.1 2008/02/17 07:32:31 das Exp $");
 
 /*
diff --git a/ld128/k_sinl.c b/ld128/k_sinl.c
index 32fff9a..1079159 100644
--- a/ld128/k_sinl.c
+++ b/ld128/k_sinl.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/ld128/k_sinl.c,v 1.1 2008/02/17 07:32:31 das Exp $");
 
 /*
diff --git a/ld128/k_tanl.c b/ld128/k_tanl.c
index 4e5c6db..6246c64 100644
--- a/ld128/k_tanl.c
+++ b/ld128/k_tanl.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/ld128/k_tanl.c,v 1.1 2008/02/17 07:32:31 das Exp $");
 
 /*
diff --git a/ld128/s_exp2l.c b/ld128/s_exp2l.c
index 4b09c71..1d97d07 100644
--- a/ld128/s_exp2l.c
+++ b/ld128/s_exp2l.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/ld128/s_exp2l.c,v 1.3 2008/02/13 10:44:44 bde Exp $");
 
 #include <float.h>
diff --git a/ld80/e_rem_pio2l.h b/ld80/e_rem_pio2l.h
index 10e20e4..2e7d0e7 100644
--- a/ld80/e_rem_pio2l.h
+++ b/ld80/e_rem_pio2l.h
@@ -13,7 +13,7 @@
  * Optimized by Bruce D. Evans.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/ld80/e_rem_pio2l.h,v 1.3 2011/06/18 13:56:33 benl Exp $");
 
 /* ld80 version of __ieee754_rem_pio2l(x,y)
diff --git a/ld80/invtrig.c b/ld80/invtrig.c
index 0386350..8e7f185 100644
--- a/ld80/invtrig.c
+++ b/ld80/invtrig.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/ld80/invtrig.c,v 1.1 2008/07/31 22:41:26 das Exp $");
 
 #include "invtrig.h"
diff --git a/ld80/k_cosl.c b/ld80/k_cosl.c
index 1795314..403da9d 100644
--- a/ld80/k_cosl.c
+++ b/ld80/k_cosl.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/ld80/k_cosl.c,v 1.1 2008/02/17 07:32:14 das Exp $");
 
 /*
diff --git a/ld80/k_sinl.c b/ld80/k_sinl.c
index 8211b8e..792baf6 100644
--- a/ld80/k_sinl.c
+++ b/ld80/k_sinl.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/ld80/k_sinl.c,v 1.1 2008/02/17 07:32:14 das Exp $");
 
 /*
diff --git a/ld80/k_tanl.c b/ld80/k_tanl.c
index d9e1c73..5e141b4 100644
--- a/ld80/k_tanl.c
+++ b/ld80/k_tanl.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/ld80/k_tanl.c,v 1.3 2008/02/18 15:39:52 bde Exp $");
 
 /*
diff --git a/ld80/s_exp2l.c b/ld80/s_exp2l.c
index 939e20c..a0393c7 100644
--- a/ld80/s_exp2l.c
+++ b/ld80/s_exp2l.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/ld80/s_exp2l.c,v 1.3 2008/02/13 10:44:44 bde Exp $");
 
 #include <float.h>
diff --git a/src/Makefile b/src/Makefile
index f4cee00..149c1f1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,8 +20,9 @@ SRCS= \
 	s_finite.o s_finitef.o \
 	s_floor.o s_floorf.o s_fma.o s_fmaf.o \
 	s_fmax.o s_fmaxf.o s_fmaxl.o s_fmin.o \
-	s_fminf.o s_fminl.o s_frexp.o s_frexpf.o s_ilogb.o s_ilogbf.o \
-	s_ilogbl.o s_isfinite.o s_isnormal.o s_isnan.o \
+	s_fminf.o s_fminl.o s_fpclassify.o \
+	s_frexp.o s_frexpf.o s_ilogb.o s_ilogbf.o \
+	s_ilogbl.o s_isinf.o s_isfinite.o s_isnormal.o s_isnan.o \
 	s_llrint.o s_llrintf.o s_llround.o s_llroundf.o s_llroundl.o \
 	s_log1p.o s_log1pf.o s_logb.o s_logbf.o s_lrint.o s_lrintf.o \
 	s_lround.o s_lroundf.o s_lroundl.o s_modf.o s_modff.o \
diff --git a/src/e_acos.c b/src/e_acos.c
index 53e9d3d..810f5e9 100644
--- a/src/e_acos.c
+++ b/src/e_acos.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_acos.c,v 1.13 2008/07/31 22:41:26 das Exp $");
 
 /* __ieee754_acos(x)
diff --git a/src/e_acosf.c b/src/e_acosf.c
index 8b98dd2..bfce86b 100644
--- a/src/e_acosf.c
+++ b/src/e_acosf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_acosf.c,v 1.11 2008/08/03 17:39:54 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_acosh.c b/src/e_acosh.c
index 5736945..3a05602 100644
--- a/src/e_acosh.c
+++ b/src/e_acosh.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_acosh.c,v 1.9 2008/02/22 02:30:34 das Exp $");
 
 /* __ieee754_acosh(x)
diff --git a/src/e_acoshf.c b/src/e_acoshf.c
index 1bae9c2..753d7ce 100644
--- a/src/e_acoshf.c
+++ b/src/e_acoshf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_acoshf.c,v 1.8 2008/02/22 02:30:34 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_acosl.c b/src/e_acosl.c
index 7415070..015e37b 100644
--- a/src/e_acosl.c
+++ b/src/e_acosl.c
@@ -12,7 +12,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_acosl.c,v 1.2 2008/08/02 03:56:22 das Exp $");
 
 /*
diff --git a/src/e_asin.c b/src/e_asin.c
index c41f39e..3b01a19 100644
--- a/src/e_asin.c
+++ b/src/e_asin.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_asin.c,v 1.15 2011/02/10 07:37:50 das Exp $");
 
 /* __ieee754_asin(x)
diff --git a/src/e_asinf.c b/src/e_asinf.c
index 95ebd55..679ce98 100644
--- a/src/e_asinf.c
+++ b/src/e_asinf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_asinf.c,v 1.13 2008/08/08 00:21:27 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_asinl.c b/src/e_asinl.c
index 2235824..2deef4b 100644
--- a/src/e_asinl.c
+++ b/src/e_asinl.c
@@ -12,7 +12,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_asinl.c,v 1.2 2008/08/03 17:49:05 das Exp $");
 
 /*
diff --git a/src/e_atan2.c b/src/e_atan2.c
index b64950c..c4c1c33 100644
--- a/src/e_atan2.c
+++ b/src/e_atan2.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2.c,v 1.14 2008/08/02 19:17:00 das Exp $");
 
 /* __ieee754_atan2(y,x)
diff --git a/src/e_atan2f.c b/src/e_atan2f.c
index da6faaf..749b7ef 100644
--- a/src/e_atan2f.c
+++ b/src/e_atan2f.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2f.c,v 1.12 2008/08/03 17:39:54 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_atan2l.c b/src/e_atan2l.c
index a12a8ea..0baac0e 100644
--- a/src/e_atan2l.c
+++ b/src/e_atan2l.c
@@ -13,7 +13,7 @@
  *
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2l.c,v 1.3 2008/08/02 19:17:00 das Exp $");
 
 /*
diff --git a/src/e_atanh.c b/src/e_atanh.c
index da6cff3..eb2d1ed 100644
--- a/src/e_atanh.c
+++ b/src/e_atanh.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_atanh.c,v 1.8 2008/02/22 02:30:34 das Exp $");
 
 /* __ieee754_atanh(x)
diff --git a/src/e_atanhf.c b/src/e_atanhf.c
index 522b7da..4f33cf5 100644
--- a/src/e_atanhf.c
+++ b/src/e_atanhf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_atanhf.c,v 1.7 2008/02/22 02:30:34 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_cosh.c b/src/e_cosh.c
index 2a65c52..dd495b4 100644
--- a/src/e_cosh.c
+++ b/src/e_cosh.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_cosh.c,v 1.10 2011/10/21 06:28:47 das Exp $");
 
 /* __ieee754_cosh(x)
diff --git a/src/e_coshf.c b/src/e_coshf.c
index f6a1314..1b34509 100644
--- a/src/e_coshf.c
+++ b/src/e_coshf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_coshf.c,v 1.9 2011/10/21 06:28:47 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_exp.c b/src/e_exp.c
index 83cb796..1097c44 100644
--- a/src/e_exp.c
+++ b/src/e_exp.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_exp.c,v 1.14 2011/10/21 06:26:38 das Exp $");
 
 /* __ieee754_exp(x)
diff --git a/src/e_expf.c b/src/e_expf.c
index a8c2e74..ca1629c 100644
--- a/src/e_expf.c
+++ b/src/e_expf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_expf.c,v 1.16 2011/10/21 06:26:38 das Exp $");
 
 #include <float.h>
diff --git a/src/e_fmod.c b/src/e_fmod.c
index 76a3f28..5633776 100644
--- a/src/e_fmod.c
+++ b/src/e_fmod.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_fmod.c,v 1.10 2008/02/22 02:30:34 das Exp $");
 
 /* 
diff --git a/src/e_fmodf.c b/src/e_fmodf.c
index 2f87017..aed7852 100644
--- a/src/e_fmodf.c
+++ b/src/e_fmodf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_fmodf.c,v 1.7 2008/02/22 02:30:34 das Exp $");
 
 /*
diff --git a/src/e_fmodl.c b/src/e_fmodl.c
index 96aef52..8f4c5b2 100644
--- a/src/e_fmodl.c
+++ b/src/e_fmodl.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_fmodl.c,v 1.2 2008/07/31 20:09:47 das Exp $");
 
 #include <float.h>
diff --git a/src/e_gamma.c b/src/e_gamma.c
index 1089b4c..26cb25e 100644
--- a/src/e_gamma.c
+++ b/src/e_gamma.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_gamma.c,v 1.8 2008/02/22 02:30:34 das Exp $");
 
 /* __ieee754_gamma(x)
diff --git a/src/e_gamma_r.c b/src/e_gamma_r.c
index e736ed1..b45b69e 100644
--- a/src/e_gamma_r.c
+++ b/src/e_gamma_r.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_gamma_r.c,v 1.8 2008/02/22 02:30:34 das Exp $");
 
 /* __ieee754_gamma_r(x, signgamp)
diff --git a/src/e_gammaf.c b/src/e_gammaf.c
index 2725f5e..05f88d8 100644
--- a/src/e_gammaf.c
+++ b/src/e_gammaf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_gammaf.c,v 1.7 2008/02/22 02:30:35 das Exp $");
 
 /* __ieee754_gammaf(x)
diff --git a/src/e_gammaf_r.c b/src/e_gammaf_r.c
index e7fa20e..f22df40 100644
--- a/src/e_gammaf_r.c
+++ b/src/e_gammaf_r.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_gammaf_r.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
 /* __ieee754_gammaf_r(x, signgamp)
diff --git a/src/e_hypot.c b/src/e_hypot.c
index 97a7295..db6d0cf 100644
--- a/src/e_hypot.c
+++ b/src/e_hypot.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_hypot.c,v 1.14 2011/10/15 07:00:28 das Exp $");
 
 /* __ieee754_hypot(x,y)
diff --git a/src/e_hypotf.c b/src/e_hypotf.c
index 891502e..531f1db 100644
--- a/src/e_hypotf.c
+++ b/src/e_hypotf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_hypotf.c,v 1.14 2011/10/15 07:00:28 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_hypotl.c b/src/e_hypotl.c
index d4910f9..f7a35ad 100644
--- a/src/e_hypotl.c
+++ b/src/e_hypotl.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_hypotl.c,v 1.3 2011/10/16 05:36:39 das Exp $");
 
 /* long double version of hypot().  See e_hypot.c for most comments. */
diff --git a/src/e_j0.c b/src/e_j0.c
index 7d045f9..8a581a7 100644
--- a/src/e_j0.c
+++ b/src/e_j0.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_j0.c,v 1.9 2008/02/22 02:30:35 das Exp $");
 
 /* __ieee754_j0(x), __ieee754_y0(x)
diff --git a/src/e_j0f.c b/src/e_j0f.c
index d45cb9b..c3edd2e 100644
--- a/src/e_j0f.c
+++ b/src/e_j0f.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_j0f.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_j1.c b/src/e_j1.c
index 28d9b75..925d498 100644
--- a/src/e_j1.c
+++ b/src/e_j1.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_j1.c,v 1.9 2008/02/22 02:30:35 das Exp $");
 
 /* __ieee754_j1(x), __ieee754_y1(x)
diff --git a/src/e_j1f.c b/src/e_j1f.c
index 943c76f..47631e9 100644
--- a/src/e_j1f.c
+++ b/src/e_j1f.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_j1f.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_jn.c b/src/e_jn.c
index 8236530..dd0d2ac 100644
--- a/src/e_jn.c
+++ b/src/e_jn.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_jn.c,v 1.11 2010/11/13 10:54:10 uqs Exp $");
 
 /*
diff --git a/src/e_jnf.c b/src/e_jnf.c
index 76217e0..e6e6e98 100644
--- a/src/e_jnf.c
+++ b/src/e_jnf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_jnf.c,v 1.11 2010/11/13 10:54:10 uqs Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_lgamma.c b/src/e_lgamma.c
index 84edb71..4a2e880 100644
--- a/src/e_lgamma.c
+++ b/src/e_lgamma.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_lgamma.c,v 1.9 2008/02/22 02:30:35 das Exp $");
 
 /* __ieee754_lgamma(x)
diff --git a/src/e_lgamma_r.c b/src/e_lgamma_r.c
index 1b2f04d..1a4550d 100644
--- a/src/e_lgamma_r.c
+++ b/src/e_lgamma_r.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_lgamma_r.c,v 1.11 2011/10/15 07:00:28 das Exp $");
 
 /* __ieee754_lgamma_r(x, signgamp)
diff --git a/src/e_lgammaf.c b/src/e_lgammaf.c
index 1e6c4a1..a3e5c1b 100644
--- a/src/e_lgammaf.c
+++ b/src/e_lgammaf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_lgammaf.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
 /* __ieee754_lgammaf(x)
diff --git a/src/e_lgammaf_r.c b/src/e_lgammaf_r.c
index 76d85f0..70492c6 100644
--- a/src/e_lgammaf_r.c
+++ b/src/e_lgammaf_r.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_lgammaf_r.c,v 1.12 2011/10/15 07:00:28 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_log.c b/src/e_log.c
index b78f12d..81c3f2b 100644
--- a/src/e_log.c
+++ b/src/e_log.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_log.c,v 1.15 2008/03/29 16:37:59 das Exp $");
 
 /* __ieee754_log(x)
diff --git a/src/e_log10.c b/src/e_log10.c
index f291d24..f5fda16 100644
--- a/src/e_log10.c
+++ b/src/e_log10.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_log10.c,v 1.15 2011/10/15 05:23:28 das Exp $");
 
 /*
diff --git a/src/e_log10f.c b/src/e_log10f.c
index 3656e02..d628260 100644
--- a/src/e_log10f.c
+++ b/src/e_log10f.c
@@ -9,7 +9,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_log10f.c,v 1.13 2011/10/16 05:36:23 das Exp $");
 
 /*
diff --git a/src/e_log2.c b/src/e_log2.c
index 2df2242..cfc2fd1 100644
--- a/src/e_log2.c
+++ b/src/e_log2.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_log2.c,v 1.4 2011/10/15 05:23:28 das Exp $");
 
 /*
diff --git a/src/e_log2f.c b/src/e_log2f.c
index 00df424..173efaf 100644
--- a/src/e_log2f.c
+++ b/src/e_log2f.c
@@ -9,7 +9,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_log2f.c,v 1.5 2011/10/15 05:23:28 das Exp $");
 
 /*
diff --git a/src/e_logf.c b/src/e_logf.c
index 5924635..8e88abd 100644
--- a/src/e_logf.c
+++ b/src/e_logf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_logf.c,v 1.11 2008/03/29 16:37:59 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_pow.c b/src/e_pow.c
index f07e249..6c145a8 100644
--- a/src/e_pow.c
+++ b/src/e_pow.c
@@ -9,7 +9,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_pow.c,v 1.14 2011/10/21 06:26:07 das Exp $");
 
 /* __ieee754_pow(x,y) return x**y
diff --git a/src/e_powf.c b/src/e_powf.c
index 2f2d3b0..4d86054 100644
--- a/src/e_powf.c
+++ b/src/e_powf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_powf.c,v 1.16 2011/10/21 06:26:07 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_rem_pio2.c b/src/e_rem_pio2.c
index ebe5e07..02687cc 100644
--- a/src/e_rem_pio2.c
+++ b/src/e_rem_pio2.c
@@ -13,7 +13,7 @@
  * Optimized by Bruce D. Evans.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.22 2011/06/19 17:07:58 kargl Exp $");
 
 /* __ieee754_rem_pio2(x,y)
diff --git a/src/e_rem_pio2f.c b/src/e_rem_pio2f.c
index da46e59..8fe2790 100644
--- a/src/e_rem_pio2f.c
+++ b/src/e_rem_pio2f.c
@@ -14,7 +14,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.32 2009/06/03 08:16:34 ed Exp $");
 
 /* __ieee754_rem_pio2f(x,y)
diff --git a/src/e_remainder.c b/src/e_remainder.c
index 38de07f..70356d5 100644
--- a/src/e_remainder.c
+++ b/src/e_remainder.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_remainder.c,v 1.12 2008/03/30 20:47:42 das Exp $");
 
 /* __ieee754_remainder(x,p)
diff --git a/src/e_remainderf.c b/src/e_remainderf.c
index 568d6c5..b2ca56c 100644
--- a/src/e_remainderf.c
+++ b/src/e_remainderf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_remainderf.c,v 1.8 2008/02/12 17:11:36 bde Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_remainderl.c b/src/e_remainderl.c
index f3bb16a..ddfe9cf 100644
--- a/src/e_remainderl.c
+++ b/src/e_remainderl.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_remainderl.c,v 1.1 2008/03/30 20:47:42 das Exp $");
 
 #include <openlibm.h>
diff --git a/src/e_scalb.c b/src/e_scalb.c
index 3718cc4..e78baf6 100644
--- a/src/e_scalb.c
+++ b/src/e_scalb.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_scalb.c,v 1.13 2008/02/22 02:30:35 das Exp $");
 
 /*
diff --git a/src/e_scalbf.c b/src/e_scalbf.c
index eaab8d6..73ebcb6 100644
--- a/src/e_scalbf.c
+++ b/src/e_scalbf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.13 2008/02/22 02:30:35 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_sinh.c b/src/e_sinh.c
index a2899cb..2d8b5c2 100644
--- a/src/e_sinh.c
+++ b/src/e_sinh.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_sinh.c,v 1.11 2011/10/21 06:28:47 das Exp $");
 
 /* __ieee754_sinh(x)
diff --git a/src/e_sinhf.c b/src/e_sinhf.c
index 850ac6e..4dbbdb1 100644
--- a/src/e_sinhf.c
+++ b/src/e_sinhf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_sinhf.c,v 1.10 2011/10/21 06:28:47 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/e_sqrt.c b/src/e_sqrt.c
index a222631..ca2294e 100644
--- a/src/e_sqrt.c
+++ b/src/e_sqrt.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_sqrt.c,v 1.11 2008/03/02 01:47:58 das Exp $");
 
 /* __ieee754_sqrt(x)
diff --git a/src/e_sqrtl.c b/src/e_sqrtl.c
index 7209ef4..9fa40bf 100644
--- a/src/e_sqrtl.c
+++ b/src/e_sqrtl.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_sqrtl.c,v 1.1 2008/03/02 01:47:58 das Exp $");
 
 #include <fenv.h>
diff --git a/src/k_cos.c b/src/k_cos.c
index f180c6a..eabd230 100644
--- a/src/k_cos.c
+++ b/src/k_cos.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_cos.c,v 1.12 2008/02/19 12:54:14 bde Exp $");
 
 /*
diff --git a/src/k_cosf.c b/src/k_cosf.c
index a3f200f..f4b8fc7 100644
--- a/src/k_cosf.c
+++ b/src/k_cosf.c
@@ -15,7 +15,7 @@
  */
 
 #ifndef INLINE_KERNEL_COSDF
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.18 2009/06/03 08:16:34 ed Exp $");
 #endif
 
diff --git a/src/k_exp.c b/src/k_exp.c
index 32cbf38..b512c78 100644
--- a/src/k_exp.c
+++ b/src/k_exp.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_exp.c,v 1.1 2011/10/21 06:27:56 das Exp $");
 
 #include <complex.h>
diff --git a/src/k_expf.c b/src/k_expf.c
index 2addad4..f4e16ff 100644
--- a/src/k_expf.c
+++ b/src/k_expf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_expf.c,v 1.1 2011/10/21 06:27:56 das Exp $");
 
 #include <complex.h>
diff --git a/src/k_log.h b/src/k_log.h
index 4b3cb0f..a0943c4 100644
--- a/src/k_log.h
+++ b/src/k_log.h
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_log.h,v 1.2 2011/10/15 05:23:28 das Exp $");
 
 /*
diff --git a/src/k_logf.h b/src/k_logf.h
index 4aedf0d..1b665ae 100644
--- a/src/k_logf.h
+++ b/src/k_logf.h
@@ -9,7 +9,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_logf.h,v 1.3 2011/10/15 05:23:28 das Exp $");
 
 /*
diff --git a/src/k_rem_pio2.c b/src/k_rem_pio2.c
index 36d9627..6ce50b9 100644
--- a/src/k_rem_pio2.c
+++ b/src/k_rem_pio2.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.11 2008/02/25 11:43:20 bde Exp $");
 
 /*
diff --git a/src/k_sin.c b/src/k_sin.c
index 58ccf8e..4969844 100644
--- a/src/k_sin.c
+++ b/src/k_sin.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_sin.c,v 1.11 2008/02/19 12:54:14 bde Exp $");
 
 /* __kernel_sin( x, y, iy)
diff --git a/src/k_sinf.c b/src/k_sinf.c
index 89f3ae3..bf9039a 100644
--- a/src/k_sinf.c
+++ b/src/k_sinf.c
@@ -15,7 +15,7 @@
  */
 
 #ifndef INLINE_KERNEL_SINDF
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_sinf.c,v 1.16 2009/06/03 08:16:34 ed Exp $");
 #endif
 
diff --git a/src/k_tan.c b/src/k_tan.c
index 4fb9ea6..d56297f 100644
--- a/src/k_tan.c
+++ b/src/k_tan.c
@@ -11,7 +11,7 @@
  */
 
 /* INDENT OFF */
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_tan.c,v 1.13 2008/02/22 02:30:35 das Exp $");
 
 /* __kernel_tan( x, y, k )
diff --git a/src/k_tanf.c b/src/k_tanf.c
index d165e3a..c4c25d0 100644
--- a/src/k_tanf.c
+++ b/src/k_tanf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef INLINE_KERNEL_TANDF
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_tanf.c,v 1.23 2009/06/03 08:16:34 ed Exp $");
 #endif
 
diff --git a/src/math_private.h b/src/math_private.h
index 24b68ae..88ea766 100644
--- a/src/math_private.h
+++ b/src/math_private.h
@@ -17,31 +17,8 @@
 #ifndef _MATH_PRIVATE_H_
 #define	_MATH_PRIVATE_H_
 
-#include <sys/types.h>
-
-#ifdef __APPLE__
-#include <machine/endian.h>
-#ifdef __arm__
-#if defined(__VFP_FP__)
-#define	IEEE_WORD_ORDER	BYTE_ORDER
-#else
-#define	IEEE_WORD_ORDER	BIG_ENDIAN
-#endif
-#else /* __arm__ */
-#define	IEEE_WORD_ORDER	BYTE_ORDER
-#endif
-#endif
-
-#ifdef __linux__
-#include <endian.h>
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define IEEE_WORD_ORDER LITTLE_ENDIAN
-#endif
-#if __BYTE_ORDER == __BIG_ENDIAN
-#define IEEE_WORD_ORDER BIG_ENDIAN
-#endif
-#endif
-
+#include "types-compat.h"
+#include "fpmath.h"
 #include <complex.h>
 
 /*
@@ -62,7 +39,7 @@
  * ints.
  */
 
-#if IEEE_WORD_ORDER == BIG_ENDIAN
+#if _IEEE_WORD_ORDER == _BIG_ENDIAN
 
 typedef union
 {
@@ -80,7 +57,7 @@ typedef union
 
 #endif
 
-#if IEEE_WORD_ORDER == LITTLE_ENDIAN
+#if _IEEE_WORD_ORDER == _LITTLE_ENDIAN
 
 typedef union
 {
diff --git a/src/openlibm.h b/src/openlibm.h
index d4ed039..5e6ba5d 100644
--- a/src/openlibm.h
+++ b/src/openlibm.h
@@ -17,20 +17,8 @@
 #ifndef _MATH_H_
 #define	_MATH_H_
 
-#include <sys/cdefs.h>
-#ifdef __APPLE__
-#include <sys/_types.h>
-#include <machine/_limits.h>
-#endif
-
-#ifdef __linux__
-/* Not sure what to do about __pure2 on linux */
-#define __pure2 
-#include <sys/types.h>
-#include <limits.h>
-#endif
-
-
+#include "cdefs-compat.h"
+#include "types-compat.h"
 
 /*
  * ANSI/POSIX
@@ -103,7 +91,7 @@ extern const union __nan_un {
     ((sizeof (x) == sizeof (float)) ? __fpclassifyf(x) \
     : (sizeof (x) == sizeof (double)) ? __fpclassifyd(x) \
     : __fpclassifyl(x))
-
+	
 #define	isfinite(x)					\
     ((sizeof (x) == sizeof (float)) ? __isfinitef(x)	\
     : (sizeof (x) == sizeof (double)) ? __isfinite(x)	\
@@ -503,5 +491,4 @@ long double	truncl(long double);
 
 #endif /* __ISO_C_VISIBLE >= 1999 */
 __END_DECLS
-
 #endif /* !_MATH_H_ */
diff --git a/src/s_asinh.c b/src/s_asinh.c
index 1d14759..36f0489 100644
--- a/src/s_asinh.c
+++ b/src/s_asinh.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_asinh.c,v 1.9 2008/02/22 02:30:35 das Exp $");
 
 /* asinh(x)
diff --git a/src/s_asinhf.c b/src/s_asinhf.c
index dc43f62..9a753c5 100644
--- a/src/s_asinhf.c
+++ b/src/s_asinhf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_asinhf.c,v 1.9 2008/02/22 02:30:35 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_atan.c b/src/s_atan.c
index bc4f44a..02c7a8d 100644
--- a/src/s_atan.c
+++ b/src/s_atan.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_atan.c,v 1.13 2011/02/10 07:37:50 das Exp $");
 
 /* atan(x)
diff --git a/src/s_atanf.c b/src/s_atanf.c
index 0d1f63a..db78fc5 100644
--- a/src/s_atanf.c
+++ b/src/s_atanf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_atanf.c,v 1.10 2008/08/01 01:24:25 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_atanl.c b/src/s_atanl.c
index 6fa4106..e4e8459 100644
--- a/src/s_atanl.c
+++ b/src/s_atanl.c
@@ -11,7 +11,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_atanl.c,v 1.1 2008/07/31 22:41:26 das Exp $");
 
 /*
diff --git a/src/s_carg.c b/src/s_carg.c
index 5a938b9..50d22b1 100644
--- a/src/s_carg.c
+++ b/src/s_carg.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_carg.c,v 1.1 2007/12/12 23:43:51 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_cargf.c b/src/s_cargf.c
index c694995..9ef6f1c 100644
--- a/src/s_cargf.c
+++ b/src/s_cargf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cargf.c,v 1.1 2007/12/12 23:43:51 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_cargl.c b/src/s_cargl.c
index 983d0d2..7b831e3 100644
--- a/src/s_cargl.c
+++ b/src/s_cargl.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cargl.c,v 1.1 2008/07/31 22:41:26 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_cbrt.c b/src/s_cbrt.c
index 03c766f..57f13d3 100644
--- a/src/s_cbrt.c
+++ b/src/s_cbrt.c
@@ -12,7 +12,7 @@
  * Optimized by Bruce D. Evans.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrt.c,v 1.17 2011/03/12 16:50:39 kargl Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_cbrtf.c b/src/s_cbrtf.c
index b34c030..9422505 100644
--- a/src/s_cbrtf.c
+++ b/src/s_cbrtf.c
@@ -14,7 +14,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrtf.c,v 1.18 2008/02/22 02:30:35 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_cbrtl.c b/src/s_cbrtl.c
index c1f124f..9ccd5ac 100644
--- a/src/s_cbrtl.c
+++ b/src/s_cbrtl.c
@@ -14,7 +14,7 @@
  * and David A. Schultz.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrtl.c,v 1.1 2011/03/12 19:37:35 kargl Exp $");
 
 #include <float.h>
diff --git a/src/s_ccosh.c b/src/s_ccosh.c
index 65ba253..e6ed10c 100644
--- a/src/s_ccosh.c
+++ b/src/s_ccosh.c
@@ -34,7 +34,7 @@
  * These values and the return value were taken from n1124.pdf.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ccosh.c,v 1.2 2011/10/21 06:29:32 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_ccoshf.c b/src/s_ccoshf.c
index 1929278..ca6131b 100644
--- a/src/s_ccoshf.c
+++ b/src/s_ccoshf.c
@@ -28,7 +28,7 @@
  * Hyperbolic cosine of a complex argument.  See s_ccosh.c for details.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ccoshf.c,v 1.2 2011/10/21 06:29:32 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_ceil.c b/src/s_ceil.c
index 5828570..7646153 100644
--- a/src/s_ceil.c
+++ b/src/s_ceil.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ceil.c,v 1.11 2008/02/15 07:01:40 bde Exp $");
 
 /*
diff --git a/src/s_ceilf.c b/src/s_ceilf.c
index df516ba..10659ab 100644
--- a/src/s_ceilf.c
+++ b/src/s_ceilf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ceilf.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_ceill.c b/src/s_ceill.c
index 026d5e6..2035e98 100644
--- a/src/s_ceill.c
+++ b/src/s_ceill.c
@@ -11,7 +11,7 @@
  * From: @(#)s_ceil.c 5.1 93/09/24
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ceill.c,v 1.9 2008/02/14 15:10:33 bde Exp $");
 
 /*
diff --git a/src/s_cexp.c b/src/s_cexp.c
index 7a7e03c..b1c6b91 100644
--- a/src/s_cexp.c
+++ b/src/s_cexp.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cexp.c,v 1.3 2011/10/21 06:27:56 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_cexpf.c b/src/s_cexpf.c
index fd5649c..b2453c8 100644
--- a/src/s_cexpf.c
+++ b/src/s_cexpf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cexpf.c,v 1.3 2011/10/21 06:27:56 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_copysign.c b/src/s_copysign.c
index e006d3f..7708ace 100644
--- a/src/s_copysign.c
+++ b/src/s_copysign.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_copysign.c,v 1.10 2008/02/22 02:30:35 das Exp $");
 
 /*
diff --git a/src/s_copysignf.c b/src/s_copysignf.c
index 516df00..34ace7e 100644
--- a/src/s_copysignf.c
+++ b/src/s_copysignf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_copysignf.c,v 1.10 2008/02/22 02:30:35 das Exp $");
 
 /*
diff --git a/src/s_cos.c b/src/s_cos.c
index 9dafbca..20a2fe7 100644
--- a/src/s_cos.c
+++ b/src/s_cos.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cos.c,v 1.13 2011/02/10 07:37:50 das Exp $");
 
 /* cos(x)
diff --git a/src/s_cosf.c b/src/s_cosf.c
index 5547dae..3e12f7a 100644
--- a/src/s_cosf.c
+++ b/src/s_cosf.c
@@ -14,7 +14,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.18 2008/02/25 22:19:17 bde Exp $");
 
 #include <float.h>
diff --git a/src/s_cosl.c b/src/s_cosl.c
index 7d20a93..00b9c87 100644
--- a/src/s_cosl.c
+++ b/src/s_cosl.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cosl.c,v 1.3 2011/05/30 19:41:28 kargl Exp $");
 
 /*
diff --git a/src/s_cproj.c b/src/s_cproj.c
index 4c5e312..16679d8 100644
--- a/src/s_cproj.c
+++ b/src/s_cproj.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cproj.c,v 1.1 2008/08/07 15:07:48 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_cprojf.c b/src/s_cprojf.c
index 79884f8..410ebe8 100644
--- a/src/s_cprojf.c
+++ b/src/s_cprojf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cprojf.c,v 1.1 2008/08/07 15:07:48 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_cprojl.c b/src/s_cprojl.c
index 388751d..3edfed1 100644
--- a/src/s_cprojl.c
+++ b/src/s_cprojl.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cprojl.c,v 1.1 2008/08/07 15:07:48 das Exp $");
 
 #include <complex.h>
@@ -36,7 +36,7 @@ long double complex
 cprojl(long double complex z)
 {
 
-	if (!__isinf(creall(z)) && !__isinf(cimagl(z)))
+	if (!isinf(creall(z)) && !isinf(cimagl(z)))
 		return (z);
 	else
 		return (cpackl(INFINITY, copysignl(0.0, cimagl(z))));
diff --git a/src/s_csinh.c b/src/s_csinh.c
index d2d1221..69a6415 100644
--- a/src/s_csinh.c
+++ b/src/s_csinh.c
@@ -34,7 +34,7 @@
  * These values and the return value were taken from n1124.pdf.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csinh.c,v 1.2 2011/10/21 06:29:32 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_csinhf.c b/src/s_csinhf.c
index 3769065..583ff18 100644
--- a/src/s_csinhf.c
+++ b/src/s_csinhf.c
@@ -28,7 +28,7 @@
  * Hyperbolic sine of a complex argument z.  See s_csinh.c for details.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csinhf.c,v 1.2 2011/10/21 06:29:32 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_csqrt.c b/src/s_csqrt.c
index b00d2ba..684c843 100644
--- a/src/s_csqrt.c
+++ b/src/s_csqrt.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrt.c,v 1.4 2008/08/08 00:15:16 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_csqrtf.c b/src/s_csqrtf.c
index 378b205..d91bd3e 100644
--- a/src/s_csqrtf.c
+++ b/src/s_csqrtf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrtf.c,v 1.3 2008/08/08 00:15:16 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_csqrtl.c b/src/s_csqrtl.c
index e126461..229db82 100644
--- a/src/s_csqrtl.c
+++ b/src/s_csqrtl.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrtl.c,v 1.2 2008/08/08 00:15:16 das Exp $");
 
 #include <complex.h>
@@ -59,13 +59,13 @@ csqrtl(long double complex z)
 	/* Handle special cases. */
 	if (z == 0)
 		return (cpackl(0, b));
-	if (__isinf(b))
+	if (isinf(b))
 		return (cpackl(INFINITY, b));
 	if (isnan(a)) {
 		t = (b - b) / (b - b);	/* raise invalid if b is not a NaN */
 		return (cpackl(a, t));	/* return NaN + NaN i */
 	}
-	if (__isinf(a)) {
+	if (isinf(a)) {
 		/*
 		 * csqrt(inf + NaN i)  = inf +  NaN i
 		 * csqrt(inf + y i)    = inf +  0 i
diff --git a/src/s_ctanh.c b/src/s_ctanh.c
index d92358f..073d661 100644
--- a/src/s_ctanh.c
+++ b/src/s_ctanh.c
@@ -63,7 +63,7 @@
  *   precision.  I also handle large x differently.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ctanh.c,v 1.2 2011/10/21 06:30:16 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_ctanhf.c b/src/s_ctanhf.c
index d0d60a7..a2a6c49 100644
--- a/src/s_ctanhf.c
+++ b/src/s_ctanhf.c
@@ -28,7 +28,7 @@
  * Hyperbolic tangent of a complex argument z.  See s_ctanh.c for details.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ctanhf.c,v 1.2 2011/10/21 06:30:16 das Exp $");
 
 #include <complex.h>
diff --git a/src/s_erf.c b/src/s_erf.c
index ce25a75..6f4fa23 100644
--- a/src/s_erf.c
+++ b/src/s_erf.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_erf.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
 /* double erf(double x)
diff --git a/src/s_erff.c b/src/s_erff.c
index 4589442..3351c47 100644
--- a/src/s_erff.c
+++ b/src/s_erff.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_erff.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_exp2.c b/src/s_exp2.c
index 9090314..f76993c 100644
--- a/src/s_exp2.c
+++ b/src/s_exp2.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2.c,v 1.7 2008/02/22 02:27:34 das Exp $");
 
 #include <float.h>
diff --git a/src/s_exp2f.c b/src/s_exp2f.c
index 1a20d7a..4623889 100644
--- a/src/s_exp2f.c
+++ b/src/s_exp2f.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.9 2008/02/22 02:27:34 das Exp $");
 
 #include <float.h>
diff --git a/src/s_expm1.c b/src/s_expm1.c
index 8ee07a8..8f002c8 100644
--- a/src/s_expm1.c
+++ b/src/s_expm1.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_expm1.c,v 1.12 2011/10/21 06:26:38 das Exp $");
 
 /* expm1(x)
diff --git a/src/s_expm1f.c b/src/s_expm1f.c
index 7bfbda6..1ea85a8 100644
--- a/src/s_expm1f.c
+++ b/src/s_expm1f.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_expm1f.c,v 1.12 2011/10/21 06:26:38 das Exp $");
 
 #include <float.h>
diff --git a/src/s_fabsf.c b/src/s_fabsf.c
index d1e0bdf..6b9f4bc 100644
--- a/src/s_fabsf.c
+++ b/src/s_fabsf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_fabsf.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
 /*
diff --git a/src/s_fdim.c b/src/s_fdim.c
index ffa86e5..43f4985 100644
--- a/src/s_fdim.c
+++ b/src/s_fdim.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_fdim.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <openlibm.h>
diff --git a/src/s_finite.c b/src/s_finite.c
index fd7a94f..c5962f7 100644
--- a/src/s_finite.c
+++ b/src/s_finite.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_finite.c,v 1.9 2008/02/22 02:30:35 das Exp $");
 
 /*
diff --git a/src/s_finitef.c b/src/s_finitef.c
index 8b19233..779f24b 100644
--- a/src/s_finitef.c
+++ b/src/s_finitef.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_finitef.c,v 1.7 2008/02/22 02:30:35 das Exp $");
 
 /*
diff --git a/src/s_floor.c b/src/s_floor.c
index 615c995..39e08c9 100644
--- a/src/s_floor.c
+++ b/src/s_floor.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_floor.c,v 1.11 2008/02/15 07:01:40 bde Exp $");
 
 /*
diff --git a/src/s_floorf.c b/src/s_floorf.c
index 4348a86..7676bd2 100644
--- a/src/s_floorf.c
+++ b/src/s_floorf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_floorf.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
 /*
diff --git a/src/s_floorl.c b/src/s_floorl.c
index 544c6f1..2d4ad46 100644
--- a/src/s_floorl.c
+++ b/src/s_floorl.c
@@ -11,7 +11,7 @@
  * From: @(#)s_floor.c 5.1 93/09/24
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_floorl.c,v 1.8 2008/02/14 15:10:34 bde Exp $");
 
 /*
diff --git a/src/s_fma.c b/src/s_fma.c
index 4da9b22..93eae94 100644
--- a/src/s_fma.c
+++ b/src/s_fma.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_fma.c,v 1.8 2011/10/21 06:30:43 das Exp $");
 
 #include <fenv.h>
diff --git a/src/s_fmaf.c b/src/s_fmaf.c
index a32382f..37b1618 100644
--- a/src/s_fmaf.c
+++ b/src/s_fmaf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaf.c,v 1.3 2011/10/15 04:16:58 das Exp $");
 
 #include <fenv.h>
diff --git a/src/s_fmal.c b/src/s_fmal.c
index 729acb2..0943094 100644
--- a/src/s_fmal.c
+++ b/src/s_fmal.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.7 2011/10/21 06:30:43 das Exp $");
 
 #include <fenv.h>
diff --git a/src/s_fmax.c b/src/s_fmax.c
index 9a3f164..a1c2132 100644
--- a/src/s_fmax.c
+++ b/src/s_fmax.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_fmax.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <openlibm.h>
diff --git a/src/s_fmaxf.c b/src/s_fmaxf.c
index d8f87e0..abe6d27 100644
--- a/src/s_fmaxf.c
+++ b/src/s_fmaxf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaxf.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <openlibm.h>
diff --git a/src/s_fmaxl.c b/src/s_fmaxl.c
index fefd00a..76d4809 100644
--- a/src/s_fmaxl.c
+++ b/src/s_fmaxl.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaxl.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <openlibm.h>
diff --git a/src/s_fmin.c b/src/s_fmin.c
index 470b00f..bea5722 100644
--- a/src/s_fmin.c
+++ b/src/s_fmin.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_fmin.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <openlibm.h>
diff --git a/src/s_fminf.c b/src/s_fminf.c
index 1eb59d2..bcbb97c 100644
--- a/src/s_fminf.c
+++ b/src/s_fminf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_fminf.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <openlibm.h>
diff --git a/src/s_fminl.c b/src/s_fminl.c
index 1563aa1..94f8b52 100644
--- a/src/s_fminl.c
+++ b/src/s_fminl.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_fminl.c,v 1.1 2004/06/30 07:04:01 das Exp $");
 
 #include <openlibm.h>
diff --git a/src/s_fpclassify.c b/src/s_fpclassify.c
new file mode 100644
index 0000000..6d9e329
--- /dev/null
+++ b/src/s_fpclassify.c
@@ -0,0 +1,35 @@
+/*-
+ * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <openlibm.h>
+
+#include "fpmath.h"
+
+#warning "todo: fpclassify needs to be defined"
+int	__fpclassifyd(double);
+int	__fpclassifyf(float);
+int	__fpclassifyl(long double);
diff --git a/src/s_frexp.c b/src/s_frexp.c
index 944300e..ae8d647 100644
--- a/src/s_frexp.c
+++ b/src/s_frexp.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_frexp.c,v 1.11 2008/02/22 02:30:35 das Exp $");
 
 /*
diff --git a/src/s_frexpf.c b/src/s_frexpf.c
index 439888f..b1f51cb 100644
--- a/src/s_frexpf.c
+++ b/src/s_frexpf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_frexpf.c,v 1.10 2008/02/22 02:30:35 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_ilogb.c b/src/s_ilogb.c
index 619aed3..d8bc4bf 100644
--- a/src/s_ilogb.c
+++ b/src/s_ilogb.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ilogb.c,v 1.10 2008/02/22 02:30:35 das Exp $");
 
 /* ilogb(double x)
diff --git a/src/s_ilogbf.c b/src/s_ilogbf.c
index cc01195..f7501cd 100644
--- a/src/s_ilogbf.c
+++ b/src/s_ilogbf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ilogbf.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
 #include <limits.h>
diff --git a/src/s_ilogbl.c b/src/s_ilogbl.c
index e65e12c..f75c971 100644
--- a/src/s_ilogbl.c
+++ b/src/s_ilogbl.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ilogbl.c,v 1.2 2008/02/22 02:30:35 das Exp $");
 
 #include <float.h>
diff --git a/src/s_isinf.c b/src/s_isinf.c
new file mode 100644
index 0000000..d59d995
--- /dev/null
+++ b/src/s_isinf.c
@@ -0,0 +1,63 @@
+/*-
+ * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <openlibm.h>
+
+#include "fpmath.h"
+
+/* Provided by libc */
+#if 1
+int
+(isinf) (double d)
+{
+	union IEEEd2bits u;
+
+	u.d = d;
+	return (u.bits.exp == 2047 && u.bits.manl == 0 && u.bits.manh == 0);
+}
+#endif
+
+int
+__isinff(float f)
+{
+	union IEEEf2bits u;
+
+	u.f = f;
+	return (u.bits.exp == 255 && u.bits.man == 0);
+}
+
+int
+__isinfl(long double e)
+{
+	union IEEEl2bits u;
+
+	u.e = e;
+	mask_nbit_l(u);
+	return (u.bits.exp == 32767 && u.bits.manl == 0 && u.bits.manh == 0);
+}
+
+__weak_reference(__isinff, isinff);
diff --git a/src/s_isnan.c b/src/s_isnan.c
index 1efeb81..7477e81 100644
--- a/src/s_isnan.c
+++ b/src/s_isnan.c
@@ -31,9 +31,9 @@
 #include "fpmath.h"
 
 /* Provided by libc */
-#if 0
+#if 1
 int
-isnan(double d)
+(isnan) (double d)
 {
 	union IEEEd2bits u;
 
diff --git a/src/s_llrint.c b/src/s_llrint.c
index fb8646e..dcd6aed 100644
--- a/src/s_llrint.c
+++ b/src/s_llrint.c
@@ -1,4 +1,4 @@
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_llrint.c,v 1.1 2005/01/11 23:12:55 das Exp $");
 
 #define type		double
diff --git a/src/s_llrintf.c b/src/s_llrintf.c
index 8cb69d1..81ae8f0 100644
--- a/src/s_llrintf.c
+++ b/src/s_llrintf.c
@@ -1,4 +1,4 @@
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_llrintf.c,v 1.1 2005/01/11 23:12:55 das Exp $");
 
 #define type		float
diff --git a/src/s_llrintl.c b/src/s_llrintl.c
index 8ccae31..3b23238 100644
--- a/src/s_llrintl.c
+++ b/src/s_llrintl.c
@@ -1,4 +1,4 @@
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_llrintl.c,v 1.1 2008/01/14 02:12:06 das Exp $");
 
 #define type		long double
diff --git a/src/s_llround.c b/src/s_llround.c
index f3d8bb4..717ea96 100644
--- a/src/s_llround.c
+++ b/src/s_llround.c
@@ -1,4 +1,4 @@
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_llround.c,v 1.2 2005/04/08 00:52:27 das Exp $");
 
 #define type		double
diff --git a/src/s_llroundf.c b/src/s_llroundf.c
index abda02d..9b8b8b8 100644
--- a/src/s_llroundf.c
+++ b/src/s_llroundf.c
@@ -1,4 +1,4 @@
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_llroundf.c,v 1.2 2005/04/08 00:52:27 das Exp $");
 
 #define type		float
diff --git a/src/s_llroundl.c b/src/s_llroundl.c
index 7aa37a7..7a00657 100644
--- a/src/s_llroundl.c
+++ b/src/s_llroundl.c
@@ -1,4 +1,4 @@
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_llroundl.c,v 1.1 2005/04/08 01:24:08 das Exp $");
 
 #define type		long double
diff --git a/src/s_log1p.c b/src/s_log1p.c
index bb7aef6..5472650 100644
--- a/src/s_log1p.c
+++ b/src/s_log1p.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_log1p.c,v 1.10 2008/03/29 16:37:59 das Exp $");
 
 /* double log1p(double x)
diff --git a/src/s_log1pf.c b/src/s_log1pf.c
index 73f0bb5..5f91b84 100644
--- a/src/s_log1pf.c
+++ b/src/s_log1pf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_log1pf.c,v 1.12 2008/03/29 16:37:59 das Exp $");
 
 #include <float.h>
diff --git a/src/s_logb.c b/src/s_logb.c
index e43b26c..0407271 100644
--- a/src/s_logb.c
+++ b/src/s_logb.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_logb.c,v 1.12 2008/02/08 01:22:13 bde Exp $");
 
 /*
diff --git a/src/s_logbf.c b/src/s_logbf.c
index 28e4942..586a917 100644
--- a/src/s_logbf.c
+++ b/src/s_logbf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_logbf.c,v 1.9 2008/02/22 02:30:35 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_lrint.c b/src/s_lrint.c
index cf4fd2e..7630fca 100644
--- a/src/s_lrint.c
+++ b/src/s_lrint.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 #include <fenv.h>
 #include <openlibm.h>
 
diff --git a/src/s_lrintf.c b/src/s_lrintf.c
index de079c4..f29ad52 100644
--- a/src/s_lrintf.c
+++ b/src/s_lrintf.c
@@ -1,4 +1,4 @@
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_lrintf.c,v 1.1 2005/01/11 23:12:55 das Exp $");
 
 #define type		float
diff --git a/src/s_lrintl.c b/src/s_lrintl.c
index 09145f0..b57c27d 100644
--- a/src/s_lrintl.c
+++ b/src/s_lrintl.c
@@ -1,4 +1,4 @@
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_lrintl.c,v 1.1 2008/01/14 02:12:06 das Exp $");
 
 #define type		long double
diff --git a/src/s_lround.c b/src/s_lround.c
index 672d48b..f852ccc 100644
--- a/src/s_lround.c
+++ b/src/s_lround.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //VBS begin
 //#include <sys/limits.h>
 #include <limits.h>
diff --git a/src/s_lroundf.c b/src/s_lroundf.c
index e532f9c..f526eef 100644
--- a/src/s_lroundf.c
+++ b/src/s_lroundf.c
@@ -1,4 +1,4 @@
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_lroundf.c,v 1.2 2005/04/08 00:52:27 das Exp $");
 
 #define type		float
diff --git a/src/s_lroundl.c b/src/s_lroundl.c
index 60f7032..eb8997c 100644
--- a/src/s_lroundl.c
+++ b/src/s_lroundl.c
@@ -1,4 +1,4 @@
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_lroundl.c,v 1.1 2005/04/08 01:24:08 das Exp $");
 
 #define type		long double
diff --git a/src/s_modff.c b/src/s_modff.c
index 49d3bb7..9de60ff 100644
--- a/src/s_modff.c
+++ b/src/s_modff.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_modff.c,v 1.9 2008/02/22 02:30:35 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_nan.c b/src/s_nan.c
index 8a06a39..f9d2ac8 100644
--- a/src/s_nan.c
+++ b/src/s_nan.c
@@ -32,10 +32,23 @@
 #include <float.h>
 #include <openlibm.h>
 #include <stdint.h>
-#include <strings.h>
+#include <string.h> //for memset
 
 #include "math_private.h"
 
+#if !defined(__APPLE__)
+static __inline int digittoint(int c) {
+	if ('0' <= c <= '9')
+		return (c - '0');
+	else if ('A' <= c && c <= 'F')
+		return (c - 'A' + 10);
+	else if ('a' <= c && c <= 'f')
+		return (c - 'a' + 10);
+	return 0;
+}
+#endif
+
+
 /*
  * Scan a string of hexadecimal digits (the format nan(3) expects) and
  * make a bit array (using the local endianness). We stop when we
@@ -54,7 +67,7 @@ _scan_nan(u_int32_t *words, int num_words, const char *s)
 	int si;		/* index into s */
 	int bitpos;	/* index into words (in bits) */
 
-	bzero(words, num_words * sizeof(u_int32_t));
+	memset(words, 0, num_words * sizeof(u_int32_t));
 
 	/* Allow a leading '0x'. (It's expected, but redundant.) */
 	if (s[0] == '0' && (s[1] == 'x' || s[1] == 'X'))
diff --git a/src/s_nearbyint.c b/src/s_nearbyint.c
index 77f3c9d..ea1271d 100644
--- a/src/s_nearbyint.c
+++ b/src/s_nearbyint.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_nearbyint.c,v 1.2 2008/01/14 02:12:06 das Exp $");
 
 #include <fenv.h>
diff --git a/src/s_nextafter.c b/src/s_nextafter.c
index b3d74aa..cabdd32 100644
--- a/src/s_nextafter.c
+++ b/src/s_nextafter.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_nextafter.c,v 1.12 2008/02/22 02:30:35 das Exp $");
 
 /* IEEE functions
diff --git a/src/s_nextafterf.c b/src/s_nextafterf.c
index 94c8720..233a15b 100644
--- a/src/s_nextafterf.c
+++ b/src/s_nextafterf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_nextafterf.c,v 1.11 2008/02/22 02:30:35 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_nextafterl.c b/src/s_nextafterl.c
index ed93558..8ba05ce 100644
--- a/src/s_nextafterl.c
+++ b/src/s_nextafterl.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_nextafterl.c,v 1.2 2008/02/22 02:30:36 das Exp $");
 
 /* IEEE functions
diff --git a/src/s_nexttoward.c b/src/s_nexttoward.c
index f919047..942d248 100644
--- a/src/s_nexttoward.c
+++ b/src/s_nexttoward.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_nexttoward.c,v 1.3 2011/02/10 07:38:13 das Exp $");
 
 /*
diff --git a/src/s_nexttowardf.c b/src/s_nexttowardf.c
index 44ae507..04cd2d8 100644
--- a/src/s_nexttowardf.c
+++ b/src/s_nexttowardf.c
@@ -9,7 +9,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_nexttowardf.c,v 1.3 2011/02/10 07:38:38 das Exp $");
 
 #include <float.h>
diff --git a/src/s_remquo.c b/src/s_remquo.c
index 418ebc0..85f19ab 100644
--- a/src/s_remquo.c
+++ b/src/s_remquo.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_remquo.c,v 1.2 2008/03/30 20:47:26 das Exp $");
 
 #include <float.h>
diff --git a/src/s_remquof.c b/src/s_remquof.c
index 1cd74c4..9d0f79a 100644
--- a/src/s_remquof.c
+++ b/src/s_remquof.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_remquof.c,v 1.1 2005/03/25 04:40:44 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_remquol.c b/src/s_remquol.c
index 1b29725..3909d66 100644
--- a/src/s_remquol.c
+++ b/src/s_remquol.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_remquol.c,v 1.2 2008/07/31 20:09:47 das Exp $");
 
 #include <float.h>
diff --git a/src/s_rint.c b/src/s_rint.c
index 5f99aa3..68abf3f 100644
--- a/src/s_rint.c
+++ b/src/s_rint.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_rint.c,v 1.16 2008/02/22 02:30:35 das Exp $");
 
 /*
diff --git a/src/s_rintf.c b/src/s_rintf.c
index 7aa8a60..d59a92e 100644
--- a/src/s_rintf.c
+++ b/src/s_rintf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_rintf.c,v 1.12 2008/02/22 02:30:35 das Exp $");
 
 #include <float.h>
diff --git a/src/s_rintl.c b/src/s_rintl.c
index 47b3e48..5cef540 100644
--- a/src/s_rintl.c
+++ b/src/s_rintl.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_rintl.c,v 1.5 2008/02/22 11:59:05 bde Exp $");
 
 #include <float.h>
diff --git a/src/s_round.c b/src/s_round.c
index 15fb9ba..b86e01c 100644
--- a/src/s_round.c
+++ b/src/s_round.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_round.c,v 1.4 2005/12/02 13:45:06 bde Exp $");
 
 #include <openlibm.h>
diff --git a/src/s_roundf.c b/src/s_roundf.c
index 2b016a9..010ac2b 100644
--- a/src/s_roundf.c
+++ b/src/s_roundf.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_roundf.c,v 1.4 2005/12/02 13:45:06 bde Exp $");
 
 #include <openlibm.h>
diff --git a/src/s_roundl.c b/src/s_roundl.c
index deaf54f..fba814a 100644
--- a/src/s_roundl.c
+++ b/src/s_roundl.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_roundl.c,v 1.2 2005/12/02 13:45:06 bde Exp $");
 
 #include <openlibm.h>
diff --git a/src/s_scalbln.c b/src/s_scalbln.c
index 515d009..345f56e 100644
--- a/src/s_scalbln.c
+++ b/src/s_scalbln.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_scalbln.c,v 1.2 2005/03/07 04:57:50 das Exp $");
 
 #include <limits.h>
diff --git a/src/s_scalbn.c b/src/s_scalbn.c
index 5ba3696..da20175 100644
--- a/src/s_scalbn.c
+++ b/src/s_scalbn.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbn.c,v 1.11 2005/03/07 2
  * exponentiation or a multiplication.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 #include <float.h>
 
 #include "openlibm.h"
diff --git a/src/s_scalbnf.c b/src/s_scalbnf.c
index 27c0d51..db59c1a 100644
--- a/src/s_scalbnf.c
+++ b/src/s_scalbnf.c
@@ -17,7 +17,7 @@
 static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbnf.c,v 1.8 2005/03/07 04:52:43 das Exp $";
 #endif
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 
 #include "openlibm.h"
 #include "math_private.h"
diff --git a/src/s_scalbnl.c b/src/s_scalbnl.c
index 0b349e2..4218973 100644
--- a/src/s_scalbnl.c
+++ b/src/s_scalbnl.c
@@ -27,7 +27,7 @@ static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_scalbnl.c,v 1.1 2005/03/07 0
  * for scalbn(), so we don't use this routine.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 #include <float.h>
 #include <openlibm.h>
 
diff --git a/src/s_significand.c b/src/s_significand.c
index 4a6704b..5971716 100644
--- a/src/s_significand.c
+++ b/src/s_significand.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_significand.c,v 1.10 2008/02/22 02:30:35 das Exp $");
 
 /*
diff --git a/src/s_significandf.c b/src/s_significandf.c
index 632221a..1c808b4 100644
--- a/src/s_significandf.c
+++ b/src/s_significandf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_significandf.c,v 1.8 2008/02/22 02:30:36 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_sin.c b/src/s_sin.c
index 8b7109b..3beca2b 100644
--- a/src/s_sin.c
+++ b/src/s_sin.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_sin.c,v 1.13 2011/02/10 07:37:50 das Exp $");
 
 /* sin(x)
diff --git a/src/s_sinf.c b/src/s_sinf.c
index c03b94c..e1efb47 100644
--- a/src/s_sinf.c
+++ b/src/s_sinf.c
@@ -14,7 +14,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.17 2008/02/25 22:19:17 bde Exp $");
 
 #include <float.h>
diff --git a/src/s_sinl.c b/src/s_sinl.c
index e536554..5ca150a 100644
--- a/src/s_sinl.c
+++ b/src/s_sinl.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_sinl.c,v 1.3 2011/05/30 19:41:28 kargl Exp $");
 
 #include <float.h>
diff --git a/src/s_tan.c b/src/s_tan.c
index 6616702..3a6fbc4 100644
--- a/src/s_tan.c
+++ b/src/s_tan.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_tan.c,v 1.13 2011/02/10 07:37:50 das Exp $");
 
 /* tan(x)
diff --git a/src/s_tanf.c b/src/s_tanf.c
index c212c43..7c3e0f1 100644
--- a/src/s_tanf.c
+++ b/src/s_tanf.c
@@ -14,7 +14,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.17 2008/02/25 22:19:17 bde Exp $");
 
 #include <float.h>
diff --git a/src/s_tanh.c b/src/s_tanh.c
index fc8e4ac..cb57d92 100644
--- a/src/s_tanh.c
+++ b/src/s_tanh.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_tanh.c,v 1.9 2008/02/22 02:30:36 das Exp $");
 
 /* Tanh(x)
diff --git a/src/s_tanhf.c b/src/s_tanhf.c
index e844c57..e752612 100644
--- a/src/s_tanhf.c
+++ b/src/s_tanhf.c
@@ -13,7 +13,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_tanhf.c,v 1.9 2008/02/22 02:30:36 das Exp $");
 
 #include "openlibm.h"
diff --git a/src/s_tanl.c b/src/s_tanl.c
index 909be87..0e5b5c2 100644
--- a/src/s_tanl.c
+++ b/src/s_tanl.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_tanl.c,v 1.3 2011/05/30 19:41:28 kargl Exp $");
 
 /*
diff --git a/src/s_tgammaf.c b/src/s_tgammaf.c
index 312b8bd..8567686 100644
--- a/src/s_tgammaf.c
+++ b/src/s_tgammaf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_tgammaf.c,v 1.1 2008/02/18 17:27:10 das Exp $");
 
 #include <openlibm.h>
diff --git a/src/s_trunc.c b/src/s_trunc.c
index cacc89d..3289f5c 100644
--- a/src/s_trunc.c
+++ b/src/s_trunc.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_trunc.c,v 1.4 2008/02/22 02:27:34 das Exp $");
 
 /*
diff --git a/src/s_truncf.c b/src/s_truncf.c
index 423dd33..34b881d 100644
--- a/src/s_truncf.c
+++ b/src/s_truncf.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_truncf.c,v 1.1 2004/06/20 09:25:43 das Exp $");
 
 /*
diff --git a/src/s_truncl.c b/src/s_truncl.c
index 03b15ea..2c237e5 100644
--- a/src/s_truncl.c
+++ b/src/s_truncl.c
@@ -11,7 +11,7 @@
  * From: @(#)s_floor.c 5.1 93/09/24
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.9 2008/02/14 15:10:34 bde Exp $");
 
 /*
diff --git a/src/w_cabs.c b/src/w_cabs.c
index 46f25d6..22f52bb 100644
--- a/src/w_cabs.c
+++ b/src/w_cabs.c
@@ -5,7 +5,7 @@
  * Placed into the Public Domain, 1994.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/w_cabs.c,v 1.7 2008/03/30 20:03:06 das Exp $");
 
 #include <complex.h>
diff --git a/src/w_cabsl.c b/src/w_cabsl.c
index 80e634a..c3d8fbe 100644
--- a/src/w_cabsl.c
+++ b/src/w_cabsl.c
@@ -7,7 +7,7 @@
  * Modified by Steven G. Kargl for the long double type.
  */
 
-#include <sys/cdefs.h>
+#include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/w_cabsl.c,v 1.1 2008/03/30 20:02:03 das Exp $");
 
 #include <complex.h>