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
2024-11-23 07:31:31 +00:00 · 2023-11-24 13:12:57 -07:00 · 2023-11-24 13:12:57 -07:00 · a2f733abcf
commit a2f733abcf
parent 33ccf36671
239 changed files with 6 additions and 248 deletions
--- 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>

--- 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"
--- 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>

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

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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.
 *
--- a/lib/libc/stdio/vfwprintf.c
+++ b/lib/libc/stdio/vfwprintf.c
@ -37,8 +37,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
 /*
 * Actual wprintf innards.
 *
--- 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>
--- 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>
--- 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>
--- a/lib/libc/string/wcsncpy.c
+++ b/lib/libc/string/wcsncpy.c
@ -32,8 +32,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
 #include <wchar.h>

 /*
--- a/lib/libc/string/wcsstr.c
+++ b/lib/libc/string/wcsstr.c
@ -32,8 +32,6 @@
 * SUCH DAMAGE.
 */

-#if 0
-#endif
 #include <wchar.h>

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

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

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

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

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

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>

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

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

--- a/lib/libfigpar/figpar.c
+++ b/lib/libfigpar/figpar.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

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

 #include <ctype.h>
--- a/lib/libfigpar/string_m.c
+++ b/lib/libfigpar/string_m.c
@ -24,7 +24,6 @@
 * SUCH DAMAGE.
 */

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

 #include <ctype.h>
--- a/lib/libgeom/geom_util.c
+++ b/lib/libgeom/geom_util.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/disk.h>
 #include <sys/stat.h>
--- a/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
+++ b/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
@ -27,7 +27,7 @@
 * 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 <assert.h>
--- a/lib/libiconv_modules/EUC/citrus_euc.c
+++ b/lib/libiconv_modules/EUC/citrus_euc.c
@ -60,7 +60,6 @@
 * SUCH DAMAGE.
 */

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

 #include <assert.h>
--- a/lib/libiconv_modules/EUCTW/citrus_euctw.c
+++ b/lib/libiconv_modules/EUCTW/citrus_euctw.c
@ -56,7 +56,6 @@
 *	$Citrus: xpg4dl/FreeBSD/lib/libc/locale/euctw.c,v 1.13 2001/06/21 01:51:44 yamt Exp $
 */

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

 #include <assert.h>
--- a/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
+++ b/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
@ -28,7 +28,6 @@
 * SUCH DAMAGE.
 */

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

 #include <assert.h>
--- a/lib/libiconv_modules/ISO2022/citrus_iso2022.c
+++ b/lib/libiconv_modules/ISO2022/citrus_iso2022.c
@ -30,7 +30,6 @@
 *	$Citrus: xpg4dl/FreeBSD/lib/libc/locale/iso2022.c,v 1.23 2001/06/21 01:51:44 yamt Exp $
 */

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

 #include <assert.h>
--- a/lib/libiconv_modules/JOHAB/citrus_johab.c
+++ b/lib/libiconv_modules/JOHAB/citrus_johab.c
@ -27,7 +27,7 @@
 * 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 <assert.h>
--- a/lib/libiconv_modules/MSKanji/citrus_mskanji.c
+++ b/lib/libiconv_modules/MSKanji/citrus_mskanji.c
@ -61,8 +61,6 @@
 * SUCH DAMAGE.
 */

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

 #include <assert.h>
--- a/lib/libiconv_modules/UTF8/citrus_utf8.c
+++ b/lib/libiconv_modules/UTF8/citrus_utf8.c
@ -60,7 +60,6 @@
 * SUCH DAMAGE.
 */

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

 #include <assert.h>
--- a/lib/libiconv_modules/ZW/citrus_zw.c
+++ b/lib/libiconv_modules/ZW/citrus_zw.c
@ -29,7 +29,6 @@
 *
 */

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

 #include <assert.h>
--- a/lib/libipsec/ipsec_dump_policy.c
+++ b/lib/libipsec/ipsec_dump_policy.c
@ -31,7 +31,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
--- a/lib/libipsec/ipsec_get_policylen.c
+++ b/lib/libipsec/ipsec_get_policylen.c
@ -31,7 +31,6 @@
 * SUCH DAMAGE.
 */

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

--- a/lib/libipsec/ipsec_strerror.c
+++ b/lib/libipsec/ipsec_strerror.c
@ -31,7 +31,6 @@
 * SUCH DAMAGE.
 */

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

--- a/lib/libipsec/pfkey.c
+++ b/lib/libipsec/pfkey.c
@ -31,7 +31,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
--- a/lib/libipsec/pfkey_dump.c
+++ b/lib/libipsec/pfkey_dump.c
@ -31,7 +31,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
--- a/lib/libipsec/policy_parse.y
+++ b/lib/libipsec/policy_parse.y
@ -51,7 +51,7 @@
 */

 %{
-#include <sys/cdefs.h>
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
--- a/lib/libipsec/test-policy.c
+++ b/lib/libipsec/test-policy.c
@ -31,7 +31,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
--- a/lib/libiscsiutil/pdu.c
+++ b/lib/libiscsiutil/pdu.c
@ -29,7 +29,6 @@
 *
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <assert.h>
--- a/lib/libjail/jail.c
+++ b/lib/libjail/jail.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/jail.h>
 #include <sys/linker.h>
--- a/lib/libjail/jail_getid.c
+++ b/lib/libjail/jail_getid.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/jail.h>
--- a/lib/libkvm/kvm.h
+++ b/lib/libkvm/kvm.h
@ -32,7 +32,6 @@
 #ifndef _KVM_H_
 #define	_KVM_H_

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

--- a/lib/libkvm/kvm_arm.c
+++ b/lib/libkvm/kvm_arm.c
@ -37,7 +37,6 @@
 * ARM machine dependent routines for kvm.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <kvm.h>
--- a/lib/libkvm/kvm_cptime.c
+++ b/lib/libkvm/kvm_cptime.c
@ -30,7 +30,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/pcpu.h>
 #include <sys/resource.h>
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@ -26,7 +26,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>
--- a/lib/libkvm/kvm_minidump_powerpc64.c
+++ b/lib/libkvm/kvm_minidump_powerpc64.c
@ -26,7 +26,6 @@
 * From: FreeBSD: src/lib/libkvm/kvm_minidump_riscv.c
 */

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

 #include <kvm.h>
--- a/lib/libkvm/kvm_minidump_powerpc64_hpt.c
+++ b/lib/libkvm/kvm_minidump_powerpc64_hpt.c
@ -26,7 +26,6 @@
 * From: FreeBSD: src/lib/libkvm/kvm_minidump_riscv.c
 */

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

--- a/lib/libkvm/kvm_pcpu.c
+++ b/lib/libkvm/kvm_pcpu.c
@ -38,7 +38,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/pcpu.h>
 #include <sys/sysctl.h>
--- a/lib/libkvm/kvm_powerpc.c
+++ b/lib/libkvm/kvm_powerpc.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/endian.h>
 #include <sys/kerneldump.h>
--- a/lib/libkvm/kvm_powerpc64.c
+++ b/lib/libkvm/kvm_powerpc64.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/endian.h>
 #include <sys/kerneldump.h>
--- a/lib/libkvm/kvm_private.c
+++ b/lib/libkvm/kvm_private.c
@ -31,7 +31,6 @@
 * SUCH DAMAGE.
 */

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

--- a/lib/libkvm/kvm_vnet.c
+++ b/lib/libkvm/kvm_vnet.c
@ -27,7 +27,6 @@
 * SUCH DAMAGE.
 */

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

 #define	_WANT_PRISON
--- a/lib/libkvm/tests/kvm_geterr_test.c
+++ b/lib/libkvm/tests/kvm_geterr_test.c
@ -23,7 +23,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <fcntl.h>
--- a/lib/libkvm/tests/kvm_open2_test.c
+++ b/lib/libkvm/tests/kvm_open2_test.c
@ -23,7 +23,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <fcntl.h>
--- a/lib/libkvm/tests/kvm_open_test.c
+++ b/lib/libkvm/tests/kvm_open_test.c
@ -23,7 +23,6 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <fcntl.h>
--- a/lib/libkvm/tests/kvm_read_test.c
+++ b/lib/libkvm/tests/kvm_read_test.c
@ -26,7 +26,6 @@
 * From: FreeBSD: src/lib/libkvm/tests/kvm_geterr_test.c
 */

-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <errno.h>
--- a/lib/libkvm/tests/kvm_test_common.c
+++ b/lib/libkvm/tests/kvm_test_common.c
@ -23,7 +23,6 @@
 * SUCH DAMAGE.
 */

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

--- a/lib/libmd/md5c.c
+++ b/lib/libmd/md5c.c
@ -28,7 +28,6 @@
 * edited for clarity and style only.
 */

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

 #ifdef _KERNEL
--- a/lib/libmd/mdXhl.c
+++ b/lib/libmd/mdXhl.c
@ -9,7 +9,6 @@
 * ----------------------------------------------------------------------------
 */

-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
--- a/lib/libmd/mddriver.c
+++ b/lib/libmd/mddriver.c
@ -11,7 +11,6 @@
 * These notices must be retained in any copies of any part of this
 * documentation and/or software. */

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

 #include <stdio.h>
--- a/Show More
+++ b/Show More