From 7c35cff70cac638257eb6e13228734cc5d88f690 Mon Sep 17 00:00:00 2001
From: urob <978080+urob@users.noreply.github.com>
Date: Mon, 16 Jan 2023 15:20:19 -0500
Subject: [PATCH] Fix all prefixes

---
 app/include/zmk/events/mouse_button_state_changed.h | 2 +-
 app/include/zmk/events/mouse_move_state_changed.h   | 2 +-
 app/include/zmk/events/mouse_scroll_state_changed.h | 2 +-
 app/include/zmk/events/mouse_tick.h                 | 2 +-
 app/include/zmk/mouse.h                             | 2 +-
 app/src/behaviors/behavior_mouse_key_press.c        | 4 ++--
 app/src/behaviors/behavior_mouse_move.c             | 4 ++--
 app/src/behaviors/behavior_mouse_scroll.c           | 4 ++--
 app/src/events/mouse_button_state_changed.c         | 2 +-
 app/src/events/mouse_move_state_changed.c           | 2 +-
 app/src/events/mouse_scroll_state_changed.c         | 2 +-
 app/src/events/mouse_tick.c                         | 2 +-
 app/src/mouse/key_listener.c                        | 2 +-
 app/src/mouse/main.c                                | 2 +-
 app/src/mouse/tick_listener.c                       | 4 ++--
 15 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/include/zmk/events/mouse_button_state_changed.h b/app/include/zmk/events/mouse_button_state_changed.h
index 6c3adae3..346ed1c8 100644
--- a/app/include/zmk/events/mouse_button_state_changed.h
+++ b/app/include/zmk/events/mouse_button_state_changed.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/hid.h>
 #include <zmk/event_manager.h>
 #include <zmk/mouse.h>
diff --git a/app/include/zmk/events/mouse_move_state_changed.h b/app/include/zmk/events/mouse_move_state_changed.h
index 8866f81d..b1a4ffa7 100644
--- a/app/include/zmk/events/mouse_move_state_changed.h
+++ b/app/include/zmk/events/mouse_move_state_changed.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/event_manager.h>
 #include <zmk/mouse.h>
 
diff --git a/app/include/zmk/events/mouse_scroll_state_changed.h b/app/include/zmk/events/mouse_scroll_state_changed.h
index fa60e8a7..0f96e82b 100644
--- a/app/include/zmk/events/mouse_scroll_state_changed.h
+++ b/app/include/zmk/events/mouse_scroll_state_changed.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/event_manager.h>
 #include <zmk/mouse.h>
 #include <dt-bindings/zmk/mouse.h>
diff --git a/app/include/zmk/events/mouse_tick.h b/app/include/zmk/events/mouse_tick.h
index c75b9b4f..2f69b045 100644
--- a/app/include/zmk/events/mouse_tick.h
+++ b/app/include/zmk/events/mouse_tick.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include <dt-bindings/zmk/mouse.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <zmk/event_manager.h>
 #include <zmk/mouse.h>
 
diff --git a/app/include/zmk/mouse.h b/app/include/zmk/mouse.h
index f8f85744..c3851773 100644
--- a/app/include/zmk/mouse.h
+++ b/app/include/zmk/mouse.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <dt-bindings/zmk/mouse.h>
 
 typedef uint16_t zmk_mouse_button_flags_t;
diff --git a/app/src/behaviors/behavior_mouse_key_press.c b/app/src/behaviors/behavior_mouse_key_press.c
index b7ab81e5..512d8d96 100644
--- a/app/src/behaviors/behavior_mouse_key_press.c
+++ b/app/src/behaviors/behavior_mouse_key_press.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_mouse_key_press
 
-#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/event_manager.h>
diff --git a/app/src/behaviors/behavior_mouse_move.c b/app/src/behaviors/behavior_mouse_move.c
index 12552d54..e3560d44 100644
--- a/app/src/behaviors/behavior_mouse_move.c
+++ b/app/src/behaviors/behavior_mouse_move.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_mouse_move
 
-#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/event_manager.h>
diff --git a/app/src/behaviors/behavior_mouse_scroll.c b/app/src/behaviors/behavior_mouse_scroll.c
index b6c4b1d3..fa1530a5 100644
--- a/app/src/behaviors/behavior_mouse_scroll.c
+++ b/app/src/behaviors/behavior_mouse_scroll.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT zmk_behavior_mouse_scroll
 
-#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/mouse_scroll_state_changed.h>
diff --git a/app/src/events/mouse_button_state_changed.c b/app/src/events/mouse_button_state_changed.c
index e1ede414..28ab0508 100644
--- a/app/src/events/mouse_button_state_changed.c
+++ b/app/src/events/mouse_button_state_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/mouse_button_state_changed.h>
 
 ZMK_EVENT_IMPL(zmk_mouse_button_state_changed);
diff --git a/app/src/events/mouse_move_state_changed.c b/app/src/events/mouse_move_state_changed.c
index faf89cb8..07a789b2 100644
--- a/app/src/events/mouse_move_state_changed.c
+++ b/app/src/events/mouse_move_state_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/mouse_move_state_changed.h>
 
 ZMK_EVENT_IMPL(zmk_mouse_move_state_changed);
diff --git a/app/src/events/mouse_scroll_state_changed.c b/app/src/events/mouse_scroll_state_changed.c
index 4b4170fe..f6216d39 100644
--- a/app/src/events/mouse_scroll_state_changed.c
+++ b/app/src/events/mouse_scroll_state_changed.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/mouse_scroll_state_changed.h>
 
 ZMK_EVENT_IMPL(zmk_mouse_scroll_state_changed);
diff --git a/app/src/events/mouse_tick.c b/app/src/events/mouse_tick.c
index 0930b9fb..846b3fae 100644
--- a/app/src/events/mouse_tick.c
+++ b/app/src/events/mouse_tick.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/events/mouse_tick.h>
 
 ZMK_EVENT_IMPL(zmk_mouse_tick);
diff --git a/app/src/mouse/key_listener.c b/app/src/mouse/key_listener.c
index fcb700c2..91c4c5ce 100644
--- a/app/src/mouse/key_listener.c
+++ b/app/src/mouse/key_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/mouse/main.c b/app/src/mouse/main.c
index ee759171..8e6bd89e 100644
--- a/app/src/mouse/main.c
+++ b/app/src/mouse/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zmk/mouse.h>
 
 #if IS_ENABLED(CONFIG_ZMK_MOUSE_WORK_QUEUE_DEDICATED)
diff --git a/app/src/mouse/tick_listener.c b/app/src/mouse/tick_listener.c
index 99656318..f84b29f7 100644
--- a/app/src/mouse/tick_listener.c
+++ b/app/src/mouse/tick_listener.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);
 
@@ -14,7 +14,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 #include <zmk/hid.h>
 #include <zmk/mouse.h>
 
-#include <sys/util.h> // CLAMP
+#include <zephyr/sys/util.h> // CLAMP
 
 #if !defined(CONFIG_ZMK_SPLIT) || defined(CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
 #if CONFIG_MINIMAL_LIBC