diff --git a/sys/arm/allwinner/aw_syscon.c b/sys/arm/allwinner/aw_syscon.c
--- a/sys/arm/allwinner/aw_syscon.c
+++ b/sys/arm/allwinner/aw_syscon.c
@@ -41,8 +41,8 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/syscon/syscon.h>
-#include <dev/extres/syscon/syscon_generic.h>
+#include <dev/syscon/syscon.h>
+#include <dev/syscon/syscon_generic.h>
 
 static struct ofw_compat_data compat_data[] = {
 	{"allwinner,sun50i-a64-system-controller", 1},
diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c
--- a/sys/arm/allwinner/if_awg.c
+++ b/sys/arm/allwinner/if_awg.c
@@ -62,7 +62,7 @@
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
 #include <dev/regulator/regulator.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include "syscon_if.h"
 #include "miibus_if.h"
diff --git a/sys/arm/mv/clk/a37x0_xtal.c b/sys/arm/mv/clk/a37x0_xtal.c
--- a/sys/arm/mv/clk/a37x0_xtal.c
+++ b/sys/arm/mv/clk/a37x0_xtal.c
@@ -37,7 +37,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/clk/clk_fixed.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/mv_ap806_clock.c b/sys/arm/mv/mv_ap806_clock.c
--- a/sys/arm/mv/mv_ap806_clock.c
+++ b/sys/arm/mv/mv_ap806_clock.c
@@ -40,7 +40,7 @@
 #include <machine/intr.h>
 
 #include <dev/clk/clk_fixed.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/mv_cp110_clock.c b/sys/arm/mv/mv_cp110_clock.c
--- a/sys/arm/mv/mv_cp110_clock.c
+++ b/sys/arm/mv/mv_cp110_clock.c
@@ -41,7 +41,7 @@
 
 #include <dev/clk/clk_fixed.h>
 #include <dev/clk/clk_gate.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/mv_cp110_icu_bus.c b/sys/arm/mv/mv_cp110_icu_bus.c
--- a/sys/arm/mv/mv_cp110_icu_bus.c
+++ b/sys/arm/mv/mv_cp110_icu_bus.c
@@ -38,7 +38,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/fdt/simple_mfd.h>
 
 static struct ofw_compat_data compat_data[] = {
diff --git a/sys/arm/mv/mv_thermal.c b/sys/arm/mv/mv_thermal.c
--- a/sys/arm/mv/mv_thermal.c
+++ b/sys/arm/mv/mv_thermal.c
@@ -39,7 +39,7 @@
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/mvebu_gpio.c b/sys/arm/mv/mvebu_gpio.c
--- a/sys/arm/mv/mvebu_gpio.c
+++ b/sys/arm/mv/mvebu_gpio.c
@@ -43,7 +43,7 @@
 #include <machine/intr.h>
 #include <machine/resource.h>
 
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include <dev/gpio/gpiobusvar.h>
 
diff --git a/sys/arm/mv/mvebu_pinctrl.c b/sys/arm/mv/mvebu_pinctrl.c
--- a/sys/arm/mv/mvebu_pinctrl.c
+++ b/sys/arm/mv/mvebu_pinctrl.c
@@ -39,7 +39,7 @@
 #include <machine/resource.h>
 #include <machine/intr.h>
 
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include <dev/fdt/fdt_pinctrl.h>
 
diff --git a/sys/arm/ti/am335x/am335x_musb.c b/sys/arm/ti/am335x/am335x_musb.c
--- a/sys/arm/ti/am335x/am335x_musb.c
+++ b/sys/arm/ti/am335x/am335x_musb.c
@@ -67,7 +67,7 @@
 #include <arm/ti/am335x/am335x_scm.h>
 #include <arm/ti/ti_sysc.h>
 #include <dev/clk/clk.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include "syscon_if.h"
 
 #define USBCTRL_REV		0x00
diff --git a/sys/arm/ti/am335x/am335x_pwmss.c b/sys/arm/ti/am335x/am335x_pwmss.c
--- a/sys/arm/ti/am335x/am335x_pwmss.c
+++ b/sys/arm/ti/am335x/am335x_pwmss.c
@@ -45,7 +45,7 @@
 
 #include <arm/ti/ti_sysc.h>
 
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include "syscon_if.h"
 
 #include "am335x_pwm.h"
diff --git a/sys/arm/ti/am335x/am335x_scm.c b/sys/arm/ti/am335x/am335x_scm.c
--- a/sys/arm/ti/am335x/am335x_scm.c
+++ b/sys/arm/ti/am335x/am335x_scm.c
@@ -37,7 +37,7 @@
 #include <arm/ti/ti_cpuid.h>
 #include <arm/ti/ti_scm.h>
 
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include "syscon_if.h"
 
 #define	TZ_ZEROC	2731
diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c
--- a/sys/arm/ti/cpsw/if_cpsw.c
+++ b/sys/arm/ti/cpsw/if_cpsw.c
@@ -72,7 +72,7 @@
 #include <net/if_media.h>
 #include <net/if_types.h>
 
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include "syscon_if.h"
 #include <arm/ti/am335x/am335x_scm.h>
 
diff --git a/sys/arm/ti/ti_scm_syscon.c b/sys/arm/ti/ti_scm_syscon.c
--- a/sys/arm/ti/ti_scm_syscon.c
+++ b/sys/arm/ti/ti_scm_syscon.c
@@ -46,7 +46,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include "syscon_if.h"
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include "clkdev_if.h"
 
 #include <arm/ti/ti_cpuid.h>
diff --git a/sys/arm64/rockchip/rk3328_codec.c b/sys/arm64/rockchip/rk3328_codec.c
--- a/sys/arm64/rockchip/rk3328_codec.c
+++ b/sys/arm64/rockchip/rk3328_codec.c
@@ -41,7 +41,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include "syscon_if.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
@@ -44,7 +44,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.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
@@ -43,7 +43,7 @@
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
 #include <dev/regulator/regulator.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/phy/phy.h>
 
 #include <contrib/device-tree/include/dt-bindings/phy/phy.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
@@ -43,7 +43,7 @@
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
 #include <dev/regulator/regulator.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/phy/phy.h>
 
 #include <contrib/device-tree/include/dt-bindings/phy/phy.h>
diff --git a/sys/arm64/rockchip/rk_grf.c b/sys/arm64/rockchip/rk_grf.c
--- a/sys/arm64/rockchip/rk_grf.c
+++ b/sys/arm64/rockchip/rk_grf.c
@@ -37,7 +37,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/fdt/simple_mfd.h>
 
 static struct ofw_compat_data compat_data[] = {
diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c
--- a/sys/arm64/rockchip/rk_i2s.c
+++ b/sys/arm64/rockchip/rk_i2s.c
@@ -41,7 +41,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include "syscon_if.h"
 
diff --git a/sys/arm64/rockchip/rk_iodomain.c b/sys/arm64/rockchip/rk_iodomain.c
--- a/sys/arm64/rockchip/rk_iodomain.c
+++ b/sys/arm64/rockchip/rk_iodomain.c
@@ -35,7 +35,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/regulator/regulator.h>
 
 #include "syscon_if.h"
diff --git a/sys/arm64/rockchip/rk_otp.c b/sys/arm64/rockchip/rk_otp.c
--- a/sys/arm64/rockchip/rk_otp.c
+++ b/sys/arm64/rockchip/rk_otp.c
@@ -37,7 +37,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/fdt/simple_mfd.h>
 
 #include "rk_otp.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
@@ -47,7 +47,7 @@
 #include <dev/clk/clk.h>
 #include <dev/phy/phy.h>
 #include <dev/phy/phy_internal.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/hwreset/hwreset.h>
 
 #include "syscon_if.h"
diff --git a/sys/arm64/rockchip/rk_pinctrl.c b/sys/arm64/rockchip/rk_pinctrl.c
--- a/sys/arm64/rockchip/rk_pinctrl.c
+++ b/sys/arm64/rockchip/rk_pinctrl.c
@@ -48,7 +48,7 @@
 
 #include <dev/fdt/fdt_pinctrl.h>
 
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include "gpio_if.h"
 #include "syscon_if.h"
diff --git a/sys/arm64/rockchip/rk_pmu.c b/sys/arm64/rockchip/rk_pmu.c
--- a/sys/arm64/rockchip/rk_pmu.c
+++ b/sys/arm64/rockchip/rk_pmu.c
@@ -37,7 +37,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/fdt/simple_mfd.h>
 
 static struct ofw_compat_data compat_data[] = {
diff --git a/sys/arm64/rockchip/rk_tsadc.c b/sys/arm64/rockchip/rk_tsadc.c
--- a/sys/arm64/rockchip/rk_tsadc.c
+++ b/sys/arm64/rockchip/rk_tsadc.c
@@ -46,7 +46,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.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
@@ -45,7 +45,7 @@
 
 #include <dev/clk/clk.h>
 #include <dev/phy/phy_usb.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/hwreset/hwreset.h>
 
 #include "syscon_if.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
@@ -46,7 +46,7 @@
 #include <dev/clk/clk.h>
 #include <dev/phy/phy_usb.h>
 #include <dev/regulator/regulator.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include "clkdev_if.h"
 #include "syscon_if.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
@@ -40,11 +40,11 @@
 #include <dev/hwreset/hwreset.h>
 #include <dev/phy/phy_usb.h>
 #include <dev/regulator/regulator.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/fdt/simple_mfd.h>
 #include "phynode_if.h"
 #include "phynode_usb_if.h"
diff --git a/sys/conf/files b/sys/conf/files
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1677,10 +1677,6 @@
 dev/evdev/evdev_utils.c			optional evdev
 dev/evdev/uinput.c			optional evdev uinput
 dev/exca/exca.c			optional cbb
-dev/extres/syscon/syscon.c		optional syscon
-dev/extres/syscon/syscon_generic.c	optional syscon fdt
-dev/extres/syscon/syscon_if.m		optional syscon
-dev/extres/syscon/syscon_power.c	optional syscon syscon_power
 dev/fb/fbd.c			optional fbd | vt
 dev/fb/fb_if.m			standard
 dev/fb/splash.c			optional sc splash
@@ -3140,6 +3136,10 @@
 dev/stge/if_stge.c		optional stge
 dev/sym/sym_hipd.c		optional sym				\
 	dependency	"$S/dev/sym/sym_{conf,defs}.h"
+dev/syscon/syscon.c		optional syscon
+dev/syscon/syscon_generic.c	optional syscon fdt
+dev/syscon/syscon_if.m		optional syscon
+dev/syscon/syscon_power.c	optional syscon syscon_power
 dev/syscons/blank/blank_saver.c	optional blank_saver
 dev/syscons/daemon/daemon_saver.c optional daemon_saver
 dev/syscons/dragon/dragon_saver.c optional dragon_saver
diff --git a/sys/dev/clk/rockchip/rk_clk_composite.c b/sys/dev/clk/rockchip/rk_clk_composite.c
--- a/sys/dev/clk/rockchip/rk_clk_composite.c
+++ b/sys/dev/clk/rockchip/rk_clk_composite.c
@@ -30,7 +30,7 @@
 #include <sys/bus.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include <dev/clk/rockchip/rk_clk_composite.h>
 
diff --git a/sys/dev/clk/rockchip/rk_clk_mux.c b/sys/dev/clk/rockchip/rk_clk_mux.c
--- a/sys/dev/clk/rockchip/rk_clk_mux.c
+++ b/sys/dev/clk/rockchip/rk_clk_mux.c
@@ -35,7 +35,7 @@
 #include <machine/bus.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include <dev/clk/rockchip/rk_cru.h>
 #include <dev/clk/rockchip/rk_clk_mux.h>
diff --git a/sys/dev/dwc/if_dwc_rk.c b/sys/dev/dwc/if_dwc_rk.c
--- a/sys/dev/dwc/if_dwc_rk.c
+++ b/sys/dev/dwc/if_dwc_rk.c
@@ -45,7 +45,7 @@
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
 #include <dev/regulator/regulator.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include <dev/dwc/if_dwcvar.h>
 #include <dev/dwc/dwc1000_reg.h>
diff --git a/sys/dev/eqos/if_eqos_fdt.c b/sys/dev/eqos/if_eqos_fdt.c
--- a/sys/dev/eqos/if_eqos_fdt.c
+++ b/sys/dev/eqos/if_eqos_fdt.c
@@ -53,7 +53,7 @@
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
 #include <dev/regulator/regulator.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 #include <dev/eqos/if_eqos_var.h>
 
diff --git a/sys/dev/fdt/simple_mfd.c b/sys/dev/fdt/simple_mfd.c
--- a/sys/dev/fdt/simple_mfd.c
+++ b/sys/dev/fdt/simple_mfd.c
@@ -50,7 +50,7 @@
     struct simplebus_devinfo *di);
 
 #include "syscon_if.h"
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 MALLOC_DECLARE(M_SYSCON);
 
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
@@ -48,7 +48,7 @@
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
 #include <dev/phy/phy_usb.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 static struct ofw_compat_data compat_data[] = {
 	{ "qcom,dwc3",			1},
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
@@ -52,7 +52,7 @@
 #include <dev/ofw/ofw_subr.h>
 #include <dev/clk/clk.h>
 #include <dev/clk/clk_fixed.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/phy/phy.h>
 
 #include <dev/mmc/bridge.h>
diff --git a/sys/dev/sdhci/sdhci_fsl_fdt.c b/sys/dev/sdhci/sdhci_fsl_fdt.c
--- a/sys/dev/sdhci/sdhci_fsl_fdt.c
+++ b/sys/dev/sdhci/sdhci_fsl_fdt.c
@@ -40,7 +40,7 @@
 #include <machine/resource.h>
 
 #include <dev/clk/clk.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 #include <dev/mmc/bridge.h>
 #include <dev/mmc/mmcbrvar.h>
 #include <dev/mmc/mmc_fdt_helpers.h>
diff --git a/sys/dev/extres/syscon/syscon.h b/sys/dev/syscon/syscon.h
rename from sys/dev/extres/syscon/syscon.h
rename to sys/dev/syscon/syscon.h
diff --git a/sys/dev/extres/syscon/syscon.c b/sys/dev/syscon/syscon.c
rename from sys/dev/extres/syscon/syscon.c
rename to sys/dev/syscon/syscon.c
diff --git a/sys/dev/extres/syscon/syscon_generic.h b/sys/dev/syscon/syscon_generic.h
rename from sys/dev/extres/syscon/syscon_generic.h
rename to sys/dev/syscon/syscon_generic.h
diff --git a/sys/dev/extres/syscon/syscon_generic.c b/sys/dev/syscon/syscon_generic.c
rename from sys/dev/extres/syscon/syscon_generic.c
rename to sys/dev/syscon/syscon_generic.c
diff --git a/sys/dev/extres/syscon/syscon_if.m b/sys/dev/syscon/syscon_if.m
rename from sys/dev/extres/syscon/syscon_if.m
rename to sys/dev/syscon/syscon_if.m
diff --git a/sys/dev/extres/syscon/syscon_power.c b/sys/dev/syscon/syscon_power.c
rename from sys/dev/extres/syscon/syscon_power.c
rename to sys/dev/syscon/syscon_power.c
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
@@ -48,7 +48,7 @@
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
 #include <dev/phy/phy_usb.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 enum rk_dwc3_type {
 	RK3399 = 1,
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
@@ -50,7 +50,7 @@
 #include <dev/clk/clk.h>
 #include <dev/hwreset/hwreset.h>
 #include <dev/phy/phy_usb.h>
-#include <dev/extres/syscon/syscon.h>
+#include <dev/syscon/syscon.h>
 
 static struct ofw_compat_data compat_data[] = {
 	{ "xlnx,zynqmp-dwc3",	1 },
diff --git a/sys/riscv/riscv/riscv_syscon.c b/sys/riscv/riscv/riscv_syscon.c
--- a/sys/riscv/riscv/riscv_syscon.c
+++ b/sys/riscv/riscv/riscv_syscon.c
@@ -43,8 +43,8 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/syscon/syscon.h>
-#include <dev/extres/syscon/syscon_generic.h>
+#include <dev/syscon/syscon.h>
+#include <dev/syscon/syscon_generic.h>
 
 static struct ofw_compat_data compat_data[] = {
 	{"sifive,test0",	1},