git: 32e86a82f548 - main - sbin: Automated cleanup of cdefs and other formatting
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 27 Nov 2023 05:25:01 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=32e86a82f54826f14ea381affa6674db3aa3b5ae
commit 32e86a82f54826f14ea381affa6674db3aa3b5ae
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
sbin: 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
---
sbin/bectl/bectl.c | 1 -
sbin/bectl/bectl_jail.c | 1 -
sbin/bectl/bectl_list.c | 1 -
sbin/camcontrol/depop.c | 1 -
sbin/camcontrol/fwdownload.c | 1 -
sbin/camcontrol/timestamp.c | 1 -
sbin/ccdconfig/ccdconfig.c | 1 -
sbin/conscontrol/conscontrol.c | 1 -
sbin/ddb/ddb_capture.c | 1 -
sbin/ddb/ddb_script.c | 1 -
sbin/decryptcore/decryptcore.c | 1 -
sbin/devd/devd.cc | 1 -
sbin/devfs/devfs.c | 1 -
sbin/devfs/rule.c | 1 -
sbin/devmatch/devmatch.c | 1 -
sbin/dump/dumprmt.c | 3 ---
sbin/dump/itime.c | 3 ---
sbin/dump/optr.c | 3 ---
sbin/dump/tape.c | 3 ---
sbin/dump/traverse.c | 3 ---
sbin/dump/unctime.c | 3 ---
sbin/fdisk/fdisk_mbr_enc.c | 1 -
sbin/fsck/fsck.c | 1 -
sbin/fsck_ffs/dir.c | 3 ---
sbin/fsck_ffs/ea.c | 1 -
sbin/fsck_ffs/fsutil.c | 3 ---
sbin/fsck_ffs/inode.c | 3 ---
sbin/fsck_ffs/pass1.c | 3 ---
sbin/fsck_ffs/pass1b.c | 3 ---
sbin/fsck_ffs/pass2.c | 3 ---
sbin/fsck_ffs/pass3.c | 3 ---
sbin/fsck_ffs/pass4.c | 3 ---
sbin/fsck_ffs/pass5.c | 3 ---
sbin/fsck_ffs/setup.c | 3 ---
sbin/fsck_ffs/suj.c | 1 -
sbin/fsck_ffs/utilities.c | 3 ---
sbin/geom/core/geom.c | 1 -
sbin/geom/misc/subr.c | 1 -
sbin/hastctl/hastctl.c | 1 -
sbin/hastd/activemap.c | 1 -
sbin/hastd/control.c | 1 -
sbin/hastd/ebuf.c | 1 -
sbin/hastd/hastd.c | 1 -
sbin/hastd/hooks.c | 1 -
sbin/hastd/nv.c | 1 -
sbin/hastd/pjdlog.c | 1 -
sbin/hastd/primary.c | 1 -
sbin/hastd/proto.c | 1 -
sbin/hastd/proto_common.c | 1 -
sbin/hastd/proto_socketpair.c | 1 -
sbin/hastd/proto_tcp.c | 1 -
sbin/hastd/secondary.c | 1 -
sbin/hastd/subr.c | 1 -
sbin/ifconfig/ifgre.c | 1 -
sbin/ifconfig/ifipsec.c | 1 -
sbin/ifconfig/ifvxlan.c | 1 -
sbin/ipfw/nat64clat.c | 1 -
sbin/ipfw/nat64lsn.c | 1 -
sbin/ipfw/nat64stl.c | 1 -
sbin/ipfw/nptv6.c | 1 -
sbin/kldconfig/kldconfig.c | 1 -
sbin/kldload/kldload.c | 1 -
sbin/kldstat/kldstat.c | 1 -
sbin/kldunload/kldunload.c | 1 -
sbin/md5/md5.c | 1 -
sbin/mdmfs/mdmfs.c | 1 -
sbin/mount/getmntopts.c | 3 ---
sbin/mount/vfslist.c | 3 ---
sbin/mount_fusefs/mount_fusefs.c | 1 -
sbin/newfs/mkfs.c | 3 ---
sbin/nvmecontrol/comnd.c | 1 -
sbin/nvmecontrol/devlist.c | 1 -
sbin/nvmecontrol/firmware.c | 1 -
sbin/nvmecontrol/format.c | 1 -
sbin/nvmecontrol/identify.c | 1 -
sbin/nvmecontrol/identify_ext.c | 1 -
sbin/nvmecontrol/logpage.c | 1 -
sbin/nvmecontrol/modules/intel/intel.c | 1 -
sbin/nvmecontrol/modules/samsung/samsung.c | 1 -
sbin/nvmecontrol/modules/wdc/wdc.c | 1 -
sbin/nvmecontrol/ns.c | 1 -
sbin/nvmecontrol/nsid.c | 1 -
sbin/nvmecontrol/nvmecontrol.c | 1 -
sbin/nvmecontrol/passthru.c | 1 -
sbin/nvmecontrol/perftest.c | 1 -
sbin/nvmecontrol/power.c | 1 -
sbin/nvmecontrol/reset.c | 1 -
sbin/nvmecontrol/resv.c | 1 -
sbin/nvmecontrol/sanitize.c | 1 -
sbin/nvmecontrol/selftest.c | 1 -
sbin/pfctl/pf_print_state.c | 1 -
sbin/pfctl/pf_ruleset.c | 1 -
sbin/pfctl/pfctl_optimize.c | 1 -
sbin/pfctl/pfctl_osfp.c | 1 -
sbin/pfctl/pfctl_parser.c | 1 -
sbin/pfctl/pfctl_radix.c | 1 -
sbin/pfctl/pfctl_table.c | 1 -
sbin/pfctl/tests/pfctl_test.c | 2 +-
sbin/pfilctl/pfilctl.c | 1 -
sbin/ping/main.c | 1 -
sbin/ping/tests/in_cksum_test.c | 1 -
sbin/restore/dirs.c | 3 ---
sbin/restore/interactive.c | 4 ----
sbin/restore/restore.c | 4 ----
sbin/restore/symtab.c | 3 ---
sbin/restore/tape.c | 4 ----
sbin/restore/utilities.c | 3 ---
sbin/routed/rtquery/rtquery.c | 1 -
sbin/savecore/savecore.c | 1 -
sbin/sysctl/sysctl.c | 1 -
sbin/zfsbootcfg/zfsbootcfg.c | 1 -
111 files changed, 1 insertion(+), 166 deletions(-)
diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c
index 05ed8d6be5bd..e398e055a3b2 100644
--- a/sbin/bectl/bectl.c
+++ b/sbin/bectl/bectl.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/mount.h>
#include <errno.h>
diff --git a/sbin/bectl/bectl_jail.c b/sbin/bectl/bectl_jail.c
index ae48202163de..fa063962dada 100644
--- a/sbin/bectl/bectl_jail.c
+++ b/sbin/bectl/bectl_jail.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/mount.h>
diff --git a/sbin/bectl/bectl_list.c b/sbin/bectl/bectl_list.c
index 0fcb5deb37f3..c158aa9b1600 100644
--- a/sbin/bectl/bectl_list.c
+++ b/sbin/bectl/bectl_list.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/sbin/camcontrol/depop.c b/sbin/camcontrol/depop.c
index 3be67650cdae..4aff0284abe1 100644
--- a/sbin/camcontrol/depop.c
+++ b/sbin/camcontrol/depop.c
@@ -50,7 +50,6 @@
* 'depop' provides a wrapper around all these functions.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <err.h>
diff --git a/sbin/camcontrol/fwdownload.c b/sbin/camcontrol/fwdownload.c
index 25b98c804e3e..2ab18c93392b 100644
--- a/sbin/camcontrol/fwdownload.c
+++ b/sbin/camcontrol/fwdownload.c
@@ -49,7 +49,6 @@
* specified device.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/sbin/camcontrol/timestamp.c b/sbin/camcontrol/timestamp.c
index 403c126c95d9..3130dec188dc 100644
--- a/sbin/camcontrol/timestamp.c
+++ b/sbin/camcontrol/timestamp.c
@@ -35,7 +35,6 @@
* SCSI tape drive timestamp support
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <assert.h>
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index fd62c459a78f..6b8086ef0213 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -32,7 +32,6 @@
* NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c
index b8890cf22030..9c7ec9175910 100644
--- a/sbin/conscontrol/conscontrol.c
+++ b/sbin/conscontrol/conscontrol.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/ioctl.h>
diff --git a/sbin/ddb/ddb_capture.c b/sbin/ddb/ddb_capture.c
index fcff16e292ea..ab8b2c1ed0bb 100644
--- a/sbin/ddb/ddb_capture.c
+++ b/sbin/ddb/ddb_capture.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/sbin/ddb/ddb_script.c b/sbin/ddb/ddb_script.c
index c40b8b96b21f..76724df8d772 100644
--- a/sbin/ddb/ddb_script.c
+++ b/sbin/ddb/ddb_script.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/sbin/decryptcore/decryptcore.c b/sbin/decryptcore/decryptcore.c
index adeccfac8d47..1e7cf4070e51 100644
--- a/sbin/decryptcore/decryptcore.c
+++ b/sbin/decryptcore/decryptcore.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/endian.h>
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index 05715c18708f..8d621e42a232 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -63,7 +63,6 @@
// - devd needs to document the unix domain socket
// - devd.conf needs more details on the supported statements.
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index 72feed7fb857..ae8954e9d88b 100644
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
@@ -30,7 +30,6 @@
* DEVFS control.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c
index b9b493ae3742..d07104d1de13 100644
--- a/sbin/devfs/rule.c
+++ b/sbin/devfs/rule.c
@@ -30,7 +30,6 @@
* Rule subsystem manipulation.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/ioctl.h>
diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c
index 2485120c57b6..d93a35e5633d 100644
--- a/sbin/devmatch/devmatch.c
+++ b/sbin/devmatch/devmatch.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <ctype.h>
#include <devinfo.h>
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index ef75be6f2a1f..4f61905eb60e 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mtio.h>
#include <sys/socket.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index adeaa044ff4f..ba6ccaf47f04 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 15d34020b24c..f263f48374ae 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/wait.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index dd3a7672586d..e448bacf61b6 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/wait.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index c166b6a1af24..ccc2d0a625e9 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index 86ce682642b5..82ee12597c05 100644
--- a/sbin/dump/unctime.c
+++ b/sbin/dump/unctime.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
#include <time.h>
/*
diff --git a/sbin/fdisk/fdisk_mbr_enc.c b/sbin/fdisk/fdisk_mbr_enc.c
index 6fe99bbba1b3..d621124c7a85 100644
--- a/sbin/fdisk/fdisk_mbr_enc.c
+++ b/sbin/fdisk/fdisk_mbr_enc.c
@@ -33,7 +33,6 @@
* NB! This file must be usable both in kernel and userland.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/diskmbr.h>
#include <sys/endian.h>
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 6bef9a31b8f5..4c24cc9813e1 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -34,7 +34,6 @@
* $NetBSD: fsck.c,v 1.30 2003/08/07 10:04:15 agc Exp $
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/queue.h>
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index 597cb1996401..cc63aadae04c 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c
index 8e5e8ebe8aa0..f6ebc5c072fc 100644
--- a/sbin/fsck_ffs/ea.c
+++ b/sbin/fsck_ffs/ea.c
@@ -35,7 +35,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/stdint.h>
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 7e9a2c4661ef..aa536fb5dd4e 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index 8b154d972dd3..5b004cd29c90 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/stdint.h>
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 99da2db3bc6b..f4f97a38097b 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index fe6acd4c27db..3fb9cab89078 100644
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index d92bf22c4394..1755a1295a9e 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index ac0b61437ccb..853f5d62382f 100644
--- a/sbin/fsck_ffs/pass3.c
+++ b/sbin/fsck_ffs/pass3.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index bddd7ca9a94f..a261051c432a 100644
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index efe36ca42cb4..528a6956c4a1 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 71088ee13849..f10f02d159c3 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/stat.h>
diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c
index e1fd54229d69..73be60c5e5b4 100644
--- a/sbin/fsck_ffs/suj.c
+++ b/sbin/fsck_ffs/suj.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index e5ec06cb101e..56655089b9d6 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index ccaf7adca305..950f6790b1a8 100644
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/sbin/geom/misc/subr.c b/sbin/geom/misc/subr.c
index 2d3db86c943f..18bac7108ed0 100644
--- a/sbin/geom/misc/subr.c
+++ b/sbin/geom/misc/subr.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/endian.h>
diff --git a/sbin/hastctl/hastctl.c b/sbin/hastctl/hastctl.c
index ab2d618c698c..224adce2810e 100644
--- a/sbin/hastctl/hastctl.c
+++ b/sbin/hastctl/hastctl.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <err.h>
diff --git a/sbin/hastd/activemap.c b/sbin/hastd/activemap.c
index f5e3c60fd0a0..42f3d03b5482 100644
--- a/sbin/hastd/activemap.c
+++ b/sbin/hastd/activemap.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h> /* powerof2() */
#include <sys/queue.h>
diff --git a/sbin/hastd/control.c b/sbin/hastd/control.c
index f6f937d3b180..13a0c5e0af30 100644
--- a/sbin/hastd/control.c
+++ b/sbin/hastd/control.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/sbin/hastd/ebuf.c b/sbin/hastd/ebuf.c
index 522e4e821b11..fdb5c442bfa5 100644
--- a/sbin/hastd/ebuf.c
+++ b/sbin/hastd/ebuf.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <errno.h>
diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c
index f303f277e0ad..c62b85fd1925 100644
--- a/sbin/hastd/hastd.c
+++ b/sbin/hastd/hastd.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/sbin/hastd/hooks.c b/sbin/hastd/hooks.c
index 7a5ccb4e22e6..43ba6f06851a 100644
--- a/sbin/hastd/hooks.c
+++ b/sbin/hastd/hooks.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/wait.h>
diff --git a/sbin/hastd/nv.c b/sbin/hastd/nv.c
index 5f50ae349023..47499ce27294 100644
--- a/sbin/hastd/nv.c
+++ b/sbin/hastd/nv.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/sbin/hastd/pjdlog.c b/sbin/hastd/pjdlog.c
index 6726cab47697..3dbbe163812e 100644
--- a/sbin/hastd/pjdlog.c
+++ b/sbin/hastd/pjdlog.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c
index 76c454d14a74..5d166a088b9b 100644
--- a/sbin/hastd/primary.c
+++ b/sbin/hastd/primary.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/bio.h>
diff --git a/sbin/hastd/proto.c b/sbin/hastd/proto.c
index 56ff4933c9b8..93c9a064215d 100644
--- a/sbin/hastd/proto.c
+++ b/sbin/hastd/proto.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/sbin/hastd/proto_common.c b/sbin/hastd/proto_common.c
index 143b7666b7ca..39ef696f5b69 100644
--- a/sbin/hastd/proto_common.c
+++ b/sbin/hastd/proto_common.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/hastd/proto_socketpair.c b/sbin/hastd/proto_socketpair.c
index ab30a6a27263..2d3d61693e1b 100644
--- a/sbin/hastd/proto_socketpair.c
+++ b/sbin/hastd/proto_socketpair.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/hastd/proto_tcp.c b/sbin/hastd/proto_tcp.c
index dc5a23da7b23..aeec887433f8 100644
--- a/sbin/hastd/proto_tcp.c
+++ b/sbin/hastd/proto_tcp.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h> /* MAXHOSTNAMELEN */
#include <sys/socket.h>
diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c
index bf118d7e1237..6bf889bba657 100644
--- a/sbin/hastd/secondary.c
+++ b/sbin/hastd/secondary.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/bio.h>
diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c
index 27641a6f8acb..2a26482b3727 100644
--- a/sbin/hastd/subr.c
+++ b/sbin/hastd/subr.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/ioctl.h>
diff --git a/sbin/ifconfig/ifgre.c b/sbin/ifconfig/ifgre.c
index dda04e363bfc..3eeed8f3d200 100644
--- a/sbin/ifconfig/ifgre.c
+++ b/sbin/ifconfig/ifgre.c
@@ -25,7 +25,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/ifconfig/ifipsec.c b/sbin/ifconfig/ifipsec.c
index 6fd1f9f630f4..b8ab38d6165a 100644
--- a/sbin/ifconfig/ifipsec.c
+++ b/sbin/ifconfig/ifipsec.c
@@ -25,7 +25,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/ifconfig/ifvxlan.c b/sbin/ifconfig/ifvxlan.c
index e4871da645fd..cbea685b6ba0 100644
--- a/sbin/ifconfig/ifvxlan.c
+++ b/sbin/ifconfig/ifvxlan.c
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/ipfw/nat64clat.c b/sbin/ipfw/nat64clat.c
index e8b767a0c801..63fa7dae14e2 100644
--- a/sbin/ipfw/nat64clat.c
+++ b/sbin/ipfw/nat64clat.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/ipfw/nat64lsn.c b/sbin/ipfw/nat64lsn.c
index f50ea3661236..0a3e0415d459 100644
--- a/sbin/ipfw/nat64lsn.c
+++ b/sbin/ipfw/nat64lsn.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/ipfw/nat64stl.c b/sbin/ipfw/nat64stl.c
index d8dd239e7daa..b6c970001f5c 100644
--- a/sbin/ipfw/nat64stl.c
+++ b/sbin/ipfw/nat64stl.c
@@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/ipfw/nptv6.c b/sbin/ipfw/nptv6.c
index fc9ce638b8af..83bf4c768fd9 100644
--- a/sbin/ipfw/nptv6.c
+++ b/sbin/ipfw/nptv6.c
@@ -25,7 +25,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c
index 27956a961ccf..570ca5cbf713 100644
--- a/sbin/kldconfig/kldconfig.c
+++ b/sbin/kldconfig/kldconfig.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index c573a253c7c3..82469a2d40f3 100644
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index 60d12e0327ab..79c647576440 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/module.h>
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index ebdc17ce414f..69739d0f4afe 100644
--- a/sbin/kldunload/kldunload.c
+++ b/sbin/kldunload/kldunload.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index 15fd7ebec5d4..abaadb12f3ee 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -17,7 +17,6 @@
* documentation and/or software.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/resource.h>
#include <sys/stat.h>
diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c
index dbd206f953d2..93fa9e8ff0c0 100644
--- a/sbin/mdmfs/mdmfs.c
+++ b/sbin/mdmfs/mdmfs.c
@@ -32,7 +32,6 @@
* the deprecated mount_mfs(8).
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/mdioctl.h>
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index 331584d885cb..0912b1e1a306 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/stat.h>
diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c
index 6648866234b0..ea6086651483 100644
--- a/sbin/mount/vfslist.c
+++ b/sbin/mount/vfslist.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
*** 541 LINES SKIPPED ***