refactor: Move to `zephyr/` include paths.

* Zephyr moved to properly namespaced headers, so major "rip
  the bandaid" commit to move us to those everywhere.

116 files changed, 334 insertions, 331 deletions

diff --git a/app/boards/arm/mikoto/pinmux.c b/app/boards/arm/mikoto/pinmux.c
index 59a38fbf7e..6d7f46d1e9 100644
--- a/app/boards/arm/mikoto/pinmux.c
+++ b/app/boards/arm/mikoto/pinmux.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <sys/sys_io.h>
-#include <devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/devicetree.h>
 
 static int pinmux_mikoto_init(const struct device *port) {
     ARG_UNUSED(port);
diff --git a/app/boards/arm/nrfmicro/pinmux.c b/app/boards/arm/nrfmicro/pinmux.c
index ef5b552132..129530d4a5 100644
--- a/app/boards/arm/nrfmicro/pinmux.c
+++ b/app/boards/arm/nrfmicro/pinmux.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <sys/sys_io.h>
-#include <devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/devicetree.h>
 
 static int pinmux_nrfmicro_init(const struct device *port) {
     ARG_UNUSED(port);
diff --git a/app/boards/arm/puchi_ble/pinmux.c b/app/boards/arm/puchi_ble/pinmux.c
index 78cea3141f..0817b6e0a7 100644
--- a/app/boards/arm/puchi_ble/pinmux.c
+++ b/app/boards/arm/puchi_ble/pinmux.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <sys/sys_io.h>
-#include <devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/devicetree.h>
 
 static int pinmux_puchi_ble_init(const struct device *port) {
     ARG_UNUSED(port);
diff --git a/app/drivers/display/il0323.c b/app/drivers/display/il0323.c
index f6c9037e68..ec6da15934 100644
--- a/app/drivers/display/il0323.c
+++ b/app/drivers/display/il0323.c
@@ -7,16 +7,16 @@
 #define DT_DRV_COMPAT gooddisplay_il0323
 
 #include <string.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/display.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <sys/byteorder.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "il0323_regs.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(il0323, CONFIG_DISPLAY_LOG_LEVEL);
 
 /**
diff --git a/app/drivers/gpio/gpio_595.c b/app/drivers/gpio/gpio_595.c
index 320167027c..3d3858449c 100644
--- a/app/drivers/gpio/gpio_595.c
+++ b/app/drivers/gpio/gpio_595.c
@@ -12,15 +12,15 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_595);
 
 /** Configuration data */
diff --git a/app/drivers/gpio/gpio_mcp23017.c b/app/drivers/gpio/gpio_mcp23017.c
index 1df14e6baa..feafbd0a13 100644
--- a/app/drivers/gpio/gpio_mcp23017.c
+++ b/app/drivers/gpio/gpio_mcp23017.c
@@ -12,9 +12,9 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <sys/byteorder.h>
 #include <drivers/gpio.h>
 #include <drivers/i2c.h>
@@ -22,7 +22,7 @@
 #include "gpio_mcp23017.h"
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_mcp23017);
 
 /**
diff --git a/app/drivers/gpio/gpio_mcp23017.h b/app/drivers/gpio/gpio_mcp23017.h
index 026565cd00..01908c0c15 100644
--- a/app/drivers/gpio/gpio_mcp23017.h
+++ b/app/drivers/gpio/gpio_mcp23017.h
@@ -11,7 +11,7 @@
 #ifndef ZEPHYR_DRIVERS_GPIO_GPIO_MCP23017_H_
 #define ZEPHYR_DRIVERS_GPIO_GPIO_MCP23017_H_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include <drivers/gpio.h>
 #include <drivers/i2c.h>
diff --git a/app/drivers/kscan/debounce.h b/app/drivers/kscan/debounce.h
index 9fa4531bd0..6e9faa6681 100644
--- a/app/drivers/kscan/debounce.h
+++ b/app/drivers/kscan/debounce.h
@@ -8,7 +8,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define DEBOUNCE_COUNTER_BITS 14
 #define DEBOUNCE_COUNTER_MAX BIT_MASK(DEBOUNCE_COUNTER_BITS)
diff --git a/app/drivers/kscan/kscan_composite.c b/app/drivers/kscan/kscan_composite.c
index 35584d9c8b..e0cf47f987 100644
--- a/app/drivers/kscan/kscan_composite.c
+++ b/app/drivers/kscan/kscan_composite.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_kscan_composite
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/kscan.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #define MATRIX_NODE_ID DT_DRV_INST(0)
diff --git a/app/drivers/kscan/kscan_gpio_demux.c b/app/drivers/kscan/kscan_gpio_demux.c
index ff2c6c6963..5fdd3a7ec8 100644
--- a/app/drivers/kscan/kscan_gpio_demux.c
+++ b/app/drivers/kscan/kscan_gpio_demux.c
@@ -6,10 +6,10 @@
 
 #define DT_DRV_COMPAT zmk_kscan_gpio_demux
 
-#include <device.h>
-#include <drivers/kscan.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/drivers/kscan/kscan_gpio_direct.c b/app/drivers/kscan/kscan_gpio_direct.c
index 1e0576c5f7..18a9348d8e 100644
--- a/app/drivers/kscan/kscan_gpio_direct.c
+++ b/app/drivers/kscan/kscan_gpio_direct.c
@@ -6,13 +6,13 @@
 
 #include "debounce.h"
 
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/gpio.h>
-#include <drivers/kscan.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/drivers/kscan/kscan_gpio_matrix.c b/app/drivers/kscan/kscan_gpio_matrix.c
index de65fd49f7..7050214868 100644
--- a/app/drivers/kscan/kscan_gpio_matrix.c
+++ b/app/drivers/kscan/kscan_gpio_matrix.c
@@ -6,14 +6,14 @@
 
 #include "debounce.h"
 
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/gpio.h>
-#include <drivers/kscan.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/drivers/kscan/kscan_mock.c b/app/drivers/kscan/kscan_mock.c
index 4ccce69f4e..57862b0d6f 100644
--- a/app/drivers/kscan/kscan_mock.c
+++ b/app/drivers/kscan/kscan_mock.c
@@ -7,9 +7,9 @@
 #define DT_DRV_COMPAT zmk_kscan_mock
 
 #include <stdlib.h>
-#include <device.h>
-#include <drivers/kscan.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/drivers/sensor/battery/battery_common.c b/app/drivers/sensor/battery/battery_common.c
index 36e98affd1..9afe2d5b4c 100644
--- a/app/drivers/sensor/battery/battery_common.c
+++ b/app/drivers/sensor/battery/battery_common.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 
 #include "battery_common.h"
 
diff --git a/app/drivers/sensor/battery/battery_common.h b/app/drivers/sensor/battery/battery_common.h
index d81c39e24d..3e16ceed14 100644
--- a/app/drivers/sensor/battery/battery_common.h
+++ b/app/drivers/sensor/battery/battery_common.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 #include <stdint.h>
 
 struct battery_value {
diff --git a/app/drivers/sensor/battery/battery_nrf_vddh.c b/app/drivers/sensor/battery/battery_nrf_vddh.c
index 60104a69ae..3f230812f4 100644
--- a/app/drivers/sensor/battery/battery_nrf_vddh.c
+++ b/app/drivers/sensor/battery/battery_nrf_vddh.c
@@ -9,11 +9,11 @@
 
 #define DT_DRV_COMPAT zmk_battery_nrf_vddh
 
-#include <device.h>
-#include <devicetree.h>
-#include <drivers/adc.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
 #include "battery_common.h"
 
diff --git a/app/drivers/sensor/battery/battery_voltage_divider.c b/app/drivers/sensor/battery/battery_voltage_divider.c
index 09e5525ec5..bc35d00234 100644
--- a/app/drivers/sensor/battery/battery_voltage_divider.c
+++ b/app/drivers/sensor/battery/battery_voltage_divider.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT zmk_battery_voltage_divider
 
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <drivers/gpio.h>
 #include <drivers/adc.h>
 #include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "battery_common.h"
 
diff --git a/app/drivers/sensor/ec11/ec11.c b/app/drivers/sensor/ec11/ec11.c
index 2fe641fa7c..5f26ebc3aa 100644
--- a/app/drivers/sensor/ec11/ec11.c
+++ b/app/drivers/sensor/ec11/ec11.c
@@ -6,13 +6,13 @@
 
 #define DT_DRV_COMPAT alps_ec11
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 
 #include "ec11.h"
 
diff --git a/app/drivers/sensor/ec11/ec11.h b/app/drivers/sensor/ec11/ec11.h
index 1cb9c5f77e..04750df54c 100644
--- a/app/drivers/sensor/ec11/ec11.h
+++ b/app/drivers/sensor/ec11/ec11.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 
 struct ec11_config {
     const char *a_label;
diff --git a/app/drivers/sensor/ec11/ec11_trigger.c b/app/drivers/sensor/ec11/ec11_trigger.c
index 555e1f4a3e..804a21d912 100644
--- a/app/drivers/sensor/ec11/ec11_trigger.c
+++ b/app/drivers/sensor/ec11/ec11_trigger.c
@@ -6,17 +6,17 @@
 
 #define DT_DRV_COMPAT alps_ec11
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 
 #include "ec11.h"
 
 extern struct ec11_data ec11_driver;
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(EC11, CONFIG_SENSOR_LOG_LEVEL);
 
 static inline void setup_int(const struct device *dev, bool enable) {
diff --git a/app/include/drivers/behavior.h b/app/include/drivers/behavior.h
index fcb24f6fbb..71df73440e 100644
--- a/app/include/drivers/behavior.h
+++ b/app/include/drivers/behavior.h
@@ -8,9 +8,9 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <string.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include <zmk/keys.h>
 #include <zmk/behavior.h>
 
diff --git a/app/include/drivers/ext_power.h b/app/include/drivers/ext_power.h
index b422750c60..287679e169 100644
--- a/app/include/drivers/ext_power.h
+++ b/app/include/drivers/ext_power.h
@@ -8,7 +8,7 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <device.h>
+#include <zephyr/device.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/app/include/linker/zmk-events.ld b/app/include/linker/zmk-events.ld
index 78d00bb7de..66c1264a16 100644
--- a/app/include/linker/zmk-events.ld
+++ b/app/include/linker/zmk-events.ld
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
  
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 
         	__event_type_start = .; \
         	KEEP(*(".event_type")); \
diff --git a/app/include/zmk/behavior_queue.h b/app/include/zmk/behavior_queue.h
index 8a184e4aa6..307482e7cd 100644
--- a/app/include/zmk/behavior_queue.h
+++ b/app/include/zmk/behavior_queue.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdint.h>
 #include <zmk/behavior.h>
 
diff --git a/app/include/zmk/ble/profile.h b/app/include/zmk/ble/profile.h
index 1df2743641..0a57f16fa4 100644
--- a/app/include/zmk/ble/profile.h
+++ b/app/include/zmk/ble/profile.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <bluetooth/addr.h>
+#include <zephyr/bluetooth/addr.h>
 
 #define ZMK_BLE_PROFILE_NAME_MAX 15
 
diff --git a/app/include/zmk/display/widgets/battery_status.h b/app/include/zmk/display/widgets/battery_status.h
index b87e87ee6d..ce22da4d71 100644
--- a/app/include/zmk/display/widgets/battery_status.h
+++ b/app/include/zmk/display/widgets/battery_status.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <lvgl.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 struct zmk_widget_battery_status {
     sys_snode_t node;
diff --git a/app/include/zmk/display/widgets/layer_status.h b/app/include/zmk/display/widgets/layer_status.h
index 3779351a87..a11c403986 100644
--- a/app/include/zmk/display/widgets/layer_status.h
+++ b/app/include/zmk/display/widgets/layer_status.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <lvgl.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 struct zmk_widget_layer_status {
     sys_snode_t node;
diff --git a/app/include/zmk/display/widgets/output_status.h b/app/include/zmk/display/widgets/output_status.h
index 66f0927143..ed8ee813c5 100644
--- a/app/include/zmk/display/widgets/output_status.h
+++ b/app/include/zmk/display/widgets/output_status.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <lvgl.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 struct zmk_widget_output_status {
     sys_snode_t node;
diff --git a/app/include/zmk/display/widgets/peripheral_status.h b/app/include/zmk/display/widgets/peripheral_status.h
index e3b41355eb..07caeaa76d 100644
--- a/app/include/zmk/display/widgets/peripheral_status.h
+++ b/app/include/zmk/display/widgets/peripheral_status.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <lvgl.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 struct zmk_widget_peripheral_status {
     sys_snode_t node;
diff --git a/app/include/zmk/display/widgets/wpm_status.h b/app/include/zmk/display/widgets/wpm_status.h
index 0592299e2a..fbe96cc237 100644
--- a/app/include/zmk/display/widgets/wpm_status.h
+++ b/app/include/zmk/display/widgets/wpm_status.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <lvgl.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 struct zmk_widget_wpm_status {
     sys_snode_t node;
diff --git a/app/include/zmk/event_manager.h b/app/include/zmk/event_manager.h
index 5acb26eb08..aa9942ea36 100644
--- a/app/include/zmk/event_manager.h
+++ b/app/include/zmk/event_manager.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <stddef.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 struct zmk_event_type {
diff --git a/app/include/zmk/events/activity_state_changed.h b/app/include/zmk/events/activity_state_changed.h
index 998fa2d474..6a3481f3e0 100644
--- a/app/include/zmk/events/activity_state_changed.h
+++ b/app/include/zmk/events/activity_state_changed.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/event_manager.h>
 #include <zmk/activity.h>
 
diff --git a/app/include/zmk/events/battery_state_changed.h b/app/include/zmk/events/battery_state_changed.h
index 6a003d8dd7..5a8c625e07 100644
--- a/app/include/zmk/events/battery_state_changed.h
+++ b/app/include/zmk/events/battery_state_changed.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/event_manager.h>
 
 struct zmk_battery_state_changed {
diff --git a/app/include/zmk/events/ble_active_profile_changed.h b/app/include/zmk/events/ble_active_profile_changed.h
index 4d3bb7ae8f..620e19b4b8 100644
--- a/app/include/zmk/events/ble_active_profile_changed.h
+++ b/app/include/zmk/events/ble_active_profile_changed.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/event_manager.h>
-#include <device.h>
+#include <zephyr/device.h>
 
 #include <zmk/ble/profile.h>
 
diff --git a/app/include/zmk/events/endpoint_selection_changed.h b/app/include/zmk/events/endpoint_selection_changed.h
index 38a6a8e526..198fe5a168 100644
--- a/app/include/zmk/events/endpoint_selection_changed.h
+++ b/app/include/zmk/events/endpoint_selection_changed.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zmk/endpoints_types.h>
 #include <zmk/event_manager.h>
diff --git a/app/include/zmk/events/keycode_state_changed.h b/app/include/zmk/events/keycode_state_changed.h
index 233ec62fc9..c3a3ed30d0 100644
--- a/app/include/zmk/events/keycode_state_changed.h
+++ b/app/include/zmk/events/keycode_state_changed.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/event_manager.h>
 #include <zmk/keys.h>
 
diff --git a/app/include/zmk/events/layer_state_changed.h b/app/include/zmk/events/layer_state_changed.h
index 33183546ef..405d1365b7 100644
--- a/app/include/zmk/events/layer_state_changed.h
+++ b/app/include/zmk/events/layer_state_changed.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/event_manager.h>
 
 struct zmk_layer_state_changed {
diff --git a/app/include/zmk/events/modifiers_state_changed.h b/app/include/zmk/events/modifiers_state_changed.h
index 504c2c9c85..3f772cdb1d 100644
--- a/app/include/zmk/events/modifiers_state_changed.h
+++ b/app/include/zmk/events/modifiers_state_changed.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/keys.h>
 #include <zmk/event_manager.h>
 
diff --git a/app/include/zmk/events/position_state_changed.h b/app/include/zmk/events/position_state_changed.h
index 5323e943ac..3e4e9238cf 100644
--- a/app/include/zmk/events/position_state_changed.h
+++ b/app/include/zmk/events/position_state_changed.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/event_manager.h>
 
 #define ZMK_POSITION_STATE_CHANGE_SOURCE_LOCAL UINT8_MAX
diff --git a/app/include/zmk/events/sensor_event.h b/app/include/zmk/events/sensor_event.h
index f579bc398c..9398bcbb71 100644
--- a/app/include/zmk/events/sensor_event.h
+++ b/app/include/zmk/events/sensor_event.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/event_manager.h>
-#include <device.h>
+#include <zephyr/device.h>
 struct zmk_sensor_event {
     uint8_t sensor_number;
     const struct device *sensor;
diff --git a/app/include/zmk/events/split_peripheral_status_changed.h b/app/include/zmk/events/split_peripheral_status_changed.h
index c75a879f70..6ea59f6064 100644
--- a/app/include/zmk/events/split_peripheral_status_changed.h
+++ b/app/include/zmk/events/split_peripheral_status_changed.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/event_manager.h>
 
 struct zmk_split_peripheral_status_changed {
diff --git a/app/include/zmk/events/usb_conn_state_changed.h b/app/include/zmk/events/usb_conn_state_changed.h
index b40158c3af..5f4ac5d235 100644
--- a/app/include/zmk/events/usb_conn_state_changed.h
+++ b/app/include/zmk/events/usb_conn_state_changed.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <zephyr.h>
-#include <usb/usb_device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/usb/usb_device.h>
 
 #include <zmk/event_manager.h>
 #include <zmk/usb.h>
diff --git a/app/include/zmk/events/wpm_state_changed.h b/app/include/zmk/events/wpm_state_changed.h
index 3d1a369551..76253e208d 100644
--- a/app/include/zmk/events/wpm_state_changed.h
+++ b/app/include/zmk/events/wpm_state_changed.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/event_manager.h>
 #include <zmk/wpm.h>
 
diff --git a/app/include/zmk/hid.h b/app/include/zmk/hid.h
index 01104d1cd7..ab42adaa13 100644
--- a/app/include/zmk/hid.h
+++ b/app/include/zmk/hid.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <usb/usb_device.h>
-#include <usb/class/usb_hid.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_hid.h>
 
 #include <zmk/keys.h>
 #include <dt-bindings/zmk/hid_usage.h>
diff --git a/app/include/zmk/keys.h b/app/include/zmk/keys.h
index 38777ec849..fa6e7cfe69 100644
--- a/app/include/zmk/keys.h
+++ b/app/include/zmk/keys.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <dt-bindings/zmk/keys.h>
 
 typedef uint32_t zmk_key_t;
diff --git a/app/include/zmk/matrix.h b/app/include/zmk/matrix.h
index b3e2323b9a..5f8cd7d769 100644
--- a/app/include/zmk/matrix.h
+++ b/app/include/zmk/matrix.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #define ZMK_MATRIX_NODE_ID DT_CHOSEN(zmk_kscan)
 
diff --git a/app/include/zmk/split/bluetooth/central.h b/app/include/zmk/split/bluetooth/central.h
index 072408605c..443d9b1b48 100644
--- a/app/include/zmk/split/bluetooth/central.h
+++ b/app/include/zmk/split/bluetooth/central.h
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include <bluetooth/addr.h>
+#include <zephyr/bluetooth/addr.h>
 #include <zmk/behavior.h>
 
 int zmk_split_bt_invoke_behavior(uint8_t source, struct zmk_behavior_binding *binding,
diff --git a/app/include/zmk/split/bluetooth/uuid.h b/app/include/zmk/split/bluetooth/uuid.h
index 735f5751d0..cbdb17723c 100644
--- a/app/include/zmk/split/bluetooth/uuid.h
+++ b/app/include/zmk/split/bluetooth/uuid.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <bluetooth/uuid.h>
+#include <zephyr/bluetooth/uuid.h>
 
 #ifndef BT_UUID_NUM_OF_DIGITALS
 #define BT_UUID_NUM_OF_DIGITALS BT_UUID_DECLARE_16(0x2909)
diff --git a/app/include/zmk/usb.h b/app/include/zmk/usb.h
index 786d9c731a..9e92a83664 100644
--- a/app/include/zmk/usb.h
+++ b/app/include/zmk/usb.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <usb/usb_device.h>
-#include <usb/class/usb_hid.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_hid.h>
 
 #include <zmk/keys.h>
 #include <zmk/hid.h>
diff --git a/app/src/activity.c b/app/src/activity.c
index 029908c014..41fe2e15dc 100644
--- a/app/src/activity.c
+++ b/app/src/activity.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
-#include <pm/pm.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/pm/pm.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
@@ -74,8 +74,8 @@ void activity_work_handler(struct k_work *work) {
     } else
 #endif /* IS_ENABLED(CONFIG_ZMK_SLEEP) */
         if (inactive_time > MAX_IDLE_MS) {
-        set_state(ZMK_ACTIVITY_IDLE);
-    }
+            set_state(ZMK_ACTIVITY_IDLE);
+        }
 }
 
 K_WORK_DEFINE(activity_work, activity_work_handler);
diff --git a/app/src/backlight.c b/app/src/backlight.c
index 159c6fb25f..f633ddb728 100644
--- a/app/src/backlight.c
+++ b/app/src/backlight.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <device.h>
-#include <devicetree.h>
-#include <init.h>
-#include <kernel.h>
-
-#include <drivers/led.h>
-#include <logging/log.h>
-#include <settings/settings.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/led.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+
+#include <zephyr/logging/log.h>
+#include <zephyr/settings/settings.h>
 
 #include <zmk/activity.h>
 #include <zmk/backlight.h>
diff --git a/app/src/battery.c b/app/src/battery.c
index 3f66224126..540f7c3eab 100644
--- a/app/src/battery.c
+++ b/app/src/battery.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <device.h>
-#include <devicetree.h>
-#include <init.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <bluetooth/services/bas.h>
-
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/bluetooth/services/bas.h>
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/src/behavior_queue.c b/app/src/behavior_queue.c
index 617d5aad8e..529e578234 100644
--- a/app/src/behavior_queue.c
+++ b/app/src/behavior_queue.c
@@ -6,8 +6,8 @@
 
 #include <zmk/behavior_queue.h>
 
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <drivers/behavior.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
diff --git a/app/src/behaviors/behavior_backlight.c b/app/src/behaviors/behavior_backlight.c
index a1eaaf8619..fe2155b7fd 100644
--- a/app/src/behaviors/behavior_backlight.c
+++ b/app/src/behaviors/behavior_backlight.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_backlight
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include <dt-bindings/zmk/backlight.h>
 #include <zmk/backlight.h>
diff --git a/app/src/behaviors/behavior_bt.c b/app/src/behaviors/behavior_bt.c
index 79b805b6bc..71cf23225f 100644
--- a/app/src/behaviors/behavior_bt.c
+++ b/app/src/behaviors/behavior_bt.c
@@ -6,14 +6,16 @@
 
 #define DT_DRV_COMPAT zmk_behavior_bluetooth
 
-#include <device.h>
+#include <zephyr/device.h>
+#include <zephyr/bluetooth/conn.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
+
 #include <drivers/behavior.h>
 #include <dt-bindings/zmk/bt.h>
-#include <bluetooth/conn.h>
-#include <logging/log.h>
 #include <zmk/behavior.h>
 
-LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/ble.h>
 
diff --git a/app/src/behaviors/behavior_caps_word.c b/app/src/behaviors/behavior_caps_word.c
index 7a9612b302..8ee5bb5c30 100644
--- a/app/src/behaviors/behavior_caps_word.c
+++ b/app/src/behaviors/behavior_caps_word.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_caps_word
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>
 
 #include <zmk/endpoints.h>
diff --git a/app/src/behaviors/behavior_ext_power.c b/app/src/behaviors/behavior_ext_power.c
index 5db8aac2b2..690ac97175 100644
--- a/app/src/behaviors/behavior_ext_power.c
+++ b/app/src/behaviors/behavior_ext_power.c
@@ -6,14 +6,14 @@
 
 #define DT_DRV_COMPAT zmk_behavior_ext_power
 
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <drivers/behavior.h>
 #include <drivers/ext_power.h>
 
 #include <dt-bindings/zmk/ext_power.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT)
diff --git a/app/src/behaviors/behavior_hold_tap.c b/app/src/behaviors/behavior_hold_tap.c
index a9e4d642e0..6ea2fe97c7 100644
--- a/app/src/behaviors/behavior_hold_tap.c
+++ b/app/src/behaviors/behavior_hold_tap.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT zmk_behavior_hold_tap
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
 #include <zmk/keys.h>
 #include <dt-bindings/zmk/keys.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>
 #include <zmk/matrix.h>
 #include <zmk/endpoints.h>
diff --git a/app/src/behaviors/behavior_key_press.c b/app/src/behaviors/behavior_key_press.c
index 215da41d69..2765db9f3c 100644
--- a/app/src/behaviors/behavior_key_press.c
+++ b/app/src/behaviors/behavior_key_press.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_key_press
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include <zmk/event_manager.h>
 #include <zmk/events/keycode_state_changed.h>
diff --git a/app/src/behaviors/behavior_key_repeat.c b/app/src/behaviors/behavior_key_repeat.c
index ad29cb0a79..033f498b87 100644
--- a/app/src/behaviors/behavior_key_repeat.c
+++ b/app/src/behaviors/behavior_key_repeat.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_key_repeat
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>
 #include <zmk/hid.h>
 
diff --git a/app/src/behaviors/behavior_key_toggle.c b/app/src/behaviors/behavior_key_toggle.c
index cd2a5dcd7f..cbbdd0d91a 100644
--- a/app/src/behaviors/behavior_key_toggle.c
+++ b/app/src/behaviors/behavior_key_toggle.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_key_toggle
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include <zmk/hid.h>
 #include <zmk/event_manager.h>
diff --git a/app/src/behaviors/behavior_macro.c b/app/src/behaviors/behavior_macro.c
index 5b215b93a8..c86d732aab 100644
--- a/app/src/behaviors/behavior_macro.c
+++ b/app/src/behaviors/behavior_macro.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_macro
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>
 #include <zmk/behavior_queue.h>
 #include <zmk/keymap.h>
diff --git a/app/src/behaviors/behavior_mod_morph.c b/app/src/behaviors/behavior_mod_morph.c
index effbe4ac88..e5ba346e53 100644
--- a/app/src/behaviors/behavior_mod_morph.c
+++ b/app/src/behaviors/behavior_mod_morph.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_mod_morph
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>
 
 #include <zmk/matrix.h>
diff --git a/app/src/behaviors/behavior_momentary_layer.c b/app/src/behaviors/behavior_momentary_layer.c
index 46e49fcc57..c2bd0ffcb9 100644
--- a/app/src/behaviors/behavior_momentary_layer.c
+++ b/app/src/behaviors/behavior_momentary_layer.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_momentary_layer
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include <zmk/keymap.h>
 #include <zmk/behavior.h>
diff --git a/app/src/behaviors/behavior_none.c b/app/src/behaviors/behavior_none.c
index 1e7eb2b08c..613ecbad7e 100644
--- a/app/src/behaviors/behavior_none.c
+++ b/app/src/behaviors/behavior_none.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_none
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include <zmk/behavior.h>
 
diff --git a/app/src/behaviors/behavior_outputs.c b/app/src/behaviors/behavior_outputs.c
index 366abd8fab..7aab8ee32c 100644
--- a/app/src/behaviors/behavior_outputs.c
+++ b/app/src/behaviors/behavior_outputs.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT zmk_behavior_outputs
 
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <drivers/behavior.h>
 
 #include <dt-bindings/zmk/outputs.h>
@@ -15,7 +15,7 @@
 #include <zmk/behavior.h>
 #include <zmk/endpoints.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT)
diff --git a/app/src/behaviors/behavior_reset.c b/app/src/behaviors/behavior_reset.c
index 47b11fa442..0b983c8470 100644
--- a/app/src/behaviors/behavior_reset.c
+++ b/app/src/behaviors/behavior_reset.c
@@ -6,10 +6,11 @@
 
 #define DT_DRV_COMPAT zmk_behavior_reset
 
-#include <device.h>
-#include <sys/reboot.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/logging/log.h>
+
 #include <drivers/behavior.h>
-#include <logging/log.h>
 
 #include <zmk/behavior.h>
 
diff --git a/app/src/behaviors/behavior_rgb_underglow.c b/app/src/behaviors/behavior_rgb_underglow.c
index 3459cd22a5..0af07f8146 100644
--- a/app/src/behaviors/behavior_rgb_underglow.c
+++ b/app/src/behaviors/behavior_rgb_underglow.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_rgb_underglow
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include <dt-bindings/zmk/rgb.h>
 #include <zmk/rgb_underglow.h>
diff --git a/app/src/behaviors/behavior_sensor_rotate_key_press.c b/app/src/behaviors/behavior_sensor_rotate_key_press.c
index c4a34a9408..ed6eedae9d 100644
--- a/app/src/behaviors/behavior_sensor_rotate_key_press.c
+++ b/app/src/behaviors/behavior_sensor_rotate_key_press.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT zmk_behavior_sensor_rotate_key_press
 
-#include <device.h>
-#include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>
 
-#include <drivers/sensor.h>
+#include <drivers/behavior.h>
 #include <zmk/event_manager.h>
 #include <zmk/events/keycode_state_changed.h>
 
diff --git a/app/src/behaviors/behavior_sticky_key.c b/app/src/behaviors/behavior_sticky_key.c
index 267b81ab87..2293608694 100644
--- a/app/src/behaviors/behavior_sticky_key.c
+++ b/app/src/behaviors/behavior_sticky_key.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_sticky_key
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>
 
 #include <zmk/matrix.h>
diff --git a/app/src/behaviors/behavior_tap_dance.c b/app/src/behaviors/behavior_tap_dance.c
index 6d78cb3e58..ddb4aeabfe 100644
--- a/app/src/behaviors/behavior_tap_dance.c
+++ b/app/src/behaviors/behavior_tap_dance.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_tap_dance
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>
 #include <zmk/keymap.h>
 #include <zmk/matrix.h>
diff --git a/app/src/behaviors/behavior_to_layer.c b/app/src/behaviors/behavior_to_layer.c
index cce39d5ddf..c05b83eab9 100644
--- a/app/src/behaviors/behavior_to_layer.c
+++ b/app/src/behaviors/behavior_to_layer.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_to_layer
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include <zmk/keymap.h>
 #include <zmk/behavior.h>
diff --git a/app/src/behaviors/behavior_toggle_layer.c b/app/src/behaviors/behavior_toggle_layer.c
index a682c6fe2a..73a700eda5 100644
--- a/app/src/behaviors/behavior_toggle_layer.c
+++ b/app/src/behaviors/behavior_toggle_layer.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_toggle_layer
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include <zmk/keymap.h>
 #include <zmk/behavior.h>
diff --git a/app/src/behaviors/behavior_transparent.c b/app/src/behaviors/behavior_transparent.c
index 2ba057473e..eeb2242db6 100644
--- a/app/src/behaviors/behavior_transparent.c
+++ b/app/src/behaviors/behavior_transparent.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_transparent
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include <zmk/behavior.h>
 
diff --git a/app/src/ble.c b/app/src/ble.c
index 4d2e4603df..aee90d5d8a 100644
--- a/app/src/ble.c
+++ b/app/src/ble.c
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
 #include <errno.h>
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <settings/settings.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/hci_err.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci_err.h>
 
 #if IS_ENABLED(CONFIG_SETTINGS)
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
 #endif
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/src/combo.c b/app/src/combo.c
index e434ae170b..2e2373302d 100644
--- a/app/src/combo.c
+++ b/app/src/combo.c
@@ -6,11 +6,12 @@
 
 #define DT_DRV_COMPAT zmk_combos
 
-#include <device.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/dlist.h>
+#include <zephyr/kernel.h>
+
 #include <drivers/behavior.h>
-#include <logging/log.h>
-#include <sys/dlist.h>
-#include <kernel.h>
 
 #include <zmk/behavior.h>
 #include <zmk/event_manager.h>
diff --git a/app/src/conditional_layer.c b/app/src/conditional_layer.c
index 572652ff8f..9ba02a5ce4 100644
--- a/app/src/conditional_layer.c
+++ b/app/src/conditional_layer.c
@@ -7,10 +7,10 @@
 #define DT_DRV_COMPAT zmk_conditional_layers
 
 #include <stdint.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
-#include <devicetree.h>
-#include <logging/log.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
 
 #include <zmk/event_manager.h>
 #include <zmk/keymap.h>
diff --git a/app/src/display/main.c b/app/src/display/main.c
index 3fb4e8f63a..52fa3c691e 100644
--- a/app/src/display/main.c
+++ b/app/src/display/main.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
-#include <init.h>
-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <drivers/display.h>
diff --git a/app/src/display/status_screen.c b/app/src/display/status_screen.c
index 6b58c30122..7c3870a8de 100644
--- a/app/src/display/status_screen.c
+++ b/app/src/display/status_screen.c
@@ -11,7 +11,7 @@
 #include <zmk/display/widgets/wpm_status.h>
 #include <zmk/display/status_screen.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #if IS_ENABLED(CONFIG_ZMK_WIDGET_BATTERY_STATUS)
diff --git a/app/src/display/widgets/battery_status.c b/app/src/display/widgets/battery_status.c
index 3480101d8a..e35f890ac6 100644
--- a/app/src/display/widgets/battery_status.c
+++ b/app/src/display/widgets/battery_status.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
-#include <bluetooth/services/bas.h>
+#include <zephyr/kernel.h>
+#include <zephyr/bluetooth/services/bas.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/display.h>
diff --git a/app/src/display/widgets/layer_status.c b/app/src/display/widgets/layer_status.c
index 8dc0061c6a..c3ddd07cf4 100644
--- a/app/src/display/widgets/layer_status.c
+++ b/app/src/display/widgets/layer_status.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/display.h>
diff --git a/app/src/display/widgets/output_status.c b/app/src/display/widgets/output_status.c
index 135770a644..1c6da4b903 100644
--- a/app/src/display/widgets/output_status.c
+++ b/app/src/display/widgets/output_status.c
@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
-#include <bluetooth/services/bas.h>
+#include <zephyr/kernel.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/display.h>
diff --git a/app/src/display/widgets/peripheral_status.c b/app/src/display/widgets/peripheral_status.c
index d0c33f2071..fdfe4d9cb5 100644
--- a/app/src/display/widgets/peripheral_status.c
+++ b/app/src/display/widgets/peripheral_status.c
@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
-#include <bluetooth/services/bas.h>
+#include <zephyr/kernel.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/display.h>
diff --git a/app/src/display/widgets/wpm_status.c b/app/src/display/widgets/wpm_status.c
index f3d06d65a3..9ae8b540e9 100644
--- a/app/src/display/widgets/wpm_status.c
+++ b/app/src/display/widgets/wpm_status.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/display.h>
diff --git a/app/src/endpoints.c b/app/src/endpoints.c
index 3376001060..9c824f44d7 100644
--- a/app/src/endpoints.c
+++ b/app/src/endpoints.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <init.h>
-#include <settings/settings.h>
+#include <zephyr/init.h>
+#include <zephyr/settings/settings.h>
 
 #include <zmk/ble.h>
 #include <zmk/endpoints.h>
@@ -18,7 +18,7 @@
 #include <zmk/events/usb_conn_state_changed.h>
 #include <zmk/events/endpoint_selection_changed.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #define DEFAULT_ENDPOINT                                                                           \
diff --git a/app/src/event_manager.c b/app/src/event_manager.c
index 471432a8b0..0f4a5547cc 100644
--- a/app/src/event_manager.c
+++ b/app/src/event_manager.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <zephyr.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/src/events/activity_state_changed.c b/app/src/events/activity_state_changed.c
index 2c27ce7410..95be678e46 100644
--- a/app/src/events/activity_state_changed.c
+++ b/app/src/events/activity_state_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/activity_state_changed.h>
 
 ZMK_EVENT_IMPL(zmk_activity_state_changed);
\ No newline at end of file
diff --git a/app/src/events/battery_state_changed.c b/app/src/events/battery_state_changed.c
index 435fb24de7..508ee971d6 100644
--- a/app/src/events/battery_state_changed.c
+++ b/app/src/events/battery_state_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/battery_state_changed.h>
 
 ZMK_EVENT_IMPL(zmk_battery_state_changed);
\ No newline at end of file
diff --git a/app/src/events/ble_active_profile_changed.c b/app/src/events/ble_active_profile_changed.c
index c4887f73dd..dccbc7e097 100644
--- a/app/src/events/ble_active_profile_changed.c
+++ b/app/src/events/ble_active_profile_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/ble_active_profile_changed.h>
 
 ZMK_EVENT_IMPL(zmk_ble_active_profile_changed);
\ No newline at end of file
diff --git a/app/src/events/endpoint_selection_changed.c b/app/src/events/endpoint_selection_changed.c
index 7f9014da9a..34bc39dd2a 100644
--- a/app/src/events/endpoint_selection_changed.c
+++ b/app/src/events/endpoint_selection_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/endpoint_selection_changed.h>
 
 ZMK_EVENT_IMPL(zmk_endpoint_selection_changed);
diff --git a/app/src/events/keycode_state_changed.c b/app/src/events/keycode_state_changed.c
index c9ef6aa7e6..a134f34186 100644
--- a/app/src/events/keycode_state_changed.c
+++ b/app/src/events/keycode_state_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/keycode_state_changed.h>
 
 ZMK_EVENT_IMPL(zmk_keycode_state_changed);
diff --git a/app/src/events/layer_state_changed.c b/app/src/events/layer_state_changed.c
index bd6234c92a..79326ccc6d 100644
--- a/app/src/events/layer_state_changed.c
+++ b/app/src/events/layer_state_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/layer_state_changed.h>
 
 ZMK_EVENT_IMPL(zmk_layer_state_changed);
\ No newline at end of file
diff --git a/app/src/events/modifiers_state_changed.c b/app/src/events/modifiers_state_changed.c
index 3dfea25fbf..f44d90dda9 100644
--- a/app/src/events/modifiers_state_changed.c
+++ b/app/src/events/modifiers_state_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/modifiers_state_changed.h>
 
 ZMK_EVENT_IMPL(zmk_modifiers_state_changed);
\ No newline at end of file
diff --git a/app/src/events/position_state_changed.c b/app/src/events/position_state_changed.c
index bb40584e53..7b9be89f2d 100644
--- a/app/src/events/position_state_changed.c
+++ b/app/src/events/position_state_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/position_state_changed.h>
 
 ZMK_EVENT_IMPL(zmk_position_state_changed);
\ No newline at end of file
diff --git a/app/src/events/sensor_event.c b/app/src/events/sensor_event.c
index 94ade94724..bec1e6e7eb 100644
--- a/app/src/events/sensor_event.c
+++ b/app/src/events/sensor_event.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/sensor_event.h>
 
 ZMK_EVENT_IMPL(zmk_sensor_event);
\ No newline at end of file
diff --git a/app/src/events/split_peripheral_status_changed.c b/app/src/events/split_peripheral_status_changed.c
index 1d70b2ffa3..3f4c967d06 100644
--- a/app/src/events/split_peripheral_status_changed.c
+++ b/app/src/events/split_peripheral_status_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/split_peripheral_status_changed.h>
 
 ZMK_EVENT_IMPL(zmk_split_peripheral_status_changed);
\ No newline at end of file
diff --git a/app/src/events/usb_conn_state_changed.c b/app/src/events/usb_conn_state_changed.c
index b3555569f0..ae1f05037a 100644
--- a/app/src/events/usb_conn_state_changed.c
+++ b/app/src/events/usb_conn_state_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/usb_conn_state_changed.h>
 
 ZMK_EVENT_IMPL(zmk_usb_conn_state_changed);
\ No newline at end of file
diff --git a/app/src/events/wpm_state_changed.c b/app/src/events/wpm_state_changed.c
index 3d9830bf79..f16f54d292 100644
--- a/app/src/events/wpm_state_changed.c
+++ b/app/src/events/wpm_state_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/wpm_state_changed.h>
 
 ZMK_EVENT_IMPL(zmk_wpm_state_changed);
\ No newline at end of file
diff --git a/app/src/ext_power_generic.c b/app/src/ext_power_generic.c
index aab09cecbb..654f683fa6 100644
--- a/app/src/ext_power_generic.c
+++ b/app/src/ext_power_generic.c
@@ -7,17 +7,18 @@
 #define DT_DRV_COMPAT zmk_ext_power_generic
 
 #include <stdio.h>
-#include <device.h>
-#include <pm/device.h>
-#include <init.h>
-#include <kernel.h>
-#include <settings/settings.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/drivers/gpio.h>
+
 #include <drivers/ext_power.h>
 
 #if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT)
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 struct ext_power_generic_config {
diff --git a/app/src/hid.c b/app/src/hid.c
index b66a910d3d..2a6b5d39da 100644
--- a/app/src/hid.c
+++ b/app/src/hid.c
@@ -5,7 +5,7 @@
  */
 
 #include "zmk/keys.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/hid.h>
diff --git a/app/src/hid_listener.c b/app/src/hid_listener.c
index e233b0b8ed..3a11101d54 100644
--- a/app/src/hid_listener.c
+++ b/app/src/hid_listener.c
@@ -5,7 +5,7 @@
  */
 
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/src/hog.c b/app/src/hog.c
index 3dd3e874a5..930714b092 100644
--- a/app/src/hog.c
+++ b/app/src/hog.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <settings/settings.h>
-#include <init.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/init.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include <zmk/ble.h>
 #include <zmk/hog.h>
diff --git a/app/src/keymap.c b/app/src/keymap.c
index b00d0fbafb..0f06a39a33 100644
--- a/app/src/keymap.c
+++ b/app/src/keymap.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <sys/util.h>
-#include <bluetooth/bluetooth.h>
-#include <logging/log.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/matrix.h>
@@ -37,7 +37,7 @@ static uint8_t _zmk_keymap_layer_default = 0;
 #define BINDING_WITH_COMMA(idx, drv_inst) ZMK_KEYMAP_EXTRACT_BINDING(idx, drv_inst)
 
 #define TRANSFORMED_LAYER(node)                                                                    \
-    {LISTIFY(DT_PROP_LEN(node, bindings), BINDING_WITH_COMMA, (,), node)},
+    {LISTIFY(DT_PROP_LEN(node, bindings), BINDING_WITH_COMMA, (, ), node)},
 
 #if ZMK_KEYMAP_HAS_SENSORS
 #define _TRANSFORM_SENSOR_ENTRY(idx, layer)                                                        \
@@ -52,7 +52,7 @@ static uint8_t _zmk_keymap_layer_default = 0;
 #define SENSOR_LAYER(node)                                                                         \
     COND_CODE_1(                                                                                   \
         DT_NODE_HAS_PROP(node, sensor_bindings),                                                   \
-        ({LISTIFY(DT_PROP_LEN(node, sensor_bindings), _TRANSFORM_SENSOR_ENTRY, (,), node)}),       \
+        ({LISTIFY(DT_PROP_LEN(node, sensor_bindings), _TRANSFORM_SENSOR_ENTRY, (, ), node)}),      \
         ({})),
 
 #endif /* ZMK_KEYMAP_HAS_SENSORS */
diff --git a/app/src/kscan.c b/app/src/kscan.c
index c7cf288102..f9db8b1ced 100644
--- a/app/src/kscan.c
+++ b/app/src/kscan.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <zephyr.h>
-#include <device.h>
-#include <bluetooth/addr.h>
-#include <drivers/kscan.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/src/main.c b/app/src/main.c
index ae604a7b9e..8ea6705777 100644
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <zephyr.h>
-#include <device.h>
-#include <devicetree.h>
-#include <settings/settings.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/settings/settings.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/matrix.h>
diff --git a/app/src/matrix_transform.c b/app/src/matrix_transform.c
index e7c6e95f2a..47256608fd 100644
--- a/app/src/matrix_transform.c
+++ b/app/src/matrix_transform.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/matrix_transform.h>
 #include <zmk/matrix.h>
 #include <dt-bindings/zmk/matrix_transform.h>
@@ -15,7 +15,7 @@
     [(KT_ROW(DT_PROP_BY_IDX(ZMK_KEYMAP_TRANSFORM_NODE, map, i)) * ZMK_MATRIX_COLS) +               \
         KT_COL(DT_PROP_BY_IDX(ZMK_KEYMAP_TRANSFORM_NODE, map, i))] = i
 
-static uint32_t transform[] = {LISTIFY(ZMK_KEYMAP_LEN, _TRANSFORM_ENTRY, (,), 0)};
+static uint32_t transform[] = {LISTIFY(ZMK_KEYMAP_LEN, _TRANSFORM_ENTRY, (, ), 0)};
 
 #endif
 
diff --git a/app/src/rgb_underglow.c b/app/src/rgb_underglow.c
index 18614a4e19..47c3658e91 100644
--- a/app/src/rgb_underglow.c
+++ b/app/src/rgb_underglow.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
-#include <settings/settings.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/settings/settings.h>
 
 #include <math.h>
 #include <stdlib.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
-#include <drivers/led_strip.h>
+#include <zephyr/drivers/led_strip.h>
 #include <drivers/ext_power.h>
 
 #include <zmk/rgb_underglow.h>
diff --git a/app/src/sensors.c b/app/src/sensors.c
index 184061ac38..9873de4f1c 100644
--- a/app/src/sensors.c
+++ b/app/src/sensors.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <drivers/sensor.h>
-#include <devicetree.h>
-#include <init.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/init.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/src/split/bluetooth/central.c b/app/src/split/bluetooth/central.c
index e94a59aece..82cf7e015d 100644
--- a/app/src/split/bluetooth/central.c
+++ b/app/src/split/bluetooth/central.c
@@ -5,15 +5,16 @@
  */
 
 #include <zephyr/types.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
@@ -24,7 +25,6 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 #include <zmk/split/bluetooth/service.h>
 #include <zmk/event_manager.h>
 #include <zmk/events/position_state_changed.h>
-#include <init.h>
 
 static int start_scan(void);
 
diff --git a/app/src/split/bluetooth/peripheral.c b/app/src/split/bluetooth/peripheral.c
index aa690ab25b..07d3ee3f92 100644
--- a/app/src/split/bluetooth/peripheral.c
+++ b/app/src/split/bluetooth/peripheral.c
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
 #include <errno.h>
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <settings/settings.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/hci_err.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/hci_err.h>
 
 #if IS_ENABLED(CONFIG_SETTINGS)
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
 #endif
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/app/src/split/bluetooth/service.c b/app/src/split/bluetooth/service.c
index 5da5401d68..cc20c72fd6 100644
--- a/app/src/split/bluetooth/service.c
+++ b/app/src/split/bluetooth/service.c
@@ -5,15 +5,15 @@
  */
 
 #include <zephyr/types.h>
-#include <sys/util.h>
-#include <init.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/init.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-#include <bluetooth/gatt.h>
-#include <bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/uuid.h>
 
 #include <drivers/behavior.h>
 #include <zmk/behavior.h>
diff --git a/app/src/split/bluetooth/split_listener.c b/app/src/split/bluetooth/split_listener.c
index 3f3763ae04..eb5398c42d 100644
--- a/app/src/split/bluetooth/split_listener.c
+++ b/app/src/split/bluetooth/split_listener.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <device.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
 
 #include <zmk/split/bluetooth/service.h>
 
diff --git a/app/src/usb.c b/app/src/usb.c
index 146e7bb7ed..cf04ef46c8 100644
--- a/app/src/usb.c
+++ b/app/src/usb.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <usb/usb_device.h>
-#include <usb/class/usb_hid.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_hid.h>
 
 #include <zmk/hid.h>
 #include <zmk/keymap.h>
diff --git a/app/src/usb_hid.c b/app/src/usb_hid.c
index 4b90cf9612..f46c70a0a9 100644
--- a/app/src/usb_hid.c
+++ b/app/src/usb_hid.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <usb/usb_device.h>
-#include <usb/class/usb_hid.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_hid.h>
 
 #include <zmk/usb.h>
 #include <zmk/hid.h>
diff --git a/app/src/wpm.c b/app/src/wpm.c
index bcabf377ca..00a5942ecb 100644
--- a/app/src/wpm.c
+++ b/app/src/wpm.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
diff --git a/docs/docs/development/new-behavior.md b/docs/docs/development/new-behavior.md
index af98613e54..e65bb296c9 100644
--- a/docs/docs/development/new-behavior.md
+++ b/docs/docs/development/new-behavior.md
@@ -137,9 +137,9 @@ The code snippet below shows the essential components of a new driver.
 #define DT_DRV_COMPAT zmk_<behavior_name>
 
 // Dependencies
-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include <zmk/behavior.h>