git: a2f733abcff6 - main - lib: Automated cleanup of cdefs and other formatting

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

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

commit a2f733abcff64628b7771a47089628b7327a88bd
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:23:59 +0000

    lib: 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
---
 lib/csu/arm/crt1_c.c                                      | 1 -
 lib/csu/common/crtbegin.c                                 | 1 -
 lib/csu/tests/cxx_constructors.cc                         | 1 -
 lib/csu/tests/fini_test.c                                 | 1 -
 lib/flua/libjail/lua_jail.c                               | 1 -
 lib/geom/concat/geom_concat.c                             | 1 -
 lib/geom/eli/geom_eli.c                                   | 1 -
 lib/geom/journal/geom_journal.c                           | 1 -
 lib/geom/journal/geom_journal_ufs.c                       | 1 -
 lib/geom/label/geom_label.c                               | 1 -
 lib/geom/mirror/geom_mirror.c                             | 1 -
 lib/geom/multipath/geom_multipath.c                       | 1 -
 lib/geom/raid/geom_raid.c                                 | 1 -
 lib/geom/raid3/geom_raid3.c                               | 1 -
 lib/geom/shsec/geom_shsec.c                               | 1 -
 lib/geom/stripe/geom_stripe.c                             | 1 -
 lib/geom/virstor/geom_virstor.c                           | 1 -
 lib/libbe/be.c                                            | 1 -
 lib/libc/db/recno/rec_seq.c                               | 1 -
 lib/libc/rpc/svc_dg.c                                     | 2 --
 lib/libc/stdio/vfwprintf.c                                | 2 --
 lib/libc/stdio/vfwscanf.c                                 | 2 --
 lib/libc/stdlib/getopt_long.c                             | 2 --
 lib/libc/stdlib/ptsname.c                                 | 3 ---
 lib/libc/string/wcsncpy.c                                 | 2 --
 lib/libc/string/wcsstr.c                                  | 2 --
 lib/libcam/camlib.c                                       | 1 -
 lib/libcam/camlib.h                                       | 1 -
 lib/libcam/scsi_cmdparse.c                                | 1 -
 lib/libcam/scsi_wrap.c                                    | 1 -
 lib/libcasper/libcasper/libcasper.c                       | 1 -
 lib/libcasper/libcasper/libcasper_service.c               | 1 -
 lib/libcasper/libcasper/service.c                         | 1 -
 lib/libcasper/libcasper/zygote.c                          | 1 -
 lib/libcasper/services/cap_dns/tests/dns_test.c           | 1 -
 lib/libcasper/services/cap_fileargs/cap_fileargs.c        | 1 -
 lib/libcasper/services/cap_fileargs/tests/fileargs_test.c | 1 -
 lib/libcasper/services/cap_grp/tests/grp_test.c           | 1 -
 lib/libcasper/services/cap_net/tests/net_test.c           | 1 -
 lib/libcasper/services/cap_netdb/tests/netdb_test.c       | 1 -
 lib/libcasper/services/cap_pwd/cap_pwd.c                  | 1 -
 lib/libcasper/services/cap_pwd/tests/pwd_test.c           | 1 -
 lib/libcasper/services/cap_sysctl/cap_sysctl.c            | 1 -
 lib/libcasper/services/cap_sysctl/tests/sysctl_test.c     | 1 -
 lib/libcompat/4.1/ftime.c                                 | 1 -
 lib/libcrypt/crypt-md5.c                                  | 1 -
 lib/libcrypt/crypt-nthash.c                               | 1 -
 lib/libcrypt/crypt.c                                      | 1 -
 lib/libcrypt/misc.c                                       | 1 -
 lib/libdevctl/devctl.c                                    | 1 -
 lib/libdevinfo/devinfo.h                                  | 1 -
 lib/libdevstat/devstat.c                                  | 1 -
 lib/libdpv/dialogrc.c                                     | 1 -
 lib/libdpv/dprompt.c                                      | 1 -
 lib/libefivar/efivar-dp-xlate.c                           | 1 -
 lib/libexecinfo/tests/sigtramp_test.c                     | 2 +-
 lib/libfetch/common.c                                     | 1 -
 lib/libfetch/fetch.c                                      | 1 -
 lib/libfetch/file.c                                       | 1 -
 lib/libfigpar/figpar.c                                    | 1 -
 lib/libfigpar/string_m.c                                  | 1 -
 lib/libgeom/geom_util.c                                   | 1 -
 lib/libiconv_modules/DECHanyu/citrus_dechanyu.c           | 2 +-
 lib/libiconv_modules/EUC/citrus_euc.c                     | 1 -
 lib/libiconv_modules/EUCTW/citrus_euctw.c                 | 1 -
 lib/libiconv_modules/GBK2K/citrus_gbk2k.c                 | 1 -
 lib/libiconv_modules/ISO2022/citrus_iso2022.c             | 1 -
 lib/libiconv_modules/JOHAB/citrus_johab.c                 | 2 +-
 lib/libiconv_modules/MSKanji/citrus_mskanji.c             | 2 --
 lib/libiconv_modules/UTF8/citrus_utf8.c                   | 1 -
 lib/libiconv_modules/ZW/citrus_zw.c                       | 1 -
 lib/libipsec/ipsec_dump_policy.c                          | 1 -
 lib/libipsec/ipsec_get_policylen.c                        | 1 -
 lib/libipsec/ipsec_strerror.c                             | 1 -
 lib/libipsec/pfkey.c                                      | 1 -
 lib/libipsec/pfkey_dump.c                                 | 1 -
 lib/libipsec/policy_parse.y                               | 2 +-
 lib/libipsec/test-policy.c                                | 1 -
 lib/libiscsiutil/pdu.c                                    | 1 -
 lib/libjail/jail.c                                        | 1 -
 lib/libjail/jail_getid.c                                  | 1 -
 lib/libkvm/kvm.h                                          | 1 -
 lib/libkvm/kvm_arm.c                                      | 1 -
 lib/libkvm/kvm_cptime.c                                   | 1 -
 lib/libkvm/kvm_getswapinfo.c                              | 1 -
 lib/libkvm/kvm_minidump_powerpc64.c                       | 1 -
 lib/libkvm/kvm_minidump_powerpc64_hpt.c                   | 1 -
 lib/libkvm/kvm_pcpu.c                                     | 1 -
 lib/libkvm/kvm_powerpc.c                                  | 1 -
 lib/libkvm/kvm_powerpc64.c                                | 1 -
 lib/libkvm/kvm_private.c                                  | 1 -
 lib/libkvm/kvm_vnet.c                                     | 1 -
 lib/libkvm/tests/kvm_geterr_test.c                        | 1 -
 lib/libkvm/tests/kvm_open2_test.c                         | 1 -
 lib/libkvm/tests/kvm_open_test.c                          | 1 -
 lib/libkvm/tests/kvm_read_test.c                          | 1 -
 lib/libkvm/tests/kvm_test_common.c                        | 1 -
 lib/libmd/md5c.c                                          | 1 -
 lib/libmd/mdXhl.c                                         | 1 -
 lib/libmd/mddriver.c                                      | 1 -
 lib/libmd/ripemd.h                                        | 1 -
 lib/libmd/rmd160c.c                                       | 1 -
 lib/libmd/rmddriver.c                                     | 1 -
 lib/libmd/sha.h                                           | 1 -
 lib/libmd/sha0c.c                                         | 1 -
 lib/libmd/sha1c.c                                         | 1 -
 lib/libmd/shadriver.c                                     | 1 -
 lib/libmd/skeindriver.c                                   | 1 -
 lib/libmemstat/memstat_malloc.c                           | 1 -
 lib/libmt/mtlib.c                                         | 1 -
 lib/libnetbsd/sockaddr_snprintf.c                         | 1 -
 lib/libnetbsd/strsuftoll.c                                | 1 -
 lib/libnetbsd/util.c                                      | 1 -
 lib/libnetgraph/debug.c                                   | 1 -
 lib/libnetgraph/msg.c                                     | 1 -
 lib/libnetgraph/sock.c                                    | 1 -
 lib/libnv/msgio.c                                         | 1 -
 lib/libnv/tests/dnv_tests.cc                              | 1 -
 lib/libnv/tests/nv_array_tests.cc                         | 1 -
 lib/libnv/tests/nvlist_send_recv_test.c                   | 1 -
 lib/libopenbsd/getdtablecount.c                           | 1 -
 lib/libpam/modules/pam_chroot/pam_chroot.c                | 1 -
 lib/libpam/modules/pam_exec/pam_exec.c                    | 1 -
 lib/libpam/modules/pam_group/pam_group.c                  | 1 -
 lib/libpam/modules/pam_krb5/pam_krb5.c                    | 1 -
 lib/libpam/modules/pam_ksu/pam_ksu.c                      | 2 +-
 lib/libpam/modules/pam_login_access/login_access.c        | 1 -
 lib/libpam/modules/pam_nologin/pam_nologin.c              | 1 -
 lib/libpam/modules/pam_radius/pam_radius.c                | 1 -
 lib/libpam/modules/pam_securetty/pam_securetty.c          | 1 -
 lib/libpam/modules/pam_ssh/pam_ssh.c                      | 1 -
 lib/libpam/modules/pam_tacplus/pam_tacplus.c              | 1 -
 lib/libpam/modules/pam_unix/pam_unix.c                    | 1 -
 lib/libpjdlog/pjdlog.c                                    | 1 -
 lib/libpmc/libpmc.c                                       | 1 -
 lib/libpmc/pmc.h                                          | 1 -
 lib/libpmc/pmclog.c                                       | 1 -
 lib/libpmcstat/libpmcstat_event.c                         | 1 -
 lib/libpmcstat/libpmcstat_image.c                         | 1 -
 lib/libpmcstat/libpmcstat_logging.c                       | 1 -
 lib/libpmcstat/libpmcstat_process.c                       | 1 -
 lib/libpmcstat/libpmcstat_string.c                        | 1 -
 lib/libpmcstat/libpmcstat_symbol.c                        | 1 -
 lib/libproc/proc_bkpt.c                                   | 1 -
 lib/libproc/proc_create.c                                 | 1 -
 lib/libproc/proc_regs.c                                   | 1 -
 lib/libproc/proc_sym.c                                    | 1 -
 lib/libproc/proc_util.c                                   | 1 -
 lib/libproc/tests/proc_test.c                             | 1 -
 lib/libprocstat/cd9660.c                                  | 1 -
 lib/libprocstat/common_kvm.c                              | 1 -
 lib/libprocstat/core.c                                    | 1 -
 lib/libprocstat/libprocstat.c                             | 1 -
 lib/libprocstat/libprocstat_compat.c                      | 1 -
 lib/libprocstat/zfs_defs.c                                | 1 -
 lib/libradius/radlib.c                                    | 1 -
 lib/librss/librss.c                                       | 1 -
 lib/librt/aio.c                                           | 1 -
 lib/librt/mq.c                                            | 1 -
 lib/librt/timer.c                                         | 1 -
 lib/librtld_db/rtld_db.c                                  | 1 -
 lib/libsbuf/tests/sbuf_core_test.c                        | 1 -
 lib/libsbuf/tests/sbuf_stdio_test.c                       | 1 -
 lib/libsbuf/tests/sbuf_string_test.c                      | 1 -
 lib/libsecureboot/verify_file.c                           | 2 +-
 lib/libssp/fortify_stubs.c                                | 1 -
 lib/libsysdecode/errno.c                                  | 1 -
 lib/libsysdecode/linux.c                                  | 1 -
 lib/libsysdecode/signal.c                                 | 1 -
 lib/libsysdecode/support.c                                | 1 -
 lib/libsysdecode/utrace.c                                 | 1 -
 lib/libtacplus/taclib.c                                   | 1 -
 lib/libthr/tests/umtx_op_test.c                           | 1 -
 lib/libthr/thread/thr_ctrdtr.c                            | 1 -
 lib/libthr/thread/thr_kern.c                              | 1 -
 lib/libthr/thread/thr_list.c                              | 1 -
 lib/libthr/thread/thr_malloc.c                            | 1 -
 lib/libthr/thread/thr_pshared.c                           | 1 -
 lib/libthr/thread/thr_spinlock.c                          | 1 -
 lib/libthr/thread/thr_stack.c                             | 1 -
 lib/libthr/thread/thr_symbols.c                           | 1 -
 lib/libthread_db/arch/aarch64/libpthread_md.c             | 1 -
 lib/libthread_db/arch/arm/libpthread_md.c                 | 1 -
 lib/libthread_db/arch/i386/libpthread_md.c                | 1 -
 lib/libthread_db/arch/powerpc/libpthread_md.c             | 1 -
 lib/libthread_db/arch/riscv/libpthread_md.c               | 1 -
 lib/libufs/block.c                                        | 1 -
 lib/libufs/cgroup.c                                       | 1 -
 lib/libufs/inode.c                                        | 1 -
 lib/libufs/sblock.c                                       | 1 -
 lib/libufs/type.c                                         | 1 -
 lib/libulog/ulog_login.c                                  | 1 -
 lib/libusbhid/data.c                                      | 1 -
 lib/libusbhid/descr.c                                     | 1 -
 lib/libusbhid/descr_compat.c                              | 1 -
 lib/libusbhid/usage.c                                     | 1 -
 lib/libutil/_secure_path.c                                | 1 -
 lib/libutil/expand_number.c                               | 1 -
 lib/libutil/fparseln.c                                    | 1 -
 lib/libutil/getlocalbase.c                                | 1 -
 lib/libutil/gr_util.c                                     | 1 -
 lib/libutil/hexdump.c                                     | 1 -
 lib/libutil/humanize_number.c                             | 1 -
 lib/libutil/kinfo_getallproc.c                            | 1 -
 lib/libutil/kinfo_getproc.c                               | 1 -
 lib/libutil/kinfo_getvmobject.c                           | 1 -
 lib/libutil/login_auth.c                                  | 1 -
 lib/libutil/login_cap.c                                   | 1 -
 lib/libutil/login_class.c                                 | 1 -
 lib/libutil/login_crypt.c                                 | 1 -
 lib/libutil/login_ok.c                                    | 1 -
 lib/libutil/login_times.c                                 | 1 -
 lib/libutil/pidfile.c                                     | 1 -
 lib/libutil/property.c                                    | 1 -
 lib/libutil/realhostname.c                                | 1 -
 lib/libutil/tests/flopen_test.c                           | 1 -
 lib/libutil/tests/grp_test.c                              | 1 -
 lib/libutil/tests/pidfile_test.c                          | 1 -
 lib/libutil/tests/trimdomain-nodomain_test.c              | 1 -
 lib/libutil/tests/trimdomain_test.c                       | 1 -
 lib/libutil/trimdomain.c                                  | 1 -
 lib/libveriexec/veriexec_check.c                          | 1 -
 lib/libveriexec/veriexec_get.c                            | 1 -
 lib/libvgl/bitmap.c                                       | 1 -
 lib/libvmmapi/vmmapi.c                                    | 1 -
 lib/libvmmapi/vmmapi.h                                    | 1 -
 lib/libvmmapi/vmmapi_freebsd.c                            | 1 -
 lib/msun/amd64/fenv.c                                     | 1 -
 lib/msun/i387/fenv.c                                      | 1 -
 lib/msun/tests/cexp_test.c                                | 1 -
 lib/msun/tests/csqrt_test.c                               | 1 -
 lib/msun/tests/ctrig_test.c                               | 1 -
 lib/msun/tests/fenv_test.c                                | 1 -
 lib/msun/tests/fma_test.c                                 | 1 -
 lib/msun/tests/invctrig_test.c                            | 1 -
 lib/msun/tests/logarithm_test.c                           | 1 -
 lib/msun/tests/nan_test.c                                 | 1 -
 lib/msun/tests/nearbyint_test.c                           | 1 -
 lib/msun/tests/trig_test.c                                | 1 -
 239 files changed, 6 insertions(+), 248 deletions(-)

diff --git a/lib/csu/arm/crt1_c.c b/lib/csu/arm/crt1_c.c
index 7de2d333a598..bb40f262f5c2 100644
--- a/lib/csu/arm/crt1_c.c
+++ b/lib/csu/arm/crt1_c.c
@@ -41,7 +41,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/elf_common.h>
 
diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c
index ddeec986a431..d6978859af4a 100644
--- a/lib/csu/common/crtbegin.c
+++ b/lib/csu/common/crtbegin.c
@@ -21,7 +21,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include "crt.h"
diff --git a/lib/csu/tests/cxx_constructors.cc b/lib/csu/tests/cxx_constructors.cc
index 3568c4528c36..3c04053884d2 100644
--- a/lib/csu/tests/cxx_constructors.cc
+++ b/lib/csu/tests/cxx_constructors.cc
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
diff --git a/lib/csu/tests/fini_test.c b/lib/csu/tests/fini_test.c
index 9475b40f4271..79dbceb8a37c 100644
--- a/lib/csu/tests/fini_test.c
+++ b/lib/csu/tests/fini_test.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
diff --git a/lib/flua/libjail/lua_jail.c b/lib/flua/libjail/lua_jail.c
index b463f5c894ee..f364b090b3f9 100644
--- a/lib/flua/libjail/lua_jail.c
+++ b/lib/flua/libjail/lua_jail.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/jail.h>
 #include <errno.h>
diff --git a/lib/geom/concat/geom_concat.c b/lib/geom/concat/geom_concat.c
index df05b0994d79..424f60ce0179 100644
--- a/lib/geom/concat/geom_concat.c
+++ b/lib/geom/concat/geom_concat.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <paths.h>
diff --git a/lib/geom/eli/geom_eli.c b/lib/geom/eli/geom_eli.c
index 1efb760830c4..4dd1c5dea35d 100644
--- a/lib/geom/eli/geom_eli.c
+++ b/lib/geom/eli/geom_eli.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/sysctl.h>
diff --git a/lib/geom/journal/geom_journal.c b/lib/geom/journal/geom_journal.c
index 0f252a3aa26e..85eb6f88ae84 100644
--- a/lib/geom/journal/geom_journal.c
+++ b/lib/geom/journal/geom_journal.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <paths.h>
diff --git a/lib/geom/journal/geom_journal_ufs.c b/lib/geom/journal/geom_journal_ufs.c
index c01bf71da126..fc81663ec96a 100644
--- a/lib/geom/journal/geom_journal_ufs.c
+++ b/lib/geom/journal/geom_journal_ufs.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/disklabel.h>
 #include <sys/mount.h>
diff --git a/lib/geom/label/geom_label.c b/lib/geom/label/geom_label.c
index a8ec9b45628a..1daf3df1c5c2 100644
--- a/lib/geom/label/geom_label.c
+++ b/lib/geom/label/geom_label.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/geom/mirror/geom_mirror.c b/lib/geom/mirror/geom_mirror.c
index bdd9391e3315..8b47592803d9 100644
--- a/lib/geom/mirror/geom_mirror.c
+++ b/lib/geom/mirror/geom_mirror.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <err.h>
 #include <errno.h>
diff --git a/lib/geom/multipath/geom_multipath.c b/lib/geom/multipath/geom_multipath.c
index 4a9ddfc2cd1c..e4cb123594c3 100644
--- a/lib/geom/multipath/geom_multipath.c
+++ b/lib/geom/multipath/geom_multipath.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <paths.h>
diff --git a/lib/geom/raid/geom_raid.c b/lib/geom/raid/geom_raid.c
index cec3506f5757..f73b42e91e85 100644
--- a/lib/geom/raid/geom_raid.c
+++ b/lib/geom/raid/geom_raid.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <paths.h>
diff --git a/lib/geom/raid3/geom_raid3.c b/lib/geom/raid3/geom_raid3.c
index c4b0d0227c67..4967cec75448 100644
--- a/lib/geom/raid3/geom_raid3.c
+++ b/lib/geom/raid3/geom_raid3.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <paths.h>
diff --git a/lib/geom/shsec/geom_shsec.c b/lib/geom/shsec/geom_shsec.c
index 8a41b18def20..227bdcf39b7d 100644
--- a/lib/geom/shsec/geom_shsec.c
+++ b/lib/geom/shsec/geom_shsec.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <paths.h>
diff --git a/lib/geom/stripe/geom_stripe.c b/lib/geom/stripe/geom_stripe.c
index f0acd5fa45e3..da3a726db370 100644
--- a/lib/geom/stripe/geom_stripe.c
+++ b/lib/geom/stripe/geom_stripe.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <paths.h>
diff --git a/lib/geom/virstor/geom_virstor.c b/lib/geom/virstor/geom_virstor.c
index 5b81c43c0acc..131ece0107c7 100644
--- a/lib/geom/virstor/geom_virstor.c
+++ b/lib/geom/virstor/geom_virstor.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <paths.h>
diff --git a/lib/libbe/be.c b/lib/libbe/be.c
index 38e5e44abb53..c74ec9b0f3dc 100644
--- a/lib/libbe/be.c
+++ b/lib/libbe/be.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/module.h>
 #include <sys/mount.h>
diff --git a/lib/libc/db/recno/rec_seq.c b/lib/libc/db/recno/rec_seq.c
index 5ba51eb916e4..7f1ba88e73df 100644
--- a/lib/libc/db/recno/rec_seq.c
+++ b/lib/libc/db/recno/rec_seq.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c
index ddd9c25e21e3..892fe5ceaa53 100644
--- a/lib/libc/rpc/svc_dg.c
+++ b/lib/libc/rpc/svc_dg.c
@@ -34,8 +34,6 @@
  * Copyright (c) 1986-1991 by Sun Microsystems Inc.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#endif
 /*
  * svc_dg.c, Server side for connectionless RPC.
  *
diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c
index ca62716d38dd..d43b472f7730 100644
--- a/lib/libc/stdio/vfwprintf.c
+++ b/lib/libc/stdio/vfwprintf.c
@@ -37,8 +37,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
 /*
  * Actual wprintf innards.
  *
diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c
index 3f66d57e67b6..57206a8407d5 100644
--- a/lib/libc/stdio/vfwscanf.c
+++ b/lib/libc/stdio/vfwscanf.c
@@ -39,8 +39,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
 #include "namespace.h"
 #include <ctype.h>
 #include <inttypes.h>
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
index 1fdc5e3047af..5cf6a55649bd 100644
--- a/lib/libc/stdlib/getopt_long.c
+++ b/lib/libc/stdlib/getopt_long.c
@@ -49,8 +49,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if 0
-#endif
 #include <err.h>
 #include <errno.h>
 #include <getopt.h>
diff --git a/lib/libc/stdlib/ptsname.c b/lib/libc/stdlib/ptsname.c
index ea1bc9c7b7f6..adbf0e1692a4 100644
--- a/lib/libc/stdlib/ptsname.c
+++ b/lib/libc/stdlib/ptsname.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#endif /* not lint */
-
 #include "namespace.h"
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c
index 4302ce2d2ede..a02a8292c0d1 100644
--- a/lib/libc/string/wcsncpy.c
+++ b/lib/libc/string/wcsncpy.c
@@ -32,8 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
 #include <wchar.h>
 
 /*
diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c
index b874d1d6e9bd..beb5e8931742 100644
--- a/lib/libc/string/wcsstr.c
+++ b/lib/libc/string/wcsstr.c
@@ -32,8 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#endif
 #include <wchar.h>
 
 /*
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c
index 6074cdebeb63..6b3e62e13e6f 100644
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <assert.h>
diff --git a/lib/libcam/camlib.h b/lib/libcam/camlib.h
index 621ac5bf08d4..c82a529181cb 100644
--- a/lib/libcam/camlib.h
+++ b/lib/libcam/camlib.h
@@ -64,7 +64,6 @@
 #ifndef _CAMLIB_H
 #define _CAMLIB_H
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <cam/cam.h>
diff --git a/lib/libcam/scsi_cmdparse.c b/lib/libcam/scsi_cmdparse.c
index 81c8708c8d68..5aa69cd88fdb 100644
--- a/lib/libcam/scsi_cmdparse.c
+++ b/lib/libcam/scsi_cmdparse.c
@@ -37,7 +37,6 @@
  * From: scsi.c,v 1.8 1997/02/22 15:07:54 peter Exp $
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <stdlib.h>
diff --git a/lib/libcam/scsi_wrap.c b/lib/libcam/scsi_wrap.c
index e5bd76e6e9be..584f760bcc42 100644
--- a/lib/libcam/scsi_wrap.c
+++ b/lib/libcam/scsi_wrap.c
@@ -28,7 +28,6 @@
  * details.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/lib/libcasper/libcasper/libcasper.c b/lib/libcasper/libcasper/libcasper.c
index 095bbb9161e4..9cc008cdb7bc 100644
--- a/lib/libcasper/libcasper/libcasper.c
+++ b/lib/libcasper/libcasper/libcasper.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/nv.h>
diff --git a/lib/libcasper/libcasper/libcasper_service.c b/lib/libcasper/libcasper/libcasper_service.c
index 3468b520e275..df58f48d78eb 100644
--- a/lib/libcasper/libcasper/libcasper_service.c
+++ b/lib/libcasper/libcasper/libcasper_service.c
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
diff --git a/lib/libcasper/libcasper/service.c b/lib/libcasper/libcasper/service.c
index 103791676272..70418db50085 100644
--- a/lib/libcasper/libcasper/service.c
+++ b/lib/libcasper/libcasper/service.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
diff --git a/lib/libcasper/libcasper/zygote.c b/lib/libcasper/libcasper/zygote.c
index e0dcc665ee9e..976e391d8dcb 100644
--- a/lib/libcasper/libcasper/zygote.c
+++ b/lib/libcasper/libcasper/zygote.c
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/capsicum.h>
 #include <sys/procdesc.h>
diff --git a/lib/libcasper/services/cap_dns/tests/dns_test.c b/lib/libcasper/services/cap_dns/tests/dns_test.c
index 3786414053ad..2b50ab446dd1 100644
--- a/lib/libcasper/services/cap_dns/tests/dns_test.c
+++ b/lib/libcasper/services/cap_dns/tests/dns_test.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/capsicum.h>
 #include <sys/nv.h>
 
diff --git a/lib/libcasper/services/cap_fileargs/cap_fileargs.c b/lib/libcasper/services/cap_fileargs/cap_fileargs.c
index 859c862ef9e5..233b47ede613 100644
--- a/lib/libcasper/services/cap_fileargs/cap_fileargs.c
+++ b/lib/libcasper/services/cap_fileargs/cap_fileargs.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/capsicum.h>
 #include <sys/sysctl.h>
diff --git a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c
index 4df43f183735..7d499542abe9 100644
--- a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c
+++ b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c
@@ -23,7 +23,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/stat.h>
diff --git a/lib/libcasper/services/cap_grp/tests/grp_test.c b/lib/libcasper/services/cap_grp/tests/grp_test.c
index c120c61e0cf1..5441c8e9bdca 100644
--- a/lib/libcasper/services/cap_grp/tests/grp_test.c
+++ b/lib/libcasper/services/cap_grp/tests/grp_test.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/capsicum.h>
 #include <sys/nv.h>
 
diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c
index dcb897de467b..735e78fc51e0 100644
--- a/lib/libcasper/services/cap_net/tests/net_test.c
+++ b/lib/libcasper/services/cap_net/tests/net_test.c
@@ -23,7 +23,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/lib/libcasper/services/cap_netdb/tests/netdb_test.c b/lib/libcasper/services/cap_netdb/tests/netdb_test.c
index d4498e68ace0..5b984a8f6bd2 100644
--- a/lib/libcasper/services/cap_netdb/tests/netdb_test.c
+++ b/lib/libcasper/services/cap_netdb/tests/netdb_test.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/capsicum.h>
 #include <sys/nv.h>
 
diff --git a/lib/libcasper/services/cap_pwd/cap_pwd.c b/lib/libcasper/services/cap_pwd/cap_pwd.c
index 263bc4cfd582..6bae01601d60 100644
--- a/lib/libcasper/services/cap_pwd/cap_pwd.c
+++ b/lib/libcasper/services/cap_pwd/cap_pwd.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/nv.h>
 
diff --git a/lib/libcasper/services/cap_pwd/tests/pwd_test.c b/lib/libcasper/services/cap_pwd/tests/pwd_test.c
index e56c037536e2..ff796005e298 100644
--- a/lib/libcasper/services/cap_pwd/tests/pwd_test.c
+++ b/lib/libcasper/services/cap_pwd/tests/pwd_test.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/capsicum.h>
 #include <sys/nv.h>
 
diff --git a/lib/libcasper/services/cap_sysctl/cap_sysctl.c b/lib/libcasper/services/cap_sysctl/cap_sysctl.c
index 7d7f280fd00b..8e185e6474a0 100644
--- a/lib/libcasper/services/cap_sysctl/cap_sysctl.c
+++ b/lib/libcasper/services/cap_sysctl/cap_sysctl.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/cnv.h>
 #include <sys/dnv.h>
diff --git a/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c b/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c
index 2e5ec83e1c82..19803692141b 100644
--- a/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c
+++ b/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/capsicum.h>
 #include <sys/sysctl.h>
diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c
index 5ea57bca40fd..cb832e6c2526 100644
--- a/lib/libcompat/4.1/ftime.c
+++ b/lib/libcompat/4.1/ftime.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/time.h>
 #include <sys/timeb.h>
diff --git a/lib/libcrypt/crypt-md5.c b/lib/libcrypt/crypt-md5.c
index 3fb80c1ba540..52d38c64cdeb 100644
--- a/lib/libcrypt/crypt-md5.c
+++ b/lib/libcrypt/crypt-md5.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/lib/libcrypt/crypt-nthash.c b/lib/libcrypt/crypt-nthash.c
index cc9dbf7533cd..774fe3437c25 100644
--- a/lib/libcrypt/crypt-nthash.c
+++ b/lib/libcrypt/crypt-nthash.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <netinet/in.h>
diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c
index b4d0743df6cf..aaf3552f95ff 100644
--- a/lib/libcrypt/crypt.c
+++ b/lib/libcrypt/crypt.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <string.h>
diff --git a/lib/libcrypt/misc.c b/lib/libcrypt/misc.c
index ce55f5234fa7..e5db6b5dd838 100644
--- a/lib/libcrypt/misc.c
+++ b/lib/libcrypt/misc.c
@@ -29,7 +29,6 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include "crypt.h"
diff --git a/lib/libdevctl/devctl.c b/lib/libdevctl/devctl.c
index 20483e08da64..bc82d8b7b470 100644
--- a/lib/libdevctl/devctl.c
+++ b/lib/libdevctl/devctl.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <errno.h>
diff --git a/lib/libdevinfo/devinfo.h b/lib/libdevinfo/devinfo.h
index 32af3a0398a9..07e2043d43ce 100644
--- a/lib/libdevinfo/devinfo.h
+++ b/lib/libdevinfo/devinfo.h
@@ -30,7 +30,6 @@
 #ifndef _DEVINFO_H_INCLUDED
 #define _DEVINFO_H_INCLUDED
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/bus.h>
 
diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c
index 7aca8c5733d0..879e6e09b3a9 100644
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/errno.h>
diff --git a/lib/libdpv/dialogrc.c b/lib/libdpv/dialogrc.c
index fb4552e2db80..2ac745964e15 100644
--- a/lib/libdpv/dialogrc.c
+++ b/lib/libdpv/dialogrc.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/lib/libdpv/dprompt.c b/lib/libdpv/dprompt.c
index b891d4c779fa..66f785ac86a1 100644
--- a/lib/libdpv/dprompt.c
+++ b/lib/libdpv/dprompt.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #define _BSD_SOURCE /* to get dprintf() prototype in stdio.h below */
diff --git a/lib/libefivar/efivar-dp-xlate.c b/lib/libefivar/efivar-dp-xlate.c
index 6723cf707f50..1e816cecbb81 100644
--- a/lib/libefivar/efivar-dp-xlate.c
+++ b/lib/libefivar/efivar-dp-xlate.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/ucred.h>
 #include <sys/mount.h>
diff --git a/lib/libexecinfo/tests/sigtramp_test.c b/lib/libexecinfo/tests/sigtramp_test.c
index b8eecfddf43d..a4943d8d7f4f 100644
--- a/lib/libexecinfo/tests/sigtramp_test.c
+++ b/lib/libexecinfo/tests/sigtramp_test.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
-#include <sys/cdefs.h>
+
 #include <sys/param.h>
 #include <sys/wait.h>
 
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index dfa742577585..4191ee4ed8b7 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -29,7 +29,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c
index 135ee8dad151..8fdcc8e8752e 100644
--- a/lib/libfetch/fetch.c
+++ b/lib/libfetch/fetch.c
@@ -28,7 +28,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <netinet/in.h>
diff --git a/lib/libfetch/file.c b/lib/libfetch/file.c
index 3cb8893f9d46..0d46ce38b5a2 100644
--- a/lib/libfetch/file.c
+++ b/lib/libfetch/file.c
@@ -28,7 +28,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/lib/libfigpar/figpar.c b/lib/libfigpar/figpar.c
index 642291ca7c6b..803ebadc3f49 100644
*** 2164 LINES SKIPPED ***