diff --git a/arch/arc/core/cpu_idle.S b/arch/arc/core/cpu_idle.S
index 25183ad9441..a5996a2ca4b 100644
--- a/arch/arc/core/cpu_idle.S
+++ b/arch/arc/core/cpu_idle.S
@@ -11,12 +11,12 @@
  * CPU power management routines.
  */
 
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <offsets_short.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
-#include <arch/arc/asm-compat/assembler.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arc/asm-compat/assembler.h>
 
 GTEXT(arch_cpu_idle)
 GTEXT(arch_cpu_atomic_idle)
diff --git a/arch/arc/core/fast_irq.S b/arch/arc/core/fast_irq.S
index 7472fc284bf..08d498a74ab 100644
--- a/arch/arc/core/fast_irq.S
+++ b/arch/arc/core/fast_irq.S
@@ -13,11 +13,11 @@
  * See isr_wrapper.S for details.
  */
 
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <offsets_short.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include <swap_macros.h>
 
 GTEXT(_firq_enter)
diff --git a/arch/arc/core/fault_s.S b/arch/arc/core/fault_s.S
index 297c935714e..30d54306306 100644
--- a/arch/arc/core/fault_s.S
+++ b/arch/arc/core/fault_s.S
@@ -12,12 +12,12 @@
  * Fault handlers for ARCv2 processors.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include <swap_macros.h>
-#include <syscall.h>
-#include <arch/arc/asm-compat/assembler.h>
+#include <zephyr/syscall.h>
+#include <zephyr/arch/arc/asm-compat/assembler.h>
 
 GTEXT(_Fault)
 GTEXT(__reset)
diff --git a/arch/arc/core/isr_wrapper.S b/arch/arc/core/isr_wrapper.S
index 5914307b36d..f173780608a 100644
--- a/arch/arc/core/isr_wrapper.S
+++ b/arch/arc/core/isr_wrapper.S
@@ -14,13 +14,13 @@
  */
 
 #include <offsets_short.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <sw_isr_table.h>
-#include <kernel_structs.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/arch/cpu.h>
 #include <swap_macros.h>
-#include <arch/arc/asm-compat/assembler.h>
+#include <zephyr/arch/arc/asm-compat/assembler.h>
 
 GTEXT(_isr_wrapper)
 GTEXT(_isr_demux)
diff --git a/arch/arc/core/regular_irq.S b/arch/arc/core/regular_irq.S
index 183abe205b9..c0afb5e26d5 100644
--- a/arch/arc/core/regular_irq.S
+++ b/arch/arc/core/regular_irq.S
@@ -14,13 +14,13 @@
  * See isr_wrapper.S for details.
  */
 
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <offsets_short.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include <swap_macros.h>
-#include <arch/arc/asm-compat/assembler.h>
+#include <zephyr/arch/arc/asm-compat/assembler.h>
 
 GTEXT(_rirq_enter)
 GTEXT(_rirq_exit)
diff --git a/arch/arc/core/reset.S b/arch/arc/core/reset.S
index baa65c3577c..0fefe6230a8 100644
--- a/arch/arc/core/reset.S
+++ b/arch/arc/core/reset.S
@@ -11,11 +11,11 @@
  * Reset handler that prepares the system for running C code.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include <swap_macros.h>
-#include <arch/arc/asm-compat/assembler.h>
+#include <zephyr/arch/arc/asm-compat/assembler.h>
 
 GDATA(z_interrupt_stacks)
 GDATA(z_main_stack)
diff --git a/arch/arc/core/secureshield/arc_secure.S b/arch/arc/core/secureshield/arc_secure.S
index bedef0df8c0..72de3093598 100644
--- a/arch/arc/core/secureshield/arc_secure.S
+++ b/arch/arc/core/secureshield/arc_secure.S
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 
 .macro clear_scratch_regs
 	mov r1, 0
diff --git a/arch/arc/core/switch.S b/arch/arc/core/switch.S
index f458f884067..611f05dc175 100644
--- a/arch/arc/core/switch.S
+++ b/arch/arc/core/switch.S
@@ -14,14 +14,14 @@
  * See isr_wrapper.S for details.
  */
 
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <offsets_short.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include <v2/irq.h>
 #include <swap_macros.h>
-#include <arch/arc/asm-compat/assembler.h>
+#include <zephyr/arch/arc/asm-compat/assembler.h>
 
 GTEXT(z_arc_switch)
 
diff --git a/arch/arc/core/thread_entry_wrapper.S b/arch/arc/core/thread_entry_wrapper.S
index 6523e94a588..94bfb0b8995 100644
--- a/arch/arc/core/thread_entry_wrapper.S
+++ b/arch/arc/core/thread_entry_wrapper.S
@@ -11,10 +11,10 @@
  * Wrapper for z_thread_entry routine when called from the initial context.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <v2/irq.h>
-#include <arch/arc/asm-compat/assembler.h>
+#include <zephyr/arch/arc/asm-compat/assembler.h>
 
 GTEXT(z_thread_entry_wrapper)
 GTEXT(z_thread_entry_wrapper1)
diff --git a/arch/arc/core/userspace.S b/arch/arc/core/userspace.S
index 213c6952233..e52ced08550 100644
--- a/arch/arc/core/userspace.S
+++ b/arch/arc/core/userspace.S
@@ -5,11 +5,11 @@
  */
 
 #include <offsets_short.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <kernel_structs.h>
-#include <arch/cpu.h>
-#include <syscall.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/syscall.h>
 #include <swap_macros.h>
 #include <v2/irq.h>
 
diff --git a/arch/arm/core/aarch32/cortex_a_r/__aeabi_read_tp.S b/arch/arm/core/aarch32/cortex_a_r/__aeabi_read_tp.S
index 181fae3d7ea..25e240b39d3 100644
--- a/arch/arm/core/aarch32/cortex_a_r/__aeabi_read_tp.S
+++ b/arch/arm/core/aarch32/cortex_a_r/__aeabi_read_tp.S
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm/core/aarch32/cortex_a_r/exc.S b/arch/arm/core/aarch32/cortex_a_r/exc.S
index 8017d0c855d..8cec70b807e 100644
--- a/arch/arm/core/aarch32/cortex_a_r/exc.S
+++ b/arch/arm/core/aarch32/cortex_a_r/exc.S
@@ -23,10 +23,10 @@
  * depending on the application exception handler implementation.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm/core/aarch32/cortex_a_r/exc_exit.S b/arch/arm/core/aarch32/cortex_a_r/exc_exit.S
index 43d4183ee58..d10c9f7ce67 100644
--- a/arch/arm/core/aarch32/cortex_a_r/exc_exit.S
+++ b/arch/arm/core/aarch32/cortex_a_r/exc_exit.S
@@ -14,10 +14,10 @@
  * not wrapped around by _isr_wrapper()).
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm/core/aarch32/cortex_a_r/reset.S b/arch/arm/core/aarch32/cortex_a_r/reset.S
index 38c870fac3d..d6232cb949a 100644
--- a/arch/arm/core/aarch32/cortex_a_r/reset.S
+++ b/arch/arm/core/aarch32/cortex_a_r/reset.S
@@ -12,9 +12,9 @@
  * Reset handler that prepares the system for running C code.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include <offsets_short.h>
 #include <aarch32/cortex_a_r/tcm.h>
 #include "vector_table.h"
diff --git a/arch/arm/core/aarch32/cortex_a_r/vector_table.S b/arch/arm/core/aarch32/cortex_a_r/vector_table.S
index f7f41939882..971f90240c8 100644
--- a/arch/arm/core/aarch32/cortex_a_r/vector_table.S
+++ b/arch/arm/core/aarch32/cortex_a_r/vector_table.S
@@ -10,8 +10,8 @@
  * @brief Populated vector table in ROM
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include "vector_table.h"
 
 _ASM_FILE_PROLOGUE
diff --git a/arch/arm/core/aarch32/cortex_m/__aeabi_read_tp.S b/arch/arm/core/aarch32/cortex_m/__aeabi_read_tp.S
index bb13290d38c..8aeba3e5d12 100644
--- a/arch/arm/core/aarch32/cortex_m/__aeabi_read_tp.S
+++ b/arch/arm/core/aarch32/cortex_m/__aeabi_read_tp.S
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm/core/aarch32/cortex_m/exc_exit.S b/arch/arm/core/aarch32/cortex_m/exc_exit.S
index c7e446ccfda..351d2d3e475 100644
--- a/arch/arm/core/aarch32/cortex_m/exc_exit.S
+++ b/arch/arm/core/aarch32/cortex_m/exc_exit.S
@@ -13,10 +13,10 @@
  * wrapped around by _isr_wrapper()).
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm/core/aarch32/cortex_m/fault_s.S b/arch/arm/core/aarch32/cortex_m/fault_s.S
index e4a1b247754..86ae794acd7 100644
--- a/arch/arm/core/aarch32/cortex_m/fault_s.S
+++ b/arch/arm/core/aarch32/cortex_m/fault_s.S
@@ -12,8 +12,8 @@
  * Fault handlers for ARM Cortex-M processors.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm/core/aarch32/cortex_m/reset.S b/arch/arm/core/aarch32/cortex_m/reset.S
index a9f5e4aa8a7..f6eab0a6ad4 100644
--- a/arch/arm/core/aarch32/cortex_m/reset.S
+++ b/arch/arm/core/aarch32/cortex_m/reset.S
@@ -11,9 +11,9 @@
  * Reset handler that prepares the system for running C code.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include "vector_table.h"
 
 _ASM_FILE_PROLOGUE
diff --git a/arch/arm/core/aarch32/cortex_m/vector_table.S b/arch/arm/core/aarch32/cortex_m/vector_table.S
index dd85cb81bf6..45e10ea8034 100644
--- a/arch/arm/core/aarch32/cortex_m/vector_table.S
+++ b/arch/arm/core/aarch32/cortex_m/vector_table.S
@@ -17,8 +17,8 @@
  * rest should not be triggered until the kernel is ready to handle them.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include "vector_table.h"
 
 _ASM_FILE_PROLOGUE
diff --git a/arch/arm/core/aarch32/cpu_idle.S b/arch/arm/core/aarch32/cpu_idle.S
index 7796f1f081a..f5405bcc514 100644
--- a/arch/arm/core/aarch32/cpu_idle.S
+++ b/arch/arm/core/aarch32/cpu_idle.S
@@ -10,8 +10,8 @@
  *
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm/core/aarch32/irq_relay.S b/arch/arm/core/aarch32/irq_relay.S
index 8111b4d4840..229282c7650 100644
--- a/arch/arm/core/aarch32/irq_relay.S
+++ b/arch/arm/core/aarch32/irq_relay.S
@@ -21,8 +21,8 @@
  * Note: Currently support mcuboot only.
  * */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm/core/aarch32/isr_wrapper.S b/arch/arm/core/aarch32/isr_wrapper.S
index 1c7027c80ec..82e4633634b 100644
--- a/arch/arm/core/aarch32/isr_wrapper.S
+++ b/arch/arm/core/aarch32/isr_wrapper.S
@@ -17,11 +17,11 @@
  */
 .eabi_attribute Tag_ABI_align_preserved, 1
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
-#include <sw_isr_table.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sw_isr_table.h>
 
 
 _ASM_FILE_PROLOGUE
diff --git a/arch/arm/core/aarch32/nmi_on_reset.S b/arch/arm/core/aarch32/nmi_on_reset.S
index de48dedda3f..dad959e3609 100644
--- a/arch/arm/core/aarch32/nmi_on_reset.S
+++ b/arch/arm/core/aarch32/nmi_on_reset.S
@@ -15,8 +15,8 @@
  * rebooting might trigger the exact same problem over and over.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm/core/aarch32/swap_helper.S b/arch/arm/core/aarch32/swap_helper.S
index 7cf61b4d565..426e35ade3e 100644
--- a/arch/arm/core/aarch32/swap_helper.S
+++ b/arch/arm/core/aarch32/swap_helper.S
@@ -14,15 +14,15 @@
  * on ARM Cortex-A, Cortex-M and Cortex-R CPUs.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
-#include <syscall.h>
-#include <kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/syscall.h>
+#include <zephyr/kernel.h>
 
 #if defined(CONFIG_CPU_CORTEX_M)
-#include <arch/arm/aarch32/cortex_m/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cpu.h>
 #endif
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm/core/aarch32/userspace.S b/arch/arm/core/aarch32/userspace.S
index e1556a93eaf..5d970e945df 100644
--- a/arch/arm/core/aarch32/userspace.S
+++ b/arch/arm/core/aarch32/userspace.S
@@ -7,15 +7,15 @@
  *
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <syscall.h>
+#include <zephyr/syscall.h>
 
-#include <arch/arm/aarch32/exc.h>
+#include <zephyr/arch/arm/aarch32/exc.h>
 
 #if defined(CONFIG_ARMV7_R)
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 #endif
 
 _ASM_FILE_PROLOGUE
diff --git a/arch/arm64/core/cpu_idle.S b/arch/arm64/core/cpu_idle.S
index 38eee5834b2..e01881ed58d 100644
--- a/arch/arm64/core/cpu_idle.S
+++ b/arch/arm64/core/cpu_idle.S
@@ -8,9 +8,9 @@
  * ARM64 Cortex-A power management
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm64/core/fpu.S b/arch/arm64/core/fpu.S
index d5c3bce9318..cfa78e8088d 100644
--- a/arch/arm64/core/fpu.S
+++ b/arch/arm64/core/fpu.S
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm64/core/header.S b/arch/arm64/core/header.S
index ee531eb0627..9c26317ebde 100644
--- a/arch/arm64/core/header.S
+++ b/arch/arm64/core/header.S
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include "mmu.h"
 
 #if CONFIG_MMU_PAGE_SIZE == 4096 || defined(CONFIG_ARM_MPU)
diff --git a/arch/arm64/core/isr_wrapper.S b/arch/arm64/core/isr_wrapper.S
index 3aeed90a9d0..c12bf176f3e 100644
--- a/arch/arm64/core/isr_wrapper.S
+++ b/arch/arm64/core/isr_wrapper.S
@@ -8,12 +8,12 @@
  * ARM64 Cortex-A ISRs wrapper
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
-#include <sw_isr_table.h>
-#include <drivers/interrupt_controller/gic.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
 #include "macro_priv.inc"
 
 _ASM_FILE_PROLOGUE
diff --git a/arch/arm64/core/mmu.S b/arch/arm64/core/mmu.S
index e8b70f7f890..2ee7dd5e490 100644
--- a/arch/arm64/core/mmu.S
+++ b/arch/arm64/core/mmu.S
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm64/core/reset.S b/arch/arm64/core/reset.S
index 6509801d3c5..94997535ac8 100644
--- a/arch/arm64/core/reset.S
+++ b/arch/arm64/core/reset.S
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include "boot.h"
 #include "macro_priv.inc"
 
diff --git a/arch/arm64/core/smccc-call.S b/arch/arm64/core/smccc-call.S
index f5c48cb8734..90646c2b9ea 100644
--- a/arch/arm64/core/smccc-call.S
+++ b/arch/arm64/core/smccc-call.S
@@ -11,9 +11,9 @@
  * See https://developer.arm.com/docs/den0028/latest
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include <offsets_short.h>
 
 .macro SMCCC instr
diff --git a/arch/arm64/core/switch.S b/arch/arm64/core/switch.S
index eff133cb728..aaf7f506ab8 100644
--- a/arch/arm64/core/switch.S
+++ b/arch/arm64/core/switch.S
@@ -11,11 +11,11 @@
  * on ARM64 Cortex-A (AArch64)
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
-#include <syscall.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/syscall.h>
 #include "macro_priv.inc"
 
 _ASM_FILE_PROLOGUE
diff --git a/arch/arm64/core/userspace.S b/arch/arm64/core/userspace.S
index 59b12f967c5..618aa6b2c20 100644
--- a/arch/arm64/core/userspace.S
+++ b/arch/arm64/core/userspace.S
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
-#include <syscall.h>
-#include <arch/arm64/mm.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/syscall.h>
+#include <zephyr/arch/arm64/mm.h>
 #include "macro_priv.inc"
 
 _ASM_FILE_PROLOGUE
diff --git a/arch/arm64/core/vector_table.S b/arch/arm64/core/vector_table.S
index bbdee77d333..ffb5a452cdb 100644
--- a/arch/arm64/core/vector_table.S
+++ b/arch/arm64/core/vector_table.S
@@ -8,11 +8,11 @@
  * Populated vector table
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets.h>
-#include <arch/cpu.h>
-#include <arch/arm64/tpidrro_el0.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm64/tpidrro_el0.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/arch/arm64/core/xen/hypercall.S b/arch/arm64/core/xen/hypercall.S
index a9abdb003e0..429b0a42286 100644
--- a/arch/arm64/core/xen/hypercall.S
+++ b/arch/arm64/core/xen/hypercall.S
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <xen/public/arch-arm.h>
-#include <xen/public/xen.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/xen/public/arch-arm.h>
+#include <zephyr/xen/public/xen.h>
 
 #define HYPERCALL(hypercall)			\
 GTEXT(HYPERVISOR_##hypercall);			\
diff --git a/arch/mips/core/isr.S b/arch/mips/core/isr.S
index fe89d3a8169..44babb2149b 100644
--- a/arch/mips/core/isr.S
+++ b/arch/mips/core/isr.S
@@ -6,10 +6,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <kernel_structs.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/kernel_structs.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 #include <mips/regdef.h>
 #include <mips/mipsregs.h>
diff --git a/arch/mips/core/reset.S b/arch/mips/core/reset.S
index cf2d7a2842e..8daebf85d4a 100644
--- a/arch/mips/core/reset.S
+++ b/arch/mips/core/reset.S
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <mips/regdef.h>
 #include <mips/mipsregs.h>
 
diff --git a/arch/mips/core/swap.S b/arch/mips/core/swap.S
index 054b4280f0c..9530a3a40ba 100644
--- a/arch/mips/core/swap.S
+++ b/arch/mips/core/swap.S
@@ -6,9 +6,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 #include <mips/regdef.h>
 
 /*
diff --git a/arch/nios2/core/crt0.S b/arch/nios2/core/crt0.S
index c9ce8de9184..8ecb37fe926 100644
--- a/arch/nios2/core/crt0.S
+++ b/arch/nios2/core/crt0.S
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 /* exports */
 GTEXT(__start)
diff --git a/arch/nios2/core/exception.S b/arch/nios2/core/exception.S
index 1a78e1cec6b..6b003262bb0 100644
--- a/arch/nios2/core/exception.S
+++ b/arch/nios2/core/exception.S
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
 
 /* exports */
diff --git a/arch/nios2/core/reset.S b/arch/nios2/core/reset.S
index 716177da906..6ec3ff3044d 100644
--- a/arch/nios2/core/reset.S
+++ b/arch/nios2/core/reset.S
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 GTEXT(__start)
 
diff --git a/arch/nios2/core/swap.S b/arch/nios2/core/swap.S
index 1e460a2cb84..fa1cd597bc4 100644
--- a/arch/nios2/core/swap.S
+++ b/arch/nios2/core/swap.S
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
 
 /* exports */
diff --git a/arch/riscv/core/isr.S b/arch/riscv/core/isr.S
index 957ca785625..f96b0a642a3 100644
--- a/arch/riscv/core/isr.S
+++ b/arch/riscv/core/isr.S
@@ -6,15 +6,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <syscall.h>
-#include <arch/riscv/csr.h>
-#include <arch/riscv/syscall.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/syscall.h>
+#include <zephyr/arch/riscv/csr.h>
+#include <zephyr/arch/riscv/syscall.h>
 #include "asm_macros.inc"
 
 /* Convenience macros for loading/storing register states. */
diff --git a/arch/riscv/core/pmp.S b/arch/riscv/core/pmp.S
index 3f5fcff858f..d1a2ae85367 100644
--- a/arch/riscv/core/pmp.S
+++ b/arch/riscv/core/pmp.S
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include "asm_macros.inc"
 
 #define CSR_PMPCFG_BASE  0x3a0
diff --git a/arch/riscv/core/reset.S b/arch/riscv/core/reset.S
index 71ea85ce803..c51c960b268 100644
--- a/arch/riscv/core/reset.S
+++ b/arch/riscv/core/reset.S
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include "asm_macros.inc"
 
 /* exports */
diff --git a/arch/riscv/core/switch.S b/arch/riscv/core/switch.S
index c9a9d121b76..a1423428c81 100644
--- a/arch/riscv/core/switch.S
+++ b/arch/riscv/core/switch.S
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <kernel.h>
-#include <sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 #include "asm_macros.inc"
 
 /* Convenience macros for loading/storing register states. */
diff --git a/arch/riscv/core/userspace.S b/arch/riscv/core/userspace.S
index fea31045480..4b1e34888c6 100644
--- a/arch/riscv/core/userspace.S
+++ b/arch/riscv/core/userspace.S
@@ -6,13 +6,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
-#include <syscall.h>
-#include <kernel_structs.h>
-#include <arch/riscv/csr.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/syscall.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/arch/riscv/csr.h>
 #include "asm_macros.inc"
 
 /* exports */
diff --git a/arch/sparc/core/fault_trap.S b/arch/sparc/core/fault_trap.S
index 70427edf650..c1a8977ba23 100644
--- a/arch/sparc/core/fault_trap.S
+++ b/arch/sparc/core/fault_trap.S
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/sparc/sparc.h>
+#include <zephyr/arch/sparc/sparc.h>
 
 GTEXT(__sparc_trap_except_reason)
 GTEXT(__sparc_trap_fault)
diff --git a/arch/sparc/core/interrupt_trap.S b/arch/sparc/core/interrupt_trap.S
index d900fc3cc76..ba0fa552421 100644
--- a/arch/sparc/core/interrupt_trap.S
+++ b/arch/sparc/core/interrupt_trap.S
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/sparc/sparc.h>
+#include <zephyr/arch/sparc/sparc.h>
 #include "stack_offsets.h"
 
 GTEXT(__sparc_trap_interrupt)
diff --git a/arch/sparc/core/reset_trap.S b/arch/sparc/core/reset_trap.S
index 9fa41bc8fc5..66b5aafcf26 100644
--- a/arch/sparc/core/reset_trap.S
+++ b/arch/sparc/core/reset_trap.S
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/sparc/sparc.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/sparc/sparc.h>
 
 /* The trap table reset entry jumps to here. */
 
diff --git a/arch/sparc/core/sw_trap_set_pil.S b/arch/sparc/core/sw_trap_set_pil.S
index 08ecf751002..409f1b59e0d 100644
--- a/arch/sparc/core/sw_trap_set_pil.S
+++ b/arch/sparc/core/sw_trap_set_pil.S
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/sparc/sparc.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/sparc/sparc.h>
 
 GTEXT(__sparc_trap_sw_set_pil)
 
diff --git a/arch/sparc/core/switch.S b/arch/sparc/core/switch.S
index be9565e8cfe..7ad25b80b85 100644
--- a/arch/sparc/core/switch.S
+++ b/arch/sparc/core/switch.S
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <offsets_short.h>
-#include <arch/sparc/sparc.h>
+#include <zephyr/arch/sparc/sparc.h>
 
 GTEXT(z_sparc_arch_switch)
 GTEXT(z_sparc_context_switch)
diff --git a/arch/sparc/core/trap_table_mvt.S b/arch/sparc/core/trap_table_mvt.S
index 1eda311c6aa..07fcacad325 100644
--- a/arch/sparc/core/trap_table_mvt.S
+++ b/arch/sparc/core/trap_table_mvt.S
@@ -10,8 +10,8 @@
  * instructions.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 #define BAD_TRAP \
 	rd	%psr, %l0; \
diff --git a/arch/sparc/core/window_trap.S b/arch/sparc/core/window_trap.S
index 595ab7cfcf5..ea810e1d6dd 100644
--- a/arch/sparc/core/window_trap.S
+++ b/arch/sparc/core/window_trap.S
@@ -10,9 +10,9 @@
  * "Flush windows" which is used for example by longjmp() and C++ exceptions.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/sparc/sparc.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/sparc/sparc.h>
 
 GTEXT(__sparc_trap_window_overflow)
 GTEXT(__sparc_trap_window_underflow)
diff --git a/arch/x86/core/common.S b/arch/x86/core/common.S
index 2b2da6f4350..0196d6db089 100644
--- a/arch/x86/core/common.S
+++ b/arch/x86/core/common.S
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/x86/multiboot.h>
+#include <zephyr/arch/x86/multiboot.h>
 
 /*
  * This is included by ia32/crt0.S and intel64/locore.S
diff --git a/arch/x86/core/ia32/crt0.S b/arch/x86/core/ia32/crt0.S
index 2b8ebd0aac3..7abaa2c8862 100644
--- a/arch/x86/core/ia32/crt0.S
+++ b/arch/x86/core/ia32/crt0.S
@@ -15,13 +15,13 @@
  * available in virtual address space after loading of page table.
  */
 
-#include <arch/x86/ia32/asm.h>
-#include <arch/x86/msr.h>
+#include <zephyr/arch/x86/ia32/asm.h>
+#include <zephyr/arch/x86/msr.h>
 #include <kernel_arch_data.h>
-#include <arch/cpu.h>
-#include <arch/x86/multiboot.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/x86/multiboot.h>
 #include <x86_mmu.h>
-#include <sys/mem_manage.h>
+#include <zephyr/sys/mem_manage.h>
 
 	/* exports (private APIs) */
 
diff --git a/arch/x86/core/ia32/excstub.S b/arch/x86/core/ia32/excstub.S
index 2316ac935a3..9c5f3f03191 100644
--- a/arch/x86/core/ia32/excstub.S
+++ b/arch/x86/core/ia32/excstub.S
@@ -14,8 +14,8 @@
  * and exiting a C exception handler.
  */
 
-#include <arch/x86/ia32/asm.h>
-#include <arch/x86/ia32/arch.h> /* For MK_ISR_NAME */
+#include <zephyr/arch/x86/ia32/asm.h>
+#include <zephyr/arch/x86/ia32/arch.h> /* For MK_ISR_NAME */
 #include <offsets_short.h>
 
 
diff --git a/arch/x86/core/ia32/intstub.S b/arch/x86/core/ia32/intstub.S
index 1c6d90119c4..0d2a8377aeb 100644
--- a/arch/x86/core/ia32/intstub.S
+++ b/arch/x86/core/ia32/intstub.S
@@ -14,10 +14,10 @@
  * entering and exiting a C interrupt handler.
  */
 
-#include <arch/x86/ia32/asm.h>
+#include <zephyr/arch/x86/ia32/asm.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
-#include <drivers/interrupt_controller/sysapic.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/interrupt_controller/sysapic.h>
 
 	/* exports (internal APIs) */
 
diff --git a/arch/x86/core/ia32/swap.S b/arch/x86/core/ia32/swap.S
index b498b76c023..af104fdff47 100644
--- a/arch/x86/core/ia32/swap.S
+++ b/arch/x86/core/ia32/swap.S
@@ -11,9 +11,9 @@
  * This module implements the arch_swap() routine for the IA-32 architecture.
  */
 
-#include <arch/x86/ia32/asm.h>
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/x86/ia32/asm.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 #include <kernel_arch_data.h>
 #include <offsets_short.h>
 
diff --git a/arch/x86/core/ia32/userspace.S b/arch/x86/core/ia32/userspace.S
index 68df6c61c6f..adba32c78b2 100644
--- a/arch/x86/core/ia32/userspace.S
+++ b/arch/x86/core/ia32/userspace.S
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/x86/ia32/asm.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/x86/ia32/asm.h>
+#include <zephyr/arch/cpu.h>
 #include <offsets_short.h>
-#include <syscall.h>
-#include <sys/mem_manage.h>
+#include <zephyr/syscall.h>
+#include <zephyr/sys/mem_manage.h>
 #include <x86_mmu.h>
 
 /* Exports */
diff --git a/arch/x86/core/intel64/locore.S b/arch/x86/core/intel64/locore.S
index 51722181e25..212bb2c17ea 100644
--- a/arch/x86/core/intel64/locore.S
+++ b/arch/x86/core/intel64/locore.S
@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <arch/x86/multiboot.h>
-#include <arch/x86/efi.h>
-#include <sys/util.h>
-#include <arch/x86/msr.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/arch/x86/multiboot.h>
+#include <zephyr/arch/x86/efi.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/arch/x86/msr.h>
 #include <kernel_arch_data.h>
 #include <offsets_short.h>
-#include <drivers/interrupt_controller/loapic.h>
-#include <arch/cpu.h>
-#include <sys/mem_manage.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/mem_manage.h>
 
 /*
  * Definitions/macros for enabling paging
diff --git a/arch/x86/core/intel64/userspace.S b/arch/x86/core/intel64/userspace.S
index b6353effda9..747c6183c3c 100644
--- a/arch/x86/core/intel64/userspace.S
+++ b/arch/x86/core/intel64/userspace.S
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/arch/cpu.h>
 #include <offsets_short.h>
-#include <syscall.h>
-#include <sys/mem_manage.h>
+#include <zephyr/syscall.h>
+#include <zephyr/sys/mem_manage.h>
 
 #ifdef CONFIG_X86_KPTI
 /* Copy interrupt return stack context to the trampoline stack, switch back
diff --git a/arch/xtensa/core/xtensa-asm2-util.S b/arch/xtensa/core/xtensa-asm2-util.S
index 37dabb5315e..8d143280c64 100644
--- a/arch/xtensa/core/xtensa-asm2-util.S
+++ b/arch/xtensa/core/xtensa-asm2-util.S
@@ -5,7 +5,7 @@
  */
 #include <xtensa-asm2-s.h>
 #include <offsets.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <zsr.h>
 
 /*
diff --git a/drivers/interrupt_controller/intc_loapic_spurious.S b/drivers/interrupt_controller/intc_loapic_spurious.S
index ab6ff693637..c2a992f8465 100644
--- a/drivers/interrupt_controller/intc_loapic_spurious.S
+++ b/drivers/interrupt_controller/intc_loapic_spurious.S
@@ -9,8 +9,8 @@
  * @brief LOAPIC spurious interrupt handler
  */
 
-#include <kernel_structs.h>
-#include <arch/x86/ia32/asm.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/arch/x86/ia32/asm.h>
 
 	GTEXT(z_loapic_spurious_handler)
 
diff --git a/soc/arm/nordic_nrf/common/soc_nrf_common.S b/soc/arm/nordic_nrf/common/soc_nrf_common.S
index 39c3aa5e92b..df31d18c67e 100644
--- a/soc/arm/nordic_nrf/common/soc_nrf_common.S
+++ b/soc/arm/nordic_nrf/common/soc_nrf_common.S
@@ -9,7 +9,7 @@
  * @brief System/hardware module for Nordic Semiconductor nRFxx family processors
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/soc/arm/nxp_kinetis/k2x/wdog.S b/soc/arm/nxp_kinetis/k2x/wdog.S
index 18af1b31161..30eec3dd11f 100644
--- a/soc/arm/nxp_kinetis/k2x/wdog.S
+++ b/soc/arm/nxp_kinetis/k2x/wdog.S
@@ -12,8 +12,8 @@
  */
 
 #include <soc.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/soc/arm/nxp_kinetis/k6x/wdog.S b/soc/arm/nxp_kinetis/k6x/wdog.S
index b0f09e80c8e..b082e6cea60 100644
--- a/soc/arm/nxp_kinetis/k6x/wdog.S
+++ b/soc/arm/nxp_kinetis/k6x/wdog.S
@@ -12,8 +12,8 @@
  */
 
 #include <soc.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/soc/arm/nxp_kinetis/k8x/wdog.S b/soc/arm/nxp_kinetis/k8x/wdog.S
index 07264b3fb14..794127b64fd 100644
--- a/soc/arm/nxp_kinetis/k8x/wdog.S
+++ b/soc/arm/nxp_kinetis/k8x/wdog.S
@@ -12,8 +12,8 @@
  */
 
 #include <soc.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/soc/arm/nxp_kinetis/kv5x/wdog.S b/soc/arm/nxp_kinetis/kv5x/wdog.S
index 07264b3fb14..794127b64fd 100644
--- a/soc/arm/nxp_kinetis/kv5x/wdog.S
+++ b/soc/arm/nxp_kinetis/kv5x/wdog.S
@@ -12,8 +12,8 @@
  */
 
 #include <soc.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/soc/arm/nxp_kinetis/kwx/wdog.S b/soc/arm/nxp_kinetis/kwx/wdog.S
index 33dc3e10a47..1d748407c05 100644
--- a/soc/arm/nxp_kinetis/kwx/wdog.S
+++ b/soc/arm/nxp_kinetis/kwx/wdog.S
@@ -12,8 +12,8 @@
  */
 
 #include <soc.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 _ASM_FILE_PROLOGUE
 
diff --git a/soc/arm/nxp_lpc/lpc54xxx/gcc/startup_LPC54114_cm4.S b/soc/arm/nxp_lpc/lpc54xxx/gcc/startup_LPC54114_cm4.S
index 3749fe237ff..14c65a255fc 100644
--- a/soc/arm/nxp_lpc/lpc54xxx/gcc/startup_LPC54114_cm4.S
+++ b/soc/arm/nxp_lpc/lpc54xxx/gcc/startup_LPC54114_cm4.S
@@ -7,9 +7,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 
 #if defined(CONFIG_PLATFORM_SPECIFIC_INIT) && defined(CONFIG_SOC_LPC54114_M4)
 
diff --git a/soc/arm/ti_lm3s6965/reboot.S b/soc/arm/ti_lm3s6965/reboot.S
index ecb8e6aff3b..59b5ba79ed4 100644
--- a/soc/arm/ti_lm3s6965/reboot.S
+++ b/soc/arm/ti_lm3s6965/reboot.S
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include <offsets_short.h>
 
 _ASM_FILE_PROLOGUE
diff --git a/soc/mips/qemu_malta/vector.S b/soc/mips/qemu_malta/vector.S
index a00a69b0404..e8a648d7856 100644
--- a/soc/mips/qemu_malta/vector.S
+++ b/soc/mips/qemu_malta/vector.S
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <mips/regdef.h>
 
 /* Imports */
diff --git a/soc/riscv/esp32c3/soc_irq.S b/soc/riscv/esp32c3/soc_irq.S
index f1f1dfc399b..c1ad164c153 100644
--- a/soc/riscv/esp32c3/soc_irq.S
+++ b/soc/riscv/esp32c3/soc_irq.S
@@ -4,7 +4,7 @@
  */
 
 #include <offsets.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 /* Exports */
 GTEXT(__soc_is_irq)
diff --git a/soc/riscv/esp32c3/vectors.S b/soc/riscv/esp32c3/vectors.S
index 140cad36726..4ff3cb9b101 100644
--- a/soc/riscv/esp32c3/vectors.S
+++ b/soc/riscv/esp32c3/vectors.S
@@ -7,7 +7,7 @@
 #include "soc/interrupt_reg.h"
 #include "riscv/rvruntime-frames.h"
 #include "soc/soc_caps.h"
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 /* Imports */
 GTEXT(__irq_wrapper)
diff --git a/soc/riscv/openisa_rv32m1/soc_irq.S b/soc/riscv/openisa_rv32m1/soc_irq.S
index 47fef2c99c9..23222ea2c70 100644
--- a/soc/riscv/openisa_rv32m1/soc_irq.S
+++ b/soc/riscv/openisa_rv32m1/soc_irq.S
@@ -5,7 +5,7 @@
  */
 
 #include <offsets.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 #include <soc.h>
 
diff --git a/soc/riscv/openisa_rv32m1/vector.S b/soc/riscv/openisa_rv32m1/vector.S
index 7e62a98e2e3..d116fbd205c 100644
--- a/soc/riscv/openisa_rv32m1/vector.S
+++ b/soc/riscv/openisa_rv32m1/vector.S
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 /* Imports */
 GTEXT(__initialize)
diff --git a/soc/riscv/openisa_rv32m1/wdog.S b/soc/riscv/openisa_rv32m1/wdog.S
index cc43ac8391c..a132f6e9c7b 100644
--- a/soc/riscv/openisa_rv32m1/wdog.S
+++ b/soc/riscv/openisa_rv32m1/wdog.S
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <linker/sections.h>
-#include <toolchain.h>
-#include <arch/cpu.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/arch/cpu.h>
 
 /* Exports */
 GTEXT(_WdogInit)
diff --git a/soc/riscv/riscv-ite/common/soc_irq.S b/soc/riscv/riscv-ite/common/soc_irq.S
index 86d5c503490..340ced79754 100644
--- a/soc/riscv/riscv-ite/common/soc_irq.S
+++ b/soc/riscv/riscv-ite/common/soc_irq.S
@@ -8,10 +8,10 @@
  * common interrupt management code for riscv SOCs supporting the riscv
  * privileged architecture specification
  */
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <offsets.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <soc.h>
 
 /* exports */
diff --git a/soc/riscv/riscv-ite/common/vector.S b/soc/riscv/riscv-ite/common/vector.S
index 10d8e93835c..e6b45720aad 100644
--- a/soc/riscv/riscv-ite/common/vector.S
+++ b/soc/riscv/riscv-ite/common/vector.S
@@ -6,7 +6,7 @@
  */
 
 #include "chip_chipregs.h"
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 /* exports */
 GTEXT(__start)
diff --git a/soc/riscv/riscv-privilege/andes_v5/soc_irq.S b/soc/riscv/riscv-privilege/andes_v5/soc_irq.S
index d98560ba4cd..459285c1281 100644
--- a/soc/riscv/riscv-privilege/andes_v5/soc_irq.S
+++ b/soc/riscv/riscv-privilege/andes_v5/soc_irq.S
@@ -5,7 +5,7 @@
  */
 
 #include <offsets.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 #include <soc.h>
 
diff --git a/soc/riscv/riscv-privilege/andes_v5/start.S b/soc/riscv/riscv-privilege/andes_v5/start.S
index 40520cd362a..ddf5cc174a1 100644
--- a/soc/riscv/riscv-privilege/andes_v5/start.S
+++ b/soc/riscv/riscv-privilege/andes_v5/start.S
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <soc.h>
 
 /* exports */
diff --git a/soc/riscv/riscv-privilege/common/soc_irq.S b/soc/riscv/riscv-privilege/common/soc_irq.S
index 4b62eed8640..73fc24431d5 100644
--- a/soc/riscv/riscv-privilege/common/soc_irq.S
+++ b/soc/riscv/riscv-privilege/common/soc_irq.S
@@ -8,10 +8,10 @@
  * common interrupt management code for riscv SOCs supporting the riscv
  * privileged architecture specification
  */
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <offsets.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <soc.h>
 
 /*
diff --git a/soc/riscv/riscv-privilege/common/vector.S b/soc/riscv/riscv-privilege/common/vector.S
index dfa2a41ab91..1002a650713 100644
--- a/soc/riscv/riscv-privilege/common/vector.S
+++ b/soc/riscv/riscv-privilege/common/vector.S
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 /* exports */
 GTEXT(__start)
diff --git a/soc/riscv/riscv-privilege/gd32vf103/entry.S b/soc/riscv/riscv-privilege/gd32vf103/entry.S
index 71e489ed322..0dafeb5bc32 100644
--- a/soc/riscv/riscv-privilege/gd32vf103/entry.S
+++ b/soc/riscv/riscv-privilege/gd32vf103/entry.S
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <arch/riscv/csr.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/arch/riscv/csr.h>
 #include <nuclei/nuclei_csr.h>
 
 GTEXT(__nuclei_start)
diff --git a/soc/riscv/riscv-privilege/neorv32/reset.S b/soc/riscv/riscv-privilege/neorv32/reset.S
index aae9239dbbd..fc1a19f82aa 100644
--- a/soc/riscv/riscv-privilege/neorv32/reset.S
+++ b/soc/riscv/riscv-privilege/neorv32/reset.S
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 /* exports */
 GTEXT(__reset)
diff --git a/soc/riscv/riscv-privilege/neorv32/soc_irq.S b/soc/riscv/riscv-privilege/neorv32/soc_irq.S
index 529eafd0e52..555817bdca9 100644
--- a/soc/riscv/riscv-privilege/neorv32/soc_irq.S
+++ b/soc/riscv/riscv-privilege/neorv32/soc_irq.S
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 GTEXT(__soc_handle_irq)
 
diff --git a/soc/riscv/riscv-privilege/telink_b91/soc_irq.S b/soc/riscv/riscv-privilege/telink_b91/soc_irq.S
index abc9015b66b..ea43de3684b 100644
--- a/soc/riscv/riscv-privilege/telink_b91/soc_irq.S
+++ b/soc/riscv/riscv-privilege/telink_b91/soc_irq.S
@@ -5,7 +5,7 @@
  */
 
 #include <offsets.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 #include <soc.h>
 
diff --git a/soc/riscv/riscv-privilege/telink_b91/start.S b/soc/riscv/riscv-privilege/telink_b91/start.S
index 973767add5e..276c2b4ebda 100644
--- a/soc/riscv/riscv-privilege/telink_b91/start.S
+++ b/soc/riscv/riscv-privilege/telink_b91/start.S
@@ -7,7 +7,7 @@
 #define NDS_MCACHE_CTL               0x7CA
 #define NDS_MMISC_CTL                0x7D0
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 	.option push
 	.option norelax
diff --git a/tests/arch/x86/static_idt/src/test_stubs.S b/tests/arch/x86/static_idt/src/test_stubs.S
index 9ae23d3be52..cbab47b7f57 100644
--- a/tests/arch/x86/static_idt/src/test_stubs.S
+++ b/tests/arch/x86/static_idt/src/test_stubs.S
@@ -14,9 +14,9 @@ testing.
 
 #ifdef CONFIG_X86
 
-#include <arch/cpu.h>
-#include <kernel_structs.h>
-#include <arch/x86/ia32/asm.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/arch/x86/ia32/asm.h>
 
 /* imports (internal APIs) */