diff --git a/sys/conf/files.arm b/sys/conf/files.arm
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -104,7 +104,7 @@
 dev/syscons/scgfbrndr.c		optional	sc
 dev/uart/uart_cpu_fdt.c		optional	uart fdt
 
-dev/usb/controller/dwc3.c		optional	fdt dwc3
+dev/usb/controller/dwc3/dwc3.c		optional	fdt dwc3
 dev/usb/controller/generic_xhci.c	optional	xhci
 dev/usb/controller/generic_xhci_fdt.c	optional	xhci fdt
 
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -402,7 +402,6 @@
 dev/uart/uart_dev_pl011.c			optional uart pl011
 
 dev/usb/controller/dwc_otg_hisi.c		optional dwcotg fdt soc_hisi_hi6220
-dev/usb/controller/dwc3.c			optional xhci acpi dwc3 | xhci fdt dwc3
 dev/usb/controller/ehci_mv.c			optional ehci_mv fdt
 dev/usb/controller/generic_ehci.c		optional ehci
 dev/usb/controller/generic_ehci_acpi.c		optional ehci acpi
@@ -415,6 +414,10 @@
 dev/usb/controller/generic_xhci_acpi.c		optional xhci acpi
 dev/usb/controller/generic_xhci_fdt.c		optional xhci fdt
 
+dev/usb/controller/dwc3/dwc3.c			optional xhci acpi dwc3 | xhci fdt dwc3
+dev/usb/controller/dwc3/aw_dwc3.c		optional xhci fdt dwc3 aw_dwc3
+dev/usb/controller/dwc3/rk_dwc3.c		optional xhci fdt dwc3 rk_dwc3
+
 dev/vnic/mrml_bridge.c				optional vnic fdt
 dev/vnic/nic_main.c				optional vnic pci
 dev/vnic/nicvf_main.c				optional vnic pci pci_iov
@@ -437,7 +440,6 @@
 arm/allwinner/a64/sun50i_a64_acodec.c		optional fdt sound a64_codec
 arm/allwinner/sunxi_dma_if.m			optional a31_dmac
 arm/allwinner/aw_cir.c				optional evdev aw_cir fdt
-arm/allwinner/aw_dwc3.c				optional aw_dwc3 fdt
 arm/allwinner/aw_gpio.c				optional gpio aw_gpio fdt
 arm/allwinner/aw_i2s.c				optional fdt sound aw_i2s
 arm/allwinner/aw_mmc.c				optional mmc aw_mmc fdt | mmccam aw_mmc fdt
@@ -664,7 +666,6 @@
 arm64/rockchip/rk3568_combphy.c			optional fdt rk_combphy soc_rockchip_rk3568
 arm64/rockchip/rk3568_pcie.c			optional fdt pci soc_rockchip_rk3568
 arm64/rockchip/rk3568_pciephy.c			optional fdt pci soc_rockchip_rk3568
-arm64/rockchip/rk_dwc3.c			optional fdt rk_dwc3 soc_rockchip_rk3399 | fdt rk_dwc3 soc_rockchip_rk3568
 arm64/rockchip/rk_i2s.c				optional fdt sound soc_rockchip_rk3328 | fdt sound soc_rockchip_rk3399
 arm64/rockchip/rk_otp.c				optional fdt soc_rockchip_rk3568
 arm64/rockchip/rk_otp_if.m			optional fdt soc_rockchip_rk3568
diff --git a/sys/arm/allwinner/aw_dwc3.c b/sys/dev/usb/controller/dwc3/aw_dwc3.c
rename from sys/arm/allwinner/aw_dwc3.c
rename to sys/dev/usb/controller/dwc3/aw_dwc3.c
diff --git a/sys/dev/usb/controller/dwc3.h b/sys/dev/usb/controller/dwc3/dwc3.h
rename from sys/dev/usb/controller/dwc3.h
rename to sys/dev/usb/controller/dwc3/dwc3.h
diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3/dwc3.c
rename from sys/dev/usb/controller/dwc3.c
rename to sys/dev/usb/controller/dwc3/dwc3.c
--- a/sys/dev/usb/controller/dwc3.c
+++ b/sys/dev/usb/controller/dwc3/dwc3.c
@@ -53,8 +53,9 @@
 
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
+#include <dev/usb/controller/generic_xhci.h>
 #include <dev/usb/controller/xhci.h>
-#include <dev/usb/controller/dwc3.h>
+#include <dev/usb/controller/dwc3/dwc3.h>
 
 #ifdef FDT
 #include <dev/fdt/simplebus.h>
@@ -74,8 +75,6 @@
 #include <dev/acpica/acpivar.h>
 #endif
 
-#include "generic_xhci.h"
-
 struct snps_dwc3_softc {
 	struct xhci_softc	sc;
 	device_t		dev;
diff --git a/sys/arm64/rockchip/rk_dwc3.c b/sys/dev/usb/controller/dwc3/rk_dwc3.c
rename from sys/arm64/rockchip/rk_dwc3.c
rename to sys/dev/usb/controller/dwc3/rk_dwc3.c