diff --git a/arch/xtensa/core/thread.c b/arch/xtensa/core/thread.c
index d574e0e7207..389051e7866 100644
--- a/arch/xtensa/core/thread.c
+++ b/arch/xtensa/core/thread.c
@@ -12,7 +12,7 @@
 #include <kernel_structs.h>
 #include <wait_q.h>
 #include <xtensa_config.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 
 extern void _xt_user_exit(void);
 
diff --git a/arch/xtensa/core/xtensa-asm2.c b/arch/xtensa/core/xtensa-asm2.c
index e105082b141..f6849ef1225 100644
--- a/arch/xtensa/core/xtensa-asm2.c
+++ b/arch/xtensa/core/xtensa-asm2.c
@@ -9,7 +9,7 @@
 #include <kernel.h>
 #include <ksched.h>
 #include <kernel_structs.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <kswap.h>
 #include <_soc_inthandlers.h>
 
diff --git a/kernel/init.c b/kernel/init.c
index fab90838352..7a08de43afc 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -27,7 +27,7 @@
 #include <version.h>
 #include <string.h>
 #include <misc/dlist.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <kswap.h>
 
 /* kernel build timestamp items */
diff --git a/kernel/poll.c b/kernel/poll.c
index d5c799659cb..f9c8dd493c8 100644
--- a/kernel/poll.c
+++ b/kernel/poll.c
@@ -16,7 +16,7 @@
 
 #include <kernel.h>
 #include <kernel_structs.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <wait_q.h>
 #include <ksched.h>
 #include <kswap.h>
diff --git a/kernel/smp.c b/kernel/smp.c
index 9325d645ac9..739cf46d463 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -8,7 +8,7 @@
 #include <kernel_structs.h>
 #include <spinlock.h>
 #include <kswap.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 
 static struct k_spinlock global_spinlock;
 
diff --git a/kernel/thread.c b/kernel/thread.c
index 2ef739b4177..7fb00cafefd 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -24,7 +24,7 @@
 #include <wait_q.h>
 #include <atomic.h>
 #include <syscall_handler.h>
-#include <nano_internal.h>
+#include <kernel_internal.h>
 #include <kswap.h>
 
 extern struct _static_thread_data _static_thread_data_list_start[];
diff --git a/kernel/thread_abort.c b/kernel/thread_abort.c
index 5cd3ac7fdd5..fe54cda4f2c 100644
--- a/kernel/thread_abort.c
+++ b/kernel/thread_abort.c
@@ -13,7 +13,6 @@
 #include <kernel.h>
 #include <kernel_structs.h>
 #include <kernel_internal.h>
-#include <nano_internal.h>
 #include <kswap.h>
 #include <string.h>
 #include <toolchain.h>