diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 70ef95d11d900..7263201f4233a 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.31.2.1 1995/03/13 20:49:46 jtc Exp $
+#	$NetBSD: Makefile,v 1.31.2.2 1995/05/02 19:33:52 jtc Exp $
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
 #
 # All library objects contain sccsid strings by default; they may be
@@ -88,4 +88,7 @@ tags: ${SRCS}
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
 	    >> tags; sort -o tags tags
 
+NOMAN=
+NOPROFILE=
+NOPIC=
 .include <bsd.lib.mk>
diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c
index aeafdf23dbfaf..00b2cd4d5a77e 100644
--- a/lib/libc/compat-43/creat.c
+++ b/lib/libc/compat-43/creat.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)creat.c	5.3 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: creat.c,v 1.4 1993/11/11 19:04:04 jtc Exp $";
+static char *rcsid = "$Id: creat.c,v 1.4.4.1 1995/05/02 19:34:01 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <fcntl.h>
 
 int
diff --git a/lib/libc/compat-43/killpg.c b/lib/libc/compat-43/killpg.c
index 7a24a1d25cc09..5b53facf67537 100644
--- a/lib/libc/compat-43/killpg.c
+++ b/lib/libc/compat-43/killpg.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)killpg.c	5.3 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: killpg.c,v 1.4 1993/11/11 19:04:06 jtc Exp $";
+static char *rcsid = "$Id: killpg.c,v 1.4.4.1 1995/05/02 19:34:03 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc/compat-43/setpgrp.c b/lib/libc/compat-43/setpgrp.c
index 76dab1e59a268..939e7ab10c456 100644
--- a/lib/libc/compat-43/setpgrp.c
+++ b/lib/libc/compat-43/setpgrp.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)setpgrp.c	5.2 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: setpgrp.c,v 1.4 1993/11/11 19:04:07 jtc Exp $";
+static char *rcsid = "$Id: setpgrp.c,v 1.4.4.1 1995/05/02 19:34:04 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/lib/libc/compat-43/sigcompat.c b/lib/libc/compat-43/sigcompat.c
index 2d35b9c783d98..fe0dda0fad959 100644
--- a/lib/libc/compat-43/sigcompat.c
+++ b/lib/libc/compat-43/sigcompat.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)sigcompat.c	5.3 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: sigcompat.c,v 1.6 1994/02/24 06:10:57 cgd Exp $";
+static char *rcsid = "$Id: sigcompat.c,v 1.6.4.1 1995/05/02 19:34:06 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <signal.h>
 
diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c
index 66d8fc1581744..7c64eab02d127 100644
--- a/lib/libc/db/btree/bt_close.c
+++ b/lib/libc/db/btree/bt_close.c
@@ -38,6 +38,7 @@
 static char sccsid[] = "@(#)bt_close.c	8.3 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c
index b0650b7c5c36b..a4ce2426b13da 100644
--- a/lib/libc/db/btree/bt_open.c
+++ b/lib/libc/db/btree/bt_open.c
@@ -46,6 +46,7 @@ static char sccsid[] = "@(#)bt_open.c	8.7 (Berkeley) 6/16/94";
  * is wholly independent of the Postgres code.
  */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
index 4b7b732a8fdee..ce7eb27726a0e 100644
--- a/lib/libc/db/hash/hash.c
+++ b/lib/libc/db/hash/hash.c
@@ -38,6 +38,7 @@
 static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c
index 5b8cf9ceb198b..987da9b479ba8 100644
--- a/lib/libc/db/hash/hash_page.c
+++ b/lib/libc/db/hash/hash_page.c
@@ -54,6 +54,7 @@ static char sccsid[] = "@(#)hash_page.c	8.6 (Berkeley) 6/16/94";
  *	open_temp
  */
 
+#include "namespace.h"
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c
index 72627bddade3d..14e71f520bf32 100644
--- a/lib/libc/db/mpool/mpool.c
+++ b/lib/libc/db/mpool/mpool.c
@@ -35,6 +35,7 @@
 static char sccsid[] = "@(#)mpool.c	8.2 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/lib/libc/db/recno/rec_close.c b/lib/libc/db/recno/rec_close.c
index a96d4f1a1edfb..9c56e0e763f36 100644
--- a/lib/libc/db/recno/rec_close.c
+++ b/lib/libc/db/recno/rec_close.c
@@ -35,6 +35,7 @@
 static char sccsid[] = "@(#)rec_close.c	8.3 (Berkeley) 2/21/94";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/mman.h>
diff --git a/lib/libc/db/recno/rec_open.c b/lib/libc/db/recno/rec_open.c
index 2a0f354227a61..c3f2e3a302dc8 100644
--- a/lib/libc/db/recno/rec_open.c
+++ b/lib/libc/db/recno/rec_open.c
@@ -38,6 +38,7 @@
 static char sccsid[] = "@(#)rec_open.c	8.6 (Berkeley) 2/22/94";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index e25df0e74c221..529d9e861e4f4 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,11 +1,11 @@
 #	from: @(#)Makefile.inc	5.21 (Berkeley) 5/24/91
-#	$Id: Makefile.inc,v 1.63.2.1 1995/02/17 10:48:27 jtc Exp $
+#	$Id: Makefile.inc,v 1.63.2.2 1995/05/02 19:34:27 jtc Exp $
 
 # gen sources
 .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/gen ${.CURDIR}/gen
 
-SRCS+=	alarm.c assert.c clock.c closedir.c confstr.c ctermid.c ctime.c \
-	ctype_.c daemon.c devname.c difftime.c \
+SRCS+=	alarm.c assert.c clock.c closedir.c confstr.c ctermid.c \
+	ctype_.c daemon.c devname.c \
 	disklabel.c err.c errlist.c errno.c exec.c fnmatch.c \
 	fstab.c ftok.c fts.c \
 	getbsize.c getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \
@@ -56,7 +56,7 @@ SRCS+=	_setjmp.S fabs.S frexp.c isinf.c ldexp.c modf.c setjmp.S
 SRCS+=	sigsetjmp.S
 .endif
 
-MAN+=	alarm.3 clock.3 confstr.3 ctermid.3 ctime.3 ctype.3 \
+MAN+=	alarm.3 clock.3 confstr.3 ctermid.3 ctype.3 \
 	daemon.3 devname.3 directory.3 err.3 exec.3 fnmatch.3 frexp.3 \
 	ftok.3 fts.3 \
 	getbsize.3 getcap.3 getcwd.3 getdomainname.3 getdiskbyname.3 \
@@ -75,8 +75,6 @@ MAN+=	alarm.3 clock.3 confstr.3 ctermid.3 ctime.3 ctype.3 \
 	tolower.3 toupper.3 ttyname.3 tzset.3 \
 	ualarm.3 uname.3 unvis.3 usleep.3 utime.3 valloc.3 vis.3
 
-MLINKS+=ctime.3 asctime.3 ctime.3 difftime.3 ctime.3 gmtime.3 \
-	ctime.3 localtime.3 ctime.3 mktime.3
 MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \
 	directory.3 readdir.3 directory.3 rewinddir.3 directory.3 seekdir.3 \
 	directory.3 telldir.3
diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c
index 96d0f52dc5955..6354c94ba9f46 100644
--- a/lib/libc/gen/closedir.c
+++ b/lib/libc/gen/closedir.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "from: @(#)closedir.c	8.1 (Berkeley) 6/10/93";*/
-static char rcsid[] = "$Id: closedir.c,v 1.2.4.2 1995/04/26 01:01:08 jtc Exp $";
+static char rcsid[] = "$Id: closedir.c,v 1.2.4.3 1995/05/02 19:34:30 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -59,5 +59,5 @@ closedir(dirp)
 	(void)free((void *)dirp);
 	return(close(fd));
 }
-__weak_reference(_closedir,closedir);
+#pragma weak closedir=_closedir
 
diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c
index 0fc5e8b8bf95d..6d6814c54fe8d 100644
--- a/lib/libc/gen/ctermid.c
+++ b/lib/libc/gen/ctermid.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)ctermid.c	5.2 (Berkeley) 2/20/91";*/
-static char *rcsid = "$Id: ctermid.c,v 1.3 1993/08/26 00:44:20 jtc Exp $";
+static char *rcsid = "$Id: ctermid.c,v 1.3.4.1 1995/05/02 19:34:31 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -47,7 +47,7 @@ ctermid(s)
 	static char def[] = _PATH_TTY;
 
 	if (s) {
-		bcopy(def, s, sizeof(_PATH_TTY));
+		memcpy(s, def, sizeof(_PATH_TTY));
 		return(s);
 	}
 	return(def);
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index 48932b6458491..9cd258a0690ad 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)disklabel.c	5.17 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: disklabel.c,v 1.6 1994/10/19 03:13:09 cgd Exp $";
+static char *rcsid = "$Id: disklabel.c,v 1.6.2.1 1995/05/02 19:34:33 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <ufs/ffs/fs.h>
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index ed8350d05578d..89c7141451d47 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: err.c,v 1.10.2.1 1995/02/17 10:41:37 jtc Exp $";
+static char *rcsid = "$Id: err.c,v 1.10.2.2 1995/05/02 19:34:35 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -68,7 +68,7 @@ verr(eval, fmt, ap)
 	(void)fprintf(stderr, "%s\n", strerror(sverrno));
 	exit(eval);
 }
-__weak_reference(_verr,verr);
+#pragma weak verr=_verr
 
 
 __dead void
@@ -93,7 +93,7 @@ err(va_alist)
 	verr(eval, fmt, ap);
 	va_end(ap);
 }
-__weak_reference(_err,err);
+#pragma weak err=_err
 
 
 __dead void
@@ -108,7 +108,7 @@ verrx(eval, fmt, ap)
 	(void)fprintf(stderr, "\n");
 	exit(eval);
 }
-__weak_reference(_verrx,verrx);
+#pragma weak verrx=_verrx
 
 
 __dead void
@@ -133,7 +133,7 @@ errx(va_alist)
 	verrx(eval, fmt, ap);
 	va_end(ap);
 }
-__weak_reference(_errx,errx);
+#pragma weak errx=_errx
 
 
 void
@@ -151,7 +151,7 @@ vwarn(fmt, ap)
 	}
 	(void)fprintf(stderr, "%s\n", strerror(sverrno));
 }
-__weak_reference(_vwarn,vwarn);
+#pragma weak vwarn=_vwarn
 
 
 void
@@ -174,7 +174,7 @@ warn(va_alist)
 	vwarn(fmt, ap);
 	va_end(ap);
 }
-__weak_reference(_warn,warn);
+#pragma weak warn=_warn
 
 
 void
@@ -187,7 +187,7 @@ vwarnx(fmt, ap)
 		(void)vfprintf(stderr, fmt, ap);
 	(void)fprintf(stderr, "\n");
 }
-__weak_reference(_vwarnx,vwarnx);
+#pragma weak vwarnx=_vwarnx
 
 
 void
@@ -210,4 +210,4 @@ warnx(va_alist)
 	vwarnx(fmt, ap);
 	va_end(ap);
 }
-__weak_reference(_warnx,warnx);
+#pragma weak warnx=_warnx
diff --git a/lib/libc/gen/errlist.c b/lib/libc/gen/errlist.c
index ad7caa52a7c9c..7390cd0255aa9 100644
--- a/lib/libc/gen/errlist.c
+++ b/lib/libc/gen/errlist.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)errlst.c	5.10 (Berkeley) 2/19/91";*/
-static char *rcsid = "$Id: errlist.c,v 1.3.2.1 1995/02/17 10:40:28 jtc Exp $";
+static char *rcsid = "$Id: errlist.c,v 1.3.2.2 1995/05/02 19:34:37 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -140,5 +140,5 @@ const char *const sys_errlist[] = {
 };
 int sys_nerr = { sizeof sys_errlist/sizeof sys_errlist[0] };
 
-__weak_reference(_sys_errlist,sys_errlist);
-__weak_reference(_sys_nerr,sys_nerr);
+#pragma weak sys_errlist=_sys_errlist
+#pragma weak sys_nerr=_sys_nerr
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index 8aab0c72bd807..c20417bb4402c 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)exec.c	5.9 (Berkeley) 6/17/91";*/
-static char *rcsid = "$Id: exec.c,v 1.5.4.2 1995/04/26 00:59:40 jtc Exp $";
+static char *rcsid = "$Id: exec.c,v 1.5.4.3 1995/05/02 19:34:39 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -110,7 +110,7 @@ execl(name, arg, va_alist)
 	errno = sverrno;
 	return(-1);
 }
-__weak_reference(_execl,execl);
+#pragma weak execl=_execl
 
 int
 #if __STDC__
@@ -139,7 +139,7 @@ execle(name, arg, va_alist)
 	errno = sverrno;
 	return(-1);
 }
-__weak_reference(_execle,execle);
+#pragma weak execle=_execle
 
 int
 #if __STDC__
@@ -168,7 +168,7 @@ execlp(name, arg, va_alist)
 	errno = sverrno;
 	return(-1);
 }
-__weak_reference(_execlp,execlp);
+#pragma weak execlp=_execlp
 
 int
 execv(name, argv)
@@ -178,7 +178,7 @@ execv(name, argv)
 	(void)execve(name, argv, environ);
 	return(-1);
 }
-__weak_reference(_execv,execv);
+#pragma weak execv=_execv
 
 int
 execvp(name, argv)
@@ -268,4 +268,4 @@ done:	if (path)
 		free(path);
 	return(-1);
 }
-__weak_reference(_execvp,execvp);
+#pragma weak execvp=_execvp
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index 44a1716c5ddde..b09afc2e96f1b 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)fstab.c	5.15 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: fstab.c,v 1.5 1994/08/13 09:41:50 mycroft Exp $";
+static char *rcsid = "$Id: fstab.c,v 1.5.2.1 1995/05/02 19:34:41 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/uio.h>
diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c
index 8861509a541e4..d20c13bcc2aa8 100644
--- a/lib/libc/gen/ftok.c
+++ b/lib/libc/gen/ftok.c
@@ -26,9 +26,10 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$Id: ftok.c,v 1.2 1994/06/26 16:27:34 jtc Exp $";
+static char *rcsid = "$Id: ftok.c,v 1.2.4.1 1995/05/02 19:34:42 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ipc.h>
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index f4408b43c8017..bf7a0c7baae49 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94"; */
-static char *rcsid = "$Id: fts.c,v 1.11 1994/12/28 03:15:09 mycroft Exp $";
+static char *rcsid = "$Id: fts.c,v 1.11.2.1 1995/05/02 19:34:44 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
index 95ea273b6f3ef..e532a5fe178f6 100644
--- a/lib/libc/gen/getcwd.c
+++ b/lib/libc/gen/getcwd.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)getcwd.c	5.11 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: getcwd.c,v 1.3 1993/08/26 00:44:36 jtc Exp $";
+static char *rcsid = "$Id: getcwd.c,v 1.3.4.1 1995/05/02 19:34:46 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/lib/libc/gen/getpass.c b/lib/libc/gen/getpass.c
index e3a3488cd6d8b..777b50d1483fb 100644
--- a/lib/libc/gen/getpass.c
+++ b/lib/libc/gen/getpass.c
@@ -33,10 +33,11 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)getpass.c	5.9 (Berkeley) 5/6/91";*/
-static char *rcsid = "$Id: getpass.c,v 1.4.4.1 1995/04/26 00:17:56 jtc Exp $";
+static char *rcsid = "$Id: getpass.c,v 1.4.4.2 1995/05/02 19:34:47 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
-#include <sys/termios.h>
+#include "namespace.h"
+#include <termios.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index 1e0b4383bc746..e72312ccea14d 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)getpwent.c	5.21 (Berkeley) 3/14/91";*/
-static char *rcsid = "$Id: getpwent.c,v 1.11 1994/03/09 10:10:29 deraadt Exp $";
+static char *rcsid = "$Id: getpwent.c,v 1.11.4.1 1995/05/02 19:34:49 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <fcntl.h>
 #include <db.h>
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
index b6784b4338e68..238f9890766c4 100644
--- a/lib/libc/gen/getusershell.c
+++ b/lib/libc/gen/getusershell.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)getusershell.c	5.7 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: getusershell.c,v 1.4 1993/08/26 00:44:45 jtc Exp $";
+static char *rcsid = "$Id: getusershell.c,v 1.4.4.1 1995/05/02 19:34:50 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 77c5cefc6c146..79243c516e5ae 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -36,7 +36,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93"; */
-static char *rcsid = "$Id: glob.c,v 1.4 1993/11/06 01:10:18 cgd Exp $";
+static char *rcsid = "$Id: glob.c,v 1.4.4.1 1995/05/02 19:34:51 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -64,6 +64,7 @@ static char *rcsid = "$Id: glob.c,v 1.4 1993/11/06 01:10:18 cgd Exp $";
  *	Number of matches in the current invocation of glob.
  */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/lib/libc/gen/nice.c b/lib/libc/gen/nice.c
index 3a02e6dfe47aa..e53e87ea69bea 100644
--- a/lib/libc/gen/nice.c
+++ b/lib/libc/gen/nice.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)nice.c	5.5 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: nice.c,v 1.4 1993/09/27 02:40:38 mycroft Exp $";
+static char *rcsid = "$Id: nice.c,v 1.4.4.1 1995/05/02 19:34:53 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index 75c3aaa9fd0c7..19813c578088d 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "from: @(#)opendir.c	8.7 (Berkeley) 12/10/94";*/
-static char rcsid[] = "$Id: opendir.c,v 1.7.2.1 1995/04/26 01:01:12 jtc Exp $";
+static char rcsid[] = "$Id: opendir.c,v 1.7.2.2 1995/05/02 19:34:55 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -56,7 +56,7 @@ opendir(name)
 {
 	return (__opendir2(name, DTF_HIDEW|DTF_NODUP));
 }
-__weak_reference(_opendir,opendir);
+#pragma weak opendir=_opendir
 
 
 DIR *
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
index c6b303e5e64dd..af0385007ea7a 100644
--- a/lib/libc/gen/popen.c
+++ b/lib/libc/gen/popen.c
@@ -36,9 +36,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* static char sccsid[] = "@(#)popen.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: popen.c,v 1.9 1994/05/09 16:28:27 jtc Exp $";
+static char *rcsid = "$Id: popen.c,v 1.9.4.1 1995/05/02 19:34:57 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/wait.h>
 
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
index 3066f16eb13d9..bc6f95dc8d8e5 100644
--- a/lib/libc/gen/psignal.c
+++ b/lib/libc/gen/psignal.c
@@ -33,13 +33,14 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)psignal.c	5.6 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: psignal.c,v 1.7 1994/10/06 18:16:43 jtc Exp $";
+static char *rcsid = "$Id: psignal.c,v 1.7.2.1 1995/05/02 19:34:59 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
  * Print the name of the signal indicated
  * along with the supplied message.
  */
+#include "namespace.h"
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c
index 330e134db8342..db965ce27b5de 100644
--- a/lib/libc/gen/pwcache.c
+++ b/lib/libc/gen/pwcache.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "from: @(#)pwcache.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: pwcache.c,v 1.3 1994/01/19 21:15:46 jtc Exp $";
+static char rcsid[] = "$Id: pwcache.c,v 1.3.4.1 1995/05/02 19:35:00 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <utmp.h>
 #include <pwd.h>
diff --git a/lib/libc/gen/raise.c b/lib/libc/gen/raise.c
index 4f364f1cda3ef..f9a9f6c32531b 100644
--- a/lib/libc/gen/raise.c
+++ b/lib/libc/gen/raise.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)raise.c	5.1 (Berkeley) 2/19/91";*/
-static char *rcsid = "$Id: raise.c,v 1.4 1993/11/11 19:04:32 jtc Exp $";
+static char *rcsid = "$Id: raise.c,v 1.4.4.1 1995/05/02 19:35:01 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <signal.h>
 #include <unistd.h>
 
diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c
index e26a1fdd51bbc..a4aae0f4e847f 100644
--- a/lib/libc/gen/readdir.c
+++ b/lib/libc/gen/readdir.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "from: @(#)readdir.c	8.3 (Berkeley) 9/29/94";*/
-static char rcsid[] = "$Id: readdir.c,v 1.4.2.1 1995/04/26 01:01:13 jtc Exp $";
+static char rcsid[] = "$Id: readdir.c,v 1.4.2.2 1995/05/02 19:35:03 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -75,4 +75,4 @@ readdir(dirp)
 		return (dp);
 	}
 }
-__weak_reference(_readdir,readdir);
+#pragma weak readdir=_readdir
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
index 695015ae5216c..edb4b59b66b01 100644
--- a/lib/libc/gen/rewinddir.c
+++ b/lib/libc/gen/rewinddir.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "from: @(#)rewinddir.c	8.1 (Berkeley) 6/8/93";*/
-static char rcsid[] = "$Id: rewinddir.c,v 1.3.4.1 1995/04/26 01:01:15 jtc Exp $";
+static char rcsid[] = "$Id: rewinddir.c,v 1.3.4.2 1995/05/02 19:35:04 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -48,4 +48,4 @@ rewinddir(dirp)
 	__seekdir(dirp, dirp->dd_rewind);
 	dirp->dd_rewind = telldir(dirp);
 }
-__weak_reference(_rewinddir,rewinddir);
+#pragma weak rewinddir=_rewinddir
diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c
index 412236762ae28..5503d1a15fef0 100644
--- a/lib/libc/gen/seekdir.c
+++ b/lib/libc/gen/seekdir.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "from: @(#)seekdir.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$Id: seekdir.c,v 1.3.4.1 1995/04/26 01:01:17 jtc Exp $";
+static char rcsid[] = "$Id: seekdir.c,v 1.3.4.2 1995/05/02 19:35:06 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -51,4 +51,4 @@ seekdir(dirp, loc)
 {
 	__seekdir(dirp, loc);
 }
-__weak_reference(_seekdir,seekdir);
+#pragma weak seekdir=_seekdir
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index 004894530caa2..876af891fb13f 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -36,9 +36,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94"; */
-static char *rcsid = "$Id: setmode.c,v 1.9 1994/03/29 10:50:38 cgd Exp $";
+static char *rcsid = "$Id: setmode.c,v 1.9.4.1 1995/05/02 19:35:08 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/lib/libc/gen/siginterrupt.c b/lib/libc/gen/siginterrupt.c
index 0651e90fb6de8..1085000ab29a3 100644
--- a/lib/libc/gen/siginterrupt.c
+++ b/lib/libc/gen/siginterrupt.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)siginterrupt.c	5.5 (Berkeley) 6/1/90";*/
-static char *rcsid = "$Id: siginterrupt.c,v 1.4 1993/11/30 21:21:42 jtc Exp $";
+static char *rcsid = "$Id: siginterrupt.c,v 1.4.4.1 1995/05/02 19:35:09 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <signal.h>
 
 /*
diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c
index 3aa9343c5ccf4..9b439973661d2 100644
--- a/lib/libc/gen/siglist.c
+++ b/lib/libc/gen/siglist.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)siglist.c	5.6 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: siglist.c,v 1.6.2.1 1995/02/17 10:40:32 jtc Exp $";
+static char *rcsid = "$Id: siglist.c,v 1.6.2.2 1995/05/02 19:35:10 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -74,4 +74,4 @@ const char *const sys_siglist[NSIG] = {
 	"User defined signal 1",	/* SIGUSR1 */
 	"User defined signal 2"		/* SIGUSR2 */
 };
-__weak_reference(_sys_siglist,sys_siglist);
+#pragma weak sys_siglist=_sys_siglist
diff --git a/lib/libc/gen/signal.c b/lib/libc/gen/signal.c
index 2bb88911758f9..71a10c9dca8c0 100644
--- a/lib/libc/gen/signal.c
+++ b/lib/libc/gen/signal.c
@@ -33,12 +33,13 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)signal.c	5.5 (Berkeley) 6/1/90";*/
-static char *rcsid = "$Id: signal.c,v 1.5 1993/11/30 21:21:45 jtc Exp $";
+static char *rcsid = "$Id: signal.c,v 1.5.4.1 1995/05/02 19:35:12 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
  * Almost backwards compatible signal.
  */
+#include "namespace.h"
 #include <signal.h>
 
 sigset_t __sigintr;		/* shared with siginterrupt */
diff --git a/lib/libc/gen/sigsetops.c b/lib/libc/gen/sigsetops.c
index 5473d5f0822c7..a1a8fc33d2f8c 100644
--- a/lib/libc/gen/sigsetops.c
+++ b/lib/libc/gen/sigsetops.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)sigsetops.c	5.3 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: sigsetops.c,v 1.7.4.1 1995/04/26 00:15:36 jtc Exp $";
+static char *rcsid = "$Id: sigsetops.c,v 1.7.4.2 1995/05/02 19:35:13 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <signal.h>
@@ -52,7 +52,7 @@ sigemptyset(set)
 	*set = 0;
 	return (0);
 }
-__weak_reference(_sigemptyset,sigemptyset);
+#pragma weak sigemptyset=_sigemptyset
 
 int
 sigfillset(set)
@@ -61,7 +61,7 @@ sigfillset(set)
 	*set = ~(sigset_t)0;
 	return (0);
 }
-__weak_reference(_sigfillset,sigfillset);
+#pragma weak sigfillset=_sigfillset
 
 int
 sigaddset(set, signo)
@@ -75,7 +75,7 @@ sigaddset(set, signo)
 	*set |= sigmask(signo);
 	return (0);
 }
-__weak_reference(_sigaddset,sigaddset);
+#pragma weak sigaddset=_sigaddset
 
 int
 sigdelset(set, signo)
@@ -89,7 +89,7 @@ sigdelset(set, signo)
 	*set &= ~sigmask(signo);
 	return (0);
 }
-__weak_reference(_sigdelset,sigdelset);
+#pragma weak sigdelset=_sigdelset
 
 int
 sigismember(set, signo)
@@ -102,4 +102,4 @@ sigismember(set, signo)
 	}
 	return ((*set & sigmask(signo)) != 0);
 }
-__weak_reference(_sigismember,sigismember);
+#pragma weak sigismember=_sigismember
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
index 9ec05c1ba67bd..be64a0d4af5d2 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)sleep.c	5.6 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: sleep.c,v 1.5 1994/12/11 17:34:10 mycroft Exp $";
+static char *rcsid = "$Id: sleep.c,v 1.5.2.1 1995/05/02 19:35:15 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/time.h>
 #include <signal.h>
 #include <unistd.h>
diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c
index 12d6f58e5af38..4f56409e9e8f0 100644
--- a/lib/libc/gen/sysconf.c
+++ b/lib/libc/gen/sysconf.c
@@ -38,6 +38,7 @@
 static char sccsid[] = "@(#)sysconf.c	8.2 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index 36d1a2165bac8..e5c9c95319d5b 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)syslog.c	5.36 (Berkeley) 10/4/92";*/
-static char *rcsid = "$Id: syslog.c,v 1.5.4.1 1995/04/26 00:37:27 jtc Exp $";
+static char *rcsid = "$Id: syslog.c,v 1.5.4.2 1995/05/02 19:35:17 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c
index ad4e1211e4591..3d83b13be708d 100644
--- a/lib/libc/gen/telldir.c
+++ b/lib/libc/gen/telldir.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "from: @(#)telldir.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$Id: telldir.c,v 1.3.4.1 1995/04/26 01:01:18 jtc Exp $";
+static char rcsid[] = "$Id: telldir.c,v 1.3.4.2 1995/05/02 19:35:19 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -88,7 +88,7 @@ telldir(dirp)
 	dd_hash[LOCHASH(index)] = lp;
 	return (index);
 }
-__weak_reference(_telldir,telldir);
+#pragma weak telldir=_telldir
 
 
 /*
diff --git a/lib/libc/gen/termios.c b/lib/libc/gen/termios.c
index 8169d49c727fb..42f1a82ca3491 100644
--- a/lib/libc/gen/termios.c
+++ b/lib/libc/gen/termios.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)termios.c	8.2 (Berkeley) 2/21/94";*/
-static char *rcsid = "$Id: termios.c,v 1.8 1994/09/19 07:38:27 mycroft Exp $";
+static char *rcsid = "$Id: termios.c,v 1.8.2.1 1995/05/02 19:35:21 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
diff --git a/lib/libc/gen/times.c b/lib/libc/gen/times.c
index 0b471c3594c16..86917c15ebb0f 100644
--- a/lib/libc/gen/times.c
+++ b/lib/libc/gen/times.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)times.c	5.4 (Berkeley) 8/27/90";*/
-static char *rcsid = "$Id: times.c,v 1.3 1993/08/26 00:45:15 jtc Exp $";
+static char *rcsid = "$Id: times.c,v 1.3.4.1 1995/05/02 19:35:22 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/times.h>
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
index 9d24c5450ceae..4c33328d931d2 100644
--- a/lib/libc/gen/ttyname.c
+++ b/lib/libc/gen/ttyname.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)ttyname.c	5.10 (Berkeley) 5/6/91";*/
-static char *rcsid = "$Id: ttyname.c,v 1.7.4.1 1995/04/26 00:35:56 jtc Exp $";
+static char *rcsid = "$Id: ttyname.c,v 1.7.4.2 1995/05/02 19:35:24 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c
index 5c0c230beed3c..53dc582eabed5 100644
--- a/lib/libc/gen/ualarm.c
+++ b/lib/libc/gen/ualarm.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)ualarm.c	5.5 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: ualarm.c,v 1.3 1993/08/26 00:45:21 jtc Exp $";
+static char *rcsid = "$Id: ualarm.c,v 1.3.4.1 1995/05/02 19:35:25 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/time.h>
 #include <unistd.h>
 
diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c
index 8791a0d6e6d3c..8b1595cd2c0d1 100644
--- a/lib/libc/gen/utime.c
+++ b/lib/libc/gen/utime.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)utime.c	5.4 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: utime.c,v 1.4 1993/08/26 00:45:24 jtc Exp $";
+static char *rcsid = "$Id: utime.c,v 1.4.4.1 1995/05/02 19:35:26 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/time.h>
 #include <utime.h>
 
diff --git a/lib/libc/gen/wait.c b/lib/libc/gen/wait.c
index 0a18c65cd4dca..b8dad93472d98 100644
--- a/lib/libc/gen/wait.c
+++ b/lib/libc/gen/wait.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)wait.c	5.4 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: wait.c,v 1.3 1993/08/26 00:45:27 jtc Exp $";
+static char *rcsid = "$Id: wait.c,v 1.3.4.1 1995/05/02 19:35:28 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/wait.h>
diff --git a/lib/libc/gen/wait3.c b/lib/libc/gen/wait3.c
index de3b2f75a48ed..170712cb587a8 100644
--- a/lib/libc/gen/wait3.c
+++ b/lib/libc/gen/wait3.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)wait3.c	5.6 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: wait3.c,v 1.3 1993/08/26 00:45:28 jtc Exp $";
+static char *rcsid = "$Id: wait3.c,v 1.3.4.1 1995/05/02 19:35:29 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/wait.h>
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
index 7f26767d95c4c..72a5269459245 100644
--- a/lib/libc/gen/waitpid.c
+++ b/lib/libc/gen/waitpid.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)waitpid.c	5.4 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: waitpid.c,v 1.3 1993/08/26 00:45:30 jtc Exp $";
+static char *rcsid = "$Id: waitpid.c,v 1.3.4.1 1995/05/02 19:35:30 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/wait.h>
diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c
index 1315535c23cbb..c0e487728ffc0 100644
--- a/lib/libc/gmon/gmon.c
+++ b/lib/libc/gmon/gmon.c
@@ -33,9 +33,10 @@
 
 #if !defined(lint) && defined(LIBC_SCCS)
 /* from: static char sccsid[] = "@(#)gmon.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: gmon.c,v 1.2 1994/05/14 06:31:15 cgd Exp $";
+static char *rcsid = "$Id: gmon.c,v 1.2.4.1 1995/05/02 19:35:34 jtc Exp $";
 #endif
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/gmon.h>
diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
index f585e2de464b1..b2ca4fb9f8911 100644
--- a/lib/libc/include/namespace.h
+++ b/lib/libc/include/namespace.h
@@ -180,3 +180,11 @@
 #define rewinddir	_rewinddir
 #define seekdir		_seekdir
 #define telldir		_telldir
+
+#define ftok		_ftok
+#define getgrent	_getgrent
+#define getgrgid	_getgrgid
+#define getgrnam	_getgrnam
+#define getpwent	_getpwent
+#define getpwnam	_getpwnam
+#define getpwuid	_getpwuid
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index fcce2c389ab98..018a538c38458 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94"; */
-static char *rcsid = "$Id: rcmd.c,v 1.10 1994/12/04 18:13:11 christos Exp $";
+static char *rcsid = "$Id: rcmd.c,v 1.10.2.1 1995/05/02 19:35:40 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
diff --git a/lib/libc/net/recv.c b/lib/libc/net/recv.c
index 0481ff95e1d72..af4cca5585a3c 100644
--- a/lib/libc/net/recv.c
+++ b/lib/libc/net/recv.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)recv.c	5.3 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: recv.c,v 1.5 1994/10/19 03:20:30 cgd Exp $";
+static char *rcsid = "$Id: recv.c,v 1.5.2.1 1995/05/02 19:35:42 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
diff --git a/lib/libc/net/send.c b/lib/libc/net/send.c
index 87c1dceadfbe6..11acddf54109d 100644
--- a/lib/libc/net/send.c
+++ b/lib/libc/net/send.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)send.c	5.3 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: send.c,v 1.5 1994/10/19 03:20:57 cgd Exp $";
+static char *rcsid = "$Id: send.c,v 1.5.2.1 1995/05/02 19:35:44 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
diff --git a/lib/libc/nls/catclose.c b/lib/libc/nls/catclose.c
index e65f0ca6c6e3b..9e368c83b72b7 100644
--- a/lib/libc/nls/catclose.c
+++ b/lib/libc/nls/catclose.c
@@ -4,11 +4,6 @@
  */
 
 #include <sys/cdefs.h>
-
-#ifdef __weak_reference
-__weak_reference(_catclose,catclose);
-#else
-
 #include <nl_types.h>
 
 extern void _catclose __P((nl_catd));
@@ -19,5 +14,3 @@ catclose(catd)
 {
 	_catclose(catd);
 }
-
-#endif
diff --git a/lib/libc/nls/catgets.c b/lib/libc/nls/catgets.c
index 976d92d151a7b..f6a3e345a1043 100644
--- a/lib/libc/nls/catgets.c
+++ b/lib/libc/nls/catgets.c
@@ -4,11 +4,6 @@
  */
 
 #include <sys/cdefs.h>
-
-#ifdef __weak_reference
-__weak_reference(_catgets,catgets);
-#else
-
 #include <nl_types.h>
 
 extern char * _catgets __P((nl_catd, int, int, char *));
@@ -22,5 +17,3 @@ catgets(catd, set_id, msg_id, s)
 {
 	return _catgets(catd, set_id, msg_id, s);
 }
-
-#endif
diff --git a/lib/libc/nls/catopen.c b/lib/libc/nls/catopen.c
index 866c0cab4fbd1..a3415cf355b55 100644
--- a/lib/libc/nls/catopen.c
+++ b/lib/libc/nls/catopen.c
@@ -4,11 +4,6 @@
  */
 
 #include <sys/cdefs.h>
-
-#ifdef __weak_reference
-__weak_reference(_catopen,catopen);
-#else
-
 #include <nl_types.h>
 
 extern nl_catd _catopen __P((__const char *, int));
@@ -20,5 +15,3 @@ catopen(name, oflag)
 {
 	return _catopen(name, oflag);
 }
-
-#endif
diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
index 63f0d5083ca35..41a3af9005bf2 100644
--- a/lib/libc/nls/msgcat.c
+++ b/lib/libc/nls/msgcat.c
@@ -31,7 +31,7 @@ up-to-date.  Many thanks.
 ******************************************************************/
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$Id: msgcat.c,v 1.10.2.2 1995/03/25 02:21:46 jtc Exp $";
+static char *rcsid = "$Id: msgcat.c,v 1.10.2.3 1995/05/02 19:35:55 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Edit History
@@ -141,7 +141,7 @@ int type;
 
     return(loadCat(catpath, type));
 }
-__weak_reference(_catopen,catopen);
+#pragma weak catopen=_catopen
 
 
 /*
@@ -253,7 +253,7 @@ char *dflt;
     else cptr = dflt;
     return(cptr);
 }
-__weak_reference(_catgets,catgets);
+#pragma weak catgets=_catgets
 
 
 int		catclose( catd)
@@ -279,7 +279,7 @@ nl_catd catd;
 
     return 0;
 }
-__weak_reference(_catclose,catclose);
+#pragma weak catclose=_catclose
 
 
 /*
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index 75e4870ebe016..6b0729d1206cf 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)auth_unix.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: auth_unix.c,v 1.1 1993/10/07 07:29:37 cgd Exp $";
+static char *rcsid = "$Id: auth_unix.c,v 1.1.4.1 1995/05/02 19:36:00 jtc Exp $";
 #endif
 
 /*
@@ -45,6 +45,7 @@ static char *rcsid = "$Id: auth_unix.c,v 1.1 1993/10/07 07:29:37 cgd Exp $";
  *
  */
 
+#include "namespace.h"
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
index 843245b81f4a8..7c648d8dad806 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -30,13 +30,14 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)bindresvport.c 1.8 88/02/08 SMI";*/
 /*static char *sccsid = "from: @(#)bindresvport.c	2.2 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: bindresvport.c,v 1.2 1994/12/04 01:13:12 cgd Exp $";
+static char *rcsid = "$Id: bindresvport.c,v 1.2.2.1 1995/05/02 19:36:02 jtc Exp $";
 #endif
 
 /*
  * Copyright (c) 1987 by Sun Microsystems, Inc.
  */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/socket.h>
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index 92ed63063344d..32a5e9feb8291 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_simple.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: clnt_simple.c,v 1.2 1993/12/05 14:36:58 deraadt Exp $";
+static char *rcsid = "$Id: clnt_simple.c,v 1.2.4.1 1995/05/02 19:36:03 jtc Exp $";
 #endif
 
 /* 
@@ -40,6 +40,7 @@ static char *rcsid = "$Id: clnt_simple.c,v 1.2 1993/12/05 14:36:58 deraadt Exp $
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#include "namespace.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/rpc/clnt_tcp.c b/lib/libc/rpc/clnt_tcp.c
index 768071fd427d1..1a1ca9942daa7 100644
--- a/lib/libc/rpc/clnt_tcp.c
+++ b/lib/libc/rpc/clnt_tcp.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_tcp.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: clnt_tcp.c,v 1.3 1994/12/04 01:13:15 cgd Exp $";
+static char *rcsid = "$Id: clnt_tcp.c,v 1.3.2.1 1995/05/02 19:36:06 jtc Exp $";
 #endif
  
 /*
@@ -52,6 +52,7 @@ static char *rcsid = "$Id: clnt_tcp.c,v 1.3 1994/12/04 01:13:15 cgd Exp $";
  * Now go hang yourself.
  */
 
+#include "namespace.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <rpc/rpc.h>
diff --git a/lib/libc/rpc/clnt_udp.c b/lib/libc/rpc/clnt_udp.c
index 960ee217714f1..a33ad4103cab4 100644
--- a/lib/libc/rpc/clnt_udp.c
+++ b/lib/libc/rpc/clnt_udp.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_udp.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: clnt_udp.c,v 1.3 1994/12/04 01:13:16 cgd Exp $";
+static char *rcsid = "$Id: clnt_udp.c,v 1.3.2.1 1995/05/02 19:36:07 jtc Exp $";
 #endif
 
 /*
@@ -39,6 +39,7 @@ static char *rcsid = "$Id: clnt_udp.c,v 1.3 1994/12/04 01:13:16 cgd Exp $";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#include "namespace.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <rpc/rpc.h>
diff --git a/lib/libc/rpc/get_myaddress.c b/lib/libc/rpc/get_myaddress.c
index 54787297290b5..5d2a94e25d98a 100644
--- a/lib/libc/rpc/get_myaddress.c
+++ b/lib/libc/rpc/get_myaddress.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)get_myaddress.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: get_myaddress.c,v 1.1 1993/10/07 07:29:49 cgd Exp $";
+static char *rcsid = "$Id: get_myaddress.c,v 1.1.4.1 1995/05/02 19:36:09 jtc Exp $";
 #endif
 
 /*
@@ -40,6 +40,7 @@ static char *rcsid = "$Id: get_myaddress.c,v 1.1 1993/10/07 07:29:49 cgd Exp $";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#include "namespace.h"
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <rpc/pmap_prot.h>
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
index 8aceab0e84aea..9af78026267f3 100644
--- a/lib/libc/rpc/pmap_clnt.c
+++ b/lib/libc/rpc/pmap_clnt.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_clnt.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: pmap_clnt.c,v 1.1 1993/10/07 07:29:57 cgd Exp $";
+static char *rcsid = "$Id: pmap_clnt.c,v 1.1.4.1 1995/05/02 19:36:10 jtc Exp $";
 #endif
 
 /*
@@ -40,6 +40,7 @@ static char *rcsid = "$Id: pmap_clnt.c,v 1.1 1993/10/07 07:29:57 cgd Exp $";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#include "namespace.h"
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
index cc67c2e69179e..4c02cf0431b77 100644
--- a/lib/libc/rpc/pmap_getmaps.c
+++ b/lib/libc/rpc/pmap_getmaps.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_getmaps.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: pmap_getmaps.c,v 1.2 1994/12/04 01:13:19 cgd Exp $";
+static char *rcsid = "$Id: pmap_getmaps.c,v 1.2.2.1 1995/05/02 19:36:11 jtc Exp $";
 #endif
 
 /*
@@ -41,6 +41,7 @@ static char *rcsid = "$Id: pmap_getmaps.c,v 1.2 1994/12/04 01:13:19 cgd Exp $";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#include "namespace.h"
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
index 05e4fc61e8096..6a1c89a889973 100644
--- a/lib/libc/rpc/pmap_getport.c
+++ b/lib/libc/rpc/pmap_getport.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_getport.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: pmap_getport.c,v 1.1 1993/10/07 07:29:59 cgd Exp $";
+static char *rcsid = "$Id: pmap_getport.c,v 1.1.4.1 1995/05/02 19:36:13 jtc Exp $";
 #endif
 
 /*
@@ -40,6 +40,7 @@ static char *rcsid = "$Id: pmap_getport.c,v 1.1 1993/10/07 07:29:59 cgd Exp $";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#include "namespace.h"
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
index 0b274a89a8f7d..63c7ce4c83cf4 100644
--- a/lib/libc/rpc/pmap_rmt.c
+++ b/lib/libc/rpc/pmap_rmt.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_rmt.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: pmap_rmt.c,v 1.3 1994/12/04 01:13:20 cgd Exp $";
+static char *rcsid = "$Id: pmap_rmt.c,v 1.3.2.1 1995/05/02 19:36:14 jtc Exp $";
 #endif
 
 /*
@@ -41,6 +41,7 @@ static char *rcsid = "$Id: pmap_rmt.c,v 1.3 1994/12/04 01:13:20 cgd Exp $";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#include "namespace.h"
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index 92c70e19d768a..039b6ba01a3a8 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -30,13 +30,14 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_run.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: svc_run.c,v 1.5 1995/01/04 02:58:47 mycroft Exp $";
+static char *rcsid = "$Id: svc_run.c,v 1.5.2.1 1995/05/02 19:36:16 jtc Exp $";
 #endif
 
 /*
  * This is the rpc server side idle loop
  * Wait for input, call server program.
  */
+#include "namespace.h"
 #include <rpc/rpc.h>
 #include <sys/errno.h>
 
diff --git a/lib/libc/rpc/svc_tcp.c b/lib/libc/rpc/svc_tcp.c
index ef83484cf7c56..ecf3b73532226 100644
--- a/lib/libc/rpc/svc_tcp.c
+++ b/lib/libc/rpc/svc_tcp.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: svc_tcp.c,v 1.3 1994/12/04 01:13:30 cgd Exp $";
+static char *rcsid = "$Id: svc_tcp.c,v 1.3.2.1 1995/05/02 19:36:18 jtc Exp $";
 #endif
 
 /*
@@ -43,6 +43,7 @@ static char *rcsid = "$Id: svc_tcp.c,v 1.3 1994/12/04 01:13:30 cgd Exp $";
  * and a record/tcp stream.
  */
 
+#include "namespace.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <rpc/rpc.h>
diff --git a/lib/libc/rpc/svc_udp.c b/lib/libc/rpc/svc_udp.c
index d11e5302843a5..6fb19ffa39748 100644
--- a/lib/libc/rpc/svc_udp.c
+++ b/lib/libc/rpc/svc_udp.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_udp.c	2.2 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: svc_udp.c,v 1.3 1994/12/04 01:13:33 cgd Exp $";
+static char *rcsid = "$Id: svc_udp.c,v 1.3.2.1 1995/05/02 19:36:19 jtc Exp $";
 #endif
 
 /*
@@ -41,6 +41,7 @@ static char *rcsid = "$Id: svc_udp.c,v 1.3 1994/12/04 01:13:33 cgd Exp $";
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#include "namespace.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <rpc/rpc.h>
diff --git a/lib/libc/rpc/xdr_rec.c b/lib/libc/rpc/xdr_rec.c
index 32c5c5a901637..da4fb4121ebc3 100644
--- a/lib/libc/rpc/xdr_rec.c
+++ b/lib/libc/rpc/xdr_rec.c
@@ -29,7 +29,7 @@
 #if defined(LIBC_SCCS) && !defined(lint) 
 /*static char *sccsid = "from: @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_rec.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: xdr_rec.c,v 1.4 1994/12/04 01:13:42 cgd Exp $";
+static char *rcsid = "$Id: xdr_rec.c,v 1.4.2.1 1995/05/02 19:36:21 jtc Exp $";
 #endif
 
 /*
@@ -300,7 +300,7 @@ xdrrec_getpos(xdrs)
 	register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
 	register long pos;
 
-	pos = lseek((off_t)(long)rstrm->tcp_handle, 0, 1);
+	pos = lseek((long) rstrm->tcp_handle, (off_t) 0, SEEK_CUR);
 	if (pos != -1)
 		switch (xdrs->x_op) {
 
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c
index 9571aeee51960..0b02e836384d2 100644
--- a/lib/libc/stdio/fgets.c
+++ b/lib/libc/stdio/fgets.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fgets.c,v 1.4 1995/02/02 02:09:13 jtc Exp $	*/
+/*	$NetBSD: fgets.c,v 1.4.2.1 1995/05/02 19:36:28 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)fgets.c	8.2 (Berkeley) 12/22/93";
 #endif
-static char rcsid[] = "$NetBSD: fgets.c,v 1.4 1995/02/02 02:09:13 jtc Exp $";
+static char rcsid[] = "$NetBSD: fgets.c,v 1.4.2.1 1995/05/02 19:36:28 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -54,14 +54,14 @@ static char rcsid[] = "$NetBSD: fgets.c,v 1.4 1995/02/02 02:09:13 jtc Exp $";
 char *
 fgets(buf, n, fp)
 	char *buf;
-	register size_t n;
+	register int n;
 	register FILE *fp;
 {
 	register size_t len;
 	register char *s;
 	register unsigned char *p, *t;
 
-	if (n == 0)		/* sanity check */
+	if (n <= 0)		/* sanity check */
 		return (NULL);
 
 	s = buf;
diff --git a/lib/libc/stdlib/abort.c b/lib/libc/stdlib/abort.c
index c6d47bfa4cf40..dfdf06fa52ae5 100644
--- a/lib/libc/stdlib/abort.c
+++ b/lib/libc/stdlib/abort.c
@@ -33,10 +33,12 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)abort.c	5.11 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: abort.c,v 1.3 1993/08/26 00:47:47 jtc Exp $";
+static char *rcsid = "$Id: abort.c,v 1.3.4.1 1995/05/02 19:36:35 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
-#include <sys/signal.h>
+#include "namespace.h"
+#include <sys/types.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <unistd.h>
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index 084432183758f..00edab4d4db4f 100644
--- a/lib/libc/stdlib/getenv.c
+++ b/lib/libc/stdlib/getenv.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)getenv.c	5.8 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: getenv.c,v 1.4 1993/10/15 01:26:42 jtc Exp $";
+static char *rcsid = "$Id: getenv.c,v 1.4.4.1 1995/05/02 19:36:38 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index b006930f71ffc..ec36b1fdc00dc 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)malloc.c	5.11 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: malloc.c,v 1.4 1994/10/19 03:06:34 cgd Exp $";
+static char *rcsid = "$Id: malloc.c,v 1.4.2.1 1995/05/02 19:36:39 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -47,6 +47,7 @@ static char *rcsid = "$Id: malloc.c,v 1.4 1994/10/19 03:06:34 cgd Exp $";
  * This is designed for use in a virtual memory environment.
  */
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c
index 9dedf93020748..f9706e6a41ad7 100644
--- a/lib/libc/stdlib/realpath.c
+++ b/lib/libc/stdlib/realpath.c
@@ -36,9 +36,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "from: @(#)realpath.c	8.1 (Berkeley) 2/16/94";*/
-static char *rcsid = "$Id: realpath.c,v 1.1.1.1 1994/05/17 12:42:31 mycroft Exp $";
+static char *rcsid = "$Id: realpath.c,v 1.1.1.1.4.1 1995/05/02 19:36:41 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/lib/libc/stdlib/setenv.c b/lib/libc/stdlib/setenv.c
index 7a3117374bae1..bb2ac586a2366 100644
--- a/lib/libc/stdlib/setenv.c
+++ b/lib/libc/stdlib/setenv.c
@@ -33,9 +33,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)setenv.c	5.6 (Berkeley) 6/4/91";*/
-static char *rcsid = "$Id: setenv.c,v 1.5 1993/10/15 01:26:44 jtc Exp $";
+static char *rcsid = "$Id: setenv.c,v 1.5.4.1 1995/05/02 19:36:43 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/stdlib/strtoq.c b/lib/libc/stdlib/strtoq.c
index 34b38912b2042..6f6c9791207b6 100644
--- a/lib/libc/stdlib/strtoq.c
+++ b/lib/libc/stdlib/strtoq.c
@@ -134,4 +134,4 @@ strtoq(nptr, endptr, base)
 		*endptr = (char *) (any ? s - 1 : nptr);
 	return (acc);
 }
-__weak_reference(_strtoq,strtoq);
+#pragma weak strtoq=_strtoq
diff --git a/lib/libc/stdlib/strtouq.c b/lib/libc/stdlib/strtouq.c
index 4109cb22ee6f7..5c12efa0927e7 100644
--- a/lib/libc/stdlib/strtouq.c
+++ b/lib/libc/stdlib/strtouq.c
@@ -112,4 +112,4 @@ strtouq(nptr, endptr, base)
 		*endptr = (char *) (any ? s - 1 : nptr);
 	return (acc);
 }
-__weak_reference(_strtouq,strtouq);
+#pragma weak strtouq=_strtouq
diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c
index 6d02298936a41..9e079f1dba852 100644
--- a/lib/libc/stdlib/system.c
+++ b/lib/libc/stdlib/system.c
@@ -33,12 +33,13 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)system.c	5.10 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: system.c,v 1.7 1993/08/26 00:48:16 jtc Exp $";
+static char *rcsid = "$Id: system.c,v 1.7.4.1 1995/05/02 19:36:47 jtc Exp $";
 #endif /* LIBC_SCCS and not lint */
 
+#include "namespace.h"
 #include <sys/types.h>
-#include <sys/signal.h>
 #include <sys/wait.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <unistd.h>
diff --git a/lib/libc/time/localtime.c b/lib/libc/time/localtime.c
index 21c132b5406dc..120858c2d7943 100644
--- a/lib/libc/time/localtime.c
+++ b/lib/libc/time/localtime.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: localtime.c,v 1.3.2.2 1995/03/25 02:18:45 jtc Exp $	*/
+/*	$NetBSD: localtime.c,v 1.3.2.3 1995/05/02 19:36:51 jtc Exp $	*/
 
 #ifndef lint
 #ifndef NOID
@@ -14,6 +14,7 @@ static char	elsieid[] = "@(#)localtime.c	7.43";
 
 /*LINTLIBRARY*/
 
+#include "namespace.h"
 #include "private.h"
 #include "tzfile.h"
 #include "fcntl.h"
@@ -165,7 +166,7 @@ char *			tzname[2] = {
 	wildabbr,
 	wildabbr
 };
-__weak_reference(_tzname,tzname);
+#pragma weak tzname=_tzname
 
 /*
 ** Section 4.12.3 of X3.159-1989 requires that
@@ -180,13 +181,13 @@ static struct tm	tm;
 #ifdef USG_COMPAT
 time_t			timezone = 0;
 int			daylight = 0;
-__weak_reference(_timezone,timezone);
-__weak_reference(_daylight,daylight);
+#pragma weak timezone=_timezone
+#pragma weak daylight=_daylight
 #endif /* defined USG_COMPAT */
 
 #ifdef ALTZONE
 time_t			altzone = 0;
-__weak_reference(_altzone,altzone);
+#pragma weak altzone=_altzone
 #endif /* defined ALTZONE */
 
 static long
@@ -932,7 +933,7 @@ tzsetwall P((void))
 		gmtload(lclptr);
 	settzname();
 }
-__weak_reference(_tzsetwall,tzsetwall);
+#pragma weak tzsetwall=_tzsetwall
 
 void
 tzset P((void))
@@ -1098,7 +1099,7 @@ const long		offset;
 	gmtsub(timep, offset, &tm);
 	return &tm;
 }
-__weak_reference(_offtime,offtime);
+#pragma weak offtime=_offtime
 
 #endif /* defined STD_INSPIRED */
 
@@ -1503,7 +1504,7 @@ struct tm * const	tmp;
 	tmp->tm_isdst = -1;	/* in case it wasn't initialized */
 	return mktime(tmp);
 }
-__weak_reference(_timelocal,timelocal);
+#pragma weak timelocal=_timelocal
 
 time_t
 timegm(tmp)
@@ -1512,7 +1513,7 @@ struct tm * const	tmp;
 	tmp->tm_isdst = 0;
 	return time1(tmp, gmtsub, 0L);
 }
-__weak_reference(_timegm,timegm);
+#pragma weak timegm=_timegm
 
 time_t
 timeoff(tmp, offset)
@@ -1522,7 +1523,7 @@ const long		offset;
 	tmp->tm_isdst = 0;
 	return time1(tmp, gmtsub, offset);
 }
-__weak_reference(_timeoff,timeoff);
+#pragma weak timeoff=_timeoff
 
 #endif /* defined STD_INSPIRED */
 
@@ -1585,7 +1586,7 @@ time_t	t;
 	tzset();
 	return t - leapcorr(&t);
 }
-__weak_reference(_time2posix,time2posix);
+#pragma weak time2posix=_time2posix
 
 time_t
 posix2time(t)
@@ -1620,6 +1621,6 @@ time_t	t;
 	}
 	return x;
 }
-__weak_reference(_posix2time,posix2time);
+#pragma weak posix2time=_posix2time
 
 #endif /* defined STD_INSPIRED */
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
index 15ab798591d7a..0817bd9f50ea8 100644
--- a/lib/libc/yp/yplib.c
+++ b/lib/libc/yp/yplib.c
@@ -30,9 +30,10 @@
  */
 
 #ifndef LINT
-static char *rcsid = "$Id: yplib.c,v 1.13 1994/09/28 01:38:06 deraadt Exp $";
+static char *rcsid = "$Id: yplib.c,v 1.13.2.1 1995/05/02 19:36:57 jtc Exp $";
 #endif
 
+#include "namespace.h"
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>