diff --git a/sys/conf/files b/sys/conf/files
index 741ca82ada96..9b1a52f9ba59 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3455,6 +3455,18 @@ dev/virtio/random/virtio_random.c	optional	virtio_random
 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/vmci/vmci.c			optional vmci
+dev/vmware/vmci/vmci_datagram.c		optional vmci
+dev/vmware/vmci/vmci_doorbell.c		optional vmci
+dev/vmware/vmci/vmci_driver.c		optional vmci
+dev/vmware/vmci/vmci_event.c		optional vmci
+dev/vmware/vmci/vmci_hashtable.c	optional vmci
+dev/vmware/vmci/vmci_kernel_if.c	optional vmci
+dev/vmware/vmci/vmci_qpair.c		optional vmci
+dev/vmware/vmci/vmci_queue_pair.c	optional vmci
+dev/vmware/vmci/vmci_resource.c		optional vmci
+dev/vmware/pvscsi/pvscsi.c		optional pvscsi
 dev/vr/if_vr.c			optional vr pci
 dev/vt/colors/vt_termcolors.c	optional vt
 dev/vt/font/vt_font_default.c	optional vt
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 79ad9dfd5a32..3739e5240679 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -378,18 +378,6 @@ dev/tpm/tpm_acpi.c		optional	tpm acpi
 dev/tpm/tpm_isa.c		optional	tpm isa
 dev/uart/uart_cpu_x86.c		optional	uart
 dev/viawd/viawd.c		optional	viawd
-dev/vmware/vmxnet3/if_vmx.c	optional	vmx
-dev/vmware/vmci/vmci.c			optional	vmci
-dev/vmware/vmci/vmci_datagram.c		optional	vmci
-dev/vmware/vmci/vmci_doorbell.c		optional	vmci
-dev/vmware/vmci/vmci_driver.c		optional	vmci
-dev/vmware/vmci/vmci_event.c		optional	vmci
-dev/vmware/vmci/vmci_hashtable.c	optional	vmci
-dev/vmware/vmci/vmci_kernel_if.c	optional	vmci
-dev/vmware/vmci/vmci_qpair.c		optional	vmci
-dev/vmware/vmci/vmci_queue_pair.c	optional	vmci
-dev/vmware/vmci/vmci_resource.c		optional	vmci
-dev/vmware/pvscsi/pvscsi.c		optional	pvscsi
 dev/vmd/vmd.c			optional	vmd
 dev/vmd/vmd_bus.c		optional	vmd_bus
 dev/wbwd/wbwd.c			optional	wbwd
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index e4efd040334e..074b9745caee 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -126,18 +126,6 @@ dev/tpm/tpm_acpi.c		optional tpm acpi
 dev/tpm/tpm_isa.c		optional tpm isa
 dev/uart/uart_cpu_x86.c		optional uart
 dev/viawd/viawd.c		optional viawd
-dev/vmware/vmxnet3/if_vmx.c	optional vmx
-dev/vmware/vmci/vmci.c			optional	vmci
-dev/vmware/vmci/vmci_datagram.c		optional	vmci
-dev/vmware/vmci/vmci_doorbell.c		optional	vmci
-dev/vmware/vmci/vmci_driver.c		optional	vmci
-dev/vmware/vmci/vmci_event.c		optional	vmci
-dev/vmware/vmci/vmci_hashtable.c	optional	vmci
-dev/vmware/vmci/vmci_kernel_if.c	optional	vmci
-dev/vmware/vmci/vmci_qpair.c		optional	vmci
-dev/vmware/vmci/vmci_queue_pair.c	optional	vmci
-dev/vmware/vmci/vmci_resource.c		optional	vmci
-dev/vmware/pvscsi/pvscsi.c		optional	pvscsi
 dev/acpi_support/acpi_wmi_if.m	standard
 dev/wbwd/wbwd.c			optional wbwd
 i386/acpica/acpi_machdep.c	optional acpi