diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index d2da08bd97a1..0262a8f5e54d 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: banner.c,v 1.4 2000/05/30 12:03:31 sjg Exp $	*/
+/*	$NetBSD: banner.c,v 1.5 2000/07/03 02:51:12 matt Exp $	*/
 
 /*
  *	Changes for banner(1)
@@ -62,11 +62,12 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
 #if 0
 static char sccsid[] = "@(#)printjob.c	8.2 (Berkeley) 4/16/94";
 #else
-__RCSID("$NetBSD: banner.c,v 1.4 2000/05/30 12:03:31 sjg Exp $");
+__RCSID("$NetBSD: banner.c,v 1.5 2000/07/03 02:51:12 matt Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/usr.bin/bzip2/Makefile b/usr.bin/bzip2/Makefile
index 6643e6d73017..2f75c3771c49 100644
--- a/usr.bin/bzip2/Makefile
+++ b/usr.bin/bzip2/Makefile
@@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.2 1998/09/14 05:34:41 ross Exp $
-
-.include <bsd.own.mk>
+#	$NetBSD: Makefile,v 1.3 2000/07/03 02:51:15 matt Exp $
 
 PROG=      bzip2
 WARNS=	   0
-CWARNFLAGS=-Wall -Wstrict-prototypes -Wpointer-arith
+CWARNFLAGS+=-Wall -Wstrict-prototypes -Wpointer-arith
 LDSTATIC?= -static
 LDADD+=	   -lbz2
 DPADD+=	   ${LIBBZ2}
 
+.include <bsd.own.mk>
+
 MLINKS+=   bzip2.1 bunzip2.1\
 	   bzip2.1 bzcat.1\
 	   bzip2.1 bzip2recover.1
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index ed724e019003..c636feae4c99 100644
--- a/usr.bin/colcrt/colcrt.c
+++ b/usr.bin/colcrt/colcrt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: colcrt.c,v 1.4 1997/10/18 12:59:10 lukem Exp $	*/
+/*	$NetBSD: colcrt.c,v 1.5 2000/07/03 02:51:15 matt Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -43,11 +43,12 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)colcrt.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: colcrt.c,v 1.4 1997/10/18 12:59:10 lukem Exp $");
+__RCSID("$NetBSD: colcrt.c,v 1.5 2000/07/03 02:51:15 matt Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/usr.bin/fgen/Makefile b/usr.bin/fgen/Makefile
index 412a96fd8920..6cdd342155e1 100644
--- a/usr.bin/fgen/Makefile
+++ b/usr.bin/fgen/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.3 2000/04/16 04:57:55 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2000/07/03 02:51:16 matt Exp $
 
+CPPFLAGS+= -I${.CURDIR}
 PROG=	fgen
 SRCS=	fgen.l
 MAN=	fgen.1
diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c
index d37f26ea331a..143b6a4e110f 100644
--- a/usr.bin/fsplit/fsplit.c
+++ b/usr.bin/fsplit/fsplit.c
@@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
 #if 0
 static char sccsid[] = "from: @(#)fsplit.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: fsplit.c,v 1.7 1998/12/19 16:38:10 christos Exp $");
+__RCSID("$NetBSD: fsplit.c,v 1.8 2000/07/03 02:51:16 matt Exp $");
 #endif
 #endif /* not lint */
 
@@ -53,6 +53,7 @@ __RCSID("$NetBSD: fsplit.c,v 1.7 1998/12/19 16:38:10 christos Exp $");
 
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c
index 82aecc35fcd0..b472bfb40fb7 100644
--- a/usr.bin/getconf/getconf.c
+++ b/usr.bin/getconf/getconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getconf.c,v 1.12 2000/04/20 00:41:20 simonb Exp $	*/
+/*	$NetBSD: getconf.c,v 1.13 2000/07/03 02:51:17 matt Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: getconf.c,v 1.12 2000/04/20 00:41:20 simonb Exp $");
+__RCSID("$NetBSD: getconf.c,v 1.13 2000/07/03 02:51:17 matt Exp $");
 #endif /* not lint */
 
 #include <err.h>
@@ -48,6 +48,7 @@ __RCSID("$NetBSD: getconf.c,v 1.12 2000/04/20 00:41:20 simonb Exp $");
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 
 int	main __P((int, char **));
 static void usage __P((void));
diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c
index ca485b3b9732..80efa106f527 100644
--- a/usr.bin/getopt/getopt.c
+++ b/usr.bin/getopt/getopt.c
@@ -1,12 +1,13 @@
-/*	$NetBSD: getopt.c,v 1.5 1998/02/03 03:44:22 perry Exp $	*/
+/*	$NetBSD: getopt.c,v 1.6 2000/07/03 02:51:18 matt Exp $	*/
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: getopt.c,v 1.5 1998/02/03 03:44:22 perry Exp $");
+__RCSID("$NetBSD: getopt.c,v 1.6 2000/07/03 02:51:18 matt Exp $");
 #endif /* not lint */
 
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 int	main __P((int, char **));
diff --git a/usr.bin/innetgr/innetgr.c b/usr.bin/innetgr/innetgr.c
index a1fd44918a83..e9bd6585d0c5 100644
--- a/usr.bin/innetgr/innetgr.c
+++ b/usr.bin/innetgr/innetgr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: innetgr.c,v 1.1 1999/03/02 13:59:17 christos Exp $	*/
+/*	$NetBSD: innetgr.c,v 1.2 2000/07/03 02:51:20 matt Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,9 +37,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: innetgr.c,v 1.1 1999/03/02 13:59:17 christos Exp $");
+__RCSID("$NetBSD: innetgr.c,v 1.2 2000/07/03 02:51:20 matt Exp $");
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <netgroup.h>
 
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 963edccd3055..997d80e4a64a 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ktrace.c,v 1.17 2000/05/27 00:45:37 sommerfeld Exp $	*/
+/*	$NetBSD: ktrace.c,v 1.18 2000/07/03 02:51:21 matt Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
 #if 0
 static char sccsid[] = "@(#)ktrace.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: ktrace.c,v 1.17 2000/05/27 00:45:37 sommerfeld Exp $");
+__RCSID("$NetBSD: ktrace.c,v 1.18 2000/07/03 02:51:21 matt Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,6 +59,7 @@ __RCSID("$NetBSD: ktrace.c,v 1.17 2000/05/27 00:45:37 sommerfeld Exp $");
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "ktrace.h"
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index 0b98022bac39..beeb29dc50f4 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: leave.c,v 1.8 1998/12/19 17:44:22 christos Exp $	*/
+/*	$NetBSD: leave.c,v 1.9 2000/07/03 02:51:22 matt Exp $	*/
 
 /*
  * Copyright (c) 1980, 1988, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\n\
 #if 0
 static char sccsid[] = "@(#)leave.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: leave.c,v 1.8 1998/12/19 17:44:22 christos Exp $");
+__RCSID("$NetBSD: leave.c,v 1.9 2000/07/03 02:51:22 matt Exp $");
 #endif
 #endif /* not lint */
 
@@ -51,6 +51,7 @@ __RCSID("$NetBSD: leave.c,v 1.8 1998/12/19 17:44:22 christos Exp $");
 #include <sys/time.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 
diff --git a/usr.bin/menuc/avl.c b/usr.bin/menuc/avl.c
index 93fc34648d2f..bd152ee5a46a 100644
--- a/usr.bin/menuc/avl.c
+++ b/usr.bin/menuc/avl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: avl.c,v 1.1.1.1 1997/09/26 17:54:09 phil Exp $	*/
+/*	$NetBSD: avl.c,v 1.2 2000/07/03 02:51:23 matt Exp $	*/
 
 /*
  * Copyright (c) 1997 Philip A. Nelson.
@@ -46,6 +46,8 @@
  *	} id_rec;
  */
 
+#include <string.h>
+
 #include "defs.h"
 
 /*  find_id returns a pointer to node in TREE that has the correct
diff --git a/usr.bin/menuc/main.c b/usr.bin/menuc/main.c
index 1a6f7ae225f9..ceea93105591 100644
--- a/usr.bin/menuc/main.c
+++ b/usr.bin/menuc/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.6 1999/06/20 05:41:45 cgd Exp $	*/
+/*	$NetBSD: main.c,v 1.7 2000/07/03 02:51:24 matt Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -39,6 +39,7 @@
 /* main.c - main program for menu compiler. */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #define MAIN
diff --git a/usr.bin/msgc/msgmain.c b/usr.bin/msgc/msgmain.c
index 5055a22cedc4..5dcab8d3a692 100644
--- a/usr.bin/msgc/msgmain.c
+++ b/usr.bin/msgc/msgmain.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: msgmain.c,v 1.3 1998/02/03 03:53:39 perry Exp $	*/
+/*	$NetBSD: msgmain.c,v 1.4 2000/07/03 02:51:25 matt Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -39,6 +39,7 @@
 /* main.c - main program */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #define MAIN
diff --git a/usr.bin/netgroup/netgroup.c b/usr.bin/netgroup/netgroup.c
index e109ef2b2413..867a0453bbac 100644
--- a/usr.bin/netgroup/netgroup.c
+++ b/usr.bin/netgroup/netgroup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netgroup.c,v 1.1 1999/03/02 13:59:55 christos Exp $	*/
+/*	$NetBSD: netgroup.c,v 1.2 2000/07/03 02:51:25 matt Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,9 +37,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: netgroup.c,v 1.1 1999/03/02 13:59:55 christos Exp $");
+__RCSID("$NetBSD: netgroup.c,v 1.2 2000/07/03 02:51:25 matt Exp $");
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <netgroup.h>
 
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 5a939175f3c5..1fc6820f517d 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.41 2000/07/02 09:07:23 itojun Exp $	*/
+/*	$NetBSD: if.c,v 1.42 2000/07/03 02:51:26 matt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)if.c	8.2 (Berkeley) 2/21/94";
 #else
-__RCSID("$NetBSD: if.c,v 1.41 2000/07/02 09:07:23 itojun Exp $");
+__RCSID("$NetBSD: if.c,v 1.42 2000/07/03 02:51:26 matt Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,6 +59,7 @@ __RCSID("$NetBSD: if.c,v 1.41 2000/07/02 09:07:23 itojun Exp $");
 
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <netdb.h>
diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c
index 7ff07deb1225..f35db7e68845 100644
--- a/usr.bin/nl/nl.c
+++ b/usr.bin/nl/nl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nl.c,v 1.5 1999/09/06 21:50:39 kleink Exp $	*/
+/*	$NetBSD: nl.c,v 1.6 2000/07/03 02:51:27 matt Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 __COPYRIGHT(
 "@(#) Copyright (c) 1999\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: nl.c,v 1.5 1999/09/06 21:50:39 kleink Exp $");
+__RCSID("$NetBSD: nl.c,v 1.6 2000/07/03 02:51:27 matt Exp $");
 #endif    
 
 #include <errno.h>
@@ -50,6 +50,7 @@ __RCSID("$NetBSD: nl.c,v 1.5 1999/09/06 21:50:39 kleink Exp $");
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 typedef enum {
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 5e48adad3a59..bc9fd29518da 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: passwd.c,v 1.18 2000/04/14 06:11:09 simonb Exp $	*/
+/*	$NetBSD: passwd.c,v 1.19 2000/07/03 02:51:28 matt Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993, 1994
@@ -43,12 +43,13 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\
 #if 0
 static char sccsid[] = "from: @(#)passwd.c    8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: passwd.c,v 1.18 2000/04/14 06:11:09 simonb Exp $");
+__RCSID("$NetBSD: passwd.c,v 1.19 2000/07/03 02:51:28 matt Exp $");
 #endif
 #endif /* not lint */
 
 #include <err.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/usr.bin/rdist/Makefile b/usr.bin/rdist/Makefile
index 1a844e23b3cc..2957d3442e06 100644
--- a/usr.bin/rdist/Makefile
+++ b/usr.bin/rdist/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.9 1998/04/09 00:32:38 tv Exp $
+#	$NetBSD: Makefile,v 1.10 2000/07/03 02:51:32 matt Exp $
 #	from: @(#)Makefile	8.3 (Berkeley) 7/19/93
 
+CPPFLAGS+= -I${.CURDIR}
 PROG=	rdist
 SRCS=	docmd.c expand.c gram.y lookup.c main.c server.c
 
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 2a463b5c35a1..527cb16cc4af 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: renice.c,v 1.6 1998/12/19 21:07:12 christos Exp $	*/
+/*	$NetBSD: renice.c,v 1.7 2000/07/03 02:51:33 matt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1989, 1993
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993\n\
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)renice.c	8.1 (Berkeley) 6/9/93";*/
-__RCSID("$NetBSD: renice.c,v 1.6 1998/12/19 21:07:12 christos Exp $");
+__RCSID("$NetBSD: renice.c,v 1.7 2000/07/03 02:51:33 matt Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -52,6 +52,7 @@ __RCSID("$NetBSD: renice.c,v 1.6 1998/12/19 21:07:12 christos Exp $");
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 static int	getnum __P((const char *, const char *, int *));
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index 6f42a26ea85f..827c33eda5f7 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: get_addrs.c,v 1.5 1998/07/26 22:26:29 mycroft Exp $	*/
+/*	$NetBSD: get_addrs.c,v 1.6 2000/07/03 02:51:34 matt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,12 +38,13 @@
 #if 0
 static char sccsid[] = "@(#)get_addrs.c	8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: get_addrs.c,v 1.5 1998/07/26 22:26:29 mycroft Exp $");
+__RCSID("$NetBSD: get_addrs.c,v 1.6 2000/07/03 02:51:34 matt Exp $");
 #endif /* not lint */
 
 #include "talk.h"
 #include <netdb.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include "talk_ctl.h"
 
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index f7c0ab29258e..8e7f8fdd6472 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: get_names.c,v 1.7 1998/07/26 22:26:29 mycroft Exp $	*/
+/*	$NetBSD: get_names.c,v 1.8 2000/07/03 02:51:35 matt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,12 +38,13 @@
 #if 0
 static char sccsid[] = "@(#)get_names.c	8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: get_names.c,v 1.7 1998/07/26 22:26:29 mycroft Exp $");
+__RCSID("$NetBSD: get_names.c,v 1.8 2000/07/03 02:51:35 matt Exp $");
 #endif /* not lint */
 
 #include "talk.h"
 #include <sys/param.h>
 #include <pwd.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 extern	CTL_MSG msg;
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index 22aab6f7c953..d4ed6abc556d 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_disp.c,v 1.8 1998/12/19 22:36:11 christos Exp $	*/
+/*	$NetBSD: init_disp.c,v 1.9 2000/07/03 02:51:35 matt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)init_disp.c	8.2 (Berkeley) 2/16/94";
 #endif
-__RCSID("$NetBSD: init_disp.c,v 1.8 1998/12/19 22:36:11 christos Exp $");
+__RCSID("$NetBSD: init_disp.c,v 1.9 2000/07/03 02:51:35 matt Exp $");
 #endif /* not lint */
 
 /*
@@ -52,6 +52,7 @@ __RCSID("$NetBSD: init_disp.c,v 1.8 1998/12/19 22:36:11 christos Exp $");
 #include <err.h>
 #include <signal.h>
 #include <termios.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 /* 
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index 2278b76cf253..09918a7dac25 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tput.c,v 1.12 2000/04/14 06:11:10 simonb Exp $	*/
+/*	$NetBSD: tput.c,v 1.13 2000/07/03 02:51:36 matt Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1988, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\n\
 #if 0
 static char sccsid[] = "@(#)tput.c	8.3 (Berkeley) 4/28/95";
 #endif
-__RCSID("$NetBSD: tput.c,v 1.12 2000/04/14 06:11:10 simonb Exp $");
+__RCSID("$NetBSD: tput.c,v 1.13 2000/07/03 02:51:36 matt Exp $");
 #endif /* not lint */
 
 #include <termios.h>
@@ -51,6 +51,7 @@ __RCSID("$NetBSD: tput.c,v 1.12 2000/04/14 06:11:10 simonb Exp $");
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <termcap.h>
 #include <unistd.h>
 
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 18b6ecd638f3..13cec8d6ad69 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: unifdef.c,v 1.7 1998/12/19 23:22:51 christos Exp $	*/
+/*	$NetBSD: unifdef.c,v 1.8 2000/07/03 02:51:36 matt Exp $	*/
 
 /*
  * Copyright (c) 1985, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1993\n\
 #if 0
 static char sccsid[] = "@(#)unifdef.c	8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: unifdef.c,v 1.7 1998/12/19 23:22:51 christos Exp $");
+__RCSID("$NetBSD: unifdef.c,v 1.8 2000/07/03 02:51:36 matt Exp $");
 #endif				/* not lint */
 
 /*
@@ -63,6 +63,8 @@ __RCSID("$NetBSD: unifdef.c,v 1.7 1998/12/19 23:22:51 christos Exp $");
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 
 #define BSS
diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c
index 100f3fc18590..572a59ede173 100644
--- a/usr.bin/usbhidctl/usbhid.c
+++ b/usr.bin/usbhidctl/usbhid.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbhid.c,v 1.13 2000/04/14 06:11:11 simonb Exp $	*/
+/*	$NetBSD: usbhid.c,v 1.14 2000/07/03 02:51:37 matt Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/usr.bin/window/scanner.c b/usr.bin/window/scanner.c
index c6db51ff7f83..dc1141e8edac 100644
--- a/usr.bin/window/scanner.c
+++ b/usr.bin/window/scanner.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scanner.c,v 1.6 1998/10/14 00:58:48 wsanchez Exp $	*/
+/*	$NetBSD: scanner.c,v 1.7 2000/07/03 02:51:38 matt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -41,10 +41,12 @@
 #if 0
 static char sccsid[] = "@(#)scanner.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: scanner.c,v 1.6 1998/10/14 00:58:48 wsanchez Exp $");
+__RCSID("$NetBSD: scanner.c,v 1.7 2000/07/03 02:51:38 matt Exp $");
 #endif
 #endif /* not lint */
 
+#include <stdlib.h>
+
 #include "defs.h"
 #include "token.h"
 #include "context.h"
diff --git a/usr.bin/window/tttermcap.c b/usr.bin/window/tttermcap.c
index baa93be58f3b..00d0cd33d3e9 100644
--- a/usr.bin/window/tttermcap.c
+++ b/usr.bin/window/tttermcap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tttermcap.c,v 1.5 1999/10/04 23:31:30 lukem Exp $	*/
+/*	$NetBSD: tttermcap.c,v 1.6 2000/07/03 02:51:39 matt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -41,11 +41,12 @@
 #if 0
 static char sccsid[] = "@(#)tttermcap.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: tttermcap.c,v 1.5 1999/10/04 23:31:30 lukem Exp $");
+__RCSID("$NetBSD: tttermcap.c,v 1.6 2000/07/03 02:51:39 matt Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdlib.h>
+#include <string.h>
 #include <termcap.h>
 #include "tt.h"
 
diff --git a/usr.bin/window/var.c b/usr.bin/window/var.c
index 709bd7016ad1..062e41ad7fc4 100644
--- a/usr.bin/window/var.c
+++ b/usr.bin/window/var.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.6 1998/10/14 00:58:49 wsanchez Exp $	*/
+/*	$NetBSD: var.c,v 1.7 2000/07/03 02:51:40 matt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -41,11 +41,12 @@
 #if 0
 static char sccsid[] = "@(#)var.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: var.c,v 1.6 1998/10/14 00:58:49 wsanchez Exp $");
+__RCSID("$NetBSD: var.c,v 1.7 2000/07/03 02:51:40 matt Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdlib.h>
+#include <string.h>
 #include "value.h"
 #define EXTERN
 #include "var.h"
diff --git a/usr.bin/window/wwend.c b/usr.bin/window/wwend.c
index 2431d708bbfc..77b1e68a12ed 100644
--- a/usr.bin/window/wwend.c
+++ b/usr.bin/window/wwend.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wwend.c,v 1.4 1997/11/21 08:37:16 lukem Exp $	*/
+/*	$NetBSD: wwend.c,v 1.5 2000/07/03 02:51:41 matt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -41,10 +41,11 @@
 #if 0
 static char sccsid[] = "@(#)wwend.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: wwend.c,v 1.4 1997/11/21 08:37:16 lukem Exp $");
+__RCSID("$NetBSD: wwend.c,v 1.5 2000/07/03 02:51:41 matt Exp $");
 #endif
 #endif /* not lint */
 
+#include <stdlib.h>
 #include <unistd.h>
 #include "ww.h"
 #include "tt.h"
diff --git a/usr.bin/window/wwscroll.c b/usr.bin/window/wwscroll.c
index 0ac83425791a..e1b1d9b5543d 100644
--- a/usr.bin/window/wwscroll.c
+++ b/usr.bin/window/wwscroll.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wwscroll.c,v 1.4 1997/11/21 08:37:48 lukem Exp $	*/
+/*	$NetBSD: wwscroll.c,v 1.5 2000/07/03 02:51:41 matt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -41,10 +41,12 @@
 #if 0
 static char sccsid[] = "@(#)wwscroll.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: wwscroll.c,v 1.4 1997/11/21 08:37:48 lukem Exp $");
+__RCSID("$NetBSD: wwscroll.c,v 1.5 2000/07/03 02:51:41 matt Exp $");
 #endif
 #endif /* not lint */
 
+#include <stdlib.h>
+
 #include "ww.h"
 #include "tt.h"
 #include "xx.h"
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index b1fe13679837..b0190cccd23d 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: write.c,v 1.16 1999/11/09 15:06:37 drochner Exp $	*/
+/*	$NetBSD: write.c,v 1.17 2000/07/03 02:51:43 matt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)write.c	8.2 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: write.c,v 1.16 1999/11/09 15:06:37 drochner Exp $");
+__RCSID("$NetBSD: write.c,v 1.17 2000/07/03 02:51:43 matt Exp $");
 #endif
 #endif /* not lint */
 
@@ -55,6 +55,7 @@ __RCSID("$NetBSD: write.c,v 1.16 1999/11/09 15:06:37 drochner Exp $");
 #include <sys/stat.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 #include <time.h>
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index 102acb737bec..be587d36e633 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 1999/02/13 02:54:57 lukem Exp $
+#	$NetBSD: Makefile,v 1.8 2000/07/03 02:51:44 matt Exp $
 
 PROG=	lint1
 SRCS=	cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
@@ -7,7 +7,7 @@ MKMAN=	no
 LDADD+=	-ll
 DPADD+=	${LIBL}
 YHEADER=1
-CPPFLAGS+=-I.
+CPPFLAGS+=-I${.CURDIR} -I.
 LINTFLAGS=-aehpz
 
 BINDIR=	/usr/libexec
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index 6389d338e7ad..65d7d43757bd 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ypcat.c,v 1.8 1997/11/01 06:40:35 lukem Exp $	*/
+/*	$NetBSD: ypcat.c,v 1.9 2000/07/03 02:51:44 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ypcat.c,v 1.8 1997/11/01 06:40:35 lukem Exp $");
+__RCSID("$NetBSD: ypcat.c,v 1.9 2000/07/03 02:51:44 matt Exp $");
 #endif
 
 #include <sys/param.h>
@@ -43,6 +43,8 @@ __RCSID("$NetBSD: ypcat.c,v 1.8 1997/11/01 06:40:35 lukem Exp $");
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <rpc/rpc.h>
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index 54158a1ef218..553045c09ad7 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ypmatch.c,v 1.11 2000/04/14 06:11:11 simonb Exp $	*/
+/*	$NetBSD: ypmatch.c,v 1.12 2000/07/03 02:51:46 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ypmatch.c,v 1.11 2000/04/14 06:11:11 simonb Exp $");
+__RCSID("$NetBSD: ypmatch.c,v 1.12 2000/07/03 02:51:46 matt Exp $");
 #endif
 
 #include <sys/param.h>
@@ -43,6 +43,7 @@ __RCSID("$NetBSD: ypmatch.c,v 1.11 2000/04/14 06:11:11 simonb Exp $");
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 656a883b5d4b..74229b463a7b 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ypwhich.c,v 1.9 1997/11/04 11:36:28 lukem Exp $	*/
+/*	$NetBSD: ypwhich.c,v 1.10 2000/07/03 02:51:47 matt Exp $	*/
 
 /*
  *
@@ -48,6 +48,7 @@
 #include <err.h>
 #include <netdb.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>