git: 3e15b01d6914 - main - libsa: Remove redundant sys/cdefs.h
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 22 Feb 2024 16:32:17 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=3e15b01d6914c927e37d1699645783acf286655c
commit 3e15b01d6914c927e37d1699645783acf286655c
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-02-22 15:18:02 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-02-22 16:31:57 +0000
libsa: Remove redundant sys/cdefs.h
Sponsored by: Netflix
---
stand/common/boot.c | 1 -
stand/common/commands.c | 1 -
stand/common/dev_net.c | 1 -
stand/common/devopen.c | 1 -
stand/common/disk.c | 1 -
stand/common/interp.c | 1 -
stand/common/interp_backslash.c | 1 -
stand/common/interp_lua.c | 1 -
stand/common/interp_parse.c | 1 -
stand/common/interp_simple.c | 1 -
stand/common/isapnp.c | 1 -
stand/common/load_elf32.c | 2 --
stand/common/load_elf32_obj.c | 2 --
stand/common/load_elf64.c | 2 --
stand/common/load_elf64_obj.c | 2 --
stand/common/md.c | 1 -
stand/common/metadata.c | 1 -
stand/common/misc.c | 1 -
stand/common/module.c | 1 -
stand/common/part.c | 1 -
stand/common/pnp.c | 1 -
stand/common/reloc_elf32.c | 2 --
stand/common/reloc_elf64.c | 2 --
stand/common/vdisk.c | 1 -
stand/common/zfs_cmd.c | 1 -
stand/efi/libefi/delay.c | 1 -
stand/efi/libefi/devicename.c | 1 -
stand/efi/libefi/devpath.c | 1 -
stand/efi/libefi/eficom.c | 1 -
stand/efi/libefi/efienv.c | 1 -
stand/efi/libefi/efipart.c | 1 -
stand/efi/libefi/env.c | 1 -
stand/efi/libefi/errno.c | 1 -
stand/efi/libefi/handles.c | 1 -
stand/efi/libefi/libefi.c | 1 -
stand/efi/libefi/time.c | 1 -
stand/efi/libefi/time_arm64.c | 1 -
stand/efi/libefi/time_event.c | 1 -
stand/efi/libefi/wchar.c | 1 -
stand/efi/loader/arch/amd64/elf64_freebsd.c | 1 -
stand/efi/loader/arch/amd64/multiboot2.c | 2 --
stand/efi/loader/arch/amd64/trap.c | 1 -
stand/efi/loader/arch/arm64/exec.c | 1 -
stand/efi/loader/autoload.c | 1 -
stand/efi/loader/bootinfo.c | 1 -
stand/efi/loader/conf.c | 1 -
stand/efi/loader/efi_main.c | 1 -
stand/efi/loader/framebuffer.c | 1 -
stand/efi/loader/main.c | 1 -
stand/fdt/fdt_loader_cmd.c | 1 -
stand/i386/libi386/bio.c | 1 -
stand/i386/libi386/biosacpi.c | 1 -
stand/i386/libi386/biosdisk.c | 1 -
stand/i386/libi386/biosmem.c | 1 -
stand/i386/libi386/biospci.c | 1 -
stand/i386/libi386/biospnp.c | 1 -
stand/i386/libi386/biossmap.c | 1 -
stand/i386/libi386/bootinfo.c | 1 -
stand/i386/libi386/bootinfo32.c | 1 -
stand/i386/libi386/bootinfo64.c | 1 -
stand/i386/libi386/comconsole.c | 1 -
stand/i386/libi386/devicename.c | 1 -
stand/i386/libi386/elf64_freebsd.c | 1 -
stand/i386/libi386/i386_copy.c | 1 -
stand/i386/libi386/i386_module.c | 1 -
stand/i386/libi386/nullconsole.c | 1 -
stand/i386/libi386/pread.c | 1 -
stand/i386/libi386/pxe.c | 1 -
stand/i386/libi386/spinconsole.c | 1 -
stand/i386/libi386/textvidc.c | 5 +----
stand/i386/libi386/time.c | 1 -
stand/i386/libi386/vbe.c | 1 -
stand/i386/libi386/vidconsole.c | 3 +--
stand/i386/loader/chain.c | 1 -
stand/i386/loader/conf.c | 1 -
stand/i386/loader/main.c | 1 -
stand/i386/zfsboot/zfsboot.c | 1 -
stand/kboot/kboot/arch/aarch64/exec.c | 1 -
stand/kboot/kboot/arch/amd64/elf64_freebsd.c | 1 -
stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c | 1 -
stand/kboot/kboot/conf.c | 1 -
stand/kboot/kboot/main.c | 1 -
stand/liblua/lerrno.c | 1 -
stand/liblua/lpager.c | 1 -
stand/liblua/lstd.c | 1 -
stand/libofw/devicename.c | 1 -
stand/libofw/ofw_copy.c | 1 -
stand/libofw/ofw_disk.c | 1 -
stand/libofw/ofw_module.c | 1 -
stand/libofw/ofw_reboot.c | 1 -
stand/libofw/ofw_time.c | 1 -
stand/libofw/openfirm.c | 1 -
stand/libsa/abort.c | 1 -
stand/libsa/assert.c | 2 --
stand/libsa/bootp.c | 1 -
stand/libsa/bootparam.c | 1 -
stand/libsa/bzipfs.c | 1 -
stand/libsa/cd9660.c | 1 -
stand/libsa/close.c | 1 -
stand/libsa/closeall.c | 1 -
stand/libsa/dosfs.c | 1 -
stand/libsa/environment.c | 1 -
stand/libsa/ext2fs.c | 1 -
stand/libsa/fstat.c | 1 -
stand/libsa/geli/pwgets.c | 1 -
stand/libsa/getopt.c | 2 --
stand/libsa/gets.c | 1 -
stand/libsa/gzipfs.c | 1 -
stand/libsa/hexdump.c | 1 -
stand/libsa/inet_ntoa.c | 2 --
stand/libsa/ioctl.c | 1 -
stand/libsa/lseek.c | 1 -
stand/libsa/mount.c | 1 -
stand/libsa/netif.c | 1 -
stand/libsa/nullfs.c | 1 -
stand/libsa/nvstore.c | 1 -
stand/libsa/open.c | 1 -
stand/libsa/pager.c | 1 -
stand/libsa/panic.c | 1 -
stand/libsa/pkgfs.c | 1 -
stand/libsa/printf.c | 1 -
stand/libsa/rpc.c | 1 -
stand/libsa/sbrk.c | 1 -
stand/libsa/smbios.c | 1 -
stand/libsa/splitfs.c | 1 -
stand/libsa/stand.h | 2 --
stand/libsa/stat.c | 1 -
stand/libsa/strcasecmp.c | 5 +----
stand/libsa/strdup.c | 2 --
stand/libsa/strerror.c | 1 -
stand/libsa/tftp.c | 1 -
stand/libsa/time.c | 1 -
stand/libsa/ufs.c | 1 -
stand/libsa/ufsread.c | 1 -
stand/libsa/x86/hypervisor.c | 1 -
stand/libsa/zalloc_malloc.c | 1 -
stand/libsa/zfs/zfs.c | 1 -
stand/libsa/zfs/zfsimpl.c | 1 -
stand/powerpc/ofw/cas.c | 1 -
stand/powerpc/ofw/conf.c | 1 -
stand/powerpc/ofw/main.c | 1 -
stand/powerpc/ofw/ofwfdt.c | 1 -
stand/powerpc/ofw/ppc64_elf_freebsd.c | 1 -
stand/powerpc/ofw/start.c | 1 -
stand/uboot/arch/arm/conf.c | 1 -
stand/uboot/arch/powerpc/conf.c | 1 -
stand/uboot/arch/powerpc/ppc64_elf_freebsd.c | 1 -
stand/uboot/devicename.c | 1 -
stand/uboot/reboot.c | 1 -
stand/uboot/time.c | 2 --
stand/uboot/uboot_console.c | 1 -
stand/uboot/uboot_module.c | 1 -
stand/userboot/userboot/autoload.c | 1 -
stand/userboot/userboot/biossmap.c | 1 -
stand/userboot/userboot/bootinfo.c | 1 -
stand/userboot/userboot/bootinfo32.c | 1 -
stand/userboot/userboot/bootinfo64.c | 1 -
stand/userboot/userboot/conf.c | 1 -
stand/userboot/userboot/copy.c | 1 -
stand/userboot/userboot/devicename.c | 1 -
stand/userboot/userboot/elf64_freebsd.c | 1 -
stand/userboot/userboot/host.c | 1 -
stand/userboot/userboot/main.c | 1 -
stand/userboot/userboot/userboot_cons.c | 1 -
stand/userboot/userboot/userboot_disk.c | 1 -
165 files changed, 3 insertions(+), 185 deletions(-)
diff --git a/stand/common/boot.c b/stand/common/boot.c
index 658da097b9a9..e0775c0fca26 100644
--- a/stand/common/boot.c
+++ b/stand/common/boot.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* Loading modules, booting the system
*/
diff --git a/stand/common/commands.c b/stand/common/commands.c
index b09bb9604386..e6e4fd005f72 100644
--- a/stand/common/commands.c
+++ b/stand/common/commands.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <string.h>
diff --git a/stand/common/dev_net.c b/stand/common/dev_net.c
index b6880e894477..3cd78c5346ac 100644
--- a/stand/common/dev_net.c
+++ b/stand/common/dev_net.c
@@ -29,7 +29,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*-
* This module implements a "raw device" interface suitable for
* use by the stand-alone I/O library NFS code. This interface
diff --git a/stand/common/devopen.c b/stand/common/devopen.c
index a51ebaf0c9d7..a50334ba61e3 100644
--- a/stand/common/devopen.c
+++ b/stand/common/devopen.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <string.h>
diff --git a/stand/common/disk.c b/stand/common/disk.c
index e1add50bd1fb..c1650f0fa1ec 100644
--- a/stand/common/disk.c
+++ b/stand/common/disk.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/disk.h>
#include <sys/queue.h>
#include <stand.h>
diff --git a/stand/common/interp.c b/stand/common/interp.c
index 0f142902b4ac..c6ac01ea099b 100644
--- a/stand/common/interp.c
+++ b/stand/common/interp.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* Simple commandline interpreter, toplevel and misc.
*
diff --git a/stand/common/interp_backslash.c b/stand/common/interp_backslash.c
index 6d650cd2e286..e1bc84c3a1a7 100644
--- a/stand/common/interp_backslash.c
+++ b/stand/common/interp_backslash.c
@@ -14,7 +14,6 @@
* Routine for doing backslash elimination.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <string.h>
#include "bootstrap.h"
diff --git a/stand/common/interp_lua.c b/stand/common/interp_lua.c
index 11595b78a7bd..aa759aa99ec1 100644
--- a/stand/common/interp_lua.c
+++ b/stand/common/interp_lua.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include "bootstrap.h"
diff --git a/stand/common/interp_parse.c b/stand/common/interp_parse.c
index 6e883a81e383..9efcade04b36 100644
--- a/stand/common/interp_parse.c
+++ b/stand/common/interp_parse.c
@@ -14,7 +14,6 @@
* The meat of the simple parser.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <string.h>
#include "bootstrap.h"
diff --git a/stand/common/interp_simple.c b/stand/common/interp_simple.c
index 61ed724af9d0..d64c0d27b97f 100644
--- a/stand/common/interp_simple.c
+++ b/stand/common/interp_simple.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* Simple commandline interpreter, toplevel and misc.
*/
diff --git a/stand/common/isapnp.c b/stand/common/isapnp.c
index 3f554305c2e2..eaf5a08cf82a 100644
--- a/stand/common/isapnp.c
+++ b/stand/common/isapnp.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* Machine-independent ISA PnP enumerator implementing a subset of the
* ISA PnP specification.
diff --git a/stand/common/load_elf32.c b/stand/common/load_elf32.c
index 5b942fd63444..4737670d2eeb 100644
--- a/stand/common/load_elf32.c
+++ b/stand/common/load_elf32.c
@@ -1,5 +1,3 @@
-#include <sys/cdefs.h>
#define __ELF_WORD_SIZE 32
#define _MACHINE_ELF_WANT_32BIT
-
#include "load_elf.c"
diff --git a/stand/common/load_elf32_obj.c b/stand/common/load_elf32_obj.c
index dffb0070b0c0..e37b4dfddb49 100644
--- a/stand/common/load_elf32_obj.c
+++ b/stand/common/load_elf32_obj.c
@@ -1,5 +1,3 @@
-#include <sys/cdefs.h>
#define __ELF_WORD_SIZE 32
#define _MACHINE_ELF_WANT_32BIT
-
#include "load_elf_obj.c"
diff --git a/stand/common/load_elf64.c b/stand/common/load_elf64.c
index e3a913c0ce8c..98ef7dc40985 100644
--- a/stand/common/load_elf64.c
+++ b/stand/common/load_elf64.c
@@ -1,4 +1,2 @@
-#include <sys/cdefs.h>
#define __ELF_WORD_SIZE 64
-
#include "load_elf.c"
diff --git a/stand/common/load_elf64_obj.c b/stand/common/load_elf64_obj.c
index 14d6e3dc3d4d..43de8cc1214f 100644
--- a/stand/common/load_elf64_obj.c
+++ b/stand/common/load_elf64_obj.c
@@ -1,4 +1,2 @@
-#include <sys/cdefs.h>
#define __ELF_WORD_SIZE 64
-
#include "load_elf_obj.c"
diff --git a/stand/common/md.c b/stand/common/md.c
index 6b6e6303c898..d12429c3c45c 100644
--- a/stand/common/md.c
+++ b/stand/common/md.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/stand/common/metadata.c b/stand/common/metadata.c
index 8d5003ec47bf..f95763bfd01b 100644
--- a/stand/common/metadata.c
+++ b/stand/common/metadata.c
@@ -26,7 +26,6 @@
* from: FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.6
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/stand/common/misc.c b/stand/common/misc.c
index 046094f868e0..402213100951 100644
--- a/stand/common/misc.c
+++ b/stand/common/misc.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <string.h>
#include <stand.h>
#include <bootstrap.h>
diff --git a/stand/common/module.c b/stand/common/module.c
index ac0ad466484a..832a8eb4988d 100644
--- a/stand/common/module.c
+++ b/stand/common/module.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* file/module function dispatcher, support, etc.
*/
diff --git a/stand/common/part.c b/stand/common/part.c
index 41c0eef95d7d..5f7bc2103c01 100644
--- a/stand/common/part.c
+++ b/stand/common/part.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <sys/param.h>
#include <sys/diskmbr.h>
diff --git a/stand/common/pnp.c b/stand/common/pnp.c
index 8ee7f5f711b1..aab84e07935d 100644
--- a/stand/common/pnp.c
+++ b/stand/common/pnp.c
@@ -3,7 +3,6 @@
*
*/
-#include <sys/cdefs.h>
/*
* "Plug and Play" functionality.
*
diff --git a/stand/common/reloc_elf32.c b/stand/common/reloc_elf32.c
index ee2617b371c1..04b4969a51b3 100644
--- a/stand/common/reloc_elf32.c
+++ b/stand/common/reloc_elf32.c
@@ -1,4 +1,2 @@
-#include <sys/cdefs.h>
#define __ELF_WORD_SIZE 32
-
#include "reloc_elf.c"
diff --git a/stand/common/reloc_elf64.c b/stand/common/reloc_elf64.c
index c7b76ca6b265..1230f27741cd 100644
--- a/stand/common/reloc_elf64.c
+++ b/stand/common/reloc_elf64.c
@@ -1,4 +1,2 @@
-#include <sys/cdefs.h>
#define __ELF_WORD_SIZE 64
-
#include "reloc_elf.c"
diff --git a/stand/common/vdisk.c b/stand/common/vdisk.c
index 3bbb13d908c5..067e3ca3a481 100644
--- a/stand/common/vdisk.c
+++ b/stand/common/vdisk.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <stdarg.h>
#include <machine/_inttypes.h>
diff --git a/stand/common/zfs_cmd.c b/stand/common/zfs_cmd.c
index 9a4dc01f0159..0180d31f374b 100644
--- a/stand/common/zfs_cmd.c
+++ b/stand/common/zfs_cmd.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* MD bootstrap main() and assorted miscellaneous
* commands.
diff --git a/stand/efi/libefi/delay.c b/stand/efi/libefi/delay.c
index becdcb3fa267..af03f0075330 100644
--- a/stand/efi/libefi/delay.c
+++ b/stand/efi/libefi/delay.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/devicename.c b/stand/efi/libefi/devicename.c
index 22844bbbd6ec..c18017429665 100644
--- a/stand/efi/libefi/devicename.c
+++ b/stand/efi/libefi/devicename.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <string.h>
#include <sys/disklabel.h>
diff --git a/stand/efi/libefi/devpath.c b/stand/efi/libefi/devpath.c
index 6b4b8785a2dd..85a5459c7d6b 100644
--- a/stand/efi/libefi/devpath.c
+++ b/stand/efi/libefi/devpath.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <efi.h>
#include <efilib.h>
#include <efichar.h>
diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c
index c84e040420e7..d5f3f07e083f 100644
--- a/stand/efi/libefi/eficom.c
+++ b/stand/efi/libefi/eficom.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <sys/errno.h>
#include <bootstrap.h>
diff --git a/stand/efi/libefi/efienv.c b/stand/efi/libefi/efienv.c
index 031c144ee194..83da2acc816b 100644
--- a/stand/efi/libefi/efienv.c
+++ b/stand/efi/libefi/efienv.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <efi.h>
#include <efichar.h>
diff --git a/stand/efi/libefi/efipart.c b/stand/efi/libefi/efipart.c
index 475a796b4da5..3df6034571f5 100644
--- a/stand/efi/libefi/efipart.c
+++ b/stand/efi/libefi/efipart.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/disk.h>
#include <sys/param.h>
#include <sys/time.h>
diff --git a/stand/efi/libefi/env.c b/stand/efi/libefi/env.c
index 6887038fe950..328476a9f68b 100644
--- a/stand/efi/libefi/env.c
+++ b/stand/efi/libefi/env.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <string.h>
#include <efi.h>
diff --git a/stand/efi/libefi/errno.c b/stand/efi/libefi/errno.c
index e614824a2bed..92050af7f4e1 100644
--- a/stand/efi/libefi/errno.c
+++ b/stand/efi/libefi/errno.c
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/handles.c b/stand/efi/libefi/handles.c
index bc42ae144509..d3ec428b8d4a 100644
--- a/stand/efi/libefi/handles.c
+++ b/stand/efi/libefi/handles.c
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/libefi.c b/stand/efi/libefi/libefi.c
index c33c61cdef16..f615bd214bfc 100644
--- a/stand/efi/libefi/libefi.c
+++ b/stand/efi/libefi/libefi.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <efi.h>
#include <eficonsctl.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/time.c b/stand/efi/libefi/time.c
index bab8e4f73434..99d86e30ee96 100644
--- a/stand/efi/libefi/time.c
+++ b/stand/efi/libefi/time.c
@@ -38,7 +38,6 @@
*
*/
-#include <sys/cdefs.h>
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/time_arm64.c b/stand/efi/libefi/time_arm64.c
index 616d05adb806..d3c7a4e236d0 100644
--- a/stand/efi/libefi/time_arm64.c
+++ b/stand/efi/libefi/time_arm64.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/time_event.c b/stand/efi/libefi/time_event.c
index e6aad64342ce..c4334412a4fe 100644
--- a/stand/efi/libefi/time_event.c
+++ b/stand/efi/libefi/time_event.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/wchar.c b/stand/efi/libefi/wchar.c
index d67f1bf34cf8..953f29418c21 100644
--- a/stand/efi/libefi/wchar.c
+++ b/stand/efi/libefi/wchar.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/loader/arch/amd64/elf64_freebsd.c b/stand/efi/loader/arch/amd64/elf64_freebsd.c
index 5a41ea99867e..91dd979a677e 100644
--- a/stand/efi/loader/arch/amd64/elf64_freebsd.c
+++ b/stand/efi/loader/arch/amd64/elf64_freebsd.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#define __ELF_WORD_SIZE 64
#include <sys/param.h>
#include <sys/exec.h>
diff --git a/stand/efi/loader/arch/amd64/multiboot2.c b/stand/efi/loader/arch/amd64/multiboot2.c
index 6c96d7dc0073..130caa82aa49 100644
--- a/stand/efi/loader/arch/amd64/multiboot2.c
+++ b/stand/efi/loader/arch/amd64/multiboot2.c
@@ -34,8 +34,6 @@
* https://www.gnu.org/software/grub/manual/multiboot2/multiboot.html
*/
-#include <sys/cdefs.h>
-
#include <sys/param.h>
#include <sys/exec.h>
#include <sys/linker.h>
diff --git a/stand/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c
index 56a3ee67da6f..95a42a18f719 100644
--- a/stand/efi/loader/arch/amd64/trap.c
+++ b/stand/efi/loader/arch/amd64/trap.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <string.h>
#include <sys/param.h>
diff --git a/stand/efi/loader/arch/arm64/exec.c b/stand/efi/loader/arch/arm64/exec.c
index ef410a7d556c..877cff658d1e 100644
--- a/stand/efi/loader/arch/arm64/exec.c
+++ b/stand/efi/loader/arch/arm64/exec.c
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <string.h>
diff --git a/stand/efi/loader/autoload.c b/stand/efi/loader/autoload.c
index a7a5f8212e9c..ba7997487ffc 100644
--- a/stand/efi/loader/autoload.c
+++ b/stand/efi/loader/autoload.c
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#if defined(LOADER_FDT_SUPPORT)
#include <sys/param.h>
#include <fdt_platform.h>
diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c
index 13b6df9c5b06..b55c2184d9fe 100644
--- a/stand/efi/loader/bootinfo.c
+++ b/stand/efi/loader/bootinfo.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <string.h>
#include <sys/param.h>
diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c
index 389489726d84..3bc74ea6354c 100644
--- a/stand/efi/loader/conf.c
+++ b/stand/efi/loader/conf.c
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <bootstrap.h>
#include <efi.h>
diff --git a/stand/efi/loader/efi_main.c b/stand/efi/loader/efi_main.c
index 25b13d5d3728..2a5120dc89d7 100644
--- a/stand/efi/loader/efi_main.c
+++ b/stand/efi/loader/efi_main.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <bootstrap.h>
#include <efi.h>
#include <eficonsctl.h>
diff --git a/stand/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c
index 56693187b576..2f580309c2f3 100644
--- a/stand/efi/loader/framebuffer.c
+++ b/stand/efi/loader/framebuffer.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <bootstrap.h>
#include <sys/endian.h>
#include <sys/param.h>
diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
index 5944c383574e..12efe594e0e2 100644
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <sys/disk.h>
diff --git a/stand/fdt/fdt_loader_cmd.c b/stand/fdt/fdt_loader_cmd.c
index eb152ae1949c..c51e8c5ab583 100644
--- a/stand/fdt/fdt_loader_cmd.c
+++ b/stand/fdt/fdt_loader_cmd.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <libfdt.h>
#include <fdt.h>
diff --git a/stand/i386/libi386/bio.c b/stand/i386/libi386/bio.c
index e3b17ccc2a44..357d6cbedf6e 100644
--- a/stand/i386/libi386/bio.c
+++ b/stand/i386/libi386/bio.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include "libi386.h"
diff --git a/stand/i386/libi386/biosacpi.c b/stand/i386/libi386/biosacpi.c
index fcad64d81549..077b6c7e53de 100644
--- a/stand/i386/libi386/biosacpi.c
+++ b/stand/i386/libi386/biosacpi.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <machine/stdarg.h>
#include <bootstrap.h>
diff --git a/stand/i386/libi386/biosdisk.c b/stand/i386/libi386/biosdisk.c
index 29cd39e157b8..9ad9b67f5b57 100644
--- a/stand/i386/libi386/biosdisk.c
+++ b/stand/i386/libi386/biosdisk.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* BIOS disk device handling.
*
diff --git a/stand/i386/libi386/biosmem.c b/stand/i386/libi386/biosmem.c
index eaf41743bb1f..fc612eda5d69 100644
--- a/stand/i386/libi386/biosmem.c
+++ b/stand/i386/libi386/biosmem.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* Obtain memory configuration information from the BIOS
*/
diff --git a/stand/i386/libi386/biospci.c b/stand/i386/libi386/biospci.c
index 1003e368043d..5b39eab1e5e5 100644
--- a/stand/i386/libi386/biospci.c
+++ b/stand/i386/libi386/biospci.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* PnP enumerator using the PCI BIOS.
*/
diff --git a/stand/i386/libi386/biospnp.c b/stand/i386/libi386/biospnp.c
index a26c0d4d52d8..5b22f066d4ef 100644
--- a/stand/i386/libi386/biospnp.c
+++ b/stand/i386/libi386/biospnp.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* PnP BIOS enumerator.
*/
diff --git a/stand/i386/libi386/biossmap.c b/stand/i386/libi386/biossmap.c
index a2ad83cafdba..c281e6949c20 100644
--- a/stand/i386/libi386/biossmap.c
+++ b/stand/i386/libi386/biossmap.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* Obtain memory configuration information from the BIOS
*/
diff --git a/stand/i386/libi386/bootinfo.c b/stand/i386/libi386/bootinfo.c
index 4f652632b755..b81d181a75bd 100644
--- a/stand/i386/libi386/bootinfo.c
+++ b/stand/i386/libi386/bootinfo.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
diff --git a/stand/i386/libi386/bootinfo32.c b/stand/i386/libi386/bootinfo32.c
index 1b038ff6b245..535849011b6b 100644
--- a/stand/i386/libi386/bootinfo32.c
+++ b/stand/i386/libi386/bootinfo32.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
diff --git a/stand/i386/libi386/bootinfo64.c b/stand/i386/libi386/bootinfo64.c
index 2a62eba4fc09..a55b86eb5ba7 100644
--- a/stand/i386/libi386/bootinfo64.c
+++ b/stand/i386/libi386/bootinfo64.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c
index 6fff811bd34c..b2d48b13a9f4 100644
--- a/stand/i386/libi386/comconsole.c
+++ b/stand/i386/libi386/comconsole.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <bootstrap.h>
#include <machine/cpufunc.h>
diff --git a/stand/i386/libi386/devicename.c b/stand/i386/libi386/devicename.c
index c6125ba7a78b..628b969ad132 100644
--- a/stand/i386/libi386/devicename.c
+++ b/stand/i386/libi386/devicename.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <string.h>
#include "bootstrap.h"
diff --git a/stand/i386/libi386/elf64_freebsd.c b/stand/i386/libi386/elf64_freebsd.c
index da034437c6e0..b1340fd1f2e2 100644
--- a/stand/i386/libi386/elf64_freebsd.c
+++ b/stand/i386/libi386/elf64_freebsd.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#define __ELF_WORD_SIZE 64
#include <sys/param.h>
#include <sys/exec.h>
diff --git a/stand/i386/libi386/i386_copy.c b/stand/i386/libi386/i386_copy.c
index 3fcf9d09b280..44ca51f6b2ae 100644
--- a/stand/i386/libi386/i386_copy.c
+++ b/stand/i386/libi386/i386_copy.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* MD primitives supporting placement of module data
*
diff --git a/stand/i386/libi386/i386_module.c b/stand/i386/libi386/i386_module.c
index 8c6300b3ad98..26f2ed3eec40 100644
--- a/stand/i386/libi386/i386_module.c
+++ b/stand/i386/libi386/i386_module.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* i386-specific module functionality.
*
diff --git a/stand/i386/libi386/nullconsole.c b/stand/i386/libi386/nullconsole.c
index b39e52630c9d..b4ffd3e30789 100644
--- a/stand/i386/libi386/nullconsole.c
+++ b/stand/i386/libi386/nullconsole.c
@@ -35,7 +35,6 @@
* OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <bootstrap.h>
diff --git a/stand/i386/libi386/pread.c b/stand/i386/libi386/pread.c
index 854f28068ab0..5a922e3bfc6b 100644
--- a/stand/i386/libi386/pread.c
+++ b/stand/i386/libi386/pread.c
@@ -33,7 +33,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/* read into destination in flat addr space */
#include <stand.h>
diff --git a/stand/i386/libi386/pxe.c b/stand/i386/libi386/pxe.c
index 895e8fc5ff51..aa392b83718c 100644
--- a/stand/i386/libi386/pxe.c
+++ b/stand/i386/libi386/pxe.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stand.h>
#include <errno.h>
#include <stdbool.h>
diff --git a/stand/i386/libi386/spinconsole.c b/stand/i386/libi386/spinconsole.c
index 05ce33bfc5a8..156eaf35e1c0 100644
--- a/stand/i386/libi386/spinconsole.c
+++ b/stand/i386/libi386/spinconsole.c
@@ -35,7 +35,6 @@
*** 1182 LINES SKIPPED ***