diff --git a/lib/msun/aarch64/fenv.c b/lib/msun/aarch64/fenv.c
index 5d626f66516..a428a9d8a27 100644
--- a/lib/msun/aarch64/fenv.c
+++ b/lib/msun/aarch64/fenv.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#define	__fenv_static
 #include "fenv.h"
 
 /*
@@ -34,10 +33,6 @@
  */
 const fenv_t __fe_dfl_env = 0;
 
-#ifdef __GNUC_GNU_INLINE__
-#error "This file must be compiled with C99 'inline' semantics"
-#endif
-
 int
 (feclearexcept)(int excepts)
 {
diff --git a/lib/msun/amd64/fenv.c b/lib/msun/amd64/fenv.c
index 5dd122cf457..fe9ecfff3b8 100644
--- a/lib/msun/amd64/fenv.c
+++ b/lib/msun/amd64/fenv.c
@@ -29,13 +29,8 @@
 #include <sys/types.h>
 #include <machine/fpu.h>
 
-#define	__fenv_static
 #include "fenv.h"
 
-#ifdef __GNUC_GNU_INLINE__
-#error "This file must be compiled with C99 'inline' semantics"
-#endif
-
 const fenv_t __fe_dfl_env = {
 	{ 0xffff0000 | __INITIAL_FPUCW__,
 	  0xffff0000,
diff --git a/lib/msun/arm/fenv.c b/lib/msun/arm/fenv.c
index 620a05d51b9..2cf5bbdea28 100644
--- a/lib/msun/arm/fenv.c
+++ b/lib/msun/arm/fenv.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#define	__fenv_static
 #include "fenv.h"
 
 #include <machine/acle-compat.h>
@@ -66,10 +65,6 @@ const fenv_t __fe_dfl_env = 0;
 #include "fenv-softfloat.h"
 #endif
 
-#ifdef __GNUC_GNU_INLINE__
-#error "This file must be compiled with C99 'inline' semantics"
-#endif
-
 int
 (feclearexcept)(int excepts)
 {
diff --git a/lib/msun/i387/fenv.c b/lib/msun/i387/fenv.c
index d3cdc2e1caf..bae8de2fb96 100644
--- a/lib/msun/i387/fenv.c
+++ b/lib/msun/i387/fenv.c
@@ -29,13 +29,8 @@
 #include <sys/types.h>
 #include <machine/npx.h>
 
-#define	__fenv_static
 #include "fenv.h"
 
-#ifdef __GNUC_GNU_INLINE__
-#error "This file must be compiled with C99 'inline' semantics"
-#endif
-
 const fenv_t __fe_dfl_env = {
 	__INITIAL_NPXCW__,
 	0x0000,
diff --git a/lib/msun/powerpc/fenv.c b/lib/msun/powerpc/fenv.c
index d1926155d08..3104b59d4df 100644
--- a/lib/msun/powerpc/fenv.c
+++ b/lib/msun/powerpc/fenv.c
@@ -26,13 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#define	__fenv_static
 #include "fenv.h"
 
-#ifdef __GNUC_GNU_INLINE__
-#error "This file must be compiled with C99 'inline' semantics"
-#endif
-
 const fenv_t __fe_dfl_env = 0x00000000;
 
 int
diff --git a/lib/msun/riscv/fenv.c b/lib/msun/riscv/fenv.c
index 1f1f8eddc2d..7fdedca1f09 100644
--- a/lib/msun/riscv/fenv.c
+++ b/lib/msun/riscv/fenv.c
@@ -24,13 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#define	__fenv_static
 #include "fenv.h"
 
-#ifdef __GNUC_GNU_INLINE__
-#error "This file must be compiled with C99 'inline' semantics"
-#endif
-
 /*
  * Hopefully the system ID byte is immutable, so it's valid to use
  * this as a default environment.