diff --git a/soc/arc/snps_arc_hsdk/soc.c b/soc/arc/snps_arc_hsdk/soc.c
index 99fcd514693..3c0993bc7f0 100644
--- a/soc/arc/snps_arc_hsdk/soc.c
+++ b/soc/arc/snps_arc_hsdk/soc.c
@@ -8,8 +8,8 @@
  * This module provides routines to initialize and support soc-level hardware
  * for the HS Development Kit
  */
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include "soc.h"
 
 static int arc_hsdk_init(const struct device *dev)
diff --git a/soc/arc/snps_arc_hsdk/soc.h b/soc/arc/snps_arc_hsdk/soc.h
index 0e3d9105327..21fc93e72f1 100644
--- a/soc/arc/snps_arc_hsdk/soc.h
+++ b/soc/arc/snps_arc_hsdk/soc.h
@@ -14,7 +14,7 @@
 #ifndef _SOC_H_
 #define _SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 
 /* ARC HS Core IRQs */
@@ -25,8 +25,8 @@
 #ifndef _ASMLANGUAGE
 
 
-#include <sys/util.h>
-#include <random/rand32.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/random/rand32.h>
 
 /* PINMUX IO Hardware Functions */
 #define HSDK_PINMUX_FUNS		8
diff --git a/soc/arc/snps_arc_iot/soc.c b/soc/arc/snps_arc_iot/soc.c
index c9be0b8528e..9abaf8b3d97 100644
--- a/soc/arc/snps_arc_iot/soc.c
+++ b/soc/arc/snps_arc_iot/soc.c
@@ -9,8 +9,8 @@
  * for the IoT Development Kit board.
  *
  */
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include "sysconf.h"
 
 #define CPU_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
diff --git a/soc/arc/snps_arc_iot/soc.h b/soc/arc/snps_arc_iot/soc.h
index 4d742a598e1..4c34cd214d0 100644
--- a/soc/arc/snps_arc_iot/soc.h
+++ b/soc/arc/snps_arc_iot/soc.h
@@ -14,7 +14,7 @@
 #ifndef _SOC_H_
 #define _SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 /* default system clock */
 #define SYSCLK_DEFAULT_IOSC_HZ			MHZ(16)
@@ -36,8 +36,8 @@
 #ifndef _ASMLANGUAGE
 
 
-#include <sys/util.h>
-#include <random/rand32.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/random/rand32.h>
 
 
 #endif /* !_ASMLANGUAGE */
diff --git a/soc/arc/snps_emsdp/soc.h b/soc/arc/snps_emsdp/soc.h
index 6eecfb88650..07ba548549e 100644
--- a/soc/arc/snps_emsdp/soc.h
+++ b/soc/arc/snps_emsdp/soc.h
@@ -14,7 +14,7 @@
 #ifndef _SOC_H_
 #define _SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 /* default system clock */
 #define SYSCLK_DEFAULT_IOSC_HZ			MHZ(100)
@@ -26,8 +26,8 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <sys/util.h>
-#include <random/rand32.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/random/rand32.h>
 
 #endif /* !_ASMLANGUAGE */
 
diff --git a/soc/arc/snps_emsk/soc.h b/soc/arc/snps_emsk/soc.h
index 9249d617a5e..e7c689d9cec 100644
--- a/soc/arc/snps_emsk/soc.h
+++ b/soc/arc/snps_emsk/soc.h
@@ -14,7 +14,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 /* default system clock */
 /* On the EM Starter Kit board, the peripheral bus clock frequency is 50Mhz */
@@ -39,8 +39,8 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <sys/util.h>
-#include <random/rand32.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/random/rand32.h>
 
 #define INT_ENABLE_ARC				~(0x00000001 << 8)
 #define INT_ENABLE_ARC_BIT_POS			(8)
diff --git a/soc/arc/snps_emsk/soc_config.c b/soc/arc/snps_emsk/soc_config.c
index e0812430c5d..ccfbdd632b3 100644
--- a/soc/arc/snps_emsk/soc_config.c
+++ b/soc/arc/snps_emsk/soc_config.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include "soc.h"
 
 
diff --git a/soc/arc/snps_nsim/soc.c b/soc/arc/snps_nsim/soc.c
index e93668c7797..6bed1876a9b 100644
--- a/soc/arc/snps_nsim/soc.c
+++ b/soc/arc/snps_nsim/soc.c
@@ -12,8 +12,8 @@
  *
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include "soc.h"
 
 #ifdef CONFIG_SMP
diff --git a/soc/arc/snps_nsim/soc.h b/soc/arc/snps_nsim/soc.h
index cf1db4748cb..7feee645ef2 100644
--- a/soc/arc/snps_nsim/soc.h
+++ b/soc/arc/snps_nsim/soc.h
@@ -14,7 +14,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 /* ARC EM Core IRQs */
 #define IRQ_TIMER0				16
@@ -24,8 +24,8 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <sys/util.h>
-#include <random/rand32.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/random/rand32.h>
 
 #define INT_ENABLE_ARC				~(0x00000001 << 8)
 #define INT_ENABLE_ARC_BIT_POS			(8)
diff --git a/soc/arc/snps_nsim/soc_config.c b/soc/arc/snps_nsim/soc_config.c
index 504112385bb..f9a9da16f1d 100644
--- a/soc/arc/snps_nsim/soc_config.c
+++ b/soc/arc/snps_nsim/soc_config.c
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include "soc.h"
\ No newline at end of file
diff --git a/soc/arm/arm/beetle/power.c b/soc/arm/arm/beetle/power.c
index a845dcf5588..4377d79d3f0 100644
--- a/soc/arm/arm/beetle/power.c
+++ b/soc/arm/arm/beetle/power.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
-#include <pm/pm.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
 #include <soc_power.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
 #define CLK_BIT_GPIO0	_BEETLE_GPIO0
diff --git a/soc/arm/arm/beetle/soc.c b/soc/arm/arm/beetle/soc.c
index 678992c5180..c8eb66487d2 100644
--- a/soc/arm/arm/beetle/soc.c
+++ b/soc/arm/arm/beetle/soc.c
@@ -12,12 +12,12 @@
  * for the ARM LTD Beetle SoC.
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm/arm/beetle/soc.h b/soc/arm/arm/beetle/soc.h
index 647bedc3332..d14583808f1 100644
--- a/soc/arm/arm/beetle/soc.h
+++ b/soc/arm/arm/beetle/soc.h
@@ -12,7 +12,7 @@
 #ifndef _ARM_BEETLE_SOC_H_
 #define _ARM_BEETLE_SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 #include "CMSDK_BEETLE.h"
diff --git a/soc/arm/arm/designstart/soc.c b/soc/arm/arm/designstart/soc.c
index bf195add710..a6755f0f158 100644
--- a/soc/arm/arm/designstart/soc.c
+++ b/soc/arm/arm/designstart/soc.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 
 static int arm_designstart_init(const struct device *arg)
 {
diff --git a/soc/arm/arm/mps2/soc.c b/soc/arm/arm/mps2/soc.c
index 6e4f8176db4..3ef50584f87 100644
--- a/soc/arm/arm/mps2/soc.c
+++ b/soc/arm/arm/mps2/soc.c
@@ -7,11 +7,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/cpu.h>
-#include <drivers/gpio/gpio_mmio32.h>
-#include <init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/gpio/gpio_mmio32.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 
 
 /* Setup GPIO drivers for accessing FPGAIO registers */
diff --git a/soc/arm/arm/mps2/soc_registers.h b/soc/arm/arm/mps2/soc_registers.h
index 6bd11e185ce..25853c42d32 100644
--- a/soc/arm/arm/mps2/soc_registers.h
+++ b/soc/arm/arm/mps2/soc_registers.h
@@ -12,7 +12,7 @@
 #ifndef _ARM_MPS2_REGS_H_
 #define _ARM_MPS2_REGS_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/types.h>
 
 /* Registers in the FPGA system control block */
diff --git a/soc/arm/arm/mps3/soc.c b/soc/arm/arm/mps3/soc.c
index fd380a8a16b..48191d87830 100644
--- a/soc/arm/arm/mps3/soc.c
+++ b/soc/arm/arm/mps3/soc.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/cpu.h>
-#include <drivers/gpio/gpio_mmio32.h>
-#include <init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/gpio/gpio_mmio32.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 
 
 /* Setup GPIO drivers for accessing FPGAIO registers */
diff --git a/soc/arm/arm/musca_b1/soc.c b/soc/arm/arm/musca_b1/soc.c
index ee447c015b7..e1e1ab8cb21 100644
--- a/soc/arm/arm/musca_b1/soc.c
+++ b/soc/arm/arm/musca_b1/soc.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/cpu.h>
-#include <init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 
 /* (Secure System Control) Base Address */
 #define SSE_200_SYSTEM_CTRL_S_BASE	(0x50021000UL)
diff --git a/soc/arm/arm/musca_b1/soc.h b/soc/arm/arm/musca_b1/soc.h
index 672c4852bc1..e7a3156d08c 100644
--- a/soc/arm/arm/musca_b1/soc.h
+++ b/soc/arm/arm/musca_b1/soc.h
@@ -9,7 +9,7 @@
 
 #ifndef _ASMLANGUAGE
 #include "system_cmsdk_musca_b1.h"
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #endif
 
 extern void wakeup_cpu1(void);
diff --git a/soc/arm/arm/musca_s1/soc.c b/soc/arm/arm/musca_s1/soc.c
index 43534076503..2fdf43f25b0 100644
--- a/soc/arm/arm/musca_s1/soc.c
+++ b/soc/arm/arm/musca_s1/soc.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/cpu.h>
-#include <init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 /**
diff --git a/soc/arm/arm/musca_s1/soc.h b/soc/arm/arm/musca_s1/soc.h
index a7934afd1f9..ac9b90c54de 100644
--- a/soc/arm/arm/musca_s1/soc.h
+++ b/soc/arm/arm/musca_s1/soc.h
@@ -9,7 +9,7 @@
 
 #ifndef _ASMLANGUAGE
 #include "system_cmsdk_musca_s1.h"
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #endif
 
 #endif /* _SOC_H_ */
diff --git a/soc/arm/aspeed/aspeed_util.h b/soc/arm/aspeed/aspeed_util.h
index c2fe31252a8..ba1754e611b 100644
--- a/soc/arm/aspeed/aspeed_util.h
+++ b/soc/arm/aspeed/aspeed_util.h
@@ -5,9 +5,9 @@
  */
 #ifndef ZEPHYR_SOC_ARM_ASPEED_UTIL_H_
 #define ZEPHYR_SOC_ARM_ASPEED_UTIL_H_
-#include <sys/util.h>
-#include <devicetree.h>
-#include <toolchain/gcc.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/toolchain/gcc.h>
 
 /* gcc.h doesn't define __section but checkpatch.pl will complain for this. so
  * temporarily add a macro here.
diff --git a/soc/arm/aspeed/ast10x0/soc.c b/soc/arm/aspeed/ast10x0/soc.c
index 4d7fc4153ca..6ccd5a38c1c 100644
--- a/soc/arm/aspeed/ast10x0/soc.c
+++ b/soc/arm/aspeed/ast10x0/soc.c
@@ -4,13 +4,13 @@
  * Copyright (c) 2021 ASPEED Technology Inc.
  */
 
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <stdint.h>
 #include <string.h>
-#include <linker/linker-defs.h>
-#include <device.h>
-#include <cache.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/device.h>
+#include <zephyr/cache.h>
 #include <soc.h>
 
 extern char __bss_nc_start__[];
diff --git a/soc/arm/atmel_sam/common/atmel_sam_dt.h b/soc/arm/atmel_sam/common/atmel_sam_dt.h
index 481aab963b1..6e8c67c19d3 100644
--- a/soc/arm/atmel_sam/common/atmel_sam_dt.h
+++ b/soc/arm/atmel_sam/common/atmel_sam_dt.h
@@ -11,7 +11,7 @@
 #ifndef _ATMEL_SAM_DT_H_
 #define _ATMEL_SAM_DT_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 /* Devicetree macros related to clock */
 
diff --git a/soc/arm/atmel_sam/common/pinctrl_soc.h b/soc/arm/atmel_sam/common/pinctrl_soc.h
index f8e6216878a..16cfb47275f 100644
--- a/soc/arm/atmel_sam/common/pinctrl_soc.h
+++ b/soc/arm/atmel_sam/common/pinctrl_soc.h
@@ -12,6 +12,6 @@
 #ifndef ZEPHYR_SOC_ARM_ATMEL_SAM_COMMON_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_ATMEL_SAM_COMMON_PINCTRL_SOC_H_
 
-#include <drivers/pinctrl/pinctrl_soc_sam_common.h>
+#include <zephyr/drivers/pinctrl/pinctrl_soc_sam_common.h>
 
 #endif /* ZEPHYR_SOC_ARM_ATMEL_SAM_COMMON_PINCTRL_SOC_H_ */
diff --git a/soc/arm/atmel_sam/common/soc_gpio.c b/soc/arm/atmel_sam/common/soc_gpio.c
index 13c54a897b4..c7690f78487 100644
--- a/soc/arm/atmel_sam/common/soc_gpio.c
+++ b/soc/arm/atmel_sam/common/soc_gpio.c
@@ -8,7 +8,7 @@
  * module HAL driver.
  */
 
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 #include "soc_gpio.h"
 
 /*
diff --git a/soc/arm/atmel_sam/common/soc_pmc.c b/soc/arm/atmel_sam/common/soc_pmc.c
index ead5fa43ed3..86203acd86d 100644
--- a/soc/arm/atmel_sam/common/soc_pmc.c
+++ b/soc/arm/atmel_sam/common/soc_pmc.c
@@ -9,8 +9,8 @@
  */
 
 #include <soc.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
 
 #if ID_PERIPH_COUNT > 74
 #error "Unsupported SoC, update soc_pmc.c functions"
diff --git a/soc/arm/atmel_sam/common/soc_sam4l_gpio.c b/soc/arm/atmel_sam/common/soc_sam4l_gpio.c
index 18d468e7039..e9d358e455d 100644
--- a/soc/arm/atmel_sam/common/soc_sam4l_gpio.c
+++ b/soc/arm/atmel_sam/common/soc_sam4l_gpio.c
@@ -8,7 +8,7 @@
  * module HAL driver.
  */
 
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 #include "soc_gpio.h"
 
 static void configure_common_attr(volatile Gpio *gpio,
diff --git a/soc/arm/atmel_sam/common/soc_sam4l_pm.c b/soc/arm/atmel_sam/common/soc_sam4l_pm.c
index aa9787a3b4d..5599eab2b38 100644
--- a/soc/arm/atmel_sam/common/soc_sam4l_pm.c
+++ b/soc/arm/atmel_sam/common/soc_sam4l_pm.c
@@ -9,8 +9,8 @@
  */
 
 #include <soc.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
 
 /**
  * SAM4L define peripheral-ids out of order.  This maps peripheral-id group
diff --git a/soc/arm/atmel_sam/sam3x/soc.c b/soc/arm/atmel_sam/sam3x/soc.c
index e0db6f90191..13e72fccd4b 100644
--- a/soc/arm/atmel_sam/sam3x/soc.c
+++ b/soc/arm/atmel_sam/sam3x/soc.c
@@ -13,12 +13,12 @@
  * for the Atmel SAM3X series processor.
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#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>
 
 /*
  * PLL clock = Main * (MULA + 1) / DIVA
diff --git a/soc/arm/atmel_sam/sam4e/soc.c b/soc/arm/atmel_sam/sam4e/soc.c
index 3e768ff2c41..dc75e9c7aa3 100644
--- a/soc/arm/atmel_sam/sam4e/soc.c
+++ b/soc/arm/atmel_sam/sam4e/soc.c
@@ -15,11 +15,11 @@
  * for the Atmel SAM4E series processor.
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#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>
 
 /**
  * @brief Setup various clock on SoC at boot time.
diff --git a/soc/arm/atmel_sam/sam4e/soc.h b/soc/arm/atmel_sam/sam4e/soc.h
index 245cd05b7db..523c5487748 100644
--- a/soc/arm/atmel_sam/sam4e/soc.h
+++ b/soc/arm/atmel_sam/sam4e/soc.h
@@ -15,7 +15,7 @@
 #ifndef _ATMEL_SAM4E_SOC_H_
 #define _ATMEL_SAM4E_SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/atmel_sam/sam4l/soc.c b/soc/arm/atmel_sam/sam4l/soc.c
index b06d7e0e41e..43cb449e951 100644
--- a/soc/arm/atmel_sam/sam4l/soc.c
+++ b/soc/arm/atmel_sam/sam4l/soc.c
@@ -11,10 +11,10 @@
  * for the Atmel SAM4L series processor.
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 /** Watchdog control register first write keys */
 #define WDT_FIRST_KEY     0x55ul
diff --git a/soc/arm/atmel_sam/sam4s/soc.c b/soc/arm/atmel_sam/sam4s/soc.c
index 06989b67910..3bb1e6194de 100644
--- a/soc/arm/atmel_sam/sam4s/soc.c
+++ b/soc/arm/atmel_sam/sam4s/soc.c
@@ -14,11 +14,11 @@
  * for the Atmel SAM4S series processor.
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#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>
 
 /**
  * @brief Setup various clock on SoC at boot time.
diff --git a/soc/arm/atmel_sam/sam4s/soc.h b/soc/arm/atmel_sam/sam4s/soc.h
index e7c55616539..a0ad721ef34 100644
--- a/soc/arm/atmel_sam/sam4s/soc.h
+++ b/soc/arm/atmel_sam/sam4s/soc.h
@@ -15,7 +15,7 @@
 #ifndef _ATMEL_SAM4S_SOC_H_
 #define _ATMEL_SAM4S_SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/atmel_sam/same70/soc.c b/soc/arm/atmel_sam/same70/soc.c
index 77a7fe0cf30..2cefd1162bf 100644
--- a/soc/arm/atmel_sam/same70/soc.c
+++ b/soc/arm/atmel_sam/same70/soc.c
@@ -10,12 +10,12 @@
  * for the Atmel SAM E70 MCU.
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <logging/log.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
diff --git a/soc/arm/atmel_sam/same70/soc.h b/soc/arm/atmel_sam/same70/soc.h
index 41078384df3..1f9ba4d2892 100644
--- a/soc/arm/atmel_sam/same70/soc.h
+++ b/soc/arm/atmel_sam/same70/soc.h
@@ -13,7 +13,7 @@
 #ifndef _ATMEL_SAME70_SOC_H_
 #define _ATMEL_SAME70_SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/atmel_sam/same70/soc_config.c b/soc/arm/atmel_sam/same70/soc_config.c
index 0209f76b96d..9c29038976f 100644
--- a/soc/arm/atmel_sam/same70/soc_config.c
+++ b/soc/arm/atmel_sam/same70/soc_config.c
@@ -7,10 +7,10 @@
  * @brief System module to support early Atmel SAM E70 MCU configuration
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 /**
  * @brief Perform SoC configuration at boot.
diff --git a/soc/arm/atmel_sam/samv71/soc.c b/soc/arm/atmel_sam/samv71/soc.c
index 29334846ccc..2cbad876406 100644
--- a/soc/arm/atmel_sam/samv71/soc.c
+++ b/soc/arm/atmel_sam/samv71/soc.c
@@ -11,12 +11,12 @@
  * for the Atmel SAM V71 MCU.
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <logging/log.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
diff --git a/soc/arm/atmel_sam/samv71/soc.h b/soc/arm/atmel_sam/samv71/soc.h
index 64e41ffa6d6..0e5a3548d60 100644
--- a/soc/arm/atmel_sam/samv71/soc.h
+++ b/soc/arm/atmel_sam/samv71/soc.h
@@ -14,7 +14,7 @@
 #ifndef _ATMEL_SAMV71_SOC_H_
 #define _ATMEL_SAMV71_SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/atmel_sam/samv71/soc_config.c b/soc/arm/atmel_sam/samv71/soc_config.c
index 13e30a7cb15..f594016277b 100644
--- a/soc/arm/atmel_sam/samv71/soc_config.c
+++ b/soc/arm/atmel_sam/samv71/soc_config.c
@@ -8,10 +8,10 @@
  * @brief System module to support early Atmel SAM V71 MCU configuration
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 /**
  * @brief Perform SoC configuration at boot.
diff --git a/soc/arm/atmel_sam0/common/bossa.c b/soc/arm/atmel_sam0/common/bossa.c
index 8c36f6f9b69..13e9dadcd3a 100644
--- a/soc/arm/atmel_sam0/common/bossa.c
+++ b/soc/arm/atmel_sam0/common/bossa.c
@@ -5,9 +5,9 @@
  */
 
 #include <soc.h>
-#include <drivers/uart/cdc_acm.h>
-#include <drivers/usb/usb_dc.h>
-#include <usb/class/usb_cdc.h>
+#include <zephyr/drivers/uart/cdc_acm.h>
+#include <zephyr/drivers/usb/usb_dc.h>
+#include <zephyr/usb/class/usb_cdc.h>
 
 /*
  * Magic value that causes the bootloader to stay in bootloader mode instead of
diff --git a/soc/arm/atmel_sam0/common/pinctrl_soc.h b/soc/arm/atmel_sam0/common/pinctrl_soc.h
index f8e6216878a..16cfb47275f 100644
--- a/soc/arm/atmel_sam0/common/pinctrl_soc.h
+++ b/soc/arm/atmel_sam0/common/pinctrl_soc.h
@@ -12,6 +12,6 @@
 #ifndef ZEPHYR_SOC_ARM_ATMEL_SAM_COMMON_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_ATMEL_SAM_COMMON_PINCTRL_SOC_H_
 
-#include <drivers/pinctrl/pinctrl_soc_sam_common.h>
+#include <zephyr/drivers/pinctrl/pinctrl_soc_sam_common.h>
 
 #endif /* ZEPHYR_SOC_ARM_ATMEL_SAM_COMMON_PINCTRL_SOC_H_ */
diff --git a/soc/arm/atmel_sam0/common/soc_samd2x.c b/soc/arm/atmel_sam0/common/soc_samd2x.c
index c2fdca75565..6e719fe959b 100644
--- a/soc/arm/atmel_sam0/common/soc_samd2x.c
+++ b/soc/arm/atmel_sam0/common/soc_samd2x.c
@@ -9,11 +9,11 @@
  * @brief Atmel SAMD MCU series initialization code
  */
 
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 
 static void flash_waitstates_init(void)
diff --git a/soc/arm/atmel_sam0/common/soc_samd5x.c b/soc/arm/atmel_sam0/common/soc_samd5x.c
index af9de31913e..5b7abfadb04 100644
--- a/soc/arm/atmel_sam0/common/soc_samd5x.c
+++ b/soc/arm/atmel_sam0/common/soc_samd5x.c
@@ -9,10 +9,10 @@
  * @brief Atmel SAMD MCU series initialization code
  */
 
-#include <arch/cpu.h>
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 
 #define SAM0_DFLL_FREQ_HZ		(48000000U)
diff --git a/soc/arm/bcm_vk/valkyrie/soc.c b/soc/arm/bcm_vk/valkyrie/soc.c
index 0d48d681d87..7b65ad96bb5 100644
--- a/soc/arm/bcm_vk/valkyrie/soc.c
+++ b/soc/arm/bcm_vk/valkyrie/soc.c
@@ -3,10 +3,10 @@
  * Copyright 2018 Broadcom.
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm/bcm_vk/valkyrie/soc.h b/soc/arm/bcm_vk/valkyrie/soc.h
index 1a076a225ff..26863fbfea0 100644
--- a/soc/arm/bcm_vk/valkyrie/soc.h
+++ b/soc/arm/bcm_vk/valkyrie/soc.h
@@ -6,8 +6,8 @@
 #ifndef SOC_H
 #define SOC_H
 
-#include <sys/util.h>
-#include <toolchain.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/toolchain.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/bcm_vk/viper/soc.c b/soc/arm/bcm_vk/viper/soc.c
index ce57fd33d66..cc76d311f1f 100644
--- a/soc/arm/bcm_vk/viper/soc.c
+++ b/soc/arm/bcm_vk/viper/soc.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm/bcm_vk/viper/soc.h b/soc/arm/bcm_vk/viper/soc.h
index 8339e903f74..6695e92ef5c 100644
--- a/soc/arm/bcm_vk/viper/soc.h
+++ b/soc/arm/bcm_vk/viper/soc.h
@@ -7,8 +7,8 @@
 #ifndef SOC_H
 #define SOC_H
 
-#include <sys/util.h>
-#include <toolchain.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/toolchain.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h b/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h
index 7c1baffcdfd..c16d1f4d782 100644
--- a/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h
+++ b/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h
@@ -6,7 +6,7 @@
 #ifndef _ARM_CORTEX_M_MPU_MEM_CFG_H_
 #define _ARM_CORTEX_M_MPU_MEM_CFG_H_
 
-#include <arch/arm/aarch32/mpu/arm_mpu.h>
+#include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h>
 
 #if !defined(CONFIG_ARMV8_M_BASELINE) && !defined(CONFIG_ARMV8_M_MAINLINE)
 
diff --git a/soc/arm/common/cortex_m/arm_mpu_regions.c b/soc/arm/common/cortex_m/arm_mpu_regions.c
index 15e6fd7c5ba..477dc30566c 100644
--- a/soc/arm/common/cortex_m/arm_mpu_regions.c
+++ b/soc/arm/common/cortex_m/arm_mpu_regions.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/slist.h>
-#include <arch/arm/aarch32/mpu/arm_mpu.h>
-#include <linker/devicetree_regions.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h>
+#include <zephyr/linker/devicetree_regions.h>
 
 #include "arm_mpu_mem_cfg.h"
 
diff --git a/soc/arm/cypress/common/cypress_psoc6_dt.h b/soc/arm/cypress/common/cypress_psoc6_dt.h
index 3b4c837d4be..1d454ecfb5f 100644
--- a/soc/arm/cypress/common/cypress_psoc6_dt.h
+++ b/soc/arm/cypress/common/cypress_psoc6_dt.h
@@ -12,7 +12,7 @@
 #ifndef _CYPRESS_PSOC6_DT_H_
 #define _CYPRESS_PSOC6_DT_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 /*
  * Devicetree macros related to interrupt
diff --git a/soc/arm/cypress/psoc6/soc.c b/soc/arm/cypress/psoc6/soc.c
index acd7b2ea9e4..78c5255e74d 100644
--- a/soc/arm/cypress/psoc6/soc.c
+++ b/soc/arm/cypress/psoc6/soc.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 #include "cy_syslib.h"
 #include "cy_gpio.h"
diff --git a/soc/arm/cypress/psoc6/soc.h b/soc/arm/cypress/psoc6/soc.h
index c332d30c528..2fdbb94b401 100644
--- a/soc/arm/cypress/psoc6/soc.h
+++ b/soc/arm/cypress/psoc6/soc.h
@@ -15,7 +15,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/gigadevice/common/pinctrl_soc.h b/soc/arm/gigadevice/common/pinctrl_soc.h
index e552ae4d3f5..608dd00e95e 100644
--- a/soc/arm/gigadevice/common/pinctrl_soc.h
+++ b/soc/arm/gigadevice/common/pinctrl_soc.h
@@ -12,6 +12,6 @@
 #ifndef ZEPHYR_SOC_ARM_GIGADEVICE_COMMON_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_GIGADEVICE_COMMON_PINCTRL_SOC_H_
 
-#include <drivers/pinctrl/pinctrl_soc_gd32_common.h>
+#include <zephyr/drivers/pinctrl/pinctrl_soc_gd32_common.h>
 
 #endif /* ZEPHYR_SOC_ARM_GIGADEVICE_COMMON_PINCTRL_SOC_H_ */
diff --git a/soc/arm/gigadevice/gd32e10x/soc.c b/soc/arm/gigadevice/gd32e10x/soc.c
index 80cf3bada58..51e4dc35b59 100644
--- a/soc/arm/gigadevice/gd32e10x/soc.c
+++ b/soc/arm/gigadevice/gd32e10x/soc.c
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 static int gd32e10x_soc_init(const struct device *dev)
diff --git a/soc/arm/gigadevice/gd32f3x0/soc.c b/soc/arm/gigadevice/gd32f3x0/soc.c
index cbb59de3f7b..dcbeaded4f0 100644
--- a/soc/arm/gigadevice/gd32f3x0/soc.c
+++ b/soc/arm/gigadevice/gd32f3x0/soc.c
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 static int gd32f3x0_init(const struct device *dev)
diff --git a/soc/arm/gigadevice/gd32f403/soc.c b/soc/arm/gigadevice/gd32f403/soc.c
index 09eaaaefbd3..9b5e6679914 100644
--- a/soc/arm/gigadevice/gd32f403/soc.c
+++ b/soc/arm/gigadevice/gd32f403/soc.c
@@ -11,8 +11,8 @@
  * hardware for the GigaDevice GD32 SoC.
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm/gigadevice/gd32f403/soc.h b/soc/arm/gigadevice/gd32f403/soc.h
index 3ba8bb84ec4..f2e74a04f10 100644
--- a/soc/arm/gigadevice/gd32f403/soc.h
+++ b/soc/arm/gigadevice/gd32f403/soc.h
@@ -10,7 +10,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 #include <gd32f403.h>
diff --git a/soc/arm/gigadevice/gd32f4xx/soc.c b/soc/arm/gigadevice/gd32f4xx/soc.c
index a7824b052fc..394c7923946 100644
--- a/soc/arm/gigadevice/gd32f4xx/soc.c
+++ b/soc/arm/gigadevice/gd32f4xx/soc.c
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
 static int gd32f4xx_soc_init(const struct device *dev)
 {
diff --git a/soc/arm/infineon_xmc/4xxx/soc.c b/soc/arm/infineon_xmc/4xxx/soc.c
index 276c1e6ddb4..0789993904b 100644
--- a/soc/arm/infineon_xmc/4xxx/soc.c
+++ b/soc/arm/infineon_xmc/4xxx/soc.c
@@ -6,8 +6,8 @@
  *
  */
 
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 #define PMU_FLASH_WS		(0x3U)
diff --git a/soc/arm/microchip_mec/common/pinctrl_soc.h b/soc/arm/microchip_mec/common/pinctrl_soc.h
index 23c55a4f535..6e832e336ad 100644
--- a/soc/arm/microchip_mec/common/pinctrl_soc.h
+++ b/soc/arm/microchip_mec/common/pinctrl_soc.h
@@ -14,10 +14,10 @@
 #ifndef ZEPHYR_SOC_ARM_MICROCHIP_XEC_COMMON_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_MICROCHIP_XEC_COMMON_PINCTRL_SOC_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 
-#include <dt-bindings/pinctrl/mchp-xec-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/mchp-xec-pinctrl.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/arm/microchip_mec/common/soc_espi_saf.h b/soc/arm/microchip_mec/common/soc_espi_saf.h
index e0776b0e7fc..d1a3a31d539 100644
--- a/soc/arm/microchip_mec/common/soc_espi_saf.h
+++ b/soc/arm/microchip_mec/common/soc_espi_saf.h
@@ -12,7 +12,7 @@
 #define _SOC_ESPI_SAF_H_
 
 #include <stdint.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <soc.h>
 
 #define MCHP_SAF_MAX_FLASH_DEVICES 2U
diff --git a/soc/arm/microchip_mec/common/soc_i2c.c b/soc/arm/microchip_mec/common/soc_i2c.c
index eac47fe66b3..e3e42977d45 100644
--- a/soc/arm/microchip_mec/common/soc_i2c.c
+++ b/soc/arm/microchip_mec/common/soc_i2c.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/sys_io.h>
-#include <sys/__assert.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/sys/__assert.h>
 #include <soc.h>
 #include "soc_i2c.h"
 
diff --git a/soc/arm/microchip_mec/mec1501/device_power.c b/soc/arm/microchip_mec/mec1501/device_power.c
index 37df97c65f3..e5fde152ade 100644
--- a/soc/arm/microchip_mec/mec1501/device_power.c
+++ b/soc/arm/microchip_mec/mec1501/device_power.c
@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/sys_io.h>
-#include <sys/__assert.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
 
 /*
diff --git a/soc/arm/microchip_mec/mec1501/power.c b/soc/arm/microchip_mec/mec1501/power.c
index 811a22b7a61..f4a5642555c 100644
--- a/soc/arm/microchip_mec/mec1501/power.c
+++ b/soc/arm/microchip_mec/mec1501/power.c
@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/sys_io.h>
-#include <sys/__assert.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
 #include "device_power.h"
 
diff --git a/soc/arm/microchip_mec/mec1501/soc.c b/soc/arm/microchip_mec/mec1501/soc.c
index 5907fef3f3b..f4382b1a647 100644
--- a/soc/arm/microchip_mec/mec1501/soc.c
+++ b/soc/arm/microchip_mec/mec1501/soc.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 /* MEC devices IDs with special PLL handling */
 #define MCHP_GCFG_DID_DEV_ID_MEC150x    0x0020U
diff --git a/soc/arm/microchip_mec/mec1501/timing.c b/soc/arm/microchip_mec/mec1501/timing.c
index 5ce28925504..016cfa249f4 100644
--- a/soc/arm/microchip_mec/mec1501/timing.c
+++ b/soc/arm/microchip_mec/mec1501/timing.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/arm/aarch32/arch.h>
-#include <kernel.h>
-#include <sys_clock.h>
-#include <timing/timing.h>
+#include <zephyr/arch/arm/aarch32/arch.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/timing/timing.h>
 #include <soc.h>
 
 void soc_timing_init(void)
diff --git a/soc/arm/microchip_mec/mec1701/soc.c b/soc/arm/microchip_mec/mec1701/soc.c
index 27ca1860ede..ef84c10e43d 100644
--- a/soc/arm/microchip_mec/mec1701/soc.c
+++ b/soc/arm/microchip_mec/mec1701/soc.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 
 static int soc_init(const struct device *dev)
diff --git a/soc/arm/microchip_mec/mec172x/reg/mec172x_ecia.h b/soc/arm/microchip_mec/mec172x/reg/mec172x_ecia.h
index 3ceb34bf5a3..1c12fb746d3 100644
--- a/soc/arm/microchip_mec/mec172x/reg/mec172x_ecia.h
+++ b/soc/arm/microchip_mec/mec172x/reg/mec172x_ecia.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #define ECIA_BASE_ADDR			DT_REG_ADDR(DT_NODELABEL(ecia))
 
diff --git a/soc/arm/microchip_mec/mec172x/soc.c b/soc/arm/microchip_mec/mec172x/soc.c
index dd1119a72fe..9bc891e6b8e 100644
--- a/soc/arm/microchip_mec/mec172x/soc.c
+++ b/soc/arm/microchip_mec/mec172x/soc.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/__assert.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 static int soc_init(const struct device *dev)
 {
diff --git a/soc/arm/microchip_mec/mec172x/soc.h b/soc/arm/microchip_mec/mec172x/soc.h
index 1ee8a991d15..907ba7a0773 100644
--- a/soc/arm/microchip_mec/mec172x/soc.h
+++ b/soc/arm/microchip_mec/mec172x/soc.h
@@ -242,7 +242,7 @@ typedef enum {
 	MAX_IRQn
 } IRQn_Type;
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 /* chip specific register defines */
 #include "reg/mec172x_defs.h"
diff --git a/soc/arm/microchip_mec/mec172x/timing.c b/soc/arm/microchip_mec/mec172x/timing.c
index 22f4afefcfd..c415e3223d5 100644
--- a/soc/arm/microchip_mec/mec172x/timing.c
+++ b/soc/arm/microchip_mec/mec172x/timing.c
@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/arm/aarch32/arch.h>
-#include <kernel.h>
-#include <sys_clock.h>
-#include <timing/timing.h>
+#include <zephyr/arch/arm/aarch32/arch.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/timing/timing.h>
 #include <soc.h>
 
 /*
diff --git a/soc/arm/nordic_nrf/common/pinctrl_soc.h b/soc/arm/nordic_nrf/common/pinctrl_soc.h
index 4d4c00c01ae..cffd45310ac 100644
--- a/soc/arm/nordic_nrf/common/pinctrl_soc.h
+++ b/soc/arm/nordic_nrf/common/pinctrl_soc.h
@@ -12,8 +12,8 @@
 #ifndef ZEPHYR_SOC_ARM_NORDIC_NRF_COMMON_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_NORDIC_NRF_COMMON_PINCTRL_SOC_H_
 
-#include <devicetree.h>
-#include <dt-bindings/pinctrl/nrf-pinctrl.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/dt-bindings/pinctrl/nrf-pinctrl.h>
 #include <zephyr/types.h>
 
 #ifdef __cplusplus
diff --git a/soc/arm/nordic_nrf/common/soc_nrf_common.h b/soc/arm/nordic_nrf/common/soc_nrf_common.h
index abe43cc28ec..77f28ecb912 100644
--- a/soc/arm/nordic_nrf/common/soc_nrf_common.h
+++ b/soc/arm/nordic_nrf/common/soc_nrf_common.h
@@ -12,8 +12,8 @@
 
 #ifndef _ASMLANGUAGE
 #include <nrfx.h>
-#include <devicetree.h>
-#include <toolchain.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/toolchain.h>
 
 /**
  * @brief Get a PSEL value out of a foo-gpios or foo-pin devicetree property
diff --git a/soc/arm/nordic_nrf/nrf51/power.c b/soc/arm/nordic_nrf/nrf51/power.c
index fa741086154..6d2224db870 100644
--- a/soc/arm/nordic_nrf/nrf51/power.c
+++ b/soc/arm/nordic_nrf/nrf51/power.c
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 #include <hal/nrf_power.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /* Invoke Low Power/System Off specific Tasks */
diff --git a/soc/arm/nordic_nrf/nrf51/soc.c b/soc/arm/nordic_nrf/nrf51/soc.c
index 0bac17edd04..1b9009069a3 100644
--- a/soc/arm/nordic_nrf/nrf51/soc.c
+++ b/soc/arm/nordic_nrf/nrf51/soc.c
@@ -13,11 +13,11 @@
  * for the Nordic Semiconductor nRF51 family processor.
  */
 
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 #include <hal/nrf_power.h>
 #include <soc/nrfx_coredep.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #ifdef CONFIG_RUNTIME_NMI
 extern void z_arm_nmi_init(void);
diff --git a/soc/arm/nordic_nrf/nrf52/power.c b/soc/arm/nordic_nrf/nrf52/power.c
index fa741086154..6d2224db870 100644
--- a/soc/arm/nordic_nrf/nrf52/power.c
+++ b/soc/arm/nordic_nrf/nrf52/power.c
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 #include <hal/nrf_power.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /* Invoke Low Power/System Off specific Tasks */
diff --git a/soc/arm/nordic_nrf/nrf52/soc.c b/soc/arm/nordic_nrf/nrf52/soc.c
index e1e63e9f874..f6ea147e901 100644
--- a/soc/arm/nordic_nrf/nrf52/soc.c
+++ b/soc/arm/nordic_nrf/nrf52/soc.c
@@ -12,12 +12,12 @@
  * for the Nordic Semiconductor nRF52 family processor.
  */
 
-#include <kernel.h>
-#include <init.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <hal/nrf_power.h>
 #include <soc/nrfx_coredep.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #ifdef CONFIG_RUNTIME_NMI
 extern void z_arm_nmi_init(void);
diff --git a/soc/arm/nordic_nrf/nrf53/power.c b/soc/arm/nordic_nrf/nrf53/power.c
index c07f3c30a66..bdc67df214a 100644
--- a/soc/arm/nordic_nrf/nrf53/power.c
+++ b/soc/arm/nordic_nrf/nrf53/power.c
@@ -4,12 +4,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 
 #include <hal/nrf_regulators.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /* Invoke Low Power/System Off specific Tasks */
diff --git a/soc/arm/nordic_nrf/nrf53/soc.c b/soc/arm/nordic_nrf/nrf53/soc.c
index 6d2005db9b9..e652dcc6ce7 100644
--- a/soc/arm/nordic_nrf/nrf53/soc.c
+++ b/soc/arm/nordic_nrf/nrf53/soc.c
@@ -12,15 +12,15 @@
  * for the Nordic Semiconductor nRF53 family processor.
  */
 
-#include <kernel.h>
-#include <init.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <soc/nrfx_coredep.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <nrf_erratas.h>
 #if defined(CONFIG_SOC_NRF5340_CPUAPP)
-#include <drivers/gpio.h>
-#include <devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/devicetree.h>
 #include <hal/nrf_cache.h>
 #include <hal/nrf_gpio.h>
 #include <hal/nrf_oscillators.h>
diff --git a/soc/arm/nordic_nrf/nrf53/sync_rtc.c b/soc/arm/nordic_nrf/nrf53/sync_rtc.c
index a9fe37f722a..182178bac16 100644
--- a/soc/arm/nordic_nrf/nrf53/sync_rtc.c
+++ b/soc/arm/nordic_nrf/nrf53/sync_rtc.c
@@ -6,11 +6,11 @@
 #include <nrfx_dppi.h>
 #include <hal/nrf_ipc.h>
 #include <helpers/nrfx_gppi.h>
-#include <drivers/timer/nrf_rtc_timer.h>
-#include <drivers/ipm.h>
-#include <drivers/mbox.h>
-#include <logging/log_ctrl.h>
-#include <logging/log.h>
+#include <zephyr/drivers/timer/nrf_rtc_timer.h>
+#include <zephyr/drivers/ipm.h>
+#include <zephyr/drivers/mbox.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sync_rtc, CONFIG_SYNC_RTC_LOG_LEVEL);
 
 /* Arbitrary delay is used needed to handle cases when offset between cores is
diff --git a/soc/arm/nordic_nrf/nrf91/power.c b/soc/arm/nordic_nrf/nrf91/power.c
index 83ba247b9a8..02ce9d5c09d 100644
--- a/soc/arm/nordic_nrf/nrf91/power.c
+++ b/soc/arm/nordic_nrf/nrf91/power.c
@@ -4,11 +4,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 #include <hal/nrf_regulators.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /* Invoke Low Power/System Off specific Tasks */
diff --git a/soc/arm/nordic_nrf/nrf91/soc.c b/soc/arm/nordic_nrf/nrf91/soc.c
index a65e8cc6847..b24281df67c 100644
--- a/soc/arm/nordic_nrf/nrf91/soc.c
+++ b/soc/arm/nordic_nrf/nrf91/soc.c
@@ -12,11 +12,11 @@
  * for the Nordic Semiconductor nRF91 family processor.
  */
 
-#include <kernel.h>
-#include <init.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <soc/nrfx_coredep.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #ifdef CONFIG_RUNTIME_NMI
 extern void z_arm_nmi_init(void);
diff --git a/soc/arm/nordic_nrf/timing.c b/soc/arm/nordic_nrf/timing.c
index 6619d6ed15a..e75be5f9cdb 100644
--- a/soc/arm/nordic_nrf/timing.c
+++ b/soc/arm/nordic_nrf/timing.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/arm/aarch32/arch.h>
-#include <kernel.h>
-#include <sys_clock.h>
-#include <timing/timing.h>
+#include <zephyr/arch/arm/aarch32/arch.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/timing/timing.h>
 #include <nrfx.h>
 
 #if defined(CONFIG_NRF_RTC_TIMER)
diff --git a/soc/arm/nordic_nrf/validate_base_addresses.c b/soc/arm/nordic_nrf/validate_base_addresses.c
index fbe2d14cfd7..45a641b5dbe 100644
--- a/soc/arm/nordic_nrf/validate_base_addresses.c
+++ b/soc/arm/nordic_nrf/validate_base_addresses.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 /*
  * Account for MDK inconsistencies
diff --git a/soc/arm/nordic_nrf/validate_enabled_instances.c b/soc/arm/nordic_nrf/validate_enabled_instances.c
index 4a0a8ce16d8..02f585a79c8 100644
--- a/soc/arm/nordic_nrf/validate_enabled_instances.c
+++ b/soc/arm/nordic_nrf/validate_enabled_instances.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #define I2C_ENABLED(idx)  (IS_ENABLED(CONFIG_I2C) && \
 			   DT_NODE_HAS_STATUS(DT_NODELABEL(i2c##idx), okay))
diff --git a/soc/arm/nuvoton_npcx/common/power.c b/soc/arm/nuvoton_npcx/common/power.c
index a5b8cc4573c..fe2ee6fe191 100644
--- a/soc/arm/nuvoton_npcx/common/power.c
+++ b/soc/arm/nuvoton_npcx/common/power.c
@@ -45,16 +45,16 @@
  * INCLUDE FILES: soc_clock.h
  */
 
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <zephyr.h>
-#include <drivers/espi.h>
-#include <pm/pm.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
 
 #include "soc_host.h"
 #include "soc_power.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /* The steps that npcx ec enters sleep/deep mode and leaves it. */
diff --git a/soc/arm/nuvoton_npcx/common/reg/reg_def.h b/soc/arm/nuvoton_npcx/common/reg/reg_def.h
index 34a2fa48676..623ab64edd3 100644
--- a/soc/arm/nuvoton_npcx/common/reg/reg_def.h
+++ b/soc/arm/nuvoton_npcx/common/reg/reg_def.h
@@ -9,10 +9,10 @@
 
 #include <stdint.h>
 
-#include <devicetree.h>
-#include <sys/__assert.h>
-#include <sys/util_macro.h>
-#include <toolchain.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/toolchain.h>
 
 /*
  * NPCX register structure size/offset checking macro function to mitigate
diff --git a/soc/arm/nuvoton_npcx/common/registers.c b/soc/arm/nuvoton_npcx/common/registers.c
index fa7f54c957a..9da3a4ac421 100644
--- a/soc/arm/nuvoton_npcx/common/registers.c
+++ b/soc/arm/nuvoton_npcx/common/registers.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
 
 /* CDCG register structure check */
diff --git a/soc/arm/nuvoton_npcx/common/scfg.c b/soc/arm/nuvoton_npcx/common/scfg.c
index 212ef6eb390..4fafbe146df 100644
--- a/soc/arm/nuvoton_npcx/common/scfg.c
+++ b/soc/arm/nuvoton_npcx/common/scfg.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <dt-bindings/pinctrl/npcx-pinctrl.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/dt-bindings/pinctrl/npcx-pinctrl.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 
 #include "soc_gpio.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pimux_npcx, LOG_LEVEL_ERR);
 
 /* Driver config */
diff --git a/soc/arm/nuvoton_npcx/common/soc_clock.h b/soc/arm/nuvoton_npcx/common/soc_clock.h
index f02bb7d989e..99656d38c8a 100644
--- a/soc/arm/nuvoton_npcx/common/soc_clock.h
+++ b/soc/arm/nuvoton_npcx/common/soc_clock.h
@@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/arm/nuvoton_npcx/common/soc_dt.h b/soc/arm/nuvoton_npcx/common/soc_dt.h
index 3f3300bb03c..8cfc1ed18e5 100644
--- a/soc/arm/nuvoton_npcx/common/soc_dt.h
+++ b/soc/arm/nuvoton_npcx/common/soc_dt.h
@@ -7,9 +7,9 @@
 #ifndef _NUVOTON_NPCX_SOC_DT_H_
 #define _NUVOTON_NPCX_SOC_DT_H_
 
-#include <devicetree.h>
-#include <irq.h>
-#include <sys/util_macro.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/irq.h>
+#include <zephyr/sys/util_macro.h>
 
 /**
  * @brief Like DT_PROP(), but expand parameters with
diff --git a/soc/arm/nuvoton_npcx/common/soc_espi.h b/soc/arm/nuvoton_npcx/common/soc_espi.h
index b577aacf78e..cdf86e86509 100644
--- a/soc/arm/nuvoton_npcx/common/soc_espi.h
+++ b/soc/arm/nuvoton_npcx/common/soc_espi.h
@@ -7,7 +7,7 @@
 #ifndef _NUVOTON_NPCX_SOC_ESPI_H_
 #define _NUVOTON_NPCX_SOC_ESPI_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/arm/nuvoton_npcx/common/soc_gpio.h b/soc/arm/nuvoton_npcx/common/soc_gpio.h
index 5d29a4ce215..b4414b002cf 100644
--- a/soc/arm/nuvoton_npcx/common/soc_gpio.h
+++ b/soc/arm/nuvoton_npcx/common/soc_gpio.h
@@ -7,7 +7,7 @@
 #ifndef _NUVOTON_NPCX_SOC_GPIO_H_
 #define _NUVOTON_NPCX_SOC_GPIO_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/arm/nuvoton_npcx/common/soc_host.h b/soc/arm/nuvoton_npcx/common/soc_host.h
index e5c7c3aff6c..b0d78ca5a33 100644
--- a/soc/arm/nuvoton_npcx/common/soc_host.h
+++ b/soc/arm/nuvoton_npcx/common/soc_host.h
@@ -9,9 +9,9 @@
 
 #include <stdint.h>
 
-#include <device.h>
-#include <drivers/espi.h>
-#include <sys/slist.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/sys/slist.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/arm/nuvoton_npcx/common/soc_miwu.h b/soc/arm/nuvoton_npcx/common/soc_miwu.h
index fad42ee4ac5..c7b51b4f211 100644
--- a/soc/arm/nuvoton_npcx/common/soc_miwu.h
+++ b/soc/arm/nuvoton_npcx/common/soc_miwu.h
@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 
-#include <device.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/arm/nuvoton_npcx/npcx7/soc.c b/soc/arm/nuvoton_npcx/npcx7/soc.c
index ca64f982e7f..de0fcec37ef 100644
--- a/soc/arm/nuvoton_npcx/npcx7/soc.c
+++ b/soc/arm/nuvoton_npcx/npcx7/soc.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 
diff --git a/soc/arm/nuvoton_npcx/npcx9/soc.c b/soc/arm/nuvoton_npcx/npcx9/soc.c
index 5614228432d..0a461a2586b 100644
--- a/soc/arm/nuvoton_npcx/npcx9/soc.c
+++ b/soc/arm/nuvoton_npcx/npcx9/soc.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 
diff --git a/soc/arm/nuvoton_numicro/m48x/soc.c b/soc/arm/nuvoton_numicro/m48x/soc.c
index 6127a170cda..3ac1490f7d8 100644
--- a/soc/arm/nuvoton_numicro/m48x/soc.c
+++ b/soc/arm/nuvoton_numicro/m48x/soc.c
@@ -5,8 +5,8 @@
  * Author: Saravanan Sekar <saravanan@linumiz.com>
  */
 
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 
 void z_arm_platform_init(void)
 {
diff --git a/soc/arm/nuvoton_numicro/m48x/soc.h b/soc/arm/nuvoton_numicro/m48x/soc.h
index a33c8b3dd6c..845058d025d 100644
--- a/soc/arm/nuvoton_numicro/m48x/soc.h
+++ b/soc/arm/nuvoton_numicro/m48x/soc.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_SOC_ARM_NUVOTON_M48X_SOC_H_
 #define ZEPHYR_SOC_ARM_NUVOTON_M48X_SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <NuMicro.h>
 
 #endif /* ZEPHYR_SOC_ARM_NUVOTON_M48X_SOC_H_*/
diff --git a/soc/arm/nxp_imx/mcimx6x_m4/soc.c b/soc/arm/nxp_imx/mcimx6x_m4/soc.c
index 31e4515728f..84bf5415d2a 100644
--- a/soc/arm/nxp_imx/mcimx6x_m4/soc.c
+++ b/soc/arm/nxp_imx/mcimx6x_m4/soc.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <dt-bindings/rdc/imx_rdc.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/dt-bindings/rdc/imx_rdc.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include "wdog_imx.h"
 
 /* Initialize Resource Domain Controller. */
diff --git a/soc/arm/nxp_imx/mcimx7_m4/soc.c b/soc/arm/nxp_imx/mcimx7_m4/soc.c
index 69d6c51f0d5..9665c850858 100644
--- a/soc/arm/nxp_imx/mcimx7_m4/soc.c
+++ b/soc/arm/nxp_imx/mcimx7_m4/soc.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <dt-bindings/rdc/imx_rdc.h>
+#include <zephyr/dt-bindings/rdc/imx_rdc.h>
 #include "wdog_imx.h"
 
 /* Initialize clock. */
diff --git a/soc/arm/nxp_imx/mimx8ml8_m7/mpu_regions.c b/soc/arm/nxp_imx/mimx8ml8_m7/mpu_regions.c
index 739629531b7..f2771d5e30d 100644
--- a/soc/arm/nxp_imx/mimx8ml8_m7/mpu_regions.c
+++ b/soc/arm/nxp_imx/mimx8ml8_m7/mpu_regions.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "../../common/cortex_m/arm_mpu_mem_cfg.h"
 
 #define REGION_MASK_BASE_ADDRESS			0x00000000U
diff --git a/soc/arm/nxp_imx/mimx8ml8_m7/soc.c b/soc/arm/nxp_imx/mimx8ml8_m7/soc.c
index 48bd9b1c5b8..47aefc1fd4d 100644
--- a/soc/arm/nxp_imx/mimx8ml8_m7/soc.c
+++ b/soc/arm/nxp_imx/mimx8ml8_m7/soc.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <fsl_clock.h>
 #include <fsl_common.h>
 #include <fsl_rdc.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 
-#include <dt-bindings/rdc/imx_rdc.h>
+#include <zephyr/dt-bindings/rdc/imx_rdc.h>
 
 /* OSC/PLL is already initialized by ROM and Cortex-A53 (u-boot) */
 static void SOC_RdcInit(void)
diff --git a/soc/arm/nxp_imx/mimx8mm6_m4/soc.c b/soc/arm/nxp_imx/mimx8mm6_m4/soc.c
index f1c0c8f0c31..b386b3a6e03 100644
--- a/soc/arm/nxp_imx/mimx8mm6_m4/soc.c
+++ b/soc/arm/nxp_imx/mimx8mm6_m4/soc.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <fsl_clock.h>
 #include <fsl_common.h>
 #include <fsl_rdc.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 
-#include <dt-bindings/rdc/imx_rdc.h>
+#include <zephyr/dt-bindings/rdc/imx_rdc.h>
 
 /* OSC/PLL is already initialized by ROM and Cortex-A53 (u-boot) */
 static void SOC_RdcInit(void)
diff --git a/soc/arm/nxp_imx/mimx8mq6_m4/soc.c b/soc/arm/nxp_imx/mimx8mq6_m4/soc.c
index 19a746eed12..393c08ad442 100644
--- a/soc/arm/nxp_imx/mimx8mq6_m4/soc.c
+++ b/soc/arm/nxp_imx/mimx8mq6_m4/soc.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <fsl_clock.h>
 #include <fsl_common.h>
 #include <fsl_rdc.h>
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 
-#include <dt-bindings/rdc/imx_rdc.h>
+#include <zephyr/dt-bindings/rdc/imx_rdc.h>
 
 /* OSC/PLL is already initialized by ROM and Cortex-A53 (u-boot) */
 static void SOC_RdcInit(void)
diff --git a/soc/arm/nxp_imx/rt/lpm_rt1064.c b/soc/arm/nxp_imx/rt/lpm_rt1064.c
index 206d0f51994..6d211e2d3a0 100644
--- a/soc/arm/nxp_imx/rt/lpm_rt1064.c
+++ b/soc/arm/nxp_imx/rt/lpm_rt1064.c
@@ -7,9 +7,9 @@
  * to the flexspi modules must be linked to RAM, or within this file
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 #include <power_rt10xx.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include "clock_config.h"
 
 
diff --git a/soc/arm/nxp_imx/rt/mpu_regions.c b/soc/arm/nxp_imx/rt/mpu_regions.c
index d425b5de508..e6108b7a327 100644
--- a/soc/arm/nxp_imx/rt/mpu_regions.c
+++ b/soc/arm/nxp_imx/rt/mpu_regions.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "../../common/cortex_m/arm_mpu_mem_cfg.h"
 #define IS_CHOSEN_SRAM(x) (DT_DEP_ORD(DT_NODELABEL(x)) == DT_DEP_ORD(DT_CHOSEN(zephyr_sram)))
 
diff --git a/soc/arm/nxp_imx/rt/pinctrl_rt10xx.h b/soc/arm/nxp_imx/rt/pinctrl_rt10xx.h
index 9e081efdcdc..6b28394dadf 100644
--- a/soc/arm/nxp_imx/rt/pinctrl_rt10xx.h
+++ b/soc/arm/nxp_imx/rt/pinctrl_rt10xx.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_SOC_ARM_NXP_IMX_RT_PINCTRL_RT10XX_H_
 #define ZEPHYR_SOC_ARM_NXP_IMX_RT_PINCTRL_RT10XX_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 #include "fsl_common.h"
 
diff --git a/soc/arm/nxp_imx/rt/pinctrl_rt11xx.h b/soc/arm/nxp_imx/rt/pinctrl_rt11xx.h
index ebdb39b6432..c6e2441969c 100644
--- a/soc/arm/nxp_imx/rt/pinctrl_rt11xx.h
+++ b/soc/arm/nxp_imx/rt/pinctrl_rt11xx.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_SOC_ARM_NXP_IMX_RT_PINCTRL_RT11XX_H_
 #define ZEPHYR_SOC_ARM_NXP_IMX_RT_PINCTRL_RT11XX_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 #include "fsl_common.h"
 
diff --git a/soc/arm/nxp_imx/rt/power_rt10xx.c b/soc/arm/nxp_imx/rt/power_rt10xx.c
index 030cbc6ad47..5b53b6e1f62 100644
--- a/soc/arm/nxp_imx/rt/power_rt10xx.c
+++ b/soc/arm/nxp_imx/rt/power_rt10xx.c
@@ -6,15 +6,15 @@
  * Note: this file is linked to RAM. Any functions called while preparing for
  * sleep mode must be defined within this file, or linked to RAM.
  */
-#include <zephyr.h>
-#include <device.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/pm.h>
 #include <fsl_dcdc.h>
 #include <fsl_pmu.h>
 #include <fsl_gpc.h>
 #include <fsl_lpuart.h>
 #include <fsl_clock.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "power_rt10xx.h"
 
diff --git a/soc/arm/nxp_imx/rt/power_rt11xx.c b/soc/arm/nxp_imx/rt/power_rt11xx.c
index c9f5b72a81a..5b424b5bf51 100644
--- a/soc/arm/nxp_imx/rt/power_rt11xx.c
+++ b/soc/arm/nxp_imx/rt/power_rt11xx.c
@@ -3,15 +3,15 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <device.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/pm.h>
 #include <fsl_dcdc.h>
 #include <fsl_gpc.h>
-#include <dt-bindings/pm/imx_spc.h>
+#include <zephyr/dt-bindings/pm/imx_spc.h>
 #include "power_rt11xx.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /*
diff --git a/soc/arm/nxp_imx/rt/soc.h b/soc/arm/nxp_imx/rt/soc.h
index 796179b98e7..5d13f53fe62 100644
--- a/soc/arm/nxp_imx/rt/soc.h
+++ b/soc/arm/nxp_imx/rt/soc.h
@@ -7,14 +7,14 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
 #include <fsl_common.h>
 
 /* Add include for DTS generated information */
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/arm/nxp_imx/rt/soc_rt10xx.c b/soc/arm/nxp_imx/rt/soc_rt10xx.c
index d19856e21c9..6f94f39a381 100644
--- a/soc/arm/nxp_imx/rt/soc_rt10xx.c
+++ b/soc/arm/nxp_imx/rt/soc_rt10xx.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <linker/sections.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/linker/linker-defs.h>
 #include <fsl_clock.h>
-#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>
 #include <fsl_flexspi_nor_boot.h>
-#include <dt-bindings/clock/imx_ccm.h>
+#include <zephyr/dt-bindings/clock/imx_ccm.h>
 #include <fsl_iomuxc.h>
 #if CONFIG_USB_DC_NXP_EHCI
 #include "usb_phy.h"
diff --git a/soc/arm/nxp_imx/rt/soc_rt11xx.c b/soc/arm/nxp_imx/rt/soc_rt11xx.c
index f381dee7b0b..58bb25e6e3e 100644
--- a/soc/arm/nxp_imx/rt/soc_rt11xx.c
+++ b/soc/arm/nxp_imx/rt/soc_rt11xx.c
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <linker/sections.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/linker/linker-defs.h>
 #include <fsl_clock.h>
 #include <fsl_gpc.h>
 #include <fsl_pmu.h>
 #include <fsl_dcdc.h>
-#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>
 #include <fsl_flexspi_nor_boot.h>
-#include <dt-bindings/clock/imx_ccm_rev2.h>
+#include <zephyr/dt-bindings/clock/imx_ccm_rev2.h>
 #if CONFIG_USB_DC_NXP_EHCI
 #include "usb_phy.h"
 #include "usb_dc_mcux.h"
diff --git a/soc/arm/nxp_imx/rt5xx/pinctrl_soc.h b/soc/arm/nxp_imx/rt5xx/pinctrl_soc.h
index b4ea0fa2b02..3389073bd09 100644
--- a/soc/arm/nxp_imx/rt5xx/pinctrl_soc.h
+++ b/soc/arm/nxp_imx/rt5xx/pinctrl_soc.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_SOC_ARM_NXP_IMX_RT5XX_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_NXP_IMX_RT5XX_PINCTRL_SOC_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 
 #ifdef __cplusplus
diff --git a/soc/arm/nxp_imx/rt5xx/soc.c b/soc/arm/nxp_imx/rt5xx/soc.c
index 10dd904748e..ed64558140a 100644
--- a/soc/arm/nxp_imx/rt5xx/soc.c
+++ b/soc/arm/nxp_imx/rt5xx/soc.c
@@ -12,7 +12,7 @@
  * hardware for the RT5XX platforms.
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include "flash_clock_setup.h"
 #include "fsl_power.h"
diff --git a/soc/arm/nxp_imx/rt5xx/soc.h b/soc/arm/nxp_imx/rt5xx/soc.h
index 7c2344325ad..c92883e9d73 100644
--- a/soc/arm/nxp_imx/rt5xx/soc.h
+++ b/soc/arm/nxp_imx/rt5xx/soc.h
@@ -16,7 +16,7 @@
 #define _SOC__H_
 
 #ifndef _ASMLANGUAGE
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <fsl_common.h>
 
 #endif /* !_ASMLANGUAGE */
diff --git a/soc/arm/nxp_imx/rt6xx/pinctrl_soc.h b/soc/arm/nxp_imx/rt6xx/pinctrl_soc.h
index ec4bb9b5f2d..445bd1a873b 100644
--- a/soc/arm/nxp_imx/rt6xx/pinctrl_soc.h
+++ b/soc/arm/nxp_imx/rt6xx/pinctrl_soc.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_SOC_ARM_NXP_IMX_RT6XX_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_NXP_IMX_RT6XX_PINCTRL_SOC_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 
 #ifdef __cplusplus
diff --git a/soc/arm/nxp_imx/rt6xx/power.c b/soc/arm/nxp_imx/rt6xx/power.c
index 01f25801d18..95389a4c793 100644
--- a/soc/arm/nxp_imx/rt6xx/power.c
+++ b/soc/arm/nxp_imx/rt6xx/power.c
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 #include "fsl_power.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /*!< Power down all unnecessary blocks and enable RBB during deep sleep. */
diff --git a/soc/arm/nxp_imx/rt6xx/soc.c b/soc/arm/nxp_imx/rt6xx/soc.c
index 72b68ec6af0..01ee51af519 100644
--- a/soc/arm/nxp_imx/rt6xx/soc.c
+++ b/soc/arm/nxp_imx/rt6xx/soc.c
@@ -12,13 +12,13 @@
  * hardware for the nxp_lpc55s69 platform.
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/uart.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include <aarch32/cortex_m/exc.h>
 #include <fsl_power.h>
 #include <fsl_clock.h>
diff --git a/soc/arm/nxp_imx/rt6xx/soc.h b/soc/arm/nxp_imx/rt6xx/soc.h
index bef8ea33f62..771d751667e 100644
--- a/soc/arm/nxp_imx/rt6xx/soc.h
+++ b/soc/arm/nxp_imx/rt6xx/soc.h
@@ -16,11 +16,11 @@
 #define _SOC__H_
 
 #ifndef _ASMLANGUAGE
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <fsl_common.h>
 
 /* Add include for DTS generated information */
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 
diff --git a/soc/arm/nxp_kinetis/common/pinctrl_soc.h b/soc/arm/nxp_kinetis/common/pinctrl_soc.h
index 0b1b19ff2b3..d3a2ee0c02d 100644
--- a/soc/arm/nxp_kinetis/common/pinctrl_soc.h
+++ b/soc/arm/nxp_kinetis/common/pinctrl_soc.h
@@ -12,7 +12,7 @@
 #ifndef ZEPHYR_SOC_ARM_NXP_KINETIS_COMMON_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_NXP_KINETIS_COMMON_PINCTRL_SOC_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 
 #ifdef __cplusplus
diff --git a/soc/arm/nxp_kinetis/flash_configuration.c b/soc/arm/nxp_kinetis/flash_configuration.c
index 31faab03df7..ccf50f5a306 100644
--- a/soc/arm/nxp_kinetis/flash_configuration.c
+++ b/soc/arm/nxp_kinetis/flash_configuration.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <linker/sections.h>
+#include <zephyr/kernel.h>
+#include <zephyr/linker/sections.h>
 
 uint8_t __kinetis_flash_config_section __kinetis_flash_config[] = {
 	/* Backdoor Comparison Key (unused) */
diff --git a/soc/arm/nxp_kinetis/k2x/soc.c b/soc/arm/nxp_kinetis/k2x/soc.c
index 82fa9de07d6..35d1b9d7713 100644
--- a/soc/arm/nxp_kinetis/k2x/soc.c
+++ b/soc/arm/nxp_kinetis/k2x/soc.c
@@ -15,15 +15,15 @@
  * hardware for the fsl_frdm_k22f platform.
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
-#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>
 
 #define TIMESRC_OSCERCLK        (2)
 
diff --git a/soc/arm/nxp_kinetis/k2x/soc.h b/soc/arm/nxp_kinetis/k2x/soc.h
index da77f1dd5df..1adb5b8a9e4 100644
--- a/soc/arm/nxp_kinetis/k2x/soc.h
+++ b/soc/arm/nxp_kinetis/k2x/soc.h
@@ -17,7 +17,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,9 +30,9 @@ extern "C" {
 #ifndef _ASMLANGUAGE
 
 #include <fsl_common.h>
-#include <device.h>
-#include <sys/util.h>
-#include <random/rand32.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/random/rand32.h>
 
 #endif /* !_ASMLANGUAGE */
 
diff --git a/soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c b/soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c
index 9be34e692b6..d0662e3dfb2 100644
--- a/soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c
+++ b/soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <soc.h>
-#include <arch/arm/aarch32/mpu/nxp_mpu.h>
+#include <zephyr/arch/arm/aarch32/mpu/nxp_mpu.h>
 
 static const struct nxp_mpu_region mpu_regions[] = {
 	/* Region 0 */
diff --git a/soc/arm/nxp_kinetis/k6x/soc.c b/soc/arm/nxp_kinetis/k6x/soc.c
index 91944c1ca95..13bfaf4db33 100644
--- a/soc/arm/nxp_kinetis/k6x/soc.c
+++ b/soc/arm/nxp_kinetis/k6x/soc.c
@@ -13,15 +13,15 @@
  * hardware for the fsl_frdm_k64f platform.
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
-#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>
 
 #define LPUART0SRC_OSCERCLK     (1)
 
diff --git a/soc/arm/nxp_kinetis/k6x/soc.h b/soc/arm/nxp_kinetis/k6x/soc.h
index 0e3b1a90138..4318106e889 100644
--- a/soc/arm/nxp_kinetis/k6x/soc.h
+++ b/soc/arm/nxp_kinetis/k6x/soc.h
@@ -15,7 +15,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 /* address bases */
 
diff --git a/soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c b/soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c
index fef9e18a2e9..d7bcce1cd9b 100644
--- a/soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c
+++ b/soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <soc.h>
-#include <arch/arm/aarch32/mpu/nxp_mpu.h>
+#include <zephyr/arch/arm/aarch32/mpu/nxp_mpu.h>
 
 static const struct nxp_mpu_region mpu_regions[] = {
 	/* Region 0 */
diff --git a/soc/arm/nxp_kinetis/k8x/soc.c b/soc/arm/nxp_kinetis/k8x/soc.c
index 9200dfaa0cb..974e4d8f444 100644
--- a/soc/arm/nxp_kinetis/k8x/soc.c
+++ b/soc/arm/nxp_kinetis/k8x/soc.c
@@ -8,9 +8,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
 
diff --git a/soc/arm/nxp_kinetis/k8x/soc.h b/soc/arm/nxp_kinetis/k8x/soc.h
index 924c8ca8a90..c542e3bb8b9 100644
--- a/soc/arm/nxp_kinetis/k8x/soc.h
+++ b/soc/arm/nxp_kinetis/k8x/soc.h
@@ -7,7 +7,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c b/soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c
index fef9e18a2e9..d7bcce1cd9b 100644
--- a/soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c
+++ b/soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <soc.h>
-#include <arch/arm/aarch32/mpu/nxp_mpu.h>
+#include <zephyr/arch/arm/aarch32/mpu/nxp_mpu.h>
 
 static const struct nxp_mpu_region mpu_regions[] = {
 	/* Region 0 */
diff --git a/soc/arm/nxp_kinetis/ke1xf/power.c b/soc/arm/nxp_kinetis/ke1xf/power.c
index 10c8753bb54..8d2cdfbe438 100644
--- a/soc/arm/nxp_kinetis/ke1xf/power.c
+++ b/soc/arm/nxp_kinetis/ke1xf/power.c
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <logging/log.h>
-#include <pm/pm.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
 
 LOG_MODULE_DECLARE(power, CONFIG_PM_LOG_LEVEL);
diff --git a/soc/arm/nxp_kinetis/ke1xf/soc.c b/soc/arm/nxp_kinetis/ke1xf/soc.c
index 826fc2ab726..bca29f2aa89 100644
--- a/soc/arm/nxp_kinetis/ke1xf/soc.c
+++ b/soc/arm/nxp_kinetis/ke1xf/soc.c
@@ -8,12 +8,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <fsl_clock.h>
 #include <fsl_cache.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 #define ASSERT_WITHIN_RANGE(val, min, max, str) \
 	BUILD_ASSERT(val >= min && val <= max, str)
diff --git a/soc/arm/nxp_kinetis/ke1xf/soc.h b/soc/arm/nxp_kinetis/ke1xf/soc.h
index 46e052c674b..2b93ef51d77 100644
--- a/soc/arm/nxp_kinetis/ke1xf/soc.h
+++ b/soc/arm/nxp_kinetis/ke1xf/soc.h
@@ -7,7 +7,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/nxp_kinetis/kl2x/soc.c b/soc/arm/nxp_kinetis/kl2x/soc.c
index abc3e16fe67..557d4b6668c 100644
--- a/soc/arm/nxp_kinetis/kl2x/soc.c
+++ b/soc/arm/nxp_kinetis/kl2x/soc.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 #define LPSCI0SRC_MCGFLLCLK	(1)
 
diff --git a/soc/arm/nxp_kinetis/kl2x/soc.h b/soc/arm/nxp_kinetis/kl2x/soc.h
index 0b6a15293dc..f41d4aec9ae 100644
--- a/soc/arm/nxp_kinetis/kl2x/soc.h
+++ b/soc/arm/nxp_kinetis/kl2x/soc.h
@@ -7,7 +7,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define UART0_CLK_SRC kCLOCK_CoreSysClk
 
diff --git a/soc/arm/nxp_kinetis/kv5x/soc.c b/soc/arm/nxp_kinetis/kv5x/soc.c
index 04d4b9c2c45..08ee7668f49 100644
--- a/soc/arm/nxp_kinetis/kv5x/soc.c
+++ b/soc/arm/nxp_kinetis/kv5x/soc.c
@@ -8,9 +8,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
 
diff --git a/soc/arm/nxp_kinetis/kv5x/soc.h b/soc/arm/nxp_kinetis/kv5x/soc.h
index 924c8ca8a90..c542e3bb8b9 100644
--- a/soc/arm/nxp_kinetis/kv5x/soc.h
+++ b/soc/arm/nxp_kinetis/kv5x/soc.h
@@ -7,7 +7,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/arm/nxp_kinetis/kwx/soc.h b/soc/arm/nxp_kinetis/kwx/soc.h
index e121b68a7c0..6422e517612 100644
--- a/soc/arm/nxp_kinetis/kwx/soc.h
+++ b/soc/arm/nxp_kinetis/kwx/soc.h
@@ -8,7 +8,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #if defined(CONFIG_SOC_MKW40Z4) || defined(CONFIG_SOC_MKW41Z4)
 
diff --git a/soc/arm/nxp_kinetis/kwx/soc_kw2xd.c b/soc/arm/nxp_kinetis/kwx/soc_kw2xd.c
index 1750022b385..532ea49e05b 100644
--- a/soc/arm/nxp_kinetis/kwx/soc_kw2xd.c
+++ b/soc/arm/nxp_kinetis/kwx/soc_kw2xd.c
@@ -6,15 +6,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
-#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>
 
 #define PLLFLLSEL_MCGFLLCLK	(0)
 #define PLLFLLSEL_MCGPLLCLK	(1)
diff --git a/soc/arm/nxp_kinetis/kwx/soc_kw4xz.c b/soc/arm/nxp_kinetis/kwx/soc_kw4xz.c
index a8d13fbc58a..9690a8b701c 100644
--- a/soc/arm/nxp_kinetis/kwx/soc_kw4xz.c
+++ b/soc/arm/nxp_kinetis/kwx/soc_kw4xz.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 #define LPUART0SRC_OSCERCLK	(1)
 #define TPMSRC_MCGPLLCLK	(1)
diff --git a/soc/arm/nxp_lpc/lpc11u6x/soc.c b/soc/arm/nxp_lpc/lpc11u6x/soc.c
index 6c7f4703ebe..daa0396e8fd 100644
--- a/soc/arm/nxp_lpc/lpc11u6x/soc.c
+++ b/soc/arm/nxp_lpc/lpc11u6x/soc.c
@@ -12,12 +12,12 @@
  * hardware for the nxp_lpc11u6x platform.
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include <aarch32/cortex_m/exc.h>
 
 /**
diff --git a/soc/arm/nxp_lpc/lpc11u6x/soc.h b/soc/arm/nxp_lpc/lpc11u6x/soc.h
index 7001e76ae9d..2bf70c8e61d 100644
--- a/soc/arm/nxp_lpc/lpc11u6x/soc.h
+++ b/soc/arm/nxp_lpc/lpc11u6x/soc.h
@@ -16,7 +16,7 @@
 #define _SOC__H_
 
 #ifndef _ASMLANGUAGE
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 
 #endif /* !_ASMLANGUAGE */
diff --git a/soc/arm/nxp_lpc/lpc54xxx/pinctrl_soc.h b/soc/arm/nxp_lpc/lpc54xxx/pinctrl_soc.h
index 36c895175de..f1a77f8823d 100644
--- a/soc/arm/nxp_lpc/lpc54xxx/pinctrl_soc.h
+++ b/soc/arm/nxp_lpc/lpc54xxx/pinctrl_soc.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_SOC_ARM_NXP_LPC_54xxx_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_NXP_LPC_54xxx_PINCTRL_SOC_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 
 #ifdef __cplusplus
diff --git a/soc/arm/nxp_lpc/lpc54xxx/soc.c b/soc/arm/nxp_lpc/lpc54xxx/soc.c
index f1a3784e687..b4c59a1bd16 100644
--- a/soc/arm/nxp_lpc/lpc54xxx/soc.c
+++ b/soc/arm/nxp_lpc/lpc54xxx/soc.c
@@ -12,13 +12,13 @@
  * hardware for the nxp_lpc54114 platform.
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/uart.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include <aarch32/cortex_m/exc.h>
 #include <fsl_power.h>
 #include <fsl_clock.h>
diff --git a/soc/arm/nxp_lpc/lpc54xxx/soc.h b/soc/arm/nxp_lpc/lpc54xxx/soc.h
index 309287ede52..98e1d7cba01 100644
--- a/soc/arm/nxp_lpc/lpc54xxx/soc.h
+++ b/soc/arm/nxp_lpc/lpc54xxx/soc.h
@@ -16,7 +16,7 @@
 #define _SOC__H_
 
 #ifndef _ASMLANGUAGE
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <fsl_common.h>
 
 
diff --git a/soc/arm/nxp_lpc/lpc55xxx/pinctrl_soc.h b/soc/arm/nxp_lpc/lpc55xxx/pinctrl_soc.h
index 8553fd5668a..5991794d090 100644
--- a/soc/arm/nxp_lpc/lpc55xxx/pinctrl_soc.h
+++ b/soc/arm/nxp_lpc/lpc55xxx/pinctrl_soc.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_SOC_ARM_NXP_LPC_55xxx_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_NXP_LPC_55xxx_PINCTRL_SOC_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 
 #ifdef __cplusplus
diff --git a/soc/arm/nxp_lpc/lpc55xxx/soc.c b/soc/arm/nxp_lpc/lpc55xxx/soc.c
index 420665f7c77..e61a448cfaa 100644
--- a/soc/arm/nxp_lpc/lpc55xxx/soc.c
+++ b/soc/arm/nxp_lpc/lpc55xxx/soc.c
@@ -12,13 +12,13 @@
  * hardware for the nxp_lpc55s69 platform.
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <drivers/uart.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 #include <aarch32/cortex_m/exc.h>
 #include <fsl_power.h>
 #include <fsl_clock.h>
diff --git a/soc/arm/nxp_lpc/lpc55xxx/soc.h b/soc/arm/nxp_lpc/lpc55xxx/soc.h
index 08a09fa51e0..2b38ce7c95a 100644
--- a/soc/arm/nxp_lpc/lpc55xxx/soc.h
+++ b/soc/arm/nxp_lpc/lpc55xxx/soc.h
@@ -16,7 +16,7 @@
 #define _SOC__H_
 
 #ifndef _ASMLANGUAGE
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <fsl_common.h>
 
 
diff --git a/soc/arm/quicklogic_eos_s3/soc.c b/soc/arm/quicklogic_eos_s3/soc.c
index 32fa8250db3..821324ec939 100644
--- a/soc/arm/quicklogic_eos_s3/soc.c
+++ b/soc/arm/quicklogic_eos_s3/soc.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <soc_pinmap.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 void eos_s3_lock_enable(void)
 {
diff --git a/soc/arm/quicklogic_eos_s3/soc.h b/soc/arm/quicklogic_eos_s3/soc.h
index dcebcb6bab5..b294be96e9b 100644
--- a/soc/arm/quicklogic_eos_s3/soc.h
+++ b/soc/arm/quicklogic_eos_s3/soc.h
@@ -7,7 +7,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <eoss3_dev.h>
 
 /* Available frequencies */
diff --git a/soc/arm/renesas_rcar/gen3/pfc_r8a77951.c b/soc/arm/renesas_rcar/gen3/pfc_r8a77951.c
index 80323749c16..c59be6cfe6f 100644
--- a/soc/arm/renesas_rcar/gen3/pfc_r8a77951.c
+++ b/soc/arm/renesas_rcar/gen3/pfc_r8a77951.c
@@ -6,7 +6,7 @@
  */
 
 #include "pinctrl_soc.h"
-#include <dt-bindings/pinctrl/renesas/pinctrl-r8a77951.h>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-r8a77951.h>
 
 const struct pfc_drive_reg pfc_drive_regs[] = {
 	/* DRVCTRL0 */
diff --git a/soc/arm/renesas_rcar/gen3/pinctrl_soc.h b/soc/arm/renesas_rcar/gen3/pinctrl_soc.h
index ee6a20c770a..92f7aa507a4 100644
--- a/soc/arm/renesas_rcar/gen3/pinctrl_soc.h
+++ b/soc/arm/renesas_rcar/gen3/pinctrl_soc.h
@@ -8,10 +8,10 @@
 #ifndef ZEPHYR_SOC_ARM_RENESAS_RCAR_GEN3_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_RENESAS_RCAR_GEN3_PINCTRL_SOC_H_
 
-#include <devicetree.h>
-#include <dt-bindings/pinctrl/renesas/pinctrl-rcar-common.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-rcar-common.h>
 #include <stdint.h>
-#include <sys/util_macro.h>
+#include <zephyr/sys/util_macro.h>
 
 struct rcar_pin_func {
 	uint8_t bank:5;      /* bank number 0 - 18 */
diff --git a/soc/arm/renesas_rcar/gen3/soc.c b/soc/arm/renesas_rcar/gen3/soc.c
index 49f1df026c3..ab81900bf32 100644
--- a/soc/arm/renesas_rcar/gen3/soc.c
+++ b/soc/arm/renesas_rcar/gen3/soc.c
@@ -5,9 +5,9 @@
  *
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
 /**
  *
diff --git a/soc/arm/rpi_pico/rp2/pinctrl_soc.h b/soc/arm/rpi_pico/rp2/pinctrl_soc.h
index b6bcc40da12..e6b6a2c5495 100644
--- a/soc/arm/rpi_pico/rp2/pinctrl_soc.h
+++ b/soc/arm/rpi_pico/rp2/pinctrl_soc.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_SOC_ARM_RPI_PICO_RP2_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_RPI_PICO_RP2_PINCTRL_SOC_H_
 
-#include <dt-bindings/pinctrl/rpi-pico-rp2040-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/rpi-pico-rp2040-pinctrl.h>
 
 /**
  * @brief Type to hold a pin's pinctrl configuration.
diff --git a/soc/arm/rpi_pico/rp2/soc.c b/soc/arm/rpi_pico/rp2/soc.c
index 233b09f7e6d..04f73ef81a7 100644
--- a/soc/arm/rpi_pico/rp2/soc.c
+++ b/soc/arm/rpi_pico/rp2/soc.c
@@ -13,9 +13,9 @@
  * for the Raspberry Pi RP2040 family processor.
  */
 
-#include <kernel.h>
-#include <init.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/logging/log.h>
 
 #include <hardware/regs/resets.h>
 #include <hardware/clocks.h>
diff --git a/soc/arm/silabs_exx32/common/soc.c b/soc/arm/silabs_exx32/common/soc.c
index 11d5991c825..f864f778b1e 100644
--- a/soc/arm/silabs_exx32/common/soc.c
+++ b/soc/arm/silabs_exx32/common/soc.c
@@ -9,16 +9,16 @@
  * @brief Common SoC initialization for the EXX32
  */
 
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <em_cmu.h>
 #include <em_emu.h>
 #include <em_chip.h>
-#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>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 
diff --git a/soc/arm/silabs_exx32/common/soc_power.c b/soc/arm/silabs_exx32/common/soc_power.c
index 3a1ed52a9a7..a11d8379285 100644
--- a/soc/arm/silabs_exx32/common/soc_power.c
+++ b/soc/arm/silabs_exx32/common/soc_power.c
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 #include <em_emu.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /*
diff --git a/soc/arm/silabs_exx32/efm32gg11b/soc.h b/soc/arm/silabs_exx32/efm32gg11b/soc.h
index 3de7ede03c5..8b53c1228a6 100644
--- a/soc/arm/silabs_exx32/efm32gg11b/soc.h
+++ b/soc/arm/silabs_exx32/efm32gg11b/soc.h
@@ -14,7 +14,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/arm/silabs_exx32/efm32gg11b/soc_pinmap.h b/soc/arm/silabs_exx32/efm32gg11b/soc_pinmap.h
index c1e960df74b..9cfa04017d5 100644
--- a/soc/arm/silabs_exx32/efm32gg11b/soc_pinmap.h
+++ b/soc/arm/silabs_exx32/efm32gg11b/soc_pinmap.h
@@ -15,7 +15,7 @@
 #ifndef _SILABS_EFM32GG11B_SOC_PINMAP_H_
 #define _SILABS_EFM32GG11B_SOC_PINMAP_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <soc.h>
 #include <em_gpio.h>
 
diff --git a/soc/arm/silabs_exx32/efm32hg/soc.h b/soc/arm/silabs_exx32/efm32hg/soc.h
index 2c525d32437..df5ff943982 100644
--- a/soc/arm/silabs_exx32/efm32hg/soc.h
+++ b/soc/arm/silabs_exx32/efm32hg/soc.h
@@ -13,12 +13,12 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
 #include <em_common.h>
-#include <device.h>
+#include <zephyr/device.h>
 
 #include "soc_pinmap.h"
 #include "../common/soc_gpio.h"
diff --git a/soc/arm/silabs_exx32/efm32jg12b/soc.h b/soc/arm/silabs_exx32/efm32jg12b/soc.h
index d66a0085754..f6f7ebda406 100644
--- a/soc/arm/silabs_exx32/efm32jg12b/soc.h
+++ b/soc/arm/silabs_exx32/efm32jg12b/soc.h
@@ -13,7 +13,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/silabs_exx32/efm32jg12b/soc_pinmap.h b/soc/arm/silabs_exx32/efm32jg12b/soc_pinmap.h
index 5e947578eee..dc649c44963 100644
--- a/soc/arm/silabs_exx32/efm32jg12b/soc_pinmap.h
+++ b/soc/arm/silabs_exx32/efm32jg12b/soc_pinmap.h
@@ -13,7 +13,7 @@
 #ifndef _SILABS_EFM32JG12B_SOC_PINMAP_H_
 #define _SILABS_EFM32JG12B_SOC_PINMAP_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <soc.h>
 #include <em_gpio.h>
 
diff --git a/soc/arm/silabs_exx32/efm32pg12b/soc.h b/soc/arm/silabs_exx32/efm32pg12b/soc.h
index 4d30b3d943b..5bf18f17856 100644
--- a/soc/arm/silabs_exx32/efm32pg12b/soc.h
+++ b/soc/arm/silabs_exx32/efm32pg12b/soc.h
@@ -13,7 +13,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/silabs_exx32/efm32pg12b/soc_pinmap.h b/soc/arm/silabs_exx32/efm32pg12b/soc_pinmap.h
index 7765a26a741..38a610ed3ae 100644
--- a/soc/arm/silabs_exx32/efm32pg12b/soc_pinmap.h
+++ b/soc/arm/silabs_exx32/efm32pg12b/soc_pinmap.h
@@ -13,7 +13,7 @@
 #ifndef _SILABS_EFM32PG12B_SOC_PINMAP_H_
 #define _SILABS_EFM32PG12B_SOC_PINMAP_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <soc.h>
 #include <em_gpio.h>
 
diff --git a/soc/arm/silabs_exx32/efm32pg1b/soc.h b/soc/arm/silabs_exx32/efm32pg1b/soc.h
index 81f923f05ca..96b384e580d 100644
--- a/soc/arm/silabs_exx32/efm32pg1b/soc.h
+++ b/soc/arm/silabs_exx32/efm32pg1b/soc.h
@@ -13,7 +13,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/silabs_exx32/efm32pg1b/soc_pinmap.h b/soc/arm/silabs_exx32/efm32pg1b/soc_pinmap.h
index 8eea7121e11..1ba176049bc 100644
--- a/soc/arm/silabs_exx32/efm32pg1b/soc_pinmap.h
+++ b/soc/arm/silabs_exx32/efm32pg1b/soc_pinmap.h
@@ -13,7 +13,7 @@
 #ifndef _SILABS_EFM32PG1B_SOC_PINMAP_H_
 #define _SILABS_EFM32PG1B_SOC_PINMAP_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <soc.h>
 #include <em_gpio.h>
 
diff --git a/soc/arm/silabs_exx32/efm32wg/soc.h b/soc/arm/silabs_exx32/efm32wg/soc.h
index 2c9cbeb919e..ddebae2b303 100644
--- a/soc/arm/silabs_exx32/efm32wg/soc.h
+++ b/soc/arm/silabs_exx32/efm32wg/soc.h
@@ -13,7 +13,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/silabs_exx32/efr32bg13p/soc.h b/soc/arm/silabs_exx32/efr32bg13p/soc.h
index e04f1ea865a..e288cdaf0b2 100644
--- a/soc/arm/silabs_exx32/efr32bg13p/soc.h
+++ b/soc/arm/silabs_exx32/efr32bg13p/soc.h
@@ -13,7 +13,7 @@
 #ifndef EFR32BG13P_SOC_H_
 #define EFR32BG13P_SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/silabs_exx32/efr32bg13p/soc_pinmap.h b/soc/arm/silabs_exx32/efr32bg13p/soc_pinmap.h
index 47a1b471068..b10232c730e 100644
--- a/soc/arm/silabs_exx32/efr32bg13p/soc_pinmap.h
+++ b/soc/arm/silabs_exx32/efr32bg13p/soc_pinmap.h
@@ -10,7 +10,7 @@
 #ifndef SOC_PINMAP_H_
 #define SOC_PINMAP_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <em_gpio.h>
 
 #define GPIO_NODE DT_INST(0, silabs_gecko_gpio)
diff --git a/soc/arm/silabs_exx32/efr32fg13p/soc.h b/soc/arm/silabs_exx32/efr32fg13p/soc.h
index 21b4c924eb3..e22118b9ab1 100644
--- a/soc/arm/silabs_exx32/efr32fg13p/soc.h
+++ b/soc/arm/silabs_exx32/efr32fg13p/soc.h
@@ -13,7 +13,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/silabs_exx32/efr32fg13p/soc_pinmap.h b/soc/arm/silabs_exx32/efr32fg13p/soc_pinmap.h
index fa9731e2c8e..121ce8f3eff 100644
--- a/soc/arm/silabs_exx32/efr32fg13p/soc_pinmap.h
+++ b/soc/arm/silabs_exx32/efr32fg13p/soc_pinmap.h
@@ -13,7 +13,7 @@
 #ifndef _SILABS_EFR32FG13P_SOC_PINMAP_H_
 #define _SILABS_EFR32FG13P_SOC_PINMAP_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <soc.h>
 #include <em_gpio.h>
 
diff --git a/soc/arm/silabs_exx32/efr32fg1p/soc.h b/soc/arm/silabs_exx32/efr32fg1p/soc.h
index 944f2e83890..ab38b437547 100644
--- a/soc/arm/silabs_exx32/efr32fg1p/soc.h
+++ b/soc/arm/silabs_exx32/efr32fg1p/soc.h
@@ -13,7 +13,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/silabs_exx32/efr32fg1p/soc_pinmap.h b/soc/arm/silabs_exx32/efr32fg1p/soc_pinmap.h
index 3688bd3348f..e2f37564dc5 100644
--- a/soc/arm/silabs_exx32/efr32fg1p/soc_pinmap.h
+++ b/soc/arm/silabs_exx32/efr32fg1p/soc_pinmap.h
@@ -13,7 +13,7 @@
 #ifndef _SILABS_EFR32FG1P_SOC_PINMAP_H_
 #define _SILABS_EFR32FG1P_SOC_PINMAP_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <soc.h>
 #include <em_gpio.h>
 
diff --git a/soc/arm/silabs_exx32/efr32mg12p/soc.h b/soc/arm/silabs_exx32/efr32mg12p/soc.h
index 02a07333be8..a972999a941 100644
--- a/soc/arm/silabs_exx32/efr32mg12p/soc.h
+++ b/soc/arm/silabs_exx32/efr32mg12p/soc.h
@@ -13,7 +13,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/silabs_exx32/efr32mg12p/soc_pinmap.h b/soc/arm/silabs_exx32/efr32mg12p/soc_pinmap.h
index 5bc059a3a4f..70c0d44b29c 100644
--- a/soc/arm/silabs_exx32/efr32mg12p/soc_pinmap.h
+++ b/soc/arm/silabs_exx32/efr32mg12p/soc_pinmap.h
@@ -13,7 +13,7 @@
 #ifndef _SOC_PINMAP_H_
 #define _SOC_PINMAP_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <em_gpio.h>
 
 #define GPIO_NODE DT_INST(0, silabs_gecko_gpio)
diff --git a/soc/arm/silabs_exx32/efr32mg21/soc.h b/soc/arm/silabs_exx32/efr32mg21/soc.h
index 16d5703dbf6..16117e9e62e 100644
--- a/soc/arm/silabs_exx32/efr32mg21/soc.h
+++ b/soc/arm/silabs_exx32/efr32mg21/soc.h
@@ -13,7 +13,7 @@
 #ifndef ZEPHYR_SOC_ARM_SILABS_EXX32_EFR32MG21_SOC_H
 #define ZEPHYR_SOC_ARM_SILABS_EXX32_EFR32MG21_SOC_H
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/soc/arm/st_stm32/common/pinctrl_soc.h b/soc/arm/st_stm32/common/pinctrl_soc.h
index 9899260b50b..d7823dfe659 100644
--- a/soc/arm/st_stm32/common/pinctrl_soc.h
+++ b/soc/arm/st_stm32/common/pinctrl_soc.h
@@ -13,13 +13,13 @@
 #ifndef ZEPHYR_SOC_ARM_ST_STM32_COMMON_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_ARM_ST_STM32_COMMON_PINCTRL_SOC_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 
 #ifdef CONFIG_SOC_SERIES_STM32F1X
-#include <dt-bindings/pinctrl/stm32f1-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/stm32f1-pinctrl.h>
 #else
-#include <dt-bindings/pinctrl/stm32-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/stm32-pinctrl.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/soc/arm/st_stm32/common/soc_config.c b/soc/arm/st_stm32/common/soc_config.c
index b1130b32cd5..37cdfe7a5cb 100644
--- a/soc/arm/st_stm32/common/soc_config.c
+++ b/soc/arm/st_stm32/common/soc_config.c
@@ -8,10 +8,10 @@
  * @brief System module to support early STM32 MCU configuration
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 #include <stm32_ll_system.h>
 #include <stm32_ll_bus.h>
 
diff --git a/soc/arm/st_stm32/common/st_stm32_dt.h b/soc/arm/st_stm32/common/st_stm32_dt.h
index e83aa20af5d..7dc38393336 100644
--- a/soc/arm/st_stm32/common/st_stm32_dt.h
+++ b/soc/arm/st_stm32/common/st_stm32_dt.h
@@ -11,7 +11,7 @@
 #ifndef _ST_STM32_DT_H_
 #define _ST_STM32_DT_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 /* Devicetree related macros to construct pinctrl config data */
 
diff --git a/soc/arm/st_stm32/common/stm32_backup_sram.c b/soc/arm/st_stm32/common/stm32_backup_sram.c
index 675fa6c64f2..bead7977847 100644
--- a/soc/arm/st_stm32/common/stm32_backup_sram.c
+++ b/soc/arm/st_stm32/common/stm32_backup_sram.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT st_stm32_backup_sram
 
-#include <device.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
 #include <stm32_ll_pwr.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(stm32_backup_sram, CONFIG_SOC_LOG_LEVEL);
 
 struct stm32_backup_sram_config {
diff --git a/soc/arm/st_stm32/common/stm32_hsem.h b/soc/arm/st_stm32/common/stm32_hsem.h
index d47b21d43c9..0aa3c88f505 100644
--- a/soc/arm/st_stm32/common/stm32_hsem.h
+++ b/soc/arm/st_stm32/common/stm32_hsem.h
@@ -8,7 +8,7 @@
 
 #include <soc.h>
 #include <stm32_ll_hsem.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #if defined(CONFIG_SOC_SERIES_STM32WBX) || defined(CONFIG_STM32H7_DUAL_CORE)
 /** HW semaphore Complement ID list defined in hw_conf.h from STM32WB
diff --git a/soc/arm/st_stm32/common/stm32cube_hal.c b/soc/arm/st_stm32/common/stm32cube_hal.c
index 509d91f873e..5534f478c11 100644
--- a/soc/arm/st_stm32/common/stm32cube_hal.c
+++ b/soc/arm/st_stm32/common/stm32cube_hal.c
@@ -12,7 +12,7 @@
  *        implementations.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 /**
  * @brief This function configures the source of stm32cube time base.
diff --git a/soc/arm/st_stm32/stm32f0/soc.c b/soc/arm/st_stm32/stm32f0/soc.c
index f5f05086dca..f033f29bacc 100644
--- a/soc/arm/st_stm32/stm32f0/soc.c
+++ b/soc/arm/st_stm32/stm32f0/soc.c
@@ -9,12 +9,12 @@
  * @brief System/hardware module for STM32F0 processor
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <stm32_ll_system.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <linker/linker-defs.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/linker/linker-defs.h>
 #include <string.h>
 
 #if defined(CONFIG_SW_VECTOR_RELAY) || defined(CONFIG_SW_VECTOR_RELAY_CLIENT)
diff --git a/soc/arm/st_stm32/stm32f1/soc.c b/soc/arm/st_stm32/stm32f1/soc.c
index 009a0058bc6..1e1a0cba182 100644
--- a/soc/arm/st_stm32/stm32f1/soc.c
+++ b/soc/arm/st_stm32/stm32f1/soc.c
@@ -9,10 +9,10 @@
  * @brief System/hardware module for STM32F1 processor
  */
 
-#include <device.h>
-#include <init.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm/st_stm32/stm32f2/soc.c b/soc/arm/st_stm32/stm32f2/soc.c
index f919748fb36..7d3743b7a7c 100644
--- a/soc/arm/st_stm32/stm32f2/soc.c
+++ b/soc/arm/st_stm32/stm32f2/soc.c
@@ -9,14 +9,14 @@
  * @brief System/hardware module for stm32f2 processor
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#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>
 #include <stm32_ll_system.h>
-#include <linker/linker-defs.h>
+#include <zephyr/linker/linker-defs.h>
 #include <string.h>
 
 /**
diff --git a/soc/arm/st_stm32/stm32f3/soc.c b/soc/arm/st_stm32/stm32f3/soc.c
index a9f839ebdbc..fbcfcb29920 100644
--- a/soc/arm/st_stm32/stm32f3/soc.c
+++ b/soc/arm/st_stm32/stm32f3/soc.c
@@ -9,10 +9,10 @@
  * @brief System/hardware module for STM32F3 processor
  */
 
-#include <device.h>
-#include <init.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm/st_stm32/stm32f4/soc.c b/soc/arm/st_stm32/stm32f4/soc.c
index db7cfbbcbf6..329ca1f04a2 100644
--- a/soc/arm/st_stm32/stm32f4/soc.c
+++ b/soc/arm/st_stm32/stm32f4/soc.c
@@ -10,10 +10,10 @@
  * @brief System/hardware module for STM32F4 processor
  */
 
-#include <device.h>
-#include <init.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <stm32_ll_system.h>
 
 /**
diff --git a/soc/arm/st_stm32/stm32f7/soc.c b/soc/arm/st_stm32/stm32f7/soc.c
index 44f7bd53fbe..23c2cc67831 100644
--- a/soc/arm/st_stm32/stm32f7/soc.c
+++ b/soc/arm/st_stm32/stm32f7/soc.c
@@ -9,12 +9,12 @@
  * @brief System/hardware module for STM32F7 processor
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#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>
 #include <stm32_ll_system.h>
 
 /**
diff --git a/soc/arm/st_stm32/stm32g0/power.c b/soc/arm/st_stm32/stm32g0/power.c
index 84c08508fd9..73db2ff56c2 100644
--- a/soc/arm/st_stm32/stm32g0/power.c
+++ b/soc/arm/st_stm32/stm32g0/power.c
@@ -4,10 +4,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include <stm32g0xx_ll_utils.h>
 #include <stm32g0xx_ll_bus.h>
@@ -16,7 +16,7 @@
 #include <stm32g0xx_ll_system.h>
 #include <clock_control/clock_stm32_ll_common.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /* Invoke Low Power/System Off specific Tasks */
diff --git a/soc/arm/st_stm32/stm32g0/soc.c b/soc/arm/st_stm32/stm32g0/soc.c
index 7375c1b8b9a..c1dd58baeba 100644
--- a/soc/arm/st_stm32/stm32g0/soc.c
+++ b/soc/arm/st_stm32/stm32g0/soc.c
@@ -10,11 +10,11 @@
  * @brief System/hardware module for STM32G0 processor
  */
 
-#include <device.h>
-#include <init.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <linker/linker-defs.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/linker/linker-defs.h>
 #include <string.h>
 #if defined(SYSCFG_CFGR1_UCPD1_STROBE) || defined(SYSCFG_CFGR1_UCPD2_STROBE)
 #include <stm32_ll_system.h>
diff --git a/soc/arm/st_stm32/stm32g4/soc.c b/soc/arm/st_stm32/stm32g4/soc.c
index bd99612cb30..4d5b5d0d7ce 100644
--- a/soc/arm/st_stm32/stm32g4/soc.c
+++ b/soc/arm/st_stm32/stm32g4/soc.c
@@ -9,11 +9,11 @@
  * @brief System/hardware module for STM32G4 processor
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <stm32_ll_system.h>
-#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>
 
 #if defined(PWR_CR3_UCPD_DBDIS)
 #include <stm32_ll_bus.h>
diff --git a/soc/arm/st_stm32/stm32h7/mpu_regions.c b/soc/arm/st_stm32/stm32h7/mpu_regions.c
index 0b098f48c6a..2d424fc20f7 100644
--- a/soc/arm/st_stm32/stm32h7/mpu_regions.c
+++ b/soc/arm/st_stm32/stm32h7/mpu_regions.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include "../../common/cortex_m/arm_mpu_mem_cfg.h"
 
 static const struct arm_mpu_region mpu_regions[] = {
diff --git a/soc/arm/st_stm32/stm32h7/soc_m4.c b/soc/arm/st_stm32/stm32h7/soc_m4.c
index 68e5b9a2feb..070cfdf43c2 100644
--- a/soc/arm/st_stm32/stm32h7/soc_m4.c
+++ b/soc/arm/st_stm32/stm32h7/soc_m4.c
@@ -9,17 +9,17 @@
  * @brief System/hardware module for STM32H7 CM4 processor
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_cortex.h>
 #include <stm32_ll_pwr.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_system.h>
-#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>
 #include "stm32_hsem.h"
 
 /**
diff --git a/soc/arm/st_stm32/stm32h7/soc_m7.c b/soc/arm/st_stm32/stm32h7/soc_m7.c
index 88175985219..c428c252559 100644
--- a/soc/arm/st_stm32/stm32h7/soc_m7.c
+++ b/soc/arm/st_stm32/stm32h7/soc_m7.c
@@ -9,16 +9,16 @@
  * @brief System/hardware module for STM32H7 CM7 processor
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_pwr.h>
 #include <stm32_ll_rcc.h>
 #include <stm32_ll_system.h>
-#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>
 #include "stm32_hsem.h"
 
 #if defined(CONFIG_STM32H7_DUAL_CORE)
diff --git a/soc/arm/st_stm32/stm32l0/power.c b/soc/arm/st_stm32/stm32l0/power.c
index 603db5410fb..b82aff909a5 100644
--- a/soc/arm/st_stm32/stm32l0/power.c
+++ b/soc/arm/st_stm32/stm32l0/power.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include <stm32l0xx_ll_utils.h>
 #include <stm32l0xx_ll_bus.h>
@@ -15,9 +15,9 @@
 #include <stm32l0xx_ll_rcc.h>
 #include <stm32l0xx_ll_system.h>
 #include <clock_control/clock_stm32_ll_common.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /* Select MSI as wake-up system clock if configured, HSI otherwise */
diff --git a/soc/arm/st_stm32/stm32l0/soc.c b/soc/arm/st_stm32/stm32l0/soc.c
index 1504cb487d7..8c17dc31504 100644
--- a/soc/arm/st_stm32/stm32l0/soc.c
+++ b/soc/arm/st_stm32/stm32l0/soc.c
@@ -9,11 +9,11 @@
  * @brief System/hardware module for STM32L0 processor
  */
 
-#include <device.h>
-#include <init.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <linker/linker-defs.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/linker/linker-defs.h>
 #include <string.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_pwr.h>
diff --git a/soc/arm/st_stm32/stm32l1/soc.c b/soc/arm/st_stm32/stm32l1/soc.c
index 3798c68e135..2b90f486331 100644
--- a/soc/arm/st_stm32/stm32l1/soc.c
+++ b/soc/arm/st_stm32/stm32l1/soc.c
@@ -9,11 +9,11 @@
  * @brief System/hardware module for STM32L1 processor
  */
 
-#include <device.h>
-#include <init.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <linker/linker-defs.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/linker/linker-defs.h>
 #include <string.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_pwr.h>
diff --git a/soc/arm/st_stm32/stm32l4/power.c b/soc/arm/st_stm32/stm32l4/power.c
index f5090e988dc..1b8fea72a9a 100644
--- a/soc/arm/st_stm32/stm32l4/power.c
+++ b/soc/arm/st_stm32/stm32l4/power.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include <stm32l4xx_ll_utils.h>
 #include <stm32l4xx_ll_bus.h>
@@ -15,9 +15,9 @@
 #include <stm32l4xx_ll_rcc.h>
 #include <stm32l4xx_ll_system.h>
 #include <clock_control/clock_stm32_ll_common.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /* select MSI as wake-up system clock if configured, HSI otherwise */
diff --git a/soc/arm/st_stm32/stm32l4/soc.c b/soc/arm/st_stm32/stm32l4/soc.c
index 33c2e3a974a..5b708ba6b5a 100644
--- a/soc/arm/st_stm32/stm32l4/soc.c
+++ b/soc/arm/st_stm32/stm32l4/soc.c
@@ -10,11 +10,11 @@
  * @brief System/hardware module for STM32L4 processor
  */
 
-#include <device.h>
-#include <init.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
diff --git a/soc/arm/st_stm32/stm32l5/power.c b/soc/arm/st_stm32/stm32l5/power.c
index 20bd37e56e1..4e2358a8d03 100644
--- a/soc/arm/st_stm32/stm32l5/power.c
+++ b/soc/arm/st_stm32/stm32l5/power.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include <stm32l5xx_ll_utils.h>
 #include <stm32l5xx_ll_bus.h>
@@ -15,9 +15,9 @@
 #include <stm32l5xx_ll_rcc.h>
 #include <stm32l5xx_ll_system.h>
 #include <clock_control/clock_stm32_ll_common.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /* select MSI as wake-up system clock if configured, HSI otherwise */
diff --git a/soc/arm/st_stm32/stm32l5/soc.c b/soc/arm/st_stm32/stm32l5/soc.c
index 9af49e77d73..26c3c597ff6 100644
--- a/soc/arm/st_stm32/stm32l5/soc.c
+++ b/soc/arm/st_stm32/stm32l5/soc.c
@@ -9,14 +9,14 @@
  * @brief System/hardware module for STM32L5 processor
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_pwr.h>
-#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>
 #include <stm32l5xx_ll_icache.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
diff --git a/soc/arm/st_stm32/stm32mp1/soc.c b/soc/arm/st_stm32/stm32mp1/soc.c
index 9eeb2fd8f25..9ab5946100b 100644
--- a/soc/arm/st_stm32/stm32mp1/soc.c
+++ b/soc/arm/st_stm32/stm32mp1/soc.c
@@ -9,13 +9,13 @@
  * @brief System/hardware module for STM32L4 processor
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <stm32_ll_bus.h>
-#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>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm/st_stm32/stm32u5/power.c b/soc/arm/st_stm32/stm32u5/power.c
index a09d025d2a0..b0d01e9d63d 100644
--- a/soc/arm/st_stm32/stm32u5/power.c
+++ b/soc/arm/st_stm32/stm32u5/power.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include <stm32u5xx_ll_utils.h>
 #include <stm32u5xx_ll_bus.h>
@@ -16,7 +16,7 @@
 #include <stm32u5xx_ll_system.h>
 #include <clock_control/clock_stm32_ll_common.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /* select MSI as wake-up system clock if configured, HSI otherwise */
diff --git a/soc/arm/st_stm32/stm32u5/soc.c b/soc/arm/st_stm32/stm32u5/soc.c
index a81800dc9c0..6089a488a3f 100644
--- a/soc/arm/st_stm32/stm32u5/soc.c
+++ b/soc/arm/st_stm32/stm32u5/soc.c
@@ -9,15 +9,15 @@
  * @brief System/hardware module for STM32U5 processor
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_pwr.h>
 #include <stm32_ll_icache.h>
-#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>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
diff --git a/soc/arm/st_stm32/stm32wb/power.c b/soc/arm/st_stm32/stm32wb/power.c
index c870e36f0c9..a48ddc332c4 100644
--- a/soc/arm/st_stm32/stm32wb/power.c
+++ b/soc/arm/st_stm32/stm32wb/power.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include <stm32wbxx_ll_utils.h>
 #include <stm32wbxx_ll_bus.h>
@@ -16,7 +16,7 @@
 #include <clock_control/clock_stm32_ll_common.h>
 #include "stm32_hsem.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /*
diff --git a/soc/arm/st_stm32/stm32wb/soc.c b/soc/arm/st_stm32/stm32wb/soc.c
index c4068ea2ef9..3d195133075 100644
--- a/soc/arm/st_stm32/stm32wb/soc.c
+++ b/soc/arm/st_stm32/stm32wb/soc.c
@@ -9,11 +9,11 @@
  * @brief System/hardware module for STM32WB processor
  */
 
-#include <device.h>
-#include <init.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
diff --git a/soc/arm/st_stm32/stm32wl/power.c b/soc/arm/st_stm32/stm32wl/power.c
index d1e19a65ba2..bb79260aaf7 100644
--- a/soc/arm/st_stm32/stm32wl/power.c
+++ b/soc/arm/st_stm32/stm32wl/power.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <pm/pm.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include <stm32wlxx_ll_utils.h>
 #include <stm32wlxx_ll_bus.h>
@@ -15,9 +15,9 @@
 #include <stm32wlxx_ll_rcc.h>
 #include <stm32wlxx_ll_system.h>
 #include <clock_control/clock_stm32_ll_common.h>
-#include <drivers/clock_control/stm32_clock_control.h>
+#include <zephyr/drivers/clock_control/stm32_clock_control.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
 /* select MSI as wake-up system clock if configured, HSI otherwise */
diff --git a/soc/arm/st_stm32/stm32wl/soc.c b/soc/arm/st_stm32/stm32wl/soc.c
index 39aac7179ec..bb7fc7f5d16 100644
--- a/soc/arm/st_stm32/stm32wl/soc.c
+++ b/soc/arm/st_stm32/stm32wl/soc.c
@@ -9,10 +9,10 @@
  * @brief System/hardware module for STM32WL processor
  */
 
-#include <device.h>
-#include <init.h>
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <stm32wlxx_ll_system.h>
 
 /**
diff --git a/soc/arm/ti_lm3s6965/soc.c b/soc/arm/ti_lm3s6965/soc.c
index 116d3161048..19887aafcb1 100644
--- a/soc/arm/ti_lm3s6965/soc.c
+++ b/soc/arm/ti_lm3s6965/soc.c
@@ -12,12 +12,12 @@
  * for the ti_lm3s6965 platform.
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 /**
  *
diff --git a/soc/arm/ti_lm3s6965/soc.h b/soc/arm/ti_lm3s6965/soc.h
index 2338f9106ae..bef939013ba 100644
--- a/soc/arm/ti_lm3s6965/soc.h
+++ b/soc/arm/ti_lm3s6965/soc.h
@@ -15,7 +15,7 @@
 #ifndef _BOARD__H_
 #define _BOARD__H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 /* default system clock */
 
diff --git a/soc/arm/ti_lm3s6965/soc_config.c b/soc/arm/ti_lm3s6965/soc_config.c
index e57a36c161a..d8ddc9330c1 100644
--- a/soc/arm/ti_lm3s6965/soc_config.c
+++ b/soc/arm/ti_lm3s6965/soc_config.c
@@ -8,15 +8,15 @@
  * @file Board config file
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include "soc.h"
 
 #ifdef CONFIG_UART_STELLARIS
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 
 #define RCGC1 (*((volatile uint32_t *)0x400FE104))
 
diff --git a/soc/arm/ti_lm3s6965/sys_arch_reboot.c b/soc/arm/ti_lm3s6965/sys_arch_reboot.c
index 72bf6e26f51..341f26218ed 100644
--- a/soc/arm/ti_lm3s6965/sys_arch_reboot.c
+++ b/soc/arm/ti_lm3s6965/sys_arch_reboot.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/util.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 /**
  *
diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c b/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c
index 7fe95635092..5fdc3b4732b 100644
--- a/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c
+++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <init.h>
-#include <pm/pm.h>
-#include <pm/policy.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
+#include <zephyr/pm/pm.h>
+#include <zephyr/pm/policy.h>
 
 #include <driverlib/pwr_ctrl.h>
 #include <driverlib/sys_ctrl.h>
@@ -20,7 +20,7 @@
 #include <ti/devices/cc13x2_cc26x2/driverlib/vims.h>
 #include <ti/devices/cc13x2_cc26x2/driverlib/sys_ctrl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
 
diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/soc.c b/soc/arm/ti_simplelink/cc13x2_cc26x2/soc.c
index 7ddd376378c..a19398ee03d 100644
--- a/soc/arm/ti_simplelink/cc13x2_cc26x2/soc.c
+++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/soc.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 
 #include <driverlib/setup.h>
 
diff --git a/soc/arm/ti_simplelink/cc32xx/soc.c b/soc/arm/ti_simplelink/cc32xx/soc.c
index 684dc101a9a..49bbde5074e 100644
--- a/soc/arm/ti_simplelink/cc32xx/soc.c
+++ b/soc/arm/ti_simplelink/cc32xx/soc.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include <driverlib/rom.h>
 #include <driverlib/rom_map.h>
diff --git a/soc/arm/ti_simplelink/msp432p4xx/soc.c b/soc/arm/ti_simplelink/msp432p4xx/soc.c
index 471179779ba..73d1a8dc13e 100644
--- a/soc/arm/ti_simplelink/msp432p4xx/soc.c
+++ b/soc/arm/ti_simplelink/msp432p4xx/soc.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
 static int ti_msp432p4xx_init(const struct device *arg)
diff --git a/soc/arm/xilinx_zynq7000/xc7zxxx/soc.c b/soc/arm/xilinx_zynq7000/xc7zxxx/soc.c
index 0232904ba02..5a39592daa1 100644
--- a/soc/arm/xilinx_zynq7000/xc7zxxx/soc.c
+++ b/soc/arm/xilinx_zynq7000/xc7zxxx/soc.c
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <devicetree.h>
-#include <init.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/util.h>
 
-#include <arch/arm/aarch32/mmu/arm_mmu.h>
+#include <zephyr/arch/arm/aarch32/mmu/arm_mmu.h>
 #include "soc.h"
 
 static const struct arm_mmu_region mmu_regions[] = {
diff --git a/soc/arm/xilinx_zynq7000/xc7zxxxs/soc.c b/soc/arm/xilinx_zynq7000/xc7zxxxs/soc.c
index b30575a8eac..44793db973b 100644
--- a/soc/arm/xilinx_zynq7000/xc7zxxxs/soc.c
+++ b/soc/arm/xilinx_zynq7000/xc7zxxxs/soc.c
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <devicetree.h>
-#include <init.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/util.h>
 
-#include <arch/arm/aarch32/mmu/arm_mmu.h>
+#include <zephyr/arch/arm/aarch32/mmu/arm_mmu.h>
 #include "soc.h"
 
 static const struct arm_mmu_region mmu_regions[] = {
diff --git a/soc/arm/xilinx_zynqmp/arm_mpu_regions.c b/soc/arm/xilinx_zynqmp/arm_mpu_regions.c
index d2d174e7903..7e0b6e3cd63 100644
--- a/soc/arm/xilinx_zynqmp/arm_mpu_regions.c
+++ b/soc/arm/xilinx_zynqmp/arm_mpu_regions.c
@@ -3,8 +3,8 @@
  * Copyright (c) 2021 Lexmark International, Inc.
  */
 
-#include <kernel.h>
-#include <arch/arm/aarch32/mpu/arm_mpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h>
 
 #define MPUTYPE_READ_ONLY \
 	{ \
diff --git a/soc/arm/xilinx_zynqmp/soc.c b/soc/arm/xilinx_zynqmp/soc.c
index cdf996c4df4..c5d6b7ce567 100644
--- a/soc/arm/xilinx_zynqmp/soc.c
+++ b/soc/arm/xilinx_zynqmp/soc.c
@@ -5,10 +5,10 @@
  *
  */
 
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <arch/arm/aarch32/cortex_a_r/cmsis.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/arch/arm/aarch32/cortex_a_r/cmsis.h>
 
 /**
  *
diff --git a/soc/arm64/arm/fvp_aemv8a/mmu_regions.c b/soc/arm64/arm/fvp_aemv8a/mmu_regions.c
index fa680d4bc10..80f0f20c8a7 100644
--- a/soc/arm64/arm/fvp_aemv8a/mmu_regions.c
+++ b/soc/arm64/arm/fvp_aemv8a/mmu_regions.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <soc.h>
-#include <arch/arm64/arm_mmu.h>
+#include <zephyr/arch/arm64/arm_mmu.h>
 
 static const struct arm_mmu_region mmu_regions[] = {
 
diff --git a/soc/arm64/arm/fvp_aemv8a/soc.h b/soc/arm64/arm/fvp_aemv8a/soc.h
index aeba7298aaf..4ca09457fb5 100644
--- a/soc/arm64/arm/fvp_aemv8a/soc.h
+++ b/soc/arm64/arm/fvp_aemv8a/soc.h
@@ -8,11 +8,11 @@
 #ifndef _SOC_H_
 #define _SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
-#include <device.h>
+#include <zephyr/device.h>
 
 #endif /* !_ASMLANGUAGE */
 
diff --git a/soc/arm64/arm/fvp_aemv8r/arm_mpu_regions.c b/soc/arm64/arm/fvp_aemv8r/arm_mpu_regions.c
index d4bfc0f5035..ba75ef842b0 100644
--- a/soc/arm64/arm/fvp_aemv8r/arm_mpu_regions.c
+++ b/soc/arm64/arm/fvp_aemv8r/arm_mpu_regions.c
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/slist.h>
-#include <linker/linker-defs.h>
-#include <arch/arm64/cortex_r/arm_mpu.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/arch/arm64/cortex_r/arm_mpu.h>
 
 
 #define DEVICE_REGION_START 0x80000000UL
diff --git a/soc/arm64/arm/fvp_aemv8r/soc.c b/soc/arm64/arm/fvp_aemv8r/soc.c
index fd2633cb554..aaeac862875 100644
--- a/soc/arm64/arm/fvp_aemv8r/soc.c
+++ b/soc/arm64/arm/fvp_aemv8r/soc.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #ifdef CONFIG_SOC_FVP_AEMV8R_EL2_INIT
 
diff --git a/soc/arm64/bcm_vk/viper/mmu_regions.c b/soc/arm64/bcm_vk/viper/mmu_regions.c
index 6bdc0602d93..badad6daea8 100644
--- a/soc/arm64/bcm_vk/viper/mmu_regions.c
+++ b/soc/arm64/bcm_vk/viper/mmu_regions.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <soc.h>
-#include <sys/util.h>
-#include <arch/arm64/arm_mmu.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/arch/arm64/arm_mmu.h>
 
 
 #define PCIE_OB_HIGHMEM_ADDR	DT_REG_ADDR_BY_NAME(DT_NODELABEL(pcie0_ep), \
diff --git a/soc/arm64/bcm_vk/viper/plat_core.c b/soc/arm64/bcm_vk/viper/plat_core.c
index 07640ee969f..88188c9e45e 100644
--- a/soc/arm64/bcm_vk/viper/plat_core.c
+++ b/soc/arm64/bcm_vk/viper/plat_core.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 
 void z_arm64_el3_plat_init(void)
 {
diff --git a/soc/arm64/bcm_vk/viper/soc.c b/soc/arm64/bcm_vk/viper/soc.c
index 75d929063ce..d0f20936b0c 100644
--- a/soc/arm64/bcm_vk/viper/soc.c
+++ b/soc/arm64/bcm_vk/viper/soc.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm64/bcm_vk/viper/soc.h b/soc/arm64/bcm_vk/viper/soc.h
index 5fcbc283083..585cd15a72d 100644
--- a/soc/arm64/bcm_vk/viper/soc.h
+++ b/soc/arm64/bcm_vk/viper/soc.h
@@ -7,8 +7,8 @@
 #ifndef SOC_H
 #define SOC_H
 
-#include <sys/util.h>
-#include <toolchain.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/toolchain.h>
 
 /* Registers block */
 #define CRMU_MCU_EXTRA_EVENT_STATUS	0x40070054
diff --git a/soc/arm64/intel_socfpga/agilex/mmu_regions.c b/soc/arm64/intel_socfpga/agilex/mmu_regions.c
index f7e67a835d6..36ecb44ac11 100644
--- a/soc/arm64/intel_socfpga/agilex/mmu_regions.c
+++ b/soc/arm64/intel_socfpga/agilex/mmu_regions.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/cpu.h>
-#include <arch/arm64/arm_mmu.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm64/arm_mmu.h>
 
 static const struct arm_mmu_region mmu_regions[] = {
 
diff --git a/soc/arm64/nxp_imx/imx8m/dummy.c b/soc/arm64/nxp_imx/imx8m/dummy.c
index a35d637c7ed..de7d7afd623 100644
--- a/soc/arm64/nxp_imx/imx8m/dummy.c
+++ b/soc/arm64/nxp_imx/imx8m/dummy.c
@@ -8,9 +8,9 @@
 
 #define DT_DRV_COMPAT nxp_imx_iuart
 
-#include <device.h>
-#include <drivers/uart.h>
-#include <drivers/clock_control.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/clock_control.h>
 #include <errno.h>
 #include <soc.h>
 
diff --git a/soc/arm64/nxp_imx/imx8m/mmu_regions.c b/soc/arm64/nxp_imx/imx8m/mmu_regions.c
index 67fee46f1ef..824dc412fd4 100644
--- a/soc/arm64/nxp_imx/imx8m/mmu_regions.c
+++ b/soc/arm64/nxp_imx/imx8m/mmu_regions.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <arch/arm64/arm_mmu.h>
+#include <zephyr/arch/arm64/arm_mmu.h>
 
 static const struct arm_mmu_region mmu_regions[] = {
 
diff --git a/soc/arm64/nxp_imx/imx8m/soc.h b/soc/arm64/nxp_imx/imx8m/soc.h
index 3ca14cc6fdd..f39ad5bf52e 100644
--- a/soc/arm64/nxp_imx/imx8m/soc.h
+++ b/soc/arm64/nxp_imx/imx8m/soc.h
@@ -7,8 +7,8 @@
 #ifndef SOC_H
 #define SOC_H
 
-#include <sys/util.h>
-#include <toolchain.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/toolchain.h>
 
 /* TODO: Place Holder */
 
diff --git a/soc/arm64/nxp_layerscape/ls1046a/mmu_regions.c b/soc/arm64/nxp_layerscape/ls1046a/mmu_regions.c
index 87f146fd4c0..eee32ac43b7 100644
--- a/soc/arm64/nxp_layerscape/ls1046a/mmu_regions.c
+++ b/soc/arm64/nxp_layerscape/ls1046a/mmu_regions.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <soc.h>
-#include <sys/util.h>
-#include <arch/arm64/arm_mmu.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/arch/arm64/arm_mmu.h>
 
 static const struct arm_mmu_region mmu_regions[] = {
 
diff --git a/soc/arm64/nxp_layerscape/ls1046a/soc.c b/soc/arm64/nxp_layerscape/ls1046a/soc.c
index 3a3fed8ae90..30d2f97af60 100644
--- a/soc/arm64/nxp_layerscape/ls1046a/soc.c
+++ b/soc/arm64/nxp_layerscape/ls1046a/soc.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
-#include <arch/cpu.h>
+#include <zephyr/arch/cpu.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm64/nxp_layerscape/ls1046a/soc.h b/soc/arm64/nxp_layerscape/ls1046a/soc.h
index e39112c1bc3..accb84874fe 100644
--- a/soc/arm64/nxp_layerscape/ls1046a/soc.h
+++ b/soc/arm64/nxp_layerscape/ls1046a/soc.h
@@ -7,8 +7,8 @@
 #ifndef SOC_H
 #define SOC_H
 
-#include <sys/util.h>
-#include <toolchain.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/toolchain.h>
 
 #ifndef _ASMLANGUAGE
 #endif /* _ASMLANGUAGE */
diff --git a/soc/arm64/qemu_cortex_a53/mmu_regions.c b/soc/arm64/qemu_cortex_a53/mmu_regions.c
index d5083890ba0..9d4cc7cf7ba 100644
--- a/soc/arm64/qemu_cortex_a53/mmu_regions.c
+++ b/soc/arm64/qemu_cortex_a53/mmu_regions.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <soc.h>
-#include <arch/arm64/arm_mmu.h>
+#include <zephyr/arch/arm64/arm_mmu.h>
 
 #define SZ_1K	1024
 
diff --git a/soc/arm64/qemu_cortex_a53/plat_core.c b/soc/arm64/qemu_cortex_a53/plat_core.c
index 6490fb10694..8c5978543e6 100644
--- a/soc/arm64/qemu_cortex_a53/plat_core.c
+++ b/soc/arm64/qemu_cortex_a53/plat_core.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/arch/cpu.h>
 
 void z_arm64_el3_plat_init(void)
 {
diff --git a/soc/arm64/qemu_cortex_a53/soc.h b/soc/arm64/qemu_cortex_a53/soc.h
index 889f634fe3e..3a90f252da4 100644
--- a/soc/arm64/qemu_cortex_a53/soc.h
+++ b/soc/arm64/qemu_cortex_a53/soc.h
@@ -8,11 +8,11 @@
 #ifndef _SOC_H_
 #define _SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
-#include <device.h>
+#include <zephyr/device.h>
 
 #endif /* !_ASMLANGUAGE */
 
diff --git a/soc/arm64/xenvm/mmu_regions.c b/soc/arm64/xenvm/mmu_regions.c
index c4d3eee5d02..97e6e7cdf86 100644
--- a/soc/arm64/xenvm/mmu_regions.c
+++ b/soc/arm64/xenvm/mmu_regions.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <devicetree.h>
-#include <sys/util.h>
-#include <arch/arm64/arm_mmu.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/arch/arm64/arm_mmu.h>
 
 static const struct arm_mmu_region mmu_regions[] = {
 
diff --git a/soc/arm64/xenvm/soc.h b/soc/arm64/xenvm/soc.h
index 405074371db..faa3f3c40b2 100644
--- a/soc/arm64/xenvm/soc.h
+++ b/soc/arm64/xenvm/soc.h
@@ -8,11 +8,11 @@
 #ifndef _SOC_H_
 #define _SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
 
-#include <device.h>
+#include <zephyr/device.h>
 
 #endif /* !_ASMLANGUAGE */
 
diff --git a/soc/posix/inf_clock/posix_soc.h b/soc/posix/inf_clock/posix_soc.h
index 3ee9df787f4..8c0c16f5952 100644
--- a/soc/posix/inf_clock/posix_soc.h
+++ b/soc/posix/inf_clock/posix_soc.h
@@ -7,7 +7,7 @@
 #ifndef _POSIX_POSIX_SOC_INF_CLOCK_H
 #define _POSIX_POSIX_SOC_INF_CLOCK_H
 
-#include <arch/posix/posix_soc_if.h>
+#include <zephyr/arch/posix/posix_soc_if.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/posix/inf_clock/soc.c b/soc/posix/inf_clock/soc.c
index 13a7cc11a86..ffd901ad7dc 100644
--- a/soc/posix/inf_clock/soc.c
+++ b/soc/posix/inf_clock/soc.c
@@ -27,7 +27,7 @@
 #include <pthread.h>
 #include <stdbool.h>
 #include <unistd.h>
-#include <arch/posix/posix_soc_if.h>
+#include <zephyr/arch/posix/posix_soc_if.h>
 #include "posix_soc.h"
 #include "posix_board_if.h"
 #include "posix_core.h"
diff --git a/soc/posix/inf_clock/soc.h b/soc/posix/inf_clock/soc.h
index 455b8d0fdd5..fb79b7e1bee 100644
--- a/soc/posix/inf_clock/soc.h
+++ b/soc/posix/inf_clock/soc.h
@@ -7,7 +7,7 @@
 #ifndef _POSIX_SOC_INF_CLOCK_SOC_H
 #define _POSIX_SOC_INF_CLOCK_SOC_H
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include "board_soc.h"
 #include "posix_soc.h"
 
diff --git a/soc/riscv/esp32c3/idle.c b/soc/riscv/esp32c3/idle.c
index df23d5a02ee..1bfb2832187 100644
--- a/soc/riscv/esp32c3/idle.c
+++ b/soc/riscv/esp32c3/idle.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <irq.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/irq.h>
+#include <zephyr/arch/cpu.h>
 
 /**
  * @brief Power save idle routine
diff --git a/soc/riscv/esp32c3/loader.c b/soc/riscv/esp32c3/loader.c
index 350c4da22e2..49a4121a98c 100644
--- a/soc/riscv/esp32c3/loader.c
+++ b/soc/riscv/esp32c3/loader.c
@@ -9,9 +9,9 @@
 #include "soc/extmem_reg.h"
 #include <bootloader_flash_priv.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 #include <esp_log.h>
 #include <stdlib.h>
 
diff --git a/soc/riscv/esp32c3/pinctrl_soc.h b/soc/riscv/esp32c3/pinctrl_soc.h
index afe5bb157c9..dc4bf442bc5 100644
--- a/soc/riscv/esp32c3/pinctrl_soc.h
+++ b/soc/riscv/esp32c3/pinctrl_soc.h
@@ -12,10 +12,10 @@
 #ifndef ZEPHYR_SOC_RISCV_ESP32C3_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_RISCV_ESP32C3_PINCTRL_SOC_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 
-#include <dt-bindings/pinctrl/esp-pinctrl-common.h>
+#include <zephyr/dt-bindings/pinctrl/esp-pinctrl-common.h>
 
 /** @cond INTERNAL_HIDDEN */
 
diff --git a/soc/riscv/esp32c3/soc.c b/soc/riscv/esp32c3/soc.c
index 1eae4875c13..cbedde5f162 100644
--- a/soc/riscv/esp32c3/soc.c
+++ b/soc/riscv/esp32c3/soc.c
@@ -14,12 +14,12 @@
 #include "hal/soc_ll.h"
 #include "esp_spi_flash.h"
 #include <soc/interrupt_reg.h>
-#include <drivers/interrupt_controller/intc_esp32c3.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
 
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <string.h>
-#include <toolchain/gcc.h>
+#include <zephyr/toolchain/gcc.h>
 #include <soc.h>
 
 /*
diff --git a/soc/riscv/esp32c3/soc.h b/soc/riscv/esp32c3/soc.h
index 2da190d338b..c5506a6e89e 100644
--- a/soc/riscv/esp32c3/soc.h
+++ b/soc/riscv/esp32c3/soc.h
@@ -15,7 +15,7 @@
 #include <esp_clk.h>
 #endif
 
-#include <arch/riscv/arch.h>
+#include <zephyr/arch/riscv/arch.h>
 
 /* IRQ numbers */
 #define RISCV_MACHINE_SOFT_IRQ 3 /* Machine Software Interrupt */
diff --git a/soc/riscv/esp32c3/soc_irq.c b/soc/riscv/esp32c3/soc_irq.c
index 01fcf5fa53e..5b103696f07 100644
--- a/soc/riscv/esp32c3/soc_irq.c
+++ b/soc/riscv/esp32c3/soc_irq.c
@@ -14,11 +14,11 @@
 #include <riscv/interrupt.h>
 #include <soc/interrupt_reg.h>
 #include <soc/periph_defs.h>
-#include <drivers/interrupt_controller/intc_esp32c3.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
 
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <string.h>
-#include <toolchain/gcc.h>
+#include <zephyr/toolchain/gcc.h>
 #include <soc.h>
 
 #define ESP32C3_INTSTATUS_SLOT1_THRESHOLD	32
diff --git a/soc/riscv/litex-vexriscv/soc.h b/soc/riscv/litex-vexriscv/soc.h
index 870af481cac..1db93f64e8d 100644
--- a/soc/riscv/litex-vexriscv/soc.h
+++ b/soc/riscv/litex-vexriscv/soc.h
@@ -8,7 +8,7 @@
 #define __RISCV32_LITEX_VEXRISCV_SOC_H_
 
 #include "../riscv-privilege/common/soc_common.h"
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 /* lib-c hooks required RAM defined variables */
 #define RISCV_RAM_BASE              DT_REG_ADDR(DT_INST(0, mmio_sram))
diff --git a/soc/riscv/openisa_rv32m1/soc.c b/soc/riscv/openisa_rv32m1/soc.c
index d97a031a931..8c4badcab2f 100644
--- a/soc/riscv/openisa_rv32m1/soc.c
+++ b/soc/riscv/openisa_rv32m1/soc.c
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <fsl_clock.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #if defined(CONFIG_MULTI_LEVEL_INTERRUPTS)
 #include <errno.h>
-#include <irq_nextlevel.h>
+#include <zephyr/irq_nextlevel.h>
 #endif
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(soc);
 
 #define SCG_LPFLL_DISABLE 0U
diff --git a/soc/riscv/riscv-ite/common/check_regs.c b/soc/riscv/riscv-ite/common/check_regs.c
index 3737a2a01b5..a177eb52b7f 100644
--- a/soc/riscv/riscv-ite/common/check_regs.c
+++ b/soc/riscv/riscv-ite/common/check_regs.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
 
 /* SMFI register structure check */
diff --git a/soc/riscv/riscv-ite/common/chip_chipregs.h b/soc/riscv/riscv-ite/common/chip_chipregs.h
index a29d4084b26..0fc6ad0b251 100644
--- a/soc/riscv/riscv-ite/common/chip_chipregs.h
+++ b/soc/riscv/riscv-ite/common/chip_chipregs.h
@@ -6,7 +6,7 @@
 #ifndef CHIP_CHIPREGS_H
 #define CHIP_CHIPREGS_H
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #define EC_REG_BASE_ADDR 0x00f00000
 
diff --git a/soc/riscv/riscv-ite/common/power.c b/soc/riscv/riscv-ite/common/power.c
index 0a57268ebc7..ae95d44a53b 100644
--- a/soc/riscv/riscv-ite/common/power.c
+++ b/soc/riscv/riscv-ite/common/power.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <pm/pm.h>
+#include <zephyr/kernel.h>
+#include <zephyr/pm/pm.h>
 #include <soc.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 /* Handle when enter deep doze mode. */
 static void ite_power_soc_deep_doze(void)
diff --git a/soc/riscv/riscv-ite/common/soc_common_irq.c b/soc/riscv/riscv-ite/common/soc_common_irq.c
index c5ffa2c1fc9..6dabdd4da34 100644
--- a/soc/riscv/riscv-ite/common/soc_common_irq.c
+++ b/soc/riscv/riscv-ite/common/soc_common_irq.c
@@ -9,7 +9,7 @@
  * @brief interrupt management code for riscv SOCs supporting the riscv
 	  privileged architecture specification
  */
-#include <irq.h>
+#include <zephyr/irq.h>
 
 void arch_irq_enable(unsigned int irq)
 {
diff --git a/soc/riscv/riscv-ite/common/soc_espi.h b/soc/riscv/riscv-ite/common/soc_espi.h
index 2273680273c..6a0af2103dc 100644
--- a/soc/riscv/riscv-ite/common/soc_espi.h
+++ b/soc/riscv/riscv-ite/common/soc_espi.h
@@ -7,8 +7,8 @@
 #ifndef _ITE_IT8XXX2_SOC_ESPI_H_
 #define _ITE_IT8XXX2_SOC_ESPI_H_
 
-#include <device.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/util.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/riscv/riscv-ite/it8xxx2/soc.c b/soc/riscv/riscv-ite/it8xxx2/soc.c
index d1219787499..6653ebd8d2c 100644
--- a/soc/riscv/riscv-ite/it8xxx2/soc.c
+++ b/soc/riscv/riscv-ite/it8xxx2/soc.c
@@ -5,13 +5,13 @@
  *
  */
 
-#include <arch/riscv/csr.h>
-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/arch/riscv/csr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <soc.h>
 #include "soc_espi.h"
-#include <dt-bindings/interrupt-controller/ite-intc.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-intc.h>
 
 #ifdef CONFIG_SOC_IT8XXX2_PLL_FLASH_48M
 #define __intc_ram_code __attribute__((section(".__ram_code")))
diff --git a/soc/riscv/riscv-privilege/andes_v5/l2_cache.c b/soc/riscv/riscv-privilege/andes_v5/l2_cache.c
index 50e8e974a53..b90b9efe301 100644
--- a/soc/riscv/riscv-privilege/andes_v5/l2_cache.c
+++ b/soc/riscv/riscv-privilege/andes_v5/l2_cache.c
@@ -10,9 +10,9 @@
  * @brief Andes V5 L2 Cache Controller driver
  */
 
-#include <init.h>
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 #include <soc.h>
 
 /*
diff --git a/soc/riscv/riscv-privilege/andes_v5/pma.c b/soc/riscv/riscv-privilege/andes_v5/pma.c
index 9b4c7c45f3d..12b170d0f4b 100644
--- a/soc/riscv/riscv-privilege/andes_v5/pma.c
+++ b/soc/riscv/riscv-privilege/andes_v5/pma.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <linker/linker-defs.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/linker/linker-defs.h>
 
 /* Programmable PMA mechanism is supported */
 #define MMSC_CFG_PPMA		(1 << 30)
diff --git a/soc/riscv/riscv-privilege/andes_v5/smu.h b/soc/riscv/riscv-privilege/andes_v5/smu.h
index d4657124f90..72e24646997 100644
--- a/soc/riscv/riscv-privilege/andes_v5/smu.h
+++ b/soc/riscv/riscv-privilege/andes_v5/smu.h
@@ -11,8 +11,8 @@
 #ifndef SOC_RISCV_ANDES_V5_SMU_H_
 #define SOC_RISCV_ANDES_V5_SMU_H_
 
-#include <devicetree.h>
-#include <sys/util_macro.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util_macro.h>
 
 /*
  * SMU Register Base Address
diff --git a/soc/riscv/riscv-privilege/common/idle.c b/soc/riscv/riscv-privilege/common/idle.c
index 04b0c6ddfa1..e61ce72b280 100644
--- a/soc/riscv/riscv-privilege/common/idle.c
+++ b/soc/riscv/riscv-privilege/common/idle.c
@@ -5,11 +5,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
-#include <irq.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/irq.h>
+#include <zephyr/arch/cpu.h>
 
-#include <tracing/tracing.h>
+#include <zephyr/tracing/tracing.h>
 
 static ALWAYS_INLINE void riscv_idle(unsigned int key)
 {
diff --git a/soc/riscv/riscv-privilege/common/nuclei/nuclei_csr.h b/soc/riscv/riscv-privilege/common/nuclei/nuclei_csr.h
index e245cf255f8..edf10a4d92d 100644
--- a/soc/riscv/riscv-privilege/common/nuclei/nuclei_csr.h
+++ b/soc/riscv/riscv-privilege/common/nuclei/nuclei_csr.h
@@ -16,7 +16,7 @@
 #ifndef ZEPHYR_SOC_RISCV_RISCV_PRIVILEGE_COMMON_NUCLEI_NUCLEI_CSR_H_
 #define ZEPHYR_SOC_RISCV_RISCV_PRIVILEGE_COMMON_NUCLEI_NUCLEI_CSR_H_
 
-#include <sys/util_macro.h>
+#include <zephyr/sys/util_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soc/riscv/riscv-privilege/common/soc_common_irq.c b/soc/riscv/riscv-privilege/common/soc_common_irq.c
index 03ac8dcda20..6060ae2477f 100644
--- a/soc/riscv/riscv-privilege/common/soc_common_irq.c
+++ b/soc/riscv/riscv-privilege/common/soc_common_irq.c
@@ -9,7 +9,7 @@
  * @brief interrupt management code for riscv SOCs supporting the riscv
 	  privileged architecture specification
  */
-#include <irq.h>
+#include <zephyr/irq.h>
 
 void arch_irq_enable(unsigned int irq)
 {
diff --git a/soc/riscv/riscv-privilege/gd32vf103/pinctrl_soc.h b/soc/riscv/riscv-privilege/gd32vf103/pinctrl_soc.h
index 5feaded106f..fd566891bc8 100644
--- a/soc/riscv/riscv-privilege/gd32vf103/pinctrl_soc.h
+++ b/soc/riscv/riscv-privilege/gd32vf103/pinctrl_soc.h
@@ -12,6 +12,6 @@
 #ifndef ZEPHYR_SOC_RISCV_RISCV_PRIVILEGE_NUCLEI_GD32VF103_COMMON_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_RISCV_RISCV_PRIVILEGE_NUCLEI_GD32VF103_COMMON_PINCTRL_SOC_H_
 
-#include <drivers/pinctrl/pinctrl_soc_gd32_common.h>
+#include <zephyr/drivers/pinctrl/pinctrl_soc_gd32_common.h>
 
 #endif /* ZEPHYR_SOC_RISCV_RISCV_PRIVILEGE_NUCLEI_GD32VF103_COMMON_PINCTRL_SOC_H_ */
diff --git a/soc/riscv/riscv-privilege/gd32vf103/soc.c b/soc/riscv/riscv-privilege/gd32vf103/soc.c
index 59cd511e43f..5abd982441a 100644
--- a/soc/riscv/riscv-privilege/gd32vf103/soc.c
+++ b/soc/riscv/riscv-privilege/gd32vf103/soc.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 
 static int gigadevice_gd32v_soc_init(const struct device *dev)
 {
diff --git a/soc/riscv/riscv-privilege/gd32vf103/soc.h b/soc/riscv/riscv-privilege/gd32vf103/soc.h
index ff994ee2cc1..cf932a7967e 100644
--- a/soc/riscv/riscv-privilege/gd32vf103/soc.h
+++ b/soc/riscv/riscv-privilege/gd32vf103/soc.h
@@ -12,14 +12,14 @@
 #define RISCV_GD32VF103_SOC_H_
 
 #include <soc_common.h>
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 /* Timer configuration */
 #define RISCV_MTIME_BASE      DT_REG_ADDR_BY_IDX(DT_NODELABEL(mtimer), 0)
 #define RISCV_MTIMECMP_BASE   DT_REG_ADDR_BY_IDX(DT_NODELABEL(mtimer), 1)
 
 #ifndef _ASMLANGUAGE
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <gd32vf103.h>
 #endif  /* !_ASMLANGUAGE */
 
diff --git a/soc/riscv/riscv-privilege/neorv32/soc.c b/soc/riscv/riscv-privilege/neorv32/soc.c
index 8953fb62d5a..2565a6dcee7 100644
--- a/soc/riscv/riscv-privilege/neorv32/soc.c
+++ b/soc/riscv/riscv-privilege/neorv32/soc.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <irq.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 
 #if defined(CONFIG_RISCV_SOC_INTERRUPT_INIT)
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/fe310_clock.c b/soc/riscv/riscv-privilege/sifive-freedom/fe310_clock.c
index 5a42ca66fed..0de049ac50d 100644
--- a/soc/riscv/riscv-privilege/sifive-freedom/fe310_clock.c
+++ b/soc/riscv/riscv-privilege/sifive-freedom/fe310_clock.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 #include "fe310_prci.h"
 
 #define CORECLK_HZ (DT_PROP(DT_NODELABEL(coreclk), clock_frequency))
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/fu540_clock.c b/soc/riscv/riscv-privilege/sifive-freedom/fu540_clock.c
index c3826ab043a..f88772ed3fc 100644
--- a/soc/riscv/riscv-privilege/sifive-freedom/fu540_clock.c
+++ b/soc/riscv/riscv-privilege/sifive-freedom/fu540_clock.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 #include "fu540_prci.h"
 
 BUILD_ASSERT(MHZ(1000) == DT_PROP(DT_NODELABEL(coreclk), clock_frequency),
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/fu740_clock.c b/soc/riscv/riscv-privilege/sifive-freedom/fu740_clock.c
index 5fa99460407..f374487eb7d 100644
--- a/soc/riscv/riscv-privilege/sifive-freedom/fu740_clock.c
+++ b/soc/riscv/riscv-privilege/sifive-freedom/fu740_clock.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 #include "fu740_prci.h"
 
 BUILD_ASSERT(MHZ(1000) == DT_PROP(DT_NODELABEL(coreclk), clock_frequency),
diff --git a/soc/riscv/riscv-privilege/telink_b91/pinctrl_soc.h b/soc/riscv/riscv-privilege/telink_b91/pinctrl_soc.h
index e98695f491f..289153e34a1 100644
--- a/soc/riscv/riscv-privilege/telink_b91/pinctrl_soc.h
+++ b/soc/riscv/riscv-privilege/telink_b91/pinctrl_soc.h
@@ -8,8 +8,8 @@
 #define SOC_RISCV_TELINK_B91_PINCTRL_SOC_H
 
 #include <stdint.h>
-#include <devicetree.h>
-#include <dt-bindings/pinctrl/b91-pinctrl.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/dt-bindings/pinctrl/b91-pinctrl.h>
 
 /**
  * @brief Telink B91 pin type.
diff --git a/soc/riscv/riscv-privilege/telink_b91/soc.c b/soc/riscv/riscv-privilege/telink_b91/soc.c
index 68036cdc60a..333de412e4c 100644
--- a/soc/riscv/riscv-privilege/telink_b91/soc.c
+++ b/soc/riscv/riscv-privilege/telink_b91/soc.c
@@ -6,7 +6,7 @@
 
 #include "sys.h"
 #include "clock.h"
-#include <device.h>
+#include <zephyr/device.h>
 
 /* Software reset defines */
 #define reg_reset                   REG_ADDR8(0x1401ef)
diff --git a/soc/riscv/riscv-privilege/virt/soc.c b/soc/riscv/riscv-privilege/virt/soc.c
index f8c4572a2bb..581f4116c9b 100644
--- a/soc/riscv/riscv-privilege/virt/soc.c
+++ b/soc/riscv/riscv-privilege/virt/soc.c
@@ -9,9 +9,9 @@
  * @brief QEMU RISC-V virt machine hardware depended 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>
 
 /*
  * Exit QEMU and tell error number.
diff --git a/soc/sparc/leon3/idle.c b/soc/sparc/leon3/idle.c
index cdb2a59cc24..0c94e63e294 100644
--- a/soc/sparc/leon3/idle.c
+++ b/soc/sparc/leon3/idle.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <tracing/tracing.h>
+#include <zephyr/kernel.h>
+#include <zephyr/tracing/tracing.h>
 
 static void leon_idle(unsigned int key)
 {
diff --git a/soc/x86/apollo_lake/cpu.c b/soc/x86/apollo_lake/cpu.c
index 5916314d380..62f05c3c253 100644
--- a/soc/x86/apollo_lake/cpu.c
+++ b/soc/x86/apollo_lake/cpu.c
@@ -3,6 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 uint8_t x86_cpu_loapics[] = { 0x00, 0x02, 0x04, 0x06 };
diff --git a/soc/x86/apollo_lake/soc.h b/soc/x86/apollo_lake/soc.h
index 9a9b7b840e7..74d5d576043 100644
--- a/soc/x86/apollo_lake/soc.h
+++ b/soc/x86/apollo_lake/soc.h
@@ -16,18 +16,18 @@
 #ifndef __SOC_H_
 #define __SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
-#include <device.h>
-#include <random/rand32.h>
+#include <zephyr/device.h>
+#include <zephyr/random/rand32.h>
 #endif
 
 #ifdef CONFIG_GPIO_INTEL
 #include "soc_gpio.h"
 #endif
 
-#include <drivers/pcie/pcie.h>
+#include <zephyr/drivers/pcie/pcie.h>
 
 /* This expands to "PCIE_BDF(0, 0x18, 0)" on this platform */
 #define X86_SOC_EARLY_SERIAL_PCIDEV DT_REG_ADDR(DT_CHOSEN(zephyr_console))
diff --git a/soc/x86/atom/soc.h b/soc/x86/atom/soc.h
index 40ea9f0ad30..1b58377dd7f 100644
--- a/soc/x86/atom/soc.h
+++ b/soc/x86/atom/soc.h
@@ -15,11 +15,11 @@
 #ifndef __SOC_H_
 #define __SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
-#include <device.h>
-#include <random/rand32.h>
+#include <zephyr/device.h>
+#include <zephyr/random/rand32.h>
 #endif
 
 /*
diff --git a/soc/x86/elkhart_lake/cpu.c b/soc/x86/elkhart_lake/cpu.c
index c30d6656ed7..afd5f3a0339 100644
--- a/soc/x86/elkhart_lake/cpu.c
+++ b/soc/x86/elkhart_lake/cpu.c
@@ -3,6 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 uint8_t x86_cpu_loapics[] = { 0x00, 0x02, 0x04, 0x06 };
diff --git a/soc/x86/elkhart_lake/soc.h b/soc/x86/elkhart_lake/soc.h
index b15412a46b8..8d6ea807b6b 100644
--- a/soc/x86/elkhart_lake/soc.h
+++ b/soc/x86/elkhart_lake/soc.h
@@ -16,11 +16,11 @@
 #ifndef __SOC_H_
 #define __SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
-#include <device.h>
-#include <random/rand32.h>
+#include <zephyr/device.h>
+#include <zephyr/random/rand32.h>
 #endif
 
 #ifdef CONFIG_GPIO_INTEL
@@ -28,7 +28,7 @@
 #endif
 
 #if DT_ON_BUS(DT_CHOSEN(zephyr_console), pcie)
-#include <drivers/pcie/pcie.h>
+#include <zephyr/drivers/pcie/pcie.h>
 #define X86_SOC_EARLY_SERIAL_PCIDEV DT_REG_ADDR(DT_CHOSEN(zephyr_console))
 #else
 #define X86_SOC_EARLY_SERIAL_MMIO8_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_console))
diff --git a/soc/x86/ia32/soc.h b/soc/x86/ia32/soc.h
index afda58358b6..bdd0fbee330 100644
--- a/soc/x86/ia32/soc.h
+++ b/soc/x86/ia32/soc.h
@@ -15,11 +15,11 @@
 #ifndef __SOC_H_
 #define __SOC_H_
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifndef _ASMLANGUAGE
-#include <device.h>
-#include <random/rand32.h>
+#include <zephyr/device.h>
+#include <zephyr/random/rand32.h>
 #endif
 
 /*
diff --git a/soc/xtensa/esp32/esp32-mp.c b/soc/xtensa/esp32/esp32-mp.c
index 857ae297820..4d1c5283ee7 100644
--- a/soc/xtensa/esp32/esp32-mp.c
+++ b/soc/xtensa/esp32/esp32-mp.c
@@ -9,12 +9,12 @@
 #include "soc/gpio_periph.h"
 #include "soc/rtc_periph.h"
 
-#include <drivers/interrupt_controller/intc_esp32.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <soc.h>
-#include <device.h>
-#include <zephyr.h>
-#include <spinlock.h>
-#include <kernel_structs.h>
+#include <zephyr/device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/kernel_structs.h>
 
 #define Z_REG(base, off) (*(volatile uint32_t *)((base) + (off)))
 
diff --git a/soc/xtensa/esp32/gdbstub.c b/soc/xtensa/esp32/gdbstub.c
index e13a60f2829..014394d4bc0 100644
--- a/soc/xtensa/esp32/gdbstub.c
+++ b/soc/xtensa/esp32/gdbstub.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <xtensa-asm2-context.h>
-#include <debug/gdbstub.h>
+#include <zephyr/debug/gdbstub.h>
 
 /*
  * Address Mappings From ESP32 Technical Reference Manual Version 4.5
diff --git a/soc/xtensa/esp32/include/_soc_inthandlers.h b/soc/xtensa/esp32/include/_soc_inthandlers.h
index c46bfbf3d8b..9d7e4b29b71 100644
--- a/soc/xtensa/esp32/include/_soc_inthandlers.h
+++ b/soc/xtensa/esp32/include/_soc_inthandlers.h
@@ -11,8 +11,8 @@
  */
 
 #include <xtensa/config/core-isa.h>
-#include <sys/util.h>
-#include <sw_isr_table.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sw_isr_table.h>
 
 #if !defined(XCHAL_INT0_LEVEL) || XCHAL_INT0_LEVEL != 1
 #error core-isa.h interrupt level does not match dispatcher!
diff --git a/soc/xtensa/esp32/loader.c b/soc/xtensa/esp32/loader.c
index ba92e9da639..b20fda6f776 100644
--- a/soc/xtensa/esp32/loader.c
+++ b/soc/xtensa/esp32/loader.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 #include <esp_log.h>
 
 #include <esp32/rom/cache.h>
diff --git a/soc/xtensa/esp32/pinctrl_soc.h b/soc/xtensa/esp32/pinctrl_soc.h
index 920088a2006..3bf1e4b6e3e 100644
--- a/soc/xtensa/esp32/pinctrl_soc.h
+++ b/soc/xtensa/esp32/pinctrl_soc.h
@@ -12,10 +12,10 @@
 #ifndef ZEPHYR_SOC_XTENSA_ESP32_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_XTENSA_ESP32_PINCTRL_SOC_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 
-#include <dt-bindings/pinctrl/esp-pinctrl-common.h>
+#include <zephyr/dt-bindings/pinctrl/esp-pinctrl-common.h>
 
 /** @cond INTERNAL_HIDDEN */
 
diff --git a/soc/xtensa/esp32/soc.c b/soc/xtensa/esp32/soc.c
index eb226fad303..d3a0ee7dcd2 100644
--- a/soc/xtensa/esp32/soc.c
+++ b/soc/xtensa/esp32/soc.c
@@ -8,13 +8,13 @@
 #include "soc.h"
 #include <soc/rtc_cntl_reg.h>
 #include <soc/timer_group_reg.h>
-#include <drivers/interrupt_controller/intc_esp32.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <xtensa/config/core-isa.h>
 #include <xtensa/corebits.h>
 
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <string.h>
-#include <toolchain/gcc.h>
+#include <zephyr/toolchain/gcc.h>
 #include <zephyr/types.h>
 
 #include "esp_private/system_internal.h"
diff --git a/soc/xtensa/esp32/soc.h b/soc/xtensa/esp32/soc.h
index 18b86aabd3f..a18dd70b7df 100644
--- a/soc/xtensa/esp32/soc.h
+++ b/soc/xtensa/esp32/soc.h
@@ -14,7 +14,7 @@
 
 #include <zephyr/types.h>
 #include <stdbool.h>
-#include <arch/xtensa/arch.h>
+#include <zephyr/arch/xtensa/arch.h>
 
 #include <xtensa/core-macros.h>
 #include <esp32/clk.h>
diff --git a/soc/xtensa/esp32s2/include/_soc_inthandlers.h b/soc/xtensa/esp32s2/include/_soc_inthandlers.h
index 8004406397b..becafa7285a 100644
--- a/soc/xtensa/esp32s2/include/_soc_inthandlers.h
+++ b/soc/xtensa/esp32s2/include/_soc_inthandlers.h
@@ -17,8 +17,8 @@
  */
 
 #include <xtensa/config/core-isa.h>
-#include <sys/util.h>
-#include <sw_isr_table.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sw_isr_table.h>
 
 #if !defined(XCHAL_INT0_LEVEL) || XCHAL_INT0_LEVEL != 1
 #error core-isa.h interrupt level does not match dispatcher!
diff --git a/soc/xtensa/esp32s2/loader.c b/soc/xtensa/esp32s2/loader.c
index 75a6b0952c6..aba6f7e41c1 100644
--- a/soc/xtensa/esp32s2/loader.c
+++ b/soc/xtensa/esp32s2/loader.c
@@ -5,9 +5,9 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 #include <esp_log.h>
 #include <stdlib.h>
 
diff --git a/soc/xtensa/esp32s2/pinctrl_soc.h b/soc/xtensa/esp32s2/pinctrl_soc.h
index ec49b58a3a6..839f36820ec 100644
--- a/soc/xtensa/esp32s2/pinctrl_soc.h
+++ b/soc/xtensa/esp32s2/pinctrl_soc.h
@@ -12,10 +12,10 @@
 #ifndef ZEPHYR_SOC_XTENSA_ESP32S2_PINCTRL_SOC_H_
 #define ZEPHYR_SOC_XTENSA_ESP32S2_PINCTRL_SOC_H_
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 
-#include <dt-bindings/pinctrl/esp-pinctrl-common.h>
+#include <zephyr/dt-bindings/pinctrl/esp-pinctrl-common.h>
 
 /** @cond INTERNAL_HIDDEN */
 
diff --git a/soc/xtensa/esp32s2/soc.c b/soc/xtensa/esp32s2/soc.c
index f03088707ab..67ff02cb5ec 100644
--- a/soc/xtensa/esp32s2/soc.c
+++ b/soc/xtensa/esp32s2/soc.c
@@ -8,14 +8,14 @@
 #include "soc.h"
 #include <soc/rtc_cntl_reg.h>
 #include <soc/timer_group_reg.h>
-#include <drivers/interrupt_controller/intc_esp32.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <xtensa/config/core-isa.h>
 #include <xtensa/corebits.h>
 
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <string.h>
-#include <toolchain/gcc.h>
+#include <zephyr/toolchain/gcc.h>
 #include <zephyr/types.h>
 
 #include "esp_private/system_internal.h"
diff --git a/soc/xtensa/esp32s2/soc.h b/soc/xtensa/esp32s2/soc.h
index 7a286bfef3c..4e91cd8710c 100644
--- a/soc/xtensa/esp32s2/soc.h
+++ b/soc/xtensa/esp32s2/soc.h
@@ -18,7 +18,7 @@
 
 #include <zephyr/types.h>
 #include <stdbool.h>
-#include <arch/xtensa/arch.h>
+#include <zephyr/arch/xtensa/arch.h>
 #include <stdlib.h>
 
 void __esp_platform_start(void);
diff --git a/soc/xtensa/intel_adsp/common/boot.c b/soc/xtensa/intel_adsp/common/boot.c
index 01d4e4a2ce2..a61512dfd6c 100644
--- a/soc/xtensa/intel_adsp/common/boot.c
+++ b/soc/xtensa/intel_adsp/common/boot.c
@@ -2,12 +2,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <soc.h>
-#include <arch/xtensa/cache.h>
+#include <zephyr/arch/xtensa/cache.h>
 #include <cavs-shim.h>
 #include <cavs-mem.h>
 #include <cpu_init.h>
diff --git a/soc/xtensa/intel_adsp/common/cavs_ipc.c b/soc/xtensa/intel_adsp/common/cavs_ipc.c
index d9f552984d0..3a23da14557 100644
--- a/soc/xtensa/intel_adsp/common/cavs_ipc.c
+++ b/soc/xtensa/intel_adsp/common/cavs_ipc.c
@@ -3,7 +3,7 @@
  */
 #include <cavs_ipc.h>
 #include <cavs-ipc-regs.h>
-#include <spinlock.h>
+#include <zephyr/spinlock.h>
 
 void cavs_ipc_set_message_handler(const struct device *dev,
 				  cavs_ipc_handler_t fn, void *arg)
diff --git a/soc/xtensa/intel_adsp/common/include/_soc_inthandlers.h b/soc/xtensa/intel_adsp/common/include/_soc_inthandlers.h
index 37d98dafd31..5824f437483 100644
--- a/soc/xtensa/intel_adsp/common/include/_soc_inthandlers.h
+++ b/soc/xtensa/intel_adsp/common/include/_soc_inthandlers.h
@@ -15,8 +15,8 @@
  */
 
 #include <xtensa/config/core-isa.h>
-#include <sys/util.h>
-#include <sw_isr_table.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sw_isr_table.h>
 
 #if !defined(XCHAL_INT0_LEVEL) || XCHAL_INT0_LEVEL != 1
 #error core-isa.h interrupt level does not match dispatcher!
diff --git a/soc/xtensa/intel_adsp/common/include/cavs-mem.h b/soc/xtensa/intel_adsp/common/include/cavs-mem.h
index 2afb04af447..4c8f54dc637 100644
--- a/soc/xtensa/intel_adsp/common/include/cavs-mem.h
+++ b/soc/xtensa/intel_adsp/common/include/cavs-mem.h
@@ -4,7 +4,7 @@
 #ifndef _ZEPHYR_SOC_INTEL_ADSP_MEM
 #define _ZEPHYR_SOC_INTEL_ADSP_MEM
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 #include <cavs-vectors.h>
 
 #define L2_SRAM_BASE (DT_REG_ADDR(DT_NODELABEL(sram0)))
diff --git a/soc/xtensa/intel_adsp/common/include/cavs_hda.h b/soc/xtensa/intel_adsp/common/include/cavs_hda.h
index 2b3d0b7405b..2dc53bd2cea 100644
--- a/soc/xtensa/intel_adsp/common/include/cavs_hda.h
+++ b/soc/xtensa/intel_adsp/common/include/cavs_hda.h
@@ -5,9 +5,9 @@
 #ifndef ZEPHYR_INCLUDE_CAVS_HDA_H
 #define ZEPHYR_INCLUDE_CAVS_HDA_H
 
-#include <arch/xtensa/cache.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/arch/xtensa/cache.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <cavs-shim.h>
 #include <cavs-mem.h>
 
diff --git a/soc/xtensa/intel_adsp/common/include/cavs_ipc.h b/soc/xtensa/intel_adsp/common/include/cavs_ipc.h
index ec1c650c8aa..6d5fad1afb2 100644
--- a/soc/xtensa/intel_adsp/common/include/cavs_ipc.h
+++ b/soc/xtensa/intel_adsp/common/include/cavs_ipc.h
@@ -4,8 +4,8 @@
 #ifndef ZEPHYR_INCLUDE_CAVS_IPC_H
 #define ZEPHYR_INCLUDE_CAVS_IPC_H
 
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 
 struct cavs_ipc_config {
 	volatile struct cavs_ipc *regs;
diff --git a/soc/xtensa/intel_adsp/common/include/cpu_init.h b/soc/xtensa/intel_adsp/common/include/cpu_init.h
index b0ce7de9ab4..60bbde57957 100644
--- a/soc/xtensa/intel_adsp/common/include/cpu_init.h
+++ b/soc/xtensa/intel_adsp/common/include/cpu_init.h
@@ -4,7 +4,7 @@
 #ifndef __INTEL_ADSP_CPU_INIT_H
 #define __INTEL_ADSP_CPU_INIT_H
 
-#include <arch/xtensa/cache.h>
+#include <zephyr/arch/xtensa/cache.h>
 #include <xtensa/config/core-isa.h>
 
 #define CxL1CCAP (*(volatile uint32_t *)0x9F080080)
diff --git a/soc/xtensa/intel_adsp/common/include/soc.h b/soc/xtensa/intel_adsp/common/include/soc.h
index cdb5a2a0085..7583968ed1c 100644
--- a/soc/xtensa/intel_adsp/common/include/soc.h
+++ b/soc/xtensa/intel_adsp/common/include/soc.h
@@ -8,7 +8,7 @@
 
 #include <string.h>
 #include <errno.h>
-#include <arch/xtensa/cache.h>
+#include <zephyr/arch/xtensa/cache.h>
 
 /* macros related to interrupt handling */
 #define XTENSA_IRQ_NUM_SHIFT			0
diff --git a/soc/xtensa/intel_adsp/common/irq-cavs.c b/soc/xtensa/intel_adsp/common/irq-cavs.c
index 19a1ad6bff5..2bd4bfd1cf9 100644
--- a/soc/xtensa/intel_adsp/common/irq-cavs.c
+++ b/soc/xtensa/intel_adsp/common/irq-cavs.c
@@ -2,19 +2,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <xtensa/xtruntime.h>
-#include <irq_nextlevel.h>
+#include <zephyr/irq_nextlevel.h>
 #include <xtensa/hal.h>
-#include <init.h>
-#include <logging/log.h>
+#include <zephyr/init.h>
+#include <zephyr/logging/log.h>
 
 #include <cavs-shim.h>
 #include <cavs-idc.h>
 #include "soc.h"
 
 #ifdef CONFIG_DYNAMIC_INTERRUPTS
-#include <sw_isr_table.h>
+#include <zephyr/sw_isr_table.h>
 #endif
 
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
diff --git a/soc/xtensa/intel_adsp/common/mp_cavs.c b/soc/xtensa/intel_adsp/common/mp_cavs.c
index 4b768c09f91..cfd60822cb7 100644
--- a/soc/xtensa/intel_adsp/common/mp_cavs.c
+++ b/soc/xtensa/intel_adsp/common/mp_cavs.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2021 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <cavs-idc.h>
 #include <cavs-mem.h>
 #include <cavs-shim.h>
diff --git a/soc/xtensa/intel_adsp/common/rimage_modules.c b/soc/xtensa/intel_adsp/common/rimage_modules.c
index 83699fbee16..e3583b3fb51 100644
--- a/soc/xtensa/intel_adsp/common/rimage_modules.c
+++ b/soc/xtensa/intel_adsp/common/rimage_modules.c
@@ -3,7 +3,7 @@
  */
 #include <manifest.h>
 #include <cavs-mem.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 /* These two modules defined here aren't runtime data used by Zephyr or
  * SOF with IPC3, but instead are inserted to *MANIFEST* of the final
diff --git a/soc/xtensa/intel_adsp/common/soc.c b/soc/xtensa/intel_adsp/common/soc.c
index b37406705dd..8eca8c7a725 100644
--- a/soc/xtensa/intel_adsp/common/soc.c
+++ b/soc/xtensa/intel_adsp/common/soc.c
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <xtensa/xtruntime.h>
-#include <irq_nextlevel.h>
+#include <zephyr/irq_nextlevel.h>
 #include <xtensa/hal.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include <cavs-shim.h>
 #include <cavs-idc.h>
 #include "soc.h"
 
 #ifdef CONFIG_DYNAMIC_INTERRUPTS
-#include <sw_isr_table.h>
+#include <zephyr/sw_isr_table.h>
 #endif
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(soc);
 
 #ifndef CONFIG_SOC_SERIES_INTEL_CAVS_V15
diff --git a/soc/xtensa/intel_adsp/common/soc_mp.c b/soc/xtensa/intel_adsp/common/soc_mp.c
index d5e7e21039d..54c1c55d9f6 100644
--- a/soc/xtensa/intel_adsp/common/soc_mp.c
+++ b/soc/xtensa/intel_adsp/common/soc_mp.c
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
-#include <kernel_structs.h>
-#include <toolchain.h>
-#include <sys/__assert.h>
-#include <sys/sys_io.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/sys_io.h>
 
 #include <xtensa/config/core-isa.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(soc_mp, CONFIG_SOC_LOG_LEVEL);
 
 #include <zsr.h>
 #include <cavs-idc.h>
 #include <soc.h>
-#include <arch/xtensa/cache.h>
+#include <zephyr/arch/xtensa/cache.h>
 #include <cavs-shim.h>
 #include <cavs-mem.h>
 #include <cpu_init.h>
diff --git a/soc/xtensa/intel_adsp/common/trace_out.c b/soc/xtensa/intel_adsp/common/trace_out.c
index 77eb10efc1c..fff021786dd 100644
--- a/soc/xtensa/intel_adsp/common/trace_out.c
+++ b/soc/xtensa/intel_adsp/common/trace_out.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2021 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
 #include <cavs-mem.h>
-#include <sys/winstream.h>
+#include <zephyr/sys/winstream.h>
 
 struct k_spinlock trace_lock;
 
diff --git a/soc/xtensa/intel_s1000/include/_soc_inthandlers.h b/soc/xtensa/intel_s1000/include/_soc_inthandlers.h
index 021ce70085c..d56db2bf4ca 100644
--- a/soc/xtensa/intel_s1000/include/_soc_inthandlers.h
+++ b/soc/xtensa/intel_s1000/include/_soc_inthandlers.h
@@ -11,7 +11,7 @@
  */
 
 #include <xtensa/config/core-isa.h>
-#include <sw_isr_table.h>
+#include <zephyr/sw_isr_table.h>
 
 #if !defined(XCHAL_INT0_LEVEL) || XCHAL_INT0_LEVEL != 1
 #error core-isa.h interrupt level does not match dispatcher!
diff --git a/soc/xtensa/intel_s1000/soc.c b/soc/xtensa/intel_s1000/soc.c
index d1dba101b9e..b7dd8725326 100644
--- a/soc/xtensa/intel_s1000/soc.c
+++ b/soc/xtensa/intel_s1000/soc.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <xtensa/xtruntime.h>
-#include <irq_nextlevel.h>
+#include <zephyr/irq_nextlevel.h>
 #include <xtensa/hal.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "soc.h"
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(soc);
 
 static uint32_t ref_clk_freq;
diff --git a/soc/xtensa/intel_s1000/soc.h b/soc/xtensa/intel_s1000/soc.h
index 620ecd6fb3d..b928388d04e 100644
--- a/soc/xtensa/intel_s1000/soc.h
+++ b/soc/xtensa/intel_s1000/soc.h
@@ -6,7 +6,7 @@
 #ifndef __INC_SOC_H
 #define __INC_SOC_H
 
-#include <arch/xtensa/cache.h>
+#include <zephyr/arch/xtensa/cache.h>
 
 /* macros related to interrupt handling */
 #define XTENSA_IRQ_NUM_SHIFT			0
diff --git a/soc/xtensa/intel_s1000/soc/shim.h b/soc/xtensa/intel_s1000/soc/shim.h
index 082e06dba18..caee6b175d8 100644
--- a/soc/xtensa/intel_s1000/soc/shim.h
+++ b/soc/xtensa/intel_s1000/soc/shim.h
@@ -9,7 +9,7 @@
 #ifndef __PLATFORM_LIB_SHIM_H__
 #define __PLATFORM_LIB_SHIM_H__
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <memory.h>
 
 #ifndef ASSEMBLY
@@ -17,8 +17,8 @@
 #endif
 
 #if !defined(__ASSEMBLER__) && !defined(LINKER)
-#include <sys/sys_io.h>
-#include <arch/common/sys_io.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/arch/common/sys_io.h>
 #endif
 
 #ifndef BIT
diff --git a/soc/xtensa/intel_s1000/soc_mp.c b/soc/xtensa/intel_s1000/soc_mp.c
index fba852bd090..9b837fec5b6 100644
--- a/soc/xtensa/intel_s1000/soc_mp.c
+++ b/soc/xtensa/intel_s1000/soc_mp.c
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <init.h>
-#include <kernel.h>
-#include <kernel_structs.h>
-#include <sys/sys_io.h>
-#include <sys/__assert.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/sys/__assert.h>
 #include <xtensa/corebits.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(soc_mp, CONFIG_SOC_LOG_LEVEL);
 
 #include "soc.h"
 #include "memory.h"
 
 #ifdef CONFIG_SCHED_IPI_SUPPORTED
-#include <drivers/ipm.h>
+#include <zephyr/drivers/ipm.h>
 #include <ipm/ipm_cavs_idc.h>
 
 static const struct device *idc;
diff --git a/soc/xtensa/intel_s1000/xcc/newlib_fixes.c b/soc/xtensa/intel_s1000/xcc/newlib_fixes.c
index 2c700a76209..f4e8fa73756 100644
--- a/soc/xtensa/intel_s1000/xcc/newlib_fixes.c
+++ b/soc/xtensa/intel_s1000/xcc/newlib_fixes.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <unistd.h>
diff --git a/soc/xtensa/nxp_adsp/common/include/adsp/io.h b/soc/xtensa/nxp_adsp/common/include/adsp/io.h
index 738960b3077..3d1f0ed98d5 100644
--- a/soc/xtensa/nxp_adsp/common/include/adsp/io.h
+++ b/soc/xtensa/nxp_adsp/common/include/adsp/io.h
@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 #include <soc/memory.h>
-#include <sys/sys_io.h>
-#include <arch/common/sys_io.h>
+#include <zephyr/sys/sys_io.h>
+#include <zephyr/arch/common/sys_io.h>
 
 static inline uint32_t io_reg_read(uint32_t reg)
 {
diff --git a/soc/xtensa/nxp_adsp/common/include/soc.h b/soc/xtensa/nxp_adsp/common/include/soc.h
index a23be28f0fc..89ee9d96a52 100644
--- a/soc/xtensa/nxp_adsp/common/include/soc.h
+++ b/soc/xtensa/nxp_adsp/common/include/soc.h
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <sys/sys_io.h>
+#include <zephyr/sys/sys_io.h>
 
 #include <adsp/cache.h>
 
diff --git a/soc/xtensa/nxp_adsp/common/soc.c b/soc/xtensa/nxp_adsp/common/soc.c
index a82ced3608b..d7319fe9f8c 100644
--- a/soc/xtensa/nxp_adsp/common/soc.c
+++ b/soc/xtensa/nxp_adsp/common/soc.c
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <xtensa/xtruntime.h>
-#include <irq_nextlevel.h>
+#include <zephyr/irq_nextlevel.h>
 #include <xtensa/hal.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "soc.h"
 
 #ifdef CONFIG_DYNAMIC_INTERRUPTS
-#include <sw_isr_table.h>
+#include <zephyr/sw_isr_table.h>
 #endif
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(soc);
 
 void z_soc_irq_enable(uint32_t irq)
diff --git a/soc/xtensa/nxp_adsp/imx8/include/_soc_inthandlers.h b/soc/xtensa/nxp_adsp/imx8/include/_soc_inthandlers.h
index 9b4a5d25b29..daa9cfe668b 100644
--- a/soc/xtensa/nxp_adsp/imx8/include/_soc_inthandlers.h
+++ b/soc/xtensa/nxp_adsp/imx8/include/_soc_inthandlers.h
@@ -16,8 +16,8 @@
  */
 
 #include <xtensa/config/core-isa.h>
-#include <sys/util.h>
-#include <sw_isr_table.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sw_isr_table.h>
 
 #if !defined(XCHAL_INT0_LEVEL) || XCHAL_INT0_LEVEL != 5
 #error core-isa.h interrupt level does not match dispatcher!
diff --git a/soc/xtensa/nxp_adsp/imx8m/include/_soc_inthandlers.h b/soc/xtensa/nxp_adsp/imx8m/include/_soc_inthandlers.h
index 9b4a5d25b29..daa9cfe668b 100644
--- a/soc/xtensa/nxp_adsp/imx8m/include/_soc_inthandlers.h
+++ b/soc/xtensa/nxp_adsp/imx8m/include/_soc_inthandlers.h
@@ -16,8 +16,8 @@
  */
 
 #include <xtensa/config/core-isa.h>
-#include <sys/util.h>
-#include <sw_isr_table.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sw_isr_table.h>
 
 #if !defined(XCHAL_INT0_LEVEL) || XCHAL_INT0_LEVEL != 5
 #error core-isa.h interrupt level does not match dispatcher!
diff --git a/soc/xtensa/sample_controller/include/_soc_inthandlers.h b/soc/xtensa/sample_controller/include/_soc_inthandlers.h
index 6ded0e8bf36..786d2029322 100644
--- a/soc/xtensa/sample_controller/include/_soc_inthandlers.h
+++ b/soc/xtensa/sample_controller/include/_soc_inthandlers.h
@@ -11,7 +11,7 @@
  */
 
 #include <xtensa/config/core-isa.h>
-#include <sw_isr_table.h>
+#include <zephyr/sw_isr_table.h>
 
 #if !defined(XCHAL_INT0_LEVEL) || XCHAL_INT0_LEVEL != 1
 #error core-isa.h interrupt level does not match dispatcher!