From 3e15b01d6914c927e37d1699645783acf286655c Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 22 Feb 2024 08:18:02 -0700 Subject: [PATCH] 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 /* * 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 #include #include 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 /*- * 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 #include #include 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 #include #include #include 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 /* * 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 #include #include #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 #include #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 #include #include #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 /* * 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 /* * 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 #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 #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 #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 #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 #include #include #include 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 #include #include #include 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 #include #include #include 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 /* * 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 #include #include #include 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 /* * "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 #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 #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 #include #include #include 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 /* * 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 #include #include 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 #include #include #include 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 #include #include #include 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 #include #include #include 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 #include #include #include 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 #include #include #include 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 #include #include #include 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 #include #include 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 #include #include 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 #include #include #include 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 #include #include 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 #include #include 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 #include #include 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 #include #include 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 #define __ELF_WORD_SIZE 64 #include #include 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 - #include #include #include 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 #include #include #include 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 #include #include 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 #if defined(LOADER_FDT_SUPPORT) #include #include 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 #include #include #include 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 #include #include #include 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 #include #include #include 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 #include #include #include 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 #include #include 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 #include #include #include 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 #include #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 #include #include #include 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 /* * 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 /* * 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 /* * 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 /* * 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 /* * 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 #include #include #include 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 #include #include #include 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 #include #include #include 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 #include #include #include 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 #include #include #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 #define __ELF_WORD_SIZE 64 #include #include 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 /* * 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 /* * 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 #include #include 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 /* read into destination in flat addr space */ #include 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 #include #include #include 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 @@ * OF SUCH DAMAGE. */ -#include #include #include diff --git a/stand/i386/libi386/textvidc.c b/stand/i386/libi386/textvidc.c index f3ab6f4b98cf..4b79f9fc66b3 100644 --- a/stand/i386/libi386/textvidc.c +++ b/stand/i386/libi386/textvidc.c @@ -24,12 +24,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp + * From: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/stand/i386/libi386/time.c b/stand/i386/libi386/time.c index 74d0fecda4de..8a84810d5a7d 100644 --- a/stand/i386/libi386/time.c +++ b/stand/i386/libi386/time.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include "bootstrap.h" diff --git a/stand/i386/libi386/vbe.c b/stand/i386/libi386/vbe.c index 61339a1e7911..00b9ab7ae0dc 100644 --- a/stand/i386/libi386/vbe.c +++ b/stand/i386/libi386/vbe.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c index f8a6bf34acad..414803e9af3d 100644 --- a/stand/i386/libi386/vidconsole.c +++ b/stand/i386/libi386/vidconsole.c @@ -24,10 +24,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp + * From: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp */ -#include #include #include #include diff --git a/stand/i386/loader/chain.c b/stand/i386/loader/chain.c index 5fab9183ccc3..9d58f9f3de33 100644 --- a/stand/i386/loader/chain.c +++ b/stand/i386/loader/chain.c @@ -31,7 +31,6 @@ * read in to temporary space and relocate on exec, when btx is stopped. */ -#include #include #include #include diff --git a/stand/i386/loader/conf.c b/stand/i386/loader/conf.c index b4e9f401ded7..622812efbb51 100644 --- a/stand/i386/loader/conf.c +++ b/stand/i386/loader/conf.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include "libi386/libi386.h" diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c index 8a3c1cbc6a42..e7a42c194326 100644 --- a/stand/i386/loader/main.c +++ b/stand/i386/loader/main.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * MD bootstrap main() and assorted miscellaneous * commands. diff --git a/stand/i386/zfsboot/zfsboot.c b/stand/i386/zfsboot/zfsboot.c index 14464eeda567..07bf31eac7a1 100644 --- a/stand/i386/zfsboot/zfsboot.c +++ b/stand/i386/zfsboot/zfsboot.c @@ -13,7 +13,6 @@ * purpose. */ -#include #include #include diff --git a/stand/kboot/kboot/arch/aarch64/exec.c b/stand/kboot/kboot/arch/aarch64/exec.c index 5ea45226bd3e..0aa0e7b8408f 100644 --- a/stand/kboot/kboot/arch/aarch64/exec.c +++ b/stand/kboot/kboot/arch/aarch64/exec.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/stand/kboot/kboot/arch/amd64/elf64_freebsd.c b/stand/kboot/kboot/arch/amd64/elf64_freebsd.c index 4da5a7177a33..f6574b4cbd0d 100644 --- a/stand/kboot/kboot/arch/amd64/elf64_freebsd.c +++ b/stand/kboot/kboot/arch/amd64/elf64_freebsd.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 64 #include #include diff --git a/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c b/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c index ebf35dc72ba0..ffa00e151661 100644 --- a/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c +++ b/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 64 #include diff --git a/stand/kboot/kboot/conf.c b/stand/kboot/kboot/conf.c index b24171ab6e3e..5d384c5270e6 100644 --- a/stand/kboot/kboot/conf.c +++ b/stand/kboot/kboot/conf.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include "bootstrap.h" diff --git a/stand/kboot/kboot/main.c b/stand/kboot/kboot/main.c index 17cbfa975926..c397e573fc75 100644 --- a/stand/kboot/kboot/main.c +++ b/stand/kboot/kboot/main.c @@ -23,7 +23,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/liblua/lerrno.c b/stand/liblua/lerrno.c index 3056e21aa997..744154e43dbd 100644 --- a/stand/liblua/lerrno.c +++ b/stand/liblua/lerrno.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #define _WANT_KERNEL_ERRNO 1 #include diff --git a/stand/liblua/lpager.c b/stand/liblua/lpager.c index 7156941eee60..fb1be4802d21 100644 --- a/stand/liblua/lpager.c +++ b/stand/liblua/lpager.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include "lauxlib.h" diff --git a/stand/liblua/lstd.c b/stand/liblua/lstd.c index 95bf37c70d17..60d55d7fbf92 100644 --- a/stand/liblua/lstd.c +++ b/stand/liblua/lstd.c @@ -25,7 +25,6 @@ * */ -#include #include "lstd.h" #include "math.h" diff --git a/stand/libofw/devicename.c b/stand/libofw/devicename.c index 2238fd000ddd..5e3a789c13db 100644 --- a/stand/libofw/devicename.c +++ b/stand/libofw/devicename.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include "bootstrap.h" diff --git a/stand/libofw/ofw_copy.c b/stand/libofw/ofw_copy.c index e819c61b21f7..b855a5b41d96 100644 --- a/stand/libofw/ofw_copy.c +++ b/stand/libofw/ofw_copy.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * MD primitives supporting placement of module data * diff --git a/stand/libofw/ofw_disk.c b/stand/libofw/ofw_disk.c index d30454b70b74..fc4c25bd9424 100644 --- a/stand/libofw/ofw_disk.c +++ b/stand/libofw/ofw_disk.c @@ -23,7 +23,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * Disk I/O routines using Open Firmware */ diff --git a/stand/libofw/ofw_module.c b/stand/libofw/ofw_module.c index d5371543051c..8d56f6debbb6 100644 --- a/stand/libofw/ofw_module.c +++ b/stand/libofw/ofw_module.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * ofw-specific module functionality. * diff --git a/stand/libofw/ofw_reboot.c b/stand/libofw/ofw_reboot.c index d23492695a5a..3f705d57d0d2 100644 --- a/stand/libofw/ofw_reboot.c +++ b/stand/libofw/ofw_reboot.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include "openfirm.h" diff --git a/stand/libofw/ofw_time.c b/stand/libofw/ofw_time.c index 46a3c0840ac8..c2da603bb52e 100644 --- a/stand/libofw/ofw_time.c +++ b/stand/libofw/ofw_time.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include "openfirm.h" diff --git a/stand/libofw/openfirm.c b/stand/libofw/openfirm.c index da0f589faa67..58e7d8cbe755 100644 --- a/stand/libofw/openfirm.c +++ b/stand/libofw/openfirm.c @@ -55,7 +55,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/stand/libsa/abort.c b/stand/libsa/abort.c index 266a1525054f..b521806fd888 100644 --- a/stand/libsa/abort.c +++ b/stand/libsa/abort.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include void diff --git a/stand/libsa/assert.c b/stand/libsa/assert.c index 35d24e4355bb..8aaf0e507a4d 100644 --- a/stand/libsa/assert.c +++ b/stand/libsa/assert.c @@ -24,9 +24,7 @@ * SUCH DAMAGE. */ -#include #include - #include "stand.h" void diff --git a/stand/libsa/bootp.c b/stand/libsa/bootp.c index fea516d4b97d..d919bb59e843 100644 --- a/stand/libsa/bootp.c +++ b/stand/libsa/bootp.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/libsa/bootparam.c b/stand/libsa/bootparam.c index 688c4be0d66f..c195a06cc5b3 100644 --- a/stand/libsa/bootparam.c +++ b/stand/libsa/bootparam.c @@ -30,7 +30,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * RPC/bootparams */ diff --git a/stand/libsa/bzipfs.c b/stand/libsa/bzipfs.c index ad51e934ed9c..f4002796f0ae 100644 --- a/stand/libsa/bzipfs.c +++ b/stand/libsa/bzipfs.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #ifndef REGRESSION #include "stand.h" #else diff --git a/stand/libsa/cd9660.c b/stand/libsa/cd9660.c index 58b16725f91e..973a7dddcda9 100644 --- a/stand/libsa/cd9660.c +++ b/stand/libsa/cd9660.c @@ -31,7 +31,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * Stand-alone ISO9660 file reading package. * diff --git a/stand/libsa/close.c b/stand/libsa/close.c index 0fb1c136664d..0aa6fd9d6ede 100644 --- a/stand/libsa/close.c +++ b/stand/libsa/close.c @@ -58,7 +58,6 @@ * rights to redistribute these changes. */ -#include #include "stand.h" int diff --git a/stand/libsa/closeall.c b/stand/libsa/closeall.c index 61c9d69f64d4..3aecd5651541 100644 --- a/stand/libsa/closeall.c +++ b/stand/libsa/closeall.c @@ -26,7 +26,6 @@ * */ -#include #include "stand.h" void diff --git a/stand/libsa/dosfs.c b/stand/libsa/dosfs.c index 06215b1ab0fd..7fbbf65989ae 100644 --- a/stand/libsa/dosfs.c +++ b/stand/libsa/dosfs.c @@ -25,7 +25,6 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * Readonly filesystem for Microsoft FAT12/FAT16/FAT32 filesystems, * also supports VFAT. diff --git a/stand/libsa/environment.c b/stand/libsa/environment.c index 2dabaa593524..95ee1718f8d4 100644 --- a/stand/libsa/environment.c +++ b/stand/libsa/environment.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * Manage an environment-like space in which string variables may be stored. * Provide support for some method-like operations for setting/retrieving diff --git a/stand/libsa/ext2fs.c b/stand/libsa/ext2fs.c index 7de39c27d6ad..47812f4543a1 100644 --- a/stand/libsa/ext2fs.c +++ b/stand/libsa/ext2fs.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /*- * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. diff --git a/stand/libsa/fstat.c b/stand/libsa/fstat.c index b1e99a075880..5b6664622100 100644 --- a/stand/libsa/fstat.c +++ b/stand/libsa/fstat.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "stand.h" int diff --git a/stand/libsa/geli/pwgets.c b/stand/libsa/geli/pwgets.c index f7eece5d0d5c..5259334a3a7a 100644 --- a/stand/libsa/geli/pwgets.c +++ b/stand/libsa/geli/pwgets.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "stand.h" /* gets() with constrained input length, for passwords */ diff --git a/stand/libsa/getopt.c b/stand/libsa/getopt.c index 0e49664f8721..4c36d262d87c 100644 --- a/stand/libsa/getopt.c +++ b/stand/libsa/getopt.c @@ -27,8 +27,6 @@ * SUCH DAMAGE. */ -#include - #include "stand.h" #include diff --git a/stand/libsa/gets.c b/stand/libsa/gets.c index 6d5968f1d6c2..922c2ab2a945 100644 --- a/stand/libsa/gets.c +++ b/stand/libsa/gets.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "stand.h" /* gets() with constrained input length */ diff --git a/stand/libsa/gzipfs.c b/stand/libsa/gzipfs.c index 6924ad4975ca..6c2b8cac9e34 100644 --- a/stand/libsa/gzipfs.c +++ b/stand/libsa/gzipfs.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include "stand.h" #include diff --git a/stand/libsa/hexdump.c b/stand/libsa/hexdump.c index 8d62828eb9f9..83fd5e277f1b 100644 --- a/stand/libsa/hexdump.c +++ b/stand/libsa/hexdump.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/libsa/inet_ntoa.c b/stand/libsa/inet_ntoa.c index e696d4c67ffe..9edc91930942 100644 --- a/stand/libsa/inet_ntoa.c +++ b/stand/libsa/inet_ntoa.c @@ -27,8 +27,6 @@ * SUCH DAMAGE. */ -#include - #include #include #include diff --git a/stand/libsa/ioctl.c b/stand/libsa/ioctl.c index 366c97309c1b..0c8613499ceb 100644 --- a/stand/libsa/ioctl.c +++ b/stand/libsa/ioctl.c @@ -58,7 +58,6 @@ * rights to redistribute these changes. */ -#include #include "stand.h" int diff --git a/stand/libsa/lseek.c b/stand/libsa/lseek.c index 73448d4a4c03..9a4722b84c33 100644 --- a/stand/libsa/lseek.c +++ b/stand/libsa/lseek.c @@ -58,7 +58,6 @@ * rights to redistribute these changes. */ -#include #include "stand.h" off_t diff --git a/stand/libsa/mount.c b/stand/libsa/mount.c index 6d42f0c23faa..73bf6ab8118c 100644 --- a/stand/libsa/mount.c +++ b/stand/libsa/mount.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/libsa/netif.c b/stand/libsa/netif.c index d8398b861af0..4b40af9aed32 100644 --- a/stand/libsa/netif.c +++ b/stand/libsa/netif.c @@ -33,7 +33,6 @@ #include #include -#include #include #include diff --git a/stand/libsa/nullfs.c b/stand/libsa/nullfs.c index bb11286a4579..1ac759995448 100644 --- a/stand/libsa/nullfs.c +++ b/stand/libsa/nullfs.c @@ -58,7 +58,6 @@ * rights to redistribute these changes. */ -#include #include "stand.h" /* diff --git a/stand/libsa/nvstore.c b/stand/libsa/nvstore.c index fb4cf9cac413..f6be3b1ca47f 100644 --- a/stand/libsa/nvstore.c +++ b/stand/libsa/nvstore.c @@ -42,7 +42,6 @@ * will switch the back end storage. */ -#include #include #include #include "stand.h" diff --git a/stand/libsa/open.c b/stand/libsa/open.c index 66866dd5c0f2..ccee4aa5c07b 100644 --- a/stand/libsa/open.c +++ b/stand/libsa/open.c @@ -58,7 +58,6 @@ * rights to redistribute these changes. */ -#include #include "stand.h" struct fs_ops *exclusive_file_system; diff --git a/stand/libsa/pager.c b/stand/libsa/pager.c index b6f20c8d9420..40d6a4397c69 100644 --- a/stand/libsa/pager.c +++ b/stand/libsa/pager.c @@ -27,7 +27,6 @@ * Simple paged-output and paged-viewing functions */ -#include #include "stand.h" #include diff --git a/stand/libsa/panic.c b/stand/libsa/panic.c index b54668ce21cc..319f08094d92 100644 --- a/stand/libsa/panic.c +++ b/stand/libsa/panic.c @@ -33,7 +33,6 @@ * */ -#include #include #include diff --git a/stand/libsa/pkgfs.c b/stand/libsa/pkgfs.c index 56e34dfe842e..64ebdf033f14 100644 --- a/stand/libsa/pkgfs.c +++ b/stand/libsa/pkgfs.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include "stand.h" #include diff --git a/stand/libsa/printf.c b/stand/libsa/printf.c index 313cf79fdffa..a84c5431f536 100644 --- a/stand/libsa/printf.c +++ b/stand/libsa/printf.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include /* * Standaloneified version of the FreeBSD kernel printf family. */ diff --git a/stand/libsa/rpc.c b/stand/libsa/rpc.c index 108601f6629e..6b11282a10be 100644 --- a/stand/libsa/rpc.c +++ b/stand/libsa/rpc.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include /* * RPC functions used by NFS and bootparams. * Note that bootparams requires the ability to find out the diff --git a/stand/libsa/sbrk.c b/stand/libsa/sbrk.c index 3d9cf97a7c9b..7d9446bff866 100644 --- a/stand/libsa/sbrk.c +++ b/stand/libsa/sbrk.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * Minimal sbrk() emulation required for malloc support. */ diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index 2708cbe16502..8d516301ec06 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/libsa/splitfs.c b/stand/libsa/splitfs.c index 550ed708bf26..69912522000e 100644 --- a/stand/libsa/splitfs.c +++ b/stand/libsa/splitfs.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include "stand.h" #define NTRIES (3) diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h index f500a8f47847..260defa3a33d 100644 --- a/stand/libsa/stand.h +++ b/stand/libsa/stand.h @@ -57,8 +57,6 @@ #ifndef STAND_H #define STAND_H -#include - #include #include #include diff --git a/stand/libsa/stat.c b/stand/libsa/stat.c index 50065db6858b..6d519a6e6f16 100644 --- a/stand/libsa/stat.c +++ b/stand/libsa/stat.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "stand.h" int diff --git a/stand/libsa/strcasecmp.c b/stand/libsa/strcasecmp.c index 9a4ddbcf9cb3..2dddac8e207e 100644 --- a/stand/libsa/strcasecmp.c +++ b/stand/libsa/strcasecmp.c @@ -27,11 +27,8 @@ * SUCH DAMAGE. */ -#include -#include -#include #include "stand.h" - +#include int strcasecmp(const char *s1, const char *s2) diff --git a/stand/libsa/strdup.c b/stand/libsa/strdup.c index f4506f424c2f..739b161c1f01 100644 --- a/stand/libsa/strdup.c +++ b/stand/libsa/strdup.c @@ -27,8 +27,6 @@ * SUCH DAMAGE. */ -#include - #include "stand.h" #include #include diff --git a/stand/libsa/strerror.c b/stand/libsa/strerror.c index 5895329bb8cc..219f652dec06 100644 --- a/stand/libsa/strerror.c +++ b/stand/libsa/strerror.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "stand.h" static struct diff --git a/stand/libsa/tftp.c b/stand/libsa/tftp.c index 71600fd45b85..c6cc8f11a765 100644 --- a/stand/libsa/tftp.c +++ b/stand/libsa/tftp.c @@ -31,7 +31,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * Simple TFTP implementation for libsa. * Assumes: diff --git a/stand/libsa/time.c b/stand/libsa/time.c index 333ca216fbad..7f33b137bd07 100644 --- a/stand/libsa/time.c +++ b/stand/libsa/time.c @@ -27,7 +27,6 @@ * The parts of kern_tc.c and other timekeeping bits of the kernel. */ -#include #include volatile time_t time_second = 1; diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c index 6239fc4bd252..2c3b3764bd74 100644 --- a/stand/libsa/ufs.c +++ b/stand/libsa/ufs.c @@ -67,7 +67,6 @@ * rights to redistribute these changes. */ -#include /* * Stand-alone file reading package. */ diff --git a/stand/libsa/ufsread.c b/stand/libsa/ufsread.c index 0ae1b3eb7149..0f9b9bb4e2fb 100644 --- a/stand/libsa/ufsread.c +++ b/stand/libsa/ufsread.c @@ -43,7 +43,6 @@ * purpose. */ -#include #include #include #include diff --git a/stand/libsa/x86/hypervisor.c b/stand/libsa/x86/hypervisor.c index ef329059e437..dc153c23c40a 100644 --- a/stand/libsa/x86/hypervisor.c +++ b/stand/libsa/x86/hypervisor.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/libsa/zalloc_malloc.c b/stand/libsa/zalloc_malloc.c index aa98ad87e597..ad7984a60046 100644 --- a/stand/libsa/zalloc_malloc.c +++ b/stand/libsa/zalloc_malloc.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include /* * MALLOC.C - malloc equivalent, runs on top of zalloc and uses sbrk */ diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c index af938fbe1b2b..3e7c698e650a 100644 --- a/stand/libsa/zfs/zfs.c +++ b/stand/libsa/zfs/zfs.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * Stand-alone file reading package. */ diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index fc9bedac7621..e37582006c7a 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * Stand-alone ZFS file reader. */ diff --git a/stand/powerpc/ofw/cas.c b/stand/powerpc/ofw/cas.c index 93816fa07cf5..b112aae67d85 100644 --- a/stand/powerpc/ofw/cas.c +++ b/stand/powerpc/ofw/cas.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/powerpc/ofw/conf.c b/stand/powerpc/ofw/conf.c index 4930eea18644..c96048b5a09c 100644 --- a/stand/powerpc/ofw/conf.c +++ b/stand/powerpc/ofw/conf.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include "bootstrap.h" #include "libofw.h" diff --git a/stand/powerpc/ofw/main.c b/stand/powerpc/ofw/main.c index 868d1eea6dce..e86a8275c8eb 100644 --- a/stand/powerpc/ofw/main.c +++ b/stand/powerpc/ofw/main.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/powerpc/ofw/ofwfdt.c b/stand/powerpc/ofw/ofwfdt.c index 4eccefa3d4c4..eeb5f132a3f2 100644 --- a/stand/powerpc/ofw/ofwfdt.c +++ b/stand/powerpc/ofw/ofwfdt.c @@ -23,7 +23,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/powerpc/ofw/ppc64_elf_freebsd.c b/stand/powerpc/ofw/ppc64_elf_freebsd.c index 5d449c79bd36..e0518abe2283 100644 --- a/stand/powerpc/ofw/ppc64_elf_freebsd.c +++ b/stand/powerpc/ofw/ppc64_elf_freebsd.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 64 #include diff --git a/stand/powerpc/ofw/start.c b/stand/powerpc/ofw/start.c index e5973e12da84..227fc3bc7fc7 100644 --- a/stand/powerpc/ofw/start.c +++ b/stand/powerpc/ofw/start.c @@ -30,7 +30,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include "libofw.h" diff --git a/stand/uboot/arch/arm/conf.c b/stand/uboot/arch/arm/conf.c index 90f8f929149c..7d36e6d6629e 100644 --- a/stand/uboot/arch/arm/conf.c +++ b/stand/uboot/arch/arm/conf.c @@ -25,7 +25,6 @@ * */ -#include #include #include "bootstrap.h" #include "libuboot.h" diff --git a/stand/uboot/arch/powerpc/conf.c b/stand/uboot/arch/powerpc/conf.c index e36336e20196..963a4ded4dcf 100644 --- a/stand/uboot/arch/powerpc/conf.c +++ b/stand/uboot/arch/powerpc/conf.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include "bootstrap.h" #include "libuboot.h" diff --git a/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c b/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c index 0b4864d3a545..291fe6b944fb 100644 --- a/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c +++ b/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 64 #include diff --git a/stand/uboot/devicename.c b/stand/uboot/devicename.c index aaeb3632bdd1..4ee9c7fd72c4 100644 --- a/stand/uboot/devicename.c +++ b/stand/uboot/devicename.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/uboot/reboot.c b/stand/uboot/reboot.c index d8ded778130f..792ade02fdd2 100644 --- a/stand/uboot/reboot.c +++ b/stand/uboot/reboot.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include "glue.h" diff --git a/stand/uboot/time.c b/stand/uboot/time.c index 547e3118c51b..64eae3c2e682 100644 --- a/stand/uboot/time.c +++ b/stand/uboot/time.c @@ -25,9 +25,7 @@ * SUCH DAMAGE. */ -#include #include - #include "glue.h" /* diff --git a/stand/uboot/uboot_console.c b/stand/uboot/uboot_console.c index f6656309be6c..60d6ccaf4417 100644 --- a/stand/uboot/uboot_console.c +++ b/stand/uboot/uboot_console.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include "bootstrap.h" #include "glue.h" diff --git a/stand/uboot/uboot_module.c b/stand/uboot/uboot_module.c index 6120dcb1d488..b3b3a067bc38 100644 --- a/stand/uboot/uboot_module.c +++ b/stand/uboot/uboot_module.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * U-Boot-specific module functionality. */ diff --git a/stand/userboot/userboot/autoload.c b/stand/userboot/userboot/autoload.c index a165a31fa013..576a7af78cb2 100644 --- a/stand/userboot/userboot/autoload.c +++ b/stand/userboot/userboot/autoload.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include int userboot_autoload(void) { diff --git a/stand/userboot/userboot/biossmap.c b/stand/userboot/userboot/biossmap.c index 01dccacb999e..5e5d1d696726 100644 --- a/stand/userboot/userboot/biossmap.c +++ b/stand/userboot/userboot/biossmap.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/userboot/userboot/bootinfo.c b/stand/userboot/userboot/bootinfo.c index 350a906351bd..40d446100b9b 100644 --- a/stand/userboot/userboot/bootinfo.c +++ b/stand/userboot/userboot/bootinfo.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/userboot/userboot/bootinfo32.c b/stand/userboot/userboot/bootinfo32.c index f4950d2f09fc..aae94e6a2370 100644 --- a/stand/userboot/userboot/bootinfo32.c +++ b/stand/userboot/userboot/bootinfo32.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/userboot/userboot/bootinfo64.c b/stand/userboot/userboot/bootinfo64.c index e44c84ea9f68..b7c07e152b8a 100644 --- a/stand/userboot/userboot/bootinfo64.c +++ b/stand/userboot/userboot/bootinfo64.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/userboot/userboot/conf.c b/stand/userboot/userboot/conf.c index 1c6801038bb9..abfd16c592e7 100644 --- a/stand/userboot/userboot/conf.c +++ b/stand/userboot/userboot/conf.c @@ -31,7 +31,6 @@ * $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ */ -#include #include #include "libuserboot.h" diff --git a/stand/userboot/userboot/copy.c b/stand/userboot/userboot/copy.c index d417b015429e..ba88d26a2e2d 100644 --- a/stand/userboot/userboot/copy.c +++ b/stand/userboot/userboot/copy.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include "libuserboot.h" diff --git a/stand/userboot/userboot/devicename.c b/stand/userboot/userboot/devicename.c index e6f97d908ce9..0c6bbc8f8a27 100644 --- a/stand/userboot/userboot/devicename.c +++ b/stand/userboot/userboot/devicename.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/userboot/userboot/elf64_freebsd.c b/stand/userboot/userboot/elf64_freebsd.c index f2948006d619..7f817a44da88 100644 --- a/stand/userboot/userboot/elf64_freebsd.c +++ b/stand/userboot/userboot/elf64_freebsd.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 64 #include #include diff --git a/stand/userboot/userboot/host.c b/stand/userboot/userboot/host.c index c222d599e4c5..8f33bbd82be8 100644 --- a/stand/userboot/userboot/host.c +++ b/stand/userboot/userboot/host.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * Read from the host filesystem */ diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c index 371f4b6a4e6f..cf1d9b12d69f 100644 --- a/stand/userboot/userboot/main.c +++ b/stand/userboot/userboot/main.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/userboot/userboot/userboot_cons.c b/stand/userboot/userboot/userboot_cons.c index b2f8d73fa3f9..a905f1397232 100644 --- a/stand/userboot/userboot/userboot_cons.c +++ b/stand/userboot/userboot/userboot_cons.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include "bootstrap.h" diff --git a/stand/userboot/userboot/userboot_disk.c b/stand/userboot/userboot/userboot_disk.c index 025fd00cb78b..9adcad4f00ac 100644 --- a/stand/userboot/userboot/userboot_disk.c +++ b/stand/userboot/userboot/userboot_disk.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * Userboot disk image handling. */