From 16811660ee628a00774219304da908a4feadc790 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Fri, 6 May 2022 10:49:15 +0200
Subject: [PATCH] arch: migrate includes to <zephyr/...>

In order to bring consistency in-tree, migrate all arch code to the new
prefix <zephyr/...>. Note that the conversion has been scripted, refer
to zephyrproject-rtos#45388 for more details.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
---
 arch/arc/arcmwdt/arcmwdt-dtr-stubs.c          |  2 +-
 arch/arc/core/arc_connect.c                   |  6 ++---
 arch/arc/core/arc_smp.c                       |  8 +++----
 arch/arc/core/cache.c                         | 18 +++++++--------
 arch/arc/core/fatal.c                         |  8 +++----
 arch/arc/core/fault.c                         | 12 +++++-----
 arch/arc/core/irq_manage.c                    | 16 +++++++-------
 arch/arc/core/irq_offload.c                   |  4 ++--
 arch/arc/core/mpu/arc_core_mpu.c              | 10 ++++-----
 arch/arc/core/mpu/arc_mpu.c                   | 16 +++++++-------
 arch/arc/core/offsets/offsets.c               |  2 +-
 arch/arc/core/prep_c.c                        |  8 +++----
 arch/arc/core/secureshield/arc_sjli.c         | 10 ++++-----
 .../core/secureshield/secure_sys_services.c   |  8 +++----
 arch/arc/core/thread.c                        |  6 ++---
 arch/arc/core/timestamp.c                     |  6 ++---
 arch/arc/core/tls.c                           |  6 ++---
 arch/arc/core/vector_table.c                  |  2 +-
 arch/arc/include/kernel_arch_data.h           | 12 +++++-----
 arch/arc/include/swap_macros.h                | 10 ++++-----
 arch/arc/include/v2/irq.h                     |  2 +-
 arch/arc/include/vector_table.h               |  4 ++--
 arch/arm/core/aarch32/__aeabi_atexit.c        |  2 +-
 arch/arm/core/aarch32/cortex_a_r/fault.c      |  6 ++---
 arch/arm/core/aarch32/cortex_a_r/irq_init.c   |  4 ++--
 arch/arm/core/aarch32/cortex_a_r/reboot.c     |  6 ++---
 arch/arm/core/aarch32/cortex_a_r/stacks.c     |  2 +-
 arch/arm/core/aarch32/cortex_a_r/tcm.c        |  4 ++--
 arch/arm/core/aarch32/cortex_a_r/thread.c     |  2 +-
 .../core/aarch32/cortex_a_r/vector_table.h    |  6 ++---
 .../aarch32/cortex_m/cmse/arm_core_cmse.c     |  2 +-
 arch/arm/core/aarch32/cortex_m/coredump.c     |  2 +-
 arch/arm/core/aarch32/cortex_m/debug.c        |  2 +-
 arch/arm/core/aarch32/cortex_m/fault.c        |  6 ++---
 arch/arm/core/aarch32/cortex_m/fpu.c          |  6 ++---
 arch/arm/core/aarch32/cortex_m/irq_init.c     |  4 ++--
 arch/arm/core/aarch32/cortex_m/scb.c          | 10 ++++-----
 arch/arm/core/aarch32/cortex_m/thread.c       |  2 +-
 arch/arm/core/aarch32/cortex_m/thread_abort.c | 10 ++++-----
 arch/arm/core/aarch32/cortex_m/timing.c       |  6 ++---
 .../core/aarch32/cortex_m/tz/arm_core_tz.c    |  2 +-
 arch/arm/core/aarch32/cortex_m/vector_table.h |  6 ++---
 arch/arm/core/aarch32/fatal.c                 |  4 ++--
 arch/arm/core/aarch32/irq_manage.c            | 22 +++++++++----------
 arch/arm/core/aarch32/irq_offload.c           |  4 ++--
 arch/arm/core/aarch32/mmu/arm_mmu.c           | 20 ++++++++---------
 arch/arm/core/aarch32/mpu/arm_core_mpu.c      | 12 +++++-----
 arch/arm/core/aarch32/mpu/arm_mpu.c           | 10 ++++-----
 .../core/aarch32/mpu/arm_mpu_v7_internal.h    |  4 ++--
 .../core/aarch32/mpu/arm_mpu_v8_internal.h    |  2 +-
 .../aarch32/mpu/cortex_a_r/arm_mpu_internal.h |  2 +-
 .../aarch32/mpu/cortex_m/arm_mpu_internal.h   |  2 +-
 arch/arm/core/aarch32/mpu/nxp_mpu.c           | 14 ++++++------
 arch/arm/core/aarch32/nmi.c                   | 12 +++++-----
 arch/arm/core/aarch32/prep_c.c                |  4 ++--
 arch/arm/core/aarch32/swap.c                  |  2 +-
 arch/arm/core/aarch32/thread.c                |  4 ++--
 arch/arm/core/common/tls.c                    |  8 +++----
 arch/arm/core/offsets/offsets_aarch32.c       |  2 +-
 arch/arm/include/aarch32/cortex_a_r/exc.h     |  4 ++--
 arch/arm/include/aarch32/cortex_m/dwt.h       |  2 +-
 arch/arm/include/aarch32/cortex_m/exc.h       |  8 +++----
 arch/arm/include/aarch32/cortex_m/stack.h     |  2 +-
 arch/arm/include/kernel_arch_data.h           | 12 +++++-----
 arch/arm64/core/cache.c                       |  2 +-
 arch/arm64/core/cortex_r/arm_mpu.c            | 14 ++++++------
 arch/arm64/core/fatal.c                       |  6 ++---
 arch/arm64/core/fpu.c                         |  6 ++---
 arch/arm64/core/irq_init.c                    |  4 ++--
 arch/arm64/core/irq_manage.c                  | 16 +++++++-------
 arch/arm64/core/irq_offload.c                 |  4 ++--
 arch/arm64/core/mmu.c                         | 22 +++++++++----------
 arch/arm64/core/offsets/offsets.c             |  4 ++--
 arch/arm64/core/prep_c.c                      |  2 +-
 arch/arm64/core/smp.c                         | 22 +++++++++----------
 arch/arm64/core/thread.c                      |  6 ++---
 arch/arm64/core/tls.c                         |  8 +++----
 arch/arm64/core/xen/enlighten.c               | 20 ++++++++---------
 arch/arm64/include/exc.h                      |  2 +-
 arch/arm64/include/kernel_arch_data.h         | 12 +++++-----
 arch/common/isr_tables.c                      |  8 +++----
 arch/common/sw_isr_common.c                   |  6 ++---
 arch/common/timing.c                          |  6 ++---
 arch/mips/core/cpu_idle.c                     |  4 ++--
 arch/mips/core/fatal.c                        |  6 ++---
 arch/mips/core/irq_manage.c                   |  4 ++--
 arch/mips/core/irq_offload.c                  |  8 +++----
 arch/mips/core/prep_c.c                       |  2 +-
 arch/mips/core/thread.c                       |  2 +-
 arch/mips/include/kernel_arch_data.h          | 10 ++++-----
 arch/nios2/core/cache.c                       |  4 ++--
 arch/nios2/core/cpu_idle.c                    |  4 ++--
 arch/nios2/core/fatal.c                       |  8 +++----
 arch/nios2/core/irq_manage.c                  | 14 ++++++------
 arch/nios2/core/irq_offload.c                 |  6 ++---
 arch/nios2/core/offsets/offsets.c             |  2 +-
 arch/nios2/core/prep_c.c                      |  6 ++---
 arch/nios2/core/thread.c                      |  2 +-
 arch/nios2/core/timing.c                      |  6 ++---
 arch/nios2/include/kernel_arch_data.h         | 12 +++++-----
 arch/posix/core/cpuhalt.c                     |  4 ++--
 arch/posix/core/fatal.c                       | 12 +++++-----
 arch/posix/core/irq.c                         |  2 +-
 arch/posix/core/offsets/offsets.c             |  2 +-
 arch/posix/core/posix_core.c                  |  2 +-
 arch/posix/core/swap.c                        |  4 ++--
 arch/posix/core/thread.c                      |  8 +++----
 arch/posix/include/asm_inline.h               |  2 +-
 arch/riscv/core/coredump.c                    |  2 +-
 arch/riscv/core/cpu_idle.c                    |  2 +-
 arch/riscv/core/fatal.c                       |  8 +++----
 arch/riscv/core/irq_manage.c                  |  4 ++--
 arch/riscv/core/irq_offload.c                 |  4 ++--
 arch/riscv/core/offsets/offsets.c             |  2 +-
 arch/riscv/core/pmp.c                         | 10 ++++-----
 arch/riscv/core/prep_c.c                      |  4 ++--
 arch/riscv/core/reboot.c                      |  6 ++---
 arch/riscv/core/smp.c                         |  4 ++--
 arch/riscv/core/thread.c                      |  4 ++--
 arch/riscv/core/tls.c                         |  8 +++----
 arch/riscv/include/kernel_arch_data.h         | 12 +++++-----
 arch/sparc/core/fatal.c                       |  4 ++--
 arch/sparc/core/irq_manage.c                  |  4 ++--
 arch/sparc/core/irq_offload.c                 |  8 +++----
 arch/sparc/core/offsets/offsets.c             |  2 +-
 arch/sparc/core/thread.c                      |  2 +-
 arch/sparc/core/tls.c                         |  8 +++----
 arch/sparc/include/kernel_arch_data.h         | 12 +++++-----
 arch/x86/core/acpi.c                          |  6 ++---
 arch/x86/core/cache.c                         | 10 ++++-----
 arch/x86/core/cpuhalt.c                       |  6 ++---
 arch/x86/core/cpuid.c                         |  6 ++---
 arch/x86/core/early_serial.c                  |  8 +++----
 arch/x86/core/efi.c                           |  6 ++---
 arch/x86/core/fatal.c                         |  8 +++----
 arch/x86/core/ia32/coredump.c                 |  2 +-
 arch/x86/core/ia32/fatal.c                    | 14 ++++++------
 arch/x86/core/ia32/float.c                    |  2 +-
 arch/x86/core/ia32/gdbstub.c                  |  4 ++--
 arch/x86/core/ia32/irq_manage.c               | 16 +++++++-------
 arch/x86/core/ia32/irq_offload.c              |  4 ++--
 arch/x86/core/ia32/soft_float_stubs.c         |  4 ++--
 arch/x86/core/ia32/thread.c                   |  4 ++--
 arch/x86/core/ia32/tls.c                      |  4 ++--
 arch/x86/core/intel64/coredump.c              |  2 +-
 arch/x86/core/intel64/cpu.c                   | 10 ++++-----
 arch/x86/core/intel64/fatal.c                 |  6 ++---
 arch/x86/core/intel64/irq.c                   | 18 +++++++--------
 arch/x86/core/intel64/thread.c                |  4 ++--
 arch/x86/core/memmap.c                        |  6 ++---
 arch/x86/core/multiboot.c                     |  8 +++----
 arch/x86/core/offsets/ia32_offsets.c          |  2 +-
 arch/x86/core/offsets/offsets.c               |  2 +-
 arch/x86/core/pcie.c                          | 20 ++++++++---------
 arch/x86/core/prep_c.c                        |  8 +++----
 arch/x86/core/reboot_rst_cnt.c                |  4 ++--
 arch/x86/core/spec_ctrl.c                     | 10 ++++-----
 arch/x86/core/tls.c                           |  6 ++---
 arch/x86/core/userspace.c                     |  6 ++---
 arch/x86/core/x86_mmu.c                       | 20 ++++++++---------
 arch/x86/include/ia32/exception.h             |  2 +-
 arch/x86/include/ia32/kernel_arch_data.h      | 12 +++++-----
 arch/x86/include/intel64/kernel_arch_data.h   |  2 +-
 arch/x86/include/intel64/kernel_arch_func.h   |  2 +-
 arch/x86/include/kernel_arch_func.h           |  2 +-
 arch/x86/include/x86_mmu.h                    |  6 ++---
 arch/x86/timing.c                             | 10 ++++-----
 arch/x86/zefi/efi.h                           |  2 +-
 arch/x86/zefi/zefi.c                          |  2 +-
 arch/xtensa/core/coredump.c                   |  2 +-
 arch/xtensa/core/cpu_idle.c                   |  2 +-
 arch/xtensa/core/fatal.c                      |  8 +++----
 arch/xtensa/core/gdbstub.c                    |  6 ++---
 arch/xtensa/core/irq_manage.c                 |  4 ++--
 arch/xtensa/core/irq_offload.c                |  4 ++--
 arch/xtensa/core/tls.c                        |  8 +++----
 arch/xtensa/core/xcc_stubs.c                  |  2 +-
 arch/xtensa/core/xtensa-asm2.c                |  8 +++----
 arch/xtensa/include/kernel_arch_func.h        |  2 +-
 arch/xtensa/include/xtensa-asm2.h             |  2 +-
 180 files changed, 581 insertions(+), 581 deletions(-)

diff --git a/arch/arc/arcmwdt/arcmwdt-dtr-stubs.c b/arch/arc/arcmwdt/arcmwdt-dtr-stubs.c
index 5520d891ba..6ba748b345 100644
--- a/arch/arc/arcmwdt/arcmwdt-dtr-stubs.c
+++ b/arch/arc/arcmwdt/arcmwdt-dtr-stubs.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 __weak void *__dso_handle;
 
diff --git a/arch/arc/core/arc_connect.c b/arch/arc/core/arc_connect.c
index 6faaebaf87..c9496e9805 100644
--- a/arch/arc/core/arc_connect.c
+++ b/arch/arc/core/arc_connect.c
@@ -10,9 +10,9 @@
  *
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <spinlock.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/spinlock.h>
 #include <kernel_internal.h>
 
 static struct k_spinlock arc_connect_spinlock;
diff --git a/arch/arc/core/arc_smp.c b/arch/arc/core/arc_smp.c
index b901b83d56..be88f6150a 100644
--- a/arch/arc/core/arc_smp.c
+++ b/arch/arc/core/arc_smp.c
@@ -9,12 +9,12 @@
  * @brief codes required for ARC multicore and Zephyr smp support
  *
  */
-#include <device.h>
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <ksched.h>
 #include <soc.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 
 #ifndef IRQ_ICI
diff --git a/arch/arc/core/cache.c b/arch/arc/core/cache.c
index e04fa97513..68d88fb77c 100644
--- a/arch/arc/core/cache.c
+++ b/arch/arc/core/cache.c
@@ -13,16 +13,16 @@
  * This module contains functions for manipulation of the d-cache.
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/util.h>
-#include <toolchain.h>
-#include <cache.h>
-#include <linker/linker-defs.h>
-#include <arch/arc/v2/aux_regs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/cache.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/arch/arc/v2/aux_regs.h>
 #include <kernel_internal.h>
-#include <sys/__assert.h>
-#include <init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/init.h>
 #include <stdbool.h>
 
 #if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)
diff --git a/arch/arc/core/fatal.c b/arch/arc/core/fatal.c
index 829f71a09b..df8af4c1b4 100644
--- a/arch/arc/core/fatal.c
+++ b/arch/arc/core/fatal.c
@@ -12,12 +12,12 @@
  * ARCv2 CPUs.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <offsets_short.h>
-#include <arch/cpu.h>
-#include <logging/log.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/logging/log.h>
 #include <kernel_arch_data.h>
-#include <arch/arc/v2/exc.h>
+#include <zephyr/arch/arc/v2/exc.h>
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
diff --git a/arch/arc/core/fault.c b/arch/arc/core/fault.c
index e07b1b331a..ca66e8153c 100644
--- a/arch/arc/core/fault.c
+++ b/arch/arc/core/fault.c
@@ -11,15 +11,15 @@
  * Common fault handler for ARCv2 processors.
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <inttypes.h>
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
-#include <kernel_structs.h>
-#include <exc_handle.h>
-#include <logging/log.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/exc_handle.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #ifdef CONFIG_USERSPACE
diff --git a/arch/arc/core/irq_manage.c b/arch/arc/core/irq_manage.c
index 4924f24fe7..130f8a279b 100644
--- a/arch/arc/core/irq_manage.c
+++ b/arch/arc/core/irq_manage.c
@@ -17,14 +17,14 @@
  * number from 16 to last IRQ number on the platform.
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/__assert.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <sw_isr_table.h>
-#include <irq.h>
-#include <sys/printk.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/irq.h>
+#include <zephyr/sys/printk.h>
 
 
 /*
diff --git a/arch/arc/core/irq_offload.c b/arch/arc/core/irq_offload.c
index 0c8de0901d..ec96946b1f 100644
--- a/arch/arc/core/irq_offload.c
+++ b/arch/arc/core/irq_offload.c
@@ -8,8 +8,8 @@
  * @file Software interrupts utility code - ARC implementation
  */
 
-#include <kernel.h>
-#include <irq_offload.h>
+#include <zephyr/kernel.h>
+#include <zephyr/irq_offload.h>
 
 static irq_offload_routine_t offload_routine;
 static const void *offload_param;
diff --git a/arch/arc/core/mpu/arc_core_mpu.c b/arch/arc/core/mpu/arc_core_mpu.c
index 0cf1e8081b..c303e831f3 100644
--- a/arch/arc/core/mpu/arc_core_mpu.c
+++ b/arch/arc/core/mpu/arc_core_mpu.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
-#include <arch/arc/v2/mpu/arc_core_mpu.h>
-#include <kernel_structs.h>
+#include <zephyr/arch/arc/v2/mpu/arc_core_mpu.h>
+#include <zephyr/kernel_structs.h>
 
 /*
  * @brief Configure MPU for the thread
diff --git a/arch/arc/core/mpu/arc_mpu.c b/arch/arc/core/mpu/arc_mpu.c
index 111bc0f608..dd2fc8fb90 100644
--- a/arch/arc/core/mpu/arc_mpu.c
+++ b/arch/arc/core/mpu/arc_mpu.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
-#include <arch/arc/v2/aux_regs.h>
-#include <arch/arc/v2/mpu/arc_mpu.h>
-#include <arch/arc/v2/mpu/arc_core_mpu.h>
-#include <linker/linker-defs.h>
+#include <zephyr/arch/arc/v2/aux_regs.h>
+#include <zephyr/arch/arc/v2/mpu/arc_mpu.h>
+#include <zephyr/arch/arc/v2/mpu/arc_core_mpu.h>
+#include <zephyr/linker/linker-defs.h>
 
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mpu);
 
 /**
diff --git a/arch/arc/core/offsets/offsets.c b/arch/arc/core/offsets/offsets.c
index 07222bef61..77e05904e5 100644
--- a/arch/arc/core/offsets/offsets.c
+++ b/arch/arc/core/offsets/offsets.c
@@ -22,7 +22,7 @@
  * completeness.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_arch_data.h>
 #include <gen_offset.h>
 #include <kernel_offsets.h>
diff --git a/arch/arc/core/prep_c.c b/arch/arc/core/prep_c.c
index 1979543336..8bf481c86b 100644
--- a/arch/arc/core/prep_c.c
+++ b/arch/arc/core/prep_c.c
@@ -17,10 +17,10 @@
  */
 
 #include <zephyr/types.h>
-#include <toolchain.h>
-#include <linker/linker-defs.h>
-#include <arch/arc/v2/aux_regs.h>
-#include <kernel_structs.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/arch/arc/v2/aux_regs.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 
 
diff --git a/arch/arc/core/secureshield/arc_sjli.c b/arch/arc/core/secureshield/arc_sjli.c
index 215c1889bf..ec85421bb1 100644
--- a/arch/arc/core/secureshield/arc_sjli.c
+++ b/arch/arc/core/secureshield/arc_sjli.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/types.h>
-#include <init.h>
-#include <toolchain.h>
+#include <zephyr/init.h>
+#include <zephyr/toolchain.h>
 
-#include <arch/arc/v2/secureshield/arc_secure.h>
+#include <zephyr/arch/arc/v2/secureshield/arc_secure.h>
 
 static void _default_sjli_entry(void);
 /*
diff --git a/arch/arc/core/secureshield/secure_sys_services.c b/arch/arc/core/secureshield/secure_sys_services.c
index c284c87a06..810dd683ec 100644
--- a/arch/arc/core/secureshield/secure_sys_services.c
+++ b/arch/arc/core/secureshield/secure_sys_services.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <errno.h>
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 #include <zephyr/types.h>
 #include <soc.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
-#include <arch/arc/v2/secureshield/arc_secure.h>
+#include <zephyr/arch/arc/v2/secureshield/arc_secure.h>
 
 #define IRQ_PRIO_MASK (0xffff << ARC_N_IRQ_START_LEVEL)
 /*
diff --git a/arch/arc/core/thread.c b/arch/arc/core/thread.c
index be3b405211..1f075e63f6 100644
--- a/arch/arc/core/thread.c
+++ b/arch/arc/core/thread.c
@@ -11,13 +11,13 @@
  * Core thread related primitives for the ARCv2 processor architecture.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
 #include <offsets_short.h>
-#include <wait_q.h>
+#include <zephyr/wait_q.h>
 
 #ifdef CONFIG_USERSPACE
-#include <arch/arc/v2/mpu/arc_core_mpu.h>
+#include <zephyr/arch/arc/v2/mpu/arc_core_mpu.h>
 #endif
 
 /*  initial stack frame */
diff --git a/arch/arc/core/timestamp.c b/arch/arc/core/timestamp.c
index b50cfbb30d..a4851e66d7 100644
--- a/arch/arc/core/timestamp.c
+++ b/arch/arc/core/timestamp.c
@@ -11,9 +11,9 @@
  * Provide 64-bit time stamp API
  */
 
-#include <kernel.h>
-#include <toolchain.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/kernel_structs.h>
 
 /*
  * @brief Read 64-bit timestamp value
diff --git a/arch/arc/core/tls.c b/arch/arc/core/tls.c
index 4f2a9ed97a..bd8254e178 100644
--- a/arch/arc/core/tls.c
+++ b/arch/arc/core/tls.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <kernel_tls.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 size_t arch_tls_stack_setup(struct k_thread *new_thread, char *stack_ptr)
 {
diff --git a/arch/arc/core/vector_table.c b/arch/arc/core/vector_table.c
index a165d6b687..5ad6e5763e 100644
--- a/arch/arc/core/vector_table.c
+++ b/arch/arc/core/vector_table.c
@@ -24,7 +24,7 @@
  */
 
 #include <zephyr/types.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include "vector_table.h"
 
 struct vector_table {
diff --git a/arch/arc/include/kernel_arch_data.h b/arch/arc/include/kernel_arch_data.h
index dfc5a688fa..eaadca7781 100644
--- a/arch/arc/include/kernel_arch_data.h
+++ b/arch/arc/include/kernel_arch_data.h
@@ -20,16 +20,16 @@
 #ifndef ZEPHYR_ARCH_ARC_INCLUDE_KERNEL_ARCH_DATA_H_
 #define ZEPHYR_ARCH_ARC_INCLUDE_KERNEL_ARCH_DATA_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 <vector_table.h>
 
 #ifndef _ASMLANGUAGE
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
-#include <sys/dlist.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/dlist.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/arc/include/swap_macros.h b/arch/arc/include/swap_macros.h
index 8ed587e887..6dcc42140d 100644
--- a/arch/arc/include/swap_macros.h
+++ b/arch/arc/include/swap_macros.h
@@ -9,12 +9,12 @@
 #ifndef ZEPHYR_ARCH_ARC_INCLUDE_SWAP_MACROS_H_
 #define ZEPHYR_ARCH_ARC_INCLUDE_SWAP_MACROS_H_
 
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <offsets_short.h>
-#include <toolchain.h>
-#include <arch/cpu.h>
-#include <arch/arc/tool-compat.h>
-#include <arch/arc/asm-compat/assembler.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arc/tool-compat.h>
+#include <zephyr/arch/arc/asm-compat/assembler.h>
 
 #ifdef _ASMLANGUAGE
 
diff --git a/arch/arc/include/v2/irq.h b/arch/arc/include/v2/irq.h
index 4bdd20be74..f24ac01315 100644
--- a/arch/arc/include/v2/irq.h
+++ b/arch/arc/include/v2/irq.h
@@ -15,7 +15,7 @@
 #ifndef ZEPHYR_ARCH_ARC_INCLUDE_V2_IRQ_H_
 #define ZEPHYR_ARCH_ARC_INCLUDE_V2_IRQ_H_
 
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/arc/include/vector_table.h b/arch/arc/include/vector_table.h
index 38ceb16053..fc828c7dda 100644
--- a/arch/arc/include/vector_table.h
+++ b/arch/arc/include/vector_table.h
@@ -25,8 +25,8 @@
 
 #ifdef _ASMLANGUAGE
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 GTEXT(__start)
 GTEXT(_VectorTable)
diff --git a/arch/arm/core/aarch32/__aeabi_atexit.c b/arch/arm/core/aarch32/__aeabi_atexit.c
index 6ef0bdffb1..d811bdd6a9 100644
--- a/arch/arm/core/aarch32/__aeabi_atexit.c
+++ b/arch/arm/core/aarch32/__aeabi_atexit.c
@@ -9,7 +9,7 @@
  * @brief Basic C++ destructor module for globals for ARM
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 EXTERN_C int __cxa_atexit(void (*destructor)(void *), void *objptr, void *dso);
 
diff --git a/arch/arm/core/aarch32/cortex_a_r/fault.c b/arch/arm/core/aarch32/cortex_a_r/fault.c
index ae037f75d5..0e0ea69ed9 100644
--- a/arch/arm/core/aarch32/cortex_a_r/fault.c
+++ b/arch/arm/core/aarch32/cortex_a_r/fault.c
@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
-#include <exc_handle.h>
-#include <logging/log.h>
+#include <zephyr/exc_handle.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #define FAULT_DUMP_VERBOSE	(CONFIG_FAULT_DUMP == 2)
diff --git a/arch/arm/core/aarch32/cortex_a_r/irq_init.c b/arch/arm/core/aarch32/cortex_a_r/irq_init.c
index 6cbd93fb16..88654b9061 100644
--- a/arch/arm/core/aarch32/cortex_a_r/irq_init.c
+++ b/arch/arm/core/aarch32/cortex_a_r/irq_init.c
@@ -9,8 +9,8 @@
  * @brief ARM Cortex-A and Cortex-R interrupt initialization
  */
 
-#include <arch/cpu.h>
-#include <drivers/interrupt_controller/gic.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
 
 /**
  *
diff --git a/arch/arm/core/aarch32/cortex_a_r/reboot.c b/arch/arm/core/aarch32/cortex_a_r/reboot.c
index a4536ec2a4..dac892cf51 100644
--- a/arch/arm/core/aarch32/cortex_a_r/reboot.c
+++ b/arch/arm/core/aarch32/cortex_a_r/reboot.c
@@ -9,9 +9,9 @@
  * @brief ARM Cortex-A and Cortex-R System Control Block interface
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/util.h>
 
 /**
  *
diff --git a/arch/arm/core/aarch32/cortex_a_r/stacks.c b/arch/arm/core/aarch32/cortex_a_r/stacks.c
index 2c95ba9774..7f98deec9c 100644
--- a/arch/arm/core/aarch32/cortex_a_r/stacks.c
+++ b/arch/arm/core/aarch32/cortex_a_r/stacks.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <aarch32/cortex_a_r/stack.h>
 #include <string.h>
 #include <kernel_internal.h>
diff --git a/arch/arm/core/aarch32/cortex_a_r/tcm.c b/arch/arm/core/aarch32/cortex_a_r/tcm.c
index ca96edb280..bc5149cffd 100644
--- a/arch/arm/core/aarch32/cortex_a_r/tcm.c
+++ b/arch/arm/core/aarch32/cortex_a_r/tcm.c
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <arch/arm/aarch32/cortex_a_r/cmsis.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/arch/arm/aarch32/cortex_a_r/cmsis.h>
 
 void z_arm_tcm_disable_ecc(void)
 {
diff --git a/arch/arm/core/aarch32/cortex_a_r/thread.c b/arch/arm/core/aarch32/cortex_a_r/thread.c
index 91c46bbf79..904e9c1137 100644
--- a/arch/arm/core/aarch32/cortex_a_r/thread.c
+++ b/arch/arm/core/aarch32/cortex_a_r/thread.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdbool.h>
-#include <arch/arm/aarch32/cortex_a_r/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_a_r/cmsis.h>
 
 bool z_arm_thread_is_in_user_mode(void)
 {
diff --git a/arch/arm/core/aarch32/cortex_a_r/vector_table.h b/arch/arm/core/aarch32/cortex_a_r/vector_table.h
index e83bc167c7..7d2122b482 100644
--- a/arch/arm/core/aarch32/cortex_a_r/vector_table.h
+++ b/arch/arm/core/aarch32/cortex_a_r/vector_table.h
@@ -24,9 +24,9 @@
 
 #ifdef _ASMLANGUAGE
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sys/util.h>
 
 GTEXT(__start)
 GDATA(_vector_table)
diff --git a/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c b/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c
index 168add1e81..3104aead21 100644
--- a/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c
+++ b/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <aarch32/cortex_m/cmse.h>
 
 int arm_cmse_mpu_region_get(uint32_t addr)
diff --git a/arch/arm/core/aarch32/cortex_m/coredump.c b/arch/arm/core/aarch32/cortex_m/coredump.c
index 08bbe2a40b..2b4a86a1bb 100644
--- a/arch/arm/core/aarch32/cortex_m/coredump.c
+++ b/arch/arm/core/aarch32/cortex_m/coredump.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <debug/coredump.h>
+#include <zephyr/debug/coredump.h>
 
 #define ARCH_HDR_VER			2
 
diff --git a/arch/arm/core/aarch32/cortex_m/debug.c b/arch/arm/core/aarch32/cortex_m/debug.c
index 69218fc595..3025f74cf2 100644
--- a/arch/arm/core/aarch32/cortex_m/debug.c
+++ b/arch/arm/core/aarch32/cortex_m/debug.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <aarch32/cortex_m/dwt.h>
 
 /**
diff --git a/arch/arm/core/aarch32/cortex_m/fault.c b/arch/arm/core/aarch32/cortex_m/fault.c
index 700fef90f9..b660012ed0 100644
--- a/arch/arm/core/aarch32/cortex_m/fault.c
+++ b/arch/arm/core/aarch32/cortex_m/fault.c
@@ -12,11 +12,11 @@
  * Common fault handler for ARM Cortex-M processors.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
 #include <inttypes.h>
-#include <exc_handle.h>
-#include <logging/log.h>
+#include <zephyr/exc_handle.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #if defined(CONFIG_PRINTK) || defined(CONFIG_LOG)
diff --git a/arch/arm/core/aarch32/cortex_m/fpu.c b/arch/arm/core/aarch32/cortex_m/fpu.c
index 3ae5857626..19921795b7 100644
--- a/arch/arm/core/aarch32/cortex_m/fpu.c
+++ b/arch/arm/core/aarch32/cortex_m/fpu.c
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <arch/arm/aarch32/cortex_m/fpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/fpu.h>
 
 /**
  * @file @brief Helper functions for saving and restoring the FP context.
diff --git a/arch/arm/core/aarch32/cortex_m/irq_init.c b/arch/arm/core/aarch32/cortex_m/irq_init.c
index 56065506d9..d579337da3 100644
--- a/arch/arm/core/aarch32/cortex_m/irq_init.c
+++ b/arch/arm/core/aarch32/cortex_m/irq_init.c
@@ -10,8 +10,8 @@
  *
  */
 
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 /**
  *
diff --git a/arch/arm/core/aarch32/cortex_m/scb.c b/arch/arm/core/aarch32/cortex_m/scb.c
index 9c56122c75..fe04241c28 100644
--- a/arch/arm/core/aarch32/cortex_m/scb.c
+++ b/arch/arm/core/aarch32/cortex_m/scb.c
@@ -14,11 +14,11 @@
  * definitions and more complex routines, if needed.
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/util.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <linker/linker-defs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/linker/linker-defs.h>
 
 #if defined(CONFIG_CPU_HAS_NXP_MPU)
 #include <fsl_sysmpu.h>
diff --git a/arch/arm/core/aarch32/cortex_m/thread.c b/arch/arm/core/aarch32/cortex_m/thread.c
index 3e829a17b7..7442682131 100644
--- a/arch/arm/core/aarch32/cortex_m/thread.c
+++ b/arch/arm/core/aarch32/cortex_m/thread.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdbool.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 bool z_arm_thread_is_in_user_mode(void)
 {
diff --git a/arch/arm/core/aarch32/cortex_m/thread_abort.c b/arch/arm/core/aarch32/cortex_m/thread_abort.c
index d9b563ba42..b28a9bcf6f 100644
--- a/arch/arm/core/aarch32/cortex_m/thread_abort.c
+++ b/arch/arm/core/aarch32/cortex_m/thread_abort.c
@@ -16,13 +16,13 @@
  * must queue the PendSV exception.
  */
 
-#include <kernel.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/kernel.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <ksched.h>
 #include <kswap.h>
-#include <wait_q.h>
-#include <sys/__assert.h>
+#include <zephyr/wait_q.h>
+#include <zephyr/sys/__assert.h>
 
 void z_impl_k_thread_abort(k_tid_t thread)
 {
diff --git a/arch/arm/core/aarch32/cortex_m/timing.c b/arch/arm/core/aarch32/cortex_m/timing.c
index a431a80597..f9de5dcd8f 100644
--- a/arch/arm/core/aarch32/cortex_m/timing.c
+++ b/arch/arm/core/aarch32/cortex_m/timing.c
@@ -11,10 +11,10 @@
  *
  */
 
-#include <init.h>
-#include <timing/timing.h>
+#include <zephyr/init.h>
+#include <zephyr/timing/timing.h>
 #include <aarch32/cortex_m/dwt.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 /**
  * @brief Return the current frequency of the cycle counter
diff --git a/arch/arm/core/aarch32/cortex_m/tz/arm_core_tz.c b/arch/arm/core/aarch32/cortex_m/tz/arm_core_tz.c
index ddebeff459..cea69bbe60 100644
--- a/arch/arm/core/aarch32/cortex_m/tz/arm_core_tz.c
+++ b/arch/arm/core/aarch32/cortex_m/tz/arm_core_tz.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <aarch32/cortex_m/tz.h>
 #include <aarch32/cortex_m/exc.h>
 
diff --git a/arch/arm/core/aarch32/cortex_m/vector_table.h b/arch/arm/core/aarch32/cortex_m/vector_table.h
index a78af2444e..f79765aefb 100644
--- a/arch/arm/core/aarch32/cortex_m/vector_table.h
+++ b/arch/arm/core/aarch32/cortex_m/vector_table.h
@@ -23,9 +23,9 @@
 
 #ifdef _ASMLANGUAGE
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sys/util.h>
 
 GTEXT(__start)
 GDATA(_vector_table)
diff --git a/arch/arm/core/aarch32/fatal.c b/arch/arm/core/aarch32/fatal.c
index 5ad2cefaf6..81b0eace4e 100644
--- a/arch/arm/core/aarch32/fatal.c
+++ b/arch/arm/core/aarch32/fatal.c
@@ -12,9 +12,9 @@
  * and Cortex-R CPUs.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_arch_data.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 static void esf_dump(const z_arch_esf_t *esf)
diff --git a/arch/arm/core/aarch32/irq_manage.c b/arch/arm/core/aarch32/irq_manage.c
index 828a7718ac..233cff5b96 100644
--- a/arch/arm/core/aarch32/irq_manage.c
+++ b/arch/arm/core/aarch32/irq_manage.c
@@ -14,21 +14,21 @@
  * connecting ISRs at runtime.
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 #if defined(CONFIG_CPU_CORTEX_M)
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #elif defined(CONFIG_CPU_AARCH32_CORTEX_A) \
 	|| defined(CONFIG_CPU_AARCH32_CORTEX_R)
-#include <drivers/interrupt_controller/gic.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
 #endif
-#include <sys/__assert.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <sw_isr_table.h>
-#include <irq.h>
-#include <tracing/tracing.h>
-#include <pm/pm.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/irq.h>
+#include <zephyr/tracing/tracing.h>
+#include <zephyr/pm/pm.h>
 
 extern void z_arm_reserved(void);
 
diff --git a/arch/arm/core/aarch32/irq_offload.c b/arch/arm/core/aarch32/irq_offload.c
index 445a1154b4..4e183c02e5 100644
--- a/arch/arm/core/aarch32/irq_offload.c
+++ b/arch/arm/core/aarch32/irq_offload.c
@@ -8,8 +8,8 @@
  * @file Software interrupts utility code - ARM implementation
  */
 
-#include <kernel.h>
-#include <irq_offload.h>
+#include <zephyr/kernel.h>
+#include <zephyr/irq_offload.h>
 
 volatile irq_offload_routine_t offload_routine;
 static const void *offload_param;
diff --git a/arch/arm/core/aarch32/mmu/arm_mmu.c b/arch/arm/core/aarch32/mmu/arm_mmu.c
index 76c698eddc..e9b29a087c 100644
--- a/arch/arm/core/aarch32/mmu/arm_mmu.c
+++ b/arch/arm/core/aarch32/mmu/arm_mmu.c
@@ -18,19 +18,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 
-#include <linker/linker-defs.h>
-#include <logging/log.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <sys/mem_manage.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/mem_manage.h>
 
-#include <arch/arm/aarch32/cortex_a_r/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_a_r/cmsis.h>
 
-#include <arch/arm/aarch32/mmu/arm_mmu.h>
+#include <zephyr/arch/arm/aarch32/mmu/arm_mmu.h>
 #include "arm_mmu_priv.h"
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
diff --git a/arch/arm/core/aarch32/mpu/arm_core_mpu.c b/arch/arm/core/aarch32/mpu/arm_core_mpu.c
index bc3b8ce8f3..0d8e39a4a7 100644
--- a/arch/arm/core/aarch32/mpu/arm_core_mpu.c
+++ b/arch/arm/core/aarch32/mpu/arm_core_mpu.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 
 #include "arm_core_mpu_dev.h"
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mpu);
 
 /*
diff --git a/arch/arm/core/aarch32/mpu/arm_mpu.c b/arch/arm/core/aarch32/mpu/arm_mpu.c
index 715549d8d9..a758887bae 100644
--- a/arch/arm/core/aarch32/mpu/arm_mpu.c
+++ b/arch/arm/core/aarch32/mpu/arm_mpu.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include "arm_core_mpu_dev.h"
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 #include <kernel_arch_data.h>
 
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(mpu);
 
 #if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
diff --git a/arch/arm/core/aarch32/mpu/arm_mpu_v7_internal.h b/arch/arm/core/aarch32/mpu/arm_mpu_v7_internal.h
index a831e934aa..508d1b6760 100644
--- a/arch/arm/core/aarch32/mpu/arm_mpu_v7_internal.h
+++ b/arch/arm/core/aarch32/mpu/arm_mpu_v7_internal.h
@@ -9,11 +9,11 @@
 #define ZEPHYR_ARCH_ARM_CORE_AARCH32_MPU_ARM_MPU_V7_INTERNAL_H_
 
 
-#include <sys/math_extras.h>
+#include <zephyr/sys/math_extras.h>
 #include <arm_mpu_internal.h>
 
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 /* Global MPU configuration at system initialization. */
 static void mpu_init(void)
diff --git a/arch/arm/core/aarch32/mpu/arm_mpu_v8_internal.h b/arch/arm/core/aarch32/mpu/arm_mpu_v8_internal.h
index 2bf57d586f..2b8dd7656f 100644
--- a/arch/arm/core/aarch32/mpu/arm_mpu_v8_internal.h
+++ b/arch/arm/core/aarch32/mpu/arm_mpu_v8_internal.h
@@ -10,7 +10,7 @@
 
 #include <aarch32/cortex_m/cmse.h>
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 /**
  * @brief internal structure holding information of
diff --git a/arch/arm/core/aarch32/mpu/cortex_a_r/arm_mpu_internal.h b/arch/arm/core/aarch32/mpu/cortex_a_r/arm_mpu_internal.h
index f9660e5598..a0f7d17443 100644
--- a/arch/arm/core/aarch32/mpu/cortex_a_r/arm_mpu_internal.h
+++ b/arch/arm/core/aarch32/mpu/cortex_a_r/arm_mpu_internal.h
@@ -3,7 +3,7 @@
  * Copyright (c) 2019 Lexmark International, Inc.
  */
 
-#include <sys/math_extras.h>
+#include <zephyr/sys/math_extras.h>
 
 /**
  *  Get the number of supported MPU regions.
diff --git a/arch/arm/core/aarch32/mpu/cortex_m/arm_mpu_internal.h b/arch/arm/core/aarch32/mpu/cortex_m/arm_mpu_internal.h
index 223bdec5ee..337f7ac365 100644
--- a/arch/arm/core/aarch32/mpu/cortex_m/arm_mpu_internal.h
+++ b/arch/arm/core/aarch32/mpu/cortex_m/arm_mpu_internal.h
@@ -3,7 +3,7 @@
  * Copyright (c) 2019 Lexmark International, Inc.
  */
 
-#include <sys/math_extras.h>
+#include <zephyr/sys/math_extras.h>
 
 /**
  *  Get the number of supported MPU regions.
diff --git a/arch/arm/core/aarch32/mpu/nxp_mpu.c b/arch/arm/core/aarch32/mpu/nxp_mpu.c
index fcc0d8d727..5469433132 100644
--- a/arch/arm/core/aarch32/mpu/nxp_mpu.c
+++ b/arch/arm/core/aarch32/mpu/nxp_mpu.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include "arm_core_mpu_dev.h"
-#include <sys/__assert.h>
-#include <sys/math_extras.h>
-#include <linker/linker-defs.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/math_extras.h>
+#include <zephyr/linker/linker-defs.h>
 
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(mpu);
 
 /*
diff --git a/arch/arm/core/aarch32/nmi.c b/arch/arm/core/aarch32/nmi.c
index bd86b70958..aefa4450b0 100644
--- a/arch/arm/core/aarch32/nmi.c
+++ b/arch/arm/core/aarch32/nmi.c
@@ -13,12 +13,12 @@
  * custom run time handler.
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/printk.h>
-#include <sys/reboot.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
 extern void z_SysNmiOnReset(void);
 #if !defined(CONFIG_RUNTIME_NMI)
diff --git a/arch/arm/core/aarch32/prep_c.c b/arch/arm/core/aarch32/prep_c.c
index d942ad62e2..68440a9aeb 100644
--- a/arch/arm/core/aarch32/prep_c.c
+++ b/arch/arm/core/aarch32/prep_c.c
@@ -16,9 +16,9 @@
  * initialization is performed.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 
 #if defined(CONFIG_ARMV7_R) || defined(CONFIG_ARMV7_A)
 #include <aarch32/cortex_a_r/stack.h>
diff --git a/arch/arm/core/aarch32/swap.c b/arch/arm/core/aarch32/swap.c
index 96189f0f2d..525dc53671 100644
--- a/arch/arm/core/aarch32/swap.c
+++ b/arch/arm/core/aarch32/swap.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
 
 extern const int _k_neg_eagain;
diff --git a/arch/arm/core/aarch32/thread.c b/arch/arm/core/aarch32/thread.c
index 0f127f47a6..ba51c96e35 100644
--- a/arch/arm/core/aarch32/thread.c
+++ b/arch/arm/core/aarch32/thread.c
@@ -12,9 +12,9 @@
  * Cortex-R processor architecture.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
-#include <wait_q.h>
+#include <zephyr/wait_q.h>
 
 #if (MPU_GUARD_ALIGN_AND_SIZE_FLOAT > MPU_GUARD_ALIGN_AND_SIZE)
 #define FP_GUARD_EXTRA_SIZE	(MPU_GUARD_ALIGN_AND_SIZE_FLOAT - \
diff --git a/arch/arm/core/common/tls.c b/arch/arm/core/common/tls.c
index 37baeeedef..9b731286c7 100644
--- a/arch/arm/core/common/tls.c
+++ b/arch/arm/core/common/tls.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <kernel_tls.h>
-#include <app_memory/app_memdomain.h>
-#include <sys/util.h>
+#include <zephyr/app_memory/app_memdomain.h>
+#include <zephyr/sys/util.h>
 
 #ifdef CONFIG_CPU_CORTEX_M
 /*
diff --git a/arch/arm/core/offsets/offsets_aarch32.c b/arch/arm/core/offsets/offsets_aarch32.c
index b3aacd51cb..d65d94eef7 100644
--- a/arch/arm/core/offsets/offsets_aarch32.c
+++ b/arch/arm/core/offsets/offsets_aarch32.c
@@ -25,7 +25,7 @@
 #ifndef _ARM_OFFSETS_INC_
 #define _ARM_OFFSETS_INC_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_arch_data.h>
 #include <kernel_offsets.h>
 
diff --git a/arch/arm/include/aarch32/cortex_a_r/exc.h b/arch/arm/include/aarch32/cortex_a_r/exc.h
index 4328a07436..8f4c7d17c4 100644
--- a/arch/arm/include/aarch32/cortex_a_r/exc.h
+++ b/arch/arm/include/aarch32/cortex_a_r/exc.h
@@ -14,7 +14,7 @@
 #ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_A_R_EXC_H_
 #define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_A_R_EXC_H_
 
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 #ifdef _ASMLANGUAGE
 
@@ -22,7 +22,7 @@
 
 #else
 
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/arm/include/aarch32/cortex_m/dwt.h b/arch/arm/include/aarch32/cortex_m/dwt.h
index ccef65ad2d..41a887cf01 100644
--- a/arch/arm/include/aarch32/cortex_m/dwt.h
+++ b/arch/arm/include/aarch32/cortex_m/dwt.h
@@ -20,7 +20,7 @@
 
 #else
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/arm/include/aarch32/cortex_m/exc.h b/arch/arm/include/aarch32/cortex_m/exc.h
index 0366536fac..b0cc623c5a 100644
--- a/arch/arm/include/aarch32/cortex_m/exc.h
+++ b/arch/arm/include/aarch32/cortex_m/exc.h
@@ -14,7 +14,7 @@
 #ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_EXC_H_
 #define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_EXC_H_
 
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 #ifdef _ASMLANGUAGE
 
@@ -22,9 +22,9 @@
 
 #else
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <arch/arm/aarch32/exc.h>
-#include <irq_offload.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/exc.h>
+#include <zephyr/irq_offload.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/arm/include/aarch32/cortex_m/stack.h b/arch/arm/include/aarch32/cortex_m/stack.h
index 5232839f9c..fb4e2b9261 100644
--- a/arch/arm/include/aarch32/cortex_m/stack.h
+++ b/arch/arm/include/aarch32/cortex_m/stack.h
@@ -20,7 +20,7 @@
 
 #else
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/arm/include/kernel_arch_data.h b/arch/arm/include/kernel_arch_data.h
index da1dfa16c2..832e4b1042 100644
--- a/arch/arm/include/kernel_arch_data.h
+++ b/arch/arm/include/kernel_arch_data.h
@@ -20,9 +20,9 @@
 #ifndef ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_DATA_H_
 #define ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_DATA_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>
 
 #if defined(CONFIG_CPU_CORTEX_M)
 #include <aarch32/cortex_m/stack.h>
@@ -33,10 +33,10 @@
 #endif
 
 #ifndef _ASMLANGUAGE
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <sys/dlist.h>
-#include <sys/atomic.h>
+#include <zephyr/sys/dlist.h>
+#include <zephyr/sys/atomic.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/arm64/core/cache.c b/arch/arm64/core/cache.c
index d9066ad700..7cfec1269b 100644
--- a/arch/arm64/core/cache.c
+++ b/arch/arm64/core/cache.c
@@ -13,7 +13,7 @@
  * This module contains functions for manipulation of the d-cache.
  */
 
-#include <cache.h>
+#include <zephyr/cache.h>
 
 #define	CTR_EL0_DMINLINE_SHIFT		16
 #define	CTR_EL0_DMINLINE_MASK		BIT_MASK(4)
diff --git a/arch/arm64/core/cortex_r/arm_mpu.c b/arch/arm64/core/cortex_r/arm_mpu.c
index 353aee0821..bb25c5e30d 100644
--- a/arch/arm64/core/cortex_r/arm_mpu.c
+++ b/arch/arm64/core/cortex_r/arm_mpu.c
@@ -5,15 +5,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <kernel_arch_func.h>
 #include <soc.h>
-#include <arch/arm64/mm.h>
-#include <linker/linker-defs.h>
-#include <logging/log.h>
-#include <sys/check.h>
+#include <zephyr/arch/arm64/mm.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/check.h>
 
 LOG_MODULE_REGISTER(mpu, CONFIG_MPU_LOG_LEVEL);
 
diff --git a/arch/arm64/core/fatal.c b/arch/arm64/core/fatal.c
index ebf73876ab..683ae21eda 100644
--- a/arch/arm64/core/fatal.c
+++ b/arch/arm64/core/fatal.c
@@ -13,9 +13,9 @@
  * exceptions
  */
 
-#include <kernel.h>
-#include <logging/log.h>
-#include <exc_handle.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/exc_handle.h>
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
diff --git a/arch/arm64/core/fpu.c b/arch/arm64/core/fpu.c
index cf904f5119..20cb7059f5 100644
--- a/arch/arm64/core/fpu.c
+++ b/arch/arm64/core/fpu.c
@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_arch_interface.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 /* to be found in fpu.S */
 extern void z_arm64_fpu_save(struct z_arm64_fp_context *saved_fp_context);
diff --git a/arch/arm64/core/irq_init.c b/arch/arm64/core/irq_init.c
index 85cda0171e..de8f46bdec 100644
--- a/arch/arm64/core/irq_init.c
+++ b/arch/arm64/core/irq_init.c
@@ -9,8 +9,8 @@
  * @brief ARM64 Cortex-A interrupt initialisation
  */
 
-#include <arch/cpu.h>
-#include <drivers/interrupt_controller/gic.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
 
 /**
  * @brief Initialise interrupts
diff --git a/arch/arm64/core/irq_manage.c b/arch/arm64/core/irq_manage.c
index 3569270242..4e96ce77bf 100644
--- a/arch/arm64/core/irq_manage.c
+++ b/arch/arm64/core/irq_manage.c
@@ -9,14 +9,14 @@
  * @brief ARM64 Cortex-A interrupt management
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <tracing/tracing.h>
-#include <irq.h>
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <sw_isr_table.h>
-#include <drivers/interrupt_controller/gic.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/tracing/tracing.h>
+#include <zephyr/irq.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
 
 void z_arm64_fatal_error(unsigned int reason, z_arch_esf_t *esf);
 
diff --git a/arch/arm64/core/irq_offload.c b/arch/arm64/core/irq_offload.c
index 32f1ba2155..26f88aa77e 100644
--- a/arch/arm64/core/irq_offload.c
+++ b/arch/arm64/core/irq_offload.c
@@ -9,8 +9,8 @@
  * @brief Software interrupts utility code - ARM64 implementation
  */
 
-#include <kernel.h>
-#include <irq_offload.h>
+#include <zephyr/kernel.h>
+#include <zephyr/irq_offload.h>
 #include <exc.h>
 
 void arch_irq_offload(irq_offload_routine_t routine, const void *parameter)
diff --git a/arch/arm64/core/mmu.c b/arch/arm64/core/mmu.c
index 101edc2f7d..7272279416 100644
--- a/arch/arm64/core/mmu.c
+++ b/arch/arm64/core/mmu.c
@@ -7,20 +7,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <cache.h>
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/cache.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <kernel_arch_func.h>
 #include <kernel_arch_interface.h>
 #include <kernel_internal.h>
-#include <logging/log.h>
-#include <arch/arm64/cpu.h>
-#include <arch/arm64/lib_helpers.h>
-#include <arch/arm64/mm.h>
-#include <linker/linker-defs.h>
-#include <spinlock.h>
-#include <sys/util.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/arch/arm64/cpu.h>
+#include <zephyr/arch/arm64/lib_helpers.h>
+#include <zephyr/arch/arm64/mm.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/sys/util.h>
 
 #include "mmu.h"
 
diff --git a/arch/arm64/core/offsets/offsets.c b/arch/arm64/core/offsets/offsets.c
index 9090c358fe..aa49d68486 100644
--- a/arch/arm64/core/offsets/offsets.c
+++ b/arch/arm64/core/offsets/offsets.c
@@ -26,7 +26,7 @@
 #define _ARM_OFFSETS_INC_
 
 #include <gen_offset.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_arch_data.h>
 #include <kernel_offsets.h>
 
@@ -58,7 +58,7 @@ GEN_ABSOLUTE_SYM(___esf_t_SIZEOF, sizeof(_esf_t));
 
 #ifdef CONFIG_HAS_ARM_SMCCC
 
-#include <arch/arm64/arm-smccc.h>
+#include <zephyr/arch/arm64/arm-smccc.h>
 
 GEN_NAMED_OFFSET_SYM(arm_smccc_res_t, a0, a0_a1);
 GEN_NAMED_OFFSET_SYM(arm_smccc_res_t, a2, a2_a3);
diff --git a/arch/arm64/core/prep_c.c b/arch/arm64/core/prep_c.c
index 16553ea68a..23c90147ea 100644
--- a/arch/arm64/core/prep_c.c
+++ b/arch/arm64/core/prep_c.c
@@ -15,7 +15,7 @@
  */
 
 #include <kernel_internal.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 
 __weak void z_arm64_mm_init(bool is_primary_core) { }
 
diff --git a/arch/arm64/core/smp.c b/arch/arm64/core/smp.c
index 95a31aa99b..e23a8ada4c 100644
--- a/arch/arm64/core/smp.c
+++ b/arch/arm64/core/smp.c
@@ -10,19 +10,19 @@
  * @brief codes required for AArch64 multicore and Zephyr smp support
  */
 
-#include <cache.h>
-#include <device.h>
-#include <devicetree.h>
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/cache.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <ksched.h>
 #include <soc.h>
-#include <init.h>
-#include <arch/arm64/mm.h>
-#include <arch/cpu.h>
-#include <drivers/interrupt_controller/gic.h>
-#include <drivers/pm_cpu_ops.h>
-#include <sys/arch_interface.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/arm64/mm.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
+#include <zephyr/drivers/pm_cpu_ops.h>
+#include <zephyr/sys/arch_interface.h>
 #include "boot.h"
 
 #define SGI_SCHED_IPI	0
diff --git a/arch/arm64/core/thread.c b/arch/arm64/core/thread.c
index 1c1aaf50d1..d8da2840c7 100644
--- a/arch/arm64/core/thread.c
+++ b/arch/arm64/core/thread.c
@@ -11,10 +11,10 @@
  * Core thread related primitives for the ARM64 Cortex-A
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
-#include <wait_q.h>
-#include <arch/cpu.h>
+#include <zephyr/wait_q.h>
+#include <zephyr/arch/cpu.h>
 
 /*
  * Note about stack usage:
diff --git a/arch/arm64/core/tls.c b/arch/arm64/core/tls.c
index ecdb67f7d2..bb71079b1a 100644
--- a/arch/arm64/core/tls.c
+++ b/arch/arm64/core/tls.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <kernel_tls.h>
-#include <app_memory/app_memdomain.h>
-#include <sys/util.h>
+#include <zephyr/app_memory/app_memdomain.h>
+#include <zephyr/sys/util.h>
 
 size_t arch_tls_stack_setup(struct k_thread *new_thread, char *stack_ptr)
 {
diff --git a/arch/arm64/core/xen/enlighten.c b/arch/arm64/core/xen/enlighten.c
index c763cee55c..5077d6e9af 100644
--- a/arch/arm64/core/xen/enlighten.c
+++ b/arch/arm64/core/xen/enlighten.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/arm64/hypercall.h>
-#include <xen/events.h>
-#include <xen/generic.h>
-#include <xen/public/xen.h>
-#include <xen/public/memory.h>
+#include <zephyr/arch/arm64/hypercall.h>
+#include <zephyr/xen/events.h>
+#include <zephyr/xen/generic.h>
+#include <zephyr/xen/public/xen.h>
+#include <zephyr/xen/public/memory.h>
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
-#include <kernel/thread.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel/thread.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(xen_enlighten);
 
diff --git a/arch/arm64/include/exc.h b/arch/arm64/include/exc.h
index 5f9adc5064..03dacc7c51 100644
--- a/arch/arm64/include/exc.h
+++ b/arch/arm64/include/exc.h
@@ -14,7 +14,7 @@
 #ifndef ZEPHYR_ARCH_ARM64_INCLUDE_EXC_H_
 #define ZEPHYR_ARCH_ARM64_INCLUDE_EXC_H_
 
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 #ifdef _ASMLANGUAGE
 
diff --git a/arch/arm64/include/kernel_arch_data.h b/arch/arm64/include/kernel_arch_data.h
index 12b20ae391..0b2d878537 100644
--- a/arch/arm64/include/kernel_arch_data.h
+++ b/arch/arm64/include/kernel_arch_data.h
@@ -20,17 +20,17 @@
 #ifndef ZEPHYR_ARCH_ARM64_INCLUDE_KERNEL_ARCH_DATA_H_
 #define ZEPHYR_ARCH_ARM64_INCLUDE_KERNEL_ARCH_DATA_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 <exc.h>
 
 #ifndef _ASMLANGUAGE
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <sys/dlist.h>
-#include <sys/atomic.h>
+#include <zephyr/sys/dlist.h>
+#include <zephyr/sys/atomic.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/common/isr_tables.c b/arch/common/isr_tables.c
index a6bad5ff90..f8084f9807 100644
--- a/arch/common/isr_tables.c
+++ b/arch/common/isr_tables.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <sw_isr_table.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/arch/cpu.h>
 
 /* There is an additional member at the end populated by the linker script
  * which indicates the number of interrupts specified
diff --git a/arch/common/sw_isr_common.c b/arch/common/sw_isr_common.c
index 9e87b8bf7a..aa52e9939c 100644
--- a/arch/common/sw_isr_common.c
+++ b/arch/common/sw_isr_common.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sw_isr_table.h>
-#include <arch/cpu.h>
-#include <sys/__assert.h>
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/__assert.h>
 /*
  * Common code for arches that use software ISR tables (CONFIG_GEN_ISR_TABLES)
  */
diff --git a/arch/common/timing.c b/arch/common/timing.c
index 00763a7d0a..8a4f65caa3 100644
--- a/arch/common/timing.c
+++ b/arch/common/timing.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys_clock.h>
-#include <timing/timing.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/timing/timing.h>
 
 void arch_timing_init(void)
 {
diff --git a/arch/mips/core/cpu_idle.c b/arch/mips/core/cpu_idle.c
index 44ab68dbb9..d91a6b3ce4 100644
--- a/arch/mips/core/cpu_idle.c
+++ b/arch/mips/core/cpu_idle.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <irq.h>
+#include <zephyr/irq.h>
 
-#include <tracing/tracing.h>
+#include <zephyr/tracing/tracing.h>
 
 static ALWAYS_INLINE void mips_idle(unsigned int key)
 {
diff --git a/arch/mips/core/fatal.c b/arch/mips/core/fatal.c
index b242c7d00d..071492a678 100644
--- a/arch/mips/core/fatal.c
+++ b/arch/mips/core/fatal.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys/printk.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 FUNC_NORETURN void z_mips_fatal_error(unsigned int reason,
diff --git a/arch/mips/core/irq_manage.c b/arch/mips/core/irq_manage.c
index 4dfee855a7..e6339845c7 100644
--- a/arch/mips/core/irq_manage.c
+++ b/arch/mips/core/irq_manage.c
@@ -6,9 +6,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kswap.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 
diff --git a/arch/mips/core/irq_offload.c b/arch/mips/core/irq_offload.c
index dbca0dcdae..2a62ae071e 100644
--- a/arch/mips/core/irq_offload.c
+++ b/arch/mips/core/irq_offload.c
@@ -6,11 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
-#include <irq.h>
-#include <irq_offload.h>
+#include <zephyr/irq.h>
+#include <zephyr/irq_offload.h>
 
 volatile irq_offload_routine_t _offload_routine;
 static volatile const void *offload_param;
diff --git a/arch/mips/core/prep_c.c b/arch/mips/core/prep_c.c
index 440e14145b..6f72699cc5 100644
--- a/arch/mips/core/prep_c.c
+++ b/arch/mips/core/prep_c.c
@@ -10,7 +10,7 @@
  */
 
 #include <kernel_internal.h>
-#include <irq.h>
+#include <zephyr/irq.h>
 
 static void interrupt_init(void)
 {
diff --git a/arch/mips/core/thread.c b/arch/mips/core/thread.c
index 5b73246253..3e3abc6c16 100644
--- a/arch/mips/core/thread.c
+++ b/arch/mips/core/thread.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 extern uint32_t mips_cp0_status_int_mask;
 
diff --git a/arch/mips/include/kernel_arch_data.h b/arch/mips/include/kernel_arch_data.h
index e04fe7b665..f1317d9904 100644
--- a/arch/mips/include/kernel_arch_data.h
+++ b/arch/mips/include/kernel_arch_data.h
@@ -17,14 +17,14 @@
 #ifndef ZEPHYR_ARCH_MIPS_INCLUDE_KERNEL_ARCH_DATA_H_
 #define ZEPHYR_ARCH_MIPS_INCLUDE_KERNEL_ARCH_DATA_H_
 
-#include <toolchain.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/arch/cpu.h>
 
 #ifndef _ASMLANGUAGE
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
-#include <sys/dlist.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/dlist.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/nios2/core/cache.c b/arch/nios2/core/cache.c
index 58027cbda9..c13c43c718 100644
--- a/arch/nios2/core/cache.c
+++ b/arch/nios2/core/cache.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/cpu.h>
-#include <sys/__assert.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/__assert.h>
 
 
 /**
diff --git a/arch/nios2/core/cpu_idle.c b/arch/nios2/core/cpu_idle.c
index e98cecffc9..ecdea13f5e 100644
--- a/arch/nios2/core/cpu_idle.c
+++ b/arch/nios2/core/cpu_idle.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 
 void arch_cpu_idle(void)
 {
diff --git a/arch/nios2/core/fatal.c b/arch/nios2/core/fatal.c
index aaff1fe5d3..9ccb4f3fd9 100644
--- a/arch/nios2/core/fatal.c
+++ b/arch/nios2/core/fatal.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/kernel_structs.h>
 #include <inttypes.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 FUNC_NORETURN void z_nios2_fatal_error(unsigned int reason,
diff --git a/arch/nios2/core/irq_manage.c b/arch/nios2/core/irq_manage.c
index 26f92ef23b..6f4b2bdf10 100644
--- a/arch/nios2/core/irq_manage.c
+++ b/arch/nios2/core/irq_manage.c
@@ -11,15 +11,15 @@
  */
 
 
-#include <kernel.h>
-#include <kernel_structs.h>
-#include <arch/cpu.h>
-#include <irq.h>
-#include <sw_isr_table.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/irq.h>
+#include <zephyr/sw_isr_table.h>
 #include <ksched.h>
 #include <kswap.h>
-#include <tracing/tracing.h>
-#include <logging/log.h>
+#include <zephyr/tracing/tracing.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 FUNC_NORETURN void z_irq_spurious(const void *unused)
diff --git a/arch/nios2/core/irq_offload.c b/arch/nios2/core/irq_offload.c
index 5229af8b2a..d33882f9f0 100644
--- a/arch/nios2/core/irq_offload.c
+++ b/arch/nios2/core/irq_offload.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
-#include <irq_offload.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/irq_offload.h>
 
 volatile irq_offload_routine_t _offload_routine;
 static volatile const void *offload_param;
diff --git a/arch/nios2/core/offsets/offsets.c b/arch/nios2/core/offsets/offsets.c
index 1b735e79b1..4e2dec76ad 100644
--- a/arch/nios2/core/offsets/offsets.c
+++ b/arch/nios2/core/offsets/offsets.c
@@ -24,7 +24,7 @@
  */
 
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_arch_data.h>
 #include <gen_offset.h>
 #include <kernel_offsets.h>
diff --git a/arch/nios2/core/prep_c.c b/arch/nios2/core/prep_c.c
index fcf41c2ba4..da8fcd9d4b 100644
--- a/arch/nios2/core/prep_c.c
+++ b/arch/nios2/core/prep_c.c
@@ -17,9 +17,9 @@
  */
 
 #include <zephyr/types.h>
-#include <toolchain.h>
-#include <linker/linker-defs.h>
-#include <kernel_structs.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 
 /**
diff --git a/arch/nios2/core/thread.c b/arch/nios2/core/thread.c
index c38f25ef10..c2f674a3fb 100644
--- a/arch/nios2/core/thread.c
+++ b/arch/nios2/core/thread.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
 
 /* forward declaration to asm function to adjust setup the arguments
diff --git a/arch/nios2/core/timing.c b/arch/nios2/core/timing.c
index dab36a31a3..9deb469a07 100644
--- a/arch/nios2/core/timing.c
+++ b/arch/nios2/core/timing.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys_clock.h>
-#include <timing/timing.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/timing/timing.h>
 #include "altera_avalon_timer_regs.h"
 
 #define NIOS2_SUBTRACT_CLOCK_CYCLES(val)                                       \
diff --git a/arch/nios2/include/kernel_arch_data.h b/arch/nios2/include/kernel_arch_data.h
index 93568c4ec3..2f1dbdd1f9 100644
--- a/arch/nios2/include/kernel_arch_data.h
+++ b/arch/nios2/include/kernel_arch_data.h
@@ -21,16 +21,16 @@
 #ifndef ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_DATA_H_
 #define ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_DATA_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>
 
 #ifndef _ASMLANGUAGE
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
-#include <sys/dlist.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/dlist.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/posix/core/cpuhalt.c b/arch/posix/core/cpuhalt.c
index cbac5f83ed..8c486cd69b 100644
--- a/arch/posix/core/cpuhalt.c
+++ b/arch/posix/core/cpuhalt.c
@@ -22,8 +22,8 @@
 
 #include "posix_core.h"
 #include "posix_board_if.h"
-#include <arch/posix/posix_soc_if.h>
-#include <tracing/tracing.h>
+#include <zephyr/arch/posix/posix_soc_if.h>
+#include <zephyr/tracing/tracing.h>
 
 #if !defined(CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT)
 #error "The POSIX architecture needs a custom busy_wait implementation. \
diff --git a/arch/posix/core/fatal.c b/arch/posix/core/fatal.c
index a749d2a169..66d91676ea 100644
--- a/arch/posix/core/fatal.c
+++ b/arch/posix/core/fatal.c
@@ -5,13 +5,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <kernel_structs.h>
-#include <sys/printk.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/sys/printk.h>
 #include <inttypes.h>
-#include <logging/log_ctrl.h>
-#include <arch/posix/posix_soc_if.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/arch/posix/posix_soc_if.h>
 
 FUNC_NORETURN void arch_system_halt(unsigned int reason)
 {
diff --git a/arch/posix/core/irq.c b/arch/posix/core/irq.c
index 8722757cff..cd62d9ff8f 100644
--- a/arch/posix/core/irq.c
+++ b/arch/posix/core/irq.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/posix/posix_soc_if.h>
+#include <zephyr/arch/posix/posix_soc_if.h>
 #include "board_irq.h"
 
 #ifdef CONFIG_IRQ_OFFLOAD
diff --git a/arch/posix/core/offsets/offsets.c b/arch/posix/core/offsets/offsets.c
index dfddbb45e2..0dc46135c5 100644
--- a/arch/posix/core/offsets/offsets.c
+++ b/arch/posix/core/offsets/offsets.c
@@ -23,7 +23,7 @@
  * completeness.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_arch_data.h>
 #include <gen_offset.h>
 #include <kernel_offsets.h>
diff --git a/arch/posix/core/posix_core.c b/arch/posix/core/posix_core.c
index 49bcf46473..19f3437f4b 100644
--- a/arch/posix/core/posix_core.c
+++ b/arch/posix/core/posix_core.c
@@ -44,7 +44,7 @@
 
 #include "posix_core.h"
 #include "posix_arch_internal.h"
-#include <arch/posix/posix_soc_if.h>
+#include <zephyr/arch/posix/posix_soc_if.h>
 #include "kernel_internal.h"
 #include "kernel_structs.h"
 #include "ksched.h"
diff --git a/arch/posix/core/swap.c b/arch/posix/core/swap.c
index 37655a8ce6..2f779ee0a9 100644
--- a/arch/posix/core/swap.c
+++ b/arch/posix/core/swap.c
@@ -14,11 +14,11 @@
  */
 
 #include "kernel.h"
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include "posix_core.h"
 #include "irq.h"
 #include "kswap.h"
-#include <pm/pm.h>
+#include <zephyr/pm/pm.h>
 
 int arch_swap(unsigned int key)
 {
diff --git a/arch/posix/core/thread.c b/arch/posix/core/thread.c
index 46840cb413..8168e88b3c 100644
--- a/arch/posix/core/thread.c
+++ b/arch/posix/core/thread.c
@@ -13,13 +13,13 @@
  * architecture
  */
 
-#include <toolchain.h>
-#include <kernel_structs.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/kernel_structs.h>
 #include <ksched.h>
-#include <wait_q.h>
+#include <zephyr/wait_q.h>
 
 #include "posix_core.h"
-#include <arch/posix/posix_soc_if.h>
+#include <zephyr/arch/posix/posix_soc_if.h>
 
 /* Note that in this arch we cheat quite a bit: we use as stack a normal
  * pthreads stack and therefore we ignore the stack size
diff --git a/arch/posix/include/asm_inline.h b/arch/posix/include/asm_inline.h
index 306eb77cd3..0434455272 100644
--- a/arch/posix/include/asm_inline.h
+++ b/arch/posix/include/asm_inline.h
@@ -16,7 +16,7 @@
 
 #if defined(__GNUC__)
 #include <asm_inline_gcc.h> /* The empty one.. */
-#include <arch/posix/asm_inline_gcc.h>
+#include <zephyr/arch/posix/asm_inline_gcc.h>
 #else
 #include <asm_inline_other.h>
 #endif /* __GNUC__ */
diff --git a/arch/riscv/core/coredump.c b/arch/riscv/core/coredump.c
index 024f45fd15..70af1b1625 100644
--- a/arch/riscv/core/coredump.c
+++ b/arch/riscv/core/coredump.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <debug/coredump.h>
+#include <zephyr/debug/coredump.h>
 
 #define ARCH_HDR_VER 1
 
diff --git a/arch/riscv/core/cpu_idle.c b/arch/riscv/core/cpu_idle.c
index 09e2916f84..0c7f5f3dac 100644
--- a/arch/riscv/core/cpu_idle.c
+++ b/arch/riscv/core/cpu_idle.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <irq.h>
+#include <zephyr/irq.h>
 
 /*
  * In RISC-V there is no conventional way to handle CPU power save.
diff --git a/arch/riscv/core/fatal.c b/arch/riscv/core/fatal.c
index 9b02f9d9af..bb9acb92de 100644
--- a/arch/riscv/core/fatal.c
+++ b/arch/riscv/core/fatal.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <inttypes.h>
-#include <exc_handle.h>
-#include <logging/log.h>
+#include <zephyr/exc_handle.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #ifdef CONFIG_USERSPACE
diff --git a/arch/riscv/core/irq_manage.c b/arch/riscv/core/irq_manage.c
index d7a9b18796..74bc916857 100644
--- a/arch/riscv/core/irq_manage.c
+++ b/arch/riscv/core/irq_manage.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 FUNC_NORETURN void z_irq_spurious(const void *unused)
diff --git a/arch/riscv/core/irq_offload.c b/arch/riscv/core/irq_offload.c
index 0e62c82aeb..d325bc2dcd 100644
--- a/arch/riscv/core/irq_offload.c
+++ b/arch/riscv/core/irq_offload.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <irq_offload.h>
-#include <arch/riscv/syscall.h>
+#include <zephyr/irq_offload.h>
+#include <zephyr/arch/riscv/syscall.h>
 
 void arch_irq_offload(irq_offload_routine_t routine, const void *parameter)
 {
diff --git a/arch/riscv/core/offsets/offsets.c b/arch/riscv/core/offsets/offsets.c
index 9f14e264a5..45f4c01e7e 100644
--- a/arch/riscv/core/offsets/offsets.c
+++ b/arch/riscv/core/offsets/offsets.c
@@ -13,7 +13,7 @@
  * structures.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_arch_data.h>
 #include <gen_offset.h>
 #include <kernel_offsets.h>
diff --git a/arch/riscv/core/pmp.c b/arch/riscv/core/pmp.c
index 4df0a12912..37ff68df8f 100644
--- a/arch/riscv/core/pmp.c
+++ b/arch/riscv/core/pmp.c
@@ -25,15 +25,15 @@
  * which are never modified.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 #include <pmp.h>
-#include <sys/arch_interface.h>
-#include <arch/riscv/csr.h>
+#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/riscv/csr.h>
 
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mpu);
 
 #define PMP_DEBUG_DUMP 0
diff --git a/arch/riscv/core/prep_c.c b/arch/riscv/core/prep_c.c
index 080b1f293c..8b9b118b24 100644
--- a/arch/riscv/core/prep_c.c
+++ b/arch/riscv/core/prep_c.c
@@ -16,8 +16,8 @@
  */
 
 #include <stddef.h>
-#include <toolchain.h>
-#include <kernel_structs.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 
 /**
diff --git a/arch/riscv/core/reboot.c b/arch/riscv/core/reboot.c
index 879a0d509c..34b0204ef4 100644
--- a/arch/riscv/core/reboot.c
+++ b/arch/riscv/core/reboot.c
@@ -9,9 +9,9 @@
  * @brief RISC-V reboot interface
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/util.h>
 
 /**
  * @brief Reset the system
diff --git a/arch/riscv/core/smp.c b/arch/riscv/core/smp.c
index 845f17eedb..510c54e783 100644
--- a/arch/riscv/core/smp.c
+++ b/arch/riscv/core/smp.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
 
 volatile struct {
diff --git a/arch/riscv/core/thread.c b/arch/riscv/core/thread.c
index 2992325996..d24b9e5ecd 100644
--- a/arch/riscv/core/thread.c
+++ b/arch/riscv/core/thread.c
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
-#include <arch/riscv/csr.h>
+#include <zephyr/arch/riscv/csr.h>
 #include <stdio.h>
 #include <pmp.h>
 
diff --git a/arch/riscv/core/tls.c b/arch/riscv/core/tls.c
index b533ec60fa..e9760a5560 100644
--- a/arch/riscv/core/tls.c
+++ b/arch/riscv/core/tls.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <kernel_tls.h>
-#include <app_memory/app_memdomain.h>
-#include <sys/util.h>
+#include <zephyr/app_memory/app_memdomain.h>
+#include <zephyr/sys/util.h>
 
 size_t arch_tls_stack_setup(struct k_thread *new_thread, char *stack_ptr)
 {
diff --git a/arch/riscv/include/kernel_arch_data.h b/arch/riscv/include/kernel_arch_data.h
index 9ee4ac2415..ce881e7344 100644
--- a/arch/riscv/include/kernel_arch_data.h
+++ b/arch/riscv/include/kernel_arch_data.h
@@ -15,15 +15,15 @@
 #ifndef ZEPHYR_ARCH_RISCV_INCLUDE_KERNEL_ARCH_DATA_H_
 #define ZEPHYR_ARCH_RISCV_INCLUDE_KERNEL_ARCH_DATA_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>
 
 #ifndef _ASMLANGUAGE
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
-#include <sys/dlist.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/dlist.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/sparc/core/fatal.c b/arch/sparc/core/fatal.c
index ae1e320437..ef92fa69f9 100644
--- a/arch/sparc/core/fatal.c
+++ b/arch/sparc/core/fatal.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 /*
diff --git a/arch/sparc/core/irq_manage.c b/arch/sparc/core/irq_manage.c
index cd5041d1e7..c3073cac55 100644
--- a/arch/sparc/core/irq_manage.c
+++ b/arch/sparc/core/irq_manage.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
 #include <kswap.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 FUNC_NORETURN void z_irq_spurious(const void *unused)
diff --git a/arch/sparc/core/irq_offload.c b/arch/sparc/core/irq_offload.c
index cd75963dec..cd5acc08ba 100644
--- a/arch/sparc/core/irq_offload.c
+++ b/arch/sparc/core/irq_offload.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
-#include <irq.h>
-#include <irq_offload.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/irq.h>
+#include <zephyr/irq_offload.h>
 
 volatile irq_offload_routine_t _offload_routine;
 static volatile const void *offload_param;
diff --git a/arch/sparc/core/offsets/offsets.c b/arch/sparc/core/offsets/offsets.c
index 328ae1f30a..59598e4fb1 100644
--- a/arch/sparc/core/offsets/offsets.c
+++ b/arch/sparc/core/offsets/offsets.c
@@ -12,7 +12,7 @@
  * value represents the member offsets for various SPARC kernel structures.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_arch_data.h>
 #include <gen_offset.h>
 #include <kernel_offsets.h>
diff --git a/arch/sparc/core/thread.c b/arch/sparc/core/thread.c
index 48c83408f0..a8e629af66 100644
--- a/arch/sparc/core/thread.c
+++ b/arch/sparc/core/thread.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
 
 void z_thread_entry_wrapper(k_thread_entry_t thread,
diff --git a/arch/sparc/core/tls.c b/arch/sparc/core/tls.c
index 8e9d5bee1b..c3363d394a 100644
--- a/arch/sparc/core/tls.c
+++ b/arch/sparc/core/tls.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <kernel_tls.h>
-#include <app_memory/app_memdomain.h>
-#include <sys/util.h>
+#include <zephyr/app_memory/app_memdomain.h>
+#include <zephyr/sys/util.h>
 
 size_t arch_tls_stack_setup(struct k_thread *new_thread, char *stack_ptr)
 {
diff --git a/arch/sparc/include/kernel_arch_data.h b/arch/sparc/include/kernel_arch_data.h
index ff3dbfc632..613cbd2ef0 100644
--- a/arch/sparc/include/kernel_arch_data.h
+++ b/arch/sparc/include/kernel_arch_data.h
@@ -15,15 +15,15 @@
 #ifndef ZEPHYR_ARCH_SPARC_INCLUDE_KERNEL_ARCH_DATA_H_
 #define ZEPHYR_ARCH_SPARC_INCLUDE_KERNEL_ARCH_DATA_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>
 
 #ifndef _ASMLANGUAGE
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
-#include <sys/dlist.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/dlist.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/x86/core/acpi.c b/arch/x86/core/acpi.c
index a3146d31c1..2828c6fe66 100644
--- a/arch/x86/core/acpi.c
+++ b/arch/x86/core/acpi.c
@@ -2,9 +2,9 @@
  * Copyright (c) 2020 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <kernel.h>
-#include <arch/x86/acpi.h>
-#include <arch/x86/efi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/x86/acpi.h>
+#include <zephyr/arch/x86/efi.h>
 
 static struct acpi_rsdp *rsdp;
 static bool is_rsdp_searched;
diff --git a/arch/x86/core/cache.c b/arch/x86/core/cache.c
index 831bd70686..0066c1b0c5 100644
--- a/arch/x86/core/cache.c
+++ b/arch/x86/core/cache.c
@@ -11,11 +11,11 @@
  * This module contains functions for manipulation caches.
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/util.h>
-#include <toolchain.h>
-#include <cache.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/cache.h>
 #include <stdbool.h>
 
 /**
diff --git a/arch/x86/core/cpuhalt.c b/arch/x86/core/cpuhalt.c
index 7ac99a67e4..5c409864f8 100644
--- a/arch/x86/core/cpuhalt.c
+++ b/arch/x86/core/cpuhalt.c
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <tracing/tracing.h>
-#include <arch/cpu.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/tracing/tracing.h>
+#include <zephyr/arch/cpu.h>
 
 __pinned_func
 void arch_cpu_idle(void)
diff --git a/arch/x86/core/cpuid.c b/arch/x86/core/cpuid.c
index 16d0b513c1..8dca8b5703 100644
--- a/arch/x86/core/cpuid.c
+++ b/arch/x86/core/cpuid.c
@@ -6,9 +6,9 @@
 
 #include <cpuid.h> /* Header provided by the toolchain. */
 
-#include <kernel_structs.h>
-#include <arch/x86/cpuid.h>
-#include <kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/arch/x86/cpuid.h>
+#include <zephyr/kernel.h>
 
 uint32_t z_x86_cpuid_extended_features(void)
 {
diff --git a/arch/x86/core/early_serial.c b/arch/x86/core/early_serial.c
index aa3aacc99d..2d6a3e340e 100644
--- a/arch/x86/core/early_serial.c
+++ b/arch/x86/core/early_serial.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys/device_mmio.h>
-#include <sys/util.h>
-#include <drivers/pcie/pcie.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/device_mmio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/pcie/pcie.h>
 #include <soc.h>
 
 
diff --git a/arch/x86/core/efi.c b/arch/x86/core/efi.c
index 6091705890..16567f0414 100644
--- a/arch/x86/core/efi.c
+++ b/arch/x86/core/efi.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <spinlock.h>
-#include <arch/x86/efi.h>
-#include <sys/mem_manage.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/arch/x86/efi.h>
+#include <zephyr/sys/mem_manage.h>
 #include "../zefi/efi.h" /* ZEFI not on include path */
 
 #define EFI_CON_BUFSZ 128
diff --git a/arch/x86/core/fatal.c b/arch/x86/core/fatal.c
index e7f11ad7be..29c5fdac06 100644
--- a/arch/x86/core/fatal.c
+++ b/arch/x86/core/fatal.c
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
-#include <exc_handle.h>
-#include <logging/log.h>
+#include <zephyr/exc_handle.h>
+#include <zephyr/logging/log.h>
 #include <x86_mmu.h>
 #include <mmu.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
diff --git a/arch/x86/core/ia32/coredump.c b/arch/x86/core/ia32/coredump.c
index 5c67047c55..b49373aab7 100644
--- a/arch/x86/core/ia32/coredump.c
+++ b/arch/x86/core/ia32/coredump.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <debug/coredump.h>
+#include <zephyr/debug/coredump.h>
 
 #define ARCH_HDR_VER			1
 
diff --git a/arch/x86/core/ia32/fatal.c b/arch/x86/core/ia32/fatal.c
index 0c683b1398..d1c0531c82 100644
--- a/arch/x86/core/ia32/fatal.c
+++ b/arch/x86/core/ia32/fatal.c
@@ -9,17 +9,17 @@
  * @brief Kernel fatal error handler
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
-#include <drivers/interrupt_controller/sysapic.h>
-#include <arch/x86/ia32/segmentation.h>
-#include <arch/syscall.h>
+#include <zephyr/drivers/interrupt_controller/sysapic.h>
+#include <zephyr/arch/x86/ia32/segmentation.h>
+#include <zephyr/arch/syscall.h>
 #include <ia32/exception.h>
 #include <inttypes.h>
-#include <exc_handle.h>
-#include <logging/log.h>
+#include <zephyr/exc_handle.h>
+#include <zephyr/logging/log.h>
 #include <x86_mmu.h>
-#include <sys/mem_manage.h>
+#include <zephyr/sys/mem_manage.h>
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
diff --git a/arch/x86/core/ia32/float.c b/arch/x86/core/ia32/float.c
index cce812e33d..7307d1445c 100644
--- a/arch/x86/core/ia32/float.c
+++ b/arch/x86/core/ia32/float.c
@@ -43,7 +43,7 @@
  * to enable FP register sharing on its behalf.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
 
 /* SSE control/status register default value (used by assembler code) */
diff --git a/arch/x86/core/ia32/gdbstub.c b/arch/x86/core/ia32/gdbstub.c
index 9aa1b3dce5..fb2276ae88 100644
--- a/arch/x86/core/ia32/gdbstub.c
+++ b/arch/x86/core/ia32/gdbstub.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
 #include <ia32/exception.h>
 #include <inttypes.h>
-#include <debug/gdbstub.h>
+#include <zephyr/debug/gdbstub.h>
 
 
 static struct gdb_ctx ctx;
diff --git a/arch/x86/core/ia32/irq_manage.c b/arch/x86/core/ia32/irq_manage.c
index 038b21703d..d35f2067f1 100644
--- a/arch/x86/core/ia32/irq_manage.c
+++ b/arch/x86/core/ia32/irq_manage.c
@@ -14,15 +14,15 @@
  * global variable.)
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <kernel_structs.h>
-#include <sys/__assert.h>
-#include <sys/printk.h>
-#include <irq.h>
-#include <tracing/tracing.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/irq.h>
+#include <zephyr/tracing/tracing.h>
 #include <kswap.h>
-#include <arch/x86/ia32/segmentation.h>
+#include <zephyr/arch/x86/ia32/segmentation.h>
 
 extern void z_SpuriousIntHandler(void *handler);
 extern void z_SpuriousIntNoErrCodeHandler(void *handler);
diff --git a/arch/x86/core/ia32/irq_offload.c b/arch/x86/core/ia32/irq_offload.c
index d12283b8bf..71e8363ece 100644
--- a/arch/x86/core/ia32/irq_offload.c
+++ b/arch/x86/core/ia32/irq_offload.c
@@ -8,8 +8,8 @@
  * @file IRQ offload - x86 implementation
  */
 
-#include <kernel.h>
-#include <irq_offload.h>
+#include <zephyr/kernel.h>
+#include <zephyr/irq_offload.h>
 
 extern void (*_irq_sw_handler)(void);
 NANO_CPU_INT_REGISTER(_irq_sw_handler, NANO_SOFT_IRQ,
diff --git a/arch/x86/core/ia32/soft_float_stubs.c b/arch/x86/core/ia32/soft_float_stubs.c
index fe3e81a1b3..3684200ee2 100644
--- a/arch/x86/core/ia32/soft_float_stubs.c
+++ b/arch/x86/core/ia32/soft_float_stubs.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <toolchain.h>
+#include <zephyr/kernel.h>
+#include <zephyr/toolchain.h>
 
 /**
  * @file
diff --git a/arch/x86/core/ia32/thread.c b/arch/x86/core/ia32/thread.c
index fb89848c7d..7830298f72 100644
--- a/arch/x86/core/ia32/thread.c
+++ b/arch/x86/core/ia32/thread.c
@@ -12,9 +12,9 @@
  * processor architecture.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
-#include <arch/x86/mmustructs.h>
+#include <zephyr/arch/x86/mmustructs.h>
 #include <kswap.h>
 #include <x86_mmu.h>
 
diff --git a/arch/x86/core/ia32/tls.c b/arch/x86/core/ia32/tls.c
index 3cb2361acb..8aa0d35296 100644
--- a/arch/x86/core/ia32/tls.c
+++ b/arch/x86/core/ia32/tls.c
@@ -5,8 +5,8 @@
  */
 
 #include <kernel_internal.h>
-#include <arch/x86/ia32/arch.h>
-#include <arch/x86/ia32/segmentation.h>
+#include <zephyr/arch/x86/ia32/arch.h>
+#include <zephyr/arch/x86/ia32/segmentation.h>
 
 #define ENTRY_NUM	(GS_TLS_SEG >> 3)
 
diff --git a/arch/x86/core/intel64/coredump.c b/arch/x86/core/intel64/coredump.c
index 3405e0dfba..f1c1a15eaf 100644
--- a/arch/x86/core/intel64/coredump.c
+++ b/arch/x86/core/intel64/coredump.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <debug/coredump.h>
+#include <zephyr/debug/coredump.h>
 
 #define ARCH_HDR_VER			1
 
diff --git a/arch/x86/core/intel64/cpu.c b/arch/x86/core/intel64/cpu.c
index 70423c1e0f..719184b354 100644
--- a/arch/x86/core/intel64/cpu.c
+++ b/arch/x86/core/intel64/cpu.c
@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_arch_data.h>
 #include <kernel_arch_func.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
-#include <arch/x86/multiboot.h>
+#include <zephyr/arch/x86/multiboot.h>
 #include <x86_mmu.h>
-#include <drivers/interrupt_controller/loapic.h>
-#include <arch/x86/acpi.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h>
+#include <zephyr/arch/x86/acpi.h>
 
 /*
  * Map of CPU logical IDs to CPU local APIC IDs. By default,
diff --git a/arch/x86/core/intel64/fatal.c b/arch/x86/core/intel64/fatal.c
index 0174d22912..5772234a0d 100644
--- a/arch/x86/core/intel64/fatal.c
+++ b/arch/x86/core/intel64/fatal.c
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 /* NMI handlers should override weak implementation
diff --git a/arch/x86/core/intel64/irq.c b/arch/x86/core/intel64/irq.c
index 551d03133a..4005983c6b 100644
--- a/arch/x86/core/intel64/irq.c
+++ b/arch/x86/core/intel64/irq.c
@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 #include <kernel_arch_data.h>
 #include <kernel_arch_func.h>
-#include <drivers/interrupt_controller/sysapic.h>
-#include <drivers/interrupt_controller/loapic.h>
-#include <irq.h>
-#include <logging/log.h>
+#include <zephyr/drivers/interrupt_controller/sysapic.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h>
+#include <zephyr/irq.h>
+#include <zephyr/logging/log.h>
 #include <x86_mmu.h>
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
@@ -31,8 +31,8 @@ const void *x86_irq_args[NR_IRQ_VECTORS];
 
 #if defined(CONFIG_INTEL_VTD_ICTL)
 
-#include <device.h>
-#include <drivers/interrupt_controller/intel_vtd.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/interrupt_controller/intel_vtd.h>
 
 static const struct device *vtd = DEVICE_DT_GET_ONE(intel_vt_d);
 
@@ -138,7 +138,7 @@ int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 }
 
 #ifdef CONFIG_IRQ_OFFLOAD
-#include <irq_offload.h>
+#include <zephyr/irq_offload.h>
 
 void arch_irq_offload(irq_offload_routine_t routine, const void *parameter)
 {
diff --git a/arch/x86/core/intel64/thread.c b/arch/x86/core/intel64/thread.c
index e998b06ac8..dfcfbcb983 100644
--- a/arch/x86/core/intel64/thread.c
+++ b/arch/x86/core/intel64/thread.c
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <offsets_short.h>
 #include <x86_mmu.h>
diff --git a/arch/x86/core/memmap.c b/arch/x86/core/memmap.c
index 4e3882ea16..3de35fe79f 100644
--- a/arch/x86/core/memmap.c
+++ b/arch/x86/core/memmap.c
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <arch/x86/memmap.h>
-#include <linker/linker-defs.h>
+#include <zephyr/arch/x86/memmap.h>
+#include <zephyr/linker/linker-defs.h>
 #include <kernel_arch_data.h>
 
 struct x86_memmap_exclusion x86_memmap_exclusions[] = {
diff --git a/arch/x86/core/multiboot.c b/arch/x86/core/multiboot.c
index 2df67e45d4..36d7f1f933 100644
--- a/arch/x86/core/multiboot.c
+++ b/arch/x86/core/multiboot.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <arch/x86/multiboot.h>
-#include <arch/x86/memmap.h>
+#include <zephyr/arch/x86/multiboot.h>
+#include <zephyr/arch/x86/memmap.h>
 
 struct multiboot_info multiboot_info;
 
@@ -133,7 +133,7 @@ void z_multiboot_init(struct multiboot_info *info_pa)
 
 #ifdef CONFIG_MULTIBOOT_FRAMEBUF
 
-#include <display/framebuf.h>
+#include <zephyr/display/framebuf.h>
 
 static struct framebuf_dev_data multiboot_framebuf_data = {
 	.width = CONFIG_MULTIBOOT_FRAMEBUF_X,
diff --git a/arch/x86/core/offsets/ia32_offsets.c b/arch/x86/core/offsets/ia32_offsets.c
index 3ac11219b7..060162853f 100644
--- a/arch/x86/core/offsets/ia32_offsets.c
+++ b/arch/x86/core/offsets/ia32_offsets.c
@@ -27,7 +27,7 @@
 #ifndef _X86_OFFSETS_INC_
 #define _X86_OFFSETS_INC_
 
-#include <arch/x86/mmustructs.h>
+#include <zephyr/arch/x86/mmustructs.h>
 
 #if defined(CONFIG_LAZY_FPU_SHARING)
 GEN_OFFSET_SYM(_thread_arch_t, excNestCount);
diff --git a/arch/x86/core/offsets/offsets.c b/arch/x86/core/offsets/offsets.c
index 0f52b23a55..53b432e74c 100644
--- a/arch/x86/core/offsets/offsets.c
+++ b/arch/x86/core/offsets/offsets.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_arch_data.h>
 #include <gen_offset.h>
 #include <kernel_offsets.h>
diff --git a/arch/x86/core/pcie.c b/arch/x86/core/pcie.c
index 5d7b9d2ed2..e59e730dc4 100644
--- a/arch/x86/core/pcie.c
+++ b/arch/x86/core/pcie.c
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys/device_mmio.h>
-#include <drivers/pcie/pcie.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/device_mmio.h>
+#include <zephyr/drivers/pcie/pcie.h>
 
 #ifdef CONFIG_ACPI
-#include <arch/x86/acpi.h>
+#include <zephyr/arch/x86/acpi.h>
 #endif
 
 #ifdef CONFIG_PCIE_MSI
 #include <kernel_arch_func.h>
-#include <device.h>
-#include <drivers/pcie/msi.h>
-#include <drivers/interrupt_controller/sysapic.h>
-#include <arch/x86/cpuid.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/pcie/msi.h>
+#include <zephyr/drivers/interrupt_controller/sysapic.h>
+#include <zephyr/arch/x86/cpuid.h>
 #endif
 
 /* PCI Express Extended Configuration Mechanism (MMIO) */
@@ -161,8 +161,8 @@ void pcie_conf_write(pcie_bdf_t bdf, unsigned int reg, uint32_t data)
 
 #ifdef CONFIG_INTEL_VTD_ICTL
 
-#include <drivers/interrupt_controller/intel_vtd.h>
-#include <arch/x86/acpi.h>
+#include <zephyr/drivers/interrupt_controller/intel_vtd.h>
+#include <zephyr/arch/x86/acpi.h>
 
 static const struct device *vtd = DEVICE_DT_GET_ONE(intel_vt_d);
 
diff --git a/arch/x86/core/prep_c.c b/arch/x86/core/prep_c.c
index 02a4b5119f..485cf55242 100644
--- a/arch/x86/core/prep_c.c
+++ b/arch/x86/core/prep_c.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
-#include <arch/x86/acpi.h>
-#include <arch/x86/multiboot.h>
-#include <arch/x86/efi.h>
+#include <zephyr/arch/x86/acpi.h>
+#include <zephyr/arch/x86/multiboot.h>
+#include <zephyr/arch/x86/efi.h>
 #include <x86_mmu.h>
 
 extern FUNC_NORETURN void z_cstart(void);
diff --git a/arch/x86/core/reboot_rst_cnt.c b/arch/x86/core/reboot_rst_cnt.c
index e6dc91ce22..630b9f4d50 100644
--- a/arch/x86/core/reboot_rst_cnt.c
+++ b/arch/x86/core/reboot_rst_cnt.c
@@ -10,8 +10,8 @@
  * @details Implements the required 'arch' sub-APIs.
  */
 
-#include <kernel.h>
-#include <sys/reboot.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/reboot.h>
 
 /* reboot through Reset Control Register (I/O port 0xcf9) */
 
diff --git a/arch/x86/core/spec_ctrl.c b/arch/x86/core/spec_ctrl.c
index 42cfcdac77..1d37d7e4ae 100644
--- a/arch/x86/core/spec_ctrl.c
+++ b/arch/x86/core/spec_ctrl.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
-#include <kernel_structs.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_arch_data.h>
 #include <kernel_arch_func.h>
-#include <arch/x86/msr.h>
-#include <arch/x86/cpuid.h>
-#include <kernel.h>
+#include <zephyr/arch/x86/msr.h>
+#include <zephyr/arch/x86/cpuid.h>
+#include <zephyr/kernel.h>
 
 /*
  * See:
diff --git a/arch/x86/core/tls.c b/arch/x86/core/tls.c
index 6e5afcf442..45e2c56b54 100644
--- a/arch/x86/core/tls.c
+++ b/arch/x86/core/tls.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <kernel_tls.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 size_t arch_tls_stack_setup(struct k_thread *new_thread, char *stack_ptr)
 {
diff --git a/arch/x86/core/userspace.c b/arch/x86/core/userspace.c
index 1b950ed295..d087674957 100644
--- a/arch/x86/core/userspace.c
+++ b/arch/x86/core/userspace.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys/speculation.h>
-#include <syscall_handler.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/speculation.h>
+#include <zephyr/syscall_handler.h>
 #include <kernel_arch_func.h>
 #include <ksched.h>
 #include <x86_mmu.h>
diff --git a/arch/x86/core/x86_mmu.c b/arch/x86/core/x86_mmu.c
index 4b9e570fea..8283ca32d8 100644
--- a/arch/x86/core/x86_mmu.c
+++ b/arch/x86/core/x86_mmu.c
@@ -5,23 +5,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <arch/x86/mmustructs.h>
-#include <sys/mem_manage.h>
-#include <sys/__assert.h>
-#include <sys/check.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/x86/mmustructs.h>
+#include <zephyr/sys/mem_manage.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/check.h>
+#include <zephyr/logging/log.h>
 #include <errno.h>
 #include <ctype.h>
-#include <spinlock.h>
+#include <zephyr/spinlock.h>
 #include <kernel_arch_func.h>
 #include <x86_mmu.h>
-#include <init.h>
+#include <zephyr/init.h>
 #include <kernel_internal.h>
 #include <mmu.h>
-#include <drivers/interrupt_controller/loapic.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h>
 #include <mmu.h>
-#include <arch/x86/memmap.h>
+#include <zephyr/arch/x86/memmap.h>
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
diff --git a/arch/x86/include/ia32/exception.h b/arch/x86/include/ia32/exception.h
index 7baa76e077..27119709c2 100644
--- a/arch/x86/include/ia32/exception.h
+++ b/arch/x86/include/ia32/exception.h
@@ -9,7 +9,7 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <toolchain/common.h>
+#include <zephyr/toolchain/common.h>
 
 #define _EXCEPTION_INTLIST(vector, dpl) \
 	".pushsection .gnu.linkonce.intList.exc_" #vector "\n\t" \
diff --git a/arch/x86/include/ia32/kernel_arch_data.h b/arch/x86/include/ia32/kernel_arch_data.h
index 449578588c..3f8c2732f9 100644
--- a/arch/x86/include/ia32/kernel_arch_data.h
+++ b/arch/x86/include/ia32/kernel_arch_data.h
@@ -26,15 +26,15 @@
 #ifndef ZEPHYR_ARCH_X86_INCLUDE_IA32_KERNEL_ARCH_DATA_H_
 #define ZEPHYR_ARCH_X86_INCLUDE_IA32_KERNEL_ARCH_DATA_H_
 
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <ia32/exception.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <sys/dlist.h>
+#include <zephyr/sys/dlist.h>
 #endif
 
 /* Some configurations require that the stack/registers be adjusted before
@@ -52,7 +52,7 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/x86/include/intel64/kernel_arch_data.h b/arch/x86/include/intel64/kernel_arch_data.h
index ff0618f9a3..6cbf18a831 100644
--- a/arch/x86/include/intel64/kernel_arch_data.h
+++ b/arch/x86/include/intel64/kernel_arch_data.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_ARCH_X86_INCLUDE_INTEL64_KERNEL_ARCH_DATA_H_
 #define ZEPHYR_ARCH_X86_INCLUDE_INTEL64_KERNEL_ARCH_DATA_H_
 
-#include <arch/x86/mmustructs.h>
+#include <zephyr/arch/x86/mmustructs.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/arch/x86/include/intel64/kernel_arch_func.h b/arch/x86/include/intel64/kernel_arch_func.h
index 0ed9d513b7..a749a9b9af 100644
--- a/arch/x86/include/intel64/kernel_arch_func.h
+++ b/arch/x86/include/intel64/kernel_arch_func.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_ARCH_X86_INCLUDE_INTEL64_KERNEL_ARCH_FUNC_H_
 #define ZEPHYR_ARCH_X86_INCLUDE_INTEL64_KERNEL_ARCH_FUNC_H_
 
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/arch/x86/include/kernel_arch_func.h b/arch/x86/include/kernel_arch_func.h
index 423ef4d61f..7c080b8e25 100644
--- a/arch/x86/include/kernel_arch_func.h
+++ b/arch/x86/include/kernel_arch_func.h
@@ -7,7 +7,7 @@
 #define ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_FUNC_H_
 
 #include <kernel_arch_data.h>
-#include <arch/x86/mmustructs.h>
+#include <zephyr/arch/x86/mmustructs.h>
 
 #ifdef CONFIG_X86_64
 #include <intel64/kernel_arch_func.h>
diff --git a/arch/x86/include/x86_mmu.h b/arch/x86/include/x86_mmu.h
index baa109cf76..14c5b053c6 100644
--- a/arch/x86/include/x86_mmu.h
+++ b/arch/x86/include/x86_mmu.h
@@ -12,9 +12,9 @@
 #ifndef ZEPHYR_ARCH_X86_INCLUDE_X86_MMU_H
 #define ZEPHYR_ARCH_X86_INCLUDE_X86_MMU_H
 
-#include <kernel.h>
-#include <arch/x86/mmustructs.h>
-#include <sys/mem_manage.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/x86/mmustructs.h>
+#include <zephyr/sys/mem_manage.h>
 
 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
 #define XD_SUPPORTED
diff --git a/arch/x86/timing.c b/arch/x86/timing.c
index a7d5e07e27..2e979ebabe 100644
--- a/arch/x86/timing.c
+++ b/arch/x86/timing.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/x86/arch.h>
-#include <kernel.h>
-#include <sys_clock.h>
-#include <timing/timing.h>
-#include <app_memory/app_memdomain.h>
+#include <zephyr/arch/x86/arch.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/timing/timing.h>
+#include <zephyr/app_memory/app_memdomain.h>
 
 K_APP_BMEM(z_libc_partition) static uint64_t tsc_freq;
 
diff --git a/arch/x86/zefi/efi.h b/arch/x86/zefi/efi.h
index 863728133c..3e28051787 100644
--- a/arch/x86/zefi/efi.h
+++ b/arch/x86/zefi/efi.h
@@ -10,7 +10,7 @@
 #ifndef _ASMLANGUAGE
 
 #include <stdbool.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define __abi __attribute__((ms_abi))
 
diff --git a/arch/x86/zefi/zefi.c b/arch/x86/zefi/zefi.c
index fd8059121b..0f81398f4a 100644
--- a/arch/x86/zefi/zefi.c
+++ b/arch/x86/zefi/zefi.c
@@ -9,7 +9,7 @@
 #include "efi.h"
 #include "printf.h"
 #include <zefi-segments.h>
-#include <arch/x86/efi.h>
+#include <zephyr/arch/x86/efi.h>
 
 #define PUTCHAR_BUFSZ 128
 
diff --git a/arch/xtensa/core/coredump.c b/arch/xtensa/core/coredump.c
index da33fbfec4..4c0213d769 100644
--- a/arch/xtensa/core/coredump.c
+++ b/arch/xtensa/core/coredump.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <debug/coredump.h>
+#include <zephyr/debug/coredump.h>
 #include <xtensa-asm2.h>
 
 #define ARCH_HDR_VER			1
diff --git a/arch/xtensa/core/cpu_idle.c b/arch/xtensa/core/cpu_idle.c
index 648ad1d8ab..81fb79c74a 100644
--- a/arch/xtensa/core/cpu_idle.c
+++ b/arch/xtensa/core/cpu_idle.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <tracing/tracing.h>
+#include <zephyr/tracing/tracing.h>
 
 void arch_cpu_idle(void)
 {
diff --git a/arch/xtensa/core/fatal.c b/arch/xtensa/core/fatal.c
index cc9e411fb4..656aae6a91 100644
--- a/arch/xtensa/core/fatal.c
+++ b/arch/xtensa/core/fatal.c
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/kernel_structs.h>
 #include <inttypes.h>
 #include <xtensa/config/specreg.h>
 #include <xtensa-asm2-context.h>
@@ -14,7 +14,7 @@
 #include <xtensa_backtrace.h>
 #endif
 #endif
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #ifdef XT_SIMULATOR
diff --git a/arch/xtensa/core/gdbstub.c b/arch/xtensa/core/gdbstub.c
index aa925f7407..8ebfa2e4ab 100644
--- a/arch/xtensa/core/gdbstub.c
+++ b/arch/xtensa/core/gdbstub.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
-#include <toolchain.h>
-#include <debug/gdbstub.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/debug/gdbstub.h>
 
 #include <xtensa-asm2-context.h>
 #include <xtensa/corebits.h>
diff --git a/arch/xtensa/core/irq_manage.c b/arch/xtensa/core/irq_manage.c
index 1e0db5a690..1c59273408 100644
--- a/arch/xtensa/core/irq_manage.c
+++ b/arch/xtensa/core/irq_manage.c
@@ -5,8 +5,8 @@
 
 #include <zephyr/types.h>
 #include <stdio.h>
-#include <arch/xtensa/irq.h>
-#include <sys/__assert.h>
+#include <zephyr/arch/xtensa/irq.h>
+#include <zephyr/sys/__assert.h>
 
 /**
  * @internal
diff --git a/arch/xtensa/core/irq_offload.c b/arch/xtensa/core/irq_offload.c
index 3b43e4c8d9..af89208d61 100644
--- a/arch/xtensa/core/irq_offload.c
+++ b/arch/xtensa/core/irq_offload.c
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <irq_offload.h>
+#include <zephyr/kernel.h>
+#include <zephyr/irq_offload.h>
 #include <zsr.h>
 
 #define CURR_CPU (IS_ENABLED(CONFIG_SMP) ? arch_curr_cpu()->id : 0)
diff --git a/arch/xtensa/core/tls.c b/arch/xtensa/core/tls.c
index 9f22cafad3..f55ad932b9 100644
--- a/arch/xtensa/core/tls.c
+++ b/arch/xtensa/core/tls.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <kernel_tls.h>
-#include <app_memory/app_memdomain.h>
-#include <sys/util.h>
+#include <zephyr/app_memory/app_memdomain.h>
+#include <zephyr/sys/util.h>
 
 #if XCHAL_HAVE_THREADPTR == 0
 #error SoC does not support THREADPTR for thread local storage.
diff --git a/arch/xtensa/core/xcc_stubs.c b/arch/xtensa/core/xcc_stubs.c
index 8dc0a3f4f2..2b52ce6ed0 100644
--- a/arch/xtensa/core/xcc_stubs.c
+++ b/arch/xtensa/core/xcc_stubs.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 __weak int atexit(void (*function)(void))
 {
diff --git a/arch/xtensa/core/xtensa-asm2.c b/arch/xtensa/core/xtensa-asm2.c
index d11657ebef..3e87d9518e 100644
--- a/arch/xtensa/core/xtensa-asm2.c
+++ b/arch/xtensa/core/xtensa-asm2.c
@@ -5,14 +5,14 @@
  */
 #include <string.h>
 #include <xtensa-asm2.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <kswap.h>
 #include <_soc_inthandlers.h>
-#include <toolchain.h>
-#include <logging/log.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
diff --git a/arch/xtensa/include/kernel_arch_func.h b/arch/xtensa/include/kernel_arch_func.h
index 2df42d4c91..a87508579e 100644
--- a/arch/xtensa/include/kernel_arch_func.h
+++ b/arch/xtensa/include/kernel_arch_func.h
@@ -13,7 +13,7 @@
 #ifndef _ASMLANGUAGE
 #include <kernel_internal.h>
 #include <string.h>
-#include <arch/xtensa/cache.h>
+#include <zephyr/arch/xtensa/cache.h>
 #include <zsr.h>
 
 #ifdef __cplusplus
diff --git a/arch/xtensa/include/xtensa-asm2.h b/arch/xtensa/include/xtensa-asm2.h
index 6b4d928a3d..25fbb2980a 100644
--- a/arch/xtensa/include/xtensa-asm2.h
+++ b/arch/xtensa/include/xtensa-asm2.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_H_
 #define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_H_
 
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include "xtensa-asm2-context.h"
 
 /**