diff --git a/src/arch/x86/Makefile b/src/arch/x86/Makefile
index b84ee830c..1a1f2dacd 100644
--- a/src/arch/x86/Makefile
+++ b/src/arch/x86/Makefile
@@ -28,11 +28,3 @@ CFLAGS		+= -DNVALGRIND
 # Define version string for lkrnprefix.S
 #
 CFLAGS_lkrnprefix	+= -DVERSION="\"$(VERSION)\""
-
-# Include Xen driver in the all-drivers build
-#
-DRIVERS_ipxe		+= $(DRIVERS_xenbus_net)
-
-# Include Hyper-V driver in the all-drivers build
-#
-DRIVERS_ipxe		+= $(DRIVERS_vmbus_net)
diff --git a/src/arch/x86/Makefile.efi b/src/arch/x86/Makefile.efi
index f04be425b..8c2c1caf8 100644
--- a/src/arch/x86/Makefile.efi
+++ b/src/arch/x86/Makefile.efi
@@ -4,3 +4,8 @@
 #
 MAKEDEPS	+= Makefile.efi
 include Makefile.efi
+
+# Include Xen and Hyper-V drivers in the all-drivers build
+#
+DRIVERS_ipxe	+= $(DRIVERS_xenbus_net)
+DRIVERS_ipxe	+= $(DRIVERS_vmbus_net)
diff --git a/src/arch/x86/Makefile.pcbios b/src/arch/x86/Makefile.pcbios
index 38dfa087c..d02e62512 100644
--- a/src/arch/x86/Makefile.pcbios
+++ b/src/arch/x86/Makefile.pcbios
@@ -105,3 +105,8 @@ NON_AUTO_MEDIA += pdsk
 %pdsk : %dsk
 	$(Q)cp $< $@
 	$(Q)$(PADIMG) --blksize=1474560 $@
+
+# Include Xen and Hyper-V drivers in the all-drivers build
+#
+DRIVERS_ipxe	+= $(DRIVERS_xenbus_net)
+DRIVERS_ipxe	+= $(DRIVERS_vmbus_net)