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
2024-10-18 02:19:39 +00:00 · 2023-11-24 13:12:57 -07:00 · 2023-11-24 13:12:57 -07:00 · 32e86a82f5
commit 32e86a82f5
parent a6fe717c2a
111 changed files with 1 additions and 166 deletions
--- a/sbin/bectl/bectl.c
+++ b/sbin/bectl/bectl.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <errno.h>
--- a/sbin/bectl/bectl_jail.c
+++ b/sbin/bectl/bectl_jail.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/jail.h>
 #include <sys/mount.h>
--- a/sbin/bectl/bectl_list.c
+++ b/sbin/bectl/bectl_list.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <stdbool.h>
 #include <stdio.h>
--- a/sbin/camcontrol/depop.c
+++ b/sbin/camcontrol/depop.c
@ -50,7 +50,6 @@
 * 'depop' provides a wrapper around all these functions.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>

 #include <err.h>
--- a/sbin/camcontrol/fwdownload.c
+++ b/sbin/camcontrol/fwdownload.c
@ -49,7 +49,6 @@
 * specified device.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>

--- a/sbin/camcontrol/timestamp.c
+++ b/sbin/camcontrol/timestamp.c
@ -35,7 +35,6 @@
 * SCSI tape drive timestamp support
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>

 #include <assert.h>
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@ -32,7 +32,6 @@
 * NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/linker.h>
 #include <sys/module.h>
--- a/sbin/conscontrol/conscontrol.c
+++ b/sbin/conscontrol/conscontrol.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/ioctl.h>
--- a/sbin/ddb/ddb_capture.c
+++ b/sbin/ddb/ddb_capture.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>

--- a/sbin/ddb/ddb_script.c
+++ b/sbin/ddb/ddb_script.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>

--- a/sbin/decryptcore/decryptcore.c
+++ b/sbin/decryptcore/decryptcore.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/capsicum.h>
 #include <sys/endian.h>
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@ -63,7 +63,6 @@
 //	  - devd needs to document the unix domain socket
 //	  - devd.conf needs more details on the supported statements.

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
@ -30,7 +30,6 @@
 * DEVFS control.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/queue.h>

--- a/sbin/devfs/rule.c
+++ b/sbin/devfs/rule.c
@ -30,7 +30,6 @@
 * Rule subsystem manipulation.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
--- a/sbin/devmatch/devmatch.c
+++ b/sbin/devmatch/devmatch.c
@ -23,7 +23,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <ctype.h>
 #include <devinfo.h>
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/mtio.h>
 #include <sys/socket.h>
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/queue.h>

--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/wait.h>
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/stat.h>

--- a/sbin/dump/unctime.c
+++ b/sbin/dump/unctime.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-#endif /* not lint */
-
 #include <time.h>

 /*
--- a/sbin/fdisk/fdisk_mbr_enc.c
+++ b/sbin/fdisk/fdisk_mbr_enc.c
@ -33,7 +33,6 @@
 * NB!  This file must be usable both in kernel and userland.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/diskmbr.h>
 #include <sys/endian.h>
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@ -34,7 +34,6 @@
 * $NetBSD: fsck.c,v 1.30 2003/08/07 10:04:15 agc Exp $
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/queue.h>
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/types.h>
--- a/sbin/fsck_ffs/ea.c
+++ b/sbin/fsck_ffs/ea.c
@ -35,7 +35,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stdint.h>
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/types.h>
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/stdint.h>
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>

 #include <ufs/ufs/dinode.h>
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>

--- a/sbin/fsck_ffs/pass3.c
+++ b/sbin/fsck_ffs/pass3.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>

 #include <ufs/ufs/dinode.h>
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>

--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>

--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/disk.h>
 #include <sys/stat.h>
--- a/sbin/fsck_ffs/suj.c
+++ b/sbin/fsck_ffs/suj.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/linker.h>
 #include <sys/module.h>
--- a/sbin/geom/misc/subr.c
+++ b/sbin/geom/misc/subr.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/disk.h>
 #include <sys/endian.h>
--- a/sbin/hastctl/hastctl.c
+++ b/sbin/hastctl/hastctl.c
@ -29,7 +29,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>

 #include <err.h>
--- a/sbin/hastd/activemap.c
+++ b/sbin/hastd/activemap.c
@ -29,7 +29,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>	/* powerof2() */
 #include <sys/queue.h>

--- a/sbin/hastd/control.c
+++ b/sbin/hastd/control.c
@ -29,7 +29,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/wait.h>

--- a/sbin/hastd/ebuf.c
+++ b/sbin/hastd/ebuf.c
@ -29,7 +29,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>

 #include <errno.h>
--- a/sbin/hastd/hastd.c
+++ b/sbin/hastd/hastd.c
@ -30,7 +30,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/linker.h>
 #include <sys/module.h>
--- a/sbin/hastd/hooks.c
+++ b/sbin/hastd/hooks.c
@ -30,7 +30,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
--- a/sbin/hastd/nv.c
+++ b/sbin/hastd/nv.c
@ -29,7 +29,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/endian.h>

--- a/sbin/hastd/pjdlog.c
+++ b/sbin/hastd/pjdlog.c
@ -30,7 +30,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
--- a/sbin/hastd/primary.c
+++ b/sbin/hastd/primary.c
@ -30,7 +30,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/bio.h>
--- a/sbin/hastd/proto.c
+++ b/sbin/hastd/proto.c
@ -29,7 +29,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
--- a/sbin/hastd/proto_common.c
+++ b/sbin/hastd/proto_common.c
@ -30,7 +30,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>

--- a/sbin/hastd/proto_socketpair.c
+++ b/sbin/hastd/proto_socketpair.c
@ -29,7 +29,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>

--- a/sbin/hastd/proto_tcp.c
+++ b/sbin/hastd/proto_tcp.c
@ -30,7 +30,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>	/* MAXHOSTNAMELEN */
 #include <sys/socket.h>

--- a/sbin/hastd/secondary.c
+++ b/sbin/hastd/secondary.c
@ -30,7 +30,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/bio.h>
--- a/sbin/hastd/subr.c
+++ b/sbin/hastd/subr.c
@ -30,7 +30,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/disk.h>
 #include <sys/ioctl.h>
--- a/sbin/ifconfig/ifgre.c
+++ b/sbin/ifconfig/ifgre.c
@ -25,7 +25,6 @@
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
--- a/sbin/ifconfig/ifipsec.c
+++ b/sbin/ifconfig/ifipsec.c
@ -25,7 +25,6 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
--- a/sbin/ifconfig/ifvxlan.c
+++ b/sbin/ifconfig/ifvxlan.c
@ -24,7 +24,6 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
--- a/sbin/ipfw/nat64clat.c
+++ b/sbin/ipfw/nat64clat.c
@ -27,7 +27,6 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>

--- a/sbin/ipfw/nat64lsn.c
+++ b/sbin/ipfw/nat64lsn.c
@ -27,7 +27,6 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>

--- a/sbin/ipfw/nat64stl.c
+++ b/sbin/ipfw/nat64stl.c
@ -26,7 +26,6 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>

--- a/sbin/ipfw/nptv6.c
+++ b/sbin/ipfw/nptv6.c
@ -25,7 +25,6 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>

--- a/sbin/kldconfig/kldconfig.c
+++ b/sbin/kldconfig/kldconfig.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/queue.h>
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/linker.h>
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/module.h>
--- a/sbin/kldunload/kldunload.c
+++ b/sbin/kldunload/kldunload.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/linker.h>

--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@ -17,7 +17,6 @@
 *  documentation and/or software.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
--- a/sbin/mdmfs/mdmfs.c
+++ b/sbin/mdmfs/mdmfs.c
@ -32,7 +32,6 @@
 * the deprecated mount_mfs(8).
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/linker.h>
 #include <sys/mdioctl.h>
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
--- a/sbin/mount/vfslist.c
+++ b/sbin/mount/vfslist.c
@ -29,9 +29,6 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
 #include <err.h>
 #include <stdlib.h>
 #include <string.h>
--- a/sbin/mount_fusefs/mount_fusefs.c
+++ b/sbin/mount_fusefs/mount_fusefs.c
@ -33,7 +33,6 @@
 *
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/uio.h>
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@ -38,9 +38,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
-#include <sys/cdefs.h>
 #define _WANT_P_OSREL
 #include <sys/param.h>
 #include <sys/disklabel.h>
--- a/sbin/nvmecontrol/comnd.c
+++ b/sbin/nvmecontrol/comnd.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/nvmecontrol/devlist.c
+++ b/sbin/nvmecontrol/devlist.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>

 #include <err.h>
--- a/sbin/nvmecontrol/firmware.c
+++ b/sbin/nvmecontrol/firmware.c
@ -29,7 +29,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>
 #include <sys/stat.h>
--- a/sbin/nvmecontrol/format.c
+++ b/sbin/nvmecontrol/format.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/nvmecontrol/identify.c
+++ b/sbin/nvmecontrol/identify.c
@ -27,7 +27,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>

 #include <ctype.h>
--- a/sbin/nvmecontrol/identify_ext.c
+++ b/sbin/nvmecontrol/identify_ext.c
@ -27,7 +27,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>

 #include <ctype.h>
--- a/sbin/nvmecontrol/logpage.c
+++ b/sbin/nvmecontrol/logpage.c
@ -30,7 +30,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/nvmecontrol/modules/intel/intel.c
+++ b/sbin/nvmecontrol/modules/intel/intel.c
@ -29,7 +29,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/nvmecontrol/modules/samsung/samsung.c
+++ b/sbin/nvmecontrol/modules/samsung/samsung.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/nvmecontrol/modules/wdc/wdc.c
+++ b/sbin/nvmecontrol/modules/wdc/wdc.c
@ -23,7 +23,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>
 #include <sys/endian.h>
--- a/sbin/nvmecontrol/ns.c
+++ b/sbin/nvmecontrol/ns.c
@ -26,7 +26,6 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/nvmecontrol/nsid.c
+++ b/sbin/nvmecontrol/nsid.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>

 #include <stdio.h>
--- a/sbin/nvmecontrol/nvmecontrol.c
+++ b/sbin/nvmecontrol/nvmecontrol.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>
 #include <sys/stat.h>
--- a/sbin/nvmecontrol/passthru.c
+++ b/sbin/nvmecontrol/passthru.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/nvmecontrol/perftest.c
+++ b/sbin/nvmecontrol/perftest.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/nvmecontrol/power.c
+++ b/sbin/nvmecontrol/power.c
@ -23,7 +23,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/nvmecontrol/reset.c
+++ b/sbin/nvmecontrol/reset.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/nvmecontrol/resv.c
+++ b/sbin/nvmecontrol/resv.c
@ -25,7 +25,6 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/nvmecontrol/sanitize.c
+++ b/sbin/nvmecontrol/sanitize.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/nvmecontrol/selftest.c
+++ b/sbin/nvmecontrol/selftest.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioccom.h>

--- a/sbin/pfctl/pf_print_state.c
+++ b/sbin/pfctl/pf_print_state.c
@ -32,7 +32,6 @@
 *
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/endian.h>
--- a/sbin/pfctl/pf_ruleset.c
+++ b/sbin/pfctl/pf_ruleset.c
@ -36,7 +36,6 @@
 *	$OpenBSD: pf_ruleset.c,v 1.2 2008/12/18 15:31:37 dhill Exp $
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/mbuf.h>
--- a/sbin/pfctl/pfctl_optimize.c
+++ b/sbin/pfctl/pfctl_optimize.c
@ -16,7 +16,6 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
--- a/sbin/pfctl/pfctl_osfp.c
+++ b/sbin/pfctl/pfctl_osfp.c
@ -16,7 +16,6 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@ -33,7 +33,6 @@
 *
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
--- a/sbin/pfctl/pfctl_radix.c
+++ b/sbin/pfctl/pfctl_radix.c
@ -32,7 +32,6 @@
 *
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
--- a/sbin/pfctl/pfctl_table.c
+++ b/sbin/pfctl/pfctl_table.c
@ -32,7 +32,6 @@
 *
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
--- a/sbin/pfctl/tests/pfctl_test.c
+++ b/sbin/pfctl/tests/pfctl_test.c
@ -30,7 +30,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include <sys/cdefs.h>
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <err.h>
--- a/sbin/pfilctl/pfilctl.c
+++ b/sbin/pfilctl/pfilctl.c
@ -25,7 +25,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
--- a/sbin/ping/main.c
+++ b/sbin/ping/main.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>

--- a/Show More
+++ b/Show More