Index: sys/conf/Makefile.amd64
===================================================================
--- sys/conf/Makefile.amd64
+++ sys/conf/Makefile.amd64
@@ -18,7 +18,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600018
+%VERSREQ=	600019
 
 STD8X16FONT?=	iso
 
Index: sys/conf/Makefile.arm
===================================================================
--- sys/conf/Makefile.arm
+++ sys/conf/Makefile.arm
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600013
+%VERSREQ=	600019
 
 STD8X16FONT?=	iso
 
Index: sys/conf/Makefile.arm64
===================================================================
--- sys/conf/Makefile.arm64
+++ sys/conf/Makefile.arm64
@@ -18,7 +18,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	600019
 
 .if !defined(S)
 S=	../../..
Index: sys/conf/Makefile.i386
===================================================================
--- sys/conf/Makefile.i386
+++ sys/conf/Makefile.i386
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	600019
 
 STD8X16FONT?=	iso
 
Index: sys/conf/Makefile.mips
===================================================================
--- sys/conf/Makefile.mips
+++ sys/conf/Makefile.mips
@@ -15,7 +15,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	600019
 
 STD8X16FONT?=	iso
 
Index: sys/conf/Makefile.powerpc
===================================================================
--- sys/conf/Makefile.powerpc
+++ sys/conf/Makefile.powerpc
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	600019
 
 STD8X16FONT?=	iso
 
Index: sys/conf/Makefile.riscv
===================================================================
--- sys/conf/Makefile.riscv
+++ sys/conf/Makefile.riscv
@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	600019
 
 .if !defined(S)
 S=	../../..
Index: sys/conf/files
===================================================================
--- sys/conf/files
+++ sys/conf/files
@@ -1652,7 +1652,8 @@
 dev/efidev/efirt.c		optional efirt
 dev/efidev/efirtc.c		optional efirt
 dev/e1000/if_em.c		optional em \
-	compile-with "${NORMAL_C} -I$S/dev/e1000"
+	requires "iflib" \
+	compile-with "${NORMAL_C} -I$S/dev/e1000" \
 dev/e1000/em_txrx.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/igb_txrx.c		optional em \
@@ -2306,6 +2307,7 @@
 dev/ixgbe/if_ixv.c		optional ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
 dev/ixgbe/if_bypass.c		optional ix inet \
+	requires "iflib" \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/if_fdir.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
@@ -3476,7 +3478,8 @@
 dev/virtio/console/virtio_console.c	optional	virtio_console
 dev/vkbd/vkbd.c			optional vkbd
 dev/vmgenc/vmgenc_acpi.c	optional acpi
-dev/vmware/vmxnet3/if_vmx.c		optional vmx
+dev/vmware/vmxnet3/if_vmx.c		optional vmx  \
+	requires "iflib"
 dev/vmware/vmci/vmci.c			optional vmci
 dev/vmware/vmci/vmci_datagram.c		optional vmci
 dev/vmware/vmci/vmci_doorbell.c		optional vmci
Index: sys/conf/files.amd64
===================================================================
--- sys/conf/files.amd64
+++ sys/conf/files.amd64
@@ -146,7 +146,8 @@
 dev/agp/agp_i810.c		optional	agp
 dev/agp/agp_via.c		optional	agp
 dev/amdgpio/amdgpio.c		optional	amdgpio
-dev/axgbe/if_axgbe_pci.c	optional	axp
+dev/axgbe/if_axgbe_pci.c	optional	axp \
+	requires "iflib"
 dev/axgbe/xgbe-desc.c		optional	axp
 dev/axgbe/xgbe-dev.c		optional	axp
 dev/axgbe/xgbe-drv.c		optional	axp
@@ -159,6 +160,7 @@
 dev/hyperv/vmbus/amd64/hyperv_machdep.c			optional	hyperv
 dev/hyperv/vmbus/amd64/vmbus_vector.S			optional	hyperv
 dev/ice/if_ice_iflib.c		optional	ice pci \
+	requires "iflib" \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_lib.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
@@ -209,6 +211,7 @@
 dev/ioat/ioat.c			optional	ioat pci
 dev/ioat/ioat_test.c		optional	ioat pci
 dev/ixl/if_ixl.c		optional	ixl pci \
+	requires "iflib" \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/ixl_pf_main.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
@@ -221,6 +224,7 @@
 dev/ixl/ixl_pf_i2c.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/if_iavf.c		optional	iavf pci \
+	requires "iflib" \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/iavf_vc.c			optional	iavf pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"