Index: sys/conf/files
===================================================================
--- sys/conf/files
+++ sys/conf/files
@@ -1652,45 +1652,45 @@
 dev/efidev/efidev.c		optional efirt
 dev/efidev/efirt.c		optional efirt
 dev/efidev/efirtc.c		optional efirt
-dev/e1000/if_em.c		optional em \
+dev/e1000/if_em.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/em_txrx.c		optional em \
+dev/e1000/em_txrx.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/igb_txrx.c		optional em \
+dev/e1000/igb_txrx.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_80003es2lan.c	optional em \
+dev/e1000/e1000_80003es2lan.c	optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_82540.c		optional em \
+dev/e1000/e1000_82540.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_82541.c		optional em \
+dev/e1000/e1000_82541.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_82542.c		optional em \
+dev/e1000/e1000_82542.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_82543.c		optional em \
+dev/e1000/e1000_82543.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_82571.c		optional em \
+dev/e1000/e1000_82571.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_82575.c		optional em \
+dev/e1000/e1000_82575.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_ich8lan.c	optional em \
+dev/e1000/e1000_ich8lan.c	optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_i210.c		optional em \
+dev/e1000/e1000_i210.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_api.c		optional em \
+dev/e1000/e1000_api.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_mac.c		optional em \
+dev/e1000/e1000_mac.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_manage.c	optional em \
+dev/e1000/e1000_manage.c	optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_nvm.c		optional em \
+dev/e1000/e1000_nvm.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_phy.c		optional em \
+dev/e1000/e1000_phy.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_vf.c		optional em \
+dev/e1000/e1000_vf.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_mbx.c		optional em \
+dev/e1000/e1000_mbx.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/e1000_osdep.c		optional em \
+dev/e1000/e1000_osdep.c		optional em iflib \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/et/if_et.c			optional et
 dev/ena/ena.c			optional ena \
@@ -2266,43 +2266,43 @@
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn6050.fw"
-dev/ixgbe/if_ix.c		optional ix inet \
+dev/ixgbe/if_ix.c		optional ix inet iflib \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
-dev/ixgbe/if_ixv.c		optional ixv inet \
+dev/ixgbe/if_ixv.c		optional ixv inet iflib \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
-dev/ixgbe/if_bypass.c		optional ix inet \
+dev/ixgbe/if_bypass.c		optional ix inet iflib \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/if_fdir.c		optional ix inet | ixv inet \
+dev/ixgbe/if_fdir.c		optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/if_sriov.c		optional ix inet \
+dev/ixgbe/if_sriov.c		optional ix iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ix_txrx.c		optional ix inet | ixv inet \
+dev/ixgbe/ix_txrx.c		optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_osdep.c		optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_osdep.c		optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_phy.c		optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_phy.c		optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_api.c		optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_api.c		optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_common.c	optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_common.c	optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_mbx.c		optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_mbx.c		optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_vf.c		optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_vf.c		optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_82598.c		optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_82598.c		optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_82599.c		optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_82599.c		optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_x540.c		optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_x540.c		optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_x550.c		optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_x550.c		optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_dcb.c		optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_dcb.c		optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_dcb_82598.c	optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_dcb_82598.c	optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_dcb_82599.c	optional ix inet | ixv inet \
+dev/ixgbe/ixgbe_dcb_82599.c	optional ix iflib inet | ixv iflib inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/jedec_dimm/jedec_dimm.c	optional jedec_dimm smbus
 dev/jedec_ts/jedec_ts.c		optional jedec_ts smbus
@@ -4122,10 +4122,10 @@
 net/if_tap.c			optional tap
 net/if_vlan.c			optional vlan
 net/if_vxlan.c			optional vxlan inet | vxlan inet6
-net/ifdi_if.m			optional ether pci
-net/iflib.c			optional ether pci
-net/iflib_clone.c		optional ether pci
-net/mp_ring.c			optional ether
+net/ifdi_if.m			optional iflib ether pci
+net/iflib.c			optional iflib ether pci
+net/iflib_clone.c		optional iflib ether pci
+net/mp_ring.c			optional iflib ether
 net/mppcc.c			optional netgraph_mppc_compression
 net/mppcd.c			optional netgraph_mppc_compression
 net/netisr.c			standard
Index: sys/conf/files.amd64
===================================================================
--- sys/conf/files.amd64
+++ sys/conf/files.amd64
@@ -259,37 +259,37 @@
 dev/ipmi/ipmi_ssif.c		optional	ipmi smbus
 dev/ipmi/ipmi_pci.c		optional	ipmi pci
 dev/ipmi/ipmi_linux.c		optional	ipmi compat_linux32
-dev/ixl/if_ixl.c		optional	ixl pci \
+dev/ixl/if_ixl.c		optional	ixl iflib pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_pf_main.c		optional	ixl pci \
+dev/ixl/ixl_pf_main.c		optional	ixl iflib pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_pf_qmgr.c		optional	ixl pci \
+dev/ixl/ixl_pf_qmgr.c		optional	ixl iflib pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_pf_iov.c		optional	ixl pci  pci_iov \
+dev/ixl/ixl_pf_iov.c		optional	ixl iflib pci  pci_iov \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_pf_i2c.c		optional	ixl pci \
+dev/ixl/ixl_pf_i2c.c		optional	ixl iflib pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-#dev/ixl/ixl_iw.c		optional	ixl pci \
+#dev/ixl/ixl_iw.c		optional	ixl iflib pci \
 #	compile-with "${NORMAL_C} -I$S/dev/ixl"
-#dev/ixl/if_ixlv.c		optional	ixlv pci \
+#dev/ixl/if_ixlv.c		optional	ixlv iflib pci \
 #	compile-with "${NORMAL_C} -I$S/dev/ixl"
-#dev/ixl/ixlvc.c			optional	ixlv pci \
+#dev/ixl/ixlvc.c			optional	ixlv iflib pci \
 #	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_txrx.c		optional	ixl pci | ixlv pci \
+dev/ixl/ixl_txrx.c		optional	ixl iflib pci | ixlv iflib pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_osdep.c		optional	ixl pci | ixlv pci \
+dev/ixl/i40e_osdep.c		optional	ixl iflib pci | ixlv iflib pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_lan_hmc.c		optional	ixl pci | ixlv pci \
+dev/ixl/i40e_lan_hmc.c		optional	ixl iflib pci | ixlv iflib pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_hmc.c		optional	ixl pci | ixlv pci \
+dev/ixl/i40e_hmc.c		optional	ixl iflib pci | ixlv iflib pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_common.c		optional	ixl pci | ixlv pci \
+dev/ixl/i40e_common.c		optional	ixl iflib pci | ixlv iflib pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_nvm.c		optional	ixl pci | ixlv pci \
+dev/ixl/i40e_nvm.c		optional	ixl iflib pci | ixlv iflib pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_adminq.c		optional	ixl pci | ixlv pci \
+dev/ixl/i40e_adminq.c		optional	ixl iflib pci | ixlv iflib pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_dcb.c		optional	ixl pci \
+dev/ixl/i40e_dcb.c		optional	ixl iflib pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/fdc/fdc.c			optional	fdc
 dev/fdc/fdc_acpi.c		optional	fdc