From 08dbb2b51732e2a78851f3720c9107120f2e4fe8 Mon Sep 17 00:00:00 2001
From: Ed Schouten <ed@nuxi.nl>
Date: Fri, 9 Jan 2015 13:30:44 +0100
Subject: [PATCH] Never include <complex.h>. Include <openlibm_complex.h>
 instead.

If we ship with a separate copy of <complex.h>, we should also use this
one instead of the one provided by the system.
---
 src/k_exp.c            |  4 ++--
 src/k_expf.c           |  4 ++--
 src/math_private.h     |  3 ++-
 src/openlibm.h         | 10 ++++------
 src/openlibm_complex.h | 11 +++++++----
 src/s_cabs.c           |  4 ++--
 src/s_cabsf.c          |  4 ++--
 src/s_cabsl.c          |  4 ++--
 src/s_cacos.c          |  4 ++--
 src/s_cacosf.c         |  4 ++--
 src/s_cacosh.c         |  4 ++--
 src/s_cacoshf.c        |  4 ++--
 src/s_cacoshl.c        |  4 ++--
 src/s_cacosl.c         |  4 ++--
 src/s_carg.c           |  3 ++-
 src/s_cargf.c          |  3 ++-
 src/s_cargl.c          |  3 ++-
 src/s_casin.c          |  4 ++--
 src/s_casinf.c         |  4 ++--
 src/s_casinh.c         |  4 ++--
 src/s_casinhf.c        |  4 ++--
 src/s_casinhl.c        |  4 ++--
 src/s_casinl.c         |  4 ++--
 src/s_catan.c          |  4 ++--
 src/s_catanf.c         |  4 ++--
 src/s_catanh.c         |  4 ++--
 src/s_catanhf.c        |  4 ++--
 src/s_catanhl.c        |  4 ++--
 src/s_catanl.c         |  4 ++--
 src/s_ccos.c           |  4 ++--
 src/s_ccosf.c          |  4 ++--
 src/s_ccosh.c          |  2 +-
 src/s_ccoshf.c         |  2 +-
 src/s_ccoshl.c         |  4 ++--
 src/s_ccosl.c          |  4 ++--
 src/s_cexp.c           |  2 +-
 src/s_cexpf.c          |  2 +-
 src/s_cexpl.c          |  4 ++--
 src/s_cimag.c          |  5 +++--
 src/s_cimagf.c         |  5 +++--
 src/s_cimagl.c         |  5 +++--
 src/s_clog.c           |  4 ++--
 src/s_clogf.c          |  4 ++--
 src/s_clogl.c          |  4 ++--
 src/s_conj.c           |  4 ++--
 src/s_conjf.c          |  4 ++--
 src/s_conjl.c          |  4 ++--
 src/s_cpow.c           |  3 ++-
 src/s_cpowf.c          |  3 ++-
 src/s_cpowl.c          |  3 ++-
 src/s_cproj.c          |  2 +-
 src/s_cprojf.c         |  2 +-
 src/s_cprojl.c         |  2 +-
 src/s_creal.c          |  4 +++-
 src/s_crealf.c         |  4 +++-
 src/s_creall.c         |  4 +++-
 src/s_csin.c           |  4 ++--
 src/s_csinf.c          |  4 ++--
 src/s_csinh.c          |  2 +-
 src/s_csinhf.c         |  2 +-
 src/s_csinhl.c         |  4 ++--
 src/s_csinl.c          |  4 ++--
 src/s_csqrt.c          |  2 +-
 src/s_csqrtf.c         |  2 +-
 src/s_csqrtl.c         |  2 +-
 src/s_ctan.c           |  4 ++--
 src/s_ctanf.c          |  4 ++--
 src/s_ctanh.c          |  2 +-
 src/s_ctanhf.c         |  2 +-
 src/s_ctanhl.c         |  4 ++--
 src/s_ctanl.c          |  4 ++--
 src/w_cabs.c           |  3 ++-
 src/w_cabsf.c          |  3 ++-
 src/w_cabsl.c          |  3 ++-
 74 files changed, 147 insertions(+), 127 deletions(-)

diff --git a/src/k_exp.c b/src/k_exp.c
index 7bed88b..6019290 100644
--- a/src/k_exp.c
+++ b/src/k_exp.c
@@ -27,9 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_exp.c,v 1.1 2011/10/21 06:27:56 das Exp $");
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const u_int32_t k = 1799;		/* constant for reduction */
diff --git a/src/k_expf.c b/src/k_expf.c
index 9df0b0f..ed5a065 100644
--- a/src/k_expf.c
+++ b/src/k_expf.c
@@ -27,9 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_expf.c,v 1.1 2011/10/21 06:27:56 das Exp $");
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const u_int32_t k = 235;			/* constant for reduction */
diff --git a/src/math_private.h b/src/math_private.h
index 05d95c3..1ab2309 100644
--- a/src/math_private.h
+++ b/src/math_private.h
@@ -17,10 +17,11 @@
 #ifndef _MATH_PRIVATE_H_
 #define	_MATH_PRIVATE_H_
 
+#include <openlibm_complex.h>
+
 #include "cdefs-compat.h"
 #include "types-compat.h"
 #include "fpmath.h"
-#include <complex.h>
 #include <stdint.h>
 #include "math_private_openbsd.h"
 
diff --git a/src/openlibm.h b/src/openlibm.h
index df24814..66c55b0 100644
--- a/src/openlibm.h
+++ b/src/openlibm.h
@@ -14,10 +14,10 @@
  * $FreeBSD: src/lib/msun/src/openlibm.h,v 1.82 2011/11/12 19:55:48 theraven Exp $
  */
 
-#ifndef _MATH_H_
-#define	_MATH_H_
+#ifndef OPENLIBM_H
+#define	OPENLIBM_H
 
-#include <complex.h>
+#include <openlibm_complex.h>
 
 #if (defined(_WIN32) || defined (_MSC_VER)) && !defined(__WIN32__)
     #define __WIN32__
@@ -581,9 +581,7 @@ long double	truncl(long double);
 long double	lgammal_r(long double, int *);
 #endif	/* __BSD_VISIBLE */
 
-#include "openlibm_complex.h"
-
 #if defined(__cplusplus)
 }
 #endif
-#endif /* !_MATH_H_ */
+#endif /* !OPENLIBM_H */
diff --git a/src/openlibm_complex.h b/src/openlibm_complex.h
index 57f5072..ba91803 100644
--- a/src/openlibm_complex.h
+++ b/src/openlibm_complex.h
@@ -15,10 +15,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _OPENLIBM_COMPLEX_H_
-#define	_OPENLIBM_COMPLEX_H_
+#ifndef OPENLIBM_COMPLEX_H
+#define	OPENLIBM_COMPLEX_H
 
-#include <sys/cdefs.h>
+#define complex _Complex
+
+#define _Complex_I 1.0fi
+#define I _Complex_I
 
 /*
  * Double versions of C99 functions
@@ -99,4 +102,4 @@ long double complex conjl(long double complex);
 long double complex cprojl(long double complex);
 long double creall(long double complex);
 
-#endif /* !_OPENLIBM_COMPLEX_H_ */
+#endif /* !OPENLIBM_COMPLEX_H */
diff --git a/src/s_cabs.c b/src/s_cabs.c
index 9fb7ee5..f7e03fe 100644
--- a/src/s_cabs.c
+++ b/src/s_cabs.c
@@ -15,9 +15,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double
 cabs(double complex z)
diff --git a/src/s_cabsf.c b/src/s_cabsf.c
index 61b5442..ae093a6 100644
--- a/src/s_cabsf.c
+++ b/src/s_cabsf.c
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float
 cabsf(float complex z)
diff --git a/src/s_cabsl.c b/src/s_cabsl.c
index 2c4538e..91db084 100644
--- a/src/s_cabsl.c
+++ b/src/s_cabsl.c
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double
 cabsl(long double complex z)
diff --git a/src/s_cacos.c b/src/s_cacos.c
index fc4d3c3..cb0c1e3 100644
--- a/src/s_cacos.c
+++ b/src/s_cacos.c
@@ -46,9 +46,9 @@
  *    IEEE      -10,+10     30000      1.8e-14      2.2e-15
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double complex
 cacos(double complex z)
diff --git a/src/s_cacosf.c b/src/s_cacosf.c
index fe49956..5df0726 100644
--- a/src/s_cacosf.c
+++ b/src/s_cacosf.c
@@ -46,8 +46,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float complex
 cacosf(float complex z)
diff --git a/src/s_cacosh.c b/src/s_cacosh.c
index 78f8e7d..8dce7f7 100644
--- a/src/s_cacosh.c
+++ b/src/s_cacosh.c
@@ -42,9 +42,9 @@
  *
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double complex
 cacosh(double complex z)
diff --git a/src/s_cacoshf.c b/src/s_cacoshf.c
index 5bbbd1a..12a790a 100644
--- a/src/s_cacoshf.c
+++ b/src/s_cacoshf.c
@@ -42,8 +42,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float complex
 cacoshf(float complex z)
diff --git a/src/s_cacoshl.c b/src/s_cacoshl.c
index 0c6d7a5..96768c3 100644
--- a/src/s_cacoshl.c
+++ b/src/s_cacoshl.c
@@ -43,8 +43,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 cacoshl(long double complex z)
diff --git a/src/s_cacosl.c b/src/s_cacosl.c
index d66fad1..147e92e 100644
--- a/src/s_cacosl.c
+++ b/src/s_cacosl.c
@@ -47,8 +47,8 @@
  *    IEEE      -10,+10     30000      1.8e-14      2.2e-15
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 static const long double PIO2L = 1.570796326794896619231321691639751442098585L;
 
diff --git a/src/s_carg.c b/src/s_carg.c
index 195feb4..a1b2dfc 100644
--- a/src/s_carg.c
+++ b/src/s_carg.c
@@ -27,8 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_carg.c,v 1.1 2007/12/12 23:43:51 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT double
diff --git a/src/s_cargf.c b/src/s_cargf.c
index 7592b1f..098a163 100644
--- a/src/s_cargf.c
+++ b/src/s_cargf.c
@@ -27,8 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cargf.c,v 1.1 2007/12/12 23:43:51 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT float
diff --git a/src/s_cargl.c b/src/s_cargl.c
index 2a725c9..f12607f 100644
--- a/src/s_cargl.c
+++ b/src/s_cargl.c
@@ -27,8 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cargl.c,v 1.1 2008/07/31 22:41:26 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT long double
diff --git a/src/s_casin.c b/src/s_casin.c
index 9e9ab5b..f469c39 100644
--- a/src/s_casin.c
+++ b/src/s_casin.c
@@ -49,9 +49,9 @@
  * Also tested by csin(casin(z)) = z.
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double complex
 casin(double complex z)
diff --git a/src/s_casinf.c b/src/s_casinf.c
index 2783acc..4f1503d 100644
--- a/src/s_casinf.c
+++ b/src/s_casinf.c
@@ -47,8 +47,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float complex
 casinf(float complex z)
diff --git a/src/s_casinh.c b/src/s_casinh.c
index 031d1e3..9d29034 100644
--- a/src/s_casinh.c
+++ b/src/s_casinh.c
@@ -42,9 +42,9 @@
  *
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double complex
 casinh(double complex z)
diff --git a/src/s_casinhf.c b/src/s_casinhf.c
index 952f7fe..e4617d8 100644
--- a/src/s_casinhf.c
+++ b/src/s_casinhf.c
@@ -42,8 +42,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float complex
 casinhf(float complex z)
diff --git a/src/s_casinhl.c b/src/s_casinhl.c
index 1738ea4..3d9c0e6 100644
--- a/src/s_casinhl.c
+++ b/src/s_casinhl.c
@@ -43,8 +43,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 casinhl(long double complex z)
diff --git a/src/s_casinl.c b/src/s_casinl.c
index 2fa08ef..53cfd24 100644
--- a/src/s_casinl.c
+++ b/src/s_casinl.c
@@ -49,9 +49,9 @@
  * Also tested by csin(casin(z)) = z.
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 #if	LDBL_MANT_DIG == 64
 static const long double MACHEPL= 5.42101086242752217003726400434970855712890625E-20L;
diff --git a/src/s_catan.c b/src/s_catan.c
index dc69b3a..cb153d9 100644
--- a/src/s_catan.c
+++ b/src/s_catan.c
@@ -62,9 +62,9 @@
  * 2.9e-17.  See also clog().
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 #define MAXNUM 1.0e308
 
diff --git a/src/s_catanf.c b/src/s_catanf.c
index 33c78c4..1238bd6 100644
--- a/src/s_catanf.c
+++ b/src/s_catanf.c
@@ -59,8 +59,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 #define MAXNUMF 1.0e38F
 
diff --git a/src/s_catanh.c b/src/s_catanh.c
index 726ac50..3c30a26 100644
--- a/src/s_catanh.c
+++ b/src/s_catanh.c
@@ -42,9 +42,9 @@
  *
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double complex
 catanh(double complex z)
diff --git a/src/s_catanhf.c b/src/s_catanhf.c
index 866e6a9..42d5efe 100644
--- a/src/s_catanhf.c
+++ b/src/s_catanhf.c
@@ -42,8 +42,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float complex
 catanhf(float complex z)
diff --git a/src/s_catanhl.c b/src/s_catanhl.c
index 2a5fa16..e2ea5d7 100644
--- a/src/s_catanhl.c
+++ b/src/s_catanhl.c
@@ -43,8 +43,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 catanhl(long double complex z)
diff --git a/src/s_catanl.c b/src/s_catanl.c
index 5a08728..7626e20 100644
--- a/src/s_catanl.c
+++ b/src/s_catanl.c
@@ -63,9 +63,9 @@
  * 2.9e-17.  See also clog().
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 static const long double PIL = 3.141592653589793238462643383279502884197169L;
 static const long double DP1 = 3.14159265358979323829596852490908531763125L;
diff --git a/src/s_ccos.c b/src/s_ccos.c
index 96731c7..e64de78 100644
--- a/src/s_ccos.c
+++ b/src/s_ccos.c
@@ -49,9 +49,9 @@
  *    IEEE      -10,+10     30000       3.8e-16     1.0e-16
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 /* calculate cosh and sinh */
 
diff --git a/src/s_ccosf.c b/src/s_ccosf.c
index 6643d4c..461098f 100644
--- a/src/s_ccosf.c
+++ b/src/s_ccosf.c
@@ -48,8 +48,8 @@
  *    IEEE      -10,+10     30000       1.8e-7       5.5e-8
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 /* calculate cosh and sinh */
 
diff --git a/src/s_ccosh.c b/src/s_ccosh.c
index 32b780a..4970645 100644
--- a/src/s_ccosh.c
+++ b/src/s_ccosh.c
@@ -37,8 +37,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ccosh.c,v 1.2 2011/10/21 06:29:32 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_ccoshf.c b/src/s_ccoshf.c
index 6d79ac6..f5bccee 100644
--- a/src/s_ccoshf.c
+++ b/src/s_ccoshf.c
@@ -31,8 +31,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ccoshf.c,v 1.2 2011/10/21 06:29:32 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_ccoshl.c b/src/s_ccoshl.c
index 265137d..246a612 100644
--- a/src/s_ccoshl.c
+++ b/src/s_ccoshl.c
@@ -43,8 +43,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 ccoshl(long double complex z)
diff --git a/src/s_ccosl.c b/src/s_ccosl.c
index b57fd9e..220d0f9 100644
--- a/src/s_ccosl.c
+++ b/src/s_ccosl.c
@@ -50,8 +50,8 @@
  *    IEEE      -10,+10     30000       3.8e-16     1.0e-16
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 static void
 cchshl(long double x, long double *c, long double *s)
diff --git a/src/s_cexp.c b/src/s_cexp.c
index f247cfe..64b60db 100644
--- a/src/s_cexp.c
+++ b/src/s_cexp.c
@@ -27,8 +27,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cexp.c,v 1.3 2011/10/21 06:27:56 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_cexpf.c b/src/s_cexpf.c
index 26e963a..b178e76 100644
--- a/src/s_cexpf.c
+++ b/src/s_cexpf.c
@@ -27,8 +27,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cexpf.c,v 1.3 2011/10/21 06:27:56 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_cexpl.c b/src/s_cexpl.c
index 0391322..b4b8e4c 100644
--- a/src/s_cexpl.c
+++ b/src/s_cexpl.c
@@ -54,8 +54,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 cexpl(long double complex z)
diff --git a/src/s_cimag.c b/src/s_cimag.c
index 99835bf..6e8a465 100644
--- a/src/s_cimag.c
+++ b/src/s_cimag.c
@@ -26,8 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_cimag.c,v 1.3 2009/03/14 18:24:15 das Exp $
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT double
diff --git a/src/s_cimagf.c b/src/s_cimagf.c
index a3d3c86..f59b65e 100644
--- a/src/s_cimagf.c
+++ b/src/s_cimagf.c
@@ -26,8 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_cimagf.c,v 1.3 2009/03/14 18:24:15 das Exp $
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT float
diff --git a/src/s_cimagl.c b/src/s_cimagl.c
index 58d1990..92345ca 100644
--- a/src/s_cimagl.c
+++ b/src/s_cimagl.c
@@ -26,8 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_cimagl.c,v 1.3 2009/03/14 18:24:15 das Exp $
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT long double
diff --git a/src/s_clog.c b/src/s_clog.c
index a862cc9..7e8f723 100644
--- a/src/s_clog.c
+++ b/src/s_clog.c
@@ -54,9 +54,9 @@
  * absolute error 1.0e-16.
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double complex
 clog(double complex z)
diff --git a/src/s_clogf.c b/src/s_clogf.c
index 3348fcb..ea67476 100644
--- a/src/s_clogf.c
+++ b/src/s_clogf.c
@@ -53,8 +53,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float complex
 clogf(float complex z)
diff --git a/src/s_clogl.c b/src/s_clogl.c
index 0618de3..caff2d4 100644
--- a/src/s_clogl.c
+++ b/src/s_clogl.c
@@ -55,8 +55,8 @@
  * absolute error 1.0e-16.
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 clogl(long double complex z)
diff --git a/src/s_conj.c b/src/s_conj.c
index b383f69..811616f 100644
--- a/src/s_conj.c
+++ b/src/s_conj.c
@@ -26,9 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_conj.c,v 1.2 2008/08/07 14:39:56 das Exp $
  */
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 DLLEXPORT double complex
diff --git a/src/s_conjf.c b/src/s_conjf.c
index 2b24486..d2f58ad 100644
--- a/src/s_conjf.c
+++ b/src/s_conjf.c
@@ -26,9 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_conjf.c,v 1.2 2008/08/07 14:39:56 das Exp $
  */
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 DLLEXPORT float complex
diff --git a/src/s_conjl.c b/src/s_conjl.c
index 4b73472..a73394a 100644
--- a/src/s_conjl.c
+++ b/src/s_conjl.c
@@ -26,9 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_conjl.c,v 1.2 2008/08/07 14:39:56 das Exp $
  */
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 DLLEXPORT long double complex
diff --git a/src/s_cpow.c b/src/s_cpow.c
index 9c618b4..ada9e77 100644
--- a/src/s_cpow.c
+++ b/src/s_cpow.c
@@ -44,9 +44,10 @@
  *
  */
 
-#include <complex.h>
 #include <float.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT double complex
diff --git a/src/s_cpowf.c b/src/s_cpowf.c
index a01398b..14482d2 100644
--- a/src/s_cpowf.c
+++ b/src/s_cpowf.c
@@ -44,8 +44,9 @@
  *
  */
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT float complex
diff --git a/src/s_cpowl.c b/src/s_cpowl.c
index 3103763..0218c78 100644
--- a/src/s_cpowl.c
+++ b/src/s_cpowl.c
@@ -45,8 +45,9 @@
  *
  */
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT long double complex
diff --git a/src/s_cproj.c b/src/s_cproj.c
index 303812c..7b9e131 100644
--- a/src/s_cproj.c
+++ b/src/s_cproj.c
@@ -27,8 +27,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cproj.c,v 1.1 2008/08/07 15:07:48 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_cprojf.c b/src/s_cprojf.c
index 30c7f47..320540c 100644
--- a/src/s_cprojf.c
+++ b/src/s_cprojf.c
@@ -27,8 +27,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cprojf.c,v 1.1 2008/08/07 15:07:48 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_cprojl.c b/src/s_cprojl.c
index a10553b..e68e14d 100644
--- a/src/s_cprojl.c
+++ b/src/s_cprojl.c
@@ -27,8 +27,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cprojl.c,v 1.1 2008/08/07 15:07:48 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_creal.c b/src/s_creal.c
index faf5999..119b1fa 100644
--- a/src/s_creal.c
+++ b/src/s_creal.c
@@ -26,7 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_creal.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT double
diff --git a/src/s_crealf.c b/src/s_crealf.c
index f17d595..b4a9045 100644
--- a/src/s_crealf.c
+++ b/src/s_crealf.c
@@ -26,7 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_crealf.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT float
diff --git a/src/s_creall.c b/src/s_creall.c
index 2d1ded7..7cd1ed5 100644
--- a/src/s_creall.c
+++ b/src/s_creall.c
@@ -26,7 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_creall.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT long double
diff --git a/src/s_csin.c b/src/s_csin.c
index d176c25..4e6616d 100644
--- a/src/s_csin.c
+++ b/src/s_csin.c
@@ -51,9 +51,9 @@
  *
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 /* calculate cosh and sinh */
 
diff --git a/src/s_csinf.c b/src/s_csinf.c
index f0023b5..4c22851 100644
--- a/src/s_csinf.c
+++ b/src/s_csinf.c
@@ -49,8 +49,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 /* calculate cosh and sinh */
 
diff --git a/src/s_csinh.c b/src/s_csinh.c
index 9f2fd95..3ec28d4 100644
--- a/src/s_csinh.c
+++ b/src/s_csinh.c
@@ -37,8 +37,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csinh.c,v 1.2 2011/10/21 06:29:32 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_csinhf.c b/src/s_csinhf.c
index e5545ab..cdaea30 100644
--- a/src/s_csinhf.c
+++ b/src/s_csinhf.c
@@ -31,8 +31,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csinhf.c,v 1.2 2011/10/21 06:29:32 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_csinhl.c b/src/s_csinhl.c
index 4c85d82..d9af4a2 100644
--- a/src/s_csinhl.c
+++ b/src/s_csinhl.c
@@ -42,8 +42,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 csinhl(long double complex z)
diff --git a/src/s_csinl.c b/src/s_csinl.c
index 02a8746..ada306d 100644
--- a/src/s_csinl.c
+++ b/src/s_csinl.c
@@ -52,8 +52,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 static void
 cchshl(long double x, long double *c, long double *s)
diff --git a/src/s_csqrt.c b/src/s_csqrt.c
index 7ddf944..e0633bd 100644
--- a/src/s_csqrt.c
+++ b/src/s_csqrt.c
@@ -27,9 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrt.c,v 1.4 2008/08/08 00:15:16 das Exp $");
 
-#include <complex.h>
 #include <float.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_csqrtf.c b/src/s_csqrtf.c
index 58c4b05..4cad53c 100644
--- a/src/s_csqrtf.c
+++ b/src/s_csqrtf.c
@@ -27,8 +27,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrtf.c,v 1.3 2008/08/08 00:15:16 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_csqrtl.c b/src/s_csqrtl.c
index 416e6b6..71ebada 100644
--- a/src/s_csqrtl.c
+++ b/src/s_csqrtl.c
@@ -26,9 +26,9 @@
 
 #include "cdefs-compat.h"
 
-#include <complex.h>
 #include <float.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_ctan.c b/src/s_ctan.c
index c23d8d0..d83e55f 100644
--- a/src/s_ctan.c
+++ b/src/s_ctan.c
@@ -56,9 +56,9 @@
  * Also tested by ctan * ccot = 1 and catan(ctan(z))  =  z.
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 #define MACHEP 1.1e-16
 #define MAXNUM 1.0e308
diff --git a/src/s_ctanf.c b/src/s_ctanf.c
index 9771372..e49b623 100644
--- a/src/s_ctanf.c
+++ b/src/s_ctanf.c
@@ -53,8 +53,8 @@
  *    IEEE      -10,+10     30000       3.3e-7       5.1e-8
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 #define MACHEPF 3.0e-8
 #define MAXNUMF 1.0e38f
diff --git a/src/s_ctanh.c b/src/s_ctanh.c
index 0042bbe..fa97cc1 100644
--- a/src/s_ctanh.c
+++ b/src/s_ctanh.c
@@ -66,8 +66,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ctanh.c,v 1.2 2011/10/21 06:30:16 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_ctanhf.c b/src/s_ctanhf.c
index cc70c5e..a976977 100644
--- a/src/s_ctanhf.c
+++ b/src/s_ctanhf.c
@@ -31,8 +31,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ctanhf.c,v 1.2 2011/10/21 06:30:16 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 
diff --git a/src/s_ctanhl.c b/src/s_ctanhl.c
index 0328bc8..6ee9b5b 100644
--- a/src/s_ctanhl.c
+++ b/src/s_ctanhl.c
@@ -43,8 +43,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 ctanhl(long double complex z)
diff --git a/src/s_ctanl.c b/src/s_ctanl.c
index c35b69f..8672938 100644
--- a/src/s_ctanl.c
+++ b/src/s_ctanl.c
@@ -56,9 +56,9 @@
  * Also tested by ctan * ccot = 1 and catan(ctan(z))  =  z.
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 #if	LDBL_MANT_DIG == 64
 static const long double MACHEPL= 5.42101086242752217003726400434970855712890625E-20L;
diff --git a/src/w_cabs.c b/src/w_cabs.c
index c992e4f..ff3fff7 100644
--- a/src/w_cabs.c
+++ b/src/w_cabs.c
@@ -8,9 +8,10 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/w_cabs.c,v 1.7 2008/03/30 20:03:06 das Exp $");
 
-#include <complex.h>
 #include <float.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT double
diff --git a/src/w_cabsf.c b/src/w_cabsf.c
index c72bbbe..6bbcf03 100644
--- a/src/w_cabsf.c
+++ b/src/w_cabsf.c
@@ -5,8 +5,9 @@
  * Placed into the Public Domain, 1994.
  */
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT float
diff --git a/src/w_cabsl.c b/src/w_cabsl.c
index 7ec31b3..3987cfe 100644
--- a/src/w_cabsl.c
+++ b/src/w_cabsl.c
@@ -10,8 +10,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/w_cabsl.c,v 1.1 2008/03/30 20:02:03 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT long double