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
@@ -22,7 +22,6 @@ SRCS=	\
 		bootinfo.c \
 		conf.c \
 		gfx_fb_stub.c \
-		host_syscalls.c \
 		hostcons.c \
 		hostdisk.c \
 		hostfs.c \
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
@@ -7,7 +7,8 @@ WARNS?= 4
 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"
 
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