diff --git a/sys/arm/allwinner/a10_ahci.c b/sys/arm/allwinner/a10_ahci.c
index 74765e1a30dd..a0717a0e9dfa 100644
--- a/sys/arm/allwinner/a10_ahci.c
+++ b/sys/arm/allwinner/a10_ahci.c
@@ -43,7 +43,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include <dev/ahci/ahci.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/regulator/regulator.h>
 
 /*
diff --git a/sys/arm/allwinner/a10_codec.c b/sys/arm/allwinner/a10_codec.c
index 711d2203f9a5..fc4937351f3b 100644
--- a/sys/arm/allwinner/a10_codec.c
+++ b/sys/arm/allwinner/a10_codec.c
@@ -47,7 +47,7 @@
 
 #include <dev/gpio/gpiobusvar.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include "sunxi_dma_if.h"
diff --git a/sys/arm/allwinner/a10_dmac.c b/sys/arm/allwinner/a10_dmac.c
index d5d27748a9d9..e711c5268b2d 100644
--- a/sys/arm/allwinner/a10_dmac.c
+++ b/sys/arm/allwinner/a10_dmac.c
@@ -45,7 +45,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include <arm/allwinner/a10_dmac.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include "sunxi_dma_if.h"
 
diff --git a/sys/arm/allwinner/a10_timer.c b/sys/arm/allwinner/a10_timer.c
index 890cb2332396..18fb2a56da3a 100644
--- a/sys/arm/allwinner/a10_timer.c
+++ b/sys/arm/allwinner/a10_timer.c
@@ -42,7 +42,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #if defined(__aarch64__)
 #include "opt_soc.h"
diff --git a/sys/arm/allwinner/a31_dmac.c b/sys/arm/allwinner/a31_dmac.c
index 0a291becbb9d..988444c4b1c5 100644
--- a/sys/arm/allwinner/a31_dmac.c
+++ b/sys/arm/allwinner/a31_dmac.c
@@ -46,7 +46,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include <arm/allwinner/a10_dmac.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include "sunxi_dma_if.h"
diff --git a/sys/arm/allwinner/a33_codec.c b/sys/arm/allwinner/a33_codec.c
index a0d455676430..d71562b08c9b 100644
--- a/sys/arm/allwinner/a33_codec.c
+++ b/sys/arm/allwinner/a33_codec.c
@@ -41,7 +41,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/gpio/gpiobusvar.h>
diff --git a/sys/arm/allwinner/a64/sun50i_a64_acodec.c b/sys/arm/allwinner/a64/sun50i_a64_acodec.c
index b5ab13efac41..f99d5385d897 100644
--- a/sys/arm/allwinner/a64/sun50i_a64_acodec.c
+++ b/sys/arm/allwinner/a64/sun50i_a64_acodec.c
@@ -40,7 +40,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 
diff --git a/sys/arm/allwinner/aw_cir.c b/sys/arm/allwinner/aw_cir.c
index bc326e6d6afa..7e9fdfca80bf 100644
--- a/sys/arm/allwinner/aw_cir.c
+++ b/sys/arm/allwinner/aw_cir.c
@@ -40,7 +40,7 @@
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/evdev/input.h>
diff --git a/sys/arm/allwinner/aw_gmacclk.c b/sys/arm/allwinner/aw_gmacclk.c
index 46672c8fcb0f..99e69674bd25 100644
--- a/sys/arm/allwinner/aw_gmacclk.c
+++ b/sys/arm/allwinner/aw_gmacclk.c
@@ -39,8 +39,8 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_subr.h>
 
-#include <dev/extres/clk/clk_mux.h>
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk_mux.h>
+#include <dev/clk/clk_gate.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c
index 5dd9a211acf4..b77972ac0187 100644
--- a/sys/arm/allwinner/aw_gpio.c
+++ b/sys/arm/allwinner/aw_gpio.c
@@ -52,7 +52,7 @@
 
 #include <arm/allwinner/aw_machdep.h>
 #include <arm/allwinner/allwinner_pinctrl.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 
diff --git a/sys/arm/allwinner/aw_i2s.c b/sys/arm/allwinner/aw_i2s.c
index 8c159de7da6d..376405056f51 100644
--- a/sys/arm/allwinner/aw_i2s.c
+++ b/sys/arm/allwinner/aw_i2s.c
@@ -40,7 +40,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include "syscon_if.h"
diff --git a/sys/arm/allwinner/aw_mmc.c b/sys/arm/allwinner/aw_mmc.c
index 466ada8942c6..7c783f69880c 100644
--- a/sys/arm/allwinner/aw_mmc.c
+++ b/sys/arm/allwinner/aw_mmc.c
@@ -52,7 +52,7 @@
 #include <dev/mmc/mmc_fdt_helpers.h>
 
 #include <arm/allwinner/aw_mmc.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 
diff --git a/sys/arm/allwinner/aw_rsb.c b/sys/arm/allwinner/aw_rsb.c
index 40627ebf8448..08522caff725 100644
--- a/sys/arm/allwinner/aw_rsb.c
+++ b/sys/arm/allwinner/aw_rsb.c
@@ -43,7 +43,7 @@
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include "iicbus_if.h"
diff --git a/sys/arm/allwinner/aw_rtc.c b/sys/arm/allwinner/aw_rtc.c
index 92bb73efc1f5..9938601f17ce 100644
--- a/sys/arm/allwinner/aw_rtc.c
+++ b/sys/arm/allwinner/aw_rtc.c
@@ -41,7 +41,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
 
 #include <arm/allwinner/aw_machdep.h>
 
diff --git a/sys/arm/allwinner/aw_thermal.c b/sys/arm/allwinner/aw_thermal.c
index 99e302571220..4f1e02612347 100644
--- a/sys/arm/allwinner/aw_thermal.c
+++ b/sys/arm/allwinner/aw_thermal.c
@@ -43,7 +43,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/nvmem/nvmem.h>
 
diff --git a/sys/arm/allwinner/aw_usb3phy.c b/sys/arm/allwinner/aw_usb3phy.c
index e2bf9c068538..058fce6061a7 100644
--- a/sys/arm/allwinner/aw_usb3phy.c
+++ b/sys/arm/allwinner/aw_usb3phy.c
@@ -42,7 +42,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 #include <dev/extres/phy/phy_usb.h>
diff --git a/sys/arm/allwinner/aw_usbphy.c b/sys/arm/allwinner/aw_usbphy.c
index 4125a13b36c2..33c11e62ef7c 100644
--- a/sys/arm/allwinner/aw_usbphy.c
+++ b/sys/arm/allwinner/aw_usbphy.c
@@ -40,7 +40,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/gpio/gpiobusvar.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 #include <dev/extres/phy/phy_usb.h>
diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c
index acc99083ad93..516cbefc6272 100644
--- a/sys/arm/allwinner/if_awg.c
+++ b/sys/arm/allwinner/if_awg.c
@@ -59,7 +59,7 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 #include <dev/extres/syscon/syscon.h>
diff --git a/sys/arm/allwinner/if_emac.c b/sys/arm/allwinner/if_emac.c
index c704e7830cbc..f581d361d3d9 100644
--- a/sys/arm/allwinner/if_emac.c
+++ b/sys/arm/allwinner/if_emac.c
@@ -75,7 +75,7 @@
 #include <arm/allwinner/if_emacreg.h>
 #include <arm/allwinner/aw_sid.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include "miibus_if.h"
 
diff --git a/sys/arm/freescale/imx/imx_gpio.c b/sys/arm/freescale/imx/imx_gpio.c
index d3d01d3cb857..c5e92992a36b 100644
--- a/sys/arm/freescale/imx/imx_gpio.c
+++ b/sys/arm/freescale/imx/imx_gpio.c
@@ -59,7 +59,7 @@
 #endif
 
 #ifdef IMX_ENABLE_CLOCKS
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #endif
 
 #include "gpio_if.h"
diff --git a/sys/arm/freescale/imx/imx_i2c.c b/sys/arm/freescale/imx/imx_i2c.c
index 7014ea4ea7e3..f8769d29e7f7 100644
--- a/sys/arm/freescale/imx/imx_i2c.c
+++ b/sys/arm/freescale/imx/imx_i2c.c
@@ -75,7 +75,7 @@
 #endif
 
 #ifdef IMX_ENABLE_CLOCKS
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #endif
 
 #define I2C_ADDR_REG		0x00 /* I2C slave address register */
diff --git a/sys/arm/freescale/vybrid/vf_i2c.c b/sys/arm/freescale/vybrid/vf_i2c.c
index 38717c186814..cc0b32bb4759 100644
--- a/sys/arm/freescale/vybrid/vf_i2c.c
+++ b/sys/arm/freescale/vybrid/vf_i2c.c
@@ -54,7 +54,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
diff --git a/sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c b/sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c
index 423a42b80e06..b102f05d25c1 100644
--- a/sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c
+++ b/sys/arm/mv/clk/a37x0_nb_periph_clk_driver.c
@@ -35,8 +35,8 @@
 
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_fixed.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/a37x0_periph_clk_driver.c b/sys/arm/mv/clk/a37x0_periph_clk_driver.c
index e8d90a0c9904..4456537ea785 100644
--- a/sys/arm/mv/clk/a37x0_periph_clk_driver.c
+++ b/sys/arm/mv/clk/a37x0_periph_clk_driver.c
@@ -35,8 +35,8 @@
 
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_fixed.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c b/sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c
index 0429c8ae12f8..910525411c7f 100644
--- a/sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c
+++ b/sys/arm/mv/clk/a37x0_sb_periph_clk_driver.c
@@ -35,8 +35,8 @@
 
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_fixed.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/a37x0_tbg.c b/sys/arm/mv/clk/a37x0_tbg.c
index d8f0f5203455..32ec1c83b102 100644
--- a/sys/arm/mv/clk/a37x0_tbg.c
+++ b/sys/arm/mv/clk/a37x0_tbg.c
@@ -32,7 +32,7 @@
 #include <sys/rman.h>
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include "clkdev_if.h"
diff --git a/sys/arm/mv/clk/a37x0_tbg_pll.c b/sys/arm/mv/clk/a37x0_tbg_pll.c
index 83115dc5741d..da8ff83cc898 100644
--- a/sys/arm/mv/clk/a37x0_tbg_pll.c
+++ b/sys/arm/mv/clk/a37x0_tbg_pll.c
@@ -30,7 +30,7 @@
 #include <sys/rman.h>
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/a37x0_tbg_pll.h b/sys/arm/mv/clk/a37x0_tbg_pll.h
index 2bb4fa6ab478..6c79c44c64db 100644
--- a/sys/arm/mv/clk/a37x0_tbg_pll.h
+++ b/sys/arm/mv/clk/a37x0_tbg_pll.h
@@ -29,7 +29,7 @@
 #ifndef	_TBG_CLK_PLL_H_
 #define	_TBG_CLK_PLL_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct a37x0_tbg_pll_reg_def {
 	uint32_t		offset;
diff --git a/sys/arm/mv/clk/a37x0_xtal.c b/sys/arm/mv/clk/a37x0_xtal.c
index e4ce8a90a24e..67a791b8d34a 100644
--- a/sys/arm/mv/clk/a37x0_xtal.c
+++ b/sys/arm/mv/clk/a37x0_xtal.c
@@ -35,8 +35,8 @@
 
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_fixed.h>
 #include <dev/extres/syscon/syscon.h>
 
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/mv/clk/armada38x_coreclk.c b/sys/arm/mv/clk/armada38x_coreclk.c
index 21e630d18b06..f0f7767397b5 100644
--- a/sys/arm/mv/clk/armada38x_coreclk.c
+++ b/sys/arm/mv/clk/armada38x_coreclk.c
@@ -37,7 +37,7 @@
 #include <dev/fdt/simplebus.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm/mv/mvwin.h>
 #include <arm/mv/mvreg.h>
diff --git a/sys/arm/mv/clk/armada38x_gateclk.c b/sys/arm/mv/clk/armada38x_gateclk.c
index c50a65b3396e..24355d9c9dac 100644
--- a/sys/arm/mv/clk/armada38x_gateclk.c
+++ b/sys/arm/mv/clk/armada38x_gateclk.c
@@ -38,8 +38,8 @@
 #include <dev/fdt/simplebus.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_gate.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/arm/mv/clk/armada38x_gen.c b/sys/arm/mv/clk/armada38x_gen.c
index 13951a33da55..b225c927f0d2 100644
--- a/sys/arm/mv/clk/armada38x_gen.c
+++ b/sys/arm/mv/clk/armada38x_gen.c
@@ -30,7 +30,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm/mv/clk/armada38x_gen.h>
 
diff --git a/sys/arm/mv/clk/armada38x_gen.h b/sys/arm/mv/clk/armada38x_gen.h
index ad46e38728fa..7275bd528529 100644
--- a/sys/arm/mv/clk/armada38x_gen.h
+++ b/sys/arm/mv/clk/armada38x_gen.h
@@ -27,7 +27,7 @@
 #ifndef _ARMADA38X_GEN_H_
 #define _ARMADA38X_GEN_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct armada38x_gen_clknode_def
 {
diff --git a/sys/arm/mv/clk/periph.c b/sys/arm/mv/clk/periph.c
index 98445fa8bc6a..986016f77b8f 100644
--- a/sys/arm/mv/clk/periph.c
+++ b/sys/arm/mv/clk/periph.c
@@ -35,11 +35,11 @@
 
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/periph.h b/sys/arm/mv/clk/periph.h
index 3eada61665a2..f23f641b8f1d 100644
--- a/sys/arm/mv/clk/periph.h
+++ b/sys/arm/mv/clk/periph.h
@@ -29,10 +29,10 @@
 #ifndef	_PERIPH_H_
 #define	_PERIPH_H_
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_mux.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_gate.h>
 
 #define TBG_SEL                 0x0
 #define DIV_SEL0                0x4
diff --git a/sys/arm/mv/clk/periph_clk_d.c b/sys/arm/mv/clk/periph_clk_d.c
index 0e8659d56e18..f3dc3a30a8b6 100644
--- a/sys/arm/mv/clk/periph_clk_d.c
+++ b/sys/arm/mv/clk/periph_clk_d.c
@@ -35,11 +35,11 @@
 
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/periph_clk_fixed.c b/sys/arm/mv/clk/periph_clk_fixed.c
index d3c1f0deafa8..e0e6f446716c 100644
--- a/sys/arm/mv/clk/periph_clk_fixed.c
+++ b/sys/arm/mv/clk/periph_clk_fixed.c
@@ -35,11 +35,11 @@
 
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/periph_clk_gate.c b/sys/arm/mv/clk/periph_clk_gate.c
index 803b5f8ed7e1..538077eb444f 100644
--- a/sys/arm/mv/clk/periph_clk_gate.c
+++ b/sys/arm/mv/clk/periph_clk_gate.c
@@ -35,11 +35,11 @@
 
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/mv/clk/periph_clk_mux_gate.c b/sys/arm/mv/clk/periph_clk_mux_gate.c
index 6016a7b1c1a4..f96d034228b4 100644
--- a/sys/arm/mv/clk/periph_clk_mux_gate.c
+++ b/sys/arm/mv/clk/periph_clk_mux_gate.c
@@ -35,11 +35,11 @@
 
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_mux.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
index b926a58aca0c..f41f5e09c4dd 100644
--- a/sys/arm/mv/mv_ap806_clock.c
+++ b/sys/arm/mv/mv_ap806_clock.c
@@ -39,7 +39,7 @@
 #include <machine/resource.h>
 #include <machine/intr.h>
 
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
 #include <dev/extres/syscon/syscon.h>
 
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/mv/mv_cp110_clock.c b/sys/arm/mv/mv_cp110_clock.c
index 604195da1ab4..45f8476df5b3 100644
--- a/sys/arm/mv/mv_cp110_clock.c
+++ b/sys/arm/mv/mv_cp110_clock.c
@@ -39,8 +39,8 @@
 #include <machine/resource.h>
 #include <machine/intr.h>
 
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
 #include <dev/extres/syscon/syscon.h>
 
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/nvidia/drm2/tegra_bo.c b/sys/arm/nvidia/drm2/tegra_bo.c
index 1ffd65de9d36..c27b9f39c508 100644
--- a/sys/arm/nvidia/drm2/tegra_bo.c
+++ b/sys/arm/nvidia/drm2/tegra_bo.c
@@ -32,7 +32,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/drm2/drmP.h>
 #include <dev/drm2/drm_crtc_helper.h>
 #include <dev/drm2/drm_fb_helper.h>
diff --git a/sys/arm/nvidia/drm2/tegra_dc.c b/sys/arm/nvidia/drm2/tegra_dc.c
index 81177180056c..637ea3981acc 100644
--- a/sys/arm/nvidia/drm2/tegra_dc.c
+++ b/sys/arm/nvidia/drm2/tegra_dc.c
@@ -36,7 +36,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/drm2/drmP.h>
 #include <dev/drm2/drm_crtc_helper.h>
diff --git a/sys/arm/nvidia/drm2/tegra_drm_subr.c b/sys/arm/nvidia/drm2/tegra_drm_subr.c
index 920419cc777e..060445966d68 100644
--- a/sys/arm/nvidia/drm2/tegra_drm_subr.c
+++ b/sys/arm/nvidia/drm2/tegra_drm_subr.c
@@ -32,7 +32,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/drm2/drmP.h>
 #include <dev/drm2/drm_crtc.h>
 #include <dev/drm2/drm_crtc_helper.h>
diff --git a/sys/arm/nvidia/drm2/tegra_fb.c b/sys/arm/nvidia/drm2/tegra_fb.c
index 23994060700b..d6a74a32fffb 100644
--- a/sys/arm/nvidia/drm2/tegra_fb.c
+++ b/sys/arm/nvidia/drm2/tegra_fb.c
@@ -32,7 +32,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/drm2/drmP.h>
 #include <dev/drm2/drm_crtc_helper.h>
 #include <dev/drm2/drm_fb_helper.h>
diff --git a/sys/arm/nvidia/drm2/tegra_hdmi.c b/sys/arm/nvidia/drm2/tegra_hdmi.c
index c45ca1721ff0..1c5e86bde498 100644
--- a/sys/arm/nvidia/drm2/tegra_hdmi.c
+++ b/sys/arm/nvidia/drm2/tegra_hdmi.c
@@ -36,7 +36,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 #include <dev/drm2/drmP.h>
diff --git a/sys/arm/nvidia/drm2/tegra_host1x.c b/sys/arm/nvidia/drm2/tegra_host1x.c
index 080fbef659a1..284c5c2e8465 100644
--- a/sys/arm/nvidia/drm2/tegra_host1x.c
+++ b/sys/arm/nvidia/drm2/tegra_host1x.c
@@ -40,7 +40,7 @@
 #include <machine/bus.h>
 #include <machine/resource.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/drm2/drmP.h>
 #include <dev/drm2/drm_crtc_helper.h>
diff --git a/sys/arm/nvidia/tegra124/tegra124_car.c b/sys/arm/nvidia/tegra124/tegra124_car.c
index ebb30b29aaa9..440f5a5b1044 100644
--- a/sys/arm/nvidia/tegra124/tegra124_car.c
+++ b/sys/arm/nvidia/tegra124/tegra124_car.c
@@ -38,10 +38,10 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_mux.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_per.c b/sys/arm/nvidia/tegra124/tegra124_clk_per.c
index 95af7a75b21b..90edc6d3a8ec 100644
--- a/sys/arm/nvidia/tegra124/tegra124_clk_per.c
+++ b/sys/arm/nvidia/tegra124/tegra124_clk_per.c
@@ -33,7 +33,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dt-bindings/clock/tegra124-car.h>
 #include "tegra124_car.h"
diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_pll.c b/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
index 524b31d299cd..fb2480436d78 100644
--- a/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
+++ b/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
@@ -33,7 +33,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dt-bindings/clock/tegra124-car.h>
 #include "tegra124_car.h"
diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_super.c b/sys/arm/nvidia/tegra124/tegra124_clk_super.c
index 8fb5e524e5fd..28245c257aea 100644
--- a/sys/arm/nvidia/tegra124/tegra124_clk_super.c
+++ b/sys/arm/nvidia/tegra124/tegra124_clk_super.c
@@ -33,7 +33,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dt-bindings/clock/tegra124-car.h>
 #include "tegra124_car.h"
diff --git a/sys/arm/nvidia/tegra124/tegra124_coretemp.c b/sys/arm/nvidia/tegra124/tegra124_coretemp.c
index a22618ca5338..42ed02de4f86 100644
--- a/sys/arm/nvidia/tegra124/tegra124_coretemp.c
+++ b/sys/arm/nvidia/tegra124/tegra124_coretemp.c
@@ -37,7 +37,7 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include "tegra_soctherm_if.h"
diff --git a/sys/arm/nvidia/tegra124/tegra124_cpufreq.c b/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
index f407d093455a..7cf83978557e 100644
--- a/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
+++ b/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
@@ -36,7 +36,7 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/regulator/regulator.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/arm/nvidia/tegra124/tegra124_pmc.c b/sys/arm/nvidia/tegra124/tegra124_pmc.c
index 1742d624384b..6b42659d453a 100644
--- a/sys/arm/nvidia/tegra124/tegra124_pmc.c
+++ b/sys/arm/nvidia/tegra124/tegra124_pmc.c
@@ -36,7 +36,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra_ahci.c b/sys/arm/nvidia/tegra_ahci.c
index 4f44a09b4a76..eeb49d6ea5a8 100644
--- a/sys/arm/nvidia/tegra_ahci.c
+++ b/sys/arm/nvidia/tegra_ahci.c
@@ -44,7 +44,7 @@
 #include <machine/resource.h>
 
 #include <dev/ahci/ahci.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/extres/regulator/regulator.h>
diff --git a/sys/arm/nvidia/tegra_efuse.c b/sys/arm/nvidia/tegra_efuse.c
index 1adfb14213e8..9e151f6ed564 100644
--- a/sys/arm/nvidia/tegra_efuse.c
+++ b/sys/arm/nvidia/tegra_efuse.c
@@ -39,7 +39,7 @@
 #include <machine/bus.h>
 #include <machine/resource.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra_ehci.c b/sys/arm/nvidia/tegra_ehci.c
index 9160ca4fa1f3..1d34ed45dd90 100644
--- a/sys/arm/nvidia/tegra_ehci.c
+++ b/sys/arm/nvidia/tegra_ehci.c
@@ -42,7 +42,7 @@
 #include <machine/bus.h>
 #include <machine/resource.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/nvidia/tegra_i2c.c b/sys/arm/nvidia/tegra_i2c.c
index 6b68b859a037..1849ae33e3a2 100644
--- a/sys/arm/nvidia/tegra_i2c.c
+++ b/sys/arm/nvidia/tegra_i2c.c
@@ -43,7 +43,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
diff --git a/sys/arm/nvidia/tegra_mc.c b/sys/arm/nvidia/tegra_mc.c
index bad75f274af0..020c9617b453 100644
--- a/sys/arm/nvidia/tegra_mc.c
+++ b/sys/arm/nvidia/tegra_mc.c
@@ -42,7 +42,7 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/arm/nvidia/tegra_pcie.c b/sys/arm/nvidia/tegra_pcie.c
index 4ac557510b23..82e282146d68 100644
--- a/sys/arm/nvidia/tegra_pcie.c
+++ b/sys/arm/nvidia/tegra_pcie.c
@@ -47,7 +47,7 @@
 #include <vm/vm_kern.h>
 #include <vm/pmap.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/extres/regulator/regulator.h>
diff --git a/sys/arm/nvidia/tegra_rtc.c b/sys/arm/nvidia/tegra_rtc.c
index b489967c946e..07bf51628665 100644
--- a/sys/arm/nvidia/tegra_rtc.c
+++ b/sys/arm/nvidia/tegra_rtc.c
@@ -43,7 +43,7 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/arm/nvidia/tegra_sdhci.c b/sys/arm/nvidia/tegra_sdhci.c
index b9b47f0d1c6f..6877b7021980 100644
--- a/sys/arm/nvidia/tegra_sdhci.c
+++ b/sys/arm/nvidia/tegra_sdhci.c
@@ -48,7 +48,7 @@
 #include <machine/resource.h>
 #include <machine/intr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/gpio/gpiobusvar.h>
 #include <dev/mmc/bridge.h>
diff --git a/sys/arm/nvidia/tegra_soctherm.c b/sys/arm/nvidia/tegra_soctherm.c
index 2cd0400b5c95..0018833e5a43 100644
--- a/sys/arm/nvidia/tegra_soctherm.c
+++ b/sys/arm/nvidia/tegra_soctherm.c
@@ -43,7 +43,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/nvidia/tegra_uart.c b/sys/arm/nvidia/tegra_uart.c
index 05d1c46407f7..31f92d34a6d3 100644
--- a/sys/arm/nvidia/tegra_uart.c
+++ b/sys/arm/nvidia/tegra_uart.c
@@ -39,7 +39,7 @@
 #include <sys/sysctl.h>
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.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
index 5c48afd48d2f..438ba719170c 100644
--- a/sys/arm/nvidia/tegra_usbphy.c
+++ b/sys/arm/nvidia/tegra_usbphy.c
@@ -38,7 +38,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/extres/regulator/regulator.h>
diff --git a/sys/arm/nvidia/tegra_xhci.c b/sys/arm/nvidia/tegra_xhci.c
index 2c2c69d177ea..e80e34f38c38 100644
--- a/sys/arm/nvidia/tegra_xhci.c
+++ b/sys/arm/nvidia/tegra_xhci.c
@@ -52,7 +52,7 @@
 #include <machine/bus.h>
 #include <machine/resource.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/extres/regulator/regulator.h>
diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c
index d6ea5267a9be..a4ca188bd83b 100644
--- a/sys/arm/ti/am335x/am335x_dmtimer.c
+++ b/sys/arm/ti/am335x/am335x_dmtimer.c
@@ -39,7 +39,7 @@
 
 #include <machine/machdep.h> /* For arm_set_delay */
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/ti/am335x/am335x_dmtpps.c b/sys/arm/ti/am335x/am335x_dmtpps.c
index 23b930741c2a..f3e4386e4837 100644
--- a/sys/arm/ti/am335x/am335x_dmtpps.c
+++ b/sys/arm/ti/am335x/am335x_dmtpps.c
@@ -60,7 +60,7 @@
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm/ti/ti_sysc.h>
 #include <arm/ti/ti_pinmux.h>
diff --git a/sys/arm/ti/am335x/am335x_lcd.c b/sys/arm/ti/am335x/am335x_lcd.c
index 82895436bdf1..9bef1df0c64c 100644
--- a/sys/arm/ti/am335x/am335x_lcd.c
+++ b/sys/arm/ti/am335x/am335x_lcd.c
@@ -48,7 +48,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arm/ti/am335x/am335x_musb.c b/sys/arm/ti/am335x/am335x_musb.c
index 28058cc96899..b24f12990640 100644
--- a/sys/arm/ti/am335x/am335x_musb.c
+++ b/sys/arm/ti/am335x/am335x_musb.c
@@ -66,7 +66,7 @@
 
 #include <arm/ti/am335x/am335x_scm.h>
 #include <arm/ti/ti_sysc.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/syscon/syscon.h>
 #include "syscon_if.h"
 
diff --git a/sys/arm/ti/clk/clock_common.c b/sys/arm/ti/clk/clock_common.c
index 78f60f609146..f8c9745dfc89 100644
--- a/sys/arm/ti/clk/clock_common.c
+++ b/sys/arm/ti/clk/clock_common.c
@@ -38,7 +38,7 @@
 #include <machine/bus.h>
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_mux.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/arm/ti/clk/ti_clk_clkctrl.c b/sys/arm/ti/clk/ti_clk_clkctrl.c
index 1fc15e679051..037f02a64f0f 100644
--- a/sys/arm/ti/clk/ti_clk_clkctrl.c
+++ b/sys/arm/ti/clk/ti_clk_clkctrl.c
@@ -30,7 +30,7 @@
 #include <sys/bus.h>
 #include <sys/malloc.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm/ti/clk/ti_clk_clkctrl.h>
 
diff --git a/sys/arm/ti/clk/ti_clk_clkctrl.h b/sys/arm/ti/clk/ti_clk_clkctrl.h
index 2ecda3e0d1f6..6410c0488bb9 100644
--- a/sys/arm/ti/clk/ti_clk_clkctrl.h
+++ b/sys/arm/ti/clk/ti_clk_clkctrl.h
@@ -28,7 +28,7 @@
 #ifndef _TI_CLK_CLKCTRL_H_
 #define _TI_CLK_CLKCTRL_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct ti_clk_clkctrl_def {
 	struct clknode_init_def 	clkdef;
diff --git a/sys/arm/ti/clk/ti_clk_dpll.c b/sys/arm/ti/clk/ti_clk_dpll.c
index 0a23a2222c0e..c3d9d04b80c3 100644
--- a/sys/arm/ti/clk/ti_clk_dpll.c
+++ b/sys/arm/ti/clk/ti_clk_dpll.c
@@ -33,7 +33,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm/ti/clk/ti_clk_dpll.h>
 
diff --git a/sys/arm/ti/clk/ti_clk_dpll.h b/sys/arm/ti/clk/ti_clk_dpll.h
index 7bb51cd5efbe..731df77828f6 100644
--- a/sys/arm/ti/clk/ti_clk_dpll.h
+++ b/sys/arm/ti/clk/ti_clk_dpll.h
@@ -30,7 +30,7 @@
 #ifndef _TI_DPLL_CLOCK_H_
 #define _TI_DPLL_CLOCK_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 /* Registers are described in AM335x TRM chapter 8.1.12.2.* */
 
diff --git a/sys/arm/ti/clk/ti_divider_clock.c b/sys/arm/ti/clk/ti_divider_clock.c
index c1b2e25a7651..ebe623762efc 100644
--- a/sys/arm/ti/clk/ti_divider_clock.c
+++ b/sys/arm/ti/clk/ti_divider_clock.c
@@ -36,7 +36,7 @@
 #include <machine/bus.h>
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk_div.h>
+#include <dev/clk/clk_div.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/arm/ti/clk/ti_dpll_clock.c b/sys/arm/ti/clk/ti_dpll_clock.c
index b47fef83bc3f..84b86008b6d6 100644
--- a/sys/arm/ti/clk/ti_dpll_clock.c
+++ b/sys/arm/ti/clk/ti_dpll_clock.c
@@ -36,7 +36,7 @@
 #include <machine/bus.h>
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk_div.h>
+#include <dev/clk/clk_div.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/arm/ti/clk/ti_gate_clock.c b/sys/arm/ti/clk/ti_gate_clock.c
index cf33f06574b7..fc54a196fb5e 100644
--- a/sys/arm/ti/clk/ti_gate_clock.c
+++ b/sys/arm/ti/clk/ti_gate_clock.c
@@ -36,7 +36,7 @@
 #include <machine/bus.h>
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk_gate.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/arm/ti/clk/ti_mux_clock.c b/sys/arm/ti/clk/ti_mux_clock.c
index 684e95305038..a6c506fedce0 100644
--- a/sys/arm/ti/clk/ti_mux_clock.c
+++ b/sys/arm/ti/clk/ti_mux_clock.c
@@ -38,7 +38,7 @@
 #include <machine/bus.h>
 #include <dev/fdt/simplebus.h>
 
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_mux.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c
index 378c892c95ec..85d075419fe8 100644
--- a/sys/arm/ti/ti_pruss.c
+++ b/sys/arm/ti/ti_pruss.c
@@ -55,7 +55,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm/ti/ti_sysc.h>
 #include <arm/ti/ti_pruss.h>
diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c
index 0c01693c3c52..29035fee77c9 100644
--- a/sys/arm/ti/ti_sdhci.c
+++ b/sys/arm/ti/ti_sdhci.c
@@ -46,7 +46,7 @@
 #include <arm/ti/ti_sysc.h>
 #include "gpio_if.h"
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/arm/ti/ti_sysc.c b/sys/arm/ti/ti_sysc.c
index b00642bb87c5..f5a132e5702d 100644
--- a/sys/arm/ti/ti_sysc.c
+++ b/sys/arm/ti/ti_sysc.c
@@ -45,7 +45,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm/ti/ti_sysc.h>
 #include <arm/ti/clk/clock_common.h>
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_composite.c b/sys/arm64/freescale/imx/clk/imx_clk_composite.c
index 76a8979a82d4..1d5ab5908d8c 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_composite.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_composite.c
@@ -29,7 +29,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm64/freescale/imx/clk/imx_clk_composite.h>
 
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_composite.h b/sys/arm64/freescale/imx/clk/imx_clk_composite.h
index 84c7aea519ce..6c6d553b1e98 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_composite.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_composite.h
@@ -28,7 +28,7 @@
 #ifndef _IMX_CLK_COMPOSITE_H_
 #define _IMX_CLK_COMPOSITE_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct imx_clk_composite_def {
 	struct clknode_init_def	clkdef;
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c
index 277c06e7badd..daa69d152af4 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c
@@ -29,7 +29,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm64/freescale/imx/clk/imx_clk_frac_pll.h>
 
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h
index 17bb75f129ac..157b9638b1fd 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h
@@ -28,7 +28,7 @@
 #ifndef _IMX_CLK_FRAC_PLL_H_
 #define _IMX_CLK_FRAC_PLL_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct imx_clk_frac_pll_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_gate.c b/sys/arm64/freescale/imx/clk/imx_clk_gate.c
index e666c063b29d..57d85291e0c2 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_gate.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_gate.c
@@ -30,7 +30,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm64/freescale/imx/clk/imx_clk_gate.h>
 
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_gate.h b/sys/arm64/freescale/imx/clk/imx_clk_gate.h
index c018466a585d..9fb7af24b282 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_gate.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_gate.h
@@ -28,7 +28,7 @@
 #ifndef _IMX_CLK_GATE_H_
 #define _IMX_CLK_GATE_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct imx_clk_gate_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_mux.c b/sys/arm64/freescale/imx/clk/imx_clk_mux.c
index 41f1bdb3bef1..ec84de9c3534 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_mux.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_mux.c
@@ -34,7 +34,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm64/freescale/imx/clk/imx_clk_mux.h>
 
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_mux.h b/sys/arm64/freescale/imx/clk/imx_clk_mux.h
index 3955e352c5e7..a735ff223037 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_mux.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_mux.h
@@ -28,7 +28,7 @@
 #ifndef _IMX_CLK_MUX_H_
 #define _IMX_CLK_MUX_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct imx_clk_mux_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c
index ae6395de707a..0f80be5e06c0 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c
@@ -29,7 +29,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm64/freescale/imx/clk/imx_clk_sscg_pll.h>
 
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h
index 16f0016a1d66..346606265e63 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h
@@ -28,7 +28,7 @@
 #ifndef _IMX_CLK_SSCG_PLL_H_
 #define _IMX_CLK_SSCG_PLL_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct imx_clk_sscg_pll_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/arm64/freescale/imx/imx_ccm_clk.h b/sys/arm64/freescale/imx/imx_ccm_clk.h
index 376815bc1663..4c16fa00fe6b 100644
--- a/sys/arm64/freescale/imx/imx_ccm_clk.h
+++ b/sys/arm64/freescale/imx/imx_ccm_clk.h
@@ -28,11 +28,11 @@
 #ifndef	IMX6_CCM_CLK_H
 #define	IMX6_CCM_CLK_H
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_link.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_link.h>
 
 enum imx_clk_type {
 	IMX_CLK_UNDEFINED = 0,
diff --git a/sys/arm64/nvidia/tegra210/tegra210_car.c b/sys/arm64/nvidia/tegra210/tegra210_car.c
index 0562b91c5a97..2046782805d6 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_car.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_car.c
@@ -39,10 +39,10 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_mux.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm64/nvidia/tegra210/tegra210_clk_per.c b/sys/arm64/nvidia/tegra210/tegra210_clk_per.c
index 0d84d42bb459..8918cfdd929c 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_clk_per.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_clk_per.c
@@ -34,7 +34,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dt-bindings/clock/tegra210-car.h>
 #include <dt-bindings/reset/tegra210-car.h>
diff --git a/sys/arm64/nvidia/tegra210/tegra210_clk_pll.c b/sys/arm64/nvidia/tegra210/tegra210_clk_pll.c
index 8c1a2045d990..41aa4dc0fdae 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_clk_pll.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_clk_pll.c
@@ -34,10 +34,10 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dt-bindings/clock/tegra210-car.h>
 #include "tegra210_car.h"
diff --git a/sys/arm64/nvidia/tegra210/tegra210_clk_super.c b/sys/arm64/nvidia/tegra210/tegra210_clk_super.c
index 7fd1b8ec7a7a..57a1d4c22d51 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_clk_super.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_clk_super.c
@@ -34,7 +34,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dt-bindings/clock/tegra210-car.h>
 #include "tegra210_car.h"
diff --git a/sys/arm64/nvidia/tegra210/tegra210_coretemp.c b/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
index fc6e3b17de34..ac037d4ac385 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
@@ -38,7 +38,7 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include "tegra_soctherm_if.h"
diff --git a/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c b/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
index e8b48c4a4947..99b54b224e89 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
@@ -37,7 +37,7 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/regulator/regulator.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/arm64/nvidia/tegra210/tegra210_pmc.c b/sys/arm64/nvidia/tegra210/tegra210_pmc.c
index 0f56342d1ac4..a04ec212a8c7 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_pmc.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_pmc.c
@@ -36,7 +36,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
index c3bf2d54668b..bfcd8894034a 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
@@ -35,7 +35,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/extres/regulator/regulator.h>
diff --git a/sys/arm64/qoriq/clk/ls1028a_clkgen.c b/sys/arm64/qoriq/clk/ls1028a_clkgen.c
index a003d366267b..9c4dafed4e59 100644
--- a/sys/arm64/qoriq/clk/ls1028a_clkgen.c
+++ b/sys/arm64/qoriq/clk/ls1028a_clkgen.c
@@ -39,7 +39,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
 
 #include <arm64/qoriq/clk/qoriq_clkgen.h>
 
diff --git a/sys/arm64/qoriq/clk/ls1028a_flexspi_clk.c b/sys/arm64/qoriq/clk/ls1028a_flexspi_clk.c
index 00cf738d1b9e..e8635b35fe5f 100644
--- a/sys/arm64/qoriq/clk/ls1028a_flexspi_clk.c
+++ b/sys/arm64/qoriq/clk/ls1028a_flexspi_clk.c
@@ -40,7 +40,7 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
-#include <dev/extres/clk/clk_div.h>
+#include <dev/clk/clk_div.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm64/qoriq/clk/ls1046a_clkgen.c b/sys/arm64/qoriq/clk/ls1046a_clkgen.c
index cc6f01537f81..96bafe415089 100644
--- a/sys/arm64/qoriq/clk/ls1046a_clkgen.c
+++ b/sys/arm64/qoriq/clk/ls1046a_clkgen.c
@@ -39,7 +39,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
 
 #include <arm64/qoriq/clk/qoriq_clkgen.h>
 
diff --git a/sys/arm64/qoriq/clk/ls1088a_clkgen.c b/sys/arm64/qoriq/clk/ls1088a_clkgen.c
index 916bf9a25331..df5a343ec109 100644
--- a/sys/arm64/qoriq/clk/ls1088a_clkgen.c
+++ b/sys/arm64/qoriq/clk/ls1088a_clkgen.c
@@ -44,7 +44,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
 
 #include <arm64/qoriq/clk/qoriq_clkgen.h>
 
diff --git a/sys/arm64/qoriq/clk/lx2160a_clkgen.c b/sys/arm64/qoriq/clk/lx2160a_clkgen.c
index 3ce70470cb96..e4e99811991d 100644
--- a/sys/arm64/qoriq/clk/lx2160a_clkgen.c
+++ b/sys/arm64/qoriq/clk/lx2160a_clkgen.c
@@ -42,7 +42,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
 
 #include <arm64/qoriq/clk/qoriq_clkgen.h>
 
diff --git a/sys/arm64/qoriq/clk/qoriq_clk_pll.c b/sys/arm64/qoriq/clk/qoriq_clk_pll.c
index 0ee05afbd0ca..0d63ae0f79ed 100644
--- a/sys/arm64/qoriq/clk/qoriq_clk_pll.c
+++ b/sys/arm64/qoriq/clk/qoriq_clk_pll.c
@@ -31,8 +31,8 @@
 #include <sys/bus.h>
 #include <sys/malloc.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_fixed.h>
 
 #include <arm64/qoriq/clk/qoriq_clkgen.h>
 
diff --git a/sys/arm64/qoriq/clk/qoriq_clk_pll.h b/sys/arm64/qoriq/clk/qoriq_clk_pll.h
index f6b5df647d9c..f9d4c0f6355d 100644
--- a/sys/arm64/qoriq/clk/qoriq_clk_pll.h
+++ b/sys/arm64/qoriq/clk/qoriq_clk_pll.h
@@ -30,7 +30,7 @@
 #ifndef	_QORIQ_CLK_PLL_H_
 #define	_QORIQ_CLK_PLL_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #define	QORIQ_CLK_PLL_HAS_KILL_BIT	0x01
 
diff --git a/sys/arm64/qoriq/clk/qoriq_clkgen.c b/sys/arm64/qoriq/clk/qoriq_clkgen.c
index 8a6d162926dd..9dca9b8c3ce8 100644
--- a/sys/arm64/qoriq/clk/qoriq_clkgen.c
+++ b/sys/arm64/qoriq/clk/qoriq_clkgen.c
@@ -42,7 +42,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
 
 #include <arm64/qoriq/clk/qoriq_clkgen.h>
 
diff --git a/sys/arm64/qoriq/clk/qoriq_clkgen.h b/sys/arm64/qoriq/clk/qoriq_clkgen.h
index b96c34270bab..4bfcaea2a929 100644
--- a/sys/arm64/qoriq/clk/qoriq_clkgen.h
+++ b/sys/arm64/qoriq/clk/qoriq_clkgen.h
@@ -30,8 +30,8 @@
 #ifndef	_QORIQ_CLKGEN_H_
 #define	_QORIQ_CLKGEN_H_
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_mux.h>
 
 #include <arm64/qoriq/clk/qoriq_clk_pll.h>
 
diff --git a/sys/arm64/qoriq/qoriq_therm.c b/sys/arm64/qoriq/qoriq_therm.c
index 6169eec3f17c..decd55fad6e4 100644
--- a/sys/arm64/qoriq/qoriq_therm.c
+++ b/sys/arm64/qoriq/qoriq_therm.c
@@ -42,7 +42,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/arm64/rockchip/rk3328_codec.c b/sys/arm64/rockchip/rk3328_codec.c
index 11c44c4f66ae..ff6f2a3da881 100644
--- a/sys/arm64/rockchip/rk3328_codec.c
+++ b/sys/arm64/rockchip/rk3328_codec.c
@@ -40,7 +40,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/syscon/syscon.h>
 
 #include "syscon_if.h"
diff --git a/sys/arm64/rockchip/rk3399_emmcphy.c b/sys/arm64/rockchip/rk3399_emmcphy.c
index bc28ee3bf7d8..70c96e4daf4e 100644
--- a/sys/arm64/rockchip/rk3399_emmcphy.c
+++ b/sys/arm64/rockchip/rk3399_emmcphy.c
@@ -43,7 +43,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/syscon/syscon.h>
 #include <dev/extres/phy/phy.h>
 
diff --git a/sys/arm64/rockchip/rk3568_combphy.c b/sys/arm64/rockchip/rk3568_combphy.c
index d89e3b5f9973..f9ba38e663ad 100644
--- a/sys/arm64/rockchip/rk3568_combphy.c
+++ b/sys/arm64/rockchip/rk3568_combphy.c
@@ -40,7 +40,7 @@
 
 #include <dev/fdt/simple_mfd.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 #include <dev/extres/syscon/syscon.h>
diff --git a/sys/arm64/rockchip/rk3568_pcie.c b/sys/arm64/rockchip/rk3568_pcie.c
index 525b1356ae2e..b8ad5b8a33f5 100644
--- a/sys/arm64/rockchip/rk3568_pcie.c
+++ b/sys/arm64/rockchip/rk3568_pcie.c
@@ -49,7 +49,7 @@
 #include <dev/pci/pcib_private.h>
 #include <dev/pci/pci_dw.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/extres/regulator/regulator.h>
 #include <dev/extres/hwreset/hwreset.h>
diff --git a/sys/arm64/rockchip/rk3568_pciephy.c b/sys/arm64/rockchip/rk3568_pciephy.c
index 91993bf69890..0f1aa5d280a8 100644
--- a/sys/arm64/rockchip/rk3568_pciephy.c
+++ b/sys/arm64/rockchip/rk3568_pciephy.c
@@ -40,7 +40,7 @@
 
 #include <dev/fdt/simple_mfd.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 #include <dev/extres/syscon/syscon.h>
diff --git a/sys/arm64/rockchip/rk_gpio.c b/sys/arm64/rockchip/rk_gpio.c
index cc50b5ce302b..2d3b4a03fe19 100644
--- a/sys/arm64/rockchip/rk_gpio.c
+++ b/sys/arm64/rockchip/rk_gpio.c
@@ -46,7 +46,7 @@
 #include <dev/gpio/gpiobusvar.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include "gpio_if.h"
 #include "pic_if.h"
diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c
index 049f27505261..fb1c23b80eb9 100644
--- a/sys/arm64/rockchip/rk_i2s.c
+++ b/sys/arm64/rockchip/rk_i2s.c
@@ -39,7 +39,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/syscon/syscon.h>
 
diff --git a/sys/arm64/rockchip/rk_pcie.c b/sys/arm64/rockchip/rk_pcie.c
index 5b3b23e24913..cccb04ffdcd9 100644
--- a/sys/arm64/rockchip/rk_pcie.c
+++ b/sys/arm64/rockchip/rk_pcie.c
@@ -44,7 +44,7 @@
 #include <machine/intr.h>
 #include <machine/resource.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/extres/regulator/regulator.h>
diff --git a/sys/arm64/rockchip/rk_pcie_phy.c b/sys/arm64/rockchip/rk_pcie_phy.c
index e12fa4970f5a..d4c8c3eb2587 100644
--- a/sys/arm64/rockchip/rk_pcie_phy.c
+++ b/sys/arm64/rockchip/rk_pcie_phy.c
@@ -44,7 +44,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/extres/phy/phy_internal.h>
 #include <dev/extres/syscon/syscon.h>
diff --git a/sys/arm64/rockchip/rk_tsadc.c b/sys/arm64/rockchip/rk_tsadc.c
index 0d0d5d130b7f..8b99c384da48 100644
--- a/sys/arm64/rockchip/rk_tsadc.c
+++ b/sys/arm64/rockchip/rk_tsadc.c
@@ -44,7 +44,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/syscon/syscon.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm64/rockchip/rk_typec_phy.c b/sys/arm64/rockchip/rk_typec_phy.c
index 0998199d8c4e..6e75394377e4 100644
--- a/sys/arm64/rockchip/rk_typec_phy.c
+++ b/sys/arm64/rockchip/rk_typec_phy.c
@@ -43,7 +43,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/phy/phy_usb.h>
 #include <dev/extres/syscon/syscon.h>
 #include <dev/extres/hwreset/hwreset.h>
diff --git a/sys/arm64/rockchip/rk_usb2phy.c b/sys/arm64/rockchip/rk_usb2phy.c
index f57e3157dc12..367d4fef61cc 100644
--- a/sys/arm64/rockchip/rk_usb2phy.c
+++ b/sys/arm64/rockchip/rk_usb2phy.c
@@ -43,7 +43,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/phy/phy_usb.h>
 #include <dev/extres/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
index 4434ac22751d..6f9001470df8 100644
--- a/sys/arm64/rockchip/rk_usbphy.c
+++ b/sys/arm64/rockchip/rk_usbphy.c
@@ -36,7 +36,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy_usb.h>
 #include <dev/extres/regulator/regulator.h>
diff --git a/sys/conf/files b/sys/conf/files
index cdc6f62edbc2..8b28d6428584 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1353,6 +1353,15 @@ dev/cfi/cfi_dev.c		optional cfi
 dev/cfi/cfi_disk.c		optional cfid
 dev/chromebook_platform/chromebook_platform.c	optional chromebook_platform
 dev/ciss/ciss.c			optional ciss
+dev/clk/clk.c			optional clk
+dev/clk/clkdev_if.m		optional clk
+dev/clk/clknode_if.m		optional clk
+dev/clk/clk_bus.c		optional clk fdt
+dev/clk/clk_div.c		optional clk
+dev/clk/clk_fixed.c		optional clk
+dev/clk/clk_gate.c		optional clk
+dev/clk/clk_link.c		optional clk
+dev/clk/clk_mux.c		optional clk
 dev/cpufreq/ichss.c		optional cpufreq pci
 dev/cxgb/cxgb_main.c		optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
@@ -1668,15 +1677,6 @@ dev/evdev/evdev_mt.c			optional evdev
 dev/evdev/evdev_utils.c			optional evdev
 dev/evdev/uinput.c			optional evdev uinput
 dev/exca/exca.c			optional cbb
-dev/extres/clk/clk.c		optional clk
-dev/extres/clk/clkdev_if.m	optional clk
-dev/extres/clk/clknode_if.m	optional clk
-dev/extres/clk/clk_bus.c	optional clk fdt
-dev/extres/clk/clk_div.c	optional clk
-dev/extres/clk/clk_fixed.c	optional clk
-dev/extres/clk/clk_gate.c	optional clk
-dev/extres/clk/clk_link.c	optional clk
-dev/extres/clk/clk_mux.c	optional clk
 dev/extres/phy/phy.c		optional phy
 dev/extres/phy/phydev_if.m	optional phy fdt
 dev/extres/phy/phynode_if.m	optional phy
diff --git a/sys/dev/ahci/ahci_fsl_fdt.c b/sys/dev/ahci/ahci_fsl_fdt.c
index 983ef7c77ee9..4a6fbed470f4 100644
--- a/sys/dev/ahci/ahci_fsl_fdt.c
+++ b/sys/dev/ahci/ahci_fsl_fdt.c
@@ -48,7 +48,7 @@
 
 #include <dev/ahci/ahci.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #define	AHCI_FSL_REG_PHY1	0xa8
 #define	AHCI_FSL_REG_PHY2	0xac
diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c
index d89e91ad1c5b..9d2b1d71883e 100644
--- a/sys/dev/cadence/if_cgem.c
+++ b/sys/dev/cadence/if_cgem.c
@@ -75,7 +75,7 @@
 #include <dev/mii/miivar.h>
 #include <dev/mii/mii_fdt.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #if BUS_SPACE_MAXADDR > BUS_SPACE_MAXADDR_32BIT
 #define CGEM64
diff --git a/sys/dev/clk/allwinner/aw_ccu.c b/sys/dev/clk/allwinner/aw_ccu.c
index fc963f7a6485..9ee08f8f2dd1 100644
--- a/sys/dev/clk/allwinner/aw_ccu.c
+++ b/sys/dev/clk/allwinner/aw_ccu.c
@@ -42,7 +42,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/dev/clk/allwinner/aw_ccung.c b/sys/dev/clk/allwinner/aw_ccung.c
index 2a6cbd8b9a20..f446b77b6226 100644
--- a/sys/dev/clk/allwinner/aw_ccung.c
+++ b/sys/dev/clk/allwinner/aw_ccung.c
@@ -44,8 +44,8 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_gate.h>
 
 #include <dev/extres/hwreset/hwreset.h>
 
diff --git a/sys/dev/clk/allwinner/aw_ccung.h b/sys/dev/clk/allwinner/aw_ccung.h
index 61d99fc3d50f..555a8a95e38a 100644
--- a/sys/dev/clk/allwinner/aw_ccung.h
+++ b/sys/dev/clk/allwinner/aw_ccung.h
@@ -37,9 +37,9 @@
 #include <dev/clk/allwinner/aw_clk_np.h>
 #include <dev/clk/allwinner/aw_clk_prediv_mux.h>
 #include <dev/clk/allwinner/aw_clk_frac.h>
-#include <dev/extres/clk/clk_mux.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
 
 enum aw_ccung_clk_type {
 	AW_CLK_UNDEFINED = 0,
diff --git a/sys/dev/clk/allwinner/aw_clk_frac.c b/sys/dev/clk/allwinner/aw_clk_frac.c
index 696f6c2ebfbf..57249dafbcc2 100644
--- a/sys/dev/clk/allwinner/aw_clk_frac.c
+++ b/sys/dev/clk/allwinner/aw_clk_frac.c
@@ -27,7 +27,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/allwinner/aw_clk.h>
 #include <dev/clk/allwinner/aw_clk_frac.h>
diff --git a/sys/dev/clk/allwinner/aw_clk_frac.h b/sys/dev/clk/allwinner/aw_clk_frac.h
index 8ee59bbebcc1..107c04ba3552 100644
--- a/sys/dev/clk/allwinner/aw_clk_frac.h
+++ b/sys/dev/clk/allwinner/aw_clk_frac.h
@@ -26,7 +26,7 @@
 #ifndef	__AW_CLK_FRAC_H__
 #define __AW_CLK_FRAC_H__
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct aw_clk_frac_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/dev/clk/allwinner/aw_clk_m.c b/sys/dev/clk/allwinner/aw_clk_m.c
index d57434617d23..5d7dd971cc7a 100644
--- a/sys/dev/clk/allwinner/aw_clk_m.c
+++ b/sys/dev/clk/allwinner/aw_clk_m.c
@@ -27,7 +27,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/allwinner/aw_clk.h>
 #include <dev/clk/allwinner/aw_clk_m.h>
diff --git a/sys/dev/clk/allwinner/aw_clk_m.h b/sys/dev/clk/allwinner/aw_clk_m.h
index 45a231bfdb37..a2a9b0664662 100644
--- a/sys/dev/clk/allwinner/aw_clk_m.h
+++ b/sys/dev/clk/allwinner/aw_clk_m.h
@@ -26,7 +26,7 @@
 #ifndef	__AW_CLK_M_H__
 #define __AW_CLK_M_H__
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct aw_clk_m_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/dev/clk/allwinner/aw_clk_mipi.c b/sys/dev/clk/allwinner/aw_clk_mipi.c
index e57b5347994a..9875e179a277 100644
--- a/sys/dev/clk/allwinner/aw_clk_mipi.c
+++ b/sys/dev/clk/allwinner/aw_clk_mipi.c
@@ -27,7 +27,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/allwinner/aw_clk.h>
 #include <dev/clk/allwinner/aw_clk_mipi.h>
diff --git a/sys/dev/clk/allwinner/aw_clk_mipi.h b/sys/dev/clk/allwinner/aw_clk_mipi.h
index bc28c0fa685d..81d2bd1bd64c 100644
--- a/sys/dev/clk/allwinner/aw_clk_mipi.h
+++ b/sys/dev/clk/allwinner/aw_clk_mipi.h
@@ -26,7 +26,7 @@
 #ifndef	__AW_CLK_MIPI_H__
 #define __AW_CLK_MIPI_H__
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct aw_clk_mipi_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/dev/clk/allwinner/aw_clk_nkmp.c b/sys/dev/clk/allwinner/aw_clk_nkmp.c
index 73bf6a2fafe3..ede89c1d1b8b 100644
--- a/sys/dev/clk/allwinner/aw_clk_nkmp.c
+++ b/sys/dev/clk/allwinner/aw_clk_nkmp.c
@@ -27,7 +27,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/allwinner/aw_clk.h>
 #include <dev/clk/allwinner/aw_clk_nkmp.h>
diff --git a/sys/dev/clk/allwinner/aw_clk_nm.c b/sys/dev/clk/allwinner/aw_clk_nm.c
index 5692ce2c8b99..cb49adda8597 100644
--- a/sys/dev/clk/allwinner/aw_clk_nm.c
+++ b/sys/dev/clk/allwinner/aw_clk_nm.c
@@ -27,7 +27,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/allwinner/aw_clk.h>
 #include <dev/clk/allwinner/aw_clk_nm.h>
diff --git a/sys/dev/clk/allwinner/aw_clk_nm.h b/sys/dev/clk/allwinner/aw_clk_nm.h
index 10c37cbf6ec7..7fbdc3c49002 100644
--- a/sys/dev/clk/allwinner/aw_clk_nm.h
+++ b/sys/dev/clk/allwinner/aw_clk_nm.h
@@ -26,7 +26,7 @@
 #ifndef	__AW_CLK_NM_H__
 #define __AW_CLK_NM_H__
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct aw_clk_nm_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/dev/clk/allwinner/aw_clk_nmm.c b/sys/dev/clk/allwinner/aw_clk_nmm.c
index 754c313271cb..ac55c5eea182 100644
--- a/sys/dev/clk/allwinner/aw_clk_nmm.c
+++ b/sys/dev/clk/allwinner/aw_clk_nmm.c
@@ -29,7 +29,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/allwinner/aw_clk.h>
 #include <dev/clk/allwinner/aw_clk_nmm.h>
diff --git a/sys/dev/clk/allwinner/aw_clk_nmm.h b/sys/dev/clk/allwinner/aw_clk_nmm.h
index 7b95ec3e23c8..7100ee72ef4e 100644
--- a/sys/dev/clk/allwinner/aw_clk_nmm.h
+++ b/sys/dev/clk/allwinner/aw_clk_nmm.h
@@ -28,7 +28,7 @@
 #ifndef	__AW_CLK_NMM_H__
 #define __AW_CLK_NMM_H__
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct aw_clk_nmm_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/dev/clk/allwinner/aw_clk_np.c b/sys/dev/clk/allwinner/aw_clk_np.c
index a06b0fa16796..bca81eb3e937 100644
--- a/sys/dev/clk/allwinner/aw_clk_np.c
+++ b/sys/dev/clk/allwinner/aw_clk_np.c
@@ -29,7 +29,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/allwinner/aw_clk.h>
 #include <dev/clk/allwinner/aw_clk_np.h>
diff --git a/sys/dev/clk/allwinner/aw_clk_np.h b/sys/dev/clk/allwinner/aw_clk_np.h
index d91bcd0dbb1f..bffa61cafe1a 100644
--- a/sys/dev/clk/allwinner/aw_clk_np.h
+++ b/sys/dev/clk/allwinner/aw_clk_np.h
@@ -28,7 +28,7 @@
 #ifndef	__AW_CLK_NP_H__
 #define __AW_CLK_NP_H__
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct aw_clk_np_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/dev/clk/allwinner/aw_clk_prediv_mux.c b/sys/dev/clk/allwinner/aw_clk_prediv_mux.c
index 3a64726ca776..5bcc06b37c8f 100644
--- a/sys/dev/clk/allwinner/aw_clk_prediv_mux.c
+++ b/sys/dev/clk/allwinner/aw_clk_prediv_mux.c
@@ -27,7 +27,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/allwinner/aw_clk.h>
 #include <dev/clk/allwinner/aw_clk_prediv_mux.h>
diff --git a/sys/dev/clk/allwinner/ccu_a10.c b/sys/dev/clk/allwinner/ccu_a10.c
index 0a14583a9f04..491cb4b28d3b 100644
--- a/sys/dev/clk/allwinner/ccu_a10.c
+++ b/sys/dev/clk/allwinner/ccu_a10.c
@@ -38,9 +38,9 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/allwinner/aw_ccung.h>
 
diff --git a/sys/dev/clk/allwinner/ccu_a13.c b/sys/dev/clk/allwinner/ccu_a13.c
index 2bddcd382040..76b3b803aec1 100644
--- a/sys/dev/clk/allwinner/ccu_a13.c
+++ b/sys/dev/clk/allwinner/ccu_a13.c
@@ -38,9 +38,9 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/allwinner/aw_ccung.h>
 
diff --git a/sys/dev/clk/allwinner/ccu_a31.c b/sys/dev/clk/allwinner/ccu_a31.c
index d6db0ab03fe7..f2cbd9196682 100644
--- a/sys/dev/clk/allwinner/ccu_a31.c
+++ b/sys/dev/clk/allwinner/ccu_a31.c
@@ -38,9 +38,9 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/allwinner/aw_ccung.h>
 
diff --git a/sys/dev/clk/allwinner/ccu_a64.c b/sys/dev/clk/allwinner/ccu_a64.c
index 73cbe147c398..779b20a19d3e 100644
--- a/sys/dev/clk/allwinner/ccu_a64.c
+++ b/sys/dev/clk/allwinner/ccu_a64.c
@@ -38,9 +38,9 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/allwinner/aw_ccung.h>
 
diff --git a/sys/dev/clk/allwinner/ccu_a83t.c b/sys/dev/clk/allwinner/ccu_a83t.c
index 1cb49d99ccbc..bc94250ba4ac 100644
--- a/sys/dev/clk/allwinner/ccu_a83t.c
+++ b/sys/dev/clk/allwinner/ccu_a83t.c
@@ -38,9 +38,9 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/allwinner/aw_ccung.h>
 
diff --git a/sys/dev/clk/allwinner/ccu_de2.c b/sys/dev/clk/allwinner/ccu_de2.c
index de490a88bafa..4bd29d139c11 100644
--- a/sys/dev/clk/allwinner/ccu_de2.c
+++ b/sys/dev/clk/allwinner/ccu_de2.c
@@ -42,9 +42,9 @@
 #include "opt_soc.h"
 #endif
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/extres/hwreset/hwreset.h>
 
diff --git a/sys/dev/clk/allwinner/ccu_h3.c b/sys/dev/clk/allwinner/ccu_h3.c
index fb6e26542b8a..de538f720d4f 100644
--- a/sys/dev/clk/allwinner/ccu_h3.c
+++ b/sys/dev/clk/allwinner/ccu_h3.c
@@ -42,9 +42,9 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #if defined(__aarch64__)
 #include "opt_soc.h"
diff --git a/sys/dev/clk/allwinner/ccu_h6.c b/sys/dev/clk/allwinner/ccu_h6.c
index 0a378d9c3980..f172d85ab07e 100644
--- a/sys/dev/clk/allwinner/ccu_h6.c
+++ b/sys/dev/clk/allwinner/ccu_h6.c
@@ -38,9 +38,9 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/allwinner/aw_ccung.h>
 
diff --git a/sys/dev/clk/allwinner/ccu_h6_r.c b/sys/dev/clk/allwinner/ccu_h6_r.c
index 7d87b3082682..4ca5e86cc436 100644
--- a/sys/dev/clk/allwinner/ccu_h6_r.c
+++ b/sys/dev/clk/allwinner/ccu_h6_r.c
@@ -38,9 +38,9 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/allwinner/aw_ccung.h>
 
diff --git a/sys/dev/clk/allwinner/ccu_sun8i_r.c b/sys/dev/clk/allwinner/ccu_sun8i_r.c
index e970dd1de95c..0fdbe6a10ec2 100644
--- a/sys/dev/clk/allwinner/ccu_sun8i_r.c
+++ b/sys/dev/clk/allwinner/ccu_sun8i_r.c
@@ -42,9 +42,9 @@
 #include "opt_soc.h"
 #endif
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/allwinner/aw_ccung.h>
 
diff --git a/sys/dev/extres/clk/clk.c b/sys/dev/clk/clk.c
similarity index 99%
rename from sys/dev/extres/clk/clk.c
rename to sys/dev/clk/clk.c
index c569b05b6189..52015d4e2905 100644
--- a/sys/dev/extres/clk/clk.c
+++ b/sys/dev/clk/clk.c
@@ -46,7 +46,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #endif
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 SYSCTL_NODE(_hw, OID_AUTO, clock, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL,
     "Clocks");
diff --git a/sys/dev/extres/clk/clk.h b/sys/dev/clk/clk.h
similarity index 98%
rename from sys/dev/extres/clk/clk.h
rename to sys/dev/clk/clk.h
index caface7bc765..4702e8741a67 100644
--- a/sys/dev/extres/clk/clk.h
+++ b/sys/dev/clk/clk.h
@@ -24,8 +24,9 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _DEV_EXTRES_CLK_H_
-#define _DEV_EXTRES_CLK_H_
+#ifndef _DEV_CLK_H_
+#define	_DEV_CLK_H_
+
 #include "opt_platform.h"
 
 #include <sys/kobj.h>
@@ -152,4 +153,4 @@ int clk_parse_ofw_out_names(device_t dev, phandle_t node,
 int clk_parse_ofw_clk_name(device_t dev, phandle_t node, const char **name);
 #endif
 
-#endif /* _DEV_EXTRES_CLK_H_ */
+#endif	/* _DEV_CLK_H_ */
diff --git a/sys/dev/extres/clk/clk_bus.c b/sys/dev/clk/clk_bus.c
similarity index 100%
rename from sys/dev/extres/clk/clk_bus.c
rename to sys/dev/clk/clk_bus.c
diff --git a/sys/dev/extres/clk/clk_div.c b/sys/dev/clk/clk_div.c
similarity index 99%
rename from sys/dev/extres/clk/clk_div.c
rename to sys/dev/clk/clk_div.c
index ab65e2bae2d2..b43136b7b4f0 100644
--- a/sys/dev/extres/clk/clk_div.c
+++ b/sys/dev/clk/clk_div.c
@@ -32,7 +32,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk_div.h>
+#include <dev/clk/clk_div.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/dev/extres/clk/clk_div.h b/sys/dev/clk/clk_div.h
similarity index 94%
rename from sys/dev/extres/clk/clk_div.h
rename to sys/dev/clk/clk_div.h
index 7db3f5885b1f..328fc40fec8b 100644
--- a/sys/dev/extres/clk/clk_div.h
+++ b/sys/dev/clk/clk_div.h
@@ -24,10 +24,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _DEV_EXTRES_CLK_DIV_H_
-#define _DEV_EXTRES_CLK_DIV_H_
+#ifndef _DEV_CLK_DIV_H_
+#define	_DEV_CLK_DIV_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #define	CLK_DIV_ZERO_BASED	0x0001 /* Zero based divider. */
 #define	CLK_DIV_WITH_TABLE	0x0002 /* Table to lookup the real value */
@@ -50,4 +50,4 @@ struct clk_div_def {
 
 int clknode_div_register(struct clkdom *clkdom, struct clk_div_def *clkdef);
 
-#endif /*_DEV_EXTRES_CLK_DIV_H_*/
+#endif	/*_DEV_CLK_DIV_H_*/
diff --git a/sys/dev/extres/clk/clk_fixed.c b/sys/dev/clk/clk_fixed.c
similarity index 99%
rename from sys/dev/extres/clk/clk_fixed.c
rename to sys/dev/clk/clk_fixed.c
index e5ca6b31d000..647ca6a05568 100644
--- a/sys/dev/extres/clk/clk_fixed.c
+++ b/sys/dev/clk/clk_fixed.c
@@ -44,7 +44,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #endif
 
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk_fixed.h>
 
 #define	CLK_TYPE_FIXED		1
 #define	CLK_TYPE_FIXED_FACTOR	2
diff --git a/sys/dev/extres/clk/clk_fixed.h b/sys/dev/clk/clk_fixed.h
similarity index 93%
rename from sys/dev/extres/clk/clk_fixed.h
rename to sys/dev/clk/clk_fixed.h
index 103ca69126ba..56f0fcbbb449 100644
--- a/sys/dev/extres/clk/clk_fixed.h
+++ b/sys/dev/clk/clk_fixed.h
@@ -24,10 +24,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _DEV_EXTRES_CLK_FIXED_H_
-#define _DEV_EXTRES_CLK_FIXED_H_
+#ifndef _DEV_CLK_FIXED_H_
+#define	_DEV_CLK_FIXED_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 /*
  * A fixed clock can represent several different real-world objects, including
@@ -47,4 +47,4 @@ struct clk_fixed_def {
 
 int clknode_fixed_register(struct clkdom *clkdom, struct clk_fixed_def *clkdef);
 
-#endif /*_DEV_EXTRES_CLK_FIXED_H_*/
+#endif	/*_DEV_CLK_FIXED_H_*/
diff --git a/sys/dev/extres/clk/clk_gate.c b/sys/dev/clk/clk_gate.c
similarity index 99%
rename from sys/dev/extres/clk/clk_gate.c
rename to sys/dev/clk/clk_gate.c
index 1ed9987c0b33..59c65d0015fe 100644
--- a/sys/dev/extres/clk/clk_gate.c
+++ b/sys/dev/clk/clk_gate.c
@@ -32,7 +32,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk_gate.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/dev/extres/clk/clk_gate.h b/sys/dev/clk/clk_gate.h
similarity index 92%
rename from sys/dev/extres/clk/clk_gate.h
rename to sys/dev/clk/clk_gate.h
index 2e9a5969d3e6..ea8de7380227 100644
--- a/sys/dev/extres/clk/clk_gate.h
+++ b/sys/dev/clk/clk_gate.h
@@ -24,10 +24,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _DEV_EXTRES_CLK_GATE_H_
-#define _DEV_EXTRES_CLK_GATE_H_
+#ifndef _DEV_CLK_GATE_H_
+#define	_DEV_CLK_GATE_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct clk_gate_def {
 	struct clknode_init_def clkdef;
@@ -41,4 +41,4 @@ struct clk_gate_def {
 
 int clknode_gate_register(struct clkdom *clkdom, struct clk_gate_def *clkdef);
 
-#endif /* _DEV_EXTRES_CLK_GATE_H_ */
+#endif	/* _DEV_CLK_GATE_H_ */
diff --git a/sys/dev/extres/clk/clk_link.c b/sys/dev/clk/clk_link.c
similarity index 99%
rename from sys/dev/extres/clk/clk_link.c
rename to sys/dev/clk/clk_link.c
index dc82a093bab9..14debc48cdac 100644
--- a/sys/dev/extres/clk/clk_link.c
+++ b/sys/dev/clk/clk_link.c
@@ -37,7 +37,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk_link.h>
+#include <dev/clk/clk_link.h>
 
 static int clknode_link_init(struct clknode *clk, device_t dev);
 static int clknode_link_recalc(struct clknode *clk, uint64_t *freq);
diff --git a/sys/dev/extres/clk/clk_link.h b/sys/dev/clk/clk_link.h
similarity index 92%
rename from sys/dev/extres/clk/clk_link.h
rename to sys/dev/clk/clk_link.h
index 1591e8166794..9610f842abcf 100644
--- a/sys/dev/extres/clk/clk_link.h
+++ b/sys/dev/clk/clk_link.h
@@ -24,10 +24,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _DEV_EXTRES_CLK_LINK_H_
-#define _DEV_EXTRES_CLK_LINK_H_
+#ifndef _DEV_CLK_LINK_H_
+#define	_DEV_CLK_LINK_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 /*
  * A linked clock is used as placeholder for not yet available clock.
@@ -42,4 +42,4 @@ struct clk_link_def {
 
 int clknode_link_register(struct clkdom *clkdom, struct clk_link_def *clkdef);
 
-#endif /*_DEV_EXTRES_CLK_LINK_H_*/
+#endif	/*_DEV_CLK_LINK_H_*/
diff --git a/sys/dev/extres/clk/clk_mux.c b/sys/dev/clk/clk_mux.c
similarity index 99%
rename from sys/dev/extres/clk/clk_mux.c
rename to sys/dev/clk/clk_mux.c
index bfdf2ba028f0..279adddae42c 100644
--- a/sys/dev/extres/clk/clk_mux.c
+++ b/sys/dev/clk/clk_mux.c
@@ -32,7 +32,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_mux.h>
 
 #include "clkdev_if.h"
 
diff --git a/sys/dev/extres/clk/clk_mux.h b/sys/dev/clk/clk_mux.h
similarity index 92%
rename from sys/dev/extres/clk/clk_mux.h
rename to sys/dev/clk/clk_mux.h
index ff5bbaa54b20..4bfa2c829b4a 100644
--- a/sys/dev/extres/clk/clk_mux.h
+++ b/sys/dev/clk/clk_mux.h
@@ -23,10 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#ifndef _DEV_EXTRESF_CLK_MUX_H_
-#define _DEV_EXTRESF_CLK_MUX_H_
 
-#include <dev/extres/clk/clk.h>
+#ifndef _DEV_CLK_MUX_H_
+#define	_DEV_CLK_MUX_H_
+
+#include <dev/clk/clk.h>
 
 struct clk_mux_def {
 	struct clknode_init_def clkdef;
@@ -38,4 +39,4 @@ struct clk_mux_def {
 
 int clknode_mux_register(struct clkdom *clkdom, struct clk_mux_def *clkdef);
 
-#endif /* _DEV_EXTRESF_CLK_MUX_H_ */
+#endif	/* _DEV_CLK_MUX_H_ */
diff --git a/sys/dev/extres/clk/clkdev_if.m b/sys/dev/clk/clkdev_if.m
similarity index 100%
rename from sys/dev/extres/clk/clkdev_if.m
rename to sys/dev/clk/clkdev_if.m
diff --git a/sys/dev/extres/clk/clknode_if.m b/sys/dev/clk/clknode_if.m
similarity index 100%
rename from sys/dev/extres/clk/clknode_if.m
rename to sys/dev/clk/clknode_if.m
diff --git a/sys/dev/clk/rockchip/rk3288_cru.c b/sys/dev/clk/rockchip/rk3288_cru.c
index 354a293ff7f2..9c8ff18ce01c 100644
--- a/sys/dev/clk/rockchip/rk3288_cru.c
+++ b/sys/dev/clk/rockchip/rk3288_cru.c
@@ -39,10 +39,10 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/rockchip/rk_cru.h>
 
diff --git a/sys/dev/clk/rockchip/rk3328_cru.c b/sys/dev/clk/rockchip/rk3328_cru.c
index 6a9583250516..0edd562ddd08 100644
--- a/sys/dev/clk/rockchip/rk3328_cru.c
+++ b/sys/dev/clk/rockchip/rk3328_cru.c
@@ -38,9 +38,9 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/rockchip/rk_cru.h>
 
diff --git a/sys/dev/clk/rockchip/rk3399_cru.c b/sys/dev/clk/rockchip/rk3399_cru.c
index 45d6592ceb73..c4b2dc0910d8 100644
--- a/sys/dev/clk/rockchip/rk3399_cru.c
+++ b/sys/dev/clk/rockchip/rk3399_cru.c
@@ -39,9 +39,9 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/rockchip/rk_cru.h>
 
diff --git a/sys/dev/clk/rockchip/rk3399_pmucru.c b/sys/dev/clk/rockchip/rk3399_pmucru.c
index 706bf444aaf2..2239722849c0 100644
--- a/sys/dev/clk/rockchip/rk3399_pmucru.c
+++ b/sys/dev/clk/rockchip/rk3399_pmucru.c
@@ -39,9 +39,9 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/rockchip/rk_cru.h>
 
diff --git a/sys/dev/clk/rockchip/rk3568_cru.c b/sys/dev/clk/rockchip/rk3568_cru.c
index 4d7f569a3de2..5f6eb766b4ee 100644
--- a/sys/dev/clk/rockchip/rk3568_cru.c
+++ b/sys/dev/clk/rockchip/rk3568_cru.c
@@ -39,9 +39,9 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/rockchip/rk_cru.h>
 #include <contrib/device-tree/include/dt-bindings/clock/rk3568-cru.h>
diff --git a/sys/dev/clk/rockchip/rk3568_pmucru.c b/sys/dev/clk/rockchip/rk3568_pmucru.c
index 0756dc5392bf..214253abb55e 100644
--- a/sys/dev/clk/rockchip/rk3568_pmucru.c
+++ b/sys/dev/clk/rockchip/rk3568_pmucru.c
@@ -39,9 +39,9 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include <dev/clk/rockchip/rk_cru.h>
 #include <contrib/device-tree/include/dt-bindings/clock/rk3568-cru.h>
diff --git a/sys/dev/clk/rockchip/rk_clk_armclk.c b/sys/dev/clk/rockchip/rk_clk_armclk.c
index 3d462e74d92b..36197166d213 100644
--- a/sys/dev/clk/rockchip/rk_clk_armclk.c
+++ b/sys/dev/clk/rockchip/rk_clk_armclk.c
@@ -29,7 +29,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/rockchip/rk_clk_armclk.h>
 
diff --git a/sys/dev/clk/rockchip/rk_clk_armclk.h b/sys/dev/clk/rockchip/rk_clk_armclk.h
index 0c7f91d21d60..d5d14f1e8449 100644
--- a/sys/dev/clk/rockchip/rk_clk_armclk.h
+++ b/sys/dev/clk/rockchip/rk_clk_armclk.h
@@ -28,7 +28,7 @@
 #ifndef _RK_CLK_ARMCLK_H_
 #define _RK_CLK_ARMCLK_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct rk_clk_armclk_rates {
 	uint64_t	freq;
diff --git a/sys/dev/clk/rockchip/rk_clk_composite.c b/sys/dev/clk/rockchip/rk_clk_composite.c
index a37ddcd6ecb2..2b6c889913b8 100644
--- a/sys/dev/clk/rockchip/rk_clk_composite.c
+++ b/sys/dev/clk/rockchip/rk_clk_composite.c
@@ -29,7 +29,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/syscon/syscon.h>
 
 #include <dev/clk/rockchip/rk_clk_composite.h>
diff --git a/sys/dev/clk/rockchip/rk_clk_composite.h b/sys/dev/clk/rockchip/rk_clk_composite.h
index 22a052da22c2..346bee53f04f 100644
--- a/sys/dev/clk/rockchip/rk_clk_composite.h
+++ b/sys/dev/clk/rockchip/rk_clk_composite.h
@@ -28,7 +28,7 @@
 #ifndef _RK_CLK_COMPOSITE_H_
 #define _RK_CLK_COMPOSITE_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct rk_clk_composite_def {
 	struct clknode_init_def	clkdef;
diff --git a/sys/dev/clk/rockchip/rk_clk_fract.c b/sys/dev/clk/rockchip/rk_clk_fract.c
index f559e9c71852..aa7084c90d76 100644
--- a/sys/dev/clk/rockchip/rk_clk_fract.c
+++ b/sys/dev/clk/rockchip/rk_clk_fract.c
@@ -29,7 +29,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/rockchip/rk_clk_fract.h>
 
diff --git a/sys/dev/clk/rockchip/rk_clk_fract.h b/sys/dev/clk/rockchip/rk_clk_fract.h
index 6923f162f265..57f539d8d246 100644
--- a/sys/dev/clk/rockchip/rk_clk_fract.h
+++ b/sys/dev/clk/rockchip/rk_clk_fract.h
@@ -28,7 +28,7 @@
 #ifndef _RK_CLK_FRACT_H_
 #define _RK_CLK_FRACT_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct rk_clk_fract_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/dev/clk/rockchip/rk_clk_gate.c b/sys/dev/clk/rockchip/rk_clk_gate.c
index 053236d043e6..911e4cbad2c9 100644
--- a/sys/dev/clk/rockchip/rk_clk_gate.c
+++ b/sys/dev/clk/rockchip/rk_clk_gate.c
@@ -30,7 +30,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/rockchip/rk_clk_gate.h>
 
diff --git a/sys/dev/clk/rockchip/rk_clk_gate.h b/sys/dev/clk/rockchip/rk_clk_gate.h
index add5cd22aa89..2282f7c19284 100644
--- a/sys/dev/clk/rockchip/rk_clk_gate.h
+++ b/sys/dev/clk/rockchip/rk_clk_gate.h
@@ -28,7 +28,7 @@
 #ifndef _RK_CLK_GATE_H_
 #define _RK_CLK_GATE_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct rk_clk_gate_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/dev/clk/rockchip/rk_clk_mux.c b/sys/dev/clk/rockchip/rk_clk_mux.c
index e42d5819378a..fba57f794d16 100644
--- a/sys/dev/clk/rockchip/rk_clk_mux.c
+++ b/sys/dev/clk/rockchip/rk_clk_mux.c
@@ -34,7 +34,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/syscon/syscon.h>
 
 #include <dev/clk/rockchip/rk_cru.h>
diff --git a/sys/dev/clk/rockchip/rk_clk_mux.h b/sys/dev/clk/rockchip/rk_clk_mux.h
index b32e0687fac3..c6c261294b68 100644
--- a/sys/dev/clk/rockchip/rk_clk_mux.h
+++ b/sys/dev/clk/rockchip/rk_clk_mux.h
@@ -28,7 +28,7 @@
 #ifndef _RK_CLK_MUX_H_
 #define _RK_CLK_MUX_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct rk_clk_mux_def {
 	struct clknode_init_def clkdef;
diff --git a/sys/dev/clk/rockchip/rk_clk_pll.c b/sys/dev/clk/rockchip/rk_clk_pll.c
index f89fdeb0c341..8e6551ef6c29 100644
--- a/sys/dev/clk/rockchip/rk_clk_pll.c
+++ b/sys/dev/clk/rockchip/rk_clk_pll.c
@@ -29,7 +29,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/rockchip/rk_clk_pll.h>
 
diff --git a/sys/dev/clk/rockchip/rk_clk_pll.h b/sys/dev/clk/rockchip/rk_clk_pll.h
index 2d0c0bb67fdf..28d795b4e5b8 100644
--- a/sys/dev/clk/rockchip/rk_clk_pll.h
+++ b/sys/dev/clk/rockchip/rk_clk_pll.h
@@ -28,7 +28,7 @@
 #ifndef _RK_CLK_PLL_H_
 #define _RK_CLK_PLL_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct rk_clk_pll_rate {
 	uint32_t	freq;
diff --git a/sys/dev/clk/rockchip/rk_cru.c b/sys/dev/clk/rockchip/rk_cru.c
index 81760bcd74a1..a7d1b26166f1 100644
--- a/sys/dev/clk/rockchip/rk_cru.c
+++ b/sys/dev/clk/rockchip/rk_cru.c
@@ -44,10 +44,10 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_link.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_link.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/clk/rockchip/rk_clk_composite.h>
diff --git a/sys/dev/clk/rockchip/rk_cru.h b/sys/dev/clk/rockchip/rk_cru.h
index 3249c8c8f13c..685c6bb67568 100644
--- a/sys/dev/clk/rockchip/rk_cru.h
+++ b/sys/dev/clk/rockchip/rk_cru.h
@@ -28,11 +28,11 @@
 #ifndef __RK_CRU_H__
 #define __RK_CRU_H__
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_gate.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_link.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_gate.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_link.h>
 
 #include <dev/clk/rockchip/rk_clk_armclk.h>
 #include <dev/clk/rockchip/rk_clk_composite.h>
diff --git a/sys/dev/clk/xilinx/zynqmp_clk_div.c b/sys/dev/clk/xilinx/zynqmp_clk_div.c
index cc6e4d73e92d..ce754b10fb55 100644
--- a/sys/dev/clk/xilinx/zynqmp_clk_div.c
+++ b/sys/dev/clk/xilinx/zynqmp_clk_div.c
@@ -31,7 +31,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/xilinx/zynqmp_clk_div.h>
 
diff --git a/sys/dev/clk/xilinx/zynqmp_clk_fixed.c b/sys/dev/clk/xilinx/zynqmp_clk_fixed.c
index 94de0491acb6..7a8016593c8f 100644
--- a/sys/dev/clk/xilinx/zynqmp_clk_fixed.c
+++ b/sys/dev/clk/xilinx/zynqmp_clk_fixed.c
@@ -31,7 +31,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/xilinx/zynqmp_clk_fixed.h>
 
diff --git a/sys/dev/clk/xilinx/zynqmp_clk_gate.c b/sys/dev/clk/xilinx/zynqmp_clk_gate.c
index 180c7db38c09..8f3f7de1c151 100644
--- a/sys/dev/clk/xilinx/zynqmp_clk_gate.c
+++ b/sys/dev/clk/xilinx/zynqmp_clk_gate.c
@@ -31,7 +31,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/xilinx/zynqmp_clk_gate.h>
 
diff --git a/sys/dev/clk/xilinx/zynqmp_clk_mux.c b/sys/dev/clk/xilinx/zynqmp_clk_mux.c
index 6826ee5123fe..49034edeff96 100644
--- a/sys/dev/clk/xilinx/zynqmp_clk_mux.c
+++ b/sys/dev/clk/xilinx/zynqmp_clk_mux.c
@@ -31,7 +31,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/xilinx/zynqmp_clk_mux.h>
 
diff --git a/sys/dev/clk/xilinx/zynqmp_clk_pll.c b/sys/dev/clk/xilinx/zynqmp_clk_pll.c
index 6e5da9533859..9a8157994971 100644
--- a/sys/dev/clk/xilinx/zynqmp_clk_pll.c
+++ b/sys/dev/clk/xilinx/zynqmp_clk_pll.c
@@ -31,7 +31,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/clk/xilinx/zynqmp_clk_pll.h>
 
diff --git a/sys/dev/clk/xilinx/zynqmp_clock.c b/sys/dev/clk/xilinx/zynqmp_clock.c
index 76f23cec38d0..6d7eb7fa2b7e 100644
--- a/sys/dev/clk/xilinx/zynqmp_clock.c
+++ b/sys/dev/clk/xilinx/zynqmp_clock.c
@@ -41,8 +41,8 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_fixed.h>
 
 #include <dev/clk/xilinx/zynqmp_clk_mux.h>
 #include <dev/clk/xilinx/zynqmp_clk_pll.h>
diff --git a/sys/dev/cpufreq/cpufreq_dt.c b/sys/dev/cpufreq/cpufreq_dt.c
index cfd052c56a96..4dae7142b380 100644
--- a/sys/dev/cpufreq/cpufreq_dt.c
+++ b/sys/dev/cpufreq/cpufreq_dt.c
@@ -41,7 +41,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/regulator/regulator.h>
 
 #include "cpufreq_if.h"
diff --git a/sys/dev/dwc/dwc1000_core.c b/sys/dev/dwc/dwc1000_core.c
index 83d54d8325e1..d25c31e66e28 100644
--- a/sys/dev/dwc/dwc1000_core.c
+++ b/sys/dev/dwc/dwc1000_core.c
@@ -54,7 +54,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/mii/mii.h>
diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c
index 8f3340eb3128..e89ccee5b0ff 100644
--- a/sys/dev/dwc/dwc1000_dma.c
+++ b/sys/dev/dwc/dwc1000_dma.c
@@ -49,7 +49,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c
index ab43ad6f8645..be44a6be193b 100644
--- a/sys/dev/dwc/if_dwc.c
+++ b/sys/dev/dwc/if_dwc.c
@@ -59,7 +59,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/mii/mii.h>
diff --git a/sys/dev/dwc/if_dwc_aw.c b/sys/dev/dwc/if_dwc_aw.c
index 5a39a08809f8..981f621e3f27 100644
--- a/sys/dev/dwc/if_dwc_aw.c
+++ b/sys/dev/dwc/if_dwc_aw.c
@@ -41,7 +41,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 
diff --git a/sys/dev/dwc/if_dwc_rk.c b/sys/dev/dwc/if_dwc_rk.c
index 2a1a5e763c2f..76fd11dfd109 100644
--- a/sys/dev/dwc/if_dwc_rk.c
+++ b/sys/dev/dwc/if_dwc_rk.c
@@ -42,7 +42,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 #include <dev/extres/syscon/syscon.h>
diff --git a/sys/dev/dwc/if_dwc_socfpga.c b/sys/dev/dwc/if_dwc_socfpga.c
index ae3ea55564b6..ae2bcac54a95 100644
--- a/sys/dev/dwc/if_dwc_socfpga.c
+++ b/sys/dev/dwc/if_dwc_socfpga.c
@@ -44,7 +44,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/dwc/if_dwcvar.h>
diff --git a/sys/dev/dwwdt/dwwdt.c b/sys/dev/dwwdt/dwwdt.c
index e1787bb549ca..89f94fff9bad 100644
--- a/sys/dev/dwwdt/dwwdt.c
+++ b/sys/dev/dwwdt/dwwdt.c
@@ -40,7 +40,7 @@
 #include <machine/bus.h>
 #include <machine/resource.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/dev/eqos/if_eqos.c b/sys/dev/eqos/if_eqos.c
index 75e3ca957b48..17c820a1b191 100644
--- a/sys/dev/eqos/if_eqos.c
+++ b/sys/dev/eqos/if_eqos.c
@@ -67,7 +67,7 @@
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #endif
 
 #include <dev/eqos/if_eqos_reg.h>
diff --git a/sys/dev/eqos/if_eqos_fdt.c b/sys/dev/eqos/if_eqos_fdt.c
index 68fcbc1ea706..9c36f658bad1 100644
--- a/sys/dev/eqos/if_eqos_fdt.c
+++ b/sys/dev/eqos/if_eqos_fdt.c
@@ -50,7 +50,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 #include <dev/extres/syscon/syscon.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw.c
index 4e1f803a92fe..c017419be0ff 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw.c
@@ -51,7 +51,7 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mdio/mdio.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c
index 4cbe65025111..a3facf4a6199 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_atu.c
@@ -51,7 +51,7 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mdio/mdio.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c
index 39296fc3d444..43c2d8744054 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mdio.c
@@ -51,7 +51,7 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mdio/mdio.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c
index 55c0003766c5..6fdc9e96fd81 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mib.c
@@ -51,7 +51,7 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mdio/mdio.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c
index 011cf8607343..7e440f54e3ac 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_mirror.c
@@ -51,7 +51,7 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mdio/mdio.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c
index e207a6da8b8f..e701f3ae28ba 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_port.c
@@ -51,7 +51,7 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mdio/mdio.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c
index 24460d8b0b43..0f0704c41aba 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_psgmii.c
@@ -51,7 +51,7 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mdio/mdio.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c b/sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c
index e471dd4746dc..3c3800847438 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_hw_vtu.c
@@ -51,7 +51,7 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mdio/mdio.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_main.c b/sys/dev/etherswitch/ar40xx/ar40xx_main.c
index ed17d2789bf4..d8cbfd836a9b 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_main.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_main.c
@@ -51,7 +51,7 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mdio/mdio.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_phy.c b/sys/dev/etherswitch/ar40xx/ar40xx_phy.c
index 3e2bcd4af18d..079a92983503 100644
--- a/sys/dev/etherswitch/ar40xx/ar40xx_phy.c
+++ b/sys/dev/etherswitch/ar40xx/ar40xx_phy.c
@@ -51,7 +51,7 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mdio/mdio.h>
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/dev/firmware/arm/scmi.c b/sys/dev/firmware/arm/scmi.c
index 455a802f254d..3101be245ee1 100644
--- a/sys/dev/firmware/arm/scmi.c
+++ b/sys/dev/firmware/arm/scmi.c
@@ -37,7 +37,7 @@
 #include <sys/module.h>
 #include <sys/mutex.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/fdt/simplebus.h>
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/dev/firmware/arm/scmi_clk.c b/sys/dev/firmware/arm/scmi_clk.c
index fbf65f0fee74..da7a8d37b465 100644
--- a/sys/dev/firmware/arm/scmi_clk.c
+++ b/sys/dev/firmware/arm/scmi_clk.c
@@ -35,7 +35,7 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/fdt/simplebus.h>
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/dev/flash/flexspi/flex_spi.c b/sys/dev/flash/flexspi/flex_spi.c
index 106a7845b2ad..766a1cfaa332 100644
--- a/sys/dev/flash/flexspi/flex_spi.c
+++ b/sys/dev/flash/flexspi/flex_spi.c
@@ -42,7 +42,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
diff --git a/sys/dev/hdmi/dwc_hdmi_fdt.c b/sys/dev/hdmi/dwc_hdmi_fdt.c
index d8cd1a3cba8f..927a6a15427d 100644
--- a/sys/dev/hdmi/dwc_hdmi_fdt.c
+++ b/sys/dev/hdmi/dwc_hdmi_fdt.c
@@ -42,7 +42,7 @@
 
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/videomode/videomode.h>
 #include <dev/videomode/edidvar.h>
diff --git a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c
index fff9c57184d7..61f4975c10de 100644
--- a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c
+++ b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c
@@ -52,7 +52,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
diff --git a/sys/dev/iicbus/controller/opencores/iicoc_fdt.c b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c
index 40994c22628b..649027038659 100644
--- a/sys/dev/iicbus/controller/opencores/iicoc_fdt.c
+++ b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c
@@ -39,7 +39,7 @@
 #include <sys/mutex.h>
 #include <sys/rman.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/iicbus/iicbus.h>
 #include <dev/iicbus/iiconf.h>
diff --git a/sys/dev/iicbus/controller/rockchip/rk_i2c.c b/sys/dev/iicbus/controller/rockchip/rk_i2c.c
index 0961dbc96a92..4a431649de49 100644
--- a/sys/dev/iicbus/controller/rockchip/rk_i2c.c
+++ b/sys/dev/iicbus/controller/rockchip/rk_i2c.c
@@ -39,7 +39,7 @@
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include "iicbus_if.h"
 
diff --git a/sys/dev/iicbus/controller/twsi/a10_twsi.c b/sys/dev/iicbus/controller/twsi/a10_twsi.c
index e66f941d3814..40d75f64e3e1 100644
--- a/sys/dev/iicbus/controller/twsi/a10_twsi.c
+++ b/sys/dev/iicbus/controller/twsi/a10_twsi.c
@@ -44,7 +44,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include "iicbus_if.h"
diff --git a/sys/dev/iicbus/controller/twsi/mv_twsi.c b/sys/dev/iicbus/controller/twsi/mv_twsi.c
index 23f3ee8debd2..b3032533da47 100644
--- a/sys/dev/iicbus/controller/twsi/mv_twsi.c
+++ b/sys/dev/iicbus/controller/twsi/mv_twsi.c
@@ -58,7 +58,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <arm/mv/mvreg.h>
 #include <arm/mv/mvvar.h>
diff --git a/sys/dev/iicbus/controller/twsi/twsi.h b/sys/dev/iicbus/controller/twsi/twsi.h
index 132a75fd0ab8..54aec51bbb76 100644
--- a/sys/dev/iicbus/controller/twsi/twsi.h
+++ b/sys/dev/iicbus/controller/twsi/twsi.h
@@ -32,7 +32,7 @@
 #ifndef _TWSI_H_
 #define	_TWSI_H_
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 struct twsi_baud_rate {
 	uint32_t	raw;
diff --git a/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c b/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c
index c450154001f6..c65a41294c96 100644
--- a/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c
+++ b/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c
@@ -34,7 +34,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/iicbus/pmic/rockchip/rk8xx.h>
 
diff --git a/sys/dev/mmc/host/dwmmc.c b/sys/dev/mmc/host/dwmmc.c
index 8cd50d2cc898..fd55ce5c0cd4 100644
--- a/sys/dev/mmc/host/dwmmc.c
+++ b/sys/dev/mmc/host/dwmmc.c
@@ -60,7 +60,7 @@
 #include <machine/cpu.h>
 #include <machine/intr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/mmc/host/dwmmc_reg.h>
 #include <dev/mmc/host/dwmmc_var.h>
diff --git a/sys/dev/mmc/host/dwmmc_rockchip.c b/sys/dev/mmc/host/dwmmc_rockchip.c
index 5cec9f9603d1..c4b07ac3290e 100644
--- a/sys/dev/mmc/host/dwmmc_rockchip.c
+++ b/sys/dev/mmc/host/dwmmc_rockchip.c
@@ -38,7 +38,7 @@
 
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/mmc/host/dwmmc_var.h>
 
diff --git a/sys/dev/mmc/host/dwmmc_var.h b/sys/dev/mmc/host/dwmmc_var.h
index ef9b1d5305bd..16893b110804 100644
--- a/sys/dev/mmc/host/dwmmc_var.h
+++ b/sys/dev/mmc/host/dwmmc_var.h
@@ -31,7 +31,7 @@
 #ifndef DEV_MMC_HOST_DWMMC_VAR_H
 #define DEV_MMC_HOST_DWMMC_VAR_H
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/regulator/regulator.h>
 
diff --git a/sys/dev/mmc/mmc_pwrseq.c b/sys/dev/mmc/mmc_pwrseq.c
index 5e2e87fd5564..46bfab41aa6c 100644
--- a/sys/dev/mmc/mmc_pwrseq.c
+++ b/sys/dev/mmc/mmc_pwrseq.c
@@ -36,7 +36,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include "mmc_pwrseq_if.h"
 
diff --git a/sys/dev/neta/if_mvneta.c b/sys/dev/neta/if_mvneta.c
index f7f9c042b937..8a2c2ec8512c 100644
--- a/sys/dev/neta/if_mvneta.c
+++ b/sys/dev/neta/if_mvneta.c
@@ -63,7 +63,7 @@
 #include <sys/rman.h>
 #include <machine/resource.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c
index bd9164fd9f5c..e18004ae19d2 100644
--- a/sys/dev/ofw/ofw_cpu.c
+++ b/sys/dev/ofw/ofw_cpu.c
@@ -43,7 +43,7 @@
 #include <dev/ofw/ofw_cpu.h>
 
 #if defined(__arm__) || defined(__arm64__) || defined(__riscv__)
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #endif
 
 static int	ofw_cpulist_probe(device_t);
diff --git a/sys/dev/pci/pci_dw_mv.c b/sys/dev/pci/pci_dw_mv.c
index b37baf044e8b..4f0671cb23d9 100644
--- a/sys/dev/pci/pci_dw_mv.c
+++ b/sys/dev/pci/pci_dw_mv.c
@@ -44,7 +44,7 @@
 #include <machine/intr.h>
 #include <machine/resource.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/dev/pwm/controller/allwinner/aw_pwm.c b/sys/dev/pwm/controller/allwinner/aw_pwm.c
index 85ccf4352423..8d7e38834fdd 100644
--- a/sys/dev/pwm/controller/allwinner/aw_pwm.c
+++ b/sys/dev/pwm/controller/allwinner/aw_pwm.c
@@ -37,7 +37,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include "pwmbus_if.h"
 
diff --git a/sys/dev/pwm/controller/rockchip/rk_pwm.c b/sys/dev/pwm/controller/rockchip/rk_pwm.c
index 260899f15d89..f1f3946e4d59 100644
--- a/sys/dev/pwm/controller/rockchip/rk_pwm.c
+++ b/sys/dev/pwm/controller/rockchip/rk_pwm.c
@@ -38,7 +38,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include "pwmbus_if.h"
 
diff --git a/sys/dev/qcom_clk/qcom_clk_apssdiv.c b/sys/dev/qcom_clk/qcom_clk_apssdiv.c
index d33134f0ba86..52f6bfa9945f 100644
--- a/sys/dev/qcom_clk/qcom_clk_apssdiv.c
+++ b/sys/dev/qcom_clk/qcom_clk_apssdiv.c
@@ -31,10 +31,10 @@
 #include <sys/rman.h>
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include "qcom_clk_freqtbl.h"
 #include "qcom_clk_apssdiv.h"
diff --git a/sys/dev/qcom_clk/qcom_clk_branch2.c b/sys/dev/qcom_clk/qcom_clk_branch2.c
index 7cbd9a2b73e9..dac9d83ddfbb 100644
--- a/sys/dev/qcom_clk/qcom_clk_branch2.c
+++ b/sys/dev/qcom_clk/qcom_clk_branch2.c
@@ -31,10 +31,10 @@
 #include <sys/rman.h>
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include "qcom_clk_branch2.h"
 #include "qcom_clk_branch2_reg.h"
diff --git a/sys/dev/qcom_clk/qcom_clk_fdiv.c b/sys/dev/qcom_clk/qcom_clk_fdiv.c
index 6d7e7cfa8bb5..1fb1975446e6 100644
--- a/sys/dev/qcom_clk/qcom_clk_fdiv.c
+++ b/sys/dev/qcom_clk/qcom_clk_fdiv.c
@@ -31,10 +31,10 @@
 #include <sys/rman.h>
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include "qcom_clk_fdiv.h"
 
diff --git a/sys/dev/qcom_clk/qcom_clk_fepll.c b/sys/dev/qcom_clk/qcom_clk_fepll.c
index e50b4823fee5..4704186d91ed 100644
--- a/sys/dev/qcom_clk/qcom_clk_fepll.c
+++ b/sys/dev/qcom_clk/qcom_clk_fepll.c
@@ -31,10 +31,10 @@
 #include <sys/rman.h>
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include "qcom_clk_fepll.h"
 
diff --git a/sys/dev/qcom_clk/qcom_clk_rcg2.c b/sys/dev/qcom_clk/qcom_clk_rcg2.c
index 03de356aa64d..0407706dd138 100644
--- a/sys/dev/qcom_clk/qcom_clk_rcg2.c
+++ b/sys/dev/qcom_clk/qcom_clk_rcg2.c
@@ -31,10 +31,10 @@
 #include <sys/rman.h>
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include "qcom_clk_freqtbl.h"
 #include "qcom_clk_rcg2.h"
diff --git a/sys/dev/qcom_clk/qcom_clk_ro_div.c b/sys/dev/qcom_clk/qcom_clk_ro_div.c
index 72712119faf7..f6cb14192bfb 100644
--- a/sys/dev/qcom_clk/qcom_clk_ro_div.c
+++ b/sys/dev/qcom_clk/qcom_clk_ro_div.c
@@ -31,10 +31,10 @@
 #include <sys/rman.h>
 #include <machine/bus.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
 
 #include "qcom_clk_ro_div.h"
 
diff --git a/sys/dev/qcom_dwc3/qcom_dwc3.c b/sys/dev/qcom_dwc3/qcom_dwc3.c
index 73034c914eeb..d9f01e714867 100644
--- a/sys/dev/qcom_dwc3/qcom_dwc3.c
+++ b/sys/dev/qcom_dwc3/qcom_dwc3.c
@@ -45,7 +45,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy_usb.h>
 #include <dev/extres/syscon/syscon.h>
diff --git a/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c b/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c
index b49053dc96d0..6441cf3e6ae5 100644
--- a/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c
+++ b/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c
@@ -44,10 +44,10 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk_div.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_mux.h>
-#include <dev/extres/clk/clk_link.h>
+#include <dev/clk/clk_div.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_mux.h>
+#include <dev/clk/clk_link.h>
 
 #include <dt-bindings/clock/qcom,gcc-ipq4019.h>
 
diff --git a/sys/dev/qcom_qup/qcom_spi.c b/sys/dev/qcom_qup/qcom_spi.c
index 552f01c59bb2..f7163fa1dcab 100644
--- a/sys/dev/qcom_qup/qcom_spi.c
+++ b/sys/dev/qcom_qup/qcom_spi.c
@@ -53,7 +53,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/spibus/spi.h>
diff --git a/sys/dev/qcom_qup/qcom_spi_hw.c b/sys/dev/qcom_qup/qcom_spi_hw.c
index ba2663c79cff..6efbedf0892a 100644
--- a/sys/dev/qcom_qup/qcom_spi_hw.c
+++ b/sys/dev/qcom_qup/qcom_spi_hw.c
@@ -49,7 +49,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <dev/spibus/spi.h>
diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c
index 02077e9766c6..bf9f81108467 100644
--- a/sys/dev/sdhci/sdhci_fdt.c
+++ b/sys/dev/sdhci/sdhci_fdt.c
@@ -50,8 +50,8 @@
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include <dev/ofw/ofw_subr.h>
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_fixed.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_fixed.h>
 #include <dev/extres/syscon/syscon.h>
 #include <dev/extres/phy/phy.h>
 
diff --git a/sys/dev/sdhci/sdhci_fsl_fdt.c b/sys/dev/sdhci/sdhci_fsl_fdt.c
index e83ee384cad9..12ce8c13342c 100644
--- a/sys/dev/sdhci/sdhci_fsl_fdt.c
+++ b/sys/dev/sdhci/sdhci_fsl_fdt.c
@@ -39,7 +39,7 @@
 #include <machine/bus.h>
 #include <machine/resource.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/syscon/syscon.h>
 #include <dev/mmc/bridge.h>
 #include <dev/mmc/mmcbrvar.h>
diff --git a/sys/dev/spibus/controller/allwinner/aw_spi.c b/sys/dev/spibus/controller/allwinner/aw_spi.c
index 3dcde0e4225e..fe6f5c21fcd7 100644
--- a/sys/dev/spibus/controller/allwinner/aw_spi.c
+++ b/sys/dev/spibus/controller/allwinner/aw_spi.c
@@ -40,7 +40,7 @@
 #include <dev/spibus/spi.h>
 #include <dev/spibus/spibusvar.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include "spibus_if.h"
diff --git a/sys/dev/spibus/controller/rockchip/rk_spi.c b/sys/dev/spibus/controller/rockchip/rk_spi.c
index c7a79c4e3cad..42f12e6ddaee 100644
--- a/sys/dev/spibus/controller/rockchip/rk_spi.c
+++ b/sys/dev/spibus/controller/rockchip/rk_spi.c
@@ -42,7 +42,7 @@
 #include <dev/spibus/spi.h>
 #include <dev/spibus/spibusvar.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include "spibus_if.h"
diff --git a/sys/dev/uart/uart_dev_imx.c b/sys/dev/uart/uart_dev_imx.c
index 698497644ee2..b40012a313ca 100644
--- a/sys/dev/uart/uart_dev_imx.c
+++ b/sys/dev/uart/uart_dev_imx.c
@@ -49,7 +49,7 @@
 #endif
 
 #ifdef IMX_ENABLE_CLOCKS
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #endif
 
 #include "uart_if.h"
diff --git a/sys/dev/uart/uart_dev_snps.c b/sys/dev/uart/uart_dev_snps.c
index 6dd071f95fe1..fb5894344927 100644
--- a/sys/dev/uart/uart_dev_snps.c
+++ b/sys/dev/uart/uart_dev_snps.c
@@ -38,7 +38,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 
 #include "uart_if.h"
diff --git a/sys/dev/usb/controller/dwc3/aw_dwc3.c b/sys/dev/usb/controller/dwc3/aw_dwc3.c
index 5b4d5291c28f..7f2869933ee5 100644
--- a/sys/dev/usb/controller/dwc3/aw_dwc3.c
+++ b/sys/dev/usb/controller/dwc3/aw_dwc3.c
@@ -45,7 +45,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy_usb.h>
 
diff --git a/sys/dev/usb/controller/dwc3/dwc3.c b/sys/dev/usb/controller/dwc3/dwc3.c
index d97b0b11d44c..e0ad19fb835f 100644
--- a/sys/dev/usb/controller/dwc3/dwc3.c
+++ b/sys/dev/usb/controller/dwc3/dwc3.c
@@ -65,7 +65,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/phy/phy_usb.h>
 #endif
 
diff --git a/sys/dev/usb/controller/dwc3/rk_dwc3.c b/sys/dev/usb/controller/dwc3/rk_dwc3.c
index f336490c386e..f0cec78a6f22 100644
--- a/sys/dev/usb/controller/dwc3/rk_dwc3.c
+++ b/sys/dev/usb/controller/dwc3/rk_dwc3.c
@@ -45,7 +45,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy_usb.h>
 #include <dev/extres/syscon/syscon.h>
diff --git a/sys/dev/usb/controller/generic_ehci_fdt.c b/sys/dev/usb/controller/generic_ehci_fdt.c
index 4dc3758b59f3..8f9558c6636a 100644
--- a/sys/dev/usb/controller/generic_ehci_fdt.c
+++ b/sys/dev/usb/controller/generic_ehci_fdt.c
@@ -54,7 +54,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/extres/phy/phy_usb.h>
diff --git a/sys/dev/usb/controller/generic_ohci.c b/sys/dev/usb/controller/generic_ohci.c
index 5098a12446b0..efedc92ebfb9 100644
--- a/sys/dev/usb/controller/generic_ohci.c
+++ b/sys/dev/usb/controller/generic_ohci.c
@@ -53,7 +53,7 @@
 #include <dev/usb/controller/ohci.h>
 #include <dev/usb/controller/ohcireg.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/extres/phy/phy_usb.h>
diff --git a/sys/dev/usb/controller/musb_otg_allwinner.c b/sys/dev/usb/controller/musb_otg_allwinner.c
index 2949f730cd7d..4e630ac431e8 100644
--- a/sys/dev/usb/controller/musb_otg_allwinner.c
+++ b/sys/dev/usb/controller/musb_otg_allwinner.c
@@ -58,7 +58,7 @@
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/musb_otg.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy.h>
 #include <dev/extres/phy/phy_usb.h>
diff --git a/sys/dev/usb/controller/usb_nop_xceiv.c b/sys/dev/usb/controller/usb_nop_xceiv.c
index 3d2583d561cf..25fc13cb0020 100644
--- a/sys/dev/usb/controller/usb_nop_xceiv.c
+++ b/sys/dev/usb/controller/usb_nop_xceiv.c
@@ -41,7 +41,7 @@
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/regulator/regulator.h>
 #include <dev/extres/phy/phy_usb.h>
 
diff --git a/sys/dev/usb/controller/xlnx_dwc3.c b/sys/dev/usb/controller/xlnx_dwc3.c
index 0a53fb855034..df91d5e5bc3b 100644
--- a/sys/dev/usb/controller/xlnx_dwc3.c
+++ b/sys/dev/usb/controller/xlnx_dwc3.c
@@ -47,7 +47,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_subr.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/extres/phy/phy_usb.h>
 #include <dev/extres/syscon/syscon.h>
diff --git a/sys/riscv/sifive/fu740_pci_dw.c b/sys/riscv/sifive/fu740_pci_dw.c
index 67305f1ee790..ff2078464379 100644
--- a/sys/riscv/sifive/fu740_pci_dw.c
+++ b/sys/riscv/sifive/fu740_pci_dw.c
@@ -40,7 +40,7 @@
 #include <machine/intr.h>
 #include <machine/resource.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 #include <dev/extres/hwreset/hwreset.h>
 #include <dev/gpio/gpiobusvar.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/riscv/sifive/sifive_prci.c b/sys/riscv/sifive/sifive_prci.c
index 0065711a62d9..ecfaf936e516 100644
--- a/sys/riscv/sifive/sifive_prci.c
+++ b/sys/riscv/sifive/sifive_prci.c
@@ -42,9 +42,9 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
-#include <dev/extres/clk/clk.h>
-#include <dev/extres/clk/clk_fixed.h>
-#include <dev/extres/clk/clk_gate.h>
+#include <dev/clk/clk.h>
+#include <dev/clk/clk_fixed.h>
+#include <dev/clk/clk_gate.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/riscv/sifive/sifive_spi.c b/sys/riscv/sifive/sifive_spi.c
index e27859954408..df6e50ba21ae 100644
--- a/sys/riscv/sifive/sifive_spi.c
+++ b/sys/riscv/sifive/sifive_spi.c
@@ -41,7 +41,7 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/riscv/sifive/sifive_uart.c b/sys/riscv/sifive/sifive_uart.c
index 594773cd3263..0baa32f183ec 100644
--- a/sys/riscv/sifive/sifive_uart.c
+++ b/sys/riscv/sifive/sifive_uart.c
@@ -41,7 +41,7 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
-#include <dev/extres/clk/clk.h>
+#include <dev/clk/clk.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>