diff --git a/sys/arm/allwinner/clkng/ccu_a10.c b/sys/arm/allwinner/clkng/ccu_a10.c
index 288ac10b43f..182a19f35e9 100644
--- a/sys/arm/allwinner/clkng/ccu_a10.c
+++ b/sys/arm/allwinner/clkng/ccu_a10.c
@@ -49,9 +49,9 @@ __FBSDID("$FreeBSD$");
 
 #include <arm/allwinner/clkng/aw_ccung.h>
 
-#include <gnu/dts/include/dt-bindings/clock/sun4i-a10-ccu.h>
-#include <gnu/dts/include/dt-bindings/clock/sun7i-a20-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun4i-a10-ccu.h>
+#include <dt-bindings/clock/sun4i-a10-ccu.h>
+#include <dt-bindings/clock/sun7i-a20-ccu.h>
+#include <dt-bindings/reset/sun4i-a10-ccu.h>
 
 /* Non-exported resets */
 /* Non-exported clocks */
diff --git a/sys/arm/allwinner/clkng/ccu_a64.c b/sys/arm/allwinner/clkng/ccu_a64.c
index 859862b2b47..41f53159647 100644
--- a/sys/arm/allwinner/clkng/ccu_a64.c
+++ b/sys/arm/allwinner/clkng/ccu_a64.c
@@ -49,8 +49,8 @@ __FBSDID("$FreeBSD$");
 
 #include <arm/allwinner/clkng/aw_ccung.h>
 
-#include <gnu/dts/include/dt-bindings/clock/sun50i-a64-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun50i-a64-ccu.h>
+#include <dt-bindings/clock/sun50i-a64-ccu.h>
+#include <dt-bindings/reset/sun50i-a64-ccu.h>
 
 /* Non-exported clocks */
 
diff --git a/sys/arm/allwinner/clkng/ccu_a83t.c b/sys/arm/allwinner/clkng/ccu_a83t.c
index bf8dcb13399..c32b1d62416 100644
--- a/sys/arm/allwinner/clkng/ccu_a83t.c
+++ b/sys/arm/allwinner/clkng/ccu_a83t.c
@@ -49,8 +49,8 @@ __FBSDID("$FreeBSD$");
 
 #include <arm/allwinner/clkng/aw_ccung.h>
 
-#include <gnu/dts/include/dt-bindings/clock/sun8i-a83t-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun8i-a83t-ccu.h>
+#include <dt-bindings/clock/sun8i-a83t-ccu.h>
+#include <dt-bindings/reset/sun8i-a83t-ccu.h>
 
 /* Non-exported clocks */
 
diff --git a/sys/arm/allwinner/clkng/ccu_de2.c b/sys/arm/allwinner/clkng/ccu_de2.c
index 7e699cce36a..84a2681abeb 100644
--- a/sys/arm/allwinner/clkng/ccu_de2.c
+++ b/sys/arm/allwinner/clkng/ccu_de2.c
@@ -55,8 +55,8 @@ __FBSDID("$FreeBSD$");
 
 #include <arm/allwinner/clkng/aw_ccung.h>
 
-#include <gnu/dts/include/dt-bindings/clock/sun8i-de2.h>
-#include <gnu/dts/include/dt-bindings/reset/sun8i-de2.h>
+#include <dt-bindings/clock/sun8i-de2.h>
+#include <dt-bindings/reset/sun8i-de2.h>
 
 enum CCU_DE2 {
 	H3_CCU = 1,
diff --git a/sys/arm/allwinner/clkng/ccu_h3.c b/sys/arm/allwinner/clkng/ccu_h3.c
index c5f182b81a3..72e257c98d7 100644
--- a/sys/arm/allwinner/clkng/ccu_h3.c
+++ b/sys/arm/allwinner/clkng/ccu_h3.c
@@ -57,8 +57,8 @@ __FBSDID("$FreeBSD$");
 
 #include <arm/allwinner/clkng/aw_ccung.h>
 
-#include <gnu/dts/include/dt-bindings/clock/sun8i-h3-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun8i-h3-ccu.h>
+#include <dt-bindings/clock/sun8i-h3-ccu.h>
+#include <dt-bindings/reset/sun8i-h3-ccu.h>
 
 /* Non-exported resets */
 #define	RST_BUS_SCR		53
diff --git a/sys/arm/allwinner/clkng/ccu_h6.c b/sys/arm/allwinner/clkng/ccu_h6.c
index 5dd1816fab1..dbecaaff0e6 100644
--- a/sys/arm/allwinner/clkng/ccu_h6.c
+++ b/sys/arm/allwinner/clkng/ccu_h6.c
@@ -49,8 +49,8 @@ __FBSDID("$FreeBSD$");
 
 #include <arm/allwinner/clkng/aw_ccung.h>
 
-#include <gnu/dts/include/dt-bindings/clock/sun50i-h6-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun50i-h6-ccu.h>
+#include <dt-bindings/clock/sun50i-h6-ccu.h>
+#include <dt-bindings/reset/sun50i-h6-ccu.h>
 
 /* Non-exported clocks */
 #define	CLK_OSC_12M		0
diff --git a/sys/arm/allwinner/clkng/ccu_h6_r.c b/sys/arm/allwinner/clkng/ccu_h6_r.c
index 98fcd2b47c9..1f1ca8c1054 100644
--- a/sys/arm/allwinner/clkng/ccu_h6_r.c
+++ b/sys/arm/allwinner/clkng/ccu_h6_r.c
@@ -49,8 +49,8 @@ __FBSDID("$FreeBSD$");
 
 #include <arm/allwinner/clkng/aw_ccung.h>
 
-#include <gnu/dts/include/dt-bindings/clock/sun50i-h6-r-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun50i-h6-r-ccu.h>
+#include <dt-bindings/clock/sun50i-h6-r-ccu.h>
+#include <dt-bindings/reset/sun50i-h6-r-ccu.h>
 
 /* Non-exported clocks */
 #define	CLK_R_AHB	1
diff --git a/sys/arm/allwinner/clkng/ccu_sun8i_r.c b/sys/arm/allwinner/clkng/ccu_sun8i_r.c
index cc3b5bff2cf..05558f4dc73 100644
--- a/sys/arm/allwinner/clkng/ccu_sun8i_r.c
+++ b/sys/arm/allwinner/clkng/ccu_sun8i_r.c
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 
 #include <arm/allwinner/clkng/aw_ccung.h>
 
-#include <gnu/dts/include/dt-bindings/clock/sun8i-r-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun8i-r-ccu.h>
+#include <dt-bindings/clock/sun8i-r-ccu.h>
+#include <dt-bindings/reset/sun8i-r-ccu.h>
 
 /* Non-exported clocks */
 #define	CLK_AHB0	1
diff --git a/sys/arm/mv/mv_cp110_icu.c b/sys/arm/mv/mv_cp110_icu.c
index 41e727ccc69..12dd6989e33 100644
--- a/sys/arm/mv/mv_cp110_icu.c
+++ b/sys/arm/mv/mv_cp110_icu.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <gnu/dts/include/dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include "pic_if.h"
 
 #define	ICU_GRP_NSR		0x0
diff --git a/sys/arm/nvidia/as3722.c b/sys/arm/nvidia/as3722.c
index 21dae2d7c69..60301c78a2f 100644
--- a/sys/arm/nvidia/as3722.c
+++ b/sys/arm/nvidia/as3722.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <gnu/dts/include/dt-bindings/mfd/as3722.h>
+#include <dt-bindings/mfd/as3722.h>
 
 #include "clock_if.h"
 #include "regdev_if.h"
diff --git a/sys/arm/nvidia/as3722_regulators.c b/sys/arm/nvidia/as3722_regulators.c
index d6cb5c52917..3e463f0f5de 100644
--- a/sys/arm/nvidia/as3722_regulators.c
+++ b/sys/arm/nvidia/as3722_regulators.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/extres/regulator/regulator.h>
 #include <dev/gpio/gpiobusvar.h>
 
-#include <gnu/dts/include/dt-bindings/mfd/as3722.h>
+#include <dt-bindings/mfd/as3722.h>
 
 #include "as3722.h"
 
diff --git a/sys/arm/nvidia/drm2/tegra_drm_subr.c b/sys/arm/nvidia/drm2/tegra_drm_subr.c
index ab883445a2e..813da9c7b18 100644
--- a/sys/arm/nvidia/drm2/tegra_drm_subr.c
+++ b/sys/arm/nvidia/drm2/tegra_drm_subr.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 
 #include <arm/nvidia/drm2/tegra_drm.h>
 
-#include <gnu/dts/include/dt-bindings/gpio/gpio.h>
+#include <dt-bindings/gpio/gpio.h>
 
 int
 tegra_drm_connector_get_modes(struct drm_connector *connector)
diff --git a/sys/arm/nvidia/tegra124/tegra124_car.c b/sys/arm/nvidia/tegra124/tegra124_car.c
index 7e776720a2e..89f3e392c0b 100644
--- a/sys/arm/nvidia/tegra124/tegra124_car.c
+++ b/sys/arm/nvidia/tegra124/tegra124_car.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <gnu/dts/include/dt-bindings/clock/tegra124-car.h>
+#include <dt-bindings/clock/tegra124-car.h>
 
 #include "clkdev_if.h"
 #include "hwreset_if.h"
diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_per.c b/sys/arm/nvidia/tegra124/tegra124_clk_per.c
index f1a36a447c1..4d68e8b22da 100644
--- a/sys/arm/nvidia/tegra124/tegra124_clk_per.c
+++ b/sys/arm/nvidia/tegra124/tegra124_clk_per.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/extres/clk/clk.h>
 
-#include <gnu/dts/include/dt-bindings/clock/tegra124-car.h>
+#include <dt-bindings/clock/tegra124-car.h>
 #include "tegra124_car.h"
 
 /* The TEGRA124_CLK_XUSB_GATE is missing in current
diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_pll.c b/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
index 7e04c39dcee..82b34fd7120 100644
--- a/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
+++ b/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/extres/clk/clk.h>
 
-#include <gnu/dts/include/dt-bindings/clock/tegra124-car.h>
+#include <dt-bindings/clock/tegra124-car.h>
 #include "tegra124_car.h"
 
 /* #define TEGRA_PLL_DEBUG */
diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_super.c b/sys/arm/nvidia/tegra124/tegra124_clk_super.c
index 808a262ad65..43582508ede 100644
--- a/sys/arm/nvidia/tegra124/tegra124_clk_super.c
+++ b/sys/arm/nvidia/tegra124/tegra124_clk_super.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/extres/clk/clk.h>
 
-#include <gnu/dts/include/dt-bindings/clock/tegra124-car.h>
+#include <dt-bindings/clock/tegra124-car.h>
 #include "tegra124_car.h"
 
 /* Flags */
diff --git a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
index 52b3eb6a896..f4123419733 100644
--- a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
+++ b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 
 #include <arm/nvidia/tegra_efuse.h>
 
-#include <gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h>
+#include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h>
 
 #include "phydev_if.h"
 
diff --git a/sys/arm/nvidia/tegra_soctherm.c b/sys/arm/nvidia/tegra_soctherm.c
index d82b0748883..d90e97e5915 100644
--- a/sys/arm/nvidia/tegra_soctherm.c
+++ b/sys/arm/nvidia/tegra_soctherm.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include <arm/nvidia/tegra_efuse.h>
-#include <gnu/dts/include/dt-bindings/thermal/tegra124-soctherm.h>
+#include <dt-bindings/thermal/tegra124-soctherm.h>
 #include "tegra_soctherm_if.h"
 
 /* Per sensors registers - base is 0x0c0*/
diff --git a/sys/arm/ti/ti_sysc.c b/sys/arm/ti/ti_sysc.c
index 171520643c1..b16158aa5d8 100644
--- a/sys/arm/ti/ti_sysc.c
+++ b/sys/arm/ti/ti_sysc.c
@@ -120,7 +120,7 @@ static const char * reg_names[] = { "rev", "sysc", "syss" };
 #define REG_MAX		3
 
 /* master idle / slave idle mode defined in 8.1.3.2.1 / 8.1.3.2.2 */
-#include <gnu/dts/include/dt-bindings/bus/ti-sysc.h>
+#include <dt-bindings/bus/ti-sysc.h>
 #define SYSC_IDLE_MAX		4
 
 struct sysc_reg {