diff --git a/sys/arm/allwinner/aw_usb3phy.c b/sys/arm/allwinner/aw_usb3phy.c
--- a/sys/arm/allwinner/aw_usb3phy.c
+++ b/sys/arm/allwinner/aw_usb3phy.c
@@ -45,7 +45,7 @@
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
 #include <dev/regulator/regulator.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 
 #include "phynode_if.h"
 
diff --git a/sys/arm/allwinner/aw_usbphy.c b/sys/arm/allwinner/aw_usbphy.c
--- a/sys/arm/allwinner/aw_usbphy.c
+++ b/sys/arm/allwinner/aw_usbphy.c
@@ -43,7 +43,7 @@
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
 #include <dev/regulator/regulator.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 
 #include "phynode_if.h"
 
diff --git a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
--- a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
+++ b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
@@ -36,7 +36,7 @@
 #include <machine/fdt.h>
 
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 #include <dev/regulator/regulator.h>
 #include <dev/fdt/fdt_common.h>
 #include <dev/fdt/fdt_pinctrl.h>
diff --git a/sys/arm/nvidia/tegra_ahci.c b/sys/arm/nvidia/tegra_ahci.c
--- a/sys/arm/nvidia/tegra_ahci.c
+++ b/sys/arm/nvidia/tegra_ahci.c
@@ -46,7 +46,7 @@
 #include <dev/ahci/ahci.h>
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 #include <dev/regulator/regulator.h>
 #include <dev/fdt/fdt_pinctrl.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/nvidia/tegra_ehci.c b/sys/arm/nvidia/tegra_ehci.c
--- a/sys/arm/nvidia/tegra_ehci.c
+++ b/sys/arm/nvidia/tegra_ehci.c
@@ -44,7 +44,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/usb/usb.h>
diff --git a/sys/arm/nvidia/tegra_pcie.c b/sys/arm/nvidia/tegra_pcie.c
--- a/sys/arm/nvidia/tegra_pcie.c
+++ b/sys/arm/nvidia/tegra_pcie.c
@@ -49,7 +49,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 #include <dev/regulator/regulator.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra_usbphy.c b/sys/arm/nvidia/tegra_usbphy.c
--- a/sys/arm/nvidia/tegra_usbphy.c
+++ b/sys/arm/nvidia/tegra_usbphy.c
@@ -40,7 +40,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 #include <dev/regulator/regulator.h>
 #include <dev/fdt/fdt_pinctrl.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/nvidia/tegra_xhci.c b/sys/arm/nvidia/tegra_xhci.c
--- a/sys/arm/nvidia/tegra_xhci.c
+++ b/sys/arm/nvidia/tegra_xhci.c
@@ -54,7 +54,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 #include <dev/regulator/regulator.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/qualcomm/ipq4018_usb_hs_phy.c b/sys/arm/qualcomm/ipq4018_usb_hs_phy.c
--- a/sys/arm/qualcomm/ipq4018_usb_hs_phy.c
+++ b/sys/arm/qualcomm/ipq4018_usb_hs_phy.c
@@ -37,7 +37,7 @@
 #include <machine/bus.h>
 
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 #include <dev/regulator/regulator.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/qualcomm/ipq4018_usb_ss_phy.c b/sys/arm/qualcomm/ipq4018_usb_ss_phy.c
--- a/sys/arm/qualcomm/ipq4018_usb_ss_phy.c
+++ b/sys/arm/qualcomm/ipq4018_usb_ss_phy.c
@@ -37,7 +37,7 @@
 #include <machine/bus.h>
 
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 #include <dev/regulator/regulator.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/ti/am335x/am335x_usb_phy.c b/sys/arm/ti/am335x/am335x_usb_phy.c
--- a/sys/arm/ti/am335x/am335x_usb_phy.c
+++ b/sys/arm/ti/am335x/am335x_usb_phy.c
@@ -83,7 +83,7 @@
 	sc = device_get_softc(dev);
 	sc->dev = dev;
 
-	/* FIXME: Add dev/extres/phy/ interface */
+	/* FIXME: Add dev/phy/ interface */
 
 	return (bus_generic_attach(dev));
 }
diff --git a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
--- a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
@@ -37,7 +37,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 #include <dev/regulator/regulator.h>
 #include <dev/fdt/fdt_common.h>
 #include <dev/fdt/fdt_pinctrl.h>
diff --git a/sys/arm64/rockchip/rk3399_emmcphy.c b/sys/arm64/rockchip/rk3399_emmcphy.c
--- a/sys/arm64/rockchip/rk3399_emmcphy.c
+++ b/sys/arm64/rockchip/rk3399_emmcphy.c
@@ -45,7 +45,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/extres/syscon/syscon.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 
 #include "syscon_if.h"
 
diff --git a/sys/arm64/rockchip/rk3568_combphy.c b/sys/arm64/rockchip/rk3568_combphy.c
--- a/sys/arm64/rockchip/rk3568_combphy.c
+++ b/sys/arm64/rockchip/rk3568_combphy.c
@@ -44,7 +44,7 @@
 #include <dev/hwreset/hwreset.h>
 #include <dev/regulator/regulator.h>
 #include <dev/extres/syscon/syscon.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 
 #include <contrib/device-tree/include/dt-bindings/phy/phy.h>
 
diff --git a/sys/arm64/rockchip/rk3568_pcie.c b/sys/arm64/rockchip/rk3568_pcie.c
--- a/sys/arm64/rockchip/rk3568_pcie.c
+++ b/sys/arm64/rockchip/rk3568_pcie.c
@@ -50,7 +50,7 @@
 #include <dev/pci/pci_dw.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 #include <dev/regulator/regulator.h>
 #include <dev/hwreset/hwreset.h>
 
diff --git a/sys/arm64/rockchip/rk3568_pciephy.c b/sys/arm64/rockchip/rk3568_pciephy.c
--- a/sys/arm64/rockchip/rk3568_pciephy.c
+++ b/sys/arm64/rockchip/rk3568_pciephy.c
@@ -44,7 +44,7 @@
 #include <dev/hwreset/hwreset.h>
 #include <dev/regulator/regulator.h>
 #include <dev/extres/syscon/syscon.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 
 #include <contrib/device-tree/include/dt-bindings/phy/phy.h>
 
diff --git a/sys/arm64/rockchip/rk_pcie.c b/sys/arm64/rockchip/rk_pcie.c
--- a/sys/arm64/rockchip/rk_pcie.c
+++ b/sys/arm64/rockchip/rk_pcie.c
@@ -46,7 +46,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 #include <dev/regulator/regulator.h>
 #include <dev/gpio/gpiobusvar.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm64/rockchip/rk_pcie_phy.c b/sys/arm64/rockchip/rk_pcie_phy.c
--- a/sys/arm64/rockchip/rk_pcie_phy.c
+++ b/sys/arm64/rockchip/rk_pcie_phy.c
@@ -45,8 +45,8 @@
 #include <dev/ofw/ofw_subr.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/phy/phy.h>
-#include <dev/extres/phy/phy_internal.h>
+#include <dev/phy/phy.h>
+#include <dev/phy/phy_internal.h>
 #include <dev/extres/syscon/syscon.h>
 #include <dev/hwreset/hwreset.h>
 
diff --git a/sys/arm64/rockchip/rk_typec_phy.c b/sys/arm64/rockchip/rk_typec_phy.c
--- a/sys/arm64/rockchip/rk_typec_phy.c
+++ b/sys/arm64/rockchip/rk_typec_phy.c
@@ -44,7 +44,7 @@
 #include <dev/ofw/ofw_subr.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 #include <dev/extres/syscon/syscon.h>
 #include <dev/hwreset/hwreset.h>
 
diff --git a/sys/arm64/rockchip/rk_usb2phy.c b/sys/arm64/rockchip/rk_usb2phy.c
--- a/sys/arm64/rockchip/rk_usb2phy.c
+++ b/sys/arm64/rockchip/rk_usb2phy.c
@@ -44,7 +44,7 @@
 #include <dev/ofw/ofw_subr.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 #include <dev/regulator/regulator.h>
 #include <dev/extres/syscon/syscon.h>
 
diff --git a/sys/arm64/rockchip/rk_usbphy.c b/sys/arm64/rockchip/rk_usbphy.c
--- a/sys/arm64/rockchip/rk_usbphy.c
+++ b/sys/arm64/rockchip/rk_usbphy.c
@@ -38,7 +38,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 #include <dev/regulator/regulator.h>
 #include <dev/extres/syscon/syscon.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/conf/files b/sys/conf/files
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1677,11 +1677,6 @@
 dev/evdev/evdev_utils.c			optional evdev
 dev/evdev/uinput.c			optional evdev uinput
 dev/exca/exca.c			optional cbb
-dev/extres/phy/phy.c		optional phy
-dev/extres/phy/phydev_if.m	optional phy fdt
-dev/extres/phy/phynode_if.m	optional phy
-dev/extres/phy/phy_usb.c	optional phy
-dev/extres/phy/phynode_usb_if.m	optional phy
 dev/extres/syscon/syscon.c		optional syscon
 dev/extres/syscon/syscon_generic.c	optional syscon fdt
 dev/extres/syscon/syscon_if.m		optional syscon
@@ -2591,6 +2586,11 @@
 dev/pci/pcib_if.m		standard
 dev/pci/pcib_support.c		standard
 dev/pci/vga_pci.c		optional pci
+dev/phy/phy.c			optional phy
+dev/phy/phydev_if.m		optional phy fdt
+dev/phy/phynode_if.m		optional phy
+dev/phy/phy_usb.c		optional phy
+dev/phy/phynode_usb_if.m	optional phy
 dev/pms/freebsd/driver/ini/src/agtiapi.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sadisc.c			optional pmspcv \
diff --git a/sys/dev/pci/pci_dw_mv.c b/sys/dev/pci/pci_dw_mv.c
--- a/sys/dev/pci/pci_dw_mv.c
+++ b/sys/dev/pci/pci_dw_mv.c
@@ -45,7 +45,7 @@
 #include <machine/resource.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_pci.h>
diff --git a/sys/dev/extres/phy/phy.h b/sys/dev/phy/phy.h
rename from sys/dev/extres/phy/phy.h
rename to sys/dev/phy/phy.h
--- a/sys/dev/extres/phy/phy.h
+++ b/sys/dev/phy/phy.h
@@ -23,8 +23,9 @@
  *
  */
 
-#ifndef DEV_EXTRES_PHY_H
-#define DEV_EXTRES_PHY_H
+#ifndef _DEV_PHY_H_
+#define	_DEV_PHY_H_
+
 #include "opt_platform.h"
 
 #include <sys/kobj.h>
@@ -148,4 +149,4 @@
     phy_t *phy);
 #endif
 
-#endif /* DEV_EXTRES_PHY_H */
+#endif /* _DEV_PHY_H_ */
diff --git a/sys/dev/extres/phy/phy.c b/sys/dev/phy/phy.c
rename from sys/dev/extres/phy/phy.c
rename to sys/dev/phy/phy.c
--- a/sys/dev/extres/phy/phy.c
+++ b/sys/dev/phy/phy.c
@@ -40,8 +40,8 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #endif
 
-#include  <dev/extres/phy/phy.h>
-#include  <dev/extres/phy/phy_internal.h>
+#include  <dev/phy/phy.h>
+#include  <dev/phy/phy_internal.h>
 
 #ifdef FDT
 #include "phydev_if.h"
diff --git a/sys/dev/extres/phy/phy_internal.h b/sys/dev/phy/phy_internal.h
rename from sys/dev/extres/phy/phy_internal.h
rename to sys/dev/phy/phy_internal.h
--- a/sys/dev/extres/phy/phy_internal.h
+++ b/sys/dev/phy/phy_internal.h
@@ -23,8 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DEV_EXTRES_PHY_INTERNAL_H
-#define DEV_EXTRES_PHY_INTERNAL_H
+#ifndef _DEV_PHY_INTERNAL_H_
+#define	_DEV_PHY_INTERNAL_H_
 
 /* Forward declarations. */
 struct phy;
@@ -78,4 +78,4 @@
 
 extern struct sx phynode_topo_lock;
 
-#endif /* DEV_EXTRES_PHY_INTERNAL_H */
+#endif /* _DEV_PHY_INTERNAL_H_ */
diff --git a/sys/dev/extres/phy/phy_usb.h b/sys/dev/phy/phy_usb.h
rename from sys/dev/extres/phy/phy_usb.h
rename to sys/dev/phy/phy_usb.h
--- a/sys/dev/extres/phy/phy_usb.h
+++ b/sys/dev/phy/phy_usb.h
@@ -24,10 +24,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _DEV_EXTRES_PHY_USB_H_
-#define _DEV_EXTRES_PHY_USB_H_
+#ifndef _DEV_PHY_USB_H_
+#define	_DEV_PHY_USB_H_
 
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 #include "phynode_usb_if.h"
 
 #define	PHY_USB_MODE_UNKNOWN	0
@@ -80,4 +80,4 @@
 int phy_usb_set_mode(phy_t phy, int usb_mode);
 int phy_usb_get_mode(phy_t phy, int *usb_mode);
 
-#endif /*_DEV_EXTRES_PHY_USB_H_*/
+#endif /*_DEV_PHY_USB_H_*/
diff --git a/sys/dev/extres/phy/phy_usb.c b/sys/dev/phy/phy_usb.c
rename from sys/dev/extres/phy/phy_usb.c
rename to sys/dev/phy/phy_usb.c
--- a/sys/dev/extres/phy/phy_usb.c
+++ b/sys/dev/phy/phy_usb.c
@@ -32,8 +32,8 @@
 #include <sys/sx.h>
 
 
-#include <dev/extres/phy/phy_usb.h>
-#include <dev/extres/phy/phy_internal.h>
+#include <dev/phy/phy_usb.h>
+#include <dev/phy/phy_internal.h>
 
 /*
  * USB phy controller methods.
diff --git a/sys/dev/extres/phy/phydev_if.m b/sys/dev/phy/phydev_if.m
rename from sys/dev/extres/phy/phydev_if.m
rename to sys/dev/phy/phydev_if.m
diff --git a/sys/dev/extres/phy/phynode_if.m b/sys/dev/phy/phynode_if.m
rename from sys/dev/extres/phy/phynode_if.m
rename to sys/dev/phy/phynode_if.m
--- a/sys/dev/extres/phy/phynode_if.m
+++ b/sys/dev/phy/phynode_if.m
@@ -26,7 +26,7 @@
 INTERFACE phynode;
 
 HEADER {
-	#include <dev/extres/phy/phy.h>
+	#include <dev/phy/phy.h>
 
 	struct phynode;
 }
diff --git a/sys/dev/extres/phy/phynode_usb_if.m b/sys/dev/phy/phynode_usb_if.m
rename from sys/dev/extres/phy/phynode_usb_if.m
rename to sys/dev/phy/phynode_usb_if.m
diff --git a/sys/dev/qcom_dwc3/qcom_dwc3.c b/sys/dev/qcom_dwc3/qcom_dwc3.c
--- a/sys/dev/qcom_dwc3/qcom_dwc3.c
+++ b/sys/dev/qcom_dwc3/qcom_dwc3.c
@@ -47,7 +47,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 #include <dev/extres/syscon/syscon.h>
 
 static struct ofw_compat_data compat_data[] = {
diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c
--- a/sys/dev/sdhci/sdhci_fdt.c
+++ b/sys/dev/sdhci/sdhci_fdt.c
@@ -53,7 +53,7 @@
 #include <dev/clk/clk.h>
 #include <dev/clk/clk_fixed.h>
 #include <dev/extres/syscon/syscon.h>
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 
 #include <dev/mmc/bridge.h>
 
diff --git a/sys/dev/usb/controller/dwc3/aw_dwc3.c b/sys/dev/usb/controller/dwc3/aw_dwc3.c
--- a/sys/dev/usb/controller/dwc3/aw_dwc3.c
+++ b/sys/dev/usb/controller/dwc3/aw_dwc3.c
@@ -47,7 +47,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 
 static struct ofw_compat_data compat_data[] = {
 	{ "allwinner,sun50i-h6-dwc3",	1 },
diff --git a/sys/dev/usb/controller/dwc3/dwc3.c b/sys/dev/usb/controller/dwc3/dwc3.c
--- a/sys/dev/usb/controller/dwc3/dwc3.c
+++ b/sys/dev/usb/controller/dwc3/dwc3.c
@@ -66,7 +66,7 @@
 #include <dev/ofw/ofw_subr.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 #endif
 
 #ifdef DEV_ACPI
diff --git a/sys/dev/usb/controller/dwc3/rk_dwc3.c b/sys/dev/usb/controller/dwc3/rk_dwc3.c
--- a/sys/dev/usb/controller/dwc3/rk_dwc3.c
+++ b/sys/dev/usb/controller/dwc3/rk_dwc3.c
@@ -47,7 +47,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 #include <dev/extres/syscon/syscon.h>
 
 enum rk_dwc3_type {
diff --git a/sys/dev/usb/controller/generic_ehci_fdt.c b/sys/dev/usb/controller/generic_ehci_fdt.c
--- a/sys/dev/usb/controller/generic_ehci_fdt.c
+++ b/sys/dev/usb/controller/generic_ehci_fdt.c
@@ -56,8 +56,8 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy.h>
+#include <dev/phy/phy_usb.h>
 
 #include "generic_ehci.h"
 
diff --git a/sys/dev/usb/controller/generic_ohci.c b/sys/dev/usb/controller/generic_ohci.c
--- a/sys/dev/usb/controller/generic_ohci.c
+++ b/sys/dev/usb/controller/generic_ohci.c
@@ -55,8 +55,8 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy.h>
+#include <dev/phy/phy_usb.h>
 
 #include "generic_usb_if.h"
 
diff --git a/sys/dev/usb/controller/generic_xhci_fdt.c b/sys/dev/usb/controller/generic_xhci_fdt.c
--- a/sys/dev/usb/controller/generic_xhci_fdt.c
+++ b/sys/dev/usb/controller/generic_xhci_fdt.c
@@ -51,7 +51,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/phy/phy.h>
+#include <dev/phy/phy.h>
 
 #include "generic_xhci.h"
 
diff --git a/sys/dev/usb/controller/musb_otg_allwinner.c b/sys/dev/usb/controller/musb_otg_allwinner.c
--- a/sys/dev/usb/controller/musb_otg_allwinner.c
+++ b/sys/dev/usb/controller/musb_otg_allwinner.c
@@ -60,8 +60,8 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy.h>
+#include <dev/phy/phy_usb.h>
 
 #ifdef __arm__
 #include <arm/allwinner/aw_machdep.h>
diff --git a/sys/dev/usb/controller/usb_nop_xceiv.c b/sys/dev/usb/controller/usb_nop_xceiv.c
--- a/sys/dev/usb/controller/usb_nop_xceiv.c
+++ b/sys/dev/usb/controller/usb_nop_xceiv.c
@@ -43,7 +43,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/regulator/regulator.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 
 #include "phynode_if.h"
 
diff --git a/sys/dev/usb/controller/xlnx_dwc3.c b/sys/dev/usb/controller/xlnx_dwc3.c
--- a/sys/dev/usb/controller/xlnx_dwc3.c
+++ b/sys/dev/usb/controller/xlnx_dwc3.c
@@ -49,7 +49,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/phy/phy_usb.h>
+#include <dev/phy/phy_usb.h>
 #include <dev/extres/syscon/syscon.h>
 
 static struct ofw_compat_data compat_data[] = {