Revert most part of 200420 as requested, as more review and polish is

needed.

120 files changed, 191 insertions, 17 deletions

diff --git a/usr.bin/ar/util.c b/usr.bin/ar/util.c
index 621c2b8..e1230e3 100644
--- a/usr.bin/ar/util.c
+++ b/usr.bin/ar/util.c
@@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/queue.h>
 #include <sys/types.h>
+#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c
index f8c47c5..a1dc9b2 100644
--- a/usr.bin/c89/c89.c
+++ b/usr.bin/c89/c89.c
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <unistd.h>
 
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 39f2c9c..d1bb745 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <time.h>
 #include <unistd.h>
 
+#include "pathnames.h"
 #include "calendar.h"
 
 struct passwd	*pw;
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index e40481e..d3f3c1e 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <time.h>
 
+#include "pathnames.h"
 #include "calendar.h"
 
 struct tm		*tp;
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 93e9c07..76e5933 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "calendar.h"
 
diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c
index e713f5f..d96ffc2 100644
--- a/usr.bin/calendar/paskha.c
+++ b/usr.bin/calendar/paskha.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "calendar.h"
 
diff --git a/usr.bin/cksum/Makefile b/usr.bin/cksum/Makefile
index 7ba3803..828900a 100644
--- a/usr.bin/cksum/Makefile
+++ b/usr.bin/cksum/Makefile
@@ -5,6 +5,5 @@ PROG=	cksum
 SRCS=	cksum.c crc.c print.c sum1.c sum2.c crc32.c
 LINKS=	${BINDIR}/cksum ${BINDIR}/sum
 MLINKS=	cksum.1 sum.1
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index ee48278..d1f42f2 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
+#include <stdint.h>
 #include <unistd.h>
 
 #include "extern.h"
diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c
index eefa772..cadbc17 100644
--- a/usr.bin/cksum/crc32.c
+++ b/usr.bin/cksum/crc32.c
@@ -17,6 +17,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 
 #include <stdio.h>
+#include <stdint.h>
 #include <unistd.h>
 
 #include "extern.h"
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index e6dd910..406b40e 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 
 #include <unistd.h>
+#include <stdint.h>
 
 #include "extern.h"
 
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index b438062..c179c62 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 
 #include <unistd.h>
+#include <stdint.h>
 
 #include "extern.h"
 
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index 555725a..814d933 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -45,10 +45,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 
 #include <err.h>
+#include <errno.h>
 #include <limits.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "extern.h"
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index e5e8325..bbe3cb1 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "extern.h"
 
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index f845251..2ba4f39 100644
--- a/usr.bin/colcrt/colcrt.c
+++ b/usr.bin/colcrt/colcrt.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <wchar.h>
 
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 399252a..52dda90 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -48,9 +48,12 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <err.h>
+#include <errno.h>
+#include <limits.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <wchar.h>
 
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index 92e0a97..f0ec887 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -67,11 +67,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/stat.h>
 
+#include <ctype.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "zopen.h"
 
 #define	BITS		16		/* Default bits. */
diff --git a/usr.bin/cpuset/cpuset.c b/usr.bin/cpuset/cpuset.c
index a2bcf88..35b13af 100644
--- a/usr.bin/cpuset/cpuset.c
+++ b/usr.bin/cpuset/cpuset.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <stdint.h>
 #include <unistd.h>
+#include <string.h>
 
 int cflag;
 int gflag;
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 9f04799..6c99db8 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <unistd.h>
 #include <wchar.h>
+#include <wctype.h>
 
 /*
  * expand - expand tabs to equivalent spaces
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index 8fe419b..2512a2e 100644
--- a/usr.bin/fetch/fetch.c
+++ b/usr.bin/fetch/fetch.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/time.h>
 
+#include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <signal.h>
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index 8affbd0..e50bd1f 100644
--- a/usr.bin/file2c/file2c.c
+++ b/usr.bin/file2c/file2c.c
@@ -10,6 +10,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index 3171f8b..cc2d797 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <fts.h>
 #include <regex.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "find.h"
diff --git a/usr.bin/find/getdate.y b/usr.bin/find/getdate.y
index 0a7ab21..de7750c 100644
--- a/usr.bin/find/getdate.y
+++ b/usr.bin/find/getdate.y
@@ -15,6 +15,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <stdio.h>
 #include <ctype.h>
 
 /* The code at the top of get_date which figures out the offset of the
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index 7b9d88f..88e4593 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 
 #include <err.h>
+#include <errno.h>
 #include <fts.h>
 #include <grp.h>
 #include <inttypes.h>
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 9a0b9ce..8e2b42c 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 
 #include <err.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <fts.h>
 #include <locale.h>
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index 8fda57c..1532906 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 
 #include <err.h>
+#include <errno.h>
 #include <fts.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index 6c76bbf..7d06c91 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <fts.h>
 #include <regex.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index d656693..848bbee 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -310,7 +310,7 @@ show_text(const char *directory, const char *file_name, const char *header)
 		return(0);
 
 	/* If short enough, and no newlines, show it on a single line.*/
-	if (sb.st_size <= (int)(LINE_LEN - strlen(header) - 5)) {
+	if (sb.st_size <= LINE_LEN - strlen(header) - 5) {
 		nr = read(fd, tbuf, sizeof(tbuf));
 		if (nr <= 0) {
 			(void)close(fd);
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 703ff60..5260a2d 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -230,7 +230,7 @@ trying(const struct addrinfo *ai)
 	printf("Trying %s...\n", buf);
 }
 
-static void
+void
 cleanup(int sig __unused)
 {
 #define	ERRSTR	"Timed out.\n"
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 3eabd34..a84c711 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -120,7 +120,7 @@ enter_lastlog(PERSON *pn)
 	}
 	if (fd == -1 ||
 	    lseek(fd, (long)pn->uid * sizeof(ll), SEEK_SET) !=
-	    (off_t)(pn->uid * sizeof(ll)) ||
+	    (long)pn->uid * sizeof(ll) ||
 	    read(fd, (char *)&ll, sizeof(ll)) != sizeof(ll)) {
 			/* as if never logged in */
 			ll.ll_line[0] = ll.ll_host[0] = '\0';
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index 1ce9334..ed85c2e 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -180,6 +180,7 @@ __FBSDID("$FreeBSD$");
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sysexits.h>
 #include <unistd.h>
 #include <wchar.h>
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 6c7fafb..59d8fc5 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <wchar.h>
 #include <wctype.h>
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 706620c..35d5363 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "extern.h"
diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c
index d0355d8..d1671a7 100644
--- a/usr.bin/getopt/getopt.c
+++ b/usr.bin/getopt/getopt.c
@@ -7,6 +7,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 int
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index 3d6a6ea..db04c49 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "hexdump.h"
 
 enum _vflag vflag = FIRST;
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index a035531..2ed7c4b 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <locale.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include "hexdump.h"
 
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 4cd7433..2e33d41 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 /* Defaults */
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
index 6ac53dd..0a779fd 100644
--- a/usr.bin/killall/killall.c
+++ b/usr.bin/killall/killall.c
@@ -34,6 +34,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 #include <sys/user.h>
 #include <sys/sysctl.h>
+#include <fcntl.h>
+#include <dirent.h>
 #include <jail.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 4f41a13..a9d3f64 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -47,6 +47,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 
+#include <stdio.h>
+
 #include "ktrace.h"
 
 void timevaladd(struct timeval *, struct timeval *);
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index b5ca6dd..8c55123 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -51,6 +51,9 @@ __FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <grp.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/lastcomm/readrec.c b/usr.bin/lastcomm/readrec.c
index 5de7c5c..4883b2a 100644
--- a/usr.bin/lastcomm/readrec.c
+++ b/usr.bin/lastcomm/readrec.c
@@ -33,9 +33,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/acct.h>
 
+#include <ctype.h>
+#include <err.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 int	 readrec_forward(FILE *f, struct acctv2 *av2);
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index 9c250f9..2da69a2 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index d581284..3b19e35 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/signal.h>
 #include <sys/consio.h>
 #include <err.h>
+#include <ctype.h>
 #include <errno.h>
 #include <pwd.h>
 #include <stdio.h>
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index dd63d92..2a42924 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -64,8 +64,8 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <errno.h>
 #include <grp.h>
+#include <libutil.h>
 #include <login_cap.h>
-#include <paths.h>
 #include <pwd.h>
 #include <setjmp.h>
 #include <signal.h>
diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c
index c3cb8f4..f6111a1 100644
--- a/usr.bin/login/login_fbtab.c
+++ b/usr.bin/login/login_fbtab.c
@@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$");
 #include <syslog.h>
 #include <unistd.h>
 
+#include "login.h"
 #include "pathnames.h"
 
 static void	login_protect(const char *, char *, int, uid_t, gid_t);
diff --git a/usr.bin/login/pathnames.h b/usr.bin/login/pathnames.h
index afb06ef..60fecc2 100644
--- a/usr.bin/login/pathnames.h
+++ b/usr.bin/login/pathnames.h
@@ -34,6 +34,8 @@
  * $FreeBSD$
  */
 
+#include <paths.h>
+
 #define	_PATH_HUSHLOGIN		".hushlogin"
 #define	_PATH_MOTDFILE		"/etc/motd"
 #define _PATH_FBTAB		"/etc/fbtab"
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 7f891cc..270c1c5 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 static void usage(void);
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 4686562..7e147b6 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #define	BASEMODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | \
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index 99d86e6..344af22 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <err.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index 72b89d6..b58ac4b 100644
--- a/usr.bin/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -143,7 +143,7 @@ main(int argc, char **argv)
 }
 
 static void
-usage(void)
+usage()
 {
 	fprintf(stderr,
 		"usage: mktemp [-d] [-q] [-t prefix] [-u] template ...\n");
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 4699025..a65a2fc 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -30,6 +30,7 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <calendar.h>
+#include <ctype.h>
 #include <err.h>
 #include <langinfo.h>
 #include <locale.h>
diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index cf82020..9ed4820 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -52,6 +52,8 @@ __FBSDID("$FreeBSD$");
 #include <netatalk/at.h>
 #include <netatalk/ddp_var.h>
 
+#include <errno.h>
+#include <nlist.h>
 #include <netdb.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c
index 2f862e1..2ffeacb 100644
--- a/usr.bin/netstat/bpf.c
+++ b/usr.bin/netstat/bpf.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "netstat.h"
 
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 043a20f..02f390a 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "netstat.h"
 
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index 8aeeace..d3276bf 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -111,6 +111,8 @@ __FBSDID("$FreeBSD$");
 
 #include <stdint.h>
 #include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 #include "netstat.h"
 
 #ifdef IPSEC
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index adc6cfb..b79a93b 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -64,6 +64,8 @@ __FBSDID("$FreeBSD$");
 #define	SANAMES
 #include <netipx/spx_debug.h>
 
+#include <nlist.h>
+#include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 23593d5..fec7172 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -60,10 +60,12 @@ __FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <err.h>
+#include <errno.h>
 #include <kvm.h>
 #include <limits.h>
 #include <netdb.h>
 #include <nlist.h>
+#include <paths.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 47a58c4..7f65701 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -54,6 +54,8 @@ __FBSDID("$FreeBSD$");
 #include <memstat.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "netstat.h"
 
 /*
diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c
index adae25e..c4dd647 100644
--- a/usr.bin/netstat/netgraph.c
+++ b/usr.bin/netstat/netgraph.c
@@ -50,9 +50,11 @@ __FBSDID("$FreeBSD$");
 #include <netgraph/ng_socketvar.h>
 
 #include <nlist.h>
+#include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include <err.h>
 #include "netstat.h"
 
diff --git a/usr.bin/netstat/pfkey.c b/usr.bin/netstat/pfkey.c
index 22a6421..2ab58e9 100644
--- a/usr.bin/netstat/pfkey.c
+++ b/usr.bin/netstat/pfkey.c
@@ -83,6 +83,8 @@ __FBSDID("$FreeBSD$");
 
 #include <stdint.h>
 #include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 #include "netstat.h"
 
 #ifdef IPSEC
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index db7a4d1..2e9e919 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
+#include <unistd.h>
 #include <err.h>
 #include "netstat.h"
 
diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
index 82a4c13..fe29787 100644
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -52,10 +52,13 @@ __FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <errno.h>
+#include <libutil.h>
+#include <netdb.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "netstat.h"
 
 #ifdef SCTP
diff --git a/usr.bin/newgrp/newgrp.c b/usr.bin/newgrp/newgrp.c
index b5e0402..91b62a5 100644
--- a/usr.bin/newgrp/newgrp.c
+++ b/usr.bin/newgrp/newgrp.c
@@ -34,8 +34,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 
 #include <err.h>
+#include <errno.h>
 #include <grp.h>
 #include <libgen.h>
+#include <limits.h>
 #include <login_cap.h>
 #include <paths.h>
 #include <pwd.h>
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index eba42fc..11a1db9 100644
--- a/usr.bin/newkey/update.c
+++ b/usr.bin/newkey/update.c
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <netdb.h>
 #endif	/* YP */
 
+#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index aa964b8..4af133b 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -62,6 +62,7 @@ static const char rcsid[] =
 
 #include <signal.h>
 #include <fcntl.h>
+#include <ctype.h>
 #include <errno.h>
 #include <kvm.h>
 #include <limits.h>
@@ -70,6 +71,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <paths.h>
 #include <err.h>
 
 struct nlist nl[] = {
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index aa3109c..06f2244 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 static void dofile(void);
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index dd12a56..d35458c 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <syslog.h>
 #include <unistd.h>
 
 #include <security/pam_appl.h>
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 72c2736..6e3e553 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -52,9 +52,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 
 #include <err.h>
+#include <errno.h>
+#include <limits.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <wchar.h>
 
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index cf42d7c..277459e 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -46,8 +46,11 @@ __FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
+#include "extern.h"
+
 /*
  * egetopt:	get option letter from argument vector (an extended
  *		version of getopt).
diff --git a/usr.bin/procstat/procstat_args.c b/usr.bin/procstat/procstat_args.c
index 1c132ca..e5a7acd 100644
--- a/usr.bin/procstat/procstat_args.c
+++ b/usr.bin/procstat/procstat_args.c
@@ -34,6 +34,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "procstat.h"
diff --git a/usr.bin/procstat/procstat_basic.c b/usr.bin/procstat/procstat_basic.c
index 00109e7..2775172 100644
--- a/usr.bin/procstat/procstat_basic.c
+++ b/usr.bin/procstat/procstat_basic.c
@@ -30,6 +30,7 @@
 #include <sys/sysctl.h>
 #include <sys/user.h>
 
+#include <err.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c
index 984dced..debb0e4 100644
--- a/usr.bin/procstat/procstat_files.c
+++ b/usr.bin/procstat/procstat_files.c
@@ -36,6 +36,7 @@
 
 #include <arpa/inet.h>
 
+#include <err.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c
index 2d3a666..5c965a9 100644
--- a/usr.bin/procstat/procstat_vm.c
+++ b/usr.bin/procstat/procstat_vm.c
@@ -30,6 +30,7 @@
 #include <sys/sysctl.h>
 #include <sys/user.h>
 
+#include <err.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index 66a7ad2..8b38897 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -49,9 +49,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 
 #include <err.h>
+#include <errno.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <wchar.h>
 
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index 971de67..c279535 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -72,7 +72,9 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <libutil.h>
 #include <netdb.h>
+#include <paths.h>
 #include <pwd.h>
 #include <setjmp.h>
 #include <termios.h>
diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index 76c9b93..713cba1 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
  * Copyright (C) 1987, Sun Microsytsems, Inc.
  */
 #include <stdio.h>
+#include <string.h>
 #include <rpc/types.h>
 #include "rpc_parse.h"
 #include "rpc_scan.h"
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index ce92fe2..7068363 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
  * Copyright (C) 1987, Sun Microsystems, Inc.
  */
 #include <stdio.h>
+#include <ctype.h>
 #include "rpc_parse.h"
 #include "rpc_scan.h"
 #include "rpc_util.h"
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 736f857..f96bdfc 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
  */
 #include <err.h>
 #include <stdio.h>
+#include <string.h>
 #include "rpc_parse.h"
 #include "rpc_scan.h"
 #include "rpc_util.h"
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 4080565..9d1c85b 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
  * Copyright (C) 1989, Sun Microsystems, Inc.
  */
 #include <err.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index b8672e4..1e3356f 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dirent.h>
 #include <err.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index d104bde..042b72f 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
 #include <unistd.h>
 
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index f99c12a..1a140b1 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -51,10 +51,12 @@ static const char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/3/94";
 
 #include <err.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <libgen.h>
 #include <limits.h>
 #include <locale.h>
 #include <regex.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index 4a7f643..f3b5137 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -41,8 +41,14 @@ static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #include <sys/types.h>
 
 #include <err.h>
+#include <limits.h>
 #include <regex.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
+#include "defs.h"
+#include "extern.h"
 
 /*
  * Return a string for a regular expression error passed.  This is overkill,
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index 0a63a32..5e67cc1 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -55,6 +55,7 @@ static const char rcsid[] =
 #include <sys/socketvar.h>
 
 #include <err.h>
+#include <netdb.h>
 #include <rpc/rpc.h>
 #include <rpc/pmap_clnt.h>
 #include <rpc/pmap_prot.h>
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 88a19d9..5dcb24a 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -88,6 +88,7 @@ __FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <errno.h>
+#include <grp.h>
 #include <login_cap.h>
 #include <paths.h>
 #include <pwd.h>
diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c
index 124c3b9..0edce34 100644
--- a/usr.bin/systat/fetch.c
+++ b/usr.bin/systat/fetch.c
@@ -42,6 +42,7 @@ static const char sccsid[] = "@(#)fetch.c	8.1 (Berkeley) 6/6/93";
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
+#include <err.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index acf6b3f..2d5f8e4 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -54,7 +54,9 @@ static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
 #include <netinet/ip_icmp.h>
 #include <netinet/icmp_var.h>
 
+#include <stdlib.h>
 #include <string.h>
+#include <paths.h>
 #include "systat.h"
 #include "extern.h"
 #include "mode.h"
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index d3573af..90e1578 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -73,6 +73,7 @@ static const char sccsid[] = "@(#)iostat.c	8.1 (Berkeley) 6/6/93";
 #include <devstat.h>
 #include <err.h>
 #include <nlist.h>
+#include <paths.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index 44ed6ac..0914328 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -55,6 +55,10 @@ static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 
+#include <stdlib.h>
+#include <string.h>
+#include <paths.h>
+
 #include "systat.h"
 #include "extern.h"
 #include "mode.h"
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 90c6208..d092f10 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -53,6 +53,7 @@ static const char copyright[] =
 #include <limits.h>
 #include <locale.h>
 #include <nlist.h>
+#include <paths.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index 9b0d4a8..37be1ef 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -47,6 +47,7 @@ static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <paths.h>
 
 #include "systat.h"
 #include "extern.h"
diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c
index 745a283..5f64e3e 100644
--- a/usr.bin/systat/mode.c
+++ b/usr.bin/systat/mode.c
@@ -60,6 +60,8 @@
 
 __FBSDID("$FreeBSD$");
 
+#include <sys/types.h>
+
 #include "systat.h"
 #include "extern.h"
 #include "mode.h"
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index eb469f3..14fc495 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -74,6 +74,7 @@ static const char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
 
 #include <netdb.h>
 #include <nlist.h>
+#include <paths.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index dca29b5..43df8eb 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -53,6 +53,7 @@ static const char sccsid[] = "@(#)swap.c	8.3 (Berkeley) 4/29/95";
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include <err.h>
 
 #include "systat.h"
 #include "extern.h"
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index 4a69a4f..b7f7592 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -57,7 +57,9 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 
+#include <stdlib.h>
 #include <string.h>
+#include <paths.h>
 
 #include "systat.h"
 #include "extern.h"
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 6585d93..742e2f7 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -60,6 +60,7 @@ static const char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #include <errno.h>
 #include <langinfo.h>
 #include <nlist.h>
+#include <paths.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/tar/getdate.c b/usr.bin/tar/getdate.c
index effac4e..8df1e26 100644
--- a/usr.bin/tar/getdate.c
+++ b/usr.bin/tar/getdate.c
@@ -33,6 +33,8 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index de592c5..123a2de 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -52,6 +52,7 @@ static const char rcsid[] =
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 typedef struct _list {
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index d586ba1..a97ffec 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -59,6 +59,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <string.h>
 #include <unistd.h>
 
 static int getstathz(void);
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index e3b8a37..a478d5d 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -45,6 +45,8 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)tput.c	8.2 (Berkeley) 3/19/94";
 #endif
 
+#include <termios.h>
+
 #include <err.h>
 #include <termcap.h>
 #include <stdio.h>
diff --git a/usr.bin/tr/cmap.c b/usr.bin/tr/cmap.c
index 8c2ab97..811040c 100644
--- a/usr.bin/tr/cmap.c
+++ b/usr.bin/tr/cmap.c
@@ -33,7 +33,10 @@
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
+#include <limits.h>
+#include <stdbool.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "cmap.h"
 
 static struct cmapnode *cmap_splay(struct cmapnode *, wint_t);
diff --git a/usr.bin/tr/cmap.h b/usr.bin/tr/cmap.h
index a7c1a30..9a81e13 100644
--- a/usr.bin/tr/cmap.h
+++ b/usr.bin/tr/cmap.h
@@ -29,6 +29,7 @@
 #ifndef CMAP_H
 #define	CMAP_H
 
+#include <limits.h>
 #include <stdbool.h>
 #include <wchar.h>
 
diff --git a/usr.bin/tr/cset.c b/usr.bin/tr/cset.c
index 2535eed..1b42129 100644
--- a/usr.bin/tr/cset.c
+++ b/usr.bin/tr/cset.c
@@ -33,7 +33,10 @@
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
+#include <stdbool.h>
 #include <stdlib.h>
+#include <wchar.h>
+#include <wctype.h>
 #include "cset.h"
 
 static struct csnode *	cset_delete(struct csnode *, wchar_t);
diff --git a/usr.bin/tr/cset.h b/usr.bin/tr/cset.h
index 4a8108a..ab3eabd 100644
--- a/usr.bin/tr/cset.h
+++ b/usr.bin/tr/cset.h
@@ -30,6 +30,7 @@
 #define	CSET_H
 
 #include <stdbool.h>
+#include <wchar.h>
 #include <wctype.h>
 
 struct csnode {
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index 1dee776..86ae173 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -44,6 +44,8 @@ static const char sccsid[] = "@(#)str.c	8.2 (Berkeley) 4/28/95";
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index 6db16af..61195ff 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -47,12 +47,16 @@ static const char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
 
 #include <sys/types.h>
 
+#include <ctype.h>
 #include <err.h>
+#include <limits.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <wchar.h>
+#include <wctype.h>
 
 #include "cmap.h"
 #include "cset.h"
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 4036a63..d0dd073 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -47,6 +47,8 @@ __FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <err.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index 4f79ea3..53a6fe1 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -43,9 +43,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/wait.h>
 
 #include <err.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include <machine/reg.h>
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index e7c538e..a01a86c 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <ctype.h>
 #include <db.h>
 #include <err.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index 725fc25..77559cf 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -53,6 +53,7 @@ static const char rcsid[] =
 #include <termcap.h>
 #include <unistd.h>
 #include <wchar.h>
+#include <wctype.h>
 
 #define	IESC	'\033'
 #define	SO	'\016'
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 5009ca1..d59cd4e 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -54,8 +54,10 @@ static const char sccsid[] = "@(#)unexpand.c	8.1 (Berkeley) 6/6/93";
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <wchar.h>
+#include <wctype.h>
 
 int	all;
 int	nstops;
diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c
index 783909e..a5e2598 100644
--- a/usr.bin/usbhidaction/usbhidaction.c
+++ b/usr.bin/usbhidaction/usbhidaction.c
@@ -50,6 +50,7 @@
 #include <usbhid.h>
 #include <syslog.h>
 #include <signal.h>
+#include <errno.h>
 #include <sys/stat.h>
 
 static int	verbose = 0;
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index fcf6047..6ad82c2 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -41,8 +41,12 @@ static const char sccsid[] = "@(#)foldit.c	8.1 (Berkeley) 6/6/93";
 
 #include <stdio.h>
 
+#include "extern.h"
+
 int
-foldit(char *chunk, int col, int max)
+foldit(chunk, col, max)
+	char *chunk;
+	int col, max;
 {
 	char *cp;
 
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index b46fe17..acf6f8c 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -43,6 +43,7 @@ static const char sccsid[] = "@(#)pr_time.c	8.2 (Berkeley) 4/4/94";
 #include <sys/time.h>
 
 #include <stdio.h>
+#include <string.h>
 #include <wchar.h>
 
 #include "extern.h"
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 23fce28..d35892e 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -66,6 +66,7 @@ static const char sccsid[] = "@(#)w.c	8.4 (Berkeley) 4/16/94";
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
 
+#include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -81,9 +82,11 @@ static const char sccsid[] = "@(#)w.c	8.4 (Berkeley) 4/16/94";
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <timeconv.h>
 #define	_ULOG_POSIX_NAMES
 #include <ulog.h>
 #include <unistd.h>
+#include <vis.h>
 
 #include "extern.h"
 
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index bb5c43e..a977875 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -48,6 +48,7 @@ static const char sccsid[] = "@(#)ttymsg.c	8.2 (Berkeley) 11/16/93";
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #include "ttymsg.h"
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index a279d14..5db4f88 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <timeconv.h>
 #define _ULOG_POSIX_NAMES
 #include <ulog.h>
 #include <unistd.h>
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 35f6a60..49e47c6 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/time.h>
 #include <sys/wait.h>
 
+#include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -85,16 +86,16 @@ int dobackup, docompare, dodir, dopreserve, dostrip, nommap, safecopy, verbose;
 mode_t mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
 const char *suffix = BACKUP_SUFFIX;
 
-static void	copy(int, const char *, int, const char *, off_t);
-static int	compare(int, const char *, size_t, int, const char *, size_t);
-static int	create_newfile(const char *, int, struct stat *);
-static int	create_tempfile(const char *, char *, size_t);
-static void	install(const char *, const char *, u_long, u_int);
-static void	install_dir(char *);
-static u_long	numeric_id(const char *, const char *);
-static void	strip(const char *);
-static int	trymmap(int);
-static void	usage(void);
+void	copy(int, const char *, int, const char *, off_t);
+int	compare(int, const char *, size_t, int, const char *, size_t);
+int	create_newfile(const char *, int, struct stat *);
+int	create_tempfile(const char *, char *, size_t);
+void	install(const char *, const char *, u_long, u_int);
+void	install_dir(char *);
+u_long	numeric_id(const char *, const char *);
+void	strip(const char *);
+int	trymmap(int);
+void	usage(void);
 
 int
 main(int argc, char *argv[])
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index 3da854e..3484bc9 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
 
+#include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index 707a9e9..a9c32ea 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
 
+#include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index cb43f64..4e719df 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 
 #include <arpa/inet.h>
 
+#include <ctype.h>
 #include <err.h>
 #include <netdb.h>
 #include <stdio.h>