diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -62,7 +62,6 @@
 	rfb.c			\
 	smbiostbl.c		\
 	sockstream.c		\
-	spinup_ap.c		\
 	tpm_device.c		\
 	tpm_emul_passthru.c	\
 	tpm_intf_crb.c		\
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
@@ -10,6 +10,7 @@
 	ps2kbd.c	\
 	ps2mouse.c	\
 	rtc.c		\
+	spinup_ap.c	\
 	task_switch.c	\
 	xmsr.c
 
diff --git a/usr.sbin/bhyve/spinup_ap.h b/usr.sbin/bhyve/amd64/spinup_ap.h
rename from usr.sbin/bhyve/spinup_ap.h
rename to usr.sbin/bhyve/amd64/spinup_ap.h
diff --git a/usr.sbin/bhyve/spinup_ap.c b/usr.sbin/bhyve/amd64/spinup_ap.c
rename from usr.sbin/bhyve/spinup_ap.c
rename to usr.sbin/bhyve/amd64/spinup_ap.c