diff --git a/lib/libm/compat/compat_cabs.c b/lib/libm/compat/compat_cabs.c
index 61533a1c98d8..af6c4572908a 100644
--- a/lib/libm/compat/compat_cabs.c
+++ b/lib/libm/compat/compat_cabs.c
@@ -7,9 +7,10 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_cabs.c,v 1.1 2007/02/22 22:08:19 drochner Exp $");
+__RCSID("$NetBSD: compat_cabs.c,v 1.2 2007/08/10 21:20:35 drochner Exp $");
 #endif
 
+#include "../src/namespace.h"
 #include <math.h>
 
 struct complex {
diff --git a/lib/libm/compat/compat_cabsf.c b/lib/libm/compat/compat_cabsf.c
index 742b34238a10..fad6283e94ca 100644
--- a/lib/libm/compat/compat_cabsf.c
+++ b/lib/libm/compat/compat_cabsf.c
@@ -7,9 +7,10 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_cabsf.c,v 1.1 2007/02/22 22:08:19 drochner Exp $");
+__RCSID("$NetBSD: compat_cabsf.c,v 1.2 2007/08/10 21:20:35 drochner Exp $");
 #endif
 
+#include "../src/namespace.h"
 #include <math.h>
 
 struct complex {
diff --git a/lib/libm/src/namespace.h b/lib/libm/src/namespace.h
new file mode 100644
index 000000000000..deba57611b63
--- /dev/null
+++ b/lib/libm/src/namespace.h
@@ -0,0 +1,6 @@
+/* $NetBSD: namespace.h,v 1.1 2007/08/10 21:20:36 drochner Exp $ */
+
+#define atan2 _atan2
+#define atan2f _atan2f
+#define hypot _hypot
+#define hypotf _hypotf
diff --git a/lib/libm/src/w_atan2.c b/lib/libm/src/w_atan2.c
index 00804042143a..ae46ef3b1ea7 100644
--- a/lib/libm/src/w_atan2.c
+++ b/lib/libm/src/w_atan2.c
@@ -12,16 +12,20 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_atan2.c,v 1.9 2002/05/26 22:01:59 wiz Exp $");
+__RCSID("$NetBSD: w_atan2.c,v 1.10 2007/08/10 21:20:36 drochner Exp $");
 #endif
 
 /*
  * wrapper atan2(y,x)
  */
 
+#include "namespace.h"
 #include "math.h"
 #include "math_private.h"
 
+#ifdef __weak_alias
+__weak_alias(atan2, _atan2)
+#endif
 
 double
 atan2(double y, double x)	/* wrapper atan2 */
diff --git a/lib/libm/src/w_atan2f.c b/lib/libm/src/w_atan2f.c
index 47a0cd5964c1..8461e1e8214c 100644
--- a/lib/libm/src/w_atan2f.c
+++ b/lib/libm/src/w_atan2f.c
@@ -15,16 +15,20 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_atan2f.c,v 1.6 2002/05/26 22:02:00 wiz Exp $");
+__RCSID("$NetBSD: w_atan2f.c,v 1.7 2007/08/10 21:20:36 drochner Exp $");
 #endif
 
 /*
  * wrapper atan2f(y,x)
  */
 
+#include "namespace.h"
 #include "math.h"
 #include "math_private.h"
 
+#ifdef __weak_alias
+__weak_alias(atan2f, _atan2f)
+#endif
 
 float
 atan2f(float y, float x)		/* wrapper atan2f */
diff --git a/lib/libm/src/w_hypot.c b/lib/libm/src/w_hypot.c
index 605ee103aae5..4e25a1f1a73f 100644
--- a/lib/libm/src/w_hypot.c
+++ b/lib/libm/src/w_hypot.c
@@ -12,16 +12,20 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_hypot.c,v 1.9 2002/05/26 22:02:01 wiz Exp $");
+__RCSID("$NetBSD: w_hypot.c,v 1.10 2007/08/10 21:20:36 drochner Exp $");
 #endif
 
 /*
  * wrapper hypot(x,y)
  */
 
+#include "namespace.h"
 #include "math.h"
 #include "math_private.h"
 
+#ifdef __weak_alias
+__weak_alias(hypot, _hypot)
+#endif
 
 double
 hypot(double x, double y)/* wrapper hypot */
diff --git a/lib/libm/src/w_hypotf.c b/lib/libm/src/w_hypotf.c
index 448ed58b52d4..0c88c238c603 100644
--- a/lib/libm/src/w_hypotf.c
+++ b/lib/libm/src/w_hypotf.c
@@ -15,16 +15,20 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: w_hypotf.c,v 1.6 2002/05/26 22:02:01 wiz Exp $");
+__RCSID("$NetBSD: w_hypotf.c,v 1.7 2007/08/10 21:20:36 drochner Exp $");
 #endif
 
 /*
  * wrapper hypotf(x,y)
  */
 
+#include "namespace.h"
 #include "math.h"
 #include "math_private.h"
 
+#ifdef __weak_alias
+__weak_alias(hypotf, _hypotf)
+#endif
 
 float
 hypotf(float x, float y)	/* wrapper hypotf */