711 files changed, 200 insertions, 202 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 0483d469f1f20..e77e3037e91ad 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -86,7 +86,7 @@ sh(1)		jilles		Pre-commit review requested. This also applies
 				compiled in as builtins.
 share/mk	imp, bapt, bdrewery, emaste, sjg	Make is hard.
 share/mk/*.test.mk	freebsd-testing,ngie (same list as share/mk too)	Pre-commit review requested.
-sys/boot/forth		dteske	Pre-commit review requested.
+stand/forth		dteske	Pre-commit review requested.
 sys/compat/linuxkpi	hselasky	If in doubt, ask.
 sys/dev/e1000	erj	Pre-commit phabricator review requested.
 sys/dev/ixgbe	erj	Pre-commit phabricator review requested.
diff --git a/Makefile.inc1 b/Makefile.inc1
index 0b27de1c61ee7..8c5ba9407c24b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -251,6 +251,9 @@ SUBDIR+=secure
 .if !defined(NO_SHARE)
 SUBDIR+=share
 .endif
+.if ${MK_BOOT} != "no"
+SUBDIR+=stand
+.endif
 SUBDIR+=sys usr.bin usr.sbin
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
@@ -2082,7 +2085,7 @@ _clang_libs=	lib/clang
 _gcc=		gnu/usr.bin/cc
 .endif
 .if ${MK_USB} != "no"
-_usb_tools=	sys/boot/usb/tools
+_usb_tools=	stand/usb/tools
 .endif
 
 cross-tools: .MAKE .PHONY
diff --git a/lib/libefivar/Makefile b/lib/libefivar/Makefile
index b4368ce9e97cf..66dd52ca29940 100644
--- a/lib/libefivar/Makefile
+++ b/lib/libefivar/Makefile
@@ -26,7 +26,7 @@
 
 .include <src.opts.mk>
 
-EFIBOOT=${SRCTOP}/sys/boot/efi
+EFIBOOT=${SRCTOP}/stand/efi
 EDK2INC=${SRCTOP}/sys/contrib/edk2/Include
 
 .PATH:	${EFIBOOT}/libefi
diff --git a/release/arm64/PINE64.conf b/release/arm64/PINE64.conf
index 1a41bce06a303..a01e417426c1f 100644
--- a/release/arm64/PINE64.conf
+++ b/release/arm64/PINE64.conf
@@ -31,7 +31,7 @@ arm_install_uboot() {
 	BOOTFILES="$(chroot ${CHROOTDIR} \
 	    env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 	    WITH_UNIFIED_OBJDIR=yes \
-	    make -C ${WORLDDIR}/sys/boot -V .OBJDIR)"
+	    make -C ${WORLDDIR}/stand -V .OBJDIR)"
 	BOOTFILES="$(realpath ${BOOTFILES})"
 
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT
diff --git a/release/arm64/RPI3.conf b/release/arm64/RPI3.conf
index 8636ddbfa8ba4..216acae43a5a6 100644
--- a/release/arm64/RPI3.conf
+++ b/release/arm64/RPI3.conf
@@ -45,7 +45,7 @@ arm_install_uboot() {
 	BOOTFILES="$(chroot ${CHROOTDIR} \
 	    env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 	    WITH_UNIFIED_OBJDIR=yes \
-	    make -C ${WORLDDIR}/sys/boot -V .OBJDIR)"
+	    make -C ${WORLDDIR}/stand -V .OBJDIR)"
 	BOOTFILES="$(realpath ${BOOTFILES})"
 
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT
diff --git a/release/powerpc/generate-hfs.sh b/release/powerpc/generate-hfs.sh
index c445fea5df04f..8883f9d40e21e 100755
--- a/release/powerpc/generate-hfs.sh
+++ b/release/powerpc/generate-hfs.sh
@@ -32,7 +32,7 @@ cat > bootinfo.txt << EOF
 <CHRP-BOOT>
 <DESCRIPTION>FreeBSD/powerpc bootloader</DESCRIPTION>
 <OS-NAME>FreeBSD</OS-NAME>
-<VERSION> $FreeBSD: head/sys/boot/powerpc/boot1.chrp/bootinfo.txt 184490 2008-10
+<VERSION> $FreeBSD: head/stand/powerpc/boot1.chrp/bootinfo.txt 184490 2008-10
 -31 00:52:31Z nwhitehorn $ </VERSION>
 
 <COMPATIBLE>
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 78e7839d64e4f..90adeed44d829 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -16,7 +16,7 @@ write_partition_layout() {
 
 	BOOTFILES="$(env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 	    WITH_UNIFIED_OBJDIR=yes \
-	    make -C ${WORLDDIR}/sys/boot -V .OBJDIR)"
+	    make -C ${WORLDDIR}/stand -V .OBJDIR)"
 	BOOTFILES="$(realpath ${BOOTFILES})"
 
 	case "${TARGET}:${TARGET_ARCH}" in
diff --git a/share/examples/bootforth/README b/share/examples/bootforth/README
index b8eb8a0f3a169..1ac13420c9ee7 100644
--- a/share/examples/bootforth/README
+++ b/share/examples/bootforth/README
@@ -1,6 +1,6 @@
 Here you can find some simple examples how to use BootFORTH (part of the
 new bootloader) together with terminal emulation code (available when
-compiling /sys/boot/i386/libi386 with -DTERM_EMU).
+compiling /stand/i386/libi386 with -DTERM_EMU).
 
 Normally, you can place the files in /boot as they are here, and they will be
 automatically loaded by /boot/loader. You must choose between boot.4th or
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 900a77af2a22e..a5772909f1677 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -171,7 +171,7 @@
 #BOOT_COMCONSOLE_SPEED=	115200
 #
 # By default the 'pxeboot' loader retrieves the kernel via NFS.  Defining
-# this and recompiling /usr/src/sys/boot will cause it to retrieve the kernel
+# this and recompiling /usr/src/stand will cause it to retrieve the kernel
 # via TFTP.  This allows pxeboot to load a custom BOOTP diskless kernel yet
 # still mount the server's '/' (i.e. rather than load the server's kernel).
 #
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 5278c66bd8f54..e2b5d0c1b07c4 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -374,7 +374,7 @@ By default the
 .Xr pxeboot 8
 loader retrieves the kernel via NFS.
 Defining this and recompiling
-.Pa /usr/src/sys/boot
+.Pa /usr/src/stand
 will cause it to retrieve the kernel via TFTP.
 This allows
 .Xr pxeboot 8
@@ -385,7 +385,7 @@ rather than load the server's kernel.
 .It Va LOADER_FIREWIRE_SUPPORT
 .Pq Vt bool
 Defining this and recompiling
-.Pa /usr/src/sys/boot/i386
+.Pa /usr/src/stand/i386
 will add
 .Xr dcons 4
 console driver to
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 3fcbc25c727f1..668ba21fb1695 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -124,7 +124,7 @@ the
 .Nm
 machine, which may not be what you want to have happen.
 .Bd -literal -offset indent
-cd /usr/src/sys/boot/i386
+cd /usr/src/stand/i386
 make clean; make; make install
 cp /boot/pxeboot /tftpdir/
 .Ed
diff --git a/sys/boot/Makefile b/stand/Makefile
index 5234189658717..5234189658717 100644
--- a/sys/boot/Makefile
+++ b/stand/Makefile
diff --git a/sys/boot/Makefile.amd64 b/stand/Makefile.amd64
index abecaa685022d..abecaa685022d 100644
--- a/sys/boot/Makefile.amd64
+++ b/stand/Makefile.amd64
diff --git a/sys/boot/Makefile.arm b/stand/Makefile.arm
index 387b77bd344d4..387b77bd344d4 100644
--- a/sys/boot/Makefile.arm
+++ b/stand/Makefile.arm
diff --git a/sys/boot/Makefile.arm64 b/stand/Makefile.arm64
index bf0fd3988c152..bf0fd3988c152 100644
--- a/sys/boot/Makefile.arm64
+++ b/stand/Makefile.arm64
diff --git a/sys/boot/Makefile.i386 b/stand/Makefile.i386
index fb53744ab5aef..fb53744ab5aef 100644
--- a/sys/boot/Makefile.i386
+++ b/stand/Makefile.i386
diff --git a/sys/boot/Makefile.inc b/stand/Makefile.inc
index cf833d92423d8..cf833d92423d8 100644
--- a/sys/boot/Makefile.inc
+++ b/stand/Makefile.inc
diff --git a/sys/boot/Makefile.mips b/stand/Makefile.mips
index 46fc5742fbf6a..46fc5742fbf6a 100644
--- a/sys/boot/Makefile.mips
+++ b/stand/Makefile.mips
diff --git a/sys/boot/Makefile.powerpc b/stand/Makefile.powerpc
index b7660f4600d4f..b7660f4600d4f 100644
--- a/sys/boot/Makefile.powerpc
+++ b/stand/Makefile.powerpc
diff --git a/sys/boot/Makefile.sparc64 b/stand/Makefile.sparc64
index 40b42e9c18e1f..40b42e9c18e1f 100644
--- a/sys/boot/Makefile.sparc64
+++ b/stand/Makefile.sparc64
diff --git a/sys/boot/arm/Makefile b/stand/arm/Makefile
index 1d12d9831658e..1d12d9831658e 100644
--- a/sys/boot/arm/Makefile
+++ b/stand/arm/Makefile
diff --git a/sys/boot/arm/Makefile.inc b/stand/arm/Makefile.inc
index 265f86d1ed55a..265f86d1ed55a 100644
--- a/sys/boot/arm/Makefile.inc
+++ b/stand/arm/Makefile.inc
diff --git a/sys/boot/arm/loader/loader.conf b/stand/arm/loader/loader.conf
index 4154ab7bcc9f9..4154ab7bcc9f9 100644
--- a/sys/boot/arm/loader/loader.conf
+++ b/stand/arm/loader/loader.conf
diff --git a/sys/boot/arm/uboot/Makefile b/stand/arm/uboot/Makefile
index 5bf7d533b9425..5bf7d533b9425 100644
--- a/sys/boot/arm/uboot/Makefile
+++ b/stand/arm/uboot/Makefile
diff --git a/sys/boot/arm/uboot/conf.c b/stand/arm/uboot/conf.c
index 777a7b20340c6..777a7b20340c6 100644
--- a/sys/boot/arm/uboot/conf.c
+++ b/stand/arm/uboot/conf.c
diff --git a/sys/boot/arm/uboot/help.uboot b/stand/arm/uboot/help.uboot
index c1574af92715e..c1574af92715e 100644
--- a/sys/boot/arm/uboot/help.uboot
+++ b/stand/arm/uboot/help.uboot
diff --git a/sys/boot/arm/uboot/ldscript.arm b/stand/arm/uboot/ldscript.arm
index 8eb604c888875..8eb604c888875 100644
--- a/sys/boot/arm/uboot/ldscript.arm
+++ b/stand/arm/uboot/ldscript.arm
diff --git a/sys/boot/arm/uboot/start.S b/stand/arm/uboot/start.S
index 3f7764f2b7b0b..3f7764f2b7b0b 100644
--- a/sys/boot/arm/uboot/start.S
+++ b/stand/arm/uboot/start.S
diff --git a/sys/boot/arm/uboot/version b/stand/arm/uboot/version
index 486c4125cc0d4..486c4125cc0d4 100644
--- a/sys/boot/arm/uboot/version
+++ b/stand/arm/uboot/version
diff --git a/sys/boot/arm64/Makefile b/stand/arm64/Makefile
index 3ecb5825dc641..3ecb5825dc641 100644
--- a/sys/boot/arm64/Makefile
+++ b/stand/arm64/Makefile
diff --git a/sys/boot/arm64/libarm64/cache.c b/stand/arm64/libarm64/cache.c
index 25766ef564ddf..25766ef564ddf 100644
--- a/sys/boot/arm64/libarm64/cache.c
+++ b/stand/arm64/libarm64/cache.c
diff --git a/sys/boot/arm64/libarm64/cache.h b/stand/arm64/libarm64/cache.h
index 89b094b19c185..89b094b19c185 100644
--- a/sys/boot/arm64/libarm64/cache.h
+++ b/stand/arm64/libarm64/cache.h
diff --git a/sys/boot/common/Makefile.depend b/stand/common/Makefile.depend
index f80275d86ab17..f80275d86ab17 100644
--- a/sys/boot/common/Makefile.depend
+++ b/stand/common/Makefile.depend
diff --git a/sys/boot/common/bcache.c b/stand/common/bcache.c
index 198dd5f3b7ae7..198dd5f3b7ae7 100644
--- a/sys/boot/common/bcache.c
+++ b/stand/common/bcache.c
diff --git a/sys/boot/common/boot.c b/stand/common/boot.c
index 5ee95215283c7..5ee95215283c7 100644
--- a/sys/boot/common/boot.c
+++ b/stand/common/boot.c
diff --git a/sys/boot/common/bootstrap.h b/stand/common/bootstrap.h
index 2234e05e67e5f..2234e05e67e5f 100644
--- a/sys/boot/common/bootstrap.h
+++ b/stand/common/bootstrap.h
diff --git a/sys/boot/common/commands.c b/stand/common/commands.c
index def7ff2846496..def7ff2846496 100644
--- a/sys/boot/common/commands.c
+++ b/stand/common/commands.c
diff --git a/sys/boot/common/console.c b/stand/common/console.c
index f4ffc563889c0..f4ffc563889c0 100644
--- a/sys/boot/common/console.c
+++ b/stand/common/console.c
diff --git a/sys/boot/common/dev_net.c b/stand/common/dev_net.c
index c5b1e0abd92b7..c5b1e0abd92b7 100644
--- a/sys/boot/common/dev_net.c
+++ b/stand/common/dev_net.c
diff --git a/sys/boot/common/dev_net.h b/stand/common/dev_net.h
index 995b67241de89..995b67241de89 100644
--- a/sys/boot/common/dev_net.h
+++ b/stand/common/dev_net.h
diff --git a/sys/boot/common/devopen.c b/stand/common/devopen.c
index de6165c03e8e4..de6165c03e8e4 100644
--- a/sys/boot/common/devopen.c
+++ b/stand/common/devopen.c
diff --git a/sys/boot/common/disk.c b/stand/common/disk.c
index 4cb57d466a5e7..4cb57d466a5e7 100644
--- a/sys/boot/common/disk.c
+++ b/stand/common/disk.c
diff --git a/sys/boot/common/disk.h b/stand/common/disk.h
index 51e1498e3dae0..51e1498e3dae0 100644
--- a/sys/boot/common/disk.h
+++ b/stand/common/disk.h
diff --git a/sys/boot/common/help.common b/stand/common/help.common
index 3618501c18ff9..3618501c18ff9 100644
--- a/sys/boot/common/help.common
+++ b/stand/common/help.common
diff --git a/sys/boot/common/install.c b/stand/common/install.c
index 8c19066894abf..8c19066894abf 100644
--- a/sys/boot/common/install.c
+++ b/stand/common/install.c
diff --git a/sys/boot/common/interp.c b/stand/common/interp.c
index f4117b9b3e58c..f4117b9b3e58c 100644
--- a/sys/boot/common/interp.c
+++ b/stand/common/interp.c
diff --git a/sys/boot/common/interp_backslash.c b/stand/common/interp_backslash.c
index 09b8f57bf0292..09b8f57bf0292 100644
--- a/sys/boot/common/interp_backslash.c
+++ b/stand/common/interp_backslash.c
diff --git a/sys/boot/common/interp_forth.c b/stand/common/interp_forth.c
index a3b77769d38a6..a3b77769d38a6 100644
--- a/sys/boot/common/interp_forth.c
+++ b/stand/common/interp_forth.c
diff --git a/sys/boot/common/interp_parse.c b/stand/common/interp_parse.c
index 8d8a2e2909835..8d8a2e2909835 100644
--- a/sys/boot/common/interp_parse.c
+++ b/stand/common/interp_parse.c
diff --git a/sys/boot/common/isapnp.c b/stand/common/isapnp.c
index 58676007248c6..58676007248c6 100644
--- a/sys/boot/common/isapnp.c
+++ b/stand/common/isapnp.c
diff --git a/sys/boot/common/isapnp.h b/stand/common/isapnp.h
index a5b8f28304f76..a5b8f28304f76 100644
--- a/sys/boot/common/isapnp.h
+++ b/stand/common/isapnp.h
diff --git a/sys/boot/common/load_elf.c b/stand/common/load_elf.c
index 679842b9423e7..679842b9423e7 100644
--- a/sys/boot/common/load_elf.c
+++ b/stand/common/load_elf.c
diff --git a/sys/boot/common/load_elf32.c b/stand/common/load_elf32.c
index 0c9f460d4863a..0c9f460d4863a 100644
--- a/sys/boot/common/load_elf32.c
+++ b/stand/common/load_elf32.c
diff --git a/sys/boot/common/load_elf32_obj.c b/stand/common/load_elf32_obj.c
index 94b0896188366..94b0896188366 100644
--- a/sys/boot/common/load_elf32_obj.c
+++ b/stand/common/load_elf32_obj.c
diff --git a/sys/boot/common/load_elf64.c b/stand/common/load_elf64.c
index c29e8e3596a79..c29e8e3596a79 100644
--- a/sys/boot/common/load_elf64.c
+++ b/stand/common/load_elf64.c
diff --git a/sys/boot/common/load_elf64_obj.c b/stand/common/load_elf64_obj.c
index 3c9371ba01303..3c9371ba01303 100644
--- a/sys/boot/common/load_elf64_obj.c
+++ b/stand/common/load_elf64_obj.c
diff --git a/sys/boot/common/load_elf_obj.c b/stand/common/load_elf_obj.c
index a32b9fde4b75f..a32b9fde4b75f 100644
--- a/sys/boot/common/load_elf_obj.c
+++ b/stand/common/load_elf_obj.c
diff --git a/sys/boot/common/ls.c b/stand/common/ls.c
index cd6b7c49ea5f3..cd6b7c49ea5f3 100644
--- a/sys/boot/common/ls.c
+++ b/stand/common/ls.c
diff --git a/sys/boot/common/md.c b/stand/common/md.c
index 5585218b3276b..5585218b3276b 100644
--- a/sys/boot/common/md.c
+++ b/stand/common/md.c
diff --git a/sys/boot/common/merge_help.awk b/stand/common/merge_help.awk
index 1070f73f1fe96..1070f73f1fe96 100644
--- a/sys/boot/common/merge_help.awk
+++ b/stand/common/merge_help.awk
diff --git a/sys/boot/common/misc.c b/stand/common/misc.c
index 9b938afdf8c88..9b938afdf8c88 100644
--- a/sys/boot/common/misc.c
+++ b/stand/common/misc.c
diff --git a/sys/boot/common/module.c b/stand/common/module.c
index d651ad10bc866..d651ad10bc866 100644
--- a/sys/boot/common/module.c
+++ b/stand/common/module.c
diff --git a/sys/boot/common/newvers.sh b/stand/common/newvers.sh
index 75efeceab26b8..75efeceab26b8 100755
--- a/sys/boot/common/newvers.sh
+++ b/stand/common/newvers.sh
diff --git a/sys/boot/common/part.c b/stand/common/part.c
index cdb1e006695da..cdb1e006695da 100644
--- a/sys/boot/common/part.c
+++ b/stand/common/part.c
diff --git a/sys/boot/common/part.h b/stand/common/part.h
index 19bd6702fc698..19bd6702fc698 100644
--- a/sys/boot/common/part.h
+++ b/stand/common/part.h
diff --git a/sys/boot/common/paths.h b/stand/common/paths.h
index 9ed45e646a3e3..9ed45e646a3e3 100644
--- a/sys/boot/common/paths.h
+++ b/stand/common/paths.h
diff --git a/sys/boot/common/pnp.c b/stand/common/pnp.c
index 6197776a1d7d1..6197776a1d7d1 100644
--- a/sys/boot/common/pnp.c
+++ b/stand/common/pnp.c
diff --git a/sys/boot/common/rbx.h b/stand/common/rbx.h
index 21371a563805b..21371a563805b 100644
--- a/sys/boot/common/rbx.h
+++ b/stand/common/rbx.h
diff --git a/sys/boot/common/reloc_elf.c b/stand/common/reloc_elf.c
index 6d4a00ff8f681..6d4a00ff8f681 100644
--- a/sys/boot/common/reloc_elf.c
+++ b/stand/common/reloc_elf.c
diff --git a/sys/boot/common/reloc_elf32.c b/stand/common/reloc_elf32.c
index 03d9d73bab7ff..03d9d73bab7ff 100644
--- a/sys/boot/common/reloc_elf32.c
+++ b/stand/common/reloc_elf32.c
diff --git a/sys/boot/common/reloc_elf64.c b/stand/common/reloc_elf64.c
index c8dcf2a36b0db..c8dcf2a36b0db 100644
--- a/sys/boot/common/reloc_elf64.c
+++ b/stand/common/reloc_elf64.c
diff --git a/sys/boot/common/self_reloc.c b/stand/common/self_reloc.c
index 5f6bfcbb27bb8..5f6bfcbb27bb8 100644
--- a/sys/boot/common/self_reloc.c
+++ b/stand/common/self_reloc.c
diff --git a/sys/boot/defs.mk b/stand/defs.mk
index 2753e21bdb216..20e9a77864132 100644
--- a/sys/boot/defs.mk
+++ b/stand/defs.mk
@@ -5,7 +5,7 @@
 .if !defined(__BOOT_DEFS_MK__)
 __BOOT_DEFS_MK__=${MFILE}
 
-BOOTSRC=	${SRCTOP}/sys/boot
+BOOTSRC=	${SRCTOP}/stand
 EFISRC=		${BOOTSRC}/efi
 EFIINC=		${EFISRC}/include
 EFIINCMD=	${EFIINC}/${MACHINE}
@@ -17,7 +17,7 @@ SYSDIR=		${SRCTOP}/sys
 UBOOTSRC=	${BOOTSRC}/uboot
 ZFSSRC=		${BOOTSRC}/zfs
 
-BOOTOBJ=	${OBJTOP}/sys/boot
+BOOTOBJ=	${OBJTOP}/stand
 
 # BINDIR is where we install
 BINDIR?=	/boot
diff --git a/sys/boot/efi/Makefile b/stand/efi/Makefile
index e3b22de4a99a9..e3b22de4a99a9 100644
--- a/sys/boot/efi/Makefile
+++ b/stand/efi/Makefile
diff --git a/sys/boot/efi/Makefile.inc b/stand/efi/Makefile.inc
index 4fd8762e1a21b..4fd8762e1a21b 100644
--- a/sys/boot/efi/Makefile.inc
+++ b/stand/efi/Makefile.inc
diff --git a/sys/boot/efi/boot1/Makefile b/stand/efi/boot1/Makefile
index f2e69460593d9..f2e69460593d9 100644
--- a/sys/boot/efi/boot1/Makefile
+++ b/stand/efi/boot1/Makefile
diff --git a/sys/boot/efi/boot1/Makefile.depend b/stand/efi/boot1/Makefile.depend
index 813358d57274c..ffc5430cceecd 100644
--- a/sys/boot/efi/boot1/Makefile.depend
+++ b/stand/efi/boot1/Makefile.depend
@@ -5,9 +5,9 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/libmd \
-	sys/boot/efi/libefi \
-	sys/boot/libsa \
-	sys/boot/zfs \
+	stand/efi/libefi \
+	stand/libsa \
+	stand/zfs \
 
 
 .include <dirdeps.mk>
diff --git a/sys/boot/efi/boot1/Makefile.fat b/stand/efi/boot1/Makefile.fat
index 1d40fa8ab54cf..1d40fa8ab54cf 100644
--- a/sys/boot/efi/boot1/Makefile.fat
+++ b/stand/efi/boot1/Makefile.fat
diff --git a/sys/boot/efi/boot1/boot1.c b/stand/efi/boot1/boot1.c
index b7cb57f455304..b7cb57f455304 100644
--- a/sys/boot/efi/boot1/boot1.c
+++ b/stand/efi/boot1/boot1.c
diff --git a/sys/boot/efi/boot1/boot_module.h b/stand/efi/boot1/boot_module.h
index bfade34fe9cbe..bfade34fe9cbe 100644
--- a/sys/boot/efi/boot1/boot_module.h
+++ b/stand/efi/boot1/boot_module.h
diff --git a/sys/boot/efi/boot1/fat-amd64.tmpl.xz b/stand/efi/boot1/fat-amd64.tmpl.xz
index fb5f94e0e9b6d..fb5f94e0e9b6d 100644
--- a/sys/boot/efi/boot1/fat-amd64.tmpl.xz
+++ b/stand/efi/boot1/fat-amd64.tmpl.xz
diff --git a/sys/boot/efi/boot1/fat-arm.tmpl.xz b/stand/efi/boot1/fat-arm.tmpl.xz
index bb253fcfaf279..bb253fcfaf279 100644
--- a/sys/boot/efi/boot1/fat-arm.tmpl.xz
+++ b/stand/efi/boot1/fat-arm.tmpl.xz
diff --git a/sys/boot/efi/boot1/fat-arm64.tmpl.xz b/stand/efi/boot1/fat-arm64.tmpl.xz
index 15df643393fc6..15df643393fc6 100644
--- a/sys/boot/efi/boot1/fat-arm64.tmpl.xz
+++ b/stand/efi/boot1/fat-arm64.tmpl.xz
diff --git a/sys/boot/efi/boot1/fat-i386.tmpl.xz b/stand/efi/boot1/fat-i386.tmpl.xz
index 2cde337b62f0c..2cde337b62f0c 100644
--- a/sys/boot/efi/boot1/fat-i386.tmpl.xz
+++ b/stand/efi/boot1/fat-i386.tmpl.xz
diff --git a/sys/boot/efi/boot1/generate-fat.sh b/stand/efi/boot1/generate-fat.sh
index f6bda6f5f11f4..f6bda6f5f11f4 100755
--- a/sys/boot/efi/boot1/generate-fat.sh
+++ b/stand/efi/boot1/generate-fat.sh
diff --git a/sys/boot/efi/boot1/ufs_module.c b/stand/efi/boot1/ufs_module.c
index 4a8016fad2ce5..4a8016fad2ce5 100644
--- a/sys/boot/efi/boot1/ufs_module.c
+++ b/stand/efi/boot1/ufs_module.c
diff --git a/sys/boot/efi/boot1/zfs_module.c b/stand/efi/boot1/zfs_module.c
index e1d1a5a35f176..e1d1a5a35f176 100644
--- a/sys/boot/efi/boot1/zfs_module.c
+++ b/stand/efi/boot1/zfs_module.c
diff --git a/sys/boot/efi/fdt/Makefile b/stand/efi/fdt/Makefile
index 7308ce94e45ec..7308ce94e45ec 100644
--- a/sys/boot/efi/fdt/Makefile
+++ b/stand/efi/fdt/Makefile
diff --git a/sys/boot/efi/fdt/Makefile.depend b/stand/efi/fdt/Makefile.depend
index 18be76b0cb6f4..18be76b0cb6f4 100644
--- a/sys/boot/efi/fdt/Makefile.depend
+++ b/stand/efi/fdt/Makefile.depend
diff --git a/sys/boot/efi/fdt/efi_fdt.c b/stand/efi/fdt/efi_fdt.c
index d6757689c8967..d6757689c8967 100644
--- a/sys/boot/efi/fdt/efi_fdt.c
+++ b/stand/efi/fdt/efi_fdt.c
diff --git a/sys/boot/efi/include/README b/stand/efi/include/README
index bf821fae7e600..bf821fae7e600 100644
--- a/sys/boot/efi/include/README
+++ b/stand/efi/include/README
diff --git a/sys/boot/efi/include/amd64/efibind.h b/stand/efi/include/amd64/efibind.h
index 8cfce5bbc5f1c..8cfce5bbc5f1c 100644
--- a/sys/boot/efi/include/amd64/efibind.h
+++ b/stand/efi/include/amd64/efibind.h
diff --git a/sys/boot/efi/include/amd64/pe.h b/stand/efi/include/amd64/pe.h
index f8033c55ac55f..f8033c55ac55f 100644
--- a/sys/boot/efi/include/amd64/pe.h
+++ b/stand/efi/include/amd64/pe.h
diff --git a/sys/boot/efi/include/arm/efibind.h b/stand/efi/include/arm/efibind.h
index 177032adc01af..177032adc01af 100644
--- a/sys/boot/efi/include/arm/efibind.h
+++ b/stand/efi/include/arm/efibind.h
diff --git a/sys/boot/efi/include/arm64/efibind.h b/stand/efi/include/arm64/efibind.h
index 4751e2e944a84..4751e2e944a84 100644
--- a/sys/boot/efi/include/arm64/efibind.h
+++ b/stand/efi/include/arm64/efibind.h
diff --git a/sys/boot/efi/include/efi.h b/stand/efi/include/efi.h
index a91e8813c184c..a91e8813c184c 100644
--- a/sys/boot/efi/include/efi.h
+++ b/stand/efi/include/efi.h
diff --git a/sys/boot/efi/include/efi_driver_utils.h b/stand/efi/include/efi_driver_utils.h
index 520cff128a279..520cff128a279 100644
--- a/sys/boot/efi/include/efi_driver_utils.h
+++ b/stand/efi/include/efi_driver_utils.h
diff --git a/sys/boot/efi/include/efi_drivers.h b/stand/efi/include/efi_drivers.h
index 8df9133f73d47..8df9133f73d47 100644
--- a/sys/boot/efi/include/efi_drivers.h
+++ b/stand/efi/include/efi_drivers.h
diff --git a/sys/boot/efi/include/efi_nii.h b/stand/efi/include/efi_nii.h
index 561cbd46a3ea3..561cbd46a3ea3 100644
--- a/sys/boot/efi/include/efi_nii.h
+++ b/stand/efi/include/efi_nii.h
diff --git a/sys/boot/efi/include/efiapi.h b/stand/efi/include/efiapi.h
index 8bab2173c0a57..8bab2173c0a57 100644
--- a/sys/boot/efi/include/efiapi.h
+++ b/stand/efi/include/efiapi.h
diff --git a/sys/boot/efi/include/efichar.h b/stand/efi/include/efichar.h
index 2fa4ed44792c6..2fa4ed44792c6 100644
--- a/sys/boot/efi/include/efichar.h
+++ b/stand/efi/include/efichar.h
diff --git a/sys/boot/efi/include/eficon.h b/stand/efi/include/eficon.h
index 2f719e70a7e41..2f719e70a7e41 100644
--- a/sys/boot/efi/include/eficon.h
+++ b/stand/efi/include/eficon.h
diff --git a/sys/boot/efi/include/eficonsctl.h b/stand/efi/include/eficonsctl.h
index 68be3d69f4fd3..68be3d69f4fd3 100644
--- a/sys/boot/efi/include/eficonsctl.h
+++ b/stand/efi/include/eficonsctl.h
diff --git a/sys/boot/efi/include/efidebug.h b/stand/efi/include/efidebug.h
index 5576d5f4e48cc..5576d5f4e48cc 100644
--- a/sys/boot/efi/include/efidebug.h
+++ b/stand/efi/include/efidebug.h
diff --git a/sys/boot/efi/include/efidef.h b/stand/efi/include/efidef.h
index 9cc5cdcbe883d..9cc5cdcbe883d 100644
--- a/sys/boot/efi/include/efidef.h
+++ b/stand/efi/include/efidef.h
diff --git a/sys/boot/efi/include/efidevp.h b/stand/efi/include/efidevp.h
index cda6b41fdd4f0..cda6b41fdd4f0 100644
--- a/sys/boot/efi/include/efidevp.h
+++ b/stand/efi/include/efidevp.h
diff --git a/sys/boot/efi/include/efierr.h b/stand/efi/include/efierr.h
index a8b655718599c..a8b655718599c 100644
--- a/sys/boot/efi/include/efierr.h
+++ b/stand/efi/include/efierr.h
diff --git a/sys/boot/efi/include/efifpswa.h b/stand/efi/include/efifpswa.h
index 21823c5ff6f16..21823c5ff6f16 100644
--- a/sys/boot/efi/include/efifpswa.h
+++ b/stand/efi/include/efifpswa.h
diff --git a/sys/boot/efi/include/efifs.h b/stand/efi/include/efifs.h
index 58febb66eb751..58febb66eb751 100644
--- a/sys/boot/efi/include/efifs.h
+++ b/stand/efi/include/efifs.h
diff --git a/sys/boot/efi/include/efigop.h b/stand/efi/include/efigop.h
index 104fa6e44b5a6..104fa6e44b5a6 100644
--- a/sys/boot/efi/include/efigop.h
+++ b/stand/efi/include/efigop.h
diff --git a/sys/boot/efi/include/efilib.h b/stand/efi/include/efilib.h
index 8721bc5766262..8721bc5766262 100644
--- a/sys/boot/efi/include/efilib.h
+++ b/stand/efi/include/efilib.h
diff --git a/sys/boot/efi/include/efinet.h b/stand/efi/include/efinet.h
index 3ac58b2431cae..3ac58b2431cae 100644
--- a/sys/boot/efi/include/efinet.h
+++ b/stand/efi/include/efinet.h
diff --git a/sys/boot/efi/include/efipart.h b/stand/efi/include/efipart.h
index ef1a8709d91b9..ef1a8709d91b9 100644
--- a/sys/boot/efi/include/efipart.h
+++ b/stand/efi/include/efipart.h
diff --git a/sys/boot/efi/include/efipciio.h b/stand/efi/include/efipciio.h
index b00d6ecc994a5..b00d6ecc994a5 100644
--- a/sys/boot/efi/include/efipciio.h
+++ b/stand/efi/include/efipciio.h
diff --git a/sys/boot/efi/include/efiprot.h b/stand/efi/include/efiprot.h
index 351b2d347ad4a..351b2d347ad4a 100644
--- a/sys/boot/efi/include/efiprot.h
+++ b/stand/efi/include/efiprot.h
diff --git a/sys/boot/efi/include/efipxebc.h b/stand/efi/include/efipxebc.h
index ba0b2e9b6c5df..ba0b2e9b6c5df 100644
--- a/sys/boot/efi/include/efipxebc.h
+++ b/stand/efi/include/efipxebc.h
diff --git a/sys/boot/efi/include/efiser.h b/stand/efi/include/efiser.h
index e3d66e203a4bd..e3d66e203a4bd 100644
--- a/sys/boot/efi/include/efiser.h
+++ b/stand/efi/include/efiser.h
diff --git a/sys/boot/efi/include/efistdarg.h b/stand/efi/include/efistdarg.h
index 25f5569841122..25f5569841122 100644
--- a/sys/boot/efi/include/efistdarg.h
+++ b/stand/efi/include/efistdarg.h
diff --git a/sys/boot/efi/include/efiuga.h b/stand/efi/include/efiuga.h
index 28c738e7fbc4a..28c738e7fbc4a 100644
--- a/sys/boot/efi/include/efiuga.h
+++ b/stand/efi/include/efiuga.h
diff --git a/sys/boot/efi/include/efizfs.h b/stand/efi/include/efizfs.h
index 1fd034fb2ab36..1fd034fb2ab36 100644
--- a/sys/boot/efi/include/efizfs.h
+++ b/stand/efi/include/efizfs.h
diff --git a/sys/boot/efi/include/i386/efibind.h b/stand/efi/include/i386/efibind.h
index 0f1d4f1155981..0f1d4f1155981 100644
--- a/sys/boot/efi/include/i386/efibind.h
+++ b/stand/efi/include/i386/efibind.h
diff --git a/sys/boot/efi/include/i386/pe.h b/stand/efi/include/i386/pe.h
index e2ae25c3ddf6c..e2ae25c3ddf6c 100644
--- a/sys/boot/efi/include/i386/pe.h
+++ b/stand/efi/include/i386/pe.h
diff --git a/sys/boot/efi/libefi/Makefile b/stand/efi/libefi/Makefile
index e0ffd7b80f62f..e0ffd7b80f62f 100644
--- a/sys/boot/efi/libefi/Makefile
+++ b/stand/efi/libefi/Makefile
diff --git a/sys/boot/efi/libefi/Makefile.depend b/stand/efi/libefi/Makefile.depend
index 18be76b0cb6f4..18be76b0cb6f4 100644
--- a/sys/boot/efi/libefi/Makefile.depend
+++ b/stand/efi/libefi/Makefile.depend
diff --git a/sys/boot/efi/libefi/delay.c b/stand/efi/libefi/delay.c
index 723f681c52864..723f681c52864 100644
--- a/sys/boot/efi/libefi/delay.c
+++ b/stand/efi/libefi/delay.c
diff --git a/sys/boot/efi/libefi/devicename.c b/stand/efi/libefi/devicename.c
index 52e4799c8f3d0..52e4799c8f3d0 100644
--- a/sys/boot/efi/libefi/devicename.c
+++ b/stand/efi/libefi/devicename.c
diff --git a/sys/boot/efi/libefi/devpath.c b/stand/efi/libefi/devpath.c
index f881cfce98969..f881cfce98969 100644
--- a/sys/boot/efi/libefi/devpath.c
+++ b/stand/efi/libefi/devpath.c
diff --git a/sys/boot/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c
index 450ed46a23f51..450ed46a23f51 100644
--- a/sys/boot/efi/libefi/efi_console.c
+++ b/stand/efi/libefi/efi_console.c
diff --git a/sys/boot/efi/libefi/efi_driver_utils.c b/stand/efi/libefi/efi_driver_utils.c
index 0edea5c1e0d87..0edea5c1e0d87 100644
--- a/sys/boot/efi/libefi/efi_driver_utils.c
+++ b/stand/efi/libefi/efi_driver_utils.c
diff --git a/sys/boot/efi/libefi/efichar.c b/stand/efi/libefi/efichar.c
index dad4e963300c0..dad4e963300c0 100644
--- a/sys/boot/efi/libefi/efichar.c
+++ b/stand/efi/libefi/efichar.c
diff --git a/sys/boot/efi/libefi/efinet.c b/stand/efi/libefi/efinet.c
index cdb63c99f39bc..cdb63c99f39bc 100644
--- a/sys/boot/efi/libefi/efinet.c
+++ b/stand/efi/libefi/efinet.c
diff --git a/sys/boot/efi/libefi/efipart.c b/stand/efi/libefi/efipart.c
index 724233c5ab08e..724233c5ab08e 100644
--- a/sys/boot/efi/libefi/efipart.c
+++ b/stand/efi/libefi/efipart.c
diff --git a/sys/boot/efi/libefi/efizfs.c b/stand/efi/libefi/efizfs.c
index 7c434765fb540..7c434765fb540 100644
--- a/sys/boot/efi/libefi/efizfs.c
+++ b/stand/efi/libefi/efizfs.c
diff --git a/sys/boot/efi/libefi/env.c b/stand/efi/libefi/env.c
index ceec7b2a18f86..ceec7b2a18f86 100644
--- a/sys/boot/efi/libefi/env.c
+++ b/stand/efi/libefi/env.c
diff --git a/sys/boot/efi/libefi/errno.c b/stand/efi/libefi/errno.c
index 0f354c3f3c8f4..0f354c3f3c8f4 100644
--- a/sys/boot/efi/libefi/errno.c
+++ b/stand/efi/libefi/errno.c
diff --git a/sys/boot/efi/libefi/handles.c b/stand/efi/libefi/handles.c
index 1e4ef6ffbd50a..1e4ef6ffbd50a 100644
--- a/sys/boot/efi/libefi/handles.c
+++ b/stand/efi/libefi/handles.c
diff --git a/sys/boot/efi/libefi/libefi.c b/stand/efi/libefi/libefi.c
index e0a721f58b329..e0a721f58b329 100644
--- a/sys/boot/efi/libefi/libefi.c
+++ b/stand/efi/libefi/libefi.c
diff --git a/sys/boot/efi/libefi/time.c b/stand/efi/libefi/time.c
index fe0d2ef2702bb..fe0d2ef2702bb 100644
--- a/sys/boot/efi/libefi/time.c
+++ b/stand/efi/libefi/time.c
diff --git a/sys/boot/efi/libefi/time_event.c b/stand/efi/libefi/time_event.c
index f96f1d845f6af..f96f1d845f6af 100644
--- a/sys/boot/efi/libefi/time_event.c
+++ b/stand/efi/libefi/time_event.c
diff --git a/sys/boot/efi/libefi/wchar.c b/stand/efi/libefi/wchar.c
index d8d81aca4bcca..d8d81aca4bcca 100644
--- a/sys/boot/efi/libefi/wchar.c
+++ b/stand/efi/libefi/wchar.c
diff --git a/sys/boot/efi/loader/Makefile b/stand/efi/loader/Makefile
index a3a23c87dfe76..a3a23c87dfe76 100644
--- a/sys/boot/efi/loader/Makefile
+++ b/stand/efi/loader/Makefile
diff --git a/stand/efi/loader/Makefile.depend b/stand/efi/loader/Makefile.depend
new file mode 100644
index 0000000000000..657c40116b4d5
--- /dev/null
+++ b/stand/efi/loader/Makefile.depend
@@ -0,0 +1,17 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	stand/efi/libefi \
+	stand/ficl \
+	stand/libsa \
+	stand/zfs \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sys/boot/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loader/arch/amd64/Makefile.inc
index b6d824ce57e45..b6d824ce57e45 100644
--- a/sys/boot/efi/loader/arch/amd64/Makefile.inc
+++ b/stand/efi/loader/arch/amd64/Makefile.inc
diff --git a/sys/boot/efi/loader/arch/amd64/amd64_tramp.S b/stand/efi/loader/arch/amd64/amd64_tramp.S
index c102d92435894..c102d92435894 100644
--- a/sys/boot/efi/loader/arch/amd64/amd64_tramp.S
+++ b/stand/efi/loader/arch/amd64/amd64_tramp.S
diff --git a/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c b/stand/efi/loader/arch/amd64/elf64_freebsd.c
index 37e9fe1b4b183..37e9fe1b4b183 100644
--- a/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c
+++ b/stand/efi/loader/arch/amd64/elf64_freebsd.c
diff --git a/sys/boot/efi/loader/arch/amd64/exc.S b/stand/efi/loader/arch/amd64/exc.S
index 0035d4a37e20a..0035d4a37e20a 100644
--- a/sys/boot/efi/loader/arch/amd64/exc.S
+++ b/stand/efi/loader/arch/amd64/exc.S
diff --git a/sys/boot/efi/loader/arch/amd64/ldscript.amd64 b/stand/efi/loader/arch/amd64/ldscript.amd64
index 874df9b08f9e3..874df9b08f9e3 100644
--- a/sys/boot/efi/loader/arch/amd64/ldscript.amd64
+++ b/stand/efi/loader/arch/amd64/ldscript.amd64
diff --git a/sys/boot/efi/loader/arch/amd64/start.S b/stand/efi/loader/arch/amd64/start.S
index 774ef4fa7901b..774ef4fa7901b 100644
--- a/sys/boot/efi/loader/arch/amd64/start.S
+++ b/stand/efi/loader/arch/amd64/start.S
diff --git a/sys/boot/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c
index e8cf188cf22fc..e8cf188cf22fc 100644
--- a/sys/boot/efi/loader/arch/amd64/trap.c
+++ b/stand/efi/loader/arch/amd64/trap.c
diff --git a/sys/boot/efi/loader/arch/arm/Makefile.inc b/stand/efi/loader/arch/arm/Makefile.inc
index 74e6616e991b3..74e6616e991b3 100644
--- a/sys/boot/efi/loader/arch/arm/Makefile.inc
+++ b/stand/efi/loader/arch/arm/Makefile.inc
diff --git a/sys/boot/efi/loader/arch/arm/exec.c b/stand/efi/loader/arch/arm/exec.c
index 83d3f2b1140ac..83d3f2b1140ac 100644
--- a/sys/boot/efi/loader/arch/arm/exec.c
+++ b/stand/efi/loader/arch/arm/exec.c
diff --git a/sys/boot/efi/loader/arch/arm/ldscript.arm b/stand/efi/loader/arch/arm/ldscript.arm
index 9f6e7c29117eb..9f6e7c29117eb 100644
--- a/sys/boot/efi/loader/arch/arm/ldscript.arm
+++ b/stand/efi/loader/arch/arm/ldscript.arm
diff --git a/sys/boot/efi/loader/arch/arm/start.S b/stand/efi/loader/arch/arm/start.S
index 5b6182d67d0af..5b6182d67d0af 100644
--- a/sys/boot/efi/loader/arch/arm/start.S
+++ b/stand/efi/loader/arch/arm/start.S
diff --git a/sys/boot/efi/loader/arch/arm64/Makefile.inc b/stand/efi/loader/arch/arm64/Makefile.inc
index a71bcc2e1a1fd..a71bcc2e1a1fd 100644
--- a/sys/boot/efi/loader/arch/arm64/Makefile.inc
+++ b/stand/efi/loader/arch/arm64/Makefile.inc
diff --git a/sys/boot/efi/loader/arch/arm64/exec.c b/stand/efi/loader/arch/arm64/exec.c
index 45321261def0a..45321261def0a 100644
--- a/sys/boot/efi/loader/arch/arm64/exec.c
+++ b/stand/efi/loader/arch/arm64/exec.c
diff --git a/sys/boot/efi/loader/arch/arm64/ldscript.arm64 b/stand/efi/loader/arch/arm64/ldscript.arm64
index 685c0967840d8..685c0967840d8 100644
--- a/sys/boot/efi/loader/arch/arm64/ldscript.arm64
+++ b/stand/efi/loader/arch/arm64/ldscript.arm64
diff --git a/sys/boot/efi/loader/arch/arm64/start.S b/stand/efi/loader/arch/arm64/start.S
index b58c2c50be9fa..b58c2c50be9fa 100644
--- a/sys/boot/efi/loader/arch/arm64/start.S
+++ b/stand/efi/loader/arch/arm64/start.S
diff --git a/sys/boot/efi/loader/arch/i386/Makefile.inc b/stand/efi/loader/arch/i386/Makefile.inc
index 70d2848ba26f9..70d2848ba26f9 100644
--- a/sys/boot/efi/loader/arch/i386/Makefile.inc
+++ b/stand/efi/loader/arch/i386/Makefile.inc
diff --git a/sys/boot/efi/loader/arch/i386/bootinfo.c b/stand/efi/loader/arch/i386/bootinfo.c
index cbd6e4ebe9772..cbd6e4ebe9772 100644
--- a/sys/boot/efi/loader/arch/i386/bootinfo.c
+++ b/stand/efi/loader/arch/i386/bootinfo.c
diff --git a/sys/boot/efi/loader/arch/i386/efimd.c b/stand/efi/loader/arch/i386/efimd.c
index 8e1d850d82cca..8e1d850d82cca 100644
--- a/sys/boot/efi/loader/arch/i386/efimd.c
+++ b/stand/efi/loader/arch/i386/efimd.c
diff --git a/sys/boot/efi/loader/arch/i386/elf32_freebsd.c b/stand/efi/loader/arch/i386/elf32_freebsd.c
index d3c42613108e6..d3c42613108e6 100644
--- a/sys/boot/efi/loader/arch/i386/elf32_freebsd.c
+++ b/stand/efi/loader/arch/i386/elf32_freebsd.c
diff --git a/sys/boot/efi/loader/arch/i386/exec.c b/stand/efi/loader/arch/i386/exec.c
index 579f5593b24b8..579f5593b24b8 100644
--- a/sys/boot/efi/loader/arch/i386/exec.c
+++ b/stand/efi/loader/arch/i386/exec.c
diff --git a/sys/boot/efi/loader/arch/i386/i386_copy.c b/stand/efi/loader/arch/i386/i386_copy.c
index 522913f5da43d..522913f5da43d 100644
--- a/sys/boot/efi/loader/arch/i386/i386_copy.c
+++ b/stand/efi/loader/arch/i386/i386_copy.c
diff --git a/sys/boot/efi/loader/arch/i386/ldscript.i386 b/stand/efi/loader/arch/i386/ldscript.i386
index e17212a1bdddb..e17212a1bdddb 100644
--- a/sys/boot/efi/loader/arch/i386/ldscript.i386
+++ b/stand/efi/loader/arch/i386/ldscript.i386
diff --git a/sys/boot/efi/loader/arch/i386/start.S b/stand/efi/loader/arch/i386/start.S
index b597f419d4a1f..b597f419d4a1f 100644
--- a/sys/boot/efi/loader/arch/i386/start.S
+++ b/stand/efi/loader/arch/i386/start.S
diff --git a/sys/boot/efi/loader/autoload.c b/stand/efi/loader/autoload.c
index c1eb84928ed86..c1eb84928ed86 100644
--- a/sys/boot/efi/loader/autoload.c
+++ b/stand/efi/loader/autoload.c
diff --git a/sys/boot/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c
index ca06a6194f8dc..ca06a6194f8dc 100644
--- a/sys/boot/efi/loader/bootinfo.c
+++ b/stand/efi/loader/bootinfo.c
diff --git a/sys/boot/efi/loader/conf.c b/stand/efi/loader/conf.c
index cea95b3db1045..cea95b3db1045 100644
--- a/sys/boot/efi/loader/conf.c
+++ b/stand/efi/loader/conf.c
diff --git a/sys/boot/efi/loader/copy.c b/stand/efi/loader/copy.c
index efa42b99d66ee..efa42b99d66ee 100644
--- a/sys/boot/efi/loader/copy.c
+++ b/stand/efi/loader/copy.c
diff --git a/sys/boot/efi/loader/efi_main.c b/stand/efi/loader/efi_main.c
index e424d89666ec9..e424d89666ec9 100644
--- a/sys/boot/efi/loader/efi_main.c
+++ b/stand/efi/loader/efi_main.c
diff --git a/sys/boot/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c
index 37999ea1d372f..37999ea1d372f 100644
--- a/sys/boot/efi/loader/framebuffer.c
+++ b/stand/efi/loader/framebuffer.c
diff --git a/sys/boot/efi/loader/framebuffer.h b/stand/efi/loader/framebuffer.h
index 2ec9017dc3eef..2ec9017dc3eef 100644
--- a/sys/boot/efi/loader/framebuffer.h
+++ b/stand/efi/loader/framebuffer.h
diff --git a/sys/boot/efi/loader/loader_efi.h b/stand/efi/loader/loader_efi.h
index 780fbfe4c6aa7..780fbfe4c6aa7 100644
--- a/sys/boot/efi/loader/loader_efi.h
+++ b/stand/efi/loader/loader_efi.h
diff --git a/sys/boot/efi/loader/main.c b/stand/efi/loader/main.c
index 129fd72068ba4..129fd72068ba4 100644
--- a/sys/boot/efi/loader/main.c
+++ b/stand/efi/loader/main.c
diff --git a/sys/boot/efi/loader/version b/stand/efi/loader/version
index 3a4c47c5efb17..3a4c47c5efb17 100644
--- a/sys/boot/efi/loader/version
+++ b/stand/efi/loader/version
diff --git a/sys/boot/fdt.mk b/stand/fdt.mk
index 4d4794d980f26..4d4794d980f26 100644
--- a/sys/boot/fdt.mk
+++ b/stand/fdt.mk
diff --git a/sys/boot/fdt/Makefile b/stand/fdt/Makefile
index a725499d2f78e..a725499d2f78e 100644
--- a/sys/boot/fdt/Makefile
+++ b/stand/fdt/Makefile
diff --git a/sys/boot/fdt/Makefile.depend b/stand/fdt/Makefile.depend
index 18be76b0cb6f4..18be76b0cb6f4 100644
--- a/sys/boot/fdt/Makefile.depend
+++ b/stand/fdt/Makefile.depend
diff --git a/sys/boot/fdt/fdt_loader_cmd.c b/stand/fdt/fdt_loader_cmd.c
index a463631301c5a..a463631301c5a 100644
--- a/sys/boot/fdt/fdt_loader_cmd.c
+++ b/stand/fdt/fdt_loader_cmd.c
diff --git a/sys/boot/fdt/fdt_overlay.c b/stand/fdt/fdt_overlay.c
index 9f77e86660066..9f77e86660066 100644
--- a/sys/boot/fdt/fdt_overlay.c
+++ b/stand/fdt/fdt_overlay.c
diff --git a/sys/boot/fdt/fdt_overlay.h b/stand/fdt/fdt_overlay.h
index 0f9134384d3c2..0f9134384d3c2 100644
--- a/sys/boot/fdt/fdt_overlay.h
+++ b/stand/fdt/fdt_overlay.h
diff --git a/sys/boot/fdt/fdt_platform.h b/stand/fdt/fdt_platform.h
index eae940aab0303..eae940aab0303 100644
--- a/sys/boot/fdt/fdt_platform.h
+++ b/stand/fdt/fdt_platform.h
diff --git a/sys/boot/fdt/help.fdt b/stand/fdt/help.fdt
index 665f63c260c6b..665f63c260c6b 100644
--- a/sys/boot/fdt/help.fdt
+++ b/stand/fdt/help.fdt
diff --git a/sys/boot/ficl.mk b/stand/ficl.mk
index a0a13206b495a..a0a13206b495a 100644
--- a/sys/boot/ficl.mk
+++ b/stand/ficl.mk
diff --git a/sys/boot/ficl/Makefile b/stand/ficl/Makefile
index 9a13614a7fea3..9a13614a7fea3 100644
--- a/sys/boot/ficl/Makefile
+++ b/stand/ficl/Makefile
diff --git a/sys/boot/ficl/Makefile.depend b/stand/ficl/Makefile.depend
index c210061155d24..c210061155d24 100644
--- a/sys/boot/ficl/Makefile.depend
+++ b/stand/ficl/Makefile.depend
diff --git a/sys/boot/ficl/aarch64/sysdep.c b/stand/ficl/aarch64/sysdep.c
index ad38660843cdb..ad38660843cdb 100644
--- a/sys/boot/ficl/aarch64/sysdep.c
+++ b/stand/ficl/aarch64/sysdep.c
diff --git a/sys/boot/ficl/aarch64/sysdep.h b/stand/ficl/aarch64/sysdep.h
index 3726b9ef838f2..3726b9ef838f2 100644
--- a/sys/boot/ficl/aarch64/sysdep.h
+++ b/stand/ficl/aarch64/sysdep.h
diff --git a/sys/boot/ficl/amd64/sysdep.c b/stand/ficl/amd64/sysdep.c
index 5957b71e461a0..5957b71e461a0 100644
--- a/sys/boot/ficl/amd64/sysdep.c
+++ b/stand/ficl/amd64/sysdep.c
diff --git a/sys/boot/ficl/amd64/sysdep.h b/stand/ficl/amd64/sysdep.h
index 08bc0e1f4d0bc..08bc0e1f4d0bc 100644
--- a/sys/boot/ficl/amd64/sysdep.h
+++ b/stand/ficl/amd64/sysdep.h
diff --git a/sys/boot/ficl/arm/sysdep.c b/stand/ficl/arm/sysdep.c
index ad38660843cdb..ad38660843cdb 100644
--- a/sys/boot/ficl/arm/sysdep.c
+++ b/stand/ficl/arm/sysdep.c
diff --git a/sys/boot/ficl/arm/sysdep.h b/stand/ficl/arm/sysdep.h
index 00718eedd35cd..00718eedd35cd 100644
--- a/sys/boot/ficl/arm/sysdep.h
+++ b/stand/ficl/arm/sysdep.h
diff --git a/sys/boot/ficl/dict.c b/stand/ficl/dict.c
index b76d92559f8fc..b76d92559f8fc 100644
--- a/sys/boot/ficl/dict.c
+++ b/stand/ficl/dict.c
diff --git a/sys/boot/ficl/ficl.c b/stand/ficl/ficl.c
index 219cf84b22257..219cf84b22257 100644
--- a/sys/boot/ficl/ficl.c
+++ b/stand/ficl/ficl.c
diff --git a/sys/boot/ficl/ficl.h b/stand/ficl/ficl.h
index 8829ccea96688..8829ccea96688 100644
--- a/sys/boot/ficl/ficl.h
+++ b/stand/ficl/ficl.h
diff --git a/sys/boot/ficl/fileaccess.c b/stand/ficl/fileaccess.c
index 2b981c8709757..2b981c8709757 100644
--- a/sys/boot/ficl/fileaccess.c
+++ b/stand/ficl/fileaccess.c
diff --git a/sys/boot/ficl/float.c b/stand/ficl/float.c
index d757b23648bcb..d757b23648bcb 100644
--- a/sys/boot/ficl/float.c
+++ b/stand/ficl/float.c
diff --git a/sys/boot/ficl/i386/sysdep.c b/stand/ficl/i386/sysdep.c
index ea594e63808f1..ea594e63808f1 100644
--- a/sys/boot/ficl/i386/sysdep.c
+++ b/stand/ficl/i386/sysdep.c
diff --git a/sys/boot/ficl/i386/sysdep.h b/stand/ficl/i386/sysdep.h
index 94fda2047edef..94fda2047edef 100644
--- a/sys/boot/ficl/i386/sysdep.h
+++ b/stand/ficl/i386/sysdep.h
diff --git a/sys/boot/ficl/loader.c b/stand/ficl/loader.c
index 50f70642cc5c7..50f70642cc5c7 100644
--- a/sys/boot/ficl/loader.c
+++ b/stand/ficl/loader.c
diff --git a/sys/boot/ficl/math64.c b/stand/ficl/math64.c
index 6e50458151bc0..6e50458151bc0 100644
--- a/sys/boot/ficl/math64.c
+++ b/stand/ficl/math64.c
diff --git a/sys/boot/ficl/math64.h b/stand/ficl/math64.h
index a4e56369564f9..a4e56369564f9 100644
--- a/sys/boot/ficl/math64.h
+++ b/stand/ficl/math64.h
diff --git a/sys/boot/ficl/mips/sysdep.c b/stand/ficl/mips/sysdep.c
index ad38660843cdb..ad38660843cdb 100644
--- a/sys/boot/ficl/mips/sysdep.c
+++ b/stand/ficl/mips/sysdep.c
diff --git a/sys/boot/ficl/mips/sysdep.h b/stand/ficl/mips/sysdep.h
index 3ae748e259c75..3ae748e259c75 100644
--- a/sys/boot/ficl/mips/sysdep.h
+++ b/stand/ficl/mips/sysdep.h
diff --git a/sys/boot/ficl/mips64/sysdep.c b/stand/ficl/mips64/sysdep.c
index ad38660843cdb..ad38660843cdb 100644
--- a/sys/boot/ficl/mips64/sysdep.c
+++ b/stand/ficl/mips64/sysdep.c
diff --git a/sys/boot/ficl/mips64/sysdep.h b/stand/ficl/mips64/sysdep.h
index 5c9e163acb706..5c9e163acb706 100644
--- a/sys/boot/ficl/mips64/sysdep.h
+++ b/stand/ficl/mips64/sysdep.h
diff --git a/sys/boot/ficl/powerpc/sysdep.c b/stand/ficl/powerpc/sysdep.c
index ad38660843cdb..ad38660843cdb 100644
--- a/sys/boot/ficl/powerpc/sysdep.c
+++ b/stand/ficl/powerpc/sysdep.c
diff --git a/sys/boot/ficl/powerpc/sysdep.h b/stand/ficl/powerpc/sysdep.h
index 3ae748e259c75..3ae748e259c75 100644
--- a/sys/boot/ficl/powerpc/sysdep.h
+++ b/stand/ficl/powerpc/sysdep.h
diff --git a/sys/boot/ficl/prefix.c b/stand/ficl/prefix.c
index a34fc6c78240e..a34fc6c78240e 100644
--- a/sys/boot/ficl/prefix.c
+++ b/stand/ficl/prefix.c
diff --git a/sys/boot/ficl/riscv/sysdep.c b/stand/ficl/riscv/sysdep.c
index ad38660843cdb..ad38660843cdb 100644
--- a/sys/boot/ficl/riscv/sysdep.c
+++ b/stand/ficl/riscv/sysdep.c
diff --git a/sys/boot/ficl/riscv/sysdep.h b/stand/ficl/riscv/sysdep.h
index 3726b9ef838f2..3726b9ef838f2 100644
--- a/sys/boot/ficl/riscv/sysdep.h
+++ b/stand/ficl/riscv/sysdep.h
diff --git a/sys/boot/ficl/search.c b/stand/ficl/search.c
index d445cb32d93ad..d445cb32d93ad 100644
--- a/sys/boot/ficl/search.c
+++ b/stand/ficl/search.c
diff --git a/sys/boot/ficl/softwords/classes.fr b/stand/ficl/softwords/classes.fr
index b56da378e9709..b56da378e9709 100644
--- a/sys/boot/ficl/softwords/classes.fr
+++ b/stand/ficl/softwords/classes.fr
diff --git a/sys/boot/ficl/softwords/ficlclass.fr b/stand/ficl/softwords/ficlclass.fr
index 6d75efb0d3c5c..6d75efb0d3c5c 100644
--- a/sys/boot/ficl/softwords/ficlclass.fr
+++ b/stand/ficl/softwords/ficlclass.fr
diff --git a/sys/boot/ficl/softwords/ficllocal.fr b/stand/ficl/softwords/ficllocal.fr
index c916089696c13..c916089696c13 100644
--- a/sys/boot/ficl/softwords/ficllocal.fr
+++ b/stand/ficl/softwords/ficllocal.fr
diff --git a/sys/boot/ficl/softwords/fileaccess.fr b/stand/ficl/softwords/fileaccess.fr
index 7297df681cf30..7297df681cf30 100644
--- a/sys/boot/ficl/softwords/fileaccess.fr
+++ b/stand/ficl/softwords/fileaccess.fr
diff --git a/sys/boot/ficl/softwords/forml.fr b/stand/ficl/softwords/forml.fr
index 1144ef536792f..1144ef536792f 100644
--- a/sys/boot/ficl/softwords/forml.fr
+++ b/stand/ficl/softwords/forml.fr
diff --git a/sys/boot/ficl/softwords/freebsd.fr b/stand/ficl/softwords/freebsd.fr
index 96205c0808dd1..96205c0808dd1 100644
--- a/sys/boot/ficl/softwords/freebsd.fr
+++ b/stand/ficl/softwords/freebsd.fr
diff --git a/sys/boot/ficl/softwords/ifbrack.fr b/stand/ficl/softwords/ifbrack.fr
index a8c60626c4f84..a8c60626c4f84 100644
--- a/sys/boot/ficl/softwords/ifbrack.fr
+++ b/stand/ficl/softwords/ifbrack.fr
diff --git a/sys/boot/ficl/softwords/jhlocal.fr b/stand/ficl/softwords/jhlocal.fr
index 12ccb9fea7537..12ccb9fea7537 100644
--- a/sys/boot/ficl/softwords/jhlocal.fr
+++ b/stand/ficl/softwords/jhlocal.fr
diff --git a/sys/boot/ficl/softwords/marker.fr b/stand/ficl/softwords/marker.fr
index ee3c9bdf2f64a..ee3c9bdf2f64a 100644
--- a/sys/boot/ficl/softwords/marker.fr
+++ b/stand/ficl/softwords/marker.fr
diff --git a/sys/boot/ficl/softwords/oo.fr b/stand/ficl/softwords/oo.fr
index b1c8e214e5bd3..b1c8e214e5bd3 100644
--- a/sys/boot/ficl/softwords/oo.fr
+++ b/stand/ficl/softwords/oo.fr
diff --git a/sys/boot/ficl/softwords/prefix.fr b/stand/ficl/softwords/prefix.fr
index ae1727fc00bcd..ae1727fc00bcd 100644
--- a/sys/boot/ficl/softwords/prefix.fr
+++ b/stand/ficl/softwords/prefix.fr
diff --git a/sys/boot/ficl/softwords/softcore.awk b/stand/ficl/softwords/softcore.awk
index 5a97999a98232..5a97999a98232 100644
--- a/sys/boot/ficl/softwords/softcore.awk
+++ b/stand/ficl/softwords/softcore.awk
diff --git a/sys/boot/ficl/softwords/softcore.fr b/stand/ficl/softwords/softcore.fr
index a70ebaa634efb..a70ebaa634efb 100644
--- a/sys/boot/ficl/softwords/softcore.fr
+++ b/stand/ficl/softwords/softcore.fr
diff --git a/sys/boot/ficl/softwords/string.fr b/stand/ficl/softwords/string.fr
index dabb3900892fe..dabb3900892fe 100644
--- a/sys/boot/ficl/softwords/string.fr
+++ b/stand/ficl/softwords/string.fr
diff --git a/sys/boot/ficl/sparc64/sysdep.c b/stand/ficl/sparc64/sysdep.c
index ad38660843cdb..ad38660843cdb 100644
--- a/sys/boot/ficl/sparc64/sysdep.c
+++ b/stand/ficl/sparc64/sysdep.c
diff --git a/sys/boot/ficl/sparc64/sysdep.h b/stand/ficl/sparc64/sysdep.h
index 0a6ca33363dda..0a6ca33363dda 100644
--- a/sys/boot/ficl/sparc64/sysdep.h
+++ b/stand/ficl/sparc64/sysdep.h
diff --git a/sys/boot/ficl/stack.c b/stand/ficl/stack.c
index f98a3b61db7de..f98a3b61db7de 100644
--- a/sys/boot/ficl/stack.c
+++ b/stand/ficl/stack.c
diff --git a/sys/boot/ficl/testmain.c b/stand/ficl/testmain.c
index 7167f30a25613..7167f30a25613 100644
--- a/sys/boot/ficl/testmain.c
+++ b/stand/ficl/testmain.c
diff --git a/sys/boot/ficl/tools.c b/stand/ficl/tools.c
index db1e94850f5e4..db1e94850f5e4 100644
--- a/sys/boot/ficl/tools.c
+++ b/stand/ficl/tools.c
diff --git a/sys/boot/ficl/unix.c b/stand/ficl/unix.c
index 5b5644079ba99..5b5644079ba99 100644
--- a/sys/boot/ficl/unix.c
+++ b/stand/ficl/unix.c
diff --git a/sys/boot/ficl/vm.c b/stand/ficl/vm.c
index 97a4f04e3b3b9..97a4f04e3b3b9 100644
--- a/sys/boot/ficl/vm.c
+++ b/stand/ficl/vm.c
diff --git a/sys/boot/ficl/words.c b/stand/ficl/words.c
index eee6fe93562b8..eee6fe93562b8 100644
--- a/sys/boot/ficl/words.c
+++ b/stand/ficl/words.c
diff --git a/sys/boot/ficl32/Makefile b/stand/ficl32/Makefile
index 09499464ac89f..09499464ac89f 100644
--- a/sys/boot/ficl32/Makefile
+++ b/stand/ficl32/Makefile
diff --git a/sys/boot/ficl32/Makefile.depend b/stand/ficl32/Makefile.depend
index c210061155d24..c210061155d24 100644
--- a/sys/boot/ficl32/Makefile.depend
+++ b/stand/ficl32/Makefile.depend
diff --git a/sys/boot/forth/Makefile b/stand/forth/Makefile
index 74d9ed7443220..74d9ed7443220 100644
--- a/sys/boot/forth/Makefile
+++ b/stand/forth/Makefile
diff --git a/sys/boot/forth/Makefile.depend b/stand/forth/Makefile.depend
index f80275d86ab17..f80275d86ab17 100644
--- a/sys/boot/forth/Makefile.depend
+++ b/stand/forth/Makefile.depend
diff --git a/sys/boot/forth/beastie.4th b/stand/forth/beastie.4th
index 752cce22a4ff6..752cce22a4ff6 100644
--- a/sys/boot/forth/beastie.4th
+++ b/stand/forth/beastie.4th
diff --git a/sys/boot/forth/beastie.4th.8 b/stand/forth/beastie.4th.8
index e99f65474b432..e99f65474b432 100644
--- a/sys/boot/forth/beastie.4th.8
+++ b/stand/forth/beastie.4th.8
diff --git a/sys/boot/forth/brand-fbsd.4th b/stand/forth/brand-fbsd.4th
index 9cd017f84a3fd..9cd017f84a3fd 100644
--- a/sys/boot/forth/brand-fbsd.4th
+++ b/stand/forth/brand-fbsd.4th
diff --git a/sys/boot/forth/brand.4th b/stand/forth/brand.4th
index 39a9bfae753c1..39a9bfae753c1 100644
--- a/sys/boot/forth/brand.4th
+++ b/stand/forth/brand.4th
diff --git a/sys/boot/forth/brand.4th.8 b/stand/forth/brand.4th.8
index dfd188d0ff84c..dfd188d0ff84c 100644
--- a/sys/boot/forth/brand.4th.8
+++ b/stand/forth/brand.4th.8
diff --git a/sys/boot/forth/check-password.4th b/stand/forth/check-password.4th
index d41777c8bd2a6..d41777c8bd2a6 100644
--- a/sys/boot/forth/check-password.4th
+++ b/stand/forth/check-password.4th
diff --git a/sys/boot/forth/check-password.4th.8 b/stand/forth/check-password.4th.8
index db0aa4bc6bc4d..db0aa4bc6bc4d 100644
--- a/sys/boot/forth/check-password.4th.8
+++ b/stand/forth/check-password.4th.8
diff --git a/sys/boot/forth/color.4th b/stand/forth/color.4th
index 65e6de905ac62..65e6de905ac62 100644
--- a/sys/boot/forth/color.4th
+++ b/stand/forth/color.4th
diff --git a/sys/boot/forth/color.4th.8 b/stand/forth/color.4th.8
index 9191da0f04571..9191da0f04571 100644
--- a/sys/boot/forth/color.4th.8
+++ b/stand/forth/color.4th.8
diff --git a/sys/boot/forth/delay.4th b/stand/forth/delay.4th
index 28cfa5c26eb9c..28cfa5c26eb9c 100644
--- a/sys/boot/forth/delay.4th
+++ b/stand/forth/delay.4th
diff --git a/sys/boot/forth/delay.4th.8 b/stand/forth/delay.4th.8
index af31fd04bad68..af31fd04bad68 100644
--- a/sys/boot/forth/delay.4th.8
+++ b/stand/forth/delay.4th.8
diff --git a/sys/boot/forth/efi.4th b/stand/forth/efi.4th
index 7c1bdf30b8e1f..7c1bdf30b8e1f 100644
--- a/sys/boot/forth/efi.4th
+++ b/stand/forth/efi.4th
diff --git a/sys/boot/forth/frames.4th b/stand/forth/frames.4th
index b237afe7ac43a..b237afe7ac43a 100644
--- a/sys/boot/forth/frames.4th
+++ b/stand/forth/frames.4th
diff --git a/sys/boot/forth/loader.4th b/stand/forth/loader.4th
index 9486237b8a93e..9486237b8a93e 100644
--- a/sys/boot/forth/loader.4th
+++ b/stand/forth/loader.4th
diff --git a/sys/boot/forth/loader.4th.8 b/stand/forth/loader.4th.8
index b689077058daa..b689077058daa 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/stand/forth/loader.4th.8
diff --git a/sys/boot/forth/loader.conf b/stand/forth/loader.conf
index 8fe533fd2debf..8fe533fd2debf 100644
--- a/sys/boot/forth/loader.conf
+++ b/stand/forth/loader.conf
diff --git a/sys/boot/forth/loader.conf.5 b/stand/forth/loader.conf.5
index 631250c5278ca..631250c5278ca 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/stand/forth/loader.conf.5
diff --git a/sys/boot/forth/loader.rc b/stand/forth/loader.rc
index 0bc66579cd0f9..0bc66579cd0f9 100644
--- a/sys/boot/forth/loader.rc
+++ b/stand/forth/loader.rc
diff --git a/sys/boot/forth/logo-beastie.4th b/stand/forth/logo-beastie.4th
index 671eb5e496b2b..671eb5e496b2b 100644
--- a/sys/boot/forth/logo-beastie.4th
+++ b/stand/forth/logo-beastie.4th
diff --git a/sys/boot/forth/logo-beastiebw.4th b/stand/forth/logo-beastiebw.4th
index 197099cda0bc2..197099cda0bc2 100644
--- a/sys/boot/forth/logo-beastiebw.4th
+++ b/stand/forth/logo-beastiebw.4th
diff --git a/sys/boot/forth/logo-fbsdbw.4th b/stand/forth/logo-fbsdbw.4th
index d4a532b78f4ff..d4a532b78f4ff 100644
--- a/sys/boot/forth/logo-fbsdbw.4th
+++ b/stand/forth/logo-fbsdbw.4th
diff --git a/sys/boot/forth/logo-orb.4th b/stand/forth/logo-orb.4th
index c2a504d1ddf5e..c2a504d1ddf5e 100644
--- a/sys/boot/forth/logo-orb.4th
+++ b/stand/forth/logo-orb.4th
diff --git a/sys/boot/forth/logo-orbbw.4th b/stand/forth/logo-orbbw.4th
index 11dc11cabb773..11dc11cabb773 100644
--- a/sys/boot/forth/logo-orbbw.4th
+++ b/stand/forth/logo-orbbw.4th
diff --git a/sys/boot/forth/menu-commands.4th b/stand/forth/menu-commands.4th
index 9adf30a46b661..9adf30a46b661 100644
--- a/sys/boot/forth/menu-commands.4th
+++ b/stand/forth/menu-commands.4th
diff --git a/sys/boot/forth/menu.4th b/stand/forth/menu.4th
index e3fe0f7d776e1..e3fe0f7d776e1 100644
--- a/sys/boot/forth/menu.4th
+++ b/stand/forth/menu.4th
diff --git a/sys/boot/forth/menu.4th.8 b/stand/forth/menu.4th.8
index 3673eec74aa70..3673eec74aa70 100644
--- a/sys/boot/forth/menu.4th.8
+++ b/stand/forth/menu.4th.8
diff --git a/sys/boot/forth/menu.rc b/stand/forth/menu.rc
index 6fe3dfe14281a..6fe3dfe14281a 100644
--- a/sys/boot/forth/menu.rc
+++ b/stand/forth/menu.rc
diff --git a/sys/boot/forth/menusets.4th b/stand/forth/menusets.4th
index 9335b80d511a3..9335b80d511a3 100644
--- a/sys/boot/forth/menusets.4th
+++ b/stand/forth/menusets.4th
diff --git a/sys/boot/forth/menusets.4th.8 b/stand/forth/menusets.4th.8
index f785ae18eabe1..f785ae18eabe1 100644
--- a/sys/boot/forth/menusets.4th.8
+++ b/stand/forth/menusets.4th.8
diff --git a/sys/boot/forth/pcibios.4th b/stand/forth/pcibios.4th
index 71702dad8a0ca..71702dad8a0ca 100644
--- a/sys/boot/forth/pcibios.4th
+++ b/stand/forth/pcibios.4th
diff --git a/sys/boot/forth/pnp.4th b/stand/forth/pnp.4th
index 8be89d8277fe7..4aa4bcf2ac210 100644
--- a/sys/boot/forth/pnp.4th
+++ b/stand/forth/pnp.4th
@@ -45,7 +45,7 @@ structure: pnpident
 	sizeof STAILQ_ENTRY cells member: pnpid.link	\ pnpident
 ;structure
 
-structure: pnpinfo \ sync with sys/boot/config/bootstrap.h
+structure: pnpinfo \ sync with stand/common/bootstrap.h
 	ptr pnpi.desc
 	int pnpi.revision
 	ptr pnpi.module				\ (char*) module args
diff --git a/sys/boot/forth/screen.4th b/stand/forth/screen.4th
index e0af82b3a8b85..e0af82b3a8b85 100644
--- a/sys/boot/forth/screen.4th
+++ b/stand/forth/screen.4th
diff --git a/sys/boot/forth/shortcuts.4th b/stand/forth/shortcuts.4th
index 33a1cf678988c..33a1cf678988c 100644
--- a/sys/boot/forth/shortcuts.4th
+++ b/stand/forth/shortcuts.4th
diff --git a/sys/boot/forth/support.4th b/stand/forth/support.4th
index 7ce9e5289acfa..aa50b3bb3a9d3 100644
--- a/sys/boot/forth/support.4th
+++ b/stand/forth/support.4th
@@ -130,7 +130,7 @@ structure: module
 ;structure
 
 \ Internal loader structures (preloaded_file, kernel_module, file_metadata)
-\ must be in sync with the C struct in sys/boot/common/bootstrap.h
+\ must be in sync with the C struct in stand/common/bootstrap.h
 structure: preloaded_file
 	ptr pf.name
 	ptr pf.type
diff --git a/sys/boot/forth/version.4th b/stand/forth/version.4th
index a5311b4442ac1..a5311b4442ac1 100644
--- a/sys/boot/forth/version.4th
+++ b/stand/forth/version.4th
diff --git a/sys/boot/forth/version.4th.8 b/stand/forth/version.4th.8
index 256df1ee5f872..256df1ee5f872 100644
--- a/sys/boot/forth/version.4th.8
+++ b/stand/forth/version.4th.8
diff --git a/sys/boot/geli/Makefile b/stand/geli/Makefile
index c7904311c08d9..c7904311c08d9 100644
--- a/sys/boot/geli/Makefile
+++ b/stand/geli/Makefile
diff --git a/sys/boot/geli/Makefile.depend b/stand/geli/Makefile.depend
index 106f2f62b86ca..106f2f62b86ca 100644
--- a/sys/boot/geli/Makefile.depend
+++ b/stand/geli/Makefile.depend
diff --git a/sys/boot/geli/geliboot.c b/stand/geli/geliboot.c
index 2fca7ba513dbd..2fca7ba513dbd 100644
--- a/sys/boot/geli/geliboot.c
+++ b/stand/geli/geliboot.c
diff --git a/sys/boot/geli/geliboot.h b/stand/geli/geliboot.h
index 788b82c574ac1..788b82c574ac1 100644
--- a/sys/boot/geli/geliboot.h
+++ b/stand/geli/geliboot.h
diff --git a/sys/boot/geli/geliboot_crypto.c b/stand/geli/geliboot_crypto.c
index 4187e97390b88..4187e97390b88 100644
--- a/sys/boot/geli/geliboot_crypto.c
+++ b/stand/geli/geliboot_crypto.c
diff --git a/sys/boot/geli/geliboot_internal.h b/stand/geli/geliboot_internal.h
index 1fad3c5f88ea8..1fad3c5f88ea8 100644
--- a/sys/boot/geli/geliboot_internal.h
+++ b/stand/geli/geliboot_internal.h
diff --git a/sys/boot/geli/pwgets.c b/stand/geli/pwgets.c
index 450255f1ee363..450255f1ee363 100644
--- a/sys/boot/geli/pwgets.c
+++ b/stand/geli/pwgets.c
diff --git a/sys/boot/i386/Makefile b/stand/i386/Makefile
index 9a1663abab075..9a1663abab075 100644
--- a/sys/boot/i386/Makefile
+++ b/stand/i386/Makefile
diff --git a/sys/boot/i386/Makefile.inc b/stand/i386/Makefile.inc
index 5c36555f940c0..54391c4d62c27 100644
--- a/sys/boot/i386/Makefile.inc
+++ b/stand/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# Common defines for all of /sys/boot/i386/
+# Common defines for all of stand/i386/
 #
 # $FreeBSD$
 
diff --git a/sys/boot/i386/boot.ldscript b/stand/i386/boot.ldscript
index 04ea39d476938..04ea39d476938 100644
--- a/sys/boot/i386/boot.ldscript
+++ b/stand/i386/boot.ldscript
diff --git a/sys/boot/i386/boot0/Makefile b/stand/i386/boot0/Makefile
index 39c0072e66386..39c0072e66386 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/stand/i386/boot0/Makefile
diff --git a/sys/boot/i386/boot0/Makefile.depend b/stand/i386/boot0/Makefile.depend
index f80275d86ab17..f80275d86ab17 100644
--- a/sys/boot/i386/boot0/Makefile.depend
+++ b/stand/i386/boot0/Makefile.depend
diff --git a/sys/boot/i386/boot0/boot0.S b/stand/i386/boot0/boot0.S
index 708f0934c4277..708f0934c4277 100644
--- a/sys/boot/i386/boot0/boot0.S
+++ b/stand/i386/boot0/boot0.S
diff --git a/sys/boot/i386/boot0sio/Makefile b/stand/i386/boot0sio/Makefile
index 1321dd330c4d5..1321dd330c4d5 100644
--- a/sys/boot/i386/boot0sio/Makefile
+++ b/stand/i386/boot0sio/Makefile
diff --git a/sys/boot/i386/boot0sio/Makefile.depend b/stand/i386/boot0sio/Makefile.depend
index f80275d86ab17..f80275d86ab17 100644
--- a/sys/boot/i386/boot0sio/Makefile.depend
+++ b/stand/i386/boot0sio/Makefile.depend
diff --git a/sys/boot/i386/boot2/Makefile b/stand/i386/boot2/Makefile
index c3146b3e90634..c3146b3e90634 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/stand/i386/boot2/Makefile
diff --git a/stand/i386/boot2/Makefile.depend b/stand/i386/boot2/Makefile.depend
new file mode 100644
index 0000000000000..bc9b1b7bddc92
--- /dev/null
+++ b/stand/i386/boot2/Makefile.depend
@@ -0,0 +1,14 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	stand/i386/btx/btx \
+	stand/i386/btx/lib \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sys/boot/i386/boot2/boot1.S b/stand/i386/boot2/boot1.S
index 984ab52a816fe..984ab52a816fe 100644
--- a/sys/boot/i386/boot2/boot1.S
+++ b/stand/i386/boot2/boot1.S
diff --git a/sys/boot/i386/boot2/boot2.c b/stand/i386/boot2/boot2.c
index cc5d76f86dad1..cc5d76f86dad1 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/stand/i386/boot2/boot2.c
diff --git a/sys/boot/i386/boot2/lib.h b/stand/i386/boot2/lib.h
index d8d3317e5aa00..d8d3317e5aa00 100644
--- a/sys/boot/i386/boot2/lib.h
+++ b/stand/i386/boot2/lib.h
diff --git a/sys/boot/i386/boot2/sio.S b/stand/i386/boot2/sio.S
index ca9d0a2406aa2..ca9d0a2406aa2 100644
--- a/sys/boot/i386/boot2/sio.S
+++ b/stand/i386/boot2/sio.S
diff --git a/sys/boot/i386/btx/Makefile b/stand/i386/btx/Makefile
index 39f78ed639b9c..39f78ed639b9c 100644
--- a/sys/boot/i386/btx/Makefile
+++ b/stand/i386/btx/Makefile
diff --git a/sys/boot/i386/btx/Makefile.inc b/stand/i386/btx/Makefile.inc
index 265f86d1ed55a..265f86d1ed55a 100644
--- a/sys/boot/i386/btx/Makefile.inc
+++ b/stand/i386/btx/Makefile.inc
diff --git a/sys/boot/i386/btx/btx/Makefile b/stand/i386/btx/btx/Makefile
index f42e20d83b33d..f42e20d83b33d 100644
--- a/sys/boot/i386/btx/btx/Makefile
+++ b/stand/i386/btx/btx/Makefile
diff --git a/sys/boot/i386/btx/btx/Makefile.depend b/stand/i386/btx/btx/Makefile.depend
index f80275d86ab17..f80275d86ab17 100644
--- a/sys/boot/i386/btx/btx/Makefile.depend
+++ b/stand/i386/btx/btx/Makefile.depend
diff --git a/sys/boot/i386/btx/btx/btx.S b/stand/i386/btx/btx/btx.S
index 87d09a5a1e179..87d09a5a1e179 100644
--- a/sys/boot/i386/btx/btx/btx.S
+++ b/stand/i386/btx/btx/btx.S
diff --git a/sys/boot/i386/btx/btxldr/Makefile b/stand/i386/btx/btxldr/Makefile
index 32795975b7ad6..32795975b7ad6 100644
--- a/sys/boot/i386/btx/btxldr/Makefile
+++ b/stand/i386/btx/btxldr/Makefile
diff --git a/sys/boot/i386/btx/btxldr/Makefile.depend b/stand/i386/btx/btxldr/Makefile.depend
index f80275d86ab17..f80275d86ab17 100644
--- a/sys/boot/i386/btx/btxldr/Makefile.depend
+++ b/stand/i386/btx/btxldr/Makefile.depend
diff --git a/sys/boot/i386/btx/btxldr/btxldr.S b/stand/i386/btx/btxldr/btxldr.S
index 1a0f5f40ff072..1a0f5f40ff072 100644
--- a/sys/boot/i386/btx/btxldr/btxldr.S
+++ b/stand/i386/btx/btxldr/btxldr.S
diff --git a/sys/boot/i386/btx/lib/Makefile b/stand/i386/btx/lib/Makefile
index 8de62555c9dcc..8de62555c9dcc 100644
--- a/sys/boot/i386/btx/lib/Makefile
+++ b/stand/i386/btx/lib/Makefile
diff --git a/sys/boot/i386/btx/lib/Makefile.depend b/stand/i386/btx/lib/Makefile.depend
index f80275d86ab17..f80275d86ab17 100644
--- a/sys/boot/i386/btx/lib/Makefile.depend
+++ b/stand/i386/btx/lib/Makefile.depend
diff --git a/sys/boot/i386/btx/lib/btxcsu.S b/stand/i386/btx/lib/btxcsu.S
index c46f8097dbe30..c46f8097dbe30 100644
--- a/sys/boot/i386/btx/lib/btxcsu.S
+++ b/stand/i386/btx/lib/btxcsu.S
diff --git a/sys/boot/i386/btx/lib/btxsys.s b/stand/i386/btx/lib/btxsys.s
index 9c77b4295e7cf..9c77b4295e7cf 100644
--- a/sys/boot/i386/btx/lib/btxsys.s
+++ b/stand/i386/btx/lib/btxsys.s
diff --git a/sys/boot/i386/btx/lib/btxv86.h b/stand/i386/btx/lib/btxv86.h
index f04ce5e3092b4..f04ce5e3092b4 100644
--- a/sys/boot/i386/btx/lib/btxv86.h
+++ b/stand/i386/btx/lib/btxv86.h
diff --git a/sys/boot/i386/btx/lib/btxv86.s b/stand/i386/btx/lib/btxv86.s
index 0d7d1116322d2..0d7d1116322d2 100644
--- a/sys/boot/i386/btx/lib/btxv86.s
+++ b/stand/i386/btx/lib/btxv86.s
diff --git a/sys/boot/i386/cdboot/Makefile b/stand/i386/cdboot/Makefile
index 7acd4046d816f..7acd4046d816f 100644
--- a/sys/boot/i386/cdboot/Makefile
+++ b/stand/i386/cdboot/Makefile
diff --git a/sys/boot/i386/cdboot/Makefile.depend b/stand/i386/cdboot/Makefile.depend
index f80275d86ab17..f80275d86ab17 100644
--- a/sys/boot/i386/cdboot/Makefile.depend
+++ b/stand/i386/cdboot/Makefile.depend
diff --git a/sys/boot/i386/cdboot/cdboot.S b/stand/i386/cdboot/cdboot.S
index 9c3fb15ddf580..9c3fb15ddf580 100644
--- a/sys/boot/i386/cdboot/cdboot.S
+++ b/stand/i386/cdboot/cdboot.S
diff --git a/sys/boot/i386/common/bootargs.h b/stand/i386/common/bootargs.h
index df558072f37f2..df558072f37f2 100644
--- a/sys/boot/i386/common/bootargs.h
+++ b/stand/i386/common/bootargs.h
diff --git a/sys/boot/i386/common/cons.c b/stand/i386/common/cons.c
index 5fb1a936bde7b..5fb1a936bde7b 100644
--- a/sys/boot/i386/common/cons.c
+++ b/stand/i386/common/cons.c
diff --git a/sys/boot/i386/common/cons.h b/stand/i386/common/cons.h
index 73474fbe9c769..73474fbe9c769 100644
--- a/sys/boot/i386/common/cons.h
+++ b/stand/i386/common/cons.h
diff --git a/sys/boot/i386/common/drv.c b/stand/i386/common/drv.c
index a805c41f9c442..a805c41f9c442 100644
--- a/sys/boot/i386/common/drv.c
+++ b/stand/i386/common/drv.c
diff --git a/sys/boot/i386/common/drv.h b/stand/i386/common/drv.h
index c0995df45ea92..c0995df45ea92 100644
--- a/sys/boot/i386/common/drv.h
+++ b/stand/i386/common/drv.h
diff --git a/sys/boot/i386/common/edd.h b/stand/i386/common/edd.h
index 7d1f45020f9dd..7d1f45020f9dd 100644
--- a/sys/boot/i386/common/edd.h
+++ b/stand/i386/common/edd.h
diff --git a/sys/boot/i386/gptboot/Makefile b/stand/i386/gptboot/Makefile
index 9e62007c55ae9..9e62007c55ae9 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/stand/i386/gptboot/Makefile
diff --git a/sys/boot/i386/gptboot/Makefile.depend b/stand/i386/gptboot/Makefile.depend
index c6ac7d89dda03..89aa3261d1331 100644
--- a/sys/boot/i386/gptboot/Makefile.depend
+++ b/stand/i386/gptboot/Makefile.depend
@@ -5,10 +5,10 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/libmd \
-	sys/boot/geli \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/lib \
-	sys/boot/libsa32 \
+	stand/geli \
+	stand/i386/btx/btx \
+	stand/i386/btx/lib \
+	stand/libsa32 \
 
 
 .include <dirdeps.mk>
diff --git a/sys/boot/i386/gptboot/gptboot.8 b/stand/i386/gptboot/gptboot.8
index a7afd81d90870..a7afd81d90870 100644
--- a/sys/boot/i386/gptboot/gptboot.8
+++ b/stand/i386/gptboot/gptboot.8
diff --git a/sys/boot/i386/gptboot/gptboot.c b/stand/i386/gptboot/gptboot.c
index dd06f0c593910..dd06f0c593910 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/stand/i386/gptboot/gptboot.c
diff --git a/sys/boot/i386/gptboot/gptldr.S b/stand/i386/gptboot/gptldr.S
index 088122f3b3492..088122f3b3492 100644
--- a/sys/boot/i386/gptboot/gptldr.S
+++ b/stand/i386/gptboot/gptldr.S
diff --git a/sys/boot/i386/gptzfsboot/Makefile b/stand/i386/gptzfsboot/Makefile
index 97f195445151c..97f195445151c 100644
--- a/sys/boot/i386/gptzfsboot/Makefile
+++ b/stand/i386/gptzfsboot/Makefile
diff --git a/stand/i386/gptzfsboot/Makefile.depend b/stand/i386/gptzfsboot/Makefile.depend
new file mode 100644
index 0000000000000..ce86c7a5535c4
--- /dev/null
+++ b/stand/i386/gptzfsboot/Makefile.depend
@@ -0,0 +1,19 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libmd \
+	stand/geli \
+	stand/i386/btx/btx \
+	stand/i386/btx/lib \
+	stand/libsa32 \
+	stand/zfs32 \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sys/boot/i386/gptzfsboot/gptzfsboot.8 b/stand/i386/gptzfsboot/gptzfsboot.8
index 66feb6d35055e..66feb6d35055e 100644
--- a/sys/boot/i386/gptzfsboot/gptzfsboot.8
+++ b/stand/i386/gptzfsboot/gptzfsboot.8
diff --git a/sys/boot/i386/kgzldr/Makefile b/stand/i386/kgzldr/Makefile
index 5a03b83e5e497..5a03b83e5e497 100644
--- a/sys/boot/i386/kgzldr/Makefile
+++ b/stand/i386/kgzldr/Makefile
diff --git a/sys/boot/i386/kgzldr/Makefile.depend b/stand/i386/kgzldr/Makefile.depend
index 79506ce16b796..79506ce16b796 100644
--- a/sys/boot/i386/kgzldr/Makefile.depend
+++ b/stand/i386/kgzldr/Makefile.depend
diff --git a/sys/boot/i386/kgzldr/boot.c b/stand/i386/kgzldr/boot.c
index 45ed2ee62e168..45ed2ee62e168 100644
--- a/sys/boot/i386/kgzldr/boot.c
+++ b/stand/i386/kgzldr/boot.c
diff --git a/sys/boot/i386/kgzldr/crt.s b/stand/i386/kgzldr/crt.s
index cfb479fd2d84f..cfb479fd2d84f 100644
--- a/sys/boot/i386/kgzldr/crt.s
+++ b/stand/i386/kgzldr/crt.s
diff --git a/sys/boot/i386/kgzldr/kgzldr.h b/stand/i386/kgzldr/kgzldr.h
index 5cd5b44b60057..5cd5b44b60057 100644
--- a/sys/boot/i386/kgzldr/kgzldr.h
+++ b/stand/i386/kgzldr/kgzldr.h
diff --git a/sys/boot/i386/kgzldr/lib.c b/stand/i386/kgzldr/lib.c
index 538875b510e59..538875b510e59 100644
--- a/sys/boot/i386/kgzldr/lib.c
+++ b/stand/i386/kgzldr/lib.c
diff --git a/sys/boot/i386/kgzldr/sio.s b/stand/i386/kgzldr/sio.s
index ff174eb0b71b3..ff174eb0b71b3 100644
--- a/sys/boot/i386/kgzldr/sio.s
+++ b/stand/i386/kgzldr/sio.s
diff --git a/sys/boot/i386/kgzldr/start.s b/stand/i386/kgzldr/start.s
index 550fa526d946f..550fa526d946f 100644
--- a/sys/boot/i386/kgzldr/start.s
+++ b/stand/i386/kgzldr/start.s
diff --git a/sys/boot/i386/libfirewire/Makefile b/stand/i386/libfirewire/Makefile
index d3f88c448b6f6..d3f88c448b6f6 100644
--- a/sys/boot/i386/libfirewire/Makefile
+++ b/stand/i386/libfirewire/Makefile
diff --git a/sys/boot/i386/libfirewire/Makefile.depend b/stand/i386/libfirewire/Makefile.depend
index 18be76b0cb6f4..18be76b0cb6f4 100644
--- a/sys/boot/i386/libfirewire/Makefile.depend
+++ b/stand/i386/libfirewire/Makefile.depend
diff --git a/sys/boot/i386/libfirewire/dconsole.c b/stand/i386/libfirewire/dconsole.c
index 1528fafdf787e..1528fafdf787e 100644
--- a/sys/boot/i386/libfirewire/dconsole.c
+++ b/stand/i386/libfirewire/dconsole.c
diff --git a/sys/boot/i386/libfirewire/firewire.c b/stand/i386/libfirewire/firewire.c
index 48403259873dd..48403259873dd 100644
--- a/sys/boot/i386/libfirewire/firewire.c
+++ b/stand/i386/libfirewire/firewire.c
diff --git a/sys/boot/i386/libfirewire/fwohci.c b/stand/i386/libfirewire/fwohci.c
index 567abcf58a20f..567abcf58a20f 100644
--- a/sys/boot/i386/libfirewire/fwohci.c
+++ b/stand/i386/libfirewire/fwohci.c
diff --git a/sys/boot/i386/libfirewire/fwohci.h b/stand/i386/libfirewire/fwohci.h
index 4a93220b31ac6..4a93220b31ac6 100644
--- a/sys/boot/i386/libfirewire/fwohci.h
+++ b/stand/i386/libfirewire/fwohci.h
diff --git a/sys/boot/i386/libfirewire/fwohcireg.h b/stand/i386/libfirewire/fwohcireg.h
index d57870cd626ef..d57870cd626ef 100644
--- a/sys/boot/i386/libfirewire/fwohcireg.h
+++ b/stand/i386/libfirewire/fwohcireg.h
diff --git a/sys/boot/i386/libi386/Makefile b/stand/i386/libi386/Makefile
index 8d65513436c3d..8d65513436c3d 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/stand/i386/libi386/Makefile
diff --git a/sys/boot/i386/libi386/Makefile.depend b/stand/i386/libi386/Makefile.depend
index df20c96b20e1f..df20c96b20e1f 100644
--- a/sys/boot/i386/libi386/Makefile.depend
+++ b/stand/i386/libi386/Makefile.depend
diff --git a/sys/boot/i386/libi386/amd64_tramp.S b/stand/i386/libi386/amd64_tramp.S
index 6359b90d5c9fd..6359b90d5c9fd 100644
--- a/sys/boot/i386/libi386/amd64_tramp.S
+++ b/stand/i386/libi386/amd64_tramp.S
diff --git a/sys/boot/i386/libi386/biosacpi.c b/stand/i386/libi386/biosacpi.c
index 8167fca7b6221..8167fca7b6221 100644
--- a/sys/boot/i386/libi386/biosacpi.c
+++ b/stand/i386/libi386/biosacpi.c
diff --git a/sys/boot/i386/libi386/bioscd.c b/stand/i386/libi386/bioscd.c
index 2e8fc3b11b494..2e8fc3b11b494 100644
--- a/sys/boot/i386/libi386/bioscd.c
+++ b/stand/i386/libi386/bioscd.c
diff --git a/sys/boot/i386/libi386/biosdisk.c b/stand/i386/libi386/biosdisk.c
index a2147e2294f55..a2147e2294f55 100644
--- a/sys/boot/i386/libi386/biosdisk.c
+++ b/stand/i386/libi386/biosdisk.c
diff --git a/sys/boot/i386/libi386/biosmem.c b/stand/i386/libi386/biosmem.c
index 7105757e8104e..7105757e8104e 100644
--- a/sys/boot/i386/libi386/biosmem.c
+++ b/stand/i386/libi386/biosmem.c
diff --git a/sys/boot/i386/libi386/biospci.c b/stand/i386/libi386/biospci.c
index 098e30caa5f1f..098e30caa5f1f 100644
--- a/sys/boot/i386/libi386/biospci.c
+++ b/stand/i386/libi386/biospci.c
diff --git a/sys/boot/i386/libi386/biospnp.c b/stand/i386/libi386/biospnp.c
index 30e55fc893d0e..30e55fc893d0e 100644
--- a/sys/boot/i386/libi386/biospnp.c
+++ b/stand/i386/libi386/biospnp.c
diff --git a/sys/boot/i386/libi386/biossmap.c b/stand/i386/libi386/biossmap.c
index e95ea64517d05..e95ea64517d05 100644
--- a/sys/boot/i386/libi386/biossmap.c
+++ b/stand/i386/libi386/biossmap.c
diff --git a/sys/boot/i386/libi386/bootinfo.c b/stand/i386/libi386/bootinfo.c
index c33cec7633aea..c33cec7633aea 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/stand/i386/libi386/bootinfo.c
diff --git a/sys/boot/i386/libi386/bootinfo32.c b/stand/i386/libi386/bootinfo32.c
index 494688fd7cd87..494688fd7cd87 100644
--- a/sys/boot/i386/libi386/bootinfo32.c
+++ b/stand/i386/libi386/bootinfo32.c
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/stand/i386/libi386/bootinfo64.c
index 02fcf723ba969..02fcf723ba969 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/stand/i386/libi386/bootinfo64.c
diff --git a/sys/boot/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c
index bd2a2e864fa2f..bd2a2e864fa2f 100644
--- a/sys/boot/i386/libi386/comconsole.c
+++ b/stand/i386/libi386/comconsole.c
diff --git a/sys/boot/i386/libi386/devicename.c b/stand/i386/libi386/devicename.c
index c7705d71386f2..c7705d71386f2 100644
--- a/sys/boot/i386/libi386/devicename.c
+++ b/stand/i386/libi386/devicename.c
diff --git a/sys/boot/i386/libi386/elf32_freebsd.c b/stand/i386/libi386/elf32_freebsd.c
index 641e2733c3a2c..641e2733c3a2c 100644
--- a/sys/boot/i386/libi386/elf32_freebsd.c
+++ b/stand/i386/libi386/elf32_freebsd.c
diff --git a/sys/boot/i386/libi386/elf64_freebsd.c b/stand/i386/libi386/elf64_freebsd.c
index 338a7456443f0..338a7456443f0 100644
--- a/sys/boot/i386/libi386/elf64_freebsd.c
+++ b/stand/i386/libi386/elf64_freebsd.c
diff --git a/sys/boot/i386/libi386/i386_copy.c b/stand/i386/libi386/i386_copy.c
index 3c05241985c87..3c05241985c87 100644
--- a/sys/boot/i386/libi386/i386_copy.c
+++ b/stand/i386/libi386/i386_copy.c
diff --git a/sys/boot/i386/libi386/i386_module.c b/stand/i386/libi386/i386_module.c
index 78ab61ba9a59f..78ab61ba9a59f 100644
--- a/sys/boot/i386/libi386/i386_module.c
+++ b/stand/i386/libi386/i386_module.c
diff --git a/sys/boot/i386/libi386/libi386.h b/stand/i386/libi386/libi386.h
index e65a060acb77e..e65a060acb77e 100644
--- a/sys/boot/i386/libi386/libi386.h
+++ b/stand/i386/libi386/libi386.h
diff --git a/sys/boot/i386/libi386/multiboot.c b/stand/i386/libi386/multiboot.c
index 9aac64010a1f8..9aac64010a1f8 100644
--- a/sys/boot/i386/libi386/multiboot.c
+++ b/stand/i386/libi386/multiboot.c
diff --git a/sys/boot/i386/libi386/multiboot.h b/stand/i386/libi386/multiboot.h
index 819fa2e5019ff..819fa2e5019ff 100644
--- a/sys/boot/i386/libi386/multiboot.h
+++ b/stand/i386/libi386/multiboot.h
diff --git a/sys/boot/i386/libi386/multiboot_tramp.S b/stand/i386/libi386/multiboot_tramp.S
index 0bd604365f232..0bd604365f232 100644
--- a/sys/boot/i386/libi386/multiboot_tramp.S
+++ b/stand/i386/libi386/multiboot_tramp.S
diff --git a/sys/boot/i386/libi386/nullconsole.c b/stand/i386/libi386/nullconsole.c
index ebb1e7edd2b63..ebb1e7edd2b63 100644
--- a/sys/boot/i386/libi386/nullconsole.c
+++ b/stand/i386/libi386/nullconsole.c
diff --git a/sys/boot/i386/libi386/pread.c b/stand/i386/libi386/pread.c
index 870e2540150f6..870e2540150f6 100644
--- a/sys/boot/i386/libi386/pread.c
+++ b/stand/i386/libi386/pread.c
diff --git a/sys/boot/i386/libi386/pxe.c b/stand/i386/libi386/pxe.c
index 7cb483317924f..7cb483317924f 100644
--- a/sys/boot/i386/libi386/pxe.c
+++ b/stand/i386/libi386/pxe.c
diff --git a/sys/boot/i386/libi386/pxe.h b/stand/i386/libi386/pxe.h
index 119c86be519d5..119c86be519d5 100644
--- a/sys/boot/i386/libi386/pxe.h
+++ b/stand/i386/libi386/pxe.h
diff --git a/sys/boot/i386/libi386/pxetramp.s b/stand/i386/libi386/pxetramp.s
index dcf1441aeb244..dcf1441aeb244 100644
--- a/sys/boot/i386/libi386/pxetramp.s
+++ b/stand/i386/libi386/pxetramp.s
diff --git a/sys/boot/i386/libi386/relocater_tramp.S b/stand/i386/libi386/relocater_tramp.S
index 6db4a7509b2cd..6db4a7509b2cd 100644
--- a/sys/boot/i386/libi386/relocater_tramp.S
+++ b/stand/i386/libi386/relocater_tramp.S
diff --git a/sys/boot/i386/libi386/smbios.c b/stand/i386/libi386/smbios.c
index 2aa62fa85df76..2aa62fa85df76 100644
--- a/sys/boot/i386/libi386/smbios.c
+++ b/stand/i386/libi386/smbios.c
diff --git a/sys/boot/i386/libi386/smbios.h b/stand/i386/libi386/smbios.h
index 03fc07e293629..03fc07e293629 100644
--- a/sys/boot/i386/libi386/smbios.h
+++ b/stand/i386/libi386/smbios.h
diff --git a/sys/boot/i386/libi386/spinconsole.c b/stand/i386/libi386/spinconsole.c
index 1daac35869393..1daac35869393 100644
--- a/sys/boot/i386/libi386/spinconsole.c
+++ b/stand/i386/libi386/spinconsole.c
diff --git a/sys/boot/i386/libi386/time.c b/stand/i386/libi386/time.c
index 7636ace5ff944..7636ace5ff944 100644
--- a/sys/boot/i386/libi386/time.c
+++ b/stand/i386/libi386/time.c
diff --git a/sys/boot/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c
index 073d5314dc873..073d5314dc873 100644
--- a/sys/boot/i386/libi386/vidconsole.c
+++ b/stand/i386/libi386/vidconsole.c
diff --git a/sys/boot/i386/loader/Makefile b/stand/i386/loader/Makefile
index 40ac46ce0cf7c..40ac46ce0cf7c 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/stand/i386/loader/Makefile
diff --git a/sys/boot/efi/loader/Makefile.depend b/stand/i386/loader/Makefile.depend
index 6eec9589d9fac..05739faa951de 100644
--- a/sys/boot/efi/loader/Makefile.depend
+++ b/stand/i386/loader/Makefile.depend
@@ -4,10 +4,13 @@
 DIRDEPS = \
 	include \
 	include/xlocale \
-	sys/boot/efi/libefi \
-	sys/boot/ficl \
-	sys/boot/libsa \
-	sys/boot/zfs \
+	stand/ficl32 \
+	stand/geli \
+	stand/i386/btx/btx \
+	stand/i386/btx/btxldr \
+	stand/i386/btx/lib \
+	stand/i386/libi386 \
+	stand/libsa32 \
 
 
 .include <dirdeps.mk>
diff --git a/sys/boot/i386/loader/chain.c b/stand/i386/loader/chain.c
index d6810ef67fce9..d6810ef67fce9 100644
--- a/sys/boot/i386/loader/chain.c
+++ b/stand/i386/loader/chain.c
diff --git a/sys/boot/i386/loader/conf.c b/stand/i386/loader/conf.c
index 29ce1e3326052..29ce1e3326052 100644
--- a/sys/boot/i386/loader/conf.c
+++ b/stand/i386/loader/conf.c
diff --git a/sys/boot/i386/loader/help.i386 b/stand/i386/loader/help.i386
index 0ff628643c87a..0ff628643c87a 100644
--- a/sys/boot/i386/loader/help.i386
+++ b/stand/i386/loader/help.i386
diff --git a/sys/boot/i386/loader/loader.rc b/stand/i386/loader/loader.rc
index 287c05efdfed1..287c05efdfed1 100644
--- a/sys/boot/i386/loader/loader.rc
+++ b/stand/i386/loader/loader.rc
diff --git a/sys/boot/i386/loader/main.c b/stand/i386/loader/main.c
index 81bc2ff55dd0e..81bc2ff55dd0e 100644
--- a/sys/boot/i386/loader/main.c
+++ b/stand/i386/loader/main.c
diff --git a/sys/boot/i386/loader/version b/stand/i386/loader/version
index 7a2acaf1859a6..7a2acaf1859a6 100644
--- a/sys/boot/i386/loader/version
+++ b/stand/i386/loader/version
diff --git a/sys/boot/i386/mbr/Makefile b/stand/i386/mbr/Makefile
index 9bfa0bd38fa0e..9bfa0bd38fa0e 100644
--- a/sys/boot/i386/mbr/Makefile
+++ b/stand/i386/mbr/Makefile
diff --git a/sys/boot/i386/mbr/Makefile.depend b/stand/i386/mbr/Makefile.depend
index f80275d86ab17..f80275d86ab17 100644
--- a/sys/boot/i386/mbr/Makefile.depend
+++ b/stand/i386/mbr/Makefile.depend
diff --git a/sys/boot/i386/mbr/mbr.s b/stand/i386/mbr/mbr.s
index 3cfc20dd58e19..3cfc20dd58e19 100644
--- a/sys/boot/i386/mbr/mbr.s
+++ b/stand/i386/mbr/mbr.s
diff --git a/sys/boot/i386/pmbr/Makefile b/stand/i386/pmbr/Makefile
index 1bfe0ee11ab2c..1bfe0ee11ab2c 100644
--- a/sys/boot/i386/pmbr/Makefile
+++ b/stand/i386/pmbr/Makefile
diff --git a/sys/boot/i386/pmbr/Makefile.depend b/stand/i386/pmbr/Makefile.depend
index f80275d86ab17..f80275d86ab17 100644
--- a/sys/boot/i386/pmbr/Makefile.depend
+++ b/stand/i386/pmbr/Makefile.depend
diff --git a/sys/boot/i386/pmbr/pmbr.s b/stand/i386/pmbr/pmbr.s
index 1a758812edd35..1a758812edd35 100644
--- a/sys/boot/i386/pmbr/pmbr.s
+++ b/stand/i386/pmbr/pmbr.s
diff --git a/sys/boot/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile
index 819283cf8a2ab..819283cf8a2ab 100644
--- a/sys/boot/i386/pxeldr/Makefile
+++ b/stand/i386/pxeldr/Makefile
diff --git a/stand/i386/pxeldr/Makefile.depend b/stand/i386/pxeldr/Makefile.depend
new file mode 100644
index 0000000000000..35b75b1ca42b2
--- /dev/null
+++ b/stand/i386/pxeldr/Makefile.depend
@@ -0,0 +1,15 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	stand/i386/btx/btx \
+	stand/i386/btx/btxldr \
+	stand/i386/loader \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sys/boot/i386/pxeldr/pxeboot.8 b/stand/i386/pxeldr/pxeboot.8
index 0194e218e523b..0194e218e523b 100644
--- a/sys/boot/i386/pxeldr/pxeboot.8
+++ b/stand/i386/pxeldr/pxeboot.8
diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/stand/i386/pxeldr/pxeldr.S
index ee1e18a1f38af..ee1e18a1f38af 100644
--- a/sys/boot/i386/pxeldr/pxeldr.S
+++ b/stand/i386/pxeldr/pxeldr.S
diff --git a/sys/boot/i386/zfsboot/Makefile b/stand/i386/zfsboot/Makefile
index f0523dfa26122..f0523dfa26122 100644
--- a/sys/boot/i386/zfsboot/Makefile
+++ b/stand/i386/zfsboot/Makefile
diff --git a/stand/i386/zfsboot/Makefile.depend b/stand/i386/zfsboot/Makefile.depend
new file mode 100644
index 0000000000000..58b2754996b41
--- /dev/null
+++ b/stand/i386/zfsboot/Makefile.depend
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libmd \
+	stand/i386/btx/btx \
+	stand/i386/btx/lib \
+	stand/libsa32 \
+	stand/zfs32 \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sys/boot/i386/zfsboot/zfsboot.8 b/stand/i386/zfsboot/zfsboot.8
index 6450939de9559..6450939de9559 100644
--- a/sys/boot/i386/zfsboot/zfsboot.8
+++ b/stand/i386/zfsboot/zfsboot.8
diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/stand/i386/zfsboot/zfsboot.c
index 88b5231efe458..88b5231efe458 100644
--- a/sys/boot/i386/zfsboot/zfsboot.c
+++ b/stand/i386/zfsboot/zfsboot.c
diff --git a/sys/boot/i386/zfsboot/zfsldr.S b/stand/i386/zfsboot/zfsldr.S
index 3e85e27aa38c5..3e85e27aa38c5 100644
--- a/sys/boot/i386/zfsboot/zfsldr.S
+++ b/stand/i386/zfsboot/zfsldr.S
diff --git a/sys/boot/i386/zfsloader/Makefile b/stand/i386/zfsloader/Makefile
index a9fa913e7e138..a9fa913e7e138 100644
--- a/sys/boot/i386/zfsloader/Makefile
+++ b/stand/i386/zfsloader/Makefile
diff --git a/stand/i386/zfsloader/Makefile.depend b/stand/i386/zfsloader/Makefile.depend
new file mode 100644
index 0000000000000..59ee8748092a7
--- /dev/null
+++ b/stand/i386/zfsloader/Makefile.depend
@@ -0,0 +1,21 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	stand/ficl32 \
+	stand/geli \
+	stand/i386/btx/btx \
+	stand/i386/btx/btxldr \
+	stand/i386/btx/lib \
+	stand/i386/libi386 \
+	stand/libsa32 \
+	stand/zfs32 \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sys/boot/kshim/bsd_busspace.c b/stand/kshim/bsd_busspace.c
index 778c4494d96ce..778c4494d96ce 100644
--- a/sys/boot/kshim/bsd_busspace.c
+++ b/stand/kshim/bsd_busspace.c
diff --git a/sys/boot/kshim/bsd_global.h b/stand/kshim/bsd_global.h
index 63bba757736dc..63bba757736dc 100644
--- a/sys/boot/kshim/bsd_global.h
+++ b/stand/kshim/bsd_global.h
diff --git a/sys/boot/kshim/bsd_kernel.c b/stand/kshim/bsd_kernel.c
index 75eccb1d67257..75eccb1d67257 100644
--- a/sys/boot/kshim/bsd_kernel.c
+++ b/stand/kshim/bsd_kernel.c
diff --git a/sys/boot/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h
index 66106ac65dd35..66106ac65dd35 100644
--- a/sys/boot/kshim/bsd_kernel.h
+++ b/stand/kshim/bsd_kernel.h
diff --git a/sys/boot/kshim/kshim.mk b/stand/kshim/kshim.mk
index 7e9b00d562d8a..7e9b00d562d8a 100644
--- a/sys/boot/kshim/kshim.mk
+++ b/stand/kshim/kshim.mk
diff --git a/sys/boot/kshim/sysinit.h b/stand/kshim/sysinit.h
index a7a450ee4cf2c..a7a450ee4cf2c 100644
--- a/sys/boot/kshim/sysinit.h
+++ b/stand/kshim/sysinit.h
diff --git a/sys/boot/libsa/Makefile b/stand/libsa/Makefile
index 9aa228847c837..9aa228847c837 100644
--- a/sys/boot/libsa/Makefile
+++ b/stand/libsa/Makefile
diff --git a/sys/boot/libsa/Makefile.depend b/stand/libsa/Makefile.depend
index 1d86fce1441d7..1d86fce1441d7 100644
--- a/sys/boot/libsa/Makefile.depend
+++ b/stand/libsa/Makefile.depend
diff --git a/sys/boot/libsa/__main.c b/stand/libsa/__main.c
index e38f33865c050..e38f33865c050 100644
--- a/sys/boot/libsa/__main.c
+++ b/stand/libsa/__main.c
diff --git a/sys/boot/libsa/amd64/_setjmp.S b/stand/libsa/amd64/_setjmp.S
index 6d9a5fa13f8d7..6d9a5fa13f8d7 100644
--- a/sys/boot/libsa/amd64/_setjmp.S
+++ b/stand/libsa/amd64/_setjmp.S
diff --git a/sys/boot/libsa/arp.c b/stand/libsa/arp.c
index 841010c3195ce..841010c3195ce 100644
--- a/sys/boot/libsa/arp.c
+++ b/stand/libsa/arp.c
diff --git a/sys/boot/libsa/assert.c b/stand/libsa/assert.c
index 8eec63a4729a6..8eec63a4729a6 100644
--- a/sys/boot/libsa/assert.c
+++ b/stand/libsa/assert.c
diff --git a/sys/boot/libsa/bcd.c b/stand/libsa/bcd.c
index 7bd67c91620a6..7bd67c91620a6 100644
--- a/sys/boot/libsa/bcd.c
+++ b/stand/libsa/bcd.c
diff --git a/sys/boot/libsa/bootp.c b/stand/libsa/bootp.c
index d770bf3bf5160..d770bf3bf5160 100644
--- a/sys/boot/libsa/bootp.c
+++ b/stand/libsa/bootp.c
diff --git a/sys/boot/libsa/bootp.h b/stand/libsa/bootp.h
index 2e7049b872afb..2e7049b872afb 100644
--- a/sys/boot/libsa/bootp.h
+++ b/stand/libsa/bootp.h
diff --git a/sys/boot/libsa/bootparam.c b/stand/libsa/bootparam.c
index 1de2d53d77fe2..1de2d53d77fe2 100644
--- a/sys/boot/libsa/bootparam.c
+++ b/stand/libsa/bootparam.c
diff --git a/sys/boot/libsa/bootparam.h b/stand/libsa/bootparam.h
index 9c9f50ea434d1..9c9f50ea434d1 100644
--- a/sys/boot/libsa/bootparam.h
+++ b/stand/libsa/bootparam.h
diff --git a/sys/boot/libsa/bzipfs.c b/stand/libsa/bzipfs.c
index ff1514efeed3d..ff1514efeed3d 100644
--- a/sys/boot/libsa/bzipfs.c
+++ b/stand/libsa/bzipfs.c
diff --git a/sys/boot/libsa/cd9660.c b/stand/libsa/cd9660.c
index c5618838e4a6b..c5618838e4a6b 100644
--- a/sys/boot/libsa/cd9660.c
+++ b/stand/libsa/cd9660.c
diff --git a/sys/boot/libsa/close.c b/stand/libsa/close.c
index 142982b884448..142982b884448 100644
--- a/sys/boot/libsa/close.c
+++ b/stand/libsa/close.c
diff --git a/sys/boot/libsa/closeall.c b/stand/libsa/closeall.c
index 9693130ebf9b1..9693130ebf9b1 100644
--- a/sys/boot/libsa/closeall.c
+++ b/stand/libsa/closeall.c
diff --git a/sys/boot/libsa/crc32.c b/stand/libsa/crc32.c
index 1a3e3a3329fea..1a3e3a3329fea 100644
--- a/sys/boot/libsa/crc32.c
+++ b/stand/libsa/crc32.c
diff --git a/sys/boot/libsa/crc32.h b/stand/libsa/crc32.h
index adfd628671aac..adfd628671aac 100644
--- a/sys/boot/libsa/crc32.h
+++ b/stand/libsa/crc32.h
diff --git a/sys/boot/libsa/dev.c b/stand/libsa/dev.c
index 20f3100852e79..20f3100852e79 100644
--- a/sys/boot/libsa/dev.c
+++ b/stand/libsa/dev.c
diff --git a/sys/boot/libsa/dosfs.c b/stand/libsa/dosfs.c
index 68762842eaee2..68762842eaee2 100644
--- a/sys/boot/libsa/dosfs.c
+++ b/stand/libsa/dosfs.c
diff --git a/sys/boot/libsa/dosfs.h b/stand/libsa/dosfs.h
index 5b11e0fc375a4..5b11e0fc375a4 100644
--- a/sys/boot/libsa/dosfs.h
+++ b/stand/libsa/dosfs.h
diff --git a/sys/boot/libsa/environment.c b/stand/libsa/environment.c
index 291e330044300..291e330044300 100644
--- a/sys/boot/libsa/environment.c
+++ b/stand/libsa/environment.c
diff --git a/sys/boot/libsa/ether.c b/stand/libsa/ether.c
index 3616777e79554..3616777e79554 100644
--- a/sys/boot/libsa/ether.c
+++ b/stand/libsa/ether.c
diff --git a/sys/boot/libsa/ext2fs.c b/stand/libsa/ext2fs.c
index 348fdecc5c11f..348fdecc5c11f 100644
--- a/sys/boot/libsa/ext2fs.c
+++ b/stand/libsa/ext2fs.c
diff --git a/sys/boot/libsa/fstat.c b/stand/libsa/fstat.c
index cb2df8cbf0ac4..cb2df8cbf0ac4 100644
--- a/sys/boot/libsa/fstat.c
+++ b/stand/libsa/fstat.c
diff --git a/sys/boot/libsa/getopt.c b/stand/libsa/getopt.c
index ead2ee56267cb..ead2ee56267cb 100644
--- a/sys/boot/libsa/getopt.c
+++ b/stand/libsa/getopt.c
diff --git a/sys/boot/libsa/gets.c b/stand/libsa/gets.c
index 9172ffc1328f3..9172ffc1328f3 100644
--- a/sys/boot/libsa/gets.c
+++ b/stand/libsa/gets.c
diff --git a/sys/boot/libsa/globals.c b/stand/libsa/globals.c
index 8fb56cf23e6b0..8fb56cf23e6b0 100644
--- a/sys/boot/libsa/globals.c
+++ b/stand/libsa/globals.c
diff --git a/sys/boot/libsa/gpt.c b/stand/libsa/gpt.c
index 7ab3fc6d04e05..7ab3fc6d04e05 100644
--- a/sys/boot/libsa/gpt.c
+++ b/stand/libsa/gpt.c
diff --git a/sys/boot/libsa/gpt.h b/stand/libsa/gpt.h
index 9d48564b5ada3..9d48564b5ada3 100644
--- a/sys/boot/libsa/gpt.h
+++ b/stand/libsa/gpt.h
diff --git a/sys/boot/libsa/gzipfs.c b/stand/libsa/gzipfs.c
index 6057c2835fecb..6057c2835fecb 100644
--- a/sys/boot/libsa/gzipfs.c
+++ b/stand/libsa/gzipfs.c
diff --git a/sys/boot/libsa/i386/_setjmp.S b/stand/libsa/i386/_setjmp.S
index 95b0ea8037f5a..95b0ea8037f5a 100644
--- a/sys/boot/libsa/i386/_setjmp.S
+++ b/stand/libsa/i386/_setjmp.S
diff --git a/sys/boot/libsa/in_cksum.c b/stand/libsa/in_cksum.c
index 97782152d71d4..97782152d71d4 100644
--- a/sys/boot/libsa/in_cksum.c
+++ b/stand/libsa/in_cksum.c
diff --git a/sys/boot/libsa/inet_ntoa.c b/stand/libsa/inet_ntoa.c
index f675a0ff77366..f675a0ff77366 100644
--- a/sys/boot/libsa/inet_ntoa.c
+++ b/stand/libsa/inet_ntoa.c
diff --git a/sys/boot/libsa/ioctl.c b/stand/libsa/ioctl.c
index 807b308e5e501..807b308e5e501 100644
--- a/sys/boot/libsa/ioctl.c
+++ b/stand/libsa/ioctl.c
diff --git a/sys/boot/libsa/iodesc.h b/stand/libsa/iodesc.h
index 37ae044af9d94..37ae044af9d94 100644
--- a/sys/boot/libsa/iodesc.h
+++ b/stand/libsa/iodesc.h
diff --git a/sys/boot/libsa/ip.c b/stand/libsa/ip.c
index f2293b3cd3f92..f2293b3cd3f92 100644
--- a/sys/boot/libsa/ip.c
+++ b/stand/libsa/ip.c
diff --git a/sys/boot/libsa/libstand.3 b/stand/libsa/libstand.3
index 42289c1bce416..42289c1bce416 100644
--- a/sys/boot/libsa/libstand.3
+++ b/stand/libsa/libstand.3
diff --git a/sys/boot/libsa/lseek.c b/stand/libsa/lseek.c
index df2591acd76d7..df2591acd76d7 100644
--- a/sys/boot/libsa/lseek.c
+++ b/stand/libsa/lseek.c
diff --git a/sys/boot/libsa/mips/_setjmp.S b/stand/libsa/mips/_setjmp.S
index 0289b0ec9274b..0289b0ec9274b 100644
--- a/sys/boot/libsa/mips/_setjmp.S
+++ b/stand/libsa/mips/_setjmp.S
diff --git a/sys/boot/libsa/nandfs.c b/stand/libsa/nandfs.c
index b3e72243e9952..b3e72243e9952 100644
--- a/sys/boot/libsa/nandfs.c
+++ b/stand/libsa/nandfs.c
diff --git a/sys/boot/libsa/net.c b/stand/libsa/net.c
index ae6e74511e127..ae6e74511e127 100644
--- a/sys/boot/libsa/net.c
+++ b/stand/libsa/net.c
diff --git a/sys/boot/libsa/net.h b/stand/libsa/net.h
index cc946c15ff5c2..cc946c15ff5c2 100644
--- a/sys/boot/libsa/net.h
+++ b/stand/libsa/net.h
diff --git a/sys/boot/libsa/netif.c b/stand/libsa/netif.c
index 105f9a31ab5da..105f9a31ab5da 100644
--- a/sys/boot/libsa/netif.c
+++ b/stand/libsa/netif.c
diff --git a/sys/boot/libsa/netif.h b/stand/libsa/netif.h
index 44165ab0d88ac..44165ab0d88ac 100644
--- a/sys/boot/libsa/netif.h
+++ b/stand/libsa/netif.h
diff --git a/sys/boot/libsa/nfs.c b/stand/libsa/nfs.c
index 7e2e1ababacc9..7e2e1ababacc9 100644
--- a/sys/boot/libsa/nfs.c
+++ b/stand/libsa/nfs.c
diff --git a/sys/boot/libsa/nfsv2.h b/stand/libsa/nfsv2.h
index 09b2428b8012b..09b2428b8012b 100644
--- a/sys/boot/libsa/nfsv2.h
+++ b/stand/libsa/nfsv2.h
diff --git a/sys/boot/libsa/nullfs.c b/stand/libsa/nullfs.c
index 7773d16a82f60..7773d16a82f60 100644
--- a/sys/boot/libsa/nullfs.c
+++ b/stand/libsa/nullfs.c
diff --git a/sys/boot/libsa/open.c b/stand/libsa/open.c
index 2ae17314bc544..2ae17314bc544 100644
--- a/sys/boot/libsa/open.c
+++ b/stand/libsa/open.c
diff --git a/sys/boot/libsa/pager.c b/stand/libsa/pager.c
index a966b0bd79920..a966b0bd79920 100644
--- a/sys/boot/libsa/pager.c
+++ b/stand/libsa/pager.c
diff --git a/sys/boot/libsa/panic.c b/stand/libsa/panic.c
index 6e4c76d0e031a..6e4c76d0e031a 100644
--- a/sys/boot/libsa/panic.c
+++ b/stand/libsa/panic.c
diff --git a/sys/boot/libsa/pkgfs.c b/stand/libsa/pkgfs.c
index fda7f607087d6..fda7f607087d6 100644
--- a/sys/boot/libsa/pkgfs.c
+++ b/stand/libsa/pkgfs.c
diff --git a/sys/boot/libsa/powerpc/_setjmp.S b/stand/libsa/powerpc/_setjmp.S
index 7c7c24b1237cd..7c7c24b1237cd 100644
--- a/sys/boot/libsa/powerpc/_setjmp.S
+++ b/stand/libsa/powerpc/_setjmp.S
diff --git a/sys/boot/libsa/powerpc/syncicache.c b/stand/libsa/powerpc/syncicache.c
index 434dcec634162..434dcec634162 100644
--- a/sys/boot/libsa/powerpc/syncicache.c
+++ b/stand/libsa/powerpc/syncicache.c
diff --git a/sys/boot/libsa/printf.c b/stand/libsa/printf.c
index d0c409ded53cf..d0c409ded53cf 100644
--- a/sys/boot/libsa/printf.c
+++ b/stand/libsa/printf.c
diff --git a/sys/boot/libsa/qdivrem.c b/stand/libsa/qdivrem.c
index 9e7696de38537..9e7696de38537 100644
--- a/sys/boot/libsa/qdivrem.c
+++ b/stand/libsa/qdivrem.c
diff --git a/sys/boot/libsa/quad.h b/stand/libsa/quad.h
index 3450a7a1afe4e..3450a7a1afe4e 100644
--- a/sys/boot/libsa/quad.h
+++ b/stand/libsa/quad.h
diff --git a/sys/boot/libsa/random.c b/stand/libsa/random.c
index a4b4d50206427..a4b4d50206427 100644
--- a/sys/boot/libsa/random.c
+++ b/stand/libsa/random.c
diff --git a/sys/boot/libsa/rarp.c b/stand/libsa/rarp.c
index b7e3ea4860792..b7e3ea4860792 100644
--- a/sys/boot/libsa/rarp.c
+++ b/stand/libsa/rarp.c
diff --git a/sys/boot/libsa/read.c b/stand/libsa/read.c
index e48a4d8642127..e48a4d8642127 100644
--- a/sys/boot/libsa/read.c
+++ b/stand/libsa/read.c
diff --git a/sys/boot/libsa/readdir.c b/stand/libsa/readdir.c
index e49d93d15ed6c..e49d93d15ed6c 100644
--- a/sys/boot/libsa/readdir.c
+++ b/stand/libsa/readdir.c
diff --git a/sys/boot/libsa/rpc.c b/stand/libsa/rpc.c
index 932fdc98b9036..932fdc98b9036 100644
--- a/sys/boot/libsa/rpc.c
+++ b/stand/libsa/rpc.c
diff --git a/sys/boot/libsa/rpc.h b/stand/libsa/rpc.h
index 5efe832101424..5efe832101424 100644
--- a/sys/boot/libsa/rpc.h
+++ b/stand/libsa/rpc.h
diff --git a/sys/boot/libsa/rpcv2.h b/stand/libsa/rpcv2.h
index 4f1f016333a00..4f1f016333a00 100644
--- a/sys/boot/libsa/rpcv2.h
+++ b/stand/libsa/rpcv2.h
diff --git a/sys/boot/libsa/saioctl.h b/stand/libsa/saioctl.h
index 5124f86187c93..5124f86187c93 100644
--- a/sys/boot/libsa/saioctl.h
+++ b/stand/libsa/saioctl.h
diff --git a/sys/boot/libsa/sbrk.c b/stand/libsa/sbrk.c
index 471e78ecf6dfe..471e78ecf6dfe 100644
--- a/sys/boot/libsa/sbrk.c
+++ b/stand/libsa/sbrk.c
diff --git a/sys/boot/libsa/sparc64/_setjmp.S b/stand/libsa/sparc64/_setjmp.S
index 8df29e6ba7501..8df29e6ba7501 100644
--- a/sys/boot/libsa/sparc64/_setjmp.S
+++ b/stand/libsa/sparc64/_setjmp.S
diff --git a/sys/boot/libsa/splitfs.c b/stand/libsa/splitfs.c
index af28704bc4658..af28704bc4658 100644
--- a/sys/boot/libsa/splitfs.c
+++ b/stand/libsa/splitfs.c
diff --git a/sys/boot/libsa/stand.h b/stand/libsa/stand.h
index bddfa76657d64..bddfa76657d64 100644
--- a/sys/boot/libsa/stand.h
+++ b/stand/libsa/stand.h
diff --git a/sys/boot/libsa/stat.c b/stand/libsa/stat.c
index 9875372b441d5..9875372b441d5 100644
--- a/sys/boot/libsa/stat.c
+++ b/stand/libsa/stat.c
diff --git a/sys/boot/libsa/strcasecmp.c b/stand/libsa/strcasecmp.c
index f8131019384c1..f8131019384c1 100644
--- a/sys/boot/libsa/strcasecmp.c
+++ b/stand/libsa/strcasecmp.c
diff --git a/sys/boot/libsa/strdup.c b/stand/libsa/strdup.c
index de6c4def8bc6c..de6c4def8bc6c 100644
--- a/sys/boot/libsa/strdup.c
+++ b/stand/libsa/strdup.c
diff --git a/sys/boot/libsa/strerror.c b/stand/libsa/strerror.c
index e08ca0a7f1759..e08ca0a7f1759 100644
--- a/sys/boot/libsa/strerror.c
+++ b/stand/libsa/strerror.c
diff --git a/sys/boot/libsa/strtol.c b/stand/libsa/strtol.c
index e15339a60d41c..e15339a60d41c 100644
--- a/sys/boot/libsa/strtol.c
+++ b/stand/libsa/strtol.c
diff --git a/sys/boot/libsa/strtoul.c b/stand/libsa/strtoul.c
index 0c7147c2ab67e..0c7147c2ab67e 100644
--- a/sys/boot/libsa/strtoul.c
+++ b/stand/libsa/strtoul.c
diff --git a/sys/boot/libsa/tftp.c b/stand/libsa/tftp.c
index 9bef4643d25fa..9bef4643d25fa 100644
--- a/sys/boot/libsa/tftp.c
+++ b/stand/libsa/tftp.c
diff --git a/sys/boot/libsa/tftp.h b/stand/libsa/tftp.h
index c56fb81aafaa2..c56fb81aafaa2 100644
--- a/sys/boot/libsa/tftp.h
+++ b/stand/libsa/tftp.h
diff --git a/sys/boot/libsa/twiddle.c b/stand/libsa/twiddle.c
index 31828542f7f37..31828542f7f37 100644
--- a/sys/boot/libsa/twiddle.c
+++ b/stand/libsa/twiddle.c
diff --git a/sys/boot/libsa/udp.c b/stand/libsa/udp.c
index 02ac62571fb70..02ac62571fb70 100644
--- a/sys/boot/libsa/udp.c
+++ b/stand/libsa/udp.c
diff --git a/sys/boot/libsa/ufs.c b/stand/libsa/ufs.c
index e0ceed804d9ad..e0ceed804d9ad 100644
--- a/sys/boot/libsa/ufs.c
+++ b/stand/libsa/ufs.c
diff --git a/sys/boot/libsa/ufsread.c b/stand/libsa/ufsread.c
index bd9ad2c571038..bd9ad2c571038 100644
--- a/sys/boot/libsa/ufsread.c
+++ b/stand/libsa/ufsread.c
diff --git a/sys/boot/libsa/util.c b/stand/libsa/util.c
index 49f42ebe2da98..49f42ebe2da98 100644
--- a/sys/boot/libsa/util.c
+++ b/stand/libsa/util.c
diff --git a/sys/boot/libsa/util.h b/stand/libsa/util.h
index 88a99f19f0b34..88a99f19f0b34 100644
--- a/sys/boot/libsa/util.h
+++ b/stand/libsa/util.h
diff --git a/sys/boot/libsa/uuid_from_string.c b/stand/libsa/uuid_from_string.c
index 7a59b4189ead9..7a59b4189ead9 100644
--- a/sys/boot/libsa/uuid_from_string.c
+++ b/stand/libsa/uuid_from_string.c
diff --git a/sys/boot/libsa/uuid_to_string.c b/stand/libsa/uuid_to_string.c
index d878af495aca9..d878af495aca9 100644
--- a/sys/boot/libsa/uuid_to_string.c
+++ b/stand/libsa/uuid_to_string.c
diff --git a/sys/boot/libsa/write.c b/stand/libsa/write.c
index 6c65dd331245c..6c65dd331245c 100644
--- a/sys/boot/libsa/write.c
+++ b/stand/libsa/write.c
diff --git a/sys/boot/libsa/zalloc.c b/stand/libsa/zalloc.c
index 4d1ec6291210c..4d1ec6291210c 100644
--- a/sys/boot/libsa/zalloc.c
+++ b/stand/libsa/zalloc.c
diff --git a/sys/boot/libsa/zalloc_defs.h b/stand/libsa/zalloc_defs.h
index 7f2cc1202c9be..7f2cc1202c9be 100644
--- a/sys/boot/libsa/zalloc_defs.h
+++ b/stand/libsa/zalloc_defs.h
diff --git a/sys/boot/libsa/zalloc_malloc.c b/stand/libsa/zalloc_malloc.c
index b9a295fb38503..b9a295fb38503 100644
--- a/sys/boot/libsa/zalloc_malloc.c
+++ b/stand/libsa/zalloc_malloc.c
diff --git a/sys/boot/libsa/zalloc_mem.h b/stand/libsa/zalloc_mem.h
index 26d388dfc75e1..26d388dfc75e1 100644
--- a/sys/boot/libsa/zalloc_mem.h
+++ b/stand/libsa/zalloc_mem.h
diff --git a/sys/boot/libsa/zalloc_protos.h b/stand/libsa/zalloc_protos.h
index 53a40e400dcd9..53a40e400dcd9 100644
--- a/sys/boot/libsa/zalloc_protos.h
+++ b/stand/libsa/zalloc_protos.h
diff --git a/sys/boot/libsa32/Makefile b/stand/libsa32/Makefile
index eba6c00bd891c..eba6c00bd891c 100644
--- a/sys/boot/libsa32/Makefile
+++ b/stand/libsa32/Makefile
diff --git a/sys/boot/libsa32/Makefile.depend b/stand/libsa32/Makefile.depend
index 1d86fce1441d7..1d86fce1441d7 100644
--- a/sys/boot/libsa32/Makefile.depend
+++ b/stand/libsa32/Makefile.depend
diff --git a/sys/boot/loader.mk b/stand/loader.mk
index 7236c8614e06a..7236c8614e06a 100644
--- a/sys/boot/loader.mk
+++ b/stand/loader.mk
diff --git a/sys/boot/man/Makefile b/stand/man/Makefile
index 15285acbafc97..15285acbafc97 100644
--- a/sys/boot/man/Makefile
+++ b/stand/man/Makefile
diff --git a/sys/boot/man/Makefile.depend b/stand/man/Makefile.depend
index f80275d86ab17..f80275d86ab17 100644
--- a/sys/boot/man/Makefile.depend
+++ b/stand/man/Makefile.depend
diff --git a/sys/boot/man/loader.8 b/stand/man/loader.8
index 7af7343d99ddf..7af7343d99ddf 100644
--- a/sys/boot/man/loader.8
+++ b/stand/man/loader.8
diff --git a/sys/boot/man/zfsloader.8 b/stand/man/zfsloader.8
index fd437d9399c17..fd437d9399c17 100644
--- a/sys/boot/man/zfsloader.8
+++ b/stand/man/zfsloader.8
diff --git a/sys/boot/mips/Makefile b/stand/mips/Makefile
index 760c557d92d14..760c557d92d14 100644
--- a/sys/boot/mips/Makefile
+++ b/stand/mips/Makefile
diff --git a/sys/boot/mips/Makefile.inc b/stand/mips/Makefile.inc
index 265f86d1ed55a..265f86d1ed55a 100644
--- a/sys/boot/mips/Makefile.inc
+++ b/stand/mips/Makefile.inc
diff --git a/sys/boot/mips/beri/Makefile b/stand/mips/beri/Makefile
index afcb538816b81..afcb538816b81 100644
--- a/sys/boot/mips/beri/Makefile
+++ b/stand/mips/beri/Makefile
diff --git a/sys/boot/mips/beri/Makefile.inc b/stand/mips/beri/Makefile.inc
index a12699c3a6f77..a12699c3a6f77 100644
--- a/sys/boot/mips/beri/Makefile.inc
+++ b/stand/mips/beri/Makefile.inc
diff --git a/sys/boot/mips/beri/boot2/Makefile b/stand/mips/beri/boot2/Makefile
index d36934078e1a7..d36934078e1a7 100644
--- a/sys/boot/mips/beri/boot2/Makefile
+++ b/stand/mips/beri/boot2/Makefile
diff --git a/sys/boot/mips/beri/boot2/boot2.c b/stand/mips/beri/boot2/boot2.c
index 3db33c4ea0b0b..3db33c4ea0b0b 100644
--- a/sys/boot/mips/beri/boot2/boot2.c
+++ b/stand/mips/beri/boot2/boot2.c
diff --git a/sys/boot/mips/beri/boot2/flashboot.ldscript b/stand/mips/beri/boot2/flashboot.ldscript
index 4d61438bd9b8c..4d61438bd9b8c 100644
--- a/sys/boot/mips/beri/boot2/flashboot.ldscript
+++ b/stand/mips/beri/boot2/flashboot.ldscript
diff --git a/sys/boot/mips/beri/boot2/jtagboot.ldscript b/stand/mips/beri/boot2/jtagboot.ldscript
index 064c6e15d0384..064c6e15d0384 100644
--- a/sys/boot/mips/beri/boot2/jtagboot.ldscript
+++ b/stand/mips/beri/boot2/jtagboot.ldscript
diff --git a/sys/boot/mips/beri/boot2/relocate.S b/stand/mips/beri/boot2/relocate.S
index d704eb54c69c1..d704eb54c69c1 100644
--- a/sys/boot/mips/beri/boot2/relocate.S
+++ b/stand/mips/beri/boot2/relocate.S
diff --git a/sys/boot/mips/beri/boot2/start.S b/stand/mips/beri/boot2/start.S
index c1fcce5812e83..c1fcce5812e83 100644
--- a/sys/boot/mips/beri/boot2/start.S
+++ b/stand/mips/beri/boot2/start.S
diff --git a/sys/boot/mips/beri/common/altera_jtag_uart.c b/stand/mips/beri/common/altera_jtag_uart.c
index 7edb45191c6a9..7edb45191c6a9 100644
--- a/sys/boot/mips/beri/common/altera_jtag_uart.c
+++ b/stand/mips/beri/common/altera_jtag_uart.c
diff --git a/sys/boot/mips/beri/common/beri.h b/stand/mips/beri/common/beri.h
index e6ccae8610093..e6ccae8610093 100644
--- a/sys/boot/mips/beri/common/beri.h
+++ b/stand/mips/beri/common/beri.h
diff --git a/sys/boot/mips/beri/common/cfi.c b/stand/mips/beri/common/cfi.c
index a6798f4a74515..a6798f4a74515 100644
--- a/sys/boot/mips/beri/common/cfi.c
+++ b/stand/mips/beri/common/cfi.c
diff --git a/sys/boot/mips/beri/common/cfi.h b/stand/mips/beri/common/cfi.h
index 3dfe48c8c7298..3dfe48c8c7298 100644
--- a/sys/boot/mips/beri/common/cfi.h
+++ b/stand/mips/beri/common/cfi.h
diff --git a/sys/boot/mips/beri/common/common.ldscript b/stand/mips/beri/common/common.ldscript
index 6266646cfc3c7..6266646cfc3c7 100644
--- a/sys/boot/mips/beri/common/common.ldscript
+++ b/stand/mips/beri/common/common.ldscript
diff --git a/sys/boot/mips/beri/common/cons.h b/stand/mips/beri/common/cons.h
index 18a466ab1c5fb..18a466ab1c5fb 100644
--- a/sys/boot/mips/beri/common/cons.h
+++ b/stand/mips/beri/common/cons.h
diff --git a/sys/boot/mips/beri/common/mips.h b/stand/mips/beri/common/mips.h
index c63d475313a4d..c63d475313a4d 100644
--- a/sys/boot/mips/beri/common/mips.h
+++ b/stand/mips/beri/common/mips.h
diff --git a/sys/boot/mips/beri/common/sdcard.c b/stand/mips/beri/common/sdcard.c
index e50f4e70017d1..e50f4e70017d1 100644
--- a/sys/boot/mips/beri/common/sdcard.c
+++ b/stand/mips/beri/common/sdcard.c
diff --git a/sys/boot/mips/beri/common/sdcard.h b/stand/mips/beri/common/sdcard.h
index 0eb77604d766c..0eb77604d766c 100644
--- a/sys/boot/mips/beri/common/sdcard.h
+++ b/stand/mips/beri/common/sdcard.h
diff --git a/sys/boot/mips/beri/loader/Makefile b/stand/mips/beri/loader/Makefile
index 763b3b34662e7..763b3b34662e7 100644
--- a/sys/boot/mips/beri/loader/Makefile
+++ b/stand/mips/beri/loader/Makefile
diff --git a/sys/boot/mips/beri/loader/arch.c b/stand/mips/beri/loader/arch.c
index 5ce8ede9c6a3c..5ce8ede9c6a3c 100644
--- a/sys/boot/mips/beri/loader/arch.c
+++ b/stand/mips/beri/loader/arch.c
diff --git a/sys/boot/mips/beri/loader/beri_console.c b/stand/mips/beri/loader/beri_console.c
index 9a4ae19d5c8ae..9a4ae19d5c8ae 100644
--- a/sys/boot/mips/beri/loader/beri_console.c
+++ b/stand/mips/beri/loader/beri_console.c
diff --git a/sys/boot/mips/beri/loader/beri_disk_cfi.c b/stand/mips/beri/loader/beri_disk_cfi.c
index a21947fdfec63..a21947fdfec63 100644
--- a/sys/boot/mips/beri/loader/beri_disk_cfi.c
+++ b/stand/mips/beri/loader/beri_disk_cfi.c
diff --git a/sys/boot/mips/beri/loader/beri_disk_sdcard.c b/stand/mips/beri/loader/beri_disk_sdcard.c
index 266fb4a813f10..266fb4a813f10 100644
--- a/sys/boot/mips/beri/loader/beri_disk_sdcard.c
+++ b/stand/mips/beri/loader/beri_disk_sdcard.c
diff --git a/sys/boot/mips/beri/loader/devicename.c b/stand/mips/beri/loader/devicename.c
index 4a2c273992a95..4a2c273992a95 100644
--- a/sys/boot/mips/beri/loader/devicename.c
+++ b/stand/mips/beri/loader/devicename.c
diff --git a/sys/boot/mips/beri/loader/exec.c b/stand/mips/beri/loader/exec.c
index 382b6a1c87237..382b6a1c87237 100644
--- a/sys/boot/mips/beri/loader/exec.c
+++ b/stand/mips/beri/loader/exec.c
diff --git a/sys/boot/mips/beri/loader/help.mips b/stand/mips/beri/loader/help.mips
index 5873eb0512d2d..5873eb0512d2d 100644
--- a/sys/boot/mips/beri/loader/help.mips
+++ b/stand/mips/beri/loader/help.mips
diff --git a/sys/boot/mips/beri/loader/loader.h b/stand/mips/beri/loader/loader.h
index e4152e72df92f..e4152e72df92f 100644
--- a/sys/boot/mips/beri/loader/loader.h
+++ b/stand/mips/beri/loader/loader.h
diff --git a/sys/boot/mips/beri/loader/loader.ldscript b/stand/mips/beri/loader/loader.ldscript
index deb4865c28ee6..deb4865c28ee6 100644
--- a/sys/boot/mips/beri/loader/loader.ldscript
+++ b/stand/mips/beri/loader/loader.ldscript
diff --git a/sys/boot/mips/beri/loader/main.c b/stand/mips/beri/loader/main.c
index 2d201d8011ee9..2d201d8011ee9 100644
--- a/sys/boot/mips/beri/loader/main.c
+++ b/stand/mips/beri/loader/main.c
diff --git a/sys/boot/mips/beri/loader/metadata.c b/stand/mips/beri/loader/metadata.c
index 0698cd19c6513..0698cd19c6513 100644
--- a/sys/boot/mips/beri/loader/metadata.c
+++ b/stand/mips/beri/loader/metadata.c
diff --git a/sys/boot/mips/beri/loader/start.S b/stand/mips/beri/loader/start.S
index d679caaa98942..d679caaa98942 100644
--- a/sys/boot/mips/beri/loader/start.S
+++ b/stand/mips/beri/loader/start.S
diff --git a/sys/boot/mips/beri/loader/version b/stand/mips/beri/loader/version
index ce8e1875844c3..ce8e1875844c3 100644
--- a/sys/boot/mips/beri/loader/version
+++ b/stand/mips/beri/loader/version
diff --git a/sys/boot/mips/uboot/Makefile b/stand/mips/uboot/Makefile
index b941ba3424313..b941ba3424313 100644
--- a/sys/boot/mips/uboot/Makefile
+++ b/stand/mips/uboot/Makefile
diff --git a/sys/boot/mips/uboot/conf.c b/stand/mips/uboot/conf.c
index 3579b6a56753b..3579b6a56753b 100644
--- a/sys/boot/mips/uboot/conf.c
+++ b/stand/mips/uboot/conf.c
diff --git a/sys/boot/mips/uboot/help.uboot b/stand/mips/uboot/help.uboot
index c1574af92715e..c1574af92715e 100644
--- a/sys/boot/mips/uboot/help.uboot
+++ b/stand/mips/uboot/help.uboot
diff --git a/sys/boot/mips/uboot/ldscript.mips b/stand/mips/uboot/ldscript.mips
index 815dabc745870..815dabc745870 100644
--- a/sys/boot/mips/uboot/ldscript.mips
+++ b/stand/mips/uboot/ldscript.mips
diff --git a/sys/boot/mips/uboot/loader.conf b/stand/mips/uboot/loader.conf
index 4154ab7bcc9f9..4154ab7bcc9f9 100644
--- a/sys/boot/mips/uboot/loader.conf
+++ b/stand/mips/uboot/loader.conf
diff --git a/sys/boot/mips/uboot/start.S b/stand/mips/uboot/start.S
index 2ca68b2ef1f91..2ca68b2ef1f91 100644
--- a/sys/boot/mips/uboot/start.S
+++ b/stand/mips/uboot/start.S
diff --git a/sys/boot/mips/uboot/version b/stand/mips/uboot/version
index 486c4125cc0d4..486c4125cc0d4 100644
--- a/sys/boot/mips/uboot/version
+++ b/stand/mips/uboot/version
diff --git a/sys/boot/ofw/Makefile b/stand/ofw/Makefile
index 3b881b780e87a..3b881b780e87a 100644
--- a/sys/boot/ofw/Makefile
+++ b/stand/ofw/Makefile
diff --git a/sys/boot/ofw/Makefile.inc b/stand/ofw/Makefile.inc
index 265f86d1ed55a..265f86d1ed55a 100644
--- a/sys/boot/ofw/Makefile.inc
+++ b/stand/ofw/Makefile.inc
diff --git a/sys/boot/ofw/common/Makefile.inc b/stand/ofw/common/Makefile.inc
index 5d20372631e67..5d20372631e67 100644
--- a/sys/boot/ofw/common/Makefile.inc
+++ b/stand/ofw/common/Makefile.inc
diff --git a/sys/boot/ofw/common/main.c b/stand/ofw/common/main.c
index 3c0bbdf97a260..3c0bbdf97a260 100644
--- a/sys/boot/ofw/common/main.c
+++ b/stand/ofw/common/main.c
diff --git a/sys/boot/ofw/libofw/Makefile b/stand/ofw/libofw/Makefile
index 8e9ac804c5fa1..8e9ac804c5fa1 100644
--- a/sys/boot/ofw/libofw/Makefile
+++ b/stand/ofw/libofw/Makefile
diff --git a/sys/boot/ofw/libofw/devicename.c b/stand/ofw/libofw/devicename.c
index c9814b76e97a0..c9814b76e97a0 100644
--- a/sys/boot/ofw/libofw/devicename.c
+++ b/stand/ofw/libofw/devicename.c
diff --git a/sys/boot/ofw/libofw/elf_freebsd.c b/stand/ofw/libofw/elf_freebsd.c
index 80ece7eeba46e..80ece7eeba46e 100644
--- a/sys/boot/ofw/libofw/elf_freebsd.c
+++ b/stand/ofw/libofw/elf_freebsd.c
diff --git a/sys/boot/ofw/libofw/libofw.h b/stand/ofw/libofw/libofw.h
index 87e90959c9e6d..87e90959c9e6d 100644
--- a/sys/boot/ofw/libofw/libofw.h
+++ b/stand/ofw/libofw/libofw.h
diff --git a/sys/boot/ofw/libofw/ofw_console.c b/stand/ofw/libofw/ofw_console.c
index 59ce9a5067d5d..59ce9a5067d5d 100644
--- a/sys/boot/ofw/libofw/ofw_console.c
+++ b/stand/ofw/libofw/ofw_console.c
diff --git a/sys/boot/ofw/libofw/ofw_copy.c b/stand/ofw/libofw/ofw_copy.c
index ffd6987315034..ffd6987315034 100644
--- a/sys/boot/ofw/libofw/ofw_copy.c
+++ b/stand/ofw/libofw/ofw_copy.c
diff --git a/sys/boot/ofw/libofw/ofw_disk.c b/stand/ofw/libofw/ofw_disk.c
index 2c3bd568a2683..2c3bd568a2683 100644
--- a/sys/boot/ofw/libofw/ofw_disk.c
+++ b/stand/ofw/libofw/ofw_disk.c
diff --git a/sys/boot/ofw/libofw/ofw_memory.c b/stand/ofw/libofw/ofw_memory.c
index 5616184e80808..5616184e80808 100644
--- a/sys/boot/ofw/libofw/ofw_memory.c
+++ b/stand/ofw/libofw/ofw_memory.c
diff --git a/sys/boot/ofw/libofw/ofw_module.c b/stand/ofw/libofw/ofw_module.c
index d39a34344556e..d39a34344556e 100644
--- a/sys/boot/ofw/libofw/ofw_module.c
+++ b/stand/ofw/libofw/ofw_module.c
diff --git a/sys/boot/ofw/libofw/ofw_net.c b/stand/ofw/libofw/ofw_net.c
index ea5e47e7ed0d3..ea5e47e7ed0d3 100644
--- a/sys/boot/ofw/libofw/ofw_net.c
+++ b/stand/ofw/libofw/ofw_net.c
diff --git a/sys/boot/ofw/libofw/ofw_reboot.c b/stand/ofw/libofw/ofw_reboot.c
index bbb420ac1767e..bbb420ac1767e 100644
--- a/sys/boot/ofw/libofw/ofw_reboot.c
+++ b/stand/ofw/libofw/ofw_reboot.c
diff --git a/sys/boot/ofw/libofw/ofw_time.c b/stand/ofw/libofw/ofw_time.c
index d5ca271564de5..d5ca271564de5 100644
--- a/sys/boot/ofw/libofw/ofw_time.c
+++ b/stand/ofw/libofw/ofw_time.c
diff --git a/sys/boot/ofw/libofw/openfirm.c b/stand/ofw/libofw/openfirm.c
index 1ccae60d66d01..1ccae60d66d01 100644
--- a/sys/boot/ofw/libofw/openfirm.c
+++ b/stand/ofw/libofw/openfirm.c
diff --git a/sys/boot/ofw/libofw/openfirm.h b/stand/ofw/libofw/openfirm.h
index 9fe77c69a09fa..9fe77c69a09fa 100644
--- a/sys/boot/ofw/libofw/openfirm.h
+++ b/stand/ofw/libofw/openfirm.h
diff --git a/sys/boot/ofw/libofw/ppc64_elf_freebsd.c b/stand/ofw/libofw/ppc64_elf_freebsd.c
index b411da491222b..b411da491222b 100644
--- a/sys/boot/ofw/libofw/ppc64_elf_freebsd.c
+++ b/stand/ofw/libofw/ppc64_elf_freebsd.c
diff --git a/sys/boot/powerpc/Makefile b/stand/powerpc/Makefile
index 969eee8dc63e3..969eee8dc63e3 100644
--- a/sys/boot/powerpc/Makefile
+++ b/stand/powerpc/Makefile
diff --git a/sys/boot/powerpc/Makefile.inc b/stand/powerpc/Makefile.inc
index 265f86d1ed55a..265f86d1ed55a 100644
--- a/sys/boot/powerpc/Makefile.inc
+++ b/stand/powerpc/Makefile.inc
diff --git a/sys/boot/powerpc/boot1.chrp/Makefile b/stand/powerpc/boot1.chrp/Makefile
index 384d0abc2788f..384d0abc2788f 100644
--- a/sys/boot/powerpc/boot1.chrp/Makefile
+++ b/stand/powerpc/boot1.chrp/Makefile
diff --git a/sys/boot/powerpc/boot1.chrp/Makefile.hfs b/stand/powerpc/boot1.chrp/Makefile.hfs
index c6c2d866f6bf0..c6c2d866f6bf0 100644
--- a/sys/boot/powerpc/boot1.chrp/Makefile.hfs
+++ b/stand/powerpc/boot1.chrp/Makefile.hfs
diff --git a/sys/boot/powerpc/boot1.chrp/boot1.c b/stand/powerpc/boot1.chrp/boot1.c
index 8de8e9f17f41b..8de8e9f17f41b 100644
--- a/sys/boot/powerpc/boot1.chrp/boot1.c
+++ b/stand/powerpc/boot1.chrp/boot1.c
diff --git a/sys/boot/powerpc/boot1.chrp/bootinfo.txt b/stand/powerpc/boot1.chrp/bootinfo.txt
index 61cf0079fa6fa..61cf0079fa6fa 100644
--- a/sys/boot/powerpc/boot1.chrp/bootinfo.txt
+++ b/stand/powerpc/boot1.chrp/bootinfo.txt
diff --git a/sys/boot/powerpc/boot1.chrp/generate-hfs.sh b/stand/powerpc/boot1.chrp/generate-hfs.sh
index ef368d1566b4d..ef368d1566b4d 100755
--- a/sys/boot/powerpc/boot1.chrp/generate-hfs.sh
+++ b/stand/powerpc/boot1.chrp/generate-hfs.sh
diff --git a/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu b/stand/powerpc/boot1.chrp/hfs.tmpl.bz2.uu
index 20b7695e6db4d..20b7695e6db4d 100644
--- a/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu
+++ b/stand/powerpc/boot1.chrp/hfs.tmpl.bz2.uu
diff --git a/sys/boot/powerpc/kboot/Makefile b/stand/powerpc/kboot/Makefile
index bed586e6732a2..bed586e6732a2 100644
--- a/sys/boot/powerpc/kboot/Makefile
+++ b/stand/powerpc/kboot/Makefile
diff --git a/sys/boot/powerpc/kboot/conf.c b/stand/powerpc/kboot/conf.c
index 104dd93ca2fb6..104dd93ca2fb6 100644
--- a/sys/boot/powerpc/kboot/conf.c
+++ b/stand/powerpc/kboot/conf.c
diff --git a/sys/boot/powerpc/kboot/host_syscall.S b/stand/powerpc/kboot/host_syscall.S
index 3607fdb0d2a18..3607fdb0d2a18 100644
--- a/sys/boot/powerpc/kboot/host_syscall.S
+++ b/stand/powerpc/kboot/host_syscall.S
diff --git a/sys/boot/powerpc/kboot/host_syscall.h b/stand/powerpc/kboot/host_syscall.h
index 0d47bd58a44ac..0d47bd58a44ac 100644
--- a/sys/boot/powerpc/kboot/host_syscall.h
+++ b/stand/powerpc/kboot/host_syscall.h
diff --git a/sys/boot/powerpc/kboot/hostcons.c b/stand/powerpc/kboot/hostcons.c
index 31dceb0199732..31dceb0199732 100644
--- a/sys/boot/powerpc/kboot/hostcons.c
+++ b/stand/powerpc/kboot/hostcons.c
diff --git a/sys/boot/powerpc/kboot/hostdisk.c b/stand/powerpc/kboot/hostdisk.c
index 22f540674cc18..22f540674cc18 100644
--- a/sys/boot/powerpc/kboot/hostdisk.c
+++ b/stand/powerpc/kboot/hostdisk.c
diff --git a/sys/boot/powerpc/kboot/kbootfdt.c b/stand/powerpc/kboot/kbootfdt.c
index 5ab3c3da43c96..5ab3c3da43c96 100644
--- a/sys/boot/powerpc/kboot/kbootfdt.c
+++ b/stand/powerpc/kboot/kbootfdt.c
diff --git a/sys/boot/powerpc/kboot/kerneltramp.S b/stand/powerpc/kboot/kerneltramp.S
index a394c9554f30a..a394c9554f30a 100644
--- a/sys/boot/powerpc/kboot/kerneltramp.S
+++ b/stand/powerpc/kboot/kerneltramp.S
diff --git a/sys/boot/powerpc/kboot/ldscript.powerpc b/stand/powerpc/kboot/ldscript.powerpc
index 729113695105f..729113695105f 100644
--- a/sys/boot/powerpc/kboot/ldscript.powerpc
+++ b/stand/powerpc/kboot/ldscript.powerpc
diff --git a/sys/boot/powerpc/kboot/main.c b/stand/powerpc/kboot/main.c
index 7a24c163d5c4f..7a24c163d5c4f 100644
--- a/sys/boot/powerpc/kboot/main.c
+++ b/stand/powerpc/kboot/main.c
diff --git a/sys/boot/powerpc/kboot/metadata.c b/stand/powerpc/kboot/metadata.c
index 1e8c314c64e65..1e8c314c64e65 100644
--- a/sys/boot/powerpc/kboot/metadata.c
+++ b/stand/powerpc/kboot/metadata.c
diff --git a/sys/boot/powerpc/kboot/ppc64_elf_freebsd.c b/stand/powerpc/kboot/ppc64_elf_freebsd.c
index 22fa7b576775a..22fa7b576775a 100644
--- a/sys/boot/powerpc/kboot/ppc64_elf_freebsd.c
+++ b/stand/powerpc/kboot/ppc64_elf_freebsd.c
diff --git a/sys/boot/powerpc/kboot/version b/stand/powerpc/kboot/version
index b24d6ea8e47a2..b24d6ea8e47a2 100644
--- a/sys/boot/powerpc/kboot/version
+++ b/stand/powerpc/kboot/version
diff --git a/sys/boot/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile
index 1853b2596fcee..1853b2596fcee 100644
--- a/sys/boot/powerpc/ofw/Makefile
+++ b/stand/powerpc/ofw/Makefile
diff --git a/sys/boot/powerpc/ofw/conf.c b/stand/powerpc/ofw/conf.c
index 7cad372cef045..7cad372cef045 100644
--- a/sys/boot/powerpc/ofw/conf.c
+++ b/stand/powerpc/ofw/conf.c
diff --git a/sys/boot/powerpc/ofw/ldscript.powerpc b/stand/powerpc/ofw/ldscript.powerpc
index 3a2765047dbbe..3a2765047dbbe 100644
--- a/sys/boot/powerpc/ofw/ldscript.powerpc
+++ b/stand/powerpc/ofw/ldscript.powerpc
diff --git a/sys/boot/powerpc/ofw/metadata.c b/stand/powerpc/ofw/metadata.c
index 25d51f8251ce3..25d51f8251ce3 100644
--- a/sys/boot/powerpc/ofw/metadata.c
+++ b/stand/powerpc/ofw/metadata.c
diff --git a/sys/boot/powerpc/ofw/ofwfdt.c b/stand/powerpc/ofw/ofwfdt.c
index 493bae7576fb1..493bae7576fb1 100644
--- a/sys/boot/powerpc/ofw/ofwfdt.c
+++ b/stand/powerpc/ofw/ofwfdt.c
diff --git a/sys/boot/powerpc/ofw/start.c b/stand/powerpc/ofw/start.c
index 911a2ec2af772..911a2ec2af772 100644
--- a/sys/boot/powerpc/ofw/start.c
+++ b/stand/powerpc/ofw/start.c
diff --git a/sys/boot/powerpc/ofw/version b/stand/powerpc/ofw/version
index cb0f6938f966c..cb0f6938f966c 100644
--- a/sys/boot/powerpc/ofw/version
+++ b/stand/powerpc/ofw/version
diff --git a/sys/boot/powerpc/ps3/Makefile b/stand/powerpc/ps3/Makefile
index 07ad135d97964..07ad135d97964 100644
--- a/sys/boot/powerpc/ps3/Makefile
+++ b/stand/powerpc/ps3/Makefile
diff --git a/sys/boot/powerpc/ps3/conf.c b/stand/powerpc/ps3/conf.c
index 3a5ae4c41f028..3a5ae4c41f028 100644
--- a/sys/boot/powerpc/ps3/conf.c
+++ b/stand/powerpc/ps3/conf.c
diff --git a/sys/boot/powerpc/ps3/devicename.c b/stand/powerpc/ps3/devicename.c
index 041f853986d58..041f853986d58 100644
--- a/sys/boot/powerpc/ps3/devicename.c
+++ b/stand/powerpc/ps3/devicename.c
diff --git a/sys/boot/powerpc/ps3/ldscript.powerpc b/stand/powerpc/ps3/ldscript.powerpc
index 12f3e751fb52d..12f3e751fb52d 100644
--- a/sys/boot/powerpc/ps3/ldscript.powerpc
+++ b/stand/powerpc/ps3/ldscript.powerpc
diff --git a/sys/boot/powerpc/ps3/lv1call.S b/stand/powerpc/ps3/lv1call.S
index a399a9c3bbf62..a399a9c3bbf62 100644
--- a/sys/boot/powerpc/ps3/lv1call.S
+++ b/stand/powerpc/ps3/lv1call.S
diff --git a/sys/boot/powerpc/ps3/lv1call.h b/stand/powerpc/ps3/lv1call.h
index fb8044825bd08..fb8044825bd08 100644
--- a/sys/boot/powerpc/ps3/lv1call.h
+++ b/stand/powerpc/ps3/lv1call.h
diff --git a/sys/boot/powerpc/ps3/main.c b/stand/powerpc/ps3/main.c
index be8708aadefa1..be8708aadefa1 100644
--- a/sys/boot/powerpc/ps3/main.c
+++ b/stand/powerpc/ps3/main.c
diff --git a/sys/boot/powerpc/ps3/metadata.c b/stand/powerpc/ps3/metadata.c
index 6f29c5774ef30..6f29c5774ef30 100644
--- a/sys/boot/powerpc/ps3/metadata.c
+++ b/stand/powerpc/ps3/metadata.c
diff --git a/sys/boot/powerpc/ps3/ppc64_elf_freebsd.c b/stand/powerpc/ps3/ppc64_elf_freebsd.c
index 3eb991e10ae95..3eb991e10ae95 100644
--- a/sys/boot/powerpc/ps3/ppc64_elf_freebsd.c
+++ b/stand/powerpc/ps3/ppc64_elf_freebsd.c
diff --git a/sys/boot/powerpc/ps3/ps3.h b/stand/powerpc/ps3/ps3.h
index 1a770029a5c07..1a770029a5c07 100644
--- a/sys/boot/powerpc/ps3/ps3.h
+++ b/stand/powerpc/ps3/ps3.h
diff --git a/sys/boot/powerpc/ps3/ps3bus.h b/stand/powerpc/ps3/ps3bus.h
index a3b20f3bd88f5..a3b20f3bd88f5 100644
--- a/sys/boot/powerpc/ps3/ps3bus.h
+++ b/stand/powerpc/ps3/ps3bus.h
diff --git a/sys/boot/powerpc/ps3/ps3cdrom.c b/stand/powerpc/ps3/ps3cdrom.c
index d8d41fde49afa..d8d41fde49afa 100644
--- a/sys/boot/powerpc/ps3/ps3cdrom.c
+++ b/stand/powerpc/ps3/ps3cdrom.c
diff --git a/sys/boot/powerpc/ps3/ps3cons.c b/stand/powerpc/ps3/ps3cons.c
index fa9ef321c62a6..fa9ef321c62a6 100644
--- a/sys/boot/powerpc/ps3/ps3cons.c
+++ b/stand/powerpc/ps3/ps3cons.c
diff --git a/sys/boot/powerpc/ps3/ps3devdesc.h b/stand/powerpc/ps3/ps3devdesc.h
index 5a6e52ff52779..5a6e52ff52779 100644
--- a/sys/boot/powerpc/ps3/ps3devdesc.h
+++ b/stand/powerpc/ps3/ps3devdesc.h
diff --git a/sys/boot/powerpc/ps3/ps3disk.c b/stand/powerpc/ps3/ps3disk.c
index c33a023e70a62..c33a023e70a62 100644
--- a/sys/boot/powerpc/ps3/ps3disk.c
+++ b/stand/powerpc/ps3/ps3disk.c
diff --git a/sys/boot/powerpc/ps3/ps3mmu.c b/stand/powerpc/ps3/ps3mmu.c
index 08dcf75d28399..08dcf75d28399 100644
--- a/sys/boot/powerpc/ps3/ps3mmu.c
+++ b/stand/powerpc/ps3/ps3mmu.c
diff --git a/sys/boot/powerpc/ps3/ps3net.c b/stand/powerpc/ps3/ps3net.c
index 142eab8243a61..142eab8243a61 100644
--- a/sys/boot/powerpc/ps3/ps3net.c
+++ b/stand/powerpc/ps3/ps3net.c
diff --git a/sys/boot/powerpc/ps3/ps3repo.c b/stand/powerpc/ps3/ps3repo.c
index 006476925479f..006476925479f 100644
--- a/sys/boot/powerpc/ps3/ps3repo.c
+++ b/stand/powerpc/ps3/ps3repo.c
diff --git a/sys/boot/powerpc/ps3/ps3repo.h b/stand/powerpc/ps3/ps3repo.h
index 68001df3509be..68001df3509be 100644
--- a/sys/boot/powerpc/ps3/ps3repo.h
+++ b/stand/powerpc/ps3/ps3repo.h
diff --git a/sys/boot/powerpc/ps3/ps3stor.c b/stand/powerpc/ps3/ps3stor.c
index bbfc56a7ae2ac..bbfc56a7ae2ac 100644
--- a/sys/boot/powerpc/ps3/ps3stor.c
+++ b/stand/powerpc/ps3/ps3stor.c
diff --git a/sys/boot/powerpc/ps3/ps3stor.h b/stand/powerpc/ps3/ps3stor.h
index 350b716f7aa1c..350b716f7aa1c 100644
--- a/sys/boot/powerpc/ps3/ps3stor.h
+++ b/stand/powerpc/ps3/ps3stor.h
diff --git a/sys/boot/powerpc/ps3/start.S b/stand/powerpc/ps3/start.S
index 570b3f52cc682..570b3f52cc682 100644
--- a/sys/boot/powerpc/ps3/start.S
+++ b/stand/powerpc/ps3/start.S
diff --git a/sys/boot/powerpc/ps3/version b/stand/powerpc/ps3/version
index fdac54e40aa5f..fdac54e40aa5f 100644
--- a/sys/boot/powerpc/ps3/version
+++ b/stand/powerpc/ps3/version
diff --git a/sys/boot/powerpc/uboot/Makefile b/stand/powerpc/uboot/Makefile
index d543aceeee4cf..d543aceeee4cf 100644
--- a/sys/boot/powerpc/uboot/Makefile
+++ b/stand/powerpc/uboot/Makefile
diff --git a/sys/boot/powerpc/uboot/conf.c b/stand/powerpc/uboot/conf.c
index 561238d1ccf78..561238d1ccf78 100644
--- a/sys/boot/powerpc/uboot/conf.c
+++ b/stand/powerpc/uboot/conf.c
diff --git a/sys/boot/powerpc/uboot/ldscript.powerpc b/stand/powerpc/uboot/ldscript.powerpc
index 9238383657939..9238383657939 100644
--- a/sys/boot/powerpc/uboot/ldscript.powerpc
+++ b/stand/powerpc/uboot/ldscript.powerpc
diff --git a/sys/boot/powerpc/uboot/start.S b/stand/powerpc/uboot/start.S
index 3e80576907a4d..3e80576907a4d 100644
--- a/sys/boot/powerpc/uboot/start.S
+++ b/stand/powerpc/uboot/start.S
diff --git a/sys/boot/powerpc/uboot/version b/stand/powerpc/uboot/version
index 21556cff70e00..21556cff70e00 100644
--- a/sys/boot/powerpc/uboot/version
+++ b/stand/powerpc/uboot/version
diff --git a/sys/boot/sparc64/Makefile b/stand/sparc64/Makefile
index 6a81a0580d5f6..6a81a0580d5f6 100644
--- a/sys/boot/sparc64/Makefile
+++ b/stand/sparc64/Makefile
diff --git a/sys/boot/sparc64/Makefile.inc b/stand/sparc64/Makefile.inc
index a12699c3a6f77..a12699c3a6f77 100644
--- a/sys/boot/sparc64/Makefile.inc
+++ b/stand/sparc64/Makefile.inc
diff --git a/sys/boot/sparc64/boot1/Makefile b/stand/sparc64/boot1/Makefile
index 36e3968961027..36e3968961027 100644
--- a/sys/boot/sparc64/boot1/Makefile
+++ b/stand/sparc64/boot1/Makefile
diff --git a/sys/boot/sparc64/boot1/_start.s b/stand/sparc64/boot1/_start.s
index 30f8019cc863e..30f8019cc863e 100644
--- a/sys/boot/sparc64/boot1/_start.s
+++ b/stand/sparc64/boot1/_start.s
diff --git a/sys/boot/sparc64/boot1/boot1.c b/stand/sparc64/boot1/boot1.c
index 4724ca165fd48..4724ca165fd48 100644
--- a/sys/boot/sparc64/boot1/boot1.c
+++ b/stand/sparc64/boot1/boot1.c
diff --git a/sys/boot/sparc64/loader/Makefile b/stand/sparc64/loader/Makefile
index 5388761cf5252..5388761cf5252 100644
--- a/sys/boot/sparc64/loader/Makefile
+++ b/stand/sparc64/loader/Makefile
diff --git a/sys/boot/sparc64/loader/help.sparc64 b/stand/sparc64/loader/help.sparc64
index e69de29bb2d1d..e69de29bb2d1d 100644
--- a/sys/boot/sparc64/loader/help.sparc64
+++ b/stand/sparc64/loader/help.sparc64
diff --git a/sys/boot/sparc64/loader/locore.S b/stand/sparc64/loader/locore.S
index a73f5bfa7f980..a73f5bfa7f980 100644
--- a/sys/boot/sparc64/loader/locore.S
+++ b/stand/sparc64/loader/locore.S
diff --git a/sys/boot/sparc64/loader/main.c b/stand/sparc64/loader/main.c
index e8cdf5fcc5ea0..e8cdf5fcc5ea0 100644
--- a/sys/boot/sparc64/loader/main.c
+++ b/stand/sparc64/loader/main.c
diff --git a/sys/boot/sparc64/loader/metadata.c b/stand/sparc64/loader/metadata.c
index a3b3eb5cedff8..a3b3eb5cedff8 100644
--- a/sys/boot/sparc64/loader/metadata.c
+++ b/stand/sparc64/loader/metadata.c
diff --git a/sys/boot/sparc64/loader/version b/stand/sparc64/loader/version
index bef4091e58f67..bef4091e58f67 100644
--- a/sys/boot/sparc64/loader/version
+++ b/stand/sparc64/loader/version
diff --git a/sys/boot/sparc64/zfsboot/Makefile b/stand/sparc64/zfsboot/Makefile
index 9e58c27eb0672..9e58c27eb0672 100644
--- a/sys/boot/sparc64/zfsboot/Makefile
+++ b/stand/sparc64/zfsboot/Makefile
diff --git a/sys/boot/sparc64/zfsloader/Makefile b/stand/sparc64/zfsloader/Makefile
index b4c554b5cb159..b4c554b5cb159 100644
--- a/sys/boot/sparc64/zfsloader/Makefile
+++ b/stand/sparc64/zfsloader/Makefile
diff --git a/sys/boot/uboot.mk b/stand/uboot.mk
index d120481a4b961..d120481a4b961 100644
--- a/sys/boot/uboot.mk
+++ b/stand/uboot.mk
diff --git a/sys/boot/uboot/Makefile b/stand/uboot/Makefile
index 8c3a80dd6e2ef..8c3a80dd6e2ef 100644
--- a/sys/boot/uboot/Makefile
+++ b/stand/uboot/Makefile
diff --git a/sys/boot/uboot/Makefile.inc b/stand/uboot/Makefile.inc
index 265f86d1ed55a..265f86d1ed55a 100644
--- a/sys/boot/uboot/Makefile.inc
+++ b/stand/uboot/Makefile.inc
diff --git a/sys/boot/uboot/common/main.c b/stand/uboot/common/main.c
index c4efb1f69bd9d..c4efb1f69bd9d 100644
--- a/sys/boot/uboot/common/main.c
+++ b/stand/uboot/common/main.c
diff --git a/sys/boot/uboot/common/metadata.c b/stand/uboot/common/metadata.c
index 38db4bca44b5c..38db4bca44b5c 100644
--- a/sys/boot/uboot/common/metadata.c
+++ b/stand/uboot/common/metadata.c
diff --git a/sys/boot/uboot/fdt/Makefile b/stand/uboot/fdt/Makefile
index 4bc38ec7c6f07..4bc38ec7c6f07 100644
--- a/sys/boot/uboot/fdt/Makefile
+++ b/stand/uboot/fdt/Makefile
diff --git a/sys/boot/uboot/fdt/uboot_fdt.c b/stand/uboot/fdt/uboot_fdt.c
index 1865310054014..1865310054014 100644
--- a/sys/boot/uboot/fdt/uboot_fdt.c
+++ b/stand/uboot/fdt/uboot_fdt.c
diff --git a/sys/boot/uboot/lib/Makefile b/stand/uboot/lib/Makefile
index d12d48cafaa1c..d12d48cafaa1c 100644
--- a/sys/boot/uboot/lib/Makefile
+++ b/stand/uboot/lib/Makefile
diff --git a/sys/boot/uboot/lib/api_public.h b/stand/uboot/lib/api_public.h
index f393de88933b3..f393de88933b3 100644
--- a/sys/boot/uboot/lib/api_public.h
+++ b/stand/uboot/lib/api_public.h
diff --git a/sys/boot/uboot/lib/console.c b/stand/uboot/lib/console.c
index f49f455c7efa6..f49f455c7efa6 100644
--- a/sys/boot/uboot/lib/console.c
+++ b/stand/uboot/lib/console.c
diff --git a/sys/boot/uboot/lib/copy.c b/stand/uboot/lib/copy.c
index 131b88d858615..131b88d858615 100644
--- a/sys/boot/uboot/lib/copy.c
+++ b/stand/uboot/lib/copy.c
diff --git a/sys/boot/uboot/lib/devicename.c b/stand/uboot/lib/devicename.c
index 9e68f9df9eb84..9e68f9df9eb84 100644
--- a/sys/boot/uboot/lib/devicename.c
+++ b/stand/uboot/lib/devicename.c
diff --git a/sys/boot/uboot/lib/disk.c b/stand/uboot/lib/disk.c
index f5e44c749ba3e..f5e44c749ba3e 100644
--- a/sys/boot/uboot/lib/disk.c
+++ b/stand/uboot/lib/disk.c
diff --git a/sys/boot/uboot/lib/elf_freebsd.c b/stand/uboot/lib/elf_freebsd.c
index a65fa26aa722f..a65fa26aa722f 100644
--- a/sys/boot/uboot/lib/elf_freebsd.c
+++ b/stand/uboot/lib/elf_freebsd.c
diff --git a/sys/boot/uboot/lib/glue.c b/stand/uboot/lib/glue.c
index 312075ab9882b..312075ab9882b 100644
--- a/sys/boot/uboot/lib/glue.c
+++ b/stand/uboot/lib/glue.c
diff --git a/sys/boot/uboot/lib/glue.h b/stand/uboot/lib/glue.h
index 4c2da66ccb271..4c2da66ccb271 100644
--- a/sys/boot/uboot/lib/glue.h
+++ b/stand/uboot/lib/glue.h
diff --git a/sys/boot/uboot/lib/libuboot.h b/stand/uboot/lib/libuboot.h
index e4201d8a1347b..e4201d8a1347b 100644
--- a/sys/boot/uboot/lib/libuboot.h
+++ b/stand/uboot/lib/libuboot.h
diff --git a/sys/boot/uboot/lib/module.c b/stand/uboot/lib/module.c
index 0951ed6618e40..0951ed6618e40 100644
--- a/sys/boot/uboot/lib/module.c
+++ b/stand/uboot/lib/module.c
diff --git a/sys/boot/uboot/lib/net.c b/stand/uboot/lib/net.c
index a0d1cb4f45832..a0d1cb4f45832 100644
--- a/sys/boot/uboot/lib/net.c
+++ b/stand/uboot/lib/net.c
diff --git a/sys/boot/uboot/lib/reboot.c b/stand/uboot/lib/reboot.c
index 9f4d277eb6f95..9f4d277eb6f95 100644
--- a/sys/boot/uboot/lib/reboot.c
+++ b/stand/uboot/lib/reboot.c
diff --git a/sys/boot/uboot/lib/time.c b/stand/uboot/lib/time.c
index a3c73f471a25d..a3c73f471a25d 100644
--- a/sys/boot/uboot/lib/time.c
+++ b/stand/uboot/lib/time.c
diff --git a/sys/boot/usb/Makefile b/stand/usb/Makefile
index 1b94b3db7d82a..1b94b3db7d82a 100644
--- a/sys/boot/usb/Makefile
+++ b/stand/usb/Makefile
diff --git a/sys/boot/usb/Makefile.test b/stand/usb/Makefile.test
index 7c6a66d173104..7c6a66d173104 100644
--- a/sys/boot/usb/Makefile.test
+++ b/stand/usb/Makefile.test
diff --git a/sys/boot/usb/bsd_usbloader_test.c b/stand/usb/bsd_usbloader_test.c
index 35140b87c360d..35140b87c360d 100644
--- a/sys/boot/usb/bsd_usbloader_test.c
+++ b/stand/usb/bsd_usbloader_test.c
diff --git a/sys/boot/usb/storage/umass_common.c b/stand/usb/storage/umass_common.c
index 5ddd159297b76..5ddd159297b76 100644
--- a/sys/boot/usb/storage/umass_common.c
+++ b/stand/usb/storage/umass_common.c
diff --git a/sys/boot/usb/storage/umass_common.h b/stand/usb/storage/umass_common.h
index a8ffd4987eb9c..a8ffd4987eb9c 100644
--- a/sys/boot/usb/storage/umass_common.h
+++ b/stand/usb/storage/umass_common.h
diff --git a/sys/boot/usb/storage/umass_loader.c b/stand/usb/storage/umass_loader.c
index fbb890be279a2..fbb890be279a2 100644
--- a/sys/boot/usb/storage/umass_loader.c
+++ b/stand/usb/storage/umass_loader.c
diff --git a/sys/boot/usb/tools/Makefile b/stand/usb/tools/Makefile
index 64cf28ca75e80..64cf28ca75e80 100644
--- a/sys/boot/usb/tools/Makefile
+++ b/stand/usb/tools/Makefile
diff --git a/sys/boot/usb/tools/sysinit.c b/stand/usb/tools/sysinit.c
index b968fe0ab8589..b968fe0ab8589 100644
--- a/sys/boot/usb/tools/sysinit.c
+++ b/stand/usb/tools/sysinit.c
diff --git a/sys/boot/usb/usb_busdma_loader.c b/stand/usb/usb_busdma_loader.c
index 90dc1692ba01a..90dc1692ba01a 100644
--- a/sys/boot/usb/usb_busdma_loader.c
+++ b/stand/usb/usb_busdma_loader.c
diff --git a/sys/boot/usb/usbcore.mk b/stand/usb/usbcore.mk
index 153a1d435ce1c..153a1d435ce1c 100644
--- a/sys/boot/usb/usbcore.mk
+++ b/stand/usb/usbcore.mk
diff --git a/sys/boot/userboot/Makefile b/stand/userboot/Makefile
index 0a53a217dc15f..0a53a217dc15f 100644
--- a/sys/boot/userboot/Makefile
+++ b/stand/userboot/Makefile
diff --git a/sys/boot/userboot/Makefile.inc b/stand/userboot/Makefile.inc
index 265f86d1ed55a..265f86d1ed55a 100644
--- a/sys/boot/userboot/Makefile.inc
+++ b/stand/userboot/Makefile.inc
diff --git a/sys/boot/userboot/test/Makefile b/stand/userboot/test/Makefile
index 1bc66798aac81..1bc66798aac81 100644
--- a/sys/boot/userboot/test/Makefile
+++ b/stand/userboot/test/Makefile
diff --git a/sys/boot/userboot/test/Makefile.depend b/stand/userboot/test/Makefile.depend
index 6cfaab1c36440..6cfaab1c36440 100644
--- a/sys/boot/userboot/test/Makefile.depend
+++ b/stand/userboot/test/Makefile.depend
diff --git a/sys/boot/userboot/test/test.c b/stand/userboot/test/test.c
index bacde565ec3b0..bacde565ec3b0 100644
--- a/sys/boot/userboot/test/test.c
+++ b/stand/userboot/test/test.c
diff --git a/sys/boot/userboot/userboot.h b/stand/userboot/userboot.h
index 7ffb06f652aa5..7ffb06f652aa5 100644
--- a/sys/boot/userboot/userboot.h
+++ b/stand/userboot/userboot.h
diff --git a/sys/boot/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile
index cbada8227ba09..cbada8227ba09 100644
--- a/sys/boot/userboot/userboot/Makefile
+++ b/stand/userboot/userboot/Makefile
diff --git a/stand/userboot/userboot/Makefile.depend b/stand/userboot/userboot/Makefile.depend
new file mode 100644
index 0000000000000..87e0acc0f3b5e
--- /dev/null
+++ b/stand/userboot/userboot/Makefile.depend
@@ -0,0 +1,16 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	stand/ficl \
+	stand/libsa \
+	stand/zfs \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sys/boot/userboot/userboot/autoload.c b/stand/userboot/userboot/autoload.c
index a86afcfa2b4bf..a86afcfa2b4bf 100644
--- a/sys/boot/userboot/userboot/autoload.c
+++ b/stand/userboot/userboot/autoload.c
diff --git a/sys/boot/userboot/userboot/biossmap.c b/stand/userboot/userboot/biossmap.c
index 9e556be373cc4..9e556be373cc4 100644
--- a/sys/boot/userboot/userboot/biossmap.c
+++ b/stand/userboot/userboot/biossmap.c
diff --git a/sys/boot/userboot/userboot/bootinfo.c b/stand/userboot/userboot/bootinfo.c
index 289ca071fe89b..289ca071fe89b 100644
--- a/sys/boot/userboot/userboot/bootinfo.c
+++ b/stand/userboot/userboot/bootinfo.c
diff --git a/sys/boot/userboot/userboot/bootinfo32.c b/stand/userboot/userboot/bootinfo32.c
index 6498461a740a7..6498461a740a7 100644
--- a/sys/boot/userboot/userboot/bootinfo32.c
+++ b/stand/userboot/userboot/bootinfo32.c
diff --git a/sys/boot/userboot/userboot/bootinfo64.c b/stand/userboot/userboot/bootinfo64.c
index 10ff133ce54c8..10ff133ce54c8 100644
--- a/sys/boot/userboot/userboot/bootinfo64.c
+++ b/stand/userboot/userboot/bootinfo64.c
diff --git a/sys/boot/userboot/userboot/conf.c b/stand/userboot/userboot/conf.c
index b8daa7396ca36..b8daa7396ca36 100644
--- a/sys/boot/userboot/userboot/conf.c
+++ b/stand/userboot/userboot/conf.c
diff --git a/sys/boot/userboot/userboot/copy.c b/stand/userboot/userboot/copy.c
index f8763e9b526ad..f8763e9b526ad 100644
--- a/sys/boot/userboot/userboot/copy.c
+++ b/stand/userboot/userboot/copy.c
diff --git a/sys/boot/userboot/userboot/devicename.c b/stand/userboot/userboot/devicename.c
index efa5634e541e7..efa5634e541e7 100644
--- a/sys/boot/userboot/userboot/devicename.c
+++ b/stand/userboot/userboot/devicename.c
diff --git a/sys/boot/userboot/userboot/elf32_freebsd.c b/stand/userboot/userboot/elf32_freebsd.c
index d8ccc3375cfd2..d8ccc3375cfd2 100644
--- a/sys/boot/userboot/userboot/elf32_freebsd.c
+++ b/stand/userboot/userboot/elf32_freebsd.c
diff --git a/sys/boot/userboot/userboot/elf64_freebsd.c b/stand/userboot/userboot/elf64_freebsd.c
index 19d369d6d5488..19d369d6d5488 100644
--- a/sys/boot/userboot/userboot/elf64_freebsd.c
+++ b/stand/userboot/userboot/elf64_freebsd.c
diff --git a/sys/boot/userboot/userboot/host.c b/stand/userboot/userboot/host.c
index 94f8a3dca44c0..94f8a3dca44c0 100644
--- a/sys/boot/userboot/userboot/host.c
+++ b/stand/userboot/userboot/host.c
diff --git a/sys/boot/userboot/userboot/libuserboot.h b/stand/userboot/userboot/libuserboot.h
index e2048d5fef941..e2048d5fef941 100644
--- a/sys/boot/userboot/userboot/libuserboot.h
+++ b/stand/userboot/userboot/libuserboot.h
diff --git a/sys/boot/userboot/userboot/main.c b/stand/userboot/userboot/main.c
index 9e69724b17a9d..9e69724b17a9d 100644
--- a/sys/boot/userboot/userboot/main.c
+++ b/stand/userboot/userboot/main.c
diff --git a/sys/boot/userboot/userboot/userboot_cons.c b/stand/userboot/userboot/userboot_cons.c
index 6f73ad5633bb7..6f73ad5633bb7 100644
--- a/sys/boot/userboot/userboot/userboot_cons.c
+++ b/stand/userboot/userboot/userboot_cons.c
diff --git a/sys/boot/userboot/userboot/userboot_disk.c b/stand/userboot/userboot/userboot_disk.c
index fc21b5f1792d1..fc21b5f1792d1 100644
--- a/sys/boot/userboot/userboot/userboot_disk.c
+++ b/stand/userboot/userboot/userboot_disk.c
diff --git a/sys/boot/userboot/userboot/version b/stand/userboot/userboot/version
index ce6e2701fdc37..ce6e2701fdc37 100644
--- a/sys/boot/userboot/userboot/version
+++ b/stand/userboot/userboot/version
diff --git a/sys/boot/zfs/Makefile b/stand/zfs/Makefile
index e86c84b02fc03..e86c84b02fc03 100644
--- a/sys/boot/zfs/Makefile
+++ b/stand/zfs/Makefile
diff --git a/sys/boot/zfs/Makefile.depend b/stand/zfs/Makefile.depend
index 18be76b0cb6f4..18be76b0cb6f4 100644
--- a/sys/boot/zfs/Makefile.depend
+++ b/stand/zfs/Makefile.depend
diff --git a/sys/boot/zfs/devicename_stubs.c b/stand/zfs/devicename_stubs.c
index 41bf907e0cf17..41bf907e0cf17 100644
--- a/sys/boot/zfs/devicename_stubs.c
+++ b/stand/zfs/devicename_stubs.c
diff --git a/sys/boot/zfs/libzfs.h b/stand/zfs/libzfs.h
index d1b4674679e55..d1b4674679e55 100644
--- a/sys/boot/zfs/libzfs.h
+++ b/stand/zfs/libzfs.h
diff --git a/sys/boot/zfs/zfs.c b/stand/zfs/zfs.c
index 0334bddb667a3..0334bddb667a3 100644
--- a/sys/boot/zfs/zfs.c
+++ b/stand/zfs/zfs.c
diff --git a/sys/boot/zfs/zfsimpl.c b/stand/zfs/zfsimpl.c
index 6e0d9b6fe7759..6e0d9b6fe7759 100644
--- a/sys/boot/zfs/zfsimpl.c
+++ b/stand/zfs/zfsimpl.c
diff --git a/sys/boot/zfs32/Makefile b/stand/zfs32/Makefile
index 32d0074ad340b..32d0074ad340b 100644
--- a/sys/boot/zfs32/Makefile
+++ b/stand/zfs32/Makefile
diff --git a/sys/boot/zfs32/Makefile.depend b/stand/zfs32/Makefile.depend
index 18be76b0cb6f4..18be76b0cb6f4 100644
--- a/sys/boot/zfs32/Makefile.depend
+++ b/stand/zfs32/Makefile.depend
diff --git a/sys/Makefile b/sys/Makefile
index 0de854341ff57..760c2073e5ee2 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 # Directories to include in cscope name file and TAGS.
-CSCOPEDIRS=	boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
+CSCOPEDIRS=	bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
 		geom gnu isa kern libkern modules net net80211 \
 		netgraph netinet netinet6 netipsec netpfil \
 		netsmb nfs nfsclient nfsserver nlm ofed opencrypto \
@@ -62,11 +62,6 @@ TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscope.files
 .if !(make(cscope) || make(cscope-clean) || make(cscope-hook) || make(TAGS))
 .include <src.opts.mk>
 
-# The boot loader
-.if ${MK_BOOT} != "no"
-SUBDIR=	boot
-.endif
-
 # Loadable kernel modules
 
 .if defined(MODULES_WITH_WORLD)
diff --git a/sys/boot/i386/boot2/Makefile.depend b/sys/boot/i386/boot2/Makefile.depend
deleted file mode 100644
index d5a67a6b20856..0000000000000
--- a/sys/boot/i386/boot2/Makefile.depend
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/lib \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/sys/boot/i386/gptzfsboot/Makefile.depend b/sys/boot/i386/gptzfsboot/Makefile.depend
deleted file mode 100644
index 16b58a77a452e..0000000000000
--- a/sys/boot/i386/gptzfsboot/Makefile.depend
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libmd \
-	sys/boot/geli \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/lib \
-	sys/boot/libsa32 \
-	sys/boot/zfs32 \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/sys/boot/i386/loader/Makefile.depend b/sys/boot/i386/loader/Makefile.depend
deleted file mode 100644
index 5d4398105e2a1..0000000000000
--- a/sys/boot/i386/loader/Makefile.depend
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	sys/boot/ficl32 \
-	sys/boot/geli \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/btxldr \
-	sys/boot/i386/btx/lib \
-	sys/boot/i386/libi386 \
-	sys/boot/libsa32 \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/sys/boot/i386/pxeldr/Makefile.depend b/sys/boot/i386/pxeldr/Makefile.depend
deleted file mode 100644
index c6f574a284a31..0000000000000
--- a/sys/boot/i386/pxeldr/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/btxldr \
-	sys/boot/i386/loader \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/sys/boot/i386/zfsboot/Makefile.depend b/sys/boot/i386/zfsboot/Makefile.depend
deleted file mode 100644
index 491ced5bb5652..0000000000000
--- a/sys/boot/i386/zfsboot/Makefile.depend
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libmd \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/lib \
-	sys/boot/libsa32 \
-	sys/boot/zfs32 \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/sys/boot/i386/zfsloader/Makefile.depend b/sys/boot/i386/zfsloader/Makefile.depend
deleted file mode 100644
index d17b393240225..0000000000000
--- a/sys/boot/i386/zfsloader/Makefile.depend
+++ /dev/null
@@ -1,21 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	sys/boot/ficl32 \
-	sys/boot/geli \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/btxldr \
-	sys/boot/i386/btx/lib \
-	sys/boot/i386/libi386 \
-	sys/boot/libsa32 \
-	sys/boot/zfs32 \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/sys/boot/userboot/userboot/Makefile.depend b/sys/boot/userboot/userboot/Makefile.depend
deleted file mode 100644
index 0d4affa29aee6..0000000000000
--- a/sys/boot/userboot/userboot/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	sys/boot/ficl \
-	sys/boot/libsa \
-	sys/boot/zfs \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh
index e56a33a41c0e3..91770e33f556c 100755
--- a/sys/contrib/dev/acpica/acpica_prep.sh
+++ b/sys/contrib/dev/acpica/acpica_prep.sh
@@ -90,4 +90,4 @@ echo "Directories you may want to 'svn diff':"
 echo "    sys/contrib/dev/acpica sys/dev/acpica \\"
 echo "    sys/amd64/acpica sys/arm64/acpica sys/i386/acpica sys/x86/acpica \\"
 echo "    sys/amd64/include sys/arm64/include sys/i386/include include \\"
-echo "    sys/boot sys/conf sys/modules/acpi usr.sbin/acpi"
+echo "    stand sys/conf sys/modules/acpi usr.sbin/acpi"
diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend
index c9a880aec3aae..7410751c77b4b 100644
--- a/targets/pseudo/userland/lib/Makefile.depend
+++ b/targets/pseudo/userland/lib/Makefile.depend
@@ -196,7 +196,7 @@ DIRDEPS+= \
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
     ${MACHINE_CPUARCH} == "powerpc"
-DIRDEPS+= sys/boot/libsa32
+DIRDEPS+= stand/libsa32
 .endif
 
 .if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mfilter}
diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend
index 6d473ea1f88cc..7b4700a5d2017 100644
--- a/targets/pseudo/userland/misc/Makefile.depend
+++ b/targets/pseudo/userland/misc/Makefile.depend
@@ -6,12 +6,12 @@
 .include <src.opts.mk>
 .endif
 
-_sys_boot_efi= sys/boot/efi/loader sys/boot/efi/boot1
+_sys_boot_efi= stand/efi/loader stand/efi/boot1
 .if ${MK_FDT} != "no"
-_sys_boot_fdt= sys/boot/fdt sys/boot/efi/fdt
+_sys_boot_fdt= stand/fdt stand/efi/fdt
 .endif
 .if ${MK_ZFS} != "no"
-_sys_boot_zfs= sys/boot/zfs
+_sys_boot_zfs= stand/zfs
 .endif
 
 DIRDEPS = \
@@ -22,40 +22,40 @@ DIRDEPS = \
 	rescue/rescue \
 
 .if ${MK_BOOT} != "no"
-DIRDEPS+= sys/boot/common
+DIRDEPS+= stand/common
 
 .if ${MK_FORTH} != "no"
 DIRDEPS+= \
-	sys/boot/ficl \
-	sys/boot/forth \
+	stand/ficl \
+	stand/forth \
 
 .endif
 
 DIRDEPS.x86sys= \
-	sys/boot/efi/libefi \
-	sys/boot/geli \
-	sys/boot/i386/boot0 \
-	sys/boot/i386/boot0sio \
-	sys/boot/i386/boot2 \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/btxldr \
-	sys/boot/i386/btx/lib \
-	sys/boot/i386/cdboot \
-	sys/boot/i386/gptboot \
-	sys/boot/i386/libfirewire \
-	sys/boot/i386/libi386 \
-	sys/boot/i386/loader \
-	sys/boot/i386/mbr \
-	sys/boot/i386/pmbr \
-	sys/boot/i386/pxeldr \
-	sys/boot/libsa32 \
+	stand/efi/libefi \
+	stand/geli \
+	stand/i386/boot0 \
+	stand/i386/boot0sio \
+	stand/i386/boot2 \
+	stand/i386/btx/btx \
+	stand/i386/btx/btxldr \
+	stand/i386/btx/lib \
+	stand/i386/cdboot \
+	stand/i386/gptboot \
+	stand/i386/libfirewire \
+	stand/i386/libi386 \
+	stand/i386/loader \
+	stand/i386/mbr \
+	stand/i386/pmbr \
+	stand/i386/pxeldr \
+	stand/libsa32 \
 	${_sys_boot_zfs} \
 
 .if ${MK_ZFS} != "no"
 DIRDEPS.x86sys+= \
-	sys/boot/i386/gptzfsboot \
-	sys/boot/i386/zfsboot \
-	sys/boot/i386/zfsloader \
+	stand/i386/gptzfsboot \
+	stand/i386/zfsboot \
+	stand/i386/zfsloader \
 
 DIRDEPS+= \
 	sbin/zfsbootcfg \
@@ -65,13 +65,13 @@ DIRDEPS+= \
 DIRDEPS.amd64= \
 	${DIRDEPS.x86sys} \
 	${_sys_boot_efi} \
-	sys/boot/ficl32 \
-	sys/boot/userboot/test \
-	sys/boot/userboot/userboot \
+	stand/ficl32 \
+	stand/userboot/test \
+	stand/userboot/userboot \
 
 .if ${MK_ZFS} != "no"
 DIRDEPS.amd64+= \
-	sys/boot/zfs32 \
+	stand/zfs32 \
 
 .endif
 
@@ -83,9 +83,9 @@ DIRDEPS+= \
 
 DIRDEPS.arm= ${_sys_boot_fdt} ${_sys_boot_efi}
 DIRDEPS.arm64= ${_sys_boot_fdt} ${_sys_boot_efi}
-DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi} sys/boot/i386/kgzldr
-DIRDEPS.powerpc= ${_sys_boot_fdt} sys/boot/libsa32 sys/boot/ofw sys/boot/uboot
-DIRDEPS.sparc64= sys/boot/ofw ${_sys_boot_zfs}
+DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi} stand/i386/kgzldr
+DIRDEPS.powerpc= ${_sys_boot_fdt} stand/libsa32 stand/ofw stand/uboot
+DIRDEPS.sparc64= stand/ofw ${_sys_boot_zfs}
 .endif
 
 DIRDEPS+= ${DIRDEPS.${MACHINE}:U}
diff --git a/targets/pseudo/userland/share/Makefile.depend b/targets/pseudo/userland/share/Makefile.depend
index 3bac4b78d4a8d..9946a8370552c 100644
--- a/targets/pseudo/userland/share/Makefile.depend
+++ b/targets/pseudo/userland/share/Makefile.depend
@@ -91,7 +91,7 @@ DIRDEPS = \
 	share/xml/atf \
 	share/xsl/atf \
 	share/zoneinfo \
-	sys/boot/man \
+	stand/man \
 
 
 .include <dirdeps.mk>
diff --git a/tools/boot/universe.sh b/tools/boot/universe.sh
index 3b607b4c4a1a2..495e84b1ebaa2 100755
--- a/tools/boot/universe.sh
+++ b/tools/boot/universe.sh
@@ -11,8 +11,8 @@
 #	powerpc/powerpc powerpc/powerpc64 powerpc/powerpcspe \
 #	riscv/riscv64 riscv/riscv64sf
 #
-# This script is expected to be run in sys/boot (though you could run it anywhere
-# in the tree). It does a full clean build. For sys/boot you can do all the archs in
+# This script is expected to be run in stand (though you could run it anywhere
+# in the tree). It does a full clean build. For stand you can do all the archs in
 # about a minute or two on a fast machine. It's also possible that you need a full
 # make universe for this to work completely.
 #
@@ -40,7 +40,7 @@ dobuild()
 }
 
 top=$(make -V SRCTOP)
-cd $top/sys/boot
+cd $top/stand
 
 # Default build for a goodly selection of architectures
 for i in \
diff --git a/tools/tools/bootparttest/Makefile b/tools/tools/bootparttest/Makefile
index 026f83ea647de..7d54dfca04275 100644
--- a/tools/tools/bootparttest/Makefile
+++ b/tools/tools/bootparttest/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${SRCTOP}/sys/boot/common
+.PATH:		${SRCTOP}/stand/common
 
 BINDIR?=	/usr/bin
 
@@ -9,7 +9,7 @@ MAN=
 
 SRCS=		bootparttest.c crc32.c stub.c part.c disk.c
 
-CFLAGS=		-I${SRCTOP}/sys/boot/common \
+CFLAGS=		-I${SRCTOP}/stand/common \
 		-DLOADER_GPT_SUPPORT -DLOADER_MBR_SUPPORT -DPART_DEBUG \
 		-DDISK_DEBUG
 
diff --git a/tools/tools/zfsboottest/Makefile b/tools/tools/zfsboottest/Makefile
index 1f6084effa0a3..acb510de70a90 100644
--- a/tools/tools/zfsboottest/Makefile
+++ b/tools/tools/zfsboottest/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${SRCTOP}/sys/boot/zfs ${SRCTOP}/sys/cddl/boot/zfs
+.PATH:		${SRCTOP}/stand/zfs ${SRCTOP}/sys/cddl/boot/zfs
 
 BINDIR?=	/usr/bin
 SCRIPTSDIR?=	/usr/bin
@@ -11,7 +11,7 @@ SCRIPTSNAME=	zfsboottest.sh
 MAN=
 
 CFLAGS=	-O1 \
-	-I${SRCTOP}/sys/boot/zfs \
+	-I${SRCTOP}/stand/zfs \
 	-I${SRCTOP}/sys/cddl/boot/zfs \
 	-I. \
 	-fdiagnostics-show-option \
diff --git a/usr.sbin/bhyveload/Makefile b/usr.sbin/bhyveload/Makefile
index f0241b84f43b9..48bed64c26e40 100644
--- a/usr.sbin/bhyveload/Makefile
+++ b/usr.sbin/bhyveload/Makefile
@@ -9,6 +9,6 @@ LIBADD=	vmmapi
 
 WARNS?=	3
 
-CFLAGS+=-I${SRCTOP}/sys/boot/userboot
+CFLAGS+=-I${SRCTOP}/stand/userboot
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/efivar/Makefile b/usr.sbin/efivar/Makefile
index 89d453eeb962f..92f8a70b1c954 100644
--- a/usr.sbin/efivar/Makefile
+++ b/usr.sbin/efivar/Makefile
@@ -7,7 +7,7 @@ LIBADD= efivar
 
 SRCS=	efivar.c efiutil.c
 
-EFIBOOT=${SRCTOP}/sys/boot/efi
+EFIBOOT=${SRCTOP}/stand/efi
 CFLAGS+=	-I${EFIBOOT}/include
 
 .include <bsd.prog.mk>