diff --git a/sys/arm/allwinner/a10_ahci.c b/sys/arm/allwinner/a10_ahci.c
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.h b/sys/arm/mv/clk/a37x0_tbg_pll.h
--- 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_tbg_pll.c b/sys/arm/mv/clk/a37x0_tbg_pll.c
--- 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_xtal.c b/sys/arm/mv/clk/a37x0_xtal.c
--- a/sys/arm/mv/clk/a37x0_xtal.c
+++ b/sys/arm/mv/clk/a37x0_xtal.c
@@ -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
--- 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
--- 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.h b/sys/arm/mv/clk/armada38x_gen.h
--- 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/armada38x_gen.c b/sys/arm/mv/clk/armada38x_gen.c
--- 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/periph.h b/sys/arm/mv/clk/periph.h
--- 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.c b/sys/arm/mv/clk/periph.c
--- 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_clk_d.c b/sys/arm/mv/clk/periph_clk_d.c
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.h b/sys/arm/ti/clk/ti_clk_clkctrl.h
--- 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_clkctrl.c b/sys/arm/ti/clk/ti_clk_clkctrl.c
--- 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_dpll.h b/sys/arm/ti/clk/ti_clk_dpll.h
--- 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_clk_dpll.c b/sys/arm/ti/clk/ti_clk_dpll.c
--- 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_divider_clock.c b/sys/arm/ti/clk/ti_divider_clock.c
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.h b/sys/arm64/freescale/imx/clk/imx_clk_composite.h
--- 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_composite.c b/sys/arm64/freescale/imx/clk/imx_clk_composite.c
--- 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_frac_pll.h b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h
--- 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_frac_pll.c b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c
--- 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_gate.h b/sys/arm64/freescale/imx/clk/imx_clk_gate.h
--- 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_gate.c b/sys/arm64/freescale/imx/clk/imx_clk_gate.c
--- 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_mux.h b/sys/arm64/freescale/imx/clk/imx_clk_mux.h
--- 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_mux.c b/sys/arm64/freescale/imx/clk/imx_clk_mux.c
--- 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_sscg_pll.h b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h
--- 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/clk/imx_clk_sscg_pll.c b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c
--- 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/imx_ccm_clk.h b/sys/arm64/freescale/imx/imx_ccm_clk.h
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 e51cf74a31271c667a87989011a283606bacdc3f..833e14c883d3cdb86c1e89eaf39be16eb6875c0f
GIT binary patch
literal 56827
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
BD8v8&

literal 56855
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
G$p1gOelzR<

diff --git a/sys/arm64/qoriq/clk/ls1028a_clkgen.c b/sys/arm64/qoriq/clk/ls1028a_clkgen.c
--- 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
--- 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
--- 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
--- 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
--- 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.h b/sys/arm64/qoriq/clk/qoriq_clk_pll.h
--- 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_clk_pll.c b/sys/arm64/qoriq/clk/qoriq_clk_pll.c
--- 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_clkgen.h b/sys/arm64/qoriq/clk/qoriq_clkgen.h
--- 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/clk/qoriq_clkgen.c b/sys/arm64/qoriq/clk/qoriq_clkgen.c
--- 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/qoriq_therm.c b/sys/arm64/qoriq/qoriq_therm.c
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1353,6 +1353,15 @@
 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_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
--- 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
--- 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
--- 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.h b/sys/dev/clk/allwinner/aw_ccung.h
--- 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_ccung.c b/sys/dev/clk/allwinner/aw_ccung.c
--- 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_clk_frac.h b/sys/dev/clk/allwinner/aw_clk_frac.h
--- 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_frac.c b/sys/dev/clk/allwinner/aw_clk_frac.c
--- 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_m.h b/sys/dev/clk/allwinner/aw_clk_m.h
--- 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_m.c b/sys/dev/clk/allwinner/aw_clk_m.c
--- 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_mipi.h b/sys/dev/clk/allwinner/aw_clk_mipi.h
--- 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_mipi.c b/sys/dev/clk/allwinner/aw_clk_mipi.c
--- 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_nkmp.c b/sys/dev/clk/allwinner/aw_clk_nkmp.c
--- 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.h b/sys/dev/clk/allwinner/aw_clk_nm.h
--- 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_nm.c b/sys/dev/clk/allwinner/aw_clk_nm.c
--- 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_nmm.h b/sys/dev/clk/allwinner/aw_clk_nmm.h
--- 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_nmm.c b/sys/dev/clk/allwinner/aw_clk_nmm.c
--- 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_np.h b/sys/dev/clk/allwinner/aw_clk_np.h
--- 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_np.c b/sys/dev/clk/allwinner/aw_clk_np.c
--- 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_prediv_mux.c b/sys/dev/clk/allwinner/aw_clk_prediv_mux.c
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.h b/sys/dev/clk/clk.h
rename from sys/dev/extres/clk/clk.h
rename to sys/dev/clk/clk.h
--- 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_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.c b/sys/dev/clk/clk.c
rename from sys/dev/extres/clk/clk.c
rename to sys/dev/clk/clk.c
--- 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_bus.c b/sys/dev/clk/clk_bus.c
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.h b/sys/dev/clk/clk_div.h
rename from sys/dev/extres/clk/clk_div.h
rename to sys/dev/clk/clk_div.h
--- 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 @@
 
 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_div.c b/sys/dev/clk/clk_div.c
rename from sys/dev/extres/clk/clk_div.c
rename to sys/dev/clk/clk_div.c
--- 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_fixed.h b/sys/dev/clk/clk_fixed.h
rename from sys/dev/extres/clk/clk_fixed.h
rename to sys/dev/clk/clk_fixed.h
--- 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 @@
 
 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_fixed.c b/sys/dev/clk/clk_fixed.c
rename from sys/dev/extres/clk/clk_fixed.c
rename to sys/dev/clk/clk_fixed.c
--- 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_gate.h b/sys/dev/clk/clk_gate.h
rename from sys/dev/extres/clk/clk_gate.h
rename to sys/dev/clk/clk_gate.h
--- 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 @@
 
 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_gate.c b/sys/dev/clk/clk_gate.c
rename from sys/dev/extres/clk/clk_gate.c
rename to sys/dev/clk/clk_gate.c
--- 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_link.h b/sys/dev/clk/clk_link.h
rename from sys/dev/extres/clk/clk_link.h
rename to sys/dev/clk/clk_link.h
--- 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 @@
 
 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_link.c b/sys/dev/clk/clk_link.c
rename from sys/dev/extres/clk/clk_link.c
rename to sys/dev/clk/clk_link.c
--- 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_mux.h b/sys/dev/clk/clk_mux.h
rename from sys/dev/extres/clk/clk_mux.h
rename to sys/dev/clk/clk_mux.h
--- 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 @@
 
 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/clk_mux.c b/sys/dev/clk/clk_mux.c
rename from sys/dev/extres/clk/clk_mux.c
rename to sys/dev/clk/clk_mux.c
--- 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/clkdev_if.m b/sys/dev/clk/clkdev_if.m
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
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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.h b/sys/dev/clk/rockchip/rk_clk_armclk.h
--- 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_armclk.c b/sys/dev/clk/rockchip/rk_clk_armclk.c
--- 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_composite.h b/sys/dev/clk/rockchip/rk_clk_composite.h
--- 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_composite.c b/sys/dev/clk/rockchip/rk_clk_composite.c
--- a/sys/dev/clk/rockchip/rk_clk_composite.c
+++ b/sys/dev/clk/rockchip/rk_clk_composite.c
@@ -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_fract.h b/sys/dev/clk/rockchip/rk_clk_fract.h
--- 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_fract.c b/sys/dev/clk/rockchip/rk_clk_fract.c
--- 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_gate.h b/sys/dev/clk/rockchip/rk_clk_gate.h
--- 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_gate.c b/sys/dev/clk/rockchip/rk_clk_gate.c
--- 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_mux.h b/sys/dev/clk/rockchip/rk_clk_mux.h
--- 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_mux.c b/sys/dev/clk/rockchip/rk_clk_mux.c
--- a/sys/dev/clk/rockchip/rk_clk_mux.c
+++ b/sys/dev/clk/rockchip/rk_clk_mux.c
@@ -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_pll.h b/sys/dev/clk/rockchip/rk_clk_pll.h
--- 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_clk_pll.c b/sys/dev/clk/rockchip/rk_clk_pll.c
--- 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_cru.h b/sys/dev/clk/rockchip/rk_cru.h
--- 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/rockchip/rk_cru.c b/sys/dev/clk/rockchip/rk_cru.c
--- 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/xilinx/zynqmp_clk_div.c b/sys/dev/clk/xilinx/zynqmp_clk_div.c
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>