9 files changed, 14 insertions, 2 deletions
diff --git a/lib/libm/fmaf.c b/lib/libm/fmaf.c
index b940283d..fb7508a3 100644
--- a/lib/libm/fmaf.c
+++ b/lib/libm/fmaf.c
@@ -25,6 +25,7 @@
  * SUCH DAMAGE.
  */
 
+#include "bits/fenv.h" // for FE_INEXACT, FE_UNDERFLOW, FE_TONEAREST
 
 #include <fenv.h>   // for feraiseexcept, fetestexcept, feclearexcept
 #include <math.h>   // for fmaf
diff --git a/lib/libm/fmal.c b/lib/libm/fmal.c
index 8dd0ac61..11097f0e 100644
--- a/lib/libm/fmal.c
+++ b/lib/libm/fmal.c
@@ -25,6 +25,7 @@
  * SUCH DAMAGE.
  */
 
+#include "bits/fenv.h" // for FE_INEXACT, FE_UNDERFLOW, FE_DOWNWARD, FE_TON...
 #include "libm.h"      // for ldshape, ldshape::(anonymous)
 
 #include <float.h> // for LDBL_MANT_DIG, LDBL_MAX_EXP, LDBL_MIN
diff --git a/lib/libm/llrintl.c b/lib/libm/llrintl.c
index 99e38781..a075dcc7 100644
--- a/lib/libm/llrintl.c
+++ b/lib/libm/llrintl.c
@@ -1,5 +1,7 @@
 
 
+#include "bits/fenv.h" // for FE_INEXACT
+
 #include <fenv.h>   // for feclearexcept, fetestexcept
 #include <float.h>  // for LDBL_MANT_DIG, LDBL_MAX_EXP
 #include <limits.h> // for LLONG_MAX, LLONG_MIN
diff --git a/lib/libm/lrintl.c b/lib/libm/lrintl.c
index fc82d8a8..22d99823 100644
--- a/lib/libm/lrintl.c
+++ b/lib/libm/lrintl.c
@@ -1,5 +1,7 @@
 
 
+#include "bits/fenv.h" // for FE_INEXACT
+
 #include <fenv.h>   // for feclearexcept, fetestexcept
 #include <float.h>  // for LDBL_MANT_DIG, LDBL_MAX_EXP
 #include <limits.h> // for LONG_MAX, LONG_MIN
diff --git a/lib/libm/nearbyint.c b/lib/libm/nearbyint.c
index d075eac6..3e3317a9 100644
--- a/lib/libm/nearbyint.c
+++ b/lib/libm/nearbyint.c
@@ -1,5 +1,7 @@
 
 
+#include "bits/fenv.h" // for FE_INEXACT
+
 #include <fenv.h> // for feclearexcept, fetestexcept
 #include <math.h> // for nearbyint, rint
 
diff --git a/lib/libm/nearbyintf.c b/lib/libm/nearbyintf.c
index a180ae22..224af0f6 100644
--- a/lib/libm/nearbyintf.c
+++ b/lib/libm/nearbyintf.c
@@ -1,5 +1,7 @@
 
 
+#include "bits/fenv.h" // for FE_INEXACT
+
 #include <fenv.h> // for feclearexcept, fetestexcept
 #include <math.h> // for nearbyintf, rintf
 
diff --git a/lib/libm/nearbyintl.c b/lib/libm/nearbyintl.c
index fc19d84b..df48af53 100644
--- a/lib/libm/nearbyintl.c
+++ b/lib/libm/nearbyintl.c
@@ -1,5 +1,7 @@
 
 
+#include "bits/fenv.h" // for FE_INEXACT
+
 #include <float.h> // for LDBL_MANT_DIG, LDBL_MAX_EXP
 #include <math.h>  // for nearbyintl, rintl
 
diff --git a/lib/libm/tanf.c b/lib/libm/tanf.c
index ef808637..f005908f 100644
--- a/lib/libm/tanf.c
+++ b/lib/libm/tanf.c
@@ -16,7 +16,7 @@
 
 #include "libm.h" // for __tandf, __rem_pio2f, FORCE_EVAL, GET_FLOAT_WORD
 
-#include <math.h>   // for M_PI_2, tanf
+#include <math.h>   // for M_PI_2, tanf, NAN
 #include <stdint.h> // for uint32_t
 
 /* Small multiples of pi/2 rounded to double precision. */
diff --git a/lib/libm/tanl.c b/lib/libm/tanl.c
index 22657cce..7fb0e269 100644
--- a/lib/libm/tanl.c
+++ b/lib/libm/tanl.c
@@ -1,7 +1,7 @@
 #include "libm.h" // for ldshape, ldshape::(anonymous), __tanl, __rem_pio2l
 
 #include <float.h> // for LDBL_MANT_DIG, LDBL_MAX_EXP
-#include <math.h>  // for tanl, M_PI_4
+#include <math.h>  // for tanl, M_PI_4, NAN
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double tanl(long double x)