diff --git a/amd64/fenv.c b/amd64/fenv.c
index 8eb8ed4..ddf7dba 100644
--- a/amd64/fenv.c
+++ b/amd64/fenv.c
@@ -30,7 +30,7 @@
 #include "math_private.h"
 
 #ifdef _WIN32
-#define __fenv_static DLLEXPORT
+#define __fenv_static OLM_DLLEXPORT
 #endif
 #include <openlibm_fenv.h>
 
@@ -48,10 +48,10 @@ const fenv_t __fe_dfl_env = {
 	__INITIAL_MXCSR__
 };
 
-extern inline DLLEXPORT int feclearexcept(int __excepts);
-extern inline DLLEXPORT int fegetexceptflag(fexcept_t *__flagp, int __excepts);
+extern inline OLM_DLLEXPORT int feclearexcept(int __excepts);
+extern inline OLM_DLLEXPORT int fegetexceptflag(fexcept_t *__flagp, int __excepts);
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 fesetexceptflag(const fexcept_t *flagp, int excepts)
 {
 	fenv_t env;
@@ -69,7 +69,7 @@ fesetexceptflag(const fexcept_t *flagp, int excepts)
 	return (0);
 }
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 feraiseexcept(int excepts)
 {
 	fexcept_t ex = excepts;
@@ -79,11 +79,11 @@ feraiseexcept(int excepts)
 	return (0);
 }
 
-extern inline DLLEXPORT int fetestexcept(int __excepts);
-extern inline DLLEXPORT int fegetround(void);
-extern inline DLLEXPORT int fesetround(int __round);
+extern inline OLM_DLLEXPORT int fetestexcept(int __excepts);
+extern inline OLM_DLLEXPORT int fegetround(void);
+extern inline OLM_DLLEXPORT int fesetround(int __round);
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 fegetenv(fenv_t *envp)
 {
 
@@ -97,7 +97,7 @@ fegetenv(fenv_t *envp)
 	return (0);
 }
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 feholdexcept(fenv_t *envp)
 {
 	uint32_t mxcsr;
@@ -112,9 +112,9 @@ feholdexcept(fenv_t *envp)
 	return (0);
 }
 
-extern inline DLLEXPORT int fesetenv(const fenv_t *__envp);
+extern inline OLM_DLLEXPORT int fesetenv(const fenv_t *__envp);
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 feupdateenv(const fenv_t *envp)
 {
 	uint32_t mxcsr;
diff --git a/bsdsrc/b_exp.c b/bsdsrc/b_exp.c
index 724c36f..6af8dd7 100644
--- a/bsdsrc/b_exp.c
+++ b/bsdsrc/b_exp.c
@@ -83,7 +83,7 @@ static const double lntiny = -0x1.77af8ebeae354p9;
 static const double invln2 = 0x1.71547652b82fep0;
 
 #if 0
-DLLEXPORT double exp(x)
+OLM_DLLEXPORT double exp(x)
 double x;
 {
 	double  z,hi,lo,c;
diff --git a/bsdsrc/b_log.c b/bsdsrc/b_log.c
index dc134ec..c20d290 100644
--- a/bsdsrc/b_log.c
+++ b/bsdsrc/b_log.c
@@ -351,7 +351,7 @@ static double logF_tail[N+1] = {
 };
 
 #if 0
-DLLEXPORT double
+OLM_DLLEXPORT double
 #ifdef _ANSI_SOURCE
 log(double x)
 #else
diff --git a/bsdsrc/b_tgamma.c b/bsdsrc/b_tgamma.c
index 98d7175..18b049e 100644
--- a/bsdsrc/b_tgamma.c
+++ b/bsdsrc/b_tgamma.c
@@ -122,7 +122,7 @@ static struct Double ratfun_gam(double, double);
 
 static const double zero = 0., one = 1.0, tiny = 1e-300;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 tgamma(x)
 	double x;
 {
diff --git a/i387/bsd_ieeefp.h b/i387/bsd_ieeefp.h
index 63d4476..79c7bf3 100644
--- a/i387/bsd_ieeefp.h
+++ b/i387/bsd_ieeefp.h
@@ -172,7 +172,7 @@ fpsetround(fp_rnd_t _m)
 }
 
 //static __inline fp_prec_t
-DLLEXPORT fp_prec_t
+OLM_DLLEXPORT fp_prec_t
 fpgetprec(void)
 {
 	unsigned short _cw;
@@ -182,7 +182,7 @@ fpgetprec(void)
 }
 
 //static __inline fp_prec_t
-DLLEXPORT fp_prec_t
+OLM_DLLEXPORT fp_prec_t
 fpsetprec(fp_prec_t _m)
 {
 	fp_prec_t _p;
diff --git a/i387/fenv.c b/i387/fenv.c
index b0a8744..6afe766 100644
--- a/i387/fenv.c
+++ b/i387/fenv.c
@@ -90,10 +90,10 @@ __test_sse(void)
 	return (0);
 }
 
-extern inline DLLEXPORT int feclearexcept(int __excepts);
-extern inline DLLEXPORT int fegetexceptflag(fexcept_t *__flagp, int __excepts);
+extern inline OLM_DLLEXPORT int feclearexcept(int __excepts);
+extern inline OLM_DLLEXPORT int fegetexceptflag(fexcept_t *__flagp, int __excepts);
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 fesetexceptflag(const fexcept_t *flagp, int excepts)
 {
 	fenv_t env;
@@ -114,7 +114,7 @@ fesetexceptflag(const fexcept_t *flagp, int excepts)
 	return (0);
 }
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 feraiseexcept(int excepts)
 {
 	fexcept_t ex = excepts;
@@ -124,9 +124,9 @@ feraiseexcept(int excepts)
 	return (0);
 }
 
-extern inline DLLEXPORT int fetestexcept(int __excepts);
-extern inline DLLEXPORT int fegetround(void);
-extern inline DLLEXPORT int fesetround(int __round);
+extern inline OLM_DLLEXPORT int fetestexcept(int __excepts);
+extern inline OLM_DLLEXPORT int fegetround(void);
+extern inline OLM_DLLEXPORT int fesetround(int __round);
 
 int
 fegetenv(fenv_t *envp)
@@ -163,9 +163,9 @@ feholdexcept(fenv_t *envp)
 	return (0);
 }
 
-extern inline DLLEXPORT int fesetenv(const fenv_t *__envp);
+extern inline OLM_DLLEXPORT int fesetenv(const fenv_t *__envp);
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 feupdateenv(const fenv_t *envp)
 {
 	uint32_t mxcsr;
diff --git a/include/openlibm_fenv_amd64.h b/include/openlibm_fenv_amd64.h
index 2236192..9e302bd 100644
--- a/include/openlibm_fenv_amd64.h
+++ b/include/openlibm_fenv_amd64.h
@@ -125,8 +125,8 @@ fegetexceptflag(fexcept_t *__flagp, int __excepts)
 	return (0);
 }
 
-DLLEXPORT int fesetexceptflag(const fexcept_t *__flagp, int __excepts);
-DLLEXPORT int feraiseexcept(int __excepts);
+OLM_DLLEXPORT int fesetexceptflag(const fexcept_t *__flagp, int __excepts);
+OLM_DLLEXPORT int feraiseexcept(int __excepts);
 
 __fenv_static __attribute__((always_inline)) inline int
 fetestexcept(int __excepts)
@@ -176,8 +176,8 @@ fesetround(int __round)
 	return (0);
 }
 
-DLLEXPORT int fegetenv(fenv_t *__envp);
-DLLEXPORT int feholdexcept(fenv_t *__envp);
+OLM_DLLEXPORT int fegetenv(fenv_t *__envp);
+OLM_DLLEXPORT int feholdexcept(fenv_t *__envp);
 
 __fenv_static inline int
 fesetenv(const fenv_t *__envp)
@@ -196,12 +196,12 @@ fesetenv(const fenv_t *__envp)
 	return (0);
 }
 
-DLLEXPORT int feupdateenv(const fenv_t *__envp);
+OLM_DLLEXPORT int feupdateenv(const fenv_t *__envp);
 
 #if __BSD_VISIBLE
 
-DLLEXPORT int feenableexcept(int __mask);
-DLLEXPORT int fedisableexcept(int __mask);
+OLM_DLLEXPORT int feenableexcept(int __mask);
+OLM_DLLEXPORT int fedisableexcept(int __mask);
 
 /* We currently provide no external definition of fegetexcept(). */
 static inline int
diff --git a/include/openlibm_math.h b/include/openlibm_math.h
index 4da85a2..eca248d 100644
--- a/include/openlibm_math.h
+++ b/include/openlibm_math.h
@@ -35,12 +35,12 @@
 
 #ifdef _WIN32
 # ifdef IMPORT_EXPORTS
-#  define DLLEXPORT __declspec(dllimport)
+#  define OLM_DLLEXPORT __declspec(dllimport)
 # else
-#  define DLLEXPORT __declspec(dllexport)
+#  define OLM_DLLEXPORT __declspec(OLM_DLLEXPORT)
 # endif
 #else
-#define DLLEXPORT __attribute__ ((visibility("default")))
+#define OLM_DLLEXPORT __attribute__ ((visibility("default")))
 #endif
 
 /*
@@ -210,286 +210,286 @@ int isopenlibm(void);
 /*
  * ANSI/POSIX
  */
-DLLEXPORT int	__fpclassifyd(double) __pure2;
-DLLEXPORT int	__fpclassifyf(float) __pure2;
-DLLEXPORT int	__fpclassifyl(long double) __pure2;
-DLLEXPORT int	__isfinitef(float) __pure2;
-DLLEXPORT int	__isfinite(double) __pure2;
-DLLEXPORT int	__isfinitel(long double) __pure2;
-DLLEXPORT int	__isinff(float) __pure2;
-DLLEXPORT int	__isinfl(long double) __pure2;
-DLLEXPORT int	__isnanf(float) __pure2;
-DLLEXPORT int	__isnanl(long double) __pure2;
-DLLEXPORT int	__isnormalf(float) __pure2;
-DLLEXPORT int	__isnormal(double) __pure2;
-DLLEXPORT int	__isnormall(long double) __pure2;
-DLLEXPORT int	__signbit(double) __pure2;
-DLLEXPORT int	__signbitf(float) __pure2;
-DLLEXPORT int	__signbitl(long double) __pure2;
+OLM_DLLEXPORT int	__fpclassifyd(double) __pure2;
+OLM_DLLEXPORT int	__fpclassifyf(float) __pure2;
+OLM_DLLEXPORT int	__fpclassifyl(long double) __pure2;
+OLM_DLLEXPORT int	__isfinitef(float) __pure2;
+OLM_DLLEXPORT int	__isfinite(double) __pure2;
+OLM_DLLEXPORT int	__isfinitel(long double) __pure2;
+OLM_DLLEXPORT int	__isinff(float) __pure2;
+OLM_DLLEXPORT int	__isinfl(long double) __pure2;
+OLM_DLLEXPORT int	__isnanf(float) __pure2;
+OLM_DLLEXPORT int	__isnanl(long double) __pure2;
+OLM_DLLEXPORT int	__isnormalf(float) __pure2;
+OLM_DLLEXPORT int	__isnormal(double) __pure2;
+OLM_DLLEXPORT int	__isnormall(long double) __pure2;
+OLM_DLLEXPORT int	__signbit(double) __pure2;
+OLM_DLLEXPORT int	__signbitf(float) __pure2;
+OLM_DLLEXPORT int	__signbitl(long double) __pure2;
 
-DLLEXPORT double	acos(double);
-DLLEXPORT double	asin(double);
-DLLEXPORT double	atan(double);
-DLLEXPORT double	atan2(double, double);
-DLLEXPORT double	cos(double);
-DLLEXPORT double	sin(double);
-DLLEXPORT double	tan(double);
+OLM_DLLEXPORT double	acos(double);
+OLM_DLLEXPORT double	asin(double);
+OLM_DLLEXPORT double	atan(double);
+OLM_DLLEXPORT double	atan2(double, double);
+OLM_DLLEXPORT double	cos(double);
+OLM_DLLEXPORT double	sin(double);
+OLM_DLLEXPORT double	tan(double);
 
-DLLEXPORT double	cosh(double);
-DLLEXPORT double	sinh(double);
-DLLEXPORT double	tanh(double);
+OLM_DLLEXPORT double	cosh(double);
+OLM_DLLEXPORT double	sinh(double);
+OLM_DLLEXPORT double	tanh(double);
 
-DLLEXPORT double	exp(double);
-DLLEXPORT double	frexp(double, int *);	/* fundamentally !__pure2 */
-DLLEXPORT double	ldexp(double, int);
-DLLEXPORT double	log(double);
-DLLEXPORT double	log10(double);
-DLLEXPORT double	modf(double, double *);	/* fundamentally !__pure2 */
+OLM_DLLEXPORT double	exp(double);
+OLM_DLLEXPORT double	frexp(double, int *);	/* fundamentally !__pure2 */
+OLM_DLLEXPORT double	ldexp(double, int);
+OLM_DLLEXPORT double	log(double);
+OLM_DLLEXPORT double	log10(double);
+OLM_DLLEXPORT double	modf(double, double *);	/* fundamentally !__pure2 */
 
-DLLEXPORT double	pow(double, double);
-DLLEXPORT double	sqrt(double);
+OLM_DLLEXPORT double	pow(double, double);
+OLM_DLLEXPORT double	sqrt(double);
 
-DLLEXPORT double	ceil(double);
-DLLEXPORT double	fabs(double) __pure2;
-DLLEXPORT double	floor(double);
-DLLEXPORT double	fmod(double, double);
+OLM_DLLEXPORT double	ceil(double);
+OLM_DLLEXPORT double	fabs(double) __pure2;
+OLM_DLLEXPORT double	floor(double);
+OLM_DLLEXPORT double	fmod(double, double);
 
 /*
  * These functions are not in C90.
  */
 #if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE
-DLLEXPORT double	acosh(double);
-DLLEXPORT double	asinh(double);
-DLLEXPORT double	atanh(double);
-DLLEXPORT double	cbrt(double);
-DLLEXPORT double	erf(double);
-DLLEXPORT double	erfc(double);
-DLLEXPORT double	exp2(double);
-DLLEXPORT double	expm1(double);
-DLLEXPORT double	fma(double, double, double);
-DLLEXPORT double	hypot(double, double);
-DLLEXPORT int	ilogb(double) __pure2;
-DLLEXPORT int	(isinf)(double) __pure2;
-DLLEXPORT int	(isnan)(double) __pure2;
-DLLEXPORT double	lgamma(double);
-DLLEXPORT long long llrint(double);
-DLLEXPORT long long llround(double);
-DLLEXPORT double	log1p(double);
-DLLEXPORT double	log2(double);
-DLLEXPORT double	logb(double);
-DLLEXPORT long	lrint(double);
-DLLEXPORT long	lround(double);
-DLLEXPORT double	nan(const char *) __pure2;
-DLLEXPORT double	nextafter(double, double);
-DLLEXPORT double	remainder(double, double);
-DLLEXPORT double	remquo(double, double, int *);
-DLLEXPORT double	rint(double);
+OLM_DLLEXPORT double	acosh(double);
+OLM_DLLEXPORT double	asinh(double);
+OLM_DLLEXPORT double	atanh(double);
+OLM_DLLEXPORT double	cbrt(double);
+OLM_DLLEXPORT double	erf(double);
+OLM_DLLEXPORT double	erfc(double);
+OLM_DLLEXPORT double	exp2(double);
+OLM_DLLEXPORT double	expm1(double);
+OLM_DLLEXPORT double	fma(double, double, double);
+OLM_DLLEXPORT double	hypot(double, double);
+OLM_DLLEXPORT int	ilogb(double) __pure2;
+OLM_DLLEXPORT int	(isinf)(double) __pure2;
+OLM_DLLEXPORT int	(isnan)(double) __pure2;
+OLM_DLLEXPORT double	lgamma(double);
+OLM_DLLEXPORT long long llrint(double);
+OLM_DLLEXPORT long long llround(double);
+OLM_DLLEXPORT double	log1p(double);
+OLM_DLLEXPORT double	log2(double);
+OLM_DLLEXPORT double	logb(double);
+OLM_DLLEXPORT long	lrint(double);
+OLM_DLLEXPORT long	lround(double);
+OLM_DLLEXPORT double	nan(const char *) __pure2;
+OLM_DLLEXPORT double	nextafter(double, double);
+OLM_DLLEXPORT double	remainder(double, double);
+OLM_DLLEXPORT double	remquo(double, double, int *);
+OLM_DLLEXPORT double	rint(double);
 #endif /* __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE */
 
 #if __BSD_VISIBLE || __XSI_VISIBLE
-DLLEXPORT double	j0(double);
-DLLEXPORT double	j1(double);
-DLLEXPORT double	jn(int, double);
-DLLEXPORT double	y0(double);
-DLLEXPORT double	y1(double);
-DLLEXPORT double	yn(int, double);
+OLM_DLLEXPORT double	j0(double);
+OLM_DLLEXPORT double	j1(double);
+OLM_DLLEXPORT double	jn(int, double);
+OLM_DLLEXPORT double	y0(double);
+OLM_DLLEXPORT double	y1(double);
+OLM_DLLEXPORT double	yn(int, double);
 #endif /* __BSD_VISIBLE || __XSI_VISIBLE */
 
 #if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999
-DLLEXPORT double	copysign(double, double) __pure2;
-DLLEXPORT double	fdim(double, double);
-DLLEXPORT double	fmax(double, double) __pure2;
-DLLEXPORT double	fmin(double, double) __pure2;
-DLLEXPORT double	nearbyint(double);
-DLLEXPORT double	round(double);
-DLLEXPORT double	scalbln(double, long);
-DLLEXPORT double	scalbn(double, int);
-DLLEXPORT double	tgamma(double);
-DLLEXPORT double	trunc(double);
+OLM_DLLEXPORT double	copysign(double, double) __pure2;
+OLM_DLLEXPORT double	fdim(double, double);
+OLM_DLLEXPORT double	fmax(double, double) __pure2;
+OLM_DLLEXPORT double	fmin(double, double) __pure2;
+OLM_DLLEXPORT double	nearbyint(double);
+OLM_DLLEXPORT double	round(double);
+OLM_DLLEXPORT double	scalbln(double, long);
+OLM_DLLEXPORT double	scalbn(double, int);
+OLM_DLLEXPORT double	tgamma(double);
+OLM_DLLEXPORT double	trunc(double);
 #endif
 
 /*
  * BSD math library entry points
  */
 #if __BSD_VISIBLE
-DLLEXPORT int	isnanf(float) __pure2;
+OLM_DLLEXPORT int	isnanf(float) __pure2;
 
 /*
  * Reentrant version of lgamma; passes signgam back by reference as the
  * second argument; user must allocate space for signgam.
  */
-DLLEXPORT double	lgamma_r(double, int *);
+OLM_DLLEXPORT double	lgamma_r(double, int *);
 
 /*
  * Single sine/cosine function.
  */
-DLLEXPORT void	sincos(double, double *, double *);
+OLM_DLLEXPORT void	sincos(double, double *, double *);
 #endif /* __BSD_VISIBLE */
 
 /* float versions of ANSI/POSIX functions */
 #if __ISO_C_VISIBLE >= 1999
-DLLEXPORT float	acosf(float);
-DLLEXPORT float	asinf(float);
-DLLEXPORT float	atanf(float);
-DLLEXPORT float	atan2f(float, float);
-DLLEXPORT float	cosf(float);
-DLLEXPORT float	sinf(float);
-DLLEXPORT float	tanf(float);
+OLM_DLLEXPORT float	acosf(float);
+OLM_DLLEXPORT float	asinf(float);
+OLM_DLLEXPORT float	atanf(float);
+OLM_DLLEXPORT float	atan2f(float, float);
+OLM_DLLEXPORT float	cosf(float);
+OLM_DLLEXPORT float	sinf(float);
+OLM_DLLEXPORT float	tanf(float);
 
-DLLEXPORT float	coshf(float);
-DLLEXPORT float	sinhf(float);
-DLLEXPORT float	tanhf(float);
+OLM_DLLEXPORT float	coshf(float);
+OLM_DLLEXPORT float	sinhf(float);
+OLM_DLLEXPORT float	tanhf(float);
 
-DLLEXPORT float	exp2f(float);
-DLLEXPORT float	expf(float);
-DLLEXPORT float	expm1f(float);
-DLLEXPORT float	frexpf(float, int *);	/* fundamentally !__pure2 */
-DLLEXPORT int	ilogbf(float) __pure2;
-DLLEXPORT float	ldexpf(float, int);
-DLLEXPORT float	log10f(float);
-DLLEXPORT float	log1pf(float);
-DLLEXPORT float	log2f(float);
-DLLEXPORT float	logf(float);
-DLLEXPORT float	modff(float, float *);	/* fundamentally !__pure2 */
+OLM_DLLEXPORT float	exp2f(float);
+OLM_DLLEXPORT float	expf(float);
+OLM_DLLEXPORT float	expm1f(float);
+OLM_DLLEXPORT float	frexpf(float, int *);	/* fundamentally !__pure2 */
+OLM_DLLEXPORT int	ilogbf(float) __pure2;
+OLM_DLLEXPORT float	ldexpf(float, int);
+OLM_DLLEXPORT float	log10f(float);
+OLM_DLLEXPORT float	log1pf(float);
+OLM_DLLEXPORT float	log2f(float);
+OLM_DLLEXPORT float	logf(float);
+OLM_DLLEXPORT float	modff(float, float *);	/* fundamentally !__pure2 */
 
-DLLEXPORT float	powf(float, float);
-DLLEXPORT float	sqrtf(float);
+OLM_DLLEXPORT float	powf(float, float);
+OLM_DLLEXPORT float	sqrtf(float);
 
-DLLEXPORT float	ceilf(float);
-DLLEXPORT float	fabsf(float) __pure2;
-DLLEXPORT float	floorf(float);
-DLLEXPORT float	fmodf(float, float);
-DLLEXPORT float	roundf(float);
+OLM_DLLEXPORT float	ceilf(float);
+OLM_DLLEXPORT float	fabsf(float) __pure2;
+OLM_DLLEXPORT float	floorf(float);
+OLM_DLLEXPORT float	fmodf(float, float);
+OLM_DLLEXPORT float	roundf(float);
 
-DLLEXPORT float	erff(float);
-DLLEXPORT float	erfcf(float);
-DLLEXPORT float	hypotf(float, float);
-DLLEXPORT float	lgammaf(float);
-DLLEXPORT float	tgammaf(float);
+OLM_DLLEXPORT float	erff(float);
+OLM_DLLEXPORT float	erfcf(float);
+OLM_DLLEXPORT float	hypotf(float, float);
+OLM_DLLEXPORT float	lgammaf(float);
+OLM_DLLEXPORT float	tgammaf(float);
 
-DLLEXPORT float	acoshf(float);
-DLLEXPORT float	asinhf(float);
-DLLEXPORT float	atanhf(float);
-DLLEXPORT float	cbrtf(float);
-DLLEXPORT float	logbf(float);
-DLLEXPORT float	copysignf(float, float) __pure2;
-DLLEXPORT long long llrintf(float);
-DLLEXPORT long long llroundf(float);
-DLLEXPORT long	lrintf(float);
-DLLEXPORT long	lroundf(float);
-DLLEXPORT float	nanf(const char *) __pure2;
-DLLEXPORT float	nearbyintf(float);
-DLLEXPORT float	nextafterf(float, float);
-DLLEXPORT float	remainderf(float, float);
-DLLEXPORT float	remquof(float, float, int *);
-DLLEXPORT float	rintf(float);
-DLLEXPORT float	scalblnf(float, long);
-DLLEXPORT float	scalbnf(float, int);
-DLLEXPORT float	truncf(float);
+OLM_DLLEXPORT float	acoshf(float);
+OLM_DLLEXPORT float	asinhf(float);
+OLM_DLLEXPORT float	atanhf(float);
+OLM_DLLEXPORT float	cbrtf(float);
+OLM_DLLEXPORT float	logbf(float);
+OLM_DLLEXPORT float	copysignf(float, float) __pure2;
+OLM_DLLEXPORT long long llrintf(float);
+OLM_DLLEXPORT long long llroundf(float);
+OLM_DLLEXPORT long	lrintf(float);
+OLM_DLLEXPORT long	lroundf(float);
+OLM_DLLEXPORT float	nanf(const char *) __pure2;
+OLM_DLLEXPORT float	nearbyintf(float);
+OLM_DLLEXPORT float	nextafterf(float, float);
+OLM_DLLEXPORT float	remainderf(float, float);
+OLM_DLLEXPORT float	remquof(float, float, int *);
+OLM_DLLEXPORT float	rintf(float);
+OLM_DLLEXPORT float	scalblnf(float, long);
+OLM_DLLEXPORT float	scalbnf(float, int);
+OLM_DLLEXPORT float	truncf(float);
 
-DLLEXPORT float	fdimf(float, float);
-DLLEXPORT float	fmaf(float, float, float);
-DLLEXPORT float	fmaxf(float, float) __pure2;
-DLLEXPORT float	fminf(float, float) __pure2;
+OLM_DLLEXPORT float	fdimf(float, float);
+OLM_DLLEXPORT float	fmaf(float, float, float);
+OLM_DLLEXPORT float	fmaxf(float, float) __pure2;
+OLM_DLLEXPORT float	fminf(float, float) __pure2;
 #endif
 
 /*
  * float versions of BSD math library entry points
  */
 #if __BSD_VISIBLE
-DLLEXPORT float	dremf(float, float);
-DLLEXPORT float	j0f(float);
-DLLEXPORT float	j1f(float);
-DLLEXPORT float	jnf(int, float);
-DLLEXPORT float	y0f(float);
-DLLEXPORT float	y1f(float);
-DLLEXPORT float	ynf(int, float);
+OLM_DLLEXPORT float	dremf(float, float);
+OLM_DLLEXPORT float	j0f(float);
+OLM_DLLEXPORT float	j1f(float);
+OLM_DLLEXPORT float	jnf(int, float);
+OLM_DLLEXPORT float	y0f(float);
+OLM_DLLEXPORT float	y1f(float);
+OLM_DLLEXPORT float	ynf(int, float);
 
 /*
  * Float versions of reentrant version of lgamma; passes signgam back by
  * reference as the second argument; user must allocate space for signgam.
  */
-DLLEXPORT float	lgammaf_r(float, int *);
+OLM_DLLEXPORT float	lgammaf_r(float, int *);
 
 /*
  * Single sine/cosine function.
  */
-DLLEXPORT void	sincosf(float, float *, float *);
+OLM_DLLEXPORT void	sincosf(float, float *, float *);
 #endif	/* __BSD_VISIBLE */
 
 /*
  * long double versions of ISO/POSIX math functions
  */
 #if __ISO_C_VISIBLE >= 1999
-DLLEXPORT long double	acoshl(long double);
-DLLEXPORT long double	acosl(long double);
-DLLEXPORT long double	asinhl(long double);
-DLLEXPORT long double	asinl(long double);
-DLLEXPORT long double	atan2l(long double, long double);
-DLLEXPORT long double	atanhl(long double);
-DLLEXPORT long double	atanl(long double);
-DLLEXPORT long double	cbrtl(long double);
-DLLEXPORT long double	ceill(long double);
-DLLEXPORT long double	copysignl(long double, long double) __pure2;
-DLLEXPORT long double	coshl(long double);
-DLLEXPORT long double	cosl(long double);
-DLLEXPORT long double	erfcl(long double);
-DLLEXPORT long double	erfl(long double);
-DLLEXPORT long double	exp2l(long double);
-DLLEXPORT long double	expl(long double);
-DLLEXPORT long double	expm1l(long double);
-DLLEXPORT long double	fabsl(long double) __pure2;
-DLLEXPORT long double	fdiml(long double, long double);
-DLLEXPORT long double	floorl(long double);
-DLLEXPORT long double	fmal(long double, long double, long double);
-DLLEXPORT long double	fmaxl(long double, long double) __pure2;
-DLLEXPORT long double	fminl(long double, long double) __pure2;
-DLLEXPORT long double	fmodl(long double, long double);
-DLLEXPORT long double	frexpl(long double value, int *); /* fundamentally !__pure2 */
-DLLEXPORT long double	hypotl(long double, long double);
-DLLEXPORT int		ilogbl(long double) __pure2;
-DLLEXPORT long double	ldexpl(long double, int);
-DLLEXPORT long double	lgammal(long double);
-DLLEXPORT long long	llrintl(long double);
-DLLEXPORT long long	llroundl(long double);
-DLLEXPORT long double	log10l(long double);
-DLLEXPORT long double	log1pl(long double);
-DLLEXPORT long double	log2l(long double);
-DLLEXPORT long double	logbl(long double);
-DLLEXPORT long double	logl(long double);
-DLLEXPORT long		lrintl(long double);
-DLLEXPORT long		lroundl(long double);
-DLLEXPORT long double	modfl(long double, long double *); /* fundamentally !__pure2 */
-DLLEXPORT long double	nanl(const char *) __pure2;
-DLLEXPORT long double	nearbyintl(long double);
-DLLEXPORT long double	nextafterl(long double, long double);
-DLLEXPORT double		nexttoward(double, long double);
-DLLEXPORT float		nexttowardf(float, long double);
-DLLEXPORT long double	nexttowardl(long double, long double);
-DLLEXPORT long double	powl(long double, long double);
-DLLEXPORT long double	remainderl(long double, long double);
-DLLEXPORT long double	remquol(long double, long double, int *);
-DLLEXPORT long double	rintl(long double);
-DLLEXPORT long double	roundl(long double);
-DLLEXPORT long double	scalblnl(long double, long);
-DLLEXPORT long double	scalbnl(long double, int);
-DLLEXPORT long double	sinhl(long double);
-DLLEXPORT long double	sinl(long double);
-DLLEXPORT long double	sqrtl(long double);
-DLLEXPORT long double	tanhl(long double);
-DLLEXPORT long double	tanl(long double);
-DLLEXPORT long double	tgammal(long double);
-DLLEXPORT long double	truncl(long double);
+OLM_DLLEXPORT long double	acoshl(long double);
+OLM_DLLEXPORT long double	acosl(long double);
+OLM_DLLEXPORT long double	asinhl(long double);
+OLM_DLLEXPORT long double	asinl(long double);
+OLM_DLLEXPORT long double	atan2l(long double, long double);
+OLM_DLLEXPORT long double	atanhl(long double);
+OLM_DLLEXPORT long double	atanl(long double);
+OLM_DLLEXPORT long double	cbrtl(long double);
+OLM_DLLEXPORT long double	ceill(long double);
+OLM_DLLEXPORT long double	copysignl(long double, long double) __pure2;
+OLM_DLLEXPORT long double	coshl(long double);
+OLM_DLLEXPORT long double	cosl(long double);
+OLM_DLLEXPORT long double	erfcl(long double);
+OLM_DLLEXPORT long double	erfl(long double);
+OLM_DLLEXPORT long double	exp2l(long double);
+OLM_DLLEXPORT long double	expl(long double);
+OLM_DLLEXPORT long double	expm1l(long double);
+OLM_DLLEXPORT long double	fabsl(long double) __pure2;
+OLM_DLLEXPORT long double	fdiml(long double, long double);
+OLM_DLLEXPORT long double	floorl(long double);
+OLM_DLLEXPORT long double	fmal(long double, long double, long double);
+OLM_DLLEXPORT long double	fmaxl(long double, long double) __pure2;
+OLM_DLLEXPORT long double	fminl(long double, long double) __pure2;
+OLM_DLLEXPORT long double	fmodl(long double, long double);
+OLM_DLLEXPORT long double	frexpl(long double value, int *); /* fundamentally !__pure2 */
+OLM_DLLEXPORT long double	hypotl(long double, long double);
+OLM_DLLEXPORT int		ilogbl(long double) __pure2;
+OLM_DLLEXPORT long double	ldexpl(long double, int);
+OLM_DLLEXPORT long double	lgammal(long double);
+OLM_DLLEXPORT long long	llrintl(long double);
+OLM_DLLEXPORT long long	llroundl(long double);
+OLM_DLLEXPORT long double	log10l(long double);
+OLM_DLLEXPORT long double	log1pl(long double);
+OLM_DLLEXPORT long double	log2l(long double);
+OLM_DLLEXPORT long double	logbl(long double);
+OLM_DLLEXPORT long double	logl(long double);
+OLM_DLLEXPORT long		lrintl(long double);
+OLM_DLLEXPORT long		lroundl(long double);
+OLM_DLLEXPORT long double	modfl(long double, long double *); /* fundamentally !__pure2 */
+OLM_DLLEXPORT long double	nanl(const char *) __pure2;
+OLM_DLLEXPORT long double	nearbyintl(long double);
+OLM_DLLEXPORT long double	nextafterl(long double, long double);
+OLM_DLLEXPORT double		nexttoward(double, long double);
+OLM_DLLEXPORT float		nexttowardf(float, long double);
+OLM_DLLEXPORT long double	nexttowardl(long double, long double);
+OLM_DLLEXPORT long double	powl(long double, long double);
+OLM_DLLEXPORT long double	remainderl(long double, long double);
+OLM_DLLEXPORT long double	remquol(long double, long double, int *);
+OLM_DLLEXPORT long double	rintl(long double);
+OLM_DLLEXPORT long double	roundl(long double);
+OLM_DLLEXPORT long double	scalblnl(long double, long);
+OLM_DLLEXPORT long double	scalbnl(long double, int);
+OLM_DLLEXPORT long double	sinhl(long double);
+OLM_DLLEXPORT long double	sinl(long double);
+OLM_DLLEXPORT long double	sqrtl(long double);
+OLM_DLLEXPORT long double	tanhl(long double);
+OLM_DLLEXPORT long double	tanl(long double);
+OLM_DLLEXPORT long double	tgammal(long double);
+OLM_DLLEXPORT long double	truncl(long double);
 #endif /* __ISO_C_VISIBLE >= 1999 */
 
 /* Reentrant version of lgammal. */
 #if __BSD_VISIBLE
-DLLEXPORT long double	lgammal_r(long double, int *);
+OLM_DLLEXPORT long double	lgammal_r(long double, int *);
 
 /*
  * Single sine/cosine function.
  */
-DLLEXPORT void	sincosl(long double, long double *, long double *);
+OLM_DLLEXPORT void	sincosl(long double, long double *, long double *);
 #endif	/* __BSD_VISIBLE */
 
 #if defined(__cplusplus)
diff --git a/ld128/s_exp2l.c b/ld128/s_exp2l.c
index d0daabd..c5f997f 100644
--- a/ld128/s_exp2l.c
+++ b/ld128/s_exp2l.c
@@ -354,7 +354,7 @@ static const float eps[TBLSIZE] = {
  *	Gal, S. and Bachelis, B.  An Accurate Elementary Mathematical Library
  *	for the IEEE Floating Point Standard.  TOMS 17(1), 26-46 (1991).
  */
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 exp2l(long double x)
 {
 	union IEEEl2bits u, v;
diff --git a/ld128/s_nanl.c b/ld128/s_nanl.c
index 336d8cf..4dcdb4e 100644
--- a/ld128/s_nanl.c
+++ b/ld128/s_nanl.c
@@ -31,7 +31,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 nanl(const char *s)
 {
 	union {
diff --git a/ld80/s_exp2l.c b/ld80/s_exp2l.c
index d0864fc..0cf5259 100644
--- a/ld80/s_exp2l.c
+++ b/ld80/s_exp2l.c
@@ -211,7 +211,7 @@ static const double tbl[TBLSIZE * 2] = {
  *   The table entries each have 104 bits of accuracy, encoded as
  *   a pair of double precision values.
  */
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 exp2l(long double x)
 {
 	union IEEEl2bits u, v;
diff --git a/ld80/s_nanl.c b/ld80/s_nanl.c
index 2b24691..ca77048 100644
--- a/ld80/s_nanl.c
+++ b/ld80/s_nanl.c
@@ -30,7 +30,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 nanl(const char *s)
 {
 	union {
diff --git a/src/cdefs-compat.h b/src/cdefs-compat.h
index 7c78691..d3e3166 100644
--- a/src/cdefs-compat.h
+++ b/src/cdefs-compat.h
@@ -15,7 +15,7 @@
 #define __strong_reference(sym,aliassym) __weak_reference(sym,aliassym)
 #else
 #define __strong_reference(sym,aliassym)	\
-	DLLEXPORT extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)));
+	OLM_DLLEXPORT extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)));
 #endif /* __APPLE__ */
 #endif /* __strong_reference */
 
diff --git a/src/common.c b/src/common.c
index 373f579..b02d697 100644
--- a/src/common.c
+++ b/src/common.c
@@ -2,6 +2,6 @@
 
 #include "math_private.h"
 
-DLLEXPORT int isopenlibm(void) {
+OLM_DLLEXPORT int isopenlibm(void) {
     return 1;
 }
diff --git a/src/e_acos.c b/src/e_acos.c
index 3b18a37..b7a74b9 100644
--- a/src/e_acos.c
+++ b/src/e_acos.c
@@ -61,7 +61,7 @@ qS2 =  2.02094576023350569471e+00, /* 0x40002AE5, 0x9C598AC8 */
 qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */
 qS4 =  7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_acos(double x)
 {
 	double z,p,q,r,w,s,c,df;
diff --git a/src/e_acosf.c b/src/e_acosf.c
index 47e301b..2beab5c 100644
--- a/src/e_acosf.c
+++ b/src/e_acosf.c
@@ -32,7 +32,7 @@ pS1 = -4.2743422091e-02,
 pS2 = -8.6563630030e-03,
 qS1 = -7.0662963390e-01;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_acosf(float x)
 {
 	float z,p,q,r,w,s,c,df;
diff --git a/src/e_acosh.c b/src/e_acosh.c
index 9c0239a..3f80d95 100644
--- a/src/e_acosh.c
+++ b/src/e_acosh.c
@@ -37,7 +37,7 @@ static const double
 one	= 1.0,
 ln2	= 6.93147180559945286227e-01;  /* 0x3FE62E42, 0xFEFA39EF */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_acosh(double x)
 {
 	double t;
diff --git a/src/e_acoshf.c b/src/e_acoshf.c
index fc4c788..729e593 100644
--- a/src/e_acoshf.c
+++ b/src/e_acoshf.c
@@ -24,7 +24,7 @@ static const float
 one	= 1.0,
 ln2	= 6.9314718246e-01;  /* 0x3f317218 */
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_acoshf(float x)
 {
 	float t;
diff --git a/src/e_acosl.c b/src/e_acosl.c
index 348baf2..ebe5a22 100644
--- a/src/e_acosl.c
+++ b/src/e_acosl.c
@@ -40,7 +40,7 @@ static const long double
 pi =  3.14159265358979323846264338327950280e+00L;
 #endif
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 acosl(long double x)
 {
 	union IEEEl2bits u;
diff --git a/src/e_asin.c b/src/e_asin.c
index c15c0f5..2ec1764 100644
--- a/src/e_asin.c
+++ b/src/e_asin.c
@@ -67,7 +67,7 @@ qS2 =  2.02094576023350569471e+00, /* 0x40002AE5, 0x9C598AC8 */
 qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */
 qS4 =  7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_asin(double x)
 {
 	double t=0.0,w,p,q,c,r,s;
diff --git a/src/e_asinf.c b/src/e_asinf.c
index e89e239..1c1ab2c 100644
--- a/src/e_asinf.c
+++ b/src/e_asinf.c
@@ -32,7 +32,7 @@ qS1 = -7.0662963390e-01;
 static const double
 pio2 =  1.570796326794896558e+00;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_asinf(float x)
 {
 	double s;
diff --git a/src/e_asinl.c b/src/e_asinl.c
index ab253b7..521913a 100644
--- a/src/e_asinl.c
+++ b/src/e_asinl.c
@@ -30,7 +30,7 @@ static const long double
 one =  1.00000000000000000000e+00,
 huge = 1.000e+300;
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 asinl(long double x)
 {
 	union IEEEl2bits u;
diff --git a/src/e_atan2.c b/src/e_atan2.c
index 490646e..c27b41d 100644
--- a/src/e_atan2.c
+++ b/src/e_atan2.c
@@ -57,7 +57,7 @@ pi      = 3.1415926535897931160E+00; /* 0x400921FB, 0x54442D18 */
 static volatile double
 pi_lo   = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_atan2(double y, double x)
 {
 	double z;
diff --git a/src/e_atan2f.c b/src/e_atan2f.c
index b75d929..a52a581 100644
--- a/src/e_atan2f.c
+++ b/src/e_atan2f.c
@@ -30,7 +30,7 @@ pi      = 3.1415927410e+00; /* 0x40490fdb */
 static volatile float
 pi_lo   = -8.7422776573e-08; /* 0xb3bbbd2e */
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_atan2f(float y, float x)
 {
 	float z;
diff --git a/src/e_atan2l.c b/src/e_atan2l.c
index a017fdd..1c0a796 100644
--- a/src/e_atan2l.c
+++ b/src/e_atan2l.c
@@ -43,7 +43,7 @@ static const long double
 pi =  3.14159265358979323846264338327950280e+00L;
 #endif
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 atan2l(long double y, long double x)
 {
 	union IEEEl2bits ux, uy;
diff --git a/src/e_atanh.c b/src/e_atanh.c
index b3f6241..b278af3 100644
--- a/src/e_atanh.c
+++ b/src/e_atanh.c
@@ -40,7 +40,7 @@
 static const double one = 1.0, huge = 1e300;
 static const double zero = 0.0;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_atanh(double x)
 {
 	double t;
diff --git a/src/e_atanhf.c b/src/e_atanhf.c
index 3477298..1ce329c 100644
--- a/src/e_atanhf.c
+++ b/src/e_atanhf.c
@@ -24,7 +24,7 @@ static const float one = 1.0, huge = 1e30;
 
 static const float zero = 0.0;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_atanhf(float x)
 {
 	float t;
diff --git a/src/e_cosh.c b/src/e_cosh.c
index 1f0683a..a4bfe0b 100644
--- a/src/e_cosh.c
+++ b/src/e_cosh.c
@@ -41,7 +41,7 @@
 
 static const double one = 1.0, half=0.5, huge = 1.0e300;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_cosh(double x)
 {
 	double t,w;
diff --git a/src/e_coshf.c b/src/e_coshf.c
index 99ae790..e129659 100644
--- a/src/e_coshf.c
+++ b/src/e_coshf.c
@@ -22,7 +22,7 @@
 
 static const float one = 1.0, half=0.5, huge = 1.0e30;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_coshf(float x)
 {
 	float t,w;
diff --git a/src/e_exp.c b/src/e_exp.c
index f8ee596..ed0e3fe 100644
--- a/src/e_exp.c
+++ b/src/e_exp.c
@@ -101,7 +101,7 @@ P5   =  4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */
 static volatile double
 twom1000= 9.33263618503218878990e-302;     /* 2**-1000=0x01700000,0*/
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_exp(double x)	/* default IEEE double exp */
 {
 	double y,hi=0.0,lo=0.0,c,t,twopk;
diff --git a/src/e_expf.c b/src/e_expf.c
index 35ea801..a239413 100644
--- a/src/e_expf.c
+++ b/src/e_expf.c
@@ -41,7 +41,7 @@ P2 = -2.7667332906e-3;		/* -0xb55215.0p-32 */
 
 static volatile float twom100 = 7.8886090522e-31;      /* 2**-100=0x0d800000 */
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_expf(float x)
 {
 	float y,hi=0.0,lo=0.0,c,t,twopk;
diff --git a/src/e_fmod.c b/src/e_fmod.c
index 4226183..285da8d 100644
--- a/src/e_fmod.c
+++ b/src/e_fmod.c
@@ -26,7 +26,7 @@
 
 static const double one = 1.0, Zero[] = {0.0, -0.0,};
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_fmod(double x, double y)
 {
 	int32_t n,hx,hy,hz,ix,iy,sx,i;
diff --git a/src/e_fmodf.c b/src/e_fmodf.c
index a929401..88fd8ae 100644
--- a/src/e_fmodf.c
+++ b/src/e_fmodf.c
@@ -28,7 +28,7 @@
 
 static const float one = 1.0, Zero[] = {0.0, -0.0,};
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_fmodf(float x, float y)
 {
 	int32_t n,hx,hy,hz,ix,iy,sx,i;
diff --git a/src/e_fmodl.c b/src/e_fmodl.c
index a222002..47d961b 100644
--- a/src/e_fmodl.c
+++ b/src/e_fmodl.c
@@ -62,7 +62,7 @@ static const long double one = 1.0, Zero[] = {0.0, -0.0,};
  * - The high part of the mantissa fits in an int64_t with enough room
  *   for an explicit integer bit in front of the fractional bits.
  */
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 fmodl(long double x, long double y)
 {
 	union IEEEl2bits ux, uy;
diff --git a/src/e_hypot.c b/src/e_hypot.c
index b4f1031..23fdc95 100644
--- a/src/e_hypot.c
+++ b/src/e_hypot.c
@@ -51,7 +51,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_hypot(double x, double y)
 {
 	double a,b,t1,t2,y1,y2,w;
diff --git a/src/e_hypotf.c b/src/e_hypotf.c
index 6e4e230..e90fb5d 100644
--- a/src/e_hypotf.c
+++ b/src/e_hypotf.c
@@ -20,7 +20,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_hypotf(float x, float y)
 {
 	float a,b,t1,t2,y1,y2,w;
diff --git a/src/e_hypotl.c b/src/e_hypotl.c
index 7d5af86..047484d 100644
--- a/src/e_hypotl.c
+++ b/src/e_hypotl.c
@@ -45,7 +45,7 @@ typedef	u_int64_t man_t;
 typedef	u_int32_t man_t;
 #endif
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 hypotl(long double x, long double y)
 {
 	long double a=x,b=y,t1,t2,y1,y2,w;
diff --git a/src/e_j0.c b/src/e_j0.c
index 71b7122..a2419d3 100644
--- a/src/e_j0.c
+++ b/src/e_j0.c
@@ -84,7 +84,7 @@ S04  =  1.16614003333790000205e-09; /* 0x3E1408BC, 0xF4745D8F */
 
 static const double zero = 0.0;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_j0(double x)
 {
 	double z, s,c,ss,cc,r,u,v;
@@ -145,7 +145,7 @@ v02  =  7.60068627350353253702e-05, /* 0x3F13ECBB, 0xF578C6C1 */
 v03  =  2.59150851840457805467e-07, /* 0x3E91642D, 0x7FF202FD */
 v04  =  4.41110311332675467403e-10; /* 0x3DFE5018, 0x3BD6D9EF */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_y0(double x)
 {
 	double z, s,c,ss,cc,u,v;
diff --git a/src/e_j0f.c b/src/e_j0f.c
index 6ea8233..62258b1 100644
--- a/src/e_j0f.c
+++ b/src/e_j0f.c
@@ -38,7 +38,7 @@ S04  =  1.1661400734e-09; /* 0x30a045e8 */
 
 static const float zero = 0.0;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_j0f(float x)
 {
 	float z, s,c,ss,cc,r,u,v;
@@ -99,7 +99,7 @@ v02  =  7.6006865129e-05, /* 0x389f65e0 */
 v03  =  2.5915085189e-07, /* 0x348b216c */
 v04  =  4.4111031494e-10; /* 0x2ff280c2 */
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_y0f(float x)
 {
 	float z, s,c,ss,cc,u,v;
diff --git a/src/e_j1.c b/src/e_j1.c
index 06af073..4be57cd 100644
--- a/src/e_j1.c
+++ b/src/e_j1.c
@@ -85,7 +85,7 @@ s05  =  1.23542274426137913908e-11; /* 0x3DAB2ACF, 0xCFB97ED8 */
 
 static const double zero    = 0.0;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_j1(double x)
 {
 	double z, s,c,ss,cc,r,u,v,y;
@@ -142,7 +142,7 @@ static const double V0[5] = {
   1.66559246207992079114e-11, /* 0x3DB25039, 0xDACA772A */
 };
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_y1(double x)
 {
 	double z, s,c,ss,cc,u,v;
diff --git a/src/e_j1f.c b/src/e_j1f.c
index 940edf7..ac32c6f 100644
--- a/src/e_j1f.c
+++ b/src/e_j1f.c
@@ -38,7 +38,7 @@ s05  =  1.2354227016e-11; /* 0x2d59567e */
 
 static const float zero    = 0.0;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_j1f(float x)
 {
 	float z, s,c,ss,cc,r,u,v,y;
@@ -95,7 +95,7 @@ static const float V0[5] = {
   1.6655924903e-11, /* 0x2d9281cf */
 };
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_y1f(float x)
 {
 	float z, s,c,ss,cc,u,v;
diff --git a/src/e_jn.c b/src/e_jn.c
index b651664..1a53965 100644
--- a/src/e_jn.c
+++ b/src/e_jn.c
@@ -51,7 +51,7 @@ one   =  1.00000000000000000000e+00; /* 0x3FF00000, 0x00000000 */
 
 static const double zero  =  0.00000000000000000000e+00;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_jn(int n, double x)
 {
 	int32_t i,hx,ix,lx, sgn;
@@ -212,7 +212,7 @@ __ieee754_jn(int n, double x)
 	if(sgn==1) return -b; else return b;
 }
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_yn(int n, double x)
 {
 	int32_t i,hx,ix,lx;
diff --git a/src/e_jnf.c b/src/e_jnf.c
index a2b83ee..cb73e86 100644
--- a/src/e_jnf.c
+++ b/src/e_jnf.c
@@ -26,7 +26,7 @@ one   =  1.0000000000e+00; /* 0x3F800000 */
 
 static const float zero  =  0.0000000000e+00;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_jnf(int n, float x)
 {
 	int32_t i,hx,ix, sgn;
@@ -164,7 +164,7 @@ __ieee754_jnf(int n, float x)
 	if(sgn==1) return -b; else return b;
 }
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_ynf(int n, float x)
 {
 	int32_t i,hx,ix,ib;
diff --git a/src/e_lgamma.c b/src/e_lgamma.c
index 42cbd08..d316796 100644
--- a/src/e_lgamma.c
+++ b/src/e_lgamma.c
@@ -25,7 +25,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_lgamma(double x)
 {
 #ifdef OPENLIBM_ONLY_THREAD_SAFE
diff --git a/src/e_lgamma_r.c b/src/e_lgamma_r.c
index 45dba55..df3ae23 100644
--- a/src/e_lgamma_r.c
+++ b/src/e_lgamma_r.c
@@ -202,7 +202,7 @@ static const double zero=  0.00000000000000000000e+00;
 }
 
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_lgamma_r(double x, int *signgamp)
 {
 	double t,y,z,nadj,p,p1,p2,p3,q,r,w;
diff --git a/src/e_lgammaf.c b/src/e_lgammaf.c
index 375262a..5b95f02 100644
--- a/src/e_lgammaf.c
+++ b/src/e_lgammaf.c
@@ -26,7 +26,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_lgammaf(float x)
 {
 #ifdef OPENLIBM_ONLY_THREAD_SAFE
diff --git a/src/e_lgammaf_r.c b/src/e_lgammaf_r.c
index dd65147..7446dfc 100644
--- a/src/e_lgammaf_r.c
+++ b/src/e_lgammaf_r.c
@@ -135,7 +135,7 @@ static const float zero=  0.0000000000e+00;
 }
 
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_lgammaf_r(float x, int *signgamp)
 {
 	float t,y,z,nadj,p,p1,p2,p3,q,r,w;
diff --git a/src/e_lgammal.c b/src/e_lgammal.c
index e71d365..c1bfb25 100644
--- a/src/e_lgammal.c
+++ b/src/e_lgammal.c
@@ -4,7 +4,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 lgammal(long double x)
 {
 #ifdef OPENLIBM_ONLY_THREAD_SAFE
diff --git a/src/e_log.c b/src/e_log.c
index 524cb55..4e0a0a9 100644
--- a/src/e_log.c
+++ b/src/e_log.c
@@ -83,7 +83,7 @@ Lg7 = 1.479819860511658591e-01;  /* 3FC2F112 DF3E5244 */
 
 static const double zero   =  0.0;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_log(double x)
 {
 	double hfsq,f,s,z,R,w,t1,t2,dk;
diff --git a/src/e_log10.c b/src/e_log10.c
index c9c4fc8..5d20746 100644
--- a/src/e_log10.c
+++ b/src/e_log10.c
@@ -36,7 +36,7 @@ log10_2lo  =  3.69423907715893078616e-13; /* 0x3D59FEF3, 0x11F12B36 */
 
 static const double zero   =  0.0;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_log10(double x)
 {
 	double f,hfsq,hi,lo,r,val_hi,val_lo,w,y,y2;
diff --git a/src/e_log10f.c b/src/e_log10f.c
index 41f430f..1f6e31a 100644
--- a/src/e_log10f.c
+++ b/src/e_log10f.c
@@ -33,7 +33,7 @@ log10_2lo  =  7.9034151668e-07; /* 0x355427db */
 
 static const float zero   =  0.0;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_log10f(float x)
 {
 	float f,hfsq,hi,lo,r,y;
diff --git a/src/e_log2.c b/src/e_log2.c
index e9053a9..9fb21a1 100644
--- a/src/e_log2.c
+++ b/src/e_log2.c
@@ -36,7 +36,7 @@ ivln2lo    =  1.67517131648865118353e-10; /* 0x3de705fc, 0x2eefa200 */
 
 static const double zero   =  0.0;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_log2(double x)
 {
 	double f,hfsq,hi,lo,r,val_hi,val_lo,w,y;
diff --git a/src/e_log2f.c b/src/e_log2f.c
index babe920..58977ac 100644
--- a/src/e_log2f.c
+++ b/src/e_log2f.c
@@ -31,7 +31,7 @@ ivln2lo    = -1.7605285393e-04; /* 0xb9389ad4 */
 
 static const float zero   =  0.0;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_log2f(float x)
 {
 	float f,hfsq,hi,lo,r,y;
diff --git a/src/e_logf.c b/src/e_logf.c
index ce0c0a4..dc5e151 100644
--- a/src/e_logf.c
+++ b/src/e_logf.c
@@ -32,7 +32,7 @@ Lg4 =      0xf89e26.0p-26;	/* 0.24279078841 */
 
 static const float zero   =  0.0;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_logf(float x)
 {
 	float hfsq,f,s,z,R,w,t1,t2,dk;
diff --git a/src/e_pow.c b/src/e_pow.c
index b64d699..e407983 100644
--- a/src/e_pow.c
+++ b/src/e_pow.c
@@ -94,7 +94,7 @@ ivln2    =  1.44269504088896338700e+00, /* 0x3FF71547, 0x652B82FE =1/ln2 */
 ivln2_h  =  1.44269502162933349609e+00, /* 0x3FF71547, 0x60000000 =24b 1/ln2*/
 ivln2_l  =  1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_pow(double x, double y)
 {
 	double z,ax,z_h,z_l,p_h,p_l;
diff --git a/src/e_powf.c b/src/e_powf.c
index 2573961..84b5692 100644
--- a/src/e_powf.c
+++ b/src/e_powf.c
@@ -53,7 +53,7 @@ ivln2    =  1.4426950216e+00, /* 0x3fb8aa3b =1/ln2 */
 ivln2_h  =  1.4426879883e+00, /* 0x3fb8aa00 =16b 1/ln2*/
 ivln2_l  =  7.0526075433e-06; /* 0x36eca570 =1/ln2 tail*/
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_powf(float x, float y)
 {
 	float z,ax,z_h,z_l,p_h,p_l;
diff --git a/src/e_remainder.c b/src/e_remainder.c
index c563f11..bc9d9bf 100644
--- a/src/e_remainder.c
+++ b/src/e_remainder.c
@@ -31,7 +31,7 @@
 static const double zero = 0.0;
 
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_remainder(double x, double p)
 {
 	int32_t hx,hp;
diff --git a/src/e_remainderf.c b/src/e_remainderf.c
index 2cc81e3..ac0d153 100644
--- a/src/e_remainderf.c
+++ b/src/e_remainderf.c
@@ -23,7 +23,7 @@
 static const float zero = 0.0;
 
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_remainderf(float x, float p)
 {
 	int32_t hx,hp;
diff --git a/src/e_remainderl.c b/src/e_remainderl.c
index 4575086..5f1ee61 100644
--- a/src/e_remainderl.c
+++ b/src/e_remainderl.c
@@ -30,7 +30,7 @@
 #include <openlibm_math.h>
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 remainderl(long double x, long double y)
 {
 	int quo;
diff --git a/src/e_sinh.c b/src/e_sinh.c
index 6cd0298..e6ca6bc 100644
--- a/src/e_sinh.c
+++ b/src/e_sinh.c
@@ -38,7 +38,7 @@
 
 static const double one = 1.0, shuge = 1.0e307;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_sinh(double x)
 {
 	double t,h;
diff --git a/src/e_sinhf.c b/src/e_sinhf.c
index c1168b7..6e5e06d 100644
--- a/src/e_sinhf.c
+++ b/src/e_sinhf.c
@@ -22,7 +22,7 @@
 
 static const float one = 1.0, shuge = 1.0e37;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_sinhf(float x)
 {
 	float t,h;
diff --git a/src/e_sqrt.c b/src/e_sqrt.c
index fa10513..01c7104 100644
--- a/src/e_sqrt.c
+++ b/src/e_sqrt.c
@@ -91,7 +91,7 @@
 
 static	const double	one	= 1.0, tiny=1.0e-300;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ieee754_sqrt(double x)
 {
 	double z;
diff --git a/src/e_sqrtf.c b/src/e_sqrtf.c
index ea32744..2aeaa9f 100644
--- a/src/e_sqrtf.c
+++ b/src/e_sqrtf.c
@@ -19,7 +19,7 @@
 
 static	const float	one	= 1.0, tiny=1.0e-30;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ieee754_sqrtf(float x)
 {
 	float z;
diff --git a/src/e_sqrtl.c b/src/e_sqrtl.c
index 637f103..a073bf9 100644
--- a/src/e_sqrtl.c
+++ b/src/e_sqrtl.c
@@ -75,7 +75,7 @@ dec(long double x)
  * if possible.
  */
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 sqrtl(long double x)
 {
 	union IEEEl2bits u;
diff --git a/src/k_cos.c b/src/k_cos.c
index d023f49..f3054ef 100644
--- a/src/k_cos.c
+++ b/src/k_cos.c
@@ -66,7 +66,7 @@ C4  = -2.75573143513906633035e-07, /* 0xBE927E4F, 0x809C52AD */
 C5  =  2.08757232129817482790e-09, /* 0x3E21EE9E, 0xBDB4B1C4 */
 C6  = -1.13596475577881948265e-11; /* 0xBDA8FAE9, 0xBE8838D4 */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __kernel_cos(double x, double y)
 {
 	double hz,z,r,w;
diff --git a/src/k_cosf.c b/src/k_cosf.c
index aca33de..6774db4 100644
--- a/src/k_cosf.c
+++ b/src/k_cosf.c
@@ -35,7 +35,7 @@ C3  =  0x199342e0ee5069.0p-68;	/*  0.0000243904487962774090654 */
 extern
 #endif
 //__inline float
-DLLEXPORT float
+OLM_DLLEXPORT float
 __kernel_cosdf(double x)
 {
 	double r, w, z;
diff --git a/src/k_exp.c b/src/k_exp.c
index 4a2388c..4739e20 100644
--- a/src/k_exp.c
+++ b/src/k_exp.c
@@ -71,7 +71,7 @@ __frexp_exp(double x, int *expt)
  * has filtered out very large x, for which overflow would be inevitable.
  */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __ldexp_exp(double x, int expt)
 {
 	double exp_x, scale;
@@ -83,7 +83,7 @@ __ldexp_exp(double x, int expt)
 	return (exp_x * scale);
 }
 
-DLLEXPORT double complex
+OLM_DLLEXPORT double complex
 __ldexp_cexp(double complex z, int expt)
 {
 	double x, y, exp_x, scale1, scale2;
diff --git a/src/k_expf.c b/src/k_expf.c
index 0243d9e..bbf094c 100644
--- a/src/k_expf.c
+++ b/src/k_expf.c
@@ -54,7 +54,7 @@ __frexp_expf(float x, int *expt)
 	return (exp_x);
 }
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 __ldexp_expf(float x, int expt)
 {
 	float exp_x, scale;
@@ -66,7 +66,7 @@ __ldexp_expf(float x, int expt)
 	return (exp_x * scale);
 }
 
-DLLEXPORT float complex
+OLM_DLLEXPORT float complex
 __ldexp_cexpf(float complex z, int expt)
 {
 	float x, y, exp_x, scale1, scale2;
diff --git a/src/k_rem_pio2.c b/src/k_rem_pio2.c
index e1224c3..9555d3a 100644
--- a/src/k_rem_pio2.c
+++ b/src/k_rem_pio2.c
@@ -290,7 +290,7 @@ one    = 1.0,
 two24   =  1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */
 twon24  =  5.96046447753906250000e-08; /* 0x3E700000, 0x00000000 */
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 __kernel_rem_pio2(double *x, double *y, int e0, int nx, int prec)
 {
 	int32_t jz,jx,jv,jp,jk,carry,n,iq[20],i,j,k,m,q0,ih;
diff --git a/src/k_sin.c b/src/k_sin.c
index 7c3c860..0b3de39 100644
--- a/src/k_sin.c
+++ b/src/k_sin.c
@@ -57,7 +57,7 @@ S4  =  2.75573137070700676789e-06, /* 0x3EC71DE3, 0x57B1FE7D */
 S5  = -2.50507602534068634195e-08, /* 0xBE5AE5E6, 0x8A2B9CEB */
 S6  =  1.58969099521155010221e-10; /* 0x3DE5D93A, 0x5ACFD57C */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 __kernel_sin(double x, double y, int iy)
 {
 	double z,r,v,w;
diff --git a/src/k_sinf.c b/src/k_sinf.c
index 08b8229..15c8e03 100644
--- a/src/k_sinf.c
+++ b/src/k_sinf.c
@@ -34,7 +34,7 @@ S4 =  0x16cd878c3b46a7.0p-71;	/*  0.0000027183114939898219064 */
 extern
 #endif
 //__inline float
-DLLEXPORT float 
+OLM_DLLEXPORT float 
 __kernel_sindf(double x)
 {
 	double r, s, w, z;
diff --git a/src/k_tanf.c b/src/k_tanf.c
index b7a0a7c..9c17d1b 100644
--- a/src/k_tanf.c
+++ b/src/k_tanf.c
@@ -37,7 +37,7 @@ T[] =  {
 extern
 #endif
 //__inline float
-DLLEXPORT float
+OLM_DLLEXPORT float
 __kernel_tandf(double x, int iy)
 {
 	double z,r,w,s,t,u;
diff --git a/src/math_private.h b/src/math_private.h
index 8e861a4..2d40880 100644
--- a/src/math_private.h
+++ b/src/math_private.h
@@ -355,15 +355,15 @@ long double __kernel_sinl(long double, long double, int);
 long double __kernel_cosl(long double, long double);
 long double __kernel_tanl(long double, long double, int);
 
-#undef DLLEXPORT
+#undef OLM_DLLEXPORT
 #ifdef _WIN32
 # ifdef IMPORT_EXPORTS
-#  define DLLEXPORT __declspec(dllimport)
+#  define OLM_DLLEXPORT __declspec(dllimport)
 # else
-#  define DLLEXPORT __declspec(dllexport)
+#  define OLM_DLLEXPORT __declspec(OLM_DLLEXPORT)
 # endif
 #else
-#define DLLEXPORT __attribute__ ((visibility("default")))
+#define OLM_DLLEXPORT __attribute__ ((visibility("default")))
 #endif
 
 
diff --git a/src/s_asinh.c b/src/s_asinh.c
index c7a4699..1f9bc09 100644
--- a/src/s_asinh.c
+++ b/src/s_asinh.c
@@ -33,7 +33,7 @@ one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
 ln2 =  6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */
 huge=  1.00000000000000000000e+300;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 asinh(double x)
 {
 	double t,w;
diff --git a/src/s_asinhf.c b/src/s_asinhf.c
index 9966a32..c9d3694 100644
--- a/src/s_asinhf.c
+++ b/src/s_asinhf.c
@@ -25,7 +25,7 @@ one =  1.0000000000e+00, /* 0x3F800000 */
 ln2 =  6.9314718246e-01, /* 0x3f317218 */
 huge=  1.0000000000e+30;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 asinhf(float x)
 {
 	float t,w;
diff --git a/src/s_atan.c b/src/s_atan.c
index 1524928..f87e486 100644
--- a/src/s_atan.c
+++ b/src/s_atan.c
@@ -70,7 +70,7 @@ static const double aT[] = {
 one   = 1.0,
 huge   = 1.0e300;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 atan(double x)
 {
 	double w,s1,s2,z;
diff --git a/src/s_atanf.c b/src/s_atanf.c
index 2a8991c..cdba6a3 100644
--- a/src/s_atanf.c
+++ b/src/s_atanf.c
@@ -46,7 +46,7 @@ static const float
 one   = 1.0,
 huge   = 1.0e30;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 atanf(float x)
 {
 	float w,s1,s2,z;
diff --git a/src/s_atanl.c b/src/s_atanl.c
index f4fbf30..4edfa5a 100644
--- a/src/s_atanl.c
+++ b/src/s_atanl.c
@@ -29,7 +29,7 @@ static const long double
 one   = 1.0,
 huge   = 1.0e300;
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 atanl(long double x)
 {
 	union IEEEl2bits u;
diff --git a/src/s_carg.c b/src/s_carg.c
index 88f1161..2ebfe17 100644
--- a/src/s_carg.c
+++ b/src/s_carg.c
@@ -32,7 +32,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 carg(double complex z)
 {
 
diff --git a/src/s_cargf.c b/src/s_cargf.c
index 6bb0b72..41e320b 100644
--- a/src/s_cargf.c
+++ b/src/s_cargf.c
@@ -32,7 +32,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 cargf(float complex z)
 {
 
diff --git a/src/s_cargl.c b/src/s_cargl.c
index 3c7a8a0..5052133 100644
--- a/src/s_cargl.c
+++ b/src/s_cargl.c
@@ -32,7 +32,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 cargl(long double complex z)
 {
 
diff --git a/src/s_cbrt.c b/src/s_cbrt.c
index 4400a13..dd3c141 100644
--- a/src/s_cbrt.c
+++ b/src/s_cbrt.c
@@ -34,7 +34,7 @@ P2 =  1.621429720105354466140,		/* 0x3ff9f160, 0x4a49d6c2 */
 P3 = -0.758397934778766047437,		/* 0xbfe844cb, 0xbee751d9 */
 P4 =  0.145996192886612446982;		/* 0x3fc2b000, 0xd4e4edd7 */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 cbrt(double x)
 {
 	int32_t	hx;
diff --git a/src/s_cbrtf.c b/src/s_cbrtf.c
index 09f6200..6a3a762 100644
--- a/src/s_cbrtf.c
+++ b/src/s_cbrtf.c
@@ -28,7 +28,7 @@ static const unsigned
 	B1 = 709958130, /* B1 = (127-127.0/3-0.03306235651)*2**23 */
 	B2 = 642849266; /* B2 = (127-127.0/3-24/3-0.03306235651)*2**23 */
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 cbrtf(float x)
 {
 	double r,T;
diff --git a/src/s_cbrtl.c b/src/s_cbrtl.c
index 435a0a1..2fe0360 100644
--- a/src/s_cbrtl.c
+++ b/src/s_cbrtl.c
@@ -33,7 +33,7 @@
 static const unsigned
     B1 = 709958130;	/* B1 = (127-127.0/3-0.03306235651)*2**23 */
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 cbrtl(long double x)
 {
 	union IEEEl2bits u, v;
diff --git a/src/s_ccosh.c b/src/s_ccosh.c
index 1a478c3..110494a 100644
--- a/src/s_ccosh.c
+++ b/src/s_ccosh.c
@@ -44,7 +44,7 @@
 
 static const double huge = 0x1p1023;
 
-DLLEXPORT double complex
+OLM_DLLEXPORT double complex
 ccosh(double complex z)
 {
 	double x, y, h;
@@ -146,7 +146,7 @@ ccosh(double complex z)
 	return (CMPLX((x * x) * (y - y), (x + x) * (y - y)));
 }
 
-DLLEXPORT double complex
+OLM_DLLEXPORT double complex
 ccos(double complex z)
 {
 
diff --git a/src/s_ccoshf.c b/src/s_ccoshf.c
index 3134b5e..53c8e7a 100644
--- a/src/s_ccoshf.c
+++ b/src/s_ccoshf.c
@@ -38,7 +38,7 @@
 
 static const float huge = 0x1p127;
 
-DLLEXPORT float complex
+OLM_DLLEXPORT float complex
 ccoshf(float complex z)
 {
 	float x, y, h;
@@ -96,7 +96,7 @@ ccoshf(float complex z)
 	return (CMPLXF((x * x) * (y - y), (x + x) * (y - y)));
 }
 
-DLLEXPORT float complex
+OLM_DLLEXPORT float complex
 ccosf(float complex z)
 {
 
diff --git a/src/s_ceil.c b/src/s_ceil.c
index e3ae9e4..bdac17f 100644
--- a/src/s_ceil.c
+++ b/src/s_ceil.c
@@ -29,7 +29,7 @@
 
 static const double huge = 1.0e300;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 ceil(double x)
 {
 	int32_t i0,i1,j0;
diff --git a/src/s_ceilf.c b/src/s_ceilf.c
index 2040ef9..5e2a568 100644
--- a/src/s_ceilf.c
+++ b/src/s_ceilf.c
@@ -22,7 +22,7 @@
 
 static const float huge = 1.0e30;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 ceilf(float x)
 {
 	int32_t i0,j0;
diff --git a/src/s_ceill.c b/src/s_ceill.c
index c31fee9..f525411 100644
--- a/src/s_ceill.c
+++ b/src/s_ceill.c
@@ -52,7 +52,7 @@
 
 static const long double huge = 1.0e300;
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 ceill(long double x)
 {
 	union IEEEl2bits u = { .e = x };
diff --git a/src/s_cexp.c b/src/s_cexp.c
index e9ae645..1510721 100644
--- a/src/s_cexp.c
+++ b/src/s_cexp.c
@@ -36,7 +36,7 @@ static const u_int32_t
 exp_ovfl  = 0x40862e42,			/* high bits of MAX_EXP * ln2 ~= 710 */
 cexp_ovfl = 0x4096b8e4;			/* (MAX_EXP - MIN_DENORM_EXP) * ln2 */
 
-DLLEXPORT double complex
+OLM_DLLEXPORT double complex
 cexp(double complex z)
 {
 	double x, y, exp_x;
diff --git a/src/s_cexpf.c b/src/s_cexpf.c
index f83c742..05f4544 100644
--- a/src/s_cexpf.c
+++ b/src/s_cexpf.c
@@ -36,7 +36,7 @@ static const u_int32_t
 exp_ovfl  = 0x42b17218,		/* MAX_EXP * ln2 ~= 88.722839355 */
 cexp_ovfl = 0x43400074;		/* (MAX_EXP - MIN_DENORM_EXP) * ln2 */
 
-DLLEXPORT float complex
+OLM_DLLEXPORT float complex
 cexpf(float complex z)
 {
 	float x, y, exp_x;
diff --git a/src/s_cimag.c b/src/s_cimag.c
index e778e89..456ae99 100644
--- a/src/s_cimag.c
+++ b/src/s_cimag.c
@@ -30,7 +30,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 cimag(double complex z)
 {
 	return (__imag__ z);
diff --git a/src/s_cimagf.c b/src/s_cimagf.c
index 3b56d2f..8287412 100644
--- a/src/s_cimagf.c
+++ b/src/s_cimagf.c
@@ -30,7 +30,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 cimagf(float complex z)
 {
 	return (__imag__ z);
diff --git a/src/s_cimagl.c b/src/s_cimagl.c
index 70ccdb5..588c6a3 100644
--- a/src/s_cimagl.c
+++ b/src/s_cimagl.c
@@ -30,7 +30,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 cimagl(long double complex z)
 {
 	return (__imag__ z);
diff --git a/src/s_conj.c b/src/s_conj.c
index 8e41275..a7c0940 100644
--- a/src/s_conj.c
+++ b/src/s_conj.c
@@ -30,7 +30,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double complex
+OLM_DLLEXPORT double complex
 conj(double complex z)
 {
 
diff --git a/src/s_conjf.c b/src/s_conjf.c
index 29eb734..d2ff743 100644
--- a/src/s_conjf.c
+++ b/src/s_conjf.c
@@ -30,7 +30,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float complex
+OLM_DLLEXPORT float complex
 conjf(float complex z)
 {
 
diff --git a/src/s_conjl.c b/src/s_conjl.c
index e1aeb6c..e4d7a01 100644
--- a/src/s_conjl.c
+++ b/src/s_conjl.c
@@ -30,7 +30,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT long double complex
+OLM_DLLEXPORT long double complex
 conjl(long double complex z)
 {
 
diff --git a/src/s_copysign.c b/src/s_copysign.c
index 068cafe..a52701f 100644
--- a/src/s_copysign.c
+++ b/src/s_copysign.c
@@ -23,7 +23,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 copysign(double x, double y)
 {
 	u_int32_t hx,hy;
diff --git a/src/s_copysignf.c b/src/s_copysignf.c
index e2a25ba..945b3fd 100644
--- a/src/s_copysignf.c
+++ b/src/s_copysignf.c
@@ -26,7 +26,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 copysignf(float x, float y)
 {
 	u_int32_t ix,iy;
diff --git a/src/s_copysignl.c b/src/s_copysignl.c
index fdbfa94..6cae5d3 100644
--- a/src/s_copysignl.c
+++ b/src/s_copysignl.c
@@ -31,7 +31,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 copysignl(long double x, long double y)
 {
 	union IEEEl2bits ux, uy;
diff --git a/src/s_cos.c b/src/s_cos.c
index 6c56389..ea84163 100644
--- a/src/s_cos.c
+++ b/src/s_cos.c
@@ -51,7 +51,7 @@
 #include "math_private.h"
 //#include "e_rem_pio2.c"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 cos(double x)
 {
 	double y[2],z=0.0;
diff --git a/src/s_cosf.c b/src/s_cosf.c
index 7797c80..57ec7c7 100644
--- a/src/s_cosf.c
+++ b/src/s_cosf.c
@@ -35,7 +35,7 @@ c2pio2 = 2*M_PI_2,			/* 0x400921FB, 0x54442D18 */
 c3pio2 = 3*M_PI_2,			/* 0x4012D97C, 0x7F3321D2 */
 c4pio2 = 4*M_PI_2;			/* 0x401921FB, 0x54442D18 */
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 cosf(float x)
 {
 	double y;
diff --git a/src/s_cosl.c b/src/s_cosl.c
index 8d3e821..886d3e3 100644
--- a/src/s_cosl.c
+++ b/src/s_cosl.c
@@ -44,7 +44,7 @@
 #error "Unsupported long double format"
 #endif
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 cosl(long double x)
 {
 	union IEEEl2bits z;
diff --git a/src/s_cpow.c b/src/s_cpow.c
index 209a1af..d99621f 100644
--- a/src/s_cpow.c
+++ b/src/s_cpow.c
@@ -50,7 +50,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double complex
+OLM_DLLEXPORT double complex
 cpow(double complex a, double complex z)
 {
 	double complex w;
diff --git a/src/s_cpowf.c b/src/s_cpowf.c
index 2738ca4..764053d 100644
--- a/src/s_cpowf.c
+++ b/src/s_cpowf.c
@@ -49,7 +49,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float complex
+OLM_DLLEXPORT float complex
 cpowf(float complex a, float complex z)
 {
 	float complex w;
diff --git a/src/s_cpowl.c b/src/s_cpowl.c
index 124afa1..81c9afd 100644
--- a/src/s_cpowl.c
+++ b/src/s_cpowl.c
@@ -50,7 +50,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT long double complex
+OLM_DLLEXPORT long double complex
 cpowl(long double complex a, long double complex z)
 {
 	long double complex w;
diff --git a/src/s_cproj.c b/src/s_cproj.c
index c6cb120..89dfc55 100644
--- a/src/s_cproj.c
+++ b/src/s_cproj.c
@@ -32,7 +32,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double complex
+OLM_DLLEXPORT double complex
 cproj(double complex z)
 {
 
diff --git a/src/s_cprojf.c b/src/s_cprojf.c
index d13450f..717c165 100644
--- a/src/s_cprojf.c
+++ b/src/s_cprojf.c
@@ -32,7 +32,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float complex
+OLM_DLLEXPORT float complex
 cprojf(float complex z)
 {
 
diff --git a/src/s_cprojl.c b/src/s_cprojl.c
index 653864c..753ab4c 100644
--- a/src/s_cprojl.c
+++ b/src/s_cprojl.c
@@ -32,7 +32,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT long double complex
+OLM_DLLEXPORT long double complex
 cprojl(long double complex z)
 {
 
diff --git a/src/s_creal.c b/src/s_creal.c
index 1562fc2..28a0fbf 100644
--- a/src/s_creal.c
+++ b/src/s_creal.c
@@ -30,7 +30,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 creal(double complex z)
 {
 	return z;
diff --git a/src/s_crealf.c b/src/s_crealf.c
index 393f206..9aaed5f 100644
--- a/src/s_crealf.c
+++ b/src/s_crealf.c
@@ -30,7 +30,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 crealf(float complex z)
 {
 	return z;
diff --git a/src/s_creall.c b/src/s_creall.c
index 6c62ae8..576666e 100644
--- a/src/s_creall.c
+++ b/src/s_creall.c
@@ -30,7 +30,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 creall(long double complex z)
 {
 	return z;
diff --git a/src/s_csinh.c b/src/s_csinh.c
index 023c3e6..3838f25 100644
--- a/src/s_csinh.c
+++ b/src/s_csinh.c
@@ -44,7 +44,7 @@
 
 static const double huge = 0x1p1023;
 
-DLLEXPORT double complex
+OLM_DLLEXPORT double complex
 csinh(double complex z)
 {
 	double x, y, h;
@@ -147,7 +147,7 @@ csinh(double complex z)
 	return (CMPLX((x * x) * (y - y), (x + x) * (y - y)));
 }
 
-DLLEXPORT double complex
+OLM_DLLEXPORT double complex
 csin(double complex z)
 {
 
diff --git a/src/s_csinhf.c b/src/s_csinhf.c
index f6a5e4b..94954b0 100644
--- a/src/s_csinhf.c
+++ b/src/s_csinhf.c
@@ -38,7 +38,7 @@
 
 static const float huge = 0x1p127;
 
-DLLEXPORT float complex
+OLM_DLLEXPORT float complex
 csinhf(float complex z)
 {
 	float x, y, h;
@@ -96,7 +96,7 @@ csinhf(float complex z)
 	return (CMPLXF((x * x) * (y - y), (x + x) * (y - y)));
 }
 
-DLLEXPORT float complex
+OLM_DLLEXPORT float complex
 csinf(float complex z)
 {
 
diff --git a/src/s_csqrt.c b/src/s_csqrt.c
index 83918b0..105592f 100644
--- a/src/s_csqrt.c
+++ b/src/s_csqrt.c
@@ -47,7 +47,7 @@
 /* We risk spurious overflow for components >= DBL_MAX / (1 + sqrt(2)). */
 #define	THRESH	0x1.a827999fcef32p+1022
 
-DLLEXPORT double complex
+OLM_DLLEXPORT double complex
 csqrt(double complex z)
 {
 	double complex result;
diff --git a/src/s_csqrtf.c b/src/s_csqrtf.c
index 92ddace..a131829 100644
--- a/src/s_csqrtf.c
+++ b/src/s_csqrtf.c
@@ -43,7 +43,7 @@
 #pragma	STDC CX_LIMITED_RANGE	ON
 #endif
 
-DLLEXPORT float complex
+OLM_DLLEXPORT float complex
 csqrtf(float complex z)
 {
 	float a = crealf(z), b = cimagf(z);
diff --git a/src/s_csqrtl.c b/src/s_csqrtl.c
index bd29e69..da97fb2 100644
--- a/src/s_csqrtl.c
+++ b/src/s_csqrtl.c
@@ -46,7 +46,7 @@
 /* We risk spurious overflow for components >= LDBL_MAX / (1 + sqrt(2)). */
 #define	THRESH	(LDBL_MAX / 2.414213562373095048801688724209698L)
 
-DLLEXPORT long double complex
+OLM_DLLEXPORT long double complex
 csqrtl(long double complex z)
 {
 	long double complex result;
diff --git a/src/s_ctanh.c b/src/s_ctanh.c
index 392408c..8d452ee 100644
--- a/src/s_ctanh.c
+++ b/src/s_ctanh.c
@@ -71,7 +71,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double complex
+OLM_DLLEXPORT double complex
 ctanh(double complex z)
 {
 	double x, y;
@@ -134,7 +134,7 @@ ctanh(double complex z)
 	return (CMPLX((beta * rho * s) / denom, t / denom));
 }
 
-DLLEXPORT double complex
+OLM_DLLEXPORT double complex
 ctan(double complex z)
 {
 
diff --git a/src/s_ctanhf.c b/src/s_ctanhf.c
index 729f44c..b2f8f19 100644
--- a/src/s_ctanhf.c
+++ b/src/s_ctanhf.c
@@ -36,7 +36,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float complex
+OLM_DLLEXPORT float complex
 ctanhf(float complex z)
 {
 	float x, y;
@@ -74,7 +74,7 @@ ctanhf(float complex z)
 	return (CMPLXF((beta * rho * s) / denom, t / denom));
 }
 
-DLLEXPORT float complex
+OLM_DLLEXPORT float complex
 ctanf(float complex z)
 {
 
diff --git a/src/s_erf.c b/src/s_erf.c
index 79c7524..33ef913 100644
--- a/src/s_erf.c
+++ b/src/s_erf.c
@@ -186,7 +186,7 @@ sb5  =  2.55305040643316442583e+03, /* 0x40A3F219, 0xCEDF3BE6 */
 sb6  =  4.74528541206955367215e+02, /* 0x407DA874, 0xE79FE763 */
 sb7  = -2.24409524465858183362e+01; /* 0xC03670E2, 0x42712D62 */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 erf(double x)
 {
 	int32_t hx,ix,i;
@@ -238,7 +238,7 @@ erf(double x)
 	if(hx>=0) return one-r/x; else return  r/x-one;
 }
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 erfc(double x)
 {
 	int32_t hx,ix;
diff --git a/src/s_erff.c b/src/s_erff.c
index 70f7fe6..ed6030f 100644
--- a/src/s_erff.c
+++ b/src/s_erff.c
@@ -80,7 +80,7 @@ sb3  =  4.72810211e+01F, /*  0x1.7a3f88p+5 */
 sb4  =  8.93033314e+00F; /*  0x1.1dc54ap+3 */
 
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 erff(float x)
 {
 	int32_t hx,ix,i;
@@ -127,7 +127,7 @@ erff(float x)
 	if(hx>=0) return one-r/x; else return  r/x-one;
 }
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 erfcf(float x)
 {
 	int32_t hx,ix;
diff --git a/src/s_exp2.c b/src/s_exp2.c
index 023657c..e5faf7f 100644
--- a/src/s_exp2.c
+++ b/src/s_exp2.c
@@ -337,7 +337,7 @@ static const double tbl[TBLSIZE * 2] = {
  *	Gal, S. and Bachelis, B.  An Accurate Elementary Mathematical Library
  *	for the IEEE Floating Point Standard.  TOMS 17(1), 26-46 (1991).
  */
-DLLEXPORT double
+OLM_DLLEXPORT double
 exp2(double x)
 {
 	double r, t, twopk, twopkp1000, z;
diff --git a/src/s_exp2f.c b/src/s_exp2f.c
index 9903929..74bc9f3 100644
--- a/src/s_exp2f.c
+++ b/src/s_exp2f.c
@@ -90,7 +90,7 @@ static const double exp2ft[TBLSIZE] = {
  *	Tang, P.  Table-driven Implementation of the Exponential Function
  *	in IEEE Floating-Point Arithmetic.  TOMS 15(2), 144-157 (1989).
  */
-DLLEXPORT float
+OLM_DLLEXPORT float
 exp2f(float x)
 {
 	double tv, twopk, u, z;
diff --git a/src/s_expm1.c b/src/s_expm1.c
index 45b3714..fd125d9 100644
--- a/src/s_expm1.c
+++ b/src/s_expm1.c
@@ -128,7 +128,7 @@ Q3  =  -7.93650757867487942473e-05, /* BF14CE19 9EAADBB7 */
 Q4  =   4.00821782732936239552e-06, /* 3ED0CFCA 86E65239 */
 Q5  =  -2.01099218183624371326e-07; /* BE8AFDB7 6E09C32D */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 expm1(double x)
 {
 	double y,hi,lo,c,t,e,hxs,hfx,r1,twopk;
diff --git a/src/s_expm1f.c b/src/s_expm1f.c
index 2b27eec..cb7ceec 100644
--- a/src/s_expm1f.c
+++ b/src/s_expm1f.c
@@ -37,7 +37,7 @@ invln2		= 1.4426950216e+00,/* 0x3fb8aa3b */
 Q1 = -3.3333212137e-2,		/* -0x888868.0p-28 */
 Q2 =  1.5807170421e-3;		/*  0xcf3010.0p-33 */
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 expm1f(float x)
 {
 	float y,hi,lo,c,t,e,hxs,hfx,r1,twopk;
diff --git a/src/s_fabs.c b/src/s_fabs.c
index 0a634b8..43ffc1a 100644
--- a/src/s_fabs.c
+++ b/src/s_fabs.c
@@ -18,7 +18,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 fabs(double x)
 {
 	u_int32_t high;
diff --git a/src/s_fabsf.c b/src/s_fabsf.c
index 31ebc55..eeceee4 100644
--- a/src/s_fabsf.c
+++ b/src/s_fabsf.c
@@ -24,7 +24,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 fabsf(float x)
 {
 	u_int32_t ix;
diff --git a/src/s_fabsl.c b/src/s_fabsl.c
index 20b6e1e..6bc1971 100644
--- a/src/s_fabsl.c
+++ b/src/s_fabsl.c
@@ -32,7 +32,7 @@
 #include "math_private.h"
 #include "fpmath.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 fabsl(long double x)
 {
 	union IEEEl2bits u;
diff --git a/src/s_fdim.c b/src/s_fdim.c
index cff1462..1781f72 100644
--- a/src/s_fdim.c
+++ b/src/s_fdim.c
@@ -30,7 +30,7 @@
 #include "math_private.h"
 
 #define	DECL(type, fn)			\
-DLLEXPORT type					\
+OLM_DLLEXPORT type					\
 fn(type x, type y)			\
 {					\
 					\
diff --git a/src/s_floor.c b/src/s_floor.c
index 14a41e7..1d67a21 100644
--- a/src/s_floor.c
+++ b/src/s_floor.c
@@ -29,7 +29,7 @@
 
 static const double huge = 1.0e300;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 floor(double x)
 {
 	int32_t i0,i1,j0;
diff --git a/src/s_floorf.c b/src/s_floorf.c
index 70f4818..07efe04 100644
--- a/src/s_floorf.c
+++ b/src/s_floorf.c
@@ -31,7 +31,7 @@
 
 static const float huge = 1.0e30;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 floorf(float x)
 {
 	int32_t i0,j0;
diff --git a/src/s_floorl.c b/src/s_floorl.c
index e0d3d51..8427edb 100644
--- a/src/s_floorl.c
+++ b/src/s_floorl.c
@@ -52,7 +52,7 @@
 
 static const long double huge = 1.0e300;
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 floorl(long double x)
 {
 	union IEEEl2bits u = { .e = x };
diff --git a/src/s_fma.c b/src/s_fma.c
index 60575a8..798e426 100644
--- a/src/s_fma.c
+++ b/src/s_fma.c
@@ -174,7 +174,7 @@ dd_mul(double a, double b)
  * Hardware instructions should be used on architectures that support it,
  * since this implementation will likely be several times slower.
  */
-DLLEXPORT double
+OLM_DLLEXPORT double
 fma(double x, double y, double z)
 {
 	double xs, ys, zs, adj;
diff --git a/src/s_fmaf.c b/src/s_fmaf.c
index 24ee8f4..b3c8efb 100644
--- a/src/s_fmaf.c
+++ b/src/s_fmaf.c
@@ -39,7 +39,7 @@
  * direct double-precision arithmetic suffices, except where double
  * rounding occurs.
  */
-DLLEXPORT float
+OLM_DLLEXPORT float
 fmaf(float x, float y, float z)
 {
 	double xy, result;
diff --git a/src/s_fmal.c b/src/s_fmal.c
index 39fc1e5..2fe30c6 100644
--- a/src/s_fmal.c
+++ b/src/s_fmal.c
@@ -163,7 +163,7 @@ dd_mul(long double a, long double b)
  *	Dekker, T.  A Floating-Point Technique for Extending the
  *	Available Precision.  Numer. Math. 18, 224-242 (1971).
  */
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 fmal(long double x, long double y, long double z)
 {
 	long double xs, ys, zs, adj;
diff --git a/src/s_fmax.c b/src/s_fmax.c
index c5ccb61..73919c6 100644
--- a/src/s_fmax.c
+++ b/src/s_fmax.c
@@ -32,7 +32,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 fmax(double x, double y)
 {
 	union IEEEd2bits u[2];
diff --git a/src/s_fmaxf.c b/src/s_fmaxf.c
index 112b6ac..a803461 100644
--- a/src/s_fmaxf.c
+++ b/src/s_fmaxf.c
@@ -32,7 +32,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 fmaxf(float x, float y)
 {
 	union IEEEf2bits u[2];
diff --git a/src/s_fmaxl.c b/src/s_fmaxl.c
index 1dc34e6..48de991 100644
--- a/src/s_fmaxl.c
+++ b/src/s_fmaxl.c
@@ -32,7 +32,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 fmaxl(long double x, long double y)
 {
 	union IEEEl2bits u[2];
diff --git a/src/s_fmin.c b/src/s_fmin.c
index da8a01c..9c52739 100644
--- a/src/s_fmin.c
+++ b/src/s_fmin.c
@@ -32,7 +32,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 fmin(double x, double y)
 {
 	union IEEEd2bits u[2];
diff --git a/src/s_fminf.c b/src/s_fminf.c
index 88b7590..cc4017f 100644
--- a/src/s_fminf.c
+++ b/src/s_fminf.c
@@ -32,7 +32,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 fminf(float x, float y)
 {
 	union IEEEf2bits u[2];
diff --git a/src/s_fminl.c b/src/s_fminl.c
index 3fce2fb..043886d 100644
--- a/src/s_fminl.c
+++ b/src/s_fminl.c
@@ -32,7 +32,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 fminl(long double x, long double y)
 {
 	union IEEEl2bits u[2];
diff --git a/src/s_fpclassify.c b/src/s_fpclassify.c
index babf7e2..558fb55 100644
--- a/src/s_fpclassify.c
+++ b/src/s_fpclassify.c
@@ -29,7 +29,7 @@
 #include "math_private.h"
 #include "fpmath.h"
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 __fpclassifyd(double d)
 {
 	union IEEEd2bits u;
@@ -51,7 +51,7 @@ __fpclassifyd(double d)
 }
 		
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 __fpclassifyf(float f)
 {
 	union IEEEf2bits u;
@@ -73,7 +73,7 @@ __fpclassifyf(float f)
 }
 
 #ifdef LONG_DOUBLE
-DLLEXPORT int
+OLM_DLLEXPORT int
 __fpclassifyl(long double e)
 {
 	union IEEEl2bits u;
diff --git a/src/s_frexp.c b/src/s_frexp.c
index ef10010..46367a4 100644
--- a/src/s_frexp.c
+++ b/src/s_frexp.c
@@ -31,7 +31,7 @@
 static const double
 two54 =  1.80143985094819840000e+16; /* 0x43500000, 0x00000000 */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 frexp(double x, int *eptr)
 {
 	int32_t hx, ix, lx;
diff --git a/src/s_frexpf.c b/src/s_frexpf.c
index e6626c4..fe63046 100644
--- a/src/s_frexpf.c
+++ b/src/s_frexpf.c
@@ -23,7 +23,7 @@
 static const float
 two25 =  3.3554432000e+07; /* 0x4c000000 */
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 frexpf(float x, int *eptr)
 {
 	int32_t hx,ix;
diff --git a/src/s_frexpl.c b/src/s_frexpl.c
index 5f7368a..ed2d28b 100644
--- a/src/s_frexpl.c
+++ b/src/s_frexpl.c
@@ -36,7 +36,7 @@
 #error "Unsupported long double format"
 #endif
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 frexpl(long double x, int *ex)
 {
 	union IEEEl2bits u;
diff --git a/src/s_ilogb.c b/src/s_ilogb.c
index 99600c6..897e6d6 100644
--- a/src/s_ilogb.c
+++ b/src/s_ilogb.c
@@ -25,7 +25,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 ilogb(double x)
 {
 	int32_t hx,lx,ix;
diff --git a/src/s_ilogbf.c b/src/s_ilogbf.c
index 772f60f..79e359d 100644
--- a/src/s_ilogbf.c
+++ b/src/s_ilogbf.c
@@ -21,7 +21,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 ilogbf(float x)
 {
 	int32_t hx,ix;
diff --git a/src/s_ilogbl.c b/src/s_ilogbl.c
index fcbeb99..d67eea8 100644
--- a/src/s_ilogbl.c
+++ b/src/s_ilogbl.c
@@ -20,7 +20,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 ilogbl(long double x)
 {
 	union IEEEl2bits u;
diff --git a/src/s_isfinite.c b/src/s_isfinite.c
index fe1ea85..504c2b8 100644
--- a/src/s_isfinite.c
+++ b/src/s_isfinite.c
@@ -31,7 +31,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 __isfinite(double d)
 {
 	union IEEEd2bits u;
@@ -40,7 +40,7 @@ __isfinite(double d)
 	return (u.bits.exp != 2047);
 }
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 __isfinitef(float f)
 {
 	union IEEEf2bits u;
@@ -50,7 +50,7 @@ __isfinitef(float f)
 }
 
 #ifdef LONG_DOUBLE
-DLLEXPORT int
+OLM_DLLEXPORT int
 __isfinitel(long double e)
 {
 	union IEEEl2bits u;
diff --git a/src/s_isinf.c b/src/s_isinf.c
index 8c0d7be..c013c91 100644
--- a/src/s_isinf.c
+++ b/src/s_isinf.c
@@ -32,7 +32,7 @@
 
 /* Provided by libc */
 #if 1
-DLLEXPORT int
+OLM_DLLEXPORT int
 (isinf) (double d)
 {
 	union IEEEd2bits u;
@@ -42,7 +42,7 @@ DLLEXPORT int
 }
 #endif
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 __isinff(float f)
 {
 	union IEEEf2bits u;
@@ -52,7 +52,7 @@ __isinff(float f)
 }
 
 #ifdef LONG_DOUBLE
-DLLEXPORT int
+OLM_DLLEXPORT int
 __isinfl(long double e)
 {
 	union IEEEl2bits u;
diff --git a/src/s_isnan.c b/src/s_isnan.c
index 0b8d894..b68aa5b 100644
--- a/src/s_isnan.c
+++ b/src/s_isnan.c
@@ -33,7 +33,7 @@
 
 /* Provided by libc */
 #if 1
-DLLEXPORT int
+OLM_DLLEXPORT int
 (isnan) (double d)
 {
 	union IEEEd2bits u;
@@ -43,7 +43,7 @@ DLLEXPORT int
 }
 #endif
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 __isnanf(float f)
 {
 	union IEEEf2bits u;
@@ -53,7 +53,7 @@ __isnanf(float f)
 }
 
 #ifdef LONG_DOUBLE
-DLLEXPORT int
+OLM_DLLEXPORT int
 __isnanl(long double e)
 {
 	union IEEEl2bits u;
diff --git a/src/s_isnormal.c b/src/s_isnormal.c
index 12074c7..b6f6dd2 100644
--- a/src/s_isnormal.c
+++ b/src/s_isnormal.c
@@ -31,7 +31,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 __isnormal(double d)
 {
 	union IEEEd2bits u;
@@ -40,7 +40,7 @@ __isnormal(double d)
 	return (u.bits.exp != 0 && u.bits.exp != 2047);
 }
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 __isnormalf(float f)
 {
 	union IEEEf2bits u;
@@ -50,7 +50,7 @@ __isnormalf(float f)
 }
 
 #ifdef LONG_DOUBLE
-DLLEXPORT int
+OLM_DLLEXPORT int
 __isnormall(long double e)
 {
 	union IEEEl2bits u;
diff --git a/src/s_log1p.c b/src/s_log1p.c
index 7c5cd5f..aa36fcd 100644
--- a/src/s_log1p.c
+++ b/src/s_log1p.c
@@ -97,7 +97,7 @@ Lp7 = 1.479819860511658591e-01;  /* 3FC2F112 DF3E5244 */
 
 static const double zero = 0.0;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 log1p(double x)
 {
 	double hfsq,f,c,s,z,R,u;
diff --git a/src/s_log1pf.c b/src/s_log1pf.c
index c5643dd..53c8f49 100644
--- a/src/s_log1pf.c
+++ b/src/s_log1pf.c
@@ -35,7 +35,7 @@ Lp7 = 1.4798198640e-01; /* 3E178897 */
 
 static const float zero = 0.0;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 log1pf(float x)
 {
 	float hfsq,f,c,s,z,R,u;
diff --git a/src/s_logb.c b/src/s_logb.c
index d2e6af2..6395dd6 100644
--- a/src/s_logb.c
+++ b/src/s_logb.c
@@ -27,7 +27,7 @@
 static const double
 two54 = 1.80143985094819840000e+16;	/* 43500000 00000000 */
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 logb(double x)
 {
 	int32_t lx,ix;
diff --git a/src/s_logbf.c b/src/s_logbf.c
index f1eeed5..8b1d117 100644
--- a/src/s_logbf.c
+++ b/src/s_logbf.c
@@ -23,7 +23,7 @@
 static const float
 two25 = 3.355443200e+07;		/* 0x4c000000 */
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 logbf(float x)
 {
 	int32_t ix;
diff --git a/src/s_logbl.c b/src/s_logbl.c
index 9d6f62e..3c1336b 100644
--- a/src/s_logbl.c
+++ b/src/s_logbl.c
@@ -17,7 +17,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 logbl(long double x)
 {
 	union IEEEl2bits u;
diff --git a/src/s_lrint.c b/src/s_lrint.c
index d685aa8..e1c5546 100644
--- a/src/s_lrint.c
+++ b/src/s_lrint.c
@@ -46,7 +46,7 @@
  * significant bits than 'type'.  Hence, we bend over backwards for the
  * sake of correctness; an MD implementation could be more efficient.
  */
-DLLEXPORT dtype
+OLM_DLLEXPORT dtype
 fn(type x)
 {
 	fenv_t env;
diff --git a/src/s_lround.c b/src/s_lround.c
index 1085aa8..76fa732 100644
--- a/src/s_lround.c
+++ b/src/s_lround.c
@@ -55,7 +55,7 @@ static const type dtype_max = DTYPE_MAX + 0.5;
 #define	INRANGE(x)	(dtype_max - DTYPE_MAX != 0.5 || \
 			 ((x) > dtype_min && (x) < dtype_max))
 
-DLLEXPORT dtype
+OLM_DLLEXPORT dtype
 fn(type x)
 {
 
diff --git a/src/s_modf.c b/src/s_modf.c
index 18e0875..e3b517b 100644
--- a/src/s_modf.c
+++ b/src/s_modf.c
@@ -26,7 +26,7 @@
 
 static const double one = 1.0;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 modf(double x, double *iptr)
 {
 	int32_t i0,i1,j0;
diff --git a/src/s_modff.c b/src/s_modff.c
index b6ec37a..0a0c840 100644
--- a/src/s_modff.c
+++ b/src/s_modff.c
@@ -22,7 +22,7 @@
 
 static const float one = 1.0;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 modff(float x, float *iptr)
 {
 	int32_t i0,j0;
diff --git a/src/s_modfl.c b/src/s_modfl.c
index ed24f6c..44a9363 100644
--- a/src/s_modfl.c
+++ b/src/s_modfl.c
@@ -54,7 +54,7 @@
 
 static const long double zero[] = { 0.0L, -0.0L };
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 modfl(long double x, long double *iptr)
 {
 	union IEEEl2bits ux;
diff --git a/src/s_nan.c b/src/s_nan.c
index 2aa4c97..d3d745c 100644
--- a/src/s_nan.c
+++ b/src/s_nan.c
@@ -61,7 +61,7 @@ static __inline int digittoint(int c) {
  * consider valid, so we might be violating the C standard. But it's
  * impossible to use nan(3) portably anyway, so this seems good enough.
  */
-DLLEXPORT void
+OLM_DLLEXPORT void
 __scan_nan(u_int32_t *words, int num_words, const char *s)
 {
 	int si;		/* index into s */
@@ -89,7 +89,7 @@ __scan_nan(u_int32_t *words, int num_words, const char *s)
 	}
 }
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 nan(const char *s)
 {
 	union {
@@ -106,7 +106,7 @@ nan(const char *s)
 	return (u.d);
 }
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 nanf(const char *s)
 {
 	union {
diff --git a/src/s_nearbyint.c b/src/s_nearbyint.c
index ee9cf6f..95162a5 100644
--- a/src/s_nearbyint.c
+++ b/src/s_nearbyint.c
@@ -40,7 +40,7 @@
  * rounding can't overflow as long as emax >= p.
  */
 #define	DECL(type, fn, rint)	\
-DLLEXPORT type				\
+OLM_DLLEXPORT type				\
 fn(type x)			\
 {				\
 	type ret;		\
diff --git a/src/s_nextafter.c b/src/s_nextafter.c
index e582741..2fbf2ed 100644
--- a/src/s_nextafter.c
+++ b/src/s_nextafter.c
@@ -25,7 +25,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 nextafter(double x, double y)
 {
 	volatile double t;
diff --git a/src/s_nextafterf.c b/src/s_nextafterf.c
index 6aa34fb..d4cd630 100644
--- a/src/s_nextafterf.c
+++ b/src/s_nextafterf.c
@@ -20,7 +20,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 nextafterf(float x, float y)
 {
 	volatile float t;
diff --git a/src/s_nextafterl.c b/src/s_nextafterl.c
index 39bf61b..d00cd65 100644
--- a/src/s_nextafterl.c
+++ b/src/s_nextafterl.c
@@ -30,7 +30,7 @@
 #error "Unsupported long double format"
 #endif
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 nextafterl(long double x, long double y)
 {
 	volatile long double t;
diff --git a/src/s_nexttoward.c b/src/s_nexttoward.c
index 19f81f0..8729c8f 100644
--- a/src/s_nexttoward.c
+++ b/src/s_nexttoward.c
@@ -29,7 +29,7 @@
 #error "Unsupported long double format"
 #endif
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 nexttoward(double x, long double y)
 {
 	union IEEEl2bits uy;
diff --git a/src/s_nexttowardf.c b/src/s_nexttowardf.c
index 6fa5820..5676995 100644
--- a/src/s_nexttowardf.c
+++ b/src/s_nexttowardf.c
@@ -21,7 +21,7 @@
 #define	LDBL_INFNAN_EXP	(LDBL_MAX_EXP * 2 - 1)
 
 #ifdef LONG_DOUBLE
-DLLEXPORT float
+OLM_DLLEXPORT float
 nexttowardf(float x, long double y)
 {
 	union IEEEl2bits uy;
diff --git a/src/s_remquo.c b/src/s_remquo.c
index c4025ca..13375c3 100644
--- a/src/s_remquo.c
+++ b/src/s_remquo.c
@@ -28,7 +28,7 @@ static const double Zero[] = {0.0, -0.0,};
  * method.  In practice, this is far more bits than are needed to use
  * remquo in reduction algorithms.
  */
-DLLEXPORT double
+OLM_DLLEXPORT double
 remquo(double x, double y, int *quo)
 {
 	int32_t n,hx,hy,hz,ix,iy,sx,i;
diff --git a/src/s_remquof.c b/src/s_remquof.c
index d86ac10..7ef0f72 100644
--- a/src/s_remquof.c
+++ b/src/s_remquof.c
@@ -27,7 +27,7 @@ static const float Zero[] = {0.0, -0.0,};
  * method.  In practice, this is far more bits than are needed to use
  * remquo in reduction algorithms.
  */
-DLLEXPORT float
+OLM_DLLEXPORT float
 remquof(float x, float y, int *quo)
 {
 	int32_t n,hx,hy,hz,ix,iy,sx,i;
diff --git a/src/s_remquol.c b/src/s_remquol.c
index 9efd086..ebde999 100644
--- a/src/s_remquol.c
+++ b/src/s_remquol.c
@@ -64,7 +64,7 @@ static const long double Zero[] = {0.0L, -0.0L};
  * - The high part of the mantissa fits in an int64_t with enough room
  *   for an explicit integer bit in front of the fractional bits.
  */
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 remquol(long double x, long double y, int *quo)
 {
 	union IEEEl2bits ux, uy;
diff --git a/src/s_rint.c b/src/s_rint.c
index bc76fad..f2d8c0e 100644
--- a/src/s_rint.c
+++ b/src/s_rint.c
@@ -34,7 +34,7 @@ TWO52[2]={
  -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
 };
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 rint(double x)
 {
 	int32_t i0,j0,sx;
diff --git a/src/s_rintf.c b/src/s_rintf.c
index 41f7822..60cdb46 100644
--- a/src/s_rintf.c
+++ b/src/s_rintf.c
@@ -28,7 +28,7 @@ TWO23[2]={
  -8.3886080000e+06, /* 0xcb000000 */
 };
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 rintf(float x)
 {
 	int32_t i0,j0,sx;
diff --git a/src/s_rintl.c b/src/s_rintl.c
index 1983ec7..d20768e 100644
--- a/src/s_rintl.c
+++ b/src/s_rintl.c
@@ -56,7 +56,7 @@ shift[2] = {
 };
 static const float zero[2] = { 0.0, -0.0 };
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 rintl(long double x)
 {
 	union IEEEl2bits u;
@@ -102,7 +102,7 @@ rintl(long double x)
  * rounding can't overflow as long as emax >= p.
  */
 #define	DECL(type, fn, rint)	\
-DLLEXPORT type				\
+OLM_DLLEXPORT type				\
 fn(type x)			\
 {				\
 	type ret;		\
diff --git a/src/s_round.c b/src/s_round.c
index ab38566..a982ec3 100644
--- a/src/s_round.c
+++ b/src/s_round.c
@@ -31,7 +31,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 round(double x)
 {
 	double t;
diff --git a/src/s_roundf.c b/src/s_roundf.c
index 0ad5dbc..784a8a5 100644
--- a/src/s_roundf.c
+++ b/src/s_roundf.c
@@ -31,7 +31,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 roundf(float x)
 {
 	float t;
diff --git a/src/s_roundl.c b/src/s_roundl.c
index ea63a4c..dbcd651 100644
--- a/src/s_roundl.c
+++ b/src/s_roundl.c
@@ -31,7 +31,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 roundl(long double x)
 {
 	long double t;
diff --git a/src/s_scalbln.c b/src/s_scalbln.c
index 18554c4..978b523 100644
--- a/src/s_scalbln.c
+++ b/src/s_scalbln.c
@@ -32,7 +32,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 scalbln (double x, long n)
 {
 	int in;
@@ -47,7 +47,7 @@ scalbln (double x, long n)
 	return (scalbn(x, in));
 }
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 scalblnf (float x, long n)
 {
 	int in;
@@ -62,7 +62,7 @@ scalblnf (float x, long n)
 	return (scalbnf(x, in));
 }
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 scalblnl (long double x, long n)
 {
 	int in;
diff --git a/src/s_scalbn.c b/src/s_scalbn.c
index ecabc68..4ab59ca 100644
--- a/src/s_scalbn.c
+++ b/src/s_scalbn.c
@@ -30,7 +30,7 @@ twom54  =  5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */
 huge   = 1.0e+300,
 tiny   = 1.0e-300;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 scalbn (double x, int n)
 {
 	int32_t k,hx,lx;
diff --git a/src/s_scalbnf.c b/src/s_scalbnf.c
index 0a21533..3e8c471 100644
--- a/src/s_scalbnf.c
+++ b/src/s_scalbnf.c
@@ -26,7 +26,7 @@ twom25  =  2.9802322388e-08,	/* 0x33000000 */
 huge   = 1.0e+30,
 tiny   = 1.0e-30;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 scalbnf (float x, int n)
 {
 	int32_t k,ix;
diff --git a/src/s_scalbnl.c b/src/s_scalbnl.c
index 49d7215..d41cd02 100644
--- a/src/s_scalbnl.c
+++ b/src/s_scalbnl.c
@@ -39,7 +39,7 @@ static const long double
 huge = 0x1p16000L,
 tiny = 0x1p-16000L;
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 scalbnl (long double x, int n)
 {
 	union IEEEl2bits u;
diff --git a/src/s_signbit.c b/src/s_signbit.c
index c3eb8d5..3954c41 100644
--- a/src/s_signbit.c
+++ b/src/s_signbit.c
@@ -31,7 +31,7 @@
 #include "fpmath.h"
 #include "math_private.h"
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 __signbit(double d)
 {
 	union IEEEd2bits u;
@@ -40,7 +40,7 @@ __signbit(double d)
 	return (u.bits.sign);
 }
 
-DLLEXPORT int
+OLM_DLLEXPORT int
 __signbitf(float f)
 {
 	union IEEEf2bits u;
@@ -50,7 +50,7 @@ __signbitf(float f)
 }
 
 #ifdef LONG_DOUBLE
-DLLEXPORT int
+OLM_DLLEXPORT int
 __signbitl(long double e)
 {
 	union IEEEl2bits u;
diff --git a/src/s_sin.c b/src/s_sin.c
index cfe1554..3eb0c4a 100644
--- a/src/s_sin.c
+++ b/src/s_sin.c
@@ -51,7 +51,7 @@
 #include "math_private.h"
 //#include "e_rem_pio2.c"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 sin(double x)
 {
 	double y[2],z=0.0;
diff --git a/src/s_sincos.c b/src/s_sincos.c
index 5a5444b..229d967 100644
--- a/src/s_sincos.c
+++ b/src/s_sincos.c
@@ -86,7 +86,7 @@ __kernel_sincos( double x, double y, int iy, double * k_s, double * k_c )
         *k_s = x-((z*(half*y-v*r)-y)-v*S1);
 }
 
-DLLEXPORT void
+OLM_DLLEXPORT void
 sincos(double x, double * s, double * c)
 {
     double y[2];
diff --git a/src/s_sincosf.c b/src/s_sincosf.c
index 5f60e01..09f35af 100644
--- a/src/s_sincosf.c
+++ b/src/s_sincosf.c
@@ -63,7 +63,7 @@ __kernel_sincosdf( double x, float * s, float * c )
 	*s = k_s;
 }
 
-DLLEXPORT void
+OLM_DLLEXPORT void
 sincosf(float x, float * s, float * c) {
 	// Worst approximation of sin and cos NA
 	*s = x;
diff --git a/src/s_sincosl.c b/src/s_sincosl.c
index 264228e..c587a1b 100644
--- a/src/s_sincosl.c
+++ b/src/s_sincosl.c
@@ -23,7 +23,7 @@
 #error "Unsupported long double format"
 #endif
 
-DLLEXPORT void
+OLM_DLLEXPORT void
 sincosl( long double x, long double * s, long double * c )
 {
     *s = cosl( x );
diff --git a/src/s_sinf.c b/src/s_sinf.c
index b7794b6..d987369 100644
--- a/src/s_sinf.c
+++ b/src/s_sinf.c
@@ -35,7 +35,7 @@ s2pio2 = 2*M_PI_2,			/* 0x400921FB, 0x54442D18 */
 s3pio2 = 3*M_PI_2,			/* 0x4012D97C, 0x7F3321D2 */
 s4pio2 = 4*M_PI_2;			/* 0x401921FB, 0x54442D18 */
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 sinf(float x)
 {
 	double y;
diff --git a/src/s_sinl.c b/src/s_sinl.c
index 7490674..7304fc7 100644
--- a/src/s_sinl.c
+++ b/src/s_sinl.c
@@ -39,7 +39,7 @@
 #error "Unsupported long double format"
 #endif
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 sinl(long double x)
 {
 	union IEEEl2bits z;
diff --git a/src/s_tan.c b/src/s_tan.c
index 4971719..07f2244 100644
--- a/src/s_tan.c
+++ b/src/s_tan.c
@@ -50,7 +50,7 @@
 #include "math_private.h"
 //#include "e_rem_pio2.c"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 tan(double x)
 {
 	double y[2],z=0.0;
diff --git a/src/s_tanf.c b/src/s_tanf.c
index b4a66d7..7ffe193 100644
--- a/src/s_tanf.c
+++ b/src/s_tanf.c
@@ -33,7 +33,7 @@ t2pio2 = 2*M_PI_2,			/* 0x400921FB, 0x54442D18 */
 t3pio2 = 3*M_PI_2,			/* 0x4012D97C, 0x7F3321D2 */
 t4pio2 = 4*M_PI_2;			/* 0x401921FB, 0x54442D18 */
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 tanf(float x)
 {
 	double y;
diff --git a/src/s_tanh.c b/src/s_tanh.c
index 97915fa..a8d52da 100644
--- a/src/s_tanh.c
+++ b/src/s_tanh.c
@@ -43,7 +43,7 @@
 
 static const double one = 1.0, two = 2.0, tiny = 1.0e-300, huge = 1.0e300;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 tanh(double x)
 {
 	double t,z;
diff --git a/src/s_tanhf.c b/src/s_tanhf.c
index c3aed03..cd77e4e 100644
--- a/src/s_tanhf.c
+++ b/src/s_tanhf.c
@@ -21,7 +21,7 @@
 #include "math_private.h"
 
 static const float one=1.0, two=2.0, tiny = 1.0e-30, huge = 1.0e30;
-DLLEXPORT float
+OLM_DLLEXPORT float
 tanhf(float x)
 {
 	float t,z;
diff --git a/src/s_tanl.c b/src/s_tanl.c
index 989110b..0370e6b 100644
--- a/src/s_tanl.c
+++ b/src/s_tanl.c
@@ -45,7 +45,7 @@
 #error "Unsupported long double format"
 #endif
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 tanl(long double x)
 {
 	union IEEEl2bits z;
diff --git a/src/s_tgammaf.c b/src/s_tgammaf.c
index 551789d..fbfa3fe 100644
--- a/src/s_tgammaf.c
+++ b/src/s_tgammaf.c
@@ -37,7 +37,7 @@
  * essentially useless, since the function is superexponential and
  * floats have very limited range.
  */
-DLLEXPORT float
+OLM_DLLEXPORT float
 tgammaf(float x)
 {
 
diff --git a/src/s_trunc.c b/src/s_trunc.c
index 23ebb8e..b01bfef 100644
--- a/src/s_trunc.c
+++ b/src/s_trunc.c
@@ -29,7 +29,7 @@
 
 static const double huge = 1.0e300;
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 trunc(double x)
 {
 	int32_t i0,i1,j0;
diff --git a/src/s_truncf.c b/src/s_truncf.c
index 203d06f..d9fc62e 100644
--- a/src/s_truncf.c
+++ b/src/s_truncf.c
@@ -28,7 +28,7 @@
 
 static const float huge = 1.0e30F;
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 truncf(float x)
 {
 	int32_t i0,j0;
diff --git a/src/s_truncl.c b/src/s_truncl.c
index 07518d1..34d7b65 100644
--- a/src/s_truncl.c
+++ b/src/s_truncl.c
@@ -39,7 +39,7 @@
 static const long double huge = 1.0e300;
 static const float zero[] = { 0.0, -0.0 };
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 truncl(long double x)
 {
 	union IEEEl2bits u = { .e = x };
diff --git a/src/w_cabs.c b/src/w_cabs.c
index b404f7b..6b53a60 100644
--- a/src/w_cabs.c
+++ b/src/w_cabs.c
@@ -14,7 +14,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT double
+OLM_DLLEXPORT double
 cabs(double complex z)
 {
 	return hypot(creal(z), cimag(z));
diff --git a/src/w_cabsf.c b/src/w_cabsf.c
index 163dfdb..f14c71a 100644
--- a/src/w_cabsf.c
+++ b/src/w_cabsf.c
@@ -10,7 +10,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT float
+OLM_DLLEXPORT float
 cabsf(z)
 	float complex z;
 {
diff --git a/src/w_cabsl.c b/src/w_cabsl.c
index 06397f5..c10f1d4 100644
--- a/src/w_cabsl.c
+++ b/src/w_cabsl.c
@@ -15,7 +15,7 @@
 
 #include "math_private.h"
 
-DLLEXPORT long double
+OLM_DLLEXPORT long double
 cabsl(long double complex z)
 {
 	return hypotl(creall(z), cimagl(z));