diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 85261683979e..23be5a4e669c 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -346,17 +346,6 @@ dev/ntb/ntb_if.m		optional	ntb | ntb_transport | if_ntb | ntb_hw_amd | ntb_hw_in
 dev/ntb/ntb_hw/ntb_hw_amd.c	optional	ntb_hw_amd | ntb_hw
 dev/ntb/ntb_hw/ntb_hw_intel.c	optional	ntb_hw_intel | ntb_hw
 dev/ntb/ntb_hw/ntb_hw_plx.c	optional	ntb_hw_plx | ntb_hw
-dev/nvd/nvd.c			optional	nvd nvme
-dev/nvme/nvme.c			optional	nvme
-dev/nvme/nvme_ctrlr.c		optional	nvme
-dev/nvme/nvme_ctrlr_cmd.c	optional	nvme
-dev/nvme/nvme_ns.c		optional	nvme
-dev/nvme/nvme_ns_cmd.c		optional	nvme
-dev/nvme/nvme_qpair.c		optional	nvme
-dev/nvme/nvme_sim.c		optional	nvme scbus
-dev/nvme/nvme_sysctl.c		optional	nvme
-dev/nvme/nvme_test.c		optional	nvme
-dev/nvme/nvme_util.c		optional	nvme
 dev/nvram/nvram.c		optional	nvram isa
 dev/random/ivy.c		optional	rdrand_rng !random_loadable
 dev/random/nehemiah.c		optional	padlock_rng !random_loadable
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 72eca453abc2..c6ac8db462b0 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -279,17 +279,6 @@ dev/ntb/ntb_if.m		optional ntb | ntb_transport | if_ntb | ntb_hw_amd | ntb_hw_in
 dev/ntb/ntb_hw/ntb_hw_amd.c	optional ntb_hw_amd | ntb_hw
 dev/ntb/ntb_hw/ntb_hw_intel.c	optional ntb_hw_intel | ntb_hw
 dev/ntb/ntb_hw/ntb_hw_plx.c	optional ntb_hw_plx | ntb_hw
-dev/nvd/nvd.c			optional nvd nvme
-dev/nvme/nvme.c			optional nvme
-dev/nvme/nvme_ctrlr.c		optional nvme
-dev/nvme/nvme_ctrlr_cmd.c	optional nvme
-dev/nvme/nvme_ns.c		optional nvme
-dev/nvme/nvme_ns_cmd.c		optional nvme
-dev/nvme/nvme_qpair.c		optional nvme
-dev/nvme/nvme_sysctl.c		optional nvme
-dev/nvme/nvme_test.c		optional nvme
-dev/nvme/nvme_util.c		optional nvme
-dev/nvram/nvram.c		optional nvram isa
 dev/ofw/ofwpci.c		optional fdt pci
 dev/pcf/pcf_isa.c		optional pcf
 dev/random/ivy.c		optional rdrand_rng !random_loadable