kernel: move wait_q.h header to be internal

This header does not expose any public APIs, so move it under
kernel/include and change files including it.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>

kernel/condvar.c

@@ -8,7 +8,7 @@
 #include <zephyr/kernel_structs.h>
 #include <zephyr/toolchain.h>
 #include <ksched.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 #include <zephyr/syscall_handler.h>
 
 static struct k_spinlock lock;

kernel/events.c

@@ -25,13 +25,14 @@
 #include <zephyr/kernel_structs.h>
 
 #include <zephyr/toolchain.h>
-#include <zephyr/wait_q.h>
 #include <zephyr/sys/dlist.h>
-#include <ksched.h>
 #include <zephyr/init.h>
 #include <zephyr/syscall_handler.h>
 #include <zephyr/tracing/tracing.h>
 #include <zephyr/sys/check.h>
+/* private kernel APIs */
+#include <wait_q.h>
+#include <ksched.h>
 
 #define K_EVENT_WAIT_ANY      0x00   /* Wait for any events */
 #define K_EVENT_WAIT_ALL      0x01   /* Wait for all events */

kernel/idle.c

@@ -8,12 +8,13 @@
 #include <zephyr/toolchain.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/drivers/timer/system_timer.h>
-#include <zephyr/wait_q.h>
 #include <zephyr/pm/pm.h>
 #include <stdbool.h>
 #include <zephyr/logging/log.h>
+/* private kernel APIs */
 #include <ksched.h>
 #include <kswap.h>
+#include <wait_q.h>
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 

kernel/kheap.c

@@ -5,11 +5,12 @@
  */
 
 #include <zephyr/kernel.h>
-#include <ksched.h>
-#include <zephyr/wait_q.h>
 #include <zephyr/init.h>
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/sys/iterable_sections.h>
+/* private kernel APIs */
+#include <ksched.h>
+#include <wait_q.h>
 
 void k_heap_init(struct k_heap *h, void *mem, size_t bytes)
 {

kernel/mailbox.c

@@ -14,10 +14,11 @@
 #include <zephyr/toolchain.h>
 #include <zephyr/linker/sections.h>
 #include <string.h>
-#include <ksched.h>
-#include <zephyr/wait_q.h>
 #include <zephyr/sys/dlist.h>
 #include <zephyr/init.h>
+/* private kernel APIs */
+#include <ksched.h>
+#include <wait_q.h>
 
 #if (CONFIG_NUM_MBOX_ASYNC_MSGS > 0)
 

kernel/mem_slab.c

@@ -9,12 +9,13 @@
 
 #include <zephyr/toolchain.h>
 #include <zephyr/linker/sections.h>
-#include <zephyr/wait_q.h>
 #include <zephyr/sys/dlist.h>
-#include <ksched.h>
 #include <zephyr/init.h>
 #include <zephyr/sys/check.h>
 #include <zephyr/sys/iterable_sections.h>
+/* private kernel APIs */
+#include <ksched.h>
+#include <wait_q.h>
 
 /**
  * @brief Initialize kernel memory slab subsystem.

kernel/msg_q.c

@@ -17,7 +17,7 @@
 #include <zephyr/linker/sections.h>
 #include <string.h>
 #include <ksched.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 #include <zephyr/sys/dlist.h>
 #include <zephyr/sys/math_extras.h>
 #include <zephyr/init.h>

kernel/mutex.c

@@ -30,7 +30,7 @@
 #include <zephyr/kernel_structs.h>
 #include <zephyr/toolchain.h>
 #include <ksched.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 #include <errno.h>
 #include <zephyr/init.h>
 #include <zephyr/syscall_handler.h>

kernel/pipes.c

@@ -15,7 +15,7 @@
 
 #include <zephyr/toolchain.h>
 #include <ksched.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 #include <zephyr/init.h>
 #include <zephyr/syscall_handler.h>
 #include <kernel_internal.h>

kernel/poll.c

@@ -17,7 +17,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 #include <ksched.h>
 #include <zephyr/syscall_handler.h>
 #include <zephyr/sys/dlist.h>

kernel/queue.c

@@ -15,7 +15,7 @@
 #include <zephyr/kernel_structs.h>
 
 #include <zephyr/toolchain.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 #include <ksched.h>
 #include <zephyr/init.h>
 #include <zephyr/syscall_handler.h>

kernel/sched.c

@@ -7,7 +7,7 @@
 #include <ksched.h>
 #include <zephyr/spinlock.h>
 #include <zephyr/kernel/sched_priq.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 #include <kswap.h>
 #include <kernel_arch_func.h>
 #include <zephyr/syscall_handler.h>

kernel/sem.c

@@ -21,7 +21,7 @@
 #include <zephyr/kernel_structs.h>
 
 #include <zephyr/toolchain.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 #include <zephyr/sys/dlist.h>
 #include <ksched.h>
 #include <zephyr/init.h>

kernel/stack.c

@@ -13,7 +13,7 @@
 
 #include <zephyr/toolchain.h>
 #include <ksched.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 #include <zephyr/sys/check.h>
 #include <zephyr/init.h>
 #include <zephyr/syscall_handler.h>

kernel/thread.c

@@ -16,7 +16,7 @@
 #include <zephyr/sys/math_extras.h>
 #include <zephyr/sys_clock.h>
 #include <ksched.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 #include <zephyr/syscall_handler.h>
 #include <kernel_internal.h>
 #include <kswap.h>

kernel/timer.c

@@ -7,11 +7,11 @@
 #include <zephyr/kernel.h>
 
 #include <zephyr/init.h>
-#include <ksched.h>
-#include <zephyr/wait_q.h>
 #include <zephyr/syscall_handler.h>
 #include <stdbool.h>
 #include <zephyr/spinlock.h>
+#include <ksched.h>
+#include <wait_q.h>
 
 static struct k_spinlock lock;
 

kernel/work.c

@@ -12,7 +12,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/kernel_structs.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 #include <zephyr/spinlock.h>
 #include <errno.h>
 #include <ksched.h>

lib/os/p4wq.c

@@ -5,11 +5,12 @@
  */
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/p4wq.h>
-#include <zephyr/wait_q.h>
 #include <zephyr/kernel.h>
-#include <ksched.h>
 #include <zephyr/init.h>
 #include <zephyr/sys/iterable_sections.h>
+/* private kernel APIs */
+#include <ksched.h>
+#include <wait_q.h>
 
 LOG_MODULE_REGISTER(p4wq, CONFIG_LOG_DEFAULT_LEVEL);
 

tests/benchmarks/sched/src/main.c

@@ -6,7 +6,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 #include <ksched.h>
 
 /* This is a scheduler microbenchmark, designed to measure latencies

tests/benchmarks/sched_userspace/src/main.c

@@ -6,7 +6,9 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
-#include <zephyr/wait_q.h>
+
+/* private kernel APIs */
+#include <wait_q.h>
 #include <ksched.h>
 
 #include "app_threads.h"

tests/kernel/events/event_api/CMakeLists.txt

@@ -6,3 +6,7 @@ project(events_api)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+target_include_directories(app PRIVATE
+  ${ZEPHYR_BASE}/kernel/include
+  )

tests/kernel/events/event_api/src/test_event_apis.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/wait_q.h>
+#include <wait_q.h>
 
 #define DELAY          K_MSEC(50)
 #define SHORT_TIMEOUT  K_MSEC(100)