diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -33,7 +33,6 @@
 	inout.c			\
 	ioapic.c		\
 	iov.c			\
-	kernemu_dev.c		\
 	mem.c			\
 	mevent.c		\
 	net_backends.c		\
@@ -85,8 +84,6 @@
 
 .include "${MACHINE_CPUARCH}/Makefile.inc"
 
-CFLAGS.kernemu_dev.c+=	-I${SRCTOP}/sys/amd64
-
 CFLAGS+=-I${.CURDIR}		\
 	-I${.CURDIR}/../../contrib/lib9p \
 	-I${SRCTOP}/sys
diff --git a/usr.sbin/bhyve/amd64/Makefile.inc b/usr.sbin/bhyve/amd64/Makefile.inc
--- a/usr.sbin/bhyve/amd64/Makefile.inc
+++ b/usr.sbin/bhyve/amd64/Makefile.inc
@@ -2,14 +2,16 @@
 	atkbdc.c	\
 	e820.c		\
 	fwctl.c		\
+	kernemu_dev.c	\
 	mptbl.c		\
 	post.c		\
 	ps2kbd.c	\
 	ps2mouse.c	\
 	task_switch.c
 
-
 .PATH:  ${BHYVE_SYSDIR}/sys/amd64/vmm
 SRCS+=	vmm_instruction_emul.c
 
+CFLAGS.kernemu_dev.c+=	-I${SRCTOP}/sys/amd64
+
 SUBDIR+=	kbdlayout
diff --git a/usr.sbin/bhyve/kernemu_dev.h b/usr.sbin/bhyve/amd64/kernemu_dev.h
rename from usr.sbin/bhyve/kernemu_dev.h
rename to usr.sbin/bhyve/amd64/kernemu_dev.h
diff --git a/usr.sbin/bhyve/kernemu_dev.c b/usr.sbin/bhyve/amd64/kernemu_dev.c
rename from usr.sbin/bhyve/kernemu_dev.c
rename to usr.sbin/bhyve/amd64/kernemu_dev.c
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -95,7 +95,9 @@
 #endif
 #include "gdb.h"
 #include "ioapic.h"
-#include "kernemu_dev.h"
+#ifdef __amd64__
+#include "amd64/kernemu_dev.h"
+#endif
 #include "mem.h"
 #include "mevent.h"
 #ifdef __amd64__
@@ -1457,7 +1459,9 @@
 
 	init_mem(guest_ncpus);
 	init_inout();
+#ifdef __amd64__
 	kernemu_dev_init();
+#endif
 	init_bootrom(ctx);
 #ifdef __amd64__
 	atkbdc_init(ctx);