diff --git a/amd64/fenv.c b/amd64/fenv.c
index b06c899b..63b06809 100644
--- a/amd64/fenv.c
+++ b/amd64/fenv.c
@@ -32,7 +32,7 @@
 #ifdef _WIN32
 #define __fenv_static
 #endif
-#include "openlibm_fenv.h"
+#include <openlibm_fenv.h>
 
 #ifdef __GNUC_GNU_INLINE__
 #error "This file must be compiled with C99 'inline' semantics"
diff --git a/ld128/e_rem_pio2l.h b/ld128/e_rem_pio2l.h
index 8ca0b1ed..ad84329b 100644
--- a/ld128/e_rem_pio2l.h
+++ b/ld128/e_rem_pio2l.h
@@ -23,8 +23,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 #include "fpmath.h"
 
diff --git a/ld128/k_tanl.c b/ld128/k_tanl.c
index 441950fe..2675f05f 100644
--- a/ld128/k_tanl.c
+++ b/ld128/k_tanl.c
@@ -18,7 +18,8 @@
  * ld128 version of k_tan.c.  See ../src/k_tan.c for most comments.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 /*
diff --git a/ld128/s_exp2l.c b/ld128/s_exp2l.c
index 17f93952..930b4fcc 100644
--- a/ld128/s_exp2l.c
+++ b/ld128/s_exp2l.c
@@ -28,10 +28,10 @@
 //__FBSDID("$FreeBSD: src/lib/msun/ld128/s_exp2l.c,v 1.3 2008/02/13 10:44:44 bde Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 #include <stdint.h>
 
 #include "fpmath.h"
-#include "openlibm.h"
 #include "math_private.h"
 
 #define	TBLBITS	7
diff --git a/ld128/s_nanl.c b/ld128/s_nanl.c
index 4e0c36b1..a18beaa7 100644
--- a/ld128/s_nanl.c
+++ b/ld128/s_nanl.c
@@ -26,7 +26,7 @@
  * $FreeBSD: src/lib/msun/ld128/s_nanl.c,v 1.3 2008/03/02 20:16:55 das Exp $
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
 
 #include "fpmath.h"
 #include "math_private.h"
diff --git a/ld80/e_coshl.c b/ld80/e_coshl.c
index 2d0a1145..670c5c4c 100644
--- a/ld80/e_coshl.c
+++ b/ld80/e_coshl.c
@@ -31,7 +31,8 @@
  *	only coshl(0)=1 is exact for finite x.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const long double one = 1.0, half=0.5, huge = 1.0e4900L;
diff --git a/ld80/e_rem_pio2l.h b/ld80/e_rem_pio2l.h
index 65ccaaaf..eebe723e 100644
--- a/ld80/e_rem_pio2l.h
+++ b/ld80/e_rem_pio2l.h
@@ -23,10 +23,9 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
-#include "openlibm.h"
 
 #define	BIAS	(LDBL_MAX_EXP - 1)
 
diff --git a/ld80/k_tanl.c b/ld80/k_tanl.c
index 4e65aacb..c85001eb 100644
--- a/ld80/k_tanl.c
+++ b/ld80/k_tanl.c
@@ -18,7 +18,8 @@
  * ld80 version of k_tan.c.  See ../src/k_tan.c for most comments.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 /*
diff --git a/ld80/s_exp2l.c b/ld80/s_exp2l.c
index 0c89159b..5e13a4e8 100644
--- a/ld80/s_exp2l.c
+++ b/ld80/s_exp2l.c
@@ -32,8 +32,8 @@
 
 #include "amd64/bsd_ieeefp.h"
 
-#include "openlibm.h"
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 #define	TBLBITS	7
diff --git a/ld80/s_nanl.c b/ld80/s_nanl.c
index 7b0fe01e..df6a559b 100644
--- a/ld80/s_nanl.c
+++ b/ld80/s_nanl.c
@@ -26,9 +26,8 @@
  * $FreeBSD: src/lib/msun/ld80/s_nanl.c,v 1.2 2007/12/18 23:46:31 das Exp $
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 DLLEXPORT long double
diff --git a/ld80/s_truncl.c b/ld80/s_truncl.c
index e4aa68ce..922d1da0 100644
--- a/ld80/s_truncl.c
+++ b/ld80/s_truncl.c
@@ -24,7 +24,7 @@
 //#include <machine/ieee.h>
 
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
 #include <stdint.h>
 
 #include "math_private.h"
diff --git a/src/e_acos.c b/src/e_acos.c
index 3eea5208..bf07b54f 100644
--- a/src/e_acos.c
+++ b/src/e_acos.c
@@ -39,8 +39,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double
diff --git a/src/e_acosf.c b/src/e_acosf.c
index 8e32fae1..21763fca 100644
--- a/src/e_acosf.c
+++ b/src/e_acosf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_acosf.c,v 1.11 2008/08/03 17:39:54 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float
diff --git a/src/e_acosh.c b/src/e_acosh.c
index 6180b241..d54c21a6 100644
--- a/src/e_acosh.c
+++ b/src/e_acosh.c
@@ -29,7 +29,8 @@
  *	acosh(NaN) is NaN without signal.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double
diff --git a/src/e_acoshf.c b/src/e_acoshf.c
index 65de3f26..5e4a1639 100644
--- a/src/e_acoshf.c
+++ b/src/e_acoshf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_acoshf.c,v 1.8 2008/02/22 02:30:34 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float
diff --git a/src/e_acosl.c b/src/e_acosl.c
index fe6270f1..9b3df202 100644
--- a/src/e_acosl.c
+++ b/src/e_acosl.c
@@ -21,9 +21,9 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
 #include "invtrig.h"
-#include "openlibm.h"
 #include "math_private.h"
 
 static const long double
diff --git a/src/e_asin.c b/src/e_asin.c
index a0e76f5b..67d1d0f1 100644
--- a/src/e_asin.c
+++ b/src/e_asin.c
@@ -45,8 +45,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double
diff --git a/src/e_asinf.c b/src/e_asinf.c
index 4db45508..78b1012f 100644
--- a/src/e_asinf.c
+++ b/src/e_asinf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_asinf.c,v 1.13 2008/08/08 00:21:27 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float
diff --git a/src/e_asinl.c b/src/e_asinl.c
index 6de8f0a9..c1877f0d 100644
--- a/src/e_asinl.c
+++ b/src/e_asinl.c
@@ -21,9 +21,9 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
 #include "invtrig.h"
-#include "openlibm.h"
 #include "math_private.h"
 
 static const long double
diff --git a/src/e_atan2.c b/src/e_atan2.c
index d676c7e3..bf5b15c4 100644
--- a/src/e_atan2.c
+++ b/src/e_atan2.c
@@ -43,8 +43,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static volatile double
diff --git a/src/e_atan2f.c b/src/e_atan2f.c
index 2dfc31f1..f067a181 100644
--- a/src/e_atan2f.c
+++ b/src/e_atan2f.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_atan2f.c,v 1.12 2008/08/03 17:39:54 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static volatile float
diff --git a/src/e_atan2l.c b/src/e_atan2l.c
index 3bad12f8..776bbf54 100644
--- a/src/e_atan2l.c
+++ b/src/e_atan2l.c
@@ -22,9 +22,9 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
 #include "invtrig.h"
-#include "openlibm.h"
 #include "math_private.h"
 
 static volatile long double
diff --git a/src/e_atanh.c b/src/e_atanh.c
index d09ba50f..0cf09da6 100644
--- a/src/e_atanh.c
+++ b/src/e_atanh.c
@@ -33,7 +33,8 @@
  *
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double one = 1.0, huge = 1e300;
diff --git a/src/e_atanhf.c b/src/e_atanhf.c
index e69bf48c..bb2a2f63 100644
--- a/src/e_atanhf.c
+++ b/src/e_atanhf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_atanhf.c,v 1.7 2008/02/22 02:30:34 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float one = 1.0, huge = 1e30;
diff --git a/src/e_cosh.c b/src/e_cosh.c
index a8a5c6c3..bb04ec97 100644
--- a/src/e_cosh.c
+++ b/src/e_cosh.c
@@ -35,7 +35,8 @@
  *	only cosh(0)=1 is exact for finite x.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double one = 1.0, half=0.5, huge = 1.0e300;
diff --git a/src/e_coshf.c b/src/e_coshf.c
index f5e8202b..ad2de962 100644
--- a/src/e_coshf.c
+++ b/src/e_coshf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_coshf.c,v 1.9 2011/10/21 06:28:47 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float one = 1.0, half=0.5, huge = 1.0e30;
diff --git a/src/e_exp.c b/src/e_exp.c
index 88a90f7d..6b2e7284 100644
--- a/src/e_exp.c
+++ b/src/e_exp.c
@@ -77,8 +77,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double
diff --git a/src/e_expf.c b/src/e_expf.c
index 15d622bf..88e04083 100644
--- a/src/e_expf.c
+++ b/src/e_expf.c
@@ -17,8 +17,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_expf.c,v 1.16 2011/10/21 06:26:38 das Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const float
diff --git a/src/e_fmod.c b/src/e_fmod.c
index 83076fb9..b91793ec 100644
--- a/src/e_fmod.c
+++ b/src/e_fmod.c
@@ -20,7 +20,8 @@
  * Method: shift and subtract
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double one = 1.0, Zero[] = {0.0, -0.0,};
diff --git a/src/e_fmodf.c b/src/e_fmodf.c
index 14ee2606..3ea43bab 100644
--- a/src/e_fmodf.c
+++ b/src/e_fmodf.c
@@ -22,7 +22,8 @@
  * Method: shift and subtract
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float one = 1.0, Zero[] = {0.0, -0.0,};
diff --git a/src/e_fmodl.c b/src/e_fmodl.c
index 452d155d..7aacc2a5 100644
--- a/src/e_fmodl.c
+++ b/src/e_fmodl.c
@@ -14,10 +14,11 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_fmodl.c,v 1.2 2008/07/31 20:09:47 das Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 #include <stdint.h>
 
 #include "fpmath.h"
-#include "openlibm.h"
+
 #include "math_private.h"
 
 #define	BIAS (LDBL_MAX_EXP - 1)
diff --git a/src/e_gamma.c b/src/e_gamma.c
index f256a151..ff7b257d 100644
--- a/src/e_gamma.c
+++ b/src/e_gamma.c
@@ -21,7 +21,8 @@
  * Method: call __ieee754_gamma_r
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 extern int signgam;
diff --git a/src/e_gamma_r.c b/src/e_gamma_r.c
index 3d4e767a..9d452f90 100644
--- a/src/e_gamma_r.c
+++ b/src/e_gamma_r.c
@@ -22,7 +22,8 @@
  * Method: See __ieee754_lgamma_r
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT double
diff --git a/src/e_gammaf.c b/src/e_gammaf.c
index 7350ab3b..465efb48 100644
--- a/src/e_gammaf.c
+++ b/src/e_gammaf.c
@@ -22,7 +22,8 @@
  * Method: call __ieee754_gammaf_r
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 extern int signgam;
diff --git a/src/e_gammaf_r.c b/src/e_gammaf_r.c
index 68fefd29..264d8334 100644
--- a/src/e_gammaf_r.c
+++ b/src/e_gammaf_r.c
@@ -23,7 +23,8 @@
  * Method: See __ieee754_lgammaf_r
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT float
diff --git a/src/e_hypot.c b/src/e_hypot.c
index db1745fe..058a9fd0 100644
--- a/src/e_hypot.c
+++ b/src/e_hypot.c
@@ -47,8 +47,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 DLLEXPORT double
diff --git a/src/e_hypotf.c b/src/e_hypotf.c
index 7c2885a0..046e55e5 100644
--- a/src/e_hypotf.c
+++ b/src/e_hypotf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_hypotf.c,v 1.14 2011/10/15 07:00:28 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT float
diff --git a/src/e_hypotl.c b/src/e_hypotl.c
index 269233bc..7211ce75 100644
--- a/src/e_hypotl.c
+++ b/src/e_hypotl.c
@@ -16,9 +16,9 @@
 /* long double version of hypot().  See e_hypot.c for most comments. */
 
 #include <float.h>
+#include <openlibm.h>
 
 #include "fpmath.h"
-#include "openlibm.h"
 #include "math_private.h"
 
 #define	GET_LDBL_MAN(h, l, v) do {	\
diff --git a/src/e_j0.c b/src/e_j0.c
index 684bd560..af22cb5c 100644
--- a/src/e_j0.c
+++ b/src/e_j0.c
@@ -61,7 +61,8 @@
  *	3. Special cases: y0(0)=-inf, y0(x<0)=NaN, y0(inf)=0.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static double pzero(double), qzero(double);
diff --git a/src/e_j0f.c b/src/e_j0f.c
index ee32fe19..e3cbc8f2 100644
--- a/src/e_j0f.c
+++ b/src/e_j0f.c
@@ -18,7 +18,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_j0f.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static float pzerof(float), qzerof(float);
diff --git a/src/e_j1.c b/src/e_j1.c
index b084dd96..1dbcd297 100644
--- a/src/e_j1.c
+++ b/src/e_j1.c
@@ -61,7 +61,8 @@
  *	   by method mentioned above.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static double pone(double), qone(double);
diff --git a/src/e_j1f.c b/src/e_j1f.c
index c103f2ee..90429f1d 100644
--- a/src/e_j1f.c
+++ b/src/e_j1f.c
@@ -18,7 +18,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_j1f.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static float ponef(float), qonef(float);
diff --git a/src/e_jn.c b/src/e_jn.c
index 883e45c6..30bfb82b 100644
--- a/src/e_jn.c
+++ b/src/e_jn.c
@@ -40,7 +40,8 @@
  *	
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double
diff --git a/src/e_jnf.c b/src/e_jnf.c
index 30853e4c..7ff3a2df 100644
--- a/src/e_jnf.c
+++ b/src/e_jnf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_jnf.c,v 1.11 2010/11/13 10:54:10 uqs Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float
diff --git a/src/e_lgamma.c b/src/e_lgamma.c
index 469b38fd..da25f442 100644
--- a/src/e_lgamma.c
+++ b/src/e_lgamma.c
@@ -21,7 +21,8 @@
  * Method: call __ieee754_lgamma_r
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 extern int signgam;
diff --git a/src/e_lgamma_r.c b/src/e_lgamma_r.c
index ad2c2edb..3944f365 100644
--- a/src/e_lgamma_r.c
+++ b/src/e_lgamma_r.c
@@ -83,7 +83,8 @@
  *	
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double
diff --git a/src/e_lgammaf.c b/src/e_lgammaf.c
index 8ac900c7..922be5a1 100644
--- a/src/e_lgammaf.c
+++ b/src/e_lgammaf.c
@@ -22,7 +22,8 @@
  * Method: call __ieee754_lgammaf_r
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 extern int signgam;
diff --git a/src/e_lgammaf_r.c b/src/e_lgammaf_r.c
index 5d9fc87b..52b06c3d 100644
--- a/src/e_lgammaf_r.c
+++ b/src/e_lgammaf_r.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_lgammaf_r.c,v 1.12 2011/10/15 07:00:28 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float
diff --git a/src/e_lgammal.c b/src/e_lgammal.c
index e608eb13..2e68630b 100644
--- a/src/e_lgammal.c
+++ b/src/e_lgammal.c
@@ -1,5 +1,7 @@
 #include "cdefs-compat.h"
-#include "openlibm.h"
+
+#include <openlibm.h>
+
 #include "math_private.h"
 
 extern int signgam;
diff --git a/src/e_log.c b/src/e_log.c
index ee73d741..e55390b6 100644
--- a/src/e_log.c
+++ b/src/e_log.c
@@ -65,7 +65,8 @@
  * to produce the hexadecimal values shown.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double
diff --git a/src/e_log10.c b/src/e_log10.c
index a6f9dd6b..d0a4034a 100644
--- a/src/e_log10.c
+++ b/src/e_log10.c
@@ -22,7 +22,8 @@
  * in not-quite-routine extra precision.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 #include "k_log.h"
 
diff --git a/src/e_log10f.c b/src/e_log10f.c
index 9ebce9aa..38e1a220 100644
--- a/src/e_log10f.c
+++ b/src/e_log10f.c
@@ -16,7 +16,8 @@
  * Float version of e_log10.c.  See the latter for most comments.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 #include "k_logf.h"
 
diff --git a/src/e_log2.c b/src/e_log2.c
index 07846794..590b3d1d 100644
--- a/src/e_log2.c
+++ b/src/e_log2.c
@@ -24,7 +24,8 @@
  * in not-quite-routine extra precision.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 #include "k_log.h"
 
diff --git a/src/e_log2f.c b/src/e_log2f.c
index 99fa397f..3997e2d7 100644
--- a/src/e_log2f.c
+++ b/src/e_log2f.c
@@ -16,7 +16,8 @@
  * Float version of e_log2.c.  See the latter for most comments.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 #include "k_logf.h"
 
diff --git a/src/e_logf.c b/src/e_logf.c
index c360cb73..fd06a440 100644
--- a/src/e_logf.c
+++ b/src/e_logf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_logf.c,v 1.11 2008/03/29 16:37:59 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float
diff --git a/src/e_pow.c b/src/e_pow.c
index f1a0c32a..2cff6adf 100644
--- a/src/e_pow.c
+++ b/src/e_pow.c
@@ -57,7 +57,8 @@
  * to produce the hexadecimal values shown.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double
diff --git a/src/e_powf.c b/src/e_powf.c
index c1e9e8b9..d5245269 100644
--- a/src/e_powf.c
+++ b/src/e_powf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_powf.c,v 1.16 2011/10/21 06:26:07 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float
diff --git a/src/e_rem_pio2.c b/src/e_rem_pio2.c
index 2b473092..716abdaa 100644
--- a/src/e_rem_pio2.c
+++ b/src/e_rem_pio2.c
@@ -23,8 +23,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 /*
diff --git a/src/e_rem_pio2f.c b/src/e_rem_pio2f.c
index 0f534aa8..a66adbd1 100644
--- a/src/e_rem_pio2f.c
+++ b/src/e_rem_pio2f.c
@@ -25,8 +25,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 /*
diff --git a/src/e_remainder.c b/src/e_remainder.c
index 1b1410f8..cc1e4c50 100644
--- a/src/e_remainder.c
+++ b/src/e_remainder.c
@@ -24,8 +24,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double zero = 0.0;
diff --git a/src/e_remainderf.c b/src/e_remainderf.c
index 867c40a2..5d49d239 100644
--- a/src/e_remainderf.c
+++ b/src/e_remainderf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_remainderf.c,v 1.8 2008/02/12 17:11:36 bde Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float zero = 0.0;
diff --git a/src/e_scalb.c b/src/e_scalb.c
index e0c91658..abf05f7f 100644
--- a/src/e_scalb.c
+++ b/src/e_scalb.c
@@ -20,7 +20,8 @@
  * should use scalbn() instead.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 #ifdef _SCALB_INT
diff --git a/src/e_scalbf.c b/src/e_scalbf.c
index 7472d371..6154fb0e 100644
--- a/src/e_scalbf.c
+++ b/src/e_scalbf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.13 2008/02/22 02:30:35 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 #ifdef _SCALB_INT
diff --git a/src/e_sinh.c b/src/e_sinh.c
index 5fc451e1..f9ffd9e1 100644
--- a/src/e_sinh.c
+++ b/src/e_sinh.c
@@ -32,7 +32,8 @@
  *	only sinh(0)=0 is exact for finite x.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double one = 1.0, shuge = 1.0e307;
diff --git a/src/e_sinhf.c b/src/e_sinhf.c
index 9a978343..461502fe 100644
--- a/src/e_sinhf.c
+++ b/src/e_sinhf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_sinhf.c,v 1.10 2011/10/21 06:28:47 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float one = 1.0, shuge = 1.0e37;
diff --git a/src/e_sqrt.c b/src/e_sqrt.c
index df6eec4b..f89b852f 100644
--- a/src/e_sqrt.c
+++ b/src/e_sqrt.c
@@ -85,8 +85,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static	const double	one	= 1.0, tiny=1.0e-300;
diff --git a/src/e_sqrtf.c b/src/e_sqrtf.c
index e842efe7..f863c7ab 100644
--- a/src/e_sqrtf.c
+++ b/src/e_sqrtf.c
@@ -13,7 +13,8 @@
  * ====================================================
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static	const float	one	= 1.0, tiny=1.0e-30;
diff --git a/src/e_sqrtl.c b/src/e_sqrtl.c
index 80f3d617..910bfc71 100644
--- a/src/e_sqrtl.c
+++ b/src/e_sqrtl.c
@@ -28,10 +28,10 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/e_sqrtl.c,v 1.1 2008/03/02 01:47:58 das Exp $");
 
 #include <float.h>
+#include <openlibm.h>
+#include <openlibm_fenv.h>
 
 #include "fpmath.h"
-#include "openlibm.h"
-#include "openlibm_fenv.h"
 #include "math_private.h"
 
 /* Return (x + ulp) for normal positive x. Assumes no overflow. */
diff --git a/src/k_cos.c b/src/k_cos.c
index b468594d..db7a9599 100644
--- a/src/k_cos.c
+++ b/src/k_cos.c
@@ -53,7 +53,8 @@
  *	   any extra precision in w.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double
diff --git a/src/k_cosf.c b/src/k_cosf.c
index 6daeb65f..f1a5eaca 100644
--- a/src/k_cosf.c
+++ b/src/k_cosf.c
@@ -19,7 +19,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.18 2009/06/03 08:16:34 ed Exp $");
 #endif
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 /* |cos(x) - c(x)| < 2**-34.1 (~[-5.37e-11, 5.295e-11]). */
diff --git a/src/k_rem_pio2.c b/src/k_rem_pio2.c
index ba6fd3cf..b9637de9 100644
--- a/src/k_rem_pio2.c
+++ b/src/k_rem_pio2.c
@@ -130,8 +130,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const int init_jk[] = {3,4,4,6}; /* initial value for jk */
diff --git a/src/k_sin.c b/src/k_sin.c
index 8b7c1e5a..0fa59e5e 100644
--- a/src/k_sin.c
+++ b/src/k_sin.c
@@ -44,7 +44,8 @@
  *		sin(x) = x + (S1*x + (x *(r-y/2)+y))
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double
diff --git a/src/k_sinf.c b/src/k_sinf.c
index 374d6100..fb9f22b3 100644
--- a/src/k_sinf.c
+++ b/src/k_sinf.c
@@ -19,7 +19,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_sinf.c,v 1.16 2009/06/03 08:16:34 ed Exp $");
 #endif
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 /* |sin(x)/x - s(x)| < 2**-37.5 (~[-4.89e-12, 4.824e-12]). */
diff --git a/src/k_tan.c b/src/k_tan.c
index 090304c2..cda5e679 100644
--- a/src/k_tan.c
+++ b/src/k_tan.c
@@ -49,8 +49,10 @@
  *		       = 1 - 2*(tan(y) - (tan(y)^2)/(1+tan(y)))
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
+
 static const double xxx[] = {
 		 3.33333333333334091986e-01,	/* 3FD55555, 55555563 */
 		 1.33333333333201242699e-01,	/* 3FC11111, 1110FE7A */
diff --git a/src/k_tanf.c b/src/k_tanf.c
index 3dac1107..a81a516d 100644
--- a/src/k_tanf.c
+++ b/src/k_tanf.c
@@ -18,7 +18,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_tanf.c,v 1.23 2009/06/03 08:16:34 ed Exp $");
 #endif
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 /* |tan(x)/x - t(x)| < 2**-25.5 (~[-2e-08, 2e-08]). */
diff --git a/src/polevll.c b/src/polevll.c
index 78cd75cb..3b31ec3b 100644
--- a/src/polevll.c
+++ b/src/polevll.c
@@ -60,7 +60,7 @@
  *
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/src/s_asinh.c b/src/s_asinh.c
index 70d10023..d30ae086 100644
--- a/src/s_asinh.c
+++ b/src/s_asinh.c
@@ -24,7 +24,8 @@
  *		 := sign(x)*log1p(|x| + x^2/(1 + sqrt(1+x^2)))
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double
diff --git a/src/s_asinhf.c b/src/s_asinhf.c
index 8a988df9..8b2b9515 100644
--- a/src/s_asinhf.c
+++ b/src/s_asinhf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_asinhf.c,v 1.9 2008/02/22 02:30:35 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float
diff --git a/src/s_atan.c b/src/s_atan.c
index 60d8df86..9a08b9f0 100644
--- a/src/s_atan.c
+++ b/src/s_atan.c
@@ -34,8 +34,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double atanhi[] = {
diff --git a/src/s_atanf.c b/src/s_atanf.c
index 505c3e87..b28deed6 100644
--- a/src/s_atanf.c
+++ b/src/s_atanf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_atanf.c,v 1.10 2008/08/01 01:24:25 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float atanhi[] = {
diff --git a/src/s_atanl.c b/src/s_atanl.c
index ee47f4ee..9fe682e8 100644
--- a/src/s_atanl.c
+++ b/src/s_atanl.c
@@ -20,9 +20,9 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
 #include "invtrig.h"
-#include "openlibm.h"
 #include "math_private.h"
 
 static const long double
diff --git a/src/s_cbrt.c b/src/s_cbrt.c
index 2fccb92f..17a64a40 100644
--- a/src/s_cbrt.c
+++ b/src/s_cbrt.c
@@ -15,7 +15,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrt.c,v 1.17 2011/03/12 16:50:39 kargl Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 /* cbrt(x)
diff --git a/src/s_cbrtf.c b/src/s_cbrtf.c
index ccb79577..5ca255b2 100644
--- a/src/s_cbrtf.c
+++ b/src/s_cbrtf.c
@@ -17,7 +17,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrtf.c,v 1.18 2008/02/22 02:30:35 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 /* cbrtf(x)
diff --git a/src/s_cbrtl.c b/src/s_cbrtl.c
index d43d0af4..ddd818b8 100644
--- a/src/s_cbrtl.c
+++ b/src/s_cbrtl.c
@@ -18,11 +18,11 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrtl.c,v 1.1 2011/03/12 19:37:35 kargl Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 // VBS
 //#include <ieeefp.h>
 
-#include "fpmath.h"    
-#include "openlibm.h"
+#include "fpmath.h"
 #include "math_private.h"
 #if defined(_WIN32) && defined(__i386__)
 #include "i387/bsd_ieeefp.h"
diff --git a/src/s_ceil.c b/src/s_ceil.c
index 7c020431..93ce46bd 100644
--- a/src/s_ceil.c
+++ b/src/s_ceil.c
@@ -23,8 +23,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double huge = 1.0e300;
diff --git a/src/s_ceilf.c b/src/s_ceilf.c
index 8fb20e5f..cd424748 100644
--- a/src/s_ceilf.c
+++ b/src/s_ceilf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ceilf.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float huge = 1.0e30;
diff --git a/src/s_copysign.c b/src/s_copysign.c
index 12b777d6..27be9524 100644
--- a/src/s_copysign.c
+++ b/src/s_copysign.c
@@ -19,7 +19,8 @@
  * with the sign bit of y.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT double
diff --git a/src/s_copysignf.c b/src/s_copysignf.c
index f7e84154..3fcf21e8 100644
--- a/src/s_copysignf.c
+++ b/src/s_copysignf.c
@@ -22,7 +22,8 @@
  * with the sign bit of y.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT float
diff --git a/src/s_cos.c b/src/s_cos.c
index 2d3c4bb3..63e52a34 100644
--- a/src/s_cos.c
+++ b/src/s_cos.c
@@ -45,8 +45,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 //#define INLINE_REM_PIO2
 #include "math_private.h"
 //#include "e_rem_pio2.c"
diff --git a/src/s_cosf.c b/src/s_cosf.c
index 1d4e7256..72b2551d 100644
--- a/src/s_cosf.c
+++ b/src/s_cosf.c
@@ -18,8 +18,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.18 2008/02/25 22:19:17 bde Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 //#define	INLINE_KERNEL_COSDF
 //#define	INLINE_KERNEL_SINDF
 //#define INLINE_REM_PIO2F
diff --git a/src/s_cosl.c b/src/s_cosl.c
index d9147ae0..365d74e3 100644
--- a/src/s_cosl.c
+++ b/src/s_cosl.c
@@ -33,8 +33,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 #if LDBL_MANT_DIG == 64
 #include "../ld80/e_rem_pio2l.h"
diff --git a/src/s_erf.c b/src/s_erf.c
index d6504b50..acccd578 100644
--- a/src/s_erf.c
+++ b/src/s_erf.c
@@ -107,8 +107,8 @@
  *	   	erfc/erf(NaN) is NaN
  */
 
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double
diff --git a/src/s_erff.c b/src/s_erff.c
index 18a8f49e..c4e1f5f0 100644
--- a/src/s_erff.c
+++ b/src/s_erff.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_erff.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float
diff --git a/src/s_exp2.c b/src/s_exp2.c
index 598268b2..e1863f5a 100644
--- a/src/s_exp2.c
+++ b/src/s_exp2.c
@@ -28,8 +28,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2.c,v 1.7 2008/02/22 02:27:34 das Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 #define	TBLBITS	8
diff --git a/src/s_exp2f.c b/src/s_exp2f.c
index 9409bd42..696d63e6 100644
--- a/src/s_exp2f.c
+++ b/src/s_exp2f.c
@@ -28,8 +28,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_exp2f.c,v 1.9 2008/02/22 02:27:34 das Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 #define	TBLBITS	4
diff --git a/src/s_expm1.c b/src/s_expm1.c
index ff996528..001e3acb 100644
--- a/src/s_expm1.c
+++ b/src/s_expm1.c
@@ -109,8 +109,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double
diff --git a/src/s_expm1f.c b/src/s_expm1f.c
index 9d29ac4e..9fd2f8d6 100644
--- a/src/s_expm1f.c
+++ b/src/s_expm1f.c
@@ -17,8 +17,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_expm1f.c,v 1.12 2011/10/21 06:26:38 das Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const float
diff --git a/src/s_fabs.c b/src/s_fabs.c
index 6c53c80b..077e02cb 100644
--- a/src/s_fabs.c
+++ b/src/s_fabs.c
@@ -14,7 +14,8 @@
  * fabs(x) returns the absolute value of x.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT double
diff --git a/src/s_fabsf.c b/src/s_fabsf.c
index f5b45251..8792332d 100644
--- a/src/s_fabsf.c
+++ b/src/s_fabsf.c
@@ -20,7 +20,8 @@
  * fabsf(x) returns the absolute value of x.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT float
diff --git a/src/s_finite.c b/src/s_finite.c
index 46f84e77..c8c1d0d1 100644
--- a/src/s_finite.c
+++ b/src/s_finite.c
@@ -18,7 +18,8 @@
  * no branching!
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT int
diff --git a/src/s_finitef.c b/src/s_finitef.c
index 6d189a5a..44239c1b 100644
--- a/src/s_finitef.c
+++ b/src/s_finitef.c
@@ -21,7 +21,8 @@
  * no branching!
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT int
diff --git a/src/s_floor.c b/src/s_floor.c
index 95891ef8..68254923 100644
--- a/src/s_floor.c
+++ b/src/s_floor.c
@@ -23,8 +23,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double huge = 1.0e300;
diff --git a/src/s_floorf.c b/src/s_floorf.c
index 678bb116..b056584a 100644
--- a/src/s_floorf.c
+++ b/src/s_floorf.c
@@ -25,7 +25,8 @@
  *	Inexact flag raised if x not equal to floorf(x).
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float huge = 1.0e30;
diff --git a/src/s_fmaf.c b/src/s_fmaf.c
index b697f9aa..e56489ee 100644
--- a/src/s_fmaf.c
+++ b/src/s_fmaf.c
@@ -27,8 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaf.c,v 1.3 2011/10/15 04:16:58 das Exp $");
 
-#include "openlibm.h"
-#include "openlibm_fenv.h"
+#include <openlibm.h>
+#include <openlibm_fenv.h>
+
 #include "math_private.h"
 
 /*
diff --git a/src/s_frexp.c b/src/s_frexp.c
index 3a7d3bd9..c8363756 100644
--- a/src/s_frexp.c
+++ b/src/s_frexp.c
@@ -24,8 +24,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double
diff --git a/src/s_frexpf.c b/src/s_frexpf.c
index 1f31aa14..c80f5536 100644
--- a/src/s_frexpf.c
+++ b/src/s_frexpf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_frexpf.c,v 1.10 2008/02/22 02:30:35 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float
diff --git a/src/s_ilogb.c b/src/s_ilogb.c
index 14e4265f..bbac5253 100644
--- a/src/s_ilogb.c
+++ b/src/s_ilogb.c
@@ -21,8 +21,8 @@
  */
 
 #include <limits.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 DLLEXPORT int
diff --git a/src/s_ilogbf.c b/src/s_ilogbf.c
index d83857cd..1e556c3b 100644
--- a/src/s_ilogbf.c
+++ b/src/s_ilogbf.c
@@ -17,8 +17,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ilogbf.c,v 1.8 2008/02/22 02:30:35 das Exp $");
 
 #include <limits.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 DLLEXPORT int
diff --git a/src/s_log1p.c b/src/s_log1p.c
index 2752cd23..70d4bcc2 100644
--- a/src/s_log1p.c
+++ b/src/s_log1p.c
@@ -79,8 +79,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double
diff --git a/src/s_log1pf.c b/src/s_log1pf.c
index 04120eaf..d162f7b4 100644
--- a/src/s_log1pf.c
+++ b/src/s_log1pf.c
@@ -17,8 +17,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_log1pf.c,v 1.12 2008/03/29 16:37:59 das Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const float
diff --git a/src/s_logb.c b/src/s_logb.c
index 4fb376a3..95493014 100644
--- a/src/s_logb.c
+++ b/src/s_logb.c
@@ -20,8 +20,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double
diff --git a/src/s_logbf.c b/src/s_logbf.c
index 26a36b55..e1926a38 100644
--- a/src/s_logbf.c
+++ b/src/s_logbf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_logbf.c,v 1.9 2008/02/22 02:30:35 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float
diff --git a/src/s_modf.c b/src/s_modf.c
index 26157299..319c9637 100644
--- a/src/s_modf.c
+++ b/src/s_modf.c
@@ -20,7 +20,8 @@
  *	No exception.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double one = 1.0;
diff --git a/src/s_modff.c b/src/s_modff.c
index 7deee069..a8bbf987 100644
--- a/src/s_modff.c
+++ b/src/s_modff.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_modff.c,v 1.9 2008/02/22 02:30:35 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float one = 1.0;
diff --git a/src/s_nextafter.c b/src/s_nextafter.c
index f3c695ec..2e02a327 100644
--- a/src/s_nextafter.c
+++ b/src/s_nextafter.c
@@ -21,8 +21,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 DLLEXPORT double
diff --git a/src/s_nextafterf.c b/src/s_nextafterf.c
index 1a070a62..dac81e9c 100644
--- a/src/s_nextafterf.c
+++ b/src/s_nextafterf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_nextafterf.c,v 1.11 2008/02/22 02:30:35 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT float
diff --git a/src/s_nextafterl.c b/src/s_nextafterl.c
index 2874350c..27c002e6 100644
--- a/src/s_nextafterl.c
+++ b/src/s_nextafterl.c
@@ -21,9 +21,9 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
 #include "fpmath.h"
-#include "openlibm.h"
 #include "math_private.h"
 
 #if LDBL_MAX_EXP != 0x4000
diff --git a/src/s_nexttoward.c b/src/s_nexttoward.c
index eca03700..483c9339 100644
--- a/src/s_nexttoward.c
+++ b/src/s_nexttoward.c
@@ -20,9 +20,9 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
 #include "fpmath.h"
-#include "openlibm.h"
 #include "math_private.h"
 
 #if LDBL_MAX_EXP != 0x4000
diff --git a/src/s_nexttowardf.c b/src/s_nexttowardf.c
index d7080624..4726cbd0 100644
--- a/src/s_nexttowardf.c
+++ b/src/s_nexttowardf.c
@@ -13,9 +13,9 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_nexttowardf.c,v 1.3 2011/02/10 07:38:38 das Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 
 #include "fpmath.h"
-#include "openlibm.h"
 #include "math_private.h"
 
 #define	LDBL_INFNAN_EXP	(LDBL_MAX_EXP * 2 - 1)
diff --git a/src/s_remquo.c b/src/s_remquo.c
index 7b63b76f..ca626392 100644
--- a/src/s_remquo.c
+++ b/src/s_remquo.c
@@ -14,8 +14,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_remquo.c,v 1.2 2008/03/30 20:47:26 das Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double Zero[] = {0.0, -0.0,};
diff --git a/src/s_remquof.c b/src/s_remquof.c
index 579dec07..72a03165 100644
--- a/src/s_remquof.c
+++ b/src/s_remquof.c
@@ -13,7 +13,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_remquof.c,v 1.1 2005/03/25 04:40:44 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float Zero[] = {0.0, -0.0,};
diff --git a/src/s_remquol.c b/src/s_remquol.c
index 0100cae5..69734dde 100644
--- a/src/s_remquol.c
+++ b/src/s_remquol.c
@@ -14,10 +14,10 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_remquol.c,v 1.2 2008/07/31 20:09:47 das Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 #include <stdint.h>
 
 #include "fpmath.h"
-#include "openlibm.h"
 #include "math_private.h"
 
 #define	BIAS (LDBL_MAX_EXP - 1)
diff --git a/src/s_rint.c b/src/s_rint.c
index b246e002..ba0e1045 100644
--- a/src/s_rint.c
+++ b/src/s_rint.c
@@ -24,8 +24,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double
diff --git a/src/s_rintf.c b/src/s_rintf.c
index 91d05c0e..f593c1ad 100644
--- a/src/s_rintf.c
+++ b/src/s_rintf.c
@@ -17,9 +17,9 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_rintf.c,v 1.12 2008/02/22 02:30:35 das Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 #include <stdint.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const float
diff --git a/src/s_scalbn.c b/src/s_scalbn.c
index de2c98f5..1071ac33 100644
--- a/src/s_scalbn.c
+++ b/src/s_scalbn.c
@@ -18,9 +18,10 @@
  */
 
 #include "cdefs-compat.h"
+
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double
diff --git a/src/s_scalbnf.c b/src/s_scalbnf.c
index e353e24d..57d53ca2 100644
--- a/src/s_scalbnf.c
+++ b/src/s_scalbnf.c
@@ -16,7 +16,8 @@
 
 #include "cdefs-compat.h"
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float
diff --git a/src/s_signgam.c b/src/s_signgam.c
index b5650f65..7e197a0c 100644
--- a/src/s_signgam.c
+++ b/src/s_signgam.c
@@ -1,3 +1,5 @@
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
+
 int signgam = 0;
diff --git a/src/s_significand.c b/src/s_significand.c
index d6d06ea0..51e51fd5 100644
--- a/src/s_significand.c
+++ b/src/s_significand.c
@@ -19,7 +19,8 @@
  * for exercising the fraction-part(F) IEEE 754-1985 test vector.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT double
diff --git a/src/s_significandf.c b/src/s_significandf.c
index 781f7869..3cc5011e 100644
--- a/src/s_significandf.c
+++ b/src/s_significandf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_significandf.c,v 1.8 2008/02/22 02:30:36 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT float
diff --git a/src/s_sin.c b/src/s_sin.c
index 31ed70a5..9f50764f 100644
--- a/src/s_sin.c
+++ b/src/s_sin.c
@@ -45,8 +45,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 //#define INLINE_REM_PIO2
 #include "math_private.h"
 //#include "e_rem_pio2.c"
diff --git a/src/s_sincos.c b/src/s_sincos.c
index c10a15d5..a6b7cab1 100644
--- a/src/s_sincos.c
+++ b/src/s_sincos.c
@@ -35,8 +35,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 //#define INLINE_REM_PIO2
 #include "math_private.h"
 //#include "e_rem_pio2.c"
diff --git a/src/s_sincosf.c b/src/s_sincosf.c
index 26ebca0d..8908ae67 100644
--- a/src/s_sincosf.c
+++ b/src/s_sincosf.c
@@ -10,8 +10,9 @@
 */
 
 #include "cdefs-compat.h"
+
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
 
 //#define	INLINE_KERNEL_COSDF
 //#define	INLINE_KERNEL_SINDF
diff --git a/src/s_sincosl.c b/src/s_sincosl.c
index 2ca1e976..72ada339 100644
--- a/src/s_sincosl.c
+++ b/src/s_sincosl.c
@@ -9,11 +9,11 @@
  * ====================================================
 */
 
- #include "cdefs-compat.h"
+#include "cdefs-compat.h"
 
- #include <float.h>
+#include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 #if LDBL_MANT_DIG == 64
 #include "../ld80/e_rem_pio2l.h"
diff --git a/src/s_sinf.c b/src/s_sinf.c
index 97a2c92f..c76a99ea 100644
--- a/src/s_sinf.c
+++ b/src/s_sinf.c
@@ -18,8 +18,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.17 2008/02/25 22:19:17 bde Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 //#define	INLINE_KERNEL_COSDF
 //#define	INLINE_KERNEL_SINDF
 //#define INLINE_REM_PIO2F
diff --git a/src/s_sinl.c b/src/s_sinl.c
index 5c73c331..b460b076 100644
--- a/src/s_sinl.c
+++ b/src/s_sinl.c
@@ -28,8 +28,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_sinl.c,v 1.3 2011/05/30 19:41:28 kargl Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 #if LDBL_MANT_DIG == 64
 #include "../ld80/e_rem_pio2l.h"
diff --git a/src/s_tan.c b/src/s_tan.c
index 4392776e..e830a197 100644
--- a/src/s_tan.c
+++ b/src/s_tan.c
@@ -44,8 +44,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 //#define INLINE_REM_PIO2
 #include "math_private.h"
 //#include "e_rem_pio2.c"
diff --git a/src/s_tanf.c b/src/s_tanf.c
index ccf37a96..f711507b 100644
--- a/src/s_tanf.c
+++ b/src/s_tanf.c
@@ -18,8 +18,8 @@
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.17 2008/02/25 22:19:17 bde Exp $");
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 //#define	INLINE_KERNEL_TANDF
 //#define INLINE_REM_PIO2F
 #include "math_private.h"
diff --git a/src/s_tanh.c b/src/s_tanh.c
index a400fd68..aee5df05 100644
--- a/src/s_tanh.c
+++ b/src/s_tanh.c
@@ -37,7 +37,8 @@
  *	only tanh(0)=0 is exact for finite argument.
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const double one = 1.0, two = 2.0, tiny = 1.0e-300, huge = 1.0e300;
diff --git a/src/s_tanhf.c b/src/s_tanhf.c
index 85b5d18b..0fdf18d6 100644
--- a/src/s_tanhf.c
+++ b/src/s_tanhf.c
@@ -16,7 +16,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_tanhf.c,v 1.9 2008/02/22 02:30:36 das Exp $");
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float one=1.0, two=2.0, tiny = 1.0e-30, huge = 1.0e30;
diff --git a/src/s_tanl.c b/src/s_tanl.c
index ab3046a7..ea787141 100644
--- a/src/s_tanl.c
+++ b/src/s_tanl.c
@@ -34,8 +34,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 #if LDBL_MANT_DIG == 64
 #include "../ld80/e_rem_pio2l.h"
diff --git a/src/s_trunc.c b/src/s_trunc.c
index f3d56ae1..7f59cf37 100644
--- a/src/s_trunc.c
+++ b/src/s_trunc.c
@@ -23,8 +23,8 @@
  */
 
 #include <float.h>
+#include <openlibm.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const double huge = 1.0e300;
diff --git a/src/s_truncf.c b/src/s_truncf.c
index 470d8949..ffbefdff 100644
--- a/src/s_truncf.c
+++ b/src/s_truncf.c
@@ -22,7 +22,8 @@
  *	Inexact flag raised if x not equal to truncf(x).
  */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 static const float huge = 1.0e30F;
diff --git a/src/w_dremf.c b/src/w_dremf.c
index 09a76b42..c469fba2 100644
--- a/src/w_dremf.c
+++ b/src/w_dremf.c
@@ -6,7 +6,8 @@
  */
 /* $FreeBSD: src/lib/msun/src/w_dremf.c,v 1.3 2004/07/28 05:53:18 kan Exp $ */
 
-#include "openlibm.h"
+#include <openlibm.h>
+
 #include "math_private.h"
 
 DLLEXPORT float