From acc8cb4bc8369f9c9f0ac59bcf2912f51a25db7e Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Tue, 4 Oct 2022 15:33:53 +0200
Subject: [PATCH] include: add missing irq.h include

Some modules use the IRQ API without including the necessary headers.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
---
 arch/common/sw_isr_common.c                            | 1 +
 drivers/clock_control/beetle_clock_control.c           | 1 +
 drivers/clock_control/clock_control_mchp_xec.c         | 2 +-
 drivers/clock_control/clock_control_r8a7795_cpg_mssr.c | 1 +
 drivers/clock_control/clock_control_renesas_cpg_mssr.c | 1 +
 drivers/counter/counter_mcux_ctimer.c                  | 2 ++
 drivers/counter/counter_mcux_gpt.c                     | 1 +
 drivers/counter/counter_mcux_pit.c                     | 1 +
 drivers/counter/counter_mcux_rtc.c                     | 1 +
 drivers/counter/counter_mcux_snvs.c                    | 1 +
 drivers/counter/counter_xlnx_axi_timer.c               | 1 +
 drivers/counter/timer_dtmr_cmsdk_apb.c                 | 2 ++
 drivers/counter/timer_tmr_cmsdk_apb.c                  | 1 +
 drivers/flash/flash_mcux_flexspi_mx25um51345g.c        | 1 +
 drivers/flash/flash_mcux_flexspi_nor.c                 | 1 +
 drivers/gpio/gpio_b91.c                                | 1 +
 drivers/gpio/gpio_eos_s3.c                             | 1 +
 drivers/gpio/gpio_gecko.c                              | 1 +
 drivers/gpio/gpio_imx.c                                | 1 +
 drivers/gpio/gpio_ite_it8xxx2.c                        | 1 +
 drivers/gpio/gpio_litex.c                              | 1 +
 drivers/gpio/gpio_lpc11u6x.c                           | 1 +
 drivers/gpio/gpio_mchp_xec_v2.c                        | 1 +
 drivers/gpio/gpio_mcux.c                               | 1 +
 drivers/gpio/gpio_mcux_igpio.c                         | 1 +
 drivers/gpio/gpio_mcux_lpc.c                           | 1 +
 drivers/gpio/gpio_mmio32.c                             | 1 +
 drivers/gpio/gpio_neorv32.c                            | 1 +
 drivers/gpio/gpio_rpi_pico.c                           | 1 +
 drivers/gpio/gpio_rv32m1.c                             | 1 +
 drivers/gpio/gpio_smartbond.c                          | 1 +
 drivers/gpio/gpio_stellaris.c                          | 1 +
 drivers/i2c/i2c_ite_enhance.c                          | 1 +
 drivers/i2c/i2c_ite_it8xxx2.c                          | 1 +
 drivers/i2c/i2c_nios2.c                                | 1 +
 drivers/interrupt_controller/intc_cavs.c               | 1 +
 drivers/interrupt_controller/intc_gd32_exti.c          | 1 +
 drivers/interrupt_controller/intc_sam0_eic.c           | 1 +
 drivers/pwm/pwm_mcux_ftm.c                             | 1 +
 drivers/pwm/pwm_mcux_pwt.c                             | 1 +
 drivers/sdhc/mcux_sdif.c                               | 1 +
 drivers/serial/uart_apbuart.c                          | 1 +
 drivers/serial/uart_b91.c                              | 1 +
 drivers/serial/uart_lpc11u6x.c                         | 1 +
 drivers/serial/uart_mcux.c                             | 1 +
 drivers/serial/uart_mcux_flexcomm.c                    | 1 +
 drivers/serial/uart_mcux_iuart.c                       | 1 +
 drivers/serial/uart_mcux_lpuart.c                      | 1 +
 drivers/serial/uart_rcar.c                             | 1 +
 drivers/serial/uart_rpi_pico.c                         | 1 +
 drivers/serial/uart_rv32m1_lpuart.c                    | 1 +
 drivers/serial/uart_sam.c                              | 1 +
 drivers/serial/uart_xlnx_uartlite.c                    | 1 +
 drivers/serial/usart_gd32.c                            | 1 +
 drivers/serial/usart_sam.c                             | 1 +
 drivers/timer/arm_arch_timer.c                         | 1 +
 drivers/timer/cc13x2_cc26x2_rtc_timer.c                | 1 +
 drivers/timer/leon_gptimer.c                           | 1 +
 drivers/timer/mchp_xec_rtos_timer.c                    | 1 +
 drivers/timer/mcux_gpt_timer.c                         | 2 +-
 drivers/timer/mcux_os_timer.c                          | 1 +
 drivers/timer/mips_cp0_timer.c                         | 1 +
 drivers/timer/rcar_cmt_timer.c                         | 1 +
 drivers/timer/stm32_lptim_timer.c                      | 1 +
 drivers/timer/xlnx_psttc_timer.c                       | 1 +
 drivers/usb/device/usb_dc_sam_usbhs.c                  | 1 +
 drivers/watchdog/wdt_mcux_wdog.c                       | 1 +
 drivers/watchdog/wdt_mcux_wwdt.c                       | 1 +
 drivers/watchdog/wdt_sam.c                             | 1 +
 drivers/watchdog/wdt_wwdg_stm32.c                      | 1 +
 drivers/watchdog/wdt_wwdgt_gd32.c                      | 1 +
 soc/arm/atmel_sam/sam3x/soc.c                          | 1 +
 soc/arm/atmel_sam/sam4e/soc.c                          | 1 +
 soc/arm/atmel_sam/sam4l/soc.c                          | 1 +
 soc/arm/atmel_sam/sam4s/soc.c                          | 1 +
 soc/arm/atmel_sam/same70/soc.c                         | 1 +
 soc/arm/atmel_sam/samv71/soc.c                         | 1 +
 soc/arm/bcm_vk/valkyrie/soc.c                          | 1 +
 soc/arm/bcm_vk/viper/soc.c                             | 1 +
 soc/arm/gigadevice/gd32e10x/soc.c                      | 1 +
 soc/arm/gigadevice/gd32f3x0/soc.c                      | 1 +
 soc/arm/gigadevice/gd32f403/soc.c                      | 1 +
 soc/arm/gigadevice/gd32f4xx/soc.c                      | 1 +
 soc/arm/nxp_imx/mcimx6x_m4/soc.c                       | 1 +
 soc/arm/nxp_imx/rt5xx/soc.c                            | 1 +
 soc/arm/st_stm32/stm32f0/soc.c                         | 1 +
 soc/arm/st_stm32/stm32f1/soc.c                         | 1 +
 soc/arm/st_stm32/stm32f2/soc.c                         | 1 +
 soc/arm/st_stm32/stm32f3/soc.c                         | 1 +
 soc/arm/st_stm32/stm32f4/soc.c                         | 2 ++
 soc/arm/st_stm32/stm32f7/soc.c                         | 1 +
 soc/arm/st_stm32/stm32g0/soc.c                         | 1 +
 soc/arm/st_stm32/stm32g4/soc.c                         | 1 +
 soc/arm/st_stm32/stm32h7/soc_m4.c                      | 1 +
 soc/arm/st_stm32/stm32h7/soc_m7.c                      | 1 +
 soc/arm/st_stm32/stm32l0/soc.c                         | 1 +
 soc/arm/st_stm32/stm32l1/soc.c                         | 1 +
 soc/arm/st_stm32/stm32l4/soc.c                         | 1 +
 soc/arm/st_stm32/stm32l5/soc.c                         | 1 +
 soc/arm/st_stm32/stm32mp1/soc.c                        | 1 +
 soc/arm/st_stm32/stm32u5/soc.c                         | 2 +-
 soc/arm/st_stm32/stm32wb/soc.c                         | 1 +
 soc/arm/st_stm32/stm32wl/soc.c                         | 2 ++
 soc/riscv/riscv-privilege/gd32vf103/soc.c              | 1 +
 soc/xtensa/intel_adsp/cavs/irq.c                       | 1 +
 105 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/arch/common/sw_isr_common.c b/arch/common/sw_isr_common.c
index aa52e9939cb..538c03603f2 100644
--- a/arch/common/sw_isr_common.c
+++ b/arch/common/sw_isr_common.c
@@ -6,6 +6,7 @@
 
 #include <zephyr/sw_isr_table.h>
 #include <zephyr/arch/cpu.h>
+#include <zephyr/irq.h>
 #include <zephyr/sys/__assert.h>
 /*
  * Common code for arches that use software ISR tables (CONFIG_GEN_ISR_TABLES)
diff --git a/drivers/clock_control/beetle_clock_control.c b/drivers/clock_control/beetle_clock_control.c
index 361238980a8..ba7845098ef 100644
--- a/drivers/clock_control/beetle_clock_control.c
+++ b/drivers/clock_control/beetle_clock_control.c
@@ -16,6 +16,7 @@
 
 #include <soc.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/irq.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/drivers/clock_control/arm_clock_control.h>
 
diff --git a/drivers/clock_control/clock_control_mchp_xec.c b/drivers/clock_control/clock_control_mchp_xec.c
index a8731704a84..f8bc4cfc30e 100644
--- a/drivers/clock_control/clock_control_mchp_xec.c
+++ b/drivers/clock_control/clock_control_mchp_xec.c
@@ -12,7 +12,7 @@
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/mchp_xec_clock_control.h>
 #include <zephyr/dt-bindings/clock/mchp_xec_pcr.h>
-
+#include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_xec, LOG_LEVEL_ERR);
 
diff --git a/drivers/clock_control/clock_control_r8a7795_cpg_mssr.c b/drivers/clock_control/clock_control_r8a7795_cpg_mssr.c
index b9f7fec51cb..270faa3b2af 100644
--- a/drivers/clock_control/clock_control_r8a7795_cpg_mssr.c
+++ b/drivers/clock_control/clock_control_r8a7795_cpg_mssr.c
@@ -15,6 +15,7 @@
 #include <zephyr/drivers/clock_control/renesas_cpg_mssr.h>
 #include <zephyr/dt-bindings/clock/renesas_cpg_mssr.h>
 #include <zephyr/dt-bindings/clock/r8a7795_cpg_mssr.h>
+#include <zephyr/irq.h>
 #include "clock_control_renesas_cpg_mssr.h"
 
 #define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
diff --git a/drivers/clock_control/clock_control_renesas_cpg_mssr.c b/drivers/clock_control/clock_control_renesas_cpg_mssr.c
index f04889c4fbb..c7233b69a7d 100644
--- a/drivers/clock_control/clock_control_renesas_cpg_mssr.c
+++ b/drivers/clock_control/clock_control_renesas_cpg_mssr.c
@@ -7,6 +7,7 @@
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/renesas_cpg_mssr.h>
 #include <zephyr/dt-bindings/clock/renesas_cpg_mssr.h>
+#include <zephyr/irq.h>
 #include "clock_control_renesas_cpg_mssr.h"
 
 static void rcar_cpg_reset(uint32_t base_address, uint32_t reg, uint32_t bit)
diff --git a/drivers/counter/counter_mcux_ctimer.c b/drivers/counter/counter_mcux_ctimer.c
index a2fdffe4556..339b7fb01a9 100644
--- a/drivers/counter/counter_mcux_ctimer.c
+++ b/drivers/counter/counter_mcux_ctimer.c
@@ -10,6 +10,8 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/dt-bindings/clock/mcux_lpc_syscon_clock.h>
+#include <zephyr/irq.h>
+
 LOG_MODULE_REGISTER(mcux_ctimer, CONFIG_COUNTER_LOG_LEVEL);
 
 #ifdef CONFIG_COUNTER_MCUX_CTIMER_RESERVE_CHANNEL_FOR_SETTOP
diff --git a/drivers/counter/counter_mcux_gpt.c b/drivers/counter/counter_mcux_gpt.c
index 3288385b13c..ea17ec8c759 100644
--- a/drivers/counter/counter_mcux_gpt.c
+++ b/drivers/counter/counter_mcux_gpt.c
@@ -8,6 +8,7 @@
 
 #include <zephyr/drivers/counter.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/irq.h>
 #include <fsl_gpt.h>
 #include <zephyr/logging/log.h>
 
diff --git a/drivers/counter/counter_mcux_pit.c b/drivers/counter/counter_mcux_pit.c
index 45115cc1e34..19bfad4e125 100644
--- a/drivers/counter/counter_mcux_pit.c
+++ b/drivers/counter/counter_mcux_pit.c
@@ -7,6 +7,7 @@
 #define DT_DRV_COMPAT nxp_kinetis_pit
 
 #include <zephyr/drivers/counter.h>
+#include <zephyr/irq.h>
 #include <fsl_pit.h>
 
 #define LOG_MODULE_NAME counter_pit
diff --git a/drivers/counter/counter_mcux_rtc.c b/drivers/counter/counter_mcux_rtc.c
index 13b334f21b5..58ec79ee52e 100644
--- a/drivers/counter/counter_mcux_rtc.c
+++ b/drivers/counter/counter_mcux_rtc.c
@@ -8,6 +8,7 @@
 #define DT_DRV_COMPAT nxp_kinetis_rtc
 
 #include <zephyr/drivers/counter.h>
+#include <zephyr/irq.h>
 #include <fsl_rtc.h>
 #include <zephyr/logging/log.h>
 
diff --git a/drivers/counter/counter_mcux_snvs.c b/drivers/counter/counter_mcux_snvs.c
index a36bb37dc06..3346cc21e75 100644
--- a/drivers/counter/counter_mcux_snvs.c
+++ b/drivers/counter/counter_mcux_snvs.c
@@ -17,6 +17,7 @@ LOG_MODULE_REGISTER(mcux_snvs, CONFIG_COUNTER_LOG_LEVEL);
 #endif
 
 #include <zephyr/drivers/counter.h>
+#include <zephyr/irq.h>
 #include <fsl_snvs_hp.h>
 
 #ifdef MCUX_SNVS_SRTC
diff --git a/drivers/counter/counter_xlnx_axi_timer.c b/drivers/counter/counter_xlnx_axi_timer.c
index eadd55192d1..7d8f282cc1b 100644
--- a/drivers/counter/counter_xlnx_axi_timer.c
+++ b/drivers/counter/counter_xlnx_axi_timer.c
@@ -9,6 +9,7 @@
 #include <zephyr/arch/cpu.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/counter.h>
+#include <zephyr/irq.h>
 #include <zephyr/sys/sys_io.h>
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(xlnx_axi_timer, CONFIG_COUNTER_LOG_LEVEL);
diff --git a/drivers/counter/timer_dtmr_cmsdk_apb.c b/drivers/counter/timer_dtmr_cmsdk_apb.c
index 9840bbec4ed..99613ba0552 100644
--- a/drivers/counter/timer_dtmr_cmsdk_apb.c
+++ b/drivers/counter/timer_dtmr_cmsdk_apb.c
@@ -10,8 +10,10 @@
 #include <zephyr/device.h>
 #include <errno.h>
 #include <zephyr/init.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <zephyr/drivers/clock_control/arm_clock_control.h>
+#include <zephyr/irq.h>
 
 #include "dualtimer_cmsdk_apb.h"
 
diff --git a/drivers/counter/timer_tmr_cmsdk_apb.c b/drivers/counter/timer_tmr_cmsdk_apb.c
index 071ffc3d15f..39eda6e185a 100644
--- a/drivers/counter/timer_tmr_cmsdk_apb.c
+++ b/drivers/counter/timer_tmr_cmsdk_apb.c
@@ -10,6 +10,7 @@
 #include <zephyr/device.h>
 #include <errno.h>
 #include <zephyr/init.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <zephyr/drivers/clock_control/arm_clock_control.h>
 
diff --git a/drivers/flash/flash_mcux_flexspi_mx25um51345g.c b/drivers/flash/flash_mcux_flexspi_mx25um51345g.c
index 8c443a51a7b..77ad0e33748 100644
--- a/drivers/flash/flash_mcux_flexspi_mx25um51345g.c
+++ b/drivers/flash/flash_mcux_flexspi_mx25um51345g.c
@@ -8,6 +8,7 @@
 
 #include <zephyr/drivers/flash.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/irq.h>
 #include <zephyr/sys/util.h>
 #include "spi_nor.h"
 #include "memc_mcux_flexspi.h"
diff --git a/drivers/flash/flash_mcux_flexspi_nor.c b/drivers/flash/flash_mcux_flexspi_nor.c
index 44360bfb72d..56750062094 100644
--- a/drivers/flash/flash_mcux_flexspi_nor.c
+++ b/drivers/flash/flash_mcux_flexspi_nor.c
@@ -7,6 +7,7 @@
 #define DT_DRV_COMPAT	nxp_imx_flexspi_nor
 
 #include <zephyr/drivers/flash.h>
+#include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util.h>
 #include "spi_nor.h"
diff --git a/drivers/gpio/gpio_b91.c b/drivers/gpio/gpio_b91.c
index 397b594e580..6aadb119993 100644
--- a/drivers/gpio/gpio_b91.c
+++ b/drivers/gpio/gpio_b91.c
@@ -8,6 +8,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
 #include "gpio_utils.h"
 
 
diff --git a/drivers/gpio/gpio_eos_s3.c b/drivers/gpio/gpio_eos_s3.c
index 7ad0df243cb..82bd15ac874 100644
--- a/drivers/gpio/gpio_eos_s3.c
+++ b/drivers/gpio/gpio_eos_s3.c
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <eoss3_hal_gpio.h>
 #include <eoss3_hal_pads.h>
diff --git a/drivers/gpio/gpio_gecko.c b/drivers/gpio/gpio_gecko.c
index c7de9a1f5c4..e622d880217 100644
--- a/drivers/gpio/gpio_gecko.c
+++ b/drivers/gpio/gpio_gecko.c
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <em_gpio.h>
 
diff --git a/drivers/gpio/gpio_imx.c b/drivers/gpio/gpio_imx.c
index 5c5748d210f..b2048049c78 100644
--- a/drivers/gpio/gpio_imx.c
+++ b/drivers/gpio/gpio_imx.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <zephyr/sys/util.h>
 #include <gpio_imx.h>
diff --git a/drivers/gpio/gpio_ite_it8xxx2.c b/drivers/gpio/gpio_ite_it8xxx2.c
index 5600d7ea454..3405e65cdeb 100644
--- a/drivers/gpio/gpio_ite_it8xxx2.c
+++ b/drivers/gpio/gpio_ite_it8xxx2.c
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/dt-bindings/gpio/ite-it8xxx2-gpio.h>
 #include <zephyr/dt-bindings/interrupt-controller/ite-intc.h>
+#include <zephyr/irq.h>
 #include <zephyr/types.h>
 #include <zephyr/sys/util.h>
 #include <string.h>
diff --git a/drivers/gpio/gpio_litex.c b/drivers/gpio/gpio_litex.c
index c9361bcab66..df1a91bc02e 100644
--- a/drivers/gpio/gpio_litex.c
+++ b/drivers/gpio/gpio_litex.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
 #include <zephyr/types.h>
 #include <zephyr/sys/util.h>
 #include <string.h>
diff --git a/drivers/gpio/gpio_lpc11u6x.c b/drivers/gpio/gpio_lpc11u6x.c
index a92076cfa4f..d6b2e4707f2 100644
--- a/drivers/gpio/gpio_lpc11u6x.c
+++ b/drivers/gpio/gpio_lpc11u6x.c
@@ -18,6 +18,7 @@
 
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
 
 #include <soc.h>
 
diff --git a/drivers/gpio/gpio_mchp_xec_v2.c b/drivers/gpio/gpio_mchp_xec_v2.c
index cb86a70a1b7..2d1498f061a 100644
--- a/drivers/gpio/gpio_mchp_xec_v2.c
+++ b/drivers/gpio/gpio_mchp_xec_v2.c
@@ -13,6 +13,7 @@
 #include <zephyr/dt-bindings/pinctrl/mchp-xec-pinctrl.h>
 #include <soc.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_mcux.c b/drivers/gpio/gpio_mcux.c
index 3052a528170..bf3ad08bd16 100644
--- a/drivers/gpio/gpio_mcux.c
+++ b/drivers/gpio/gpio_mcux.c
@@ -11,6 +11,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/dt-bindings/gpio/nxp-kinetis-gpio.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include <fsl_port.h>
diff --git a/drivers/gpio/gpio_mcux_igpio.c b/drivers/gpio/gpio_mcux_igpio.c
index a28ebe621d4..4792051a8bf 100644
--- a/drivers/gpio/gpio_mcux_igpio.c
+++ b/drivers/gpio/gpio_mcux_igpio.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include <fsl_gpio.h>
diff --git a/drivers/gpio/gpio_mcux_lpc.c b/drivers/gpio/gpio_mcux_lpc.c
index 79012987a67..87d2f035529 100644
--- a/drivers/gpio/gpio_mcux_lpc.c
+++ b/drivers/gpio/gpio_mcux_lpc.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_mmio32.c b/drivers/gpio/gpio_mmio32.c
index f37aaa533b1..e9e58373b5b 100644
--- a/drivers/gpio/gpio_mmio32.c
+++ b/drivers/gpio/gpio_mmio32.c
@@ -27,6 +27,7 @@
  */
 
 #include <zephyr/drivers/gpio/gpio_mmio32.h>
+#include <zephyr/irq.h>
 #include <errno.h>
 
 static int gpio_mmio32_config(const struct device *dev,
diff --git a/drivers/gpio/gpio_neorv32.c b/drivers/gpio/gpio_neorv32.c
index 2402a0ffd4a..8704f750351 100644
--- a/drivers/gpio/gpio_neorv32.c
+++ b/drivers/gpio/gpio_neorv32.c
@@ -10,6 +10,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/syscon.h>
+#include <zephyr/irq.h>
 #include <zephyr/sys/sys_io.h>
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_neorv32, CONFIG_GPIO_LOG_LEVEL);
diff --git a/drivers/gpio/gpio_rpi_pico.c b/drivers/gpio/gpio_rpi_pico.c
index 7c09b47263d..ddeb82f7d22 100644
--- a/drivers/gpio/gpio_rpi_pico.c
+++ b/drivers/gpio/gpio_rpi_pico.c
@@ -6,6 +6,7 @@
 
 #include <errno.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
 
 /* pico-sdk includes */
 #include <hardware/gpio.h>
diff --git a/drivers/gpio/gpio_rv32m1.c b/drivers/gpio/gpio_rv32m1.c
index 5036e61f1d0..c2212d70684 100644
--- a/drivers/gpio/gpio_rv32m1.c
+++ b/drivers/gpio/gpio_rv32m1.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include <fsl_port.h>
diff --git a/drivers/gpio/gpio_smartbond.c b/drivers/gpio/gpio_smartbond.c
index cb9a68b9cc5..ddf71fb44c6 100644
--- a/drivers/gpio/gpio_smartbond.c
+++ b/drivers/gpio/gpio_smartbond.c
@@ -10,6 +10,7 @@
 
 #include <stdint.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
 
 #include <DA1469xAB.h>
 
diff --git a/drivers/gpio/gpio_stellaris.c b/drivers/gpio/gpio_stellaris.c
index 4b904a20d1e..e444fcf27f5 100644
--- a/drivers/gpio/gpio_stellaris.c
+++ b/drivers/gpio/gpio_stellaris.c
@@ -10,6 +10,7 @@
 #include <zephyr/arch/cpu.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <zephyr/sys/sys_io.h>
 #include "gpio_utils.h"
diff --git a/drivers/i2c/i2c_ite_enhance.c b/drivers/i2c/i2c_ite_enhance.c
index 8786e7245b5..6bd780066c8 100644
--- a/drivers/i2c/i2c_ite_enhance.c
+++ b/drivers/i2c/i2c_ite_enhance.c
@@ -9,6 +9,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/irq.h>
 #include <zephyr/pm/policy.h>
 #include <errno.h>
 #include <soc.h>
diff --git a/drivers/i2c/i2c_ite_it8xxx2.c b/drivers/i2c/i2c_ite_it8xxx2.c
index 32a2ea0d816..dc63c1999fd 100644
--- a/drivers/i2c/i2c_ite_it8xxx2.c
+++ b/drivers/i2c/i2c_ite_it8xxx2.c
@@ -9,6 +9,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/irq.h>
 #include <errno.h>
 #include <soc.h>
 #include <soc_dt.h>
diff --git a/drivers/i2c/i2c_nios2.c b/drivers/i2c/i2c_nios2.c
index b3ebd3a9f44..8ed1414d82f 100644
--- a/drivers/i2c/i2c_nios2.c
+++ b/drivers/i2c/i2c_nios2.c
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <zephyr/sys/util.h>
 #include <altera_common.h>
diff --git a/drivers/interrupt_controller/intc_cavs.c b/drivers/interrupt_controller/intc_cavs.c
index 2d0b868f09f..7ef8f5f0202 100644
--- a/drivers/interrupt_controller/intc_cavs.c
+++ b/drivers/interrupt_controller/intc_cavs.c
@@ -8,6 +8,7 @@
 
 #include <zephyr/arch/cpu.h>
 #include <zephyr/device.h>
+#include <zephyr/irq.h>
 #include <zephyr/irq_nextlevel.h>
 #include "intc_cavs.h"
 
diff --git a/drivers/interrupt_controller/intc_gd32_exti.c b/drivers/interrupt_controller/intc_gd32_exti.c
index ac72be6d142..587870553aa 100644
--- a/drivers/interrupt_controller/intc_gd32_exti.c
+++ b/drivers/interrupt_controller/intc_gd32_exti.c
@@ -11,6 +11,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/interrupt_controller/gd32_exti.h>
 #include <zephyr/sys/__assert.h>
+#include <zephyr/irq.h>
 #include <zephyr/sys/util_macro.h>
 
 #include <gd32_exti.h>
diff --git a/drivers/interrupt_controller/intc_sam0_eic.c b/drivers/interrupt_controller/intc_sam0_eic.c
index 2704c0923f8..3bbfacdab1a 100644
--- a/drivers/interrupt_controller/intc_sam0_eic.c
+++ b/drivers/interrupt_controller/intc_sam0_eic.c
@@ -7,6 +7,7 @@
 #define DT_DRV_COMPAT atmel_sam0_eic
 
 #include <zephyr/device.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <zephyr/drivers/interrupt_controller/sam0_eic.h>
 #include "intc_sam0_eic_priv.h"
diff --git a/drivers/pwm/pwm_mcux_ftm.c b/drivers/pwm/pwm_mcux_ftm.c
index bf3bd5bf841..a1a322fc008 100644
--- a/drivers/pwm/pwm_mcux_ftm.c
+++ b/drivers/pwm/pwm_mcux_ftm.c
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/clock_control.h>
 #include <errno.h>
 #include <zephyr/drivers/pwm.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <fsl_ftm.h>
 #include <fsl_clock.h>
diff --git a/drivers/pwm/pwm_mcux_pwt.c b/drivers/pwm/pwm_mcux_pwt.c
index f6adba93f67..20b3a199684 100644
--- a/drivers/pwm/pwm_mcux_pwt.c
+++ b/drivers/pwm/pwm_mcux_pwt.c
@@ -9,6 +9,7 @@
 #include <zephyr/drivers/clock_control.h>
 #include <errno.h>
 #include <zephyr/drivers/pwm.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <fsl_pwt.h>
 #include <fsl_clock.h>
diff --git a/drivers/sdhc/mcux_sdif.c b/drivers/sdhc/mcux_sdif.c
index 697d535c185..77904538adc 100644
--- a/drivers/sdhc/mcux_sdif.c
+++ b/drivers/sdhc/mcux_sdif.c
@@ -11,6 +11,7 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/irq.h>
 #include <fsl_sdif.h>
 
 LOG_MODULE_REGISTER(sdif, CONFIG_SDHC_LOG_LEVEL);
diff --git a/drivers/serial/uart_apbuart.c b/drivers/serial/uart_apbuart.c
index f41e76a8958..c8fd226f872 100644
--- a/drivers/serial/uart_apbuart.c
+++ b/drivers/serial/uart_apbuart.c
@@ -7,6 +7,7 @@
 #define DT_DRV_COMPAT gaisler_apbuart
 
 #include <zephyr/drivers/uart.h>
+#include <zephyr/irq.h>
 #include <errno.h>
 
 /* APBUART registers
diff --git a/drivers/serial/uart_b91.c b/drivers/serial/uart_b91.c
index 2d1a27db329..2573434f34f 100644
--- a/drivers/serial/uart_b91.c
+++ b/drivers/serial/uart_b91.c
@@ -10,6 +10,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/irq.h>
 
 
 /* Driver dts compatibility: telink,b91_uart */
diff --git a/drivers/serial/uart_lpc11u6x.c b/drivers/serial/uart_lpc11u6x.c
index ffe4cd16fd4..47a687c1618 100644
--- a/drivers/serial/uart_lpc11u6x.c
+++ b/drivers/serial/uart_lpc11u6x.c
@@ -9,6 +9,7 @@
 
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/irq.h>
 
 #include "uart_lpc11u6x.h"
 
diff --git a/drivers/serial/uart_mcux.c b/drivers/serial/uart_mcux.c
index 1a71e8fd015..e9777e9c744 100644
--- a/drivers/serial/uart_mcux.c
+++ b/drivers/serial/uart_mcux.c
@@ -11,6 +11,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/irq.h>
 #include <fsl_uart.h>
 #include <soc.h>
 #ifdef CONFIG_PINCTRL
diff --git a/drivers/serial/uart_mcux_flexcomm.c b/drivers/serial/uart_mcux_flexcomm.c
index 4eea0f3740e..a2bda88b395 100644
--- a/drivers/serial/uart_mcux_flexcomm.c
+++ b/drivers/serial/uart_mcux_flexcomm.c
@@ -18,6 +18,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/irq.h>
 #include <fsl_usart.h>
 #include <soc.h>
 #include <fsl_device_registers.h>
diff --git a/drivers/serial/uart_mcux_iuart.c b/drivers/serial/uart_mcux_iuart.c
index ebfd347aa6d..c72100b5d1e 100644
--- a/drivers/serial/uart_mcux_iuart.c
+++ b/drivers/serial/uart_mcux_iuart.c
@@ -9,6 +9,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/irq.h>
 #include <errno.h>
 #include <fsl_uart.h>
 #include <zephyr/drivers/pinctrl.h>
diff --git a/drivers/serial/uart_mcux_lpuart.c b/drivers/serial/uart_mcux_lpuart.c
index fdf4abe0b93..046b41843b7 100644
--- a/drivers/serial/uart_mcux_lpuart.c
+++ b/drivers/serial/uart_mcux_lpuart.c
@@ -13,6 +13,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/irq.h>
 #include <zephyr/pm/policy.h>
 #ifdef CONFIG_PINCTRL
 #include <zephyr/drivers/pinctrl.h>
diff --git a/drivers/serial/uart_rcar.c b/drivers/serial/uart_rcar.c
index 86672655397..1a757d72422 100644
--- a/drivers/serial/uart_rcar.c
+++ b/drivers/serial/uart_rcar.c
@@ -13,6 +13,7 @@
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/renesas_cpg_mssr.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/irq.h>
 #include <zephyr/spinlock.h>
 
 struct uart_rcar_cfg {
diff --git a/drivers/serial/uart_rpi_pico.c b/drivers/serial/uart_rpi_pico.c
index 586fcb7a596..58d42ad4bb9 100644
--- a/drivers/serial/uart_rpi_pico.c
+++ b/drivers/serial/uart_rpi_pico.c
@@ -8,6 +8,7 @@
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/reset.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/irq.h>
 
 /* pico-sdk includes */
 #include <hardware/uart.h>
diff --git a/drivers/serial/uart_rv32m1_lpuart.c b/drivers/serial/uart_rv32m1_lpuart.c
index a9d6d6bd87b..7a683eca168 100644
--- a/drivers/serial/uart_rv32m1_lpuart.c
+++ b/drivers/serial/uart_rv32m1_lpuart.c
@@ -11,6 +11,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/irq.h>
 #include <fsl_lpuart.h>
 #include <soc.h>
 #ifdef CONFIG_PINCTRL
diff --git a/drivers/serial/uart_sam.c b/drivers/serial/uart_sam.c
index 5265eedfd80..49cdc0ad0da 100644
--- a/drivers/serial/uart_sam.c
+++ b/drivers/serial/uart_sam.c
@@ -21,6 +21,7 @@
 #include <soc.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/irq.h>
 
 /* Device constant configuration parameters */
 struct uart_sam_dev_cfg {
diff --git a/drivers/serial/uart_xlnx_uartlite.c b/drivers/serial/uart_xlnx_uartlite.c
index 3a6babf8c9e..2c0332b61a9 100644
--- a/drivers/serial/uart_xlnx_uartlite.c
+++ b/drivers/serial/uart_xlnx_uartlite.c
@@ -11,6 +11,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
+#include <zephyr/irq.h>
 #include <zephyr/sys/sys_io.h>
 
 /* AXI UART Lite v2 registers offsets (See Xilinx PG142 for details) */
diff --git a/drivers/serial/usart_gd32.c b/drivers/serial/usart_gd32.c
index baded3077fd..10a22f61bb6 100644
--- a/drivers/serial/usart_gd32.c
+++ b/drivers/serial/usart_gd32.c
@@ -12,6 +12,7 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/reset.h>
 #include <zephyr/drivers/uart.h>
+#include <zephyr/irq.h>
 
 #include <gd32_usart.h>
 
diff --git a/drivers/serial/usart_sam.c b/drivers/serial/usart_sam.c
index e4ba94205f6..ddad4afce46 100644
--- a/drivers/serial/usart_sam.c
+++ b/drivers/serial/usart_sam.c
@@ -21,6 +21,7 @@
 #include <soc.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/irq.h>
 
 /* Device constant configuration parameters */
 struct usart_sam_dev_cfg {
diff --git a/drivers/timer/arm_arch_timer.c b/drivers/timer/arm_arch_timer.c
index cf9d895bf4f..dfdb8142308 100644
--- a/drivers/timer/arm_arch_timer.c
+++ b/drivers/timer/arm_arch_timer.c
@@ -6,6 +6,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/timer/arm_arch_timer.h>
 #include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/irq.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>
 #include <zephyr/arch/cpu.h>
diff --git a/drivers/timer/cc13x2_cc26x2_rtc_timer.c b/drivers/timer/cc13x2_cc26x2_rtc_timer.c
index 4afa03e62be..8925bad4e07 100644
--- a/drivers/timer/cc13x2_cc26x2_rtc_timer.c
+++ b/drivers/timer/cc13x2_cc26x2_rtc_timer.c
@@ -19,6 +19,7 @@
 #include <soc.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/irq.h>
 #include <zephyr/sys_clock.h>
 
 #include <driverlib/interrupt.h>
diff --git a/drivers/timer/leon_gptimer.c b/drivers/timer/leon_gptimer.c
index 6d47ce1d821..f6c7a294f10 100644
--- a/drivers/timer/leon_gptimer.c
+++ b/drivers/timer/leon_gptimer.c
@@ -14,6 +14,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/irq.h>
 #include <zephyr/sys_clock.h>
 
 /* GPTIMER subtimer increments each microsecond. */
diff --git a/drivers/timer/mchp_xec_rtos_timer.c b/drivers/timer/mchp_xec_rtos_timer.c
index 24a05d3294c..848a7e930e7 100644
--- a/drivers/timer/mchp_xec_rtos_timer.c
+++ b/drivers/timer/mchp_xec_rtos_timer.c
@@ -13,6 +13,7 @@
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 
 BUILD_ASSERT(!IS_ENABLED(CONFIG_SMP), "XEC RTOS timer doesn't support SMP");
 BUILD_ASSERT(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC == 32768,
diff --git a/drivers/timer/mcux_gpt_timer.c b/drivers/timer/mcux_gpt_timer.c
index 9c4992a5a67..ae95239627f 100644
--- a/drivers/timer/mcux_gpt_timer.c
+++ b/drivers/timer/mcux_gpt_timer.c
@@ -12,7 +12,7 @@
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>
 #include <zephyr/sys/time_units.h>
-
+#include <zephyr/irq.h>
 
 
 /* GPT is a 32 bit counter, but we use a lower value to avoid integer overflow */
diff --git a/drivers/timer/mcux_os_timer.c b/drivers/timer/mcux_os_timer.c
index bebb77134e9..3bfa19bac0e 100644
--- a/drivers/timer/mcux_os_timer.c
+++ b/drivers/timer/mcux_os_timer.c
@@ -8,6 +8,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/irq.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>
 #include "fsl_ostimer.h"
diff --git a/drivers/timer/mips_cp0_timer.c b/drivers/timer/mips_cp0_timer.c
index 31a6c35bb63..0115997dbc1 100644
--- a/drivers/timer/mips_cp0_timer.c
+++ b/drivers/timer/mips_cp0_timer.c
@@ -9,6 +9,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/irq.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>
 #include <soc.h>
diff --git a/drivers/timer/rcar_cmt_timer.c b/drivers/timer/rcar_cmt_timer.c
index 2e5c59b9a88..63ac8160b56 100644
--- a/drivers/timer/rcar_cmt_timer.c
+++ b/drivers/timer/rcar_cmt_timer.c
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/renesas_cpg_mssr.h>
+#include <zephyr/irq.h>
 
 #define DT_DRV_COMPAT renesas_rcar_cmt
 
diff --git a/drivers/timer/stm32_lptim_timer.c b/drivers/timer/stm32_lptim_timer.c
index 092424f672f..b2e4aa66ddb 100644
--- a/drivers/timer/stm32_lptim_timer.c
+++ b/drivers/timer/stm32_lptim_timer.c
@@ -16,6 +16,7 @@
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <zephyr/sys_clock.h>
+#include <zephyr/irq.h>
 
 #include <zephyr/spinlock.h>
 
diff --git a/drivers/timer/xlnx_psttc_timer.c b/drivers/timer/xlnx_psttc_timer.c
index 19024dc1b70..b03cb34f332 100644
--- a/drivers/timer/xlnx_psttc_timer.c
+++ b/drivers/timer/xlnx_psttc_timer.c
@@ -9,6 +9,7 @@
 
 #include <zephyr/arch/cpu.h>
 #include <zephyr/device.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include "xlnx_psttc_timer_priv.h"
diff --git a/drivers/usb/device/usb_dc_sam_usbhs.c b/drivers/usb/device/usb_dc_sam_usbhs.c
index 500dc36bc24..4c202112b45 100644
--- a/drivers/usb/device/usb_dc_sam_usbhs.c
+++ b/drivers/usb/device/usb_dc_sam_usbhs.c
@@ -7,6 +7,7 @@
 #define DT_DRV_COMPAT atmel_sam_usbhs
 
 #include <zephyr/usb/usb_device.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <string.h>
 
diff --git a/drivers/watchdog/wdt_mcux_wdog.c b/drivers/watchdog/wdt_mcux_wdog.c
index ca2e8862804..35d143b5c4d 100644
--- a/drivers/watchdog/wdt_mcux_wdog.c
+++ b/drivers/watchdog/wdt_mcux_wdog.c
@@ -9,6 +9,7 @@
 
 #include <zephyr/drivers/watchdog.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/irq.h>
 #include <fsl_wdog.h>
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
diff --git a/drivers/watchdog/wdt_mcux_wwdt.c b/drivers/watchdog/wdt_mcux_wwdt.c
index 779732e9d84..56185b92494 100644
--- a/drivers/watchdog/wdt_mcux_wwdt.c
+++ b/drivers/watchdog/wdt_mcux_wwdt.c
@@ -11,6 +11,7 @@
 #define DT_DRV_COMPAT nxp_lpc_wwdt
 
 #include <zephyr/drivers/watchdog.h>
+#include <zephyr/irq.h>
 #include <fsl_wwdt.h>
 #include <fsl_clock.h>
 
diff --git a/drivers/watchdog/wdt_sam.c b/drivers/watchdog/wdt_sam.c
index b54d795394d..52a251db749 100644
--- a/drivers/watchdog/wdt_sam.c
+++ b/drivers/watchdog/wdt_sam.c
@@ -20,6 +20,7 @@
  */
 
 #include <zephyr/drivers/watchdog.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
diff --git a/drivers/watchdog/wdt_wwdg_stm32.c b/drivers/watchdog/wdt_wwdg_stm32.c
index ea7aa3d14a3..879738f7eba 100644
--- a/drivers/watchdog/wdt_wwdg_stm32.c
+++ b/drivers/watchdog/wdt_wwdg_stm32.c
@@ -15,6 +15,7 @@
 #include <zephyr/sys/__assert.h>
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/irq.h>
 
 #include "wdt_wwdg_stm32.h"
 
diff --git a/drivers/watchdog/wdt_wwdgt_gd32.c b/drivers/watchdog/wdt_wwdgt_gd32.c
index e66e3282c02..43274bca07a 100644
--- a/drivers/watchdog/wdt_wwdgt_gd32.c
+++ b/drivers/watchdog/wdt_wwdgt_gd32.c
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/clock_control/gd32.h>
 #include <zephyr/drivers/reset.h>
 #include <zephyr/drivers/watchdog.h>
+#include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
 
 #include <gd32_wwdgt.h>
diff --git a/soc/arm/atmel_sam/sam3x/soc.c b/soc/arm/atmel_sam/sam3x/soc.c
index 13e72fccd4b..7a1a81c8157 100644
--- a/soc/arm/atmel_sam/sam3x/soc.c
+++ b/soc/arm/atmel_sam/sam3x/soc.c
@@ -19,6 +19,7 @@
 #include <soc.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.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 dc75e9c7aa3..3bf6c83f9d1 100644
--- a/soc/arm/atmel_sam/sam4e/soc.c
+++ b/soc/arm/atmel_sam/sam4e/soc.c
@@ -20,6 +20,7 @@
 #include <soc.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 
 /**
  * @brief Setup various clock on SoC at boot time.
diff --git a/soc/arm/atmel_sam/sam4l/soc.c b/soc/arm/atmel_sam/sam4l/soc.c
index 43cb449e951..59a08a84e48 100644
--- a/soc/arm/atmel_sam/sam4l/soc.c
+++ b/soc/arm/atmel_sam/sam4l/soc.c
@@ -15,6 +15,7 @@
 #include <zephyr/init.h>
 #include <soc.h>
 #include <zephyr/arch/cpu.h>
+#include <zephyr/irq.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 3bb1e6194de..f3bdcfdf77f 100644
--- a/soc/arm/atmel_sam/sam4s/soc.c
+++ b/soc/arm/atmel_sam/sam4s/soc.c
@@ -19,6 +19,7 @@
 #include <soc.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 
 /**
  * @brief Setup various clock on SoC at boot time.
diff --git a/soc/arm/atmel_sam/same70/soc.c b/soc/arm/atmel_sam/same70/soc.c
index 9ad8c498f73..34198736698 100644
--- a/soc/arm/atmel_sam/same70/soc.c
+++ b/soc/arm/atmel_sam/same70/soc.c
@@ -16,6 +16,7 @@
 #include <soc.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/irq.h>
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
diff --git a/soc/arm/atmel_sam/samv71/soc.c b/soc/arm/atmel_sam/samv71/soc.c
index 232299c1b8f..083e2f44ea6 100644
--- a/soc/arm/atmel_sam/samv71/soc.c
+++ b/soc/arm/atmel_sam/samv71/soc.c
@@ -17,6 +17,7 @@
 #include <soc.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/irq.h>
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
diff --git a/soc/arm/bcm_vk/valkyrie/soc.c b/soc/arm/bcm_vk/valkyrie/soc.c
index 7b65ad96bb5..1d33a00dc88 100644
--- a/soc/arm/bcm_vk/valkyrie/soc.c
+++ b/soc/arm/bcm_vk/valkyrie/soc.c
@@ -7,6 +7,7 @@
 #include <zephyr/init.h>
 #include <soc.h>
 #include <zephyr/arch/cpu.h>
+#include <zephyr/irq.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm/bcm_vk/viper/soc.c b/soc/arm/bcm_vk/viper/soc.c
index cc76d311f1f..cd22c2feb65 100644
--- a/soc/arm/bcm_vk/viper/soc.c
+++ b/soc/arm/bcm_vk/viper/soc.c
@@ -8,6 +8,7 @@
 #include <zephyr/init.h>
 #include <soc.h>
 #include <zephyr/arch/cpu.h>
+#include <zephyr/irq.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm/gigadevice/gd32e10x/soc.c b/soc/arm/gigadevice/gd32e10x/soc.c
index 51e4dc35b59..2ca3748c9d8 100644
--- a/soc/arm/gigadevice/gd32e10x/soc.c
+++ b/soc/arm/gigadevice/gd32e10x/soc.c
@@ -5,6 +5,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/init.h>
+#include <zephyr/irq.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 dcbeaded4f0..9b253303d28 100644
--- a/soc/arm/gigadevice/gd32f3x0/soc.c
+++ b/soc/arm/gigadevice/gd32f3x0/soc.c
@@ -5,6 +5,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/init.h>
+#include <zephyr/irq.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 9b5e6679914..64bdc42f4b0 100644
--- a/soc/arm/gigadevice/gd32f403/soc.c
+++ b/soc/arm/gigadevice/gd32f403/soc.c
@@ -13,6 +13,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/init.h>
+#include <zephyr/irq.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm/gigadevice/gd32f4xx/soc.c b/soc/arm/gigadevice/gd32f4xx/soc.c
index 394c7923946..266d906a37c 100644
--- a/soc/arm/gigadevice/gd32f4xx/soc.c
+++ b/soc/arm/gigadevice/gd32f4xx/soc.c
@@ -5,6 +5,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/init.h>
+#include <zephyr/irq.h>
 
 static int gd32f4xx_soc_init(const struct device *dev)
 {
diff --git a/soc/arm/nxp_imx/mcimx6x_m4/soc.c b/soc/arm/nxp_imx/mcimx6x_m4/soc.c
index 84bf5415d2a..46a0fe9bae1 100644
--- a/soc/arm/nxp_imx/mcimx6x_m4/soc.c
+++ b/soc/arm/nxp_imx/mcimx6x_m4/soc.c
@@ -5,6 +5,7 @@
  */
 
 #include <zephyr/init.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <zephyr/dt-bindings/rdc/imx_rdc.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
diff --git a/soc/arm/nxp_imx/rt5xx/soc.c b/soc/arm/nxp_imx/rt5xx/soc.c
index fa716c5548f..1374436f685 100644
--- a/soc/arm/nxp_imx/rt5xx/soc.c
+++ b/soc/arm/nxp_imx/rt5xx/soc.c
@@ -14,6 +14,7 @@
 
 #include <zephyr/init.h>
 #include <zephyr/devicetree.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include "flash_clock_setup.h"
 #include "fsl_power.h"
diff --git a/soc/arm/st_stm32/stm32f0/soc.c b/soc/arm/st_stm32/stm32f0/soc.c
index f033f29bacc..a829f90e2a9 100644
--- a/soc/arm/st_stm32/stm32f0/soc.c
+++ b/soc/arm/st_stm32/stm32f0/soc.c
@@ -14,6 +14,7 @@
 #include <stm32_ll_system.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 #include <zephyr/linker/linker-defs.h>
 #include <string.h>
 
diff --git a/soc/arm/st_stm32/stm32f1/soc.c b/soc/arm/st_stm32/stm32f1/soc.c
index 1e1a0cba182..082ac1f6903 100644
--- a/soc/arm/st_stm32/stm32f1/soc.c
+++ b/soc/arm/st_stm32/stm32f1/soc.c
@@ -13,6 +13,7 @@
 #include <zephyr/init.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.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 7d3743b7a7c..cfeb21c3100 100644
--- a/soc/arm/st_stm32/stm32f2/soc.c
+++ b/soc/arm/st_stm32/stm32f2/soc.c
@@ -17,6 +17,7 @@
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <stm32_ll_system.h>
 #include <zephyr/linker/linker-defs.h>
+#include <zephyr/irq.h>
 #include <string.h>
 
 /**
diff --git a/soc/arm/st_stm32/stm32f3/soc.c b/soc/arm/st_stm32/stm32f3/soc.c
index fbcfcb29920..c2811d0ed12 100644
--- a/soc/arm/st_stm32/stm32f3/soc.c
+++ b/soc/arm/st_stm32/stm32f3/soc.c
@@ -13,6 +13,7 @@
 #include <zephyr/init.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.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 329ca1f04a2..55196988444 100644
--- a/soc/arm/st_stm32/stm32f4/soc.c
+++ b/soc/arm/st_stm32/stm32f4/soc.c
@@ -14,6 +14,8 @@
 #include <zephyr/init.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.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 62a60c4f9c7..915e0d37b58 100644
--- a/soc/arm/st_stm32/stm32f7/soc.c
+++ b/soc/arm/st_stm32/stm32f7/soc.c
@@ -15,6 +15,7 @@
 #include <soc.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 #include <stm32_ll_system.h>
 
 /**
diff --git a/soc/arm/st_stm32/stm32g0/soc.c b/soc/arm/st_stm32/stm32g0/soc.c
index cf8f4fb9371..d463ad07763 100644
--- a/soc/arm/st_stm32/stm32g0/soc.c
+++ b/soc/arm/st_stm32/stm32g0/soc.c
@@ -14,6 +14,7 @@
 #include <zephyr/init.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 #include <zephyr/linker/linker-defs.h>
 #include <string.h>
 #if defined(SYSCFG_CFGR1_UCPD1_STROBE) || defined(SYSCFG_CFGR1_UCPD2_STROBE)
diff --git a/soc/arm/st_stm32/stm32g4/soc.c b/soc/arm/st_stm32/stm32g4/soc.c
index 4d5b5d0d7ce..22b427cbbab 100644
--- a/soc/arm/st_stm32/stm32g4/soc.c
+++ b/soc/arm/st_stm32/stm32g4/soc.c
@@ -14,6 +14,7 @@
 #include <stm32_ll_system.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 
 #if defined(PWR_CR3_UCPD_DBDIS)
 #include <stm32_ll_bus.h>
diff --git a/soc/arm/st_stm32/stm32h7/soc_m4.c b/soc/arm/st_stm32/stm32h7/soc_m4.c
index 070cfdf43c2..654d4721a98 100644
--- a/soc/arm/st_stm32/stm32h7/soc_m4.c
+++ b/soc/arm/st_stm32/stm32h7/soc_m4.c
@@ -12,6 +12,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_cortex.h>
diff --git a/soc/arm/st_stm32/stm32h7/soc_m7.c b/soc/arm/st_stm32/stm32h7/soc_m7.c
index 11dc389e3c8..9ca1b7d7ca4 100644
--- a/soc/arm/st_stm32/stm32h7/soc_m7.c
+++ b/soc/arm/st_stm32/stm32h7/soc_m7.c
@@ -12,6 +12,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
+#include <zephyr/irq.h>
 #include <soc.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_pwr.h>
diff --git a/soc/arm/st_stm32/stm32l0/soc.c b/soc/arm/st_stm32/stm32l0/soc.c
index 8c17dc31504..688769a7ec1 100644
--- a/soc/arm/st_stm32/stm32l0/soc.c
+++ b/soc/arm/st_stm32/stm32l0/soc.c
@@ -13,6 +13,7 @@
 #include <zephyr/init.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 #include <zephyr/linker/linker-defs.h>
 #include <string.h>
 #include <stm32_ll_bus.h>
diff --git a/soc/arm/st_stm32/stm32l1/soc.c b/soc/arm/st_stm32/stm32l1/soc.c
index 2b90f486331..22b5830c79c 100644
--- a/soc/arm/st_stm32/stm32l1/soc.c
+++ b/soc/arm/st_stm32/stm32l1/soc.c
@@ -13,6 +13,7 @@
 #include <zephyr/init.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 #include <zephyr/linker/linker-defs.h>
 #include <string.h>
 #include <stm32_ll_bus.h>
diff --git a/soc/arm/st_stm32/stm32l4/soc.c b/soc/arm/st_stm32/stm32l4/soc.c
index 5b708ba6b5a..bb90223e18b 100644
--- a/soc/arm/st_stm32/stm32l4/soc.c
+++ b/soc/arm/st_stm32/stm32l4/soc.c
@@ -14,6 +14,7 @@
 #include <zephyr/init.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
diff --git a/soc/arm/st_stm32/stm32l5/soc.c b/soc/arm/st_stm32/stm32l5/soc.c
index 26c3c597ff6..31382f7d281 100644
--- a/soc/arm/st_stm32/stm32l5/soc.c
+++ b/soc/arm/st_stm32/stm32l5/soc.c
@@ -15,6 +15,7 @@
 #include <stm32_ll_pwr.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 #include <stm32l5xx_ll_icache.h>
 #include <zephyr/logging/log.h>
 
diff --git a/soc/arm/st_stm32/stm32mp1/soc.c b/soc/arm/st_stm32/stm32mp1/soc.c
index 9ab5946100b..438ac9212a3 100644
--- a/soc/arm/st_stm32/stm32mp1/soc.c
+++ b/soc/arm/st_stm32/stm32mp1/soc.c
@@ -16,6 +16,7 @@
 #include <stm32_ll_bus.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.
diff --git a/soc/arm/st_stm32/stm32u5/soc.c b/soc/arm/st_stm32/stm32u5/soc.c
index 6089a488a3f..509e3df39c7 100644
--- a/soc/arm/st_stm32/stm32u5/soc.c
+++ b/soc/arm/st_stm32/stm32u5/soc.c
@@ -16,7 +16,7 @@
 #include <stm32_ll_icache.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
-
+#include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
diff --git a/soc/arm/st_stm32/stm32wb/soc.c b/soc/arm/st_stm32/stm32wb/soc.c
index 3d195133075..2c8d876fdcb 100644
--- a/soc/arm/st_stm32/stm32wb/soc.c
+++ b/soc/arm/st_stm32/stm32wb/soc.c
@@ -14,6 +14,7 @@
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/irq.h>
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
diff --git a/soc/arm/st_stm32/stm32wl/soc.c b/soc/arm/st_stm32/stm32wl/soc.c
index bb7fc7f5d16..08d27b0586c 100644
--- a/soc/arm/st_stm32/stm32wl/soc.c
+++ b/soc/arm/st_stm32/stm32wl/soc.c
@@ -13,6 +13,8 @@
 #include <zephyr/init.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/irq.h>
+
 #include <stm32wlxx_ll_system.h>
 
 /**
diff --git a/soc/riscv/riscv-privilege/gd32vf103/soc.c b/soc/riscv/riscv-privilege/gd32vf103/soc.c
index f17f177bf84..53241673095 100644
--- a/soc/riscv/riscv-privilege/gd32vf103/soc.c
+++ b/soc/riscv/riscv-privilege/gd32vf103/soc.c
@@ -5,6 +5,7 @@
  */
 
 #include <zephyr/init.h>
+#include <zephyr/irq.h>
 
 #include <gd32vf103.h>
 
diff --git a/soc/xtensa/intel_adsp/cavs/irq.c b/soc/xtensa/intel_adsp/cavs/irq.c
index 73d9bec43b3..63c60d27387 100644
--- a/soc/xtensa/intel_adsp/cavs/irq.c
+++ b/soc/xtensa/intel_adsp/cavs/irq.c
@@ -8,6 +8,7 @@
 #include <xtensa/hal.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/irq.h>
 
 #include <adsp_shim.h>
 #include <cavs-idc.h>