diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -41,7 +41,6 @@
 	pci_e82545.c		\
 	pci_emul.c		\
 	pci_fbuf.c		\
-	pci_gvt-d.c		\
 	pci_hda.c		\
 	pci_hostbridge.c	\
 	pci_irq.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,6 +4,7 @@
 	fwctl.c		\
 	kernemu_dev.c	\
 	mptbl.c		\
+	pci_gvt-d.c	\
 	pm.c		\
 	post.c		\
 	ps2kbd.c	\
diff --git a/usr.sbin/bhyve/pci_gvt-d-opregion.h b/usr.sbin/bhyve/amd64/pci_gvt-d-opregion.h
rename from usr.sbin/bhyve/pci_gvt-d-opregion.h
rename to usr.sbin/bhyve/amd64/pci_gvt-d-opregion.h
diff --git a/usr.sbin/bhyve/pci_gvt-d.c b/usr.sbin/bhyve/amd64/pci_gvt-d.c
rename from usr.sbin/bhyve/pci_gvt-d.c
rename to usr.sbin/bhyve/amd64/pci_gvt-d.c