refactor: Move to zephyr/ include paths.

* Zephyr moved to properly namespaced headers, so major "rip the bandaid" commit to move us to those everywhere.
2026-03-20 04:55:20 -05:00 · 2022-10-08 00:46:08 -04:00
parent 35a1c5a3d4
commit 3a958c667f
116 changed files with 332 additions and 329 deletions
--- 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>

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

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

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

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

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

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

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

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

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