includes: prefer <zephyr/kernel.h> over <zephyr/zephyr.h>

As of today <zephyr/zephyr.h> is 100% equivalent to <zephyr/kernel.h>.
This patch proposes to then include <zephyr/kernel.h> instead of
<zephyr/zephyr.h> since it is more clear that you are including the
Kernel APIs and (probably) nothing else. <zephyr/zephyr.h> sounds like a
catch-all header that may be confusing. Most applications need to
include a bunch of other things to compile, e.g. driver headers or
subsystem headers like BT, logging, etc.

The idea of a catch-all header in Zephyr is probably not feasible
anyway. Reason is that Zephyr is not a library, like it could be for
example `libpython`. Zephyr provides many utilities nowadays: a kernel,
drivers, subsystems, etc and things will likely grow. A catch-all header
would be massive, difficult to keep up-to-date. It is also likely that
an application will only build a small subset. Note that subsystem-level
headers may use a catch-all approach to make things easier, though.

NOTE: This patch is **NOT** removing the header, just removing its usage
in-tree. I'd advocate for its deprecation (add a #warning on it), but I
understand many people will have concerns.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>

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)

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)

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>
 

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)
 {

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>
 

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);
 

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>
 

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>

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>

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>

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>
 

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>
 

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>
 

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"
 

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>

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>

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>

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>

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>

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>

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>

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>
 

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>

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

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

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

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>

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>
 

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>

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);

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)

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>

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>
 

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>

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>

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>

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>

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>

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>

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"

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);
 

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>
 

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>

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"

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>

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"
 

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>

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

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>

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>

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>

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);

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>

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>

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>

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>

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>

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);

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>

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>

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>

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>

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>
 

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>
 

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"
 

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"
 

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"
 

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>

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>

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>

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>

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>

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>
 

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

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>

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"

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);

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);

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

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

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

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>

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>

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>

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>

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>
 

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>
 

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>
 

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
 

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

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>
 

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>

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

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>
 

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>
 

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>

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" {

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" {

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>

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