diff --git a/include/mempool_heap.h b/include/kernel/mempool_heap.h
similarity index 100%
rename from include/mempool_heap.h
rename to include/kernel/mempool_heap.h
diff --git a/include/sched_priq.h b/include/kernel/sched_priq.h
similarity index 100%
rename from include/sched_priq.h
rename to include/kernel/sched_priq.h
diff --git a/include/kernel_includes.h b/include/kernel_includes.h
index 179ca6ae47e..f57f6182b76 100644
--- a/include/kernel_includes.h
+++ b/include/kernel_includes.h
@@ -20,13 +20,13 @@
 #include <linker/sections.h>
 #include <sys/atomic.h>
 #include <sys/__assert.h>
-#include <sched_priq.h>
+#include <kernel/sched_priq.h>
 #include <sys/dlist.h>
 #include <sys/slist.h>
 #include <sys/sflist.h>
 #include <sys/util.h>
 #include <kernel_structs.h>
-#include <mempool_heap.h>
+#include <kernel/mempool_heap.h>
 #include <kernel_version.h>
 #include <syscall.h>
 #include <sys/printk.h>
diff --git a/include/kernel_structs.h b/include/kernel_structs.h
index 8be2e17da9a..ea863abc7f7 100644
--- a/include/kernel_structs.h
+++ b/include/kernel_structs.h
@@ -23,7 +23,7 @@
 #if !defined(_ASMLANGUAGE)
 #include <sys/atomic.h>
 #include <zephyr/types.h>
-#include <sched_priq.h>
+#include <kernel/sched_priq.h>
 #include <sys/dlist.h>
 #include <sys/util.h>
 #include <sys/sys_heap.h>
diff --git a/include/wait_q.h b/include/wait_q.h
index 499d630e9d6..33478590bcd 100644
--- a/include/wait_q.h
+++ b/include/wait_q.h
@@ -12,7 +12,7 @@
 #include <kernel_structs.h>
 #include <sys/dlist.h>
 #include <sys/rb.h>
-#include <sched_priq.h>
+#include <kernel/sched_priq.h>
 #include <timeout_q.h>
 
 #ifdef __cplusplus
diff --git a/kernel/sched.c b/kernel/sched.c
index 0359af56ec0..c5e5670c624 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6,7 +6,7 @@
 #include <kernel.h>
 #include <ksched.h>
 #include <spinlock.h>
-#include <sched_priq.h>
+#include <kernel/sched_priq.h>
 #include <wait_q.h>
 #include <kswap.h>
 #include <kernel_arch_func.h>