Style improvements recommended by Bruce as a follow up to some

of the recent WARNS commits. The idea is:

1) FreeBSD id tags should follow vendor tags.
2) Vendor tags should not be compiled (though copyrights probably should).
3) There should be no blank line between including cdefs and __FBSDIF.

93 files changed, 384 insertions, 335 deletions

diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c
index bac0496..bc2ca62 100644
--- a/bin/chflags/chflags.c
+++ b/bin/chflags/chflags.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
+static char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libpam/modules/pam_login_access/login_access.c b/lib/libpam/modules/pam_login_access/login_access.c
index c058bbe..b8cdf05 100644
--- a/lib/libpam/modules/pam_login_access/login_access.c
+++ b/lib/libpam/modules/pam_login_access/login_access.c
@@ -7,14 +7,15 @@
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifdef LOGIN_ACCESS
+#if 0
 #ifndef lint
-static const char sccsid[] = "%Z% %M% %I% %E% %U%";
+static char sccsid[] = "%Z% %M% %I% %E% %U%";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile
index 48871b9..362442a 100644
--- a/usr.bin/apply/Makefile
+++ b/usr.bin/apply/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	apply
 
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index 6926388..e2f808a 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)apply.c	8.4 (Berkeley) 4/4/94";
+static char sccsid[] = "@(#)apply.c	8.4 (Berkeley) 4/4/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr.bin/ar/append.c b/usr.bin/ar/append.c
index 151ae0a..b891b9e 100644
--- a/usr.bin/ar/append.c
+++ b/usr.bin/ar/append.c
@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)append.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)append.c	8.3 (Berkeley) 4/2/94";
+#endif
 #endif /* not lint */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index f4bc76a..b951d67 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -34,19 +34,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1990, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)ar.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)ar.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/ar/archive.c b/usr.bin/ar/archive.c
index e85695a..b347fb7 100644
--- a/usr.bin/ar/archive.c
+++ b/usr.bin/ar/archive.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)archive.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)archive.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ar/contents.c b/usr.bin/ar/contents.c
index 6243984..c53c323 100644
--- a/usr.bin/ar/contents.c
+++ b/usr.bin/ar/contents.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)contents.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)contents.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ar/delete.c b/usr.bin/ar/delete.c
index 7174845..53e7f92 100644
--- a/usr.bin/ar/delete.c
+++ b/usr.bin/ar/delete.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)delete.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)delete.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ar/extract.c b/usr.bin/ar/extract.c
index 36c31e3..9d53f97 100644
--- a/usr.bin/ar/extract.c
+++ b/usr.bin/ar/extract.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)extract.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)extract.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/ar/misc.c b/usr.bin/ar/misc.c
index 5e76b19..d3c3ba2 100644
--- a/usr.bin/ar/misc.c
+++ b/usr.bin/ar/misc.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/ar/move.c b/usr.bin/ar/move.c
index d416b8a..8240b5c 100644
--- a/usr.bin/ar/move.c
+++ b/usr.bin/ar/move.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)move.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)move.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ar/print.c b/usr.bin/ar/print.c
index 6854cee..19ef47e 100644
--- a/usr.bin/ar/print.c
+++ b/usr.bin/ar/print.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)print.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)print.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/ar/replace.c b/usr.bin/ar/replace.c
index e14be94..3dffd04 100644
--- a/usr.bin/ar/replace.c
+++ b/usr.bin/ar/replace.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)replace.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)replace.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index a909dff..a9749ce 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -27,7 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #define _USE_BSD 1
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index 6158442..8921e11 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -24,7 +24,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 /* System Headers */
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index 4d738d0..4590ad1 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -34,7 +34,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 /* System Headers */
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index b22b3ab..91176b4 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -24,7 +24,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 /* System Headers */
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index c39c087..81388d8 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)banner.c	8.4 (Berkeley) 4/29/95";
+static char sccsid[] = "@(#)banner.c	8.4 (Berkeley) 4/29/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * banner - prints large signs
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index c7e4b47..cc407c9 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1991, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)basename.c	8.4 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)basename.c	8.4 (Berkeley) 5/4/95";
 #endif /* not lint */
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <libgen.h>
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index 9b198b1..a32b57d 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)biff.c	8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)biff.c	8.1 (Berkeley) 6/6/93";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index 451dcd3..90d4416 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -28,7 +28,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c
index d47f2ad..82d6427 100644
--- a/usr.bin/c89/c89.c
+++ b/usr.bin/c89/c89.c
@@ -28,7 +28,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include <err.h>
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 8a900f9..dc5b6d9 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
+static char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 44f8bb4..2216b56 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -32,7 +32,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 51b539c..c590886 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
+static char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index bf7f366..f000f7d 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -25,7 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include <stdio.h>
diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c
index c5b31ba..3999d31 100644
--- a/usr.bin/calendar/paskha.c
+++ b/usr.bin/calendar/paskha.c
@@ -25,7 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include <stdio.h>
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index 31813b3..8b111b1 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)cap_mkdb.c	8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)cap_mkdb.c	8.1 (Berkeley) 6/6/93";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/chflags/chflags.c b/usr.bin/chflags/chflags.c
index bac0496..bc2ca62 100644
--- a/usr.bin/chflags/chflags.c
+++ b/usr.bin/chflags/chflags.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
+static char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/chkey/chkey.c b/usr.bin/chkey/chkey.c
index 68d3ae8..06875ce 100644
--- a/usr.bin/chkey/chkey.c
+++ b/usr.bin/chkey/chkey.c
@@ -28,13 +28,14 @@
  * Mountain View, California  94043
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)chkey.c 1.7 91/03/11 Copyr 1986 Sun Micro";
+static char sccsid[] = "@(#)chkey.c 1.7 91/03/11 Copyr 1986 Sun Micro";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Copyright (C) 1986, Sun Microsystems, Inc.
diff --git a/usr.bin/cmp/Makefile b/usr.bin/cmp/Makefile
index 90a4c8e..c6f9ebe 100644
--- a/usr.bin/cmp/Makefile
+++ b/usr.bin/cmp/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	cmp
 SRCS=	cmp.c misc.c regular.c special.c
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index 7a3d514..ca732c6 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1987, 1990, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)cmp.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)cmp.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 1d5db6c..1211f3b 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index f8345ca..014657e 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)regular.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)regular.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/mman.h>
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index 5fe0ed1..f08cae5 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)special.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)special.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 402bcf5..85a6eac 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -34,19 +34,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1990, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)col.c	8.5 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)col.c	8.5 (Berkeley) 5/4/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index ccfb179..b670570 100644
--- a/usr.bin/colcrt/colcrt.c
+++ b/usr.bin/colcrt/colcrt.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)colcrt.c	8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)colcrt.c	8.1 (Berkeley) 6/6/93";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 16035cc..226c2fe 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1991, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)colrm.c	8.2 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)colrm.c	8.2 (Berkeley) 5/4/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <err.h>
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index 21bff28..39b9c2a 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)column.c	8.4 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)column.c	8.4 (Berkeley) 5/4/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 941233e..bdf30e3 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -34,19 +34,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
+static char sccsid[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index ebb6c79..9b814eb 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)compress.c	8.2 (Berkeley) 1/7/94";
+static char sccsid[] = "@(#)compress.c	8.2 (Berkeley) 1/7/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index b8beb7e..1251d1b 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -35,14 +35,13 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)zopen.c	8.1 (Berkeley) 6/27/93";
 #endif /* LIBC_SCCS and not lint */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*-
  * fcompress.c - File compression ala IEEE Computer, June 1984.
  *
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index fcc037a..f7394c5 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static char sccsid[] = "@(#)C.c	8.4 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index 3f74332..199ffb6 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)ctags.c	8.4 (Berkeley) 2/7/95";
+static char sccsid[] = "@(#)ctags.c	8.4 (Berkeley) 2/7/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index 16845e5..2195606 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)fortran.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)fortran.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index 293149a..b00a2a8 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)lisp.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)lisp.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index b27ca54..36c790b 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)print.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)print.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index 2be32a4..ac99639 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)tree.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)tree.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index 4a0020b..f6f2c3f 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)yacc.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)yacc.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 3240dcf..138021a 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -44,19 +44,20 @@
  *	login time is < 6 days.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Finger prints out information about users.  It is not portable since
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 26f55c3..d8f649f 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
+static char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/stat.h>
 #include <ctype.h>
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 4bcb31b..67a7087 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
+static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index aaa74da..67fdcbb 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
+static char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <db.h>
 #include <err.h>
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 8f81f50..3a001a2 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
+static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 4f24d37..59707b5 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * login [ name ]
diff --git a/usr.bin/login/login_access.c b/usr.bin/login/login_access.c
index c058bbe..b8cdf05 100644
--- a/usr.bin/login/login_access.c
+++ b/usr.bin/login/login_access.c
@@ -7,14 +7,15 @@
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifdef LOGIN_ACCESS
+#if 0
 #ifndef lint
-static const char sccsid[] = "%Z% %M% %I% %E% %U%";
+static char sccsid[] = "%Z% %M% %I% %E% %U%";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c
index 599e3a6..a62c6ef 100644
--- a/usr.bin/login/login_fbtab.c
+++ b/usr.bin/login/login_fbtab.c
@@ -59,7 +59,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/usr.bin/logname/Makefile b/usr.bin/logname/Makefile
index 717bf8c..1ef3cf0 100644
--- a/usr.bin/logname/Makefile
+++ b/usr.bin/logname/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
+# $FreeBSD$
 
 PROG=	logname
 WARNS?=	2
diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile
index 75ce758..b9e5ad4 100644
--- a/usr.bin/mkstr/Makefile
+++ b/usr.bin/mkstr/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	mkstr
 WARNS?=	2
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index 0b47e40..f1bd3d8 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/12/93
+# $FreeBSD$
 
 PROG=	netstat
 SRCS=	if.c inet.c inet6.c main.c mbuf.c mroute.c ipx.c route.c \
diff --git a/usr.bin/nfsstat/Makefile b/usr.bin/nfsstat/Makefile
index cfe0e1e..ce4c7c6 100644
--- a/usr.bin/nfsstat/Makefile
+++ b/usr.bin/nfsstat/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	nfsstat
 CFLAGS+=-DNFS
diff --git a/usr.bin/nice/Makefile b/usr.bin/nice/Makefile
index a6f8717..dc72a89 100644
--- a/usr.bin/nice/Makefile
+++ b/usr.bin/nice/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	nice
 WARNS?=	2
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index 85fffbf..ea1ec44 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)nice.c	8.2 (Berkeley) 4/16/94";
+static char sccsid[] = "@(#)nice.c	8.2 (Berkeley) 4/16/94";
 #endif /* not lint */
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/nohup/Makefile b/usr.bin/nohup/Makefile
index 74c86a0..d9aa856 100644
--- a/usr.bin/nohup/Makefile
+++ b/usr.bin/nohup/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	nohup
 WARNS?=	2
diff --git a/usr.bin/printenv/Makefile b/usr.bin/printenv/Makefile
index b8fbd6a..402dc58 100644
--- a/usr.bin/printenv/Makefile
+++ b/usr.bin/printenv/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	printenv
 MLINKS=	printenv.1 env.1
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 72722a3..cf825c2 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1987, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)printenv.c	8.2 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)printenv.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile
index 1e57f83..53fd56c 100644
--- a/usr.bin/printf/Makefile
+++ b/usr.bin/printf/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	printf
 WARNS?=	2
diff --git a/usr.bin/rev/Makefile b/usr.bin/rev/Makefile
index ef9723f..adfc4e1 100644
--- a/usr.bin/rev/Makefile
+++ b/usr.bin/rev/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
+# $FreeBSD$
 
 PROG=	rev
 WARNS?=	2
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index c023d8e..50921e7 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1987, 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)rev.c	8.3 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)rev.c	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/sasc/Makefile b/usr.bin/sasc/Makefile
index 2f359d3..c44998a 100644
--- a/usr.bin/sasc/Makefile
+++ b/usr.bin/sasc/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	sasc
 WARNS?=	2
diff --git a/usr.bin/script/Makefile b/usr.bin/script/Makefile
index 61f9435..ac3a59c 100644
--- a/usr.bin/script/Makefile
+++ b/usr.bin/script/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	script
 WARNS?=	2
diff --git a/usr.bin/soelim/Makefile b/usr.bin/soelim/Makefile
index cde7389..9d28c12 100644
--- a/usr.bin/soelim/Makefile
+++ b/usr.bin/soelim/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	soelim
 WARNS?=	2
diff --git a/usr.bin/tee/Makefile b/usr.bin/tee/Makefile
index 49cb861..52baa4c 100644
--- a/usr.bin/tee/Makefile
+++ b/usr.bin/tee/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	tee
 WARNS?=	2
diff --git a/usr.bin/tsort/Makefile b/usr.bin/tsort/Makefile
index 644dc90..3cea517 100644
--- a/usr.bin/tsort/Makefile
+++ b/usr.bin/tsort/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
+# $FreeBSD$
 
 PROG=	tsort
 WARNS?=	2
diff --git a/usr.bin/tty/Makefile b/usr.bin/tty/Makefile
index 14ed68f..1c4f6d3 100644
--- a/usr.bin/tty/Makefile
+++ b/usr.bin/tty/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	tty
 WARNS?=	2
diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile
index a28e590..5a85744 100644
--- a/usr.bin/ul/Makefile
+++ b/usr.bin/ul/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	ul
 WARNS?=	2
diff --git a/usr.bin/uniq/Makefile b/usr.bin/uniq/Makefile
index fa73ea4..2bc6ad4 100644
--- a/usr.bin/uniq/Makefile
+++ b/usr.bin/uniq/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	uniq
 WARNS?=	2
diff --git a/usr.bin/unvis/Makefile b/usr.bin/unvis/Makefile
index d50d344..755d9c4 100644
--- a/usr.bin/unvis/Makefile
+++ b/usr.bin/unvis/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	unvis
 WARNS?=	2
diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile
index 5b44030..be3a99a 100644
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	uudecode
 WARNS?=	2
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 5921c78..f7e7b55 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)closure.c	5.3 (Berkeley) 5/24/93";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)closure.c	5.3 (Berkeley) 5/24/93";
-#endif
-
 #include <stdlib.h>
 #include "defs.h"
 
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 7158000..e563693 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
-#endif
-
 /* routines for printing error messages  */
 
 #include "defs.h"
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index 73be8fe..861644a 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)lalr.c	5.3 (Berkeley) 6/1/90";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)lalr.c	5.3 (Berkeley) 6/1/90";
-#endif
-
 #include <stdlib.h>
 #include "defs.h"
 
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 94698a0..6f642fd 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)lr0.c	5.3 (Berkeley) 1/20/91";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)lr0.c	5.3 (Berkeley) 1/20/91";
-#endif
-
 #include <stdlib.h>
 #include "defs.h"
 
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 4c427c3..cd1d5b8 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
-#endif
-
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index 34aa81d..7d61246 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
-#endif
-
 #include <stdlib.h>
 #include "defs.h"
 
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index d6134c9..e7687c3 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)output.c	5.7 (Berkeley) 5/24/93";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)output.c	5.7 (Berkeley) 5/24/93";
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 23a060f..8d54e92 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)reader.c	5.7 (Berkeley) 1/20/91";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)reader.c	5.7 (Berkeley) 1/20/91";
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index 5e7ce14..11a1855 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)skeleton.c	5.8 (Berkeley) 4/29/95";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)skeleton.c	5.8 (Berkeley) 4/29/95";
-#endif
-
 #include "defs.h"
 
 /*  The definition of yysccsid in the banner should be replaced with	*/
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index 8b8298c..c808d6a 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)symtab.c	5.3 (Berkeley) 6/1/90";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)symtab.c	5.3 (Berkeley) 6/1/90";
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 2b37eef..e620650 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)verbose.c	5.3 (Berkeley) 1/20/91";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)verbose.c	5.3 (Berkeley) 1/20/91";
-#endif
-
 #include <stdlib.h>
 #include "defs.h"
 
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 8f1cd1c..3c7bf1c 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)warshall.c	5.4 (Berkeley) 5/24/93";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)warshall.c	5.4 (Berkeley) 5/24/93";
-#endif
-
 #include "defs.h"
 
 static void transitive_closure __P((unsigned *, int));
diff --git a/usr.bin/yes/Makefile b/usr.bin/yes/Makefile
index 8e91b44..247bfae 100644
--- a/usr.bin/yes/Makefile
+++ b/usr.bin/yes/Makefile
@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	yes
 WARNS?=	2