diff --git a/stand/kboot/Makefile.inc b/stand/kboot/Makefile.inc
index 02aecdad55f1..90a1b9a17e3e 100644
--- a/stand/kboot/Makefile.inc
+++ b/stand/kboot/Makefile.inc
@@ -1,7 +1,7 @@
 # Bring in the mini-libc that we wrote
 
 KBOOTSRC=${BOOTSRC}/kboot
-CFLAGS+=-I${KBOOTSRC}/include
+CFLAGS+=-I${KBOOTSRC}/include -I${KBOOTSRC}/include/arch/${MACHINE_ARCH}
 LIBKBOOT=${BOOTOBJ}/kboot/libkboot/libkboot.a
 
 .include "../Makefile.inc"
diff --git a/stand/kboot/kboot/arch/aarch64/stat_arch.h b/stand/kboot/include/arch/aarch64/stat_arch.h
similarity index 100%
rename from stand/kboot/kboot/arch/aarch64/stat_arch.h
rename to stand/kboot/include/arch/aarch64/stat_arch.h
diff --git a/stand/kboot/kboot/arch/aarch64/syscall_nr.h b/stand/kboot/include/arch/aarch64/syscall_nr.h
similarity index 100%
rename from stand/kboot/kboot/arch/aarch64/syscall_nr.h
rename to stand/kboot/include/arch/aarch64/syscall_nr.h
diff --git a/stand/kboot/kboot/arch/amd64/stat_arch.h b/stand/kboot/include/arch/amd64/stat_arch.h
similarity index 100%
rename from stand/kboot/kboot/arch/amd64/stat_arch.h
rename to stand/kboot/include/arch/amd64/stat_arch.h
diff --git a/stand/kboot/kboot/arch/amd64/syscall_nr.h b/stand/kboot/include/arch/amd64/syscall_nr.h
similarity index 100%
rename from stand/kboot/kboot/arch/amd64/syscall_nr.h
rename to stand/kboot/include/arch/amd64/syscall_nr.h
diff --git a/stand/kboot/kboot/arch/powerpc64/stat_arch.h b/stand/kboot/include/arch/powerpc64/stat_arch.h
similarity index 100%
rename from stand/kboot/kboot/arch/powerpc64/stat_arch.h
rename to stand/kboot/include/arch/powerpc64/stat_arch.h
diff --git a/stand/kboot/kboot/arch/powerpc64/syscall_nr.h b/stand/kboot/include/arch/powerpc64/syscall_nr.h
similarity index 100%
rename from stand/kboot/kboot/arch/powerpc64/syscall_nr.h
rename to stand/kboot/include/arch/powerpc64/syscall_nr.h
diff --git a/stand/kboot/kboot/host_syscall.h b/stand/kboot/include/host_syscall.h
similarity index 100%
rename from stand/kboot/kboot/host_syscall.h
rename to stand/kboot/include/host_syscall.h
diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile
index ae32d878a3f4..475f863b77bd 100644
--- a/stand/kboot/kboot/Makefile
+++ b/stand/kboot/kboot/Makefile
@@ -1,67 +1,66 @@
 
 LOADER_DISK_SUPPORT?=	yes
 LOADER_CD9660_SUPPORT?=	yes
 LOADER_MSDOS_SUPPORT?=	no
 LOADER_EXT2FS_SUPPORT?=	yes
 LOADER_UFS_SUPPORT?=	yes
 LOADER_ZFS_SUPPORT?=	yes
 LOADER_NET_SUPPORT?=	no
 LOADER_NFS_SUPPORT?=	no
 LOADER_TFTP_SUPPORT?=	no
 LOADER_GZIP_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no
 
 .include <bsd.init.mk>
 
 PROG=		loader.kboot
 NEWVERSWHAT=	"kboot loader" ${MACHINE_ARCH}
 INSTALLFLAGS=	-b
 
 # Architecture-specific loader code
 SRCS=	\
 		bootinfo.c \
 		conf.c \
 		gfx_fb_stub.c \
-		host_syscalls.c \
 		hostcons.c \
 		hostdisk.c \
 		hostfs.c \
 		init.c \
 		kbootfdt.c \
 		main.c \
 		seg.c \
 		termios.c \
 		util.c \
 		vers.c
 
 CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
 .if ${MK_LOADER_ZFS} != "no"
 CFLAGS+=	-I${ZFSSRC}
 CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include
 CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs
 HAVE_ZFS=yes
 .endif
 
 HELP_FILENAME=	loader.help.kboot
 
 .include	"${BOOTSRC}/fdt.mk"
 
 # We share bootinfo.c with efi
 .PATH:		${BOOTSRC}/efi/loader
 
 # Note: Since we're producing a userland binary, we key off of MACHINE_ARCH
 # instead of the more normal MACHINE since the changes between different flavors
 # of MACHINE_ARCH are large enough in Linux that it's easier that way.
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}
 .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 
 # Always add MI sources
 .include	"${BOOTSRC}/loader.mk"
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 
 CFLAGS+=	-Wall
 
 DPADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} ${LIBKBOOT}
 LDADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} ${LIBKBOOT}
 
 .include <bsd.prog.mk>
diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile
index 31f4827e64b9..33674da83661 100644
--- a/stand/kboot/libkboot/Makefile
+++ b/stand/kboot/libkboot/Makefile
@@ -1,14 +1,15 @@
 .include <bsd.init.mk>
 
 LIB=	kboot
 WARNS?= 4
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 
 SRCS=	crt1.c \
-	host_syscall.S
+	host_syscall.S \
+	host_syscalls.c
 
 .sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 
 .include <bsd.lib.mk>
diff --git a/stand/kboot/kboot/host_syscalls.c b/stand/kboot/libkboot/host_syscalls.c
similarity index 100%
rename from stand/kboot/kboot/host_syscalls.c
rename to stand/kboot/libkboot/host_syscalls.c