refactor: Move to zephyr/ include paths.

* Zephyr moved to properly namespaced headers, so major "rip the bandaid" commit to move us to those everywhere.
2022-10-08 00:46:08 -04:00
parent 35a1c5a3d4
commit 3a958c667f
116 changed files with 332 additions and 329 deletions
--- 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);
--- 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 <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/led.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>

-#include <drivers/led.h>
-#include <logging/log.h>
-#include <settings/settings.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/settings/settings.h>

 #include <zmk/activity.h>
 #include <zmk/backlight.h>
--- 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 <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 <logging/log.h>
+#include <zephyr/logging/log.h>

 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

--- 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);
--- 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>
--- 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>

--- 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>
--- 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)
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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)
--- 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>

--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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);

--- 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>
--- 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>
--- 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>
--- 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)
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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                                                                           \
--- 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);

--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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 {
--- 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>
--- 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);

--- 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>
--- 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 */
--- 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);

--- 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>
--- 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

--- 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>
--- 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);

--- 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);

--- 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);

--- 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>
--- 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>

--- 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>
--- 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>
--- 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);