diff --git a/include/openlibm_fenv_powerpc.h b/include/openlibm_fenv_powerpc.h
index 232ea833..7592de86 100644
--- a/include/openlibm_fenv_powerpc.h
+++ b/include/openlibm_fenv_powerpc.h
@@ -29,14 +29,16 @@
 #ifndef	_FENV_H_
 #define	_FENV_H_
 
+#include <stdint.h>
 #include <sys/types.h>
+#include "cdefs-compat.h"
 
 #ifndef	__fenv_static
 #define	__fenv_static	static
 #endif
 
-typedef	__uint32_t	fenv_t;
-typedef	__uint32_t	fexcept_t;
+typedef	uint32_t	fenv_t;
+typedef	uint32_t	fexcept_t;
 
 /* Exception flags */
 #define	FE_INEXACT	0x02000000
@@ -99,9 +101,9 @@ union __fpscr {
 	struct {
 #if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
 		fenv_t __reg;
-		__uint32_t __junk;
+		uint32_t __junk;
 #else
-		__uint32_t __junk;
+		uint32_t __junk;
 		fenv_t __reg;
 #endif
 	} __bits;
diff --git a/include/openlibm_fenv_s390.h b/include/openlibm_fenv_s390.h
index 84ef080d..a21b9ee6 100644
--- a/include/openlibm_fenv_s390.h
+++ b/include/openlibm_fenv_s390.h
@@ -29,14 +29,16 @@
 #ifndef	_FENV_H_
 #define	_FENV_H_
 
+#include <stdint.h>
 #include <sys/types.h>
+#include "cdefs-compat.h"
 
 #ifndef	__fenv_static
 #define	__fenv_static	static
 #endif
 
-typedef	__uint32_t	fenv_t;
-typedef	__uint32_t	fexcept_t;
+typedef	uint32_t	fenv_t;
+typedef	uint32_t	fexcept_t;
 
 /* Exception flags */
 #define	FE_INEXACT	0x080000