git: e043f37205ff - main - bin: Automated cleanup of cdefs and other formatting

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

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

commit e043f37205ffbde5627ff299ad25cd532f2956f0
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:23:59 +0000

    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
---
 bin/cat/cat.c           | 1 -
 bin/cp/utils.c          | 3 ---
 bin/date/date.c         | 1 -
 bin/dd/args.c           | 3 ---
 bin/dd/conv.c           | 3 ---
 bin/dd/conv_tab.c       | 3 ---
 bin/dd/misc.c           | 3 ---
 bin/dd/position.c       | 3 ---
 bin/ed/glbl.c           | 1 -
 bin/getfacl/getfacl.c   | 2 --
 bin/kenv/kenv.c         | 1 -
 bin/ls/cmp.c            | 3 ---
 bin/ls/print.c          | 3 ---
 bin/ls/util.c           | 3 ---
 bin/pax/ar_io.c         | 3 ---
 bin/pax/ar_subs.c       | 3 ---
 bin/pax/buf_subs.c      | 3 ---
 bin/pax/cache.c         | 3 ---
 bin/pax/cpio.c          | 3 ---
 bin/pax/file_subs.c     | 3 ---
 bin/pax/ftree.c         | 3 ---
 bin/pax/gen_subs.c      | 3 ---
 bin/pax/getoldopt.c     | 1 -
 bin/pax/options.c       | 4 ----
 bin/pax/pat_rep.c       | 3 ---
 bin/pax/sel_subs.c      | 3 ---
 bin/pax/tables.c        | 3 ---
 bin/pax/tar.c           | 3 ---
 bin/pax/tty_subs.c      | 3 ---
 bin/pkill/pkill.c       | 1 -
 bin/ps/fmt.c            | 4 ----
 bin/ps/keyword.c        | 3 ---
 bin/ps/nlist.c          | 4 ----
 bin/ps/print.c          | 4 ----
 bin/pwait/pwait.c       | 1 -
 bin/realpath/realpath.c | 1 -
 bin/setfacl/file.c      | 1 -
 bin/setfacl/mask.c      | 1 -
 bin/setfacl/merge.c     | 1 -
 bin/setfacl/remove.c    | 1 -
 bin/setfacl/setfacl.c   | 1 -
 bin/sh/alias.c          | 3 ---
 bin/sh/cd.c             | 3 ---
 bin/sh/error.c          | 3 ---
 bin/sh/eval.c           | 3 ---
 bin/sh/exec.c           | 3 ---
 bin/sh/expand.c         | 3 ---
 bin/sh/histedit.c       | 3 ---
 bin/sh/input.c          | 3 ---
 bin/sh/jobs.c           | 3 ---
 bin/sh/mail.c           | 3 ---
 bin/sh/memalloc.c       | 3 ---
 bin/sh/miscbltin.c      | 3 ---
 bin/sh/mystring.c       | 3 ---
 bin/sh/options.c        | 3 ---
 bin/sh/output.c         | 3 ---
 bin/sh/parser.c         | 3 ---
 bin/sh/redir.c          | 3 ---
 bin/sh/show.c           | 3 ---
 bin/sh/trap.c           | 3 ---
 bin/sh/var.c            | 3 ---
 bin/stty/cchar.c        | 3 ---
 bin/stty/gfmt.c         | 3 ---
 bin/stty/key.c          | 3 ---
 bin/stty/modes.c        | 3 ---
 bin/stty/print.c        | 3 ---
 bin/stty/util.c         | 3 ---
 bin/test/test.c         | 1 -
 bin/uuidgen/uuidgen.c   | 1 -
 69 files changed, 180 deletions(-)

diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 852617010ce2..c3812c6d9ca4 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/capsicum.h>
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 107e6638e453..2e1a50635a15 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/acl.h>
 #include <sys/stat.h>
diff --git a/bin/date/date.c b/bin/date/date.c
index 9f6a2336de97..0ff3b9f74cbd 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/bin/dd/args.c b/bin/dd/args.c
index c16b37528f94..10bb89e632b0 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <ctype.h>
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index 2ac1e1229976..d64d57040fca 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <err.h>
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index 7f256e8fd032..feba45826e03 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <signal.h>
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index c9c99a13280f..05c19b5b2073 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/bin/dd/position.c b/bin/dd/position.c
index 07a46e4a53fb..c092b5c5f8db 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/mtio.h>
 
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index 94967f8389aa..d0a1d570ee16 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c
index 25d0731559c6..3ac9e61555de 100644
--- a/bin/getfacl/getfacl.c
+++ b/bin/getfacl/getfacl.c
@@ -30,8 +30,6 @@
  * and send the results to stdout
  */
 
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/acl.h>
diff --git a/bin/kenv/kenv.c b/bin/kenv/kenv.c
index 6d414ec892d1..fe7ec4236bfb 100644
--- a/bin/kenv/kenv.c
+++ b/bin/kenv/kenv.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <err.h>
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index cc8263f227c2..4c60506f3456 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/bin/ls/print.c b/bin/ls/print.c
index 75917d60002b..979ad0ffc43e 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/acl.h>
diff --git a/bin/ls/util.c b/bin/ls/util.c
index b10169b2d321..40610faa5fae 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 440098d20fcf..c595870aaa5e 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 37505c9573f9..8f8a5b842626 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 8ee498f2f821..7f9b31881d56 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 363e5454b6b2..d15c9c223447 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index f036fa42442a..8ae40f461343 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 32fecc84bcd4..7c68e643f04c 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index dc14613365df..400eb2faad30 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 4497b9d95a6d..a92303f63106 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c
index 98e03aef7e60..6b0e83c23a24 100644
--- a/bin/pax/getoldopt.c
+++ b/bin/pax/getoldopt.c
@@ -10,7 +10,6 @@
  * in the Public Domain for your edification and enjoyment.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 58c5758053a6..3567820acced 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -33,10 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mtio.h>
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 832ffb995cde..0c416741f5d8 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 4c19e898f152..ccbb77ccbb5c 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index ba1ab3989ff8..e1e7b7d6d43e 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index 10e0c33a7e8d..50a9a41623ca 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index 139f1c9965c7..73424e12389a 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c
index 3be7bccd14cc..4b894a986062 100644
--- a/bin/pkill/pkill.c
+++ b/bin/pkill/pkill.c
@@ -32,7 +32,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index 34f50fb377d2..87e2e0f49a34 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index a1d8516d5e98..82c08d3e75f1 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index bed7dcca3215..8c6a4814e4d5 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 9f48f98c3c43..fc6f7ab25428 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -29,10 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/bin/pwait/pwait.c b/bin/pwait/pwait.c
index c3adb2a8b741..0fae22562607 100644
--- a/bin/pwait/pwait.c
+++ b/bin/pwait/pwait.c
@@ -31,7 +31,6 @@
  * OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
diff --git a/bin/realpath/realpath.c b/bin/realpath/realpath.c
index 61263e508f5b..9ee7f3126003 100644
--- a/bin/realpath/realpath.c
+++ b/bin/realpath/realpath.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <err.h>
diff --git a/bin/setfacl/file.c b/bin/setfacl/file.c
index aee3c76b6c33..24ef3869cf4c 100644
--- a/bin/setfacl/file.c
+++ b/bin/setfacl/file.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/acl.h>
 
diff --git a/bin/setfacl/mask.c b/bin/setfacl/mask.c
index 09a97fdc466c..5154b17fb5bc 100644
--- a/bin/setfacl/mask.c
+++ b/bin/setfacl/mask.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/acl.h>
 #include <sys/stat.h>
diff --git a/bin/setfacl/merge.c b/bin/setfacl/merge.c
index 981997c51ddd..d77a52ed2f25 100644
--- a/bin/setfacl/merge.c
+++ b/bin/setfacl/merge.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/acl.h>
 #include <sys/stat.h>
diff --git a/bin/setfacl/remove.c b/bin/setfacl/remove.c
index 78b3d09e4404..5bfab9c2ec9d 100644
--- a/bin/setfacl/remove.c
+++ b/bin/setfacl/remove.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/acl.h>
 #include <sys/stat.h>
diff --git a/bin/setfacl/setfacl.c b/bin/setfacl/setfacl.c
index 2cb27b5796d0..02f10944f169 100644
--- a/bin/setfacl/setfacl.c
+++ b/bin/setfacl/setfacl.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/acl.h>
 #include <sys/queue.h>
diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index 239b85f977bc..a02554d66e24 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <stdlib.h>
 #include "shell.h"
 #include "output.h"
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index 4c8b4c49ac0f..b908c4320c04 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
diff --git a/bin/sh/error.c b/bin/sh/error.c
index 8f129509b8bc..fcc2f309ccbc 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 /*
  * Errors and exceptions.
  */
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index a92adc348c2a..7caf1972a39d 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <paths.h>
 #include <signal.h>
 #include <stdlib.h>
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index b05dff807266..f7788d0758e3 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 4403fa8205e7..dfafe35fbaca 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -34,9 +34,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index d2ad33356883..5aea58650c67 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <dirent.h>
diff --git a/bin/sh/input.c b/bin/sh/input.c
index 859f2a650fdc..26f233ebf7b6 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <stdio.h>	/* defines BUFSIZ */
 #include <fcntl.h>
 #include <errno.h>
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index 45f3f66bc7eb..90b5892f72b7 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/resource.h>
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index c5abc9bc3d8e..97ea41d8da67 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 /*
  * Routines to check for mail.  (Perhaps make part of main.c?)
  */
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index ee4dff26fac4..7850bb147b01 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include "shell.h"
 #include "output.h"
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index e0e332845221..6364bd10a584 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 /*
  * Miscellaneous builtins.
  */
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 3d4f5d145446..9ac590d39f64 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 /*
  * String functions.
  *
diff --git a/bin/sh/options.c b/bin/sh/options.c
index c00d82a136ae..2dab8f4ea998 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/bin/sh/output.c b/bin/sh/output.c
index 33d5af4be915..baf4b8b7cc17 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 /*
  * Shell output routines.  We use our own output routines because:
  *	When a builtin command is interrupted we have to discard
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index aa181e567bb1..0c1b7a91c257 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <pwd.h>
 #include <stdlib.h>
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index 66196dc110b9..eb0fc618a73e 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
diff --git a/bin/sh/show.c b/bin/sh/show.c
index 0b772dd18eab..1ccd4583d3a9 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index 0b95278eaf68..2863026a4794 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 262e3e5b1066..2f9820a91bdd 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <paths.h>
diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index c43985cd1054..4a65d1b518d5 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -27,9 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index d42496a4a440..fbd21382dd82 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -27,9 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/bin/stty/key.c b/bin/stty/key.c
index cdf3e308fede..6e8f635ac237 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -27,9 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index db0d7b16cda8..d63b958680de 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -27,9 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <string.h>
 #include "stty.h"
diff --git a/bin/stty/print.c b/bin/stty/print.c
index 7e305e94907c..d7ab2abbcf14 100644
*** 50 LINES SKIPPED ***