diff --git a/stand/kboot/kboot/arch/aarch64/termios_arch.h b/stand/kboot/include/arch/aarch64/termios_arch.h
similarity index 100%
rename from stand/kboot/kboot/arch/aarch64/termios_arch.h
rename to stand/kboot/include/arch/aarch64/termios_arch.h
diff --git a/stand/kboot/kboot/arch/amd64/termios_arch.h b/stand/kboot/include/arch/amd64/termios_arch.h
similarity index 100%
rename from stand/kboot/kboot/arch/amd64/termios_arch.h
rename to stand/kboot/include/arch/amd64/termios_arch.h
diff --git a/stand/kboot/kboot/arch/powerpc64/termios_arch.h b/stand/kboot/include/arch/powerpc64/termios_arch.h
similarity index 100%
rename from stand/kboot/kboot/arch/powerpc64/termios_arch.h
rename to stand/kboot/include/arch/powerpc64/termios_arch.h
diff --git a/stand/kboot/kboot/termios.h b/stand/kboot/include/termios.h
similarity index 100%
rename from stand/kboot/kboot/termios.h
rename to stand/kboot/include/termios.h
diff --git a/stand/kboot/kboot/termios_gen.h b/stand/kboot/include/termios_gen.h
similarity index 100%
rename from stand/kboot/kboot/termios_gen.h
rename to stand/kboot/include/termios_gen.h
diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile
index 475f863b77b..055027b85eb 100644
--- a/stand/kboot/kboot/Makefile
+++ b/stand/kboot/kboot/Makefile
@@ -29,7 +29,6 @@ SRCS=	\
 		kbootfdt.c \
 		main.c \
 		seg.c \
-		termios.c \
 		util.c \
 		vers.c
 
diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile
index 33674da8366..d9ce08cb085 100644
--- a/stand/kboot/libkboot/Makefile
+++ b/stand/kboot/libkboot/Makefile
@@ -8,7 +8,8 @@ CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 
 SRCS=	crt1.c \
 	host_syscall.S \
-	host_syscalls.c
+	host_syscalls.c \
+	termios.c
 
 .sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 
diff --git a/stand/kboot/kboot/termios.c b/stand/kboot/libkboot/termios.c
similarity index 100%
rename from stand/kboot/kboot/termios.c
rename to stand/kboot/libkboot/termios.c