diff --git a/include/kernel.h b/include/kernel.h
index 3bc537f768c..3aef5cccbeb 100644
--- a/include/kernel.h
+++ b/include/kernel.h
@@ -14,27 +14,7 @@
 #define _kernel__h_
 
 #if !defined(_ASMLANGUAGE)
-#include <stddef.h>
-#include <zephyr/types.h>
-#include <limits.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <atomic.h>
-#include <errno.h>
-#include <misc/__assert.h>
-#include <sched_priq.h>
-#include <misc/dlist.h>
-#include <misc/slist.h>
-#include <misc/sflist.h>
-#include <misc/util.h>
-#include <misc/mempool_base.h>
-#include <kernel_version.h>
-#include <random/rand32.h>
-#include <kernel_arch_thread.h>
-#include <syscall.h>
-#include <misc/printk.h>
-#include <arch/cpu.h>
-#include <misc/rb.h>
+#include <kernel_includes.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/kernel_includes.h b/include/kernel_includes.h
new file mode 100644
index 00000000000..0b196030a40
--- /dev/null
+++ b/include/kernel_includes.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ *
+ * @brief Header files included by kernel.h.
+ */
+
+#ifndef _KERNEL_INCLUDES__H
+#define _KERNEL_INCLUDES__H
+
+#include <stddef.h>
+#include <zephyr/types.h>
+#include <limits.h>
+#include <toolchain.h>
+#include <linker/sections.h>
+#include <atomic.h>
+#include <errno.h>
+#include <misc/__assert.h>
+#include <sched_priq.h>
+#include <misc/dlist.h>
+#include <misc/slist.h>
+#include <misc/sflist.h>
+#include <misc/util.h>
+#include <misc/mempool_base.h>
+#include <kernel_version.h>
+#include <random/rand32.h>
+#include <kernel_arch_thread.h>
+#include <syscall.h>
+#include <misc/printk.h>
+#include <arch/cpu.h>
+#include <misc/rb.h>
+
+#endif /* _KERNEL_INCLUDES__H */