aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2023-11-24 20:12:57 +0000
committerWarner Losh <imp@FreeBSD.org>2023-11-27 05:23:59 +0000
commit32e86a82f54826f14ea381affa6674db3aa3b5ae (patch)
treea101eaa8ce067e6f1f7290d8e2cfc41af62511b1
parenta6fe717c2a876105123214c05176cd74106fb94b (diff)
-rw-r--r--sbin/bectl/bectl.c1
-rw-r--r--sbin/bectl/bectl_jail.c1
-rw-r--r--sbin/bectl/bectl_list.c1
-rw-r--r--sbin/camcontrol/depop.c1
-rw-r--r--sbin/camcontrol/fwdownload.c1
-rw-r--r--sbin/camcontrol/timestamp.c1
-rw-r--r--sbin/ccdconfig/ccdconfig.c1
-rw-r--r--sbin/conscontrol/conscontrol.c1
-rw-r--r--sbin/ddb/ddb_capture.c1
-rw-r--r--sbin/ddb/ddb_script.c1
-rw-r--r--sbin/decryptcore/decryptcore.c1
-rw-r--r--sbin/devd/devd.cc1
-rw-r--r--sbin/devfs/devfs.c1
-rw-r--r--sbin/devfs/rule.c1
-rw-r--r--sbin/devmatch/devmatch.c1
-rw-r--r--sbin/dump/dumprmt.c3
-rw-r--r--sbin/dump/itime.c3
-rw-r--r--sbin/dump/optr.c3
-rw-r--r--sbin/dump/tape.c3
-rw-r--r--sbin/dump/traverse.c3
-rw-r--r--sbin/dump/unctime.c3
-rw-r--r--sbin/fdisk/fdisk_mbr_enc.c1
-rw-r--r--sbin/fsck/fsck.c1
-rw-r--r--sbin/fsck_ffs/dir.c3
-rw-r--r--sbin/fsck_ffs/ea.c1
-rw-r--r--sbin/fsck_ffs/fsutil.c3
-rw-r--r--sbin/fsck_ffs/inode.c3
-rw-r--r--sbin/fsck_ffs/pass1.c3
-rw-r--r--sbin/fsck_ffs/pass1b.c3
-rw-r--r--sbin/fsck_ffs/pass2.c3
-rw-r--r--sbin/fsck_ffs/pass3.c3
-rw-r--r--sbin/fsck_ffs/pass4.c3
-rw-r--r--sbin/fsck_ffs/pass5.c3
-rw-r--r--sbin/fsck_ffs/setup.c3
-rw-r--r--sbin/fsck_ffs/suj.c1
-rw-r--r--sbin/fsck_ffs/utilities.c3
-rw-r--r--sbin/geom/core/geom.c1
-rw-r--r--sbin/geom/misc/subr.c1
-rw-r--r--sbin/hastctl/hastctl.c1
-rw-r--r--sbin/hastd/activemap.c1
-rw-r--r--sbin/hastd/control.c1
-rw-r--r--sbin/hastd/ebuf.c1
-rw-r--r--sbin/hastd/hastd.c1
-rw-r--r--sbin/hastd/hooks.c1
-rw-r--r--sbin/hastd/nv.c1
-rw-r--r--sbin/hastd/pjdlog.c1
-rw-r--r--sbin/hastd/primary.c1
-rw-r--r--sbin/hastd/proto.c1
-rw-r--r--sbin/hastd/proto_common.c1
-rw-r--r--sbin/hastd/proto_socketpair.c1
-rw-r--r--sbin/hastd/proto_tcp.c1
-rw-r--r--sbin/hastd/secondary.c1
-rw-r--r--sbin/hastd/subr.c1
-rw-r--r--sbin/ifconfig/ifgre.c1
-rw-r--r--sbin/ifconfig/ifipsec.c1
-rw-r--r--sbin/ifconfig/ifvxlan.c1
-rw-r--r--sbin/ipfw/nat64clat.c1
-rw-r--r--sbin/ipfw/nat64lsn.c1
-rw-r--r--sbin/ipfw/nat64stl.c1
-rw-r--r--sbin/ipfw/nptv6.c1
-rw-r--r--sbin/kldconfig/kldconfig.c1
-rw-r--r--sbin/kldload/kldload.c1
-rw-r--r--sbin/kldstat/kldstat.c1
-rw-r--r--sbin/kldunload/kldunload.c1
-rw-r--r--sbin/md5/md5.c1
-rw-r--r--sbin/mdmfs/mdmfs.c1
-rw-r--r--sbin/mount/getmntopts.c3
-rw-r--r--sbin/mount/vfslist.c3
-rw-r--r--sbin/mount_fusefs/mount_fusefs.c1
-rw-r--r--sbin/newfs/mkfs.c3
-rw-r--r--sbin/nvmecontrol/comnd.c1
-rw-r--r--sbin/nvmecontrol/devlist.c1
-rw-r--r--sbin/nvmecontrol/firmware.c1
-rw-r--r--sbin/nvmecontrol/format.c1
-rw-r--r--sbin/nvmecontrol/identify.c1
-rw-r--r--sbin/nvmecontrol/identify_ext.c1
-rw-r--r--sbin/nvmecontrol/logpage.c1
-rw-r--r--sbin/nvmecontrol/modules/intel/intel.c1
-rw-r--r--sbin/nvmecontrol/modules/samsung/samsung.c1
-rw-r--r--sbin/nvmecontrol/modules/wdc/wdc.c1
-rw-r--r--sbin/nvmecontrol/ns.c1
-rw-r--r--sbin/nvmecontrol/nsid.c1
-rw-r--r--sbin/nvmecontrol/nvmecontrol.c1
-rw-r--r--sbin/nvmecontrol/passthru.c1
-rw-r--r--sbin/nvmecontrol/perftest.c1
-rw-r--r--sbin/nvmecontrol/power.c1
-rw-r--r--sbin/nvmecontrol/reset.c1
-rw-r--r--sbin/nvmecontrol/resv.c1
-rw-r--r--sbin/nvmecontrol/sanitize.c1
-rw-r--r--sbin/nvmecontrol/selftest.c1
-rw-r--r--sbin/pfctl/pf_print_state.c1
-rw-r--r--sbin/pfctl/pf_ruleset.c1
-rw-r--r--sbin/pfctl/pfctl_optimize.c1
-rw-r--r--sbin/pfctl/pfctl_osfp.c1
-rw-r--r--sbin/pfctl/pfctl_parser.c1
-rw-r--r--sbin/pfctl/pfctl_radix.c1
-rw-r--r--sbin/pfctl/pfctl_table.c1
-rw-r--r--sbin/pfctl/tests/pfctl_test.c2
-rw-r--r--sbin/pfilctl/pfilctl.c1
-rw-r--r--sbin/ping/main.c1
-rw-r--r--sbin/ping/tests/in_cksum_test.c1
-rw-r--r--sbin/restore/dirs.c3
-rw-r--r--sbin/restore/interactive.c4
-rw-r--r--sbin/restore/restore.c4
-rw-r--r--sbin/restore/symtab.c3
-rw-r--r--sbin/restore/tape.c4
-rw-r--r--sbin/restore/utilities.c3
-rw-r--r--sbin/routed/rtquery/rtquery.c1
-rw-r--r--sbin/savecore/savecore.c1
-rw-r--r--sbin/sysctl/sysctl.c1
-rw-r--r--sbin/zfsbootcfg/zfsbootcfg.c1
111 files changed, 1 insertions, 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.
*/
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <err.h>
#include <stdlib.h>
#include <string.h>
diff --git a/sbin/mount_fusefs/mount_fusefs.c b/sbin/mount_fusefs/mount_fusefs.c
index 59667c39db10..8b1797747a25 100644
--- a/sbin/mount_fusefs/mount_fusefs.c
+++ b/sbin/mount_fusefs/mount_fusefs.c
@@ -33,7 +33,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/uio.h>
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 6b5263aef3f4..db1fe2991f6d 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -38,9 +38,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
#define _WANT_P_OSREL
#include <sys/param.h>
#include <sys/disklabel.h>
diff --git a/sbin/nvmecontrol/comnd.c b/sbin/nvmecontrol/comnd.c
index de979af71d90..112857f58943 100644
--- a/sbin/nvmecontrol/comnd.c
+++ b/sbin/nvmecontrol/comnd.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/devlist.c b/sbin/nvmecontrol/devlist.c
index 7e3dfe60fff4..ff926987aed6 100644
--- a/sbin/nvmecontrol/devlist.c
+++ b/sbin/nvmecontrol/devlist.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <err.h>
diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c
index 256847ef8ac2..71e744605c66 100644
--- a/sbin/nvmecontrol/firmware.c
+++ b/sbin/nvmecontrol/firmware.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
#include <sys/stat.h>
diff --git a/sbin/nvmecontrol/format.c b/sbin/nvmecontrol/format.c
index 541b207b373f..03706765df38 100644
--- a/sbin/nvmecontrol/format.c
+++ b/sbin/nvmecontrol/format.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/identify.c b/sbin/nvmecontrol/identify.c
index 50698e8bfc70..253682c64a99 100644
--- a/sbin/nvmecontrol/identify.c
+++ b/sbin/nvmecontrol/identify.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <ctype.h>
diff --git a/sbin/nvmecontrol/identify_ext.c b/sbin/nvmecontrol/identify_ext.c
index 72b1ff5ccd7b..2c2ba2435133 100644
--- a/sbin/nvmecontrol/identify_ext.c
+++ b/sbin/nvmecontrol/identify_ext.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <ctype.h>
diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c
index 725815edc475..23c7bbfa4559 100644
--- a/sbin/nvmecontrol/logpage.c
+++ b/sbin/nvmecontrol/logpage.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/modules/intel/intel.c b/sbin/nvmecontrol/modules/intel/intel.c
index cc5c9c49beb5..725111cd92ab 100644
--- a/sbin/nvmecontrol/modules/intel/intel.c
+++ b/sbin/nvmecontrol/modules/intel/intel.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/modules/samsung/samsung.c b/sbin/nvmecontrol/modules/samsung/samsung.c
index cc4528a0a78c..82e7af8ecd33 100644
--- a/sbin/nvmecontrol/modules/samsung/samsung.c
+++ b/sbin/nvmecontrol/modules/samsung/samsung.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/modules/wdc/wdc.c b/sbin/nvmecontrol/modules/wdc/wdc.c
index 2600464eeb0a..55758dc7e037 100644
--- a/sbin/nvmecontrol/modules/wdc/wdc.c
+++ b/sbin/nvmecontrol/modules/wdc/wdc.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
#include <sys/endian.h>
diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c
index dd678568d5ca..3d3cccf6c8da 100644
--- a/sbin/nvmecontrol/ns.c
+++ b/sbin/nvmecontrol/ns.c
@@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/nsid.c b/sbin/nvmecontrol/nsid.c
index 3d71186f396a..c49cec246737 100644
--- a/sbin/nvmecontrol/nsid.c
+++ b/sbin/nvmecontrol/nsid.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <stdio.h>
diff --git a/sbin/nvmecontrol/nvmecontrol.c b/sbin/nvmecontrol/nvmecontrol.c
index 92fbf9e25378..10623799d705 100644
--- a/sbin/nvmecontrol/nvmecontrol.c
+++ b/sbin/nvmecontrol/nvmecontrol.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
#include <sys/stat.h>
diff --git a/sbin/nvmecontrol/passthru.c b/sbin/nvmecontrol/passthru.c
index 015c52305ceb..cf38e185a582 100644
--- a/sbin/nvmecontrol/passthru.c
+++ b/sbin/nvmecontrol/passthru.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/perftest.c b/sbin/nvmecontrol/perftest.c
index 0afab9951e50..59439d3ed2a9 100644
--- a/sbin/nvmecontrol/perftest.c
+++ b/sbin/nvmecontrol/perftest.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/power.c b/sbin/nvmecontrol/power.c
index 95ee1763a28c..de384f719a14 100644
--- a/sbin/nvmecontrol/power.c
+++ b/sbin/nvmecontrol/power.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/reset.c b/sbin/nvmecontrol/reset.c
index 4cd4987d88b5..267413c975f8 100644
--- a/sbin/nvmecontrol/reset.c
+++ b/sbin/nvmecontrol/reset.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/resv.c b/sbin/nvmecontrol/resv.c
index 835ad47a924c..d607b0b015e6 100644
--- a/sbin/nvmecontrol/resv.c
+++ b/sbin/nvmecontrol/resv.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/ioccom.h>
diff --git a/sbin/nvmecontrol/sanitize.c b/sbin/nvmecontrol/sanitize.c
index d56a74685651..df1081217262 100644
--- a/sbin/nvmecontrol/sanitize.c
+++ b/sbin/nvmecontrol/sanitize.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/selftest.c b/sbin/nvmecontrol/selftest.c
index 6139a7902234..a1f09f46b206 100644
--- a/sbin/nvmecontrol/selftest.c
+++ b/sbin/nvmecontrol/selftest.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c
index 20594e050c9e..36c2103a2142 100644
--- a/sbin/pfctl/pf_print_state.c
+++ b/sbin/pfctl/pf_print_state.c
@@ -32,7 +32,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/endian.h>
diff --git a/sbin/pfctl/pf_ruleset.c b/sbin/pfctl/pf_ruleset.c
index 09ee0fdb916c..2b7ec09f28aa 100644
--- a/sbin/pfctl/pf_ruleset.c
+++ b/sbin/pfctl/pf_ruleset.c
@@ -36,7 +36,6 @@
* $OpenBSD: pf_ruleset.c,v 1.2 2008/12/18 15:31:37 dhill Exp $
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/mbuf.h>
diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c
index a377f9eb04dc..aefd7b6471e5 100644
--- a/sbin/pfctl/pfctl_optimize.c
+++ b/sbin/pfctl/pfctl_optimize.c
@@ -16,7 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/pfctl/pfctl_osfp.c b/sbin/pfctl/pfctl_osfp.c
index 7fcdcf96228d..649c1e8a2c3b 100644
--- a/sbin/pfctl/pfctl_osfp.c
+++ b/sbin/pfctl/pfctl_osfp.c
@@ -16,7 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index cb307cd6ede5..7dc0c3ae0cf2 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -33,7 +33,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c
index d33f091d8b69..b1180b40dfee 100644
--- a/sbin/pfctl/pfctl_radix.c
+++ b/sbin/pfctl/pfctl_radix.c
@@ -32,7 +32,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c
index fe934a8d2ea2..6085722f9306 100644
--- a/sbin/pfctl/pfctl_table.c
+++ b/sbin/pfctl/pfctl_table.c
@@ -32,7 +32,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/pfctl/tests/pfctl_test.c b/sbin/pfctl/tests/pfctl_test.c
index 5a98ad9f0d5f..cc69ed4e002a 100644
--- a/sbin/pfctl/tests/pfctl_test.c
+++ b/sbin/pfctl/tests/pfctl_test.c
@@ -30,7 +30,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
+
#include <sys/types.h>
#include <sys/param.h>
#include <err.h>
diff --git a/sbin/pfilctl/pfilctl.c b/sbin/pfilctl/pfilctl.c
index c2fe04ecc777..268f5a8d0e70 100644
--- a/sbin/pfilctl/pfilctl.c
+++ b/sbin/pfilctl/pfilctl.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <net/if.h>
diff --git a/sbin/ping/main.c b/sbin/ping/main.c
index 65896a5dba7b..1d1816361788 100644
--- a/sbin/ping/main.c
+++ b/sbin/ping/main.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/ping/tests/in_cksum_test.c b/sbin/ping/tests/in_cksum_test.c
index fd51a83b1f4a..ffdf8b4c63c5 100644
--- a/sbin/ping/tests/in_cksum_test.c
+++ b/sbin/ping/tests/in_cksum_test.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <atf-c.h>
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index aa57809c5b4f..16fdecba6c18 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -34,9 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index fd8a063bdac3..ea7fc0f18b64 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index bfe0f5f49fdc..1a5e16174b2c 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <limits.h>
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 6b3a136f88bf..3ae6bf20c7be 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
/*
* These routines maintain the symbol table which tracks the state
* of the file system being restored. They provide lookup by either
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index dde20333a437..4c5d828027a5 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -34,10 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/file.h>
#include <sys/mtio.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 50d080d24dae..c4d4fb1ea42f 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index 24946a2b4c7a..67a635545624 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.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/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index a571144589bb..fe42eb66eaae 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -62,7 +62,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/kerneldump.h>
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 7ed7be95c9a5..c37c1f3f7400 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/sbin/zfsbootcfg/zfsbootcfg.c b/sbin/zfsbootcfg/zfsbootcfg.c
index 0c1e9e0f7ea1..03b028a9ab71 100644
--- a/sbin/zfsbootcfg/zfsbootcfg.c
+++ b/sbin/zfsbootcfg/zfsbootcfg.c
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <errno.h>
#include <limits.h>