diff --git a/include/stdio.h b/include/stdio.h
index 15f690ac6e91..08b633f32fc6 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.57 2005/02/03 04:39:32 perry Exp $	*/
+/*	$NetBSD: stdio.h,v 1.58 2005/02/09 21:35:46 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -248,8 +248,6 @@ int	 sscanf(const char * __restrict, const char * __restrict, ...);
 FILE	*tmpfile(void);
 int	 ungetc(int, FILE *);
 int	 vfprintf(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_);
-int	 vfprintf_unlocked(FILE * __restrict, const char * __restrict,
-	    _BSD_VA_LIST_);
 int	 vprintf(const char * __restrict, _BSD_VA_LIST_);
 
 #ifndef __AUDIT__
diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c
index b53fe37ba2bf..de6ea7b11aa4 100644
--- a/lib/libc/gen/arc4random.c
+++ b/lib/libc/gen/arc4random.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: arc4random.c,v 1.6 2005/02/09 12:09:08 kleink Exp $	*/
+/*	$NetBSD: arc4random.c,v 1.7 2005/02/09 21:35:46 kleink Exp $	*/
 /*	$OpenBSD: arc4random.c,v 1.6 2001/06/05 05:05:38 pvalchev Exp $	*/
 
 /*
@@ -25,6 +25,7 @@
  * RC4 is a registered trademark of RSA Laboratories.
  */
 
+#include "namespace.h"
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -33,6 +34,10 @@
 #include <sys/time.h>
 #include <sys/sysctl.h>
 
+#ifdef __weak_alias
+__weak_alias(arc4random,_arc4random)
+#endif
+
 #ifdef __GNUC__
 #define inline __inline
 #else				/* !__GNUC__ */
diff --git a/lib/libc/gen/assert.c b/lib/libc/gen/assert.c
index 6a8a0a7e1d79..7cbf555dea7c 100644
--- a/lib/libc/gen/assert.c
+++ b/lib/libc/gen/assert.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: assert.c,v 1.15 2003/08/07 16:42:46 agc Exp $	*/
+/*	$NetBSD: assert.c,v 1.16 2005/02/09 21:35:46 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -34,10 +34,11 @@
 #if 0
 static char sccsid[] = "@(#)assert.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: assert.c,v 1.15 2003/08/07 16:42:46 agc Exp $");
+__RCSID("$NetBSD: assert.c,v 1.16 2005/02/09 21:35:46 kleink Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 
 #include <assert.h>
diff --git a/lib/libc/gen/extattr.c b/lib/libc/gen/extattr.c
index 8b3c23607b8a..90c9c5c2c155 100644
--- a/lib/libc/gen/extattr.c
+++ b/lib/libc/gen/extattr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: extattr.c,v 1.1 2005/01/02 16:43:26 thorpej Exp $	*/
+/*	$NetBSD: extattr.c,v 1.2 2005/02/09 21:35:46 kleink Exp $	*/
 
 /*-
  * Copyright (c) 2001 Robert N. M. Watson
@@ -32,9 +32,10 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: extattr.c,v 1.1 2005/01/02 16:43:26 thorpej Exp $");
+__RCSID("$NetBSD: extattr.c,v 1.2 2005/02/09 21:35:46 kleink Exp $");
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/extattr.h>
 
diff --git a/lib/libc/gen/humanize_number.c b/lib/libc/gen/humanize_number.c
index 12d029a8d0e4..055d2133f439 100644
--- a/lib/libc/gen/humanize_number.c
+++ b/lib/libc/gen/humanize_number.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: humanize_number.c,v 1.8 2004/07/27 01:56:24 enami Exp $	*/
+/*	$NetBSD: humanize_number.c,v 1.9 2005/02/09 21:35:46 kleink Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -41,9 +41,10 @@
 #ifndef __lint
 __COPYRIGHT("@(#) Copyright (c) 2002\n\
 	The NetBSD Foundation, inc. All rights reserved.\n");
-__RCSID("$NetBSD: humanize_number.c,v 1.8 2004/07/27 01:56:24 enami Exp $");
+__RCSID("$NetBSD: humanize_number.c,v 1.9 2005/02/09 21:35:46 kleink Exp $");
 #endif /* !__lint */
 
+#include "namespace.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/gen/shquote.c b/lib/libc/gen/shquote.c
index 128bb87b2534..589d1599ee0b 100644
--- a/lib/libc/gen/shquote.c
+++ b/lib/libc/gen/shquote.c
@@ -1,4 +1,4 @@
-/* $NetBSD: shquote.c,v 1.5 2003/07/26 19:24:44 salo Exp $ */
+/* $NetBSD: shquote.c,v 1.6 2005/02/09 21:35:46 kleink Exp $ */
 
 /*
  * Copyright (c) 2001 Christopher G. Demetriou
@@ -43,6 +43,7 @@
  */
 #undef	SHQUOTE_USE_MULTIBYTE
 
+#include "namespace.h"
 #include <stdlib.h>
 #include <string.h>
 #ifdef SHQUOTE_USE_MULTIBYTE
@@ -51,6 +52,10 @@
 #include <wchar.h>
 #endif
 
+#ifdef __weak_alias
+__weak_alias(shquote,_shquote)
+#endif
+
 /*
  * shquote():
  *
diff --git a/lib/libc/gen/shquotev.c b/lib/libc/gen/shquotev.c
index ff15469dad5f..e69edbdf89db 100644
--- a/lib/libc/gen/shquotev.c
+++ b/lib/libc/gen/shquotev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: shquotev.c,v 1.3 2003/07/26 19:24:45 salo Exp $ */
+/* $NetBSD: shquotev.c,v 1.4 2005/02/09 21:35:46 kleink Exp $ */
 
 /*
  * Copyright (c) 2001 Christopher G. Demetriou
@@ -34,6 +34,7 @@
  * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
  */
 
+#include "namespace.h"
 #include <stdlib.h>
 
 /*
diff --git a/lib/libc/hash/hmac_md5.c b/lib/libc/hash/hmac_md5.c
index dc070e724741..8f6b5feb96e8 100644
--- a/lib/libc/hash/hmac_md5.c
+++ b/lib/libc/hash/hmac_md5.c
@@ -1,7 +1,10 @@
+/*	$NetBSD: hmac_md5.c,v 1.2 2005/02/09 21:35:46 kleink Exp $	*/
+
 /*
  * hmac_md5 - using HMAC from RFC 2104
  */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <md5.h>
 
diff --git a/lib/libc/hash/hmac_sha1.c b/lib/libc/hash/hmac_sha1.c
index e00d0e58fca3..51ac446eba4b 100644
--- a/lib/libc/hash/hmac_sha1.c
+++ b/lib/libc/hash/hmac_sha1.c
@@ -1,8 +1,11 @@
+/*	$NetBSD: hmac_sha1.c,v 1.2 2005/02/09 21:35:46 kleink Exp $	*/
+
 /*
  * hmac_sha1 - using HMAC from RFC 2104
  */
 
-#include "sha1.h"
+#include "namespace.h"
+#include <sha1.h>
 
 #define HMAC_HASH SHA1
 #define HMAC_FUNC hmac_sha1
diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
index 0d3c6c22dc3d..734c4480a945 100644
--- a/lib/libc/include/namespace.h
+++ b/lib/libc/include/namespace.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: namespace.h,v 1.97 2005/01/06 15:10:45 lukem Exp $	*/
+/*	$NetBSD: namespace.h,v 1.98 2005/02/09 21:35:46 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -102,6 +102,7 @@
 #define adjtime			_adjtime
 #define alarm			_alarm
 #define alphasort		_alphasort
+#define arc4random		_arc4random
 #define asctime_r		_asctime_r
 #define asprintf		_asprintf
 #define atoll			_atoll
@@ -167,6 +168,7 @@
 #define endnetconfig		_endnetconfig
 #define endnetent		_endnetent
 #define endnetgrent		_endnetgrent
+#define endnetpath		_endnetpath
 #define endprotoent		_endprotoent
 #define endprotoent_r		_endprotoent_r
 #define endpwent		_endpwent
@@ -188,6 +190,7 @@
 #define execvp			_execvp
 #define fdopen			_fdopen
 #define fgetln			_fgetln
+#define fhstatvfs		_fhstatvfs
 #define flockfile		_flockfile
 #define ftrylockfile		_ftrylockfile
 #define funlockfile		_funlockfile
@@ -202,6 +205,7 @@
 #define freenetconfigent	_freenetconfigent
 #define freeaddrinfo		_freeaddrinfo
 #define freeifaddrs		_freeifaddrs
+#define fstatvfs		_fstatvfs
 #define ftok			_ftok
 #define ftruncate		_ftruncate
 #define fts_children		_fts_children
@@ -346,6 +350,7 @@
 #define lrand48			_lrand48
 #define lseek			_lseek
 #define mergesort		_mergesort
+#define mkstemp			_mkstemp
 #define mmap			_mmap
 #define mpool_close		_mpool_close
 #define mpool_filter		_mpool_filter
@@ -447,6 +452,7 @@
 #define setusershell		_setusershell
 #define shm_open		_shm_open
 #define shm_unlink		_shm_unlink
+#define shquote			_shquote
 #define siginterrupt		_siginterrupt
 #define signal			_signal
 #define sl_add			_sl_add
@@ -459,6 +465,7 @@
 #define sradixsort		_sradixsort
 #define srand48			_srand48
 #define srandom			_srandom
+#define statvfs			_statvfs
 #define strcasecmp		_strcasecmp
 #define strdup			_strdup
 #define strncasecmp		_strncasecmp
@@ -511,6 +518,7 @@
 #define sysctlgetmibinfo	_sysctlgetmibinfo
 #define sysctlnametomib		_sysctlnametomib
 #define syslog			_syslog
+#define taddr2uaddr		_taddr2uaddr
 #define tcdrain			_tcdrain
 #define tcflow			_tcflow
 #define tcflush			_tcflush
@@ -532,6 +540,7 @@
 #define tzname			_tzname
 #define tzset			_tzset
 #define tzsetwall		_tzsetwall
+#define uaddr2taddr		_uaddr2taddr
 #define ualarm			_ualarm
 #define uname			_uname
 #define unsetenv		_unsetenv
@@ -539,6 +548,8 @@
 #define user_from_uid		_user_from_uid
 #define usleep			_usleep
 #define utime			_utime
+#define uuid_create_nil		_uuid_create_nil
+#define uuid_is_nil		_uuid_is_nil
 #define valloc			_valloc
 #define vis			_vis
 #define vsnprintf		_vsnprintf
@@ -546,6 +557,7 @@
 #define wait			_wait
 #define wait3			_wait3
 #define waitpid			_waitpid
+#define wcwidth			_wcwidth
 #define xdr_accepted_reply	_xdr_accepted_reply
 #define xdr_array		_xdr_array
 #define xdr_authunix_parms	_xdr_authunix_parms
diff --git a/lib/libc/include/port_before.h b/lib/libc/include/port_before.h
index a15a42c4e5ab..3ae1413f262d 100644
--- a/lib/libc/include/port_before.h
+++ b/lib/libc/include/port_before.h
@@ -1,3 +1,4 @@
+#include "namespace.h"
 #include <sys/cdefs.h>
 #define NEED_PSELECT
 #define ISC_FORMAT_PRINTF(a,b) __attribute__((__format__(__printf__,a,b)))
diff --git a/lib/libc/locale/aliasname.c b/lib/libc/locale/aliasname.c
index 35c5a595d378..9e8f4c3dee52 100644
--- a/lib/libc/locale/aliasname.c
+++ b/lib/libc/locale/aliasname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aliasname.c,v 1.1 2002/02/13 07:45:52 yamt Exp $ */
+/* $NetBSD: aliasname.c,v 1.2 2005/02/09 21:35:46 kleink Exp $ */
 
 /*-
  * Copyright (c)2002 YAMAMOTO Takashi,
@@ -28,9 +28,10 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: aliasname.c,v 1.1 2002/02/13 07:45:52 yamt Exp $");
+__RCSID("$NetBSD: aliasname.c,v 1.2 2005/02/09 21:35:46 kleink Exp $");
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/locale/iswctype.c b/lib/libc/locale/iswctype.c
index 61febc8b0bb0..de6465daee69 100644
--- a/lib/libc/locale/iswctype.c
+++ b/lib/libc/locale/iswctype.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iswctype.c,v 1.14 2003/08/07 16:43:04 agc Exp $	*/
+/*	$NetBSD: iswctype.c,v 1.15 2005/02/09 21:35:46 kleink Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: iswctype.c,v 1.14 2003/08/07 16:43:04 agc Exp $");
+__RCSID("$NetBSD: iswctype.c,v 1.15 2005/02/09 21:35:46 kleink Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -51,6 +51,10 @@ __RCSID("$NetBSD: iswctype.c,v 1.14 2003/08/07 16:43:04 agc Exp $");
 #include "rune_local.h"
 #include "_wctrans_local.h"
 
+#ifdef __weak_alias
+__weak_alias(wcwidth,_wcwidth)
+#endif
+
 #ifdef lint
 #define __inline
 #endif
@@ -204,7 +208,6 @@ towlower(c)
 	return (__tolower_w(c));
 }
 
-#undef wcwidth
 int
 wcwidth(c)
 	wchar_t c;
diff --git a/lib/libc/net/__cmsg_alignbytes.c b/lib/libc/net/__cmsg_alignbytes.c
index 6ab2a9421daa..20493cc0fe14 100644
--- a/lib/libc/net/__cmsg_alignbytes.c
+++ b/lib/libc/net/__cmsg_alignbytes.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __cmsg_alignbytes.c,v 1.5 2004/01/29 08:25:28 itojun Exp $	*/
+/*	$NetBSD: __cmsg_alignbytes.c,v 1.6 2005/02/09 21:35:46 kleink Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -38,9 +38,10 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: __cmsg_alignbytes.c,v 1.5 2004/01/29 08:25:28 itojun Exp $");
+__RCSID("$NetBSD: __cmsg_alignbytes.c,v 1.6 2005/02/09 21:35:46 kleink Exp $");
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/resolv/res_send.c b/lib/libc/resolv/res_send.c
index ab78964c8410..ca7cfa9df801 100644
--- a/lib/libc/resolv/res_send.c
+++ b/lib/libc/resolv/res_send.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: res_send.c,v 1.7 2004/11/07 02:25:01 christos Exp $	*/
+/*	$NetBSD: res_send.c,v 1.8 2005/02/09 21:35:46 kleink Exp $	*/
 
 /*
  * Copyright (c) 1985, 1989, 1993
@@ -76,7 +76,7 @@
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "Id: res_send.c,v 1.5.2.2.4.5 2004/08/10 02:19:56 marka Exp";
 #else
-__RCSID("$NetBSD: res_send.c,v 1.7 2004/11/07 02:25:01 christos Exp $");
+__RCSID("$NetBSD: res_send.c,v 1.8 2005/02/09 21:35:46 kleink Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -84,6 +84,7 @@ __RCSID("$NetBSD: res_send.c,v 1.7 2004/11/07 02:25:01 christos Exp $");
  * Send query to name server and wait for reply.
  */
 
+#include "namespace.h"
 #include "port_before.h"
 #include "fd_setsize.h"
 
diff --git a/lib/libc/rpc/getnetpath.c b/lib/libc/rpc/getnetpath.c
index fe9b99355ec9..8d3319d16e82 100644
--- a/lib/libc/rpc/getnetpath.c
+++ b/lib/libc/rpc/getnetpath.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getnetpath.c,v 1.8 2003/09/09 03:56:40 itojun Exp $	*/
+/*	$NetBSD: getnetpath.c,v 1.9 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
 #if 0
 static        char sccsid[] = "@(#)getnetpath.c	1.11 91/12/19 SMI";
 #else
-__RCSID("$NetBSD: getnetpath.c,v 1.8 2003/09/09 03:56:40 itojun Exp $");
+__RCSID("$NetBSD: getnetpath.c,v 1.9 2005/02/09 21:35:47 kleink Exp $");
 #endif
 #endif
 
@@ -56,6 +56,7 @@ __RCSID("$NetBSD: getnetpath.c,v 1.8 2003/09/09 03:56:40 itojun Exp $");
 #ifdef __weak_alias
 __weak_alias(getnetpath,_getnetpath)
 __weak_alias(setnetpath,_setnetpath)
+__weak_alias(endnetpath,_endnetpath)
 #endif
 
 /*
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c
index f98d0492b12f..46a4f177b18e 100644
--- a/lib/libc/rpc/rpc_generic.c
+++ b/lib/libc/rpc/rpc_generic.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_generic.c,v 1.17 2005/01/08 22:48:42 lukem Exp $	*/
+/*	$NetBSD: rpc_generic.c,v 1.18 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: rpc_generic.c,v 1.17 2005/01/08 22:48:42 lukem Exp $");
+__RCSID("$NetBSD: rpc_generic.c,v 1.18 2005/02/09 21:35:47 kleink Exp $");
 #endif
 
 #include "namespace.h"
@@ -65,6 +65,11 @@ __RCSID("$NetBSD: rpc_generic.c,v 1.17 2005/01/08 22:48:42 lukem Exp $");
 #include <rpc/nettype.h>
 #include "rpc_internal.h"
 
+#ifdef __weak_alias
+__weak_alias(taddr2uaddr,_taddr2uaddr)
+__weak_alias(uaddr2taddr,_uaddr2taddr)
+#endif
+
 struct handle {
 	NCONF_HANDLE *nhandle;
 	int nflag;		/* Whether NETPATH or NETCONFIG */
diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c
index 6d02bf8d2a05..4a6dea0b8f82 100644
--- a/lib/libc/stdio/asprintf.c
+++ b/lib/libc/stdio/asprintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: asprintf.c,v 1.13 2005/01/09 05:04:02 christos Exp $	*/
+/*	$NetBSD: asprintf.c,v 1.14 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: asprintf.c,v 1.13 2005/01/09 05:04:02 christos Exp $");
+__RCSID("$NetBSD: asprintf.c,v 1.14 2005/02/09 21:35:47 kleink Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -65,7 +65,7 @@ asprintf(char **str, char const *fmt, ...)
 		goto err;
 	f._bf._size = f._w = 127;		/* Leave room for the NUL */
 	va_start(ap, fmt);
-	ret = vfprintf_unlocked(&f, fmt, ap);
+	ret = __vfprintf_unlocked(&f, fmt, ap);
 	va_end(ap);
 	if (ret == -1)
 		goto err;
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index c18391191cbd..379f4fa0950c 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: local.h,v 1.18 2004/05/10 16:47:11 drochner Exp $	*/
+/*	$NetBSD: local.h,v 1.19 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -64,6 +64,9 @@ extern int	__svfscanf __P((FILE * __restrict, const char * __restrict,
 extern int	__svfscanf_unlocked __P((FILE * __restrict, const char * __restrict,
 		    _BSD_VA_LIST_))
 		    __attribute__((__format__(__scanf__, 2, 0)));
+extern int	__vfprintf_unlocked __P((FILE * __restrict, const char * __restrict,
+		    _BSD_VA_LIST_));
+
 
 extern int	__sdidinit;
 
diff --git a/lib/libc/stdio/mkstemp.c b/lib/libc/stdio/mkstemp.c
index 254fdb247132..cb4ed579b3d9 100644
--- a/lib/libc/stdio/mkstemp.c
+++ b/lib/libc/stdio/mkstemp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkstemp.c,v 1.8 2003/10/27 00:12:42 lukem Exp $	*/
+/*	$NetBSD: mkstemp.c,v 1.9 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -40,10 +40,12 @@
 #if 0
 static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: mkstemp.c,v 1.8 2003/10/27 00:12:42 lukem Exp $");
+__RCSID("$NetBSD: mkstemp.c,v 1.9 2005/02/09 21:35:47 kleink Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
+
 #if HAVE_NBTOOL_CONFIG_H
 #define	GETTEMP		gettemp
 #else
@@ -57,6 +59,10 @@ __RCSID("$NetBSD: mkstemp.c,v 1.8 2003/10/27 00:12:42 lukem Exp $");
 #define	GETTEMP		__gettemp
 #endif
 
+#ifdef __weak_alias
+__weak_alias(mkstemp,_mkstemp)
+#endif
+
 int
 mkstemp(path)
 	char *path;
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c
index ba8a342b8a0e..3c1bc25c53df 100644
--- a/lib/libc/stdio/snprintf.c
+++ b/lib/libc/stdio/snprintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: snprintf.c,v 1.19 2003/08/07 16:43:31 agc Exp $	*/
+/*	$NetBSD: snprintf.c,v 1.20 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)snprintf.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: snprintf.c,v 1.19 2003/08/07 16:43:31 agc Exp $");
+__RCSID("$NetBSD: snprintf.c,v 1.20 2005/02/09 21:35:47 kleink Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -82,7 +82,7 @@ snprintf(char *str, size_t n, char const *fmt, ...)
 		f._bf._base = f._p = (unsigned char *)str;
 		f._bf._size = f._w = n - 1;
 	}
-	ret = vfprintf_unlocked(&f, fmt, ap);
+	ret = __vfprintf_unlocked(&f, fmt, ap);
 	*f._p = 0;
 	va_end(ap);
 	return (ret);
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index 7adf11bcb737..4c38f07dd502 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sprintf.c,v 1.13 2003/08/07 16:43:31 agc Exp $	*/
+/*	$NetBSD: sprintf.c,v 1.14 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)sprintf.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: sprintf.c,v 1.13 2003/08/07 16:43:31 agc Exp $");
+__RCSID("$NetBSD: sprintf.c,v 1.14 2005/02/09 21:35:47 kleink Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -67,7 +67,7 @@ sprintf(char *str, char const *fmt, ...)
 	f._bf._base = f._p = (unsigned char *)str;
 	f._bf._size = f._w = INT_MAX;
 	va_start(ap, fmt);
-	ret = vfprintf_unlocked(&f, fmt, ap);
+	ret = __vfprintf_unlocked(&f, fmt, ap);
 	va_end(ap);
 	*f._p = 0;
 	return (ret);
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
index ecea243e75ea..340ec5956acb 100644
--- a/lib/libc/stdio/vasprintf.c
+++ b/lib/libc/stdio/vasprintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vasprintf.c,v 1.9 2003/01/18 11:29:59 thorpej Exp $	*/
+/*	$NetBSD: vasprintf.c,v 1.10 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vasprintf.c,v 1.9 2003/01/18 11:29:59 thorpej Exp $");
+__RCSID("$NetBSD: vasprintf.c,v 1.10 2005/02/09 21:35:47 kleink Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <assert.h>
@@ -60,7 +60,7 @@ vasprintf(str, fmt, ap)
 	if (f._bf._base == NULL)
 		goto err;
 	f._bf._size = f._w = 127;		/* Leave room for the NUL */
-	ret = vfprintf_unlocked(&f, fmt, ap);
+	ret = __vfprintf_unlocked(&f, fmt, ap);
 	if (ret == -1)
 		goto err;
 	*f._p = '\0';
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index f8556a2d08f9..99227de5a9e0 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfprintf.c,v 1.47 2004/07/02 03:00:01 christos Exp $	*/
+/*	$NetBSD: vfprintf.c,v 1.48 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,7 +37,7 @@
 #if 0
 static char *sccsid = "@(#)vfprintf.c	5.50 (Berkeley) 12/16/92";
 #else
-__RCSID("$NetBSD: vfprintf.c,v 1.47 2004/07/02 03:00:01 christos Exp $");
+__RCSID("$NetBSD: vfprintf.c,v 1.48 2005/02/09 21:35:47 kleink Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -184,7 +184,7 @@ vfprintf(fp, fmt0, ap)
 	int ret;
 
 	FLOCKFILE(fp);
-	ret = vfprintf_unlocked(fp, fmt0, ap);
+	ret = __vfprintf_unlocked(fp, fmt0, ap);
 	FUNLOCKFILE(fp);
 
 	return ret;
@@ -193,7 +193,7 @@ vfprintf(fp, fmt0, ap)
 	    
 
 int
-vfprintf_unlocked(fp, fmt0, ap)
+__vfprintf_unlocked(fp, fmt0, ap)
 	FILE *fp;
 	const char *fmt0;
 	_BSD_VA_LIST_ ap;
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index a15165565cb4..a1e3f80430be 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vsnprintf.c,v 1.19 2003/08/07 16:43:35 agc Exp $	*/
+/*	$NetBSD: vsnprintf.c,v 1.20 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)vsnprintf.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: vsnprintf.c,v 1.19 2003/08/07 16:43:35 agc Exp $");
+__RCSID("$NetBSD: vsnprintf.c,v 1.20 2005/02/09 21:35:47 kleink Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -83,7 +83,7 @@ vsnprintf(str, n, fmt, ap)
 		f._bf._base = f._p = (unsigned char *)str;
 		f._bf._size = f._w = n - 1;
 	}
-	ret = vfprintf_unlocked(&f, fmt, ap);
+	ret = __vfprintf_unlocked(&f, fmt, ap);
 	*f._p = 0;
 	return (ret);
 }
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index 36a4add6b90b..916da550ccaf 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vsprintf.c,v 1.13 2003/08/07 16:43:35 agc Exp $	*/
+/*	$NetBSD: vsprintf.c,v 1.14 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)vsprintf.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: vsprintf.c,v 1.13 2003/08/07 16:43:35 agc Exp $");
+__RCSID("$NetBSD: vsprintf.c,v 1.14 2005/02/09 21:35:47 kleink Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -66,7 +66,7 @@ vsprintf(str, fmt, ap)
 	f._flags = __SWR | __SSTR;
 	f._bf._base = f._p = (unsigned char *)str;
 	f._bf._size = f._w = INT_MAX;
-	ret = vfprintf_unlocked(&f, fmt, ap);
+	ret = __vfprintf_unlocked(&f, fmt, ap);
 	*f._p = 0;
 	return (ret);
 }
diff --git a/lib/libc/stdlib/strtod.c b/lib/libc/stdlib/strtod.c
index 3407666c7f7b..66846ffb12e2 100644
--- a/lib/libc/stdlib/strtod.c
+++ b/lib/libc/stdlib/strtod.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: strtod.c,v 1.44 2004/10/28 21:14:52 dsl Exp $	*/
+/*	$NetBSD: strtod.c,v 1.45 2005/02/09 21:35:47 kleink Exp $	*/
 
 /****************************************************************
  *
@@ -93,9 +93,11 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strtod.c,v 1.44 2004/10/28 21:14:52 dsl Exp $");
+__RCSID("$NetBSD: strtod.c,v 1.45 2005/02/09 21:35:47 kleink Exp $");
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
+
 #define Unsigned_Shifts
 #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
     defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
diff --git a/lib/libc/string/strcasestr.c b/lib/libc/string/strcasestr.c
index a29f445231d1..39ad98dbe945 100644
--- a/lib/libc/string/strcasestr.c
+++ b/lib/libc/string/strcasestr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: strcasestr.c,v 1.1 2004/07/03 08:27:25 junyoung Exp $	*/
+/*	$NetBSD: strcasestr.c,v 1.2 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -34,9 +34,10 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strcasestr.c,v 1.1 2004/07/03 08:27:25 junyoung Exp $");
+__RCSID("$NetBSD: strcasestr.c,v 1.2 2005/02/09 21:35:47 kleink Exp $");
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c
index 52f89da64058..bb7531badb7b 100644
--- a/lib/libc/string/wcswidth.c
+++ b/lib/libc/string/wcswidth.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wcswidth.c,v 1.2 2001/01/03 14:29:37 lukem Exp $	*/
+/*	$NetBSD: wcswidth.c,v 1.3 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*-
  * Copyright (c)1999 Citrus Project,
@@ -30,9 +30,10 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcswidth.c,v 1.2 2001/01/03 14:29:37 lukem Exp $");
+__RCSID("$NetBSD: wcswidth.c,v 1.3 2005/02/09 21:35:47 kleink Exp $");
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <assert.h>
 #include <wchar.h>
 
diff --git a/lib/libc/sys/statfs.c b/lib/libc/sys/statfs.c
index 685b48fefe3c..3a1a7e12d913 100644
--- a/lib/libc/sys/statfs.c
+++ b/lib/libc/sys/statfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: statfs.c,v 1.1 2004/04/21 01:05:32 christos Exp $	*/
+/*	$NetBSD: statfs.c,v 1.2 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,6 +37,7 @@
  */
 #define __LIBC12_SOURCE__
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/lib/libc/sys/statvfs.c b/lib/libc/sys/statvfs.c
index f58f474bed78..f06d8aa008cf 100644
--- a/lib/libc/sys/statvfs.c
+++ b/lib/libc/sys/statvfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: statvfs.c,v 1.1 2004/04/21 01:05:32 christos Exp $	*/
+/*	$NetBSD: statvfs.c,v 1.2 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -36,8 +36,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "namespace.h"
 #include <sys/statvfs.h>
 
+#ifdef __weak_alias
+__weak_alias(statvfs,_statvfs)
+__weak_alias(fstatvfs,_fstatvfs)
+__weak_alias(fhstatvfs,_fhstatvfs)
+#endif
+
 int
 statvfs(const char *file, struct statvfs *st)
 {
diff --git a/lib/libc/uuid/uuid_create_nil.c b/lib/libc/uuid/uuid_create_nil.c
index ddddf162a69f..e48dc269f317 100644
--- a/lib/libc/uuid/uuid_create_nil.c
+++ b/lib/libc/uuid/uuid_create_nil.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uuid_create_nil.c,v 1.1 2004/09/13 21:44:54 thorpej Exp $	*/
+/*	$NetBSD: uuid_create_nil.c,v 1.2 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*-
  * Copyright (c) 2002 Marcel Moolenaar
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: uuid_create_nil.c,v 1.1 2004/09/13 21:44:54 thorpej Exp $");
+__RCSID("$NetBSD: uuid_create_nil.c,v 1.2 2005/02/09 21:35:47 kleink Exp $");
 #endif
 
 #include "namespace.h"
@@ -39,6 +39,10 @@ __RCSID("$NetBSD: uuid_create_nil.c,v 1.1 2004/09/13 21:44:54 thorpej Exp $");
 #include <string.h>
 #include <uuid.h>
 
+#ifdef __weak_alias
+__weak_alias(uuid_create_nil,_uuid_create_nil)
+#endif
+
 /*
  * uuid_create_nil() - create a nil UUID.
  * See also:
diff --git a/lib/libc/uuid/uuid_is_nil.c b/lib/libc/uuid/uuid_is_nil.c
index c3d2d8d1330c..ea84a089adf1 100644
--- a/lib/libc/uuid/uuid_is_nil.c
+++ b/lib/libc/uuid/uuid_is_nil.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uuid_is_nil.c,v 1.1 2004/09/13 21:44:54 thorpej Exp $	*/
+/*	$NetBSD: uuid_is_nil.c,v 1.2 2005/02/09 21:35:47 kleink Exp $	*/
 
 /*-
  * Copyright (c) 2002 Marcel Moolenaar
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: uuid_is_nil.c,v 1.1 2004/09/13 21:44:54 thorpej Exp $");
+__RCSID("$NetBSD: uuid_is_nil.c,v 1.2 2005/02/09 21:35:47 kleink Exp $");
 #endif
 
 #include "namespace.h"
@@ -39,6 +39,10 @@ __RCSID("$NetBSD: uuid_is_nil.c,v 1.1 2004/09/13 21:44:54 thorpej Exp $");
 #include <string.h>
 #include <uuid.h>
 
+#ifdef __weak_alias
+__weak_alias(uuid_is_nil,_uuid_is_nil)
+#endif
+
 /*
  * uuid_is_nil() - return whether the UUID is a nil UUID.
  * See also: