diff --git a/boards/arm/thingy52_nrf52832/board.c b/boards/arm/thingy52_nrf52832/board.c
index 369781ffd1f..18f097b657d 100644
--- a/boards/arm/thingy52_nrf52832/board.c
+++ b/boards/arm/thingy52_nrf52832/board.c
@@ -6,6 +6,7 @@
 
 #include <zephyr/init.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 
 static const struct gpio_dt_spec ccs_gpio =
 	GPIO_DT_SPEC_GET(DT_NODELABEL(ccs_pwr), enable_gpios);
diff --git a/boards/arm/thingy53_nrf5340/board.c b/boards/arm/thingy53_nrf5340/board.c
index a0eba96a984..39a194e93de 100644
--- a/boards/arm/thingy53_nrf5340/board.c
+++ b/boards/arm/thingy53_nrf5340/board.c
@@ -5,8 +5,8 @@
  */
 
 #include <zephyr/device.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-
 #include <soc.h>
 
 LOG_MODULE_REGISTER(thingy53_board_init);
diff --git a/drivers/clock_control/clock_control_lpc11u6x.c b/drivers/clock_control/clock_control_lpc11u6x.c
index 41aa5d94579..c9bbf3c6a87 100644
--- a/drivers/clock_control/clock_control_lpc11u6x.c
+++ b/drivers/clock_control/clock_control_lpc11u6x.c
@@ -8,6 +8,7 @@
 
 #include <zephyr/devicetree.h>
 #include <zephyr/device.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/drivers/clock_control/lpc11u6x_clock_control.h>
 
diff --git a/drivers/clock_control/clock_control_renesas_cpg_mssr.c b/drivers/clock_control/clock_control_renesas_cpg_mssr.c
index c7233b69a7d..aa45465268a 100644
--- a/drivers/clock_control/clock_control_renesas_cpg_mssr.c
+++ b/drivers/clock_control/clock_control_renesas_cpg_mssr.c
@@ -8,6 +8,7 @@
 #include <zephyr/drivers/clock_control/renesas_cpg_mssr.h>
 #include <zephyr/dt-bindings/clock/renesas_cpg_mssr.h>
 #include <zephyr/irq.h>
+#include <zephyr/kernel.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_rtc.c b/drivers/counter/counter_mcux_rtc.c
index 58ec79ee52e..275e1d86f0f 100644
--- a/drivers/counter/counter_mcux_rtc.c
+++ b/drivers/counter/counter_mcux_rtc.c
@@ -9,6 +9,7 @@
 
 #include <zephyr/drivers/counter.h>
 #include <zephyr/irq.h>
+#include <zephyr/kernel.h>
 #include <fsl_rtc.h>
 #include <zephyr/logging/log.h>
 
diff --git a/drivers/display/display_mcux_elcdif.c b/drivers/display/display_mcux_elcdif.c
index 38a19d9e1eb..41ab7122c6d 100644
--- a/drivers/display/display_mcux_elcdif.c
+++ b/drivers/display/display_mcux_elcdif.c
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/display.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 #include <fsl_elcdif.h>
 
 #ifdef CONFIG_HAS_MCUX_CACHE
diff --git a/drivers/display/ssd1306.c b/drivers/display/ssd1306.c
index a7c0929bb9c..c413b46db86 100644
--- a/drivers/display/ssd1306.c
+++ b/drivers/display/ssd1306.c
@@ -15,6 +15,7 @@ LOG_MODULE_REGISTER(ssd1306, CONFIG_DISPLAY_LOG_LEVEL);
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
 
 #include "ssd1306_regs.h"
 #include <zephyr/display/cfb.h>
diff --git a/drivers/ec_host_cmd_periph/ec_host_cmd_simulator.c b/drivers/ec_host_cmd_periph/ec_host_cmd_simulator.c
index 740fdd17c55..5c6194f6a2f 100644
--- a/drivers/ec_host_cmd_periph/ec_host_cmd_simulator.c
+++ b/drivers/ec_host_cmd_periph/ec_host_cmd_simulator.c
@@ -10,6 +10,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/ec_host_cmd_periph.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 
 #ifndef CONFIG_ARCH_POSIX
diff --git a/drivers/entropy/entropy_nrf5.c b/drivers/entropy/entropy_nrf5.c
index 57298c169e9..a3ca31b5cce 100644
--- a/drivers/entropy/entropy_nrf5.c
+++ b/drivers/entropy/entropy_nrf5.c
@@ -6,6 +6,7 @@
  */
 
 #include <zephyr/drivers/entropy.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/atomic.h>
 #include <soc.h>
 #include <hal/nrf_rng.h>
diff --git a/drivers/entropy/entropy_sam.c b/drivers/entropy/entropy_sam.c
index 5688f269571..1f2c1e2c504 100644
--- a/drivers/entropy/entropy_sam.c
+++ b/drivers/entropy/entropy_sam.c
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/entropy.h>
 #include <errno.h>
 #include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <string.h>
 
diff --git a/drivers/ethernet/phy/phy_mii.c b/drivers/ethernet/phy/phy_mii.c
index 1a3ff6bc1d8..528673998e0 100644
--- a/drivers/ethernet/phy/phy_mii.c
+++ b/drivers/ethernet/phy/phy_mii.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/drivers/mdio.h>
 #include <zephyr/net/phy.h>
diff --git a/drivers/flash/soc_flash_b91.c b/drivers/flash/soc_flash_b91.c
index 99d99b96741..a7ce4057482 100644
--- a/drivers/flash/soc_flash_b91.c
+++ b/drivers/flash/soc_flash_b91.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/flash.h>
-
+#include <zephyr/kernel.h>
 
 /* driver definitions */
 #define BLOCK_64K_SIZE         (0x10000u)
diff --git a/drivers/gpio/gpio_emul_sdl.c b/drivers/gpio/gpio_emul_sdl.c
index 015d0f352c9..aa121322b91 100644
--- a/drivers/gpio/gpio_emul_sdl.c
+++ b/drivers/gpio/gpio_emul_sdl.c
@@ -7,6 +7,7 @@
 #define DT_DRV_COMPAT zephyr_gpio_emul_sdl
 
 #include <zephyr/drivers/gpio/gpio_emul.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 #include <SDL.h>
diff --git a/drivers/gpio/gpio_fxl6408.c b/drivers/gpio/gpio_fxl6408.c
index f833bd6fdc5..20cf7be4a5a 100644
--- a/drivers/gpio/gpio_fxl6408.c
+++ b/drivers/gpio/gpio_fxl6408.c
@@ -6,6 +6,7 @@
 
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
 #include "gpio_utils.h"
 #include <zephyr/logging/log.h>
 
diff --git a/drivers/gpio/gpio_pcal6408a.c b/drivers/gpio/gpio_pcal6408a.c
index 0c349e6380a..49c6fdc0e61 100644
--- a/drivers/gpio/gpio_pcal6408a.c
+++ b/drivers/gpio/gpio_pcal6408a.c
@@ -6,6 +6,7 @@
 
 #define DT_DRV_COMPAT nxp_pcal6408a
 
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_pcf8574.c b/drivers/gpio/gpio_pcf8574.c
index 01a1af59c87..5344b795249 100644
--- a/drivers/gpio/gpio_pcf8574.c
+++ b/drivers/gpio/gpio_pcf8574.c
@@ -10,6 +10,7 @@
 
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pcf8574, CONFIG_GPIO_LOG_LEVEL);
 
diff --git a/drivers/i2c/i2c_gecko.c b/drivers/i2c/i2c_gecko.c
index 952082c4e4f..80eb2b147e2 100644
--- a/drivers/i2c/i2c_gecko.c
+++ b/drivers/i2c/i2c_gecko.c
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include <em_cmu.h>
 #include <em_i2c.h>
diff --git a/drivers/i2c/i2c_ite_enhance.c b/drivers/i2c/i2c_ite_enhance.c
index 6bd780066c8..d9258224693 100644
--- a/drivers/i2c/i2c_ite_enhance.c
+++ b/drivers/i2c/i2c_ite_enhance.c
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/irq.h>
+#include <zephyr/kernel.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 dc63c1999fd..8941517f699 100644
--- a/drivers/i2c/i2c_ite_it8xxx2.c
+++ b/drivers/i2c/i2c_ite_it8xxx2.c
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/irq.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <soc.h>
 #include <soc_dt.h>
diff --git a/drivers/i2c/i2c_mcux.c b/drivers/i2c/i2c_mcux.c
index 3fbd084ad5b..44e0779a745 100644
--- a/drivers/i2c/i2c_mcux.c
+++ b/drivers/i2c/i2c_mcux.c
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <fsl_i2c.h>
 #include <fsl_clock.h>
diff --git a/drivers/i2c/i2c_mcux_lpi2c.c b/drivers/i2c/i2c_mcux_lpi2c.c
index 429e42df9b2..66f5b956f2b 100644
--- a/drivers/i2c/i2c_mcux_lpi2c.c
+++ b/drivers/i2c/i2c_mcux_lpi2c.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/clock_control.h>
+#include <zephyr/kernel.h>
 #include <fsl_lpi2c.h>
 
 #ifdef CONFIG_PINCTRL
diff --git a/drivers/i2c/i2c_nios2.c b/drivers/i2c/i2c_nios2.c
index 8ed1414d82f..2540a0a87ac 100644
--- a/drivers/i2c/i2c_nios2.c
+++ b/drivers/i2c/i2c_nios2.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/irq.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/sys/util.h>
 #include <altera_common.h>
diff --git a/drivers/i2c/i2c_npcx_controller.c b/drivers/i2c/i2c_npcx_controller.c
index 748bb7a92f2..4832dd75274 100644
--- a/drivers/i2c/i2c_npcx_controller.c
+++ b/drivers/i2c/i2c_npcx_controller.c
@@ -70,6 +70,7 @@
 #include <assert.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 
 #include <zephyr/logging/log.h>
diff --git a/drivers/mdio/mdio_esp32.c b/drivers/mdio/mdio_esp32.c
index 49186d32435..fb243346669 100644
--- a/drivers/mdio/mdio_esp32.c
+++ b/drivers/mdio/mdio_esp32.c
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/mdio.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 #include <esp_mac.h>
diff --git a/drivers/mdio/mdio_sam.c b/drivers/mdio/mdio_sam.c
index a723f89a1ba..3fda9c79ef9 100644
--- a/drivers/mdio/mdio_sam.c
+++ b/drivers/mdio/mdio_sam.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/drivers/mdio.h>
 #include <zephyr/drivers/pinctrl.h>
diff --git a/drivers/pwm/pwm_imx.c b/drivers/pwm/pwm_imx.c
index fbece341fdd..28886a0b052 100644
--- a/drivers/pwm/pwm_imx.c
+++ b/drivers/pwm/pwm_imx.c
@@ -6,6 +6,7 @@
 
 #include <errno.h>
 #include <zephyr/drivers/pwm.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <device_imx.h>
 #include <zephyr/drivers/pinctrl.h>
diff --git a/drivers/sdhc/mcux_sdif.c b/drivers/sdhc/mcux_sdif.c
index 77904538adc..0649c1261e9 100644
--- a/drivers/sdhc/mcux_sdif.c
+++ b/drivers/sdhc/mcux_sdif.c
@@ -12,6 +12,7 @@
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
+#include <zephyr/kernel.h>
 #include <fsl_sdif.h>
 
 LOG_MODULE_REGISTER(sdif, CONFIG_SDHC_LOG_LEVEL);
diff --git a/drivers/sensor/adxl372/adxl372.h b/drivers/sensor/adxl372/adxl372.h
index 8e86977ca6e..1a5c6862e59 100644
--- a/drivers/sensor/adxl372/adxl372.h
+++ b/drivers/sensor/adxl372/adxl372.h
@@ -11,6 +11,7 @@
 #include <zephyr/types.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
diff --git a/drivers/sensor/bma280/bma280.h b/drivers/sensor/bma280/bma280.h
index 9ca76df25ba..05d3573a6c3 100644
--- a/drivers/sensor/bma280/bma280.h
+++ b/drivers/sensor/bma280/bma280.h
@@ -12,6 +12,7 @@
 #include <zephyr/types.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 
 #define BMA280_REG_CHIP_ID		0x00
 #if DT_INST_PROP(0, is_bmc150)
diff --git a/drivers/sensor/bmi160/bmi160.h b/drivers/sensor/bmi160/bmi160.h
index 49339ad8968..a9fed0dba67 100644
--- a/drivers/sensor/bmi160/bmi160.h
+++ b/drivers/sensor/bmi160/bmi160.h
@@ -14,6 +14,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 
 /* registers */
diff --git a/drivers/sensor/bmi270/bmi270.c b/drivers/sensor/bmi270/bmi270.c
index ace3d81b902..53bdc2be2a1 100644
--- a/drivers/sensor/bmi270/bmi270.c
+++ b/drivers/sensor/bmi270/bmi270.c
@@ -9,6 +9,7 @@
 
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/logging/log.h>
diff --git a/drivers/sensor/bmi270/bmi270_spi.c b/drivers/sensor/bmi270/bmi270_spi.c
index 4f0a01ec4c7..dc5ac5f3b14 100644
--- a/drivers/sensor/bmi270/bmi270_spi.c
+++ b/drivers/sensor/bmi270/bmi270_spi.c
@@ -8,6 +8,7 @@
  * Bus-specific functionality for BMI270s accessed via SPI.
  */
 
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include "bmi270.h"
 
diff --git a/drivers/sensor/fxas21002/fxas21002.h b/drivers/sensor/fxas21002/fxas21002.h
index c3ae63f7b46..4bcf9c376af 100644
--- a/drivers/sensor/fxas21002/fxas21002.h
+++ b/drivers/sensor/fxas21002/fxas21002.h
@@ -7,6 +7,7 @@
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 
 #define FXAS21002_REG_STATUS		0x00
 #define FXAS21002_REG_OUTXMSB		0x01
diff --git a/drivers/sensor/fxos8700/fxos8700.h b/drivers/sensor/fxos8700/fxos8700.h
index 2681a4ec278..21869cf8781 100644
--- a/drivers/sensor/fxos8700/fxos8700.h
+++ b/drivers/sensor/fxos8700/fxos8700.h
@@ -7,6 +7,7 @@
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 
 #define FXOS8700_REG_STATUS			0x00
 #define FXOS8700_REG_OUTXMSB			0x01
diff --git a/drivers/sensor/hmc5883l/hmc5883l.h b/drivers/sensor/hmc5883l/hmc5883l.h
index 4958c2ee260..f9ab0d2631b 100644
--- a/drivers/sensor/hmc5883l/hmc5883l.h
+++ b/drivers/sensor/hmc5883l/hmc5883l.h
@@ -12,6 +12,7 @@
 #include <zephyr/types.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 
 #define HMC5883L_REG_CONFIG_A           0x00
 #define HMC5883L_ODR_SHIFT              2
diff --git a/drivers/sensor/icm42605/icm42605.h b/drivers/sensor/icm42605/icm42605.h
index 2025e3b8e4a..29e16208cfb 100644
--- a/drivers/sensor/icm42605/icm42605.h
+++ b/drivers/sensor/icm42605/icm42605.h
@@ -10,6 +10,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/types.h>
 
diff --git a/drivers/sensor/icm42670/icm42670.h b/drivers/sensor/icm42670/icm42670.h
index 51055d8a4e1..e3ca851b303 100644
--- a/drivers/sensor/icm42670/icm42670.h
+++ b/drivers/sensor/icm42670/icm42670.h
@@ -11,6 +11,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
 
 struct icm42670_data {
 	int16_t accel_x;
diff --git a/drivers/sensor/icm42670/icm42670_spi.c b/drivers/sensor/icm42670/icm42670_spi.c
index a0c830208e9..2edccb25b4f 100644
--- a/drivers/sensor/icm42670/icm42670_spi.c
+++ b/drivers/sensor/icm42670/icm42670_spi.c
@@ -5,6 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include "icm42670_spi.h"
 #include "icm42670_reg.h"
diff --git a/drivers/sensor/iis2dh/iis2dh.h b/drivers/sensor/iis2dh/iis2dh.h
index 00ad02879f8..0959c7fa506 100644
--- a/drivers/sensor/iis2dh/iis2dh.h
+++ b/drivers/sensor/iis2dh/iis2dh.h
@@ -16,6 +16,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
 #include "iis2dh_reg.h"
 
 /*
diff --git a/drivers/sensor/iis2mdc/iis2mdc.h b/drivers/sensor/iis2mdc/iis2mdc.h
index 13271414c97..fe70d053912 100644
--- a/drivers/sensor/iis2mdc/iis2mdc.h
+++ b/drivers/sensor/iis2mdc/iis2mdc.h
@@ -13,6 +13,7 @@
 
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include "iis2mdc_reg.h"
 
diff --git a/drivers/sensor/iis3dhhc/iis3dhhc.h b/drivers/sensor/iis3dhhc/iis3dhhc.h
index 1d5093f05c4..116a6d76a53 100644
--- a/drivers/sensor/iis3dhhc/iis3dhhc.h
+++ b/drivers/sensor/iis3dhhc/iis3dhhc.h
@@ -15,6 +15,7 @@
 #include <zephyr/drivers/spi.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/sys/util.h>
 #include "iis3dhhc_reg.h"
diff --git a/drivers/sensor/ina23x/ina230.h b/drivers/sensor/ina23x/ina230.h
index 3ad9fd36f6b..7e7b8c23f3b 100644
--- a/drivers/sensor/ina23x/ina230.h
+++ b/drivers/sensor/ina23x/ina230.h
@@ -10,6 +10,7 @@
 
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
 
 #define INA230_REG_CONFIG     0x00
 #define INA230_REG_SHUNT_VOLT 0x01
diff --git a/drivers/sensor/ina23x/ina23x_trigger.h b/drivers/sensor/ina23x/ina23x_trigger.h
index 4c858bf72da..91c63147231 100644
--- a/drivers/sensor/ina23x/ina23x_trigger.h
+++ b/drivers/sensor/ina23x/ina23x_trigger.h
@@ -9,6 +9,7 @@
 
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
 
 struct ina23x_trigger {
 	struct gpio_callback gpio_cb;
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx.h b/drivers/sensor/ism330dhcx/ism330dhcx.h
index 9c33f9b53e3..063140c6201 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx.h
+++ b/drivers/sensor/ism330dhcx/ism330dhcx.h
@@ -16,6 +16,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/spi.h>
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include "ism330dhcx_reg.h"
 
diff --git a/drivers/sensor/lis3mdl/lis3mdl.h b/drivers/sensor/lis3mdl/lis3mdl.h
index f913953e418..ca9f81706cc 100644
--- a/drivers/sensor/lis3mdl/lis3mdl.h
+++ b/drivers/sensor/lis3mdl/lis3mdl.h
@@ -12,6 +12,7 @@
 #include <zephyr/types.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 
 #define LIS3MDL_REG_WHO_AM_I            0x0F
 #define LIS3MDL_CHIP_ID                 0x3D
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.h b/drivers/sensor/lsm6dsl/lsm6dsl.h
index fdd81471cf1..1f6dc47485e 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl.h
+++ b/drivers/sensor/lsm6dsl/lsm6dsl.h
@@ -14,6 +14,7 @@
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/types.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
diff --git a/drivers/sensor/max17055/max17055.c b/drivers/sensor/max17055/max17055.c
index e6e98a88ff8..1abf26dd6bb 100644
--- a/drivers/sensor/max17055/max17055.c
+++ b/drivers/sensor/max17055/max17055.c
@@ -6,6 +6,7 @@
 
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include <zephyr/logging/log.h>
diff --git a/drivers/sensor/max17262/max17262.c b/drivers/sensor/max17262/max17262.c
index 6df242f732d..70919f6b332 100644
--- a/drivers/sensor/max17262/max17262.c
+++ b/drivers/sensor/max17262/max17262.c
@@ -6,6 +6,7 @@
 
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(max17262, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/mcux_acmp/mcux_acmp.c b/drivers/sensor/mcux_acmp/mcux_acmp.c
index f3ac7db0c43..0c07befe489 100644
--- a/drivers/sensor/mcux_acmp/mcux_acmp.c
+++ b/drivers/sensor/mcux_acmp/mcux_acmp.c
@@ -11,6 +11,7 @@
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/sensor/mcux_acmp.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/kernel.h>
 #include <fsl_acmp.h>
 #include <zephyr/drivers/pinctrl.h>
 
diff --git a/drivers/sensor/mpu6050/mpu6050.h b/drivers/sensor/mpu6050/mpu6050.h
index 8299817b808..bcd2cc9e5d5 100644
--- a/drivers/sensor/mpu6050/mpu6050.h
+++ b/drivers/sensor/mpu6050/mpu6050.h
@@ -10,6 +10,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/types.h>
 
diff --git a/drivers/sensor/ms5607/ms5607_spi.c b/drivers/sensor/ms5607/ms5607_spi.c
index 0d18ca60ff3..0e962ba1ad7 100644
--- a/drivers/sensor/ms5607/ms5607_spi.c
+++ b/drivers/sensor/ms5607/ms5607_spi.c
@@ -8,6 +8,7 @@
 
 #include <string.h>
 #include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include "ms5607.h"
 
diff --git a/drivers/sensor/nuvoton_adc_cmp_npcx/adc_cmp_npcx.c b/drivers/sensor/nuvoton_adc_cmp_npcx/adc_cmp_npcx.c
index 900e91fe117..755c567d66f 100644
--- a/drivers/sensor/nuvoton_adc_cmp_npcx/adc_cmp_npcx.c
+++ b/drivers/sensor/nuvoton_adc_cmp_npcx/adc_cmp_npcx.c
@@ -7,7 +7,7 @@
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/adc/adc_npcx_threshold.h>
 #include <zephyr/drivers/sensor/adc_cmp_npcx.h>
-
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(adc_cmp_npcx, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/sm351lt/sm351lt.h b/drivers/sensor/sm351lt/sm351lt.h
index 05d7a043aca..3d0f65e3c79 100644
--- a/drivers/sensor/sm351lt/sm351lt.h
+++ b/drivers/sensor/sm351lt/sm351lt.h
@@ -10,6 +10,7 @@
 #include <stdint.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
 
 #define SENSOR_ATTR_SM351LT_TRIGGER_TYPE SENSOR_ATTR_PRIV_START
 
diff --git a/drivers/sensor/stts751/stts751.h b/drivers/sensor/stts751/stts751.h
index e311b09874e..2676e562d0a 100644
--- a/drivers/sensor/stts751/stts751.h
+++ b/drivers/sensor/stts751/stts751.h
@@ -15,6 +15,7 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/sys/util.h>
 #include "stts751_reg.h"
diff --git a/drivers/sensor/vcnl4040/vcnl4040.h b/drivers/sensor/vcnl4040/vcnl4040.h
index b3f06678d45..9df6c2aaba2 100644
--- a/drivers/sensor/vcnl4040/vcnl4040.h
+++ b/drivers/sensor/vcnl4040/vcnl4040.h
@@ -10,6 +10,7 @@
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 
 /* Registers all 16 bits */
 #define VCNL4040_REG_ALS_CONF	0x00
diff --git a/drivers/serial/uart_mcux_lpuart.c b/drivers/serial/uart_mcux_lpuart.c
index 046b41843b7..3822a843409 100644
--- a/drivers/serial/uart_mcux_lpuart.c
+++ b/drivers/serial/uart_mcux_lpuart.c
@@ -14,6 +14,7 @@
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/irq.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/policy.h>
 #ifdef CONFIG_PINCTRL
 #include <zephyr/drivers/pinctrl.h>
diff --git a/drivers/serial/uart_native_posix.c b/drivers/serial/uart_native_posix.c
index e6b1c1d2c83..d737563203e 100644
--- a/drivers/serial/uart_native_posix.c
+++ b/drivers/serial/uart_native_posix.c
@@ -18,6 +18,8 @@
 #include <poll.h>
 
 #include <zephyr/drivers/uart.h>
+#include <zephyr/kernel.h>
+
 #include "cmdline.h" /* native_posix command line options header */
 #include "soc.h"
 
diff --git a/drivers/serial/uart_rtt.c b/drivers/serial/uart_rtt.c
index f2a63ec5311..b852fe3a652 100644
--- a/drivers/serial/uart_rtt.c
+++ b/drivers/serial/uart_rtt.c
@@ -5,6 +5,7 @@
  */
 
 #include <zephyr/drivers/uart.h>
+#include <zephyr/kernel.h>
 #include <SEGGER_RTT.h>
 
 #define DT_DRV_COMPAT segger_rtt_uart
diff --git a/drivers/serial/uart_xlnx_uartlite.c b/drivers/serial/uart_xlnx_uartlite.c
index 2c0332b61a9..fa8aaf8a624 100644
--- a/drivers/serial/uart_xlnx_uartlite.c
+++ b/drivers/serial/uart_xlnx_uartlite.c
@@ -12,6 +12,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/irq.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/sys_io.h>
 
 /* AXI UART Lite v2 registers offsets (See Xilinx PG142 for details) */
diff --git a/drivers/spi/spi_context.h b/drivers/spi/spi_context.h
index 0e2df0d53d9..49ba6259ee0 100644
--- a/drivers/spi/spi_context.h
+++ b/drivers/spi/spi_context.h
@@ -14,6 +14,7 @@
 
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/spi.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/timer/mcux_lptmr_timer.c b/drivers/timer/mcux_lptmr_timer.c
index 9166ca56771..79a50d42070 100644
--- a/drivers/timer/mcux_lptmr_timer.c
+++ b/drivers/timer/mcux_lptmr_timer.c
@@ -8,6 +8,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/kernel.h>
 #include <fsl_lptmr.h>
 
 BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1,
diff --git a/drivers/timer/npcx_itim_timer.c b/drivers/timer/npcx_itim_timer.c
index a6eb113c6f3..e08299c1e75 100644
--- a/drivers/timer/npcx_itim_timer.c
+++ b/drivers/timer/npcx_itim_timer.c
@@ -37,6 +37,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys_clock.h>
 #include <zephyr/spinlock.h>
 #include <soc.h>
diff --git a/drivers/usb/device/usb_dc_mcux.c b/drivers/usb/device/usb_dc_mcux.c
index 2154ddece6d..0dfa132c269 100644
--- a/drivers/usb/device/usb_dc_mcux.c
+++ b/drivers/usb/device/usb_dc_mcux.c
@@ -13,6 +13,7 @@
 #include <zephyr/usb/usb_device.h>
 #include <soc.h>
 #include <zephyr/device.h>
+#include <zephyr/kernel.h>
 #include "usb.h"
 #include "usb_device.h"
 #include "usb_device_config.h"
diff --git a/drivers/usb/device/usb_dc_native_posix.c b/drivers/usb/device/usb_dc_native_posix.c
index 107cbfabf78..bbc8aebdd04 100644
--- a/drivers/usb/device/usb_dc_native_posix.c
+++ b/drivers/usb/device/usb_dc_native_posix.c
@@ -11,6 +11,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/drivers/usb/usb_dc.h>
 #include <zephyr/usb/usb_device.h>
diff --git a/drivers/usb/device/usb_dc_sam_usbhs.c b/drivers/usb/device/usb_dc_sam_usbhs.c
index 4c202112b45..3111836a435 100644
--- a/drivers/usb/device/usb_dc_sam_usbhs.c
+++ b/drivers/usb/device/usb_dc_sam_usbhs.c
@@ -8,6 +8,7 @@
 
 #include <zephyr/usb/usb_device.h>
 #include <zephyr/irq.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <string.h>
 
diff --git a/drivers/watchdog/wdt_iwdg_stm32.c b/drivers/watchdog/wdt_iwdg_stm32.c
index 7f4554b1125..ecec904517b 100644
--- a/drivers/watchdog/wdt_iwdg_stm32.c
+++ b/drivers/watchdog/wdt_iwdg_stm32.c
@@ -10,6 +10,7 @@
 #define DT_DRV_COMPAT st_stm32_watchdog
 
 #include <zephyr/drivers/watchdog.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <stm32_ll_bus.h>
 #include <stm32_ll_iwdg.h>
diff --git a/include/zephyr/drivers/adc.h b/include/zephyr/drivers/adc.h
index b6e5bab8d41..dc2e7a4d36a 100644
--- a/include/zephyr/drivers/adc.h
+++ b/include/zephyr/drivers/adc.h
@@ -15,6 +15,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/dt-bindings/adc/adc.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/zephyr/drivers/can.h b/include/zephyr/drivers/can.h
index 4ada3ccf36a..fb18f89cceb 100644
--- a/include/zephyr/drivers/can.h
+++ b/include/zephyr/drivers/can.h
@@ -12,6 +12,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/device.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <zephyr/sys/util.h>
 
diff --git a/include/zephyr/drivers/i2c.h b/include/zephyr/drivers/i2c.h
index 905bee562be..a3faa7e9416 100644
--- a/include/zephyr/drivers/i2c.h
+++ b/include/zephyr/drivers/i2c.h
@@ -23,6 +23,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/device.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/zephyr/drivers/spi.h b/include/zephyr/drivers/spi.h
index 6ed40052aaa..fcd9cbce7fd 100644
--- a/include/zephyr/drivers/spi.h
+++ b/include/zephyr/drivers/spi.h
@@ -24,6 +24,7 @@
 #include <zephyr/device.h>
 #include <zephyr/dt-bindings/spi/spi.h>
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/zephyr/drivers/virtualization/ivshmem.h b/include/zephyr/drivers/virtualization/ivshmem.h
index 65ff0dabf02..ec87f5e23b8 100644
--- a/include/zephyr/drivers/virtualization/ivshmem.h
+++ b/include/zephyr/drivers/virtualization/ivshmem.h
@@ -16,6 +16,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <zephyr/device.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/zephyr/drivers/w1.h b/include/zephyr/drivers/w1.h
index 49eb7f23da7..63611613bc6 100644
--- a/include/zephyr/drivers/w1.h
+++ b/include/zephyr/drivers/w1.h
@@ -15,6 +15,7 @@
 
 #include <zephyr/types.h>
 #include <zephyr/device.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/crc.h>
 #include <zephyr/sys/byteorder.h>
 
diff --git a/include/zephyr/ipc/ipc_service.h b/include/zephyr/ipc/ipc_service.h
index e9ffa8a1934..8abee0f7c9e 100644
--- a/include/zephyr/ipc/ipc_service.h
+++ b/include/zephyr/ipc/ipc_service.h
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include <zephyr/device.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/zephyr/ipc/ipc_service_backend.h b/include/zephyr/ipc/ipc_service_backend.h
index f4c84abe402..2b33930a36c 100644
--- a/include/zephyr/ipc/ipc_service_backend.h
+++ b/include/zephyr/ipc/ipc_service_backend.h
@@ -8,6 +8,7 @@
 #define ZEPHYR_INCLUDE_IPC_SERVICE_IPC_SERVICE_BACKEND_H_
 
 #include <zephyr/ipc/ipc_service.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 
 #ifdef __cplusplus
diff --git a/include/zephyr/sd/sd.h b/include/zephyr/sd/sd.h
index ec2c40e8c40..8e4dd62edad 100644
--- a/include/zephyr/sd/sd.h
+++ b/include/zephyr/sd/sd.h
@@ -14,6 +14,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/sdhc.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c
index cc544a7c6a2..120a75ae237 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c
@@ -6,6 +6,7 @@
  */
 
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 
 #include "app_gpio.h"
 #include "publisher.h"
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.h
index 78ce47405c2..ad473bdd598 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.h
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.h
@@ -8,6 +8,8 @@
 #ifndef _PUBLISHER_H
 #define _PUBLISHER_H
 
+#include <zephyr/kernel.h>
+
 /* Others */
 #define LEVEL_S0   -32768
 #define LEVEL_S25  -16384
diff --git a/samples/drivers/ht16k33/src/main.c b/samples/drivers/ht16k33/src/main.c
index 59acf152205..89d79f544bf 100644
--- a/samples/drivers/ht16k33/src/main.c
+++ b/samples/drivers/ht16k33/src/main.c
@@ -7,6 +7,7 @@
 #include <zephyr/drivers/led.h>
 #include <zephyr/drivers/kscan.h>
 #include <zephyr/devicetree.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(main, CONFIG_LOG_DEFAULT_LEVEL);
diff --git a/soc/xtensa/intel_adsp/cavs/power.c b/soc/xtensa/intel_adsp/cavs/power.c
index 5a4578fea13..101007e592d 100644
--- a/soc/xtensa/intel_adsp/cavs/power.c
+++ b/soc/xtensa/intel_adsp/cavs/power.c
@@ -9,6 +9,7 @@
 #include <zephyr/irq_nextlevel.h>
 #include <xtensa/hal.h>
 #include <zephyr/init.h>
+#include <zephyr/kernel.h>
 
 #include <adsp_shim.h>
 #include <adsp-clk.h>
diff --git a/soc/xtensa/intel_adsp/common/clk.c b/soc/xtensa/intel_adsp/common/clk.c
index 43ebf07a603..e96eddb23ac 100644
--- a/soc/xtensa/intel_adsp/common/clk.c
+++ b/soc/xtensa/intel_adsp/common/clk.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 
 #include <zephyr/device.h>
+#include <zephyr/kernel.h>
 
 #include <adsp-clk.h>
 #include <adsp_shim.h>
diff --git a/subsys/fs/fs.c b/subsys/fs/fs.c
index 91aedc1af2d..edd3922c79d 100644
--- a/subsys/fs/fs.c
+++ b/subsys/fs/fs.c
@@ -11,6 +11,7 @@
 #include <zephyr/types.h>
 #include <errno.h>
 #include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <zephyr/fs/fs.h>
 #include <zephyr/fs/fs_sys.h>
 #include <zephyr/sys/check.h>
diff --git a/subsys/mgmt/ec_host_cmd/ec_host_cmd_handler.c b/subsys/mgmt/ec_host_cmd/ec_host_cmd_handler.c
index 83958667f1c..524723a830b 100644
--- a/subsys/mgmt/ec_host_cmd/ec_host_cmd_handler.c
+++ b/subsys/mgmt/ec_host_cmd/ec_host_cmd_handler.c
@@ -7,6 +7,7 @@
 #include <zephyr/drivers/ec_host_cmd_periph.h>
 #include <zephyr/mgmt/ec_host_cmd.h>
 #include <zephyr/devicetree.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 
 #if !DT_HAS_CHOSEN(zephyr_ec_host_interface)
diff --git a/subsys/pm/pm_stats.c b/subsys/pm/pm_stats.c
index d2883be6910..608f3946cd3 100644
--- a/subsys/pm/pm_stats.c
+++ b/subsys/pm/pm_stats.c
@@ -8,7 +8,7 @@
 #include "pm_stats.h"
 
 #include <zephyr/init.h>
-#include <zephyr/kernel_structs.h>
+#include <zephyr/kernel.h>
 #include <zephyr/stats/stats.h>
 #include <zephyr/sys/printk.h>
 
diff --git a/tests/drivers/clock_control/nrf_clock_calibration/src/mock_temp_nrf5.c b/tests/drivers/clock_control/nrf_clock_calibration/src/mock_temp_nrf5.c
index 9e164b8a941..8a382369b41 100644
--- a/tests/drivers/clock_control/nrf_clock_calibration/src/mock_temp_nrf5.c
+++ b/tests/drivers/clock_control/nrf_clock_calibration/src/mock_temp_nrf5.c
@@ -5,6 +5,7 @@
  */
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/kernel.h>
 
 /* Mock of internal temperature sensor. */
 #ifdef CONFIG_TEMP_NRF5