diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -37,17 +37,13 @@
 	mevent.c		\
 	net_backends.c		\
 	net_utils.c		\
-	pci_ahci.c		\
-	pci_e82545.c		\
 	pci_emul.c		\
 	pci_fbuf.c		\
-	pci_hda.c		\
 	pci_hostbridge.c	\
 	pci_irq.c		\
 	pci_lpc.c		\
 	pci_nvme.c		\
 	pci_passthru.c		\
-	pci_uart.c		\
 	pci_virtio_9p.c		\
 	pci_virtio_block.c	\
 	pci_virtio_console.c	\
@@ -55,8 +51,6 @@
 	pci_virtio_net.c	\
 	pci_virtio_rnd.c	\
 	pci_virtio_scsi.c	\
-	pci_xhci.c		\
-	pctestdev.c		\
 	qemu_fwcfg.c		\
 	qemu_loader.c		\
 	rfb.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
@@ -4,7 +4,13 @@
 	fwctl.c		\
 	kernemu_dev.c	\
 	mptbl.c		\
+	pci_ahci.c	\
+	pci_e82545.c	\
 	pci_gvt-d.c	\
+	pci_hda.c	\
+	pci_uart.c	\
+	pci_xhci.c	\
+	pctestdev.c	\
 	pm.c		\
 	post.c		\
 	ps2kbd.c	\