zephyr: use <zephyr/kernel.h>

<zephyr/zephyr.h> is a shim to the Kernel header, so let's use it
directly.

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

Author: gmarull

applications/asset_tracker_v2/src/cloud/aws_iot_integration.c

@@ -1,5 +1,5 @@
 #include "cloud/cloud_wrapper.h"
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <net/aws_iot.h>
 #include <nrf_modem_at.h>
 

applications/asset_tracker_v2/src/cloud/azure_iot_hub_integration.c

@@ -1,4 +1,4 @@
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <net/azure_iot_hub.h>
 #include <nrf_modem_at.h>
 

applications/asset_tracker_v2/src/cloud/cloud_codec/aws_iot/aws_iot_codec.c

@@ -7,7 +7,7 @@
 #include <cloud_codec.h>
 #include <stdbool.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <stdio.h>
 #include <stdlib.h>

applications/asset_tracker_v2/src/cloud/cloud_codec/azure_iot_hub/azure_iot_hub_codec.c

@@ -7,7 +7,7 @@
 #include <cloud_codec.h>
 #include <stdbool.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <stdio.h>
 #include <stdlib.h>

applications/asset_tracker_v2/src/cloud/cloud_codec/cloud_codec.h

@@ -7,7 +7,7 @@
 #ifndef CLOUD_CODEC_H__
 #define CLOUD_CODEC_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>

applications/asset_tracker_v2/src/cloud/cloud_codec/cloud_codec_ringbuffer.c

@@ -5,7 +5,7 @@
  */
 
 #include <cloud_codec.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <cJSON.h>
 #include <cJSON_os.h>
 #include <math.h>

applications/asset_tracker_v2/src/cloud/cloud_codec/json_common.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <cJSON.h>
 #include <date_time.h>
 

applications/asset_tracker_v2/src/cloud/cloud_codec/json_common.h

@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <cJSON.h>
 
 #include "cloud_codec.h"

applications/asset_tracker_v2/src/cloud/cloud_codec/nrf_cloud/nrf_cloud_codec.c

@@ -6,7 +6,7 @@
 
 #include <stdbool.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <stdio.h>
 #include <stdlib.h>

applications/asset_tracker_v2/src/cloud/cloud_wrapper.h

@@ -11,7 +11,7 @@
 #ifndef CLOUD_WRAPPER_H__
 #define CLOUD_WRAPPER_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdbool.h>
 
 /**

applications/asset_tracker_v2/src/cloud/nrf_cloud_integration.c

@@ -1,4 +1,4 @@
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <net/nrf_cloud.h>
 #include <zephyr/net/mqtt.h>
 #include <stdio.h>

applications/asset_tracker_v2/src/ext_sensors/ext_sensors.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/drivers/sensor.h>

applications/asset_tracker_v2/src/ext_sensors/ext_sensors_bsec.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/spinlock.h>

applications/asset_tracker_v2/src/main.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

applications/asset_tracker_v2/src/modules/cloud_module.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
 #include <stdio.h>
 #include <zephyr/dfu/mcuboot.h>

applications/asset_tracker_v2/src/modules/data_module.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <app_event_manager.h>
 #include <zephyr/settings/settings.h>
 #include <date_time.h>

applications/asset_tracker_v2/src/modules/debug_module.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #if defined(CONFIG_MEMFAULT)
 #include <memfault/metrics/metrics.h>
 #include <memfault/ports/zephyr/http.h>

applications/asset_tracker_v2/src/modules/gnss_module.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <date_time.h>
 #include <app_event_manager.h>

applications/asset_tracker_v2/src/modules/modem_module.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <stdio.h>
 #include <app_event_manager.h>

applications/asset_tracker_v2/src/modules/modules_common.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <app_event_manager.h>
 #include "modules_common.h"

applications/asset_tracker_v2/src/modules/modules_common.h

@@ -11,7 +11,7 @@
  *@brief Modules common library header.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /**
  * @defgroup modules_common Modules common library

applications/asset_tracker_v2/src/modules/sensor_module.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/drivers/sensor.h>
 #include <app_event_manager.h>

applications/asset_tracker_v2/src/modules/ui_module.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/device.h>
 #include <app_event_manager.h>

applications/asset_tracker_v2/src/modules/util_module.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>

applications/asset_tracker_v2/src/watchdog/watchdog_app.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/watchdog.h>
 

applications/asset_tracker_v2/src/watchdog/watchdog_app.h

@@ -12,7 +12,7 @@
 #ifndef WATCHDOG_APP_H__
 #define WATCHDOG_APP_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {

applications/asset_tracker_v2/tests/json_common/mock/date_time_mock.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "date_time.h"
 

applications/asset_tracker_v2/tests/json_common/src/main.c

@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 #include <cJSON.h>

applications/connectivity_bridge/src/disk/config.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/fs/fs.h>
 #include <zephyr/settings/settings.h>
 #include <stdio.h>

applications/connectivity_bridge/src/disk/readme.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define MODULE file_readme
 #include "fs_event.h"

applications/connectivity_bridge/src/disk/thingy91_cdc_acm.cat.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define MODULE file_cat
 #include "fs_event.h"

applications/connectivity_bridge/src/disk/thingy91_cdc_acm.inf.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define MODULE file_inf
 #include "fs_event.h"

applications/connectivity_bridge/src/main.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <app_event_manager.h>
 

applications/connectivity_bridge/src/modules/ble_handler.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/sys/ring_buffer.h>
 

applications/connectivity_bridge/src/modules/power_handler.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <hal/nrf_power.h>
 #include <zephyr/pm/pm.h>
 #include <zephyr/sys/reboot.h>

applications/machine_learning/configuration/common/ble_adv_def.h

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <bluetooth/services/nus.h>
 

applications/machine_learning/configuration/nrf52840dk_nrf52840/click_detector_def.h

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <caf/click_detector.h>
 
 /* This configuration file is included only once from click_detector module

applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/click_detector_def.h

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <caf/click_detector.h>
 
 /* This configuration file is included only once from click_detector module

applications/machine_learning/configuration/thingy52_nrf52832/click_detector_def.h

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <caf/click_detector.h>
 
 /* This configuration file is included only once from click_detector module

applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/click_detector_def.h

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <caf/click_detector.h>
 
 /* This configuration file is included only once from click_detector module

applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/click_detector_def.h

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <caf/click_detector.h>
 
 /* This configuration file is included only once from click_detector module

applications/machine_learning/src/modules/ei_data_forwarder_bt_nus.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <bluetooth/services/nus.h>
 
 #include "ei_data_forwarder.h"

applications/machine_learning/src/modules/ei_data_forwarder_uart.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/uart.h>
 
 #include "ei_data_forwarder.h"

applications/machine_learning/src/modules/led_state.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "led_state_def.h"
 

applications/machine_learning/src/modules/ml_app_mode.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <caf/events/click_event.h>
 #include "ml_app_mode_event.h"