diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -37,7 +37,6 @@
 	net_backends.c		\
 	net_utils.c		\
 	pci_emul.c		\
-	pci_fbuf.c		\
 	pci_hostbridge.c	\
 	pci_nvme.c		\
 	pci_passthru.c		\
@@ -50,7 +49,6 @@
 	pci_virtio_scsi.c	\
 	qemu_fwcfg.c		\
 	qemu_loader.c		\
-	rfb.c			\
 	smbiostbl.c		\
 	sockstream.c		\
 	tpm_device.c		\
@@ -60,7 +58,6 @@
 	uart_emul.c		\
 	usb_emul.c		\
 	usb_mouse.c		\
-	vga.c			\
 	virtio.c		\
 	vmexit.c		\
 	vmgenc.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
@@ -7,6 +7,7 @@
 	mptbl.c		\
 	pci_ahci.c	\
 	pci_e82545.c	\
+	pci_fbuf.c	\
 	pci_gvt-d.c	\
 	pci_hda.c	\
 	pci_irq.c	\
@@ -18,9 +19,11 @@
 	post.c		\
 	ps2kbd.c	\
 	ps2mouse.c	\
+	rfb.c		\
 	rtc.c		\
 	spinup_ap.c	\
 	task_switch.c	\
+	vga.c		\
 	xmsr.c
 
 .PATH:  ${BHYVE_SYSDIR}/sys/amd64/vmm
diff --git a/usr.sbin/bhyve/vga.h b/usr.sbin/bhyve/amd64/vga.h
rename from usr.sbin/bhyve/vga.h
rename to usr.sbin/bhyve/amd64/vga.h
diff --git a/usr.sbin/bhyve/vga.c b/usr.sbin/bhyve/amd64/vga.c
rename from usr.sbin/bhyve/vga.c
rename to usr.sbin/bhyve/amd64/vga.c
diff --git a/usr.sbin/bhyve/pci_fbuf.c b/usr.sbin/bhyve/pci_fbuf.c
--- a/usr.sbin/bhyve/pci_fbuf.c
+++ b/usr.sbin/bhyve/pci_fbuf.c
@@ -46,10 +46,11 @@
 #include "config.h"
 #include "debug.h"
 #include "console.h"
-#include "inout.h"
 #include "pci_emul.h"
 #include "rfb.h"
-#include "vga.h"
+#ifdef __amd64__
+#include "amd64/vga.h"
+#endif
 
 /*
  * bhyve Framebuffer device emulation.