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

needed.

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>

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>
 

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;

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;

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"
 

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"
 

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>

usr.bin/cksum/crc.c

@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
+#include <stdint.h>
 #include <unistd.h>
 
 #include "extern.h"

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"

usr.bin/cksum/sum1.c

@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 
 #include <unistd.h>
+#include <stdint.h>
 
 #include "extern.h"
 

usr.bin/cksum/sum2.c

@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 
 #include <unistd.h>
+#include <stdint.h>
 
 #include "extern.h"
 

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"

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"
 

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>
 

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>
 

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. */

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;

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

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>

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>

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"

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

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>

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>

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>

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>
 

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);

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"

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';

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>

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>

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"

usr.bin/getopt/getopt.c

@@ -7,6 +7,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 int

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;

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"
 

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 */

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>

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 *);

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>

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);

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>

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>

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>

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);

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"

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);