diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index edeb9c60679..727351c8ff8 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sbuf.h>
 #include <sys/wait.h>
diff --git a/usr.bin/bc/bc.y b/usr.bin/bc/bc.y
index 245748528a5..c270330281a 100644
--- a/usr.bin/bc/bc.y
+++ b/usr.bin/bc/bc.y
@@ -30,7 +30,6 @@
  * easy regression testing.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index 2c908efdc22..e99af06c428 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -29,7 +29,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/elf_common.h>
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c
index 9836b8ee96f..a4813253b23 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.c
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.c
@@ -26,7 +26,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <bzlib.h>
diff --git a/usr.bin/c99/c99.c b/usr.bin/c99/c99.c
index 9040aab4e7f..688321d170b 100644
--- a/usr.bin/c99/c99.c
+++ b/usr.bin/c99/c99.c
@@ -34,7 +34,6 @@
  * specially.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index c15c3037d8a..64dc6cba0dc 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -77,7 +77,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
diff --git a/usr.bin/chkey/chkey.c b/usr.bin/chkey/chkey.c
index f5876396cb2..8309237990f 100644
--- a/usr.bin/chkey/chkey.c
+++ b/usr.bin/chkey/chkey.c
@@ -28,9 +28,6 @@
  * Mountain View, California  94043
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 /*
  * Copyright (C) 1986, Sun Microsystems, Inc.
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index 55607f72a3c..978a3eb1a63 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -40,10 +40,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c
index 80dcdfacea7..b64f33e06fd 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -40,10 +40,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c
index 2d9a449578b..53ed54e825a 100644
--- a/usr.bin/chpass/table.c
+++ b/usr.bin/chpass/table.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <stddef.h>
 #include "chpass.h"
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index 369eaba16ac..9e3b3f7903c 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -40,9 +40,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <ctype.h>
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index 6c91e9f2cb5..1a49e152687 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <stdint.h>
diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c
index 646704dcea4..2eb3e1b7d19 100644
--- a/usr.bin/cksum/crc32.c
+++ b/usr.bin/cksum/crc32.c
@@ -11,7 +11,6 @@
  *			Spencer Garrett <srg@quick.com>
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <stdio.h>
diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c
index b86e174a10e..345b36b64c4 100644
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <stdio.h>
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index da710cb2e90..6174bae00ad 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <unistd.h>
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index 26572076943..ae74226e526 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <unistd.h>
diff --git a/usr.bin/cmp/link.c b/usr.bin/cmp/link.c
index 550273cb471..33b0fa46458 100644
--- a/usr.bin/cmp/link.c
+++ b/usr.bin/cmp/link.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 35922deee42..78b431b6f6a 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index 38d1110dbd3..0b78b83968c 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index 5ca1e64f3e0..f29d3b454f6 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <capsicum_helpers.h>
diff --git a/usr.bin/csplit/csplit.c b/usr.bin/csplit/csplit.c
index dd645396948..59aa7eb3d2d 100644
--- a/usr.bin/csplit/csplit.c
+++ b/usr.bin/csplit/csplit.c
@@ -44,7 +44,6 @@
  * assumption about the input.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <ctype.h>
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index ba0ef146058..283a08ec555 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <limits.h>
 #include <stddef.h>
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index 8c355cecd3c..55d8d824f56 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index e6e22fb71cf..e219fcee463 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index ea8a603a040..e1b0957104c 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <limits.h>
 #include <stdio.h>
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index 3e654c3d909..e8250bcbcf6 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <err.h>
 #include <limits.h>
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index 8044e4a2df6..502fbc98b71 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <ctype.h>
 #include <limits.h>
diff --git a/usr.bin/ctlstat/ctlstat.c b/usr.bin/ctlstat/ctlstat.c
index 8aed0f52e35..3a2f9b7a093 100644
--- a/usr.bin/ctlstat/ctlstat.c
+++ b/usr.bin/ctlstat/ctlstat.c
@@ -38,7 +38,6 @@
  * Authors: Ken Merry <ken@FreeBSD.org>, Will Andrews <will@FreeBSD.org>
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/callout.h>
 #include <sys/ioctl.h>
diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
index 447b48fe79e..348741f8ccc 100644
--- a/usr.bin/diff/diffreg.c
+++ b/usr.bin/diff/diffreg.c
@@ -64,7 +64,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/capsicum.h>
 #include <sys/stat.h>
 
diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c
index 78638ea2428..c72ea074758 100644
--- a/usr.bin/diff3/diff3.c
+++ b/usr.bin/diff3/diff3.c
@@ -62,9 +62,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/capsicum.h>
 #include <sys/procdesc.h>
 #include <sys/types.h>
diff --git a/usr.bin/elfdump/elfdump.c b/usr.bin/elfdump/elfdump.c
index e5d5bccc414..49704cde1b0 100644
--- a/usr.bin/elfdump/elfdump.c
+++ b/usr.bin/elfdump/elfdump.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <sys/capsicum.h>
diff --git a/usr.bin/enigma/enigma.c b/usr.bin/enigma/enigma.c
index 32f8972b238..b985163476c 100644
--- a/usr.bin/enigma/enigma.c
+++ b/usr.bin/enigma/enigma.c
@@ -10,7 +10,6 @@
  *	Upgraded to function properly on 64-bit machines.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <stdio.h>
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index 8be5742386e..05c0211ead4 100644
--- a/usr.bin/fetch/fetch.c
+++ b/usr.bin/fetch/fetch.c
@@ -29,7 +29,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index 6b9696ea71d..54b4fdd679e 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -32,8 +32,6 @@
  * SUCH DAMAGE.
  */
 
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 03e49fc62b6..43aa2301439 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -32,8 +32,6 @@
  * SUCH DAMAGE.
  */
 
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ucred.h>
 #include <sys/stat.h>
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index a61d9cb7dbc..86434f53e9f 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -29,8 +29,6 @@
  * SUCH DAMAGE.
  */
 
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index 01c9f9145fa..7963e3baa4d 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -32,8 +32,6 @@
  * SUCH DAMAGE.
  */
 
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index f65b800c32a..3b4936fe055 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -32,8 +32,6 @@
  * SUCH DAMAGE.
  */
 
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index 4af5af94e32..166fc75e9c5 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 11491e5a7c8..6d5e828eb27 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 59356cd09e1..e2f1eb99d62 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 1d65b23ae07..d8649a1f57f 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 621f3455e82..183e4629001 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index c3374ecfffa..328e35e9138 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/user.h>
 #include <sys/stat.h>
diff --git a/usr.bin/fsync/fsync.c b/usr.bin/fsync/fsync.c
index 16d5a176da9..9968bc8614a 100644
--- a/usr.bin/fsync/fsync.c
+++ b/usr.bin/fsync/fsync.c
@@ -26,9 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <err.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.bin/getaddrinfo/getaddrinfo.c b/usr.bin/getaddrinfo/getaddrinfo.c
index f01ccd7b2e1..da84259a3c2 100644
--- a/usr.bin/getaddrinfo/getaddrinfo.c
+++ b/usr.bin/getaddrinfo/getaddrinfo.c
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 
diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c
index a4434c31fd3..ed69d5f0454 100644
--- a/usr.bin/getconf/getconf.c
+++ b/usr.bin/getconf/getconf.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index fe032e68a51..5e8ba06402a 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <err.h>
 #include "gprof.h"
diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c
index 081a245c544..b0bafc18fb5 100644
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <err.h>
 #include "gprof.h"
diff --git a/usr.bin/gprof/elf.c b/usr.bin/gprof/elf.c
index f46bc07524f..a237e1dd4c0 100644
--- a/usr.bin/gprof/elf.c
+++ b/usr.bin/gprof/elf.c
@@ -33,7 +33,6 @@
 /* From: */
 #endif
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/usr.bin/gprof/hertz.c b/usr.bin/gprof/hertz.c
index 9717b1b6253..2d1b6edca52 100644
--- a/usr.bin/gprof/hertz.c
+++ b/usr.bin/gprof/hertz.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <sys/time.h>
 
diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index 00445ea86a4..1d53744f59c 100644
--- a/usr.bin/gprof/lookup.c
+++ b/usr.bin/gprof/lookup.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include "gprof.h"
 
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 92e48a89b49..07791bf2d15 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <err.h>
 #include <string.h>
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index a5d33fc1e0c..a248aa9f322 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <err.h>
 #include <string.h>
diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c
index 3349b72842c..0b8240504ce 100644
--- a/usr.bin/grep/file.c
+++ b/usr.bin/grep/file.c
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/usr.bin/grep/queue.c b/usr.bin/grep/queue.c
index 6c4815992d0..296e19fb0f6 100644
--- a/usr.bin/grep/queue.c
+++ b/usr.bin/grep/queue.c
@@ -34,7 +34,6 @@
  * Dodge.  It is used in place of <sys/queue.h> to get a better performance.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
index d4301aa6095..ddfb0f8c64c 100644
--- a/usr.bin/hexdump/conv.c
+++ b/usr.bin/hexdump/conv.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <assert.h>
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index 224b576ef9f..2bef03626fe 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/conf.h>
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index 649d3028c60..de6b384cdb7 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 1ea300089ec..6c7ca55c323 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <ctype.h>
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index 9d0ab1feaa7..0f61763bd7b 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/usr.bin/iconv/iconv.c b/usr.bin/iconv/iconv.c
index 54a464de273..7d1b3c49eee 100644
--- a/usr.bin/iconv/iconv.c
+++ b/usr.bin/iconv/iconv.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/capsicum.h>
 
 #include <capsicum_helpers.h>
diff --git a/usr.bin/ident/ident.c b/usr.bin/ident/ident.c
index 84ac402f74d..96190723dbf 100644
--- a/usr.bin/ident/ident.c
+++ b/usr.bin/ident/ident.c
@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/capsicum.h>
 #include <sys/types.h>
 #include <sys/sbuf.h>
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 27dc8d0b5fc..fe03557169c 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -35,9 +35,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 /*
  * Argument scanning and profile reading code.  Default parameters are set
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index 5127aa3beca..4739e861fef 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -35,10 +35,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <capsicum_helpers.h>
diff --git a/usr.bin/indent/indent.h b/usr.bin/indent/indent.h
index bbbb5dc805d..1f9ceac1125 100644
--- a/usr.bin/indent/indent.h
+++ b/usr.bin/indent/indent.h
@@ -26,9 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 void	add_typename(const char *);
 void	alloc_typenames(void);
 int	compute_code_target(void);
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index e4a87213a0a..61b87c9343c 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -35,9 +35,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c
index 21169d513cd..7883b7c53f3 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -35,9 +35,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-#include <sys/cdefs.h>
 /*
  * Here we have the token scanner for indent.  It scans off one token and puts
  * it in the global variable "token".  It returns a code, indicating the type
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index 3d689494b6d..4434e9b01c1 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -35,9 +35,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c
index 5df747892e0..c9de7c2ccfe 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -35,9 +35,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <err.h>
 #include <stdio.h>
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index 6c2361f056d..0e0d4083712 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -32,7 +32,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #define	_WANT_SYSVMSG_INTERNALS
 #include <sys/msg.h>
diff --git a/usr.bin/ipcs/ipc.c b/usr.bin/ipcs/ipc.c
index 0729f27e594..0d9cccf2042 100644
--- a/usr.bin/ipcs/ipc.c
+++ b/usr.bin/ipcs/ipc.c
@@ -30,7 +30,6 @@
  * changes in ipcrm.c was done by Edwin Groothuis <edwin@FreeBSD.org>
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #define	_WANT_SYSVMSG_INTERNALS
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index bcb4f1953fa..99e2c8f0921 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -27,7 +27,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/proc.h>
 #define	_WANT_SYSVMSG_INTERNALS
diff --git a/usr.bin/kdump/linux.c b/usr.bin/kdump/linux.c
index 4b115f051b4..a52fbb2ba49 100644
--- a/usr.bin/kdump/linux.c
+++ b/usr.bin/kdump/linux.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/uio.h>
 #include <sys/ktrace.h>
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
index deedd06cada..8f1b4bad80f 100644
--- a/usr.bin/killall/killall.c
+++ b/usr.bin/killall/killall.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/jail.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 31c09d12e4a..520ee44a157 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/proc.h>
diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c
index f1c49cbbd41..417c565022d 100644
--- a/usr.bin/ktrdump/ktrdump.c
+++ b/usr.bin/ktrdump/ktrdump.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/capsicum.h>
 #include <sys/ktr.h>
diff --git a/usr.bin/lastcomm/readrec.c b/usr.bin/lastcomm/readrec.c
index b99e7664540..a8665a6f76a 100644
--- a/usr.bin/lastcomm/readrec.c
+++ b/usr.bin/lastcomm/readrec.c
@@ -27,7 +27,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index 5dcac0e56c2..1c0fc0fbc2e 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -30,7 +30,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/wait.h>
 
diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c
index 1da4d8921ec..a8d723163e7 100644
--- a/usr.bin/localedef/charmap.c
+++ b/usr.bin/localedef/charmap.c
@@ -31,7 +31,7 @@
 /*
  * CHARMAP file handling for localedef.
  */
-#include <sys/cdefs.h>
+
 #include <sys/types.h>
 #include <sys/tree.h>
 
diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c
index 2a080773a95..83023503604 100644
--- a/usr.bin/localedef/collate.c
+++ b/usr.bin/localedef/collate.c
@@ -31,7 +31,7 @@
 /*
  * LC_COLLATE database generation routines for localedef.
  */
-#include <sys/cdefs.h>
+
 #include <sys/types.h>
 #include <sys/tree.h>
 
diff --git a/usr.bin/localedef/localedef.h b/usr.bin/localedef/localedef.h
index 4b141ac8dc0..34299033214 100644
--- a/usr.bin/localedef/localedef.h
+++ b/usr.bin/localedef/localedef.h
@@ -33,7 +33,7 @@
  */
 
 /* Common header files. */
-#include <sys/cdefs.h>
+
 #include <sys/types.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index dd02bf2a541..7f88753d174 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 3d473a3d327..409e6cc373a 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -40,9 +40,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 /*
  * login [ name ]
diff --git a/usr.bin/login/login_audit.c b/usr.bin/login/login_audit.c
index 59b182e19de..1f2ec4d80cc 100644
--- a/usr.bin/login/login_audit.c
+++ b/usr.bin/login/login_audit.c
@@ -33,7 +33,6 @@
  * @APPLE_BSD_LICENSE_HEADER_END@
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <bsm/libbsm.h>
diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c
index 0fb9289346c..5c846534d0c 100644
--- a/usr.bin/login/login_fbtab.c
+++ b/usr.bin/login/login_fbtab.c
@@ -58,7 +58,6 @@
 	The Netherlands
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c
index 4ec98328760..04ed38e8d97 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 4533e106a37..d641ec56afe 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 28e695f6a7f..8ea361efab9 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include "extern.h"
 
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index 27901a2078c..5c670b7867e 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include <sys/wait.h>
 #include "extern.h"
diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c
index bf1962ead2a..fbc71ca87db 100644
--- a/usr.bin/mail/cmd3.c
+++ b/usr.bin/mail/cmd3.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include "extern.h"
 
diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index 1acfc763b6b..8c5ed43a03a 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "def.h"
 #include "extern.h"
 
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index e9be5332cf2..0c310b15b23 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 /*
  * Mail -- a mail program
  *
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index c07b98c8ff6..1a03c5d4e18 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include <fcntl.h>
 #include "extern.h"
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index 59c6e912bd8..6a31f2a5e36 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include <sys/file.h>
 #include <sys/wait.h>
diff --git a/usr.bin/mail/getname.c b/usr.bin/mail/getname.c
index a7bd0b9d22b..85721b1d16a 100644
--- a/usr.bin/mail/getname.c
+++ b/usr.bin/mail/getname.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include <pwd.h>
 #include "extern.h"
diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c
index ad450765d72..2e27581c9d5 100644
--- a/usr.bin/mail/head.c
+++ b/usr.bin/mail/head.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include "extern.h"
 
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index 7c579e5a474..1043dd2d470 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index bb2172c92a8..6d15a65e766 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include <ctype.h>
 #include "extern.h"
diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c
index 066e2f8058a..502487055ff 100644
--- a/usr.bin/mail/names.c
+++ b/usr.bin/mail/names.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 /*
  * Mail -- a mail program
  *
diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index 3dee3b9c162..69326bdb260 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include <sys/wait.h>
 #include <fcntl.h>
diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c
index 447c59a78bd..6b69461ca6f 100644
--- a/usr.bin/mail/quit.c
+++ b/usr.bin/mail/quit.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include <fcntl.h>
 #include "extern.h"
diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c
index be158235153..b4fbd4cbfd8 100644
--- a/usr.bin/mail/send.c
+++ b/usr.bin/mail/send.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include "extern.h"
 
diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c
index b8f7862c60e..b3cc217dbde 100644
--- a/usr.bin/mail/strings.c
+++ b/usr.bin/mail/strings.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 /*
  * Mail -- a mail program
  *
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 7143d213019..34a473af0e3 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include "extern.h"
 
diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index 39804c9c1c9..9921c8cbd20 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 /*
  * Mail -- a mail program
  *
diff --git a/usr.bin/mail/util.c b/usr.bin/mail/util.c
index af61b9c4838..ce53c7108a0 100644
--- a/usr.bin/mail/util.c
+++ b/usr.bin/mail/util.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/time.h>
 
 #include <fcntl.h>
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c
index 642e8af1f4e..6390b4235ac 100644
--- a/usr.bin/mail/v7.local.c
+++ b/usr.bin/mail/v7.local.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 /*
  * Mail -- a mail program
  *
diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c
index f65591fd504..e55ac7c3777 100644
--- a/usr.bin/mail/vars.c
+++ b/usr.bin/mail/vars.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include "rcv.h"
 #include "extern.h"
 
diff --git a/usr.bin/mail/version.c b/usr.bin/mail/version.c
index 6179b9cdccc..c44f8539a73 100644
--- a/usr.bin/mail/version.c
+++ b/usr.bin/mail/version.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 /*
  * Just keep track of the date/sid of this version of Mail.
  * Load this file first to get a "total" Mail version.
diff --git a/usr.bin/ministat/ministat.c b/usr.bin/ministat/ministat.c
index 32472a8acee..6508ce3f253 100644
--- a/usr.bin/ministat/ministat.c
+++ b/usr.bin/ministat/ministat.c
@@ -10,7 +10,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <sys/capsicum.h>
 #include <sys/ioctl.h>
 #include <sys/queue.h>
diff --git a/usr.bin/mkcsmapper/yacc.y b/usr.bin/mkcsmapper/yacc.y
index f048881b5b3..85bd525b315 100644
--- a/usr.bin/mkcsmapper/yacc.y
+++ b/usr.bin/mkcsmapper/yacc.y
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <assert.h>
diff --git a/usr.bin/mkesdb/yacc.y b/usr.bin/mkesdb/yacc.y
index 9f1781f31b5..9758fa9dd4c 100644
--- a/usr.bin/mkesdb/yacc.y
+++ b/usr.bin/mkesdb/yacc.y
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 
diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c
index bcf500cd675..541d534f967 100644
--- a/usr.bin/mkimg/mkimg.c
+++ b/usr.bin/mkimg/mkimg.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/usr.bin/mkuzip/mkuz_conveyor.c b/usr.bin/mkuzip/mkuz_conveyor.c
index b355be41990..0dee2342c0d 100644
--- a/usr.bin/mkuzip/mkuz_conveyor.c
+++ b/usr.bin/mkuzip/mkuz_conveyor.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <err.h>
 #include <inttypes.h>
diff --git a/usr.bin/mkuzip/mkuz_lzma.c b/usr.bin/mkuzip/mkuz_lzma.c
index 1c2ccf6a504..7c713e25aed 100644
--- a/usr.bin/mkuzip/mkuz_lzma.c
+++ b/usr.bin/mkuzip/mkuz_lzma.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <err.h>
 #include <stdint.h>
diff --git a/usr.bin/mkuzip/mkuz_zlib.c b/usr.bin/mkuzip/mkuz_zlib.c
index 7ec6fe37823..57f6079c3c5 100644
--- a/usr.bin/mkuzip/mkuz_zlib.c
+++ b/usr.bin/mkuzip/mkuz_zlib.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <err.h>
 #include <stdint.h>
diff --git a/usr.bin/mkuzip/mkuzip.c b/usr.bin/mkuzip/mkuzip.c
index 05d974a7774..f627562af7d 100644
--- a/usr.bin/mkuzip/mkuzip.c
+++ b/usr.bin/mkuzip/mkuzip.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/endian.h>
 #include <sys/param.h>
diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c
index c9b28b5eb08..c0cea882df7 100644
--- a/usr.bin/netstat/bpf.c
+++ b/usr.bin/netstat/bpf.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
diff --git a/usr.bin/netstat/common.c b/usr.bin/netstat/common.c
index 4b1a778737d..64e26bf3c21 100644
--- a/usr.bin/netstat/common.c
+++ b/usr.bin/netstat/common.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index c6668cae10e..7aafdf78b29 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -30,10 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 987b1ebd05c..0657926eab8 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -27,10 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/domain.h>
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 0a19627ba93..3adf5548aea 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #ifdef INET6
 #include <sys/param.h>
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index 64a948b2e21..cac42b81325 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -84,10 +84,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 87b9245dafe..ed700720ecb 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -35,10 +35,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c
index 95821efc39a..4511b17ddbb 100644
--- a/usr.bin/netstat/netgraph.c
+++ b/usr.bin/netstat/netgraph.c
@@ -32,7 +32,6 @@
  * OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
diff --git a/usr.bin/netstat/nhgrp.c b/usr.bin/netstat/nhgrp.c
index 99bc5ce7d59..00b051a04d2 100644
--- a/usr.bin/netstat/nhgrp.c
+++ b/usr.bin/netstat/nhgrp.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
diff --git a/usr.bin/netstat/nhops.c b/usr.bin/netstat/nhops.c
index 19a7a689105..f4c76f54a42 100644
--- a/usr.bin/netstat/nhops.c
+++ b/usr.bin/netstat/nhops.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
diff --git a/usr.bin/netstat/pfkey.c b/usr.bin/netstat/pfkey.c
index d4ed0c82294..27dd61a0c4e 100644
--- a/usr.bin/netstat/pfkey.c
+++ b/usr.bin/netstat/pfkey.c
@@ -59,10 +59,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 9ef3e658db5..6152cbdc859 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
diff --git a/usr.bin/netstat/route_netlink.c b/usr.bin/netstat/route_netlink.c
index 796f8d3eca6..74864fab76a 100644
--- a/usr.bin/netstat/route_netlink.c
+++ b/usr.bin/netstat/route_netlink.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
index 5395cad9fe7..92c4bf67b2f 100644
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -31,10 +31,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/types.h>
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 66bedc2d429..4d6fd9de8af 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 /*
  * Display protocol blocks in the unix domain.
diff --git a/usr.bin/newgrp/newgrp.c b/usr.bin/newgrp/newgrp.c
index 4a00cbbd45c..f1da1c8cb1f 100644
--- a/usr.bin/newgrp/newgrp.c
+++ b/usr.bin/newgrp/newgrp.c
@@ -30,7 +30,6 @@
  * newgrp -- change to a new group
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/usr.bin/newkey/generic.c b/usr.bin/newkey/generic.c
index a2fcaff07e7..faf2247376b 100644
--- a/usr.bin/newkey/generic.c
+++ b/usr.bin/newkey/generic.c
@@ -28,9 +28,6 @@
  * Mountain View, California  94043
  */
 
-#if !defined(lint) && defined(SCCSIDS)
-#endif
-
 /*
  * Copyright (C) 1986, Sun Microsystems, Inc.
  */
diff --git a/usr.bin/newkey/newkey.c b/usr.bin/newkey/newkey.c
index e745ff0d9ee..32f449c237b 100644
--- a/usr.bin/newkey/newkey.c
+++ b/usr.bin/newkey/newkey.c
@@ -28,9 +28,6 @@
  * Mountain View, California  94043
  */
 
-#if !defined(lint) && defined(SCCSIDS)
-#endif
-
 /*
  * Copyright (C) 1986, Sun Microsystems, Inc.
  */
@@ -38,7 +35,7 @@
 /*
  * Administrative tool to add a new user to the publickey database
  */
-#include <sys/cdefs.h>
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index 8e6add14277..2d2b1b8f8d0 100644
--- a/usr.bin/newkey/update.c
+++ b/usr.bin/newkey/update.c
@@ -28,9 +28,6 @@
  * Mountain View, California  94043
  */
 
-#ifndef lint
-#endif
-
 /*
  * Copyright (C) 1986, 1989, Sun Microsystems, Inc.
  */
@@ -38,7 +35,7 @@
 /*
  * Administrative tool to add a new user to the publickey database
  */
-#include <sys/cdefs.h>
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index b2ca1b35210..f1a25c1f21c 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <err.h>
diff --git a/usr.bin/pathchk/pathchk.c b/usr.bin/pathchk/pathchk.c
index 821c5de0ee2..4b9dddf0630 100644
--- a/usr.bin/pathchk/pathchk.c
+++ b/usr.bin/pathchk/pathchk.c
@@ -34,7 +34,6 @@
  * to all POSIX systems.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/usr.bin/posixshmcontrol/posixshmcontrol.c b/usr.bin/posixshmcontrol/posixshmcontrol.c
index 8b9206c5680..fde03e495d0 100644
--- a/usr.bin/posixshmcontrol/posixshmcontrol.c
+++ b/usr.bin/posixshmcontrol/posixshmcontrol.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/filio.h>
 #include <sys/mman.h>
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 215507b9b20..cf101bf0302 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -37,9 +37,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 #include <ctype.h>
 #include <stdio.h>
diff --git a/usr.bin/primes/pattern.c b/usr.bin/primes/pattern.c
index 74a68028221..2ac84be6997 100644
--- a/usr.bin/primes/pattern.c
+++ b/usr.bin/primes/pattern.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-
 /*
  * pattern - the Eratosthenes sieve on odd numbers for 3,5,7,11 and 13
  *
diff --git a/usr.bin/primes/pr_tbl.c b/usr.bin/primes/pr_tbl.c
index 986c3e272c9..70615b35dfc 100644
--- a/usr.bin/primes/pr_tbl.c
+++ b/usr.bin/primes/pr_tbl.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-
 /*
  * prime - prime table
  *
diff --git a/usr.bin/procstat/procstat.c b/usr.bin/procstat/procstat.c
index 445ea213ba2..f5c9bb6e196 100644
--- a/usr.bin/procstat/procstat.c
+++ b/usr.bin/procstat/procstat.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_args.c b/usr.bin/procstat/procstat_args.c
index c618bc37a7c..2542fe06d48 100644
--- a/usr.bin/procstat/procstat_args.c
+++ b/usr.bin/procstat/procstat_args.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_auxv.c b/usr.bin/procstat/procstat_auxv.c
index 7b68ac72f72..b37e27c6516 100644
--- a/usr.bin/procstat/procstat_auxv.c
+++ b/usr.bin/procstat/procstat_auxv.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/elf.h>
 #include <sys/sysctl.h>
diff --git a/usr.bin/procstat/procstat_basic.c b/usr.bin/procstat/procstat_basic.c
index 082689b6bd8..e1e3e363a9f 100644
--- a/usr.bin/procstat/procstat_basic.c
+++ b/usr.bin/procstat/procstat_basic.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_bin.c b/usr.bin/procstat/procstat_bin.c
index a0e272808f1..04482e5ee1b 100644
--- a/usr.bin/procstat/procstat_bin.c
+++ b/usr.bin/procstat/procstat_bin.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_cred.c b/usr.bin/procstat/procstat_cred.c
index f37a328e362..7f1efeab9d4 100644
--- a/usr.bin/procstat/procstat_cred.c
+++ b/usr.bin/procstat/procstat_cred.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_cs.c b/usr.bin/procstat/procstat_cs.c
index 89da29c598c..39d4174cf06 100644
--- a/usr.bin/procstat/procstat_cs.c
+++ b/usr.bin/procstat/procstat_cs.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/cpuset.h>
 #include <sys/sbuf.h>
diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c
index 99a0580f50d..359c2d13c86 100644
--- a/usr.bin/procstat/procstat_files.c
+++ b/usr.bin/procstat/procstat_files.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/socket.h>
diff --git a/usr.bin/procstat/procstat_kstack.c b/usr.bin/procstat/procstat_kstack.c
index c1b7e06a64f..49505bcb9ef 100644
--- a/usr.bin/procstat/procstat_kstack.c
+++ b/usr.bin/procstat/procstat_kstack.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_penv.c b/usr.bin/procstat/procstat_penv.c
index 188f761149e..b8f3c44a7b0 100644
--- a/usr.bin/procstat/procstat_penv.c
+++ b/usr.bin/procstat/procstat_penv.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_ptlwpinfo.c b/usr.bin/procstat/procstat_ptlwpinfo.c
index b2b27a4746a..bce5119516e 100644
--- a/usr.bin/procstat/procstat_ptlwpinfo.c
+++ b/usr.bin/procstat/procstat_ptlwpinfo.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ptrace.h>
 #include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_pwdx.c b/usr.bin/procstat/procstat_pwdx.c
index f364856b0b2..ee07dd6ed85 100644
--- a/usr.bin/procstat/procstat_pwdx.c
+++ b/usr.bin/procstat/procstat_pwdx.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/socket.h>
diff --git a/usr.bin/procstat/procstat_rlimit.c b/usr.bin/procstat/procstat_rlimit.c
index f2dcfcd4732..1881f8ddbeb 100644
--- a/usr.bin/procstat/procstat_rlimit.c
+++ b/usr.bin/procstat/procstat_rlimit.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/usr.bin/procstat/procstat_rusage.c b/usr.bin/procstat/procstat_rusage.c
index 5ee01c3211f..1960828fd1f 100644
--- a/usr.bin/procstat/procstat_rusage.c
+++ b/usr.bin/procstat/procstat_rusage.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_sigs.c b/usr.bin/procstat/procstat_sigs.c
index 973d622f203..7bea16739b7 100644
--- a/usr.bin/procstat/procstat_sigs.c
+++ b/usr.bin/procstat/procstat_sigs.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_threads.c b/usr.bin/procstat/procstat_threads.c
index d0679a83044..cebdc25e215 100644
--- a/usr.bin/procstat/procstat_threads.c
+++ b/usr.bin/procstat/procstat_threads.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c
index 26a8fee57d1..843c941c89c 100644
--- a/usr.bin/procstat/procstat_vm.c
+++ b/usr.bin/procstat/procstat_vm.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index dd061d54809..b5d28fd7c18 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -35,7 +35,7 @@
 /*
  * Disk quota reporting program.
  */
-#include <sys/cdefs.h>
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/usr.bin/random/randomize_fd.c b/usr.bin/random/randomize_fd.c
index 5efd1974b54..0c505aa1f9f 100644
--- a/usr.bin/random/randomize_fd.c
+++ b/usr.bin/random/randomize_fd.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 
diff --git a/usr.bin/rctl/rctl.c b/usr.bin/rctl/rctl.c
index e7b2ec24bcb..4227a866dc1 100644
--- a/usr.bin/rctl/rctl.c
+++ b/usr.bin/rctl/rctl.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/rctl.h>
 #include <sys/sysctl.h>
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index 80659a0d5e4..5f2dd443329 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -33,9 +33,6 @@
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 /*
  * rpcinfo: ping a particular rpc program
diff --git a/usr.bin/sdiff/edit.c b/usr.bin/sdiff/edit.c
index af49fd16a2a..249cb09ed44 100644
--- a/usr.bin/sdiff/edit.c
+++ b/usr.bin/sdiff/edit.c
@@ -5,7 +5,6 @@
  * Public domain.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
diff --git a/usr.bin/sdiff/sdiff.c b/usr.bin/sdiff/sdiff.c
index b863d5875db..f177f11e915 100644
--- a/usr.bin/sdiff/sdiff.c
+++ b/usr.bin/sdiff/sdiff.c
@@ -5,7 +5,6 @@
  * Public domain.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c
index 52c494f0304..73b1f00a448 100644
--- a/usr.bin/sockstat/sockstat.c
+++ b/usr.bin/sockstat/sockstat.c
@@ -28,7 +28,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/socket.h>
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index 8d012a20254..59328ba0487 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <ctype.h>
diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c
index a8bdc4c3e8a..ff7a9a552dc 100644
--- a/usr.bin/sort/coll.c
+++ b/usr.bin/sort/coll.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/usr.bin/sort/vsort.c b/usr.bin/sort/vsort.c
index 6b04feff8f6..45bcbb532ad 100644
--- a/usr.bin/sort/vsort.c
+++ b/usr.bin/sort/vsort.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <ctype.h>
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 7f4895a13db..8a61505858c 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 /*
  * Pigs display from Bill Reeves at Lucasfilm
diff --git a/usr.bin/systat/sctp.c b/usr.bin/systat/sctp.c
index 928472dbfdc..abe4d0e68e0 100644
--- a/usr.bin/systat/sctp.c
+++ b/usr.bin/systat/sctp.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/systat/sysput.c b/usr.bin/systat/sysput.c
index 78d68115876..4053037236f 100644
--- a/usr.bin/systat/sysput.c
+++ b/usr.bin/systat/sysput.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index 6f90efcf53b..83163a3525a 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/systat/zarc.c b/usr.bin/systat/zarc.c
index f2971094cdb..5f9cb8cc113 100644
--- a/usr.bin/systat/zarc.c
+++ b/usr.bin/systat/zarc.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
diff --git a/usr.bin/tabs/tabs.c b/usr.bin/tabs/tabs.c
index 7aa50472c34..0cc942565ab 100644
--- a/usr.bin/tabs/tabs.c
+++ b/usr.bin/tabs/tabs.c
@@ -34,7 +34,6 @@
  * and optionally sets a soft margin.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/tty.h>
 
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 419ffb3db80..8be76eff964 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index be7368ca75d..83852dfc46b 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index a058489b3c2..31a22f41613 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
 #include <sys/cdefs.h>
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
 
diff --git a/usr.bin/tip/libacu/biz22.c b/usr.bin/tip/libacu/biz22.c
index a2559f99fe8..6ef5b186104 100644
--- a/usr.bin/tip/libacu/biz22.c
+++ b/usr.bin/tip/libacu/biz22.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include "tip.h"
 
 #define DISCONNECT_CMD	"\20\04"	/* disconnection string */
diff --git a/usr.bin/tip/libacu/biz31.c b/usr.bin/tip/libacu/biz31.c
index 26d3287c126..cd2cc0267b4 100644
--- a/usr.bin/tip/libacu/biz31.c
+++ b/usr.bin/tip/libacu/biz31.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include "tip.h"
 
 #define MAXRETRY	3		/* sync up retry count */
diff --git a/usr.bin/tip/libacu/courier.c b/usr.bin/tip/libacu/courier.c
index e0b4af9304b..7ff0daa9d1d 100644
--- a/usr.bin/tip/libacu/courier.c
+++ b/usr.bin/tip/libacu/courier.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 /*
  * Routines for calling up on a Courier modem.
  * Derived from Hayes driver.
diff --git a/usr.bin/tip/libacu/df.c b/usr.bin/tip/libacu/df.c
index bae618fc967..5b9cf7186a6 100644
--- a/usr.bin/tip/libacu/df.c
+++ b/usr.bin/tip/libacu/df.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 /*
  * Dial the DF02-AC or DF03-AC
  */
diff --git a/usr.bin/tip/libacu/dn11.c b/usr.bin/tip/libacu/dn11.c
index 706a9df2535..8f9f47065d6 100644
--- a/usr.bin/tip/libacu/dn11.c
+++ b/usr.bin/tip/libacu/dn11.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 /*
  * Routines for dialing up on DN-11
  */
diff --git a/usr.bin/tip/libacu/hayes.c b/usr.bin/tip/libacu/hayes.c
index cd4d3689df2..efdd7fc8b43 100644
--- a/usr.bin/tip/libacu/hayes.c
+++ b/usr.bin/tip/libacu/hayes.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 /*
  * Routines for calling up on a Hayes Modem
  * (based on the old VenTel driver).
diff --git a/usr.bin/tip/libacu/t3000.c b/usr.bin/tip/libacu/t3000.c
index 7b7288872b8..9341430787d 100644
--- a/usr.bin/tip/libacu/t3000.c
+++ b/usr.bin/tip/libacu/t3000.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 /*
  * Routines for calling up on a Telebit T3000 modem.
  * Derived from Courier driver.
diff --git a/usr.bin/tip/libacu/v3451.c b/usr.bin/tip/libacu/v3451.c
index 8d360043f9e..1f671b5bffd 100644
--- a/usr.bin/tip/libacu/v3451.c
+++ b/usr.bin/tip/libacu/v3451.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 /*
  * Routines for calling up on a Vadic 3451 Modem
  */
diff --git a/usr.bin/tip/libacu/v831.c b/usr.bin/tip/libacu/v831.c
index 41410a8108b..b233cf55c28 100644
--- a/usr.bin/tip/libacu/v831.c
+++ b/usr.bin/tip/libacu/v831.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 /*
  * Routines for dialing up on Vadic 831
  */
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index 161dfa25d7d..603c18e4b5e 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 /*
  * Routines for calling up on a Ventel Modem
  * The Ventel is expected to be strapped for local echo (just like uucp)
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index dc88d5e6e41..a2c672eb888 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include "tip.h"
 
 static acu_t *acu = NOACU;
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index c5daf952528..67cfad51473 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include "tip.h"
 
 acu_t acutable[] = {
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index ff53e5f0d2d..28135f5accb 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include "tip.h"
 #include "pathnames.h"
 
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index b73e4c045b2..7219a45355f 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include "tip.h"
 
 esctable_t etable[] = {
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index 03a7de18c44..6811432d19c 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include "tip.h"
 
 static void	cuusage(void);
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 75aa65e7c7c..f4795091cb8 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include "tip.h"
 
 static	jmp_buf deadline;
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index 28cfa67af7a..5a3dc6e25dd 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include "tip.h"
 
 #ifdef ACULOG
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index f4e8bfb0074..c15482811c6 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 /*
  * Even parity table for 0-0177
  */
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index 8da6ad0633e..be0d5c7c48e 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include "tip.h"
 
 /*
diff --git a/usr.bin/tip/tip/uucplock.c b/usr.bin/tip/tip/uucplock.c
index 6d4f262ed14..e29cbc14927 100644
--- a/usr.bin/tip/tip/uucplock.c
+++ b/usr.bin/tip/tip/uucplock.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/dirent.h>
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index 73aba16b2f9..4fce98e3136 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include "tip.h"
 
 #define MIDDLE	35
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index 4741b7413af..332d6b871ff 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#endif /* not lint */
-
 #include "tip.h"
 #include "pathnames.h"
 
diff --git a/usr.bin/unifdef/tests/unifdef_test.sh b/usr.bin/unifdef/tests/unifdef_test.sh
index dfb08c18772..b0e98f128d9 100644
--- a/usr.bin/unifdef/tests/unifdef_test.sh
+++ b/usr.bin/unifdef/tests/unifdef_test.sh
@@ -10,8 +10,7 @@ hash_comment_head() {
 }
 hash_comment_body() {
 	cat >f <<EOF
-#if FOO
-#endif /*
+
 */
 EOF
 	atf_check -o file:f unifdef <f
diff --git a/usr.bin/users/users.cc b/usr.bin/users/users.cc
index f25b9206120..76e09db12c0 100644
--- a/usr.bin/users/users.cc
+++ b/usr.bin/users/users.cc
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/capsicum.h>
 
 #include <capsicum_helpers.h>
diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c
index d68516dda36..ddff1580a99 100644
--- a/usr.bin/vtfontcvt/vtfontcvt.c
+++ b/usr.bin/vtfontcvt/vtfontcvt.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/endian.h>
 #include <sys/fnv_hash.h>
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index c19c65f6229..36a63d31cc4 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/time.h>
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index c7331296913..3416d5eac0c 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 20d9b8bc468..a76fea2c469 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>