- move libm_hidden_proto to the corresponding headers. Remove from callsites.

  Note that gamma_r is not provided by glibc, perhaps add a SUN specific knob later

96 files changed, 70 insertions, 236 deletions

diff --git a/libm/Makefile.in b/libm/Makefile.in
index 0d06ec718..98e3aafe4 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -66,14 +66,15 @@ libm_CSRC := \
 	s_log1p.c s_logb.c s_matherr.c s_modf.c s_nextafter.c s_round.c \
 	s_rint.c s_scalbn.c s_signgam.c s_significand.c s_sin.c s_tan.c \
 	s_tanh.c s_trunc.c w_acos.c w_acosh.c w_asin.c w_atan2.c w_atanh.c \
-	w_cabs.c w_cosh.c w_drem.c w_exp.c w_fmod.c w_gamma.c w_gamma_r.c \
+	w_cabs.c w_cosh.c w_drem.c w_exp.c w_fmod.c w_gamma.c \
 	w_hypot.c w_j0.c w_j1.c w_jn.c w_lgamma.c w_lgamma_r.c \
 	w_log.c w_log10.c w_pow.c w_remainder.c w_scalb.c w_sinh.c \
 	w_sqrt.c nan.c carg.c s_llrint.c \
 	s_fpclassify.c s_fpclassifyf.c s_signbit.c s_signbitf.c \
-	s_isnan.c s_isnanf.c s_isinf.c s_isinff.c \
+	s_isnan.c s_isnanf.c s_isinf.c s_isinff.c s_finitef.c \
 	s_fdim.c s_fma.c s_fmax.c s_fmin.c s_nearbyint.c \
 	s_remquo.c s_scalbln.c w_exp2.c w_tgamma.c
+# REMOVED: w_gamma_r.c
 FL_MOBJ := \
 	acosf.o acoshf.o asinf.o asinhf.o atan2f.o atanf.o atanhf.o cbrtf.o \
 	ceilf.o copysignf.o cosf.o coshf.o erfcf.o erff.o exp2f.o expf.o \
diff --git a/libm/carg.c b/libm/carg.c
index 7641d5dfe..7b290b0b8 100644
--- a/libm/carg.c
+++ b/libm/carg.c
@@ -21,13 +21,9 @@
 #include <complex.h>
 #include <math.h>
 
-libm_hidden_proto(atan2)
-libm_hidden_proto(carg)
-
 double
 carg (__complex__ double x)
 {
   return atan2 (__imag__ x, __real__ x);
 }
-
 libm_hidden_def(carg)
diff --git a/libm/e_acosh.c b/libm/e_acosh.c
index d5e510eff..3d0a038f0 100644
--- a/libm/e_acosh.c
+++ b/libm/e_acosh.c
@@ -31,8 +31,6 @@ static char rcsid[] = "$NetBSD: e_acosh.c,v 1.9 1995/05/12 04:57:18 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(log1p)
-libm_hidden_proto(sqrt)
 
 #ifdef __STDC__
 static const double
diff --git a/libm/e_asin.c b/libm/e_asin.c
index 8a639771b..ce8372c2d 100644
--- a/libm/e_asin.c
+++ b/libm/e_asin.c
@@ -48,7 +48,6 @@ static char rcsid[] = "$NetBSD: e_asin.c,v 1.9 1995/05/12 04:57:22 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static const double
diff --git a/libm/e_atan2.c b/libm/e_atan2.c
index 7bb38da81..407a12920 100644
--- a/libm/e_atan2.c
+++ b/libm/e_atan2.c
@@ -44,8 +44,6 @@ static char rcsid[] = "$NetBSD: e_atan2.c,v 1.8 1995/05/10 20:44:51 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(atan)
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static const double
diff --git a/libm/e_atanh.c b/libm/e_atanh.c
index cfbe02bed..c6c47bcfa 100644
--- a/libm/e_atanh.c
+++ b/libm/e_atanh.c
@@ -35,7 +35,6 @@ static char rcsid[] = "$NetBSD: e_atanh.c,v 1.8 1995/05/10 20:44:55 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(log1p)
 
 #ifdef __STDC__
 static const double one = 1.0, huge = 1e300;
diff --git a/libm/e_cosh.c b/libm/e_cosh.c
index aa25eefcb..a7e5e4496 100644
--- a/libm/e_cosh.c
+++ b/libm/e_cosh.c
@@ -38,8 +38,6 @@ static char rcsid[] = "$NetBSD: e_cosh.c,v 1.7 1995/05/10 20:44:58 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(expm1)
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static const double one = 1.0, half=0.5, huge = 1.0e300;
diff --git a/libm/e_gamma.c b/libm/e_gamma.c
index 296ebb8f3..bb1bb9198 100644
--- a/libm/e_gamma.c
+++ b/libm/e_gamma.c
@@ -22,7 +22,6 @@
 #include "math_private.h"
 
 libm_hidden_proto(signgam)
-
 #ifdef __STDC__
 	//__private_extern__
 	double attribute_hidden __ieee754_gamma(double x)
diff --git a/libm/e_j0.c b/libm/e_j0.c
index 74defacdf..7778788fb 100644
--- a/libm/e_j0.c
+++ b/libm/e_j0.c
@@ -62,10 +62,6 @@ static char rcsid[] = "$NetBSD: e_j0.c,v 1.8 1995/05/10 20:45:23 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(sin)
-libm_hidden_proto(cos)
-libm_hidden_proto(sqrt)
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static double pzero(double), qzero(double);
diff --git a/libm/e_j1.c b/libm/e_j1.c
index bb3e650eb..4b4274ae5 100644
--- a/libm/e_j1.c
+++ b/libm/e_j1.c
@@ -62,10 +62,6 @@ static char rcsid[] = "$NetBSD: e_j1.c,v 1.8 1995/05/10 20:45:27 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(sin)
-libm_hidden_proto(cos)
-libm_hidden_proto(sqrt)
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static double pone(double), qone(double);
diff --git a/libm/e_jn.c b/libm/e_jn.c
index 53c6396f6..7771eaf5d 100644
--- a/libm/e_jn.c
+++ b/libm/e_jn.c
@@ -43,10 +43,6 @@ static char rcsid[] = "$NetBSD: e_jn.c,v 1.9 1995/05/10 20:45:34 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(sin)
-libm_hidden_proto(cos)
-libm_hidden_proto(sqrt)
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static const double
diff --git a/libm/e_lgamma.c b/libm/e_lgamma.c
index 4dce71c80..af45d11f7 100644
--- a/libm/e_lgamma.c
+++ b/libm/e_lgamma.c
@@ -22,7 +22,6 @@
 #include "math_private.h"
 
 libm_hidden_proto(signgam)
-
 #ifdef __STDC__
 	//__private_extern__
 	double attribute_hidden __ieee754_lgamma(double x)
diff --git a/libm/e_lgamma_r.c b/libm/e_lgamma_r.c
index 5e1b373c0..15b3583aa 100644
--- a/libm/e_lgamma_r.c
+++ b/libm/e_lgamma_r.c
@@ -84,9 +84,6 @@ static char rcsid[] = "$NetBSD: e_lgamma_r.c,v 1.7 1995/05/10 20:45:42 jtc Exp $
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(floor)
-libm_hidden_proto(fabs)
-
 #ifdef __STDC__
 static const double
 #else
diff --git a/libm/e_pow.c b/libm/e_pow.c
index 675149e1f..53ec81329 100644
--- a/libm/e_pow.c
+++ b/libm/e_pow.c
@@ -62,8 +62,6 @@ static char rcsid[] = "$NetBSD: e_pow.c,v 1.9 1995/05/12 04:57:32 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(scalbn)
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static const double
diff --git a/libm/e_rem_pio2.c b/libm/e_rem_pio2.c
index 97ce7bab1..92deaa33e 100644
--- a/libm/e_rem_pio2.c
+++ b/libm/e_rem_pio2.c
@@ -23,7 +23,6 @@ static char rcsid[] = "$NetBSD: e_rem_pio2.c,v 1.8 1995/05/10 20:46:02 jtc Exp $
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(fabs)
 
 /*
  * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi
diff --git a/libm/e_remainder.c b/libm/e_remainder.c
index 17047b385..95eee7480 100644
--- a/libm/e_remainder.c
+++ b/libm/e_remainder.c
@@ -26,7 +26,6 @@ static char rcsid[] = "$NetBSD: e_remainder.c,v 1.8 1995/05/10 20:46:05 jtc Exp
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static const double zero = 0.0;
diff --git a/libm/e_scalb.c b/libm/e_scalb.c
index 772d95523..2f0dba14a 100644
--- a/libm/e_scalb.c
+++ b/libm/e_scalb.c
@@ -23,10 +23,6 @@ static char rcsid[] = "$NetBSD: e_scalb.c,v 1.6 1995/05/10 20:46:09 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(scalbn)
-libm_hidden_proto(finite)
-libm_hidden_proto(rint)
-libm_hidden_proto(__isnan)
 
 #ifdef _SCALB_INT
 #ifdef __STDC__
diff --git a/libm/e_sinh.c b/libm/e_sinh.c
index e8452c287..ec2b1d865 100644
--- a/libm/e_sinh.c
+++ b/libm/e_sinh.c
@@ -35,8 +35,6 @@ static char rcsid[] = "$NetBSD: e_sinh.c,v 1.7 1995/05/10 20:46:13 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(expm1)
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static const double one = 1.0, shuge = 1.0e307;
diff --git a/libm/float_wrappers.c b/libm/float_wrappers.c
index cd0ae1832..58d3926a7 100644
--- a/libm/float_wrappers.c
+++ b/libm/float_wrappers.c
@@ -75,7 +75,6 @@ float       tanhf(float);
 
 
 #ifdef L_acosf
-libm_hidden_proto(acos)
 float acosf (float x)
 {
 	return (float) acos( (double)x );
@@ -84,7 +83,6 @@ float acosf (float x)
 
 
 #ifdef L_acoshf
-libm_hidden_proto(acosh)
 float acoshf (float x)
 {
 	return (float) acosh( (double)x );
@@ -93,7 +91,6 @@ float acoshf (float x)
 
 
 #ifdef L_asinf
-libm_hidden_proto(asin)
 float asinf (float x)
 {
 	return (float) asin( (double)x );
@@ -102,7 +99,6 @@ float asinf (float x)
 
 
 #ifdef L_asinhf
-libm_hidden_proto(asinh)
 float asinhf (float x)
 {
 	return (float) asinh( (double)x );
@@ -111,7 +107,6 @@ float asinhf (float x)
 
 
 #ifdef L_atan2f
-libm_hidden_proto(atan2)
 float atan2f (float x, float y)
 {
 	return (float) atan2( (double)x, (double)y );
@@ -120,7 +115,6 @@ float atan2f (float x, float y)
 
 
 #ifdef L_atanf
-libm_hidden_proto(atan)
 float atanf (float x)
 {
 	return (float) atan( (double)x );
@@ -129,7 +123,6 @@ float atanf (float x)
 
 
 #ifdef L_atanhf
-libm_hidden_proto(atanh)
 float atanhf (float x)
 {
 	return (float) atanh( (double)x );
@@ -138,7 +131,6 @@ float atanhf (float x)
 
 
 #ifdef L_cargf
-libm_hidden_proto(carg)
 float cargf (float complex x)
 {
 	return (float) carg( (double)x );
@@ -147,7 +139,6 @@ float cargf (float complex x)
 
 
 #ifdef L_cbrtf
-libm_hidden_proto(cbrt)
 float cbrtf (float x)
 {
 	return (float) cbrt( (double)x );
@@ -156,7 +147,6 @@ float cbrtf (float x)
 
 
 #ifdef L_ceilf
-libm_hidden_proto(ceil)
 float ceilf (float x)
 {
 	return (float) ceil( (double)x );
@@ -165,7 +155,6 @@ float ceilf (float x)
 
 
 #ifdef L_copysignf
-libm_hidden_proto(copysign)
 float copysignf (float x, float y)
 {
 	return (float) copysign( (double)x, (double)y );
@@ -174,7 +163,6 @@ float copysignf (float x, float y)
 
 
 #ifdef L_cosf
-libm_hidden_proto(cos)
 float cosf (float x)
 {
 	return (float) cos( (double)x );
@@ -183,7 +171,6 @@ float cosf (float x)
 
 
 #ifdef L_coshf
-libm_hidden_proto(cosh)
 float coshf (float x)
 {
 	return (float) cosh( (double)x );
@@ -192,7 +179,6 @@ float coshf (float x)
 
 
 #ifdef L_erfcf
-libm_hidden_proto(erfc)
 float erfcf (float x)
 {
 	return (float) erfc( (double)x );
@@ -201,7 +187,6 @@ float erfcf (float x)
 
 
 #ifdef L_erff
-libm_hidden_proto(erf)
 float erff (float x)
 {
 	return (float) erf( (double)x );
@@ -210,7 +195,6 @@ float erff (float x)
 
 
 #ifdef L_exp2f
-libm_hidden_proto(exp2)
 float exp2f (float x)
 {
 	return (float) exp2( (double)x );
@@ -219,7 +203,6 @@ float exp2f (float x)
 
 
 #ifdef L_expf
-libm_hidden_proto(exp)
 float expf (float x)
 {
 	return (float) exp( (double)x );
@@ -228,7 +211,6 @@ float expf (float x)
 
 
 #ifdef L_expm1f
-libm_hidden_proto(expm1)
 float expm1f (float x)
 {
 	return (float) expm1( (double)x );
@@ -237,7 +219,6 @@ float expm1f (float x)
 
 
 #ifdef L_fabsf
-libm_hidden_proto(fabs)
 float fabsf (float x)
 {
 	return (float) fabs( (double)x );
@@ -246,7 +227,6 @@ float fabsf (float x)
 
 
 #ifdef L_fdimf
-libm_hidden_proto(fdim)
 float fdimf (float x, float y)
 {
 	return (float) fdim( (double)x, (double)y );
@@ -255,7 +235,6 @@ float fdimf (float x, float y)
 
 
 #ifdef L_floorf
-libm_hidden_proto(floor)
 float floorf (float x)
 {
 	return (float) floor( (double)x );
@@ -264,7 +243,6 @@ float floorf (float x)
 
 
 #ifdef L_fmaf
-libm_hidden_proto(fma)
 float fmaf (float x, float y, float z)
 {
 	return (float) fma( (double)x, (double)y, (double)z );
@@ -273,7 +251,6 @@ float fmaf (float x, float y, float z)
 
 
 #ifdef L_fmaxf
-libm_hidden_proto(fmax)
 float fmaxf (float x, float y)
 {
 	return (float) fmax( (double)x, (double)y );
@@ -282,7 +259,6 @@ float fmaxf (float x, float y)
 
 
 #ifdef L_fminf
-libm_hidden_proto(fmin)
 float fminf (float x, float y)
 {
 	return (float) fmin( (double)x, (double)y );
@@ -291,7 +267,6 @@ float fminf (float x, float y)
 
 
 #ifdef L_fmodf
-libm_hidden_proto(fmod)
 float fmodf (float x, float y)
 {
 	return (float) fmod( (double)x, (double)y );
@@ -300,7 +275,6 @@ float fmodf (float x, float y)
 
 
 #ifdef L_frexpf
-libm_hidden_proto(frexp)
 float frexpf (float x, int *_exp)
 {
 	return (float) frexp( (double)x, _exp );
@@ -309,7 +283,6 @@ float frexpf (float x, int *_exp)
 
 
 #ifdef L_hypotf
-libm_hidden_proto(hypot)
 float hypotf (float x, float y)
 {
 	return (float) hypot( (double)x, (double)y );
@@ -318,7 +291,6 @@ float hypotf (float x, float y)
 
 
 #ifdef L_ilogbf
-libm_hidden_proto(ilogb)
 int ilogbf (float x)
 {
 	return (int) ilogb( (double)x );
@@ -327,7 +299,6 @@ int ilogbf (float x)
 
 
 #ifdef L_ldexpf
-libm_hidden_proto(ldexp)
 float ldexpf (float x, int _exp)
 {
 	return (float) ldexp( (double)x, _exp );
@@ -336,7 +307,6 @@ float ldexpf (float x, int _exp)
 
 
 #ifdef L_lgammaf
-libm_hidden_proto(lgamma)
 float lgammaf (float x)
 {
 	return (float) lgamma( (double)x );
@@ -345,7 +315,6 @@ float lgammaf (float x)
 
 
 #ifdef L_llrintf
-libm_hidden_proto(llrint)
 long long llrintf (float x)
 {
 	return (long long) llrint( (double)x );
@@ -354,7 +323,6 @@ long long llrintf (float x)
 
 
 #ifdef L_llroundf
-libm_hidden_proto(llround)
 long long llroundf (float x)
 {
 	return (long long) llround( (double)x );
@@ -363,7 +331,6 @@ long long llroundf (float x)
 
 
 #ifdef L_log10f
-libm_hidden_proto(log10)
 float log10f (float x)
 {
 	return (float) log10( (double)x );
@@ -372,7 +339,6 @@ float log10f (float x)
 
 
 #ifdef L_log1pf
-libm_hidden_proto(log1p)
 float log1pf (float x)
 {
 	return (float) log1p( (double)x );
@@ -381,7 +347,6 @@ float log1pf (float x)
 
 
 #ifdef L_log2f
-libm_hidden_proto(log2)
 float log2f (float x)
 {
 	return (float) log2( (double)x );
@@ -390,7 +355,6 @@ float log2f (float x)
 
 
 #ifdef L_logbf
-libm_hidden_proto(logb)
 float logbf (float x)
 {
 	return (float) logb( (double)x );
@@ -399,7 +363,6 @@ float logbf (float x)
 
 
 #ifdef L_logf
-libm_hidden_proto(log)
 float logf (float x)
 {
 	return (float) log( (double)x );
@@ -408,7 +371,6 @@ float logf (float x)
 
 
 #ifdef L_lrintf
-libm_hidden_proto(lrint)
 long lrintf (float x)
 {
 	return (long) lrint( (double)x );
@@ -417,7 +379,6 @@ long lrintf (float x)
 
 
 #ifdef L_lroundf
-libm_hidden_proto(lround)
 long lroundf (float x)
 {
 	return (long) lround( (double)x );
@@ -426,7 +387,6 @@ long lroundf (float x)
 
 
 #ifdef L_modff
-libm_hidden_proto(modf)
 float modff (float x, float *iptr)
 {
 	double y, result;
@@ -439,7 +399,6 @@ float modff (float x, float *iptr)
 
 
 #ifdef L_nearbyintf
-libm_hidden_proto(nearbyint)
 float nearbyintf (float x)
 {
 	return (float) nearbyint( (double)x );
@@ -448,7 +407,6 @@ float nearbyintf (float x)
 
 
 #ifdef L_nextafterf
-libm_hidden_proto(nextafter)
 float nextafterf (float x, float y)
 {
 	return (float) nextafter( (double)x, (double)y );
@@ -457,7 +415,6 @@ float nextafterf (float x, float y)
 
 
 #ifdef L_nexttowardf
-libm_hidden_proto(nexttoward)
 float nexttowardf (float x, long double y)
 {
 	return (float) nexttoward( (double)x, (double)y );
@@ -466,7 +423,6 @@ float nexttowardf (float x, long double y)
 
 
 #ifdef L_powf
-libm_hidden_proto(pow)
 float powf (float x, float y)
 {
 	return (float) pow( (double)x, (double)y );
@@ -475,7 +431,6 @@ float powf (float x, float y)
 
 
 #ifdef L_remainderf
-libm_hidden_proto(remainder)
 float remainderf (float x, float y)
 {
 	return (float) remainder( (double)x, (double)y );
@@ -484,7 +439,6 @@ float remainderf (float x, float y)
 
 
 #ifdef L_remquof
-libm_hidden_proto(remquo)
 float remquof (float x, float y, int *quo)
 {
 	return (float) remquo( (double)x, (double)y, quo );
@@ -493,7 +447,6 @@ float remquof (float x, float y, int *quo)
 
 
 #ifdef L_rintf
-libm_hidden_proto(rint)
 float rintf (float x)
 {
 	return (float) rint( (double)x );
@@ -502,7 +455,6 @@ float rintf (float x)
 
 
 #ifdef L_roundf
-libm_hidden_proto(round)
 float roundf (float x)
 {
 	return (float) round( (double)x );
@@ -511,7 +463,6 @@ float roundf (float x)
 
 
 #ifdef L_scalblnf
-libm_hidden_proto(scalbln)
 float scalblnf (float x, long _exp)
 {
 	return (float) scalbln( (double)x, _exp );
@@ -520,7 +471,6 @@ float scalblnf (float x, long _exp)
 
 
 #ifdef L_scalbnf
-libm_hidden_proto(scalbn)
 float scalbnf (float x, int _exp)
 {
 	return (float) scalbn( (double)x, _exp );
@@ -529,7 +479,6 @@ float scalbnf (float x, int _exp)
 
 
 #ifdef L_sinf
-libm_hidden_proto(sin)
 float sinf (float x)
 {
 	return (float) sin( (double)x );
@@ -538,7 +487,6 @@ float sinf (float x)
 
 
 #ifdef L_sinhf
-libm_hidden_proto(sinh)
 float sinhf (float x)
 {
 	return (float) sinh( (double)x );
@@ -547,7 +495,6 @@ float sinhf (float x)
 
 
 #ifdef L_sqrtf
-libm_hidden_proto(sqrt)
 float sqrtf (float x)
 {
 	return (float) sqrt( (double)x );
@@ -556,7 +503,6 @@ float sqrtf (float x)
 
 
 #ifdef L_tanf
-libm_hidden_proto(tan)
 float tanf (float x)
 {
 	return (float) tan( (double)x );
@@ -565,7 +511,6 @@ float tanf (float x)
 
 
 #ifdef L_tanhf
-libm_hidden_proto(tanh)
 float tanhf (float x)
 {
 	return (float) tanh( (double)x );
@@ -574,7 +519,6 @@ float tanhf (float x)
 
 
 #ifdef L_tgammaf
-libm_hidden_proto(tgamma)
 float tgammaf (float x)
 {
 	return (float) tgamma( (double)x );
@@ -583,7 +527,6 @@ float tgammaf (float x)
 
 
 #ifdef L_truncf
-libm_hidden_proto(trunc)
 float truncf (float x)
 {
 	return (float) trunc( (double)x );
diff --git a/libm/k_rem_pio2.c b/libm/k_rem_pio2.c
index e3b9bc195..8d1388de2 100644
--- a/libm/k_rem_pio2.c
+++ b/libm/k_rem_pio2.c
@@ -133,8 +133,6 @@ static char rcsid[] = "$NetBSD: k_rem_pio2.c,v 1.7 1995/05/10 20:46:25 jtc Exp $
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(scalbn)
-libm_hidden_proto(floor)
 
 #ifdef __STDC__
 static const int init_jk[] = {2,3,4,6}; /* initial value for jk */
diff --git a/libm/k_standard.c b/libm/k_standard.c
index 4df189853..ed8062c3e 100644
--- a/libm/k_standard.c
+++ b/libm/k_standard.c
@@ -20,9 +20,6 @@ static char rcsid[] = "$NetBSD: k_standard.c,v 1.6 1995/05/10 20:46:35 jtc Exp $
 
 #ifndef _IEEE_LIBM
 
-libm_hidden_proto(copysign)
-libm_hidden_proto(matherr)
-libm_hidden_proto(rint)
 
 #ifndef _USE_WRITE
 #include <stdio.h>			/* fputs(), stderr */
diff --git a/libm/k_tan.c b/libm/k_tan.c
index 2ba464421..95ec1510e 100644
--- a/libm/k_tan.c
+++ b/libm/k_tan.c
@@ -51,7 +51,6 @@ static char rcsid[] = "$NetBSD: k_tan.c,v 1.8 1995/05/10 20:46:37 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static const double
diff --git a/libm/nan.c b/libm/nan.c
index 16e5c1772..662a25d33 100644
--- a/libm/nan.c
+++ b/libm/nan.c
@@ -31,7 +31,9 @@ double nan (const char *tagp)
 	}
 	return NAN;
 }
+libm_hidden_def(nan)
 
+libm_hidden_proto(nanf)
 float nanf (const char *tagp)
 {
 	if (tagp[0] != '\0') {
@@ -41,8 +43,9 @@ float nanf (const char *tagp)
 	}
 	return NAN;
 }
+libm_hidden_def(nanf)
 
-#if 0
+#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
 long double nanl (const char *tagp)
 {
 	if (tagp[0] != '\0') {
@@ -52,4 +55,5 @@ long double nanl (const char *tagp)
 	}
 	return NAN;
 }
+libm_hidden_def(nanl)
 #endif
diff --git a/libm/s_asinh.c b/libm/s_asinh.c
index 9e9a05660..efdee84a6 100644
--- a/libm/s_asinh.c
+++ b/libm/s_asinh.c
@@ -28,8 +28,6 @@ static char rcsid[] = "$NetBSD: s_asinh.c,v 1.9 1995/05/12 04:57:37 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(log1p)
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static const double
@@ -40,7 +38,6 @@ one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
 ln2 =  6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */
 huge=  1.00000000000000000000e+300;
 
-libm_hidden_proto(asinh)
 #ifdef __STDC__
 	double asinh(double x)
 #else
diff --git a/libm/s_atan.c b/libm/s_atan.c
index 9c8035569..7546ae9a0 100644
--- a/libm/s_atan.c
+++ b/libm/s_atan.c
@@ -37,7 +37,6 @@ static char rcsid[] = "$NetBSD: s_atan.c,v 1.8 1995/05/10 20:46:45 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static const double atanhi[] = {
@@ -79,7 +78,6 @@ static double aT[] = {
   1.62858201153657823623e-02, /* 0x3F90AD3A, 0xE322DA11 */
 };
 
-libm_hidden_proto(atan)
 #ifdef __STDC__
 	static const double
 #else
diff --git a/libm/s_cbrt.c b/libm/s_cbrt.c
index f4635874c..d47373e82 100644
--- a/libm/s_cbrt.c
+++ b/libm/s_cbrt.c
@@ -39,7 +39,6 @@ E =  1.41428571428571436819e+00, /* 99/70     = 0x3FF6A0EA, 0x0EA0EA0F */
 F =  1.60714285714285720630e+00, /* 45/28     = 0x3FF9B6DB, 0x6DB6DB6E */
 G =  3.57142857142857150787e-01; /* 5/14      = 0x3FD6DB6D, 0xB6DB6DB7 */
 
-libm_hidden_proto(cbrt)
 #ifdef __STDC__
 	double cbrt(double x)
 #else
diff --git a/libm/s_ceil.c b/libm/s_ceil.c
index 46839410e..76be3ea43 100644
--- a/libm/s_ceil.c
+++ b/libm/s_ceil.c
@@ -32,7 +32,6 @@ static const double huge = 1.0e300;
 static double huge = 1.0e300;
 #endif
 
-libm_hidden_proto(ceil)
 #ifdef __STDC__
 	double ceil(double x)
 #else
diff --git a/libm/s_copysign.c b/libm/s_copysign.c
index 145a26cc1..cb2e0c9ca 100644
--- a/libm/s_copysign.c
+++ b/libm/s_copysign.c
@@ -23,7 +23,6 @@ static char rcsid[] = "$NetBSD: s_copysign.c,v 1.8 1995/05/10 20:46:57 jtc Exp $
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(copysign)
 #ifdef __STDC__
 	double copysign(double x, double y)
 #else
diff --git a/libm/s_cos.c b/libm/s_cos.c
index f05a8a53b..74420fdfc 100644
--- a/libm/s_cos.c
+++ b/libm/s_cos.c
@@ -48,7 +48,6 @@ static char rcsid[] = "$NetBSD: s_cos.c,v 1.7 1995/05/10 20:47:02 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(cos)
 #ifdef __STDC__
 	double cos(double x)
 #else
diff --git a/libm/s_erf.c b/libm/s_erf.c
index 0d24e2174..0996a396f 100644
--- a/libm/s_erf.c
+++ b/libm/s_erf.c
@@ -112,7 +112,6 @@ static char rcsid[] = "$NetBSD: s_erf.c,v 1.8 1995/05/10 20:47:05 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static const double
@@ -193,7 +192,6 @@ sb5  =  2.55305040643316442583e+03, /* 0x40A3F219, 0xCEDF3BE6 */
 sb6  =  4.74528541206955367215e+02, /* 0x407DA874, 0xE79FE763 */
 sb7  = -2.24409524465858183362e+01; /* 0xC03670E2, 0x42712D62 */
 
-libm_hidden_proto(erf)
 #ifdef __STDC__
 	double erf(double x)
 #else
@@ -251,7 +249,6 @@ libm_hidden_proto(erf)
 }
 libm_hidden_def(erf)
 
-libm_hidden_proto(erfc)
 #ifdef __STDC__
 	double erfc(double x)
 #else
diff --git a/libm/s_expm1.c b/libm/s_expm1.c
index 2adeead0b..4eab15c43 100644
--- a/libm/s_expm1.c
+++ b/libm/s_expm1.c
@@ -131,7 +131,6 @@ Q3  =  -7.93650757867487942473e-05, /* BF14CE19 9EAADBB7 */
 Q4  =   4.00821782732936239552e-06, /* 3ED0CFCA 86E65239 */
 Q5  =  -2.01099218183624371326e-07; /* BE8AFDB7 6E09C32D */
 
-libm_hidden_proto(expm1)
 #ifdef __STDC__
 	double expm1(double x)
 #else
diff --git a/libm/s_fabs.c b/libm/s_fabs.c
index c1538ca9e..deb91382d 100644
--- a/libm/s_fabs.c
+++ b/libm/s_fabs.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: s_fabs.c,v 1.7 1995/05/10 20:47:13 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(fabs)
 #ifdef __STDC__
 	double fabs(double x)
 #else
diff --git a/libm/s_fdim.c b/libm/s_fdim.c
index 6fdf3c2d6..98f140d17 100644
--- a/libm/s_fdim.c
+++ b/libm/s_fdim.c
@@ -7,7 +7,6 @@
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(fdim)
 #ifdef __STDC__
 	double fdim(double x, double y)
 #else
diff --git a/libm/s_finite.c b/libm/s_finite.c
index 70b9aadc4..758da9a40 100644
--- a/libm/s_finite.c
+++ b/libm/s_finite.c
@@ -10,10 +10,6 @@
  * ====================================================
  */
 
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_finite.c,v 1.8 1995/05/10 20:47:17 jtc Exp $";
-#endif
-
 /*
  * finite(x) returns 1 is x is finite, else 0;
  * no branching!
@@ -22,17 +18,12 @@ static char rcsid[] = "$NetBSD: s_finite.c,v 1.8 1995/05/10 20:47:17 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#ifdef __STDC__
-	int __finite(double x)
-#else
-	int __finite(x)
-	double x;
-#endif
+int __finite(double x)
 {
 	int32_t hx;
 	GET_HIGH_WORD(hx,x);
 	return (int)((u_int32_t)((hx&0x7fffffff)-0x7ff00000)>>31);
 }
-libm_hidden_proto(finite)
-strong_alias(__finite,finite)
-libm_hidden_def(finite)
+libm_hidden_def(__finite)
+weak_alias(__finite,finite)
+libm_hidden_weak(finite)
diff --git a/libm/s_finitef.c b/libm/s_finitef.c
new file mode 100644
index 000000000..66eba8f98
--- /dev/null
+++ b/libm/s_finitef.c
@@ -0,0 +1,32 @@
+/* s_finitef.c -- float version of s_finite.c.
+ * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
+ */
+
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+/*
+ * finitef(x) returns 1 is x is finite, else 0;
+ * no branching!
+ */
+
+#include "math.h"
+#include "math_private.h"
+
+libm_hidden_proto(__finitef)
+int __finitef(float x)
+{
+	int32_t ix;
+	GET_FLOAT_WORD(ix,x);
+	return (int)((u_int32_t)((ix&0x7fffffff)-0x7f800000)>>31);
+}
+libm_hidden_def(__finitef)
+strong_alias(__finitef,finitef)
diff --git a/libm/s_floor.c b/libm/s_floor.c
index 39b24c05b..1eccfcd8c 100644
--- a/libm/s_floor.c
+++ b/libm/s_floor.c
@@ -32,7 +32,6 @@ static const double huge = 1.0e300;
 static double huge = 1.0e300;
 #endif
 
-libm_hidden_proto(floor)
 #ifdef __STDC__
 	double floor(double x)
 #else
diff --git a/libm/s_fma.c b/libm/s_fma.c
index e5ff5a722..f9e8cf974 100644
--- a/libm/s_fma.c
+++ b/libm/s_fma.c
@@ -20,14 +20,11 @@
 
 #include <math.h>
 
+libm_hidden_proto(__fma)
 double
 __fma (double x, double y, double z)
 {
   return (x * y) + z;
 }
-weak_alias (__fma, fma)
-
-#ifdef NO_LONG_DOUBLE
-strong_alias (__fma, __fmal)
-weak_alias (__fmal, fmal)
-#endif
+libm_hidden_def(__fma)
+strong_alias (__fma, fma)
diff --git a/libm/s_fmax.c b/libm/s_fmax.c
index 61ec12d81..e3cda763f 100644
--- a/libm/s_fmax.c
+++ b/libm/s_fmax.c
@@ -7,7 +7,6 @@
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(fmax)
 #ifdef __STDC__
 	double fmax(double x, double y)
 #else
diff --git a/libm/s_fmin.c b/libm/s_fmin.c
index e30808d85..4d2a0cf56 100644
--- a/libm/s_fmin.c
+++ b/libm/s_fmin.c
@@ -7,7 +7,6 @@
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(fmin)
 #ifdef __STDC__
 	double fmin(double x, double y)
 #else
diff --git a/libm/s_fpclassify.c b/libm/s_fpclassify.c
index 6175f51ad..d2c4c8232 100644
--- a/libm/s_fpclassify.c
+++ b/libm/s_fpclassify.c
@@ -22,7 +22,6 @@
 
 #include "math_private.h"
 
-libm_hidden_proto (__fpclassify)
 int
 __fpclassify (double x)
 {
diff --git a/libm/s_fpclassifyf.c b/libm/s_fpclassifyf.c
index 3a8fd56df..602d8b2b4 100644
--- a/libm/s_fpclassifyf.c
+++ b/libm/s_fpclassifyf.c
@@ -19,10 +19,8 @@
    02111-1307 USA.  */
 
 #include <math.h>
-
 #include "math_private.h"
 
-
 libm_hidden_proto (__fpclassifyf)
 int
 __fpclassifyf (float x)
diff --git a/libm/s_frexp.c b/libm/s_frexp.c
index ed5e31395..9ec46244a 100644
--- a/libm/s_frexp.c
+++ b/libm/s_frexp.c
@@ -34,7 +34,6 @@ static double
 #endif
 two54 =  1.80143985094819840000e+16; /* 0x43500000, 0x00000000 */
 
-libm_hidden_proto(frexp)
 #ifdef __STDC__
 	double frexp(double x, int *eptr)
 #else
diff --git a/libm/s_ilogb.c b/libm/s_ilogb.c
index db7c8553e..2617757fd 100644
--- a/libm/s_ilogb.c
+++ b/libm/s_ilogb.c
@@ -23,7 +23,6 @@ static char rcsid[] = "$NetBSD: s_ilogb.c,v 1.9 1995/05/10 20:47:28 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(ilogb)
 #ifdef __STDC__
 	int ilogb(double x)
 #else
diff --git a/libm/s_isinf.c b/libm/s_isinf.c
index ce509f072..99a1cdf18 100644
--- a/libm/s_isinf.c
+++ b/libm/s_isinf.c
@@ -4,10 +4,6 @@
  * Public domain.
  */
 
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_isinf.c,v 1.3 1995/05/11 23:20:14 jtc Exp $";
-#endif
-
 /*
  * isinf(x) returns 1 is x is inf, -1 if x is -inf, else 0;
  * no branching!
@@ -16,7 +12,6 @@ static char rcsid[] = "$NetBSD: s_isinf.c,v 1.3 1995/05/11 23:20:14 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(__isinf)
 int
 __isinf (double x)
 {
@@ -26,9 +21,6 @@ __isinf (double x)
 	lx |= -lx;
 	return ~(lx >> 31) & (hx >> 30);
 }
-libm_hidden_def (__isinf)
+libm_hidden_def(__isinf)
 weak_alias (__isinf, isinf)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__isinf, __isinfl)
-weak_alias (__isinf, isinfl)
-#endif
+libm_hidden_weak(isinf)
diff --git a/libm/s_isinff.c b/libm/s_isinff.c
index 33e274947..6827024af 100644
--- a/libm/s_isinff.c
+++ b/libm/s_isinff.c
@@ -3,10 +3,6 @@
  * Public domain.
  */
 
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_isinff.c,v 1.3 1995/05/11 23:20:21 jtc Exp $";
-#endif
-
 /*
  * isinff(x) returns 1 if x is inf, -1 if x is -inf, else 0;
  * no branching!
@@ -26,5 +22,5 @@ __isinff (float x)
 	t |= -t;
 	return ~(t >> 31) & (ix >> 30);
 }
-libm_hidden_def (__isinff)
-weak_alias (__isinff, isinff)
+libm_hidden_def(__isinff)
+strong_alias (__isinff, isinff)
diff --git a/libm/s_isnan.c b/libm/s_isnan.c
index 6263d1c3f..671c5cb2e 100644
--- a/libm/s_isnan.c
+++ b/libm/s_isnan.c
@@ -10,10 +10,6 @@
  * ====================================================
  */
 
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_isnan.c,v 1.8 1995/05/10 20:47:36 jtc Exp $";
-#endif
-
 /*
  * isnan(x) returns 1 is x is nan, else 0;
  * no branching!
@@ -22,7 +18,6 @@ static char rcsid[] = "$NetBSD: s_isnan.c,v 1.8 1995/05/10 20:47:36 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto (__isnan)
 #ifdef __STDC__
 	int __isnan(double x)
 #else
@@ -37,9 +32,6 @@ libm_hidden_proto (__isnan)
 	hx = 0x7ff00000 - hx;
 	return (int)(((u_int32_t)hx)>>31);
 }
-libm_hidden_def (__isnan)
-weak_alias (__isnan, isnan)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__isnan, __isnanl)
-weak_alias (__isnan, isnanl)
-#endif
+libm_hidden_def(__isnan)
+weak_alias(__isnan,isnan)
+libm_hidden_weak(isnan)
diff --git a/libm/s_isnanf.c b/libm/s_isnanf.c
index fa2d2fe89..97c354d1a 100644
--- a/libm/s_isnanf.c
+++ b/libm/s_isnanf.c
@@ -13,10 +13,6 @@
  * ====================================================
  */
 
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_isnanf.c,v 1.4 1995/05/10 20:47:38 jtc Exp $";
-#endif
-
 /*
  * isnanf(x) returns 1 is x is nan, else 0;
  * no branching!
@@ -26,12 +22,7 @@ static char rcsid[] = "$NetBSD: s_isnanf.c,v 1.4 1995/05/10 20:47:38 jtc Exp $";
 #include "math_private.h"
 
 libm_hidden_proto (__isnanf)
-#ifdef __STDC__
-	int __isnanf(float x)
-#else
-	int __isnanf(x)
-	float x;
-#endif
+int __isnanf(float x)
 {
 	int32_t ix;
 	GET_FLOAT_WORD(ix,x);
diff --git a/libm/s_ldexp.c b/libm/s_ldexp.c
index ffc268b52..a065f5ada 100644
--- a/libm/s_ldexp.c
+++ b/libm/s_ldexp.c
@@ -18,10 +18,7 @@ static char rcsid[] = "$NetBSD: s_ldexp.c,v 1.6 1995/05/10 20:47:40 jtc Exp $";
 #include "math_private.h"
 #include <errno.h>
 
-libm_hidden_proto(scalbn)
-libm_hidden_proto(finite)
 
-libm_hidden_proto(ldexp)
 #ifdef __STDC__
 	double ldexp(double value, int exp)
 #else
diff --git a/libm/s_llrint.c b/libm/s_llrint.c
index 047290ab8..96e1495c7 100644
--- a/libm/s_llrint.c
+++ b/libm/s_llrint.c
@@ -29,8 +29,6 @@ static const double two52[2] =
  -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
 };
 
-libm_hidden_proto(llrint)
-
 long long int
 llrint (double x)
 {
diff --git a/libm/s_llround.c b/libm/s_llround.c
index 1db0c2836..a549ccc8c 100644
--- a/libm/s_llround.c
+++ b/libm/s_llround.c
@@ -22,7 +22,6 @@
 
 #include "math_private.h"
 
-libm_hidden_proto(llround)
 long long int
 llround (double x)
 {
diff --git a/libm/s_log1p.c b/libm/s_log1p.c
index 7acf6289b..695019a9e 100644
--- a/libm/s_log1p.c
+++ b/libm/s_log1p.c
@@ -104,7 +104,6 @@ static const double zero = 0.0;
 static double zero = 0.0;
 #endif
 
-libm_hidden_proto(log1p)
 #ifdef __STDC__
 	double log1p(double x)
 #else
diff --git a/libm/s_logb.c b/libm/s_logb.c
index ff47ab476..173b47764 100644
--- a/libm/s_logb.c
+++ b/libm/s_logb.c
@@ -23,9 +23,7 @@ static char rcsid[] = "$NetBSD: s_logb.c,v 1.8 1995/05/10 20:47:50 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(fabs)
 
-libm_hidden_proto(logb)
 #ifdef __STDC__
 	double logb(double x)
 #else
diff --git a/libm/s_lrint.c b/libm/s_lrint.c
index 61c521240..a0db12d76 100644
--- a/libm/s_lrint.c
+++ b/libm/s_lrint.c
@@ -30,7 +30,6 @@ static const double two52[2] =
 };
 
 
-libm_hidden_proto(lrint)
 long int
 lrint (double x)
 {
diff --git a/libm/s_lround.c b/libm/s_lround.c
index 604004f7f..056a48724 100644
--- a/libm/s_lround.c
+++ b/libm/s_lround.c
@@ -22,7 +22,6 @@
 
 #include "math_private.h"
 
-libm_hidden_proto(lround)
 long int
 lround (double x)
 {
diff --git a/libm/s_matherr.c b/libm/s_matherr.c
index 0c102e628..fda4e191b 100644
--- a/libm/s_matherr.c
+++ b/libm/s_matherr.c
@@ -19,7 +19,6 @@ static char rcsid[] = "$NetBSD: s_matherr.c,v 1.6 1995/05/10 20:47:53 jtc Exp $"
 
 #ifndef _IEEE_LIBM
 
-libm_hidden_proto(matherr)
 #ifdef __STDC__
 	int matherr(struct exception *x)
 #else
diff --git a/libm/s_modf.c b/libm/s_modf.c
index 0cf0e8356..24369c02d 100644
--- a/libm/s_modf.c
+++ b/libm/s_modf.c
@@ -33,7 +33,6 @@ static const double one = 1.0;
 static double one = 1.0;
 #endif
 
-libm_hidden_proto(modf)
 #ifdef __STDC__
 	double modf(double x, double *iptr)
 #else
diff --git a/libm/s_nearbyint.c b/libm/s_nearbyint.c
index 1bd8d4054..52ebbdba1 100644
--- a/libm/s_nearbyint.c
+++ b/libm/s_nearbyint.c
@@ -12,7 +12,6 @@
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(nearbyint)
 #ifdef __STDC__
 	double nearbyint(double x)
 #else
diff --git a/libm/s_nextafter.c b/libm/s_nextafter.c
index bdc6f3a61..1034e3290 100644
--- a/libm/s_nextafter.c
+++ b/libm/s_nextafter.c
@@ -24,7 +24,6 @@ static char rcsid[] = "$NetBSD: s_nextafter.c,v 1.8 1995/05/10 20:47:58 jtc Exp
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(nextafter)
 #ifdef __STDC__
 	double nextafter(double x, double y)
 #else
diff --git a/libm/s_remquo.c b/libm/s_remquo.c
index 18853e211..9cbf8c4ab 100644
--- a/libm/s_remquo.c
+++ b/libm/s_remquo.c
@@ -7,7 +7,6 @@
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(remquo)
 #ifdef __STDC__
 	double remquo(double x, double y, int *quo)	/* wrapper remquo */
 #else
diff --git a/libm/s_rint.c b/libm/s_rint.c
index ce42aa99d..d20f1bd3f 100644
--- a/libm/s_rint.c
+++ b/libm/s_rint.c
@@ -37,7 +37,6 @@ TWO52[2]={
  -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
 };
 
-libm_hidden_proto(rint)
 #ifdef __STDC__
 	double rint(double x)
 #else
diff --git a/libm/s_round.c b/libm/s_round.c
index 03089482b..7965c6f68 100644
--- a/libm/s_round.c
+++ b/libm/s_round.c
@@ -25,7 +25,6 @@
 
 static const double huge = 1.0e300;
 
-libm_hidden_proto(round)
 double
 round (double x)
 {
diff --git a/libm/s_scalbln.c b/libm/s_scalbln.c
index a780f3710..d2ea79153 100644
--- a/libm/s_scalbln.c
+++ b/libm/s_scalbln.c
@@ -20,7 +20,6 @@
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(scalbln)
 #ifdef __STDC__
 static const double
 #else
diff --git a/libm/s_scalbn.c b/libm/s_scalbn.c
index 6a7452485..2c5ada3fc 100644
--- a/libm/s_scalbn.c
+++ b/libm/s_scalbn.c
@@ -24,7 +24,6 @@ static char rcsid[] = "$NetBSD: s_scalbn.c,v 1.8 1995/05/10 20:48:08 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(copysign)
 
 #ifdef __STDC__
 static const double
@@ -36,7 +35,6 @@ twom54  =  5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */
 huge   = 1.0e+300,
 tiny   = 1.0e-300;
 
-libm_hidden_proto(scalbn)
 #ifdef __STDC__
 	double scalbn (double x, int n)
 #else
diff --git a/libm/s_signbit.c b/libm/s_signbit.c
index c8a72c539..c9f6527af 100644
--- a/libm/s_signbit.c
+++ b/libm/s_signbit.c
@@ -22,7 +22,6 @@
 
 #include "math_private.h"
 
-libm_hidden_proto(__signbit)
 int
 __signbit (double x)
 {
diff --git a/libm/s_significand.c b/libm/s_significand.c
index e47618cfc..2a7980a44 100644
--- a/libm/s_significand.c
+++ b/libm/s_significand.c
@@ -23,7 +23,6 @@ static char rcsid[] = "$NetBSD: s_significand.c,v 1.6 1995/05/10 20:48:11 jtc Ex
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(ilogb)
 
 #ifdef __STDC__
 	double significand(double x)
@@ -34,3 +33,4 @@ libm_hidden_proto(ilogb)
 {
 	return __ieee754_scalb(x,(double) -ilogb(x));
 }
+libm_hidden_def(significand)
diff --git a/libm/s_sin.c b/libm/s_sin.c
index ef9a36d7d..c14709b28 100644
--- a/libm/s_sin.c
+++ b/libm/s_sin.c
@@ -48,7 +48,6 @@ static char rcsid[] = "$NetBSD: s_sin.c,v 1.7 1995/05/10 20:48:15 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(sin)
 #ifdef __STDC__
 	double sin(double x)
 #else
diff --git a/libm/s_tan.c b/libm/s_tan.c
index bab343c73..26bb39f9b 100644
--- a/libm/s_tan.c
+++ b/libm/s_tan.c
@@ -47,7 +47,6 @@ static char rcsid[] = "$NetBSD: s_tan.c,v 1.7 1995/05/10 20:48:18 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(tan)
 #ifdef __STDC__
 	double tan(double x)
 #else
diff --git a/libm/s_tanh.c b/libm/s_tanh.c
index ecabbef98..edadbfe21 100644
--- a/libm/s_tanh.c
+++ b/libm/s_tanh.c
@@ -41,8 +41,6 @@ static char rcsid[] = "$NetBSD: s_tanh.c,v 1.7 1995/05/10 20:48:22 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(expm1)
-libm_hidden_proto(fabs)
 
 #ifdef __STDC__
 static const double one=1.0, two=2.0, tiny = 1.0e-300;
@@ -50,7 +48,6 @@ static const double one=1.0, two=2.0, tiny = 1.0e-300;
 static double one=1.0, two=2.0, tiny = 1.0e-300;
 #endif
 
-libm_hidden_proto(tanh)
 #ifdef __STDC__
 	double tanh(double x)
 #else
diff --git a/libm/s_trunc.c b/libm/s_trunc.c
index 8a4f5ae05..6e5678be1 100644
--- a/libm/s_trunc.c
+++ b/libm/s_trunc.c
@@ -23,7 +23,6 @@
 #include "math_private.h"
 
 
-libm_hidden_proto(trunc)
 double
 trunc (double x)
 {
diff --git a/libm/w_acos.c b/libm/w_acos.c
index ea00cf010..f93f6bb4d 100644
--- a/libm/w_acos.c
+++ b/libm/w_acos.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: w_acos.c,v 1.6 1995/05/10 20:48:26 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(acos)
 #ifdef __STDC__
 	double acos(double x)		/* wrapper acos */
 #else
diff --git a/libm/w_acosh.c b/libm/w_acosh.c
index e0efb8a63..3268218bf 100644
--- a/libm/w_acosh.c
+++ b/libm/w_acosh.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: w_acosh.c,v 1.6 1995/05/10 20:48:31 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(acosh)
 #ifdef __STDC__
 	double acosh(double x)		/* wrapper acosh */
 #else
diff --git a/libm/w_asin.c b/libm/w_asin.c
index ad156ef05..a028a1d34 100644
--- a/libm/w_asin.c
+++ b/libm/w_asin.c
@@ -23,7 +23,6 @@ static char rcsid[] = "$NetBSD: w_asin.c,v 1.6 1995/05/10 20:48:35 jtc Exp $";
 #include "math_private.h"
 
 
-libm_hidden_proto(asin)
 #ifdef __STDC__
 	double asin(double x)		/* wrapper asin */
 #else
diff --git a/libm/w_atan2.c b/libm/w_atan2.c
index c2da4681c..6a13d2b3c 100644
--- a/libm/w_atan2.c
+++ b/libm/w_atan2.c
@@ -20,7 +20,6 @@ static char rcsid[] = "$NetBSD: w_atan2.c,v 1.6 1995/05/10 20:48:39 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(atan2)
 #ifdef __STDC__
 	double atan2(double y, double x)	/* wrapper atan2 */
 #else
diff --git a/libm/w_atanh.c b/libm/w_atanh.c
index 18d0a4a80..9839313ad 100644
--- a/libm/w_atanh.c
+++ b/libm/w_atanh.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: w_atanh.c,v 1.6 1995/05/10 20:48:43 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(atanh)
 #ifdef __STDC__
 	double atanh(double x)		/* wrapper atanh */
 #else
diff --git a/libm/w_cabs.c b/libm/w_cabs.c
index 485e120db..d2a54cd9f 100644
--- a/libm/w_cabs.c
+++ b/libm/w_cabs.c
@@ -8,9 +8,9 @@
 #include <complex.h>
 #include <math.h>
 
-libm_hidden_proto(hypot)
 
 double cabs(double _Complex z)
 {
 	return hypot(__real__ z, __imag__ z);
 }
+libm_hidden_def(cabs)
diff --git a/libm/w_cosh.c b/libm/w_cosh.c
index c785af4b5..0766e373d 100644
--- a/libm/w_cosh.c
+++ b/libm/w_cosh.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: w_cosh.c,v 1.6 1995/05/10 20:48:47 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(cosh)
 #ifdef __STDC__
 	double cosh(double x)		/* wrapper cosh */
 #else
diff --git a/libm/w_drem.c b/libm/w_drem.c
index 22e281761..6b3dd3937 100644
--- a/libm/w_drem.c
+++ b/libm/w_drem.c
@@ -7,9 +7,9 @@
 
 #include <math.h>
 
-libm_hidden_proto(remainder)
 
 double drem(double x, double y)
 {
 	return remainder(x, y);
 }
+libm_hidden_def(drem)
diff --git a/libm/w_exp.c b/libm/w_exp.c
index b9b7ccc26..e11222499 100644
--- a/libm/w_exp.c
+++ b/libm/w_exp.c
@@ -29,7 +29,6 @@ static double
 o_threshold=  7.09782712893383973096e+02,  /* 0x40862E42, 0xFEFA39EF */
 u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */
 
-libm_hidden_proto(exp)
 #ifdef __STDC__
 	double exp(double x)		/* wrapper exp */
 #else
diff --git a/libm/w_exp2.c b/libm/w_exp2.c
index 20a9cf35b..604d6ecff 100644
--- a/libm/w_exp2.c
+++ b/libm/w_exp2.c
@@ -14,7 +14,6 @@
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(exp2)
 #ifdef __STDC__
 	double exp2(double x)
 #else
diff --git a/libm/w_fmod.c b/libm/w_fmod.c
index eed38372b..ce7d78469 100644
--- a/libm/w_fmod.c
+++ b/libm/w_fmod.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: w_fmod.c,v 1.6 1995/05/10 20:48:55 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(fmod)
 #ifdef __STDC__
 	double fmod(double x, double y)	/* wrapper fmod */
 #else
diff --git a/libm/w_gamma.c b/libm/w_gamma.c
index 182dece3e..0b286e190 100644
--- a/libm/w_gamma.c
+++ b/libm/w_gamma.c
@@ -24,7 +24,6 @@ static char rcsid[] = "$NetBSD: w_gamma.c,v 1.7 1995/11/20 22:06:43 jtc Exp $";
 #include "math_private.h"
 
 libm_hidden_proto(signgam)
-
 #ifdef __STDC__
 	double gamma(double x)
 #else
@@ -47,3 +46,4 @@ libm_hidden_proto(signgam)
             return y;
 #endif
 }
+libm_hidden_def(gamma)
diff --git a/libm/w_gamma_r.c b/libm/w_gamma_r.c
index 321e86480..b9f14fb48 100644
--- a/libm/w_gamma_r.c
+++ b/libm/w_gamma_r.c
@@ -23,6 +23,7 @@ static char rcsid[] = "$NetBSD: w_gamma_r.c,v 1.7 1995/11/20 22:06:45 jtc Exp $"
 
 
 double gamma_r(double x, int *signgamp);
+libm_hidden_proto(gamma_r)
 #ifdef __STDC__
 	double gamma_r(double x, int *signgamp) /* wrapper lgamma_r */
 #else
@@ -45,3 +46,4 @@ double gamma_r(double x, int *signgamp);
             return y;
 #endif
 }
+libm_hidden_def(gamma_r)
diff --git a/libm/w_hypot.c b/libm/w_hypot.c
index e4b299d5f..9ed348e3e 100644
--- a/libm/w_hypot.c
+++ b/libm/w_hypot.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: w_hypot.c,v 1.6 1995/05/10 20:49:07 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(hypot)
 #ifdef __STDC__
 	double hypot(double x, double y)/* wrapper hypot */
 #else
diff --git a/libm/w_j0.c b/libm/w_j0.c
index 61f4f20fc..27290c858 100644
--- a/libm/w_j0.c
+++ b/libm/w_j0.c
@@ -39,6 +39,7 @@ static char rcsid[] = "$NetBSD: w_j0.c,v 1.6 1995/05/10 20:49:11 jtc Exp $";
 	    return z;
 #endif
 }
+libm_hidden_def(j0)
 
 #ifdef __STDC__
 	double y0(double x)		/* wrapper y0 */
@@ -67,3 +68,4 @@ static char rcsid[] = "$NetBSD: w_j0.c,v 1.6 1995/05/10 20:49:11 jtc Exp $";
 	    return z;
 #endif
 }
+libm_hidden_def(y0)
diff --git a/libm/w_j1.c b/libm/w_j1.c
index 389dc156c..9ce34cca3 100644
--- a/libm/w_j1.c
+++ b/libm/w_j1.c
@@ -40,6 +40,7 @@ static char rcsid[] = "$NetBSD: w_j1.c,v 1.6 1995/05/10 20:49:15 jtc Exp $";
 	    return z;
 #endif
 }
+libm_hidden_def(j1)
 
 #ifdef __STDC__
 	double y1(double x)		/* wrapper y1 */
@@ -68,3 +69,4 @@ static char rcsid[] = "$NetBSD: w_j1.c,v 1.6 1995/05/10 20:49:15 jtc Exp $";
 	    return z;
 #endif
 }
+libm_hidden_def(y1)
diff --git a/libm/w_jn.c b/libm/w_jn.c
index 173f6aa9e..2ba74d812 100644
--- a/libm/w_jn.c
+++ b/libm/w_jn.c
@@ -62,6 +62,7 @@ static char rcsid[] = "$NetBSD: w_jn.c,v 1.6 1995/05/10 20:49:19 jtc Exp $";
 	    return z;
 #endif
 }
+libm_hidden_def(jn)
 
 #ifdef __STDC__
 	double yn(int n, double x)	/* wrapper yn */
@@ -90,3 +91,4 @@ static char rcsid[] = "$NetBSD: w_jn.c,v 1.6 1995/05/10 20:49:19 jtc Exp $";
 	    return z;
 #endif
 }
+libm_hidden_def(yn)
diff --git a/libm/w_lgamma.c b/libm/w_lgamma.c
index de0394b5e..24b8b02b4 100644
--- a/libm/w_lgamma.c
+++ b/libm/w_lgamma.c
@@ -24,8 +24,6 @@ static char rcsid[] = "$NetBSD: w_lgamma.c,v 1.6 1995/05/10 20:49:24 jtc Exp $";
 #include "math_private.h"
 
 libm_hidden_proto(signgam)
-
-libm_hidden_proto(lgamma)
 #ifdef __STDC__
 	double lgamma(double x)
 #else
diff --git a/libm/w_lgamma_r.c b/libm/w_lgamma_r.c
index 6ca56d6da..20b002608 100644
--- a/libm/w_lgamma_r.c
+++ b/libm/w_lgamma_r.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: w_lgamma_r.c,v 1.6 1995/05/10 20:49:27 jtc Exp $
 #include "math.h"
 #include "math_private.h"
 
-
 #ifdef __STDC__
 	double lgamma_r(double x, int *signgamp) /* wrapper lgamma_r */
 #else
@@ -44,3 +43,4 @@ static char rcsid[] = "$NetBSD: w_lgamma_r.c,v 1.6 1995/05/10 20:49:27 jtc Exp $
             return y;
 #endif
 }
+libm_hidden_def(lgamma_r)
diff --git a/libm/w_log.c b/libm/w_log.c
index 12c8282d5..22cdda148 100644
--- a/libm/w_log.c
+++ b/libm/w_log.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: w_log.c,v 1.6 1995/05/10 20:49:33 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(log)
 #ifdef __STDC__
 	double log(double x)		/* wrapper log */
 #else
diff --git a/libm/w_log10.c b/libm/w_log10.c
index cf52f6e65..efb523ecf 100644
--- a/libm/w_log10.c
+++ b/libm/w_log10.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: w_log10.c,v 1.6 1995/05/10 20:49:35 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(log10)
 #ifdef __STDC__
 	double log10(double x)		/* wrapper log10 */
 #else
diff --git a/libm/w_pow.c b/libm/w_pow.c
index 89cd08f73..94d30bcec 100644
--- a/libm/w_pow.c
+++ b/libm/w_pow.c
@@ -19,7 +19,6 @@
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(pow)
 #ifdef __STDC__
 	double pow(double x, double y)	/* wrapper pow */
 #else
diff --git a/libm/w_remainder.c b/libm/w_remainder.c
index be3dd02c9..a30ff880a 100644
--- a/libm/w_remainder.c
+++ b/libm/w_remainder.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: w_remainder.c,v 1.6 1995/05/10 20:49:44 jtc Exp
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(remainder)
 #ifdef __STDC__
 	double remainder(double x, double y)	/* wrapper remainder */
 #else
diff --git a/libm/w_scalb.c b/libm/w_scalb.c
index a5f88de39..a770877ea 100644
--- a/libm/w_scalb.c
+++ b/libm/w_scalb.c
@@ -58,3 +58,4 @@ static char rcsid[] = "$NetBSD: w_scalb.c,v 1.6 1995/05/10 20:49:48 jtc Exp $";
 	return z;
 #endif
 }
+libm_hidden_def(scalb)
diff --git a/libm/w_sinh.c b/libm/w_sinh.c
index bed9bb3f9..dabfdd918 100644
--- a/libm/w_sinh.c
+++ b/libm/w_sinh.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: w_sinh.c,v 1.6 1995/05/10 20:49:51 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(sinh)
 #ifdef __STDC__
 	double sinh(double x)		/* wrapper sinh */
 #else
diff --git a/libm/w_sqrt.c b/libm/w_sqrt.c
index 0a37249b1..d695b1d8d 100644
--- a/libm/w_sqrt.c
+++ b/libm/w_sqrt.c
@@ -21,7 +21,6 @@ static char rcsid[] = "$NetBSD: w_sqrt.c,v 1.6 1995/05/10 20:49:55 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(sqrt)
 #ifdef __STDC__
 	double sqrt(double x)		/* wrapper sqrt */
 #else
diff --git a/libm/w_tgamma.c b/libm/w_tgamma.c
index 62b3c6275..0449e16d8 100644
--- a/libm/w_tgamma.c
+++ b/libm/w_tgamma.c
@@ -18,7 +18,7 @@
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto(tgamma)
+libm_hidden_proto(signgam)
 #ifdef __STDC__
 	double tgamma(double x)
 #else