diff --git a/include/kernel.h b/include/kernel.h
index 46a31db501a..59c57a82642 100644
--- a/include/kernel.h
+++ b/include/kernel.h
@@ -13,6 +13,7 @@
 #ifndef _kernel__h_
 #define _kernel__h_
 
+#if !defined(_ASMLANGUAGE)
 #include <stddef.h>
 #include <stdint.h>
 #include <limits.h>
@@ -3145,4 +3146,6 @@ inline void *operator new[](size_t size, void *ptr)
 
 #endif /* defined(CONFIG_CPLUSPLUS) && defined(__cplusplus) */
 
+#endif /* !_ASMLANGUAGE */
+
 #endif /* _kernel__h_ */
diff --git a/kernel/include/kernel_structs.h b/kernel/include/kernel_structs.h
index f0f55cdb7e2..a00754eda37 100644
--- a/kernel/include/kernel_structs.h
+++ b/kernel/include/kernel_structs.h
@@ -7,8 +7,9 @@
 #ifndef _kernel_structs__h_
 #define _kernel_structs__h_
 
-#if !defined(_ASMLANGUAGE)
 #include <kernel.h>
+
+#if !defined(_ASMLANGUAGE)
 #include <atomic.h>
 #include <misc/dlist.h>
 #endif