diff --git a/headers/posix/arch/arm/fenv.h b/headers/posix/arch/arm/fenv.h
index 169e61964b..f07e82ed73 100644
--- a/headers/posix/arch/arm/fenv.h
+++ b/headers/posix/arch/arm/fenv.h
@@ -29,9 +29,9 @@
 #ifndef	_FENV_H_
 #define	_FENV_H_
 
+#include <stdint.h>
 #include <sys/cdefs.h>
 #include <sys/types.h>
-#include <SupportDefs.h>
 
 typedef	uint32_t	fenv_t;
 typedef	uint32_t	fexcept_t;
diff --git a/headers/posix/arch/ppc/fenv.h b/headers/posix/arch/ppc/fenv.h
index d54245cf36..c1993657fb 100644
--- a/headers/posix/arch/ppc/fenv.h
+++ b/headers/posix/arch/ppc/fenv.h
@@ -29,9 +29,9 @@
 #ifndef	_FENV_H_
 #define	_FENV_H_
 
+#include <stdint.h>
 #include <sys/cdefs.h>
 #include <sys/types.h>
-#include <SupportDefs.h>
 
 typedef	uint32_t	fenv_t;
 typedef	uint32_t	fexcept_t;
diff --git a/headers/posix/arch/x86/fenv.h b/headers/posix/arch/x86/fenv.h
index d9fa4d911c..71b48e22f7 100644
--- a/headers/posix/arch/x86/fenv.h
+++ b/headers/posix/arch/x86/fenv.h
@@ -29,11 +29,11 @@
 #ifndef	_FENV_H_
 #define	_FENV_H_
 
+#include <stdint.h>
 #include <sys/cdefs.h>
 #include <sys/types.h>
-#include <SupportDefs.h>
 
-/*                   
+/*
  * To preserve binary compatibility with FreeBSD 5.3, we pack the
  * mxcsr into some reserved fields, rather than changing sizeof(fenv_t).
  */
@@ -49,8 +49,8 @@ typedef struct {
 #define	__get_mxcsr(env)	(((env).__mxcsr_hi << 16) |	\
 				 ((env).__mxcsr_lo))
 #define	__set_mxcsr(env, x)	do {				\
-	(env).__mxcsr_hi = (uint32)(x) >> 16;		\
-	(env).__mxcsr_lo = (uint16)(x);			\
+	(env).__mxcsr_hi = (uint32_t)(x) >> 16;		\
+	(env).__mxcsr_lo = (uint16_t)(x);			\
 } while (0)
 
 typedef	uint16_t	fexcept_t;
diff --git a/headers/posix/arch/x86_64/fenv.h b/headers/posix/arch/x86_64/fenv.h
index ef03daa072..a9992f9fad 100644
--- a/headers/posix/arch/x86_64/fenv.h
+++ b/headers/posix/arch/x86_64/fenv.h
@@ -29,8 +29,9 @@
 #ifndef	_FENV_H_
 #define	_FENV_H_
 
+#include <stdint.h>
 #include <sys/cdefs.h>
-#include <sys/_types.h>
+#include <sys/types.h>
 
 typedef struct {
 	struct {