diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index a974daa91..d20bb5169 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,65 @@
+2009-04-17  Jeff johnston  <jjohnstn@redhat.com>
+
+	* libc/include/machine/ieeefp.h (_LDBL_EQ_DBL): Remove.
+	* libc/stdlib/local.h (_LDBL_EQ_DBL): Add.
+	* libc/stdlib/strtold.c: Include local.h.
+	* libc/stdlib/wcstold.c: Likewise.
+	* libm/common/atanl.c: Likewise.
+	* libm/common/cosl.c: Likewise.
+	* libm/common/sinl.c: Likewise.
+	* libm/common/modfl.c: Likewise.
+	* libm/common/frexpl.c: Likewise.
+	* libm/common/tanhl.c: Likewise.
+	* libm/common/tanl.c: Likewise.
+	* libm/common/expm1l.c: Likewise.
+	* libm/common/log1pl.c: Likewise.
+	* libm/common/ceill.c: Likewise.
+	* libm/common/fabsl.c: Likewise.
+	* libm/common/floorl.c: Likewise.
+	* libm/common/acosl.c: Likewise.
+	* libm/common/asinl.c: Likewise.
+	* libm/common/atan2l.c: Likewise.
+	* libm/common/coshl.c: Likewise.
+	* libm/common/expl.c: Likewise.
+	* libm/common/fmodl.c: Likewise.
+	* libm/common/hypotl.c: Likewise.
+	* libm/common/ldexpl.c: Likewise.
+	* libm/common/log10l.c: Likewise.
+	* libm/common/logl.c: Likewise.
+	* libm/common/powl.c: Likewise.
+	* libm/common/sqrtl.c: Likewise.
+	* libm/common/copysignl.c: Likewise.
+	* libm/common/ilogbl.c: Likewise.
+	* libm/common/nanl.c: Likewise.
+	* libm/common/cbrtl.c: Likewise.
+	* libm/common/asinhl.c: Likewise.
+	* libm/common/nextafterl.c: Likewise.
+	* libm/common/rintl.c: Likewise.
+	* libm/common/scalbnl.c: Likewise.
+	* libm/common/exp2l.c: Likewise.
+	* libm/common/fdiml.c: Likewise.
+	* libm/common/fmal.c: Likewise.
+	* libm/common/fmaxl.c: Likewise.
+	* libm/common/fminl.c: Likewise.
+	* libm/common/lrintl.c: Likewise.
+	* libm/common/lroundl.c: Likewise.
+	* libm/common/nearbyintl.c: Likewise.
+	* libm/common/remquol.c: Likewise.
+	* libm/common/roundl.c: Likewise.
+	* libm/common/scalblnl.c: Likewise.
+	* libm/common/truncl.c: Likewise.
+	* libm/common/acoshl.c: Likewise.
+	* libm/common/atanhl.c: Likewise.
+	* libm/common/erfcl.c: Likewise.
+	* libm/common/erfl.c: Likewise.
+	* libm/common/lgammal.c: Likewise.
+	* libm/common/remainderl.c: Likewise.
+	* libm/common/tgammal.c: Likewise.
+	* libm/common/sinhl.c: Likewise.
+	* libm/common/llroundl.c: Likewise.
+	* libm/common/llrintl.c: Likewise.
+	* libm/common/local.h: New file with _LDBL_EQ_DBL macro.
+
 2009-04-17  Ken Werner  <ken.werner@de.ibm.com>
 
 	* libc/include/machine/ieeefp.h: _LDBL_EQ_DBL check fixed.
diff --git a/newlib/libc/include/machine/ieeefp.h b/newlib/libc/include/machine/ieeefp.h
index 643111beb..b3c793741 100644
--- a/newlib/libc/include/machine/ieeefp.h
+++ b/newlib/libc/include/machine/ieeefp.h
@@ -331,10 +331,3 @@
 #endif /* not __IEEE_LITTLE_ENDIAN */
 #endif /* not __IEEE_BIG_ENDIAN */
 
-/* Check if long double is as wide as double. */
-#if (!defined(__STRICT_ANSI__) || __STDC_VERSION__ > 199901L || \
-  defined(__cplusplus)) && defined(__LDBL_MANT_DIG__) && \
-    (__DBL_MANT_DIG__ == __LDBL_MANT_DIG__ && __LDBL_MIN_EXP__ == __DBL_MIN_EXP__ && \
-    __LDBL_MAX_EXP__ == __DBL_MAX_EXP__)
- #define _LDBL_EQ_DBL
-#endif
diff --git a/newlib/libc/stdlib/local.h b/newlib/libc/stdlib/local.h
index 37856f8be..347154ac1 100644
--- a/newlib/libc/stdlib/local.h
+++ b/newlib/libc/stdlib/local.h
@@ -63,4 +63,13 @@ int __iso_8859_index (const char *);
 wchar_t __cp_conv[12][0x80];
 int __cp_index (const char *);
 
+#include <float.h>
+
+/* Check if long double is as wide as double. */
+#if (!defined(__STRICT_ANSI__) || __STDC_VERSION__ > 199901L || \
+  defined(__cplusplus)) && defined(LDBL_MANT_DIG) && \
+    (DBL_MANT_DIG == LDBL_MANT_DIG && LDBL_MIN_EXP == DBL_MIN_EXP && \
+    LDBL_MAX_EXP == DBL_MAX_EXP)
+ #define _LDBL_EQ_DBL
+#endif
 #endif
diff --git a/newlib/libc/stdlib/strtold.c b/newlib/libc/stdlib/strtold.c
index 2abd084a9..94f9613d2 100644
--- a/newlib/libc/stdlib/strtold.c
+++ b/newlib/libc/stdlib/strtold.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <stdlib.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libc/stdlib/wcstold.c b/newlib/libc/stdlib/wcstold.c
index 6c8a422bb..8b0ba2440 100644
--- a/newlib/libc/stdlib/wcstold.c
+++ b/newlib/libc/stdlib/wcstold.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <stdlib.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/acoshl.c b/newlib/libm/common/acoshl.c
index a7a2be1dc..8e587ece5 100644
--- a/newlib/libm/common/acoshl.c
+++ b/newlib/libm/common/acoshl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/acosl.c b/newlib/libm/common/acosl.c
index d31c71f91..498041cd2 100644
--- a/newlib/libm/common/acosl.c
+++ b/newlib/libm/common/acosl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/asinhl.c b/newlib/libm/common/asinhl.c
index 22020eded..243701862 100644
--- a/newlib/libm/common/asinhl.c
+++ b/newlib/libm/common/asinhl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/asinl.c b/newlib/libm/common/asinl.c
index aa123e8a7..4aa24cd7c 100644
--- a/newlib/libm/common/asinl.c
+++ b/newlib/libm/common/asinl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/atan2l.c b/newlib/libm/common/atan2l.c
index f87c35147..a3aaf6d4b 100644
--- a/newlib/libm/common/atan2l.c
+++ b/newlib/libm/common/atan2l.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/atanhl.c b/newlib/libm/common/atanhl.c
index b3adb7ef3..03c26d400 100644
--- a/newlib/libm/common/atanhl.c
+++ b/newlib/libm/common/atanhl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/atanl.c b/newlib/libm/common/atanl.c
index 2233a879c..d45916051 100644
--- a/newlib/libm/common/atanl.c
+++ b/newlib/libm/common/atanl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/cbrtl.c b/newlib/libm/common/cbrtl.c
index 0cc7877cc..272b09774 100644
--- a/newlib/libm/common/cbrtl.c
+++ b/newlib/libm/common/cbrtl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/ceill.c b/newlib/libm/common/ceill.c
index 6d87de81d..0614d508c 100644
--- a/newlib/libm/common/ceill.c
+++ b/newlib/libm/common/ceill.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/copysignl.c b/newlib/libm/common/copysignl.c
index c7b781731..c5de287f9 100644
--- a/newlib/libm/common/copysignl.c
+++ b/newlib/libm/common/copysignl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/coshl.c b/newlib/libm/common/coshl.c
index 037fca373..296feb267 100644
--- a/newlib/libm/common/coshl.c
+++ b/newlib/libm/common/coshl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/cosl.c b/newlib/libm/common/cosl.c
index e3cae9656..abe9c5de2 100644
--- a/newlib/libm/common/cosl.c
+++ b/newlib/libm/common/cosl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/erfcl.c b/newlib/libm/common/erfcl.c
index 1c4e8fe57..eb9bc46e0 100644
--- a/newlib/libm/common/erfcl.c
+++ b/newlib/libm/common/erfcl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/erfl.c b/newlib/libm/common/erfl.c
index 3f06b64a0..1b0be485c 100644
--- a/newlib/libm/common/erfl.c
+++ b/newlib/libm/common/erfl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/exp2l.c b/newlib/libm/common/exp2l.c
index 33d14a514..29127bb64 100644
--- a/newlib/libm/common/exp2l.c
+++ b/newlib/libm/common/exp2l.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/expl.c b/newlib/libm/common/expl.c
index c37703493..37083b020 100644
--- a/newlib/libm/common/expl.c
+++ b/newlib/libm/common/expl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/expm1l.c b/newlib/libm/common/expm1l.c
index 26e7af194..8018f9fbc 100644
--- a/newlib/libm/common/expm1l.c
+++ b/newlib/libm/common/expm1l.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/fabsl.c b/newlib/libm/common/fabsl.c
index 313aa017f..83be0ae64 100644
--- a/newlib/libm/common/fabsl.c
+++ b/newlib/libm/common/fabsl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/fdiml.c b/newlib/libm/common/fdiml.c
index ca1b3a576..fe5853155 100644
--- a/newlib/libm/common/fdiml.c
+++ b/newlib/libm/common/fdiml.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/floorl.c b/newlib/libm/common/floorl.c
index 07456d06b..045f28069 100644
--- a/newlib/libm/common/floorl.c
+++ b/newlib/libm/common/floorl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/fmal.c b/newlib/libm/common/fmal.c
index 6bbdb1c2b..c287d9b1c 100644
--- a/newlib/libm/common/fmal.c
+++ b/newlib/libm/common/fmal.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/fmaxl.c b/newlib/libm/common/fmaxl.c
index a998e8724..f983ed932 100644
--- a/newlib/libm/common/fmaxl.c
+++ b/newlib/libm/common/fmaxl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/fminl.c b/newlib/libm/common/fminl.c
index bb1bec84c..246c4263c 100644
--- a/newlib/libm/common/fminl.c
+++ b/newlib/libm/common/fminl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/fmodl.c b/newlib/libm/common/fmodl.c
index 455a134b4..3b48943c4 100644
--- a/newlib/libm/common/fmodl.c
+++ b/newlib/libm/common/fmodl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/frexpl.c b/newlib/libm/common/frexpl.c
index 6eccb0ce5..79e41fd9e 100644
--- a/newlib/libm/common/frexpl.c
+++ b/newlib/libm/common/frexpl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/hypotl.c b/newlib/libm/common/hypotl.c
index e9570b660..3934b8ecc 100644
--- a/newlib/libm/common/hypotl.c
+++ b/newlib/libm/common/hypotl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/ilogbl.c b/newlib/libm/common/ilogbl.c
index 1bb960607..03db4de4f 100644
--- a/newlib/libm/common/ilogbl.c
+++ b/newlib/libm/common/ilogbl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/ldexpl.c b/newlib/libm/common/ldexpl.c
index 6d0ea4322..5f6627a11 100644
--- a/newlib/libm/common/ldexpl.c
+++ b/newlib/libm/common/ldexpl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/lgammal.c b/newlib/libm/common/lgammal.c
index 1b16c38b3..1b42eaf4a 100644
--- a/newlib/libm/common/lgammal.c
+++ b/newlib/libm/common/lgammal.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/llrintl.c b/newlib/libm/common/llrintl.c
index 0835def90..e5faaa02b 100644
--- a/newlib/libm/common/llrintl.c
+++ b/newlib/libm/common/llrintl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/llroundl.c b/newlib/libm/common/llroundl.c
index 6bdacd612..d663226c9 100644
--- a/newlib/libm/common/llroundl.c
+++ b/newlib/libm/common/llroundl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/local.h b/newlib/libm/common/local.h
new file mode 100644
index 000000000..9e32afacb
--- /dev/null
+++ b/newlib/libm/common/local.h
@@ -0,0 +1,9 @@
+#include <float.h>
+
+/* Check if long double is as wide as double. */
+#if (!defined(__STRICT_ANSI__) || __STDC_VERSION__ > 199901L || \
+  defined(__cplusplus)) && defined(LDBL_MANT_DIG) && \
+    (DBL_MANT_DIG == LDBL_MANT_DIG && LDBL_MIN_EXP == DBL_MIN_EXP && \
+    LDBL_MAX_EXP == DBL_MAX_EXP)
+ #define _LDBL_EQ_DBL
+#endif
diff --git a/newlib/libm/common/log10l.c b/newlib/libm/common/log10l.c
index 221ed856c..e63152b4e 100644
--- a/newlib/libm/common/log10l.c
+++ b/newlib/libm/common/log10l.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/log1pl.c b/newlib/libm/common/log1pl.c
index 42c7f7086..f52462496 100644
--- a/newlib/libm/common/log1pl.c
+++ b/newlib/libm/common/log1pl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/logl.c b/newlib/libm/common/logl.c
index b1b6df3c8..aaba0761c 100644
--- a/newlib/libm/common/logl.c
+++ b/newlib/libm/common/logl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/lrintl.c b/newlib/libm/common/lrintl.c
index e7532acec..67c46384a 100644
--- a/newlib/libm/common/lrintl.c
+++ b/newlib/libm/common/lrintl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/lroundl.c b/newlib/libm/common/lroundl.c
index f3b3233b3..868752292 100644
--- a/newlib/libm/common/lroundl.c
+++ b/newlib/libm/common/lroundl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/modfl.c b/newlib/libm/common/modfl.c
index 41a5ecc59..32ccc9a7d 100644
--- a/newlib/libm/common/modfl.c
+++ b/newlib/libm/common/modfl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/nanl.c b/newlib/libm/common/nanl.c
index 6040796f2..40f898109 100644
--- a/newlib/libm/common/nanl.c
+++ b/newlib/libm/common/nanl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/nearbyintl.c b/newlib/libm/common/nearbyintl.c
index d7897d2eb..84c0f787b 100644
--- a/newlib/libm/common/nearbyintl.c
+++ b/newlib/libm/common/nearbyintl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/nextafterl.c b/newlib/libm/common/nextafterl.c
index 0065f1041..7e4e2b9b3 100644
--- a/newlib/libm/common/nextafterl.c
+++ b/newlib/libm/common/nextafterl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/powl.c b/newlib/libm/common/powl.c
index e2873a810..d956d52a6 100644
--- a/newlib/libm/common/powl.c
+++ b/newlib/libm/common/powl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/remainderl.c b/newlib/libm/common/remainderl.c
index 4c53d2aee..f2a9e9998 100644
--- a/newlib/libm/common/remainderl.c
+++ b/newlib/libm/common/remainderl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/remquol.c b/newlib/libm/common/remquol.c
index 44eeb8017..aff9e7208 100644
--- a/newlib/libm/common/remquol.c
+++ b/newlib/libm/common/remquol.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/rintl.c b/newlib/libm/common/rintl.c
index db39c387b..30a9abd4a 100644
--- a/newlib/libm/common/rintl.c
+++ b/newlib/libm/common/rintl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/roundl.c b/newlib/libm/common/roundl.c
index 6c30a3021..8b678376b 100644
--- a/newlib/libm/common/roundl.c
+++ b/newlib/libm/common/roundl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/scalblnl.c b/newlib/libm/common/scalblnl.c
index 9ae9864ea..2a2106ad1 100644
--- a/newlib/libm/common/scalblnl.c
+++ b/newlib/libm/common/scalblnl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/scalbnl.c b/newlib/libm/common/scalbnl.c
index f85e4fa9a..7af4f5b3b 100644
--- a/newlib/libm/common/scalbnl.c
+++ b/newlib/libm/common/scalbnl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/sinhl.c b/newlib/libm/common/sinhl.c
index 703d6a348..b57905a53 100644
--- a/newlib/libm/common/sinhl.c
+++ b/newlib/libm/common/sinhl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/sinl.c b/newlib/libm/common/sinl.c
index 9f9e95f1d..c6fe1e871 100644
--- a/newlib/libm/common/sinl.c
+++ b/newlib/libm/common/sinl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/sqrtl.c b/newlib/libm/common/sqrtl.c
index d1bedbe0e..1e7d7c1d6 100644
--- a/newlib/libm/common/sqrtl.c
+++ b/newlib/libm/common/sqrtl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/tanhl.c b/newlib/libm/common/tanhl.c
index 1832c6a43..3e66b5910 100644
--- a/newlib/libm/common/tanhl.c
+++ b/newlib/libm/common/tanhl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/tanl.c b/newlib/libm/common/tanl.c
index f40f1e86a..e444efee0 100644
--- a/newlib/libm/common/tanl.c
+++ b/newlib/libm/common/tanl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/tgammal.c b/newlib/libm/common/tgammal.c
index 567b79aca..540316e1b 100644
--- a/newlib/libm/common/tgammal.c
+++ b/newlib/libm/common/tgammal.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL
diff --git a/newlib/libm/common/truncl.c b/newlib/libm/common/truncl.c
index 37959036c..ba7a92d8d 100644
--- a/newlib/libm/common/truncl.c
+++ b/newlib/libm/common/truncl.c
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <math.h>
+#include "local.h"
 
 /* On platforms where long double is as wide as double.  */
 #ifdef _LDBL_EQ_DBL