diff --git a/drivers/interrupt_controller/intc_arcv2_irq_unit.c b/drivers/interrupt_controller/intc_arcv2_irq_unit.c
index 333235e..fc62f46 100644
--- a/drivers/interrupt_controller/intc_arcv2_irq_unit.c
+++ b/drivers/interrupt_controller/intc_arcv2_irq_unit.c
@@ -16,10 +16,10 @@
  * interrupt unit. The ARCv2 interrupt unit is highly programmable.
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
 /*
  * @brief Initialize the interrupt unit device driver
diff --git a/drivers/interrupt_controller/intc_cavs.c b/drivers/interrupt_controller/intc_cavs.c
index 7119d0a..3ebd676 100644
--- a/drivers/interrupt_controller/intc_cavs.c
+++ b/drivers/interrupt_controller/intc_cavs.c
@@ -6,8 +6,8 @@
 
 #define DT_DRV_COMPAT intel_cavs_intc
 
-#include <device.h>
-#include <irq_nextlevel.h>
+#include <zephyr/device.h>
+#include <zephyr/irq_nextlevel.h>
 #include "intc_cavs.h"
 
 #if defined(CONFIG_SMP) && (CONFIG_MP_NUM_CPUS > 1)
diff --git a/drivers/interrupt_controller/intc_dw.c b/drivers/interrupt_controller/intc_dw.c
index 6fdc86c..ba0969a 100644
--- a/drivers/interrupt_controller/intc_dw.c
+++ b/drivers/interrupt_controller/intc_dw.c
@@ -13,8 +13,8 @@
  * This implementation works only when sw_isr_table is enabled in zephyr
  */
 
-#include <device.h>
-#include <irq_nextlevel.h>
+#include <zephyr/device.h>
+#include <zephyr/irq_nextlevel.h>
 #include "intc_dw.h"
 #include <soc.h>
 
diff --git a/drivers/interrupt_controller/intc_esp32.c b/drivers/interrupt_controller/intc_esp32.c
index 8b9dc97..5539af4 100644
--- a/drivers/interrupt_controller/intc_esp32.c
+++ b/drivers/interrupt_controller/intc_esp32.c
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
 #include <soc.h>
-#include <drivers/interrupt_controller/intc_esp32.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include "esp_attr.h"
 #include <hal/cpu_hal.h>
 #include <hal/interrupt_controller_hal.h>
 #include <limits.h>
 #include <assert.h>
 #include "soc/soc.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(esp32_intc, CONFIG_LOG_DEFAULT_LEVEL);
 
 #define ETS_INTERNAL_TIMER0_INTR_NO 6
diff --git a/drivers/interrupt_controller/intc_esp32c3.c b/drivers/interrupt_controller/intc_esp32c3.c
index d075172..2cfe1b5 100644
--- a/drivers/interrupt_controller/intc_esp32c3.c
+++ b/drivers/interrupt_controller/intc_esp32c3.c
@@ -14,14 +14,14 @@
 #include <assert.h>
 #include "soc/soc.h"
 #include <soc.h>
-#include <zephyr.h>
-#include <drivers/interrupt_controller/intc_esp32c3.h>
-#include <sw_isr_table.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
+#include <zephyr/sw_isr_table.h>
 #include <riscv/interrupt.h>
 
 #define ESP32C3_INTC_DEFAULT_PRIO			15
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(intc_esp32c3, CONFIG_LOG_DEFAULT_LEVEL);
 
 /*
diff --git a/drivers/interrupt_controller/intc_exti_stm32.c b/drivers/interrupt_controller/intc_exti_stm32.c
index 41c18ba..9178eba 100644
--- a/drivers/interrupt_controller/intc_exti_stm32.c
+++ b/drivers/interrupt_controller/intc_exti_stm32.c
@@ -20,11 +20,11 @@
 
 #define EXTI_NODE DT_INST(0, st_stm32_exti)
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
 #include <stm32_ll_exti.h>
-#include <sys/__assert.h>
-#include <drivers/interrupt_controller/exti_stm32.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/interrupt_controller/exti_stm32.h>
 
 #include "stm32_hsem.h"
 
diff --git a/drivers/interrupt_controller/intc_gd32_exti.c b/drivers/interrupt_controller/intc_gd32_exti.c
index f107ede..27c4277 100644
--- a/drivers/interrupt_controller/intc_gd32_exti.c
+++ b/drivers/interrupt_controller/intc_gd32_exti.c
@@ -6,11 +6,11 @@
 
 #define DT_DRV_COMPAT gd_gd32_exti
 
-#include <device.h>
-#include <drivers/interrupt_controller/gd32_exti.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/interrupt_controller/gd32_exti.h>
 #include <soc.h>
-#include <sys/__assert.h>
-#include <sys/util_macro.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util_macro.h>
 
 /** Unsupported line indicator */
 #define EXTI_NOTSUP 0xFFU
diff --git a/drivers/interrupt_controller/intc_gic.c b/drivers/interrupt_controller/intc_gic.c
index 7893fc3..acf1b71 100644
--- a/drivers/interrupt_controller/intc_gic.c
+++ b/drivers/interrupt_controller/intc_gic.c
@@ -10,10 +10,10 @@
  * NOTE: This driver implements the GICv1 and GICv2 interfaces.
  */
 
-#include <devicetree.h>
-#include <sw_isr_table.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <drivers/interrupt_controller/gic.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
 
 #define CPU_REG_ID(cpu_node_id) DT_REG_ADDR(cpu_node_id),
 static const uint64_t cpu_mpid_list[] = {
diff --git a/drivers/interrupt_controller/intc_gicv3.c b/drivers/interrupt_controller/intc_gicv3.c
index 071ec40..4f878f8 100644
--- a/drivers/interrupt_controller/intc_gicv3.c
+++ b/drivers/interrupt_controller/intc_gicv3.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/__assert.h>
-#include <sw_isr_table.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <drivers/interrupt_controller/gic.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
 #include "intc_gic_common_priv.h"
 #include "intc_gicv3_priv.h"
 
diff --git a/drivers/interrupt_controller/intc_gicv3_its.c b/drivers/interrupt_controller/intc_gicv3_its.c
index e9ab069..30733c0 100644
--- a/drivers/interrupt_controller/intc_gicv3_its.c
+++ b/drivers/interrupt_controller/intc_gicv3_its.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(intc_gicv3_its, LOG_LEVEL_ERR);
 
-#include <kernel.h>
-#include <device.h>
-#include <drivers/interrupt_controller/gicv3_its.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/interrupt_controller/gicv3_its.h>
 
 #include "intc_gic_common_priv.h"
 #include "intc_gicv3_priv.h"
diff --git a/drivers/interrupt_controller/intc_gicv3_priv.h b/drivers/interrupt_controller/intc_gicv3_priv.h
index c3b7d24..e7d1704 100644
--- a/drivers/interrupt_controller/intc_gicv3_priv.h
+++ b/drivers/interrupt_controller/intc_gicv3_priv.h
@@ -8,8 +8,8 @@
 #define ZEPHYR_INCLUDE_DRIVERS_INTC_GICV3_PRIV_H_
 
 #include <zephyr/types.h>
-#include <device.h>
-#include <sys/atomic.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/atomic.h>
 
 /* Cache and Share ability for ITS & Redistributor LPI state tables */
 #define GIC_BASER_CACHE_NGNRNE		0x0UL /* Device-nGnRnE */
diff --git a/drivers/interrupt_controller/intc_intel_vtd.c b/drivers/interrupt_controller/intc_intel_vtd.c
index 9048146..0f4f906 100644
--- a/drivers/interrupt_controller/intc_intel_vtd.c
+++ b/drivers/interrupt_controller/intc_intel_vtd.c
@@ -7,23 +7,23 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 
 #include <soc.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <string.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <cache.h>
+#include <zephyr/cache.h>
 
-#include <arch/x86/intel_vtd.h>
-#include <drivers/interrupt_controller/intel_vtd.h>
-#include <drivers/interrupt_controller/ioapic.h>
-#include <drivers/interrupt_controller/loapic.h>
-#include <drivers/pcie/msi.h>
+#include <zephyr/arch/x86/intel_vtd.h>
+#include <zephyr/drivers/interrupt_controller/intel_vtd.h>
+#include <zephyr/drivers/interrupt_controller/ioapic.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h>
+#include <zephyr/drivers/pcie/msi.h>
 
 #include <kernel_arch_func.h>
 
diff --git a/drivers/interrupt_controller/intc_ioapic.c b/drivers/interrupt_controller/intc_ioapic.c
index dd205f5..f509c6a 100644
--- a/drivers/interrupt_controller/intc_ioapic.c
+++ b/drivers/interrupt_controller/intc_ioapic.c
@@ -52,17 +52,17 @@
  *
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <device.h>
-#include <pm/device.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/device.h>
 #include <string.h>
 
-#include <drivers/interrupt_controller/ioapic.h> /* public API declarations */
-#include <drivers/interrupt_controller/loapic.h> /* public API declarations and registers */
+#include <zephyr/drivers/interrupt_controller/ioapic.h> /* public API declarations */
+#include <zephyr/drivers/interrupt_controller/loapic.h> /* public API declarations and registers */
 #include "intc_ioapic_priv.h"
 
 DEVICE_MMIO_TOPLEVEL_STATIC(ioapic_regs, DT_DRV_INST(0));
@@ -89,7 +89,7 @@
 static __pinned_bss uint32_t ioapic_rtes;
 
 #ifdef CONFIG_PM_DEVICE
-#include <pm/device.h>
+#include <zephyr/pm/device.h>
 
 #define BITS_PER_IRQ  4
 #define IOAPIC_BITFIELD_HI_LO	0
@@ -119,8 +119,8 @@
 #if defined(CONFIG_INTEL_VTD_ICTL) &&				\
 	!defined(CONFIG_INTEL_VTD_ICTL_XAPIC_PASSTHROUGH)
 
-#include <drivers/interrupt_controller/intel_vtd.h>
-#include <arch/x86/acpi.h>
+#include <zephyr/drivers/interrupt_controller/intel_vtd.h>
+#include <zephyr/arch/x86/acpi.h>
 
 static const struct device *vtd;
 static uint16_t ioapic_id;
diff --git a/drivers/interrupt_controller/intc_irqmp.c b/drivers/interrupt_controller/intc_irqmp.c
index 982799d..b15ec8f 100644
--- a/drivers/interrupt_controller/intc_irqmp.c
+++ b/drivers/interrupt_controller/intc_irqmp.c
@@ -16,8 +16,8 @@
 
 #define DT_DRV_COMPAT gaisler_irqmp
 
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 
 /*
  * Register description for IRQMP and IRQAMP interrupt controllers
diff --git a/drivers/interrupt_controller/intc_ite_it8xxx2.c b/drivers/interrupt_controller/intc_ite_it8xxx2.c
index a780011..9e338d8 100644
--- a/drivers/interrupt_controller/intc_ite_it8xxx2.c
+++ b/drivers/interrupt_controller/intc_ite_it8xxx2.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <init.h>
-#include <sys/printk.h>
-#include <sw_isr_table.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sw_isr_table.h>
 #include "intc_ite_it8xxx2.h"
 
 #define MAX_REGISR_IRQ_NUM		8
diff --git a/drivers/interrupt_controller/intc_ite_it8xxx2.h b/drivers/interrupt_controller/intc_ite_it8xxx2.h
index 8cef428..2b1ac2d 100644
--- a/drivers/interrupt_controller/intc_ite_it8xxx2.h
+++ b/drivers/interrupt_controller/intc_ite_it8xxx2.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_ITE_IT8XXX2_H_
 #define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_ITE_IT8XXX2_H_
 
-#include <dt-bindings/interrupt-controller/ite-intc.h>
+#include <zephyr/dt-bindings/interrupt-controller/ite-intc.h>
 #include <soc.h>
 
 #endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_ITE_IT8XXX2_H_ */
diff --git a/drivers/interrupt_controller/intc_loapic.c b/drivers/interrupt_controller/intc_loapic.c
index 817a02c..7d548fa 100644
--- a/drivers/interrupt_controller/intc_loapic.c
+++ b/drivers/interrupt_controller/intc_loapic.c
@@ -7,21 +7,21 @@
  * driver for x86 CPU local APIC (as an interrupt controller)
  */
 
-#include <kernel.h>
-#include <kernel_structs.h>
-#include <arch/cpu.h>
-#include <pm/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/pm/device.h>
 #include <zephyr/types.h>
 #include <string.h>
-#include <sys/__assert.h>
-#include <arch/x86/msr.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/arch/x86/msr.h>
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <drivers/interrupt_controller/loapic.h> /* public API declarations */
-#include <device.h>
-#include <drivers/interrupt_controller/sysapic.h>
-#include <drivers/interrupt_controller/ioapic.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h> /* public API declarations */
+#include <zephyr/device.h>
+#include <zephyr/drivers/interrupt_controller/sysapic.h>
+#include <zephyr/drivers/interrupt_controller/ioapic.h>
 
 /* Local APIC Version Register Bits */
 
@@ -62,7 +62,7 @@
 #define LOPIC_SSPND_BITS_PER_IRQ  1  /* Just the one for enable disable*/
 #define LOPIC_SUSPEND_BITS_REQD (ROUND_UP((LOAPIC_IRQ_COUNT * LOPIC_SSPND_BITS_PER_IRQ), 32))
 #ifdef CONFIG_PM_DEVICE
-#include <pm/device.h>
+#include <zephyr/pm/device.h>
 __pinned_bss
 uint32_t loapic_suspend_buf[LOPIC_SUSPEND_BITS_REQD / 32] = {0};
 #endif
diff --git a/drivers/interrupt_controller/intc_mchp_ecia_xec.c b/drivers/interrupt_controller/intc_mchp_ecia_xec.c
index 485d495..53582f3 100644
--- a/drivers/interrupt_controller/intc_mchp_ecia_xec.c
+++ b/drivers/interrupt_controller/intc_mchp_ecia_xec.c
@@ -12,14 +12,14 @@
 
 #define DT_DRV_COMPAT microchip_xec_ecia
 
-#include <arch/cpu.h>
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
-#include <device.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <sys/__assert.h>
-#include <drivers/clock_control/mchp_xec_clock_control.h>
-#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
-#include <dt-bindings/interrupt-controller/mchp-xec-ecia.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
+#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
+#include <zephyr/dt-bindings/interrupt-controller/mchp-xec-ecia.h>
 
 /* defined at the SoC layer */
 #define MCHP_FIRST_GIRQ			MCHP_FIRST_GIRQ_NOS
diff --git a/drivers/interrupt_controller/intc_miwu.c b/drivers/interrupt_controller/intc_miwu.c
index 9285925..a9bb95f 100644
--- a/drivers/interrupt_controller/intc_miwu.c
+++ b/drivers/interrupt_controller/intc_miwu.c
@@ -46,17 +46,17 @@
  *
  */
 
-#include <device.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
-#include <sys/__assert.h>
-#include <irq_nextlevel.h>
-#include <drivers/gpio.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/irq_nextlevel.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "soc_miwu.h"
 #include "soc_gpio.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(intc_miwu, LOG_LEVEL_ERR);
 
 /* MIWU module instances forward declaration */
diff --git a/drivers/interrupt_controller/intc_nuclei_eclic.c b/drivers/interrupt_controller/intc_nuclei_eclic.c
index 8b36867..c36f692 100644
--- a/drivers/interrupt_controller/intc_nuclei_eclic.c
+++ b/drivers/interrupt_controller/intc_nuclei_eclic.c
@@ -8,13 +8,13 @@
  * @brief Driver for Nuclie's Extended Core Interrupt Controller
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <sys/util.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
-#include <sw_isr_table.h>
+#include <zephyr/sw_isr_table.h>
 
 union CLICCFG {
 	struct {
diff --git a/drivers/interrupt_controller/intc_plic.c b/drivers/interrupt_controller/intc_plic.c
index 68c7ed1..ebef795 100644
--- a/drivers/interrupt_controller/intc_plic.c
+++ b/drivers/interrupt_controller/intc_plic.c
@@ -12,12 +12,12 @@
  *        for RISC-V processors
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
 #include <soc.h>
 
-#include <sw_isr_table.h>
+#include <zephyr/sw_isr_table.h>
 
 #define PLIC_MAX_PRIO	DT_INST_PROP(0, riscv_max_priority)
 #define PLIC_PRIO	DT_INST_REG_ADDR_BY_NAME(0, prio)
diff --git a/drivers/interrupt_controller/intc_rv32m1_intmux.c b/drivers/interrupt_controller/intc_rv32m1_intmux.c
index 7327a1e..d881df9 100644
--- a/drivers/interrupt_controller/intc_rv32m1_intmux.c
+++ b/drivers/interrupt_controller/intc_rv32m1_intmux.c
@@ -22,14 +22,14 @@
  * associated IRQ numbers to work with this driver.
  */
 
-#include <kernel.h>
-#include <drivers/clock_control.h>
-#include <init.h>
-#include <irq.h>
-#include <irq_nextlevel.h>
-#include <sw_isr_table.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/init.h>
+#include <zephyr/irq.h>
+#include <zephyr/irq_nextlevel.h>
+#include <zephyr/sw_isr_table.h>
 #include <soc.h>
-#include <dt-bindings/interrupt-controller/openisa-intmux.h>
+#include <zephyr/dt-bindings/interrupt-controller/openisa-intmux.h>
 
 /*
  * CHn_VEC registers are offset by a value that is convenient if
diff --git a/drivers/interrupt_controller/intc_sam0_eic.c b/drivers/interrupt_controller/intc_sam0_eic.c
index b4f3f56..0fe48d8 100644
--- a/drivers/interrupt_controller/intc_sam0_eic.c
+++ b/drivers/interrupt_controller/intc_sam0_eic.c
@@ -6,9 +6,9 @@
 
 #define DT_DRV_COMPAT atmel_sam0_eic
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/interrupt_controller/sam0_eic.h>
+#include <zephyr/drivers/interrupt_controller/sam0_eic.h>
 #include "intc_sam0_eic_priv.h"
 
 struct sam0_eic_line_assignment {
diff --git a/drivers/interrupt_controller/intc_shared_irq.c b/drivers/interrupt_controller/intc_shared_irq.c
index 8678e88..05f91ba 100644
--- a/drivers/interrupt_controller/intc_shared_irq.c
+++ b/drivers/interrupt_controller/intc_shared_irq.c
@@ -8,14 +8,14 @@
 
 #include <errno.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <shared_irq.h>
-#include <init.h>
-#include <sys/sys_io.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/shared_irq.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/sys_io.h>
 
 #ifdef CONFIG_IOAPIC
-#include <drivers/interrupt_controller/ioapic.h>
+#include <zephyr/drivers/interrupt_controller/ioapic.h>
 #endif
 
 typedef void (*shared_irq_config_irq_t)(void);
diff --git a/drivers/interrupt_controller/intc_swerv_pic.c b/drivers/interrupt_controller/intc_swerv_pic.c
index b3358c8..a21973a 100644
--- a/drivers/interrupt_controller/intc_swerv_pic.c
+++ b/drivers/interrupt_controller/intc_swerv_pic.c
@@ -10,10 +10,10 @@
  * @brief SweRV EH1 PIC driver
  */
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <init.h>
-#include <sw_isr_table.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
+#include <zephyr/sw_isr_table.h>
 
 #define SWERV_PIC_MAX_NUM	CONFIG_NUM_IRQS
 #define SWERV_PIC_MAX_ID	(SWERV_PIC_MAX_NUM + RISCV_MAX_GENERIC_IRQ)
diff --git a/drivers/interrupt_controller/intc_system_apic.c b/drivers/interrupt_controller/intc_system_apic.c
index 3f85b83..b9ad0b7 100644
--- a/drivers/interrupt_controller/intc_system_apic.c
+++ b/drivers/interrupt_controller/intc_system_apic.c
@@ -10,14 +10,14 @@
  *
  */
 
-#include <sys/__assert.h>
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <drivers/interrupt_controller/ioapic.h>
-#include <drivers/interrupt_controller/loapic.h>
-#include <drivers/interrupt_controller/sysapic.h>
-#include <irq.h>
-#include <linker/sections.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/drivers/interrupt_controller/ioapic.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h>
+#include <zephyr/drivers/interrupt_controller/sysapic.h>
+#include <zephyr/irq.h>
+#include <zephyr/linker/sections.h>
 
 #define IS_IOAPIC_IRQ(irq)  (irq < z_loapic_irq_base())
 #define HARDWARE_IRQ_LIMIT ((z_loapic_irq_base() + LOAPIC_IRQ_COUNT) - 1)
diff --git a/drivers/interrupt_controller/intc_vexriscv_litex.c b/drivers/interrupt_controller/intc_vexriscv_litex.c
index 7673c11..b164bf3 100644
--- a/drivers/interrupt_controller/intc_vexriscv_litex.c
+++ b/drivers/interrupt_controller/intc_vexriscv_litex.c
@@ -6,12 +6,12 @@
 
 #define DT_DRV_COMPAT litex_eth0
 
-#include <kernel.h>
-#include <arch/cpu.h>
-#include <init.h>
-#include <irq.h>
-#include <device.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/init.h>
+#include <zephyr/irq.h>
+#include <zephyr/device.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 
 #define IRQ_MASK		DT_REG_ADDR_BY_NAME(DT_INST(0, vexriscv_intc0), irq_mask)
diff --git a/drivers/interrupt_controller/wuc_ite_it8xxx2.c b/drivers/interrupt_controller/wuc_ite_it8xxx2.c
index c048d51..9e34720 100644
--- a/drivers/interrupt_controller/wuc_ite_it8xxx2.c
+++ b/drivers/interrupt_controller/wuc_ite_it8xxx2.c
@@ -6,15 +6,15 @@
 
 #define DT_DRV_COMPAT ite_it8xxx2_wuc
 
-#include <device.h>
-#include <drivers/interrupt_controller/wuc_ite_it8xxx2.h>
-#include <dt-bindings/interrupt-controller/it8xxx2-wuc.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/interrupt_controller/wuc_ite_it8xxx2.h>
+#include <zephyr/dt-bindings/interrupt-controller/it8xxx2-wuc.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <soc_common.h>
 #include <stdlib.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wuc_ite_it8xxx2, CONFIG_INTC_LOG_LEVEL);
 
 /* Driver config */