git: 5e3934b15a27 - main - usr.bin: Automated cleanup of cdefs and other formatting

From: Warner Losh <imp_at_FreeBSD.org>
Date: Mon, 27 Nov 2023 05:25:09 UTC
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=5e3934b15a2741b2de6b217e77dc9d798d740804

commit 5e3934b15a2741b2de6b217e77dc9d798d740804
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-11-24 20:12:57 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-11-27 05:24:01 +0000

    usr.bin: Automated cleanup of cdefs and other formatting
    
    Apply the following automated changes to try to eliminate
    no-longer-needed sys/cdefs.h includes as well as now-empty
    blank lines in a row.
    
    Remove /^#if.*\n#endif.*\n#include\s+<sys/cdefs.h>.*\n/
    Remove /\n+#include\s+<sys/cdefs.h>.*\n+#if.*\n#endif.*\n+/
    Remove /\n+#if.*\n#endif.*\n+/
    Remove /^#if.*\n#endif.*\n/
    Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/types.h>/
    Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/param.h>/
    Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/capsicum.h>/
    
    Sponsored by:           Netflix
---
 usr.bin/apply/apply.c                     | 4 ----
 usr.bin/bc/bc.y                           | 1 -
 usr.bin/brandelf/brandelf.c               | 1 -
 usr.bin/bsdiff/bsdiff/bsdiff.c            | 1 -
 usr.bin/c99/c99.c                         | 1 -
 usr.bin/chat/chat.c                       | 1 -
 usr.bin/chkey/chkey.c                     | 3 ---
 usr.bin/chpass/edit.c                     | 4 ----
 usr.bin/chpass/field.c                    | 4 ----
 usr.bin/chpass/table.c                    | 3 ---
 usr.bin/chpass/util.c                     | 3 ---
 usr.bin/cksum/crc.c                       | 3 ---
 usr.bin/cksum/crc32.c                     | 1 -
 usr.bin/cksum/print.c                     | 4 ----
 usr.bin/cksum/sum1.c                      | 4 ----
 usr.bin/cksum/sum2.c                      | 3 ---
 usr.bin/cmp/link.c                        | 1 -
 usr.bin/cmp/misc.c                        | 4 ----
 usr.bin/cmp/regular.c                     | 4 ----
 usr.bin/cmp/special.c                     | 4 ----
 usr.bin/csplit/csplit.c                   | 1 -
 usr.bin/ctags/C.c                         | 3 ---
 usr.bin/ctags/fortran.c                   | 3 ---
 usr.bin/ctags/lisp.c                      | 3 ---
 usr.bin/ctags/print.c                     | 3 ---
 usr.bin/ctags/tree.c                      | 3 ---
 usr.bin/ctags/yacc.c                      | 3 ---
 usr.bin/ctlstat/ctlstat.c                 | 1 -
 usr.bin/diff/diffreg.c                    | 1 -
 usr.bin/diff3/diff3.c                     | 3 ---
 usr.bin/elfdump/elfdump.c                 | 1 -
 usr.bin/enigma/enigma.c                   | 1 -
 usr.bin/fetch/fetch.c                     | 1 -
 usr.bin/find/find.c                       | 2 --
 usr.bin/find/function.c                   | 2 --
 usr.bin/find/ls.c                         | 2 --
 usr.bin/find/misc.c                       | 2 --
 usr.bin/find/operator.c                   | 2 --
 usr.bin/find/option.c                     | 1 -
 usr.bin/finger/lprint.c                   | 4 ----
 usr.bin/finger/net.c                      | 4 ----
 usr.bin/finger/sprint.c                   | 4 ----
 usr.bin/finger/util.c                     | 4 ----
 usr.bin/fstat/fstat.c                     | 1 -
 usr.bin/fsync/fsync.c                     | 3 ---
 usr.bin/getaddrinfo/getaddrinfo.c         | 1 -
 usr.bin/getconf/getconf.c                 | 1 -
 usr.bin/gprof/arcs.c                      | 3 ---
 usr.bin/gprof/dfn.c                       | 3 ---
 usr.bin/gprof/elf.c                       | 1 -
 usr.bin/gprof/hertz.c                     | 3 ---
 usr.bin/gprof/lookup.c                    | 3 ---
 usr.bin/gprof/printgprof.c                | 3 ---
 usr.bin/gprof/printlist.c                 | 3 ---
 usr.bin/grep/file.c                       | 1 -
 usr.bin/grep/queue.c                      | 1 -
 usr.bin/hexdump/conv.c                    | 1 -
 usr.bin/hexdump/display.c                 | 3 ---
 usr.bin/hexdump/hexsyntax.c               | 3 ---
 usr.bin/hexdump/odsyntax.c                | 3 ---
 usr.bin/hexdump/parse.c                   | 3 ---
 usr.bin/iconv/iconv.c                     | 1 -
 usr.bin/ident/ident.c                     | 1 -
 usr.bin/indent/args.c                     | 3 ---
 usr.bin/indent/indent.c                   | 4 ----
 usr.bin/indent/indent.h                   | 3 ---
 usr.bin/indent/io.c                       | 3 ---
 usr.bin/indent/lexi.c                     | 3 ---
 usr.bin/indent/parse.c                    | 3 ---
 usr.bin/indent/pr_comment.c               | 3 ---
 usr.bin/ipcrm/ipcrm.c                     | 1 -
 usr.bin/ipcs/ipc.c                        | 1 -
 usr.bin/ipcs/ipcs.c                       | 1 -
 usr.bin/kdump/linux.c                     | 1 -
 usr.bin/killall/killall.c                 | 1 -
 usr.bin/ktrace/subr.c                     | 4 ----
 usr.bin/ktrdump/ktrdump.c                 | 1 -
 usr.bin/lastcomm/readrec.c                | 1 -
 usr.bin/ldd/ldd.c                         | 1 -
 usr.bin/localedef/charmap.c               | 2 +-
 usr.bin/localedef/collate.c               | 2 +-
 usr.bin/localedef/localedef.h             | 2 +-
 usr.bin/lockf/lockf.c                     | 1 -
 usr.bin/login/login.c                     | 3 ---
 usr.bin/login/login_audit.c               | 1 -
 usr.bin/login/login_fbtab.c               | 1 -
 usr.bin/lsvfs/lsvfs.c                     | 1 -
 usr.bin/m4/misc.c                         | 1 -
 usr.bin/mail/cmd1.c                       | 3 ---
 usr.bin/mail/cmd2.c                       | 3 ---
 usr.bin/mail/cmd3.c                       | 3 ---
 usr.bin/mail/cmdtab.c                     | 3 ---
 usr.bin/mail/collect.c                    | 3 ---
 usr.bin/mail/edit.c                       | 3 ---
 usr.bin/mail/fio.c                        | 3 ---
 usr.bin/mail/getname.c                    | 3 ---
 usr.bin/mail/head.c                       | 3 ---
 usr.bin/mail/lex.c                        | 3 ---
 usr.bin/mail/list.c                       | 3 ---
 usr.bin/mail/names.c                      | 3 ---
 usr.bin/mail/popen.c                      | 3 ---
 usr.bin/mail/quit.c                       | 3 ---
 usr.bin/mail/send.c                       | 3 ---
 usr.bin/mail/strings.c                    | 3 ---
 usr.bin/mail/temp.c                       | 3 ---
 usr.bin/mail/tty.c                        | 3 ---
 usr.bin/mail/util.c                       | 3 ---
 usr.bin/mail/v7.local.c                   | 3 ---
 usr.bin/mail/vars.c                       | 3 ---
 usr.bin/mail/version.c                    | 3 ---
 usr.bin/ministat/ministat.c               | 1 -
 usr.bin/mkcsmapper/yacc.y                 | 1 -
 usr.bin/mkesdb/yacc.y                     | 1 -
 usr.bin/mkimg/mkimg.c                     | 1 -
 usr.bin/mkuzip/mkuz_conveyor.c            | 1 -
 usr.bin/mkuzip/mkuz_lzma.c                | 1 -
 usr.bin/mkuzip/mkuz_zlib.c                | 1 -
 usr.bin/mkuzip/mkuzip.c                   | 1 -
 usr.bin/netstat/bpf.c                     | 1 -
 usr.bin/netstat/common.c                  | 1 -
 usr.bin/netstat/if.c                      | 4 ----
 usr.bin/netstat/inet.c                    | 4 ----
 usr.bin/netstat/inet6.c                   | 3 ---
 usr.bin/netstat/ipsec.c                   | 4 ----
 usr.bin/netstat/mbuf.c                    | 4 ----
 usr.bin/netstat/netgraph.c                | 1 -
 usr.bin/netstat/nhgrp.c                   | 1 -
 usr.bin/netstat/nhops.c                   | 1 -
 usr.bin/netstat/pfkey.c                   | 4 ----
 usr.bin/netstat/route.c                   | 4 ----
 usr.bin/netstat/route_netlink.c           | 1 -
 usr.bin/netstat/sctp.c                    | 4 ----
 usr.bin/netstat/unix.c                    | 3 ---
 usr.bin/newgrp/newgrp.c                   | 1 -
 usr.bin/newkey/generic.c                  | 3 ---
 usr.bin/newkey/newkey.c                   | 5 +----
 usr.bin/newkey/update.c                   | 5 +----
 usr.bin/passwd/passwd.c                   | 1 -
 usr.bin/pathchk/pathchk.c                 | 1 -
 usr.bin/posixshmcontrol/posixshmcontrol.c | 1 -
 usr.bin/pr/egetopt.c                      | 3 ---
 usr.bin/primes/pattern.c                  | 3 ---
 usr.bin/primes/pr_tbl.c                   | 3 ---
 usr.bin/procstat/procstat.c               | 1 -
 usr.bin/procstat/procstat_args.c          | 1 -
 usr.bin/procstat/procstat_auxv.c          | 1 -
 usr.bin/procstat/procstat_basic.c         | 1 -
 usr.bin/procstat/procstat_bin.c           | 1 -
 usr.bin/procstat/procstat_cred.c          | 1 -
 usr.bin/procstat/procstat_cs.c            | 1 -
 usr.bin/procstat/procstat_files.c         | 1 -
 usr.bin/procstat/procstat_kstack.c        | 1 -
 usr.bin/procstat/procstat_penv.c          | 1 -
 usr.bin/procstat/procstat_ptlwpinfo.c     | 1 -
 usr.bin/procstat/procstat_pwdx.c          | 1 -
 usr.bin/procstat/procstat_rlimit.c        | 1 -
 usr.bin/procstat/procstat_rusage.c        | 1 -
 usr.bin/procstat/procstat_sigs.c          | 1 -
 usr.bin/procstat/procstat_threads.c       | 1 -
 usr.bin/procstat/procstat_vm.c            | 1 -
 usr.bin/quota/quota.c                     | 2 +-
 usr.bin/random/randomize_fd.c             | 1 -
 usr.bin/rctl/rctl.c                       | 1 -
 usr.bin/rpcinfo/rpcinfo.c                 | 3 ---
 usr.bin/sdiff/edit.c                      | 1 -
 usr.bin/sdiff/sdiff.c                     | 1 -
 usr.bin/sockstat/sockstat.c               | 1 -
 usr.bin/soelim/soelim.c                   | 1 -
 usr.bin/sort/coll.c                       | 1 -
 usr.bin/sort/vsort.c                      | 1 -
 usr.bin/systat/pigs.c                     | 3 ---
 usr.bin/systat/sctp.c                     | 1 -
 usr.bin/systat/sysput.c                   | 1 -
 usr.bin/systat/tcp.c                      | 1 -
 usr.bin/systat/zarc.c                     | 1 -
 usr.bin/tabs/tabs.c                       | 1 -
 usr.bin/tail/reverse.c                    | 4 ----
 usr.bin/talk/talk.h                       | 1 -
 usr.bin/tftp/tftp.c                       | 3 ---
 usr.bin/tip/libacu/biz22.c                | 4 ----
 usr.bin/tip/libacu/biz31.c                | 4 ----
 usr.bin/tip/libacu/courier.c              | 4 ----
 usr.bin/tip/libacu/df.c                   | 4 ----
 usr.bin/tip/libacu/dn11.c                 | 4 ----
 usr.bin/tip/libacu/hayes.c                | 4 ----
 usr.bin/tip/libacu/t3000.c                | 4 ----
 usr.bin/tip/libacu/v3451.c                | 4 ----
 usr.bin/tip/libacu/v831.c                 | 4 ----
 usr.bin/tip/libacu/ventel.c               | 4 ----
 usr.bin/tip/tip/acu.c                     | 4 ----
 usr.bin/tip/tip/acutab.c                  | 4 ----
 usr.bin/tip/tip/cmds.c                    | 4 ----
 usr.bin/tip/tip/cmdtab.c                  | 4 ----
 usr.bin/tip/tip/cu.c                      | 4 ----
 usr.bin/tip/tip/hunt.c                    | 4 ----
 usr.bin/tip/tip/log.c                     | 4 ----
 usr.bin/tip/tip/partab.c                  | 4 ----
 usr.bin/tip/tip/tipout.c                  | 4 ----
 usr.bin/tip/tip/uucplock.c                | 4 ----
 usr.bin/tip/tip/value.c                   | 4 ----
 usr.bin/tip/tip/vars.c                    | 4 ----
 usr.bin/unifdef/tests/unifdef_test.sh     | 3 +--
 usr.bin/users/users.cc                    | 1 -
 usr.bin/vtfontcvt/vtfontcvt.c             | 1 -
 usr.bin/w/proc_compare.c                  | 4 ----
 usr.bin/who/who.c                         | 1 -
 usr.bin/ypwhich/ypwhich.c                 | 1 -
 207 files changed, 7 insertions(+), 476 deletions(-)

diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index edeb9c60679a..727351c8ff87 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 245748528a53..c270330281a8 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 2c908efdc227..e99af06c428a 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 9836b8ee96f4..a4813253b23e 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 9040aab4e7f0..688321d170bc 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 c15c3037d8a0..64dc6cba0dcf 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 f5876396cb2c..8309237990f1 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 55607f72a3c5..978a3eb1a63f 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 80dcdfacea7f..b64f33e06fdb 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 2d9a449578bc..53ed54e825af 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 369eaba16acc..9e3b3f7903c7 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 6c91e9f2cb5d..1a49e1526874 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 646704dcea47..2eb3e1b7d190 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 b86e174a10e9..345b36b64c44 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 da710cb2e90a..6174bae00adf 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 26572076943f..ae74226e5266 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 550273cb471a..33b0fa46458c 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 35922deee42d..78b431b6f6a9 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 38d1110dbd3a..0b78b83968c7 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 5ca1e64f3e09..f29d3b454f64 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 dd645396948d..59aa7eb3d2d9 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 ba0ef146058b..283a08ec555d 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 8c355cecd3ca..55d8d824f568 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 e6e22fb71cfb..e219fcee4634 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 ea8a603a040a..e1b0957104c0 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 3e654c3d909b..e8250bcbcf67 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 8044e4a2df60..502fbc98b714 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 8aed0f52e350..3a2f9b7a0939 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 447b48fe79ed..348741f8ccca 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 78638ea2428c..c72ea0747589 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 e5d5bccc414e..49704cde1b08 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 32f8972b238a..b985163476c4 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 8be5742386e7..05c0211ead49 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 6b9696ea71df..54b4fdd679e4 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 03e49fc62b64..43aa2301439c 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 a61d9cb7dbcd..86434f53e9fd 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 01c9f9145fa2..7963e3baa4d3 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 f65b800c32a6..3b4936fe055b 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 4af5af94e329..166fc75e9c51 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 11491e5a7c8e..6d5e828eb274 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 59356cd09e1f..e2f1eb99d623 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 1d65b23ae073..d8649a1f57f6 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 621f3455e82e..183e46290013 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 c3374ecfffac..328e35e9138f 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 16d5a176da93..9968bc8614a5 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 f01ccd7b2e10..da84259a3c2e 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 a4434c31fd36..ed69d5f0454b 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 fe032e68a516..5e8ba06402a3 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 081a245c544c..b0bafc18fb52 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 f46bc07524f5..a237e1dd4c02 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 9717b1b6253b..2d1b6edca52a 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 00445ea86a45..1d53744f59cc 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 92e48a89b497..07791bf2d154 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 a5d33fc1e0c6..a248aa9f3226 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 3349b72842ca..0b8240504ce6 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 6c4815992d0f..296e19fb0f6d 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>
 
*** 2023 LINES SKIPPED ***