diff --git a/arch/arm/core/aarch32/cortex_a_r/tcm.c b/arch/arm/core/aarch32/cortex_a_r/tcm.c
index bc5149cffd..05f4046c19 100644
--- a/arch/arm/core/aarch32/cortex_a_r/tcm.c
+++ b/arch/arm/core/aarch32/cortex_a_r/tcm.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/arch/arm/aarch32/cortex_a_r/cmsis.h>
 
 void z_arm_tcm_disable_ecc(void)
diff --git a/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c b/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c
index 3104aead21..7ddab21d54 100644
--- a/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c
+++ b/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <aarch32/cortex_m/cmse.h>
 
 int arm_cmse_mpu_region_get(uint32_t addr)
diff --git a/arch/x86/core/cpuhalt.c b/arch/x86/core/cpuhalt.c
index 5c409864f8..77c727bd3f 100644
--- a/arch/x86/core/cpuhalt.c
+++ b/arch/x86/core/cpuhalt.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/tracing/tracing.h>
 #include <zephyr/arch/cpu.h>
 
diff --git a/arch/xtensa/core/timing.c b/arch/xtensa/core/timing.c
index 12e840ec64..871aa5c2ea 100644
--- a/arch/xtensa/core/timing.c
+++ b/arch/xtensa/core/timing.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2022 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 void arch_timing_init(void)
 {
diff --git a/boards/arm/bl5340_dvk/bl5340_dvk_cpunet_reset.c b/boards/arm/bl5340_dvk/bl5340_dvk_cpunet_reset.c
index f6beb32c21..64da5e9142 100644
--- a/boards/arm/bl5340_dvk/bl5340_dvk_cpunet_reset.c
+++ b/boards/arm/bl5340_dvk/bl5340_dvk_cpunet_reset.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
 
diff --git a/boards/arm/mps2_an521/empty_cpu0/src/main.c b/boards/arm/mps2_an521/empty_cpu0/src/main.c
index 9da41b2d62..0cd262ff40 100644
--- a/boards/arm/mps2_an521/empty_cpu0/src/main.c
+++ b/boards/arm/mps2_an521/empty_cpu0/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 extern void wakeup_cpu1(void);
 
diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340_cpunet_reset.c b/boards/arm/nrf5340dk_nrf5340/nrf5340_cpunet_reset.c
index 9f96095d83..0094e915b1 100644
--- a/boards/arm/nrf5340dk_nrf5340/nrf5340_cpunet_reset.c
+++ b/boards/arm/nrf5340dk_nrf5340/nrf5340_cpunet_reset.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
 
diff --git a/boards/arm/nrf9160dk_nrf52840/board.c b/boards/arm/nrf9160dk_nrf52840/board.c
index a2dd0fe66e..efb4c59bb2 100644
--- a/boards/arm/nrf9160dk_nrf52840/board.c
+++ b/boards/arm/nrf9160dk_nrf52840/board.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/devicetree.h>
diff --git a/boards/arm/stm32l496g_disco/board_adc_vref.c b/boards/arm/stm32l496g_disco/board_adc_vref.c
index eb8b051aac..438720fd7b 100644
--- a/boards/arm/stm32l496g_disco/board_adc_vref.c
+++ b/boards/arm/stm32l496g_disco/board_adc_vref.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <stm32_ll_adc.h>
 #include <zephyr/devicetree.h>
diff --git a/doc/services/settings/index.rst b/doc/services/settings/index.rst
index 835a71ae47..7c333a9f9e 100644
--- a/doc/services/settings/index.rst
+++ b/doc/services/settings/index.rst
@@ -225,7 +225,7 @@ up from where it was before restart.
 
 .. code-block:: c
 
-    #include <zephyr/zephyr.h>
+    #include <zephyr/kernel.h>
     #include <zephyr/sys/reboot.h>
     #include <zephyr/settings/settings.h>
     #include <zephyr/sys/printk.h>
diff --git a/doc/services/smf/index.rst b/doc/services/smf/index.rst
index 8a25867eeb..f3265a5ca1 100644
--- a/doc/services/smf/index.rst
+++ b/doc/services/smf/index.rst
@@ -340,7 +340,6 @@ state machine can be implemented using Zephyr :ref:`events`.
 Code::
 
 	#include <zephyr/kernel.h>
-	#include <zephyr/zephyr.h>
 	#include <zephyr/drivers/gpio.h>
 	#include <zephyr/smf.h>
 
diff --git a/drivers/adc/adc_ads1119.c b/drivers/adc/adc_ads1119.c
index 8a79172dcf..2f5cc160a5 100644
--- a/drivers/adc/adc_ads1119.c
+++ b/drivers/adc/adc_ads1119.c
@@ -9,7 +9,7 @@
 #include <zephyr/drivers/adc.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/drivers/i2c.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
 
diff --git a/drivers/adc/adc_ads1x1x.c b/drivers/adc/adc_ads1x1x.c
index 7a97fe6d85..47721f1d8d 100644
--- a/drivers/adc/adc_ads1x1x.c
+++ b/drivers/adc/adc_ads1x1x.c
@@ -11,7 +11,7 @@
 #include <zephyr/drivers/adc.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/drivers/i2c.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
 
diff --git a/drivers/audio/mpxxdtyy.h b/drivers/audio/mpxxdtyy.h
index 75b02cf3c9..13d9cc0a1e 100644
--- a/drivers/audio/mpxxdtyy.h
+++ b/drivers/audio/mpxxdtyy.h
@@ -8,7 +8,7 @@
 #define MPXXDTYY_H
 
 #include <zephyr/audio/dmic.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include "OpenPDMFilter.h"
 
diff --git a/drivers/bluetooth/hci/h4.c b/drivers/bluetooth/hci/h4.c
index 40a1ca02ef..60f27d7271 100644
--- a/drivers/bluetooth/hci/h4.c
+++ b/drivers/bluetooth/hci/h4.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 #include <stddef.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/arch/cpu.h>
 
 #include <zephyr/init.h>
diff --git a/drivers/bluetooth/hci/h5.c b/drivers/bluetooth/hci/h5.c
index 18b5315158..6430c29709 100644
--- a/drivers/bluetooth/hci/h5.c
+++ b/drivers/bluetooth/hci/h5.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 #include <stddef.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/init.h>
 #include <zephyr/drivers/uart.h>
diff --git a/drivers/bluetooth/hci/userchan.c b/drivers/bluetooth/hci/userchan.c
index ce5ee887b4..fc9076053c 100644
--- a/drivers/bluetooth/hci/userchan.c
+++ b/drivers/bluetooth/hci/userchan.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
 #include <zephyr/sys/util.h>
diff --git a/drivers/can/can_mcux_flexcan.c b/drivers/can/can_mcux_flexcan.c
index df33bcde7d..0e0c1a3694 100644
--- a/drivers/can/can_mcux_flexcan.c
+++ b/drivers/can/can_mcux_flexcan.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_flexcan
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/drivers/can.h>
 #include <zephyr/drivers/can/transceiver.h>
diff --git a/drivers/dac/dac_dacx0508.c b/drivers/dac/dac_dacx0508.c
index 3976abf121..3b9932ed7d 100644
--- a/drivers/dac/dac_dacx0508.c
+++ b/drivers/dac/dac_dacx0508.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/spi.h>
 #include <zephyr/drivers/dac.h>
 #include <zephyr/logging/log.h>
diff --git a/drivers/dac/dac_mcp4725.c b/drivers/dac/dac_mcp4725.c
index e76db89916..8c727cf26a 100644
--- a/drivers/dac/dac_mcp4725.c
+++ b/drivers/dac/dac_mcp4725.c
@@ -5,7 +5,7 @@
  */
 #define DT_DRV_COMPAT microchip_mcp4725
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/dac.h>
 #include <zephyr/logging/log.h>
diff --git a/drivers/dac/dac_mcp4728.c b/drivers/dac/dac_mcp4728.c
index f6a27c519b..ce685ace53 100644
--- a/drivers/dac/dac_mcp4728.c
+++ b/drivers/dac/dac_mcp4728.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT microchip_mcp4728
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/dac.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/logging/log.h>
diff --git a/drivers/dac/dac_mcux_dac.c b/drivers/dac/dac_mcux_dac.c
index d099429c2d..12b06fbabe 100644
--- a/drivers/dac/dac_mcux_dac.c
+++ b/drivers/dac/dac_mcux_dac.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_dac
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/dac.h>
 #include <zephyr/logging/log.h>
 
diff --git a/drivers/dac/dac_mcux_dac32.c b/drivers/dac/dac_mcux_dac32.c
index 12e445f4e7..35d80dbda1 100644
--- a/drivers/dac/dac_mcux_dac32.c
+++ b/drivers/dac/dac_mcux_dac32.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT nxp_kinetis_dac32
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/dac.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/drivers/pinctrl.h>
diff --git a/drivers/display/display_max7219.c b/drivers/display/display_max7219.c
index b8574773bf..76c92686d8 100644
--- a/drivers/display/display_max7219.c
+++ b/drivers/display/display_max7219.c
@@ -29,7 +29,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 LOG_MODULE_REGISTER(max7219, CONFIG_DISPLAY_LOG_LEVEL);
 
 #define MAX7219_SEGMENTS_PER_DIGIT 8
diff --git a/drivers/display/display_st7735r.h b/drivers/display/display_st7735r.h
index 0411d53406..736bae7a4b 100644
--- a/drivers/display/display_st7735r.h
+++ b/drivers/display/display_st7735r.h
@@ -6,7 +6,7 @@
 #ifndef ST7735R_DISPLAY_DRIVER_H__
 #define ST7735R_DISPLAY_DRIVER_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define ST7735R_CMD_SW_RESET            0x01
 #define ST7735R_CMD_RDDID               0x04
diff --git a/drivers/display/display_st7789v.h b/drivers/display/display_st7789v.h
index a59b1e0db7..aa16e8d563 100644
--- a/drivers/display/display_st7789v.h
+++ b/drivers/display/display_st7789v.h
@@ -6,7 +6,7 @@
 #ifndef ST7789V_DISPLAY_DRIVER_H__
 #define ST7789V_DISPLAY_DRIVER_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define ST7789V_CMD_NOP				0x00
 #define ST7789V_CMD_SW_RESET			0x01
diff --git a/drivers/display/mb_display.c b/drivers/display/mb_display.c
index 41b807ad49..540a24fa52 100644
--- a/drivers/display/mb_display.c
+++ b/drivers/display/mb_display.c
@@ -10,7 +10,7 @@
  * a suitable LED matrix controller driver.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <string.h>
 #include <zephyr/sys/printk.h>
diff --git a/drivers/edac/edac_ibecc.c b/drivers/edac/edac_ibecc.c
index 3a501f676b..df8b638686 100644
--- a/drivers/edac/edac_ibecc.c
+++ b/drivers/edac/edac_ibecc.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT intel_ibecc
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/pcie/pcie.h>
 
diff --git a/drivers/eeprom/eeprom_at2x.c b/drivers/eeprom/eeprom_at2x.c
index 2411eaf61b..81fca84a67 100644
--- a/drivers/eeprom/eeprom_at2x.c
+++ b/drivers/eeprom/eeprom_at2x.c
@@ -14,7 +14,7 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/spi.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LOG_LEVEL CONFIG_EEPROM_LOG_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/drivers/eeprom/eeprom_emulator.c b/drivers/eeprom/eeprom_emulator.c
index 7268f291f0..0db2eb454a 100644
--- a/drivers/eeprom/eeprom_emulator.c
+++ b/drivers/eeprom/eeprom_emulator.c
@@ -59,7 +59,7 @@
 
 #include <zephyr/drivers/eeprom.h>
 #include <zephyr/drivers/flash.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #define LOG_LEVEL CONFIG_EEPROM_LOG_LEVEL
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(eeprom_emulator);
diff --git a/drivers/entropy/entropy_litex.c b/drivers/entropy/entropy_litex.c
index 767a3840d6..d95beee32a 100644
--- a/drivers/entropy/entropy_litex.c
+++ b/drivers/entropy/entropy_litex.c
@@ -12,7 +12,7 @@
 #include <zephyr/init.h>
 #include <soc.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define PRBS_STATUS     DT_INST_REG_ADDR(0)
 #define PRBS_WIDTH      DT_INST_REG_SIZE(0)
diff --git a/drivers/ethernet/eth_dwmac.c b/drivers/ethernet/eth_dwmac.c
index 1f9db989ff..3bc382c84a 100644
--- a/drivers/ethernet/eth_dwmac.c
+++ b/drivers/ethernet/eth_dwmac.c
@@ -13,7 +13,7 @@
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <sys/types.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/cache.h>
 #include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
diff --git a/drivers/ethernet/eth_dwmac_mmu.c b/drivers/ethernet/eth_dwmac_mmu.c
index f402f8fb54..f31d52deab 100644
--- a/drivers/ethernet/eth_dwmac_mmu.c
+++ b/drivers/ethernet/eth_dwmac_mmu.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <sys/types.h>
 #include <zephyr/sys/mem_manage.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/cache.h>
 #include <zephyr/net/ethernet.h>
 
diff --git a/drivers/ethernet/eth_dwmac_stm32h7x.c b/drivers/ethernet/eth_dwmac_stm32h7x.c
index 4b06e79d6a..b434429542 100644
--- a/drivers/ethernet/eth_dwmac_stm32h7x.c
+++ b/drivers/ethernet/eth_dwmac_stm32h7x.c
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define DT_DRV_COMPAT st_stm32_ethernet
 
 #include <sys/types.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/ethernet.h>
 #include <ethernet/eth.h>
 #include <zephyr/drivers/clock_control.h>
diff --git a/drivers/ethernet/eth_e1000.c b/drivers/ethernet/eth_e1000.c
index de5576f33a..71b8b7f7ea 100644
--- a/drivers/ethernet/eth_e1000.c
+++ b/drivers/ethernet/eth_e1000.c
@@ -12,7 +12,7 @@
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <sys/types.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/ethernet.h>
 #include <ethernet/eth_stats.h>
 #include <zephyr/drivers/pcie/pcie.h>
diff --git a/drivers/ethernet/eth_enc28j60.c b/drivers/ethernet/eth_enc28j60.c
index 7b272bcd6e..1e5558f585 100644
--- a/drivers/ethernet/eth_enc28j60.c
+++ b/drivers/ethernet/eth_enc28j60.c
@@ -13,7 +13,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <string.h>
 #include <errno.h>
diff --git a/drivers/ethernet/eth_enc424j600.c b/drivers/ethernet/eth_enc424j600.c
index 61bb50be84..b1c58456af 100644
--- a/drivers/ethernet/eth_enc424j600.c
+++ b/drivers/ethernet/eth_enc424j600.c
@@ -9,7 +9,7 @@
 
 #define DT_DRV_COMPAT microchip_enc424j600
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <string.h>
 #include <errno.h>
diff --git a/drivers/ethernet/eth_w5500.c b/drivers/ethernet/eth_w5500.c
index 8fa5dabd63..d5c1651542 100644
--- a/drivers/ethernet/eth_w5500.c
+++ b/drivers/ethernet/eth_w5500.c
@@ -11,7 +11,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(eth_w5500, CONFIG_ETHERNET_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <string.h>
 #include <errno.h>
diff --git a/drivers/ethernet/eth_xlnx_gem.c b/drivers/ethernet/eth_xlnx_gem.c
index ba3f71e200..24a9ec2cfc 100644
--- a/drivers/ethernet/eth_xlnx_gem.c
+++ b/drivers/ethernet/eth_xlnx_gem.c
@@ -21,7 +21,7 @@
  *   RX Status and TX Status registers.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/sys/__assert.h>
diff --git a/drivers/ethernet/phy_xlnx_gem.c b/drivers/ethernet/phy_xlnx_gem.c
index 16ea0ec845..126626a0f2 100644
--- a/drivers/ethernet/phy_xlnx_gem.c
+++ b/drivers/ethernet/phy_xlnx_gem.c
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 #include "eth_xlnx_gem_priv.h"
diff --git a/drivers/flash/flash_cadence_qspi_nor_ll.c b/drivers/flash/flash_cadence_qspi_nor_ll.c
index 1866f4ab81..d997c42659 100644
--- a/drivers/flash/flash_cadence_qspi_nor_ll.c
+++ b/drivers/flash/flash_cadence_qspi_nor_ll.c
@@ -9,7 +9,7 @@
 
 #include <zephyr/logging/log.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 LOG_MODULE_REGISTER(flash_cadence_ll, CONFIG_FLASH_LOG_LEVEL);
 
diff --git a/drivers/flash/flash_mcux_flexspi_hyperflash.c b/drivers/flash/flash_mcux_flexspi_hyperflash.c
index d6e6746ee5..f98b2e4ead 100644
--- a/drivers/flash/flash_mcux_flexspi_hyperflash.c
+++ b/drivers/flash/flash_mcux_flexspi_hyperflash.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT nxp_imx_flexspi_hyperflash
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/drivers/flash.h>
 
diff --git a/drivers/flash/flash_shell.c b/drivers/flash/flash_shell.c
index 1b8b78e1ba..c8a97e7faa 100644
--- a/drivers/flash/flash_shell.c
+++ b/drivers/flash/flash_shell.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 
 #include <zephyr/shell/shell.h>
diff --git a/drivers/gpio/gpio_emul.c b/drivers/gpio/gpio_emul.c
index c5a83eb21e..71f2de58ce 100644
--- a/drivers/gpio/gpio_emul.c
+++ b/drivers/gpio/gpio_emul.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/gpio/gpio_emul.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/device.h>
 
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_lmp90xxx.c b/drivers/gpio/gpio_lmp90xxx.c
index fc1a75be95..8e01de2d79 100644
--- a/drivers/gpio/gpio_lmp90xxx.c
+++ b/drivers/gpio/gpio_lmp90xxx.c
@@ -12,7 +12,7 @@
 #define DT_DRV_COMPAT ti_lmp90xxx_gpio
 
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/drivers/gpio/gpio_sn74hc595.c b/drivers/gpio/gpio_sn74hc595.c
index d20fbfef09..24d7d2e59e 100644
--- a/drivers/gpio/gpio_sn74hc595.c
+++ b/drivers/gpio/gpio_sn74hc595.c
@@ -14,7 +14,7 @@
 #include <zephyr/drivers/spi.h>
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/i2c/i2c_tca954x.c b/drivers/i2c/i2c_tca954x.c
index e1756a023f..603ba79ed4 100644
--- a/drivers/i2c/i2c_tca954x.c
+++ b/drivers/i2c/i2c_tca954x.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/drivers/i2c/i2c_test.c b/drivers/i2c/i2c_test.c
index 53274f6efd..b3e185c0b1 100644
--- a/drivers/i2c/i2c_test.c
+++ b/drivers/i2c/i2c_test.c
@@ -9,7 +9,7 @@
  * devices for the "vnd,i2c" devicetree compatible used in test code.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 
 #define DT_DRV_COMPAT vnd_i2c
diff --git a/drivers/interrupt_controller/intc_esp32.c b/drivers/interrupt_controller/intc_esp32.c
index 39c7dfed6e..3ad2dd92c8 100644
--- a/drivers/interrupt_controller/intc_esp32.c
+++ b/drivers/interrupt_controller/intc_esp32.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/drivers/interrupt_controller/intc_esp32c3.c b/drivers/interrupt_controller/intc_esp32c3.c
index 2cfe1b5185..6293afd07f 100644
--- a/drivers/interrupt_controller/intc_esp32c3.c
+++ b/drivers/interrupt_controller/intc_esp32c3.c
@@ -14,7 +14,7 @@
 #include <assert.h>
 #include "soc/soc.h"
 #include <soc.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/interrupt_controller/intc_esp32c3.h>
 #include <zephyr/sw_isr_table.h>
 #include <riscv/interrupt.h>
diff --git a/drivers/kscan/kscan_ht16k33.c b/drivers/kscan/kscan_ht16k33.c
index 68681592df..9595874e90 100644
--- a/drivers/kscan/kscan_ht16k33.c
+++ b/drivers/kscan/kscan_ht16k33.c
@@ -11,7 +11,7 @@
  * @brief Keyscan driver for the HT16K33 I2C LED driver
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/kscan.h>
 #include <zephyr/drivers/led/ht16k33.h>
 #include <zephyr/logging/log.h>
diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c
index e73bb61e78..58caba7f3f 100644
--- a/drivers/led/led_gpio.c
+++ b/drivers/led/led_gpio.c
@@ -14,7 +14,7 @@
 #include <zephyr/drivers/led.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/device.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(led_gpio, CONFIG_LED_LOG_LEVEL);
diff --git a/drivers/led/led_pwm.c b/drivers/led/led_pwm.c
index 27015fe29e..90db66bf32 100644
--- a/drivers/led/led_pwm.c
+++ b/drivers/led/led_pwm.c
@@ -15,7 +15,7 @@
 #include <zephyr/drivers/pwm.h>
 #include <zephyr/device.h>
 #include <zephyr/pm/device.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/math_extras.h>
 
 #include <zephyr/logging/log.h>
diff --git a/drivers/led/lp3943.c b/drivers/led/lp3943.c
index 9f133f7fc6..1c583d259d 100644
--- a/drivers/led/lp3943.c
+++ b/drivers/led/lp3943.c
@@ -22,7 +22,7 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/led.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LOG_LEVEL CONFIG_LED_LOG_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/drivers/led/lp503x.c b/drivers/led/lp503x.c
index e81a0b9812..fac9ecaf3a 100644
--- a/drivers/led/lp503x.c
+++ b/drivers/led/lp503x.c
@@ -15,7 +15,7 @@
 #include <zephyr/drivers/led.h>
 #include <zephyr/drivers/led/lp503x.h>
 #include <zephyr/device.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LOG_LEVEL CONFIG_LED_LOG_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/drivers/led/lp5562.c b/drivers/led/lp5562.c
index 83e5e6ec42..222a9659d6 100644
--- a/drivers/led/lp5562.c
+++ b/drivers/led/lp5562.c
@@ -33,7 +33,7 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/led.h>
 #include <zephyr/device.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LOG_LEVEL CONFIG_LED_LOG_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/drivers/led/pca9633.c b/drivers/led/pca9633.c
index b328769444..96a04dc484 100644
--- a/drivers/led/pca9633.c
+++ b/drivers/led/pca9633.c
@@ -14,7 +14,7 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/led.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LOG_LEVEL CONFIG_LED_LOG_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/drivers/led/tlc59108.c b/drivers/led/tlc59108.c
index 38640a6275..d625488a16 100644
--- a/drivers/led/tlc59108.c
+++ b/drivers/led/tlc59108.c
@@ -15,7 +15,7 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/led.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(tlc59108, CONFIG_LED_LOG_LEVEL);
diff --git a/drivers/led_strip/lpd880x.c b/drivers/led_strip/lpd880x.c
index b148f8d5c8..ba17bbf31a 100644
--- a/drivers/led_strip/lpd880x.c
+++ b/drivers/led_strip/lpd880x.c
@@ -19,7 +19,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(lpd880x);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/spi.h>
 #include <zephyr/sys/util.h>
diff --git a/drivers/led_strip/tlc5971.c b/drivers/led_strip/tlc5971.c
index 9482f6ec86..37f9296b38 100644
--- a/drivers/led_strip/tlc5971.c
+++ b/drivers/led_strip/tlc5971.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT ti_tlc5971
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/spi.h>
 #include <zephyr/drivers/led_strip.h>
 #include <zephyr/drivers/led_strip/tlc5971.h>
diff --git a/drivers/led_strip/ws2812_gpio.c b/drivers/led_strip/ws2812_gpio.c
index 5aece2c05a..692f25bd0d 100644
--- a/drivers/led_strip/ws2812_gpio.c
+++ b/drivers/led_strip/ws2812_gpio.c
@@ -16,7 +16,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ws2812_gpio);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/device.h>
diff --git a/drivers/led_strip/ws2812_spi.c b/drivers/led_strip/ws2812_spi.c
index 45c485ab8a..40f48896e2 100644
--- a/drivers/led_strip/ws2812_spi.c
+++ b/drivers/led_strip/ws2812_spi.c
@@ -16,7 +16,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ws2812_spi);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/spi.h>
 #include <zephyr/sys/math_extras.h>
diff --git a/drivers/lora/hal_common.c b/drivers/lora/hal_common.c
index 40e53bc8d3..b8777e4e0d 100644
--- a/drivers/lora/hal_common.c
+++ b/drivers/lora/hal_common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <timer.h>
 
diff --git a/drivers/lora/sx126x.c b/drivers/lora/sx126x.c
index 1c359d442a..b70194efac 100644
--- a/drivers/lora/sx126x.c
+++ b/drivers/lora/sx126x.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/lora.h>
 #include <zephyr/drivers/spi.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <sx126x/sx126x.h>
 
diff --git a/drivers/lora/sx126x_standalone.c b/drivers/lora/sx126x_standalone.c
index f072afd9b6..2a2c3d5ea1 100644
--- a/drivers/lora/sx126x_standalone.c
+++ b/drivers/lora/sx126x_standalone.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "sx126x_common.h"
 
diff --git a/drivers/lora/sx126x_stm32wl.c b/drivers/lora/sx126x_stm32wl.c
index 3cd5439dea..7a78b01752 100644
--- a/drivers/lora/sx126x_stm32wl.c
+++ b/drivers/lora/sx126x_stm32wl.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "sx126x_common.h"
 
diff --git a/drivers/lora/sx127x.c b/drivers/lora/sx127x.c
index ae91bfa602..135058dc5a 100644
--- a/drivers/lora/sx127x.c
+++ b/drivers/lora/sx127x.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/lora.h>
 #include <zephyr/drivers/spi.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "sx12xx_common.h"
 
diff --git a/drivers/lora/sx12xx_common.c b/drivers/lora/sx12xx_common.c
index 8cea14d33c..1d08977b60 100644
--- a/drivers/lora/sx12xx_common.c
+++ b/drivers/lora/sx12xx_common.c
@@ -9,7 +9,7 @@
 #include <zephyr/drivers/lora.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/atomic.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /* LoRaMac-node specific includes */
 #include <radio.h>
diff --git a/drivers/misc/ft8xx/ft8xx_drv.c b/drivers/misc/ft8xx/ft8xx_drv.c
index 2aa4ca241e..0e56e23b12 100644
--- a/drivers/misc/ft8xx/ft8xx_drv.c
+++ b/drivers/misc/ft8xx/ft8xx_drv.c
@@ -6,7 +6,7 @@
 
 #include "ft8xx_drv.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/spi.h>
 #include <zephyr/logging/log.h>
diff --git a/drivers/modem/hl7800.c b/drivers/modem/hl7800.c
index d9cd5514b8..7e7369e876 100644
--- a/drivers/modem/hl7800.c
+++ b/drivers/modem/hl7800.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_MODEM_LOG_LEVEL);
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
diff --git a/drivers/modem/modem_shell.c b/drivers/modem/modem_shell.c
index d3b7c9790f..4eebe30036 100644
--- a/drivers/modem/modem_shell.c
+++ b/drivers/modem/modem_shell.c
@@ -12,7 +12,7 @@
 
 #define LOG_MODULE_NAME modem_shell
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <string.h>
 #include <zephyr/device.h>
diff --git a/drivers/modem/wncm14a2a.c b/drivers/modem/wncm14a2a.c
index 1c2cbea2eb..c9c8e862f3 100644
--- a/drivers/modem/wncm14a2a.c
+++ b/drivers/modem/wncm14a2a.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
diff --git a/drivers/pwm/pwm_capture.c b/drivers/pwm/pwm_capture.c
index 15d417ac60..d5b30966c0 100644
--- a/drivers/pwm/pwm_capture.c
+++ b/drivers/pwm/pwm_capture.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/pwm.h>
 #include <zephyr/logging/log.h>
 
diff --git a/drivers/pwm/pwm_test.c b/drivers/pwm/pwm_test.c
index a51fc1235d..a238895d30 100644
--- a/drivers/pwm/pwm_test.c
+++ b/drivers/pwm/pwm_test.c
@@ -10,7 +10,7 @@
  * devices for the "vnd,pwm" devicetree compatible used in test code.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/pwm.h>
 
 #define DT_DRV_COMPAT vnd_pwm
diff --git a/drivers/sdhc/imx_usdhc.c b/drivers/sdhc/imx_usdhc.c
index be942083b8..ae22a9640b 100644
--- a/drivers/sdhc/imx_usdhc.c
+++ b/drivers/sdhc/imx_usdhc.c
@@ -7,7 +7,7 @@
 
 #define DT_DRV_COMPAT nxp_imx_usdhc
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/sdhc.h>
 #include <zephyr/sd/sd_spec.h>
diff --git a/drivers/sensor/dht/dht.c b/drivers/sensor/dht/dht.c
index b899be0cc4..5bebdbc270 100644
--- a/drivers/sensor/dht/dht.c
+++ b/drivers/sensor/dht/dht.c
@@ -12,7 +12,7 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/drivers/sensor.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 #include "dht.h"
diff --git a/drivers/sensor/grove/light_sensor.c b/drivers/sensor/grove/light_sensor.c
index e945cd5002..317a4c2d63 100644
--- a/drivers/sensor/grove/light_sensor.c
+++ b/drivers/sensor/grove/light_sensor.c
@@ -11,7 +11,7 @@
 #include <zephyr/devicetree.h>
 #include <math.h>
 #include <zephyr/drivers/sensor.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(grove_light, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/sensor/grove/temperature_sensor.c b/drivers/sensor/grove/temperature_sensor.c
index 96ea381350..f2dba210a0 100644
--- a/drivers/sensor/grove/temperature_sensor.c
+++ b/drivers/sensor/grove/temperature_sensor.c
@@ -11,7 +11,7 @@
 #include <zephyr/devicetree.h>
 #include <math.h>
 #include <zephyr/drivers/sensor.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(grove_temp, CONFIG_SENSOR_LOG_LEVEL);
diff --git a/drivers/serial/serial_test.c b/drivers/serial/serial_test.c
index 19fc22cc0a..8d41157533 100644
--- a/drivers/serial/serial_test.c
+++ b/drivers/serial/serial_test.c
@@ -9,7 +9,7 @@
  * devices for the "vnd,serial" devicetree compatible used in test code.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/uart.h>
 
 #define DT_DRV_COMPAT vnd_serial
diff --git a/drivers/spi/spi_signal.c b/drivers/spi/spi_signal.c
index 09553ce3df..2ea645cffd 100644
--- a/drivers/spi/spi_signal.c
+++ b/drivers/spi/spi_signal.c
@@ -9,7 +9,7 @@
  * @brief Async callback used with signal notifier
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 #ifdef CONFIG_POLL
diff --git a/drivers/spi/spi_test.c b/drivers/spi/spi_test.c
index cb98157b42..ce3360d21f 100644
--- a/drivers/spi/spi_test.c
+++ b/drivers/spi/spi_test.c
@@ -9,7 +9,7 @@
  * devices for the "vnd,spi" devicetree compatible used in test code.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/spi.h>
 
 #define DT_DRV_COMPAT vnd_spi
diff --git a/drivers/timer/rv32m1_lptmr_timer.c b/drivers/timer/rv32m1_lptmr_timer.c
index 19dbb3e850..88a4ed61c9 100644
--- a/drivers/timer/rv32m1_lptmr_timer.c
+++ b/drivers/timer/rv32m1_lptmr_timer.c
@@ -7,7 +7,7 @@
 #define DT_DRV_COMPAT openisa_rv32m1_lptmr
 
 #include <zephyr/device.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/drivers/timer/system_timer.h>
 #include <soc.h>
diff --git a/drivers/video/mt9m114.c b/drivers/video/mt9m114.c
index 8972d41fc0..57613c1b16 100644
--- a/drivers/video/mt9m114.c
+++ b/drivers/video/mt9m114.c
@@ -5,7 +5,7 @@
  */
 
 #define DT_DRV_COMPAT aptina_mt9m114
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 #include <zephyr/sys/byteorder.h>
diff --git a/drivers/video/ov2640.c b/drivers/video/ov2640.c
index 8c9c916c4a..2b481a0ac8 100644
--- a/drivers/video/ov2640.c
+++ b/drivers/video/ov2640.c
@@ -5,7 +5,7 @@
  */
 
 #define DT_DRV_COMPAT ovti_ov2640
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 #include <zephyr/drivers/video.h>
diff --git a/drivers/video/ov7725.c b/drivers/video/ov7725.c
index e0d231a698..d1705e9e42 100644
--- a/drivers/video/ov7725.c
+++ b/drivers/video/ov7725.c
@@ -5,7 +5,7 @@
  */
 
 #define DT_DRV_COMPAT ovti_ov7725
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 #include <zephyr/sys/byteorder.h>
diff --git a/drivers/video/video_common.c b/drivers/video/video_common.c
index 64a2af7352..11786bd692 100644
--- a/drivers/video/video_common.c
+++ b/drivers/video/video_common.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/drivers/video.h>
 
diff --git a/drivers/video/video_mcux_csi.c b/drivers/video/video_mcux_csi.c
index dc399ff5f1..3648063e55 100644
--- a/drivers/video/video_mcux_csi.c
+++ b/drivers/video/video_mcux_csi.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT nxp_imx_csi
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <fsl_csi.h>
 
diff --git a/drivers/video/video_sw_generator.c b/drivers/video/video_sw_generator.c
index eb43bf5ef2..c4aa147f66 100644
--- a/drivers/video/video_sw_generator.c
+++ b/drivers/video/video_sw_generator.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/drivers/video.h>
 
diff --git a/drivers/w1/w1_ds2484.c b/drivers/w1/w1_ds2484.c
index 84582db720..6065d22cc6 100644
--- a/drivers/w1/w1_ds2484.c
+++ b/drivers/w1/w1_ds2484.c
@@ -12,7 +12,7 @@
 #include <zephyr/drivers/w1.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/pm/device.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define DT_DRV_COMPAT maxim_ds2484
 
diff --git a/drivers/w1/w1_ds248x.h b/drivers/w1/w1_ds248x.h
index 1b8ca911d8..860bf45aee 100644
--- a/drivers/w1/w1_ds248x.h
+++ b/drivers/w1/w1_ds248x.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_DRIVERS_W1_W1_DS248X_H_
 
 #include <zephyr/drivers/i2c.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define CMD_1WT	 0x78
 #define CMD_1WSB 0x87
diff --git a/drivers/wifi/simplelink/simplelink_sockets.c b/drivers/wifi/simplelink/simplelink_sockets.c
index 079b770d02..7bc97b687e 100644
--- a/drivers/wifi/simplelink/simplelink_sockets.c
+++ b/drivers/wifi/simplelink/simplelink_sockets.c
@@ -11,7 +11,7 @@ LOG_MODULE_DECLARE(LOG_MODULE_NAME);
 #include <limits.h>
 #include <fcntl.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 /* Define sockaddr, etc, before simplelink.h */
 #include <zephyr/net/socket_offload.h>
 
diff --git a/drivers/wifi/simplelink/simplelink_support.c b/drivers/wifi/simplelink/simplelink_support.c
index 61fade86b0..dab0739a08 100644
--- a/drivers/wifi/simplelink/simplelink_support.c
+++ b/drivers/wifi/simplelink/simplelink_support.c
@@ -11,7 +11,7 @@
 #include "simplelink_log.h"
 LOG_MODULE_DECLARE(LOG_MODULE_NAME);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdint.h>
 
 #include <ti/drivers/net/wifi/simplelink.h>
diff --git a/include/zephyr/bluetooth/mesh/msg.h b/include/zephyr/bluetooth/mesh/msg.h
index 4e8cc90f0d..4052dea735 100644
--- a/include/zephyr/bluetooth/mesh/msg.h
+++ b/include/zephyr/bluetooth/mesh/msg.h
@@ -17,7 +17,7 @@
  * @{
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/buf.h>
 
 #ifdef __cplusplus
diff --git a/include/zephyr/drivers/video-controls.h b/include/zephyr/drivers/video-controls.h
index d688a12c47..1cb37ce868 100644
--- a/include/zephyr/drivers/video-controls.h
+++ b/include/zephyr/drivers/video-controls.h
@@ -21,7 +21,7 @@
 
 #include <zephyr/device.h>
 #include <stddef.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/types.h>
 
diff --git a/include/zephyr/drivers/video.h b/include/zephyr/drivers/video.h
index 767b0a2de8..3a85bfba0a 100644
--- a/include/zephyr/drivers/video.h
+++ b/include/zephyr/drivers/video.h
@@ -21,7 +21,7 @@
 
 #include <zephyr/device.h>
 #include <stddef.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/types.h>
 
diff --git a/include/zephyr/mgmt/osdp.h b/include/zephyr/mgmt/osdp.h
index e85a451742..f6cacf7d3b 100644
--- a/include/zephyr/mgmt/osdp.h
+++ b/include/zephyr/mgmt/osdp.h
@@ -7,7 +7,7 @@
 #ifndef _OSDP_H_
 #define _OSDP_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdint.h>
 
 #include <zephyr/sys/slist.h>
diff --git a/include/zephyr/net/buf.h b/include/zephyr/net/buf.h
index 030bf1cae0..f869dfab5a 100644
--- a/include/zephyr/net/buf.h
+++ b/include/zephyr/net/buf.h
@@ -13,7 +13,7 @@
 #include <stddef.h>
 #include <zephyr/types.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/zephyr/net/capture.h b/include/zephyr/net/capture.h
index 8adbe8afaa..b4d9ce323a 100644
--- a/include/zephyr/net/capture.h
+++ b/include/zephyr/net/capture.h
@@ -13,7 +13,7 @@
 #ifndef ZEPHYR_INCLUDE_NET_CAPTURE_H_
 #define ZEPHYR_INCLUDE_NET_CAPTURE_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h
index 8282092c9e..aaba49a60e 100644
--- a/include/zephyr/net/mqtt.h
+++ b/include/zephyr/net/mqtt.h
@@ -24,7 +24,7 @@
 
 #include <stddef.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/net/tls_credentials.h>
 #include <zephyr/net/net_ip.h>
diff --git a/include/zephyr/net/tftp.h b/include/zephyr/net/tftp.h
index 36b0c689fa..d0f683e899 100644
--- a/include/zephyr/net/tftp.h
+++ b/include/zephyr/net/tftp.h
@@ -12,7 +12,7 @@
 #ifndef ZEPHYR_INCLUDE_NET_TFTP_H_
 #define ZEPHYR_INCLUDE_NET_TFTP_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
 
 #ifdef __cplusplus
diff --git a/include/zephyr/posix/sys/eventfd.h b/include/zephyr/posix/sys/eventfd.h
index 4d6d4dc33c..1228613b60 100644
--- a/include/zephyr/posix/sys/eventfd.h
+++ b/include/zephyr/posix/sys/eventfd.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_INCLUDE_POSIX_SYS_EVENTFD_H_
 #define ZEPHYR_INCLUDE_POSIX_SYS_EVENTFD_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/fdtable.h>
 #include <sys/types.h>
 
diff --git a/include/zephyr/shell/shell.h b/include/zephyr/shell/shell.h
index a6838265e5..b935fc646c 100644
--- a/include/zephyr/shell/shell.h
+++ b/include/zephyr/shell/shell.h
@@ -7,7 +7,7 @@
 #ifndef SHELL_H__
 #define SHELL_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell_types.h>
 #include <zephyr/shell/shell_history.h>
 #include <zephyr/shell/shell_fprintf.h>
diff --git a/include/zephyr/shell/shell_fprintf.h b/include/zephyr/shell/shell_fprintf.h
index 9f4cc29466..979e88ebd2 100644
--- a/include/zephyr/shell/shell_fprintf.h
+++ b/include/zephyr/shell/shell_fprintf.h
@@ -7,7 +7,7 @@
 #ifndef SHELL_FPRINTF_H__
 #define SHELL_FPRINTF_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdbool.h>
 #include <stddef.h>
 
diff --git a/include/zephyr/shell/shell_history.h b/include/zephyr/shell/shell_history.h
index a8bb6c84fb..9148335774 100644
--- a/include/zephyr/shell/shell_history.h
+++ b/include/zephyr/shell/shell_history.h
@@ -7,7 +7,7 @@
 #ifndef SHELL_HISTORY_H__
 #define SHELL_HISTORY_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/dlist.h>
 #include <zephyr/sys/ring_buffer.h>
diff --git a/include/zephyr/shell/shell_log_backend.h b/include/zephyr/shell/shell_log_backend.h
index c10dde2dba..293cdf1163 100644
--- a/include/zephyr/shell/shell_log_backend.h
+++ b/include/zephyr/shell/shell_log_backend.h
@@ -7,7 +7,7 @@
 #ifndef SHELL_LOG_BACKEND_H__
 #define SHELL_LOG_BACKEND_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log_backend.h>
 #include <zephyr/logging/log_output.h>
 #include <zephyr/sys/mpsc_pbuf.h>
diff --git a/include/zephyr/shell/shell_mqtt.h b/include/zephyr/shell/shell_mqtt.h
index 9671df6a00..f709ffd1ed 100644
--- a/include/zephyr/shell/shell_mqtt.h
+++ b/include/zephyr/shell/shell_mqtt.h
@@ -7,7 +7,7 @@
 #ifndef SHELL_MQTT_H__
 #define SHELL_MQTT_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/net_mgmt.h>
diff --git a/include/zephyr/smf.h b/include/zephyr/smf.h
index 7376e2d391..2fdcbbdced 100644
--- a/include/zephyr/smf.h
+++ b/include/zephyr/smf.h
@@ -56,7 +56,7 @@
 extern "C" {
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /**
  * @brief Function pointer that implements a portion of a state
diff --git a/lib/libc/minimal/source/stdlib/abort.c b/lib/libc/minimal/source/stdlib/abort.c
index 91ede1068d..d61e094ce9 100644
--- a/lib/libc/minimal/source/stdlib/abort.c
+++ b/lib/libc/minimal/source/stdlib/abort.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 void abort(void)
 {
diff --git a/lib/libc/minimal/source/stdlib/exit.c b/lib/libc/minimal/source/stdlib/exit.c
index d93ec0a879..5700cd9558 100644
--- a/lib/libc/minimal/source/stdlib/exit.c
+++ b/lib/libc/minimal/source/stdlib/exit.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 void _exit(int status)
 {
diff --git a/lib/libc/minimal/source/stdlib/malloc.c b/lib/libc/minimal/source/stdlib/malloc.c
index 4e13c94197..5eb3f4f57c 100644
--- a/lib/libc/minimal/source/stdlib/malloc.c
+++ b/lib/libc/minimal/source/stdlib/malloc.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <errno.h>
 #include <zephyr/sys/math_extras.h>
diff --git a/lib/libc/picolibc/libc-hooks.c b/lib/libc/picolibc/libc-hooks.c
index dd95fe3043..2076b33d9a 100644
--- a/lib/libc/picolibc/libc-hooks.c
+++ b/lib/libc/picolibc/libc-hooks.c
@@ -528,7 +528,7 @@ int _gettimeofday(struct timeval *__tp, void *__tzp)
 }
 
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /* Replace picolibc abort with native Zephyr one */
 void abort(void)
diff --git a/lib/open-amp/resource_table.c b/lib/open-amp/resource_table.c
index 2a170c9e18..2d58beb4b9 100644
--- a/lib/open-amp/resource_table.c
+++ b/lib/open-amp/resource_table.c
@@ -26,7 +26,7 @@
  *   https://github.com/OpenAMP/open-amp/wiki/OpenAMP-Life-Cycle-Management
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <resource_table.h>
 
 extern char ram_console[];
diff --git a/lib/os/assert.c b/lib/os/assert.c
index 8653acc803..b6a33ae732 100644
--- a/lib/os/assert.c
+++ b/lib/os/assert.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/printk.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 
 /**
diff --git a/lib/os/mem_blocks.c b/lib/os/mem_blocks.c
index 713c4513d6..3517a5705d 100644
--- a/lib/os/mem_blocks.c
+++ b/lib/os/mem_blocks.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/check.h>
 #include <zephyr/sys/heap_listener.h>
diff --git a/lib/os/shared_multi_heap.c b/lib/os/shared_multi_heap.c
index 88ead84cad..e2ae4bf7d7 100644
--- a/lib/os/shared_multi_heap.c
+++ b/lib/os/shared_multi_heap.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/sys/sys_heap.h>
 #include <zephyr/sys/multi_heap.h>
diff --git a/lib/os/spsc_pbuf.c b/lib/os/spsc_pbuf.c
index 36413a2b35..ff9a825067 100644
--- a/lib/os/spsc_pbuf.c
+++ b/lib/os/spsc_pbuf.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <zephyr/cache.h>
diff --git a/lib/posix/eventfd.c b/lib/posix/eventfd.c
index 17573d074d..6974164036 100644
--- a/lib/posix/eventfd.c
+++ b/lib/posix/eventfd.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/wait_q.h>
 #include <zephyr/posix/sys/eventfd.h>
 #include <zephyr/net/socket.h>
diff --git a/lib/posix/getopt/getopt.h b/lib/posix/getopt/getopt.h
index 8f21065f89..0cbdda651f 100644
--- a/lib/posix/getopt/getopt.h
+++ b/lib/posix/getopt/getopt.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 struct getopt_state {
 	int opterr;	/* if error message should be printed */
diff --git a/lib/posix/getopt/getopt_common.c b/lib/posix/getopt/getopt_common.c
index 6698a7fbe6..cec16cbf97 100644
--- a/lib/posix/getopt/getopt_common.c
+++ b/lib/posix/getopt/getopt_common.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 #include "getopt.h"
 
diff --git a/modules/canopennode/CO_driver.c b/modules/canopennode/CO_driver.c
index cbb2e27229..622df16d9b 100644
--- a/modules/canopennode/CO_driver.c
+++ b/modules/canopennode/CO_driver.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/can.h>
 #include <zephyr/init.h>
 #include <zephyr/sys/util.h>
diff --git a/modules/canopennode/CO_driver_target.h b/modules/canopennode/CO_driver_target.h
index aa4069a9cd..2cd943e5d2 100644
--- a/modules/canopennode/CO_driver_target.h
+++ b/modules/canopennode/CO_driver_target.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/device.h>
 #include <zephyr/toolchain.h>
diff --git a/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_backend_ipc.c b/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_backend_ipc.c
index 782f0a7949..251709add6 100644
--- a/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_backend_ipc.c
+++ b/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_backend_ipc.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ipc/ipc_service.h>
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
diff --git a/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_response_notifier.c b/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_response_notifier.c
index 036dd16c46..f4480d7ed3 100644
--- a/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_response_notifier.c
+++ b/modules/hal_nordic/nrf_802154/serialization/platform/nrf_802154_spinel_response_notifier.c
@@ -10,7 +10,7 @@
 #include <string.h>
 
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "../spinel_base/spinel.h"
 #include "nrf_802154_spinel_log.h"
diff --git a/modules/trusted-firmware-m/src/reboot.c b/modules/trusted-firmware-m/src/reboot.c
index a9dc98e693..8aeeac369a 100644
--- a/modules/trusted-firmware-m/src/reboot.c
+++ b/modules/trusted-firmware-m/src/reboot.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "tfm_platform_api.h"
 
diff --git a/modules/trusted-firmware-m/src/zephyr_tfm_psa_test.c b/modules/trusted-firmware-m/src/zephyr_tfm_psa_test.c
index 15fc48d11d..d7d68f9db6 100644
--- a/modules/trusted-firmware-m/src/zephyr_tfm_psa_test.c
+++ b/modules/trusted-firmware-m/src/zephyr_tfm_psa_test.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /**
  * \brief This symbol is the entry point provided by the PSA API compliance
diff --git a/samples/application_development/code_relocation_nocopy/src/ext_code.c b/samples/application_development/code_relocation_nocopy/src/ext_code.c
index 5e84f7a4df..d50dd5ec36 100644
--- a/samples/application_development/code_relocation_nocopy/src/ext_code.c
+++ b/samples/application_development/code_relocation_nocopy/src/ext_code.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 uint32_t var_ext_sram_data = 10U;
diff --git a/samples/application_development/code_relocation_nocopy/src/sram_code.c b/samples/application_development/code_relocation_nocopy/src/sram_code.c
index 460b39f4b6..f068a26216 100644
--- a/samples/application_development/code_relocation_nocopy/src/sram_code.c
+++ b/samples/application_development/code_relocation_nocopy/src/sram_code.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 uint32_t var_sram_data = 10U;
diff --git a/samples/application_development/external_lib/src/main.c b/samples/application_development/external_lib/src/main.c
index 41c7097b8e..f034a7fbb4 100644
--- a/samples/application_development/external_lib/src/main.c
+++ b/samples/application_development/external_lib/src/main.c
@@ -7,7 +7,7 @@
 /* hello world example: calling functions from a static library */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 
 #include <mylib.h>
diff --git a/samples/application_development/out_of_tree_board/src/main.c b/samples/application_development/out_of_tree_board/src/main.c
index b76861f03d..d8712daf22 100644
--- a/samples/application_development/out_of_tree_board/src/main.c
+++ b/samples/application_development/out_of_tree_board/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 void main(void)
diff --git a/samples/application_development/out_of_tree_driver/src/main.c b/samples/application_development/out_of_tree_driver/src/main.c
index 63e74033bf..95a5474925 100644
--- a/samples/application_development/out_of_tree_driver/src/main.c
+++ b/samples/application_development/out_of_tree_driver/src/main.c
@@ -6,7 +6,7 @@
 
 #include "hello_world_driver.h"
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 const struct device *dev;
 
diff --git a/samples/arch/mpu/mpu_test/src/main.c b/samples/arch/mpu/mpu_test/src/main.c
index 8726a4bbbd..50270ccb47 100644
--- a/samples/arch/mpu/mpu_test/src/main.c
+++ b/samples/arch/mpu/mpu_test/src/main.c
@@ -6,7 +6,7 @@
  */
 #include <stdlib.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/flash.h>
diff --git a/samples/arch/smp/pi/src/main.c b/samples/arch/smp/pi/src/main.c
index 3631b6344b..f5cc0f6fb2 100644
--- a/samples/arch/smp/pi/src/main.c
+++ b/samples/arch/smp/pi/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 
 /* Amount of execution threads to create and run */
diff --git a/samples/arch/smp/pktqueue/src/main.h b/samples/arch/smp/pktqueue/src/main.h
index e9c1d5b77f..9484909ab8 100644
--- a/samples/arch/smp/pktqueue/src/main.h
+++ b/samples/arch/smp/pktqueue/src/main.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/sys/crc.h>
 #include <zephyr/random/rand32.h>
diff --git a/samples/arch/smp/pktqueue/src/pktqueue.h b/samples/arch/smp/pktqueue/src/pktqueue.h
index aec4ac367e..e46d7ed194 100644
--- a/samples/arch/smp/pktqueue/src/pktqueue.h
+++ b/samples/arch/smp/pktqueue/src/pktqueue.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/sys/crc.h>
 #include <zephyr/random/rand32.h>
diff --git a/samples/basic/blinky/src/main.c b/samples/basic/blinky/src/main.c
index 8e0509bde6..2d627f2d4e 100644
--- a/samples/basic/blinky/src/main.c
+++ b/samples/basic/blinky/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 
 /* 1000 msec = 1 sec */
diff --git a/samples/basic/blinky_pwm/src/main.c b/samples/basic/blinky_pwm/src/main.c
index af936481f0..fb4b7e2741 100644
--- a/samples/basic/blinky_pwm/src/main.c
+++ b/samples/basic/blinky_pwm/src/main.c
@@ -9,7 +9,7 @@
  * @file Sample app to demonstrate PWM.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/pwm.h>
diff --git a/samples/basic/button/src/main.c b/samples/basic/button/src/main.c
index 37e392cf7f..20a207a1ef 100644
--- a/samples/basic/button/src/main.c
+++ b/samples/basic/button/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/sys/util.h>
diff --git a/samples/basic/fade_led/src/main.c b/samples/basic/fade_led/src/main.c
index 04dbaa1c20..fcd9fc519f 100644
--- a/samples/basic/fade_led/src/main.c
+++ b/samples/basic/fade_led/src/main.c
@@ -9,7 +9,7 @@
  * @file Sample app to demonstrate PWM-based LED fade
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/pwm.h>
diff --git a/samples/basic/minimal/src/main.c b/samples/basic/minimal/src/main.c
index 48d350e9f9..49a8af3e6b 100644
--- a/samples/basic/minimal/src/main.c
+++ b/samples/basic/minimal/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 void main(void)
 {
diff --git a/samples/basic/rgb_led/src/main.c b/samples/basic/rgb_led/src/main.c
index 097f72f616..2fbd943dd3 100644
--- a/samples/basic/rgb_led/src/main.c
+++ b/samples/basic/rgb_led/src/main.c
@@ -8,7 +8,7 @@
  * @file Sample app to demonstrate PWM-based RGB LED control
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/pwm.h>
diff --git a/samples/basic/servo_motor/src/main.c b/samples/basic/servo_motor/src/main.c
index 15969fa255..eed4ec8a95 100644
--- a/samples/basic/servo_motor/src/main.c
+++ b/samples/basic/servo_motor/src/main.c
@@ -8,7 +8,7 @@
  * @file Sample app to demonstrate PWM-based servomotor control
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/pwm.h>
diff --git a/samples/basic/threads/src/main.c b/samples/basic/threads/src/main.c
index 553bd99997..0554ddd9da 100644
--- a/samples/basic/threads/src/main.c
+++ b/samples/basic/threads/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/bluetooth/central/src/main.c b/samples/bluetooth/central/src/main.c
index d14c6bc259..192e33072a 100644
--- a/samples/bluetooth/central/src/main.c
+++ b/samples/bluetooth/central/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/samples/bluetooth/central_gatt_write/src/central_gatt_write.c b/samples/bluetooth/central_gatt_write/src/central_gatt_write.c
index 3ed820e9f0..385877ec28 100644
--- a/samples/bluetooth/central_gatt_write/src/central_gatt_write.c
+++ b/samples/bluetooth/central_gatt_write/src/central_gatt_write.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/samples/bluetooth/central_gatt_write/src/gatt_write_common.c b/samples/bluetooth/central_gatt_write/src/gatt_write_common.c
index 8238c0d4c5..58c8c58f50 100644
--- a/samples/bluetooth/central_gatt_write/src/gatt_write_common.c
+++ b/samples/bluetooth/central_gatt_write/src/gatt_write_common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/samples/bluetooth/central_hr/src/main.c b/samples/bluetooth/central_hr/src/main.c
index c76a972111..437b91e84c 100644
--- a/samples/bluetooth/central_hr/src/main.c
+++ b/samples/bluetooth/central_hr/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/samples/bluetooth/central_ht/src/main.c b/samples/bluetooth/central_ht/src/main.c
index 224f1cea73..7bface1cea 100644
--- a/samples/bluetooth/central_ht/src/main.c
+++ b/samples/bluetooth/central_ht/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <errno.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
 
diff --git a/samples/bluetooth/central_iso/src/main.c b/samples/bluetooth/central_iso/src/main.c
index 12ada9c7d2..d33e3fa9a2 100644
--- a/samples/bluetooth/central_iso/src/main.c
+++ b/samples/bluetooth/central_iso/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/samples/bluetooth/central_multilink/src/central_multilink.c b/samples/bluetooth/central_multilink/src/central_multilink.c
index b2c0ce7522..f7e036f89b 100644
--- a/samples/bluetooth/central_multilink/src/central_multilink.c
+++ b/samples/bluetooth/central_multilink/src/central_multilink.c
@@ -10,7 +10,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/samples/bluetooth/central_otc/src/main.c b/samples/bluetooth/central_otc/src/main.c
index 32e416e08b..503f33182f 100644
--- a/samples/bluetooth/central_otc/src/main.c
+++ b/samples/bluetooth/central_otc/src/main.c
@@ -20,7 +20,7 @@
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/types.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define OBJ_MAX_SIZE			      1024
 /* Hardcoded here since definition is in internal header */
diff --git a/samples/bluetooth/direction_finding_central/src/main.c b/samples/bluetooth/direction_finding_central/src/main.c
index d0a8dd5fd9..dfc0bcca6f 100644
--- a/samples/bluetooth/direction_finding_central/src/main.c
+++ b/samples/bluetooth/direction_finding_central/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
 
diff --git a/samples/bluetooth/direction_finding_connectionless_rx/src/main.c b/samples/bluetooth/direction_finding_connectionless_rx/src/main.c
index 90b83f52ee..32b1dd8e07 100644
--- a/samples/bluetooth/direction_finding_connectionless_rx/src/main.c
+++ b/samples/bluetooth/direction_finding_connectionless_rx/src/main.c
@@ -6,7 +6,7 @@
 
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/samples/bluetooth/direction_finding_connectionless_tx/src/main.c b/samples/bluetooth/direction_finding_connectionless_tx/src/main.c
index 86f7eeacfe..ae78b8509b 100644
--- a/samples/bluetooth/direction_finding_connectionless_tx/src/main.c
+++ b/samples/bluetooth/direction_finding_connectionless_tx/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/samples/bluetooth/direction_finding_peripheral/src/main.c b/samples/bluetooth/direction_finding_peripheral/src/main.c
index 5cfa3bee07..3b5792ac1d 100644
--- a/samples/bluetooth/direction_finding_peripheral/src/main.c
+++ b/samples/bluetooth/direction_finding_peripheral/src/main.c
@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/eddystone/src/main.c b/samples/bluetooth/eddystone/src/main.c
index 0af2cbdf7f..b4c1b58fad 100644
--- a/samples/bluetooth/eddystone/src/main.c
+++ b/samples/bluetooth/eddystone/src/main.c
@@ -13,7 +13,7 @@
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/handsfree/src/main.c b/samples/bluetooth/handsfree/src/main.c
index 98fa9829bf..1505d63fcf 100644
--- a/samples/bluetooth/handsfree/src/main.c
+++ b/samples/bluetooth/handsfree/src/main.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
diff --git a/samples/bluetooth/hap_ha/src/bap_unicast_sr.c b/samples/bluetooth/hap_ha/src/bap_unicast_sr.c
index 9edf19b70b..c777c05410 100644
--- a/samples/bluetooth/hap_ha/src/bap_unicast_sr.c
+++ b/samples/bluetooth/hap_ha/src/bap_unicast_sr.c
@@ -7,7 +7,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/printk.h>
 
diff --git a/samples/bluetooth/hap_ha/src/ccp_call_ctrl.c b/samples/bluetooth/hap_ha/src/ccp_call_ctrl.c
index a7bd783227..8bfaab4fb3 100644
--- a/samples/bluetooth/hap_ha/src/ccp_call_ctrl.c
+++ b/samples/bluetooth/hap_ha/src/ccp_call_ctrl.c
@@ -7,7 +7,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util.h>
 
diff --git a/samples/bluetooth/hap_ha/src/csip_set_member.c b/samples/bluetooth/hap_ha/src/csip_set_member.c
index 1bfb1193aa..bd30640f2e 100644
--- a/samples/bluetooth/hap_ha/src/csip_set_member.c
+++ b/samples/bluetooth/hap_ha/src/csip_set_member.c
@@ -6,7 +6,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/bluetooth/audio/cap.h>
diff --git a/samples/bluetooth/hap_ha/src/has_server.c b/samples/bluetooth/hap_ha/src/has_server.c
index a7e92850fe..f940c7be54 100644
--- a/samples/bluetooth/hap_ha/src/has_server.c
+++ b/samples/bluetooth/hap_ha/src/has_server.c
@@ -6,7 +6,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util.h>
 
diff --git a/samples/bluetooth/hap_ha/src/main.c b/samples/bluetooth/hap_ha/src/main.c
index d517ba232e..0c8c1d889b 100644
--- a/samples/bluetooth/hap_ha/src/main.c
+++ b/samples/bluetooth/hap_ha/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/printk.h>
 
diff --git a/samples/bluetooth/hap_ha/src/micp_mic_dev.c b/samples/bluetooth/hap_ha/src/micp_mic_dev.c
index 540bef0ea2..f1c8ffb5ac 100644
--- a/samples/bluetooth/hap_ha/src/micp_mic_dev.c
+++ b/samples/bluetooth/hap_ha/src/micp_mic_dev.c
@@ -8,7 +8,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/samples/bluetooth/hap_ha/src/vcp_vol_renderer.c b/samples/bluetooth/hap_ha/src/vcp_vol_renderer.c
index 7a47463491..7fca88a038 100644
--- a/samples/bluetooth/hap_ha/src/vcp_vol_renderer.c
+++ b/samples/bluetooth/hap_ha/src/vcp_vol_renderer.c
@@ -8,7 +8,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/samples/bluetooth/hci_rpmsg/src/main.c b/samples/bluetooth/hci_rpmsg/src/main.c
index 4380a72130..4da4822de3 100644
--- a/samples/bluetooth/hci_rpmsg/src/main.c
+++ b/samples/bluetooth/hci_rpmsg/src/main.c
@@ -10,7 +10,7 @@
 #include <string.h>
 
 #include <zephyr/device.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
 
diff --git a/samples/bluetooth/hci_spi/src/main.c b/samples/bluetooth/hci_spi/src/main.c
index cd71e84a87..77c97053a5 100644
--- a/samples/bluetooth/hci_spi/src/main.c
+++ b/samples/bluetooth/hci_spi/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/debug/stack.h>
diff --git a/samples/bluetooth/hci_uart/src/main.c b/samples/bluetooth/hci_uart/src/main.c
index 429044ebe2..a93ab0cf52 100644
--- a/samples/bluetooth/hci_uart/src/main.c
+++ b/samples/bluetooth/hci_uart/src/main.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/logging/log.h>
diff --git a/samples/bluetooth/hci_usb/src/main.c b/samples/bluetooth/hci_usb/src/main.c
index 8108cda1cd..773dd9eac3 100644
--- a/samples/bluetooth/hci_usb/src/main.c
+++ b/samples/bluetooth/hci_usb/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/usb/usb_device.h>
 
diff --git a/samples/bluetooth/hci_usb_h4/src/main.c b/samples/bluetooth/hci_usb_h4/src/main.c
index 2fc55086fc..e8874a9078 100644
--- a/samples/bluetooth/hci_usb_h4/src/main.c
+++ b/samples/bluetooth/hci_usb_h4/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/usb/usb_device.h>
 
diff --git a/samples/bluetooth/ipsp/src/main.c b/samples/bluetooth/ipsp/src/main.c
index ad98ee7092..02e3e0a5c3 100644
--- a/samples/bluetooth/ipsp/src/main.c
+++ b/samples/bluetooth/ipsp/src/main.c
@@ -14,7 +14,7 @@ LOG_MODULE_REGISTER(ipsp);
 /* Preventing log module registration in net_core.h */
 #define NET_LOG_ENABLED	0
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/samples/bluetooth/peripheral/src/cts.c b/samples/bluetooth/peripheral/src/cts.c
index b41d12e1bb..20b53177d6 100644
--- a/samples/bluetooth/peripheral/src/cts.c
+++ b/samples/bluetooth/peripheral/src/cts.c
@@ -14,7 +14,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/peripheral/src/main.c b/samples/bluetooth/peripheral/src/main.c
index b7fa597ad3..5a76e8edda 100644
--- a/samples/bluetooth/peripheral/src/main.c
+++ b/samples/bluetooth/peripheral/src/main.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/settings/settings.h>
 
diff --git a/samples/bluetooth/peripheral_csc/src/main.c b/samples/bluetooth/peripheral_csc/src/main.c
index d3e7f29901..abe913f7f0 100644
--- a/samples/bluetooth/peripheral_csc/src/main.c
+++ b/samples/bluetooth/peripheral_csc/src/main.c
@@ -14,7 +14,7 @@
 #include <zephyr/random/rand32.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/peripheral_dis/src/main.c b/samples/bluetooth/peripheral_dis/src/main.c
index 589c8c333b..bb690315f9 100644
--- a/samples/bluetooth/peripheral_dis/src/main.c
+++ b/samples/bluetooth/peripheral_dis/src/main.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/peripheral_esp/src/main.c b/samples/bluetooth/peripheral_esp/src/main.c
index 42477ee124..20ad40be48 100644
--- a/samples/bluetooth/peripheral_esp/src/main.c
+++ b/samples/bluetooth/peripheral_esp/src/main.c
@@ -13,7 +13,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/peripheral_gatt_write/src/peripheral_gatt_write.c b/samples/bluetooth/peripheral_gatt_write/src/peripheral_gatt_write.c
index 8d9404f483..7dcae853f0 100644
--- a/samples/bluetooth/peripheral_gatt_write/src/peripheral_gatt_write.c
+++ b/samples/bluetooth/peripheral_gatt_write/src/peripheral_gatt_write.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/samples/bluetooth/peripheral_hids/src/hog.c b/samples/bluetooth/peripheral_hids/src/hog.c
index a0f15b34ff..f4d53ce8d9 100644
--- a/samples/bluetooth/peripheral_hids/src/hog.c
+++ b/samples/bluetooth/peripheral_hids/src/hog.c
@@ -14,7 +14,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/peripheral_hids/src/main.c b/samples/bluetooth/peripheral_hids/src/main.c
index 41959d9644..81b15aeaeb 100644
--- a/samples/bluetooth/peripheral_hids/src/main.c
+++ b/samples/bluetooth/peripheral_hids/src/main.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/settings/settings.h>
 
diff --git a/samples/bluetooth/peripheral_hr/src/main.c b/samples/bluetooth/peripheral_hr/src/main.c
index b946d91a5d..9dbd5225c7 100644
--- a/samples/bluetooth/peripheral_hr/src/main.c
+++ b/samples/bluetooth/peripheral_hr/src/main.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/peripheral_ht/src/hts.c b/samples/bluetooth/peripheral_ht/src/hts.c
index a65e00ed5d..56ea00646a 100644
--- a/samples/bluetooth/peripheral_ht/src/hts.c
+++ b/samples/bluetooth/peripheral_ht/src/hts.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/samples/bluetooth/peripheral_ht/src/main.c b/samples/bluetooth/peripheral_ht/src/main.c
index 937f36ffa5..8f5a71a5ba 100644
--- a/samples/bluetooth/peripheral_ht/src/main.c
+++ b/samples/bluetooth/peripheral_ht/src/main.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/peripheral_iso/src/main.c b/samples/bluetooth/peripheral_iso/src/main.c
index 0eed0a77ea..dc75f86799 100644
--- a/samples/bluetooth/peripheral_iso/src/main.c
+++ b/samples/bluetooth/peripheral_iso/src/main.c
@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/peripheral_ots/src/main.c b/samples/bluetooth/peripheral_ots/src/main.c
index 9877c2a38f..a2ebd2c849 100644
--- a/samples/bluetooth/peripheral_ots/src/main.c
+++ b/samples/bluetooth/peripheral_ots/src/main.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <zephyr/sys/printk.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
diff --git a/samples/bluetooth/peripheral_sc_only/src/main.c b/samples/bluetooth/peripheral_sc_only/src/main.c
index 5914125423..4d8c7f8ff8 100644
--- a/samples/bluetooth/peripheral_sc_only/src/main.c
+++ b/samples/bluetooth/peripheral_sc_only/src/main.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/st_ble_sensor/src/button_svc.c b/samples/bluetooth/st_ble_sensor/src/button_svc.c
index 70cf3d0d14..72a5e18f7b 100644
--- a/samples/bluetooth/st_ble_sensor/src/button_svc.c
+++ b/samples/bluetooth/st_ble_sensor/src/button_svc.c
@@ -10,7 +10,7 @@
 
 #include "button_svc.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/samples/bluetooth/st_ble_sensor/src/led_svc.c b/samples/bluetooth/st_ble_sensor/src/led_svc.c
index 64001e17e6..01d0017872 100644
--- a/samples/bluetooth/st_ble_sensor/src/led_svc.c
+++ b/samples/bluetooth/st_ble_sensor/src/led_svc.c
@@ -10,7 +10,7 @@
 
 #include "led_svc.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/logging/log.h>
 
diff --git a/samples/bluetooth/st_ble_sensor/src/main.c b/samples/bluetooth/st_ble_sensor/src/main.c
index e6eacad12b..493256f6c1 100644
--- a/samples/bluetooth/st_ble_sensor/src/main.c
+++ b/samples/bluetooth/st_ble_sensor/src/main.c
@@ -13,7 +13,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/logging/log.h>
 
diff --git a/samples/bluetooth/unicast_audio_client/src/main.c b/samples/bluetooth/unicast_audio_client/src/main.c
index d6d89ec09b..267dd608c4 100644
--- a/samples/bluetooth/unicast_audio_client/src/main.c
+++ b/samples/bluetooth/unicast_audio_client/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/samples/bluetooth/unicast_audio_server/src/main.c b/samples/bluetooth/unicast_audio_server/src/main.c
index 4e15139574..6e5816a624 100644
--- a/samples/bluetooth/unicast_audio_server/src/main.c
+++ b/samples/bluetooth/unicast_audio_server/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/samples/boards/96b_argonkey/microphone/src/main.c b/samples/boards/96b_argonkey/microphone/src/main.c
index 4a2f5a8711..75da366bb3 100644
--- a/samples/boards/96b_argonkey/microphone/src/main.c
+++ b/samples/boards/96b_argonkey/microphone/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/boards/96b_argonkey/sensors/src/main.c b/samples/boards/96b_argonkey/sensors/src/main.c
index c3a589749b..c929a7817a 100644
--- a/samples/boards/96b_argonkey/sensors/src/main.c
+++ b/samples/boards/96b_argonkey/sensors/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/boards/arc_secure_services/src/main.c b/samples/boards/arc_secure_services/src/main.c
index ac7b9bef5f..31c8f53f1d 100644
--- a/samples/boards/arc_secure_services/src/main.c
+++ b/samples/boards/arc_secure_services/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/devicetree.h>
 
diff --git a/samples/boards/bbc_microbit/display/src/main.c b/samples/boards/bbc_microbit/display/src/main.c
index 48fcf7df3d..6b44e86e76 100644
--- a/samples/boards/bbc_microbit/display/src/main.c
+++ b/samples/boards/bbc_microbit/display/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/device.h>
diff --git a/samples/boards/bbc_microbit/line_follower_robot/src/main.c b/samples/boards/bbc_microbit/line_follower_robot/src/main.c
index 78700752cf..76f2f774bd 100644
--- a/samples/boards/bbc_microbit/line_follower_robot/src/main.c
+++ b/samples/boards/bbc_microbit/line_follower_robot/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
diff --git a/samples/boards/bbc_microbit/pong/src/ble.c b/samples/boards/bbc_microbit/pong/src/ble.c
index 3c46e2cd1c..96993c3dc3 100644
--- a/samples/boards/bbc_microbit/pong/src/ble.c
+++ b/samples/boards/bbc_microbit/pong/src/ble.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/device.h>
diff --git a/samples/boards/bbc_microbit/pong/src/main.c b/samples/boards/bbc_microbit/pong/src/main.c
index 21b83530ec..78af921ea4 100644
--- a/samples/boards/bbc_microbit/pong/src/main.c
+++ b/samples/boards/bbc_microbit/pong/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/device.h>
diff --git a/samples/boards/bbc_microbit/sound/src/main.c b/samples/boards/bbc_microbit/sound/src/main.c
index a0198de0cb..13ff462c0e 100644
--- a/samples/boards/bbc_microbit/sound/src/main.c
+++ b/samples/boards/bbc_microbit/sound/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/pwm.h>
diff --git a/samples/boards/esp32/flash_encryption/src/main.c b/samples/boards/esp32/flash_encryption/src/main.c
index d707e165ea..14a8dba5ed 100644
--- a/samples/boards/esp32/flash_encryption/src/main.c
+++ b/samples/boards/esp32/flash_encryption/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/flash.h>
diff --git a/samples/boards/esp32/spiram_test/src/main.c b/samples/boards/esp32/spiram_test/src/main.c
index a07e9490ce..8f2365c794 100644
--- a/samples/boards/esp32/spiram_test/src/main.c
+++ b/samples/boards/esp32/spiram_test/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <soc/soc_memory_layout.h>
 
diff --git a/samples/boards/esp32/wifi_station/src/main.c b/samples/boards/esp32/wifi_station/src/main.c
index ffc7cf3361..cc86127e58 100644
--- a/samples/boards/esp32/wifi_station/src/main.c
+++ b/samples/boards/esp32/wifi_station/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <esp_wifi.h>
 #include <esp_timer.h>
diff --git a/samples/boards/google_kukui/src/main.c b/samples/boards/google_kukui/src/main.c
index c76ab1d6d9..8f1e6cde60 100644
--- a/samples/boards/google_kukui/src/main.c
+++ b/samples/boards/google_kukui/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 void main(void)
diff --git a/samples/boards/mec15xxevb_assy6853/power_management/src/power_mgmt.c b/samples/boards/mec15xxevb_assy6853/power_management/src/power_mgmt.c
index 159ef5c7e2..df898394b7 100644
--- a/samples/boards/mec15xxevb_assy6853/power_management/src/power_mgmt.c
+++ b/samples/boards/mec15xxevb_assy6853/power_management/src/power_mgmt.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <soc.h>
 #include <zephyr/pm/pm.h>
diff --git a/samples/boards/mimxrt1060_evk/system_off/src/main.c b/samples/boards/mimxrt1060_evk/system_off/src/main.c
index ee8304071d..ab0d118bdc 100644
--- a/samples/boards/mimxrt1060_evk/system_off/src/main.c
+++ b/samples/boards/mimxrt1060_evk/system_off/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/counter.h>
diff --git a/samples/boards/nrf/battery/src/battery.c b/samples/boards/nrf/battery/src/battery.c
index 167a0ada3a..ef844c697b 100644
--- a/samples/boards/nrf/battery/src/battery.c
+++ b/samples/boards/nrf/battery/src/battery.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/adc.h>
diff --git a/samples/boards/nrf/battery/src/main.c b/samples/boards/nrf/battery/src/main.c
index aa3d28e5a6..aefeea8a1e 100644
--- a/samples/boards/nrf/battery/src/main.c
+++ b/samples/boards/nrf/battery/src/main.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "battery.h"
 
 /** A discharge curve specific to the power source. */
diff --git a/samples/boards/nrf/clock_skew/src/main.c b/samples/boards/nrf/clock_skew/src/main.c
index cd12e0dcb3..2bae7961df 100644
--- a/samples/boards/nrf/clock_skew/src/main.c
+++ b/samples/boards/nrf/clock_skew/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/timeutil.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
diff --git a/samples/boards/nrf/ieee802154/802154_rpmsg/src/main.c b/samples/boards/nrf/ieee802154/802154_rpmsg/src/main.c
index c69eec650f..814489b00e 100644
--- a/samples/boards/nrf/ieee802154/802154_rpmsg/src/main.c
+++ b/samples/boards/nrf/ieee802154/802154_rpmsg/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/sys/__assert.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <nrf_802154_serialization_error.h>
 
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/smp_svr.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/smp_svr.c
index 321771d839..7f0f7fa01d 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/smp_svr.c
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/smp_svr.c
@@ -14,7 +14,7 @@
 #include <zephyr/stats/stats.h>
 #include <stdlib.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef CONFIG_MCUMGR_CMD_IMG_MGMT
 #include "img_mgmt/img_mgmt.h"
diff --git a/samples/boards/nrf/nrf53_sync_rtc/net/src/main.c b/samples/boards/nrf/nrf53_sync_rtc/net/src/main.c
index ac84ca49f7..b25e8ee33e 100644
--- a/samples/boards/nrf/nrf53_sync_rtc/net/src/main.c
+++ b/samples/boards/nrf/nrf53_sync_rtc/net/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/mbox.h>
 #include <hal/nrf_ipc.h>
 #include <zephyr/drivers/ipm.h>
diff --git a/samples/boards/nrf/nrf53_sync_rtc/src/main.c b/samples/boards/nrf/nrf53_sync_rtc/src/main.c
index f0e3ac6994..6bb941602c 100644
--- a/samples/boards/nrf/nrf53_sync_rtc/src/main.c
+++ b/samples/boards/nrf/nrf53_sync_rtc/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <hal/nrf_ipc.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/boards/nrf/nrf_led_matrix/src/main.c b/samples/boards/nrf/nrf_led_matrix/src/main.c
index c87a50e6b5..fa45b2798e 100644
--- a/samples/boards/nrf/nrf_led_matrix/src/main.c
+++ b/samples/boards/nrf/nrf_led_matrix/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/display.h>
 #include <string.h>
diff --git a/samples/boards/nrf/nrfx/src/main.c b/samples/boards/nrf/nrfx/src/main.c
index 472efb8b77..1330469bf9 100644
--- a/samples/boards/nrf/nrfx/src/main.c
+++ b/samples/boards/nrf/nrfx/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <nrfx_gpiote.h>
 #include <helpers/nrfx_gppi.h>
diff --git a/samples/boards/nrf/nrfx_prs/src/main.c b/samples/boards/nrf/nrfx_prs/src/main.c
index 2d494a47fd..9317da20af 100644
--- a/samples/boards/nrf/nrfx_prs/src/main.c
+++ b/samples/boards/nrf/nrfx_prs/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/spi.h>
 #include <zephyr/drivers/pinctrl.h>
diff --git a/samples/boards/nrf/s2ram/src/main.c b/samples/boards/nrf/s2ram/src/main.c
index cd04cd0add..d53e501789 100644
--- a/samples/boards/nrf/s2ram/src/main.c
+++ b/samples/boards/nrf/s2ram/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/pm/pm.h>
 #include <zephyr/pm/policy.h>
diff --git a/samples/boards/nrf/system_off/src/main.c b/samples/boards/nrf/system_off/src/main.c
index 828901e40b..5f99e51de0 100644
--- a/samples/boards/nrf/system_off/src/main.c
+++ b/samples/boards/nrf/system_off/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
 #include <zephyr/pm/pm.h>
diff --git a/samples/boards/nrf/system_off/src/retained.c b/samples/boards/nrf/system_off/src/retained.c
index c45bffbb00..f389b50cc2 100644
--- a/samples/boards/nrf/system_off/src/retained.c
+++ b/samples/boards/nrf/system_off/src/retained.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/crc.h>
diff --git a/samples/boards/reel_board/mesh_badge/src/main.c b/samples/boards/reel_board/mesh_badge/src/main.c
index e7762bb9b6..f0debadf1a 100644
--- a/samples/boards/reel_board/mesh_badge/src/main.c
+++ b/samples/boards/reel_board/mesh_badge/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <string.h>
diff --git a/samples/boards/reel_board/mesh_badge/src/mesh.c b/samples/boards/reel_board/mesh_badge/src/mesh.c
index d3ad655cc6..66be367c20 100644
--- a/samples/boards/reel_board/mesh_badge/src/mesh.c
+++ b/samples/boards/reel_board/mesh_badge/src/mesh.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <zephyr/sys/printk.h>
 
diff --git a/samples/boards/reel_board/mesh_badge/src/periphs.c b/samples/boards/reel_board/mesh_badge/src/periphs.c
index d8e4270806..3aef5fe6a3 100644
--- a/samples/boards/reel_board/mesh_badge/src/periphs.c
+++ b/samples/boards/reel_board/mesh_badge/src/periphs.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/sensor.h>
 #include "board.h"
diff --git a/samples/boards/reel_board/mesh_badge/src/reel_board.c b/samples/boards/reel_board/mesh_badge/src/reel_board.c
index 73eda84f9a..b33377a8ff 100644
--- a/samples/boards/reel_board/mesh_badge/src/reel_board.c
+++ b/samples/boards/reel_board/mesh_badge/src/reel_board.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/boards/sensortile_box/src/main.c b/samples/boards/sensortile_box/src/main.c
index 2222a16ae1..e066c9c8b2 100644
--- a/samples/boards/sensortile_box/src/main.c
+++ b/samples/boards/sensortile_box/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/boards/stm32/backup_sram/src/main.c b/samples/boards/stm32/backup_sram/src/main.c
index 608fde6169..6e70a30fbf 100644
--- a/samples/boards/stm32/backup_sram/src/main.c
+++ b/samples/boards/stm32/backup_sram/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 /** Value stored in backup SRAM. */
diff --git a/samples/boards/stm32/ccm/src/main.c b/samples/boards/stm32/ccm/src/main.c
index 37c6623c4f..f3de6ad1fe 100644
--- a/samples/boards/stm32/ccm/src/main.c
+++ b/samples/boards/stm32/ccm/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/samples/boards/stm32/h7_dual_core/src/main.c b/samples/boards/stm32/h7_dual_core/src/main.c
index 385d3e9abf..4c9622e656 100644
--- a/samples/boards/stm32/h7_dual_core/src/main.c
+++ b/samples/boards/stm32/h7_dual_core/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/ipm.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/boards/stm32/power_mgmt/blinky/src/main.c b/samples/boards/stm32/power_mgmt/blinky/src/main.c
index 5fd08f5be0..768165cf83 100644
--- a/samples/boards/stm32/power_mgmt/blinky/src/main.c
+++ b/samples/boards/stm32/power_mgmt/blinky/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/boards/stm32/power_mgmt/serial_wakeup/src/main.c b/samples/boards/stm32/power_mgmt/serial_wakeup/src/main.c
index 8d749c338c..8020e49412 100644
--- a/samples/boards/stm32/power_mgmt/serial_wakeup/src/main.c
+++ b/samples/boards/stm32/power_mgmt/serial_wakeup/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/devicetree.h>
diff --git a/samples/boards/stm32/usbc/sink/src/main.c b/samples/boards/stm32/usbc/sink/src/main.c
index b607fd0083..49c6e43fa9 100644
--- a/samples/boards/stm32/usbc/sink/src/main.c
+++ b/samples/boards/stm32/usbc/sink/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/boards/stm32/usbc/sink/src/stm32g081b_eval_board.c b/samples/boards/stm32/usbc/sink/src/stm32g081b_eval_board.c
index 396dea3aa4..a872c55c8c 100644
--- a/samples/boards/stm32/usbc/sink/src/stm32g081b_eval_board.c
+++ b/samples/boards/stm32/usbc/sink/src/stm32g081b_eval_board.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/boards/stm32/usbc/sink/src/usbc_snk.c b/samples/boards/stm32/usbc/sink/src/usbc_snk.c
index 23e8b0eb49..494dfb83eb 100644
--- a/samples/boards/stm32/usbc/sink/src/usbc_snk.c
+++ b/samples/boards/stm32/usbc/sink/src/usbc_snk.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/smf.h>
diff --git a/samples/boards/ti/cc13x2_cc26x2/system_off/src/ext_flash.c b/samples/boards/ti/cc13x2_cc26x2/system_off/src/ext_flash.c
index 180b7d3312..4ee91088ed 100644
--- a/samples/boards/ti/cc13x2_cc26x2/system_off/src/ext_flash.c
+++ b/samples/boards/ti/cc13x2_cc26x2/system_off/src/ext_flash.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 
diff --git a/samples/boards/ti/cc13x2_cc26x2/system_off/src/main.c b/samples/boards/ti/cc13x2_cc26x2/system_off/src/main.c
index 35672ae189..a22f2cf088 100644
--- a/samples/boards/ti/cc13x2_cc26x2/system_off/src/main.c
+++ b/samples/boards/ti/cc13x2_cc26x2/system_off/src/main.c
@@ -6,7 +6,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/boards/up_squared/gpio_counter/src/main.c b/samples/boards/up_squared/gpio_counter/src/main.c
index 1c995f2f95..b44dd5112b 100644
--- a/samples/boards/up_squared/gpio_counter/src/main.c
+++ b/samples/boards/up_squared/gpio_counter/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <board.h>
 #include <soc.h>
diff --git a/samples/compression/lz4/src/main.c b/samples/compression/lz4/src/main.c
index d348e9f740..e77acc2c95 100644
--- a/samples/compression/lz4/src/main.c
+++ b/samples/compression/lz4/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <stdlib.h>
 #include "lz4.h"
diff --git a/samples/drivers/audio/dmic/src/main.c b/samples/drivers/audio/dmic/src/main.c
index 3f9e1c2374..7c9b89102e 100644
--- a/samples/drivers/audio/dmic/src/main.c
+++ b/samples/drivers/audio/dmic/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/audio/dmic.h>
 
 #include <zephyr/logging/log.h>
diff --git a/samples/drivers/clock_control_litex/src/main.c b/samples/drivers/clock_control_litex/src/main.c
index dfbd817e99..8e63bbe1fe 100644
--- a/samples/drivers/clock_control_litex/src/main.c
+++ b/samples/drivers/clock_control_litex/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/clock_control.h>
diff --git a/samples/drivers/counter/alarm/src/main.c b/samples/drivers/counter/alarm/src/main.c
index c12bf2e93e..32486a76d9 100644
--- a/samples/drivers/counter/alarm/src/main.c
+++ b/samples/drivers/counter/alarm/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/counter.h>
diff --git a/samples/drivers/counter/maxim_ds3231/src/main.c b/samples/drivers/counter/maxim_ds3231/src/main.c
index e58a0e3eab..b598248f05 100644
--- a/samples/drivers/counter/maxim_ds3231/src/main.c
+++ b/samples/drivers/counter/maxim_ds3231/src/main.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/counter.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/drivers/crypto/src/main.c b/samples/drivers/crypto/src/main.c
index af3c987cfd..2db2b9308b 100644
--- a/samples/drivers/crypto/src/main.c
+++ b/samples/drivers/crypto/src/main.c
@@ -9,7 +9,7 @@
  */
 
 #include <zephyr/device.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <zephyr/crypto/crypto.h>
 
diff --git a/samples/drivers/dac/src/main.c b/samples/drivers/dac/src/main.c
index 393f2b854c..7fa5052196 100644
--- a/samples/drivers/dac/src/main.c
+++ b/samples/drivers/dac/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/dac.h>
 
diff --git a/samples/drivers/display/src/main.c b/samples/drivers/display/src/main.c
index b1268be2e1..901f22c7a0 100644
--- a/samples/drivers/display/src/main.c
+++ b/samples/drivers/display/src/main.c
@@ -10,7 +10,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(sample, LOG_LEVEL_INF);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/display.h>
 
diff --git a/samples/drivers/eeprom/src/main.c b/samples/drivers/eeprom/src/main.c
index 8462f48388..0298bf949e 100644
--- a/samples/drivers/eeprom/src/main.c
+++ b/samples/drivers/eeprom/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/eeprom.h>
 #include <zephyr/device.h>
diff --git a/samples/drivers/espi/src/main.c b/samples/drivers/espi/src/main.c
index 15cd5f7289..c22494b8b3 100644
--- a/samples/drivers/espi/src/main.c
+++ b/samples/drivers/espi/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <soc.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/drivers/flash_shell/src/main.c b/samples/drivers/flash_shell/src/main.c
index 3c20dc0036..c581a22e12 100644
--- a/samples/drivers/flash_shell/src/main.c
+++ b/samples/drivers/flash_shell/src/main.c
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
diff --git a/samples/drivers/fpga/fpga_controller/src/main.c b/samples/drivers/fpga/fpga_controller/src/main.c
index 03e4403d01..e1d79d126a 100644
--- a/samples/drivers/fpga/fpga_controller/src/main.c
+++ b/samples/drivers/fpga/fpga_controller/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/device.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/drivers/i2c_fujitsu_fram/src/main.c b/samples/drivers/i2c_fujitsu_fram/src/main.c
index 6792375a45..96f06e389e 100644
--- a/samples/drivers/i2c_fujitsu_fram/src/main.c
+++ b/samples/drivers/i2c_fujitsu_fram/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/i2c.h>
diff --git a/samples/drivers/i2s/echo/src/codec.c b/samples/drivers/i2s/echo/src/codec.c
index cbbdbf73a4..bcbf8ac7c0 100644
--- a/samples/drivers/i2s/echo/src/codec.c
+++ b/samples/drivers/i2s/echo/src/codec.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "codec.h"
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/i2c.h>
diff --git a/samples/drivers/i2s/echo/src/main.c b/samples/drivers/i2s/echo/src/main.c
index 19e703fb7e..c642b33196 100644
--- a/samples/drivers/i2s/echo/src/main.c
+++ b/samples/drivers/i2s/echo/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "codec.h"
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/i2s.h>
diff --git a/samples/drivers/i2s/litex/src/main.c b/samples/drivers/i2s/litex/src/main.c
index 6de7f0ebd7..ccd1ae19e3 100644
--- a/samples/drivers/i2s/litex/src/main.c
+++ b/samples/drivers/i2s/litex/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/i2s.h>
 #include <stdlib.h>
diff --git a/samples/drivers/ipm/ipm_esp32/ipm_esp32_net/src/main.c b/samples/drivers/ipm/ipm_esp32/ipm_esp32_net/src/main.c
index c01951eec3..a57940ad42 100644
--- a/samples/drivers/ipm/ipm_esp32/ipm_esp32_net/src/main.c
+++ b/samples/drivers/ipm/ipm_esp32/ipm_esp32_net/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/ipm.h>
 #include <zephyr/device.h>
diff --git a/samples/drivers/ipm/ipm_esp32/src/main.c b/samples/drivers/ipm/ipm_esp32/src/main.c
index aba758fa32..e144697882 100644
--- a/samples/drivers/ipm/ipm_esp32/src/main.c
+++ b/samples/drivers/ipm/ipm_esp32/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/ipm.h>
 #include <zephyr/device.h>
diff --git a/samples/drivers/ipm/ipm_imx/src/main.c b/samples/drivers/ipm/ipm_imx/src/main.c
index ae7be58919..629752fcc8 100644
--- a/samples/drivers/ipm/ipm_imx/src/main.c
+++ b/samples/drivers/ipm/ipm_imx/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/ipm.h>
diff --git a/samples/drivers/ipm/ipm_mcux/remote/src/main_remote.c b/samples/drivers/ipm/ipm_mcux/remote/src/main_remote.c
index 0aecde7425..1050cc613b 100644
--- a/samples/drivers/ipm/ipm_mcux/remote/src/main_remote.c
+++ b/samples/drivers/ipm/ipm_mcux/remote/src/main_remote.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/ipm.h>
diff --git a/samples/drivers/ipm/ipm_mcux/src/main_master.c b/samples/drivers/ipm/ipm_mcux/src/main_master.c
index 87b0cb041e..3f32cfb3cc 100644
--- a/samples/drivers/ipm/ipm_mcux/src/main_master.c
+++ b/samples/drivers/ipm/ipm_mcux/src/main_master.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/ipm.h>
diff --git a/samples/drivers/ipm/ipm_mhu_dual_core/src/main.c b/samples/drivers/ipm/ipm_mhu_dual_core/src/main.c
index 30a2b45da3..bcc1c25f8d 100644
--- a/samples/drivers/ipm/ipm_mhu_dual_core/src/main.c
+++ b/samples/drivers/ipm/ipm_mhu_dual_core/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/ipm.h>
 
diff --git a/samples/drivers/jesd216/src/main.c b/samples/drivers/jesd216/src/main.c
index 72edcbc8d0..7a3c12c61c 100644
--- a/samples/drivers/jesd216/src/main.c
+++ b/samples/drivers/jesd216/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/flash.h>
 #include <jesd216.h>
diff --git a/samples/drivers/kscan/src/main.c b/samples/drivers/kscan/src/main.c
index a2a320ccab..1bf1c8cc85 100644
--- a/samples/drivers/kscan/src/main.c
+++ b/samples/drivers/kscan/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/gpio.h>
 #include <soc.h>
diff --git a/samples/drivers/kscan_touch/src/main.c b/samples/drivers/kscan_touch/src/main.c
index 7c1034718b..a9e34a4548 100644
--- a/samples/drivers/kscan_touch/src/main.c
+++ b/samples/drivers/kscan_touch/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/gpio.h>
 #include <soc.h>
diff --git a/samples/drivers/lcd_hd44780/src/main.c b/samples/drivers/lcd_hd44780/src/main.c
index bdec29f4d5..203987f6da 100644
--- a/samples/drivers/lcd_hd44780/src/main.c
+++ b/samples/drivers/lcd_hd44780/src/main.c
@@ -64,7 +64,7 @@
  *	--------------------
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/drivers/led_apa102/src/main.c b/samples/drivers/led_apa102/src/main.c
index 85f6f75983..2da4ba3e2b 100644
--- a/samples/drivers/led_apa102/src/main.c
+++ b/samples/drivers/led_apa102/src/main.c
@@ -12,7 +12,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/led_strip.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/spi.h>
diff --git a/samples/drivers/led_apa102c_bitbang/src/main.c b/samples/drivers/led_apa102c_bitbang/src/main.c
index c94e7716de..db21d5f288 100644
--- a/samples/drivers/led_apa102c_bitbang/src/main.c
+++ b/samples/drivers/led_apa102c_bitbang/src/main.c
@@ -16,7 +16,7 @@
  * Protect your eyes and do not look directly into those LEDs.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/sys/printk.h>
 
diff --git a/samples/drivers/led_lp3943/src/main.c b/samples/drivers/led_lp3943/src/main.c
index 6aba86b05f..4fa7aa82cc 100644
--- a/samples/drivers/led_lp3943/src/main.c
+++ b/samples/drivers/led_lp3943/src/main.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <zephyr/drivers/led.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/samples/drivers/led_lp503x/src/main.c b/samples/drivers/led_lp503x/src/main.c
index f34131c2df..f11dce9575 100644
--- a/samples/drivers/led_lp503x/src/main.c
+++ b/samples/drivers/led_lp503x/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/drivers/led.h>
 #include <zephyr/drivers/led/lp503x.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/samples/drivers/led_lp5562/src/main.c b/samples/drivers/led_lp5562/src/main.c
index 9dc5b12a6c..148e574911 100644
--- a/samples/drivers/led_lp5562/src/main.c
+++ b/samples/drivers/led_lp5562/src/main.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <zephyr/drivers/led.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LOG_LEVEL 4
 #include <zephyr/logging/log.h>
diff --git a/samples/drivers/led_lpd8806/src/main.c b/samples/drivers/led_lpd8806/src/main.c
index 6f97d3caa4..dbcbd580eb 100644
--- a/samples/drivers/led_lpd8806/src/main.c
+++ b/samples/drivers/led_lpd8806/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/led_strip.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/spi.h>
diff --git a/samples/drivers/led_pca9633/src/main.c b/samples/drivers/led_pca9633/src/main.c
index 5e68ac87a3..2cde3dce1f 100644
--- a/samples/drivers/led_pca9633/src/main.c
+++ b/samples/drivers/led_pca9633/src/main.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <zephyr/drivers/led.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/samples/drivers/led_pwm/src/main.c b/samples/drivers/led_pwm/src/main.c
index e13148985e..04e2f02980 100644
--- a/samples/drivers/led_pwm/src/main.c
+++ b/samples/drivers/led_pwm/src/main.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 #include <zephyr/drivers/led.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main, CONFIG_LOG_DEFAULT_LEVEL);
diff --git a/samples/drivers/led_sx1509b_intensity/src/main.c b/samples/drivers/led_sx1509b_intensity/src/main.c
index 4efc122dac..95b3efe202 100644
--- a/samples/drivers/led_sx1509b_intensity/src/main.c
+++ b/samples/drivers/led_sx1509b_intensity/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/gpio/gpio_sx1509b.h>
diff --git a/samples/drivers/led_ws2812/src/main.c b/samples/drivers/led_ws2812/src/main.c
index 0b1859e42e..578b56a85c 100644
--- a/samples/drivers/led_ws2812/src/main.c
+++ b/samples/drivers/led_ws2812/src/main.c
@@ -12,7 +12,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/led_strip.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/spi.h>
diff --git a/samples/drivers/lora/receive/src/main.c b/samples/drivers/lora/receive/src/main.c
index ef496ad565..05e1e411ec 100644
--- a/samples/drivers/lora/receive/src/main.c
+++ b/samples/drivers/lora/receive/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/lora.h>
 #include <errno.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define DEFAULT_RADIO_NODE DT_ALIAS(lora0)
 BUILD_ASSERT(DT_NODE_HAS_STATUS(DEFAULT_RADIO_NODE, okay),
diff --git a/samples/drivers/lora/send/src/main.c b/samples/drivers/lora/send/src/main.c
index 53536e9cda..b8b5739d8f 100644
--- a/samples/drivers/lora/send/src/main.c
+++ b/samples/drivers/lora/send/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/lora.h>
 #include <errno.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define DEFAULT_RADIO_NODE DT_ALIAS(lora0)
 BUILD_ASSERT(DT_NODE_HAS_STATUS(DEFAULT_RADIO_NODE, okay),
diff --git a/samples/drivers/mbox/remote/src/main.c b/samples/drivers/mbox/remote/src/main.c
index 2f4218615d..21865b118e 100644
--- a/samples/drivers/mbox/remote/src/main.c
+++ b/samples/drivers/mbox/remote/src/main.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/mbox.h>
 
 #define TX_ID (0)
diff --git a/samples/drivers/mbox/src/main.c b/samples/drivers/mbox/src/main.c
index 30a3b36939..d78720d852 100644
--- a/samples/drivers/mbox/src/main.c
+++ b/samples/drivers/mbox/src/main.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/mbox.h>
 
 #define TX_ID (1)
diff --git a/samples/drivers/misc/ft800/src/main.c b/samples/drivers/misc/ft800/src/main.c
index 81714bf917..337ed68c47 100644
--- a/samples/drivers/misc/ft800/src/main.c
+++ b/samples/drivers/misc/ft800/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/drivers/misc/ft8xx/ft8xx.h>
 #include <zephyr/drivers/misc/ft8xx/ft8xx_copro.h>
diff --git a/samples/drivers/misc/grove_display/src/main.c b/samples/drivers/misc/grove_display/src/main.c
index 81e9f26d84..ef4c191e84 100644
--- a/samples/drivers/misc/grove_display/src/main.c
+++ b/samples/drivers/misc/grove_display/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/sys/printk.h>
 
diff --git a/samples/drivers/peci/src/main.c b/samples/drivers/peci/src/main.c
index 21b1d5ab8d..a9c7b0ef46 100644
--- a/samples/drivers/peci/src/main.c
+++ b/samples/drivers/peci/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/peci.h>
 #include <soc.h>
diff --git a/samples/drivers/ps2/src/main.c b/samples/drivers/ps2/src/main.c
index 3f5a911ed8..acc3faa0b3 100644
--- a/samples/drivers/ps2/src/main.c
+++ b/samples/drivers/ps2/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/ps2.h>
 #include <soc.h>
diff --git a/samples/drivers/soc_flash_nrf/src/main.c b/samples/drivers/soc_flash_nrf/src/main.c
index b5e3b65476..44b74f35cd 100644
--- a/samples/drivers/soc_flash_nrf/src/main.c
+++ b/samples/drivers/soc_flash_nrf/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/storage/flash_map.h>
 #include <zephyr/device.h>
diff --git a/samples/drivers/spi_bitbang/src/main.c b/samples/drivers/spi_bitbang/src/main.c
index e7b60da740..d566ac4565 100644
--- a/samples/drivers/spi_bitbang/src/main.c
+++ b/samples/drivers/spi_bitbang/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(app, LOG_LEVEL_INF);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <stdio.h>
diff --git a/samples/drivers/spi_flash/src/main.c b/samples/drivers/spi_flash/src/main.c
index 8a538d613e..381e3971a6 100644
--- a/samples/drivers/spi_flash/src/main.c
+++ b/samples/drivers/spi_flash/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
diff --git a/samples/drivers/spi_flash_at45/src/main.c b/samples/drivers/spi_flash_at45/src/main.c
index 8aa940eb4f..186ce48072 100644
--- a/samples/drivers/spi_flash_at45/src/main.c
+++ b/samples/drivers/spi_flash_at45/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/pm/device.h>
diff --git a/samples/drivers/spi_fujitsu_fram/src/main.c b/samples/drivers/spi_fujitsu_fram/src/main.c
index 67fea7f5da..e9b018d85a 100644
--- a/samples/drivers/spi_fujitsu_fram/src/main.c
+++ b/samples/drivers/spi_fujitsu_fram/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/spi.h>
diff --git a/samples/drivers/uart/echo_bot/src/main.c b/samples/drivers/uart/echo_bot/src/main.c
index 6b4384b364..55623a3248 100644
--- a/samples/drivers/uart/echo_bot/src/main.c
+++ b/samples/drivers/uart/echo_bot/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
 
diff --git a/samples/drivers/w1/scanner/src/main.c b/samples/drivers/w1/scanner/src/main.c
index 310615aaad..eff298defd 100644
--- a/samples/drivers/w1/scanner/src/main.c
+++ b/samples/drivers/w1/scanner/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/w1.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 LOG_MODULE_REGISTER(main, CONFIG_LOG_DEFAULT_LEVEL);
 
diff --git a/samples/drivers/watchdog/src/main.c b/samples/drivers/watchdog/src/main.c
index 93464f1a04..0db6b1f78e 100644
--- a/samples/drivers/watchdog/src/main.c
+++ b/samples/drivers/watchdog/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/watchdog.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/hello_world/src/main.c b/samples/hello_world/src/main.c
index 8676d8940b..9a90c6a6a0 100644
--- a/samples/hello_world/src/main.c
+++ b/samples/hello_world/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 void main(void)
 {
diff --git a/samples/kernel/condition_variables/condvar/src/main.c b/samples/kernel/condition_variables/condvar/src/main.c
index 82306b17a4..beacff4229 100644
--- a/samples/kernel/condition_variables/condvar/src/main.c
+++ b/samples/kernel/condition_variables/condvar/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/sys/arch_interface.h>
 
diff --git a/samples/kernel/condition_variables/simple/src/main.c b/samples/kernel/condition_variables/simple/src/main.c
index bdb5f2bb3c..e25deac58b 100644
--- a/samples/kernel/condition_variables/simple/src/main.c
+++ b/samples/kernel/condition_variables/simple/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/sys/arch_interface.h>
 
diff --git a/samples/kernel/metairq_dispatch/src/main.c b/samples/kernel/metairq_dispatch/src/main.c
index 470b38bce9..a767cb8d76 100644
--- a/samples/kernel/metairq_dispatch/src/main.c
+++ b/samples/kernel/metairq_dispatch/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "msgdev.h"
 
 #include <zephyr/logging/log.h>
diff --git a/samples/modules/canopennode/src/main.c b/samples/modules/canopennode/src/main.c
index d02476e9a9..5a35ce6db5 100644
--- a/samples/modules/canopennode/src/main.c
+++ b/samples/modules/canopennode/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/settings/settings.h>
diff --git a/samples/modules/chre/src/main.cpp b/samples/modules/chre/src/main.cpp
index ced8210817..ec9ee1983f 100644
--- a/samples/modules/chre/src/main.cpp
+++ b/samples/modules/chre/src/main.cpp
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include "apps.hpp"
diff --git a/samples/modules/nanopb/src/main.c b/samples/modules/nanopb/src/main.c
index 2aab4f1c8c..7ddb67ccd8 100644
--- a/samples/modules/nanopb/src/main.c
+++ b/samples/modules/nanopb/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <pb_encode.h>
diff --git a/samples/modules/sof/src/main.c b/samples/modules/sof/src/main.c
index 87f8582075..304a18f027 100644
--- a/samples/modules/sof/src/main.c
+++ b/samples/modules/sof/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);
diff --git a/samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.cpp b/samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.cpp
index a0b5561c44..894cba004e 100644
--- a/samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.cpp
+++ b/samples/modules/tflite-micro/magic_wand/src/accelerometer_handler.cpp
@@ -20,7 +20,7 @@
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define BUFLEN 300
 int begin_index = 0;
diff --git a/samples/net/capture/src/main.c b/samples/net/capture/src/main.c
index 9d97afc283..9a34f21707 100644
--- a/samples/net/capture/src/main.c
+++ b/samples/net/capture/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_capture_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 void main(void)
 {
diff --git a/samples/net/cloud/google_iot_mqtt/src/dhcp.c b/samples/net/cloud/google_iot_mqtt/src/dhcp.c
index f201ed87c4..bc06cb424b 100644
--- a/samples/net/cloud/google_iot_mqtt/src/dhcp.c
+++ b/samples/net/cloud/google_iot_mqtt/src/dhcp.c
@@ -10,7 +10,7 @@
 
 LOG_MODULE_DECLARE(net_google_iot_mqtt, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_core.h>
diff --git a/samples/net/cloud/google_iot_mqtt/src/main.c b/samples/net/cloud/google_iot_mqtt/src/main.c
index 91fa49179a..9e1fedd0c0 100644
--- a/samples/net/cloud/google_iot_mqtt/src/main.c
+++ b/samples/net/cloud/google_iot_mqtt/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "dhcp.h"
 #include "protocol.h"
diff --git a/samples/net/cloud/google_iot_mqtt/src/protocol.c b/samples/net/cloud/google_iot_mqtt/src/protocol.c
index e66c2f7558..7e62253583 100644
--- a/samples/net/cloud/google_iot_mqtt/src/protocol.c
+++ b/samples/net/cloud/google_iot_mqtt/src/protocol.c
@@ -10,7 +10,7 @@
 LOG_MODULE_DECLARE(net_google_iot_mqtt, LOG_LEVEL_DBG);
 #include "protocol.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <zephyr/data/jwt.h>
 #include <zephyr/drivers/entropy.h>
diff --git a/samples/net/cloud/mqtt_azure/src/main.c b/samples/net/cloud/mqtt_azure/src/main.c
index b402d27db8..73d54b960c 100644
--- a/samples/net/cloud/mqtt_azure/src/main.c
+++ b/samples/net/cloud/mqtt_azure/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mqtt_azure, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/mqtt.h>
 
diff --git a/samples/net/cloud/tagoio_http_post/src/main.c b/samples/net/cloud/tagoio_http_post/src/main.c
index f7fc35245f..b24d91d45c 100644
--- a/samples/net/cloud/tagoio_http_post/src/main.c
+++ b/samples/net/cloud/tagoio_http_post/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tagoio_http_post, CONFIG_TAGOIO_HTTP_POST_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/http_client.h>
 #include <zephyr/random/rand32.h>
diff --git a/samples/net/dhcpv4_client/src/main.c b/samples/net/dhcpv4_client/src/main.c
index bc5350242b..d3f4ff6fda 100644
--- a/samples/net/dhcpv4_client/src/main.c
+++ b/samples/net/dhcpv4_client/src/main.c
@@ -10,7 +10,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_dhcpv4_client_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/samples/net/dns_resolve/src/main.c b/samples/net/dns_resolve/src/main.c
index f7b3e3306f..44aa7b3412 100644
--- a/samples/net/dns_resolve/src/main.c
+++ b/samples/net/dns_resolve/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_dns_resolve_client_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/samples/net/dsa/src/main.h b/samples/net/dsa/src/main.h
index 41b191322f..6a1e9f367a 100644
--- a/samples/net/dsa/src/main.h
+++ b/samples/net/dsa/src/main.h
@@ -7,7 +7,7 @@
 #ifndef __DSA_SAMPLE__
 #define __DSA_SAMPLE__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 
 #include <zephyr/net/net_core.h>
diff --git a/samples/net/eth_native_posix/src/main.c b/samples/net/eth_native_posix/src/main.c
index 455598d46f..2a2bb25218 100644
--- a/samples/net/eth_native_posix/src/main.c
+++ b/samples/net/eth_native_posix/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_native_posix_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 
 #include <zephyr/net/net_core.h>
diff --git a/samples/net/gptp/src/gptp.c b/samples/net/gptp/src/gptp.c
index d2f47614d4..5a59828739 100644
--- a/samples/net/gptp/src/gptp.c
+++ b/samples/net/gptp/src/gptp.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_gptp_sample);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <stdlib.h>
 
diff --git a/samples/net/gptp/src/main.c b/samples/net/gptp/src/main.c
index 221e986228..659208654d 100644
--- a/samples/net/gptp/src/main.c
+++ b/samples/net/gptp/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_gptp_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 
 #include <zephyr/net/net_core.h>
diff --git a/samples/net/gsm_modem/src/main.c b/samples/net/gsm_modem/src/main.c
index 619b814d58..381f3b33bc 100644
--- a/samples/net/gsm_modem/src/main.c
+++ b/samples/net/gsm_modem/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/drivers/uart.h>
diff --git a/samples/net/ipv4_autoconf/src/main.c b/samples/net/ipv4_autoconf/src/main.c
index 94e6969fa3..6fd0dcb499 100644
--- a/samples/net/ipv4_autoconf/src/main.c
+++ b/samples/net/ipv4_autoconf/src/main.c
@@ -10,7 +10,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ipv4_autoconf_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/samples/net/lldp/src/main.c b/samples/net/lldp/src/main.c
index 60c4de5372..1eafaad082 100644
--- a/samples/net/lldp/src/main.c
+++ b/samples/net/lldp/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_lldp_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 
 #include <zephyr/net/net_core.h>
diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c
index 2897167d56..5d519b7c8a 100644
--- a/samples/net/lwm2m_client/src/lwm2m-client.c
+++ b/samples/net/lwm2m_client/src/lwm2m-client.c
@@ -12,7 +12,7 @@
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <zephyr/drivers/hwinfo.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/net/lwm2m.h>
diff --git a/samples/net/mdns_responder/src/main.c b/samples/net/mdns_responder/src/main.c
index 8b68378b8a..c8fd9977da 100644
--- a/samples/net/mdns_responder/src/main.c
+++ b/samples/net/mdns_responder/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mdns_responder_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/net_core.h>
 
 extern void service(void);
diff --git a/samples/net/mdns_responder/src/service.c b/samples/net/mdns_responder/src/service.c
index 631e72ad51..31f65c0492 100644
--- a/samples/net/mdns_responder/src/service.c
+++ b/samples/net/mdns_responder/src/service.c
@@ -11,7 +11,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mdns_echo_service, LOG_LEVEL_DBG);
diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c
index 0d9d11b354..b2ae8d9942 100644
--- a/samples/net/mqtt_publisher/src/main.c
+++ b/samples/net/mqtt_publisher/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mqtt_publisher_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/mqtt.h>
 #include <zephyr/random/rand32.h>
diff --git a/samples/net/promiscuous_mode/src/main.c b/samples/net/promiscuous_mode/src/main.c
index 481c290ffb..f6eaac3850 100644
--- a/samples/net/promiscuous_mode/src/main.c
+++ b/samples/net/promiscuous_mode/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_promisc_sample, LOG_LEVEL_INF);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <zephyr/shell/shell.h>
diff --git a/samples/net/sockets/can/src/main.c b/samples/net/sockets/can/src/main.c
index 4327df0058..2c4ad5be5f 100644
--- a/samples/net/sockets/can/src/main.c
+++ b/samples/net/sockets/can/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_socket_can_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/drivers/can.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/net/sockets/coap_client/src/coap-client.c b/samples/net/sockets/coap_client/src/coap-client.c
index 16bb990374..44eea68d9d 100644
--- a/samples/net/sockets/coap_client/src/coap-client.c
+++ b/samples/net/sockets/coap_client/src/coap-client.c
@@ -10,7 +10,7 @@ LOG_MODULE_REGISTER(net_coap_client_sample, LOG_LEVEL_DBG);
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/socket.h>
 #include <zephyr/net/net_mgmt.h>
diff --git a/samples/net/sockets/coap_server/src/coap-server.c b/samples/net/sockets/coap_server/src/coap-server.c
index c7ff157f15..a90549a069 100644
--- a/samples/net/sockets/coap_server/src/coap-server.c
+++ b/samples/net/sockets/coap_server/src/coap-server.c
@@ -10,7 +10,7 @@ LOG_MODULE_REGISTER(net_coap_server_sample, LOG_LEVEL_DBG);
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/socket.h>
 #include <zephyr/net/net_mgmt.h>
diff --git a/samples/net/sockets/dumb_http_server_mt/src/main.c b/samples/net/sockets/dumb_http_server_mt/src/main.c
index c3e304dff3..963cfcb0b9 100644
--- a/samples/net/sockets/dumb_http_server_mt/src/main.c
+++ b/samples/net/sockets/dumb_http_server_mt/src/main.c
@@ -8,7 +8,7 @@
 #define LOG_LEVEL LOG_LEVEL_DBG
 LOG_MODULE_REGISTER(net_dumb_http_srv_mt_sample);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/net/sockets/echo_client/src/echo-client.c b/samples/net/sockets/echo_client/src/echo-client.c
index 4c92eeeba0..84c6322f56 100644
--- a/samples/net/sockets/echo_client/src/echo-client.c
+++ b/samples/net/sockets/echo_client/src/echo-client.c
@@ -20,7 +20,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_echo_client_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <stdio.h>
 
diff --git a/samples/net/sockets/echo_client/src/tcp.c b/samples/net/sockets/echo_client/src/tcp.c
index b5c65fe2d4..5ff80eb25a 100644
--- a/samples/net/sockets/echo_client/src/tcp.c
+++ b/samples/net/sockets/echo_client/src/tcp.c
@@ -10,7 +10,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <stdio.h>
 
diff --git a/samples/net/sockets/echo_client/src/udp.c b/samples/net/sockets/echo_client/src/udp.c
index 3e1c95323e..62b3490070 100644
--- a/samples/net/sockets/echo_client/src/udp.c
+++ b/samples/net/sockets/echo_client/src/udp.c
@@ -10,7 +10,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <stdio.h>
 
diff --git a/samples/net/sockets/echo_client/src/vlan.c b/samples/net/sockets/echo_client/src/vlan.c
index f1a0ed9df9..482fbefb42 100644
--- a/samples/net/sockets/echo_client/src/vlan.c
+++ b/samples/net/sockets/echo_client/src/vlan.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/ethernet.h>
 
diff --git a/samples/net/sockets/echo_server/src/echo-server.c b/samples/net/sockets/echo_server/src/echo-server.c
index c5eefa3a82..a80074d29a 100644
--- a/samples/net/sockets/echo_server/src/echo-server.c
+++ b/samples/net/sockets/echo_server/src/echo-server.c
@@ -10,7 +10,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_echo_server_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <errno.h>
 #include <zephyr/shell/shell.h>
diff --git a/samples/net/sockets/echo_server/src/tcp.c b/samples/net/sockets/echo_server/src/tcp.c
index a47017d735..5a0998c426 100644
--- a/samples/net/sockets/echo_server/src/tcp.c
+++ b/samples/net/sockets/echo_server/src/tcp.c
@@ -10,7 +10,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <stdio.h>
 
diff --git a/samples/net/sockets/echo_server/src/tunnel.c b/samples/net/sockets/echo_server/src/tunnel.c
index c4860a426f..e1cb98fb9c 100644
--- a/samples/net/sockets/echo_server/src/tunnel.c
+++ b/samples/net/sockets/echo_server/src/tunnel.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/virtual_mgmt.h>
diff --git a/samples/net/sockets/echo_server/src/udp.c b/samples/net/sockets/echo_server/src/udp.c
index ef41e74ef8..92592ce0d9 100644
--- a/samples/net/sockets/echo_server/src/udp.c
+++ b/samples/net/sockets/echo_server/src/udp.c
@@ -10,7 +10,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <stdio.h>
 
diff --git a/samples/net/sockets/echo_server/src/vlan.c b/samples/net/sockets/echo_server/src/vlan.c
index 82a5e58b26..4f2a52034e 100644
--- a/samples/net/sockets/echo_server/src/vlan.c
+++ b/samples/net/sockets/echo_server/src/vlan.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/ethernet.h>
 
diff --git a/samples/net/sockets/net_mgmt/src/main.c b/samples/net/sockets/net_mgmt/src/main.c
index e09022be19..62759b8da9 100644
--- a/samples/net/sockets/net_mgmt/src/main.c
+++ b/samples/net/sockets/net_mgmt/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mgmt_sock_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <stdio.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/net/sockets/packet/src/packet.c b/samples/net/sockets/packet/src/packet.c
index 115b8805f4..48e189f9e3 100644
--- a/samples/net/sockets/packet/src/packet.c
+++ b/samples/net/sockets/packet/src/packet.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_pkt_sock_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <stdio.h>
 
diff --git a/samples/net/sockets/txtime/src/main.c b/samples/net/sockets/txtime/src/main.c
index 8ac477eb74..2beca8b358 100644
--- a/samples/net/sockets/txtime/src/main.c
+++ b/samples/net/sockets/txtime/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_txtime_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <stdio.h>
 #include <inttypes.h>
diff --git a/samples/net/sockets/txtime/src/vlan.c b/samples/net/sockets/txtime/src/vlan.c
index 88a16175ad..b8cee26c59 100644
--- a/samples/net/sockets/txtime/src/vlan.c
+++ b/samples/net/sockets/txtime/src/vlan.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_txtime_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/ethernet.h>
 
diff --git a/samples/net/stats/src/main.c b/samples/net/stats/src/main.c
index bcd99b80fd..8c704f9adb 100644
--- a/samples/net/stats/src/main.c
+++ b/samples/net/stats/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_stats_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 
 #include <zephyr/net/net_core.h>
diff --git a/samples/net/syslog_net/src/main.c b/samples/net/syslog_net/src/main.c
index dc75224cda..453209d35b 100644
--- a/samples/net/syslog_net/src/main.c
+++ b/samples/net/syslog_net/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_syslog, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/logging/log_backend.h>
 
diff --git a/samples/net/telnet/src/telnet.c b/samples/net/telnet/src/telnet.c
index 6ac855c9cf..537079dc9a 100644
--- a/samples/net/telnet/src/telnet.c
+++ b/samples/net/telnet/src/telnet.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_telnet_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/samples/net/virtual/src/main.c b/samples/net/virtual/src/main.c
index 1893ad2881..6fd41638c3 100644
--- a/samples/net/virtual/src/main.c
+++ b/samples/net/virtual/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_virtual_interface_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <errno.h>
 
diff --git a/samples/net/vlan/src/main.c b/samples/net/vlan/src/main.c
index 0dff77aa25..57dc81aa67 100644
--- a/samples/net/vlan/src/main.c
+++ b/samples/net/vlan/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_vlan_sample, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 
 #include <zephyr/net/net_core.h>
diff --git a/samples/net/wifi/src/wifi_test.c b/samples/net/wifi/src/wifi_test.c
index 80e87db942..db7d2e9f9d 100644
--- a/samples/net/wifi/src/wifi_test.c
+++ b/samples/net/wifi/src/wifi_test.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 
 void main(void)
diff --git a/samples/net/wpan_serial/src/main.c b/samples/net/wpan_serial/src/main.c
index b99900cf69..973e94214a 100644
--- a/samples/net/wpan_serial/src/main.c
+++ b/samples/net/wpan_serial/src/main.c
@@ -16,7 +16,7 @@
 LOG_MODULE_REGISTER(wpan_serial, CONFIG_USB_DEVICE_LOG_LEVEL);
 
 #include <zephyr/drivers/uart.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/usb/usb_device.h>
 #include <zephyr/random/rand32.h>
 
diff --git a/samples/philosophers/src/main.c b/samples/philosophers/src/main.c
index 24b95f69df..4c9026ed8a 100644
--- a/samples/philosophers/src/main.c
+++ b/samples/philosophers/src/main.c
@@ -35,7 +35,7 @@
  * header file.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #if defined(CONFIG_STDOUT_CONSOLE)
 #include <stdio.h>
diff --git a/samples/sensor/accel_polling/src/main.c b/samples/sensor/accel_polling/src/main.c
index c94e4d509f..d8f3b9f88a 100644
--- a/samples/sensor/accel_polling/src/main.c
+++ b/samples/sensor/accel_polling/src/main.c
@@ -10,7 +10,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/util_macro.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define ACCEL_ALIAS(i) DT_ALIAS(_CONCAT(accel, i))
 #define ACCELEROMETER_DEVICE(i, _)                                                                 \
diff --git a/samples/sensor/adc_cmp_npcx/src/main.c b/samples/sensor/adc_cmp_npcx/src/main.c
index e901fa726a..3e430c8ad4 100644
--- a/samples/sensor/adc_cmp_npcx/src/main.c
+++ b/samples/sensor/adc_cmp_npcx/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/sensor/adc_cmp_npcx.h>
 #include <zephyr/sys/atomic.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <stdio.h>
 
diff --git a/samples/sensor/adt7420/src/main.c b/samples/sensor/adt7420/src/main.c
index c8a71ea494..c54061c3a9 100644
--- a/samples/sensor/adt7420/src/main.c
+++ b/samples/sensor/adt7420/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/amg88xx/src/main.c b/samples/sensor/amg88xx/src/main.c
index 71f3c24db6..04292c0ca6 100644
--- a/samples/sensor/amg88xx/src/main.c
+++ b/samples/sensor/amg88xx/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/sensor/ams_iAQcore/src/main.c b/samples/sensor/ams_iAQcore/src/main.c
index 0afaf756f0..cf109333c8 100644
--- a/samples/sensor/ams_iAQcore/src/main.c
+++ b/samples/sensor/ams_iAQcore/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/sensor/apds9960/src/main.c b/samples/sensor/apds9960/src/main.c
index 00c193928b..05a80c5495 100644
--- a/samples/sensor/apds9960/src/main.c
+++ b/samples/sensor/apds9960/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/device.h>
 #include <stdio.h>
diff --git a/samples/sensor/bme280/src/main.c b/samples/sensor/bme280/src/main.c
index 593fc3b950..57388587da 100644
--- a/samples/sensor/bme280/src/main.c
+++ b/samples/sensor/bme280/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/sensor.h>
diff --git a/samples/sensor/bme680/src/main.c b/samples/sensor/bme680/src/main.c
index c9c70477ce..cb9dae22d2 100644
--- a/samples/sensor/bme680/src/main.c
+++ b/samples/sensor/bme680/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/bmg160/src/main.c b/samples/sensor/bmg160/src/main.c
index 9930a55d7d..2741b593d7 100644
--- a/samples/sensor/bmg160/src/main.c
+++ b/samples/sensor/bmg160/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys_clock.h>
diff --git a/samples/sensor/bmi270/src/main.c b/samples/sensor/bmi270/src/main.c
index 269ec21096..22a53ec078 100644
--- a/samples/sensor/bmi270/src/main.c
+++ b/samples/sensor/bmi270/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/bq274xx/src/main.c b/samples/sensor/bq274xx/src/main.c
index 6a019bc4cb..69f5868995 100644
--- a/samples/sensor/bq274xx/src/main.c
+++ b/samples/sensor/bq274xx/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/sensor/ccs811/src/main.c b/samples/sensor/ccs811/src/main.c
index 343add8a5e..f2288d6617 100644
--- a/samples/sensor/ccs811/src/main.c
+++ b/samples/sensor/ccs811/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/sensor/dht/src/main.c b/samples/sensor/dht/src/main.c
index fcc02a7673..5ec3657510 100644
--- a/samples/sensor/dht/src/main.c
+++ b/samples/sensor/dht/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/dps310/src/main.c b/samples/sensor/dps310/src/main.c
index 24eb7ae940..1a7f2efc07 100644
--- a/samples/sensor/dps310/src/main.c
+++ b/samples/sensor/dps310/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdlib.h>
diff --git a/samples/sensor/ds18b20/src/main.c b/samples/sensor/ds18b20/src/main.c
index b61f8bca29..90f17e5dc9 100644
--- a/samples/sensor/ds18b20/src/main.c
+++ b/samples/sensor/ds18b20/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/sensor.h>
diff --git a/samples/sensor/ens210/src/main.c b/samples/sensor/ens210/src/main.c
index b73b6992af..723fdfb4b1 100644
--- a/samples/sensor/ens210/src/main.c
+++ b/samples/sensor/ens210/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/sensor/fdc2x1x/src/main.c b/samples/sensor/fdc2x1x/src/main.c
index cf7894e061..e56d438deb 100644
--- a/samples/sensor/fdc2x1x/src/main.c
+++ b/samples/sensor/fdc2x1x/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/drivers/sensor.h>
diff --git a/samples/sensor/fxas21002/src/main.c b/samples/sensor/fxas21002/src/main.c
index 94cd1f1581..1ba9e8a4f0 100644
--- a/samples/sensor/fxas21002/src/main.c
+++ b/samples/sensor/fxas21002/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
 
diff --git a/samples/sensor/fxos8700-hid/src/main.c b/samples/sensor/fxos8700-hid/src/main.c
index 2487006f0c..f433ad9028 100644
--- a/samples/sensor/fxos8700-hid/src/main.c
+++ b/samples/sensor/fxos8700-hid/src/main.c
@@ -5,7 +5,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/sensor.h>
diff --git a/samples/sensor/fxos8700/src/main.c b/samples/sensor/fxos8700/src/main.c
index 38d2bb6e68..23c79e1820 100644
--- a/samples/sensor/fxos8700/src/main.c
+++ b/samples/sensor/fxos8700/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
 
diff --git a/samples/sensor/grove_light/src/main.c b/samples/sensor/grove_light/src/main.c
index 89d21f4775..1edfbf0d19 100644
--- a/samples/sensor/grove_light/src/main.c
+++ b/samples/sensor/grove_light/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <stdio.h>
 #include <zephyr/drivers/sensor.h>
diff --git a/samples/sensor/grove_temperature/src/main.c b/samples/sensor/grove_temperature/src/main.c
index 8e514b7e64..f29df243b0 100644
--- a/samples/sensor/grove_temperature/src/main.c
+++ b/samples/sensor/grove_temperature/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <stdio.h>
 #include <zephyr/drivers/sensor.h>
diff --git a/samples/sensor/hts221/src/main.c b/samples/sensor/hts221/src/main.c
index 3c3db93588..18cd764f7c 100644
--- a/samples/sensor/hts221/src/main.c
+++ b/samples/sensor/hts221/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/i3g4250d/src/main.c b/samples/sensor/i3g4250d/src/main.c
index a5af455560..5a23a36012 100644
--- a/samples/sensor/i3g4250d/src/main.c
+++ b/samples/sensor/i3g4250d/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 
diff --git a/samples/sensor/icm42605/src/main.c b/samples/sensor/icm42605/src/main.c
index b230ededed..57ffe4f2db 100644
--- a/samples/sensor/icm42605/src/main.c
+++ b/samples/sensor/icm42605/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/ina219/src/main.c b/samples/sensor/ina219/src/main.c
index bee7b9ed92..c461a043c2 100644
--- a/samples/sensor/ina219/src/main.c
+++ b/samples/sensor/ina219/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/drivers/sensor.h>
 
diff --git a/samples/sensor/isl29035/src/main.c b/samples/sensor/isl29035/src/main.c
index d18d3fa137..8d2ff42107 100644
--- a/samples/sensor/isl29035/src/main.c
+++ b/samples/sensor/isl29035/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/lis2dh/src/main.c b/samples/sensor/lis2dh/src/main.c
index cd6ff2460b..7d64866547 100644
--- a/samples/sensor/lis2dh/src/main.c
+++ b/samples/sensor/lis2dh/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 
diff --git a/samples/sensor/lps22hb/src/main.c b/samples/sensor/lps22hb/src/main.c
index 1e774af4d5..871575cc40 100644
--- a/samples/sensor/lps22hb/src/main.c
+++ b/samples/sensor/lps22hb/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/lps22hh/src/main.c b/samples/sensor/lps22hh/src/main.c
index 46e57bd88f..4cd6455dd2 100644
--- a/samples/sensor/lps22hh/src/main.c
+++ b/samples/sensor/lps22hh/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/lsm303dlhc/src/main.c b/samples/sensor/lsm303dlhc/src/main.c
index 50fd0e44c0..70d85d7629 100644
--- a/samples/sensor/lsm303dlhc/src/main.c
+++ b/samples/sensor/lsm303dlhc/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/lsm6dsl/src/main.c b/samples/sensor/lsm6dsl/src/main.c
index 1e3053b117..e437b2a3e6 100644
--- a/samples/sensor/lsm6dsl/src/main.c
+++ b/samples/sensor/lsm6dsl/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/lsm6dso/src/main.c b/samples/sensor/lsm6dso/src/main.c
index 746ea11c14..e5497903c4 100644
--- a/samples/sensor/lsm6dso/src/main.c
+++ b/samples/sensor/lsm6dso/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 
diff --git a/samples/sensor/magn_polling/src/main.c b/samples/sensor/magn_polling/src/main.c
index baa99e0665..43465fc521 100644
--- a/samples/sensor/magn_polling/src/main.c
+++ b/samples/sensor/magn_polling/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/sensor/max17262/src/main.c b/samples/sensor/max17262/src/main.c
index a872e41016..e977132271 100644
--- a/samples/sensor/max17262/src/main.c
+++ b/samples/sensor/max17262/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/sensor.h>
diff --git a/samples/sensor/max30101/src/main.c b/samples/sensor/max30101/src/main.c
index e477009ee8..2f502a88bb 100644
--- a/samples/sensor/max30101/src/main.c
+++ b/samples/sensor/max30101/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
 
diff --git a/samples/sensor/max44009/src/main.c b/samples/sensor/max44009/src/main.c
index 57dea6c1de..2c1248549e 100644
--- a/samples/sensor/max44009/src/main.c
+++ b/samples/sensor/max44009/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/sensor.h>
 
diff --git a/samples/sensor/max6675/src/main.c b/samples/sensor/max6675/src/main.c
index 10783d71bf..67c73e45e3 100644
--- a/samples/sensor/max6675/src/main.c
+++ b/samples/sensor/max6675/src/main.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 
diff --git a/samples/sensor/mcp9808/src/main.c b/samples/sensor/mcp9808/src/main.c
index 10fbe40abc..9a0c6c28c5 100644
--- a/samples/sensor/mcp9808/src/main.c
+++ b/samples/sensor/mcp9808/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/mcux_acmp/src/main.c b/samples/sensor/mcux_acmp/src/main.c
index d1162b2a72..48d89942b8 100644
--- a/samples/sensor/mcux_acmp/src/main.c
+++ b/samples/sensor/mcux_acmp/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/sensor/mcux_acmp.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <stdio.h>
 
diff --git a/samples/sensor/mhz19b/src/main.c b/samples/sensor/mhz19b/src/main.c
index 119f687062..8d6c994a77 100644
--- a/samples/sensor/mhz19b/src/main.c
+++ b/samples/sensor/mhz19b/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/sensor/mhz19b.h>
diff --git a/samples/sensor/mpr/src/main.c b/samples/sensor/mpr/src/main.c
index 9137bbad09..f9d45ecaa1 100644
--- a/samples/sensor/mpr/src/main.c
+++ b/samples/sensor/mpr/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/mpu6050/src/main.c b/samples/sensor/mpu6050/src/main.c
index 1db3afa383..1d72b97cd7 100644
--- a/samples/sensor/mpu6050/src/main.c
+++ b/samples/sensor/mpu6050/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/ms5837/src/main.c b/samples/sensor/ms5837/src/main.c
index 55cb69c6c0..10c37d6eba 100644
--- a/samples/sensor/ms5837/src/main.c
+++ b/samples/sensor/ms5837/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main);
diff --git a/samples/sensor/sgp40_sht4x/src/main.c b/samples/sensor/sgp40_sht4x/src/main.c
index c329b598e9..9dd5aa9331 100644
--- a/samples/sensor/sgp40_sht4x/src/main.c
+++ b/samples/sensor/sgp40_sht4x/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/sht3xd/src/main.c b/samples/sensor/sht3xd/src/main.c
index c77784f7d4..7a30de6f34 100644
--- a/samples/sensor/sht3xd/src/main.c
+++ b/samples/sensor/sht3xd/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/sm351lt/src/main.c b/samples/sensor/sm351lt/src/main.c
index 3f7b6de2a9..0e4c315c45 100644
--- a/samples/sensor/sm351lt/src/main.c
+++ b/samples/sensor/sm351lt/src/main.c
@@ -6,7 +6,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/sensor.h>
diff --git a/samples/sensor/stm32_temp_sensor/src/main.c b/samples/sensor/stm32_temp_sensor/src/main.c
index c3a07048a3..2d680cb08d 100644
--- a/samples/sensor/stm32_temp_sensor/src/main.c
+++ b/samples/sensor/stm32_temp_sensor/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/sensor/stm32_vbat_sensor/src/main.c b/samples/sensor/stm32_vbat_sensor/src/main.c
index d4b0b34025..4d6b099baa 100644
--- a/samples/sensor/stm32_vbat_sensor/src/main.c
+++ b/samples/sensor/stm32_vbat_sensor/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/sensor/sx9500/src/main.c b/samples/sensor/sx9500/src/main.c
index 929be67d58..dcd453cd5b 100644
--- a/samples/sensor/sx9500/src/main.c
+++ b/samples/sensor/sx9500/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/th02/src/main.c b/samples/sensor/th02/src/main.c
index d1076ada1e..07d2e3d91d 100644
--- a/samples/sensor/th02/src/main.c
+++ b/samples/sensor/th02/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/sensor/thermometer/src/main.c b/samples/sensor/thermometer/src/main.c
index 711e29a6cc..7a0ad1e48e 100644
--- a/samples/sensor/thermometer/src/main.c
+++ b/samples/sensor/thermometer/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
 
diff --git a/samples/sensor/ti_hdc/src/main.c b/samples/sensor/ti_hdc/src/main.c
index 7ef038f499..a5d49c5385 100644
--- a/samples/sensor/ti_hdc/src/main.c
+++ b/samples/sensor/ti_hdc/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/sensor/tmp108/src/main.c b/samples/sensor/tmp108/src/main.c
index 6b25c0fc04..4bcbf01d43 100644
--- a/samples/sensor/tmp108/src/main.c
+++ b/samples/sensor/tmp108/src/main.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/sensor/tmp108.h>
 
diff --git a/samples/sensor/tmp112/src/main.c b/samples/sensor/tmp112/src/main.c
index f284c3c98a..6cdd4851c9 100644
--- a/samples/sensor/tmp112/src/main.c
+++ b/samples/sensor/tmp112/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/sensor/tmp116/src/main.c b/samples/sensor/tmp116/src/main.c
index ec21be2a42..725e3989be 100644
--- a/samples/sensor/tmp116/src/main.c
+++ b/samples/sensor/tmp116/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/eeprom.h>
diff --git a/samples/sensor/vcnl4040/src/main.c b/samples/sensor/vcnl4040/src/main.c
index 7b0dedb30b..a14016e83c 100644
--- a/samples/sensor/vcnl4040/src/main.c
+++ b/samples/sensor/vcnl4040/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys_clock.h>
diff --git a/samples/sensor/vl53l0x/src/main.c b/samples/sensor/vl53l0x/src/main.c
index d5ba7147b0..182ff4a19c 100644
--- a/samples/sensor/vl53l0x/src/main.c
+++ b/samples/sensor/vl53l0x/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/sensor/wsen_hids/src/main.c b/samples/sensor/wsen_hids/src/main.c
index daaff0708d..7ec5c7f6bf 100644
--- a/samples/sensor/wsen_hids/src/main.c
+++ b/samples/sensor/wsen_hids/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 LOG_MODULE_REGISTER(MAIN);
 
diff --git a/samples/sensor/wsen_itds/src/main.c b/samples/sensor/wsen_itds/src/main.c
index 62a6a14682..c23a61308a 100644
--- a/samples/sensor/wsen_itds/src/main.c
+++ b/samples/sensor/wsen_itds/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys_clock.h>
diff --git a/samples/shields/lmp90100_evb/rtd/src/main.c b/samples/shields/lmp90100_evb/rtd/src/main.c
index 71ee780be9..b9ac80ce34 100644
--- a/samples/shields/lmp90100_evb/rtd/src/main.c
+++ b/samples/shields/lmp90100_evb/rtd/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/adc.h>
 #include <stdio.h>
diff --git a/samples/shields/x_nucleo_53l0a1/src/main.c b/samples/shields/x_nucleo_53l0a1/src/main.c
index ccb9f6054f..26c8ceb638 100644
--- a/samples/shields/x_nucleo_53l0a1/src/main.c
+++ b/samples/shields/x_nucleo_53l0a1/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/shields/x_nucleo_iks01a1/src/main.c b/samples/shields/x_nucleo_iks01a1/src/main.c
index 014ef8fc99..95f5e402c9 100644
--- a/samples/shields/x_nucleo_iks01a1/src/main.c
+++ b/samples/shields/x_nucleo_iks01a1/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/shields/x_nucleo_iks01a2/sensorhub/src/main.c b/samples/shields/x_nucleo_iks01a2/sensorhub/src/main.c
index 4ab7f0f9c4..7352e40b72 100644
--- a/samples/shields/x_nucleo_iks01a2/sensorhub/src/main.c
+++ b/samples/shields/x_nucleo_iks01a2/sensorhub/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/shields/x_nucleo_iks01a2/standard/src/main.c b/samples/shields/x_nucleo_iks01a2/standard/src/main.c
index f622e8f873..85031d9889 100644
--- a/samples/shields/x_nucleo_iks01a2/standard/src/main.c
+++ b/samples/shields/x_nucleo_iks01a2/standard/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/shields/x_nucleo_iks01a3/sensorhub/src/main.c b/samples/shields/x_nucleo_iks01a3/sensorhub/src/main.c
index 9658f4a796..94c2926849 100644
--- a/samples/shields/x_nucleo_iks01a3/sensorhub/src/main.c
+++ b/samples/shields/x_nucleo_iks01a3/sensorhub/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/shields/x_nucleo_iks01a3/standard/src/main.c b/samples/shields/x_nucleo_iks01a3/standard/src/main.c
index 7f8ac3ef93..40d82c03b8 100644
--- a/samples/shields/x_nucleo_iks01a3/standard/src/main.c
+++ b/samples/shields/x_nucleo_iks01a3/standard/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/shields/x_nucleo_iks02a1/microphone/src/main.c b/samples/shields/x_nucleo_iks02a1/microphone/src/main.c
index 3085609c83..8a8df35a8c 100644
--- a/samples/shields/x_nucleo_iks02a1/microphone/src/main.c
+++ b/samples/shields/x_nucleo_iks02a1/microphone/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/audio/dmic.h>
diff --git a/samples/shields/x_nucleo_iks02a1/sensorhub/src/main.c b/samples/shields/x_nucleo_iks02a1/sensorhub/src/main.c
index d687b74b61..af659dc572 100644
--- a/samples/shields/x_nucleo_iks02a1/sensorhub/src/main.c
+++ b/samples/shields/x_nucleo_iks02a1/sensorhub/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/shields/x_nucleo_iks02a1/standard/src/main.c b/samples/shields/x_nucleo_iks02a1/standard/src/main.c
index 058d1141b9..139e2307cb 100644
--- a/samples/shields/x_nucleo_iks02a1/standard/src/main.c
+++ b/samples/shields/x_nucleo_iks02a1/standard/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/subsys/canbus/isotp/src/main.c b/samples/subsys/canbus/isotp/src/main.c
index 7be38e0eaa..3930c65aa2 100644
--- a/samples/subsys/canbus/isotp/src/main.c
+++ b/samples/subsys/canbus/isotp/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/canbus/isotp.h>
 
 
diff --git a/samples/subsys/console/echo/src/main.c b/samples/subsys/console/echo/src/main.c
index 8f116210e0..354f4c8f24 100644
--- a/samples/subsys/console/echo/src/main.c
+++ b/samples/subsys/console/echo/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/console/console.h>
 
 static const char prompt[] = "Start typing characters to see them echoed back\r\n";
diff --git a/samples/subsys/console/getchar/src/main.c b/samples/subsys/console/getchar/src/main.c
index bd4718240a..a0a32b0d9a 100644
--- a/samples/subsys/console/getchar/src/main.c
+++ b/samples/subsys/console/getchar/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/console/console.h>
 
diff --git a/samples/subsys/console/getline/src/main.c b/samples/subsys/console/getline/src/main.c
index 9ed8854e1e..7cc13a9fd6 100644
--- a/samples/subsys/console/getline/src/main.c
+++ b/samples/subsys/console/getline/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/console/console.h>
 
diff --git a/samples/subsys/cpp/cpp_synchronization/src/main.cpp b/samples/subsys/cpp/cpp_synchronization/src/main.cpp
index 6b430a2eb3..3ccf39bbb2 100644
--- a/samples/subsys/cpp/cpp_synchronization/src/main.cpp
+++ b/samples/subsys/cpp/cpp_synchronization/src/main.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/sys/printk.h>
 
diff --git a/samples/subsys/debug/fuzz/src/main.c b/samples/subsys/debug/fuzz/src/main.c
index 00862c087d..30bda202ea 100644
--- a/samples/subsys/debug/fuzz/src/main.c
+++ b/samples/subsys/debug/fuzz/src/main.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2022 Google, LLC.
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 
 /* Fuzz testing is coverage-based, so we want to hide a failure case
diff --git a/samples/subsys/debug/gdbstub/src/main.c b/samples/subsys/debug/gdbstub/src/main.c
index 2de60d3308..ecb36f46e4 100644
--- a/samples/subsys/debug/gdbstub/src/main.c
+++ b/samples/subsys/debug/gdbstub/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #define STACKSIZE 512
diff --git a/samples/subsys/display/cfb/src/main.c b/samples/subsys/display/cfb/src/main.c
index d481774091..03ee57fd63 100644
--- a/samples/subsys/display/cfb/src/main.c
+++ b/samples/subsys/display/cfb/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/display/cfb.h>
 #include <stdio.h>
diff --git a/samples/subsys/display/cfb_custom_font/src/main.c b/samples/subsys/display/cfb_custom_font/src/main.c
index 6f9cbf1f5a..f6a7af912a 100644
--- a/samples/subsys/display/cfb_custom_font/src/main.c
+++ b/samples/subsys/display/cfb_custom_font/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/display/cfb.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/subsys/display/lvgl/src/main.c b/samples/subsys/display/lvgl/src/main.c
index f291b968ad..1b8e944b45 100644
--- a/samples/subsys/display/lvgl/src/main.c
+++ b/samples/subsys/display/lvgl/src/main.c
@@ -9,7 +9,7 @@
 #include <lvgl.h>
 #include <stdio.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/samples/subsys/edac/src/main.c b/samples/subsys/edac/src/main.c
index 6e0324476f..361c7c024a 100644
--- a/samples/subsys/edac/src/main.c
+++ b/samples/subsys/edac/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 
diff --git a/samples/subsys/fs/fat_fs/src/main.c b/samples/subsys/fs/fat_fs/src/main.c
index a69f693873..0578f79690 100644
--- a/samples/subsys/fs/fat_fs/src/main.c
+++ b/samples/subsys/fs/fat_fs/src/main.c
@@ -6,7 +6,7 @@
 
 /* Sample which uses the filesystem API and SDHC driver */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/storage/disk_access.h>
 #include <zephyr/logging/log.h>
diff --git a/samples/subsys/fs/littlefs/src/main.c b/samples/subsys/fs/littlefs/src/main.c
index e89075cfc2..8f973bd7b2 100644
--- a/samples/subsys/fs/littlefs/src/main.c
+++ b/samples/subsys/fs/littlefs/src/main.c
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/fs/fs.h>
 #include <zephyr/fs/littlefs.h>
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/src/main.c b/samples/subsys/ipc/ipc_service/icmsg/remote/src/main.c
index 33a6d545be..df032c0c32 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/remote/src/main.c
+++ b/samples/subsys/ipc/ipc_service/icmsg/remote/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 #include <zephyr/ipc/ipc_service.h>
diff --git a/samples/subsys/ipc/ipc_service/icmsg/src/main.c b/samples/subsys/ipc/ipc_service/icmsg/src/main.c
index aca4c77978..1ddb0c9f37 100644
--- a/samples/subsys/ipc/ipc_service/icmsg/src/main.c
+++ b/samples/subsys/ipc/ipc_service/icmsg/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 #include <zephyr/ipc/ipc_service.h>
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/remote/src/main.c b/samples/subsys/ipc/ipc_service/static_vrings/remote/src/main.c
index 812d5b4e0b..80fbdf5fcb 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/remote/src/main.c
+++ b/samples/subsys/ipc/ipc_service/static_vrings/remote/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 #include <zephyr/ipc/ipc_service.h>
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/src/main.c b/samples/subsys/ipc/ipc_service/static_vrings/src/main.c
index 3fa22f045f..9f26ad5485 100644
--- a/samples/subsys/ipc/ipc_service/static_vrings/src/main.c
+++ b/samples/subsys/ipc/ipc_service/static_vrings/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 #include <zephyr/ipc/ipc_service.h>
diff --git a/samples/subsys/ipc/openamp/remote/src/main.c b/samples/subsys/ipc/openamp/remote/src/main.c
index b7fdc8485f..06124069f4 100644
--- a/samples/subsys/ipc/openamp/remote/src/main.c
+++ b/samples/subsys/ipc/openamp/remote/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/ipm.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
diff --git a/samples/subsys/ipc/openamp/src/main.c b/samples/subsys/ipc/openamp/src/main.c
index 283cae776e..bdbfc17bb4 100644
--- a/samples/subsys/ipc/openamp/src/main.c
+++ b/samples/subsys/ipc/openamp/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/ipm.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
diff --git a/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c b/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c
index 5d7a5d3f7c..b1cddc19de 100644
--- a/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c
+++ b/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/samples/subsys/ipc/rpmsg_service/remote/src/main.c b/samples/subsys/ipc/rpmsg_service/remote/src/main.c
index 1ccd6f42e4..5b804387e5 100644
--- a/samples/subsys/ipc/rpmsg_service/remote/src/main.c
+++ b/samples/subsys/ipc/rpmsg_service/remote/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/ipm.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
diff --git a/samples/subsys/ipc/rpmsg_service/src/main.c b/samples/subsys/ipc/rpmsg_service/src/main.c
index bcd8719a00..cd0cd4e949 100644
--- a/samples/subsys/ipc/rpmsg_service/src/main.c
+++ b/samples/subsys/ipc/rpmsg_service/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/ipm.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/device.h>
diff --git a/samples/subsys/logging/dictionary/src/main.c b/samples/subsys/logging/dictionary/src/main.c
index b9d815cb38..edddd9fe8c 100644
--- a/samples/subsys/logging/dictionary/src/main.c
+++ b/samples/subsys/logging/dictionary/src/main.c
@@ -6,7 +6,7 @@
  */
 
 #include <inttypes.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
diff --git a/samples/subsys/logging/logger/src/main.c b/samples/subsys/logging/logger/src/main.c
index 5c45a105fa..2f95c6b966 100644
--- a/samples/subsys/logging/logger/src/main.c
+++ b/samples/subsys/logging/logger/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <zephyr/sys/printk.h>
 #include "sample_instance.h"
diff --git a/samples/subsys/logging/logger/src/sample_module.c b/samples/subsys/logging/logger/src/sample_module.c
index 223d3f13f3..0f641e8520 100644
--- a/samples/subsys/logging/logger/src/sample_module.c
+++ b/samples/subsys/logging/logger/src/sample_module.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include "sample_module.h"
 
diff --git a/samples/subsys/logging/syst/src/main.c b/samples/subsys/logging/syst/src/main.c
index 9ff162c10d..ad0223f7ab 100644
--- a/samples/subsys/logging/syst/src/main.c
+++ b/samples/subsys/logging/syst/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/samples/subsys/lorawan/class_a/src/main.c b/samples/subsys/lorawan/class_a/src/main.c
index ae689d2f48..6a94317236 100644
--- a/samples/subsys/lorawan/class_a/src/main.c
+++ b/samples/subsys/lorawan/class_a/src/main.c
@@ -8,7 +8,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/lorawan/lorawan.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /* Customize based on network configuration */
 #define LORAWAN_DEV_EUI			{ 0xDD, 0xEE, 0xAA, 0xDD, 0xBB, 0xEE,\
diff --git a/samples/subsys/mgmt/hawkbit/src/dhcp.c b/samples/subsys/mgmt/hawkbit/src/dhcp.c
index f96180e0a9..3f72a03f3f 100644
--- a/samples/subsys/mgmt/hawkbit/src/dhcp.c
+++ b/samples/subsys/mgmt/hawkbit/src/dhcp.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/logging/log.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_core.h>
diff --git a/samples/subsys/mgmt/hawkbit/src/main.c b/samples/subsys/mgmt/hawkbit/src/main.c
index 40d02ae28e..f4a1c06f76 100644
--- a/samples/subsys/mgmt/hawkbit/src/main.c
+++ b/samples/subsys/mgmt/hawkbit/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/mgmt/hawkbit.h>
 #include <zephyr/dfu/mcuboot.h>
 #include <zephyr/sys/printk.h>
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/src/main.c b/samples/subsys/mgmt/mcumgr/smp_svr/src/main.c
index 8b79f310d1..f89a34a1aa 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/src/main.c
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/stats/stats.h>
 #include <zephyr/usb/usb_device.h>
 
diff --git a/samples/subsys/mgmt/osdp/control_panel/src/main.c b/samples/subsys/mgmt/osdp/control_panel/src/main.c
index b8c4e9b126..560663992a 100644
--- a/samples/subsys/mgmt/osdp/control_panel/src/main.c
+++ b/samples/subsys/mgmt/osdp/control_panel/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/mgmt/osdp.h>
diff --git a/samples/subsys/mgmt/osdp/peripheral_device/src/main.c b/samples/subsys/mgmt/osdp/peripheral_device/src/main.c
index 7c298851c3..985d9a4b82 100644
--- a/samples/subsys/mgmt/osdp/peripheral_device/src/main.c
+++ b/samples/subsys/mgmt/osdp/peripheral_device/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/mgmt/osdp.h>
diff --git a/samples/subsys/mgmt/updatehub/src/main.c b/samples/subsys/mgmt/updatehub/src/main.c
index a4bdc8e6aa..28db2dc864 100644
--- a/samples/subsys/mgmt/updatehub/src/main.c
+++ b/samples/subsys/mgmt/updatehub/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <updatehub.h>
 #include <zephyr/net/net_mgmt.h>
 #include <zephyr/net/net_event.h>
diff --git a/samples/subsys/modbus/rtu_client/src/main.c b/samples/subsys/modbus/rtu_client/src/main.c
index 76a266a5b6..fa7bd5221f 100644
--- a/samples/subsys/modbus/rtu_client/src/main.c
+++ b/samples/subsys/modbus/rtu_client/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/modbus/modbus.h>
diff --git a/samples/subsys/modbus/rtu_server/src/main.c b/samples/subsys/modbus/rtu_server/src/main.c
index a7ca270c50..8738e06f0d 100644
--- a/samples/subsys/modbus/rtu_server/src/main.c
+++ b/samples/subsys/modbus/rtu_server/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/modbus/modbus.h>
diff --git a/samples/subsys/modbus/tcp_gateway/src/main.c b/samples/subsys/modbus/tcp_gateway/src/main.c
index 5481db14c3..6a48f3f823 100644
--- a/samples/subsys/modbus/tcp_gateway/src/main.c
+++ b/samples/subsys/modbus/tcp_gateway/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/modbus/modbus.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/subsys/modbus/tcp_server/src/main.c b/samples/subsys/modbus/tcp_server/src/main.c
index cd52a2c01e..3567f5359c 100644
--- a/samples/subsys/modbus/tcp_server/src/main.c
+++ b/samples/subsys/modbus/tcp_server/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/modbus/modbus.h>
diff --git a/samples/subsys/nvs/src/main.c b/samples/subsys/nvs/src/main.c
index a13963caa6..88ae9580c3 100644
--- a/samples/subsys/nvs/src/main.c
+++ b/samples/subsys/nvs/src/main.c
@@ -38,7 +38,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/device.h>
 #include <string.h>
diff --git a/samples/subsys/pm/device_pm/src/dummy_driver.h b/samples/subsys/pm/device_pm/src/dummy_driver.h
index 2525f3c0d0..a4939aa12c 100644
--- a/samples/subsys/pm/device_pm/src/dummy_driver.h
+++ b/samples/subsys/pm/device_pm/src/dummy_driver.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #define DUMMY_DRIVER_NAME	"dummy_driver"
 
diff --git a/samples/subsys/pm/device_pm/src/dummy_parent.h b/samples/subsys/pm/device_pm/src/dummy_parent.h
index 87f32bdce4..73c960e4e3 100644
--- a/samples/subsys/pm/device_pm/src/dummy_parent.h
+++ b/samples/subsys/pm/device_pm/src/dummy_parent.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #define DUMMY_PARENT_NAME	"dummy_parent"
 
diff --git a/samples/subsys/portability/cmsis_rtos_v1/timer_synchronization/src/main.c b/samples/subsys/portability/cmsis_rtos_v1/timer_synchronization/src/main.c
index 9a6aaf6359..130721f0f8 100644
--- a/samples/subsys/portability/cmsis_rtos_v1/timer_synchronization/src/main.c
+++ b/samples/subsys/portability/cmsis_rtos_v1/timer_synchronization/src/main.c
@@ -8,7 +8,7 @@
  * @file Synchronization demo using CMSIS RTOS V1 APIs.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 /* specify delay between greetings (in ms); compute equivalent in ticks */
diff --git a/samples/subsys/portability/cmsis_rtos_v2/timer_synchronization/src/main.c b/samples/subsys/portability/cmsis_rtos_v2/timer_synchronization/src/main.c
index 93e185a296..7c827ed8bd 100644
--- a/samples/subsys/portability/cmsis_rtos_v2/timer_synchronization/src/main.c
+++ b/samples/subsys/portability/cmsis_rtos_v2/timer_synchronization/src/main.c
@@ -8,7 +8,7 @@
  * @file Synchronization demo using CMSIS RTOS V2 APIs.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
 /* specify delay between greetings (in ms); compute equivalent in ticks */
diff --git a/samples/subsys/rtio/sensor_batch_processing/src/main.c b/samples/subsys/rtio/sensor_batch_processing/src/main.c
index 5a2e71e795..0eefa69cbc 100644
--- a/samples/subsys/rtio/sensor_batch_processing/src/main.c
+++ b/samples/subsys/rtio/sensor_batch_processing/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/rtio/rtio.h>
 #include <zephyr/rtio/rtio_executor_simple.h>
 #include <zephyr/logging/log.h>
diff --git a/samples/subsys/rtio/sensor_batch_processing/src/vnd_sensor.c b/samples/subsys/rtio/sensor_batch_processing/src/vnd_sensor.c
index 018b5c5120..86987b033b 100644
--- a/samples/subsys/rtio/sensor_batch_processing/src/vnd_sensor.c
+++ b/samples/subsys/rtio/sensor_batch_processing/src/vnd_sensor.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT vnd_sensor
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/rtio/rtio.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util.h>
diff --git a/samples/subsys/shell/shell_module/src/main.c b/samples/subsys/shell/shell_module/src/main.c
index 96bc8da933..41275a8a76 100644
--- a/samples/subsys/shell/shell_module/src/main.c
+++ b/samples/subsys/shell/shell_module/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 #include <version.h>
 #include <zephyr/logging/log.h>
diff --git a/samples/subsys/task_wdt/src/main.c b/samples/subsys/task_wdt/src/main.c
index 805b6967e6..52207fa1e3 100644
--- a/samples/subsys/task_wdt/src/main.c
+++ b/samples/subsys/task_wdt/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/watchdog.h>
 #include <zephyr/sys/reboot.h>
diff --git a/samples/subsys/tracing/src/main.c b/samples/subsys/tracing/src/main.c
index 9ad49f34b4..58523d9ff0 100644
--- a/samples/subsys/tracing/src/main.c
+++ b/samples/subsys/tracing/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/usb/usb_device.h>
diff --git a/samples/subsys/usb/audio/headphones_microphone/src/main.c b/samples/subsys/usb/audio/headphones_microphone/src/main.c
index d20fa88533..c2c59fa69c 100644
--- a/samples/subsys/usb/audio/headphones_microphone/src/main.c
+++ b/samples/subsys/usb/audio/headphones_microphone/src/main.c
@@ -9,7 +9,7 @@
  * @brief Sample app for Audio class
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/usb/usb_device.h>
 #include <zephyr/usb/class/usb_audio.h>
diff --git a/samples/subsys/usb/audio/headset/src/main.c b/samples/subsys/usb/audio/headset/src/main.c
index 7a861ce898..107d11fbf7 100644
--- a/samples/subsys/usb/audio/headset/src/main.c
+++ b/samples/subsys/usb/audio/headset/src/main.c
@@ -9,7 +9,7 @@
  * @brief Sample app for Audio class
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/usb/usb_device.h>
 #include <zephyr/usb/class/usb_audio.h>
diff --git a/samples/subsys/usb/cdc_acm/src/main.c b/samples/subsys/usb/cdc_acm/src/main.c
index 6a6ea94ba5..0e2ef88c08 100644
--- a/samples/subsys/usb/cdc_acm/src/main.c
+++ b/samples/subsys/usb/cdc_acm/src/main.c
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/ring_buffer.h>
 
 #include <zephyr/usb/usb_device.h>
diff --git a/samples/subsys/usb/cdc_acm_composite/src/main.c b/samples/subsys/usb/cdc_acm_composite/src/main.c
index e2c118f840..ca3384a21b 100644
--- a/samples/subsys/usb/cdc_acm_composite/src/main.c
+++ b/samples/subsys/usb/cdc_acm_composite/src/main.c
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/ring_buffer.h>
 
 #include <zephyr/usb/usb_device.h>
diff --git a/samples/subsys/usb/console/src/main.c b/samples/subsys/usb/console/src/main.c
index 919770db9c..5decdb4ee9 100644
--- a/samples/subsys/usb/console/src/main.c
+++ b/samples/subsys/usb/console/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/usb/usb_device.h>
 #include <zephyr/drivers/uart.h>
diff --git a/samples/subsys/usb/dfu/src/main.c b/samples/subsys/usb/dfu/src/main.c
index 26a37fa932..2f5d213012 100644
--- a/samples/subsys/usb/dfu/src/main.c
+++ b/samples/subsys/usb/dfu/src/main.c
@@ -7,7 +7,7 @@
 
 /* Sample app for USB DFU class driver. */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/usb/usb_device.h>
 LOG_MODULE_REGISTER(main);
diff --git a/samples/subsys/usb/hid-cdc/src/main.c b/samples/subsys/usb/hid-cdc/src/main.c
index 35ca2d3037..e257676ec3 100644
--- a/samples/subsys/usb/hid-cdc/src/main.c
+++ b/samples/subsys/usb/hid-cdc/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/uart.h>
diff --git a/samples/subsys/usb/hid-mouse/src/main.c b/samples/subsys/usb/hid-mouse/src/main.c
index 1cf9bdf794..e04b05b04c 100644
--- a/samples/subsys/usb/hid-mouse/src/main.c
+++ b/samples/subsys/usb/hid-mouse/src/main.c
@@ -4,7 +4,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 
diff --git a/samples/subsys/usb/hid/src/main.c b/samples/subsys/usb/hid/src/main.c
index f7910df3aa..ec28291a2a 100644
--- a/samples/subsys/usb/hid/src/main.c
+++ b/samples/subsys/usb/hid/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 
 #include <zephyr/usb/usb_device.h>
diff --git a/samples/subsys/usb/mass/src/main.c b/samples/subsys/usb/mass/src/main.c
index b43fe2e2df..49cf23e456 100644
--- a/samples/subsys/usb/mass/src/main.c
+++ b/samples/subsys/usb/mass/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/usb/usb_device.h>
 #include <zephyr/fs/fs.h>
diff --git a/samples/subsys/usb/testusb/src/main.c b/samples/subsys/usb/testusb/src/main.c
index 69fe0b7275..1313b28d59 100644
--- a/samples/subsys/usb/testusb/src/main.c
+++ b/samples/subsys/usb/testusb/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/usb/usb_device.h>
 LOG_MODULE_REGISTER(main);
diff --git a/samples/subsys/video/capture/src/main.c b/samples/subsys/video/capture/src/main.c
index aef420970f..196949e5d4 100644
--- a/samples/subsys/video/capture/src/main.c
+++ b/samples/subsys/video/capture/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 #include <zephyr/drivers/video.h>
diff --git a/samples/subsys/video/tcpserversink/src/main.c b/samples/subsys/video/tcpserversink/src/main.c
index 45f5b962bd..18152533df 100644
--- a/samples/subsys/video/tcpserversink/src/main.c
+++ b/samples/subsys/video/tcpserversink/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 #include <zephyr/net/socket.h>
diff --git a/samples/synchronization/src/main.c b/samples/synchronization/src/main.c
index d67e29e269..1befc1c89b 100644
--- a/samples/synchronization/src/main.c
+++ b/samples/synchronization/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 /*
diff --git a/samples/tfm_integration/psa_crypto/src/main.c b/samples/tfm_integration/psa_crypto/src/main.c
index f6c5c70e51..1ef298ecf7 100644
--- a/samples/tfm_integration/psa_crypto/src/main.c
+++ b/samples/tfm_integration/psa_crypto/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>
 
diff --git a/samples/tfm_integration/psa_crypto/src/psa_attestation.c b/samples/tfm_integration/psa_crypto/src/psa_attestation.c
index ac116b04a2..144239b774 100644
--- a/samples/tfm_integration/psa_crypto/src/psa_attestation.c
+++ b/samples/tfm_integration/psa_crypto/src/psa_attestation.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/logging/log.h>
 
diff --git a/samples/tfm_integration/psa_crypto/src/psa_crypto.c b/samples/tfm_integration/psa_crypto/src/psa_crypto.c
index da5420c9d0..b94edcd8b2 100644
--- a/samples/tfm_integration/psa_crypto/src/psa_crypto.c
+++ b/samples/tfm_integration/psa_crypto/src/psa_crypto.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/data/json.h>
diff --git a/samples/tfm_integration/psa_crypto/src/psa_crypto.h b/samples/tfm_integration/psa_crypto/src/psa_crypto.h
index 9eb75a9b68..1998e9ceec 100644
--- a/samples/tfm_integration/psa_crypto/src/psa_crypto.h
+++ b/samples/tfm_integration/psa_crypto/src/psa_crypto.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "psa/crypto.h"
 #include "psa/error.h"
diff --git a/samples/tfm_integration/psa_crypto/src/util_app_cfg.h b/samples/tfm_integration/psa_crypto/src/util_app_cfg.h
index b0f3a8935c..2b3e312b26 100644
--- a/samples/tfm_integration/psa_crypto/src/util_app_cfg.h
+++ b/samples/tfm_integration/psa_crypto/src/util_app_cfg.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "psa/error.h"
 
diff --git a/samples/tfm_integration/psa_crypto/src/util_app_log.c b/samples/tfm_integration/psa_crypto/src/util_app_log.c
index 7bb8140e36..52f766c81c 100644
--- a/samples/tfm_integration/psa_crypto/src/util_app_log.c
+++ b/samples/tfm_integration/psa_crypto/src/util_app_log.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>
 
diff --git a/samples/tfm_integration/psa_crypto/src/util_sformat.h b/samples/tfm_integration/psa_crypto/src/util_sformat.h
index b29d5a37a8..b76d2aa5b9 100644
--- a/samples/tfm_integration/psa_crypto/src/util_sformat.h
+++ b/samples/tfm_integration/psa_crypto/src/util_sformat.h
@@ -8,7 +8,7 @@
 #define _SFORMAT_H_
 
 #include <stdint.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/samples/tfm_integration/psa_firmware/src/main.c b/samples/tfm_integration/psa_firmware/src/main.c
index d28f9d4af6..25ffcd7cee 100644
--- a/samples/tfm_integration/psa_firmware/src/main.c
+++ b/samples/tfm_integration/psa_firmware/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>
 #include <psa/update.h>
diff --git a/samples/tfm_integration/psa_protected_storage/src/main.c b/samples/tfm_integration/psa_protected_storage/src/main.c
index 14fdcfe3d5..8c04e76db1 100644
--- a/samples/tfm_integration/psa_protected_storage/src/main.c
+++ b/samples/tfm_integration/psa_protected_storage/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <zephyr/sys/printk.h>
 #include <psa/storage_common.h>
diff --git a/samples/tfm_integration/tfm_ipc/src/main.c b/samples/tfm_integration/tfm_ipc/src/main.c
index 2081ce57b6..4676ab2652 100644
--- a/samples/tfm_integration/tfm_ipc/src/main.c
+++ b/samples/tfm_integration/tfm_ipc/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/reboot.h>
 
diff --git a/samples/tfm_integration/tfm_psa_test/src/main.c b/samples/tfm_integration/tfm_psa_test/src/main.c
index fcaa3bb6dd..0735e4476c 100644
--- a/samples/tfm_integration/tfm_psa_test/src/main.c
+++ b/samples/tfm_integration/tfm_psa_test/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /* Run the PSA test suite */
 void psa_test(void);
diff --git a/samples/tfm_integration/tfm_regression_test/src/main.c b/samples/tfm_integration/tfm_regression_test/src/main.c
index 8492e08b83..36bfc92b43 100644
--- a/samples/tfm_integration/tfm_regression_test/src/main.c
+++ b/samples/tfm_integration/tfm_regression_test/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 __attribute__((noreturn))
 void main(void)
diff --git a/samples/tfm_integration/tfm_secure_partition/src/main.c b/samples/tfm_integration/tfm_secure_partition/src/main.c
index ec557b253a..5923b77c7e 100644
--- a/samples/tfm_integration/tfm_secure_partition/src/main.c
+++ b/samples/tfm_integration/tfm_secure_partition/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <tfm_veneers.h>
 #include <tfm_ns_interface.h>
 
diff --git a/samples/userspace/hello_world_user/src/main.c b/samples/userspace/hello_world_user/src/main.c
index 4fd33836d7..52ed637bc4 100644
--- a/samples/userspace/hello_world_user/src/main.c
+++ b/samples/userspace/hello_world_user/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #define USER_STACKSIZE	2048
 
diff --git a/samples/userspace/shared_mem/src/main.h b/samples/userspace/shared_mem/src/main.h
index fd7091f3a5..3fa72b5df1 100644
--- a/samples/userspace/shared_mem/src/main.h
+++ b/samples/userspace/shared_mem/src/main.h
@@ -7,7 +7,7 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/kernel_structs.h>
 #include <string.h>
diff --git a/samples/userspace/syscall_perf/src/main.c b/samples/userspace/syscall_perf/src/main.c
index 55376c5f7d..2c5179670d 100644
--- a/samples/userspace/syscall_perf/src/main.c
+++ b/samples/userspace/syscall_perf/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 
 #include "thread_def.h"
diff --git a/samples/userspace/syscall_perf/src/test_supervisor.c b/samples/userspace/syscall_perf/src/test_supervisor.c
index 72a9aaaa2c..6800a5e97f 100644
--- a/samples/userspace/syscall_perf/src/test_supervisor.c
+++ b/samples/userspace/syscall_perf/src/test_supervisor.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 
 /*
diff --git a/samples/userspace/syscall_perf/src/test_user.c b/samples/userspace/syscall_perf/src/test_user.c
index e51654f489..947d046f6f 100644
--- a/samples/userspace/syscall_perf/src/test_user.c
+++ b/samples/userspace/syscall_perf/src/test_user.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 
 /*
diff --git a/scripts/build/gen_cfb_font_header.py b/scripts/build/gen_cfb_font_header.py
index 17c0d2c364..380237e12f 100755
--- a/scripts/build/gen_cfb_font_header.py
+++ b/scripts/build/gen_cfb_font_header.py
@@ -155,7 +155,7 @@ def generate_header():
  *
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/display/cfb.h>
 
 static const uint8_t cfb_font_{name:s}_{width:d}{height:d}[{elem:d}][{b:.0f}] = {{\n"""
diff --git a/scripts/build/gen_relocate_app.py b/scripts/build/gen_relocate_app.py
index 48db0d6818..594dba1bd3 100644
--- a/scripts/build/gen_relocate_app.py
+++ b/scripts/build/gen_relocate_app.py
@@ -114,7 +114,7 @@ LINKER_SECTION_SEQ_MPU = """
 
 SOURCE_CODE_INCLUDES = """
 /* Auto generated code. Do not modify.*/
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
diff --git a/soc/arm/microchip_mec/common/soc_i2c.c b/soc/arm/microchip_mec/common/soc_i2c.c
index e3e42977d4..b2e5afbf17 100644
--- a/soc/arm/microchip_mec/common/soc_i2c.c
+++ b/soc/arm/microchip_mec/common/soc_i2c.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/sys_io.h>
 #include <zephyr/sys/__assert.h>
 #include <soc.h>
diff --git a/soc/arm/microchip_mec/mec1501/device_power.c b/soc/arm/microchip_mec/mec1501/device_power.c
index e5fde152ad..1fcba362fe 100644
--- a/soc/arm/microchip_mec/mec1501/device_power.c
+++ b/soc/arm/microchip_mec/mec1501/device_power.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/sys_io.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/pm/pm.h>
diff --git a/soc/arm/microchip_mec/mec1501/power.c b/soc/arm/microchip_mec/mec1501/power.c
index f4a5642555..9d2f229b11 100644
--- a/soc/arm/microchip_mec/mec1501/power.c
+++ b/soc/arm/microchip_mec/mec1501/power.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/sys_io.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/pm/pm.h>
diff --git a/soc/arm/microchip_mec/mec172x/device_power.c b/soc/arm/microchip_mec/mec172x/device_power.c
index 36c2721036..601ce99c61 100644
--- a/soc/arm/microchip_mec/mec172x/device_power.c
+++ b/soc/arm/microchip_mec/mec172x/device_power.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/sys_io.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/pm/pm.h>
diff --git a/soc/arm/microchip_mec/mec172x/power.c b/soc/arm/microchip_mec/mec172x/power.c
index 1b0cc96600..55805f4499 100644
--- a/soc/arm/microchip_mec/mec172x/power.c
+++ b/soc/arm/microchip_mec/mec172x/power.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/sys_io.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/pm/pm.h>
diff --git a/soc/arm/nordic_nrf/nrf51/power.c b/soc/arm/nordic_nrf/nrf51/power.c
index 6d2224db87..8291d10700 100644
--- a/soc/arm/nordic_nrf/nrf51/power.c
+++ b/soc/arm/nordic_nrf/nrf51/power.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <hal/nrf_power.h>
 
diff --git a/soc/arm/nordic_nrf/nrf52/power.c b/soc/arm/nordic_nrf/nrf52/power.c
index 6d2224db87..8291d10700 100644
--- a/soc/arm/nordic_nrf/nrf52/power.c
+++ b/soc/arm/nordic_nrf/nrf52/power.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <hal/nrf_power.h>
 
diff --git a/soc/arm/nordic_nrf/nrf53/power.c b/soc/arm/nordic_nrf/nrf53/power.c
index bdc67df214..ccd658be6e 100644
--- a/soc/arm/nordic_nrf/nrf53/power.c
+++ b/soc/arm/nordic_nrf/nrf53/power.c
@@ -4,7 +4,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 
 #include <hal/nrf_regulators.h>
diff --git a/soc/arm/nordic_nrf/nrf91/power.c b/soc/arm/nordic_nrf/nrf91/power.c
index 02ce9d5c09..2083490606 100644
--- a/soc/arm/nordic_nrf/nrf91/power.c
+++ b/soc/arm/nordic_nrf/nrf91/power.c
@@ -4,7 +4,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <hal/nrf_regulators.h>
 
diff --git a/soc/arm/nuvoton_npcx/common/power.c b/soc/arm/nuvoton_npcx/common/power.c
index 0ab072b4a7..379784231d 100644
--- a/soc/arm/nuvoton_npcx/common/power.c
+++ b/soc/arm/nuvoton_npcx/common/power.c
@@ -46,7 +46,7 @@
  */
 
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/espi.h>
 #include <zephyr/pm/pm.h>
diff --git a/soc/arm/nxp_imx/rt/lpm_rt1064.c b/soc/arm/nxp_imx/rt/lpm_rt1064.c
index df6142e7c1..0fde542a63 100644
--- a/soc/arm/nxp_imx/rt/lpm_rt1064.c
+++ b/soc/arm/nxp_imx/rt/lpm_rt1064.c
@@ -9,7 +9,7 @@
 
 #include <zephyr/init.h>
 #include <power_rt10xx.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <fsl_clock.h>
 
 /*
diff --git a/soc/arm/nxp_imx/rt/power_rt10xx.c b/soc/arm/nxp_imx/rt/power_rt10xx.c
index 77c57ad6c5..57a7ccfd95 100644
--- a/soc/arm/nxp_imx/rt/power_rt10xx.c
+++ b/soc/arm/nxp_imx/rt/power_rt10xx.c
@@ -6,7 +6,7 @@
  * Note: this file is linked to RAM. Any functions called while preparing for
  * sleep mode must be defined within this file, or linked to RAM.
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/pm/pm.h>
 #include <fsl_dcdc.h>
diff --git a/soc/arm/nxp_imx/rt/power_rt11xx.c b/soc/arm/nxp_imx/rt/power_rt11xx.c
index 5b424b5bf5..9ce36869ea 100644
--- a/soc/arm/nxp_imx/rt/power_rt11xx.c
+++ b/soc/arm/nxp_imx/rt/power_rt11xx.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/pm/pm.h>
 #include <fsl_dcdc.h>
diff --git a/soc/arm/nxp_imx/rt6xx/power.c b/soc/arm/nxp_imx/rt6xx/power.c
index 95389a4c79..6709f7b2c9 100644
--- a/soc/arm/nxp_imx/rt6xx/power.c
+++ b/soc/arm/nxp_imx/rt6xx/power.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include "fsl_power.h"
 
diff --git a/soc/arm/silabs_exx32/common/soc_power.c b/soc/arm/silabs_exx32/common/soc_power.c
index a11d837928..a0ba7104a1 100644
--- a/soc/arm/silabs_exx32/common/soc_power.c
+++ b/soc/arm/silabs_exx32/common/soc_power.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <em_emu.h>
 
diff --git a/soc/arm/st_stm32/stm32g0/power.c b/soc/arm/st_stm32/stm32g0/power.c
index 73db2ff56c..43b54686f1 100644
--- a/soc/arm/st_stm32/stm32g0/power.c
+++ b/soc/arm/st_stm32/stm32g0/power.c
@@ -4,7 +4,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <soc.h>
 #include <zephyr/init.h>
diff --git a/soc/arm/st_stm32/stm32l0/power.c b/soc/arm/st_stm32/stm32l0/power.c
index b82aff909a..a1fa8ae4e4 100644
--- a/soc/arm/st_stm32/stm32l0/power.c
+++ b/soc/arm/st_stm32/stm32l0/power.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <soc.h>
 #include <zephyr/init.h>
diff --git a/soc/arm/st_stm32/stm32l4/power.c b/soc/arm/st_stm32/stm32l4/power.c
index 1b8fea72a9..dee84a1770 100644
--- a/soc/arm/st_stm32/stm32l4/power.c
+++ b/soc/arm/st_stm32/stm32l4/power.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <soc.h>
 #include <zephyr/init.h>
diff --git a/soc/arm/st_stm32/stm32l5/power.c b/soc/arm/st_stm32/stm32l5/power.c
index 91c73b8e3b..770cffb67f 100644
--- a/soc/arm/st_stm32/stm32l5/power.c
+++ b/soc/arm/st_stm32/stm32l5/power.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <soc.h>
 #include <zephyr/init.h>
diff --git a/soc/arm/st_stm32/stm32u5/power.c b/soc/arm/st_stm32/stm32u5/power.c
index b0d01e9d63..b050caa55a 100644
--- a/soc/arm/st_stm32/stm32u5/power.c
+++ b/soc/arm/st_stm32/stm32u5/power.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <soc.h>
 #include <zephyr/init.h>
diff --git a/soc/arm/st_stm32/stm32wb/power.c b/soc/arm/st_stm32/stm32wb/power.c
index a48ddc332c..291bec1094 100644
--- a/soc/arm/st_stm32/stm32wb/power.c
+++ b/soc/arm/st_stm32/stm32wb/power.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <soc.h>
 #include <zephyr/init.h>
diff --git a/soc/arm/st_stm32/stm32wl/power.c b/soc/arm/st_stm32/stm32wl/power.c
index bb79260aaf..b0b4755ddc 100644
--- a/soc/arm/st_stm32/stm32wl/power.c
+++ b/soc/arm/st_stm32/stm32wl/power.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <soc.h>
 #include <zephyr/init.h>
diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c b/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c
index 5fdc3b4732..dd5ae3e8f2 100644
--- a/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c
+++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <zephyr/pm/pm.h>
 #include <zephyr/pm/policy.h>
diff --git a/soc/riscv/esp32c3/loader.c b/soc/riscv/esp32c3/loader.c
index 49a4121a98..79c70328b2 100644
--- a/soc/riscv/esp32c3/loader.c
+++ b/soc/riscv/esp32c3/loader.c
@@ -9,7 +9,7 @@
 #include "soc/extmem_reg.h"
 #include <bootloader_flash_priv.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/storage/flash_map.h>
 #include <esp_log.h>
diff --git a/soc/xtensa/esp32/esp32-mp.c b/soc/xtensa/esp32/esp32-mp.c
index 3ab9bdd471..df0a7de104 100644
--- a/soc/xtensa/esp32/esp32-mp.c
+++ b/soc/xtensa/esp32/esp32-mp.c
@@ -12,7 +12,7 @@
 #include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <soc.h>
 #include <zephyr/device.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/spinlock.h>
 #include <zephyr/kernel_structs.h>
 
diff --git a/soc/xtensa/esp32/loader.c b/soc/xtensa/esp32/loader.c
index b20fda6f77..b8ced36a6d 100644
--- a/soc/xtensa/esp32/loader.c
+++ b/soc/xtensa/esp32/loader.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/storage/flash_map.h>
 #include <esp_log.h>
diff --git a/soc/xtensa/esp32s2/loader.c b/soc/xtensa/esp32s2/loader.c
index aba6f7e41c..f10cfcb032 100644
--- a/soc/xtensa/esp32s2/loader.c
+++ b/soc/xtensa/esp32s2/loader.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/storage/flash_map.h>
 #include <esp_log.h>
diff --git a/soc/xtensa/intel_adsp/ace_v1x/multiprocessing.c b/soc/xtensa/intel_adsp/ace_v1x/multiprocessing.c
index 77215ca1ec..8b2099a363 100644
--- a/soc/xtensa/intel_adsp/ace_v1x/multiprocessing.c
+++ b/soc/xtensa/intel_adsp/ace_v1x/multiprocessing.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/check.h>
 
 #include <soc.h>
diff --git a/soc/xtensa/intel_adsp/ace_v1x/power.c b/soc/xtensa/intel_adsp/ace_v1x/power.c
index 4f61103509..b096fd042b 100644
--- a/soc/xtensa/intel_adsp/ace_v1x/power.c
+++ b/soc/xtensa/intel_adsp/ace_v1x/power.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <cpu_init.h>
 
diff --git a/soc/xtensa/intel_adsp/common/trace_out.c b/soc/xtensa/intel_adsp/common/trace_out.c
index 68978ce8a1..267a60e39f 100644
--- a/soc/xtensa/intel_adsp/common/trace_out.c
+++ b/soc/xtensa/intel_adsp/common/trace_out.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2021 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <adsp_memory.h>
 #include <zephyr/sys/winstream.h>
diff --git a/subsys/bluetooth/audio/aics.c b/subsys/bluetooth/audio/aics.c
index 559e2a26f9..68560e100f 100644
--- a/subsys/bluetooth/audio/aics.c
+++ b/subsys/bluetooth/audio/aics.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 
diff --git a/subsys/bluetooth/audio/aics_client.c b/subsys/bluetooth/audio/aics_client.c
index 6661faa74f..57d0aeac8e 100644
--- a/subsys/bluetooth/audio/aics_client.c
+++ b/subsys/bluetooth/audio/aics_client.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <zephyr/sys/check.h>
diff --git a/subsys/bluetooth/audio/ascs.c b/subsys/bluetooth/audio/ascs.c
index df904e5db3..ff578d1316 100644
--- a/subsys/bluetooth/audio/ascs.c
+++ b/subsys/bluetooth/audio/ascs.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 
diff --git a/subsys/bluetooth/audio/bass.c b/subsys/bluetooth/audio/bass.c
index e01df9aed1..a288143dc4 100644
--- a/subsys/bluetooth/audio/bass.c
+++ b/subsys/bluetooth/audio/bass.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
 
diff --git a/subsys/bluetooth/audio/bass_client.c b/subsys/bluetooth/audio/bass_client.c
index d1eeec5f53..523ed40415 100644
--- a/subsys/bluetooth/audio/bass_client.c
+++ b/subsys/bluetooth/audio/bass_client.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <zephyr/device.h>
diff --git a/subsys/bluetooth/audio/broadcast_sink.c b/subsys/bluetooth/audio/broadcast_sink.c
index 615c00c06c..646c333c27 100644
--- a/subsys/bluetooth/audio/broadcast_sink.c
+++ b/subsys/bluetooth/audio/broadcast_sink.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 
diff --git a/subsys/bluetooth/audio/broadcast_source.c b/subsys/bluetooth/audio/broadcast_source.c
index 6bb5152a47..89af27cc2b 100644
--- a/subsys/bluetooth/audio/broadcast_source.c
+++ b/subsys/bluetooth/audio/broadcast_source.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 
diff --git a/subsys/bluetooth/audio/capabilities.c b/subsys/bluetooth/audio/capabilities.c
index da2146133c..6c8208f6a7 100644
--- a/subsys/bluetooth/audio/capabilities.c
+++ b/subsys/bluetooth/audio/capabilities.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include <zephyr/device.h>
diff --git a/subsys/bluetooth/audio/csis.c b/subsys/bluetooth/audio/csis.c
index 110df9a1f2..2377497b69 100644
--- a/subsys/bluetooth/audio/csis.c
+++ b/subsys/bluetooth/audio/csis.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <zephyr/device.h>
diff --git a/subsys/bluetooth/audio/csis_client.c b/subsys/bluetooth/audio/csis_client.c
index 7c4b0f9289..babd2a1321 100644
--- a/subsys/bluetooth/audio/csis_client.c
+++ b/subsys/bluetooth/audio/csis_client.c
@@ -19,7 +19,7 @@
  */
 
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <zephyr/device.h>
diff --git a/subsys/bluetooth/audio/has.c b/subsys/bluetooth/audio/has.c
index c548483582..8cc0946aa0 100644
--- a/subsys/bluetooth/audio/has.c
+++ b/subsys/bluetooth/audio/has.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/device.h>
 
diff --git a/subsys/bluetooth/audio/has_client.c b/subsys/bluetooth/audio/has_client.c
index d69ccfa1d9..aa933da806 100644
--- a/subsys/bluetooth/audio/has_client.c
+++ b/subsys/bluetooth/audio/has_client.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/gatt.h>
diff --git a/subsys/bluetooth/audio/mcc.c b/subsys/bluetooth/audio/mcc.c
index bc446205df..380d43ba30 100644
--- a/subsys/bluetooth/audio/mcc.c
+++ b/subsys/bluetooth/audio/mcc.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
diff --git a/subsys/bluetooth/audio/mcs.c b/subsys/bluetooth/audio/mcs.c
index 0638f8672a..9e0ce2b698 100644
--- a/subsys/bluetooth/audio/mcs.c
+++ b/subsys/bluetooth/audio/mcs.c
@@ -9,7 +9,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdbool.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
diff --git a/subsys/bluetooth/audio/micp_mic_ctlr.c b/subsys/bluetooth/audio/micp_mic_ctlr.c
index 12624d7043..ffa9be5aa0 100644
--- a/subsys/bluetooth/audio/micp_mic_ctlr.c
+++ b/subsys/bluetooth/audio/micp_mic_ctlr.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <zephyr/sys/check.h>
diff --git a/subsys/bluetooth/audio/micp_mic_dev.c b/subsys/bluetooth/audio/micp_mic_dev.c
index 3b882b4d74..56329079f9 100644
--- a/subsys/bluetooth/audio/micp_mic_dev.c
+++ b/subsys/bluetooth/audio/micp_mic_dev.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 
diff --git a/subsys/bluetooth/audio/pacs.c b/subsys/bluetooth/audio/pacs.c
index 009178b048..cb32d650b9 100644
--- a/subsys/bluetooth/audio/pacs.c
+++ b/subsys/bluetooth/audio/pacs.c
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 
diff --git a/subsys/bluetooth/audio/stream.c b/subsys/bluetooth/audio/stream.c
index 8ad5562c8b..c6054b1a95 100644
--- a/subsys/bluetooth/audio/stream.c
+++ b/subsys/bluetooth/audio/stream.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 
diff --git a/subsys/bluetooth/audio/tbs.c b/subsys/bluetooth/audio/tbs.c
index 9be22c5641..4ac23993ce 100644
--- a/subsys/bluetooth/audio/tbs.c
+++ b/subsys/bluetooth/audio/tbs.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <zephyr/device.h>
diff --git a/subsys/bluetooth/audio/tbs_client.c b/subsys/bluetooth/audio/tbs_client.c
index 6be04056e0..86f864a51b 100644
--- a/subsys/bluetooth/audio/tbs_client.c
+++ b/subsys/bluetooth/audio/tbs_client.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/sys/check.h>
 
diff --git a/subsys/bluetooth/audio/unicast_client.c b/subsys/bluetooth/audio/unicast_client.c
index b918e3b59b..9cd8d07974 100644
--- a/subsys/bluetooth/audio/unicast_client.c
+++ b/subsys/bluetooth/audio/unicast_client.c
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 
diff --git a/subsys/bluetooth/audio/vcs.c b/subsys/bluetooth/audio/vcs.c
index 77c56d219e..5d885c8849 100644
--- a/subsys/bluetooth/audio/vcs.c
+++ b/subsys/bluetooth/audio/vcs.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 
diff --git a/subsys/bluetooth/audio/vcs_client.c b/subsys/bluetooth/audio/vcs_client.c
index 5476aaf4f7..05fd5f30c2 100644
--- a/subsys/bluetooth/audio/vcs_client.c
+++ b/subsys/bluetooth/audio/vcs_client.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <zephyr/sys/check.h>
diff --git a/subsys/bluetooth/audio/vocs.c b/subsys/bluetooth/audio/vocs.c
index c0bd977de1..5a26e7c063 100644
--- a/subsys/bluetooth/audio/vocs.c
+++ b/subsys/bluetooth/audio/vocs.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 
diff --git a/subsys/bluetooth/audio/vocs_client.c b/subsys/bluetooth/audio/vocs_client.c
index cecbf3aab3..de680b15da 100644
--- a/subsys/bluetooth/audio/vocs_client.c
+++ b/subsys/bluetooth/audio/vocs_client.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <zephyr/device.h>
diff --git a/subsys/bluetooth/common/dummy.c b/subsys/bluetooth/common/dummy.c
index 10d8f397d5..4b9d393cc9 100644
--- a/subsys/bluetooth/common/dummy.c
+++ b/subsys/bluetooth/common/dummy.c
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/bluetooth.h>
 
 /*
diff --git a/subsys/bluetooth/common/log.c b/subsys/bluetooth/common/log.c
index 075350b8db..063dc2edcb 100644
--- a/subsys/bluetooth/common/log.c
+++ b/subsys/bluetooth/common/log.c
@@ -14,7 +14,7 @@
 
 #include <stddef.h>
 #include <zephyr/types.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/uuid.h>
diff --git a/subsys/bluetooth/common/log.h b/subsys/bluetooth/common/log.h
index 1bfc384b6c..69480d6d46 100644
--- a/subsys/bluetooth/common/log.h
+++ b/subsys/bluetooth/common/log.h
@@ -13,7 +13,7 @@
 
 #include <zephyr/linker/sections.h>
 #include <offsets.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/__assert.h>
 
diff --git a/subsys/bluetooth/common/rpa.c b/subsys/bluetooth/common/rpa.c
index b1c031ea0f..0fb5fe528b 100644
--- a/subsys/bluetooth/common/rpa.c
+++ b/subsys/bluetooth/common/rpa.c
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <errno.h>
 #include <string.h>
diff --git a/subsys/bluetooth/controller/hci/hci_driver.c b/subsys/bluetooth/controller/hci/hci_driver.c
index a1c53ead19..9cce33170c 100644
--- a/subsys/bluetooth/controller/hci/hci_driver.c
+++ b/subsys/bluetooth/controller/hci/hci_driver.c
@@ -9,7 +9,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/init.h>
 #include <zephyr/device.h>
diff --git a/subsys/bluetooth/controller/ll_sw/isoal.c b/subsys/bluetooth/controller/ll_sw/isoal.c
index 4da1ea9ed6..86bd2e3fc1 100644
--- a/subsys/bluetooth/controller/ll_sw/isoal.c
+++ b/subsys/bluetooth/controller/ll_sw/isoal.c
@@ -9,7 +9,7 @@
 #include <zephyr/toolchain.h>
 #include <zephyr/sys/util.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 
diff --git a/subsys/bluetooth/controller/ll_sw/ll_addr.c b/subsys/bluetooth/controller/ll_sw/ll_addr.c
index 0c3d7413df..3bf867e8d5 100644
--- a/subsys/bluetooth/controller/ll_sw/ll_addr.c
+++ b/subsys/bluetooth/controller/ll_sw/ll_addr.c
@@ -7,7 +7,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/controller.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ll_feat.c b/subsys/bluetooth/controller/ll_sw/ll_feat.c
index 9a20143a26..a3161e57fa 100644
--- a/subsys/bluetooth/controller/ll_sw/ll_feat.c
+++ b/subsys/bluetooth/controller/ll_sw/ll_feat.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "util/util.h"
 #include "util/memq.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c b/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c
index 6361d04bb0..49518359b4 100644
--- a/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c
+++ b/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/hci_vs.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ull.c b/subsys/bluetooth/controller/ll_sw/ull.c
index ca4892bdaa..32bdc7c13c 100644
--- a/subsys/bluetooth/controller/ll_sw/ull.c
+++ b/subsys/bluetooth/controller/ll_sw/ull.c
@@ -8,7 +8,7 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/entropy.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv.c b/subsys/bluetooth/controller/ll_sw/ull_adv.c
index eb17a5a1a9..92f22bcf2b 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv.c
@@ -7,7 +7,7 @@
 
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c b/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
index 7902bdecf5..3228dba167 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c b/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
index 1d1a73ab4f..75868f55d5 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_sync.c b/subsys/bluetooth/controller/ll_sw/ull_adv_sync.c
index 50f0e28303..8f73ee5a6e 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_sync.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ull_central.c b/subsys/bluetooth/controller/ll_sw/ull_central.c
index 4ea584d9b6..27b6b0c964 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_central.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_central.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ull_central_iso.c b/subsys/bluetooth/controller/ll_sw/ull_central_iso.c
index 989a614163..7019be2c8f 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_central_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_central_iso.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
 #define LOG_MODULE_NAME bt_ctlr_ull_central_iso
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c
index a81087cd86..0886f42820 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c
@@ -5,7 +5,7 @@
  */
 
 #include <stddef.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c b/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c
index cf1749cc4c..e7d786935d 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/bluetooth/bluetooth.h>
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_df.c b/subsys/bluetooth/controller/ll_sw/ull_df.c
index 3f6813e5f3..1d83389978 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_df.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_df.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ull_filter.c b/subsys/bluetooth/controller/ll_sw/ull_filter.c
index 613c1e150c..093f759b1a 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_filter.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_filter.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ull_iso.c b/subsys/bluetooth/controller/ll_sw/ull_iso.c
index 3744b0a222..0e324bfaf1 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_iso.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/sys/byteorder.h>
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_peripheral.c b/subsys/bluetooth/controller/ll_sw/ull_peripheral.c
index 26af85de95..e869c8efc3 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_peripheral.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_peripheral.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c b/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
index 8f94645e12..f5179dfb60 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/buf.h>
 #include <zephyr/sys/byteorder.h>
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan.c b/subsys/bluetooth/controller/ll_sw/ull_scan.c
index 99648f6079..b28a707259 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/bluetooth/hci.h>
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sched.c b/subsys/bluetooth/controller/ll_sw/ull_sched.c
index 8998628bcc..981ce6973d 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sched.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sched.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/sys/byteorder.h>
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sync.c b/subsys/bluetooth/controller/ll_sw/ull_sync.c
index e64754cd43..01b8528d3e 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sync.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c b/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
index ecc31b918c..2c02f18f7a 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/sys/byteorder.h>
 
diff --git a/subsys/bluetooth/host/a2dp.c b/subsys/bluetooth/host/a2dp.c
index b4b516ec8d..ae878c19f0 100644
--- a/subsys/bluetooth/host/a2dp.c
+++ b/subsys/bluetooth/host/a2dp.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <zephyr/sys/atomic.h>
diff --git a/subsys/bluetooth/host/aes_ccm.c b/subsys/bluetooth/host/aes_ccm.c
index 2797a30b9a..82e7882a8b 100644
--- a/subsys/bluetooth/host/aes_ccm.c
+++ b/subsys/bluetooth/host/aes_ccm.c
@@ -7,7 +7,7 @@
 
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/bluetooth/crypto.h>
 
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index df2f1c8e32..5f61b93eae 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/subsys/bluetooth/host/avdtp.c b/subsys/bluetooth/host/avdtp.c
index 39d6551ca3..e617324931 100644
--- a/subsys/bluetooth/host/avdtp.c
+++ b/subsys/bluetooth/host/avdtp.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 118ab0be7a..7f8a5d17e4 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/subsys/bluetooth/host/crypto.c b/subsys/bluetooth/host/crypto.c
index 6d83939dee..87454e3d22 100644
--- a/subsys/bluetooth/host/crypto.c
+++ b/subsys/bluetooth/host/crypto.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
index a200805a07..b636a2a2c4 100644
--- a/subsys/bluetooth/host/gatt.c
+++ b/subsys/bluetooth/host/gatt.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index 3660f49600..6d92d5fb7d 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/subsys/bluetooth/host/hci_ecc.c b/subsys/bluetooth/host/hci_ecc.c
index 45ebb208a0..ea49a015cd 100644
--- a/subsys/bluetooth/host/hci_ecc.c
+++ b/subsys/bluetooth/host/hci_ecc.c
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/debug/stack.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/subsys/bluetooth/host/hfp_hf.c b/subsys/bluetooth/host/hfp_hf.c
index 15350f2d67..b26112da79 100644
--- a/subsys/bluetooth/host/hfp_hf.c
+++ b/subsys/bluetooth/host/hfp_hf.c
@@ -5,7 +5,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/subsys/bluetooth/host/iso.c b/subsys/bluetooth/host/iso.c
index 54de8fe071..e6fd2decce 100644
--- a/subsys/bluetooth/host/iso.c
+++ b/subsys/bluetooth/host/iso.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/check.h>
 
diff --git a/subsys/bluetooth/host/keys.c b/subsys/bluetooth/host/keys.c
index e80275e2e4..6dc28e837c 100644
--- a/subsys/bluetooth/host/keys.c
+++ b/subsys/bluetooth/host/keys.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <stdlib.h>
 #include <zephyr/sys/atomic.h>
diff --git a/subsys/bluetooth/host/keys_br.c b/subsys/bluetooth/host/keys_br.c
index f84aff245e..96aee6c973 100644
--- a/subsys/bluetooth/host/keys_br.c
+++ b/subsys/bluetooth/host/keys_br.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/util.h>
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 7691bcc246..4b12c0402a 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <zephyr/sys/atomic.h>
diff --git a/subsys/bluetooth/host/l2cap_br.c b/subsys/bluetooth/host/l2cap_br.c
index a9e440bef7..fc261062f1 100644
--- a/subsys/bluetooth/host/l2cap_br.c
+++ b/subsys/bluetooth/host/l2cap_br.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <zephyr/sys/atomic.h>
diff --git a/subsys/bluetooth/host/monitor.c b/subsys/bluetooth/host/monitor.c
index 19e935646d..19b15b0298 100644
--- a/subsys/bluetooth/host/monitor.c
+++ b/subsys/bluetooth/host/monitor.c
@@ -11,7 +11,7 @@
 #include <zephyr/types.h>
 #include <stdbool.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
 #include <zephyr/drivers/uart_pipe.h>
diff --git a/subsys/bluetooth/host/rfcomm.c b/subsys/bluetooth/host/rfcomm.c
index 71b58483ef..284f4c8a24 100644
--- a/subsys/bluetooth/host/rfcomm.c
+++ b/subsys/bluetooth/host/rfcomm.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <zephyr/sys/atomic.h>
diff --git a/subsys/bluetooth/host/settings.c b/subsys/bluetooth/host/settings.c
index 2b99e22157..7e4c83bef0 100644
--- a/subsys/bluetooth/host/settings.c
+++ b/subsys/bluetooth/host/settings.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/settings/settings.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/subsys/bluetooth/host/smp.c b/subsys/bluetooth/host/smp.c
index 492f06f49e..a0a48a816f 100644
--- a/subsys/bluetooth/host/smp.c
+++ b/subsys/bluetooth/host/smp.c
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <errno.h>
 #include <string.h>
diff --git a/subsys/bluetooth/host/smp_null.c b/subsys/bluetooth/host/smp_null.c
index 39ded45529..bf5cc18db4 100644
--- a/subsys/bluetooth/host/smp_null.c
+++ b/subsys/bluetooth/host/smp_null.c
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/util.h>
diff --git a/subsys/bluetooth/host/testing.c b/subsys/bluetooth/host/testing.c
index bc957d1c59..db865ea526 100644
--- a/subsys/bluetooth/host/testing.c
+++ b/subsys/bluetooth/host/testing.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 
 #include <zephyr/bluetooth/testing.h>
diff --git a/subsys/bluetooth/mesh/access.c b/subsys/bluetooth/mesh/access.c
index 6806bb2815..916c23ac91 100644
--- a/subsys/bluetooth/mesh/access.c
+++ b/subsys/bluetooth/mesh/access.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <zephyr/sys/util.h>
diff --git a/subsys/bluetooth/mesh/adv.c b/subsys/bluetooth/mesh/adv.c
index 686f994a72..17681aa183 100644
--- a/subsys/bluetooth/mesh/adv.c
+++ b/subsys/bluetooth/mesh/adv.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/debug/stack.h>
 #include <zephyr/sys/util.h>
 
diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index f467941bf4..dc761c5897 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/debug/stack.h>
 
 #include <zephyr/net/buf.h>
diff --git a/subsys/bluetooth/mesh/adv_legacy.c b/subsys/bluetooth/mesh/adv_legacy.c
index a1519d5ebb..115adb781d 100644
--- a/subsys/bluetooth/mesh/adv_legacy.c
+++ b/subsys/bluetooth/mesh/adv_legacy.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/debug/stack.h>
 #include <zephyr/sys/util.h>
 
diff --git a/subsys/bluetooth/mesh/beacon.c b/subsys/bluetooth/mesh/beacon.c
index 5f0c6b6f3a..34ec2a7c48 100644
--- a/subsys/bluetooth/mesh/beacon.c
+++ b/subsys/bluetooth/mesh/beacon.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/sys/util.h>
 
diff --git a/subsys/bluetooth/mesh/cdb.c b/subsys/bluetooth/mesh/cdb.c
index 6159667597..762eadf773 100644
--- a/subsys/bluetooth/mesh/cdb.c
+++ b/subsys/bluetooth/mesh/cdb.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/subsys/bluetooth/mesh/cfg_cli.c b/subsys/bluetooth/mesh/cfg_cli.c
index f46a73a802..3824100995 100644
--- a/subsys/bluetooth/mesh/cfg_cli.c
+++ b/subsys/bluetooth/mesh/cfg_cli.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/subsys/bluetooth/mesh/cfg_srv.c b/subsys/bluetooth/mesh/cfg_srv.c
index 547331248c..33bae19bf5 100644
--- a/subsys/bluetooth/mesh/cfg_srv.c
+++ b/subsys/bluetooth/mesh/cfg_srv.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/subsys/bluetooth/mesh/friend.c b/subsys/bluetooth/mesh/friend.c
index b31473bac9..d5a05b83d5 100644
--- a/subsys/bluetooth/mesh/friend.c
+++ b/subsys/bluetooth/mesh/friend.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include <zephyr/net/buf.h>
diff --git a/subsys/bluetooth/mesh/gatt_cli.c b/subsys/bluetooth/mesh/gatt_cli.c
index 7a4184c394..0232830b7d 100644
--- a/subsys/bluetooth/mesh/gatt_cli.c
+++ b/subsys/bluetooth/mesh/gatt_cli.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include <zephyr/net/buf.h>
diff --git a/subsys/bluetooth/mesh/health_cli.c b/subsys/bluetooth/mesh/health_cli.c
index a463546b00..582d74b11a 100644
--- a/subsys/bluetooth/mesh/health_cli.c
+++ b/subsys/bluetooth/mesh/health_cli.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/subsys/bluetooth/mesh/health_srv.c b/subsys/bluetooth/mesh/health_srv.c
index 55096abade..25360ef186 100644
--- a/subsys/bluetooth/mesh/health_srv.c
+++ b/subsys/bluetooth/mesh/health_srv.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/subsys/bluetooth/mesh/lpn.c b/subsys/bluetooth/mesh/lpn.c
index 7ec5fb02c0..7fb74cd2b7 100644
--- a/subsys/bluetooth/mesh/lpn.c
+++ b/subsys/bluetooth/mesh/lpn.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include <zephyr/net/buf.h>
diff --git a/subsys/bluetooth/mesh/main.c b/subsys/bluetooth/mesh/main.c
index 7edaab91f1..956146d78d 100644
--- a/subsys/bluetooth/mesh/main.c
+++ b/subsys/bluetooth/mesh/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdbool.h>
 #include <errno.h>
 
diff --git a/subsys/bluetooth/mesh/net.c b/subsys/bluetooth/mesh/net.c
index 2593d5a46b..a8775dd350 100644
--- a/subsys/bluetooth/mesh/net.c
+++ b/subsys/bluetooth/mesh/net.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/subsys/bluetooth/mesh/pb_gatt_cli.c b/subsys/bluetooth/mesh/pb_gatt_cli.c
index 0cbaebe33a..c6cc7eb186 100644
--- a/subsys/bluetooth/mesh/pb_gatt_cli.c
+++ b/subsys/bluetooth/mesh/pb_gatt_cli.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include <zephyr/net/buf.h>
diff --git a/subsys/bluetooth/mesh/pb_gatt_srv.c b/subsys/bluetooth/mesh/pb_gatt_srv.c
index 16d8d6419a..d3f3b3a8ea 100644
--- a/subsys/bluetooth/mesh/pb_gatt_srv.c
+++ b/subsys/bluetooth/mesh/pb_gatt_srv.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include <zephyr/net/buf.h>
diff --git a/subsys/bluetooth/mesh/prov.c b/subsys/bluetooth/mesh/prov.c
index 8a243b0f60..42dc2f5147 100644
--- a/subsys/bluetooth/mesh/prov.c
+++ b/subsys/bluetooth/mesh/prov.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/util.h>
diff --git a/subsys/bluetooth/mesh/prov_device.c b/subsys/bluetooth/mesh/prov_device.c
index fa5a9e2d25..d7cf80b8c5 100644
--- a/subsys/bluetooth/mesh/prov_device.c
+++ b/subsys/bluetooth/mesh/prov_device.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/util.h>
diff --git a/subsys/bluetooth/mesh/provisioner.c b/subsys/bluetooth/mesh/provisioner.c
index ace74c4a5a..a13642ea6c 100644
--- a/subsys/bluetooth/mesh/provisioner.c
+++ b/subsys/bluetooth/mesh/provisioner.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/sys/util.h>
diff --git a/subsys/bluetooth/mesh/proxy_cli.c b/subsys/bluetooth/mesh/proxy_cli.c
index 645e5ab2e1..9b7f5b2751 100644
--- a/subsys/bluetooth/mesh/proxy_cli.c
+++ b/subsys/bluetooth/mesh/proxy_cli.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include <zephyr/net/buf.h>
diff --git a/subsys/bluetooth/mesh/proxy_msg.c b/subsys/bluetooth/mesh/proxy_msg.c
index 2ec35b9853..d58f506056 100644
--- a/subsys/bluetooth/mesh/proxy_msg.c
+++ b/subsys/bluetooth/mesh/proxy_msg.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include <zephyr/net/buf.h>
diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
index dd4534638d..1bb4d17c28 100644
--- a/subsys/bluetooth/mesh/proxy_srv.c
+++ b/subsys/bluetooth/mesh/proxy_srv.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include <zephyr/net/buf.h>
diff --git a/subsys/bluetooth/mesh/rpl.c b/subsys/bluetooth/mesh/rpl.c
index a434d92d77..2f9affb59d 100644
--- a/subsys/bluetooth/mesh/rpl.c
+++ b/subsys/bluetooth/mesh/rpl.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/subsys/bluetooth/mesh/settings.c b/subsys/bluetooth/mesh/settings.c
index 4458f75c7c..e12c60f9f6 100644
--- a/subsys/bluetooth/mesh/settings.c
+++ b/subsys/bluetooth/mesh/settings.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <zephyr/sys/util.h>
diff --git a/subsys/bluetooth/mesh/shell.c b/subsys/bluetooth/mesh/shell.c
index 7a6c2666f9..ffae0cc90e 100644
--- a/subsys/bluetooth/mesh/shell.c
+++ b/subsys/bluetooth/mesh/shell.c
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <ctype.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util.h>
 
diff --git a/subsys/bluetooth/mesh/subnet.c b/subsys/bluetooth/mesh/subnet.c
index 9a243179e9..671b153cc3 100644
--- a/subsys/bluetooth/mesh/subnet.c
+++ b/subsys/bluetooth/mesh/subnet.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/subsys/bluetooth/mesh/subnet.h b/subsys/bluetooth/mesh/subnet.h
index a41ec6c627..232bcb741c 100644
--- a/subsys/bluetooth/mesh/subnet.h
+++ b/subsys/bluetooth/mesh/subnet.h
@@ -10,7 +10,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 #include <zephyr/net/buf.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define BT_MESH_NET_FLAG_KR       BIT(0)
 #define BT_MESH_NET_FLAG_IVU      BIT(1)
diff --git a/subsys/bluetooth/mesh/transport.c b/subsys/bluetooth/mesh/transport.c
index 882648d814..97e8f3c382 100644
--- a/subsys/bluetooth/mesh/transport.c
+++ b/subsys/bluetooth/mesh/transport.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/subsys/bluetooth/services/dis.c b/subsys/bluetooth/services/dis.c
index 98e6aae01e..f1a87420a3 100644
--- a/subsys/bluetooth/services/dis.c
+++ b/subsys/bluetooth/services/dis.c
@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 
 #include <zephyr/settings/settings.h>
diff --git a/subsys/bluetooth/services/hrs.c b/subsys/bluetooth/services/hrs.c
index 49dc6aa424..ce596f525a 100644
--- a/subsys/bluetooth/services/hrs.c
+++ b/subsys/bluetooth/services/hrs.c
@@ -12,7 +12,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/subsys/bluetooth/services/ias.c b/subsys/bluetooth/services/ias.c
index 0f4405b2f9..0239836deb 100644
--- a/subsys/bluetooth/services/ias.c
+++ b/subsys/bluetooth/services/ias.c
@@ -11,7 +11,7 @@
 #include <errno.h>
 #include <zephyr/init.h>
 #include <stdint.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/buf.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/bluetooth/gatt.h>
diff --git a/subsys/bluetooth/services/ots/ots.c b/subsys/bluetooth/services/ots/ots.c
index b11760c55f..bec55ea611 100644
--- a/subsys/bluetooth/services/ots/ots.c
+++ b/subsys/bluetooth/services/ots/ots.c
@@ -11,7 +11,7 @@
 #include <zephyr/init.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/l2cap.h>
diff --git a/subsys/bluetooth/services/ots/ots_client.c b/subsys/bluetooth/services/ots/ots_client.c
index da950c94fe..6d0c528560 100644
--- a/subsys/bluetooth/services/ots/ots_client.c
+++ b/subsys/bluetooth/services/ots/ots_client.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <zephyr/device.h>
diff --git a/subsys/bluetooth/services/ots/ots_l2cap.c b/subsys/bluetooth/services/ots/ots_l2cap.c
index ae8c89c92d..ec9612dace 100644
--- a/subsys/bluetooth/services/ots/ots_l2cap.c
+++ b/subsys/bluetooth/services/ots/ots_l2cap.c
@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 
 #include <zephyr/net/buf.h>
diff --git a/subsys/bluetooth/services/ots/ots_oacp.c b/subsys/bluetooth/services/ots/ots_oacp.c
index 1c7a224ade..2dbb35199c 100644
--- a/subsys/bluetooth/services/ots/ots_oacp.c
+++ b/subsys/bluetooth/services/ots/ots_oacp.c
@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/services/ots.h>
diff --git a/subsys/bluetooth/services/ots/ots_olcp.c b/subsys/bluetooth/services/ots/ots_olcp.c
index e4163e0ebd..ed8c7d4fa1 100644
--- a/subsys/bluetooth/services/ots/ots_olcp.c
+++ b/subsys/bluetooth/services/ots/ots_olcp.c
@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/services/ots.h>
diff --git a/subsys/bluetooth/shell/audio.c b/subsys/bluetooth/shell/audio.c
index 4e01ada9c4..06eef4302e 100644
--- a/subsys/bluetooth/shell/audio.c
+++ b/subsys/bluetooth/shell/audio.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/subsys/bluetooth/shell/bass.c b/subsys/bluetooth/shell/bass.c
index 2ad6ec4f6b..dae6714739 100644
--- a/subsys/bluetooth/shell/bass.c
+++ b/subsys/bluetooth/shell/bass.c
@@ -9,7 +9,7 @@
 
 #include <zephyr/types.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/shell/shell.h>
 #include <stdlib.h>
diff --git a/subsys/bluetooth/shell/bass_client.c b/subsys/bluetooth/shell/bass_client.c
index c8da879b8e..ed06a34d64 100644
--- a/subsys/bluetooth/shell/bass_client.c
+++ b/subsys/bluetooth/shell/bass_client.c
@@ -9,7 +9,7 @@
 
 #include <zephyr/types.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/shell/shell.h>
 #include <stdlib.h>
diff --git a/subsys/bluetooth/shell/bredr.c b/subsys/bluetooth/shell/bredr.c
index be3ccdca8c..3e96676a7f 100644
--- a/subsys/bluetooth/shell/bredr.c
+++ b/subsys/bluetooth/shell/bredr.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/settings/settings.h>
 
diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
index 83a0a16f48..2df538e188 100644
--- a/subsys/bluetooth/shell/bt.c
+++ b/subsys/bluetooth/shell/bt.c
@@ -21,7 +21,7 @@
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/settings/settings.h>
 
diff --git a/subsys/bluetooth/shell/csis.c b/subsys/bluetooth/shell/csis.c
index e745b6adf7..8ecb0c281a 100644
--- a/subsys/bluetooth/shell/csis.c
+++ b/subsys/bluetooth/shell/csis.c
@@ -10,7 +10,7 @@
 
 #include <zephyr/types.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/shell/shell.h>
 #include <stdlib.h>
diff --git a/subsys/bluetooth/shell/csis_client.c b/subsys/bluetooth/shell/csis_client.c
index b6a47aeb1e..421cd2560d 100644
--- a/subsys/bluetooth/shell/csis_client.c
+++ b/subsys/bluetooth/shell/csis_client.c
@@ -11,7 +11,7 @@
 #include <zephyr/types.h>
 #include <zephyr/bluetooth/conn.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/shell/shell.h>
 #include <stdlib.h>
diff --git a/subsys/bluetooth/shell/gatt.c b/subsys/bluetooth/shell/gatt.c
index 127f2b38b5..342ee5affd 100644
--- a/subsys/bluetooth/shell/gatt.c
+++ b/subsys/bluetooth/shell/gatt.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
diff --git a/subsys/bluetooth/shell/has.c b/subsys/bluetooth/shell/has.c
index 76da338ef2..ed987f8cfb 100644
--- a/subsys/bluetooth/shell/has.c
+++ b/subsys/bluetooth/shell/has.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/audio/has.h>
diff --git a/subsys/bluetooth/shell/has_client.c b/subsys/bluetooth/shell/has_client.c
index a28f81d0c4..a10a430a5d 100644
--- a/subsys/bluetooth/shell/has_client.c
+++ b/subsys/bluetooth/shell/has_client.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/audio/has.h>
diff --git a/subsys/bluetooth/shell/hci.c b/subsys/bluetooth/shell/hci.c
index c2cce4e076..6192f3b07b 100644
--- a/subsys/bluetooth/shell/hci.c
+++ b/subsys/bluetooth/shell/hci.c
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/subsys/bluetooth/shell/iso.c b/subsys/bluetooth/shell/iso.c
index be8a850d83..aa7cd47bfd 100644
--- a/subsys/bluetooth/shell/iso.c
+++ b/subsys/bluetooth/shell/iso.c
@@ -12,7 +12,7 @@
 
 #include <stdlib.h>
 #include <ctype.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
diff --git a/subsys/bluetooth/shell/l2cap.c b/subsys/bluetooth/shell/l2cap.c
index 086f27eb44..e6e2d138bb 100644
--- a/subsys/bluetooth/shell/l2cap.c
+++ b/subsys/bluetooth/shell/l2cap.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/settings/settings.h>
 
diff --git a/subsys/bluetooth/shell/ll.c b/subsys/bluetooth/shell/ll.c
index a4123b2ca3..fd92fe592a 100644
--- a/subsys/bluetooth/shell/ll.c
+++ b/subsys/bluetooth/shell/ll.c
@@ -11,7 +11,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/subsys/bluetooth/shell/rfcomm.c b/subsys/bluetooth/shell/rfcomm.c
index 05f3f79a6b..382e8ca140 100644
--- a/subsys/bluetooth/shell/rfcomm.c
+++ b/subsys/bluetooth/shell/rfcomm.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/settings/settings.h>
 
diff --git a/subsys/bluetooth/shell/tbs.c b/subsys/bluetooth/shell/tbs.c
index e257079ba0..dad8932e82 100644
--- a/subsys/bluetooth/shell/tbs.c
+++ b/subsys/bluetooth/shell/tbs.c
@@ -9,7 +9,7 @@
  */
 
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 
 #include <zephyr/bluetooth/audio/tbs.h>
diff --git a/subsys/bluetooth/shell/tbs_client.c b/subsys/bluetooth/shell/tbs_client.c
index 228cc58420..ab11723960 100644
--- a/subsys/bluetooth/shell/tbs_client.c
+++ b/subsys/bluetooth/shell/tbs_client.c
@@ -11,7 +11,7 @@
 
 #include <stdlib.h>
 #include <ctype.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/sys/printk.h>
diff --git a/subsys/bluetooth/shell/ticker.c b/subsys/bluetooth/shell/ticker.c
index b076476479..92cef827c8 100644
--- a/subsys/bluetooth/shell/ticker.c
+++ b/subsys/bluetooth/shell/ticker.c
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
diff --git a/subsys/console/getchar.c b/subsys/console/getchar.c
index 1a05e277b0..ba8055ecfe 100644
--- a/subsys/console/getchar.c
+++ b/subsys/console/getchar.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/console/console.h>
 #include <zephyr/console/tty.h>
diff --git a/subsys/console/getline.c b/subsys/console/getline.c
index 8dbb8dc5f4..89f21022ca 100644
--- a/subsys/console/getline.c
+++ b/subsys/console/getline.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/console/console.h>
 #include <zephyr/drivers/console/uart_console.h>
diff --git a/subsys/console/tty.c b/subsys/console/tty.c
index ddf6aa4849..aa8a94c596 100644
--- a/subsys/console/tty.c
+++ b/subsys/console/tty.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/console/tty.h>
diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c
index 4f7e6b1877..87cf1d3e02 100644
--- a/subsys/dfu/boot/mcuboot.c
+++ b/subsys/dfu/boot/mcuboot.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/storage/flash_map.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 
 #include <zephyr/sys/__assert.h>
diff --git a/subsys/fb/cfb.c b/subsys/fb/cfb.c
index 96bc0fdcfa..539a406e8d 100644
--- a/subsys/fb/cfb.c
+++ b/subsys/fb/cfb.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <zephyr/display/cfb.h>
 
diff --git a/subsys/fb/cfb_fonts.c b/subsys/fb/cfb_fonts.c
index 7d308bdce6..7995a4e2f4 100644
--- a/subsys/fb/cfb_fonts.c
+++ b/subsys/fb/cfb_fonts.c
@@ -8,7 +8,7 @@
  * Licensed under the Apache License, Version 2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/display/cfb.h>
 
 #define CFB_FONTS_FIRST_CHAR	32
diff --git a/subsys/fs/fs_impl.c b/subsys/fs/fs_impl.c
index bb4eb1153d..d2466f5b21 100644
--- a/subsys/fs/fs_impl.c
+++ b/subsys/fs/fs_impl.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/fs/fs.h>
 #include "fs_impl.h"
 
diff --git a/subsys/fs/fuse_fs_access.c b/subsys/fs/fuse_fs_access.c
index b0af4c97f8..8453c6544e 100644
--- a/subsys/fs/fuse_fs_access.c
+++ b/subsys/fs/fuse_fs_access.c
@@ -18,7 +18,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/fs/fs.h>
 
 #include "cmdline.h"
diff --git a/subsys/ipc/ipc_service/backends/ipc_icmsg.c b/subsys/ipc/ipc_service/backends/ipc_icmsg.c
index f6b84110a3..2791fc3730 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icmsg.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <string.h>
 #include <zephyr/drivers/mbox.h>
diff --git a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
index 8a3a066e2b..37ed1177b5 100644
--- a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
+++ b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/cache.h>
 #include <zephyr/device.h>
 #include <zephyr/sys/atomic.h>
diff --git a/subsys/ipc/ipc_service/ipc_service.c b/subsys/ipc/ipc_service/ipc_service.c
index 5ddbb0b3cc..73ca6cd30e 100644
--- a/subsys/ipc/ipc_service/ipc_service.c
+++ b/subsys/ipc/ipc_service/ipc_service.c
@@ -9,7 +9,7 @@
 #include <zephyr/ipc/ipc_service_backend.h>
 
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 LOG_MODULE_REGISTER(ipc_service, CONFIG_IPC_SERVICE_LOG_LEVEL);
diff --git a/subsys/ipc/ipc_service/lib/ipc_rpmsg.c b/subsys/ipc/ipc_service/lib/ipc_rpmsg.c
index 55264b566f..38a577e4e8 100644
--- a/subsys/ipc/ipc_service/lib/ipc_rpmsg.c
+++ b/subsys/ipc/ipc_service/lib/ipc_rpmsg.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ipc/ipc_rpmsg.h>
 
 static void rpmsg_service_unbind(struct rpmsg_endpoint *ep)
diff --git a/subsys/ipc/rpmsg_service/rpmsg_backend.c b/subsys/ipc/rpmsg_service/rpmsg_backend.c
index 3ba6df1aab..431fd093be 100644
--- a/subsys/ipc/rpmsg_service/rpmsg_backend.c
+++ b/subsys/ipc/rpmsg_service/rpmsg_backend.c
@@ -6,7 +6,7 @@
 
 #include "rpmsg_backend.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/ipm.h>
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
diff --git a/subsys/ipc/rpmsg_service/rpmsg_service.c b/subsys/ipc/rpmsg_service/rpmsg_service.c
index 5375317c21..e82c7a6be7 100644
--- a/subsys/ipc/rpmsg_service/rpmsg_service.c
+++ b/subsys/ipc/rpmsg_service/rpmsg_service.c
@@ -8,7 +8,7 @@
 
 #include "rpmsg_backend.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
 
diff --git a/subsys/logging/log_backend_adsp_mtrace.c b/subsys/logging/log_backend_adsp_mtrace.c
index de35c232ac..d06e6ec094 100644
--- a/subsys/logging/log_backend_adsp_mtrace.c
+++ b/subsys/logging/log_backend_adsp_mtrace.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log_core.h>
 #include <zephyr/logging/log_output.h>
 #include <zephyr/logging/log_backend_std.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 
 #include <adsp_memory.h>
diff --git a/subsys/logging/log_msg.c b/subsys/logging/log_msg.c
index 1f0d9d84e7..962f84c834 100644
--- a/subsys/logging/log_msg.c
+++ b/subsys/logging/log_msg.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/syscall_handler.h>
 #include <zephyr/logging/log_internal.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/subsys/lorawan/lw_priv.c b/subsys/lorawan/lw_priv.c
index 063184804e..e23128aff6 100644
--- a/subsys/lorawan/lw_priv.c
+++ b/subsys/lorawan/lw_priv.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "lw_priv.h"
 
diff --git a/subsys/mgmt/hawkbit/hawkbit.c b/subsys/mgmt/hawkbit/hawkbit.c
index a28c3649c9..7ddb919b62 100644
--- a/subsys/mgmt/hawkbit/hawkbit.c
+++ b/subsys/mgmt/hawkbit/hawkbit.c
@@ -13,7 +13,7 @@
 LOG_MODULE_REGISTER(hawkbit, CONFIG_HAWKBIT_LOG_LEVEL);
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <stdlib.h>
 #include <zephyr/fs/nvs.h>
diff --git a/subsys/mgmt/hawkbit/hawkbit_device.h b/subsys/mgmt/hawkbit/hawkbit_device.h
index 0cd1a23c70..9af19794e9 100644
--- a/subsys/mgmt/hawkbit/hawkbit_device.h
+++ b/subsys/mgmt/hawkbit/hawkbit_device.h
@@ -7,7 +7,7 @@
 #ifndef __HAWKBIT_DEVICE_H__
 #define __HAWKBIT_DEVICE_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/hwinfo.h>
 
 #define DEVICE_ID_BIN_MAX_SIZE	16
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_crc32.h b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_crc32.h
index 6add63feee..42a4cf077f 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_crc32.h
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_crc32.h
@@ -7,7 +7,7 @@
 #ifndef H_HASH_CHECKSUM_CRC32_
 #define H_HASH_CHECKSUM_CRC32_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_mgmt.h b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_mgmt.h
index 87cce4abb9..aa37f54118 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_mgmt.h
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_mgmt.h
@@ -8,7 +8,7 @@
 #ifndef H_HASH_CHECKSUM_MGMT_
 #define H_HASH_CHECKSUM_MGMT_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/fs/fs.h>
 
 #ifdef __cplusplus
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_sha256.h b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_sha256.h
index eff3852567..1f07e68dcf 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_sha256.h
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_sha256.h
@@ -7,7 +7,7 @@
 #ifndef H_HASH_CHECKSUM_SHA256_
 #define H_HASH_CHECKSUM_SHA256_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/fs_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/fs_mgmt.c
index 1b392dcb72..7564de7a49 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/fs_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/fs_mgmt.c
@@ -6,7 +6,7 @@
  */
 
 #include <assert.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <limits.h>
 #include <string.h>
 #include <zephyr/sys/util.h>
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_crc32.c b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_crc32.c
index 4eeba15e10..eceac3f7db 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_crc32.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_crc32.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <zephyr/sys/crc.h>
 #include <zephyr/fs/fs.h>
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_mgmt.c
index b80aa1f8af..bc3408cb00 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_mgmt.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include "mgmt/mgmt.h"
 #include "fs_mgmt/hash_checksum_mgmt.h"
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_sha256.c b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_sha256.c
index a44b58efda..422f3c57d5 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_sha256.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_sha256.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <zephyr/fs/fs.h>
 #include <mgmt/mgmt.h>
diff --git a/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt.c
index 436d8f97d3..46c863ea7a 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt.c
@@ -10,7 +10,7 @@ LOG_MODULE_REGISTER(mcumgr_img_mgmt, CONFIG_MCUMGR_IMG_MGMT_LOG_LEVEL);
 #include <assert.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/storage/flash_map.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/init.h>
 #include <zephyr/dfu/mcuboot.h>
diff --git a/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt_log.c b/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt_log.c
index 6482438038..a5fd1698a8 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt_log.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt_log.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <img_mgmt/img_mgmt.h>
 /**
  * Log event types (all events are CBOR-encoded):
diff --git a/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/os_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/os_mgmt.c
index 31f5b3374e..57ff2d3db6 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/os_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/os_mgmt.c
@@ -9,7 +9,7 @@
 #include <zephyr/sys/util.h>
 #include <assert.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/debug/object_tracing.h>
 #include <zephyr/kernel_structs.h>
diff --git a/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/zephyr_os_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/zephyr_os_mgmt.c
index 3d2d12d976..a98fe9e475 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/zephyr_os_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/zephyr_os_mgmt.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/debug/object_tracing.h>
 #include <zephyr/kernel_structs.h>
diff --git a/subsys/mgmt/mcumgr/smp.c b/subsys/mgmt/mcumgr/smp.c
index bf3ba42c30..a3feea55ad 100644
--- a/subsys/mgmt/mcumgr/smp.c
+++ b/subsys/mgmt/mcumgr/smp.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/buf.h>
 #include <zephyr/mgmt/mcumgr/buf.h>
 #include "mgmt/mgmt.h"
diff --git a/subsys/mgmt/mcumgr/smp_bt.c b/subsys/mgmt/mcumgr/smp_bt.c
index 951e60c998..2f17fa9894 100644
--- a/subsys/mgmt/mcumgr/smp_bt.c
+++ b/subsys/mgmt/mcumgr/smp_bt.c
@@ -10,7 +10,7 @@
 
 #include <errno.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/uuid.h>
diff --git a/subsys/mgmt/mcumgr/smp_reassembly.c b/subsys/mgmt/mcumgr/smp_reassembly.c
index d1372e9e5a..4084488be2 100644
--- a/subsys/mgmt/mcumgr/smp_reassembly.c
+++ b/subsys/mgmt/mcumgr/smp_reassembly.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/net/buf.h>
 #include <zephyr/mgmt/mcumgr/buf.h>
diff --git a/subsys/mgmt/mcumgr/smp_shell.c b/subsys/mgmt/mcumgr/smp_shell.c
index 185e2e5f8b..0d983ef011 100644
--- a/subsys/mgmt/mcumgr/smp_shell.c
+++ b/subsys/mgmt/mcumgr/smp_shell.c
@@ -9,7 +9,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <zephyr/net/buf.h>
 #include <zephyr/mgmt/mcumgr/buf.h>
diff --git a/subsys/mgmt/mcumgr/smp_uart.c b/subsys/mgmt/mcumgr/smp_uart.c
index ad1fe01a8b..dd5bdcc237 100644
--- a/subsys/mgmt/mcumgr/smp_uart.c
+++ b/subsys/mgmt/mcumgr/smp_uart.c
@@ -9,7 +9,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <zephyr/net/buf.h>
 #include <zephyr/mgmt/mcumgr/buf.h>
diff --git a/subsys/mgmt/mcumgr/smp_udp.c b/subsys/mgmt/mcumgr/smp_udp.c
index 084fa3f32c..068fc3a01e 100644
--- a/subsys/mgmt/mcumgr/smp_udp.c
+++ b/subsys/mgmt/mcumgr/smp_udp.c
@@ -9,7 +9,7 @@
  * @brief UDP transport for the mcumgr SMP protocol.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #if defined(CONFIG_POSIX_API)
 #include <zephyr/posix/unistd.h>
diff --git a/subsys/mgmt/mcumgr/zephyr_grp/basic_mgmt.c b/subsys/mgmt/mcumgr/zephyr_grp/basic_mgmt.c
index f710cb0b53..074fa36545 100644
--- a/subsys/mgmt/mcumgr/zephyr_grp/basic_mgmt.c
+++ b/subsys/mgmt/mcumgr/zephyr_grp/basic_mgmt.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/init.h>
 #include <mgmt/mgmt.h>
diff --git a/subsys/mgmt/updatehub/updatehub.c b/subsys/mgmt/updatehub/updatehub.c
index 51ef8888d7..449fc496dc 100644
--- a/subsys/mgmt/updatehub/updatehub.c
+++ b/subsys/mgmt/updatehub/updatehub.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(updatehub, CONFIG_UPDATEHUB_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/net/socket.h>
diff --git a/subsys/mgmt/updatehub/updatehub_device.h b/subsys/mgmt/updatehub/updatehub_device.h
index 10ea830324..f1944dab27 100644
--- a/subsys/mgmt/updatehub/updatehub_device.h
+++ b/subsys/mgmt/updatehub/updatehub_device.h
@@ -7,7 +7,7 @@
 #ifndef __UPDATEHUB_DEVICE_H__
 #define __UPDATEHUB_DEVICE_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/hwinfo.h>
 
 #define DEVICE_ID_BIN_MAX_SIZE	64
diff --git a/subsys/mgmt/updatehub/updatehub_timer.c b/subsys/mgmt/updatehub/updatehub_timer.c
index 5799a4be32..fdc4d712f3 100644
--- a/subsys/mgmt/updatehub/updatehub_timer.c
+++ b/subsys/mgmt/updatehub/updatehub_timer.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(updatehub, CONFIG_UPDATEHUB_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "updatehub_timer.h"
 
 static int blk_vars[UPDATEHUB_BLK_MAX_VARS];
diff --git a/subsys/modbus/modbus_internal.h b/subsys/modbus/modbus_internal.h
index 84902053f9..f271e08941 100644
--- a/subsys/modbus/modbus_internal.h
+++ b/subsys/modbus/modbus_internal.h
@@ -23,7 +23,7 @@
 #ifndef ZEPHYR_INCLUDE_MODBUS_INTERNAL_H_
 #define ZEPHYR_INCLUDE_MODBUS_INTERNAL_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/modbus/modbus.h>
 
diff --git a/subsys/net/hostname.c b/subsys/net/hostname.c
index 1d3f80f104..84146a74bf 100644
--- a/subsys/net/hostname.c
+++ b/subsys/net/hostname.c
@@ -11,7 +11,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_hostname, CONFIG_NET_HOSTNAME_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/hostname.h>
 #include <zephyr/net/net_core.h>
diff --git a/subsys/net/ip/ipv4_autoconf_internal.h b/subsys/net/ip/ipv4_autoconf_internal.h
index 3e138fbd5f..0d78d51d98 100644
--- a/subsys/net/ip/ipv4_autoconf_internal.h
+++ b/subsys/net/ip/ipv4_autoconf_internal.h
@@ -13,7 +13,7 @@
 #ifndef __IPV4_AUTOCONF_INTERNAL_H
 #define __IPV4_AUTOCONF_INTERNAL_H
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/ipv4_autoconf.h>
 
diff --git a/subsys/net/ip/net_shell.c b/subsys/net/ip/net_shell.c
index a1b90a07b2..c37dce1d63 100644
--- a/subsys/net/ip/net_shell.c
+++ b/subsys/net/ip/net_shell.c
@@ -13,7 +13,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_shell, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/random/rand32.h>
diff --git a/subsys/net/ip/net_tc.c b/subsys/net/ip/net_tc.c
index 22e3b159be..70942421ff 100644
--- a/subsys/net/ip/net_tc.c
+++ b/subsys/net/ip/net_tc.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_tc, CONFIG_NET_TC_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 
 #include <zephyr/net/net_core.h>
diff --git a/subsys/net/ip/tcp.c b/subsys/net/ip/tcp.c
index bbd1713fa7..e04450b334 100644
--- a/subsys/net/ip/tcp.c
+++ b/subsys/net/ip/tcp.c
@@ -10,7 +10,7 @@ LOG_MODULE_REGISTER(net_tcp, CONFIG_NET_TCP_LOG_LEVEL);
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/random/rand32.h>
 
 #if defined(CONFIG_NET_TCP_ISN_RFC6528)
diff --git a/subsys/net/ip/tp_priv.h b/subsys/net/ip/tp_priv.h
index f5d754fee7..1f3f153a03 100644
--- a/subsys/net/ip/tp_priv.h
+++ b/subsys/net/ip/tp_priv.h
@@ -13,7 +13,7 @@ extern "C" {
 
 #include <sys/types.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/net_pkt.h>
 
 #define tp_dbg(fmt, args...) printk("%s: " fmt "\n", __func__, ## args)
diff --git a/subsys/net/l2/ieee802154/ieee802154_shell.c b/subsys/net/l2/ieee802154/ieee802154_shell.c
index f5076990d9..d15652ab26 100644
--- a/subsys/net/l2/ieee802154/ieee802154_shell.c
+++ b/subsys/net/l2/ieee802154/ieee802154_shell.c
@@ -11,7 +11,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154_shell, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <zephyr/shell/shell.h>
diff --git a/subsys/net/l2/virtual/ipip/ipip.c b/subsys/net/l2/virtual/ipip/ipip.c
index e4540c58a8..f5df26514e 100644
--- a/subsys/net/l2/virtual/ipip/ipip.c
+++ b/subsys/net/l2/virtual/ipip/ipip.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_virtual_ipip, CONFIG_NET_L2_IPIP_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <errno.h>
 
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index b90d159854..6dffd9ba07 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -11,7 +11,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_wifi_shell, LOG_LEVEL_INF);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <zephyr/shell/shell.h>
diff --git a/subsys/net/lib/capture/capture.c b/subsys/net/lib/capture/capture.c
index 95852d1e85..91ed775ad4 100644
--- a/subsys/net/lib/capture/capture.c
+++ b/subsys/net/lib/capture/capture.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_capture, CONFIG_NET_CAPTURE_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <zephyr/sys/slist.h>
 #include <zephyr/net/net_core.h>
diff --git a/subsys/net/lib/config/bt_settings.c b/subsys/net/lib/config/bt_settings.c
index 73fee0db1b..d7f6afc92c 100644
--- a/subsys/net/lib/config/bt_settings.c
+++ b/subsys/net/lib/config/bt_settings.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_config, CONFIG_NET_CONFIG_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 
 #include <zephyr/net/net_if.h>
diff --git a/subsys/net/lib/config/ieee802154_settings.c b/subsys/net/lib/config/ieee802154_settings.c
index c8bb2f2e41..5217a5cf00 100644
--- a/subsys/net/lib/config/ieee802154_settings.c
+++ b/subsys/net/lib/config/ieee802154_settings.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_config, CONFIG_NET_CONFIG_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 
 #include <zephyr/net/net_if.h>
diff --git a/subsys/net/lib/config/init.c b/subsys/net/lib/config/init.c
index e472805ed2..e0489ab8b2 100644
--- a/subsys/net/lib/config/init.c
+++ b/subsys/net/lib/config/init.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_config, CONFIG_NET_CONFIG_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <string.h>
 #include <errno.h>
diff --git a/subsys/net/lib/dns/dns_sd.c b/subsys/net/lib/dns/dns_sd.c
index 45c2006c25..56be7b2502 100644
--- a/subsys/net/lib/dns/dns_sd.c
+++ b/subsys/net/lib/dns/dns_sd.c
@@ -16,7 +16,7 @@
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/dns_sd.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "dns_pack.h"
 #include "dns_sd.h"
diff --git a/subsys/net/lib/dns/llmnr_responder.c b/subsys/net/lib/dns/llmnr_responder.c
index 4a28f6ec7a..816cf6e066 100644
--- a/subsys/net/lib/dns/llmnr_responder.c
+++ b/subsys/net/lib/dns/llmnr_responder.c
@@ -13,7 +13,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_llmnr_responder, CONFIG_LLMNR_RESPONDER_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <string.h>
 #include <strings.h>
diff --git a/subsys/net/lib/dns/mdns_responder.c b/subsys/net/lib/dns/mdns_responder.c
index ce556b435d..5db58f1142 100644
--- a/subsys/net/lib/dns/mdns_responder.c
+++ b/subsys/net/lib/dns/mdns_responder.c
@@ -14,7 +14,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mdns_responder, CONFIG_MDNS_RESPONDER_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <string.h>
 #include <strings.h>
diff --git a/subsys/net/lib/socks/socks.c b/subsys/net/lib/socks/socks.c
index 73463c8ee2..847537d02d 100644
--- a/subsys/net/lib/socks/socks.c
+++ b/subsys/net/lib/socks/socks.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_socks, CONFIG_SOCKS_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/net_pkt.h>
 
diff --git a/subsys/net/lib/tftp/tftp_client.h b/subsys/net/lib/tftp/tftp_client.h
index dcda9ce0da..89e37a6eb9 100644
--- a/subsys/net/lib/tftp/tftp_client.h
+++ b/subsys/net/lib/tftp/tftp_client.h
@@ -5,7 +5,7 @@
  */
 
 /* Generic header files required by the TFTPC Module. */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/net/socket.h>
 
diff --git a/subsys/net/lib/zperf/shell_utils.c b/subsys/net/lib/zperf/shell_utils.c
index 988bd5dc44..726cf21059 100644
--- a/subsys/net/lib/zperf/shell_utils.c
+++ b/subsys/net/lib/zperf/shell_utils.c
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "shell_utils.h"
 
diff --git a/subsys/net/lib/zperf/zperf_session.c b/subsys/net/lib/zperf/zperf_session.c
index 68e2a66baf..fe6964d644 100644
--- a/subsys/net/lib/zperf/zperf_session.c
+++ b/subsys/net/lib/zperf/zperf_session.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_zperf, CONFIG_NET_ZPERF_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/udp.h>
diff --git a/subsys/net/lib/zperf/zperf_session.h b/subsys/net/lib/zperf/zperf_session.h
index 71c5dbba43..112c55631d 100644
--- a/subsys/net/lib/zperf/zperf_session.h
+++ b/subsys/net/lib/zperf/zperf_session.h
@@ -9,7 +9,7 @@
 #include <zephyr/linker/sections.h>
 #include <zephyr/toolchain.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/net/net_ip.h>
diff --git a/subsys/net/lib/zperf/zperf_shell.c b/subsys/net/lib/zperf/zperf_shell.c
index 4302469abf..381a08e98a 100644
--- a/subsys/net/lib/zperf/zperf_shell.c
+++ b/subsys/net/lib/zperf/zperf_shell.c
@@ -11,7 +11,7 @@ LOG_MODULE_REGISTER(net_zperf, CONFIG_NET_ZPERF_LOG_LEVEL);
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 
 #include <zephyr/net/net_ip.h>
diff --git a/subsys/net/lib/zperf/zperf_tcp_receiver.c b/subsys/net/lib/zperf/zperf_tcp_receiver.c
index 354c343daa..bd4ce8c1ae 100644
--- a/subsys/net/lib/zperf/zperf_tcp_receiver.c
+++ b/subsys/net/lib/zperf/zperf_tcp_receiver.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_zperf, CONFIG_NET_ZPERF_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/linker/sections.h>
 #include <zephyr/toolchain.h>
diff --git a/subsys/net/lib/zperf/zperf_tcp_uploader.c b/subsys/net/lib/zperf/zperf_tcp_uploader.c
index 82483e5073..1c4b463e4e 100644
--- a/subsys/net/lib/zperf/zperf_tcp_uploader.c
+++ b/subsys/net/lib/zperf/zperf_tcp_uploader.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_zperf, CONFIG_NET_ZPERF_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <errno.h>
 
diff --git a/subsys/net/lib/zperf/zperf_udp_receiver.c b/subsys/net/lib/zperf/zperf_udp_receiver.c
index a29c0c9d68..7ee7dea37d 100644
--- a/subsys/net/lib/zperf/zperf_udp_receiver.c
+++ b/subsys/net/lib/zperf/zperf_udp_receiver.c
@@ -10,7 +10,7 @@ LOG_MODULE_DECLARE(net_zperf, CONFIG_NET_ZPERF_LOG_LEVEL);
 #include <zephyr/linker/sections.h>
 #include <zephyr/toolchain.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/socket.h>
 
diff --git a/subsys/net/lib/zperf/zperf_udp_uploader.c b/subsys/net/lib/zperf/zperf_udp_uploader.c
index 7c75349806..e86598d2ca 100644
--- a/subsys/net/lib/zperf/zperf_udp_uploader.c
+++ b/subsys/net/lib/zperf/zperf_udp_uploader.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_zperf, CONFIG_NET_ZPERF_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/socket.h>
 
diff --git a/subsys/sd/sd.c b/subsys/sd/sd.c
index d46b8cb66d..fc86e1abb5 100644
--- a/subsys/sd/sd.c
+++ b/subsys/sd/sd.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sdhc.h>
 #include <zephyr/sd/sd.h>
 #include <zephyr/sd/sdmmc.h>
diff --git a/subsys/sd/sd_utils.h b/subsys/sd/sd_utils.h
index a7bc377bb9..9569683f5e 100644
--- a/subsys/sd/sd_utils.h
+++ b/subsys/sd/sd_utils.h
@@ -11,7 +11,7 @@
 #ifndef ZEPHYR_SUBSYS_SD_UTILS_H_
 #define ZEPHYR_SUBSYS_SD_UTILS_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sd/sd.h>
 
 #ifdef __cplusplus
diff --git a/subsys/sd/sdmmc.c b/subsys/sd/sdmmc.c
index ae4572ab18..8787ba2f97 100644
--- a/subsys/sd/sdmmc.c
+++ b/subsys/sd/sdmmc.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sdhc.h>
 #include <zephyr/sd/sd.h>
 #include <zephyr/sd/sdmmc.h>
diff --git a/subsys/sd/sdmmc_priv.h b/subsys/sd/sdmmc_priv.h
index bf424ccd5a..90e45527b5 100644
--- a/subsys/sd/sdmmc_priv.h
+++ b/subsys/sd/sdmmc_priv.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_SUBSYS_SD_SDMMC_PRIV_H_
 #define ZEPHYR_SUBSYS_SD_SDMMC_PRIV_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sd/sd.h>
 
 int sdmmc_card_init(struct sd_card *card);
diff --git a/subsys/settings/src/settings_file.c b/subsys/settings/src/settings_file.c
index a936216df6..e1f7812d0b 100644
--- a/subsys/settings/src/settings_file.c
+++ b/subsys/settings/src/settings_file.c
@@ -7,7 +7,7 @@
 
 #include <string.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/fs/fs.h>
 
diff --git a/subsys/settings/src/settings_init.c b/subsys/settings/src/settings_init.c
index cdb2b16df5..f62895b4bf 100644
--- a/subsys/settings/src/settings_init.c
+++ b/subsys/settings/src/settings_init.c
@@ -13,7 +13,7 @@
 
 #include <zephyr/settings/settings.h>
 #include "settings/settings_file.h"
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 
 bool settings_subsys_initialized;
diff --git a/subsys/shell/backends/shell_mqtt.c b/subsys/shell/backends/shell_mqtt.c
index 861cb46526..d719714fbb 100644
--- a/subsys/shell/backends/shell_mqtt.c
+++ b/subsys/shell/backends/shell_mqtt.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell_mqtt.h>
 #include <zephyr/init.h>
 #include <zephyr/logging/log.h>
diff --git a/subsys/shell/shell_utils.h b/subsys/shell/shell_utils.h
index a51aa87e19..3185eb4407 100644
--- a/subsys/shell/shell_utils.h
+++ b/subsys/shell/shell_utils.h
@@ -6,7 +6,7 @@
 #ifndef SHELL_UTILS_H__
 #define SHELL_UTILS_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 
 #ifdef __cplusplus
diff --git a/subsys/storage/flash_map/flash_map_default.c b/subsys/storage/flash_map/flash_map_default.c
index 65d2de1137..00ceea8379 100644
--- a/subsys/storage/flash_map/flash_map_default.c
+++ b/subsys/storage/flash_map/flash_map_default.c
@@ -8,7 +8,7 @@
 #define DT_DRV_COMPAT fixed_partitions
 
 #include <zephyr/device.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/storage/flash_map.h>
 
 #define FLASH_AREA_FOO(part)							\
diff --git a/subsys/testsuite/coverage/coverage.c b/subsys/testsuite/coverage/coverage.c
index 95f31ce12b..739251bc9b 100644
--- a/subsys/testsuite/coverage/coverage.c
+++ b/subsys/testsuite/coverage/coverage.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <errno.h>
diff --git a/subsys/testsuite/include/zephyr/tc_util.h b/subsys/testsuite/include/zephyr/tc_util.h
index 8366475373..18637605e9 100644
--- a/subsys/testsuite/include/zephyr/tc_util.h
+++ b/subsys/testsuite/include/zephyr/tc_util.h
@@ -9,7 +9,7 @@
 #ifndef ZEPHYR_TESTSUITE_INCLUDE_TC_UTIL_H_
 #define ZEPHYR_TESTSUITE_INCLUDE_TC_UTIL_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <string.h>
 #ifdef CONFIG_SHELL
diff --git a/subsys/testsuite/include/zephyr/timestamp.h b/subsys/testsuite/include/zephyr/timestamp.h
index 673e9d822a..e59511fb60 100644
--- a/subsys/testsuite/include/zephyr/timestamp.h
+++ b/subsys/testsuite/include/zephyr/timestamp.h
@@ -13,7 +13,7 @@
 
 #ifndef _TIMESTAMP_H_
 #define _TIMESTAMP_H_
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <limits.h>
 #if defined(__GNUC__)
diff --git a/subsys/testsuite/ztest/include/zephyr/ztest.h b/subsys/testsuite/ztest/include/zephyr/ztest.h
index 7178bff133..bf8f064258 100644
--- a/subsys/testsuite/ztest/include/zephyr/ztest.h
+++ b/subsys/testsuite/ztest/include/zephyr/ztest.h
@@ -44,7 +44,7 @@ typedef struct esf z_arch_esf_t;
 #include <zephyr/sys/printk.h>
 #define PRINT printk
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/ztest_assert.h>
 #include <zephyr/ztest_mock.h>
diff --git a/subsys/testsuite/ztest/include/zephyr/ztest_error_hook.h b/subsys/testsuite/ztest/include/zephyr/ztest_error_hook.h
index 2d9d33c85c..6ebee086fc 100644
--- a/subsys/testsuite/ztest/include/zephyr/ztest_error_hook.h
+++ b/subsys/testsuite/ztest/include/zephyr/ztest_error_hook.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_INCLUDE_ZTEST_FATAL_HOOK_H_
 #define ZEPHYR_INCLUDE_ZTEST_FATAL_HOOK_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/testsuite/ztest/src/ztest_error_hook.c b/subsys/testsuite/ztest/src/ztest_error_hook.c
index 3fbc78cc70..e0a92077b0 100644
--- a/subsys/testsuite/ztest/src/ztest_error_hook.c
+++ b/subsys/testsuite/ztest/src/ztest_error_hook.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 
diff --git a/subsys/tracing/ctf/ctf_top.c b/subsys/tracing/ctf/ctf_top.c
index cf2bad5aef..40cc31dbc3 100644
--- a/subsys/tracing/ctf/ctf_top.c
+++ b/subsys/tracing/ctf/ctf_top.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <ctf_top.h>
diff --git a/subsys/tracing/sysview/sysview.c b/subsys/tracing/sysview/sysview.c
index 2fd661751c..34edb7ce59 100644
--- a/subsys/tracing/sysview/sysview.c
+++ b/subsys/tracing/sysview/sysview.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/kernel_structs.h>
 #include <zephyr/init.h>
 #include <ksched.h>
diff --git a/subsys/tracing/test/tracing_string_format_test.c b/subsys/tracing/test/tracing_string_format_test.c
index e79e5f1d30..26f1d2474f 100644
--- a/subsys/tracing/test/tracing_string_format_test.c
+++ b/subsys/tracing/test/tracing_string_format_test.c
@@ -6,7 +6,7 @@
 
 #define DISABLE_SYSCALL_TRACING
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <tracing_test.h>
 #include <tracing_test_syscall.h>
 #include <zephyr/tracing/tracing_format.h>
diff --git a/subsys/usb/device/bos.c b/subsys/usb/device/bos.c
index 6167800dd1..9e7f178a1a 100644
--- a/subsys/usb/device/bos.c
+++ b/subsys/usb/device/bos.c
@@ -8,7 +8,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_bos);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/usb/usb_device.h>
 
diff --git a/subsys/usb/device/os_desc.c b/subsys/usb/device/os_desc.c
index 2b1ad7ed80..ce94352504 100644
--- a/subsys/usb/device/os_desc.c
+++ b/subsys/usb/device/os_desc.c
@@ -8,7 +8,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_os_desc);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/usb/usb_device.h>
 #include <os_desc.h>
diff --git a/subsys/usb/device/usb_transfer.c b/subsys/usb/device/usb_transfer.c
index 1e385d20c9..ad47c1a312 100644
--- a/subsys/usb/device/usb_transfer.c
+++ b/subsys/usb/device/usb_transfer.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/usb/usb_device.h>
 #include <zephyr/logging/log.h>
 
diff --git a/tests/application_development/code_relocation/src/test_file1.c b/tests/application_development/code_relocation/src/test_file1.c
index 412b8decd8..55fa850c1c 100644
--- a/tests/application_development/code_relocation/src/test_file1.c
+++ b/tests/application_development/code_relocation/src/test_file1.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/application_development/code_relocation/src/test_file2.c b/tests/application_development/code_relocation/src/test_file2.c
index 877f9d9fd5..2139187d79 100644
--- a/tests/application_development/code_relocation/src/test_file2.c
+++ b/tests/application_development/code_relocation/src/test_file2.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/application_development/code_relocation/src/test_file3.c b/tests/application_development/code_relocation/src/test_file3.c
index 6499d86aae..e7c26773c3 100644
--- a/tests/application_development/code_relocation/src/test_file3.c
+++ b/tests/application_development/code_relocation/src/test_file3.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c b/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c
index 51f9bc4a8e..eb3ace8a00 100644
--- a/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c
+++ b/tests/arch/arm/arm_hardfault_validation/src/arm_hardfault.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
diff --git a/tests/arch/arm/arm_interrupt/src/test_syscalls.h b/tests/arch/arm/arm_interrupt/src/test_syscalls.h
index 3de0d1b09e..5d85f7d4f8 100644
--- a/tests/arch/arm/arm_interrupt/src/test_syscalls.h
+++ b/tests/arch/arm/arm_interrupt/src/test_syscalls.h
@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 __syscall void test_arm_user_interrupt_syscall(void);
 
diff --git a/tests/arch/arm/arm_mem_protect/src/main.c b/tests/arch/arm/arm_mem_protect/src/main.c
index 25b4d7198e..45e2314a98 100644
--- a/tests/arch/arm/arm_mem_protect/src/main.c
+++ b/tests/arch/arm/arm_mem_protect/src/main.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2021 Lexmark International, Inc.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/syscall_handler.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c b/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c
index 92b324c974..b6789804d9 100644
--- a/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c
+++ b/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
diff --git a/tests/arch/arm/arm_thread_swap/src/test_syscalls.h b/tests/arch/arm/arm_thread_swap/src/test_syscalls.h
index f365f6896b..760ae3cbaa 100644
--- a/tests/arch/arm/arm_thread_swap/src/test_syscalls.h
+++ b/tests/arch/arm/arm_thread_swap/src/test_syscalls.h
@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 __syscall void test_arm_user_syscall(void);
 __syscall void test_arm_cpu_write_reg(void);
diff --git a/tests/arch/arm64/arm64_high_addresses/src/main.c b/tests/arch/arm64/arm64_high_addresses/src/main.c
index 97540eb6d8..c91b6bffd4 100644
--- a/tests/arch/arm64/arm64_high_addresses/src/main.c
+++ b/tests/arch/arm64/arm64_high_addresses/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 ZTEST_USER(arm64_high_addresses, test_arm64_high_addresses)
diff --git a/tests/arch/x86/cpu_scrubs_regs/src/main.c b/tests/arch/x86/cpu_scrubs_regs/src/main.c
index 7b0597ad9b..bddcc4f792 100644
--- a/tests/arch/x86/cpu_scrubs_regs/src/main.c
+++ b/tests/arch/x86/cpu_scrubs_regs/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/syscall_handler.h>
 #include <zephyr/ztest.h>
 #include "test_syscalls.h"
diff --git a/tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h b/tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h
index bb7a711c79..105ded868a 100644
--- a/tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h
+++ b/tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h
@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 __syscall void test_cpu_write_reg(void);
 
diff --git a/tests/arch/x86/info/src/acpi.c b/tests/arch/x86/info/src/acpi.c
index 5df99d9b3d..e8501bc3ef 100644
--- a/tests/arch/x86/info/src/acpi.c
+++ b/tests/arch/x86/info/src/acpi.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/arch/x86/acpi.h>
 
 static void vtd_dev_scope_info(struct acpi_dmar_dev_scope *dev_scope)
diff --git a/tests/arch/x86/info/src/main.c b/tests/arch/x86/info/src/main.c
index ea16950c62..8fdf97a9f3 100644
--- a/tests/arch/x86/info/src/main.c
+++ b/tests/arch/x86/info/src/main.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "info.h"
 
 __weak void multiboot(void)
diff --git a/tests/arch/x86/info/src/memmap.c b/tests/arch/x86/info/src/memmap.c
index 8eb0a31f9d..5c73cfa39a 100644
--- a/tests/arch/x86/info/src/memmap.c
+++ b/tests/arch/x86/info/src/memmap.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/arch/x86/memmap.h>
 
 void memmap(void)
diff --git a/tests/arch/x86/info/src/multiboot.c b/tests/arch/x86/info/src/multiboot.c
index 43febc8e6b..93fe2c1b23 100644
--- a/tests/arch/x86/info/src/multiboot.c
+++ b/tests/arch/x86/info/src/multiboot.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/arch/x86/multiboot.h>
 
 void multiboot(void)
diff --git a/tests/arch/x86/info/src/timer.c b/tests/arch/x86/info/src/timer.c
index 0c367b5ae3..85d4a72215 100644
--- a/tests/arch/x86/info/src/timer.c
+++ b/tests/arch/x86/info/src/timer.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2019 Intel Corp.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/counter.h>
 
diff --git a/tests/arch/x86/nmi/src/main.c b/tests/arch/x86/nmi/src/main.c
index 0bcb3b2e30..2664aa0cac 100644
--- a/tests/arch/x86/nmi/src/main.c
+++ b/tests/arch/x86/nmi/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/tc_util.h>
 
diff --git a/tests/arch/x86/pagetables/src/main.c b/tests/arch/x86/pagetables/src/main.c
index e546763ca2..2392746fb7 100644
--- a/tests/arch/x86/pagetables/src/main.c
+++ b/tests/arch/x86/pagetables/src/main.c
@@ -9,7 +9,7 @@
  * x86-specific tests for MMU features and page tables
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/tc_util.h>
 #include <zephyr/arch/x86/mmustructs.h>
diff --git a/tests/arch/x86/static_idt/src/main.c b/tests/arch/x86/static_idt/src/main.c
index d307a70dca..d86d57fda3 100644
--- a/tests/arch/x86/static_idt/src/main.c
+++ b/tests/arch/x86/static_idt/src/main.c
@@ -10,7 +10,7 @@
  *  Ensures interrupt and exception stubs are installed correctly.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/tc_util.h>
 #include <zephyr/arch/x86/ia32/segmentation.h>
diff --git a/tests/benchmarks/app_kernel/src/master.h b/tests/benchmarks/app_kernel/src/master.h
index a4397efa4e..0f8c13b41c 100644
--- a/tests/benchmarks/app_kernel/src/master.h
+++ b/tests/benchmarks/app_kernel/src/master.h
@@ -9,7 +9,7 @@
 #ifndef _MASTER_H
 #define _MASTER_H
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <stdio.h>
 
diff --git a/tests/benchmarks/app_kernel/src/memmap_b.c b/tests/benchmarks/app_kernel/src/memmap_b.c
index 7f50ff73f2..8ef0a3ae37 100644
--- a/tests/benchmarks/app_kernel/src/memmap_b.c
+++ b/tests/benchmarks/app_kernel/src/memmap_b.c
@@ -7,7 +7,7 @@
  */
 
 #include "master.h"
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef MEMMAP_BENCH
 
diff --git a/tests/benchmarks/app_kernel/src/receiver.h b/tests/benchmarks/app_kernel/src/receiver.h
index 8456658cc8..4075a10e9b 100644
--- a/tests/benchmarks/app_kernel/src/receiver.h
+++ b/tests/benchmarks/app_kernel/src/receiver.h
@@ -9,7 +9,7 @@
 #ifndef _RECEIVER_H
 #define _RECEIVER_H
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "config.h"
 #include "memcfg.h"
 #include "master.h"
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c b/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c
index 958e29a871..7cb1986c09 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/benchmark_common.h"
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c b/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c
index 37ed1ccb66..f288a23499 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/benchmark_common.h"
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c b/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c
index 54cdb53b61..c7e6cde960 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/benchmark_common.h"
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c b/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c
index 3f2c82a6f0..fa91a3146b 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/benchmark_common.h"
diff --git a/tests/benchmarks/cmsis_dsp/common/benchmark_common.h b/tests/benchmarks/cmsis_dsp/common/benchmark_common.h
index 7efb4f9069..e2f65b88f5 100644
--- a/tests/benchmarks/cmsis_dsp/common/benchmark_common.h
+++ b/tests/benchmarks/cmsis_dsp/common/benchmark_common.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_BENCHMARK_CMSIS_DSP_COMMON_BENCHMARK_COMMON_H_
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #if defined(CONFIG_CPU_CORTEX_M_HAS_DWT)
 /* Use cycle counting on the Cortex-M devices that support DWT */
diff --git a/tests/benchmarks/latency_measure/src/heap_malloc_free.c b/tests/benchmarks/latency_measure/src/heap_malloc_free.c
index d61f785320..fe35e3d3b4 100644
--- a/tests/benchmarks/latency_measure/src/heap_malloc_free.c
+++ b/tests/benchmarks/latency_measure/src/heap_malloc_free.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/timing/timing.h>
 #include "utils.h"
 
diff --git a/tests/benchmarks/latency_measure/src/int_to_thread_evt.c b/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
index c87b13ee0e..acafd0e1fc 100644
--- a/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
+++ b/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
@@ -15,7 +15,7 @@
  * interrupted.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/irq_offload.h>
 
 #include "utils.h"
diff --git a/tests/benchmarks/latency_measure/src/mutex_lock_unlock.c b/tests/benchmarks/latency_measure/src/mutex_lock_unlock.c
index 2a8d11773a..d236f75a37 100644
--- a/tests/benchmarks/latency_measure/src/mutex_lock_unlock.c
+++ b/tests/benchmarks/latency_measure/src/mutex_lock_unlock.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/timing/timing.h>
 #include "utils.h"
 
diff --git a/tests/benchmarks/latency_measure/src/sema_test_signal_release.c b/tests/benchmarks/latency_measure/src/sema_test_signal_release.c
index 8baad21307..13fad1ff8e 100644
--- a/tests/benchmarks/latency_measure/src/sema_test_signal_release.c
+++ b/tests/benchmarks/latency_measure/src/sema_test_signal_release.c
@@ -12,7 +12,7 @@
  * mutex being tested.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/timing/timing.h>
 #include "utils.h"
 
diff --git a/tests/benchmarks/latency_measure/src/thread.c b/tests/benchmarks/latency_measure/src/thread.c
index 5fd6b413ae..5d140d9458 100644
--- a/tests/benchmarks/latency_measure/src/thread.c
+++ b/tests/benchmarks/latency_measure/src/thread.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/timing/timing.h>
 #include "utils.h"
 
diff --git a/tests/benchmarks/latency_measure/src/thread_switch_yield.c b/tests/benchmarks/latency_measure/src/thread_switch_yield.c
index ddb4db4d94..1ddfa2b1dc 100644
--- a/tests/benchmarks/latency_measure/src/thread_switch_yield.c
+++ b/tests/benchmarks/latency_measure/src/thread_switch_yield.c
@@ -11,7 +11,7 @@
  * context switch.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/timing/timing.h>
 #include <stdlib.h>
 #include <zephyr/timestamp.h>
diff --git a/tests/benchmarks/sched/src/main.c b/tests/benchmarks/sched/src/main.c
index c889a1a56e..9d2f36e21b 100644
--- a/tests/benchmarks/sched/src/main.c
+++ b/tests/benchmarks/sched/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/wait_q.h>
 #include <ksched.h>
diff --git a/tests/benchmarks/sys_kernel/src/syskernel.c b/tests/benchmarks/sys_kernel/src/syskernel.c
index abb56c8faa..a19858df33 100644
--- a/tests/benchmarks/sys_kernel/src/syskernel.c
+++ b/tests/benchmarks/sys_kernel/src/syskernel.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/tc_util.h>
 
 #include "syskernel.h"
diff --git a/tests/bluetooth/adv/src/main.c b/tests/bluetooth/adv/src/main.c
index cd320424f7..2d100d3231 100644
--- a/tests/bluetooth/adv/src/main.c
+++ b/tests/bluetooth/adv/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
 
diff --git a/tests/bluetooth/bluetooth/src/bluetooth.c b/tests/bluetooth/bluetooth/src/bluetooth.c
index da7d2cf820..4b02efdcdc 100644
--- a/tests/bluetooth/bluetooth/src/bluetooth.c
+++ b/tests/bluetooth/bluetooth/src/bluetooth.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <errno.h>
 #include <zephyr/tc_util.h>
diff --git a/tests/bluetooth/bsim_bt/bsim_test_adv_chain/src/main.c b/tests/bluetooth/bsim_bt/bsim_test_adv_chain/src/main.c
index 37ff8c2926..feb3c255d5 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_adv_chain/src/main.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_adv_chain/src/main.c
@@ -6,7 +6,7 @@
 
 #include <stddef.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util.h>
diff --git a/tests/bluetooth/bsim_bt/bsim_test_gatt_write/src/main.c b/tests/bluetooth/bsim_bt/bsim_test_gatt_write/src/main.c
index b5c64fe3e7..06a39a05ca 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_gatt_write/src/main.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_gatt_write/src/main.c
@@ -6,7 +6,7 @@
 
 #include <stddef.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util.h>
diff --git a/tests/bluetooth/bsim_bt/bsim_test_multiple/src/main.c b/tests/bluetooth/bsim_bt/bsim_test_multiple/src/main.c
index 3d45768670..96ae150d1d 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_multiple/src/main.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_multiple/src/main.c
@@ -8,7 +8,7 @@
 
 #include <stddef.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util.h>
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/main.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/main.c
index 45a9d8476c..0beee2a33e 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/main.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/main.c
@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/settings/settings.h>
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c
index bced4006c6..d470f13178 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c
@@ -8,7 +8,7 @@
  * @brief HCI interface application
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/settings/settings.h>
 
diff --git a/tests/bluetooth/controller/mock_ctrl/src/ull_conn_iso.c b/tests/bluetooth/controller/mock_ctrl/src/ull_conn_iso.c
index e8080a524c..a774a83083 100644
--- a/tests/bluetooth/controller/mock_ctrl/src/ull_conn_iso.c
+++ b/tests/bluetooth/controller/mock_ctrl/src/ull_conn_iso.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "hal/ccm.h"
 #include "hal/ticker.h"
diff --git a/tests/bluetooth/controller/mock_ctrl/src/ull_peripheral_iso.c b/tests/bluetooth/controller/mock_ctrl/src/ull_peripheral_iso.c
index 2c605662b7..08d345f685 100644
--- a/tests/bluetooth/controller/mock_ctrl/src/ull_peripheral_iso.c
+++ b/tests/bluetooth/controller/mock_ctrl/src/ull_peripheral_iso.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/buf.h>
 #include <zephyr/sys/byteorder.h>
 
diff --git a/tests/bluetooth/df/common/src/bt_common.c b/tests/bluetooth/df/common/src/bt_common.c
index cea5616376..3b7a379a4b 100644
--- a/tests/bluetooth/df/common/src/bt_common.c
+++ b/tests/bluetooth/df/common/src/bt_common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/df/common/src/bt_conn_common.c b/tests/bluetooth/df/common/src/bt_conn_common.c
index b503a25397..7e1162d18c 100644
--- a/tests/bluetooth/df/common/src/bt_conn_common.c
+++ b/tests/bluetooth/df/common/src/bt_conn_common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/df/connection_cte_req/src/test_cte_req_enable.c b/tests/bluetooth/df/connection_cte_req/src/test_cte_req_enable.c
index cfddcb0c65..e518903cba 100644
--- a/tests/bluetooth/df/connection_cte_req/src/test_cte_req_enable.c
+++ b/tests/bluetooth/df/connection_cte_req/src/test_cte_req_enable.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/df/connection_cte_req/src/test_cte_set_rx_params.c b/tests/bluetooth/df/connection_cte_req/src/test_cte_set_rx_params.c
index 19d9b11818..72a0786193 100644
--- a/tests/bluetooth/df/connection_cte_req/src/test_cte_set_rx_params.c
+++ b/tests/bluetooth/df/connection_cte_req/src/test_cte_set_rx_params.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/df/connection_cte_tx_params/src/test_set_conn_cte_tx_params.c b/tests/bluetooth/df/connection_cte_tx_params/src/test_set_conn_cte_tx_params.c
index 91918c0d44..11cbf937a3 100644
--- a/tests/bluetooth/df/connection_cte_tx_params/src/test_set_conn_cte_tx_params.c
+++ b/tests/bluetooth/df/connection_cte_tx_params/src/test_set_conn_cte_tx_params.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/df/connectionless_cte_chains/src/common.c b/tests/bluetooth/df/connectionless_cte_chains/src/common.c
index d65910aea8..743c944fba 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/src/common.c
+++ b/tests/bluetooth/df/connectionless_cte_chains/src/common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/df/connectionless_cte_chains/src/test_add_cte_to_chain.c b/tests/bluetooth/df/connectionless_cte_chains/src/test_add_cte_to_chain.c
index 10ee6369df..2ab527f6b0 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/src/test_add_cte_to_chain.c
+++ b/tests/bluetooth/df/connectionless_cte_chains/src/test_add_cte_to_chain.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/df/connectionless_cte_chains/src/test_remove_cte_from_chain.c b/tests/bluetooth/df/connectionless_cte_chains/src/test_remove_cte_from_chain.c
index b8f3277f10..e4720529ad 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/src/test_remove_cte_from_chain.c
+++ b/tests/bluetooth/df/connectionless_cte_chains/src/test_remove_cte_from_chain.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/df/connectionless_cte_rx/src/common.c b/tests/bluetooth/df/connectionless_cte_rx/src/common.c
index 6635f537bf..32b639a810 100644
--- a/tests/bluetooth/df/connectionless_cte_rx/src/common.c
+++ b/tests/bluetooth/df/connectionless_cte_rx/src/common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/df/connectionless_cte_rx/src/test_set_iq_sampling_enable.c b/tests/bluetooth/df/connectionless_cte_rx/src/test_set_iq_sampling_enable.c
index 68e9288c5c..c29cc168ec 100644
--- a/tests/bluetooth/df/connectionless_cte_rx/src/test_set_iq_sampling_enable.c
+++ b/tests/bluetooth/df/connectionless_cte_rx/src/test_set_iq_sampling_enable.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/df/connectionless_cte_tx/src/common.c b/tests/bluetooth/df/connectionless_cte_tx/src/common.c
index 0bd45a42a5..f00f96d55a 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/src/common.c
+++ b/tests/bluetooth/df/connectionless_cte_tx/src/common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_enable.c b/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_enable.c
index b63c2eee22..313f94e776 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_enable.c
+++ b/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_enable.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_param.c b/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_param.c
index f2ec025d50..e539730f96 100644
--- a/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_param.c
+++ b/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_param.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/gatt/src/main.c b/tests/bluetooth/gatt/src/main.c
index cb72809b1e..d5c0327266 100644
--- a/tests/bluetooth/gatt/src/main.c
+++ b/tests/bluetooth/gatt/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/hci_codecs_info/src/main.c b/tests/bluetooth/hci_codecs_info/src/main.c
index e3d40547a8..c941166f16 100644
--- a/tests/bluetooth/hci_codecs_info/src/main.c
+++ b/tests/bluetooth/hci_codecs_info/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/hci_prop_evt/src/main.c b/tests/bluetooth/hci_prop_evt/src/main.c
index 6ac19a095e..978d3f95d9 100644
--- a/tests/bluetooth/hci_prop_evt/src/main.c
+++ b/tests/bluetooth/hci_prop_evt/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <errno.h>
 #include <zephyr/tc_util.h>
diff --git a/tests/bluetooth/host_long_adv_recv/src/main.c b/tests/bluetooth/host_long_adv_recv/src/main.c
index 8e15f3c083..24010e5326 100644
--- a/tests/bluetooth/host_long_adv_recv/src/main.c
+++ b/tests/bluetooth/host_long_adv_recv/src/main.c
@@ -7,7 +7,7 @@
  */
 
 #include <zephyr/fff.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include <errno.h>
diff --git a/tests/bluetooth/l2cap/src/main.c b/tests/bluetooth/l2cap/src/main.c
index af3e5bf266..029b5f9028 100644
--- a/tests/bluetooth/l2cap/src/main.c
+++ b/tests/bluetooth/l2cap/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/ll_settings/src/main.c b/tests/bluetooth/ll_settings/src/main.c
index 472d1df9f9..5e4fea4c5a 100644
--- a/tests/bluetooth/ll_settings/src/main.c
+++ b/tests/bluetooth/ll_settings/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/bluetooth/mesh_shell/src/main.c b/tests/bluetooth/mesh_shell/src/main.c
index 1017e3184d..b76673fd56 100644
--- a/tests/bluetooth/mesh_shell/src/main.c
+++ b/tests/bluetooth/mesh_shell/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/sys/printk.h>
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/shell/shell.h>
 
diff --git a/tests/bluetooth/shell/src/main.c b/tests/bluetooth/shell/src/main.c
index 15ace788fb..ebba188607 100644
--- a/tests/bluetooth/shell/src/main.c
+++ b/tests/bluetooth/shell/src/main.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/usb/usb_device.h>
 #include <zephyr/drivers/uart.h>
 
diff --git a/tests/bluetooth/tester/src/bttester.c b/tests/bluetooth/tester/src/bttester.c
index 0f7d3ab38a..0936c87acd 100644
--- a/tests/bluetooth/tester/src/bttester.c
+++ b/tests/bluetooth/tester/src/bttester.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/types.h>
diff --git a/tests/bluetooth/tester/src/main.c b/tests/bluetooth/tester/src/main.c
index 74e1bc84d8..2bd20e946b 100644
--- a/tests/bluetooth/tester/src/main.c
+++ b/tests/bluetooth/tester/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/toolchain.h>
 
diff --git a/tests/boards/altera_max10/i2c_master/src/i2c_master.c b/tests/boards/altera_max10/i2c_master/src/i2c_master.c
index d43bbf3657..ce3a2eeff3 100644
--- a/tests/boards/altera_max10/i2c_master/src/i2c_master.c
+++ b/tests/boards/altera_max10/i2c_master/src/i2c_master.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/drivers/i2c.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 /*
diff --git a/tests/boards/altera_max10/sysid/src/sysid.c b/tests/boards/altera_max10/sysid/src/sysid.c
index 1256a616ad..962b4e9049 100644
--- a/tests/boards/altera_max10/sysid/src/sysid.c
+++ b/tests/boards/altera_max10/sysid/src/sysid.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include "altera_avalon_sysid.h"
diff --git a/tests/boards/espressif_esp32/cache_coex/src/cache_coex.c b/tests/boards/espressif_esp32/cache_coex/src/cache_coex.c
index 68ec2b658a..b89b6c8aec 100644
--- a/tests/boards/espressif_esp32/cache_coex/src/cache_coex.c
+++ b/tests/boards/espressif_esp32/cache_coex/src/cache_coex.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/sys/printk.h>
diff --git a/tests/boards/intel_adsp/mm/src/main.c b/tests/boards/intel_adsp/mm/src/main.c
index 50f92f9df1..d836475412 100644
--- a/tests/boards/intel_adsp/mm/src/main.c
+++ b/tests/boards/intel_adsp/mm/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/toolchain.h>
 #include <zephyr/sys/printk.h>
diff --git a/tests/boards/intel_adsp/smoke/src/main.c b/tests/boards/intel_adsp/smoke/src/main.c
index 9f36581de8..3643687505 100644
--- a/tests/boards/intel_adsp/smoke/src/main.c
+++ b/tests/boards/intel_adsp/smoke/src/main.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2022 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <stdlib.h>
 #include "tests.h"
diff --git a/tests/boards/intel_adsp/smoke/src/smpboot.c b/tests/boards/intel_adsp/smoke/src/smpboot.c
index 9083641720..5dbedfe63c 100644
--- a/tests/boards/intel_adsp/smoke/src/smpboot.c
+++ b/tests/boards/intel_adsp/smoke/src/smpboot.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include "tests.h"
 
diff --git a/tests/boards/intel_adsp/ssp/src/main.c b/tests/boards/intel_adsp/ssp/src/main.c
index c7fc520ab0..f7ff98830b 100644
--- a/tests/boards/intel_adsp/ssp/src/main.c
+++ b/tests/boards/intel_adsp/ssp/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/toolchain.h>
 #include <zephyr/sys/printk.h>
diff --git a/tests/boards/mec15xxevb_assy6853/i2c_api/src/main.c b/tests/boards/mec15xxevb_assy6853/i2c_api/src/main.c
index 7cf0b415e0..7143f98c88 100644
--- a/tests/boards/mec15xxevb_assy6853/i2c_api/src/main.c
+++ b/tests/boards/mec15xxevb_assy6853/i2c_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/drivers/i2c.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 /* command to configure port direction of NXP PCA95xx */
diff --git a/tests/boards/native_posix/cpu_wait/src/main.c b/tests/boards/native_posix/cpu_wait/src/main.c
index f98b035a01..ec36fcce65 100644
--- a/tests/boards/native_posix/cpu_wait/src/main.c
+++ b/tests/boards/native_posix/cpu_wait/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <stdlib.h>
diff --git a/tests/boards/native_posix/rtc/src/main.c b/tests/boards/native_posix/rtc/src/main.c
index 9f781863b7..b1960c2e49 100644
--- a/tests/boards/native_posix/rtc/src/main.c
+++ b/tests/boards/native_posix/rtc/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <stdlib.h>
diff --git a/tests/boot/uefi/src/main.c b/tests/boot/uefi/src/main.c
index 6e1ba6a64f..1f1106a128 100644
--- a/tests/boot/uefi/src/main.c
+++ b/tests/boot/uefi/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 void main(void)
diff --git a/tests/crypto/mbedtls/src/mbedtls.c b/tests/crypto/mbedtls/src/mbedtls.c
index 250a08734e..971e87cc58 100644
--- a/tests/crypto/mbedtls/src/mbedtls.c
+++ b/tests/crypto/mbedtls/src/mbedtls.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <errno.h>
 
diff --git a/tests/drivers/adc/adc_api/src/main.c b/tests/drivers/adc/adc_api/src/main.c
index 609d10c414..09549ca7ac 100644
--- a/tests/drivers/adc/adc_api/src/main.c
+++ b/tests/drivers/adc/adc_api/src/main.c
@@ -6,7 +6,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 extern const struct device *get_adc_device(void);
diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c
index 848363fe99..4e26d7cde6 100644
--- a/tests/drivers/adc/adc_api/src/test_adc.c
+++ b/tests/drivers/adc/adc_api/src/test_adc.c
@@ -7,7 +7,7 @@
 
 
 #include <zephyr/drivers/adc.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #if defined(CONFIG_SHIELD_MIKROE_ADC_CLICK)
diff --git a/tests/drivers/adc/adc_dma/src/main.c b/tests/drivers/adc/adc_dma/src/main.c
index a185688899..a1f73c339d 100644
--- a/tests/drivers/adc/adc_dma/src/main.c
+++ b/tests/drivers/adc/adc_dma/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 extern const struct device *get_adc_device(void);
diff --git a/tests/drivers/adc/adc_dma/src/test_adc.c b/tests/drivers/adc/adc_dma/src/test_adc.c
index 8e1625efae..341e2bfe50 100644
--- a/tests/drivers/adc/adc_dma/src/test_adc.c
+++ b/tests/drivers/adc/adc_dma/src/test_adc.c
@@ -9,7 +9,7 @@
 
 #include <zephyr/drivers/adc.h>
 #include <zephyr/drivers/counter.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #if defined(CONFIG_BOARD_FRDM_K64F)
diff --git a/tests/drivers/adc/adc_emul/src/main.c b/tests/drivers/adc/adc_emul/src/main.c
index 50d72cbe15..1cd6d746bc 100644
--- a/tests/drivers/adc/adc_emul/src/main.c
+++ b/tests/drivers/adc/adc_emul/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/drivers/adc.h>
 #include <zephyr/drivers/adc/adc_emul.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #define ADC_DEVICE_NODE		DT_INST(0, zephyr_adc_emul)
diff --git a/tests/drivers/console/src/main.c b/tests/drivers/console/src/main.c
index b086c4b511..0838706a38 100644
--- a/tests/drivers/console/src/main.c
+++ b/tests/drivers/console/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 void main(void)
diff --git a/tests/drivers/dac/dac_api/src/main.c b/tests/drivers/dac/dac_api/src/main.c
index f8752d2826..f22d525d0e 100644
--- a/tests/drivers/dac/dac_api/src/main.c
+++ b/tests/drivers/dac/dac_api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 extern void test_dac_write_value(void);
diff --git a/tests/drivers/dac/dac_api/src/test_dac.c b/tests/drivers/dac/dac_api/src/test_dac.c
index 1611e58207..059b02ac79 100644
--- a/tests/drivers/dac/dac_api/src/test_dac.c
+++ b/tests/drivers/dac/dac_api/src/test_dac.c
@@ -6,7 +6,7 @@
 
 
 #include <zephyr/drivers/dac.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #if defined(CONFIG_BOARD_NUCLEO_F091RC) || \
diff --git a/tests/drivers/dac/dac_loopback/src/main.c b/tests/drivers/dac/dac_loopback/src/main.c
index 7af5d559fc..ef3f9096a0 100644
--- a/tests/drivers/dac/dac_loopback/src/main.c
+++ b/tests/drivers/dac/dac_loopback/src/main.c
@@ -11,7 +11,7 @@
  * @}
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 extern void test_dac_loopback(void);
diff --git a/tests/drivers/dac/dac_loopback/src/test_dac.c b/tests/drivers/dac/dac_loopback/src/test_dac.c
index 76d72af21e..c72244e397 100644
--- a/tests/drivers/dac/dac_loopback/src/test_dac.c
+++ b/tests/drivers/dac/dac_loopback/src/test_dac.c
@@ -14,7 +14,7 @@
 
 #include <zephyr/drivers/dac.h>
 #include <zephyr/drivers/adc.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 /*
diff --git a/tests/drivers/disk/disk_access/src/main.c b/tests/drivers/disk/disk_access/src/main.c
index 765d5be4c5..382cb46764 100644
--- a/tests/drivers/disk/disk_access/src/main.c
+++ b/tests/drivers/disk/disk_access/src/main.c
@@ -9,7 +9,7 @@
  * this test with an disk that has useful data
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/storage/disk_access.h>
 #include <zephyr/device.h>
diff --git a/tests/drivers/disk/disk_performance/src/main.c b/tests/drivers/disk/disk_performance/src/main.c
index fafa04c8b1..a831c635af 100644
--- a/tests/drivers/disk/disk_performance/src/main.c
+++ b/tests/drivers/disk/disk_performance/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/storage/disk_access.h>
 #include <zephyr/device.h>
diff --git a/tests/drivers/dma/chan_blen_transfer/src/main.c b/tests/drivers/dma/chan_blen_transfer/src/main.c
index aff6ad04c0..d8580eb4c2 100644
--- a/tests/drivers/dma/chan_blen_transfer/src/main.c
+++ b/tests/drivers/dma/chan_blen_transfer/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 ZTEST_SUITE(dma_m2m, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/dma/chan_blen_transfer/src/test_dma.c b/tests/drivers/dma/chan_blen_transfer/src/test_dma.c
index ede0a69836..e777704ec7 100644
--- a/tests/drivers/dma/chan_blen_transfer/src/test_dma.c
+++ b/tests/drivers/dma/chan_blen_transfer/src/test_dma.c
@@ -16,7 +16,7 @@
  *   -# Data is transferred correctly from src to dest
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/dma.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/drivers/dma/chan_link_transfer/src/main.c b/tests/drivers/dma/chan_link_transfer/src/main.c
index 1fcc5e57ff..644b0c6454 100644
--- a/tests/drivers/dma/chan_link_transfer/src/main.c
+++ b/tests/drivers/dma/chan_link_transfer/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 ZTEST_SUITE(dma_m2m_link, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/dma/chan_link_transfer/src/test_dma.c b/tests/drivers/dma/chan_link_transfer/src/test_dma.c
index 72f871ae5f..12a008979b 100644
--- a/tests/drivers/dma/chan_link_transfer/src/test_dma.c
+++ b/tests/drivers/dma/chan_link_transfer/src/test_dma.c
@@ -17,7 +17,7 @@
  *   -# Data is transferred correctly from src to dest
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/dma.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/drivers/dma/loop_transfer/src/main.c b/tests/drivers/dma/loop_transfer/src/main.c
index b8004c14fe..a690772b73 100644
--- a/tests/drivers/dma/loop_transfer/src/main.c
+++ b/tests/drivers/dma/loop_transfer/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 ZTEST_SUITE(dma_m2m_loop, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/dma/loop_transfer/src/test_dma_loop.c b/tests/drivers/dma/loop_transfer/src/test_dma_loop.c
index 43b8c0fdab..fd707c421f 100644
--- a/tests/drivers/dma/loop_transfer/src/test_dma_loop.c
+++ b/tests/drivers/dma/loop_transfer/src/test_dma_loop.c
@@ -21,7 +21,7 @@
  *   -# Data is transferred correctly from src to dest, for each loop
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/dma.h>
diff --git a/tests/drivers/dma/scatter_gather/src/main.c b/tests/drivers/dma/scatter_gather/src/main.c
index 46ebcc495c..5a16e5516e 100644
--- a/tests/drivers/dma/scatter_gather/src/main.c
+++ b/tests/drivers/dma/scatter_gather/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 ZTEST_SUITE(dma_m2m_sg, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/flash/src/main.c b/tests/drivers/flash/src/main.c
index ef5c4f107e..143e5451e5 100644
--- a/tests/drivers/flash/src/main.c
+++ b/tests/drivers/flash/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/devicetree.h>
diff --git a/tests/drivers/gpio/gpio_api_1pin/src/test_gpio_api.h b/tests/drivers/gpio/gpio_api_1pin/src/test_gpio_api.h
index 28e049750c..024c9d1a9d 100644
--- a/tests/drivers/gpio/gpio_api_1pin/src/test_gpio_api.h
+++ b/tests/drivers/gpio/gpio_api_1pin/src/test_gpio_api.h
@@ -7,7 +7,7 @@
 #ifndef TEST_GPIO_API_H_
 #define TEST_GPIO_API_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/drivers/gpio/gpio_basic_api/src/gpio_emul_callback.c b/tests/drivers/gpio/gpio_basic_api/src/gpio_emul_callback.c
index 74ffd3eca6..258191b23e 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/gpio_emul_callback.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/gpio_emul_callback.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/gpio/gpio_emul.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "test_gpio.h"
 
diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
index 1c2d004762..38a15dc3dc 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
@@ -7,7 +7,7 @@
 #ifndef __TEST_GPIO_H__
 #define __TEST_GPIO_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/ztest.h>
diff --git a/tests/drivers/gpio/gpio_get_direction/src/main.c b/tests/drivers/gpio/gpio_get_direction/src/main.c
index 2f44cd049b..9f36dcb86b 100644
--- a/tests/drivers/gpio/gpio_get_direction/src/main.c
+++ b/tests/drivers/gpio/gpio_get_direction/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/drivers/i2c/i2c_api/src/main.c b/tests/drivers/i2c/i2c_api/src/main.c
new file mode 100644
index 0000000000..2e7da031ca
--- /dev/null
+++ b/tests/drivers/i2c/i2c_api/src/main.c
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+
+extern void test_i2c_gy271(void);
+extern void test_i2c_burst_gy271(void);
+
+void test_main(void)
+{
+	ztest_test_suite(i2c_test,
+			 ztest_unit_test(test_i2c_gy271),
+			 ztest_unit_test(test_i2c_burst_gy271));
+	ztest_run_test_suite(i2c_test);
+}
diff --git a/tests/drivers/i2c/i2c_api/src/test_i2c.c b/tests/drivers/i2c/i2c_api/src/test_i2c.c
index 9107394680..55b92794a5 100644
--- a/tests/drivers/i2c/i2c_api/src/test_i2c.c
+++ b/tests/drivers/i2c/i2c_api/src/test_i2c.c
@@ -13,7 +13,7 @@
  */
 
 #include <zephyr/drivers/i2c.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_0), okay)
diff --git a/tests/drivers/i2c/i2c_target_api/src/main.c b/tests/drivers/i2c/i2c_target_api/src/main.c
index 3100d1a257..e07ab6d33d 100644
--- a/tests/drivers/i2c/i2c_target_api/src/main.c
+++ b/tests/drivers/i2c/i2c_target_api/src/main.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <stdio.h>
 #include <zephyr/sys/util.h>
diff --git a/tests/drivers/i2s/i2s_api/src/common.c b/tests/drivers/i2s/i2s_api/src/common.c
index 32c8eec85d..b6beb072b3 100644
--- a/tests/drivers/i2s/i2s_api/src/common.c
+++ b/tests/drivers/i2s/i2s_api/src/common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
diff --git a/tests/drivers/i2s/i2s_api/src/main.c b/tests/drivers/i2s/i2s_api/src/main.c
index feea482d83..4fdadd826e 100644
--- a/tests/drivers/i2s/i2s_api/src/main.c
+++ b/tests/drivers/i2s/i2s_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/device.h>
 #include "i2s_api_test.h"
diff --git a/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_loopback.c b/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_loopback.c
index e7c116c4af..93c1ddbb81 100644
--- a/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_loopback.c
+++ b/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_loopback.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
diff --git a/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_states.c b/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_states.c
index 9e41e20c78..d88b8d5483 100644
--- a/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_states.c
+++ b/tests/drivers/i2s/i2s_api/src/test_i2s_dir_both_states.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
diff --git a/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c b/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c
index d96a89515b..02ec5f03f3 100644
--- a/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c
+++ b/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
diff --git a/tests/drivers/i2s/i2s_api/src/test_i2s_states.c b/tests/drivers/i2s/i2s_api/src/test_i2s_states.c
index 0daa670afd..c2f6ee9440 100644
--- a/tests/drivers/i2s/i2s_api/src/test_i2s_states.c
+++ b/tests/drivers/i2s/i2s_api/src/test_i2s_states.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/i2s.h>
 #include "i2s_api_test.h"
diff --git a/tests/drivers/i2s/i2s_speed/src/main.c b/tests/drivers/i2s/i2s_speed/src/main.c
index c6e215f685..2fd74c019c 100644
--- a/tests/drivers/i2s/i2s_speed/src/main.c
+++ b/tests/drivers/i2s/i2s_speed/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 void test_i2s_tx_transfer_configure(void);
diff --git a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
index 964bd6dace..2890057f87 100644
--- a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
+++ b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/i2s.h>
 
diff --git a/tests/drivers/ipm/src/ipm_dummy.c b/tests/drivers/ipm/src/ipm_dummy.c
index de15c6b53f..af6f61df58 100644
--- a/tests/drivers/ipm/src/ipm_dummy.c
+++ b/tests/drivers/ipm/src/ipm_dummy.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/ipm.h>
 #include <errno.h>
 #include <zephyr/device.h>
diff --git a/tests/drivers/ipm/src/ipm_dummy.h b/tests/drivers/ipm/src/ipm_dummy.h
index d5fe9acced..4f9700cee0 100644
--- a/tests/drivers/ipm/src/ipm_dummy.h
+++ b/tests/drivers/ipm/src/ipm_dummy.h
@@ -8,7 +8,7 @@
 
 #ifndef _IPM_DUMMY_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/ipm.h>
 
diff --git a/tests/drivers/ipm/src/main.c b/tests/drivers/ipm/src/main.c
index ec084ccad7..2735ea684f 100644
--- a/tests/drivers/ipm/src/main.c
+++ b/tests/drivers/ipm/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/ipm.h>
 #include <zephyr/drivers/console/ipm_console.h>
 #include <zephyr/device.h>
diff --git a/tests/drivers/kscan/kscan_api/src/test_kscan.c b/tests/drivers/kscan/kscan_api/src/test_kscan.c
index b4ab01fe45..6f2e01065d 100644
--- a/tests/drivers/kscan/kscan_api/src/test_kscan.c
+++ b/tests/drivers/kscan/kscan_api/src/test_kscan.c
@@ -7,7 +7,7 @@
 #include <zephyr/device.h>
 #include <stdlib.h>
 #include <zephyr/drivers/kscan.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 static void kb_callback(const struct device *dev, uint32_t row, uint32_t col,
diff --git a/tests/drivers/led/led_api/src/main.c b/tests/drivers/led/led_api/src/main.c
new file mode 100644
index 0000000000..8b205bcdad
--- /dev/null
+++ b/tests/drivers/led/led_api/src/main.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2020 Seagate Technology LLC
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+
+#include "test_led_api.h"
+
+void test_main(void)
+{
+	ztest_test_suite(led_user_test,
+			 ztest_user_unit_test(test_led_setup),
+			 ztest_user_unit_test(test_led_get_info),
+			 ztest_user_unit_test(test_led_on),
+			 ztest_user_unit_test(test_led_off),
+			 ztest_user_unit_test(test_led_set_color),
+			 ztest_user_unit_test(test_led_set_brightness));
+	ztest_run_test_suite(led_user_test);
+}
diff --git a/tests/drivers/led/led_api/src/test_led_api.c b/tests/drivers/led/led_api/src/test_led_api.c
index 359ba56f10..4ca2d5a403 100644
--- a/tests/drivers/led/led_api/src/test_led_api.c
+++ b/tests/drivers/led/led_api/src/test_led_api.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/led.h>
 
diff --git a/tests/drivers/memc/ram/src/main.c b/tests/drivers/memc/ram/src/main.c
index c067df1352..478963f3bf 100644
--- a/tests/drivers/memc/ram/src/main.c
+++ b/tests/drivers/memc/ram/src/main.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/linker/devicetree_regions.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 /** Buffer size. */
diff --git a/tests/drivers/pwm/pwm_api/src/main.c b/tests/drivers/pwm/pwm_api/src/main.c
index 5c83702b8e..4d56ffae3d 100644
--- a/tests/drivers/pwm/pwm_api/src/main.c
+++ b/tests/drivers/pwm/pwm_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/device.h>
 
diff --git a/tests/drivers/pwm/pwm_api/src/test_pwm.c b/tests/drivers/pwm/pwm_api/src/test_pwm.c
index 16c5931c66..23027752e1 100644
--- a/tests/drivers/pwm/pwm_api/src/test_pwm.c
+++ b/tests/drivers/pwm/pwm_api/src/test_pwm.c
@@ -26,7 +26,7 @@
 #include <zephyr/device.h>
 #include <inttypes.h>
 #include <zephyr/drivers/pwm.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #if DT_NODE_HAS_STATUS(DT_ALIAS(pwm_0), okay)
diff --git a/tests/drivers/pwm/pwm_loopback/src/main.c b/tests/drivers/pwm/pwm_loopback/src/main.c
index 0078c22b3a..149b9bc0b9 100644
--- a/tests/drivers/pwm/pwm_loopback/src/main.c
+++ b/tests/drivers/pwm/pwm_loopback/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include "test_pwm_loopback.h"
diff --git a/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.c b/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.c
index 6c0366fb55..6d2c226021 100644
--- a/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.c
+++ b/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/pwm.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.h b/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.h
index bba5c2bbd7..062f953b6f 100644
--- a/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.h
+++ b/tests/drivers/pwm/pwm_loopback/src/test_pwm_loopback.h
@@ -7,7 +7,7 @@
 #ifndef __TEST_PWM_LOOPBACK_H__
 #define __TEST_PWM_LOOPBACK_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/pwm.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/drivers/regulator/fixed/src/main.c b/tests/drivers/regulator/fixed/src/main.c
index c6cbec9fe3..08630dd8c1 100644
--- a/tests/drivers/regulator/fixed/src/main.c
+++ b/tests/drivers/regulator/fixed/src/main.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/regulator.h>
 #include <zephyr/ztest.h>
diff --git a/tests/drivers/regulator/pmic/src/main.c b/tests/drivers/regulator/pmic/src/main.c
index 54d5f637aa..cce3cd97b9 100644
--- a/tests/drivers/regulator/pmic/src/main.c
+++ b/tests/drivers/regulator/pmic/src/main.c
@@ -9,7 +9,7 @@
  * respectively.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/adc.h>
 #include <zephyr/drivers/regulator.h>
diff --git a/tests/drivers/sdhc/src/main.c b/tests/drivers/sdhc/src/main.c
index e654db8f53..559884499b 100644
--- a/tests/drivers/sdhc/src/main.c
+++ b/tests/drivers/sdhc/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sdhc.h>
 #include <zephyr/device.h>
 #include <zephyr/ztest.h>
diff --git a/tests/drivers/sensor/generic/src/dummy_sensor.h b/tests/drivers/sensor/generic/src/dummy_sensor.h
index 4afb296b4e..c4118153d9 100644
--- a/tests/drivers/sensor/generic/src/dummy_sensor.h
+++ b/tests/drivers/sensor/generic/src/dummy_sensor.h
@@ -7,7 +7,7 @@
 #ifndef __TEST_DUMMY_SENSOR_H__
 #define __TEST_DUMMY_SENSOR_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #define DUMMY_SENSOR_NAME	"dummy_sensor"
diff --git a/tests/drivers/sensor/sbs_gauge/src/test_sbs_gauge.c b/tests/drivers/sensor/sbs_gauge/src/test_sbs_gauge.c
index 3a1c63e1d7..de03755b29 100644
--- a/tests/drivers/sensor/sbs_gauge/src/test_sbs_gauge.c
+++ b/tests/drivers/sensor/sbs_gauge/src/test_sbs_gauge.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/drivers/sensor.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 const struct device *get_fuel_gauge_device(void)
diff --git a/tests/drivers/spi/spi_loopback/src/spi.c b/tests/drivers/spi/spi_loopback/src/spi.c
index e9026aa433..5390f9a69b 100644
--- a/tests/drivers/spi/spi_loopback/src/spi.c
+++ b/tests/drivers/spi/spi_loopback/src/spi.c
@@ -8,7 +8,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/tests/drivers/virtualization/ivshmem/src/ivshmem.c b/tests/drivers/virtualization/ivshmem/src/ivshmem.c
index 4fb35026e3..e635626359 100644
--- a/tests/drivers/virtualization/ivshmem/src/ivshmem.c
+++ b/tests/drivers/virtualization/ivshmem/src/ivshmem.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include <zephyr/drivers/virtualization/ivshmem.h>
diff --git a/tests/drivers/w1/w1_api/src/main.c b/tests/drivers/w1/w1_api/src/main.c
index b620b2c1b9..7564be9341 100644
--- a/tests/drivers/w1/w1_api/src/main.c
+++ b/tests/drivers/w1/w1_api/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/sensor/w1_sensor.h>
 #include <zephyr/drivers/w1.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #define W1_MASTER  DT_NODELABEL(w1_0)
diff --git a/tests/drivers/watchdog/wdt_basic_api/src/main.c b/tests/drivers/watchdog/wdt_basic_api/src/main.c
index 21628dca29..694c032751 100644
--- a/tests/drivers/watchdog/wdt_basic_api/src/main.c
+++ b/tests/drivers/watchdog/wdt_basic_api/src/main.c
@@ -12,7 +12,7 @@
  * @}
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 ZTEST_SUITE(wdt_basic_test_suite, NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
index bcfc02a7e3..5805934540 100644
--- a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
+++ b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
@@ -58,7 +58,7 @@
  */
 
 #include <zephyr/drivers/watchdog.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 /*
diff --git a/tests/kernel/common/src/bitarray.c b/tests/kernel/common/src/bitarray.c
index 2750a8528b..a3a14901d1 100644
--- a/tests/kernel/common/src/bitarray.c
+++ b/tests/kernel/common/src/bitarray.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 
diff --git a/tests/kernel/common/src/bitfield.c b/tests/kernel/common/src/bitfield.c
index 2fc5f1fdfa..e3584487a1 100644
--- a/tests/kernel/common/src/bitfield.c
+++ b/tests/kernel/common/src/bitfield.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/arch/cpu.h>
 
diff --git a/tests/kernel/common/src/errno.c b/tests/kernel/common/src/errno.c
index 9de534493b..e1fe44900a 100644
--- a/tests/kernel/common/src/errno.c
+++ b/tests/kernel/common/src/errno.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/sys/errno_private.h>
 
diff --git a/tests/kernel/common/src/irq_offload.c b/tests/kernel/common/src/irq_offload.c
index 32581fbed8..395b74c2e8 100644
--- a/tests/kernel/common/src/irq_offload.c
+++ b/tests/kernel/common/src/irq_offload.c
@@ -12,7 +12,7 @@
  * context, on the IRQ stack.
  *
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/kernel_structs.h>
 #include <zephyr/irq_offload.h>
diff --git a/tests/kernel/common/src/multilib.c b/tests/kernel/common/src/multilib.c
index 9154617131..f691c356c3 100644
--- a/tests/kernel/common/src/multilib.c
+++ b/tests/kernel/common/src/multilib.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/tc_util.h>
 #include <zephyr/ztest.h>
diff --git a/tests/kernel/common/src/pow2.c b/tests/kernel/common/src/pow2.c
index 3185558c0f..2ba73031f5 100644
--- a/tests/kernel/common/src/pow2.c
+++ b/tests/kernel/common/src/pow2.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /**
  * @brief Test the Z_POW2_CEIL() macro
diff --git a/tests/kernel/device/src/bad_driver.c b/tests/kernel/device/src/bad_driver.c
index 701e13cb39..7f781ce92d 100644
--- a/tests/kernel/device/src/bad_driver.c
+++ b/tests/kernel/device/src/bad_driver.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 
diff --git a/tests/kernel/device/src/dummy_driver.c b/tests/kernel/device/src/dummy_driver.c
index e6f8dfe65d..bef80a159f 100644
--- a/tests/kernel/device/src/dummy_driver.c
+++ b/tests/kernel/device/src/dummy_driver.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 
diff --git a/tests/kernel/device/src/main.c b/tests/kernel/device/src/main.c
index a07d1e2ec7..8373e9e064 100644
--- a/tests/kernel/device/src/main.c
+++ b/tests/kernel/device/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
 #include <zephyr/ztest.h>
diff --git a/tests/kernel/device/src/test_driver_init.c b/tests/kernel/device/src/test_driver_init.c
index 6fff2bc2d2..1c468f72a2 100644
--- a/tests/kernel/device/src/test_driver_init.c
+++ b/tests/kernel/device/src/test_driver_init.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
 #include <zephyr/ztest.h>
diff --git a/tests/kernel/fatal/exception/src/main.c b/tests/kernel/fatal/exception/src/main.c
index 8cafe2eca7..8c2bb897ce 100644
--- a/tests/kernel/fatal/exception/src/main.c
+++ b/tests/kernel/fatal/exception/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/tc_util.h>
 #include <zephyr/kernel_structs.h>
diff --git a/tests/kernel/fatal/exception/src/test_syscalls.h b/tests/kernel/fatal/exception/src/test_syscalls.h
index 4c09000276..096547c35e 100644
--- a/tests/kernel/fatal/exception/src/test_syscalls.h
+++ b/tests/kernel/fatal/exception/src/test_syscalls.h
@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 __syscall void blow_up_priv_stack(void);
 
diff --git a/tests/kernel/fatal/message_capture/src/main.c b/tests/kernel/fatal/message_capture/src/main.c
index 9679221cbf..13379e70f4 100644
--- a/tests/kernel/fatal/message_capture/src/main.c
+++ b/tests/kernel/fatal/message_capture/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 static volatile int expected_reason = -1;
diff --git a/tests/kernel/fatal/no-multithreading/src/main.c b/tests/kernel/fatal/no-multithreading/src/main.c
index 53421f3034..f99f65e3f9 100644
--- a/tests/kernel/fatal/no-multithreading/src/main.c
+++ b/tests/kernel/fatal/no-multithreading/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/tc_util.h>
 #include <zephyr/kernel_structs.h>
diff --git a/tests/kernel/gen_isr_table/src/main.c b/tests/kernel/gen_isr_table/src/main.c
index 5c4b4eac02..6cee43147d 100644
--- a/tests/kernel/gen_isr_table/src/main.c
+++ b/tests/kernel/gen_isr_table/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/irq.h>
 #include <zephyr/tc_util.h>
diff --git a/tests/kernel/mem_heap/shared_multi_heap/src/main.c b/tests/kernel/mem_heap/shared_multi_heap/src/main.c
index b36a6b2198..40a12ccc31 100644
--- a/tests/kernel/mem_heap/shared_multi_heap/src/main.c
+++ b/tests/kernel/mem_heap/shared_multi_heap/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/sys/mem_manage.h>
diff --git a/tests/kernel/mem_protect/mem_protect/src/common.c b/tests/kernel/mem_protect/mem_protect/src/common.c
index c3d50321da..4fa016f514 100644
--- a/tests/kernel/mem_protect/mem_protect/src/common.c
+++ b/tests/kernel/mem_protect/mem_protect/src/common.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 ZTEST_BMEM volatile bool valid_fault;
diff --git a/tests/kernel/mem_protect/mem_protect/src/mem_protect.h b/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
index 637b068986..79682147d9 100644
--- a/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
+++ b/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/kernel_structs.h>
 #include <string.h>
diff --git a/tests/kernel/mem_protect/obj_validation/src/main.c b/tests/kernel/mem_protect/obj_validation/src/main.c
index bc96038335..ffd13122b1 100644
--- a/tests/kernel/mem_protect/obj_validation/src/main.c
+++ b/tests/kernel/mem_protect/obj_validation/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/syscall_handler.h>
 #include <zephyr/ztest.h>
 #include <kernel_internal.h>
diff --git a/tests/kernel/mem_protect/protection/src/main.c b/tests/kernel/mem_protect/protection/src/main.c
index 0eed647e8e..5062ae5755 100644
--- a/tests/kernel/mem_protect/protection/src/main.c
+++ b/tests/kernel/mem_protect/protection/src/main.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/kernel_structs.h>
 #include <string.h>
diff --git a/tests/kernel/mem_protect/protection/src/targets.c b/tests/kernel/mem_protect/protection/src/targets.c
index 21c83b4ba1..66e3e881c6 100644
--- a/tests/kernel/mem_protect/protection/src/targets.c
+++ b/tests/kernel/mem_protect/protection/src/targets.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include "targets.h"
diff --git a/tests/kernel/mem_protect/stack_random/src/main.c b/tests/kernel/mem_protect/stack_random/src/main.c
index d37ea3f026..4295921eb6 100644
--- a/tests/kernel/mem_protect/stack_random/src/main.c
+++ b/tests/kernel/mem_protect/stack_random/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define STACKSIZE       2048
 #define THREAD_COUNT	64
diff --git a/tests/kernel/mem_protect/stackprot/src/main.c b/tests/kernel/mem_protect/stackprot/src/main.c
index 8db499b97f..f03bbb1f38 100644
--- a/tests/kernel/mem_protect/stackprot/src/main.c
+++ b/tests/kernel/mem_protect/stackprot/src/main.c
@@ -6,7 +6,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 
diff --git a/tests/kernel/mem_protect/syscalls/src/main.c b/tests/kernel/mem_protect/syscalls/src/main.c
index 3d21673080..84ebbff16d 100644
--- a/tests/kernel/mem_protect/syscalls/src/main.c
+++ b/tests/kernel/mem_protect/syscalls/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/syscall_handler.h>
 #include <zephyr/ztest.h>
 #include <zephyr/linker/linker-defs.h>
diff --git a/tests/kernel/mem_protect/syscalls/src/test_syscalls.h b/tests/kernel/mem_protect/syscalls/src/test_syscalls.h
index a5f2424cb5..968928c54b 100644
--- a/tests/kernel/mem_protect/syscalls/src/test_syscalls.h
+++ b/tests/kernel/mem_protect/syscalls/src/test_syscalls.h
@@ -6,7 +6,7 @@
 
 #ifndef _TEST_SYSCALLS_H_
 #define _TEST_SYSCALLS_H_
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 __syscall int string_alloc_copy(char *src);
 
diff --git a/tests/kernel/mem_protect/userspace/src/main.c b/tests/kernel/mem_protect/userspace/src/main.c
index 6364263223..dbd96249d8 100644
--- a/tests/kernel/mem_protect/userspace/src/main.c
+++ b/tests/kernel/mem_protect/userspace/src/main.c
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/kernel_structs.h>
 #include <string.h>
diff --git a/tests/kernel/mem_slab/mslab/src/main.c b/tests/kernel/mem_slab/mslab/src/main.c
index 1736e15665..2bfa7b49ad 100644
--- a/tests/kernel/mem_slab/mslab/src/main.c
+++ b/tests/kernel/mem_slab/mslab/src/main.c
@@ -25,7 +25,7 @@
 
 #include <zephyr/tc_util.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 /* size of stack area used by each thread */
diff --git a/tests/kernel/mem_slab/mslab_stats/src/main.c b/tests/kernel/mem_slab/mslab_stats/src/main.c
index d48e71c617..dfe3f017be 100644
--- a/tests/kernel/mem_slab/mslab_stats/src/main.c
+++ b/tests/kernel/mem_slab/mslab_stats/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #define BLK_SZ     64
diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq.h b/tests/kernel/msgq/msgq_api/src/test_msgq.h
index 8f1c20897c..f714936549 100644
--- a/tests/kernel/msgq/msgq_api/src/test_msgq.h
+++ b/tests/kernel/msgq/msgq_api/src/test_msgq.h
@@ -7,7 +7,7 @@
 #ifndef __TEST_MSGQ_H__
 #define __TEST_MSGQ_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/ztest.h>
 #include <limits.h>
diff --git a/tests/kernel/msgq/msgq_usage/src/main.c b/tests/kernel/msgq/msgq_usage/src/main.c
index c9519401b2..e8e209d275 100644
--- a/tests/kernel/msgq/msgq_usage/src/main.c
+++ b/tests/kernel/msgq/msgq_usage/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/ztest.h>
 #include <limits.h>
diff --git a/tests/kernel/mutex/sys_mutex/src/main.c b/tests/kernel/mutex/sys_mutex/src/main.c
index 273a98f752..ccab407b1a 100644
--- a/tests/kernel/mutex/sys_mutex/src/main.c
+++ b/tests/kernel/mutex/sys_mutex/src/main.c
@@ -46,7 +46,7 @@
  */
 
 #include <zephyr/tc_util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/sys/mutex.h>
 
diff --git a/tests/kernel/mutex/sys_mutex/src/thread_12.c b/tests/kernel/mutex/sys_mutex/src/thread_12.c
index 5b33bced33..f70b654f4b 100644
--- a/tests/kernel/mutex/sys_mutex/src/thread_12.c
+++ b/tests/kernel/mutex/sys_mutex/src/thread_12.c
@@ -16,7 +16,7 @@
  */
 
 #include <zephyr/tc_util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/mutex.h>
 
 static int tc_rc = TC_PASS;         /* test case return code */
diff --git a/tests/kernel/mutex/sys_mutex/src/thread_competition.c b/tests/kernel/mutex/sys_mutex/src/thread_competition.c
index 3366a9e025..4501127918 100644
--- a/tests/kernel/mutex/sys_mutex/src/thread_competition.c
+++ b/tests/kernel/mutex/sys_mutex/src/thread_competition.c
@@ -6,7 +6,7 @@
 
 #ifndef CONFIG_USERSPACE
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/sys/mutex.h>
 
diff --git a/tests/kernel/sched/deadline/src/main.c b/tests/kernel/sched/deadline/src/main.c
index 6c29e0c187..f221ec8967 100644
--- a/tests/kernel/sched/deadline/src/main.c
+++ b/tests/kernel/sched/deadline/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/random/rand32.h>
 
diff --git a/tests/kernel/sched/preempt/src/main.c b/tests/kernel/sched/preempt/src/main.c
index 2f8e7c0574..071c6362e0 100644
--- a/tests/kernel/sched/preempt/src/main.c
+++ b/tests/kernel/sched/preempt/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/irq_offload.h>
 #include <zephyr/kernel_structs.h> /* for _THREAD_PENDING */
diff --git a/tests/kernel/sched/schedule_api/src/test_sched.h b/tests/kernel/sched/schedule_api/src/test_sched.h
index e1f6310bd1..730753d444 100644
--- a/tests/kernel/sched/schedule_api/src/test_sched.h
+++ b/tests/kernel/sched/schedule_api/src/test_sched.h
@@ -7,7 +7,7 @@
 #ifndef __TEST_SCHED_H__
 #define __TEST_SCHED_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #define MAX_NUM_THREAD 10
diff --git a/tests/kernel/sleep/src/usleep.c b/tests/kernel/sleep/src/usleep.c
index 9341e39291..e014a84ab7 100644
--- a/tests/kernel/sleep/src/usleep.c
+++ b/tests/kernel/sleep/src/usleep.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /*
  * precision timing tests in an emulation environment are not reliable.
diff --git a/tests/kernel/smp_boot_delay/src/main.c b/tests/kernel/smp_boot_delay/src/main.c
index e318a015bc..8f70ae7080 100644
--- a/tests/kernel/smp_boot_delay/src/main.c
+++ b/tests/kernel/smp_boot_delay/src/main.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 /* Experimentally 10ms is enough time to get the second CPU to run on
diff --git a/tests/kernel/spinlock/src/spinlock_error_case.c b/tests/kernel/spinlock/src/spinlock_error_case.c
index 6d3ac6d84c..8e5f358ae0 100644
--- a/tests/kernel/spinlock/src/spinlock_error_case.c
+++ b/tests/kernel/spinlock/src/spinlock_error_case.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/spinlock.h>
 
diff --git a/tests/kernel/threads/no-multithreading/src/main.c b/tests/kernel/threads/no-multithreading/src/main.c
index 9b216772fa..d69d3b2bd1 100644
--- a/tests/kernel/threads/no-multithreading/src/main.c
+++ b/tests/kernel/threads/no-multithreading/src/main.c
@@ -4,7 +4,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/kernel/threads/thread_stack/src/main.c b/tests/kernel/threads/thread_stack/src/main.c
index 25fa43417e..49826c7672 100644
--- a/tests/kernel/threads/thread_stack/src/main.c
+++ b/tests/kernel/threads/thread_stack/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/syscall_handler.h>
 #include <kernel_internal.h>
diff --git a/tests/kernel/timer/cycle64/src/main.c b/tests/kernel/timer/cycle64/src/main.c
index e8068f0032..deffd165b6 100644
--- a/tests/kernel/timer/cycle64/src/main.c
+++ b/tests/kernel/timer/cycle64/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 static void swap64(uint64_t *a, uint64_t *b)
 {
diff --git a/tests/kernel/timer/starve/src/main.c b/tests/kernel/timer/starve/src/main.c
index 7aee8974d0..55220235fc 100644
--- a/tests/kernel/timer/starve/src/main.c
+++ b/tests/kernel/timer/starve/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/tc_util.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/kernel/timer/timer_behavior/src/main.c b/tests/kernel/timer/timer_behavior/src/main.c
index a8b5efb11e..7a2fdf34ae 100644
--- a/tests/kernel/timer/timer_behavior/src/main.c
+++ b/tests/kernel/timer/timer_behavior/src/main.c
@@ -8,7 +8,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/tc_util.h>
 #include <zephyr/ztest.h>
diff --git a/tests/kernel/timer/timer_monotonic/src/main.c b/tests/kernel/timer/timer_monotonic/src/main.c
index 95654d63e6..26fb53358d 100644
--- a/tests/kernel/timer/timer_monotonic/src/main.c
+++ b/tests/kernel/timer/timer_monotonic/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/tc_util.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/kernel/workq/critical/src/main.c b/tests/kernel/workq/critical/src/main.c
index 93daf25eee..42e7104d70 100644
--- a/tests/kernel/workq/critical/src/main.c
+++ b/tests/kernel/workq/critical/src/main.c
@@ -24,7 +24,7 @@
  * @{
  * @}
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/kernel/workq/work_queue/src/main.c b/tests/kernel/workq/work_queue/src/main.c
index 5151bd30cd..80f26c6cf7 100644
--- a/tests/kernel/workq/work_queue/src/main.c
+++ b/tests/kernel/workq/work_queue/src/main.c
@@ -15,7 +15,7 @@
 #undef __DEPRECATED_MACRO
 #define __DEPRECATED_MACRO
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/tc_util.h>
 #include <zephyr/sys/util.h>
diff --git a/tests/lib/c_lib/src/main.c b/tests/lib/c_lib/src/main.c
index 9dd885b137..68284cfc82 100644
--- a/tests/lib/c_lib/src/main.c
+++ b/tests/lib/c_lib/src/main.c
@@ -15,7 +15,7 @@
  * it guarantee that ALL functionality provided is working correctly.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/lib/cmsis_dsp/basicmath/src/f16.c b/tests/lib/cmsis_dsp/basicmath/src/f16.c
index dcbe3f7211..bfd79cb3f0 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/f16.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/basicmath/src/f32.c b/tests/lib/cmsis_dsp/basicmath/src/f32.c
index a1e64d83b9..b8f27223f3 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q15.c b/tests/lib/cmsis_dsp/basicmath/src/q15.c
index 1ad79a79e5..9c7938152a 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q15.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q31.c b/tests/lib/cmsis_dsp/basicmath/src/q31.c
index 9215ea5651..dd0ff26c5c 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q31.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q7.c b/tests/lib/cmsis_dsp/basicmath/src/q7.c
index 48445ebd06..cb9628fc3b 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q7.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/bayes/src/f16.c b/tests/lib/cmsis_dsp/bayes/src/f16.c
index 42c91e2a91..ac92cf9df7 100644
--- a/tests/lib/cmsis_dsp/bayes/src/f16.c
+++ b/tests/lib/cmsis_dsp/bayes/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/bayes/src/f32.c b/tests/lib/cmsis_dsp/bayes/src/f32.c
index 4b59cd4a2f..f3009e641c 100644
--- a/tests/lib/cmsis_dsp/bayes/src/f32.c
+++ b/tests/lib/cmsis_dsp/bayes/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/common/test_common.h b/tests/lib/cmsis_dsp/common/test_common.h
index ee82bba1f6..033245ab81 100644
--- a/tests/lib/cmsis_dsp/common/test_common.h
+++ b/tests/lib/cmsis_dsp/common/test_common.h
@@ -9,7 +9,7 @@
 #define ZEPHYR_TESTS_LIB_CMSIS_DSP_COMMON_TEST_COMMON_H_
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #ifdef CONFIG_CMSIS_DSP_FLOAT16
diff --git a/tests/lib/cmsis_dsp/complexmath/src/f16.c b/tests/lib/cmsis_dsp/complexmath/src/f16.c
index 779e65805c..549f294f69 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/f16.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/complexmath/src/f32.c b/tests/lib/cmsis_dsp/complexmath/src/f32.c
index 9d38d43079..a4d824046e 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/complexmath/src/q15.c b/tests/lib/cmsis_dsp/complexmath/src/q15.c
index 8895bdbec5..492791e8eb 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/q15.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/complexmath/src/q31.c b/tests/lib/cmsis_dsp/complexmath/src/q31.c
index 2f11df8aaa..6e4b903a7a 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/q31.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/distance/src/f16.c b/tests/lib/cmsis_dsp/distance/src/f16.c
index 5d7333815b..03d6ae5047 100644
--- a/tests/lib/cmsis_dsp/distance/src/f16.c
+++ b/tests/lib/cmsis_dsp/distance/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/distance/src/f32.c b/tests/lib/cmsis_dsp/distance/src/f32.c
index d0d764b6e3..4b071f71be 100644
--- a/tests/lib/cmsis_dsp/distance/src/f32.c
+++ b/tests/lib/cmsis_dsp/distance/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/distance/src/u32.c b/tests/lib/cmsis_dsp/distance/src/u32.c
index e21c5e1fc4..921d35f53b 100644
--- a/tests/lib/cmsis_dsp/distance/src/u32.c
+++ b/tests/lib/cmsis_dsp/distance/src/u32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/fastmath/src/f16.c b/tests/lib/cmsis_dsp/fastmath/src/f16.c
index 9634aa7148..5e5596fa3a 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/f16.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/fastmath/src/f32.c b/tests/lib/cmsis_dsp/fastmath/src/f32.c
index e757fd8812..357b9b991c 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/fastmath/src/q15.c b/tests/lib/cmsis_dsp/fastmath/src/q15.c
index ac35618a66..428dd7b09a 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/q15.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/fastmath/src/q31.c b/tests/lib/cmsis_dsp/fastmath/src/q31.c
index c090e29a42..23344b659a 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/q31.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_f16.c b/tests/lib/cmsis_dsp/filtering/src/biquad_f16.c
index b3475f4eef..d2e7390643 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_f16.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c b/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c
index 29db34bf75..54d62f9b42 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c b/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c
index 081b89d52c..d78d44c82e 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_q15.c b/tests/lib/cmsis_dsp/filtering/src/biquad_q15.c
index 9afa3698d1..4a7a3dcad7 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_q31.c b/tests/lib/cmsis_dsp/filtering/src/biquad_q31.c
index 48696121d5..e99cccda0a 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/decim_f32.c b/tests/lib/cmsis_dsp/filtering/src/decim_f32.c
index 5e0c764b21..b4ed1039bc 100644
--- a/tests/lib/cmsis_dsp/filtering/src/decim_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/decim_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/decim_q15.c b/tests/lib/cmsis_dsp/filtering/src/decim_q15.c
index d7f3b19519..6fce2c1210 100644
--- a/tests/lib/cmsis_dsp/filtering/src/decim_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/decim_q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/decim_q31.c b/tests/lib/cmsis_dsp/filtering/src/decim_q31.c
index eded8fddb0..f73555a9b5 100644
--- a/tests/lib/cmsis_dsp/filtering/src/decim_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/decim_q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_f16.c b/tests/lib/cmsis_dsp/filtering/src/fir_f16.c
index 5d0808785b..cf9e99580a 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_f16.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_f32.c b/tests/lib/cmsis_dsp/filtering/src/fir_f32.c
index 2bec71811d..557a0d421b 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_q15.c b/tests/lib/cmsis_dsp/filtering/src/fir_q15.c
index 958373b177..31df11be49 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_q31.c b/tests/lib/cmsis_dsp/filtering/src/fir_q31.c
index 327f0e0660..961faef32a 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_q7.c b/tests/lib/cmsis_dsp/filtering/src/fir_q7.c
index b906adebf9..5aebeb301a 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_q7.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/main.c b/tests/lib/cmsis_dsp/filtering/src/main.c
index c1317e8c42..07fe03d1ed 100644
--- a/tests/lib/cmsis_dsp/filtering/src/main.c
+++ b/tests/lib/cmsis_dsp/filtering/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 extern void test_filtering_biquad_q15(void);
 extern void test_filtering_biquad_q31(void);
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_f16.c b/tests/lib/cmsis_dsp/filtering/src/misc_f16.c
index 4231a7f562..56d9f64bfa 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_f16.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_f32.c b/tests/lib/cmsis_dsp/filtering/src/misc_f32.c
index 1d9325101e..8bf4001bfa 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_q15.c b/tests/lib/cmsis_dsp/filtering/src/misc_q15.c
index a94e0c70ca..9a8ee66086 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_q31.c b/tests/lib/cmsis_dsp/filtering/src/misc_q31.c
index 1fdaeebd9d..5a83f25d70 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_q7.c b/tests/lib/cmsis_dsp/filtering/src/misc_q7.c
index 9e66954f07..97963533a6 100644
--- a/tests/lib/cmsis_dsp/filtering/src/misc_q7.c
+++ b/tests/lib/cmsis_dsp/filtering/src/misc_q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/interpolation/src/f16.c b/tests/lib/cmsis_dsp/interpolation/src/f16.c
index 8bdba1ae10..ef7225b896 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/f16.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/interpolation/src/f32.c b/tests/lib/cmsis_dsp/interpolation/src/f32.c
index 76436695fa..99185df23b 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/f32.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/interpolation/src/main.c b/tests/lib/cmsis_dsp/interpolation/src/main.c
index 3e22024e1a..97e96a4e30 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/main.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 extern void test_interpolation_q7(void);
 extern void test_interpolation_q15(void);
diff --git a/tests/lib/cmsis_dsp/interpolation/src/q15.c b/tests/lib/cmsis_dsp/interpolation/src/q15.c
index 1ed1f03680..b9c55cac83 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/q15.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/interpolation/src/q31.c b/tests/lib/cmsis_dsp/interpolation/src/q31.c
index 86634caae1..0ab4dd088b 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/q31.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/interpolation/src/q7.c b/tests/lib/cmsis_dsp/interpolation/src/q7.c
index 218f9ac57a..f82673fa48 100644
--- a/tests/lib/cmsis_dsp/interpolation/src/q7.c
+++ b/tests/lib/cmsis_dsp/interpolation/src/q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_f16.c b/tests/lib/cmsis_dsp/matrix/src/binary_f16.c
index bba59bfa9d..52758592d4 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_f16.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_f32.c b/tests/lib/cmsis_dsp/matrix/src/binary_f32.c
index 3109136697..c0d062d7b3 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_f32.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_f64.c b/tests/lib/cmsis_dsp/matrix/src/binary_f64.c
index 7686e19d7e..638c47ced7 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_f64.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_f64.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_q15.c b/tests/lib/cmsis_dsp/matrix/src/binary_q15.c
index d3e346caed..b4c3b75a53 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_q15.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_q31.c b/tests/lib/cmsis_dsp/matrix/src/binary_q31.c
index 3546baf8f1..648868f826 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_q31.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_q7.c b/tests/lib/cmsis_dsp/matrix/src/binary_q7.c
index 73a6447a94..fdea720d7e 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_q7.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/main.c b/tests/lib/cmsis_dsp/matrix/src/main.c
index 19c08ed575..ad27bf0f2d 100644
--- a/tests/lib/cmsis_dsp/matrix/src/main.c
+++ b/tests/lib/cmsis_dsp/matrix/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 extern void test_matrix_unary_q7(void);
 extern void test_matrix_unary_q15(void);
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_f16.c b/tests/lib/cmsis_dsp/matrix/src/unary_f16.c
index 3829b4bde0..9bc0f280d3 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_f16.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_f32.c b/tests/lib/cmsis_dsp/matrix/src/unary_f32.c
index c0cafa685e..ab4350ca62 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_f32.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_f64.c b/tests/lib/cmsis_dsp/matrix/src/unary_f64.c
index a22cee9eab..2815167450 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_f64.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_f64.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_q15.c b/tests/lib/cmsis_dsp/matrix/src/unary_q15.c
index 779d1ed74b..2ea3675c3a 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_q15.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_q31.c b/tests/lib/cmsis_dsp/matrix/src/unary_q31.c
index f61ab0f7ba..6ecff54130 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_q31.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_q7.c b/tests/lib/cmsis_dsp/matrix/src/unary_q7.c
index dfeeb16327..c2d5f7419a 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_q7.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/quaternionmath/src/f32.c b/tests/lib/cmsis_dsp/quaternionmath/src/f32.c
index eed70c9595..b9785eae93 100644
--- a/tests/lib/cmsis_dsp/quaternionmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/quaternionmath/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/statistics/src/f16.c b/tests/lib/cmsis_dsp/statistics/src/f16.c
index f0028e90d0..58a73c5f64 100644
--- a/tests/lib/cmsis_dsp/statistics/src/f16.c
+++ b/tests/lib/cmsis_dsp/statistics/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/statistics/src/f32.c b/tests/lib/cmsis_dsp/statistics/src/f32.c
index 7f57c3096d..d890dd095c 100644
--- a/tests/lib/cmsis_dsp/statistics/src/f32.c
+++ b/tests/lib/cmsis_dsp/statistics/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/statistics/src/f64.c b/tests/lib/cmsis_dsp/statistics/src/f64.c
index 00c1fc4f0a..fe37336095 100644
--- a/tests/lib/cmsis_dsp/statistics/src/f64.c
+++ b/tests/lib/cmsis_dsp/statistics/src/f64.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/statistics/src/main.c b/tests/lib/cmsis_dsp/statistics/src/main.c
index 894ede6a2b..01766ce665 100644
--- a/tests/lib/cmsis_dsp/statistics/src/main.c
+++ b/tests/lib/cmsis_dsp/statistics/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 extern void test_statistics_q7(void);
 extern void test_statistics_q15(void);
diff --git a/tests/lib/cmsis_dsp/statistics/src/q15.c b/tests/lib/cmsis_dsp/statistics/src/q15.c
index fba7557b02..1eab41375b 100644
--- a/tests/lib/cmsis_dsp/statistics/src/q15.c
+++ b/tests/lib/cmsis_dsp/statistics/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/statistics/src/q31.c b/tests/lib/cmsis_dsp/statistics/src/q31.c
index 08bfca98e5..dc755a6774 100644
--- a/tests/lib/cmsis_dsp/statistics/src/q31.c
+++ b/tests/lib/cmsis_dsp/statistics/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/statistics/src/q7.c b/tests/lib/cmsis_dsp/statistics/src/q7.c
index 715272dd62..ebabc72794 100644
--- a/tests/lib/cmsis_dsp/statistics/src/q7.c
+++ b/tests/lib/cmsis_dsp/statistics/src/q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/barycenter_f16.c b/tests/lib/cmsis_dsp/support/src/barycenter_f16.c
index 5999cc0952..f5168e64bc 100644
--- a/tests/lib/cmsis_dsp/support/src/barycenter_f16.c
+++ b/tests/lib/cmsis_dsp/support/src/barycenter_f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/barycenter_f32.c b/tests/lib/cmsis_dsp/support/src/barycenter_f32.c
index 4948907a3d..216a1507fd 100644
--- a/tests/lib/cmsis_dsp/support/src/barycenter_f32.c
+++ b/tests/lib/cmsis_dsp/support/src/barycenter_f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/f16.c b/tests/lib/cmsis_dsp/support/src/f16.c
index 2e6d0fb779..0a1b79fea3 100644
--- a/tests/lib/cmsis_dsp/support/src/f16.c
+++ b/tests/lib/cmsis_dsp/support/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/f32.c b/tests/lib/cmsis_dsp/support/src/f32.c
index 2a749bd1e8..cdfcbf20d6 100644
--- a/tests/lib/cmsis_dsp/support/src/f32.c
+++ b/tests/lib/cmsis_dsp/support/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/main.c b/tests/lib/cmsis_dsp/support/src/main.c
index e0ac51d2db..e554babcc8 100644
--- a/tests/lib/cmsis_dsp/support/src/main.c
+++ b/tests/lib/cmsis_dsp/support/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 extern void test_support_q7(void);
 extern void test_support_q15(void);
diff --git a/tests/lib/cmsis_dsp/support/src/q15.c b/tests/lib/cmsis_dsp/support/src/q15.c
index 702fdf29d3..6e151e80c1 100644
--- a/tests/lib/cmsis_dsp/support/src/q15.c
+++ b/tests/lib/cmsis_dsp/support/src/q15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/q31.c b/tests/lib/cmsis_dsp/support/src/q31.c
index b5d5813bb2..084aa52b10 100644
--- a/tests/lib/cmsis_dsp/support/src/q31.c
+++ b/tests/lib/cmsis_dsp/support/src/q31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/support/src/q7.c b/tests/lib/cmsis_dsp/support/src/q7.c
index 80db4a331c..f4854ef7f1 100644
--- a/tests/lib/cmsis_dsp/support/src/q7.c
+++ b/tests/lib/cmsis_dsp/support/src/q7.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/svm/src/f16.c b/tests/lib/cmsis_dsp/svm/src/f16.c
index e91e53e792..e54f92ba68 100644
--- a/tests/lib/cmsis_dsp/svm/src/f16.c
+++ b/tests/lib/cmsis_dsp/svm/src/f16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/svm/src/f32.c b/tests/lib/cmsis_dsp/svm/src/f32.c
index 41808ba484..784aae322b 100644
--- a/tests/lib/cmsis_dsp/svm/src/f32.c
+++ b/tests/lib/cmsis_dsp/svm/src/f32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include "../../common/test_common.h"
diff --git a/tests/lib/cmsis_dsp/transform/src/cf16.c b/tests/lib/cmsis_dsp/transform/src/cf16.c
index e16e392842..ca73178a20 100644
--- a/tests/lib/cmsis_dsp/transform/src/cf16.c
+++ b/tests/lib/cmsis_dsp/transform/src/cf16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/cf32.c b/tests/lib/cmsis_dsp/transform/src/cf32.c
index 785da42b23..f920968bed 100644
--- a/tests/lib/cmsis_dsp/transform/src/cf32.c
+++ b/tests/lib/cmsis_dsp/transform/src/cf32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/cf64.c b/tests/lib/cmsis_dsp/transform/src/cf64.c
index 1bae3d20dc..82baab2d69 100644
--- a/tests/lib/cmsis_dsp/transform/src/cf64.c
+++ b/tests/lib/cmsis_dsp/transform/src/cf64.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/cq15.c b/tests/lib/cmsis_dsp/transform/src/cq15.c
index 1b56c75783..0112a9bfcc 100644
--- a/tests/lib/cmsis_dsp/transform/src/cq15.c
+++ b/tests/lib/cmsis_dsp/transform/src/cq15.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/cq31.c b/tests/lib/cmsis_dsp/transform/src/cq31.c
index 4a05b864de..4340274c4a 100644
--- a/tests/lib/cmsis_dsp/transform/src/cq31.c
+++ b/tests/lib/cmsis_dsp/transform/src/cq31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/main.c b/tests/lib/cmsis_dsp/transform/src/main.c
index 7c764f74fe..ac9b512abe 100644
--- a/tests/lib/cmsis_dsp/transform/src/main.c
+++ b/tests/lib/cmsis_dsp/transform/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 extern void test_transform_cq15(void);
 extern void test_transform_rq15(void);
diff --git a/tests/lib/cmsis_dsp/transform/src/rf16.c b/tests/lib/cmsis_dsp/transform/src/rf16.c
index 2313b2865c..735d0eb2e4 100644
--- a/tests/lib/cmsis_dsp/transform/src/rf16.c
+++ b/tests/lib/cmsis_dsp/transform/src/rf16.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math_f16.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/rf32.c b/tests/lib/cmsis_dsp/transform/src/rf32.c
index 4ef7a64061..347e9b2ed7 100644
--- a/tests/lib/cmsis_dsp/transform/src/rf32.c
+++ b/tests/lib/cmsis_dsp/transform/src/rf32.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/rf64.c b/tests/lib/cmsis_dsp/transform/src/rf64.c
index 8d416e50d8..7ba77eef87 100644
--- a/tests/lib/cmsis_dsp/transform/src/rf64.c
+++ b/tests/lib/cmsis_dsp/transform/src/rf64.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/rq15.c b/tests/lib/cmsis_dsp/transform/src/rq15.c
index fbe4dc5acf..d4aba30a09 100644
--- a/tests/lib/cmsis_dsp/transform/src/rq15.c
+++ b/tests/lib/cmsis_dsp/transform/src/rq15.c
@@ -22,7 +22,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_dsp/transform/src/rq31.c b/tests/lib/cmsis_dsp/transform/src/rq31.c
index 8e0c6f5fd4..6cc75b3481 100644
--- a/tests/lib/cmsis_dsp/transform/src/rq31.c
+++ b/tests/lib/cmsis_dsp/transform/src/rq31.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <arm_math.h>
 #include <arm_const_structs.h>
diff --git a/tests/lib/cmsis_nn/src/main.c b/tests/lib/cmsis_nn/src/main.c
index baeab66e8e..f653d5a6aa 100644
--- a/tests/lib/cmsis_nn/src/main.c
+++ b/tests/lib/cmsis_nn/src/main.c
@@ -11,7 +11,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 
 #include "arm_nnfunctions.h"
diff --git a/tests/lib/fdtable/src/main.c b/tests/lib/fdtable/src/main.c
index 460ba2361b..e7d2da5e0e 100644
--- a/tests/lib/fdtable/src/main.c
+++ b/tests/lib/fdtable/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/fdtable.h>
 #include <errno.h>
 
diff --git a/tests/lib/gui/lvgl/src/img.c b/tests/lib/gui/lvgl/src/img.c
index b549a07c81..004bc670a3 100644
--- a/tests/lib/gui/lvgl/src/img.c
+++ b/tests/lib/gui/lvgl/src/img.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "img.h"
 
 static const uint8_t img_data[] = {
diff --git a/tests/lib/gui/lvgl/src/main.c b/tests/lib/gui/lvgl/src/main.c
index 1081874498..44a3f5fbc1 100644
--- a/tests/lib/gui/lvgl/src/main.c
+++ b/tests/lib/gui/lvgl/src/main.c
@@ -6,7 +6,7 @@
 
 #include "img.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/fs/fs.h>
 #include <zephyr/fs/littlefs.h>
diff --git a/tests/lib/heap/src/main.c b/tests/lib/heap/src/main.c
index a8b8bbac73..62899f6d7d 100644
--- a/tests/lib/heap/src/main.c
+++ b/tests/lib/heap/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/sys/sys_heap.h>
 #include <zephyr/sys/heap_listener.h>
diff --git a/tests/lib/heap_align/src/main.c b/tests/lib/heap_align/src/main.c
index ac72de6b82..0061d1c4ad 100644
--- a/tests/lib/heap_align/src/main.c
+++ b/tests/lib/heap_align/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/sys/sys_heap.h>
 
diff --git a/tests/lib/mem_alloc/src/main.c b/tests/lib/mem_alloc/src/main.c
index f59dab1ecb..e9181ba814 100644
--- a/tests/lib/mem_alloc/src/main.c
+++ b/tests/lib/mem_alloc/src/main.c
@@ -25,7 +25,7 @@
 #endif
 
 #define _BSD_SOURCE
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/tests/lib/mem_blocks/src/main.c b/tests/lib/mem_blocks/src/main.c
index 41473cdaca..2483ef7536 100644
--- a/tests/lib/mem_blocks/src/main.c
+++ b/tests/lib/mem_blocks/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include <zephyr/sys/heap_listener.h>
diff --git a/tests/lib/mem_blocks_stats/src/main.c b/tests/lib/mem_blocks_stats/src/main.c
index 721bac557e..7a6d3eaf2a 100644
--- a/tests/lib/mem_blocks_stats/src/main.c
+++ b/tests/lib/mem_blocks_stats/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include <zephyr/sys/heap_listener.h>
diff --git a/tests/lib/mpsc_pbuf/src/main.c b/tests/lib/mpsc_pbuf/src/main.c
index f00d929274..fcf279cab8 100644
--- a/tests/lib/mpsc_pbuf/src/main.c
+++ b/tests/lib/mpsc_pbuf/src/main.c
@@ -13,7 +13,7 @@
 
 #include <zephyr/tc_util.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/random/rand32.h>
 
diff --git a/tests/lib/newlib/heap_listener/src/main.c b/tests/lib/newlib/heap_listener/src/main.c
index 7b89a10206..4b8ec3bbdd 100644
--- a/tests/lib/newlib/heap_listener/src/main.c
+++ b/tests/lib/newlib/heap_listener/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/sys/heap_listener.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include <malloc.h>
diff --git a/tests/lib/newlib/thread_safety/src/locks.c b/tests/lib/newlib/thread_safety/src/locks.c
index ca2bdafc6d..76aab5b06c 100644
--- a/tests/lib/newlib/thread_safety/src/locks.c
+++ b/tests/lib/newlib/thread_safety/src/locks.c
@@ -12,7 +12,7 @@
  * intended.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include <stdio.h>
diff --git a/tests/lib/newlib/thread_safety/src/stress.c b/tests/lib/newlib/thread_safety/src/stress.c
index 05cbab89ab..1734d436a6 100644
--- a/tests/lib/newlib/thread_safety/src/stress.c
+++ b/tests/lib/newlib/thread_safety/src/stress.c
@@ -12,7 +12,7 @@
  * specific contexts are properly handled (i.e. re-entrant).
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include <stdio.h>
diff --git a/tests/lib/p4workq/src/main.c b/tests/lib/p4workq/src/main.c
index ae2175d047..9fea5b2ef2 100644
--- a/tests/lib/p4workq/src/main.c
+++ b/tests/lib/p4workq/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/random/rand32.h>
 #include <zephyr/ztest.h>
 #include <zephyr/sys/p4wq.h>
diff --git a/tests/lib/smf/src/main.c b/tests/lib/smf/src/main.c
index d421b90a3b..538c3c99d4 100644
--- a/tests/lib/smf/src/main.c
+++ b/tests/lib/smf/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include <zephyr/smf.h>
diff --git a/tests/lib/uoscore/src/main.c b/tests/lib/uoscore/src/main.c
index 540acdcae8..bd32232df0 100644
--- a/tests/lib/uoscore/src/main.c
+++ b/tests/lib/uoscore/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 /* OSCORE testvector tests */
diff --git a/tests/lib/uoscore/src/oscore_testvector_tests/oscore_tests.c b/tests/lib/uoscore/src/oscore_testvector_tests/oscore_tests.c
index 095d8979a5..ab6883e981 100644
--- a/tests/lib/uoscore/src/oscore_testvector_tests/oscore_tests.c
+++ b/tests/lib/uoscore/src/oscore_testvector_tests/oscore_tests.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <oscore.h>
 
diff --git a/tests/misc/arm_mpu_regions/src/main.c b/tests/misc/arm_mpu_regions/src/main.c
index e4b29ac924..ec784787bb 100644
--- a/tests/misc/arm_mpu_regions/src/main.c
+++ b/tests/misc/arm_mpu_regions/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/sys/slist.h>
 #include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h>
diff --git a/tests/misc/print_format/src/main.c b/tests/misc/print_format/src/main.c
index cf4d7cd4b0..98c61d8751 100644
--- a/tests/misc/print_format/src/main.c
+++ b/tests/misc/print_format/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 void main(void)
 {
diff --git a/tests/misc/test_build/src/main.c b/tests/misc/test_build/src/main.c
index 023145ab90..b703b8d9fa 100644
--- a/tests/misc/test_build/src/main.c
+++ b/tests/misc/test_build/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 /*
diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c
index f1b399c693..a0ebdb3687 100644
--- a/tests/net/6lo/src/main.c
+++ b/tests/net/6lo/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_6LO_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/linker/sections.h>
 
diff --git a/tests/net/arp/src/main.c b/tests/net/arp/src/main.c
index d7522d61d5..b5bcf8d26c 100644
--- a/tests/net/arp/src/main.c
+++ b/tests/net/arp/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_ARP_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 
 #include <zephyr/tc_util.h>
diff --git a/tests/net/dhcpv4/src/main.c b/tests/net/dhcpv4/src/main.c
index 71cf698827..bbc0e297a2 100644
--- a/tests/net/dhcpv4/src/main.c
+++ b/tests/net/dhcpv4/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_DHCPV4_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 
 #include <zephyr/types.h>
diff --git a/tests/net/ethernet_mgmt/src/main.c b/tests/net/ethernet_mgmt/src/main.c
index f4d5996d44..f020480ae8 100644
--- a/tests/net/ethernet_mgmt/src/main.c
+++ b/tests/net/ethernet_mgmt/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/ethernet.h>
diff --git a/tests/net/ieee802154/6lo_fragment/src/main.c b/tests/net/ieee802154/6lo_fragment/src/main.c
index 893ae9ed6e..ca95023f27 100644
--- a/tests/net/ieee802154/6lo_fragment/src/main.c
+++ b/tests/net/ieee802154/6lo_fragment/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/linker/sections.h>
 
diff --git a/tests/net/ieee802154/custom_l2/src/main.c b/tests/net/ieee802154/custom_l2/src/main.c
index 3f2ac5fd50..b0f26ebbe6 100644
--- a/tests/net/ieee802154/custom_l2/src/main.c
+++ b/tests/net/ieee802154/custom_l2/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/logging/log.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/ieee802154_radio.h>
diff --git a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
index 7738244d16..cdc98e280e 100644
--- a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
+++ b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154_fake_driver, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/net/net_core.h>
 #include "net_private.h"
diff --git a/tests/net/ieee802154/l2/src/ieee802154_test.c b/tests/net/ieee802154/l2/src/ieee802154_test.c
index b974252329..7c030a138d 100644
--- a/tests/net/ieee802154/l2/src/ieee802154_test.c
+++ b/tests/net/ieee802154/l2/src/ieee802154_test.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154_test, LOG_LEVEL_DBG);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 
diff --git a/tests/net/lib/dns_packet/src/main.c b/tests/net/lib/dns_packet/src/main.c
index c78265cae6..95ded79342 100644
--- a/tests/net/lib/dns_packet/src/main.c
+++ b/tests/net/lib/dns_packet/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/sys/crc.h>
 #include <dns_pack.h>
diff --git a/tests/net/lib/lwm2m/content_json/src/main.c b/tests/net/lib/lwm2m/content_json/src/main.c
index 47b92e15df..49ba101274 100644
--- a/tests/net/lib/lwm2m/content_json/src/main.c
+++ b/tests/net/lib/lwm2m/content_json/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include "lwm2m_engine.h"
diff --git a/tests/net/lib/lwm2m/content_link_format/src/main.c b/tests/net/lib/lwm2m/content_link_format/src/main.c
index 8fb584a4c4..d10a0948a5 100644
--- a/tests/net/lib/lwm2m/content_link_format/src/main.c
+++ b/tests/net/lib/lwm2m/content_link_format/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include "lwm2m_engine.h"
diff --git a/tests/net/lib/lwm2m/content_oma_tlv/src/main.c b/tests/net/lib/lwm2m/content_oma_tlv/src/main.c
index 454d821891..9eac06b4a5 100644
--- a/tests/net/lib/lwm2m/content_oma_tlv/src/main.c
+++ b/tests/net/lib/lwm2m/content_oma_tlv/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include "lwm2m_util.h"
diff --git a/tests/net/lib/lwm2m/content_plain_text/src/main.c b/tests/net/lib/lwm2m/content_plain_text/src/main.c
index cbae24ddc0..419a37cdc0 100644
--- a/tests/net/lib/lwm2m/content_plain_text/src/main.c
+++ b/tests/net/lib/lwm2m/content_plain_text/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include "lwm2m_rw_plain_text.h"
diff --git a/tests/net/lib/lwm2m/content_raw_cbor/src/main.c b/tests/net/lib/lwm2m/content_raw_cbor/src/main.c
index 6169f9c4d9..9739144a4b 100644
--- a/tests/net/lib/lwm2m/content_raw_cbor/src/main.c
+++ b/tests/net/lib/lwm2m/content_raw_cbor/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include "lwm2m_util.h"
diff --git a/tests/net/lib/lwm2m/content_senml_cbor/src/main.c b/tests/net/lib/lwm2m/content_senml_cbor/src/main.c
index 7d4359f39a..f0cedd475a 100644
--- a/tests/net/lib/lwm2m/content_senml_cbor/src/main.c
+++ b/tests/net/lib/lwm2m/content_senml_cbor/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include "lwm2m_util.h"
diff --git a/tests/net/mgmt/src/mgmt.c b/tests/net/mgmt/src/mgmt.c
index d5b020bce8..23edc1a6a6 100644
--- a/tests/net/mgmt/src/mgmt.c
+++ b/tests/net/mgmt/src/mgmt.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_MGMT_EVENT_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/tc_util.h>
 #include <errno.h>
 #include <zephyr/toolchain.h>
diff --git a/tests/net/pm/src/main.c b/tests/net/pm/src/main.c
index cc4b33a410..37492939e5 100644
--- a/tests/net/pm/src/main.c
+++ b/tests/net/pm/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/ztest.h>
diff --git a/tests/net/shell/src/main.c b/tests/net/shell/src/main.c
index 3c4db79874..362859b79b 100644
--- a/tests/net/shell/src/main.c
+++ b/tests/net/shell/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 
 #include <zephyr/types.h>
diff --git a/tests/net/socket/af_packet_ipproto_raw/src/main.c b/tests/net/socket/af_packet_ipproto_raw/src/main.c
index 606bfe8713..a115ff5693 100644
--- a/tests/net/socket/af_packet_ipproto_raw/src/main.c
+++ b/tests/net/socket/af_packet_ipproto_raw/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/ztest.h>
 #include <zephyr/random/rand32.h>
diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c
index 0eb8db69a2..735ec1eb70 100644
--- a/tests/net/udp/src/main.c
+++ b/tests/net/udp/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 
 #include <zephyr/types.h>
diff --git a/tests/posix/common/src/mqueue.c b/tests/posix/common/src/mqueue.c
index f229f4feba..813a342cc6 100644
--- a/tests/posix/common/src/mqueue.c
+++ b/tests/posix/common/src/mqueue.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <fcntl.h>
 #include <zephyr/sys/util.h>
diff --git a/tests/posix/getopt/src/main.c b/tests/posix/getopt/src/main.c
index 55f8dbcf19..1ab9e7b9c8 100644
--- a/tests/posix/getopt/src/main.c
+++ b/tests/posix/getopt/src/main.c
@@ -9,7 +9,7 @@
  *
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <string.h>
 #include <getopt.h>
diff --git a/tests/subsys/debug/coredump/src/main.c b/tests/subsys/debug/coredump/src/main.c
index 364439bbc7..6dc6cd0f68 100644
--- a/tests/subsys/debug/coredump/src/main.c
+++ b/tests/subsys/debug/coredump/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/debug/coredump.h>
 
diff --git a/tests/subsys/debug/coredump_backends/src/main.c b/tests/subsys/debug/coredump_backends/src/main.c
index e902523e83..f855d04775 100644
--- a/tests/subsys/debug/coredump_backends/src/main.c
+++ b/tests/subsys/debug/coredump_backends/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <zephyr/ztest.h>
diff --git a/tests/subsys/edac/ibecc/src/dummy.c b/tests/subsys/edac/ibecc/src/dummy.c
index b63b647a89..eb7adf18ba 100644
--- a/tests/subsys/edac/ibecc/src/dummy.c
+++ b/tests/subsys/edac/ibecc/src/dummy.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/ztest.h>
 
diff --git a/tests/subsys/edac/ibecc/src/ibecc.c b/tests/subsys/edac/ibecc/src/ibecc.c
index fd62aea1c6..327983cf0d 100644
--- a/tests/subsys/edac/ibecc/src/ibecc.c
+++ b/tests/subsys/edac/ibecc/src/ibecc.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/ztest.h>
 #include <zephyr/tc_util.h>
diff --git a/tests/subsys/fs/common/test_fs_open_flags.c b/tests/subsys/fs/common/test_fs_open_flags.c
index 88e1227a0e..02b404a09a 100644
--- a/tests/subsys/fs/common/test_fs_open_flags.c
+++ b/tests/subsys/fs/common/test_fs_open_flags.c
@@ -10,7 +10,7 @@
  * Tests the fs_open flags
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/fs/fs.h>
 #include <string.h>
diff --git a/tests/subsys/fs/fat_fs_api/src/test_fat.h b/tests/subsys/fs/fat_fs_api/src/test_fat.h
index 2bc0649719..9da1fbabfc 100644
--- a/tests/subsys/fs/fat_fs_api/src/test_fat.h
+++ b/tests/subsys/fs/fat_fs_api/src/test_fat.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/fs/fs.h>
 
diff --git a/tests/subsys/fs/fat_fs_dual_drive/src/test_fat.h b/tests/subsys/fs/fat_fs_dual_drive/src/test_fat.h
index 88772ed826..87f87c0f0f 100644
--- a/tests/subsys/fs/fat_fs_dual_drive/src/test_fat.h
+++ b/tests/subsys/fs/fat_fs_dual_drive/src/test_fat.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/fs/fs.h>
 
diff --git a/tests/subsys/fs/fs_api/src/test_fs.h b/tests/subsys/fs/fs_api/src/test_fs.h
index dc8e1819b0..235e224abc 100644
--- a/tests/subsys/fs/fs_api/src/test_fs.h
+++ b/tests/subsys/fs/fs_api/src/test_fs.h
@@ -7,7 +7,7 @@
 #ifndef __TEST_FS_H__
 #define __TEST_FS_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/fs/fs.h>
 #include <zephyr/fs/fs_sys.h>
diff --git a/tests/subsys/fs/multi-fs/src/test_fs_shell.c b/tests/subsys/fs/multi-fs/src/test_fs_shell.c
index 653da72695..4ab039cc75 100644
--- a/tests/subsys/fs/multi-fs/src/test_fs_shell.c
+++ b/tests/subsys/fs/multi-fs/src/test_fs_shell.c
@@ -9,7 +9,7 @@
  *
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include "test_fs_shell.h"
diff --git a/tests/subsys/ipc/ipc_service/src/backend.c b/tests/subsys/ipc/ipc_service/src/backend.c
index dc928138b7..2526522eaf 100644
--- a/tests/subsys/ipc/ipc_service/src/backend.c
+++ b/tests/subsys/ipc/ipc_service/src/backend.c
@@ -11,7 +11,7 @@
 
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util_macro.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 #define DT_DRV_COMPAT		ipc_service_backend
diff --git a/tests/subsys/logging/log_backend_fs/src/log_fs_test.c b/tests/subsys/logging/log_backend_fs/src/log_fs_test.c
index 979a751ca5..6921f1e645 100644
--- a/tests/subsys/logging/log_backend_fs/src/log_fs_test.c
+++ b/tests/subsys/logging/log_backend_fs/src/log_fs_test.c
@@ -12,7 +12,7 @@
 
 #include <stdbool.h>
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/fs/fs.h>
 
diff --git a/tests/subsys/logging/log_backend_init/src/main.c b/tests/subsys/logging/log_backend_init/src/main.c
index 474c015d5d..c4797539be 100644
--- a/tests/subsys/logging/log_backend_init/src/main.c
+++ b/tests/subsys/logging/log_backend_init/src/main.c
@@ -7,7 +7,7 @@
 
 #include <zephyr/tc_util.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/logging/log_backend.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/tests/subsys/logging/log_benchmark/src/main.c b/tests/subsys/logging/log_benchmark/src/main.c
index 8e27560f0e..11e2f468b5 100644
--- a/tests/subsys/logging/log_benchmark/src/main.c
+++ b/tests/subsys/logging/log_benchmark/src/main.c
@@ -13,7 +13,7 @@
 
 #include <zephyr/tc_util.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/logging/log_backend.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/tests/subsys/logging/log_benchmark/src/test_helpers.h b/tests/subsys/logging/log_benchmark/src/test_helpers.h
index 60e0c24b83..0383d840c8 100644
--- a/tests/subsys/logging/log_benchmark/src/test_helpers.h
+++ b/tests/subsys/logging/log_benchmark/src/test_helpers.h
@@ -6,7 +6,7 @@
 #ifndef SRC_TEST_HELPERS_H__
 #define SRC_TEST_HELPERS_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 __syscall void test_helpers_log_setup(void);
 __syscall int test_helpers_cycle_get(void);
diff --git a/tests/subsys/logging/log_core_additional/src/log_test.c b/tests/subsys/logging/log_core_additional/src/log_test.c
index 480d22f443..93cd6fc4dd 100644
--- a/tests/subsys/logging/log_core_additional/src/log_test.c
+++ b/tests/subsys/logging/log_core_additional/src/log_test.c
@@ -12,7 +12,7 @@
 
 #include <zephyr/tc_util.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/logging/log_backend.h>
 #include <zephyr/logging/log_backend_std.h>
diff --git a/tests/subsys/logging/log_core_additional/src/log_test_user.c b/tests/subsys/logging/log_core_additional/src/log_test_user.c
index 7f4391bf88..f24e8bea83 100644
--- a/tests/subsys/logging/log_core_additional/src/log_test_user.c
+++ b/tests/subsys/logging/log_core_additional/src/log_test_user.c
@@ -12,7 +12,7 @@
 
 #include <zephyr/tc_util.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/logging/log_backend.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/tests/subsys/logging/log_immediate/src/log_immediate_test.c b/tests/subsys/logging/log_immediate/src/log_immediate_test.c
index b56c234ea0..6bd6edb8d9 100644
--- a/tests/subsys/logging/log_immediate/src/log_immediate_test.c
+++ b/tests/subsys/logging/log_immediate/src/log_immediate_test.c
@@ -13,7 +13,7 @@
 
 #include <zephyr/tc_util.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/logging/log_backend.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/tests/subsys/logging/log_msg/src/main.c b/tests/subsys/logging/log_msg/src/main.c
index bfa78f9014..f682c75813 100644
--- a/tests/subsys/logging/log_msg/src/main.c
+++ b/tests/subsys/logging/log_msg/src/main.c
@@ -15,7 +15,7 @@
 
 #include <zephyr/tc_util.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/sys/cbprintf.h>
 
diff --git a/tests/subsys/logging/log_output/src/log_output_test.c b/tests/subsys/logging/log_output/src/log_output_test.c
index 0e7bbcef4e..c8138a40b8 100644
--- a/tests/subsys/logging/log_output/src/log_output_test.c
+++ b/tests/subsys/logging/log_output/src/log_output_test.c
@@ -14,7 +14,7 @@
 
 #include <zephyr/tc_util.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #define LOG_MODULE_NAME test
diff --git a/tests/subsys/logging/log_switch_format/src/main.c b/tests/subsys/logging/log_switch_format/src/main.c
index b5f15eb4ae..317f6b214c 100644
--- a/tests/subsys/logging/log_switch_format/src/main.c
+++ b/tests/subsys/logging/log_switch_format/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include "mock_backend.h"
 #include <zephyr/sys/printk.h>
diff --git a/tests/subsys/logging/log_syst/src/main.c b/tests/subsys/logging/log_syst/src/main.c
index 44e4a71748..730f509f66 100644
--- a/tests/subsys/logging/log_syst/src/main.c
+++ b/tests/subsys/logging/log_syst/src/main.c
@@ -9,7 +9,7 @@
  * @brief Test log message
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include "mock_backend.h"
 #include <zephyr/sys/printk.h>
diff --git a/tests/subsys/openthread/radio_test.c b/tests/subsys/openthread/radio_test.c
index 3edbe55e39..75603d346f 100644
--- a/tests/subsys/openthread/radio_test.c
+++ b/tests/subsys/openthread/radio_test.c
@@ -10,7 +10,7 @@
 #include <zephyr/fff.h>
 #include <zephyr/net/ieee802154_radio.h>
 #include <zephyr/net/net_pkt.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include <openthread/message.h>
diff --git a/tests/subsys/pm/device_wakeup_api/src/main.c b/tests/subsys/pm/device_wakeup_api/src/main.c
index 2ae687956b..cf8d7e2f3c 100644
--- a/tests/subsys/pm/device_wakeup_api/src/main.c
+++ b/tests/subsys/pm/device_wakeup_api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/pm/pm.h>
 #include <zephyr/pm/device.h>
diff --git a/tests/subsys/pm/power_mgmt/src/dummy_driver.h b/tests/subsys/pm/power_mgmt/src/dummy_driver.h
index 1ab1d3d83e..425e962b59 100644
--- a/tests/subsys/pm/power_mgmt/src/dummy_driver.h
+++ b/tests/subsys/pm/power_mgmt/src/dummy_driver.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #define DUMMY_DRIVER_NAME	"dummy_driver"
 
diff --git a/tests/subsys/pm/power_mgmt_soc/src/main.c b/tests/subsys/pm/power_mgmt_soc/src/main.c
index 5adb4aafbd..f308fc28a7 100644
--- a/tests/subsys/pm/power_mgmt_soc/src/main.c
+++ b/tests/subsys/pm/power_mgmt_soc/src/main.c
@@ -6,7 +6,7 @@
 
 #define LOG_LEVEL LOG_LEVEL_INF
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/tc_util.h>
 LOG_MODULE_DECLARE(brd_pm_test);
diff --git a/tests/subsys/pm/power_states_api/src/main.c b/tests/subsys/pm/power_states_api/src/main.c
index 4376b01182..302f57ff66 100644
--- a/tests/subsys/pm/power_states_api/src/main.c
+++ b/tests/subsys/pm/power_states_api/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/pm/pm.h>
 
diff --git a/tests/subsys/sd/sdmmc/src/main.c b/tests/subsys/sd/sdmmc/src/main.c
index d6464870a7..84c07bb399 100644
--- a/tests/subsys/sd/sdmmc/src/main.c
+++ b/tests/subsys/sd/sdmmc/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sd/sdmmc.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/disk.h>
diff --git a/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c b/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c
index 8fc9be64f9..a449e27e30 100644
--- a/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c
+++ b/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <zephyr/ztest.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/reboot.h>
 #include <string.h>
 
diff --git a/tests/subsys/settings/functional/fcb/settings_test_fcb.c b/tests/subsys/settings/functional/fcb/settings_test_fcb.c
index bf09f71787..48fa483048 100644
--- a/tests/subsys/settings/functional/fcb/settings_test_fcb.c
+++ b/tests/subsys/settings/functional/fcb/settings_test_fcb.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 /* Copyright (c) 2022 Nordic semiconductor ASA */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <errno.h>
 #include <zephyr/settings/settings.h>
diff --git a/tests/subsys/settings/functional/file/settings_test_fs.c b/tests/subsys/settings/functional/file/settings_test_fs.c
index 204a849f31..faf5d8aec3 100644
--- a/tests/subsys/settings/functional/file/settings_test_fs.c
+++ b/tests/subsys/settings/functional/file/settings_test_fs.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 /* Copyright (c) 2022 Nordic semiconductor ASA */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <errno.h>
 #include <zephyr/settings/settings.h>
diff --git a/tests/subsys/settings/functional/nvs/settings_test_nvs.c b/tests/subsys/settings/functional/nvs/settings_test_nvs.c
index fc545dc79f..b5d230cc94 100644
--- a/tests/subsys/settings/functional/nvs/settings_test_nvs.c
+++ b/tests/subsys/settings/functional/nvs/settings_test_nvs.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 /* Copyright (c) 2022 Nordic semiconductor ASA */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <errno.h>
 #include <zephyr/settings/settings.h>
diff --git a/tests/subsys/settings/functional/src/settings_basic_test.c b/tests/subsys/settings/functional/src/settings_basic_test.c
index e326f9f737..664ef654e5 100644
--- a/tests/subsys/settings/functional/src/settings_basic_test.c
+++ b/tests/subsys/settings/functional/src/settings_basic_test.c
@@ -9,7 +9,7 @@
  *
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <errno.h>
 #include <zephyr/settings/settings.h>
diff --git a/tests/subsys/shell/shell/src/main.c b/tests/subsys/shell/shell/src/main.c
index afe40e6bfc..18845cff28 100644
--- a/tests/subsys/shell/shell/src/main.c
+++ b/tests/subsys/shell/shell/src/main.c
@@ -9,7 +9,7 @@
  *
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include <zephyr/shell/shell.h>
diff --git a/tests/subsys/shell/shell_flash/src/shell_flash_test.c b/tests/subsys/shell/shell_flash/src/shell_flash_test.c
index 62a7688dc1..a06a74f970 100644
--- a/tests/subsys/shell/shell_flash/src/shell_flash_test.c
+++ b/tests/subsys/shell/shell_flash/src/shell_flash_test.c
@@ -9,7 +9,7 @@
  *
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 #include <zephyr/device.h>
 
diff --git a/tests/subsys/shell/shell_history/src/shell_history_test.c b/tests/subsys/shell/shell_history/src/shell_history_test.c
index 4068d40dff..5a9fff6b0b 100644
--- a/tests/subsys/shell/shell_history/src/shell_history_test.c
+++ b/tests/subsys/shell/shell_history/src/shell_history_test.c
@@ -9,7 +9,7 @@
  *
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/ztest.h>
 
 #include <zephyr/shell/shell_history.h>
diff --git a/tests/subsys/tracing/tracing_api/src/main.c b/tests/subsys/tracing/tracing_api/src/main.c
index 0a3ac6ae6f..2188f3f6ff 100644
--- a/tests/subsys/tracing/tracing_api/src/main.c
+++ b/tests/subsys/tracing/tracing_api/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <tracing_buffer.h>
 #include <tracing_core.h>