git: 4d65a7c6951c - main - usr.sbin: Automated cleanup of cdefs and other formatting

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

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

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

    usr.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
---
 usr.sbin/autofs/automount.c                                      | 1 -
 usr.sbin/autofs/automountd.c                                     | 1 -
 usr.sbin/autofs/autounmountd.c                                   | 1 -
 usr.sbin/autofs/common.c                                         | 1 -
 usr.sbin/autofs/defined.c                                        | 1 -
 usr.sbin/autofs/popen.c                                          | 1 -
 usr.sbin/bhyve/acpi.c                                            | 1 -
 usr.sbin/bhyve/amd64/atkbdc.c                                    | 1 -
 usr.sbin/bhyve/amd64/fwctl.c                                     | 2 +-
 usr.sbin/bhyve/amd64/inout.c                                     | 1 -
 usr.sbin/bhyve/amd64/ioapic.c                                    | 1 -
 usr.sbin/bhyve/amd64/kernemu_dev.c                               | 2 +-
 usr.sbin/bhyve/amd64/mptbl.c                                     | 1 -
 usr.sbin/bhyve/amd64/pci_irq.c                                   | 2 --
 usr.sbin/bhyve/amd64/pci_lpc.c                                   | 1 -
 usr.sbin/bhyve/amd64/pm.c                                        | 1 -
 usr.sbin/bhyve/amd64/post.c                                      | 1 -
 usr.sbin/bhyve/amd64/ps2kbd.c                                    | 1 -
 usr.sbin/bhyve/amd64/ps2mouse.c                                  | 1 -
 usr.sbin/bhyve/amd64/rtc.c                                       | 1 -
 usr.sbin/bhyve/amd64/spinup_ap.c                                 | 1 -
 usr.sbin/bhyve/amd64/task_switch.c                               | 1 -
 usr.sbin/bhyve/amd64/vga.c                                       | 1 -
 usr.sbin/bhyve/amd64/xmsr.c                                      | 1 -
 usr.sbin/bhyve/bhyvegc.c                                         | 1 -
 usr.sbin/bhyve/bhyverun.c                                        | 1 -
 usr.sbin/bhyve/block_if.c                                        | 1 -
 usr.sbin/bhyve/console.c                                         | 1 -
 usr.sbin/bhyve/gdb.c                                             | 1 -
 usr.sbin/bhyve/iov.c                                             | 1 -
 usr.sbin/bhyve/mem.c                                             | 1 -
 usr.sbin/bhyve/net_utils.c                                       | 1 -
 usr.sbin/bhyve/pci_ahci.c                                        | 1 -
 usr.sbin/bhyve/pci_e82545.c                                      | 1 -
 usr.sbin/bhyve/pci_emul.c                                        | 1 -
 usr.sbin/bhyve/pci_fbuf.c                                        | 1 -
 usr.sbin/bhyve/pci_hda.c                                         | 1 -
 usr.sbin/bhyve/pci_passthru.c                                    | 1 -
 usr.sbin/bhyve/pci_uart.c                                        | 1 -
 usr.sbin/bhyve/pci_virtio_9p.c                                   | 1 -
 usr.sbin/bhyve/pci_virtio_block.c                                | 1 -
 usr.sbin/bhyve/pci_virtio_console.c                              | 1 -
 usr.sbin/bhyve/pci_virtio_input.c                                | 1 -
 usr.sbin/bhyve/pci_virtio_net.c                                  | 1 -
 usr.sbin/bhyve/pci_virtio_rnd.c                                  | 1 -
 usr.sbin/bhyve/pci_virtio_scsi.c                                 | 1 -
 usr.sbin/bhyve/pci_xhci.c                                        | 2 +-
 usr.sbin/bhyve/pctestdev.c                                       | 1 -
 usr.sbin/bhyve/rfb.c                                             | 1 -
 usr.sbin/bhyve/smbiostbl.c                                       | 1 -
 usr.sbin/bhyve/snapshot.c                                        | 1 -
 usr.sbin/bhyve/sockstream.c                                      | 1 -
 usr.sbin/bhyve/tpm_intf_crb.c                                    | 1 -
 usr.sbin/bhyve/tpm_ppi_qemu.c                                    | 1 -
 usr.sbin/bhyve/uart_emul.c                                       | 1 -
 usr.sbin/bhyve/usb_emul.c                                        | 1 -
 usr.sbin/bhyve/virtio.c                                          | 1 -
 usr.sbin/bhyve/vmgenc.c                                          | 2 +-
 usr.sbin/bhyvectl/bhyvectl.c                                     | 1 -
 usr.sbin/binmiscctl/binmiscctl.c                                 | 1 -
 usr.sbin/boot0cfg/boot0cfg.c                                     | 1 -
 usr.sbin/bsdinstall/distextract/distextract.c                    | 1 -
 usr.sbin/bsdinstall/distfetch/distfetch.c                        | 1 -
 usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c                    | 1 -
 usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c                    | 1 -
 usr.sbin/config/mkheaders.c                                      | 3 ---
 usr.sbin/config/mkmakefile.cc                                    | 3 ---
 usr.sbin/config/mkoptions.cc                                     | 3 ---
 usr.sbin/cpucontrol/amd10h.c                                     | 1 -
 usr.sbin/crunch/crunchgen/crunched_main.c                        | 1 -
 usr.sbin/crunch/crunchgen/crunchgen.c                            | 1 -
 usr.sbin/ctladm/ctladm.c                                         | 1 -
 usr.sbin/ctld/ctld.c                                             | 1 -
 usr.sbin/ctld/isns.c                                             | 1 -
 usr.sbin/ctld/kernel.c                                           | 1 -
 usr.sbin/cxgbetool/cxgbetool.c                                   | 1 -
 usr.sbin/daemon/daemon.c                                         | 1 -
 usr.sbin/devinfo/devinfo.c                                       | 1 -
 usr.sbin/efitable/efitable.c                                     | 1 -
 usr.sbin/fstyp/exfat.c                                           | 1 -
 usr.sbin/fstyp/fstyp.c                                           | 1 -
 usr.sbin/fstyp/ufs.c                                             | 1 -
 usr.sbin/fstyp/zfs.c                                             | 1 -
 usr.sbin/gssd/gssd.c                                             | 1 -
 usr.sbin/ifmcstat/ifmcstat.c                                     | 1 -
 usr.sbin/iovctl/iovctl.c                                         | 1 -
 usr.sbin/iovctl/parse.c                                          | 1 -
 usr.sbin/iovctl/validate.c                                       | 1 -
 usr.sbin/iscsid/discovery.c                                      | 1 -
 usr.sbin/iscsid/iscsid.c                                         | 1 -
 usr.sbin/iscsid/login.c                                          | 1 -
 usr.sbin/jail/command.c                                          | 1 -
 usr.sbin/jail/config.c                                           | 1 -
 usr.sbin/jail/jail.c                                             | 1 -
 usr.sbin/jls/jls.c                                               | 1 -
 usr.sbin/kbdmap/kbdmap.c                                         | 1 -
 usr.sbin/keyserv/keyserv.c                                       | 3 ---
 usr.sbin/keyserv/setkey.c                                        | 3 ---
 usr.sbin/kldxref/ef_riscv.c                                      | 1 -
 usr.sbin/lpr/common_source/common.c                              | 3 ---
 usr.sbin/lpr/common_source/displayq.c                            | 3 ---
 usr.sbin/lpr/common_source/printcap.c                            | 3 ---
 usr.sbin/lpr/common_source/rmjob.c                               | 3 ---
 usr.sbin/lpr/common_source/startdaemon.c                         | 3 ---
 usr.sbin/lpr/lpc/cmdtab.c                                        | 3 ---
 usr.sbin/lpr/lpd/lpdchar.c                                       | 3 ---
 usr.sbin/lpr/lpd/modes.c                                         | 3 ---
 usr.sbin/mailwrapper/mailwrapper.c                               | 1 -
 usr.sbin/makefs/cd9660.c                                         | 1 -
 usr.sbin/makefs/cd9660/cd9660_debug.c                            | 1 -
 usr.sbin/makefs/cd9660/cd9660_strings.c                          | 1 -
 usr.sbin/makefs/ffs/buf.c                                        | 1 -
 usr.sbin/makefs/ffs/ffs_alloc.c                                  | 1 -
 usr.sbin/makefs/ffs/ffs_balloc.c                                 | 1 -
 usr.sbin/makefs/ffs/ffs_bswap.c                                  | 1 -
 usr.sbin/makefs/ffs/ffs_subr.c                                   | 1 -
 usr.sbin/makefs/ffs/mkfs.c                                       | 1 -
 usr.sbin/makefs/ffs/ufs_bmap.c                                   | 1 -
 usr.sbin/makefs/makefs.c                                         | 1 -
 usr.sbin/makefs/msdos.c                                          | 1 -
 usr.sbin/makefs/msdos/msdosfs_conv.c                             | 1 -
 usr.sbin/makefs/msdos/msdosfs_denode.c                           | 1 -
 usr.sbin/makefs/msdos/msdosfs_vnops.c                            | 1 -
 usr.sbin/makefs/mtree.c                                          | 1 -
 usr.sbin/makefs/walk.c                                           | 2 --
 usr.sbin/mld6query/mld6.c                                        | 1 -
 usr.sbin/mlx5tool/mlx5tool.c                                     | 1 -
 usr.sbin/moused/moused.c                                         | 1 -
 usr.sbin/mpsutil/mps_cmd.c                                       | 1 -
 usr.sbin/mpsutil/mps_debug.c                                     | 1 -
 usr.sbin/mpsutil/mps_set.c                                       | 1 -
 usr.sbin/mpsutil/mps_show.c                                      | 1 -
 usr.sbin/mpsutil/mpsutil.c                                       | 1 -
 usr.sbin/mptutil/mpt_cam.c                                       | 1 -
 usr.sbin/mptutil/mpt_cmd.c                                       | 1 -
 usr.sbin/mptutil/mpt_config.c                                    | 1 -
 usr.sbin/mptutil/mpt_drive.c                                     | 1 -
 usr.sbin/mptutil/mpt_evt.c                                       | 1 -
 usr.sbin/mptutil/mpt_show.c                                      | 1 -
 usr.sbin/mptutil/mpt_volume.c                                    | 1 -
 usr.sbin/mptutil/mptutil.c                                       | 1 -
 usr.sbin/mtest/mtest.c                                           | 1 -
 usr.sbin/nfscbd/nfscbd.c                                         | 1 -
 usr.sbin/nfsdumpstate/nfsdumpstate.c                             | 1 -
 usr.sbin/nfsrevoke/nfsrevoke.c                                   | 1 -
 usr.sbin/nfsuserd/nfsuserd.c                                     | 1 -
 usr.sbin/ngctl/main.c                                            | 1 -
 usr.sbin/nscd/agents/group.c                                     | 1 -
 usr.sbin/nscd/agents/passwd.c                                    | 1 -
 usr.sbin/nscd/agents/services.c                                  | 1 -
 usr.sbin/nscd/mp_rs_query.c                                      | 1 -
 usr.sbin/nscd/mp_ws_query.c                                      | 1 -
 usr.sbin/nscd/nscd.c                                             | 1 -
 usr.sbin/nscd/nscdcli.c                                          | 1 -
 usr.sbin/nscd/query.c                                            | 1 -
 usr.sbin/ofwdump/ofw_util.c                                      | 1 -
 usr.sbin/pkg/config.c                                            | 1 -
 usr.sbin/pkg/pkg.c                                               | 1 -
 usr.sbin/pmc/cmd_pmc_filter.cc                                   | 1 -
 usr.sbin/pmc/cmd_pmc_list.c                                      | 1 -
 usr.sbin/pmc/cmd_pmc_stat.c                                      | 1 -
 usr.sbin/pmc/cmd_pmc_summary.cc                                  | 1 -
 usr.sbin/pmc/pmc_util.c                                          | 1 -
 usr.sbin/pmcannotate/pmcannotate.c                               | 1 -
 usr.sbin/pmccontrol/pmccontrol.c                                 | 1 -
 usr.sbin/pmcstat/pmcpl_annotate.c                                | 1 -
 usr.sbin/pmcstat/pmcpl_annotate_cg.c                             | 1 -
 usr.sbin/pmcstat/pmcpl_callgraph.c                               | 1 -
 usr.sbin/pmcstat/pmcpl_calltree.c                                | 1 -
 usr.sbin/pmcstat/pmcpl_gprof.c                                   | 1 -
 usr.sbin/pmcstat/pmcstat.c                                       | 1 -
 usr.sbin/pmcstat/pmcstat_log.c                                   | 1 -
 usr.sbin/powerd/powerd.c                                         | 1 -
 usr.sbin/ppp/async.c                                             | 1 -
 usr.sbin/pppctl/pppctl.c                                         | 1 -
 usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c | 1 -
 usr.sbin/pw/pwupd.h                                              | 1 -
 usr.sbin/quot/quot.c                                             | 1 -
 usr.sbin/rpc.lockd/kern.c                                        | 1 -
 usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c                             | 1 -
 usr.sbin/rpc.tlsservd/rpc.tlsservd.c                             | 1 -
 usr.sbin/rpc.yppasswdd/yppasswdd_main.c                          | 1 -
 usr.sbin/rpc.yppasswdd/yppasswdd_server.c                        | 1 -
 usr.sbin/rpc.ypupdated/update.c                                  | 3 ---
 usr.sbin/rpcbind/check_bound.c                                   | 3 ---
 usr.sbin/rpcbind/pmap_svc.c                                      | 3 ---
 usr.sbin/rpcbind/rpcbind.c                                       | 3 ---
 usr.sbin/rtprio/rtprio.c                                         | 1 -
 usr.sbin/rtsold/cap_llflags.c                                    | 1 -
 usr.sbin/rtsold/cap_script.c                                     | 1 -
 usr.sbin/sa/db.c                                                 | 1 -
 usr.sbin/sa/pdb.c                                                | 1 -
 usr.sbin/sa/usrdb.c                                              | 1 -
 usr.sbin/services_mkdb/services_mkdb.c                           | 1 -
 usr.sbin/spi/spi.c                                               | 1 -
 usr.sbin/tcpdrop/tcpdrop.c                                       | 1 -
 usr.sbin/uefisign/child.c                                        | 1 -
 usr.sbin/ugidfw/ugidfw.c                                         | 1 -
 usr.sbin/watch/watch.c                                           | 1 -
 usr.sbin/ypbind/yp_ping.c                                        | 3 ---
 usr.sbin/ypbind/ypbind.c                                         | 1 -
 usr.sbin/yppoll/yppoll.c                                         | 1 -
 usr.sbin/ypserv/common/yplib_host.c                              | 1 -
 usr.sbin/ypserv/yp_extern.h                                      | 2 +-
 usr.sbin/ypset/ypset.c                                           | 1 -
 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
*** 1750 LINES SKIPPED ***