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:24:01 +0000
commit4d65a7c6951cea0333f1a0c1b32c38489cdfa6c5 (patch)
tree68b10d2a903d8049a37b5ce2b7d101f493060dcb
parent5e3934b15a2741b2de6b217e77dc9d798d740804 (diff)
downloadsrc-4d65a7c6951cea0333f1a0c1b32c38489cdfa6c5.tar.gz
src-4d65a7c6951cea0333f1a0c1b32c38489cdfa6c5.zip
usr.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
-rw-r--r--usr.sbin/autofs/automount.c1
-rw-r--r--usr.sbin/autofs/automountd.c1
-rw-r--r--usr.sbin/autofs/autounmountd.c1
-rw-r--r--usr.sbin/autofs/common.c1
-rw-r--r--usr.sbin/autofs/defined.c1
-rw-r--r--usr.sbin/autofs/popen.c1
-rw-r--r--usr.sbin/bhyve/acpi.c1
-rw-r--r--usr.sbin/bhyve/amd64/atkbdc.c1
-rw-r--r--usr.sbin/bhyve/amd64/fwctl.c2
-rw-r--r--usr.sbin/bhyve/amd64/inout.c1
-rw-r--r--usr.sbin/bhyve/amd64/ioapic.c1
-rw-r--r--usr.sbin/bhyve/amd64/kernemu_dev.c2
-rw-r--r--usr.sbin/bhyve/amd64/mptbl.c1
-rw-r--r--usr.sbin/bhyve/amd64/pci_irq.c2
-rw-r--r--usr.sbin/bhyve/amd64/pci_lpc.c1
-rw-r--r--usr.sbin/bhyve/amd64/pm.c1
-rw-r--r--usr.sbin/bhyve/amd64/post.c1
-rw-r--r--usr.sbin/bhyve/amd64/ps2kbd.c1
-rw-r--r--usr.sbin/bhyve/amd64/ps2mouse.c1
-rw-r--r--usr.sbin/bhyve/amd64/rtc.c1
-rw-r--r--usr.sbin/bhyve/amd64/spinup_ap.c1
-rw-r--r--usr.sbin/bhyve/amd64/task_switch.c1
-rw-r--r--usr.sbin/bhyve/amd64/vga.c1
-rw-r--r--usr.sbin/bhyve/amd64/xmsr.c1
-rw-r--r--usr.sbin/bhyve/bhyvegc.c1
-rw-r--r--usr.sbin/bhyve/bhyverun.c1
-rw-r--r--usr.sbin/bhyve/block_if.c1
-rw-r--r--usr.sbin/bhyve/console.c1
-rw-r--r--usr.sbin/bhyve/gdb.c1
-rw-r--r--usr.sbin/bhyve/iov.c1
-rw-r--r--usr.sbin/bhyve/mem.c1
-rw-r--r--usr.sbin/bhyve/net_utils.c1
-rw-r--r--usr.sbin/bhyve/pci_ahci.c1
-rw-r--r--usr.sbin/bhyve/pci_e82545.c1
-rw-r--r--usr.sbin/bhyve/pci_emul.c1
-rw-r--r--usr.sbin/bhyve/pci_fbuf.c1
-rw-r--r--usr.sbin/bhyve/pci_hda.c1
-rw-r--r--usr.sbin/bhyve/pci_passthru.c1
-rw-r--r--usr.sbin/bhyve/pci_uart.c1
-rw-r--r--usr.sbin/bhyve/pci_virtio_9p.c1
-rw-r--r--usr.sbin/bhyve/pci_virtio_block.c1
-rw-r--r--usr.sbin/bhyve/pci_virtio_console.c1
-rw-r--r--usr.sbin/bhyve/pci_virtio_input.c1
-rw-r--r--usr.sbin/bhyve/pci_virtio_net.c1
-rw-r--r--usr.sbin/bhyve/pci_virtio_rnd.c1
-rw-r--r--usr.sbin/bhyve/pci_virtio_scsi.c1
-rw-r--r--usr.sbin/bhyve/pci_xhci.c2
-rw-r--r--usr.sbin/bhyve/pctestdev.c1
-rw-r--r--usr.sbin/bhyve/rfb.c1
-rw-r--r--usr.sbin/bhyve/smbiostbl.c1
-rw-r--r--usr.sbin/bhyve/snapshot.c1
-rw-r--r--usr.sbin/bhyve/sockstream.c1
-rw-r--r--usr.sbin/bhyve/tpm_intf_crb.c1
-rw-r--r--usr.sbin/bhyve/tpm_ppi_qemu.c1
-rw-r--r--usr.sbin/bhyve/uart_emul.c1
-rw-r--r--usr.sbin/bhyve/usb_emul.c1
-rw-r--r--usr.sbin/bhyve/virtio.c1
-rw-r--r--usr.sbin/bhyve/vmgenc.c2
-rw-r--r--usr.sbin/bhyvectl/bhyvectl.c1
-rw-r--r--usr.sbin/binmiscctl/binmiscctl.c1
-rw-r--r--usr.sbin/boot0cfg/boot0cfg.c1
-rw-r--r--usr.sbin/bsdinstall/distextract/distextract.c1
-rw-r--r--usr.sbin/bsdinstall/distfetch/distfetch.c1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c1
-rw-r--r--usr.sbin/config/mkheaders.c3
-rw-r--r--usr.sbin/config/mkmakefile.cc3
-rw-r--r--usr.sbin/config/mkoptions.cc3
-rw-r--r--usr.sbin/cpucontrol/amd10h.c1
-rw-r--r--usr.sbin/crunch/crunchgen/crunched_main.c1
-rw-r--r--usr.sbin/crunch/crunchgen/crunchgen.c1
-rw-r--r--usr.sbin/ctladm/ctladm.c1
-rw-r--r--usr.sbin/ctld/ctld.c1
-rw-r--r--usr.sbin/ctld/isns.c1
-rw-r--r--usr.sbin/ctld/kernel.c1
-rw-r--r--usr.sbin/cxgbetool/cxgbetool.c1
-rw-r--r--usr.sbin/daemon/daemon.c1
-rw-r--r--usr.sbin/devinfo/devinfo.c1
-rw-r--r--usr.sbin/efitable/efitable.c1
-rw-r--r--usr.sbin/fstyp/exfat.c1
-rw-r--r--usr.sbin/fstyp/fstyp.c1
-rw-r--r--usr.sbin/fstyp/ufs.c1
-rw-r--r--usr.sbin/fstyp/zfs.c1
-rw-r--r--usr.sbin/gssd/gssd.c1
-rw-r--r--usr.sbin/ifmcstat/ifmcstat.c1
-rw-r--r--usr.sbin/iovctl/iovctl.c1
-rw-r--r--usr.sbin/iovctl/parse.c1
-rw-r--r--usr.sbin/iovctl/validate.c1
-rw-r--r--usr.sbin/iscsid/discovery.c1
-rw-r--r--usr.sbin/iscsid/iscsid.c1
-rw-r--r--usr.sbin/iscsid/login.c1
-rw-r--r--usr.sbin/jail/command.c1
-rw-r--r--usr.sbin/jail/config.c1
-rw-r--r--usr.sbin/jail/jail.c1
-rw-r--r--usr.sbin/jls/jls.c1
-rw-r--r--usr.sbin/kbdmap/kbdmap.c1
-rw-r--r--usr.sbin/keyserv/keyserv.c3
-rw-r--r--usr.sbin/keyserv/setkey.c3
-rw-r--r--usr.sbin/kldxref/ef_riscv.c1
-rw-r--r--usr.sbin/lpr/common_source/common.c3
-rw-r--r--usr.sbin/lpr/common_source/displayq.c3
-rw-r--r--usr.sbin/lpr/common_source/printcap.c3
-rw-r--r--usr.sbin/lpr/common_source/rmjob.c3
-rw-r--r--usr.sbin/lpr/common_source/startdaemon.c3
-rw-r--r--usr.sbin/lpr/lpc/cmdtab.c3
-rw-r--r--usr.sbin/lpr/lpd/lpdchar.c3
-rw-r--r--usr.sbin/lpr/lpd/modes.c3
-rw-r--r--usr.sbin/mailwrapper/mailwrapper.c1
-rw-r--r--usr.sbin/makefs/cd9660.c1
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_debug.c1
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_strings.c1
-rw-r--r--usr.sbin/makefs/ffs/buf.c1
-rw-r--r--usr.sbin/makefs/ffs/ffs_alloc.c1
-rw-r--r--usr.sbin/makefs/ffs/ffs_balloc.c1
-rw-r--r--usr.sbin/makefs/ffs/ffs_bswap.c1
-rw-r--r--usr.sbin/makefs/ffs/ffs_subr.c1
-rw-r--r--usr.sbin/makefs/ffs/mkfs.c1
-rw-r--r--usr.sbin/makefs/ffs/ufs_bmap.c1
-rw-r--r--usr.sbin/makefs/makefs.c1
-rw-r--r--usr.sbin/makefs/msdos.c1
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_conv.c1
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_denode.c1
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_vnops.c1
-rw-r--r--usr.sbin/makefs/mtree.c1
-rw-r--r--usr.sbin/makefs/walk.c2
-rw-r--r--usr.sbin/mld6query/mld6.c1
-rw-r--r--usr.sbin/mlx5tool/mlx5tool.c1
-rw-r--r--usr.sbin/moused/moused.c1
-rw-r--r--usr.sbin/mpsutil/mps_cmd.c1
-rw-r--r--usr.sbin/mpsutil/mps_debug.c1
-rw-r--r--usr.sbin/mpsutil/mps_set.c1
-rw-r--r--usr.sbin/mpsutil/mps_show.c1
-rw-r--r--usr.sbin/mpsutil/mpsutil.c1
-rw-r--r--usr.sbin/mptutil/mpt_cam.c1
-rw-r--r--usr.sbin/mptutil/mpt_cmd.c1
-rw-r--r--usr.sbin/mptutil/mpt_config.c1
-rw-r--r--usr.sbin/mptutil/mpt_drive.c1
-rw-r--r--usr.sbin/mptutil/mpt_evt.c1
-rw-r--r--usr.sbin/mptutil/mpt_show.c1
-rw-r--r--usr.sbin/mptutil/mpt_volume.c1
-rw-r--r--usr.sbin/mptutil/mptutil.c1
-rw-r--r--usr.sbin/mtest/mtest.c1
-rw-r--r--usr.sbin/nfscbd/nfscbd.c1
-rw-r--r--usr.sbin/nfsdumpstate/nfsdumpstate.c1
-rw-r--r--usr.sbin/nfsrevoke/nfsrevoke.c1
-rw-r--r--usr.sbin/nfsuserd/nfsuserd.c1
-rw-r--r--usr.sbin/ngctl/main.c1
-rw-r--r--usr.sbin/nscd/agents/group.c1
-rw-r--r--usr.sbin/nscd/agents/passwd.c1
-rw-r--r--usr.sbin/nscd/agents/services.c1
-rw-r--r--usr.sbin/nscd/mp_rs_query.c1
-rw-r--r--usr.sbin/nscd/mp_ws_query.c1
-rw-r--r--usr.sbin/nscd/nscd.c1
-rw-r--r--usr.sbin/nscd/nscdcli.c1
-rw-r--r--usr.sbin/nscd/query.c1
-rw-r--r--usr.sbin/ofwdump/ofw_util.c1
-rw-r--r--usr.sbin/pkg/config.c1
-rw-r--r--usr.sbin/pkg/pkg.c1
-rw-r--r--usr.sbin/pmc/cmd_pmc_filter.cc1
-rw-r--r--usr.sbin/pmc/cmd_pmc_list.c1
-rw-r--r--usr.sbin/pmc/cmd_pmc_stat.c1
-rw-r--r--usr.sbin/pmc/cmd_pmc_summary.cc1
-rw-r--r--usr.sbin/pmc/pmc_util.c1
-rw-r--r--usr.sbin/pmcannotate/pmcannotate.c1
-rw-r--r--usr.sbin/pmccontrol/pmccontrol.c1
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate.c1
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate_cg.c1
-rw-r--r--usr.sbin/pmcstat/pmcpl_callgraph.c1
-rw-r--r--usr.sbin/pmcstat/pmcpl_calltree.c1
-rw-r--r--usr.sbin/pmcstat/pmcpl_gprof.c1
-rw-r--r--usr.sbin/pmcstat/pmcstat.c1
-rw-r--r--usr.sbin/pmcstat/pmcstat_log.c1
-rw-r--r--usr.sbin/powerd/powerd.c1
-rw-r--r--usr.sbin/ppp/async.c1
-rw-r--r--usr.sbin/pppctl/pppctl.c1
-rw-r--r--usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c1
-rw-r--r--usr.sbin/pw/pwupd.h1
-rw-r--r--usr.sbin/quot/quot.c1
-rw-r--r--usr.sbin/rpc.lockd/kern.c1
-rw-r--r--usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c1
-rw-r--r--usr.sbin/rpc.tlsservd/rpc.tlsservd.c1
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_main.c1
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_server.c1
-rw-r--r--usr.sbin/rpc.ypupdated/update.c3
-rw-r--r--usr.sbin/rpcbind/check_bound.c3
-rw-r--r--usr.sbin/rpcbind/pmap_svc.c3
-rw-r--r--usr.sbin/rpcbind/rpcbind.c3
-rw-r--r--usr.sbin/rtprio/rtprio.c1
-rw-r--r--usr.sbin/rtsold/cap_llflags.c1
-rw-r--r--usr.sbin/rtsold/cap_script.c1
-rw-r--r--usr.sbin/sa/db.c1
-rw-r--r--usr.sbin/sa/pdb.c1
-rw-r--r--usr.sbin/sa/usrdb.c1
-rw-r--r--usr.sbin/services_mkdb/services_mkdb.c1
-rw-r--r--usr.sbin/spi/spi.c1
-rw-r--r--usr.sbin/tcpdrop/tcpdrop.c1
-rw-r--r--usr.sbin/uefisign/child.c1
-rw-r--r--usr.sbin/ugidfw/ugidfw.c1
-rw-r--r--usr.sbin/watch/watch.c1
-rw-r--r--usr.sbin/ypbind/yp_ping.c3
-rw-r--r--usr.sbin/ypbind/ypbind.c1
-rw-r--r--usr.sbin/yppoll/yppoll.c1
-rw-r--r--usr.sbin/ypserv/common/yplib_host.c1
-rw-r--r--usr.sbin/ypserv/yp_extern.h2
-rw-r--r--usr.sbin/ypset/ypset.c1
205 files changed, 5 insertions, 243 deletions
diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c
index 6637e16c9129..32aa2300d094 100644
--- a/usr.sbin/autofs/automount.c
+++ b/usr.sbin/autofs/automount.c
@@ -29,7 +29,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/automountd.c b/usr.sbin/autofs/automountd.c
index 50136044b503..54e5558768b1 100644
--- a/usr.sbin/autofs/automountd.c
+++ b/usr.sbin/autofs/automountd.c
@@ -29,7 +29,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/autounmountd.c b/usr.sbin/autofs/autounmountd.c
index 04705faaaf9e..0230510d6e78 100644
--- a/usr.sbin/autofs/autounmountd.c
+++ b/usr.sbin/autofs/autounmountd.c
@@ -29,7 +29,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/event.h>
#include <sys/mount.h>
diff --git a/usr.sbin/autofs/common.c b/usr.sbin/autofs/common.c
index b6e435603dc7..18756752876c 100644
--- a/usr.sbin/autofs/common.c
+++ b/usr.sbin/autofs/common.c
@@ -29,7 +29,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/defined.c b/usr.sbin/autofs/defined.c
index 01bc8218ac5d..578684b589fd 100644
--- a/usr.sbin/autofs/defined.c
+++ b/usr.sbin/autofs/defined.c
@@ -34,7 +34,6 @@
* such as ${OSNAME}, in maps.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/popen.c b/usr.sbin/autofs/popen.c
index 2d3790ff2b0d..38c4a10e327e 100644
--- a/usr.sbin/autofs/popen.c
+++ b/usr.sbin/autofs/popen.c
@@ -38,7 +38,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/wait.h>
diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
index 050e1a0ab75f..b3d3c13fc946 100644
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -36,7 +36,6 @@
* above the MPTable.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/errno.h>
diff --git a/usr.sbin/bhyve/amd64/atkbdc.c b/usr.sbin/bhyve/amd64/atkbdc.c
index c5dea0d220cf..5fa7f3cb779a 100644
--- a/usr.sbin/bhyve/amd64/atkbdc.c
+++ b/usr.sbin/bhyve/amd64/atkbdc.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <machine/vmm.h>
diff --git a/usr.sbin/bhyve/amd64/fwctl.c b/usr.sbin/bhyve/amd64/fwctl.c
index 5e930cdb2051..76e2eaf67849 100644
--- a/usr.sbin/bhyve/amd64/fwctl.c
+++ b/usr.sbin/bhyve/amd64/fwctl.c
@@ -30,7 +30,7 @@
* Guest firmware interface. Uses i/o ports x510/x511 as Qemu does,
* but with a request/response messaging protocol.
*/
-#include <sys/cdefs.h>
+
#include <sys/param.h>
#include <sys/types.h>
#include <sys/errno.h>
diff --git a/usr.sbin/bhyve/amd64/inout.c b/usr.sbin/bhyve/amd64/inout.c
index 898dc9aa1ea5..478678aae1fd 100644
--- a/usr.sbin/bhyve/amd64/inout.c
+++ b/usr.sbin/bhyve/amd64/inout.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/_iovec.h>
diff --git a/usr.sbin/bhyve/amd64/ioapic.c b/usr.sbin/bhyve/amd64/ioapic.c
index 89bb891fdaf0..9ad1c501fbae 100644
--- a/usr.sbin/bhyve/amd64/ioapic.c
+++ b/usr.sbin/bhyve/amd64/ioapic.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/bhyve/amd64/kernemu_dev.c b/usr.sbin/bhyve/amd64/kernemu_dev.c
index 54ca55307c62..d1577a7b3e99 100644
--- a/usr.sbin/bhyve/amd64/kernemu_dev.c
+++ b/usr.sbin/bhyve/amd64/kernemu_dev.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
+
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/tree.h>
diff --git a/usr.sbin/bhyve/amd64/mptbl.c b/usr.sbin/bhyve/amd64/mptbl.c
index e2653ddcf37d..4be412524b60 100644
--- a/usr.sbin/bhyve/amd64/mptbl.c
+++ b/usr.sbin/bhyve/amd64/mptbl.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/errno.h>
#include <x86/mptable.h>
diff --git a/usr.sbin/bhyve/amd64/pci_irq.c b/usr.sbin/bhyve/amd64/pci_irq.c
index 12c2d94925ad..24593befee49 100644
--- a/usr.sbin/bhyve/amd64/pci_irq.c
+++ b/usr.sbin/bhyve/amd64/pci_irq.c
@@ -27,8 +27,6 @@
* SUCH DAMAGE.
*/
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <machine/vmm.h>
diff --git a/usr.sbin/bhyve/amd64/pci_lpc.c b/usr.sbin/bhyve/amd64/pci_lpc.c
index 5c2a2a7965b0..d6e7689ccce1 100644
--- a/usr.sbin/bhyve/amd64/pci_lpc.c
+++ b/usr.sbin/bhyve/amd64/pci_lpc.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <machine/vmm.h>
#include <machine/vmm_snapshot.h>
diff --git a/usr.sbin/bhyve/amd64/pm.c b/usr.sbin/bhyve/amd64/pm.c
index e54854dee855..80882e3b8082 100644
--- a/usr.sbin/bhyve/amd64/pm.c
+++ b/usr.sbin/bhyve/amd64/pm.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <machine/vmm.h>
diff --git a/usr.sbin/bhyve/amd64/post.c b/usr.sbin/bhyve/amd64/post.c
index 53ca34f418b5..6e44bb47bd3b 100644
--- a/usr.sbin/bhyve/amd64/post.c
+++ b/usr.sbin/bhyve/amd64/post.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <assert.h>
diff --git a/usr.sbin/bhyve/amd64/ps2kbd.c b/usr.sbin/bhyve/amd64/ps2kbd.c
index c9e122b8bbd3..27b5ccd0b316 100644
--- a/usr.sbin/bhyve/amd64/ps2kbd.c
+++ b/usr.sbin/bhyve/amd64/ps2kbd.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.sbin/bhyve/amd64/ps2mouse.c b/usr.sbin/bhyve/amd64/ps2mouse.c
index f0b4b7cabd91..e99c5c21b6f0 100644
--- a/usr.sbin/bhyve/amd64/ps2mouse.c
+++ b/usr.sbin/bhyve/amd64/ps2mouse.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <machine/vmm_snapshot.h>
diff --git a/usr.sbin/bhyve/amd64/rtc.c b/usr.sbin/bhyve/amd64/rtc.c
index ef1bdcaf7a2c..21c3099740bb 100644
--- a/usr.sbin/bhyve/amd64/rtc.c
+++ b/usr.sbin/bhyve/amd64/rtc.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <time.h>
diff --git a/usr.sbin/bhyve/amd64/spinup_ap.c b/usr.sbin/bhyve/amd64/spinup_ap.c
index f874efcd374b..df90ad6443d0 100644
--- a/usr.sbin/bhyve/amd64/spinup_ap.c
+++ b/usr.sbin/bhyve/amd64/spinup_ap.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.sbin/bhyve/amd64/task_switch.c b/usr.sbin/bhyve/amd64/task_switch.c
index c316d18142a7..d311d2b1b6c3 100644
--- a/usr.sbin/bhyve/amd64/task_switch.c
+++ b/usr.sbin/bhyve/amd64/task_switch.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/_iovec.h>
#include <sys/mman.h>
diff --git a/usr.sbin/bhyve/amd64/vga.c b/usr.sbin/bhyve/amd64/vga.c
index 9e78ed93424e..7c43ad8f3bd6 100644
--- a/usr.sbin/bhyve/amd64/vga.c
+++ b/usr.sbin/bhyve/amd64/vga.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/bhyve/amd64/xmsr.c b/usr.sbin/bhyve/amd64/xmsr.c
index 7481df4669e7..cd80e4ef782e 100644
--- a/usr.sbin/bhyve/amd64/xmsr.c
+++ b/usr.sbin/bhyve/amd64/xmsr.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <machine/cpufunc.h>
diff --git a/usr.sbin/bhyve/bhyvegc.c b/usr.sbin/bhyve/bhyvegc.c
index 1527343412bf..860a4b115eb1 100644
--- a/usr.sbin/bhyve/bhyvegc.c
+++ b/usr.sbin/bhyve/bhyvegc.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdlib.h>
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index 8147dcd3872b..8163ab0d810a 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c
index 29b8910101f6..32543f9f3a18 100644
--- a/usr.sbin/bhyve/block_if.c
+++ b/usr.sbin/bhyve/block_if.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/console.c b/usr.sbin/bhyve/console.c
index 176ae2e2a298..1440c0604787 100644
--- a/usr.sbin/bhyve/console.c
+++ b/usr.sbin/bhyve/console.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "bhyvegc.h"
diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c
index a6c0700308e7..be730a75b3e6 100644
--- a/usr.sbin/bhyve/gdb.c
+++ b/usr.sbin/bhyve/gdb.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/iov.c b/usr.sbin/bhyve/iov.c
index d01c7a5601f4..5ebc426227a6 100644
--- a/usr.sbin/bhyve/iov.c
+++ b/usr.sbin/bhyve/iov.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/usr.sbin/bhyve/mem.c b/usr.sbin/bhyve/mem.c
index b4cb93a1cea4..b0c09dbf5ddf 100644
--- a/usr.sbin/bhyve/mem.c
+++ b/usr.sbin/bhyve/mem.c
@@ -32,7 +32,6 @@
* so it can be searched within the range.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/tree.h>
diff --git a/usr.sbin/bhyve/net_utils.c b/usr.sbin/bhyve/net_utils.c
index 9230895b49fe..7dc37dce06b3 100644
--- a/usr.sbin/bhyve/net_utils.c
+++ b/usr.sbin/bhyve/net_utils.c
@@ -25,7 +25,6 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <net/ethernet.h>
diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c
index 1eef285a871c..636df5c6e9b1 100644
--- a/usr.sbin/bhyve/pci_ahci.c
+++ b/usr.sbin/bhyve/pci_ahci.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/stat.h>
diff --git a/usr.sbin/bhyve/pci_e82545.c b/usr.sbin/bhyve/pci_e82545.c
index 7ab8f13f74f9..1afcb559f2bb 100644
--- a/usr.sbin/bhyve/pci_e82545.c
+++ b/usr.sbin/bhyve/pci_e82545.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
index e91b4d0a1e20..3d6797c7168e 100644
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/mman.h>
diff --git a/usr.sbin/bhyve/pci_fbuf.c b/usr.sbin/bhyve/pci_fbuf.c
index 9a4d7900751a..247b7cb69c9a 100644
--- a/usr.sbin/bhyve/pci_fbuf.c
+++ b/usr.sbin/bhyve/pci_fbuf.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/mman.h>
diff --git a/usr.sbin/bhyve/pci_hda.c b/usr.sbin/bhyve/pci_hda.c
index 6f0c1b6cfba9..8bd84a5113eb 100644
--- a/usr.sbin/bhyve/pci_hda.c
+++ b/usr.sbin/bhyve/pci_hda.c
@@ -27,7 +27,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <time.h>
diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c
index 0a80ee649689..13d422eaa59c 100644
--- a/usr.sbin/bhyve/pci_passthru.c
+++ b/usr.sbin/bhyve/pci_passthru.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_uart.c b/usr.sbin/bhyve/pci_uart.c
index 362238bf3168..054f9af0f5cc 100644
--- a/usr.sbin/bhyve/pci_uart.c
+++ b/usr.sbin/bhyve/pci_uart.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/bhyve/pci_virtio_9p.c b/usr.sbin/bhyve/pci_virtio_9p.c
index 77ea2f4bed75..3db7c86e0eb2 100644
--- a/usr.sbin/bhyve/pci_virtio_9p.c
+++ b/usr.sbin/bhyve/pci_virtio_9p.c
@@ -30,7 +30,6 @@
* VirtIO filesystem passthrough using 9p protocol.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/uio.h>
diff --git a/usr.sbin/bhyve/pci_virtio_block.c b/usr.sbin/bhyve/pci_virtio_block.c
index 680c53c0c974..ff1920600ae5 100644
--- a/usr.sbin/bhyve/pci_virtio_block.c
+++ b/usr.sbin/bhyve/pci_virtio_block.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/stat.h>
diff --git a/usr.sbin/bhyve/pci_virtio_console.c b/usr.sbin/bhyve/pci_virtio_console.c
index a0bb8591811c..921cb29032cf 100644
--- a/usr.sbin/bhyve/pci_virtio_console.c
+++ b/usr.sbin/bhyve/pci_virtio_console.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_virtio_input.c b/usr.sbin/bhyve/pci_virtio_input.c
index 389e6d2e9313..2da773df90be 100644
--- a/usr.sbin/bhyve/pci_virtio_input.c
+++ b/usr.sbin/bhyve/pci_virtio_input.c
@@ -31,7 +31,6 @@
* virtio input device emulation.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_virtio_net.c b/usr.sbin/bhyve/pci_virtio_net.c
index 1bf45aadfd4f..20977e90d32f 100644
--- a/usr.sbin/bhyve/pci_virtio_net.c
+++ b/usr.sbin/bhyve/pci_virtio_net.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/select.h>
diff --git a/usr.sbin/bhyve/pci_virtio_rnd.c b/usr.sbin/bhyve/pci_virtio_rnd.c
index 779a664a636a..78da5d39528e 100644
--- a/usr.sbin/bhyve/pci_virtio_rnd.c
+++ b/usr.sbin/bhyve/pci_virtio_rnd.c
@@ -33,7 +33,6 @@
* once it has been seeded at bootup.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c
index 08b52a55d385..409e8c1c21ae 100644
--- a/usr.sbin/bhyve/pci_virtio_scsi.c
+++ b/usr.sbin/bhyve/pci_virtio_scsi.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/types.h>
diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c
index 99c1d20b3378..8654dd9e7a14 100644
--- a/usr.sbin/bhyve/pci_xhci.c
+++ b/usr.sbin/bhyve/pci_xhci.c
@@ -32,7 +32,7 @@
devices:
tablet USB tablet mouse
*/
-#include <sys/cdefs.h>
+
#include <sys/param.h>
#include <sys/uio.h>
#include <sys/types.h>
diff --git a/usr.sbin/bhyve/pctestdev.c b/usr.sbin/bhyve/pctestdev.c
index 539016a51876..55bc06f8e5b4 100644
--- a/usr.sbin/bhyve/pctestdev.c
+++ b/usr.sbin/bhyve/pctestdev.c
@@ -29,7 +29,6 @@
* Emulation of selected legacy test/debug interfaces expected by KVM-unit-tests
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <machine/vmm.h>
diff --git a/usr.sbin/bhyve/rfb.c b/usr.sbin/bhyve/rfb.c
index db2924fee453..bb989a33f484 100644
--- a/usr.sbin/bhyve/rfb.c
+++ b/usr.sbin/bhyve/rfb.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/smbiostbl.c b/usr.sbin/bhyve/smbiostbl.c
index 0bc15087ac62..4a98278d5e61 100644
--- a/usr.sbin/bhyve/smbiostbl.c
+++ b/usr.sbin/bhyve/smbiostbl.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c
index edce55c03eae..5569cc065617 100644
--- a/usr.sbin/bhyve/snapshot.c
+++ b/usr.sbin/bhyve/snapshot.c
@@ -33,7 +33,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/sockstream.c b/usr.sbin/bhyve/sockstream.c
index 5b877fa11d44..9a93c6c27c9e 100644
--- a/usr.sbin/bhyve/sockstream.c
+++ b/usr.sbin/bhyve/sockstream.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <unistd.h>
diff --git a/usr.sbin/bhyve/tpm_intf_crb.c b/usr.sbin/bhyve/tpm_intf_crb.c
index 6aeafe7f0ec1..af0214dd1760 100644
--- a/usr.sbin/bhyve/tpm_intf_crb.c
+++ b/usr.sbin/bhyve/tpm_intf_crb.c
@@ -5,7 +5,6 @@
* Author: Corvin Köhne <c.koehne@beckhoff.com>
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/linker_set.h>
diff --git a/usr.sbin/bhyve/tpm_ppi_qemu.c b/usr.sbin/bhyve/tpm_ppi_qemu.c
index 8bea45ea3208..ad66ecb09683 100644
--- a/usr.sbin/bhyve/tpm_ppi_qemu.c
+++ b/usr.sbin/bhyve/tpm_ppi_qemu.c
@@ -5,7 +5,6 @@
* Author: Corvin Köhne <c.koehne@beckhoff.com>
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/usr.sbin/bhyve/uart_emul.c b/usr.sbin/bhyve/uart_emul.c
index 917ce36b67f6..a8c28fb5f230 100644
--- a/usr.sbin/bhyve/uart_emul.c
+++ b/usr.sbin/bhyve/uart_emul.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <dev/ic/ns16550.h>
#ifndef WITHOUT_CAPSICUM
diff --git a/usr.sbin/bhyve/usb_emul.c b/usr.sbin/bhyve/usb_emul.c
index dba11ef0922b..1cb9d3043209 100644
--- a/usr.sbin/bhyve/usb_emul.c
+++ b/usr.sbin/bhyve/usb_emul.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c
index 0aeafa011bbc..26df39ceb5b3 100644
--- a/usr.sbin/bhyve/virtio.c
+++ b/usr.sbin/bhyve/virtio.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/uio.h>
diff --git a/usr.sbin/bhyve/vmgenc.c b/usr.sbin/bhyve/vmgenc.c
index 4da5bb90e2fa..4dbbc7533f8b 100644
--- a/usr.sbin/bhyve/vmgenc.c
+++ b/usr.sbin/bhyve/vmgenc.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
+
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/uuid.h>
diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c
index 843e7a7b9dd5..a055be46d8d4 100644
--- a/usr.sbin/bhyvectl/bhyvectl.c
+++ b/usr.sbin/bhyvectl/bhyvectl.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/cpuset.h>
diff --git a/usr.sbin/binmiscctl/binmiscctl.c b/usr.sbin/binmiscctl/binmiscctl.c
index c2c541155805..6a4950c9bf3a 100644
--- a/usr.sbin/binmiscctl/binmiscctl.c
+++ b/usr.sbin/binmiscctl/binmiscctl.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/imgact_binmisc.h>
#include <sys/linker.h>
diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c
index 8c00329f53d9..2a919f0b2f2e 100644
--- a/usr.sbin/boot0cfg/boot0cfg.c
+++ b/usr.sbin/boot0cfg/boot0cfg.c
@@ -27,7 +27,6 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/disklabel.h>
#include <sys/diskmbr.h>
diff --git a/usr.sbin/bsdinstall/distextract/distextract.c b/usr.sbin/bsdinstall/distextract/distextract.c
index 0cb89ffabcbe..32bd9453eb80 100644
--- a/usr.sbin/bsdinstall/distextract/distextract.c
+++ b/usr.sbin/bsdinstall/distextract/distextract.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <archive.h>
diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c b/usr.sbin/bsdinstall/distfetch/distfetch.c
index 01f5f1aa214b..c431e187799d 100644
--- a/usr.sbin/bsdinstall/distfetch/distfetch.c
+++ b/usr.sbin/bsdinstall/distfetch/distfetch.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <bsddialog.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c b/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
index 74ddd48cd31d..4332f02156c1 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c b/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
index d3e1dcf051cb..0d0fdb1ce670 100644
--- a/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
+++ b/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index 41a48d108d08..8ff81072c5d7 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
/*
* This used to generate a bunch of headers files related to devices when
* device counters were supported. Support for that was removed in 2005.
diff --git a/usr.sbin/config/mkmakefile.cc b/usr.sbin/config/mkmakefile.cc
index 9452ab8cdfbb..060f08230550 100644
--- a/usr.sbin/config/mkmakefile.cc
+++ b/usr.sbin/config/mkmakefile.cc
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
/*
* Build the makefile for the system, from
* the information in the files files and the
diff --git a/usr.sbin/config/mkoptions.cc b/usr.sbin/config/mkoptions.cc
index 83f45a4d5c90..1580700dc08d 100644
--- a/usr.sbin/config/mkoptions.cc
+++ b/usr.sbin/config/mkoptions.cc
@@ -30,9 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#endif /* not lint */
-
/*
* Make all the .h files for the optional entries
*/
diff --git a/usr.sbin/cpucontrol/amd10h.c b/usr.sbin/cpucontrol/amd10h.c
index b0c458fabb58..aceb6bfa2ba5 100644
--- a/usr.sbin/cpucontrol/amd10h.c
+++ b/usr.sbin/cpucontrol/amd10h.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 <sys/stat.h>
#include <sys/mman.h>
diff --git a/usr.sbin/crunch/crunchgen/crunched_main.c b/usr.sbin/crunch/crunchgen/crunched_main.c
index 493c2de188b4..7de99b270ac7 100644
--- a/usr.sbin/crunch/crunchgen/crunched_main.c
+++ b/usr.sbin/crunch/crunchgen/crunched_main.c
@@ -64,7 +64,6 @@
* the crunched binary without creating all the links.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/auxv.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c
index 7b5f892cffbe..41713849b27b 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.c
+++ b/usr.sbin/crunch/crunchgen/crunchgen.c
@@ -31,7 +31,6 @@
* from specs given in a .conf file.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
index 62dd87155671..fd7fd2f57981 100644
--- a/usr.sbin/ctladm/ctladm.c
+++ b/usr.sbin/ctladm/ctladm.c
@@ -43,7 +43,6 @@
* Author: Ken Merry <ken@FreeBSD.org>
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/callout.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c
index 2a69308ff067..fd60c4f6a646 100644
--- a/usr.sbin/ctld/ctld.c
+++ b/usr.sbin/ctld/ctld.c
@@ -29,7 +29,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ctld/isns.c b/usr.sbin/ctld/isns.c
index 3c85c1a3cade..71150a8ae06f 100644
--- a/usr.sbin/ctld/isns.c
+++ b/usr.sbin/ctld/isns.c
@@ -27,7 +27,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
index cbb8e2c25f5d..cdc0b0fa187d 100644
--- a/usr.sbin/ctld/kernel.c
+++ b/usr.sbin/ctld/kernel.c
@@ -37,7 +37,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/callout.h>
diff --git a/usr.sbin/cxgbetool/cxgbetool.c b/usr.sbin/cxgbetool/cxgbetool.c
index c02bc7fdc054..bef99ff0f3da 100644
--- a/usr.sbin/cxgbetool/cxgbetool.c
+++ b/usr.sbin/cxgbetool/cxgbetool.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c
index 65e6bb7ca190..dc488993b1af 100644
--- a/usr.sbin/daemon/daemon.c
+++ b/usr.sbin/daemon/daemon.c
@@ -30,7 +30,6 @@
* From BSDI: daemon.c,v 1.2 1996/08/15 01:11:09 jch Exp
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/event.h>
#include <sys/mman.h>
diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c
index 060f272dda79..a035d958ab80 100644
--- a/usr.sbin/devinfo/devinfo.c
+++ b/usr.sbin/devinfo/devinfo.c
@@ -31,7 +31,6 @@
* Print information about system device configuration.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/efitable/efitable.c b/usr.sbin/efitable/efitable.c
index a5b37e64c13a..637188957b8b 100644
--- a/usr.sbin/efitable/efitable.c
+++ b/usr.sbin/efitable/efitable.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/efi.h>
#include <sys/efiio.h>
diff --git a/usr.sbin/fstyp/exfat.c b/usr.sbin/fstyp/exfat.c
index 83138fc26b98..8f8393b861fb 100644
--- a/usr.sbin/fstyp/exfat.c
+++ b/usr.sbin/fstyp/exfat.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/usr.sbin/fstyp/fstyp.c b/usr.sbin/fstyp/fstyp.c
index d62f9af7ce18..578210116ae5 100644
--- a/usr.sbin/fstyp/fstyp.c
+++ b/usr.sbin/fstyp/fstyp.c
@@ -27,7 +27,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/capsicum.h>
#include <sys/disk.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/fstyp/ufs.c b/usr.sbin/fstyp/ufs.c
index c62358704dfe..5133febbf065 100644
--- a/usr.sbin/fstyp/ufs.c
+++ b/usr.sbin/fstyp/ufs.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
diff --git a/usr.sbin/fstyp/zfs.c b/usr.sbin/fstyp/zfs.c
index 62a5aca6a493..6fde88c79524 100644
--- a/usr.sbin/fstyp/zfs.c
+++ b/usr.sbin/fstyp/zfs.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/time.h>
#include <stdint.h>
diff --git a/usr.sbin/gssd/gssd.c b/usr.sbin/gssd/gssd.c
index a22891f3bebf..1d543719b11c 100644
--- a/usr.sbin/gssd/gssd.c
+++ b/usr.sbin/gssd/gssd.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/linker.h>
diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index 7e82ec0d72e0..503c1000d82d 100644
--- a/usr.sbin/ifmcstat/ifmcstat.c
+++ b/usr.sbin/ifmcstat/ifmcstat.c
@@ -32,7 +32,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/iovctl/iovctl.c b/usr.sbin/iovctl/iovctl.c
index 413fb7b2f4a5..0110751082ec 100644
--- a/usr.sbin/iovctl/iovctl.c
+++ b/usr.sbin/iovctl/iovctl.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/iov.h>
#include <sys/dnv.h>
diff --git a/usr.sbin/iovctl/parse.c b/usr.sbin/iovctl/parse.c
index d04c008b449c..b1aad7d7ddd6 100644
--- a/usr.sbin/iovctl/parse.c
+++ b/usr.sbin/iovctl/parse.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/iov.h>
#include <sys/nv.h>
diff --git a/usr.sbin/iovctl/validate.c b/usr.sbin/iovctl/validate.c
index 005a371fe353..cd187291c9c7 100644
--- a/usr.sbin/iovctl/validate.c
+++ b/usr.sbin/iovctl/validate.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/iov.h>
#include <sys/dnv.h>
diff --git a/usr.sbin/iscsid/discovery.c b/usr.sbin/iscsid/discovery.c
index f6072db36804..c9bbf5504554 100644
--- a/usr.sbin/iscsid/discovery.c
+++ b/usr.sbin/iscsid/discovery.c
@@ -29,7 +29,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <stdbool.h>
diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c
index 53ea278af019..7230a8bda6fe 100644
--- a/usr.sbin/iscsid/iscsid.c
+++ b/usr.sbin/iscsid/iscsid.c
@@ -29,7 +29,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/iscsid/login.c b/usr.sbin/iscsid/login.c
index 1c53c5733fde..06d6ac072d21 100644
--- a/usr.sbin/iscsid/login.c
+++ b/usr.sbin/iscsid/login.c
@@ -29,7 +29,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <assert.h>
diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c
index 9eabcc5ff53c..8ffcca8039ac 100644
--- a/usr.sbin/jail/command.c
+++ b/usr.sbin/jail/command.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c
index 8c9ff0a7bd09..63adc9652145 100644
--- a/usr.sbin/jail/config.c
+++ b/usr.sbin/jail/config.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/socket.h>
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index fcff0d485682..db5918a32744 100644
--- a/usr.sbin/jail/jail.c
+++ b/usr.sbin/jail/jail.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c
index c1cf074cd605..5c26965b045b 100644
--- a/usr.sbin/jls/jls.c
+++ b/usr.sbin/jls/jls.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/socket.h>
diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c
index 78bb9e2741c5..d476fed87f91 100644
--- a/usr.sbin/kbdmap/kbdmap.c
+++ b/usr.sbin/kbdmap/kbdmap.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/keyserv/keyserv.c b/usr.sbin/keyserv/keyserv.c
index 2c7251483749..080798ad84bd 100644
--- a/usr.sbin/keyserv/keyserv.c
+++ b/usr.sbin/keyserv/keyserv.c
@@ -27,9 +27,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-#endif /* not lint */
-
/*
* Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
*/
diff --git a/usr.sbin/keyserv/setkey.c b/usr.sbin/keyserv/setkey.c
index f4c9fe62b0c5..ec263ebf5321 100644
--- a/usr.sbin/keyserv/setkey.c
+++ b/usr.sbin/keyserv/setkey.c
@@ -27,9 +27,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-#endif /* not lint */
-
/*
* Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
*/
diff --git a/usr.sbin/kldxref/ef_riscv.c b/usr.sbin/kldxref/ef_riscv.c
index aeb45d2b7eb4..c5ba17ed1ae1 100644
--- a/usr.sbin/kldxref/ef_riscv.c
+++ b/usr.sbin/kldxref/ef_riscv.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <machine/elf.h>
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index 0cba026acf04..9b73667d3058 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -38,9 +38,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index 58936b5f51c2..e9ef544f0399 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c
index 5a646bd8f27f..35fcab4c16eb 100644
--- a/usr.sbin/lpr/common_source/printcap.c
+++ b/usr.sbin/lpr/common_source/printcap.c
@@ -38,9 +38,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
#include <errno.h>
#include <stdio.h>
diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c
index 12e57b02d472..b3af8bf5ad3f 100644
--- a/usr.sbin/lpr/common_source/rmjob.c
+++ b/usr.sbin/lpr/common_source/rmjob.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
#include <sys/param.h>
#include <sys/uio.h>
diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c
index ad124af1fb2e..d37dd0817043 100644
--- a/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr.sbin/lpr/common_source/startdaemon.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index ebc062abf0a8..0c91c083a9b2 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
#include "lpc.h"
#include "extern.h"
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index 24171a22b1d7..a9d06fe7f600 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
/*
* Character set for line printer daemon
diff --git a/usr.sbin/lpr/lpd/modes.c b/usr.sbin/lpr/lpd/modes.c
index 5e2d7c06f4e7..c1f61d5be069 100644
--- a/usr.sbin/lpr/lpd/modes.c
+++ b/usr.sbin/lpr/lpd/modes.c
@@ -29,9 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
#include <stddef.h>
#include <string.h>
diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c
index af732674a527..f11361f10daa 100644
--- a/usr.sbin/mailwrapper/mailwrapper.c
+++ b/usr.sbin/mailwrapper/mailwrapper.c
@@ -34,7 +34,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <err.h>
diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
index 8cdfaee9464c..500e3c08c7af 100644
--- a/usr.sbin/makefs/cd9660.c
+++ b/usr.sbin/makefs/cd9660.c
@@ -97,7 +97,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <ctype.h>
diff --git a/usr.sbin/makefs/cd9660/cd9660_debug.c b/usr.sbin/makefs/cd9660/cd9660_debug.c
index da9d73203cb4..f49c5108f4c2 100644
--- a/usr.sbin/makefs/cd9660/cd9660_debug.c
+++ b/usr.sbin/makefs/cd9660/cd9660_debug.c
@@ -34,7 +34,6 @@
* OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/usr.sbin/makefs/cd9660/cd9660_strings.c b/usr.sbin/makefs/cd9660/cd9660_strings.c
index c1890e23d8c2..b3111fca6cd1 100644
--- a/usr.sbin/makefs/cd9660/cd9660_strings.c
+++ b/usr.sbin/makefs/cd9660/cd9660_strings.c
@@ -36,7 +36,6 @@
#include <sys/mount.h>
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <ctype.h>
diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c
index db73ceb6be59..5fdb517208f9 100644
--- a/usr.sbin/makefs/ffs/buf.c
+++ b/usr.sbin/makefs/ffs/buf.c
@@ -37,7 +37,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c
index fe1cb141b2eb..c5aae97928b5 100644
--- a/usr.sbin/makefs/ffs/ffs_alloc.c
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c
@@ -41,7 +41,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/makefs/ffs/ffs_balloc.c b/usr.sbin/makefs/ffs/ffs_balloc.c
index 997ac49e9950..969a779d0ae8 100644
--- a/usr.sbin/makefs/ffs/ffs_balloc.c
+++ b/usr.sbin/makefs/ffs/ffs_balloc.c
@@ -32,7 +32,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/makefs/ffs/ffs_bswap.c b/usr.sbin/makefs/ffs/ffs_bswap.c
index ebbd17441807..50498cb4f259 100644
--- a/usr.sbin/makefs/ffs/ffs_bswap.c
+++ b/usr.sbin/makefs/ffs/ffs_bswap.c
@@ -27,7 +27,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#if defined(_KERNEL)
#include <sys/systm.h>
diff --git a/usr.sbin/makefs/ffs/ffs_subr.c b/usr.sbin/makefs/ffs/ffs_subr.c
index a2f4d19a5b25..3f5b2297389b 100644
--- a/usr.sbin/makefs/ffs/ffs_subr.c
+++ b/usr.sbin/makefs/ffs/ffs_subr.c
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c
index b579565b6a01..b2f752102a69 100644
--- a/usr.sbin/makefs/ffs/mkfs.c
+++ b/usr.sbin/makefs/ffs/mkfs.c
@@ -40,7 +40,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.sbin/makefs/ffs/ufs_bmap.c b/usr.sbin/makefs/ffs/ufs_bmap.c
index ae220b907e67..1dc644349d3a 100644
--- a/usr.sbin/makefs/ffs/ufs_bmap.c
+++ b/usr.sbin/makefs/ffs/ufs_bmap.c
@@ -37,7 +37,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index 8c8e03b9d59f..14f43dcb3b24 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -37,7 +37,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <assert.h>
diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c
index 8353f06315ac..3707481a1c47 100644
--- a/usr.sbin/makefs/msdos.c
+++ b/usr.sbin/makefs/msdos.c
@@ -32,7 +32,6 @@
#include "nbtool_config.h"
#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#if !HAVE_NBTOOL_CONFIG_H
diff --git a/usr.sbin/makefs/msdos/msdosfs_conv.c b/usr.sbin/makefs/msdos/msdosfs_conv.c
index 4dcb1170bbb3..cacaa4a49a2c 100644
--- a/usr.sbin/makefs/msdos/msdosfs_conv.c
+++ b/usr.sbin/makefs/msdos/msdosfs_conv.c
@@ -47,7 +47,6 @@
* October 1992
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/usr.sbin/makefs/msdos/msdosfs_denode.c b/usr.sbin/makefs/msdos/msdosfs_denode.c
index a9c37ebf8f60..88e90ab87c7e 100644
--- a/usr.sbin/makefs/msdos/msdosfs_denode.c
+++ b/usr.sbin/makefs/msdos/msdosfs_denode.c
@@ -49,7 +49,6 @@
* October 1992
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c
index 13a6ade47d6d..ae1fa3f7bf75 100644
--- a/usr.sbin/makefs/msdos/msdosfs_vnops.c
+++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c
@@ -49,7 +49,6 @@
* October 1992
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/mman.h>
diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c
index 3e62afbc1137..1951c13601df 100644
--- a/usr.sbin/makefs/mtree.c
+++ b/usr.sbin/makefs/mtree.c
@@ -29,7 +29,6 @@
#include "nbtool_config.h"
#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/sbuf.h>
diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c
index 56e2d19c6f00..401865229957 100644
--- a/usr.sbin/makefs/walk.c
+++ b/usr.sbin/makefs/walk.c
@@ -37,8 +37,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.sbin/mld6query/mld6.c b/usr.sbin/mld6query/mld6.c
index d0830e7233da..7a8bc8c05446 100644
--- a/usr.sbin/mld6query/mld6.c
+++ b/usr.sbin/mld6query/mld6.c
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/uio.h>
#include <sys/socket.h>
diff --git a/usr.sbin/mlx5tool/mlx5tool.c b/usr.sbin/mlx5tool/mlx5tool.c
index cc13d008fcd1..f58434c91740 100644
--- a/usr.sbin/mlx5tool/mlx5tool.c
+++ b/usr.sbin/mlx5tool/mlx5tool.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index dcfd72099cb9..201e0b6ce0f6 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -46,7 +46,6 @@
**
**/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/consio.h>
#include <sys/mouse.h>
diff --git a/usr.sbin/mpsutil/mps_cmd.c b/usr.sbin/mpsutil/mps_cmd.c
index 2101bbba73b0..e8828ce0509c 100644
--- a/usr.sbin/mpsutil/mps_cmd.c
+++ b/usr.sbin/mpsutil/mps_cmd.c
@@ -33,7 +33,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/mpsutil/mps_debug.c b/usr.sbin/mpsutil/mps_debug.c
index a3297b4176cd..c1eb57f7150d 100644
--- a/usr.sbin/mpsutil/mps_debug.c
+++ b/usr.sbin/mpsutil/mps_debug.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/types.h>
diff --git a/usr.sbin/mpsutil/mps_set.c b/usr.sbin/mpsutil/mps_set.c
index b75f327cb993..603c529b8696 100644
--- a/usr.sbin/mpsutil/mps_set.c
+++ b/usr.sbin/mpsutil/mps_set.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <err.h>
diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c
index 6efa9b76dd3d..bbb2b22c8c73 100644
--- a/usr.sbin/mpsutil/mps_show.c
+++ b/usr.sbin/mpsutil/mps_show.c
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/endian.h>
diff --git a/usr.sbin/mpsutil/mpsutil.c b/usr.sbin/mpsutil/mpsutil.c
index 0b6baa3aab93..51e88ed17a2e 100644
--- a/usr.sbin/mpsutil/mpsutil.c
+++ b/usr.sbin/mpsutil/mpsutil.c
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <err.h>
diff --git a/usr.sbin/mptutil/mpt_cam.c b/usr.sbin/mptutil/mpt_cam.c
index 2e636fb6ce25..87aebc8819a1 100644
--- a/usr.sbin/mptutil/mpt_cam.c
+++ b/usr.sbin/mptutil/mpt_cam.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/mptutil/mpt_cmd.c b/usr.sbin/mptutil/mpt_cmd.c
index 8bcec08cd232..8e091e2ed19b 100644
--- a/usr.sbin/mptutil/mpt_cmd.c
+++ b/usr.sbin/mptutil/mpt_cmd.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/mptutil/mpt_config.c b/usr.sbin/mptutil/mpt_config.c
index 36c3881969c9..88fb619c7eba 100644
--- a/usr.sbin/mptutil/mpt_config.c
+++ b/usr.sbin/mptutil/mpt_config.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <err.h>
diff --git a/usr.sbin/mptutil/mpt_drive.c b/usr.sbin/mptutil/mpt_drive.c
index bf5a52b0bfd7..82d5aefe8795 100644
--- a/usr.sbin/mptutil/mpt_drive.c
+++ b/usr.sbin/mptutil/mpt_drive.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <ctype.h>
diff --git a/usr.sbin/mptutil/mpt_evt.c b/usr.sbin/mptutil/mpt_evt.c
index 6a077d4a906e..a3fbf4cf7aec 100644
--- a/usr.sbin/mptutil/mpt_evt.c
+++ b/usr.sbin/mptutil/mpt_evt.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <ctype.h>
diff --git a/usr.sbin/mptutil/mpt_show.c b/usr.sbin/mptutil/mpt_show.c
index a70a4dd90bc8..f9191aa6921e 100644
--- a/usr.sbin/mptutil/mpt_show.c
+++ b/usr.sbin/mptutil/mpt_show.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <err.h>
diff --git a/usr.sbin/mptutil/mpt_volume.c b/usr.sbin/mptutil/mpt_volume.c
index 71251e591eec..4a7c55f9f6c6 100644
--- a/usr.sbin/mptutil/mpt_volume.c
+++ b/usr.sbin/mptutil/mpt_volume.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <err.h>
diff --git a/usr.sbin/mptutil/mptutil.c b/usr.sbin/mptutil/mptutil.c
index 5e8b2eb71291..ed414931339c 100644
--- a/usr.sbin/mptutil/mptutil.c
+++ b/usr.sbin/mptutil/mptutil.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <err.h>
diff --git a/usr.sbin/mtest/mtest.c b/usr.sbin/mtest/mtest.c
index d0ed511c21fa..941379b01bc9 100644
--- a/usr.sbin/mtest/mtest.c
+++ b/usr.sbin/mtest/mtest.c
@@ -38,7 +38,6 @@
* is implemented; use MCAST_JOIN_SOURCE for IPv4.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/usr.sbin/nfscbd/nfscbd.c b/usr.sbin/nfscbd/nfscbd.c
index 9d8efaecee57..6b0b938973f2 100644
--- a/usr.sbin/nfscbd/nfscbd.c
+++ b/usr.sbin/nfscbd/nfscbd.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/linker.h>
diff --git a/usr.sbin/nfsdumpstate/nfsdumpstate.c b/usr.sbin/nfsdumpstate/nfsdumpstate.c
index 831a1efa46b9..70cfa4ac5420 100644
--- a/usr.sbin/nfsdumpstate/nfsdumpstate.c
+++ b/usr.sbin/nfsdumpstate/nfsdumpstate.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/usr.sbin/nfsrevoke/nfsrevoke.c b/usr.sbin/nfsrevoke/nfsrevoke.c
index 0f7ef0f77137..a914555e4ec1 100644
--- a/usr.sbin/nfsrevoke/nfsrevoke.c
+++ b/usr.sbin/nfsrevoke/nfsrevoke.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/usr.sbin/nfsuserd/nfsuserd.c b/usr.sbin/nfsuserd/nfsuserd.c
index 08e8c3c5e6a2..29d816934600 100644
--- a/usr.sbin/nfsuserd/nfsuserd.c
+++ b/usr.sbin/nfsuserd/nfsuserd.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/linker.h>
diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c
index b9e88681d593..7c79e67d8275 100644
--- a/usr.sbin/ngctl/main.c
+++ b/usr.sbin/ngctl/main.c
@@ -37,7 +37,6 @@
* $Whistle: main.c,v 1.12 1999/11/29 19:17:46 archie Exp $
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/select.h>
diff --git a/usr.sbin/nscd/agents/group.c b/usr.sbin/nscd/agents/group.c
index b91b77fe5df8..b64a4886f712 100644
--- a/usr.sbin/nscd/agents/group.c
+++ b/usr.sbin/nscd/agents/group.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/agents/passwd.c b/usr.sbin/nscd/agents/passwd.c
index 79b69e87db06..1401a1b95246 100644
--- a/usr.sbin/nscd/agents/passwd.c
+++ b/usr.sbin/nscd/agents/passwd.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/agents/services.c b/usr.sbin/nscd/agents/services.c
index c234af2950d9..b1cff4352349 100644
--- a/usr.sbin/nscd/agents/services.c
+++ b/usr.sbin/nscd/agents/services.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/mp_rs_query.c b/usr.sbin/nscd/mp_rs_query.c
index 2c09d6151b8b..225eec91d2a3 100644
--- a/usr.sbin/nscd/mp_rs_query.c
+++ b/usr.sbin/nscd/mp_rs_query.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/event.h>
#include <sys/socket.h>
diff --git a/usr.sbin/nscd/mp_ws_query.c b/usr.sbin/nscd/mp_ws_query.c
index 0e4bf657b47c..a2416655b991 100644
--- a/usr.sbin/nscd/mp_ws_query.c
+++ b/usr.sbin/nscd/mp_ws_query.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/event.h>
#include <sys/socket.h>
diff --git a/usr.sbin/nscd/nscd.c b/usr.sbin/nscd/nscd.c
index 5f70eea3d396..0314e99675f3 100644
--- a/usr.sbin/nscd/nscd.c
+++ b/usr.sbin/nscd/nscd.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/event.h>
#include <sys/socket.h>
diff --git a/usr.sbin/nscd/nscdcli.c b/usr.sbin/nscd/nscdcli.c
index ba603f610283..1a7a86532343 100644
--- a/usr.sbin/nscd/nscdcli.c
+++ b/usr.sbin/nscd/nscdcli.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/event.h>
diff --git a/usr.sbin/nscd/query.c b/usr.sbin/nscd/query.c
index 652be2357003..bf9cae5a0c60 100644
--- a/usr.sbin/nscd/query.c
+++ b/usr.sbin/nscd/query.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/event.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ofwdump/ofw_util.c b/usr.sbin/ofwdump/ofw_util.c
index 2f90eb1652c0..0e825a4e5430 100644
--- a/usr.sbin/ofwdump/ofw_util.c
+++ b/usr.sbin/ofwdump/ofw_util.c
@@ -23,7 +23,6 @@
* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c
index ce3a11cf8c81..d8e15d44da3d 100644
--- a/usr.sbin/pkg/config.c
+++ b/usr.sbin/pkg/config.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/utsname.h>
diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c
index 0689c67cf822..70086886fbc5 100644
--- a/usr.sbin/pkg/pkg.c
+++ b/usr.sbin/pkg/pkg.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/types.h>
diff --git a/usr.sbin/pmc/cmd_pmc_filter.cc b/usr.sbin/pmc/cmd_pmc_filter.cc
index 286d9cc97da6..11ab2dc3c964 100644
--- a/usr.sbin/pmc/cmd_pmc_filter.cc
+++ b/usr.sbin/pmc/cmd_pmc_filter.cc
@@ -26,7 +26,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmc/cmd_pmc_list.c b/usr.sbin/pmc/cmd_pmc_list.c
index 9701abd66796..a1da6a8e732d 100644
--- a/usr.sbin/pmc/cmd_pmc_list.c
+++ b/usr.sbin/pmc/cmd_pmc_list.c
@@ -26,7 +26,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmc/cmd_pmc_stat.c b/usr.sbin/pmc/cmd_pmc_stat.c
index 659b36137724..1e5c14e61857 100644
--- a/usr.sbin/pmc/cmd_pmc_stat.c
+++ b/usr.sbin/pmc/cmd_pmc_stat.c
@@ -26,7 +26,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmc/cmd_pmc_summary.cc b/usr.sbin/pmc/cmd_pmc_summary.cc
index 9f7e36c694b7..610c1fee7f0d 100644
--- a/usr.sbin/pmc/cmd_pmc_summary.cc
+++ b/usr.sbin/pmc/cmd_pmc_summary.cc
@@ -26,7 +26,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmc/pmc_util.c b/usr.sbin/pmc/pmc_util.c
index 03e9a7554fbe..40f2b9caeef3 100644
--- a/usr.sbin/pmc/pmc_util.c
+++ b/usr.sbin/pmc/pmc_util.c
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmcannotate/pmcannotate.c b/usr.sbin/pmcannotate/pmcannotate.c
index 32138aa6c3a7..01af75090793 100644
--- a/usr.sbin/pmcannotate/pmcannotate.c
+++ b/usr.sbin/pmcannotate/pmcannotate.c
@@ -30,7 +30,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.sbin/pmccontrol/pmccontrol.c b/usr.sbin/pmccontrol/pmccontrol.c
index 6734e6d16d99..c90b4994e0e8 100644
--- a/usr.sbin/pmccontrol/pmccontrol.c
+++ b/usr.sbin/pmccontrol/pmccontrol.c
@@ -27,7 +27,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/cpuset.h>
diff --git a/usr.sbin/pmcstat/pmcpl_annotate.c b/usr.sbin/pmcstat/pmcpl_annotate.c
index fbc6c90f75a9..cdc0d5705597 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate.c
+++ b/usr.sbin/pmcstat/pmcpl_annotate.c
@@ -35,7 +35,6 @@
* gprof(1) compatible profiles.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/gmon.h>
diff --git a/usr.sbin/pmcstat/pmcpl_annotate_cg.c b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
index c7399cc5467e..68d718e30821 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate_cg.c
+++ b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
@@ -38,7 +38,6 @@
* gprof(1) compatible profiles.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/gmon.h>
diff --git a/usr.sbin/pmcstat/pmcpl_callgraph.c b/usr.sbin/pmcstat/pmcpl_callgraph.c
index 2ba6dfc0f8d5..76c89b0d4c80 100644
--- a/usr.sbin/pmcstat/pmcpl_callgraph.c
+++ b/usr.sbin/pmcstat/pmcpl_callgraph.c
@@ -35,7 +35,6 @@
* gprof(1) compatible profiles.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/gmon.h>
diff --git a/usr.sbin/pmcstat/pmcpl_calltree.c b/usr.sbin/pmcstat/pmcpl_calltree.c
index 434263ccee26..209297a41885 100644
--- a/usr.sbin/pmcstat/pmcpl_calltree.c
+++ b/usr.sbin/pmcstat/pmcpl_calltree.c
@@ -33,7 +33,6 @@
* Handle top mode with a sorted tree display.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/queue.h>
diff --git a/usr.sbin/pmcstat/pmcpl_gprof.c b/usr.sbin/pmcstat/pmcpl_gprof.c
index 2c98c1c494a1..acc8c0b56a2b 100644
--- a/usr.sbin/pmcstat/pmcpl_gprof.c
+++ b/usr.sbin/pmcstat/pmcpl_gprof.c
@@ -36,7 +36,6 @@
* gprof(1) compatible profiles.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/gmon.h>
diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c
index c36cee436e55..98e14dfb9113 100644
--- a/usr.sbin/pmcstat/pmcstat.c
+++ b/usr.sbin/pmcstat/pmcstat.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmcstat/pmcstat_log.c b/usr.sbin/pmcstat/pmcstat_log.c
index cab41873eef1..c8fc414f6214 100644
--- a/usr.sbin/pmcstat/pmcstat_log.c
+++ b/usr.sbin/pmcstat/pmcstat_log.c
@@ -35,7 +35,6 @@
* gprof(1) compatible profiles.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/cpuset.h>
diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c
index 5e4c752519f2..8517b4f2bf0b 100644
--- a/usr.sbin/powerd/powerd.c
+++ b/usr.sbin/powerd/powerd.c
@@ -27,7 +27,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index 6a0cc9e8e971..d6cb89df23b8 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -29,7 +29,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <string.h>
diff --git a/usr.sbin/pppctl/pppctl.c b/usr.sbin/pppctl/pppctl.c
index 0b2dfd5f4b3e..d5f7a81eac75 100644
--- a/usr.sbin/pppctl/pppctl.c
+++ b/usr.sbin/pppctl/pppctl.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c b/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
index 09c8051786d3..e3182467beab 100644
--- a/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
+++ b/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/resource.h>
#include <sys/socket.h>
diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h
index 4eff0be81066..d174a4a20200 100644
--- a/usr.sbin/pw/pwupd.h
+++ b/usr.sbin/pw/pwupd.h
@@ -29,7 +29,6 @@
#ifndef _PWUPD_H_
#define _PWUPD_H_
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index dc189f0b8e42..99aff61ae934 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -31,7 +31,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stdint.h>
#include <sys/mount.h>
diff --git a/usr.sbin/rpc.lockd/kern.c b/usr.sbin/rpc.lockd/kern.c
index 1bd6fadc737d..c24b81159ea5 100644
--- a/usr.sbin/rpc.lockd/kern.c
+++ b/usr.sbin/rpc.lockd/kern.c
@@ -30,7 +30,6 @@
* from BSDI kern.c,v 1.2 1998/11/25 22:38:27 don Exp
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/queue.h>
diff --git a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c
index 223ec61aba7a..9c50e4b48cb7 100644
--- a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c
+++ b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c
@@ -32,7 +32,6 @@
* the client side of kernel RPC-over-TLS by Rick Macklem.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
index 9103cff2204e..00ea407551f5 100644
--- a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
+++ b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
@@ -32,7 +32,6 @@
* the server side of kernel RPC-over-TLS by Rick Macklem.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/linker.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
index 9a4779f9293a..54e5cbd060cf 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
@@ -32,7 +32,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index 5d0879005934..e42c941b7bff 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -32,7 +32,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/fcntl.h>
#include <sys/socket.h>
diff --git a/usr.sbin/rpc.ypupdated/update.c b/usr.sbin/rpc.ypupdated/update.c
index 688ae636888d..332ed752acc4 100644
--- a/usr.sbin/rpc.ypupdated/update.c
+++ b/usr.sbin/rpc.ypupdated/update.c
@@ -28,9 +28,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-#endif /* not lint */
-
/*
* Copyright (C) 1986, 1989, Sun Microsystems, Inc.
*/
diff --git a/usr.sbin/rpcbind/check_bound.c b/usr.sbin/rpcbind/check_bound.c
index e2f474532619..446dceb3502f 100644
--- a/usr.sbin/rpcbind/check_bound.c
+++ b/usr.sbin/rpcbind/check_bound.c
@@ -33,9 +33,6 @@
* Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
*/
-#if 0
-#endif
-
/*
* check_bound.c
* Checks to see whether the program is still bound to the
diff --git a/usr.sbin/rpcbind/pmap_svc.c b/usr.sbin/rpcbind/pmap_svc.c
index 2545f661da4a..cea1606258ae 100644
--- a/usr.sbin/rpcbind/pmap_svc.c
+++ b/usr.sbin/rpcbind/pmap_svc.c
@@ -33,9 +33,6 @@
* Copyright (c) 1984 - 1991 by Sun Microsystems, Inc.
*/
-#if 0
-#endif
-
/*
* pmap_svc.c
* The server procedure for the version 2 portmaper.
diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c
index 57019e3ab509..de05330d0ca5 100644
--- a/usr.sbin/rpcbind/rpcbind.c
+++ b/usr.sbin/rpcbind/rpcbind.c
@@ -33,9 +33,6 @@
* Copyright (c) 1984 - 1991 by Sun Microsystems, Inc.
*/
-#if 0
-#endif
-
/*
* rpcbind.c
* Implements the program, version to address mapping for rpc.
diff --git a/usr.sbin/rtprio/rtprio.c b/usr.sbin/rtprio/rtprio.c
index 63d89971b8ed..b5ded9308828 100644
--- a/usr.sbin/rtprio/rtprio.c
+++ b/usr.sbin/rtprio/rtprio.c
@@ -34,7 +34,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/rtprio.h>
diff --git a/usr.sbin/rtsold/cap_llflags.c b/usr.sbin/rtsold/cap_llflags.c
index bc07b2f1e3e4..29b7bd2d4b5c 100644
--- a/usr.sbin/rtsold/cap_llflags.c
+++ b/usr.sbin/rtsold/cap_llflags.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/dnv.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/rtsold/cap_script.c b/usr.sbin/rtsold/cap_script.c
index ba27bd1987c6..97b7f947532c 100644
--- a/usr.sbin/rtsold/cap_script.c
+++ b/usr.sbin/rtsold/cap_script.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/dnv.h>
diff --git a/usr.sbin/sa/db.c b/usr.sbin/sa/db.c
index f9af179b0db8..8776ed7cd9ed 100644
--- a/usr.sbin/sa/db.c
+++ b/usr.sbin/sa/db.c
@@ -27,7 +27,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/acct.h>
diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c
index 348c5494f95b..958b2c966d74 100644
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@@ -30,7 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/acct.h>
#include <err.h>
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index 8161bca3f8db..9e01d59a3693 100644
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@@ -30,7 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/acct.h>
diff --git a/usr.sbin/services_mkdb/services_mkdb.c b/usr.sbin/services_mkdb/services_mkdb.c
index 9c2a79750029..5c6de31ba5e1 100644
--- a/usr.sbin/services_mkdb/services_mkdb.c
+++ b/usr.sbin/services_mkdb/services_mkdb.c
@@ -31,7 +31,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/spi/spi.c b/usr.sbin/spi/spi.c
index d5344edd18c0..351474dde0ba 100644
--- a/usr.sbin/spi/spi.c
+++ b/usr.sbin/spi/spi.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/ioccom.h>
#include <sys/spigenio.h>
diff --git a/usr.sbin/tcpdrop/tcpdrop.c b/usr.sbin/tcpdrop/tcpdrop.c
index 882dff732304..6f6b94789df1 100644
--- a/usr.sbin/tcpdrop/tcpdrop.c
+++ b/usr.sbin/tcpdrop/tcpdrop.c
@@ -17,7 +17,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/uefisign/child.c b/usr.sbin/uefisign/child.c
index ee3f518f1473..7d2349aec7d7 100644
--- a/usr.sbin/uefisign/child.c
+++ b/usr.sbin/uefisign/child.c
@@ -29,7 +29,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/types.h>
diff --git a/usr.sbin/ugidfw/ugidfw.c b/usr.sbin/ugidfw/ugidfw.c
index 99156e6bbf94..1cba74e4bab7 100644
--- a/usr.sbin/ugidfw/ugidfw.c
+++ b/usr.sbin/ugidfw/ugidfw.c
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/mount.h>
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index f52a70872dee..fd1b98d8f4a3 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -13,7 +13,6 @@
* Snoop stuff.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/fcntl.h>
#include <sys/filio.h>
diff --git a/usr.sbin/ypbind/yp_ping.c b/usr.sbin/ypbind/yp_ping.c
index e00bc62b1139..38fbd403245c 100644
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@@ -59,9 +59,6 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if 0
-#endif
-#include <sys/cdefs.h>
/*
* clnt_udp.c, Implements a UDP/IP based, client side RPC.
*
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 1cfe7d4edcb7..2aacfa5c87d6 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index e6ca3015f30a..e6cde29d221a 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -33,7 +33,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ypserv/common/yplib_host.c b/usr.sbin/ypserv/common/yplib_host.c
index 8462d61432d4..2751c5950d87 100644
--- a/usr.sbin/ypserv/common/yplib_host.c
+++ b/usr.sbin/ypserv/common/yplib_host.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/types.h>
diff --git a/usr.sbin/ypserv/yp_extern.h b/usr.sbin/ypserv/yp_extern.h
index 2bdd5befa1f7..3fe03df71b88 100644
--- a/usr.sbin/ypserv/yp_extern.h
+++ b/usr.sbin/ypserv/yp_extern.h
@@ -37,7 +37,7 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include <sys/cdefs.h>
+
#include <sys/types.h>
#include <rpc/rpc.h>
#include <rpcsvc/yp.h>
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index 7f269e361969..2a22b54b9350 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>