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

@@ -29,7 +29,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>

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>

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>

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>

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>

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>

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>

usr.sbin/bhyve/amd64/atkbdc.c

@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/vmm.h>

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>

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>

usr.sbin/bhyve/amd64/ioapic.c

@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <stdio.h>
 

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>

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>

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>
 

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>

usr.sbin/bhyve/amd64/pm.c

@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <machine/vmm.h>
 

usr.sbin/bhyve/amd64/post.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <assert.h>

usr.sbin/bhyve/amd64/ps2kbd.c

@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 

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>

usr.sbin/bhyve/amd64/rtc.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <time.h>

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>
 

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>

usr.sbin/bhyve/amd64/vga.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <assert.h>

usr.sbin/bhyve/amd64/xmsr.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/cpufunc.h>

usr.sbin/bhyve/bhyvegc.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <stdlib.h>

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>

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>

usr.sbin/bhyve/console.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include "bhyvegc.h"

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>

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>

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>

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>
 

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>

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>

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>

usr.sbin/bhyve/pci_fbuf.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 

usr.sbin/bhyve/pci_hda.c

@@ -27,7 +27,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <time.h>
 

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>

usr.sbin/bhyve/pci_uart.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <stdio.h>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

usr.sbin/bhyve/smbiostbl.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <assert.h>

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>

usr.sbin/bhyve/sockstream.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <unistd.h>
 

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>

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>

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

usr.sbin/bhyve/usb_emul.c

@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 

usr.sbin/bhyve/virtio.c

@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/uio.h>
 

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>

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>

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>

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>

usr.sbin/bsdinstall/distextract/distextract.c

@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <archive.h>

usr.sbin/bsdinstall/distfetch/distfetch.c

@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <bsddialog.h>

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>
 

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>

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.

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

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
  */

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>

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>

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>
 

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>

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>

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>

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>

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>

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>

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>

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>

usr.sbin/fstyp/exfat.c

@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/endian.h>
 

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>

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>

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>

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>

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>

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>

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>

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>

usr.sbin/iscsid/discovery.c

@@ -29,7 +29,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <stdbool.h>

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>

usr.sbin/iscsid/login.c

@@ -29,7 +29,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <assert.h>

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>

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>

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>

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>

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>

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.
  */

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.
  */

usr.sbin/kldxref/ef_riscv.c

@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <machine/elf.h>
 

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>