From 821df508e882ca532bec415852399c6558f22f7a Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Sun, 13 Dec 2009 03:14:06 +0000
Subject: [PATCH] Revert most part of 200420 as requested, as more review and
 polish is needed.

---
 usr.bin/ar/util.c                   |  1 +
 usr.bin/c89/c89.c                   |  1 +
 usr.bin/calendar/calendar.c         |  1 +
 usr.bin/calendar/day.c              |  1 +
 usr.bin/calendar/ostern.c           |  1 +
 usr.bin/calendar/paskha.c           |  1 +
 usr.bin/cksum/Makefile              |  1 -
 usr.bin/cksum/crc.c                 |  1 +
 usr.bin/cksum/crc32.c               |  1 +
 usr.bin/cksum/sum1.c                |  1 +
 usr.bin/cksum/sum2.c                |  1 +
 usr.bin/cmp/regular.c               |  2 ++
 usr.bin/cmp/special.c               |  1 +
 usr.bin/colcrt/colcrt.c             |  1 +
 usr.bin/colrm/colrm.c               |  3 +++
 usr.bin/compress/zopen.c            |  2 ++
 usr.bin/cpuset/cpuset.c             |  1 +
 usr.bin/expand/expand.c             |  1 +
 usr.bin/fetch/fetch.c               |  1 +
 usr.bin/file2c/file2c.c             |  1 +
 usr.bin/find/find.c                 |  1 +
 usr.bin/find/getdate.y              |  1 +
 usr.bin/find/ls.c                   |  1 +
 usr.bin/find/main.c                 |  1 +
 usr.bin/find/misc.c                 |  1 +
 usr.bin/find/option.c               |  1 +
 usr.bin/finger/lprint.c             |  2 +-
 usr.bin/finger/net.c                |  2 +-
 usr.bin/finger/util.c               |  2 +-
 usr.bin/fmt/fmt.c                   |  1 +
 usr.bin/fold/fold.c                 |  1 +
 usr.bin/gcore/gcore.c               |  1 +
 usr.bin/getopt/getopt.c             |  1 +
 usr.bin/hexdump/display.c           |  1 +
 usr.bin/hexdump/hexdump.c           |  1 +
 usr.bin/jot/jot.c                   |  1 +
 usr.bin/killall/killall.c           |  2 ++
 usr.bin/ktrace/subr.c               |  2 ++
 usr.bin/lastcomm/lastcomm.c         |  3 +++
 usr.bin/lastcomm/readrec.c          |  4 ++++
 usr.bin/limits/limits.c             |  1 +
 usr.bin/lock/lock.c                 |  1 +
 usr.bin/login/login.c               |  2 +-
 usr.bin/login/login_fbtab.c         |  1 +
 usr.bin/login/pathnames.h           |  2 ++
 usr.bin/mesg/mesg.c                 |  1 +
 usr.bin/mkfifo/mkfifo.c             |  1 +
 usr.bin/mklocale/yacc.y             |  1 +
 usr.bin/mktemp/mktemp.c             |  2 +-
 usr.bin/ncal/ncal.c                 |  1 +
 usr.bin/netstat/atalk.c             |  2 ++
 usr.bin/netstat/bpf.c               |  1 +
 usr.bin/netstat/if.c                |  1 +
 usr.bin/netstat/ipsec.c             |  2 ++
 usr.bin/netstat/ipx.c               |  2 ++
 usr.bin/netstat/main.c              |  2 ++
 usr.bin/netstat/mbuf.c              |  2 ++
 usr.bin/netstat/netgraph.c          |  2 ++
 usr.bin/netstat/pfkey.c             |  2 ++
 usr.bin/netstat/route.c             |  1 +
 usr.bin/netstat/sctp.c              |  3 +++
 usr.bin/newgrp/newgrp.c             |  2 ++
 usr.bin/newkey/update.c             |  1 +
 usr.bin/nfsstat/nfsstat.c           |  2 ++
 usr.bin/nohup/nohup.c               |  1 +
 usr.bin/passwd/passwd.c             |  1 +
 usr.bin/paste/paste.c               |  3 +++
 usr.bin/pr/egetopt.c                |  3 +++
 usr.bin/procstat/procstat_args.c    |  1 +
 usr.bin/procstat/procstat_basic.c   |  1 +
 usr.bin/procstat/procstat_files.c   |  1 +
 usr.bin/procstat/procstat_vm.c      |  1 +
 usr.bin/rev/rev.c                   |  2 ++
 usr.bin/rlogin/rlogin.c             |  2 ++
 usr.bin/rpcgen/rpc_clntout.c        |  1 +
 usr.bin/rpcgen/rpc_hout.c           |  1 +
 usr.bin/rpcgen/rpc_tblout.c         |  1 +
 usr.bin/rpcgen/rpc_util.c           |  1 +
 usr.bin/ruptime/ruptime.c           |  1 +
 usr.bin/rwall/rwall.c               |  1 +
 usr.bin/sed/main.c                  |  2 ++
 usr.bin/sed/misc.c                  |  6 ++++++
 usr.bin/showmount/showmount.c       |  1 +
 usr.bin/su/su.c                     |  1 +
 usr.bin/systat/fetch.c              |  1 +
 usr.bin/systat/icmp.c               |  2 ++
 usr.bin/systat/iostat.c             |  1 +
 usr.bin/systat/ip.c                 |  4 ++++
 usr.bin/systat/main.c               |  1 +
 usr.bin/systat/mbufs.c              |  1 +
 usr.bin/systat/mode.c               |  2 ++
 usr.bin/systat/netstat.c            |  1 +
 usr.bin/systat/swap.c               |  1 +
 usr.bin/systat/tcp.c                |  2 ++
 usr.bin/systat/vmstat.c             |  1 +
 usr.bin/tar/getdate.c               |  2 ++
 usr.bin/tee/tee.c                   |  1 +
 usr.bin/time/time.c                 |  1 +
 usr.bin/tput/tput.c                 |  2 ++
 usr.bin/tr/cmap.c                   |  3 +++
 usr.bin/tr/cmap.h                   |  1 +
 usr.bin/tr/cset.c                   |  3 +++
 usr.bin/tr/cset.h                   |  1 +
 usr.bin/tr/str.c                    |  2 ++
 usr.bin/tr/tr.c                     |  4 ++++
 usr.bin/truss/main.c                |  2 ++
 usr.bin/truss/setup.c               |  4 ++++
 usr.bin/tsort/tsort.c               |  1 +
 usr.bin/ul/ul.c                     |  1 +
 usr.bin/unexpand/unexpand.c         |  2 ++
 usr.bin/usbhidaction/usbhidaction.c |  1 +
 usr.bin/vis/foldit.c                |  6 +++++-
 usr.bin/w/pr_time.c                 |  1 +
 usr.bin/w/w.c                       |  3 +++
 usr.bin/wall/ttymsg.c               |  1 +
 usr.bin/who/who.c                   |  1 +
 usr.bin/xinstall/xinstall.c         | 21 +++++++++++----------
 usr.bin/ypcat/ypcat.c               |  1 +
 usr.bin/ypmatch/ypmatch.c           |  1 +
 usr.bin/ypwhich/ypwhich.c           |  1 +
 120 files changed, 191 insertions(+), 17 deletions(-)

diff --git a/usr.bin/ar/util.c b/usr.bin/ar/util.c
index 621c2b8a197..e1230e33013 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 f8c47c5d11f..a1dc9b2a623 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 39f2c9ce23f..d1bb74516d9 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 e40481eb918..d3f3c1ec4f2 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 93e9c07b44f..76e593327a3 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 e713f5f9be9..d96ffc2546e 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 7ba38032fdb..828900ac027 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 ee48278c38f..d1f42f2f628 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 eefa7724eb9..cadbc17b69b 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 e6dd910bfee..406b40e2832 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 b4380623a64..c179c6289a2 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 555725a999b..814d9333b93 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 e5e8325d109..bbe3cb10fa8 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 f8452514d8c..2ba4f39bbda 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 399252aaa34..52dda90086d 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 92e0a971fea..f0ec8871cd8 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 a2bcf889d4d..35b13afa0a4 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 9f04799d911..6c99db80685 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 8fe419b7b05..2512a2e8632 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 8affbd07f78..e50bd1f8a46 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 3171f8ba595..cc2d797a541 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 0a7ab21087a..de7750c88ff 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 7b9d88f4731..88e45938cc6 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 9a0b9ce4c74..8e2b42cd298 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 8fda57c87df..15329064cf4 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 6c76bbfa89b..7d06c910ae7 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 d656693f0aa..848bbeeeb32 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 703ff60a86a..5260a2d6ca2 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 3eabd34b37d..a84c711745c 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 1ce93346865..ed85c2e49f2 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 6c7fafb4553..59d8fc59adf 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 706620c0c39..35d5363f143 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 d0355d83e7c..d1671a71e5e 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 3d6a6ea8ba4..db04c49aade 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 a0355317316..2ed7c4b9df4 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 4cd7433556f..2e33d41be59 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 6ac53ddcdcb..0a779fdcbc3 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 4f41a13a1b4..a9d3f6442cb 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 b5ca6dddd37..8c551231a4f 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 5de7c5c4c80..4883b2a4ef8 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 9c250f9f40c..2da69a23c64 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 d5812847fd6..3b19e35bbe1 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 dd63d9233b6..2a429247d9a 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 c3cb8f4e736..f6111a1cd35 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 afb06efc6ba..60fecc24114 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 7f891cc399c..270c1c546b5 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 468656203e4..7e147b6b149 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 99d86e6b7fc..344af220cf6 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 72b89d60788..b58ac4b9d05 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 4699025301b..a65a2fcf8a2 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 cf82020bb27..9ed48209076 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 2f862e19ebf..2ffeacbc7de 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 043a20ff0ea..02f390a0196 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 8aeeacee33f..d3276bf2761 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 adc6cfb5ac8..b79a93bba98 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 23593d58ff6..fec7172ad0c 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 47a58c4efa6..7f65701ddf5 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 adae25e639d..c4dd647eb6f 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 22a64219bb9..2ab58e91dad 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 db7a4d117e3..2e9e919f109 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 82a4c13cfcc..fe29787ef19 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 b5e040211f2..91b62a52779 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 eba42fc255f..11a1db94261 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 aa964b83f7e..4af133b1370 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 aa3109ceab2..06f22445771 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 dd12a562324..d35458c956a 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 72c27365aec..6e3e5539d0c 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 cf42d7c4463..277459ee47a 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 1c132ca540c..e5a7acda921 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 00109e787f0..277517242a4 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 984dced8929..debb0e44a20 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 2d3a666ea42..5c965a99076 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 66a7ad23938..8b38897d2f6 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 971de675ec6..c279535b649 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 76c9b93cb1f..713cba11d55 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 ce92fe24c13..70683638360 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 736f857484e..f96bdfcbc18 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 40805653546..9d1c85be5f1 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 b8672e4e46d..1e3356f6f86 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 d104bde8dbe..042b72f7135 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 f99c12a4132..1a140b14414 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 4a7f643e9ba..f3b513784a6 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 0a63a32ed2c..5e67cc1bc7b 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 88a19d9e649..5dcb24a4064 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 124c3b9763f..0edce342e7b 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 acf6b3fca99..2d5f8e4e1ff 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 d3573af5546..90e1578efeb 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 44ed6ac9706..09143285751 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 90c6208759d..d092f10fe19 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 9b0d4a8c22c..37be1ef3d59 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 745a283ff39..5f64e3ec237 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 eb469f3e06b..14fc4956f34 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 dca29b508bf..43df8eb8aa1 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 4a69a4f0e2d..b7f7592208c 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 6585d938b26..742e2f7b4f0 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 effac4e9d3d..8df1e26fba7 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 de592c5f2df..123a2de69ab 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 d586ba14c57..a97ffecce20 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 e3b8a37cebb..a478d5dcf49 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 8c2ab972d98..811040c25e7 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 a7c1a3015f6..9a81e134678 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 2535eed2d46..1b4212949b6 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 4a8108a2db9..ab3eabd3e43 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 1dee776e06b..86ae1731ac4 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 6db16af0f67..61195ff4dbb 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 4036a63904e..d0dd073e632 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 4f79ea30c20..53a6fe17f22 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 e7c538e1d31..a01a86c3700 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 725fc25765e..77559cf254f 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 5009ca1fbfd..d59cd4ef8c7 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 783909ec38f..a5e25985260 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 fcf60473560..6ad82c2dc2f 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 b46fe17189e..acf6f8c987b 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 23fce288b08..d35892ed402 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 bb5c43e7a9c..a977875942a 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 a279d143688..5db4f883598 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 35f6a60cfb4..49e47c65a36 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 3da854e1fbe..3484bc9c1f4 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 707a9e93c2f..a9c32ea72c4 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 cb43f64d30a..4e719dffcd0 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>