diff --git a/arch/arm/core/cpu_idle.S b/arch/arm/core/cpu_idle.S
index 01d04d7d0c0..a27c143b6b3 100644
--- a/arch/arm/core/cpu_idle.S
+++ b/arch/arm/core/cpu_idle.S
@@ -10,13 +10,8 @@
  *
  */
 
-#include <offsets_short.h>
 #include <toolchain.h>
 #include <linker/sections.h>
-#include <arch/cpu.h>
-#ifdef CONFIG_TICKLESS_IDLE
-#include <kernel_structs.h>
-#endif
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm/core/exc_exit.S b/arch/arm/core/exc_exit.S
index f1af77e6256..9e3c341057b 100644
--- a/arch/arm/core/exc_exit.S
+++ b/arch/arm/core/exc_exit.S
@@ -14,9 +14,9 @@
  * wrapped around by _isr_wrapper()).
  */
 
-#include <kernel_structs.h>
-#include <offsets_short.h>
 #include <toolchain.h>
+#include <linker/sections.h>
+#include <offsets_short.h>
 #include <arch/cpu.h>
 
 _ASM_FILE_PROLOGUE
diff --git a/arch/arm/core/isr_wrapper.S b/arch/arm/core/isr_wrapper.S
index 5b3b893a008..c83306ea44a 100644
--- a/arch/arm/core/isr_wrapper.S
+++ b/arch/arm/core/isr_wrapper.S
@@ -12,12 +12,12 @@
  * a parameter.
  */
 
-#include <offsets_short.h>
 #include <toolchain.h>
 #include <linker/sections.h>
-#include <sw_isr_table.h>
-#include <kernel_structs.h>
+#include <offsets_short.h>
 #include <arch/cpu.h>
+#include <sw_isr_table.h>
+
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm/core/swap_helper.S b/arch/arm/core/swap_helper.S
index c6bd30038a8..9cfb343110b 100644
--- a/arch/arm/core/swap_helper.S
+++ b/arch/arm/core/swap_helper.S
@@ -12,9 +12,9 @@
  * on ARM Cortex-M CPUs.
  */
 
-#include <kernel_structs.h>
-#include <offsets_short.h>
 #include <toolchain.h>
+#include <linker/sections.h>
+#include <offsets_short.h>
 #include <arch/cpu.h>
 #include <syscall.h>
 
diff --git a/arch/arm/core/userspace.S b/arch/arm/core/userspace.S
index 5196634f2ea..4a6c9770730 100644
--- a/arch/arm/core/userspace.S
+++ b/arch/arm/core/userspace.S
@@ -7,11 +7,9 @@
  *
  */
 
-#include <offsets_short.h>
 #include <toolchain.h>
 #include <linker/sections.h>
-#include <kernel_structs.h>
-#include <arch/cpu.h>
+#include <offsets_short.h>
 #include <syscall.h>
 
 _ASM_FILE_PROLOGUE