asm: update files with <zephyr/...> include prefix

Assembler files were not migrated with the new <zephyr/...> prefix.
Note that the conversion has been scripted, refer to #45388 for more
details.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>

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)

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)

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)

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)

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)

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)

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

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)
 

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)

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>
 

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
 

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
 

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
 

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"

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

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
 

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
 

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
 

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

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

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
 

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
 

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

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
 

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
 

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

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
 

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
 

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)

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

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
 

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"
 

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

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

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

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
 

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);			\

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>

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>
 

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>
 
 /*

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)

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 */

arch/nios2/core/reset.S

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 GTEXT(__start)
 

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 */

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. */

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

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 */

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. */

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 */

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)

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)

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. */
 

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)
 

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)

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; \

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)

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

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) */
 

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>
 
 

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) */
 

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>
 

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 */

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

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

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>
 
 /*

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)
 

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
 

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
 

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
 

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
 

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
 

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
 

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)
 

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

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 */

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)

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)

soc/riscv/openisa_rv32m1/soc_irq.S

@@ -5,7 +5,7 @@
  */
 
 #include <offsets.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 #include <soc.h>
 

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)

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)

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 */

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)

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>
 

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 */

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>
 
 /*

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)

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)

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)

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)
 

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>
 

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

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) */