diff --git a/applications/asset_tracker_v2/src/cloud/aws_iot_integration.c b/applications/asset_tracker_v2/src/cloud/aws_iot_integration.c
index dc9269db6f66..1c9dc48d9a05 100644
--- a/applications/asset_tracker_v2/src/cloud/aws_iot_integration.c
+++ b/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>
 
diff --git a/applications/asset_tracker_v2/src/cloud/azure_iot_hub_integration.c b/applications/asset_tracker_v2/src/cloud/azure_iot_hub_integration.c
index 1091c44c4122..2f34a0988457 100644
--- a/applications/asset_tracker_v2/src/cloud/azure_iot_hub_integration.c
+++ b/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>
 
diff --git a/applications/asset_tracker_v2/src/cloud/cloud_codec/aws_iot/aws_iot_codec.c b/applications/asset_tracker_v2/src/cloud/cloud_codec/aws_iot/aws_iot_codec.c
index 0b5d355d1a7f..1ab51ef88e72 100644
--- a/applications/asset_tracker_v2/src/cloud/cloud_codec/aws_iot/aws_iot_codec.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/cloud/cloud_codec/azure_iot_hub/azure_iot_hub_codec.c b/applications/asset_tracker_v2/src/cloud/cloud_codec/azure_iot_hub/azure_iot_hub_codec.c
index 1c7d0ccb68a9..56d48407feda 100644
--- a/applications/asset_tracker_v2/src/cloud/cloud_codec/azure_iot_hub/azure_iot_hub_codec.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/cloud/cloud_codec/cloud_codec.h b/applications/asset_tracker_v2/src/cloud/cloud_codec/cloud_codec.h
index 3783a0a8ba70..4326a2572e62 100644
--- a/applications/asset_tracker_v2/src/cloud/cloud_codec/cloud_codec.h
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/cloud/cloud_codec/cloud_codec_ringbuffer.c b/applications/asset_tracker_v2/src/cloud/cloud_codec/cloud_codec_ringbuffer.c
index 439c3ba10c61..6e1012a54c94 100644
--- a/applications/asset_tracker_v2/src/cloud/cloud_codec/cloud_codec_ringbuffer.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/cloud/cloud_codec/json_common.c b/applications/asset_tracker_v2/src/cloud/cloud_codec/json_common.c
index b11d1a82594b..83248083122e 100644
--- a/applications/asset_tracker_v2/src/cloud/cloud_codec/json_common.c
+++ b/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>
 
diff --git a/applications/asset_tracker_v2/src/cloud/cloud_codec/json_common.h b/applications/asset_tracker_v2/src/cloud/cloud_codec/json_common.h
index f9a7f9c1a55a..9660c4aa12d5 100644
--- a/applications/asset_tracker_v2/src/cloud/cloud_codec/json_common.h
+++ b/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"
diff --git a/applications/asset_tracker_v2/src/cloud/cloud_codec/nrf_cloud/nrf_cloud_codec.c b/applications/asset_tracker_v2/src/cloud/cloud_codec/nrf_cloud/nrf_cloud_codec.c
index 1ed33434e8fc..6ddf85629bdd 100644
--- a/applications/asset_tracker_v2/src/cloud/cloud_codec/nrf_cloud/nrf_cloud_codec.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/cloud/cloud_wrapper.h b/applications/asset_tracker_v2/src/cloud/cloud_wrapper.h
index d90de95eb1c3..daf9694a03e7 100644
--- a/applications/asset_tracker_v2/src/cloud/cloud_wrapper.h
+++ b/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>
 
 /**
diff --git a/applications/asset_tracker_v2/src/cloud/nrf_cloud_integration.c b/applications/asset_tracker_v2/src/cloud/nrf_cloud_integration.c
index d47df8e84f62..53dfa08d2fb9 100644
--- a/applications/asset_tracker_v2/src/cloud/nrf_cloud_integration.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/ext_sensors/ext_sensors.c b/applications/asset_tracker_v2/src/ext_sensors/ext_sensors.c
index b0fff919d0d6..e58185014bf1 100644
--- a/applications/asset_tracker_v2/src/ext_sensors/ext_sensors.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/ext_sensors/ext_sensors_bsec.c b/applications/asset_tracker_v2/src/ext_sensors/ext_sensors_bsec.c
index 0c6926baa863..a63010502806 100644
--- a/applications/asset_tracker_v2/src/ext_sensors/ext_sensors_bsec.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/main.c b/applications/asset_tracker_v2/src/main.c
index 97ec0dd2a905..024955854a6b 100644
--- a/applications/asset_tracker_v2/src/main.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/modules/cloud_module.c b/applications/asset_tracker_v2/src/modules/cloud_module.c
index 4e69b0e91d63..37eda6879c12 100644
--- a/applications/asset_tracker_v2/src/modules/cloud_module.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/modules/data_module.c b/applications/asset_tracker_v2/src/modules/data_module.c
index d2b0b6159c98..bf09787d6b23 100644
--- a/applications/asset_tracker_v2/src/modules/data_module.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/modules/debug_module.c b/applications/asset_tracker_v2/src/modules/debug_module.c
index 6e7b977b1cd7..fe0feb959629 100644
--- a/applications/asset_tracker_v2/src/modules/debug_module.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/modules/gnss_module.c b/applications/asset_tracker_v2/src/modules/gnss_module.c
index 8154ae7a6f93..a582412bb646 100644
--- a/applications/asset_tracker_v2/src/modules/gnss_module.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/modules/modem_module.c b/applications/asset_tracker_v2/src/modules/modem_module.c
index 210759dcbd7c..006834931877 100644
--- a/applications/asset_tracker_v2/src/modules/modem_module.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/modules/modules_common.c b/applications/asset_tracker_v2/src/modules/modules_common.c
index deed7d67b18f..2b8b00da5632 100644
--- a/applications/asset_tracker_v2/src/modules/modules_common.c
+++ b/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"
diff --git a/applications/asset_tracker_v2/src/modules/modules_common.h b/applications/asset_tracker_v2/src/modules/modules_common.h
index 3fd766679f19..73933000bb7d 100644
--- a/applications/asset_tracker_v2/src/modules/modules_common.h
+++ b/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
diff --git a/applications/asset_tracker_v2/src/modules/sensor_module.c b/applications/asset_tracker_v2/src/modules/sensor_module.c
index 06abb1062c27..5b8c0ebc33fa 100644
--- a/applications/asset_tracker_v2/src/modules/sensor_module.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/modules/ui_module.c b/applications/asset_tracker_v2/src/modules/ui_module.c
index 3b3ea10f155f..7cd7bb7e7769 100644
--- a/applications/asset_tracker_v2/src/modules/ui_module.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/modules/util_module.c b/applications/asset_tracker_v2/src/modules/util_module.c
index 6986ae8d78fd..40eaf1729107 100644
--- a/applications/asset_tracker_v2/src/modules/util_module.c
+++ b/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>
diff --git a/applications/asset_tracker_v2/src/watchdog/watchdog_app.c b/applications/asset_tracker_v2/src/watchdog/watchdog_app.c
index 0bbefa0b26ab..5a2264c3a629 100644
--- a/applications/asset_tracker_v2/src/watchdog/watchdog_app.c
+++ b/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>
 
diff --git a/applications/asset_tracker_v2/src/watchdog/watchdog_app.h b/applications/asset_tracker_v2/src/watchdog/watchdog_app.h
index 9e336526c8f5..abc777615562 100644
--- a/applications/asset_tracker_v2/src/watchdog/watchdog_app.h
+++ b/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" {
diff --git a/applications/asset_tracker_v2/tests/json_common/mock/date_time_mock.c b/applications/asset_tracker_v2/tests/json_common/mock/date_time_mock.c
index 5eeb1be4df40..85c786dca928 100644
--- a/applications/asset_tracker_v2/tests/json_common/mock/date_time_mock.c
+++ b/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"
 
diff --git a/applications/asset_tracker_v2/tests/json_common/src/main.c b/applications/asset_tracker_v2/tests/json_common/src/main.c
index 4bf18968dbf6..74a259e9095b 100644
--- a/applications/asset_tracker_v2/tests/json_common/src/main.c
+++ b/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>
diff --git a/applications/connectivity_bridge/src/disk/config.c b/applications/connectivity_bridge/src/disk/config.c
index 95b5edb90cf0..1fc4884f6720 100644
--- a/applications/connectivity_bridge/src/disk/config.c
+++ b/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>
diff --git a/applications/connectivity_bridge/src/disk/readme.c b/applications/connectivity_bridge/src/disk/readme.c
index 1f35e0a38e16..b68c11981279 100644
--- a/applications/connectivity_bridge/src/disk/readme.c
+++ b/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"
diff --git a/applications/connectivity_bridge/src/disk/thingy91_cdc_acm.cat.c b/applications/connectivity_bridge/src/disk/thingy91_cdc_acm.cat.c
index b3ce4d0b9a2d..842cfbd2bec3 100644
--- a/applications/connectivity_bridge/src/disk/thingy91_cdc_acm.cat.c
+++ b/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"
diff --git a/applications/connectivity_bridge/src/disk/thingy91_cdc_acm.inf.c b/applications/connectivity_bridge/src/disk/thingy91_cdc_acm.inf.c
index 4a0160474fbe..04a4dd442036 100644
--- a/applications/connectivity_bridge/src/disk/thingy91_cdc_acm.inf.c
+++ b/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"
diff --git a/applications/connectivity_bridge/src/main.c b/applications/connectivity_bridge/src/main.c
index f518b2af3588..ce7101bdc2ed 100644
--- a/applications/connectivity_bridge/src/main.c
+++ b/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>
 
diff --git a/applications/connectivity_bridge/src/modules/ble_handler.c b/applications/connectivity_bridge/src/modules/ble_handler.c
index e335fd97da43..e915f1aa6de2 100644
--- a/applications/connectivity_bridge/src/modules/ble_handler.c
+++ b/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>
 
diff --git a/applications/connectivity_bridge/src/modules/power_handler.c b/applications/connectivity_bridge/src/modules/power_handler.c
index 8a302d05e048..3ec3a2f8f5bf 100644
--- a/applications/connectivity_bridge/src/modules/power_handler.c
+++ b/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>
diff --git a/applications/machine_learning/configuration/common/ble_adv_def.h b/applications/machine_learning/configuration/common/ble_adv_def.h
index 8436470a82ca..a4117b4166a1 100644
--- a/applications/machine_learning/configuration/common/ble_adv_def.h
+++ b/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>
 
diff --git a/applications/machine_learning/configuration/nrf52840dk_nrf52840/click_detector_def.h b/applications/machine_learning/configuration/nrf52840dk_nrf52840/click_detector_def.h
index d92e97e31084..4d8cc57e88ae 100644
--- a/applications/machine_learning/configuration/nrf52840dk_nrf52840/click_detector_def.h
+++ b/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
diff --git a/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/click_detector_def.h b/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/click_detector_def.h
index d92e97e31084..4d8cc57e88ae 100644
--- a/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/click_detector_def.h
+++ b/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
diff --git a/applications/machine_learning/configuration/thingy52_nrf52832/click_detector_def.h b/applications/machine_learning/configuration/thingy52_nrf52832/click_detector_def.h
index d92e97e31084..4d8cc57e88ae 100644
--- a/applications/machine_learning/configuration/thingy52_nrf52832/click_detector_def.h
+++ b/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
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/click_detector_def.h b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/click_detector_def.h
index d92e97e31084..4d8cc57e88ae 100644
--- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/click_detector_def.h
+++ b/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
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/click_detector_def.h b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/click_detector_def.h
index d92e97e31084..4d8cc57e88ae 100644
--- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/click_detector_def.h
+++ b/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
diff --git a/applications/machine_learning/src/modules/ei_data_forwarder_bt_nus.c b/applications/machine_learning/src/modules/ei_data_forwarder_bt_nus.c
index 6e84c39689ba..b7dea7ac6b7d 100644
--- a/applications/machine_learning/src/modules/ei_data_forwarder_bt_nus.c
+++ b/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"
diff --git a/applications/machine_learning/src/modules/ei_data_forwarder_uart.c b/applications/machine_learning/src/modules/ei_data_forwarder_uart.c
index 53be3ad3f58a..167a7789d70a 100644
--- a/applications/machine_learning/src/modules/ei_data_forwarder_uart.c
+++ b/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"
diff --git a/applications/machine_learning/src/modules/led_state.c b/applications/machine_learning/src/modules/led_state.c
index e839b8d8b0d5..16778b2f922c 100644
--- a/applications/machine_learning/src/modules/led_state.c
+++ b/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"
 
diff --git a/applications/machine_learning/src/modules/ml_app_mode.c b/applications/machine_learning/src/modules/ml_app_mode.c
index a23ba0298d38..788b14b217d3 100644
--- a/applications/machine_learning/src/modules/ml_app_mode.c
+++ b/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"
diff --git a/applications/machine_learning/src/modules/ml_runner.c b/applications/machine_learning/src/modules/ml_runner.c
index 711c86b6404b..f18d903e2704 100644
--- a/applications/machine_learning/src/modules/ml_runner.c
+++ b/applications/machine_learning/src/modules/ml_runner.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ei_wrapper.h>
 
 #include <caf/events/sensor_event.h>
diff --git a/applications/machine_learning/src/modules/sensor_sim_ctrl.c b/applications/machine_learning/src/modules/sensor_sim_ctrl.c
index 2b343018577a..76c22889c443 100644
--- a/applications/machine_learning/src/modules/sensor_sim_ctrl.c
+++ b/applications/machine_learning/src/modules/sensor_sim_ctrl.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <drivers/sensor_sim.h>
 
 #include "sensor_sim_ctrl_def.h"
diff --git a/applications/machine_learning/src/util/ei_data_forwarder.c b/applications/machine_learning/src/util/ei_data_forwarder.c
index e3038331fee0..283964526ced 100644
--- a/applications/machine_learning/src/util/ei_data_forwarder.c
+++ b/applications/machine_learning/src/util/ei_data_forwarder.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include "ei_data_forwarder.h"
 
diff --git a/applications/nrf5340_audio/src/audio/audio_codec.c b/applications/nrf5340_audio/src/audio/audio_codec.c
index 9f627723f1e5..618931dc3db8 100644
--- a/applications/nrf5340_audio/src/audio/audio_codec.c
+++ b/applications/nrf5340_audio/src/audio/audio_codec.c
@@ -6,7 +6,7 @@
 
 #include "audio_codec.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "macros_common.h"
 #include "streamctrl.h"
diff --git a/applications/nrf5340_audio/src/audio/audio_datapath.c b/applications/nrf5340_audio/src/audio/audio_datapath.c
index 08a2fa86110e..3232ac86ec73 100644
--- a/applications/nrf5340_audio/src/audio/audio_datapath.c
+++ b/applications/nrf5340_audio/src/audio/audio_datapath.c
@@ -44,7 +44,7 @@
 
 #include "audio_datapath.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrfx_clock.h>
 #include <zephyr/shell/shell.h>
 #include <stdlib.h>
diff --git a/applications/nrf5340_audio/src/audio/audio_datapath.h b/applications/nrf5340_audio/src/audio/audio_datapath.h
index 76bc2716cb81..3adba50e03fb 100644
--- a/applications/nrf5340_audio/src/audio/audio_datapath.h
+++ b/applications/nrf5340_audio/src/audio/audio_datapath.h
@@ -45,7 +45,7 @@
 #ifndef _AUDIO_DATAPATH_H_
 #define _AUDIO_DATAPATH_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdint.h>
 #include <stdbool.h>
 
diff --git a/applications/nrf5340_audio/src/audio/audio_sync_timer.c b/applications/nrf5340_audio/src/audio/audio_sync_timer.c
index eb8192a120e6..0f89be6566e5 100644
--- a/applications/nrf5340_audio/src/audio/audio_sync_timer.c
+++ b/applications/nrf5340_audio/src/audio/audio_sync_timer.c
@@ -44,7 +44,7 @@
 
 #include "audio_sync_timer.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrfx_timer.h>
 #include <nrfx_dppi.h>
 #include <nrfx_i2s.h>
diff --git a/applications/nrf5340_audio/src/audio/streamctrl.c b/applications/nrf5340_audio/src/audio/streamctrl.c
index e906fad03531..5590fed3a009 100644
--- a/applications/nrf5340_audio/src/audio/streamctrl.c
+++ b/applications/nrf5340_audio/src/audio/streamctrl.c
@@ -6,7 +6,7 @@
 
 #include "streamctrl.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/applications/nrf5340_audio/src/audio/streamctrl.h b/applications/nrf5340_audio/src/audio/streamctrl.h
index 6a295c07158d..7927dfe43932 100644
--- a/applications/nrf5340_audio/src/audio/streamctrl.h
+++ b/applications/nrf5340_audio/src/audio/streamctrl.h
@@ -20,7 +20,7 @@
 #define _STREAMCTRL_H_
 
 #include <stddef.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /* State machine states for peer/stream */
 enum stream_state {
diff --git a/applications/nrf5340_audio/src/audio/sw_codec_select.c b/applications/nrf5340_audio/src/audio/sw_codec_select.c
index cdf0568cc064..b268ad00d397 100644
--- a/applications/nrf5340_audio/src/audio/sw_codec_select.c
+++ b/applications/nrf5340_audio/src/audio/sw_codec_select.c
@@ -6,7 +6,7 @@
 
 #include "sw_codec_select.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 
 #include "pcm_stream_channel_modifier.h"
diff --git a/applications/nrf5340_audio/src/audio/sw_codec_select.h b/applications/nrf5340_audio/src/audio/sw_codec_select.h
index 309fcce38b13..928f197b32d2 100644
--- a/applications/nrf5340_audio/src/audio/sw_codec_select.h
+++ b/applications/nrf5340_audio/src/audio/sw_codec_select.h
@@ -7,7 +7,7 @@
 #ifndef _SW_CODEC_SELECT_H_
 #define _SW_CODEC_SELECT_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #if (CONFIG_SW_CODEC_SBC)
 /* Frame length in samples */
diff --git a/applications/nrf5340_audio/src/bluetooth/ble_acl_common.c b/applications/nrf5340_audio/src/bluetooth/ble_acl_common.c
index e2896f07aa63..67de3739a4dd 100644
--- a/applications/nrf5340_audio/src/bluetooth/ble_acl_common.c
+++ b/applications/nrf5340_audio/src/bluetooth/ble_acl_common.c
@@ -7,7 +7,7 @@
 #include "ble_acl_common.h"
 #include "ctrl_events.h"
 #include "ble_trans.h"
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <zephyr/shell/shell.h>
diff --git a/applications/nrf5340_audio/src/bluetooth/ble_acl_gateway.c b/applications/nrf5340_audio/src/bluetooth/ble_acl_gateway.c
index d602d8fd0e8c..f0a6b733b12d 100644
--- a/applications/nrf5340_audio/src/bluetooth/ble_acl_gateway.c
+++ b/applications/nrf5340_audio/src/bluetooth/ble_acl_gateway.c
@@ -8,7 +8,7 @@
 #include "ble_acl_common.h"
 #include "ble_audio_services.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/gatt.h>
 
diff --git a/applications/nrf5340_audio/src/bluetooth/ble_acl_headset.c b/applications/nrf5340_audio/src/bluetooth/ble_acl_headset.c
index 8f7c271b448c..9716bdeab8cf 100644
--- a/applications/nrf5340_audio/src/bluetooth/ble_acl_headset.c
+++ b/applications/nrf5340_audio/src/bluetooth/ble_acl_headset.c
@@ -6,7 +6,7 @@
 
 #include "ble_acl_headset.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/conn.h>
 
diff --git a/applications/nrf5340_audio/src/bluetooth/ble_audio_services.c b/applications/nrf5340_audio/src/bluetooth/ble_audio_services.c
index f757931d725b..4f9630b31905 100644
--- a/applications/nrf5340_audio/src/bluetooth/ble_audio_services.c
+++ b/applications/nrf5340_audio/src/bluetooth/ble_audio_services.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/bluetooth/conn.h>
 #include <zephyr/bluetooth/audio/vcs.h>
diff --git a/applications/nrf5340_audio/src/bluetooth/ble_core.c b/applications/nrf5340_audio/src/bluetooth/ble_core.c
index b7844bfbdd65..1e4adf9c0653 100644
--- a/applications/nrf5340_audio/src/bluetooth/ble_core.c
+++ b/applications/nrf5340_audio/src/bluetooth/ble_core.c
@@ -6,7 +6,7 @@
 
 #include "ble_core.h"
 #include "ble_hci_vsc.h"
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/applications/nrf5340_audio/src/bluetooth/ble_core.h b/applications/nrf5340_audio/src/bluetooth/ble_core.h
index 4e64f6727044..0d576121508b 100644
--- a/applications/nrf5340_audio/src/bluetooth/ble_core.h
+++ b/applications/nrf5340_audio/src/bluetooth/ble_core.h
@@ -7,7 +7,7 @@
 #ifndef _BLE_CORE_H_
 #define _BLE_CORE_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /**@brief	BLE core ready callback type.
  */
diff --git a/applications/nrf5340_audio/src/bluetooth/ble_hci_vsc.h b/applications/nrf5340_audio/src/bluetooth/ble_hci_vsc.h
index 240f5e9f1bfa..810132882cd0 100644
--- a/applications/nrf5340_audio/src/bluetooth/ble_hci_vsc.h
+++ b/applications/nrf5340_audio/src/bluetooth/ble_hci_vsc.h
@@ -7,7 +7,7 @@
 #ifndef _BLE_HCI_VSC_H_
 #define _BLE_HCI_VSC_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define HCI_OPCODE_VS_SET_OP_FLAGS BT_OP(BT_OGF_VS, 0x3F3)
 #define HCI_OPCODE_VS_SET_BD_ADDR BT_OP(BT_OGF_VS, 0x3F0)
diff --git a/applications/nrf5340_audio/src/bluetooth/ble_trans.c b/applications/nrf5340_audio/src/bluetooth/ble_trans.c
index 82c580806236..beb025ca8478 100644
--- a/applications/nrf5340_audio/src/bluetooth/ble_trans.c
+++ b/applications/nrf5340_audio/src/bluetooth/ble_trans.c
@@ -8,7 +8,7 @@
 
 #include <stdlib.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/bluetooth/iso.h>
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/applications/nrf5340_audio/src/bluetooth/ble_trans.h b/applications/nrf5340_audio/src/bluetooth/ble_trans.h
index db1df4d2ebf7..1847cee23c7a 100644
--- a/applications/nrf5340_audio/src/bluetooth/ble_trans.h
+++ b/applications/nrf5340_audio/src/bluetooth/ble_trans.h
@@ -7,7 +7,7 @@
 #ifndef _BLE_TRANS_H_
 #define _BLE_TRANS_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/conn.h>
 
 /* Connection interval is calculated as x*1.25 */
diff --git a/applications/nrf5340_audio/src/drivers/cs47l63_comm.c b/applications/nrf5340_audio/src/drivers/cs47l63_comm.c
index 19e58a915deb..9032de2db969 100644
--- a/applications/nrf5340_audio/src/drivers/cs47l63_comm.c
+++ b/applications/nrf5340_audio/src/drivers/cs47l63_comm.c
@@ -6,7 +6,7 @@
 
 #include "cs47l63_comm.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/spi.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/applications/nrf5340_audio/src/drivers/ina231.c b/applications/nrf5340_audio/src/drivers/ina231.c
index 38633f3a0587..a01c55002643 100644
--- a/applications/nrf5340_audio/src/drivers/ina231.c
+++ b/applications/nrf5340_audio/src/drivers/ina231.c
@@ -6,7 +6,7 @@
 
 #include "ina231.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/applications/nrf5340_audio/src/drivers/max14690.c b/applications/nrf5340_audio/src/drivers/max14690.c
index dc3bac0f1bf9..ab96729d11ad 100644
--- a/applications/nrf5340_audio/src/drivers/max14690.c
+++ b/applications/nrf5340_audio/src/drivers/max14690.c
@@ -6,7 +6,7 @@
 
 #include "max14690.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/i2c.h>
diff --git a/applications/nrf5340_audio/src/drivers/max14690.h b/applications/nrf5340_audio/src/drivers/max14690.h
index 222b79cdf82b..393056972831 100644
--- a/applications/nrf5340_audio/src/drivers/max14690.h
+++ b/applications/nrf5340_audio/src/drivers/max14690.h
@@ -7,7 +7,7 @@
 #ifndef _MAX_14690_
 #define _MAX_14690_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 
 /* Buck inductor value */
diff --git a/applications/nrf5340_audio/src/events/ctrl_events.c b/applications/nrf5340_audio/src/events/ctrl_events.c
index db12562a4723..cc35716724f8 100644
--- a/applications/nrf5340_audio/src/events/ctrl_events.c
+++ b/applications/nrf5340_audio/src/events/ctrl_events.c
@@ -6,7 +6,7 @@
 
 #include "ctrl_events.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/kernel.h>
 #include <errno.h>
 
diff --git a/applications/nrf5340_audio/src/events/ctrl_events.h b/applications/nrf5340_audio/src/events/ctrl_events.h
index d33331f1eb55..87e7e7e63361 100644
--- a/applications/nrf5340_audio/src/events/ctrl_events.h
+++ b/applications/nrf5340_audio/src/events/ctrl_events.h
@@ -16,7 +16,7 @@
 #ifndef _CTRL_EVENTS_H_
 #define _CTRL_EVENTS_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "ble_trans.h"
 #include "button_handler.h"
diff --git a/applications/nrf5340_audio/src/main.c b/applications/nrf5340_audio/src/main.c
index 338397297735..6c42bbfb0701 100644
--- a/applications/nrf5340_audio/src/main.c
+++ b/applications/nrf5340_audio/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/debug/stack.h>
 #include <zephyr/device.h>
 #include <string.h>
diff --git a/applications/nrf5340_audio/src/modules/audio_i2s.c b/applications/nrf5340_audio/src/modules/audio_i2s.c
index ea39cdbcca2a..85dff3434d2d 100644
--- a/applications/nrf5340_audio/src/modules/audio_i2s.c
+++ b/applications/nrf5340_audio/src/modules/audio_i2s.c
@@ -44,7 +44,7 @@
 
 #include "audio_i2s.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <nrfx_i2s.h>
diff --git a/applications/nrf5340_audio/src/modules/audio_i2s.h b/applications/nrf5340_audio/src/modules/audio_i2s.h
index 1f3576768dcf..eb0e4241f5a5 100644
--- a/applications/nrf5340_audio/src/modules/audio_i2s.h
+++ b/applications/nrf5340_audio/src/modules/audio_i2s.h
@@ -45,7 +45,7 @@
 #ifndef _AUDIO_I2S_H_
 #define _AUDIO_I2S_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdint.h>
 
 /*
diff --git a/applications/nrf5340_audio/src/modules/audio_usb.c b/applications/nrf5340_audio/src/modules/audio_usb.c
index bc51d7e8c9e1..e52c99fa29e4 100644
--- a/applications/nrf5340_audio/src/modules/audio_usb.c
+++ b/applications/nrf5340_audio/src/modules/audio_usb.c
@@ -6,7 +6,7 @@
 
 #include "audio_usb.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/usb/usb_device.h>
 #include <zephyr/usb/class/usb_audio.h>
 
diff --git a/applications/nrf5340_audio/src/modules/button_handler.c b/applications/nrf5340_audio/src/modules/button_handler.c
index f5cb640d5308..99ec698d55c2 100644
--- a/applications/nrf5340_audio/src/modules/button_handler.c
+++ b/applications/nrf5340_audio/src/modules/button_handler.c
@@ -7,7 +7,7 @@
 #include "button_handler.h"
 #include "button_assignments.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/shell/shell.h>
diff --git a/applications/nrf5340_audio/src/modules/hw_codec.c b/applications/nrf5340_audio/src/modules/hw_codec.c
index be94b5c06c31..3b54a8606d78 100644
--- a/applications/nrf5340_audio/src/modules/hw_codec.c
+++ b/applications/nrf5340_audio/src/modules/hw_codec.c
@@ -6,7 +6,7 @@
 
 #include "hw_codec.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/applications/nrf5340_audio/src/modules/led.c b/applications/nrf5340_audio/src/modules/led.c
index b68a19d8cd7a..e3321d08e220 100644
--- a/applications/nrf5340_audio/src/modules/led.c
+++ b/applications/nrf5340_audio/src/modules/led.c
@@ -6,7 +6,7 @@
 
 #include "led.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/gpio.h>
 #include <hal/nrf_gpio.h>
diff --git a/applications/nrf5340_audio/src/modules/pmic.c b/applications/nrf5340_audio/src/modules/pmic.c
index 54fd2dd04013..a182110de821 100644
--- a/applications/nrf5340_audio/src/modules/pmic.c
+++ b/applications/nrf5340_audio/src/modules/pmic.c
@@ -6,7 +6,7 @@
 
 #include "pmic.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/device.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/applications/nrf5340_audio/src/modules/power_module.c b/applications/nrf5340_audio/src/modules/power_module.c
index 8f2c03a403f0..21f1604ff5d8 100644
--- a/applications/nrf5340_audio/src/modules/power_module.c
+++ b/applications/nrf5340_audio/src/modules/power_module.c
@@ -6,7 +6,7 @@
 
 #include "power_module.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <zephyr/drivers/gpio.h>
 #include <string.h>
diff --git a/applications/nrf5340_audio/src/modules/power_module.h b/applications/nrf5340_audio/src/modules/power_module.h
index 5f187f54ffc3..7365add16e5f 100644
--- a/applications/nrf5340_audio/src/modules/power_module.h
+++ b/applications/nrf5340_audio/src/modules/power_module.h
@@ -7,7 +7,7 @@
 #ifndef _POWER_MODULE_H_
 #define _POWER_MODULE_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 
 #include "ina231.h"
diff --git a/applications/nrf5340_audio/src/modules/sd_card.c b/applications/nrf5340_audio/src/modules/sd_card.c
index b22c0b4971aa..37d34cf50490 100644
--- a/applications/nrf5340_audio/src/modules/sd_card.c
+++ b/applications/nrf5340_audio/src/modules/sd_card.c
@@ -6,7 +6,7 @@
 
 #include "sd_card.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/storage/disk_access.h>
 #include <zephyr/fs/fs.h>
diff --git a/applications/nrf5340_audio/src/utils/board_version.c b/applications/nrf5340_audio/src/utils/board_version.c
index 50ac2a7a09c9..fde4a7fb20a0 100644
--- a/applications/nrf5340_audio/src/utils/board_version.c
+++ b/applications/nrf5340_audio/src/utils/board_version.c
@@ -6,7 +6,7 @@
 
 #include "board_version.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/adc.h>
 #include <zephyr/drivers/gpio.h>
 #include <stdlib.h>
diff --git a/applications/nrf5340_audio/src/utils/contin_array.c b/applications/nrf5340_audio/src/utils/contin_array.c
index 479c7def8d4e..50325713fd7a 100644
--- a/applications/nrf5340_audio/src/utils/contin_array.c
+++ b/applications/nrf5340_audio/src/utils/contin_array.c
@@ -6,7 +6,7 @@
 
 #include "contin_array.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/applications/nrf5340_audio/src/utils/contin_array.h b/applications/nrf5340_audio/src/utils/contin_array.h
index b1c103c4c54f..6b5e76e0cc45 100644
--- a/applications/nrf5340_audio/src/utils/contin_array.h
+++ b/applications/nrf5340_audio/src/utils/contin_array.h
@@ -7,7 +7,7 @@
 #ifndef CONTIN_ARRAY_H
 #define CONTIN_ARRAY_H
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /** @brief. Creates a continuous array from a finite array
  * @param pcm_cont		Pointer to the destination array
diff --git a/applications/nrf5340_audio/src/utils/data_fifo.c b/applications/nrf5340_audio/src/utils/data_fifo.c
index 9dbd46d352dd..0fe8ba6a4c3f 100644
--- a/applications/nrf5340_audio/src/utils/data_fifo.c
+++ b/applications/nrf5340_audio/src/utils/data_fifo.c
@@ -6,7 +6,7 @@
 
 #include "data_fifo.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "macros_common.h"
 
diff --git a/applications/nrf5340_audio/src/utils/error_handler.c b/applications/nrf5340_audio/src/utils/error_handler.c
index 86d15a96f025..d64b0a902995 100644
--- a/applications/nrf5340_audio/src/utils/error_handler.c
+++ b/applications/nrf5340_audio/src/utils/error_handler.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/fatal.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/applications/nrf5340_audio/src/utils/pcm_mix.c b/applications/nrf5340_audio/src/utils/pcm_mix.c
index eda7b2aa1621..1cd73dc5cff6 100644
--- a/applications/nrf5340_audio/src/utils/pcm_mix.c
+++ b/applications/nrf5340_audio/src/utils/pcm_mix.c
@@ -6,7 +6,7 @@
 
 #include "pcm_mix.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pcm_mix, LOG_LEVEL_WRN);
diff --git a/applications/nrf5340_audio/src/utils/pcm_mix.h b/applications/nrf5340_audio/src/utils/pcm_mix.h
index 050a2e05e38a..154845431371 100644
--- a/applications/nrf5340_audio/src/utils/pcm_mix.h
+++ b/applications/nrf5340_audio/src/utils/pcm_mix.h
@@ -7,7 +7,7 @@
 #ifndef _PCM_MIX_H_
 #define _PCM_MIX_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 enum pcm_mix_mode {
 	B_STEREO_INTO_A_STEREO,
diff --git a/applications/nrf5340_audio/src/utils/pcm_stream_channel_modifier.c b/applications/nrf5340_audio/src/utils/pcm_stream_channel_modifier.c
index 9c186fa1f7f9..040b910f6a20 100644
--- a/applications/nrf5340_audio/src/utils/pcm_stream_channel_modifier.c
+++ b/applications/nrf5340_audio/src/utils/pcm_stream_channel_modifier.c
@@ -6,7 +6,7 @@
 
 #include "pcm_stream_channel_modifier.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 
 #include <zephyr/logging/log.h>
diff --git a/applications/nrf5340_audio/src/utils/pcm_stream_channel_modifier.h b/applications/nrf5340_audio/src/utils/pcm_stream_channel_modifier.h
index 8d09eb0d92ae..d390a70a132c 100644
--- a/applications/nrf5340_audio/src/utils/pcm_stream_channel_modifier.h
+++ b/applications/nrf5340_audio/src/utils/pcm_stream_channel_modifier.h
@@ -7,7 +7,7 @@
 #ifndef _PCM_STREAM_CHANNEL_MODIFIER_H_
 #define _PCM_STREAM_CHANNEL_MODIFIER_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "sw_codec_select.h"
 
diff --git a/applications/nrf5340_audio/src/utils/tone.c b/applications/nrf5340_audio/src/utils/tone.c
index a5cecd5f8826..7abf986e8807 100644
--- a/applications/nrf5340_audio/src/utils/tone.c
+++ b/applications/nrf5340_audio/src/utils/tone.c
@@ -6,7 +6,7 @@
 
 #include "tone.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <math.h>
 #include <stdio.h>
 #include <arm_math.h>
diff --git a/applications/nrf_desktop/configuration/common/ble_adv_def.h b/applications/nrf_desktop/configuration/common/ble_adv_def.h
index 1bcc2fb874d8..f375fff55be1 100644
--- a/applications/nrf_desktop/configuration/common/ble_adv_def.h
+++ b/applications/nrf_desktop/configuration/common/ble_adv_def.h
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/bluetooth.h>
 
 /* This configuration file is included only once from ble_adv module and holds
diff --git a/applications/nrf_desktop/src/hw_interface/board.c b/applications/nrf_desktop/src/hw_interface/board.c
index 43cf49a57520..26f10a5bb2dc 100644
--- a/applications/nrf_desktop/src/hw_interface/board.c
+++ b/applications/nrf_desktop/src/hw_interface/board.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/gpio.h>
diff --git a/applications/nrf_desktop/src/hw_interface/buttons_sim.c b/applications/nrf_desktop/src/hw_interface/buttons_sim.c
index d3c1a2b896cc..c0701092776d 100644
--- a/applications/nrf_desktop/src/hw_interface/buttons_sim.c
+++ b/applications/nrf_desktop/src/hw_interface/buttons_sim.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 <caf/events/button_event.h>
diff --git a/applications/nrf_desktop/src/hw_interface/motion_buttons.c b/applications/nrf_desktop/src/hw_interface/motion_buttons.c
index efea3352b4e0..83a041928fd2 100644
--- a/applications/nrf_desktop/src/hw_interface/motion_buttons.c
+++ b/applications/nrf_desktop/src/hw_interface/motion_buttons.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 <caf/events/button_event.h>
diff --git a/applications/nrf_desktop/src/hw_interface/motion_sensor.c b/applications/nrf_desktop/src/hw_interface/motion_sensor.c
index 86a8d930fcc0..d390b898c16a 100644
--- a/applications/nrf_desktop/src/hw_interface/motion_sensor.c
+++ b/applications/nrf_desktop/src/hw_interface/motion_sensor.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/atomic.h>
 #include <zephyr/spinlock.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/applications/nrf_desktop/src/hw_interface/motion_simulated.c b/applications/nrf_desktop/src/hw_interface/motion_simulated.c
index e9c2727988b7..59b232adfbd1 100644
--- a/applications/nrf_desktop/src/hw_interface/motion_simulated.c
+++ b/applications/nrf_desktop/src/hw_interface/motion_simulated.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/atomic.h>
 
 #include <app_event_manager.h>
diff --git a/applications/nrf_desktop/src/hw_interface/passkey_buttons.c b/applications/nrf_desktop/src/hw_interface/passkey_buttons.c
index 17f45d1d351d..9fa53136df0a 100644
--- a/applications/nrf_desktop/src/hw_interface/passkey_buttons.c
+++ b/applications/nrf_desktop/src/hw_interface/passkey_buttons.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define MODULE passkey
 #include <caf/events/module_state_event.h>
diff --git a/applications/nrf_desktop/src/hw_interface/selector_hw.c b/applications/nrf_desktop/src/hw_interface/selector_hw.c
index c158031ba946..c1fda70165b8 100644
--- a/applications/nrf_desktop/src/hw_interface/selector_hw.c
+++ b/applications/nrf_desktop/src/hw_interface/selector_hw.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/gpio.h>
diff --git a/applications/nrf_desktop/src/modules/bas.c b/applications/nrf_desktop/src/modules/bas.c
index 7bc1f0c77759..374cda057aa4 100644
--- a/applications/nrf_desktop/src/modules/bas.c
+++ b/applications/nrf_desktop/src/modules/bas.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/bluetooth/bluetooth.h>
diff --git a/applications/nrf_desktop/src/modules/ble_passkey.c b/applications/nrf_desktop/src/modules/ble_passkey.c
index 7bebfcaa0da9..4d6f4026bd1d 100644
--- a/applications/nrf_desktop/src/modules/ble_passkey.c
+++ b/applications/nrf_desktop/src/modules/ble_passkey.c
@@ -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 <zephyr/bluetooth/conn.h>
diff --git a/applications/nrf_desktop/src/modules/ble_qos.c b/applications/nrf_desktop/src/modules/ble_qos.c
index d1a287b691d3..472a41bd04e5 100644
--- a/applications/nrf_desktop/src/modules/ble_qos.c
+++ b/applications/nrf_desktop/src/modules/ble_qos.c
@@ -6,7 +6,7 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
diff --git a/applications/nrf_desktop/src/modules/constlat.c b/applications/nrf_desktop/src/modules/constlat.c
index e46aeb6a1f64..ef7340a047c8 100644
--- a/applications/nrf_desktop/src/modules/constlat.c
+++ b/applications/nrf_desktop/src/modules/constlat.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>
 
 #define MODULE constlat
diff --git a/applications/nrf_desktop/src/modules/cpu_meas.c b/applications/nrf_desktop/src/modules/cpu_meas.c
index 75627719041f..942d95769879 100644
--- a/applications/nrf_desktop/src/modules/cpu_meas.c
+++ b/applications/nrf_desktop/src/modules/cpu_meas.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <debug/cpu_load.h>
 
 #define MODULE cpu_meas
diff --git a/applications/nrf_desktop/src/modules/dev_descr.c b/applications/nrf_desktop/src/modules/dev_descr.c
index 1cbe8ad523d6..fd86be37831a 100644
--- a/applications/nrf_desktop/src/modules/dev_descr.c
+++ b/applications/nrf_desktop/src/modules/dev_descr.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/drivers/hwinfo.h>
 
diff --git a/applications/nrf_desktop/src/modules/failsafe.c b/applications/nrf_desktop/src/modules/failsafe.c
index fbeefa0618aa..c5ee7bd7967d 100644
--- a/applications/nrf_desktop/src/modules/failsafe.c
+++ b/applications/nrf_desktop/src/modules/failsafe.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <helpers/nrfx_reset_reason.h>
 #include <zephyr/storage/flash_map.h>
 
diff --git a/applications/nrf_desktop/src/modules/hfclk_lock.c b/applications/nrf_desktop/src/modules/hfclk_lock.c
index 0752bd3dfe4d..0db0bed4162d 100644
--- a/applications/nrf_desktop/src/modules/hfclk_lock.c
+++ b/applications/nrf_desktop/src/modules/hfclk_lock.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/clock_control.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
diff --git a/applications/nrf_desktop/src/modules/hids.c b/applications/nrf_desktop/src/modules/hids.c
index 44c86bec6c13..ac95a998d433 100644
--- a/applications/nrf_desktop/src/modules/hids.c
+++ b/applications/nrf_desktop/src/modules/hids.c
@@ -7,7 +7,7 @@
 #include <assert.h>
 #include <limits.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <zephyr/sys/util.h>
diff --git a/applications/nrf_desktop/src/modules/info.c b/applications/nrf_desktop/src/modules/info.c
index 56889977d11f..b2e5b07f89a5 100644
--- a/applications/nrf_desktop/src/modules/info.c
+++ b/applications/nrf_desktop/src/modules/info.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include "hwid.h"
diff --git a/applications/nrf_desktop/src/modules/led_state.c b/applications/nrf_desktop/src/modules/led_state.c
index bf67c32b182d..5877faf12871 100644
--- a/applications/nrf_desktop/src/modules/led_state.c
+++ b/applications/nrf_desktop/src/modules/led_state.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define MODULE led_state
 #include <caf/events/module_state_event.h>
diff --git a/applications/nrf_desktop/src/modules/led_stream.c b/applications/nrf_desktop/src/modules/led_stream.c
index ca19a8bc20ea..03e228ec61f6 100644
--- a/applications/nrf_desktop/src/modules/led_stream.c
+++ b/applications/nrf_desktop/src/modules/led_stream.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #define MODULE led_stream
diff --git a/applications/nrf_desktop/src/modules/profiler_sync.c b/applications/nrf_desktop/src/modules/profiler_sync.c
index dc446d83b800..e7de5beaa396 100644
--- a/applications/nrf_desktop/src/modules/profiler_sync.c
+++ b/applications/nrf_desktop/src/modules/profiler_sync.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <nrf_profiler.h>
 
diff --git a/applications/nrf_desktop/src/modules/qos.c b/applications/nrf_desktop/src/modules/qos.c
index 655c88552914..eb4bd20caf59 100644
--- a/applications/nrf_desktop/src/modules/qos.c
+++ b/applications/nrf_desktop/src/modules/qos.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/bluetooth/bluetooth.h>
diff --git a/applications/nrf_desktop/src/modules/usb_state_pm.c b/applications/nrf_desktop/src/modules/usb_state_pm.c
index a4e10b8d9172..ebb9fe33c828 100644
--- a/applications/nrf_desktop/src/modules/usb_state_pm.c
+++ b/applications/nrf_desktop/src/modules/usb_state_pm.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include "usb_event.h"
diff --git a/applications/nrf_desktop/src/modules/watchdog.c b/applications/nrf_desktop/src/modules/watchdog.c
index b6b0cb4ba20e..c4206c171d7b 100644
--- a/applications/nrf_desktop/src/modules/watchdog.c
+++ b/applications/nrf_desktop/src/modules/watchdog.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>
 
diff --git a/applications/nrf_desktop/src/util/config_channel_transport.c b/applications/nrf_desktop/src/util/config_channel_transport.c
index 0c2b35daad2a..06cd4674554f 100644
--- a/applications/nrf_desktop/src/util/config_channel_transport.c
+++ b/applications/nrf_desktop/src/util/config_channel_transport.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 
 #include "config_channel_transport.h"
diff --git a/applications/serial_lte_modem/src/dfu/dfu_host.c b/applications/serial_lte_modem/src/dfu/dfu_host.c
index 6429c3975b6e..56617354844e 100644
--- a/applications/serial_lte_modem/src/dfu/dfu_host.c
+++ b/applications/serial_lte_modem/src/dfu/dfu_host.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/crc.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
diff --git a/applications/serial_lte_modem/src/dfu/dfu_host.h b/applications/serial_lte_modem/src/dfu/dfu_host.h
index 70a193d9d073..1312f35dea02 100644
--- a/applications/serial_lte_modem/src/dfu/dfu_host.h
+++ b/applications/serial_lte_modem/src/dfu/dfu_host.h
@@ -9,7 +9,7 @@
 #ifndef DFU_HOST_H__
 #define DFU_HOST_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/applications/serial_lte_modem/src/dfu/dfu_host_legacy.c b/applications/serial_lte_modem/src/dfu/dfu_host_legacy.c
index 3f9e814571eb..a5ce63f5e327 100644
--- a/applications/serial_lte_modem/src/dfu/dfu_host_legacy.c
+++ b/applications/serial_lte_modem/src/dfu/dfu_host_legacy.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/crc.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
diff --git a/applications/serial_lte_modem/src/dfu/dfu_target_nrf52.c b/applications/serial_lte_modem/src/dfu/dfu_target_nrf52.c
index 2512f47de47c..9fdec6115ad5 100644
--- a/applications/serial_lte_modem/src/dfu/dfu_target_nrf52.c
+++ b/applications/serial_lte_modem/src/dfu/dfu_target_nrf52.c
@@ -16,7 +16,7 @@
 #endif
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <pm_config.h>
 #include <zephyr/logging/log.h>
 #include <nrfx.h>
diff --git a/applications/serial_lte_modem/src/dfu/slip.c b/applications/serial_lte_modem/src/dfu/slip.c
index e47bbc2cb54c..1e0585eabd7b 100644
--- a/applications/serial_lte_modem/src/dfu/slip.c
+++ b/applications/serial_lte_modem/src/dfu/slip.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdbool.h>
 #include "slip.h"
 
diff --git a/applications/serial_lte_modem/src/dfu/slip.h b/applications/serial_lte_modem/src/dfu/slip.h
index 15a998893869..85d0a7cdff29 100644
--- a/applications/serial_lte_modem/src/dfu/slip.h
+++ b/applications/serial_lte_modem/src/dfu/slip.h
@@ -9,7 +9,7 @@
 #ifndef SLIP_H__
 #define SLIP_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define SLIP_SIZE_MAX 128
 
diff --git a/applications/serial_lte_modem/src/dfu/slm_at_dfu.c b/applications/serial_lte_modem/src/dfu/slm_at_dfu.c
index 3a6ff5305147..104569bd68db 100644
--- a/applications/serial_lte_modem/src/dfu/slm_at_dfu.c
+++ b/applications/serial_lte_modem/src/dfu/slm_at_dfu.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <pm_config.h>
 #include <zephyr/dfu/mcuboot.h>
diff --git a/applications/serial_lte_modem/src/ftp_c/slm_at_ftp.c b/applications/serial_lte_modem/src/ftp_c/slm_at_ftp.c
index 36785f074106..a351a9c52609 100644
--- a/applications/serial_lte_modem/src/ftp_c/slm_at_ftp.c
+++ b/applications/serial_lte_modem/src/ftp_c/slm_at_ftp.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/applications/serial_lte_modem/src/gnss/slm_at_gnss.c b/applications/serial_lte_modem/src/gnss/slm_at_gnss.c
index c1796b7ef78c..d3bf2847dda8 100644
--- a/applications/serial_lte_modem/src/gnss/slm_at_gnss.c
+++ b/applications/serial_lte_modem/src/gnss/slm_at_gnss.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/logging/log.h>
 #include <date_time.h>
diff --git a/applications/serial_lte_modem/src/gpio/slm_at_gpio.c b/applications/serial_lte_modem/src/gpio/slm_at_gpio.c
index 577f1a4d3810..8d133b44b5bc 100644
--- a/applications/serial_lte_modem/src/gpio/slm_at_gpio.c
+++ b/applications/serial_lte_modem/src/gpio/slm_at_gpio.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/drivers/gpio.h>
 #include "slm_util.h"
diff --git a/applications/serial_lte_modem/src/http_c/slm_at_httpc.c b/applications/serial_lte_modem/src/http_c/slm_at_httpc.c
index b7209f610d24..c9416bb0d606 100644
--- a/applications/serial_lte_modem/src/http_c/slm_at_httpc.c
+++ b/applications/serial_lte_modem/src/http_c/slm_at_httpc.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/applications/serial_lte_modem/src/main.c b/applications/serial_lte_modem/src/main.c
index ba97e42cabf4..c3d5d5ec23fd 100644
--- a/applications/serial_lte_modem/src/main.c
+++ b/applications/serial_lte_modem/src/main.c
@@ -6,7 +6,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/logging/log_ctrl.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/applications/serial_lte_modem/src/mqtt_c/slm_at_mqtt.c b/applications/serial_lte_modem/src/mqtt_c/slm_at_mqtt.c
index 894a8ba3f9ad..74c92d794327 100644
--- a/applications/serial_lte_modem/src/mqtt_c/slm_at_mqtt.c
+++ b/applications/serial_lte_modem/src/mqtt_c/slm_at_mqtt.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/net/mqtt.h>
 #include <zephyr/net/socket.h>
diff --git a/applications/serial_lte_modem/src/slm_at_cmng.c b/applications/serial_lte_modem/src/slm_at_cmng.c
index 88d38ced2a23..08ceb47d4434 100644
--- a/applications/serial_lte_modem/src/slm_at_cmng.c
+++ b/applications/serial_lte_modem/src/slm_at_cmng.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/net/socket.h>
diff --git a/applications/serial_lte_modem/src/slm_at_commands.c b/applications/serial_lte_modem/src/slm_at_commands.c
index d7e6a9e2bb32..ffb18dffe394 100644
--- a/applications/serial_lte_modem/src/slm_at_commands.c
+++ b/applications/serial_lte_modem/src/slm_at_commands.c
@@ -5,7 +5,7 @@
  */
 #include <zephyr/types.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <zephyr/logging/log.h>
diff --git a/applications/serial_lte_modem/src/slm_at_fota.c b/applications/serial_lte_modem/src/slm_at_fota.c
index f3e87f6ff469..ee855a3d7bfb 100644
--- a/applications/serial_lte_modem/src/slm_at_fota.c
+++ b/applications/serial_lte_modem/src/slm_at_fota.c
@@ -6,7 +6,7 @@
 #include <zephyr/logging/log.h>
 
 #include <stdint.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <nrf_modem_delta_dfu.h>
 #include <zephyr/dfu/mcuboot.h>
diff --git a/applications/serial_lte_modem/src/slm_at_host.c b/applications/serial_lte_modem/src/slm_at_host.c
index a97cc3d1926f..0565e381ced6 100644
--- a/applications/serial_lte_modem/src/slm_at_host.c
+++ b/applications/serial_lte_modem/src/slm_at_host.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <zephyr/logging/log.h>
diff --git a/applications/serial_lte_modem/src/slm_at_icmp.c b/applications/serial_lte_modem/src/slm_at_icmp.c
index 90f20879dd4f..09782f5c85ed 100644
--- a/applications/serial_lte_modem/src/slm_at_icmp.c
+++ b/applications/serial_lte_modem/src/slm_at_icmp.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/net/socket.h>
diff --git a/applications/serial_lte_modem/src/slm_at_sms.c b/applications/serial_lte_modem/src/slm_at_sms.c
index d3318ac4ed49..e07f1350c986 100644
--- a/applications/serial_lte_modem/src/slm_at_sms.c
+++ b/applications/serial_lte_modem/src/slm_at_sms.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 #include <modem/sms.h>
diff --git a/applications/serial_lte_modem/src/slm_at_socket.c b/applications/serial_lte_modem/src/slm_at_socket.c
index 52a7af298bc3..cd2646300217 100644
--- a/applications/serial_lte_modem/src/slm_at_socket.c
+++ b/applications/serial_lte_modem/src/slm_at_socket.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/net/socket.h>
diff --git a/applications/serial_lte_modem/src/slm_at_tcp_proxy.c b/applications/serial_lte_modem/src/slm_at_tcp_proxy.c
index 681f531cc82c..c237e6635611 100644
--- a/applications/serial_lte_modem/src/slm_at_tcp_proxy.c
+++ b/applications/serial_lte_modem/src/slm_at_tcp_proxy.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/net/socket.h>
diff --git a/applications/serial_lte_modem/src/slm_at_udp_proxy.c b/applications/serial_lte_modem/src/slm_at_udp_proxy.c
index 1c722d8a5408..e6a302d40187 100644
--- a/applications/serial_lte_modem/src/slm_at_udp_proxy.c
+++ b/applications/serial_lte_modem/src/slm_at_udp_proxy.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/net/socket.h>
diff --git a/applications/serial_lte_modem/src/slm_settings.c b/applications/serial_lte_modem/src/slm_settings.c
index 2c8094f405e7..c875d6790118 100644
--- a/applications/serial_lte_modem/src/slm_settings.c
+++ b/applications/serial_lte_modem/src/slm_settings.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/logging/log.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/settings/settings.h>
 #include <zephyr/drivers/uart.h>
 #include <dfu/dfu_target.h>
diff --git a/applications/serial_lte_modem/src/twi/slm_at_twi.c b/applications/serial_lte_modem/src/twi/slm_at_twi.c
index 447b7b408d93..cd258cb92353 100644
--- a/applications/serial_lte_modem/src/twi/slm_at_twi.c
+++ b/applications/serial_lte_modem/src/twi/slm_at_twi.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 #include <stdio.h>
 #include "slm_util.h"
diff --git a/applications/zigbee_weather_station/src/main.c b/applications/zigbee_weather_station/src/main.c
index 43410ef8c7ae..cfdb3f575371 100644
--- a/applications/zigbee_weather_station/src/main.c
+++ b/applications/zigbee_weather_station/src/main.c
@@ -12,7 +12,7 @@
 #include <zb_nrf_platform.h>
 #include <zboss_api.h>
 #include <zboss_api_addons.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zigbee/zigbee_app_utils.h>
 #include <zigbee/zigbee_error_handler.h>
 
diff --git a/boards/arm/nrf5340_audio_dk_nrf5340/board.h b/boards/arm/nrf5340_audio_dk_nrf5340/board.h
index ece18b080447..edce9bb139cf 100644
--- a/boards/arm/nrf5340_audio_dk_nrf5340/board.h
+++ b/boards/arm/nrf5340_audio_dk_nrf5340/board.h
@@ -7,7 +7,7 @@
 #ifndef __BOARD_H__
 #define __BOARD_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /* Voltage divider PCA10121 board versions.
  * The defines give what value the ADC will read back.
diff --git a/boards/arm/nrf5340_audio_dk_nrf5340/nrf5340_audio_dk_cpunet_reset.c b/boards/arm/nrf5340_audio_dk_nrf5340/nrf5340_audio_dk_cpunet_reset.c
index 07de3ca26f0d..8c4e59685464 100644
--- a/boards/arm/nrf5340_audio_dk_nrf5340/nrf5340_audio_dk_cpunet_reset.c
+++ b/boards/arm/nrf5340_audio_dk_nrf5340/nrf5340_audio_dk_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/drivers/entropy/entropy_cc3xx.c b/drivers/entropy/entropy_cc3xx.c
index e7aa46de9ae6..921d7811485c 100644
--- a/drivers/entropy/entropy_cc3xx.c
+++ b/drivers/entropy/entropy_cc3xx.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/entropy.h>
 #include <zephyr/sys/util.h>
 
diff --git a/drivers/hw_cc310/hw_cc310.c b/drivers/hw_cc310/hw_cc310.c
index 91c9748bdac3..320f971ffbb6 100644
--- a/drivers/hw_cc310/hw_cc310.c
+++ b/drivers/hw_cc310/hw_cc310.c
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/irq.h>
 #include <zephyr/device.h>
 
diff --git a/drivers/sensor/paw3212/paw3212.c b/drivers/sensor/paw3212/paw3212.c
index 6dd15f0fb2a5..ae43a6e5f478 100644
--- a/drivers/sensor/paw3212/paw3212.c
+++ b/drivers/sensor/paw3212/paw3212.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/device.h>
diff --git a/drivers/sensor/pmw3360/pmw3360.c b/drivers/sensor/pmw3360/pmw3360.c
index 2c086678253e..fb40489af09e 100644
--- a/drivers/sensor/pmw3360/pmw3360.c
+++ b/drivers/sensor/pmw3360/pmw3360.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/device.h>
diff --git a/include/adp536x.h b/include/adp536x.h
index 65966b5ec9cf..2c2e46ab486b 100644
--- a/include/adp536x.h
+++ b/include/adp536x.h
@@ -14,7 +14,7 @@
  * @{
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /* Definition of VBUS current limit values. */
 #define ADP536X_VBUS_ILIM_50mA		0x00
diff --git a/include/app_event_manager.h b/include/app_event_manager.h
index c4020a081340..3889791e5c86 100644
--- a/include/app_event_manager.h
+++ b/include/app_event_manager.h
@@ -19,7 +19,7 @@
  * @{
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/logging/log.h>
diff --git a/include/bluetooth/conn_ctx.h b/include/bluetooth/conn_ctx.h
index ddf90d589cf7..1977c118bedb 100644
--- a/include/bluetooth/conn_ctx.h
+++ b/include/bluetooth/conn_ctx.h
@@ -14,7 +14,7 @@
 #ifndef BT_CONN_CTX_H_
 #define BT_CONN_CTX_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/bluetooth/conn.h>
 
diff --git a/include/bluetooth/mesh/scheduler_srv.h b/include/bluetooth/mesh/scheduler_srv.h
index 889356ef7276..c9a97e285ddc 100644
--- a/include/bluetooth/mesh/scheduler_srv.h
+++ b/include/bluetooth/mesh/scheduler_srv.h
@@ -14,7 +14,7 @@
 #ifndef BT_MESH_SCHEDULER_SRV_H__
 #define BT_MESH_SCHEDULER_SRV_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <bluetooth/mesh/time_srv.h>
 #include <bluetooth/mesh/scene_srv.h>
 #include <bluetooth/mesh/scheduler.h>
diff --git a/include/dm.h b/include/dm.h
index 78b9cd43992b..ed5876611801 100644
--- a/include/dm.h
+++ b/include/dm.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <zephyr/types.h>
 #include <zephyr/bluetooth/addr.h>
diff --git a/include/ei_wrapper.h b/include/ei_wrapper.h
index 1b0a651c8173..848024bbeeba 100644
--- a/include/ei_wrapper.h
+++ b/include/ei_wrapper.h
@@ -19,7 +19,7 @@
  * @{
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/event_manager_proxy.h b/include/event_manager_proxy.h
index b76936de23c5..cd473e935581 100644
--- a/include/event_manager_proxy.h
+++ b/include/event_manager_proxy.h
@@ -11,7 +11,7 @@
 #ifndef _EVENT_MANAGER_PROXY_H_
 #define _EVENT_MANAGER_PROXY_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/device.h>
 #include <app_event_manager.h>
diff --git a/include/memfault_ncs.h b/include/memfault_ncs.h
index cef58223ca8a..44850b23f87f 100644
--- a/include/memfault_ncs.h
+++ b/include/memfault_ncs.h
@@ -18,7 +18,7 @@
  * @{
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/modem/lte_lc.h b/include/modem/lte_lc.h
index 4f6a71bb46f2..36d4a6d71cb6 100644
--- a/include/modem/lte_lc.h
+++ b/include/modem/lte_lc.h
@@ -24,7 +24,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/modem/nrf_modem_lib.h b/include/modem/nrf_modem_lib.h
index 98dd715b94f4..4d663dd16b29 100644
--- a/include/modem/nrf_modem_lib.h
+++ b/include/modem/nrf_modem_lib.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_modem.h>
 
 /**
diff --git a/include/net/aws_jobs.h b/include/net/aws_jobs.h
index 4305011d3964..103153a50c7e 100644
--- a/include/net/aws_jobs.h
+++ b/include/net/aws_jobs.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/net/mqtt.h>
 
diff --git a/include/net/cloud.h b/include/net/cloud.h
index ca99f2e0e4ff..29d9d3dca41a 100644
--- a/include/net/cloud.h
+++ b/include/net/cloud.h
@@ -13,7 +13,7 @@
  * @{
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /**@brief Cloud events that can be notified asynchronously by the backend. */
 enum cloud_event_type {
diff --git a/include/net/download_client.h b/include/net/download_client.h
index 8e76a15c0f1a..d764bad4f2f6 100644
--- a/include/net/download_client.h
+++ b/include/net/download_client.h
@@ -20,7 +20,7 @@
 #ifndef DOWNLOAD_CLIENT_H__
 #define DOWNLOAD_CLIENT_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/net/coap.h>
 
diff --git a/include/net/fota_download.h b/include/net/fota_download.h
index 19c4d9a6e6c5..9d580c86456e 100644
--- a/include/net/fota_download.h
+++ b/include/net/fota_download.h
@@ -18,7 +18,7 @@
 #ifndef FOTA_DOWNLOAD_H_
 #define FOTA_DOWNLOAD_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <net/download_client.h>
 #include <dfu/dfu_target.h>
diff --git a/include/net/ftp_client.h b/include/net/ftp_client.h
index 986e2857f1ec..a44d71372ce1 100644
--- a/include/net/ftp_client.h
+++ b/include/net/ftp_client.h
@@ -16,7 +16,7 @@
 #ifndef FTP_CLIENT_
 #define FTP_CLIENT_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #ifdef __cplusplus
diff --git a/include/net/icalendar_parser.h b/include/net/icalendar_parser.h
index 57eae51cc27f..1584fe64515f 100644
--- a/include/net/icalendar_parser.h
+++ b/include/net/icalendar_parser.h
@@ -7,7 +7,7 @@
 #ifndef ICAL_PARSER_H__
 #define ICAL_PARSER_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #ifdef __cplusplus
diff --git a/include/net/lwm2m_client_utils.h b/include/net/lwm2m_client_utils.h
index 876d95b122b2..5edcbf06882e 100644
--- a/include/net/lwm2m_client_utils.h
+++ b/include/net/lwm2m_client_utils.h
@@ -23,7 +23,7 @@
 #ifndef LWM2M_CLIENT_UTILS_H__
 #define LWM2M_CLIENT_UTILS_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 
 #ifdef __cplusplus
diff --git a/include/net/lwm2m_client_utils_location.h b/include/net/lwm2m_client_utils_location.h
index 73c1007ab4c3..cdb2ecbec8aa 100644
--- a/include/net/lwm2m_client_utils_location.h
+++ b/include/net/lwm2m_client_utils_location.h
@@ -15,7 +15,7 @@
 #ifndef LWM2M_CLIENT_UTILS_LOCATION_H__
 #define LWM2M_CLIENT_UTILS_LOCATION_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_modem_gnss.h>
 #include <zephyr/net/lwm2m.h>
 #include <app_event_manager.h>
diff --git a/include/net/multicell_location.h b/include/net/multicell_location.h
index 6478f8a2bbe0..4c19c3883fa8 100644
--- a/include/net/multicell_location.h
+++ b/include/net/multicell_location.h
@@ -7,7 +7,7 @@
 #ifndef MULTICELL_LOCATION_H_
 #define MULTICELL_LOCATION_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 
 #ifdef __cplusplus
diff --git a/include/net/nrf_cloud.h b/include/net/nrf_cloud.h
index e3582e6f64e5..d2a20debbead 100644
--- a/include/net/nrf_cloud.h
+++ b/include/net/nrf_cloud.h
@@ -7,7 +7,7 @@
 #ifndef NRF_CLOUD_H__
 #define NRF_CLOUD_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/net/mqtt.h>
 #if defined(CONFIG_MODEM_INFO)
diff --git a/include/net/nrf_cloud_agps.h b/include/net/nrf_cloud_agps.h
index b2c75b20840a..7f3e89399e7b 100644
--- a/include/net/nrf_cloud_agps.h
+++ b/include/net/nrf_cloud_agps.h
@@ -11,7 +11,7 @@
  * @brief Module to provide nRF Cloud A-GPS support to nRF9160 SiP.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_modem_gnss.h>
 #include <net/nrf_cloud.h>
 
diff --git a/include/net/nrf_cloud_cell_pos.h b/include/net/nrf_cloud_cell_pos.h
index 438debc29209..f7433b9c8f84 100644
--- a/include/net/nrf_cloud_cell_pos.h
+++ b/include/net/nrf_cloud_cell_pos.h
@@ -11,7 +11,7 @@
  * @brief Module to provide nRF Cloud cellular positioning support to nRF9160 SiP.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 #include <net/nrf_cloud.h>
 
diff --git a/include/net/nrf_cloud_pgps.h b/include/net/nrf_cloud_pgps.h
index f733efa87320..5eddd8f8ebd7 100644
--- a/include/net/nrf_cloud_pgps.h
+++ b/include/net/nrf_cloud_pgps.h
@@ -11,7 +11,7 @@
  * @brief Module to provide nRF Cloud Predicted GPS (P-GPS) support to nRF9160 SiP.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_modem_gnss.h>
 #include "nrf_cloud_agps_schema_v1.h"
 
diff --git a/include/net/rest_client.h b/include/net/rest_client.h
index e8eaf86b880c..c12e6da633c3 100644
--- a/include/net/rest_client.h
+++ b/include/net/rest_client.h
@@ -17,7 +17,7 @@
 #ifndef REST_CLIENT_H__
 #define REST_CLIENT_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/http_parser.h>
 
 /** @brief TLS is not used. */
diff --git a/include/qos.h b/include/qos.h
index dd5975f1a426..7f31c7cf11a0 100644
--- a/include/qos.h
+++ b/include/qos.h
@@ -14,7 +14,7 @@
 #ifndef QOS_H__
 #define QOS_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdbool.h>
 #include <stdio.h>
 
diff --git a/include/secure_services.h b/include/secure_services.h
index 72b6733da3b3..0c8609479924 100644
--- a/include/secure_services.h
+++ b/include/secure_services.h
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 #include <zephyr/types.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <fw_info.h>
 #include <../arch/arm/include/aarch32/cortex_m/tz_ns.h>
 
diff --git a/include/zigbee/zigbee_fota.h b/include/zigbee/zigbee_fota.h
index 534a5d1ca1ad..1cb45f57b0be 100644
--- a/include/zigbee/zigbee_fota.h
+++ b/include/zigbee/zigbee_fota.h
@@ -19,7 +19,7 @@
 #ifndef ZIGBEE_FOTA_H_
 #define ZIGBEE_FOTA_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zboss_api.h>
 
 #define ZIGBEE_FOTA_EVT_DL_COMPLETE_VAL 100
diff --git a/lib/adp536x/adp536x.c b/lib/adp536x/adp536x.c
index 1c6e107d1173..804ff05ceafe 100644
--- a/lib/adp536x/adp536x.c
+++ b/lib/adp536x/adp536x.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/i2c.h>
 #include <zephyr/sys/util.h>
diff --git a/lib/at_cmd_parser/at_cmd_parser.c b/lib/at_cmd_parser/at_cmd_parser.c
index 3df983112519..5105a4858a76 100644
--- a/lib/at_cmd_parser/at_cmd_parser.c
+++ b/lib/at_cmd_parser/at_cmd_parser.c
@@ -9,7 +9,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <modem/at_cmd_parser.h>
diff --git a/lib/at_cmd_parser/at_params.c b/lib/at_cmd_parser/at_params.c
index 272dc45fd6e8..359686a2bcd9 100644
--- a/lib/at_cmd_parser/at_params.c
+++ b/lib/at_cmd_parser/at_params.c
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/kernel.h>
 
diff --git a/lib/at_host/at_host.c b/lib/at_host/at_host.c
index 89c44a734ce7..297811693246 100644
--- a/lib/at_host/at_host.c
+++ b/lib/at_host/at_host.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <zephyr/logging/log.h>
diff --git a/lib/at_monitor/at_monitor.c b/lib/at_monitor/at_monitor.c
index 77f37536c491..9f499bd6d9e3 100644
--- a/lib/at_monitor/at_monitor.c
+++ b/lib/at_monitor/at_monitor.c
@@ -5,7 +5,7 @@
  */
 #include <stddef.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <zephyr/device.h>
 #include <nrf_modem_at.h>
diff --git a/lib/at_sms_cert/at_sms_cert.c b/lib/at_sms_cert/at_sms_cert.c
index 7706c5b8ec44..d5eda8522635 100644
--- a/lib/at_sms_cert/at_sms_cert.c
+++ b/lib/at_sms_cert/at_sms_cert.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <nrf_errno.h>
 #include <nrf_modem_at.h>
diff --git a/lib/bin/lwm2m_carrier/os/lwm2m_carrier.c b/lib/bin/lwm2m_carrier/os/lwm2m_carrier.c
index 3792f1a27b8e..58941e1bdc0f 100644
--- a/lib/bin/lwm2m_carrier/os/lwm2m_carrier.c
+++ b/lib/bin/lwm2m_carrier/os/lwm2m_carrier.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <lwm2m_carrier.h>
 
 #define LWM2M_CARRIER_THREAD_STACK_SIZE 4096
diff --git a/lib/bin/lwm2m_carrier/os/lwm2m_os.c b/lib/bin/lwm2m_carrier/os/lwm2m_os.c
index 1c301e69f78d..2cd6dc755139 100644
--- a/lib/bin/lwm2m_carrier/os/lwm2m_os.c
+++ b/lib/bin/lwm2m_carrier/os/lwm2m_os.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <nrf_modem.h>
 #include <modem/lte_lc.h>
diff --git a/lib/date_time/date_time_modem.c b/lib/date_time/date_time_modem.c
index 9bbdac7c343c..4419b337451d 100644
--- a/lib/date_time/date_time_modem.c
+++ b/lib/date_time/date_time_modem.c
@@ -5,7 +5,7 @@
  */
 
 #include <date_time.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/posix/time.h>
 #include <zephyr/sys/timeutil.h>
 #include <zephyr/logging/log.h>
diff --git a/lib/date_time/date_time_ntp.c b/lib/date_time/date_time_ntp.c
index 82cd18252a71..19d88aca0b62 100644
--- a/lib/date_time/date_time_ntp.c
+++ b/lib/date_time/date_time_ntp.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/sntp.h>
 #include <zephyr/net/socketutils.h>
 #if defined(CONFIG_LTE_LINK_CONTROL)
diff --git a/lib/dk_buttons_and_leds/dk_buttons_and_leds.c b/lib/dk_buttons_and_leds/dk_buttons_and_leds.c
index 7eeea5ed24ea..82e7d0fd743e 100644
--- a/lib/dk_buttons_and_leds/dk_buttons_and_leds.c
+++ b/lib/dk_buttons_and_leds/dk_buttons_and_leds.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/lib/fprotect/sys_init_fprotect.c b/lib/fprotect/sys_init_fprotect.c
index 4d82bbec9533..bff6bda50b97 100644
--- a/lib/fprotect/sys_init_fprotect.c
+++ b/lib/fprotect/sys_init_fprotect.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <pm_config.h>
 #include <fprotect.h>
diff --git a/lib/location/location.c b/lib/location/location.c
index 8c03ee8fefaf..993c01815f51 100644
--- a/lib/location/location.c
+++ b/lib/location/location.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <modem/location.h>
 #if defined(CONFIG_LOCATION_METHOD_GNSS_AGPS_EXTERNAL)
diff --git a/lib/location/location_core.c b/lib/location/location_core.c
index 56e4b3e0eefa..c248200cf935 100644
--- a/lib/location/location_core.c
+++ b/lib/location/location_core.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <modem/location.h>
 
diff --git a/lib/location/location_utils.c b/lib/location/location_utils.c
index be979d66bc7a..b2bb2f7bc1c2 100644
--- a/lib/location/location_utils.c
+++ b/lib/location/location_utils.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/location/method_cellular.c b/lib/location/method_cellular.c
index 467065e2e52b..08c5c9550541 100644
--- a/lib/location/method_cellular.c
+++ b/lib/location/method_cellular.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <modem/location.h>
 #include <modem/lte_lc.h>
diff --git a/lib/location/method_gnss.c b/lib/location/method_gnss.c
index 674ed9d831f2..a3bb28968152 100644
--- a/lib/location/method_gnss.c
+++ b/lib/location/method_gnss.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <modem/location.h>
 #include <modem/lte_lc.h>
diff --git a/lib/location/method_wifi.c b/lib/location/method_wifi.c
index 042406ba653c..56467f477f9e 100644
--- a/lib/location/method_wifi.c
+++ b/lib/location/method_wifi.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/net/net_if.h>
diff --git a/lib/location/wifi/wifi_here_rest.c b/lib/location/wifi/wifi_here_rest.c
index 922fce5e3437..f877cf763de6 100644
--- a/lib/location/wifi/wifi_here_rest.c
+++ b/lib/location/wifi/wifi_here_rest.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 #include <cJSON.h>
 #include <cJSON_os.h>
diff --git a/lib/location/wifi/wifi_nrf_cloud_rest.c b/lib/location/wifi/wifi_nrf_cloud_rest.c
index bb34cfa6bd37..d15d1c975772 100644
--- a/lib/location/wifi/wifi_nrf_cloud_rest.c
+++ b/lib/location/wifi/wifi_nrf_cloud_rest.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 #include <cJSON.h>
 #include <cJSON_os.h>
diff --git a/lib/location/wifi/wifi_service.c b/lib/location/wifi/wifi_service.c
index 5c3160b53d56..e2617e437935 100644
--- a/lib/location/wifi/wifi_service.c
+++ b/lib/location/wifi/wifi_service.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/logging/log.h>
 
diff --git a/lib/location/wifi/wifi_skyhook_rest.c b/lib/location/wifi/wifi_skyhook_rest.c
index 69064b2cee95..bcb3a89a0c11 100644
--- a/lib/location/wifi/wifi_skyhook_rest.c
+++ b/lib/location/wifi/wifi_skyhook_rest.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 #include <cJSON.h>
 #include <cJSON_os.h>
diff --git a/lib/lte_link_control/lte_lc.c b/lib/lte_link_control/lte_lc.c
index 2b204e8828aa..3b0ce83f117d 100644
--- a/lib/lte_link_control/lte_lc.c
+++ b/lib/lte_link_control/lte_lc.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 <errno.h>
 #include <zephyr/net/socket.h>
diff --git a/lib/lte_link_control/lte_lc_helpers.c b/lib/lte_link_control/lte_lc_helpers.c
index ca148b00eb0c..6ad78779b88b 100644
--- a/lib/lte_link_control/lte_lc_helpers.c
+++ b/lib/lte_link_control/lte_lc_helpers.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 <errno.h>
 #include <zephyr/net/socket.h>
diff --git a/lib/lte_link_control/lte_lc_helpers.h b/lib/lte_link_control/lte_lc_helpers.h
index 9b4ad949a5f1..e4a809ea16b0 100644
--- a/lib/lte_link_control/lte_lc_helpers.h
+++ b/lib/lte_link_control/lte_lc_helpers.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/lib/lte_link_control/lte_lc_trace.c b/lib/lte_link_control/lte_lc_trace.c
index cd07c061e467..9a314c0eed11 100644
--- a/lib/lte_link_control/lte_lc_trace.c
+++ b/lib/lte_link_control/lte_lc_trace.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc_trace.h>
 
 static lte_lc_trace_handler_t cb;
diff --git a/lib/modem_attest_token/modem_attest_token.c b/lib/modem_attest_token/modem_attest_token.c
index e657029fcde0..9d093e303559 100644
--- a/lib/modem_attest_token/modem_attest_token.c
+++ b/lib/modem_attest_token/modem_attest_token.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <nrf_modem_at.h>
diff --git a/lib/modem_info/modem_info.c b/lib/modem_info/modem_info.c
index 228e10d5ca6c..a8aff34859af 100644
--- a/lib/modem_info/modem_info.c
+++ b/lib/modem_info/modem_info.c
@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/logging/log.h>
 
diff --git a/lib/modem_info/modem_info_json.c b/lib/modem_info/modem_info_json.c
index 931c744ca353..204fdcd1e247 100644
--- a/lib/modem_info/modem_info_json.c
+++ b/lib/modem_info/modem_info_json.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <stdlib.h>
 #include <cJSON.h>
diff --git a/lib/modem_info/modem_info_params.c b/lib/modem_info/modem_info_params.c
index ae4461158b2b..773d61deaf9c 100644
--- a/lib/modem_info/modem_info_params.c
+++ b/lib/modem_info/modem_info_params.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <stdlib.h>
 #include <modem/modem_info.h>
diff --git a/lib/modem_jwt/modem_jwt.c b/lib/modem_jwt/modem_jwt.c
index b113f5cd56be..3dccd84d813b 100644
--- a/lib/modem_jwt/modem_jwt.c
+++ b/lib/modem_jwt/modem_jwt.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <nrf_modem_at.h>
diff --git a/lib/modem_key_mgmt/modem_key_mgmt.c b/lib/modem_key_mgmt/modem_key_mgmt.c
index 1f9c88947aa6..383c77916f67 100644
--- a/lib/modem_key_mgmt/modem_key_mgmt.c
+++ b/lib/modem_key_mgmt/modem_key_mgmt.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_modem_at.h>
 #include <nrf_modem_limits.h>
 #include <modem/modem_key_mgmt.h>
diff --git a/lib/multicell_location/multicell_location.c b/lib/multicell_location/multicell_location.c
index 96763108753d..bdd81480311e 100644
--- a/lib/multicell_location/multicell_location.c
+++ b/lib/multicell_location/multicell_location.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/net/socket.h>
 #include <modem/lte_lc.h>
diff --git a/lib/multicell_location/services/here_integration.c b/lib/multicell_location/services/here_integration.c
index 25aca96f2728..76a846e7289c 100644
--- a/lib/multicell_location/services/here_integration.c
+++ b/lib/multicell_location/services/here_integration.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 #include <net/rest_client.h>
 #include <cJSON.h>
diff --git a/lib/multicell_location/services/here_integration.h b/lib/multicell_location/services/here_integration.h
index 5aca61015cc0..e4e82be9098b 100644
--- a/lib/multicell_location/services/here_integration.h
+++ b/lib/multicell_location/services/here_integration.h
@@ -7,7 +7,7 @@
 #ifndef HERE_INTEGRATION_H_
 #define HERE_INTEGRATION_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 #include <net/multicell_location.h>
 
diff --git a/lib/multicell_location/services/location_service.c b/lib/multicell_location/services/location_service.c
index 839b75226434..853a355fb981 100644
--- a/lib/multicell_location/services/location_service.c
+++ b/lib/multicell_location/services/location_service.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <assert.h>
 #include <net/multicell_location.h>
 
diff --git a/lib/multicell_location/services/location_service.h b/lib/multicell_location/services/location_service.h
index 79514cc9ef4e..7d50cf60416a 100644
--- a/lib/multicell_location/services/location_service.h
+++ b/lib/multicell_location/services/location_service.h
@@ -7,7 +7,7 @@
 #ifndef LOCATION_SERVICE_H_
 #define LOCATION_SERVICE_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 #include <net/multicell_location.h>
 
diff --git a/lib/multicell_location/services/nrf_cloud_integration.c b/lib/multicell_location/services/nrf_cloud_integration.c
index 9b3ca4214e1c..5564214cfe50 100644
--- a/lib/multicell_location/services/nrf_cloud_integration.c
+++ b/lib/multicell_location/services/nrf_cloud_integration.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #if defined(CONFIG_NRF_CLOUD_MQTT)
 #include <net/nrf_cloud_cell_pos.h>
 #else
diff --git a/lib/multicell_location/services/nrf_cloud_integration.h b/lib/multicell_location/services/nrf_cloud_integration.h
index 347d71c5b3d5..319581d6dfa9 100644
--- a/lib/multicell_location/services/nrf_cloud_integration.h
+++ b/lib/multicell_location/services/nrf_cloud_integration.h
@@ -7,7 +7,7 @@
 #ifndef NRF_CLOUD_INTEGRATION_H_
 #define NRF_CLOUD_INTEGRATION_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 #include <net/multicell_location.h>
 
diff --git a/lib/multicell_location/services/polte_integration.c b/lib/multicell_location/services/polte_integration.c
index 7ad11bbab7a2..0c41acbc6936 100644
--- a/lib/multicell_location/services/polte_integration.c
+++ b/lib/multicell_location/services/polte_integration.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <modem/lte_lc.h>
 #include <net/rest_client.h>
diff --git a/lib/multicell_location/services/polte_integration.h b/lib/multicell_location/services/polte_integration.h
index f616265003c6..219ff310ca49 100644
--- a/lib/multicell_location/services/polte_integration.h
+++ b/lib/multicell_location/services/polte_integration.h
@@ -7,7 +7,7 @@
 #ifndef POLTE_INTEGRATION_H_
 #define POLTE_INTEGRATION_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 #include <net/multicell_location.h>
 
diff --git a/lib/multicell_location/services/skyhook_integration.c b/lib/multicell_location/services/skyhook_integration.c
index 1870112bc202..725ca3baabac 100644
--- a/lib/multicell_location/services/skyhook_integration.c
+++ b/lib/multicell_location/services/skyhook_integration.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <modem/lte_lc.h>
 #include <modem/modem_jwt.h>
diff --git a/lib/multicell_location/services/skyhook_integration.h b/lib/multicell_location/services/skyhook_integration.h
index 495570b841a6..c308d9aff911 100644
--- a/lib/multicell_location/services/skyhook_integration.h
+++ b/lib/multicell_location/services/skyhook_integration.h
@@ -7,7 +7,7 @@
 #ifndef SKYHOOK_INTEGRATION_H_
 #define SKYHOOK_INTEGRATION_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 #include <net/multicell_location.h>
 
diff --git a/lib/multithreading_lock/multithreading_lock.h b/lib/multithreading_lock/multithreading_lock.h
index 0ba4f2820c58..61b3f044d8fc 100644
--- a/lib/multithreading_lock/multithreading_lock.h
+++ b/lib/multithreading_lock/multithreading_lock.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /** Macro for acquiring a lock */
 #define MULTITHREADING_LOCK_ACQUIRE() \
diff --git a/lib/nrf_modem_lib/nrf91_sockets.c b/lib/nrf_modem_lib/nrf91_sockets.c
index 92dee89e4ee6..f0c324f00a96 100644
--- a/lib/nrf_modem_lib/nrf91_sockets.c
+++ b/lib/nrf_modem_lib/nrf91_sockets.c
@@ -21,7 +21,7 @@
 #include <nrf_gai_errors.h>
 #include <sockets_internal.h>
 #include <zephyr/sys/fdtable.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #if defined(CONFIG_POSIX_API)
 #include <zephyr/posix/poll.h>
diff --git a/lib/nrf_modem_lib/nrf_modem_lib.c b/lib/nrf_modem_lib/nrf_modem_lib.c
index 6cd48ffbd66b..3000bae664c8 100644
--- a/lib/nrf_modem_lib/nrf_modem_lib.c
+++ b/lib/nrf_modem_lib/nrf_modem_lib.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/init.h>
 #include <zephyr/device.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrfx_ipc.h>
 #include <nrf_modem.h>
 #include <nrf_modem_platform.h>
diff --git a/lib/nrf_modem_lib/nrf_modem_lib_trace.c b/lib/nrf_modem_lib/nrf_modem_lib_trace.c
index 1183a720bfe1..38196da8ff09 100644
--- a/lib/nrf_modem_lib/nrf_modem_lib_trace.c
+++ b/lib/nrf_modem_lib/nrf_modem_lib_trace.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <zephyr/kernel.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <modem/nrf_modem_lib_trace.h>
 #include <nrf_errno.h>
diff --git a/lib/nrf_modem_lib/nrf_modem_lib_trace_sync.c b/lib/nrf_modem_lib/nrf_modem_lib_trace_sync.c
index 62f6d5d92c0d..9bef17dcffed 100644
--- a/lib/nrf_modem_lib/nrf_modem_lib_trace_sync.c
+++ b/lib/nrf_modem_lib/nrf_modem_lib_trace_sync.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <zephyr/kernel.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <modem/nrf_modem_lib_trace.h>
 #include <nrf_modem_at.h>
diff --git a/lib/nrf_modem_lib/nrf_modem_os.c b/lib/nrf_modem_lib/nrf_modem_os.c
index 2feb6105d971..4af901d20b5e 100644
--- a/lib/nrf_modem_lib/nrf_modem_os.c
+++ b/lib/nrf_modem_lib/nrf_modem_os.c
@@ -7,7 +7,7 @@
 
 #include <string.h>
 #include <zephyr/init.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_modem.h>
 #include <nrf_modem_os.h>
 #include <nrf_modem_platform.h>
diff --git a/lib/pdn/pdn.c b/lib/pdn/pdn.c
index 9f28b7331811..331c9cc82ab0 100644
--- a/lib/pdn/pdn.c
+++ b/lib/pdn/pdn.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <nrf_modem_at.h>
 #include <modem/pdn.h>
diff --git a/lib/qos/qos.c b/lib/qos/qos.c
index e5b2639231a6..c8c61f732094 100644
--- a/lib/qos/qos.c
+++ b/lib/qos/qos.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/slist.h>
 #include <qos.h>
 
diff --git a/lib/ram_pwrdn/ram_pwrdn.c b/lib/ram_pwrdn/ram_pwrdn.c
index 0ba622c1318a..a6f49bcffaf7 100644
--- a/lib/ram_pwrdn/ram_pwrdn.c
+++ b/lib/ram_pwrdn/ram_pwrdn.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdint.h>
 
 #if defined(CONFIG_SOC_NRF52840) || defined(CONFIG_SOC_NRF52833)
diff --git a/lib/sms/parser.c b/lib/sms/parser.c
index cf03532ec753..09582ee2c6f9 100644
--- a/lib/sms/parser.c
+++ b/lib/sms/parser.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/sms/sms.c b/lib/sms/sms.c
index 3ab56285ca4f..e881bd126f26 100644
--- a/lib/sms/sms.c
+++ b/lib/sms/sms.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <modem/sms.h>
 #include <errno.h>
diff --git a/lib/sms/sms_deliver.c b/lib/sms/sms_deliver.c
index c4f2cca4b03f..ba90190ca2c8 100644
--- a/lib/sms/sms_deliver.c
+++ b/lib/sms/sms_deliver.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/sms.h>
 #include <zephyr/logging/log.h>
 
diff --git a/lib/sms/sms_submit.c b/lib/sms/sms_submit.c
index 7b892d941736..527eabd1c622 100644
--- a/lib/sms/sms_submit.c
+++ b/lib/sms/sms_submit.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/logging/log.h>
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <nrf_modem_at.h>
 #include <modem/sms.h>
diff --git a/lib/st25r3911b/st25r3911b_spi.c b/lib/st25r3911b/st25r3911b_spi.c
index 48ebb989b8f2..c17c8142ea5f 100644
--- a/lib/st25r3911b/st25r3911b_spi.c
+++ b/lib/st25r3911b/st25r3911b_spi.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/drivers/spi.h>
 #include <zephyr/device.h>
diff --git a/lib/supl/os/lte_params.c b/lib/supl/os/lte_params.c
index 84fa238acde1..ca32005b80d6 100644
--- a/lib/supl/os/lte_params.c
+++ b/lib/supl/os/lte_params.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/supl/os/supl_os_client.c b/lib/supl/os/supl_os_client.c
index 7247bf6d83ba..5610d833b5ad 100644
--- a/lib/supl/os/supl_os_client.c
+++ b/lib/supl/os/supl_os_client.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <nrf_errno.h>
 #include <nrf_modem_at.h>
diff --git a/lib/supl/os/utils.c b/lib/supl/os/utils.c
index 97dd57af3c6d..899e73f8c1d5 100644
--- a/lib/supl/os/utils.c
+++ b/lib/supl/os/utils.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "utils.h"
 
diff --git a/lib/wave_gen/wave_gen.c b/lib/wave_gen/wave_gen.c
index be99cdf6e3bc..53afc0431bd6 100644
--- a/lib/wave_gen/wave_gen.c
+++ b/lib/wave_gen/wave_gen.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 
 #include <math.h>
diff --git a/modules/cjson/os/cJSON_os.c b/modules/cjson/os/cJSON_os.c
index c9c866f402d8..d0c1c0fa05bf 100644
--- a/modules/cjson/os/cJSON_os.c
+++ b/modules/cjson/os/cJSON_os.c
@@ -7,7 +7,7 @@
 #include "cJSON_os.h"
 #include "cJSON.h"
 #include <stdint.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 static cJSON_Hooks _cjson_hooks;
 
diff --git a/modules/mcuboot/hooks/nrf53_hooks.c b/modules/mcuboot/hooks/nrf53_hooks.c
index 546e7478cc2d..ebc61666cba6 100644
--- a/modules/mcuboot/hooks/nrf53_hooks.c
+++ b/modules/mcuboot/hooks/nrf53_hooks.c
@@ -5,7 +5,7 @@
  */
 
 #include <assert.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/flash/flash_simulator.h>
 #include "bootutil/image.h"
diff --git a/modules/memfault-firmware-sdk/memfault_flash_coredump_storage.c b/modules/memfault-firmware-sdk/memfault_flash_coredump_storage.c
index 5ca746ceffb0..405dc3c42c4d 100644
--- a/modules/memfault-firmware-sdk/memfault_flash_coredump_storage.c
+++ b/modules/memfault-firmware-sdk/memfault_flash_coredump_storage.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrfx_nvmc.h>
 #include <zephyr/storage/flash_map.h>
 
diff --git a/modules/memfault-firmware-sdk/memfault_integration.c b/modules/memfault-firmware-sdk/memfault_integration.c
index 1a88e9702b70..4ac958e94e60 100644
--- a/modules/memfault-firmware-sdk/memfault_integration.c
+++ b/modules/memfault-firmware-sdk/memfault_integration.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/init.h>
diff --git a/modules/memfault-firmware-sdk/memfault_ncs_metrics.c b/modules/memfault-firmware-sdk/memfault_ncs_metrics.c
index 5552c4161a23..bcf4dbccaad4 100644
--- a/modules/memfault-firmware-sdk/memfault_ncs_metrics.c
+++ b/modules/memfault-firmware-sdk/memfault_ncs_metrics.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 #include <modem/lte_lc_trace.h>
 #include <memfault/metrics/metrics.h>
diff --git a/samples/app_event_manager/src/modules/controller.c b/samples/app_event_manager/src/modules/controller.c
index ed6c346a21a6..671fb9088171 100644
--- a/samples/app_event_manager/src/modules/controller.c
+++ b/samples/app_event_manager/src/modules/controller.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "measurement_event.h"
 #include "control_event.h"
diff --git a/samples/app_event_manager/src/modules/sensor_simulated.c b/samples/app_event_manager/src/modules/sensor_simulated.c
index 394575cae850..0ad7482ec52e 100644
--- a/samples/app_event_manager/src/modules/sensor_simulated.c
+++ b/samples/app_event_manager/src/modules/sensor_simulated.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "measurement_event.h"
 #include "control_event.h"
diff --git a/samples/app_event_manager/src/modules/stats.c b/samples/app_event_manager/src/modules/stats.c
index d2037d955361..3cb4ca9ba3e7 100644
--- a/samples/app_event_manager/src/modules/stats.c
+++ b/samples/app_event_manager/src/modules/stats.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define MODULE stats
 
diff --git a/samples/app_event_manager_profiler_tracer/src/modules/module_a.c b/samples/app_event_manager_profiler_tracer/src/modules/module_a.c
index 3cfd856e5256..ac469ba01ca3 100644
--- a/samples/app_event_manager_profiler_tracer/src/modules/module_a.c
+++ b/samples/app_event_manager_profiler_tracer/src/modules/module_a.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "five_sec_event.h"
 #include "one_sec_event.h"
diff --git a/samples/app_event_manager_profiler_tracer/src/modules/module_b.c b/samples/app_event_manager_profiler_tracer/src/modules/module_b.c
index e7f21a5bb3da..701a471ab55e 100644
--- a/samples/app_event_manager_profiler_tracer/src/modules/module_b.c
+++ b/samples/app_event_manager_profiler_tracer/src/modules/module_b.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "five_sec_event.h"
 #include "one_sec_event.h"
diff --git a/samples/bluetooth/alexa_gadget/src/main.c b/samples/bluetooth/alexa_gadget/src/main.c
index 5529ae9b4165..70976933eb1d 100644
--- a/samples/bluetooth/alexa_gadget/src/main.c
+++ b/samples/bluetooth/alexa_gadget/src/main.c
@@ -8,7 +8,7 @@
  *  @brief Alexa Gadgets sample
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/samples/bluetooth/central_and_peripheral_hr/src/main.c b/samples/bluetooth/central_and_peripheral_hr/src/main.c
index d88bc2820357..3475f5a619ac 100644
--- a/samples/bluetooth/central_and_peripheral_hr/src/main.c
+++ b/samples/bluetooth/central_and_peripheral_hr/src/main.c
@@ -19,7 +19,7 @@
 
 #include <zephyr/settings/settings.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define STACKSIZE 1024
 #define PRIORITY 7
diff --git a/samples/bluetooth/central_bas/src/main.c b/samples/bluetooth/central_bas/src/main.c
index 47b709008d40..b270de7ee8aa 100644
--- a/samples/bluetooth/central_bas/src/main.c
+++ b/samples/bluetooth/central_bas/src/main.c
@@ -12,7 +12,7 @@
 #include <stddef.h>
 #include <inttypes.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_hids/src/main.c b/samples/bluetooth/central_hids/src/main.c
index 8b34d6271bd4..18eeecbb3bee 100644
--- a/samples/bluetooth/central_hids/src/main.c
+++ b/samples/bluetooth/central_hids/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_hr_coded/src/main.c b/samples/bluetooth/central_hr_coded/src/main.c
index bb453f98b82f..f08e174c22b6 100644
--- a/samples/bluetooth/central_hr_coded/src/main.c
+++ b/samples/bluetooth/central_hr_coded/src/main.c
@@ -11,7 +11,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/central_nfc_pairing/src/main.c b/samples/bluetooth/central_nfc_pairing/src/main.c
index 0d143b689530..b7f80c2bd093 100644
--- a/samples/bluetooth/central_nfc_pairing/src/main.c
+++ b/samples/bluetooth/central_nfc_pairing/src/main.c
@@ -8,7 +8,7 @@
  *  @brief Nordic Central NFC pairing sample
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/central_nfc_pairing/src/nfc_poller.c b/samples/bluetooth/central_nfc_pairing/src/nfc_poller.c
index 0efbe8dbb508..d8656063bac7 100644
--- a/samples/bluetooth/central_nfc_pairing/src/nfc_poller.c
+++ b/samples/bluetooth/central_nfc_pairing/src/nfc_poller.c
@@ -10,7 +10,7 @@
 
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <nfc/t2t/parser.h>
diff --git a/samples/bluetooth/central_smp_client/src/main.c b/samples/bluetooth/central_smp_client/src/main.c
index cc70a8198dcd..33636eef276d 100644
--- a/samples/bluetooth/central_smp_client/src/main.c
+++ b/samples/bluetooth/central_smp_client/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 <tinycbor/cbor.h>
diff --git a/samples/bluetooth/central_uart/src/main.c b/samples/bluetooth/central_uart/src/main.c
index b589afb300ef..ac165754c1d5 100644
--- a/samples/bluetooth/central_uart/src/main.c
+++ b/samples/bluetooth/central_uart/src/main.c
@@ -9,7 +9,7 @@
  */
 
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/samples/bluetooth/direct_test_mode/src/main.c b/samples/bluetooth/direct_test_mode/src/main.c
index cc2dad5e925f..b8cacccefd77 100644
--- a/samples/bluetooth/direct_test_mode/src/main.c
+++ b/samples/bluetooth/direct_test_mode/src/main.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 #include <zephyr/drivers/uart.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "dtm.h"
 
diff --git a/samples/bluetooth/direction_finding_central/src/main.c b/samples/bluetooth/direction_finding_central/src/main.c
index c7903c4b9599..642e31178e03 100644
--- a/samples/bluetooth/direction_finding_central/src/main.c
+++ b/samples/bluetooth/direction_finding_central/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/types.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 d1f2c67558ee..3546124f5908 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/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/direction.h>
diff --git a/samples/bluetooth/direction_finding_connectionless_tx/src/main.c b/samples/bluetooth/direction_finding_connectionless_tx/src/main.c
index fdf072216ad4..ecec25528b4a 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 55797b560720..9a5bee7048a1 100644
--- a/samples/bluetooth/direction_finding_peripheral/src/main.c
+++ b/samples/bluetooth/direction_finding_peripheral/src/main.c
@@ -8,7 +8,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/mesh/ble_peripheral_lbs_coex/src/lb_service_handler.c b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/src/lb_service_handler.c
index cb59d5e814e7..1abf561a6be1 100644
--- a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/src/lb_service_handler.c
+++ b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/src/lb_service_handler.c
@@ -8,7 +8,7 @@
 #include <stddef.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 <soc.h>
 
diff --git a/samples/bluetooth/nrf_dm/src/main.c b/samples/bluetooth/nrf_dm/src/main.c
index 32d88fcf9acb..528170966d4c 100644
--- a/samples/bluetooth/nrf_dm/src/main.c
+++ b/samples/bluetooth/nrf_dm/src/main.c
@@ -8,7 +8,7 @@
  *  @brief Nordic Distance Measurement sample
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
 
diff --git a/samples/bluetooth/nrf_dm/src/peer.c b/samples/bluetooth/nrf_dm/src/peer.c
index fa35a596f5c8..11041c738721 100644
--- a/samples/bluetooth/nrf_dm/src/peer.c
+++ b/samples/bluetooth/nrf_dm/src/peer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/conn.h>
 
 #include "peer.h"
diff --git a/samples/bluetooth/nrf_dm/src/peer.h b/samples/bluetooth/nrf_dm/src/peer.h
index 81c7da791b1b..fd7970e5aa46 100644
--- a/samples/bluetooth/nrf_dm/src/peer.h
+++ b/samples/bluetooth/nrf_dm/src/peer.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/addr.h>
 #include <dm.h>
 
diff --git a/samples/bluetooth/nrf_dm/src/pwm_led.h b/samples/bluetooth/nrf_dm/src/pwm_led.h
index dc7ba233d3b8..1e3140f805a4 100644
--- a/samples/bluetooth/nrf_dm/src/pwm_led.h
+++ b/samples/bluetooth/nrf_dm/src/pwm_led.h
@@ -7,7 +7,7 @@
 #ifndef PWM_LED_H_
 #define PWM_LED_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <zephyr/types.h>
 
diff --git a/samples/bluetooth/nrf_dm/src/service.c b/samples/bluetooth/nrf_dm/src/service.c
index 7b93fa14d950..10208c559ef3 100644
--- a/samples/bluetooth/nrf_dm/src/service.c
+++ b/samples/bluetooth/nrf_dm/src/service.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <bluetooth/services/ddfs.h>
 #include <zephyr/random/rand32.h>
 #include <dm.h>
diff --git a/samples/bluetooth/nrf_dm/src/service.h b/samples/bluetooth/nrf_dm/src/service.h
index 40f0e0215fb4..c4f280b16687 100644
--- a/samples/bluetooth/nrf_dm/src/service.h
+++ b/samples/bluetooth/nrf_dm/src/service.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <dm.h>
 
 /** @brief Distance Measurement update result.
diff --git a/samples/bluetooth/peripheral_ams_client/src/main.c b/samples/bluetooth/peripheral_ams_client/src/main.c
index f5562f330b3a..1c9bcb7b9820 100644
--- a/samples/bluetooth/peripheral_ams_client/src/main.c
+++ b/samples/bluetooth/peripheral_ams_client/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 <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/samples/bluetooth/peripheral_ancs_client/src/main.c b/samples/bluetooth/peripheral_ancs_client/src/main.c
index 14ad99311e31..f2c3ccb979b4 100644
--- a/samples/bluetooth/peripheral_ancs_client/src/main.c
+++ b/samples/bluetooth/peripheral_ancs_client/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
 
diff --git a/samples/bluetooth/peripheral_bms/src/main.c b/samples/bluetooth/peripheral_bms/src/main.c
index 7989be1ea58c..a633d06f2abe 100644
--- a/samples/bluetooth/peripheral_bms/src/main.c
+++ b/samples/bluetooth/peripheral_bms/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/drivers/gpio.h>
 #include <soc.h>
 
diff --git a/samples/bluetooth/peripheral_cts_client/src/main.c b/samples/bluetooth/peripheral_cts_client/src/main.c
index c524a7f5294c..42ec18b74908 100644
--- a/samples/bluetooth/peripheral_cts_client/src/main.c
+++ b/samples/bluetooth/peripheral_cts_client/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
 
diff --git a/samples/bluetooth/peripheral_gatt_dm/src/main.c b/samples/bluetooth/peripheral_gatt_dm/src/main.c
index 034a76a3272e..75a8d7a7ede9 100644
--- a/samples/bluetooth/peripheral_gatt_dm/src/main.c
+++ b/samples/bluetooth/peripheral_gatt_dm/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/drivers/gpio.h>
 #include <soc.h>
 
diff --git a/samples/bluetooth/peripheral_hids_keyboard/src/main.c b/samples/bluetooth/peripheral_hids_keyboard/src/main.c
index b72764626fe4..6441362e9e05 100644
--- a/samples/bluetooth/peripheral_hids_keyboard/src/main.c
+++ b/samples/bluetooth/peripheral_hids_keyboard/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/drivers/gpio.h>
 #include <soc.h>
 #include <assert.h>
diff --git a/samples/bluetooth/peripheral_hids_mouse/src/main.c b/samples/bluetooth/peripheral_hids_mouse/src/main.c
index f66a5e3f21da..a0fadb895ee9 100644
--- a/samples/bluetooth/peripheral_hids_mouse/src/main.c
+++ b/samples/bluetooth/peripheral_hids_mouse/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/drivers/gpio.h>
 #include <soc.h>
 #include <assert.h>
diff --git a/samples/bluetooth/peripheral_hr_coded/src/main.c b/samples/bluetooth/peripheral_hr_coded/src/main.c
index 8d922d0cf691..bf2e7d26a759 100644
--- a/samples/bluetooth/peripheral_hr_coded/src/main.c
+++ b/samples/bluetooth/peripheral_hr_coded/src/main.c
@@ -13,7 +13,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_lbs/src/main.c b/samples/bluetooth/peripheral_lbs/src/main.c
index 2851d15e75d1..2479b7041292 100644
--- a/samples/bluetooth/peripheral_lbs/src/main.c
+++ b/samples/bluetooth/peripheral_lbs/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/drivers/gpio.h>
 #include <soc.h>
 
diff --git a/samples/bluetooth/peripheral_nfc_pairing/src/main.c b/samples/bluetooth/peripheral_nfc_pairing/src/main.c
index cf0580f9ef42..1814ba508678 100644
--- a/samples/bluetooth/peripheral_nfc_pairing/src/main.c
+++ b/samples/bluetooth/peripheral_nfc_pairing/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci.h>
diff --git a/samples/bluetooth/peripheral_rscs/src/main.c b/samples/bluetooth/peripheral_rscs/src/main.c
index 22b3d76d94be..a86fca545e50 100644
--- a/samples/bluetooth/peripheral_rscs/src/main.c
+++ b/samples/bluetooth/peripheral_rscs/src/main.c
@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/random/rand32.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_uart/src/main.c b/samples/bluetooth/peripheral_uart/src/main.c
index 401a4b35660a..8443d256d833 100644
--- a/samples/bluetooth/peripheral_uart/src/main.c
+++ b/samples/bluetooth/peripheral_uart/src/main.c
@@ -10,7 +10,7 @@
 #include "uart_async_adapter.h"
 
 #include <zephyr/types.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/usb/usb_device.h>
 
diff --git a/samples/bluetooth/peripheral_uart/src/uart_async_adapter.h b/samples/bluetooth/peripheral_uart/src/uart_async_adapter.h
index 1c7995b04d96..8bba7df4908d 100644
--- a/samples/bluetooth/peripheral_uart/src/uart_async_adapter.h
+++ b/samples/bluetooth/peripheral_uart/src/uart_async_adapter.h
@@ -21,7 +21,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 
 /**
diff --git a/samples/bluetooth/shell_bt_nus/src/main.c b/samples/bluetooth/shell_bt_nus/src/main.c
index 42e21f567dce..81426c97b079 100644
--- a/samples/bluetooth/shell_bt_nus/src/main.c
+++ b/samples/bluetooth/shell_bt_nus/src/main.c
@@ -8,7 +8,7 @@
  *  @brief Nordic UART Bridge Service (NUS) sample
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/gatt.h>
diff --git a/samples/caf/src/modules/led_state.c b/samples/caf/src/modules/led_state.c
index 43ccaca4877f..87c11313e703 100644
--- a/samples/caf/src/modules/led_state.c
+++ b/samples/caf/src/modules/led_state.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define MODULE led_state
 #include <caf/events/module_state_event.h>
diff --git a/samples/caf_sensor_manager/remote/src/main.c b/samples/caf_sensor_manager/remote/src/main.c
index 550dd9b90a18..93c01c8a3097 100644
--- a/samples/caf_sensor_manager/remote/src/main.c
+++ b/samples/caf_sensor_manager/remote/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>
 
 #define MODULE main
diff --git a/samples/caf_sensor_manager/src/main.c b/samples/caf_sensor_manager/src/main.c
index 79ccf8c4ea94..0dfc4764a264 100644
--- a/samples/caf_sensor_manager/src/main.c
+++ b/samples/caf_sensor_manager/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>
 
 #define MODULE main
diff --git a/samples/caf_sensor_manager/src/modules/sensor_sim_ctrl.c b/samples/caf_sensor_manager/src/modules/sensor_sim_ctrl.c
index b36796a4499f..d4f5312d67dd 100644
--- a/samples/caf_sensor_manager/src/modules/sensor_sim_ctrl.c
+++ b/samples/caf_sensor_manager/src/modules/sensor_sim_ctrl.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <drivers/sensor_sim.h>
 
 #include "sensor_sim_ctrl_def.h"
diff --git a/samples/crypto/aes_cbc/src/main.c b/samples/crypto/aes_cbc/src/main.c
index 5cda592dd1c6..8748b11672a5 100644
--- a/samples/crypto/aes_cbc/src/main.c
+++ b/samples/crypto/aes_cbc/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 #include <stdio.h>
diff --git a/samples/crypto/aes_ccm/src/main.c b/samples/crypto/aes_ccm/src/main.c
index ef591a068e54..96538f3d9f10 100644
--- a/samples/crypto/aes_ccm/src/main.c
+++ b/samples/crypto/aes_ccm/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 #include <stdio.h>
diff --git a/samples/crypto/aes_ctr/src/main.c b/samples/crypto/aes_ctr/src/main.c
index c4ee3aad4f63..42ebeaa12cde 100644
--- a/samples/crypto/aes_ctr/src/main.c
+++ b/samples/crypto/aes_ctr/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 #include <stdio.h>
diff --git a/samples/crypto/aes_gcm/src/main.c b/samples/crypto/aes_gcm/src/main.c
index cc931c486d0a..77bde794fd26 100644
--- a/samples/crypto/aes_gcm/src/main.c
+++ b/samples/crypto/aes_gcm/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 #include <stdio.h>
diff --git a/samples/crypto/chachapoly/src/main.c b/samples/crypto/chachapoly/src/main.c
index e14251c0cdb6..39960a6af4b9 100644
--- a/samples/crypto/chachapoly/src/main.c
+++ b/samples/crypto/chachapoly/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/samples/crypto/ecdh/src/main.c b/samples/crypto/ecdh/src/main.c
index 5c59595045f2..3e72fd0c2fc3 100644
--- a/samples/crypto/ecdh/src/main.c
+++ b/samples/crypto/ecdh/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 #include <stdio.h>
diff --git a/samples/crypto/ecdsa/src/main.c b/samples/crypto/ecdsa/src/main.c
index a0b17fdc962c..407720f16274 100644
--- a/samples/crypto/ecdsa/src/main.c
+++ b/samples/crypto/ecdsa/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 #include <stdio.h>
diff --git a/samples/crypto/hkdf/src/main.c b/samples/crypto/hkdf/src/main.c
index fd1db2c3a1a9..0e0002f186ef 100644
--- a/samples/crypto/hkdf/src/main.c
+++ b/samples/crypto/hkdf/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 #include <stdio.h>
diff --git a/samples/crypto/hmac/src/main.c b/samples/crypto/hmac/src/main.c
index 9cce8bc6a443..8dd191bc25c6 100644
--- a/samples/crypto/hmac/src/main.c
+++ b/samples/crypto/hmac/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 #include <stdio.h>
diff --git a/samples/crypto/persistent_key_usage/src/main.c b/samples/crypto/persistent_key_usage/src/main.c
index ffcdd81344c9..3684bc445890 100644
--- a/samples/crypto/persistent_key_usage/src/main.c
+++ b/samples/crypto/persistent_key_usage/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 #include <stdio.h>
diff --git a/samples/crypto/psa_tls/src/main.c b/samples/crypto/psa_tls/src/main.c
index 18bdf6fd3fb5..7cedc016fba3 100644
--- a/samples/crypto/psa_tls/src/main.c
+++ b/samples/crypto/psa_tls/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <nrf.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/net/tls_credentials.h>
 #include "psa_tls_functions.h"
diff --git a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c
index ad3c4ed676be..7e8632895301 100644
--- a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c
+++ b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c
@@ -9,7 +9,7 @@ LOG_MODULE_REGISTER(psa_tls_credentials_client_non_secure);
 
 #include <nrf.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c
index 1173bc4c1ce5..8397231cea95 100644
--- a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c
+++ b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c
@@ -9,7 +9,7 @@ LOG_MODULE_REGISTER(psa_tls_credentials_server_non_secure);
 
 #include <nrf.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/crypto/psa_tls/src/psa_tls_common.c b/samples/crypto/psa_tls/src/psa_tls_common.c
index a1146013afc6..7ce592f61c30 100644
--- a/samples/crypto/psa_tls/src/psa_tls_common.c
+++ b/samples/crypto/psa_tls/src/psa_tls_common.c
@@ -6,7 +6,7 @@
 
 #include <nrf.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
 
 
diff --git a/samples/crypto/psa_tls/src/psa_tls_functions_client.c b/samples/crypto/psa_tls/src/psa_tls_functions_client.c
index 3f44465bbd5f..d324f3f666c7 100644
--- a/samples/crypto/psa_tls/src/psa_tls_functions_client.c
+++ b/samples/crypto/psa_tls/src/psa_tls_functions_client.c
@@ -9,7 +9,7 @@ LOG_MODULE_REGISTER(psa_tls_client);
 
 #include <nrf.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/crypto/psa_tls/src/psa_tls_functions_server.c b/samples/crypto/psa_tls/src/psa_tls_functions_server.c
index 1928baf1421f..1901b3014600 100644
--- a/samples/crypto/psa_tls/src/psa_tls_functions_server.c
+++ b/samples/crypto/psa_tls/src/psa_tls_functions_server.c
@@ -9,7 +9,7 @@ LOG_MODULE_REGISTER(psa_tls_server);
 
 #include <nrf.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/net_core.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c
index 63daec86191e..3f4a1b9a03c6 100644
--- a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c
+++ b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(psa_tls_credentials_client_secure);
 
 #include <nrf.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/net/tls_credentials.h>
 #include "psa_tls_credentials.h"
diff --git a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c
index 386cc7d511c4..24a14b9ca901 100644
--- a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c
+++ b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(psa_tls_credentials_server_secure);
 
 #include <nrf.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/net/tls_credentials.h>
 #include "psa_tls_credentials.h"
diff --git a/samples/crypto/rng/src/main.c b/samples/crypto/rng/src/main.c
index 2ae6efbcfb44..297c5960aac9 100644
--- a/samples/crypto/rng/src/main.c
+++ b/samples/crypto/rng/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 #include <stdio.h>
diff --git a/samples/crypto/rsa/src/main.c b/samples/crypto/rsa/src/main.c
index b93bb3f250b7..dfd4bd84660c 100644
--- a/samples/crypto/rsa/src/main.c
+++ b/samples/crypto/rsa/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
 #include <stdio.h>
diff --git a/samples/crypto/sha256/src/main.c b/samples/crypto/sha256/src/main.c
index 8997827f8da2..efa471801ab3 100644
--- a/samples/crypto/sha256/src/main.c
+++ b/samples/crypto/sha256/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/samples/debug/ppi_trace/src/main.c b/samples/debug/ppi_trace/src/main.c
index 37114aa6d022..4d717179e48b 100644
--- a/samples/debug/ppi_trace/src/main.c
+++ b/samples/debug/ppi_trace/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <debug/ppi_trace.h>
 #include <zephyr/drivers/counter.h>
 #include <hal/nrf_rtc.h>
diff --git a/samples/edge_impulse/data_forwarder/src/main.c b/samples/edge_impulse/data_forwarder/src/main.c
index 9556b0cd2a37..6babec63c4db 100644
--- a/samples/edge_impulse/data_forwarder/src/main.c
+++ b/samples/edge_impulse/data_forwarder/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 <zephyr/drivers/sensor.h>
 #include <zephyr/drivers/uart.h>
diff --git a/samples/edge_impulse/wrapper/src/include/input_data.h b/samples/edge_impulse/wrapper/src/include/input_data.h
index de10c7bb1292..b7838ebea364 100644
--- a/samples/edge_impulse/wrapper/src/include/input_data.h
+++ b/samples/edge_impulse/wrapper/src/include/input_data.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 const static float input_data[] = {
 /* The input data - sine wave. */
diff --git a/samples/edge_impulse/wrapper/src/main.c b/samples/edge_impulse/wrapper/src/main.c
index 8c3f1af33389..f4782aeb87ad 100644
--- a/samples/edge_impulse/wrapper/src/main.c
+++ b/samples/edge_impulse/wrapper/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ei_wrapper.h>
 
 #include "input_data.h"
diff --git a/samples/esb/prx/src/main.c b/samples/esb/prx/src/main.c
index 5b77d1329827..69442dee8e0f 100644
--- a/samples/esb/prx/src/main.c
+++ b/samples/esb/prx/src/main.c
@@ -12,7 +12,7 @@
 #include <zephyr/logging/log.h>
 #include <nrf.h>
 #include <esb.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 LOG_MODULE_REGISTER(esb_prx, CONFIG_ESB_PRX_APP_LOG_LEVEL);
diff --git a/samples/esb/ptx/src/main.c b/samples/esb/ptx/src/main.c
index 9dac0f974ea0..df9716aeff1e 100644
--- a/samples/esb/ptx/src/main.c
+++ b/samples/esb/ptx/src/main.c
@@ -12,7 +12,7 @@
 #include <esb.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 LOG_MODULE_REGISTER(esb_ptx, CONFIG_ESB_PTX_APP_LOG_LEVEL);
diff --git a/samples/event_manager_proxy/modules/controller.c b/samples/event_manager_proxy/modules/controller.c
index 91df3525291c..f3f10d05dac8 100644
--- a/samples/event_manager_proxy/modules/controller.c
+++ b/samples/event_manager_proxy/modules/controller.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "measurement_event.h"
 #include "control_event.h"
diff --git a/samples/event_manager_proxy/modules/sensor_simulated.c b/samples/event_manager_proxy/modules/sensor_simulated.c
index de83da938679..5c4a8e0046e7 100644
--- a/samples/event_manager_proxy/modules/sensor_simulated.c
+++ b/samples/event_manager_proxy/modules/sensor_simulated.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "measurement_event.h"
 #include "control_event.h"
diff --git a/samples/event_manager_proxy/modules/stats.c b/samples/event_manager_proxy/modules/stats.c
index 8365308a98a0..5d60b893f125 100644
--- a/samples/event_manager_proxy/modules/stats.c
+++ b/samples/event_manager_proxy/modules/stats.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define MODULE stats
 
diff --git a/samples/event_manager_proxy/remote/src/main.c b/samples/event_manager_proxy/remote/src/main.c
index b0f77b4270c3..d98ebc68fe3e 100644
--- a/samples/event_manager_proxy/remote/src/main.c
+++ b/samples/event_manager_proxy/remote/src/main.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/ipc/ipc_service.h>
diff --git a/samples/event_manager_proxy/src/main.c b/samples/event_manager_proxy/src/main.c
index ee2917b90258..6999d6c2128b 100644
--- a/samples/event_manager_proxy/src/main.c
+++ b/samples/event_manager_proxy/src/main.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/ipc/ipc_service.h>
diff --git a/samples/gazell/gzll_ack_payload_device/src/main.c b/samples/gazell/gzll_ack_payload_device/src/main.c
index f8054a8e8c8b..0d657c9d728a 100644
--- a/samples/gazell/gzll_ack_payload_device/src/main.c
+++ b/samples/gazell/gzll_ack_payload_device/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_gzll.h>
 #include <gzll_glue.h>
 #include <dk_buttons_and_leds.h>
diff --git a/samples/gazell/gzll_ack_payload_host/src/main.c b/samples/gazell/gzll_ack_payload_host/src/main.c
index ceb228e50f1f..4904f888748d 100644
--- a/samples/gazell/gzll_ack_payload_host/src/main.c
+++ b/samples/gazell/gzll_ack_payload_host/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_gzll.h>
 #include <gzll_glue.h>
 #include <dk_buttons_and_leds.h>
diff --git a/samples/gazell/gzp_dynamic_pairing_device/src/main.c b/samples/gazell/gzp_dynamic_pairing_device/src/main.c
index bdb70d97e5ce..fae9c8907b3b 100644
--- a/samples/gazell/gzp_dynamic_pairing_device/src/main.c
+++ b/samples/gazell/gzp_dynamic_pairing_device/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/settings/settings.h>
 #include <dk_buttons_and_leds.h>
 #include <nrf_gzll.h>
diff --git a/samples/gazell/gzp_dynamic_pairing_host/src/main.c b/samples/gazell/gzp_dynamic_pairing_host/src/main.c
index c64631057c61..2f37def4dc4d 100644
--- a/samples/gazell/gzp_dynamic_pairing_host/src/main.c
+++ b/samples/gazell/gzp_dynamic_pairing_host/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/settings/settings.h>
 #include <dk_buttons_and_leds.h>
 #include <nrf_gzll.h>
diff --git a/samples/ipc/ipc_service/src/main.c b/samples/ipc/ipc_service/src/main.c
index a9bf1f16eac5..4903011d92fe 100644
--- a/samples/ipc/ipc_service/src/main.c
+++ b/samples/ipc/ipc_service/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/keys/hw_unique_key/src/derive_key.c b/samples/keys/hw_unique_key/src/derive_key.c
index 0d8afa7b39d5..66d8a4ff974b 100644
--- a/samples/keys/hw_unique_key/src/derive_key.c
+++ b/samples/keys/hw_unique_key/src/derive_key.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <psa/crypto.h>
 #include <hw_unique_key.h>
diff --git a/samples/keys/hw_unique_key/src/derive_key_tfm.c b/samples/keys/hw_unique_key/src/derive_key_tfm.c
index 59a86ba756eb..cea7309f7d07 100644
--- a/samples/keys/hw_unique_key/src/derive_key_tfm.c
+++ b/samples/keys/hw_unique_key/src/derive_key_tfm.c
@@ -7,7 +7,7 @@
  * Trusted Firmware-M project.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <psa/crypto.h>
 #include <tfm_crypto_defs.h>
diff --git a/samples/keys/hw_unique_key/src/main.c b/samples/keys/hw_unique_key/src/main.c
index 83cf44e8808c..e3ef74e4e536 100644
--- a/samples/keys/hw_unique_key/src/main.c
+++ b/samples/keys/hw_unique_key/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/samples/keys/random_hw_unique_key/src/main.c b/samples/keys/random_hw_unique_key/src/main.c
index 2084012e0161..b6e6fa84ed0d 100644
--- a/samples/keys/random_hw_unique_key/src/main.c
+++ b/samples/keys/random_hw_unique_key/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/samples/matter/common/src/dfu_over_smp.h b/samples/matter/common/src/dfu_over_smp.h
index 4ac015d5cc73..b1f8a5635f1c 100644
--- a/samples/matter/common/src/dfu_over_smp.h
+++ b/samples/matter/common/src/dfu_over_smp.h
@@ -8,7 +8,7 @@
 
 #include <platform/CHIPDeviceLayer.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 typedef void (*DFUOverSMPRestartAdvertisingHandler)(void);
 
diff --git a/samples/matter/common/src/led_widget.h b/samples/matter/common/src/led_widget.h
index caf9c739be4c..a4f82a7e94dc 100644
--- a/samples/matter/common/src/led_widget.h
+++ b/samples/matter/common/src/led_widget.h
@@ -8,7 +8,7 @@
 
 #include <cstdint>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 class LEDWidget {
 public:
diff --git a/samples/matter/lock/src/bolt_lock_manager.h b/samples/matter/lock/src/bolt_lock_manager.h
index ff3b07dab5ab..63fd398a862e 100644
--- a/samples/matter/lock/src/bolt_lock_manager.h
+++ b/samples/matter/lock/src/bolt_lock_manager.h
@@ -9,7 +9,7 @@
 #include <app-common/zap-generated/enums.h>
 #include <lib/core/ClusterEnums.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <cstdint>
 
diff --git a/samples/nfc/record_launch_app/src/main.c b/samples/nfc/record_launch_app/src/main.c
index 11fd6076c84d..ace6f8e22217 100644
--- a/samples/nfc/record_launch_app/src/main.c
+++ b/samples/nfc/record_launch_app/src/main.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 <nfc_t2t_lib.h>
diff --git a/samples/nfc/record_text/src/main.c b/samples/nfc/record_text/src/main.c
index 3137a33d3e40..ff4d5f2e9e93 100644
--- a/samples/nfc/record_text/src/main.c
+++ b/samples/nfc/record_text/src/main.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 <nfc_t2t_lib.h>
diff --git a/samples/nfc/system_off/src/main.c b/samples/nfc/system_off/src/main.c
index 2aa5943b3633..b42fa86957ae 100644
--- a/samples/nfc/system_off/src/main.c
+++ b/samples/nfc/system_off/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <zephyr/pm/policy.h>
 
diff --git a/samples/nfc/tag_reader/src/main.c b/samples/nfc/tag_reader/src/main.c
index f7cafabfa7c7..0e53fc4066e8 100644
--- a/samples/nfc/tag_reader/src/main.c
+++ b/samples/nfc/tag_reader/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <st25r3911b_nfca.h>
 #include <nfc/ndef/msg_parser.h>
diff --git a/samples/nfc/tnep_poller/src/main.c b/samples/nfc/tnep_poller/src/main.c
index 6d3d82e6b990..c3d36f6de652 100644
--- a/samples/nfc/tnep_poller/src/main.c
+++ b/samples/nfc/tnep_poller/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/byteorder.h>
 #include <st25r3911b_nfca.h>
diff --git a/samples/nfc/tnep_tag/src/main.c b/samples/nfc/tnep_tag/src/main.c
index d950abf09108..d2f20fd81409 100644
--- a/samples/nfc/tnep_tag/src/main.c
+++ b/samples/nfc/tnep_tag/src/main.c
@@ -5,7 +5,7 @@
  */
 #include <stdbool.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 
 #include <dk_buttons_and_leds.h>
diff --git a/samples/nfc/writable_ndef_msg/src/main.c b/samples/nfc/writable_ndef_msg/src/main.c
index e8f04eaf3812..fd30b2f1eaa0 100644
--- a/samples/nfc/writable_ndef_msg/src/main.c
+++ b/samples/nfc/writable_ndef_msg/src/main.c
@@ -13,7 +13,7 @@
  *
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/reboot.h>
 #include <stdbool.h>
 #include <nfc_t4t_lib.h>
diff --git a/samples/nfc/writable_ndef_msg/src/ndef_file_m.c b/samples/nfc/writable_ndef_msg/src/ndef_file_m.c
index 276793ca49ad..bfc9abdc3b91 100644
--- a/samples/nfc/writable_ndef_msg/src/ndef_file_m.c
+++ b/samples/nfc/writable_ndef_msg/src/ndef_file_m.c
@@ -13,7 +13,7 @@
  *
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <soc.h>
 #include <zephyr/device.h>
 #include <string.h>
diff --git a/samples/nrf5340/empty_app_core/src/main.c b/samples/nrf5340/empty_app_core/src/main.c
index a0af9bb69649..5a0aff0dca41 100644
--- a/samples/nrf5340/empty_app_core/src/main.c
+++ b/samples/nrf5340/empty_app_core/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/init.h>
 #include <nrf.h>
diff --git a/samples/nrf5340/multicore/src/main.c b/samples/nrf5340/multicore/src/main.c
index c4d746aad691..96eff56b135a 100644
--- a/samples/nrf5340/multicore/src/main.c
+++ b/samples/nrf5340/multicore/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 int main(void)
diff --git a/samples/nrf5340/multiprotocol_rpmsg/src/main.c b/samples/nrf5340/multiprotocol_rpmsg/src/main.c
index a0c84837599c..95cbf870da89 100644
--- a/samples/nrf5340/multiprotocol_rpmsg/src/main.c
+++ b/samples/nrf5340/multiprotocol_rpmsg/src/main.c
@@ -9,7 +9,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/sys/util.h>
diff --git a/samples/nrf5340/remote_shell/src/main.c b/samples/nrf5340/remote_shell/src/main.c
index cdf77650a465..b2ed4dfbee3e 100644
--- a/samples/nrf5340/remote_shell/src/main.c
+++ b/samples/nrf5340/remote_shell/src/main.c
@@ -8,7 +8,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/sys/atomic.h>
 #include <zephyr/usb/usb_device.h>
diff --git a/samples/nrf9160/at_client/src/main.c b/samples/nrf9160/at_client/src/main.c
index d50d1a707ac8..df132de70d2f 100644
--- a/samples/nrf9160/at_client/src/main.c
+++ b/samples/nrf9160/at_client/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 <zephyr/drivers/uart.h>
 #include <string.h>
diff --git a/samples/nrf9160/at_monitor/src/main.c b/samples/nrf9160/at_monitor/src/main.c
index bc42b14d9048..bf570d22e6bb 100644
--- a/samples/nrf9160/at_monitor/src/main.c
+++ b/samples/nrf9160/at_monitor/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <nrf_modem_at.h>
diff --git a/samples/nrf9160/aws_fota/src/main.c b/samples/nrf9160/aws_fota/src/main.c
index 9e53ff86a0cc..57e244c49cfd 100644
--- a/samples/nrf9160/aws_fota/src/main.c
+++ b/samples/nrf9160/aws_fota/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 <nrf_modem.h>
 #include <modem/lte_lc.h>
diff --git a/samples/nrf9160/aws_iot/src/main.c b/samples/nrf9160/aws_iot/src/main.c
index 82822c2cefff..ede56e7a63cc 100644
--- a/samples/nrf9160/aws_iot/src/main.c
+++ b/samples/nrf9160/aws_iot/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 <stdlib.h>
 #if defined(CONFIG_NRF_MODEM_LIB)
diff --git a/samples/nrf9160/azure_fota/src/main.c b/samples/nrf9160/azure_fota/src/main.c
index 164fe4aebb24..72f3e8479574 100644
--- a/samples/nrf9160/azure_fota/src/main.c
+++ b/samples/nrf9160/azure_fota/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 <nrf_modem.h>
 #include <modem/nrf_modem_lib.h>
diff --git a/samples/nrf9160/azure_iot_hub/src/main.c b/samples/nrf9160/azure_iot_hub/src/main.c
index b516fe43c821..ae4b1e80fd91 100644
--- a/samples/nrf9160/azure_iot_hub/src/main.c
+++ b/samples/nrf9160/azure_iot_hub/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 <stdlib.h>
 #include <net/azure_iot_hub.h>
diff --git a/samples/nrf9160/cloud_client/src/main.c b/samples/nrf9160/cloud_client/src/main.c
index e4a469d0d675..b52afb6e47d3 100644
--- a/samples/nrf9160/cloud_client/src/main.c
+++ b/samples/nrf9160/cloud_client/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 <modem/lte_lc.h>
 #include <net/cloud.h>
diff --git a/samples/nrf9160/coap_client/src/main.c b/samples/nrf9160/coap_client/src/main.c
index fb913cebcb7b..53cd1b84ac0d 100644
--- a/samples/nrf9160/coap_client/src/main.c
+++ b/samples/nrf9160/coap_client/src/main.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/coap.h>
 #include <zephyr/net/socket.h>
 #include <modem/lte_lc.h>
diff --git a/samples/nrf9160/download/src/main.c b/samples/nrf9160/download/src/main.c
index 6387b374d18b..d522d15706ea 100644
--- a/samples/nrf9160/download/src/main.c
+++ b/samples/nrf9160/download/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <modem/nrf_modem_lib.h>
 #include <modem/lte_lc.h>
diff --git a/samples/nrf9160/fmfu_smp_svr/src/main.c b/samples/nrf9160/fmfu_smp_svr/src/main.c
index 9279a0cb81a3..2cf7ab06525c 100644
--- a/samples/nrf9160/fmfu_smp_svr/src/main.c
+++ b/samples/nrf9160/fmfu_smp_svr/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <mgmt/fmfu_mgmt.h>
 #include <mgmt/fmfu_mgmt_stat.h>
 #include <modem/modem_info.h>
diff --git a/samples/nrf9160/gnss/src/assistance.c b/samples/nrf9160/gnss/src/assistance.c
index 934b15059ca2..0089cd1e649f 100644
--- a/samples/nrf9160/gnss/src/assistance.c
+++ b/samples/nrf9160/gnss/src/assistance.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <modem/modem_info.h>
 #include <modem/modem_jwt.h>
diff --git a/samples/nrf9160/gnss/src/assistance_minimal.c b/samples/nrf9160/gnss/src/assistance_minimal.c
index 26cb51eca946..f69295352639 100644
--- a/samples/nrf9160/gnss/src/assistance_minimal.c
+++ b/samples/nrf9160/gnss/src/assistance_minimal.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/timeutil.h>
 #include <zephyr/settings/settings.h>
 #include <zephyr/logging/log.h>
diff --git a/samples/nrf9160/gnss/src/assistance_supl.c b/samples/nrf9160/gnss/src/assistance_supl.c
index 4c5147bd900b..ce6ad609ab88 100644
--- a/samples/nrf9160/gnss/src/assistance_supl.c
+++ b/samples/nrf9160/gnss/src/assistance_supl.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/net/socket.h>
 #include <supl_os_client.h>
diff --git a/samples/nrf9160/gnss/src/main.c b/samples/nrf9160/gnss/src/main.c
index 73db0aff0f5b..696be3a24f5a 100644
--- a/samples/nrf9160/gnss/src/main.c
+++ b/samples/nrf9160/gnss/src/main.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <nrf_modem_at.h>
 #include <nrf_modem_gnss.h>
diff --git a/samples/nrf9160/http_update/application_update/src/main.c b/samples/nrf9160/http_update/application_update/src/main.c
index 04ca2296e2f6..3b0802f45b7b 100644
--- a/samples/nrf9160/http_update/application_update/src/main.c
+++ b/samples/nrf9160/http_update/application_update/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/dfu/mcuboot.h>
 #include <dfu/dfu_target_mcuboot.h>
 #include <modem/nrf_modem_lib.h>
diff --git a/samples/nrf9160/http_update/common/src/update.c b/samples/nrf9160/http_update/common/src/update.c
index cb6d29c9300d..1ddf7be8f25e 100644
--- a/samples/nrf9160/http_update/common/src/update.c
+++ b/samples/nrf9160/http_update/common/src/update.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/toolchain.h>
diff --git a/samples/nrf9160/http_update/full_modem_update/src/main.c b/samples/nrf9160/http_update/full_modem_update/src/main.c
index d51f9f1ca352..c26f2fb63c48 100644
--- a/samples/nrf9160/http_update/full_modem_update/src/main.c
+++ b/samples/nrf9160/http_update/full_modem_update/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/nrf_modem_lib.h>
 #include <dfu/dfu_target_full_modem.h>
 #include <net/fota_download.h>
diff --git a/samples/nrf9160/http_update/modem_delta_update/src/main.c b/samples/nrf9160/http_update/modem_delta_update/src/main.c
index 55ed145fb109..aaf8972ef6cb 100644
--- a/samples/nrf9160/http_update/modem_delta_update/src/main.c
+++ b/samples/nrf9160/http_update/modem_delta_update/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <string.h>
 #include <nrf_modem.h>
diff --git a/samples/nrf9160/https_client/src/main.c b/samples/nrf9160/https_client/src/main.c
index b8c4c01cf10c..69a862a3dd2a 100644
--- a/samples/nrf9160/https_client/src/main.c
+++ b/samples/nrf9160/https_client/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <zephyr/net/socket.h>
 #include <modem/nrf_modem_lib.h>
diff --git a/samples/nrf9160/location/src/main.c b/samples/nrf9160/location/src/main.c
index b8513f13d36c..b891a1e409ab 100644
--- a/samples/nrf9160/location/src/main.c
+++ b/samples/nrf9160/location/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_modem_at.h>
 #include <modem/lte_lc.h>
 #include <modem/location.h>
diff --git a/samples/nrf9160/lte_ble_gateway/src/aggregator.c b/samples/nrf9160/lte_ble_gateway/src/aggregator.c
index 515005867404..165a67c383f0 100644
--- a/samples/nrf9160/lte_ble_gateway/src/aggregator.c
+++ b/samples/nrf9160/lte_ble_gateway/src/aggregator.c
@@ -5,7 +5,7 @@
  */
 #include "aggregator.h"
 #include <zephyr/kernel.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/types.h>
 #include <string.h>
diff --git a/samples/nrf9160/lte_ble_gateway/src/ble.c b/samples/nrf9160/lte_ble_gateway/src/ble.c
index bb09658c1345..a069987e2631 100644
--- a/samples/nrf9160/lte_ble_gateway/src/ble.c
+++ b/samples/nrf9160/lte_ble_gateway/src/ble.c
@@ -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 <zephyr/bluetooth/gatt.h>
diff --git a/samples/nrf9160/lte_ble_gateway/src/main.c b/samples/nrf9160/lte_ble_gateway/src/main.c
index edaec25b2ec9..a226c8d0e807 100644
--- a/samples/nrf9160/lte_ble_gateway/src/main.c
+++ b/samples/nrf9160/lte_ble_gateway/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 <nrf_modem_at.h>
diff --git a/samples/nrf9160/lwm2m_carrier/src/main.c b/samples/nrf9160/lwm2m_carrier/src/main.c
index 8c4c5cf9a591..4ef604ad10f8 100644
--- a/samples/nrf9160/lwm2m_carrier/src/main.c
+++ b/samples/nrf9160/lwm2m_carrier/src/main.c
@@ -8,7 +8,7 @@
 #include <lwm2m_carrier.h>
 #include "carrier_certs.h"
 #endif /* CONFIG_LWM2M_CARRIER */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 
 #ifdef CONFIG_LWM2M_CARRIER
diff --git a/samples/nrf9160/lwm2m_client/src/events/include/accel_event.h b/samples/nrf9160/lwm2m_client/src/events/include/accel_event.h
index 7a0e7957535e..f2b18a022c37 100644
--- a/samples/nrf9160/lwm2m_client/src/events/include/accel_event.h
+++ b/samples/nrf9160/lwm2m_client/src/events/include/accel_event.h
@@ -7,7 +7,7 @@
 #ifndef ACCEL_EVENT_H__
 #define ACCEL_EVENT_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <app_event_manager.h>
 #include <app_event_manager_profiler_tracer.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/events/include/gnss_pvt_event.h b/samples/nrf9160/lwm2m_client/src/events/include/gnss_pvt_event.h
index 1f4b642c246d..ec81ca170d49 100644
--- a/samples/nrf9160/lwm2m_client/src/events/include/gnss_pvt_event.h
+++ b/samples/nrf9160/lwm2m_client/src/events/include/gnss_pvt_event.h
@@ -7,7 +7,7 @@
 #ifndef GNSS_PVT_EVENT_H__
 #define GNSS_PVT_EVENT_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_modem_gnss.h>
 #include <app_event_manager.h>
 #include <app_event_manager_profiler_tracer.h>
diff --git a/samples/nrf9160/lwm2m_client/src/events/include/sensor_event.h b/samples/nrf9160/lwm2m_client/src/events/include/sensor_event.h
index c152a135073c..119b423740aa 100644
--- a/samples/nrf9160/lwm2m_client/src/events/include/sensor_event.h
+++ b/samples/nrf9160/lwm2m_client/src/events/include/sensor_event.h
@@ -7,7 +7,7 @@
 #ifndef SENSOR_EVENT_H__
 #define SENSOR_EVENT_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <app_event_manager.h>
 #include <app_event_manager_profiler_tracer.h>
diff --git a/samples/nrf9160/lwm2m_client/src/events/include/ui_input_event.h b/samples/nrf9160/lwm2m_client/src/events/include/ui_input_event.h
index 63bcf5216718..bbad9c23d0e8 100644
--- a/samples/nrf9160/lwm2m_client/src/events/include/ui_input_event.h
+++ b/samples/nrf9160/lwm2m_client/src/events/include/ui_input_event.h
@@ -7,7 +7,7 @@
 #ifndef UI_INPUT_EVENT_H__
 #define UI_INPUT_EVENT_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <app_event_manager.h>
 #include <app_event_manager_profiler_tracer.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/ipso/ipso_colour_sensor.c b/samples/nrf9160/lwm2m_client/src/ipso/ipso_colour_sensor.c
index 37ad3d58a88c..3e8db45ada4b 100644
--- a/samples/nrf9160/lwm2m_client/src/ipso/ipso_colour_sensor.c
+++ b/samples/nrf9160/lwm2m_client/src/ipso/ipso_colour_sensor.c
@@ -8,7 +8,7 @@
  * https://raw.githubusercontent.com/OpenMobileAlliance/lwm2m-registry/prod/version_history/3335-1_0.xml
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 
 #include <lwm2m_object.h>
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/include/lwm2m_app_utils.h b/samples/nrf9160/lwm2m_client/src/lwm2m/include/lwm2m_app_utils.h
index e5dd8fc31606..5bc8e6003181 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/include/lwm2m_app_utils.h
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/include/lwm2m_app_utils.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <zephyr/drivers/sensor.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/include/lwm2m_client_app.h b/samples/nrf9160/lwm2m_client/src/lwm2m/include/lwm2m_client_app.h
index e6e29d4123d9..02ab1333c816 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/include/lwm2m_client_app.h
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/include/lwm2m_client_app.h
@@ -7,7 +7,7 @@
 #ifndef LWM2M_CLIENT_APP_H__
 #define LWM2M_CLIENT_APP_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 
 #ifdef __cplusplus
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_accelerometer.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_accelerometer.c
index 411a85d1eb6b..9b00eb91686c 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_accelerometer.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_accelerometer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
 #include <math.h>
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_app_utils.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_app_utils.c
index b722394c371d..a078a7afc84b 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_app_utils.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_app_utils.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_buzzer.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_buzzer.c
index c626bda2f6e3..b8a1756b5e2e 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_buzzer.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_buzzer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_device.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_device.c
index 68358712f0f4..835e1722f9c5 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_device.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_device.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <version.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/sys/reboot.h>
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_gas_res_sensor.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_gas_res_sensor.c
index 58eb210211d4..6059f2cd6b63 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_gas_res_sensor.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_gas_res_sensor.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_humid_sensor.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_humid_sensor.c
index b6008e919996..793f86cdfde2 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_humid_sensor.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_humid_sensor.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_light_control.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_light_control.c
index 58564695ad23..7479c28656e9 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_light_control.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_light_control.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
 #include <stdlib.h>
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_light_sensor.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_light_sensor.c
index 84c4c016ca2b..bbf1bf75bc04 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_light_sensor.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_light_sensor.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
 #include <stdio.h>
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_location.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_location.c
index b30aff515021..b8103b419e22 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_location.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_location.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_modem_gnss.h>
 #include <zephyr/net/lwm2m.h>
 #include <zephyr/net/lwm2m_path.h>
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_onoff_switch.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_onoff_switch.c
index 877ab7d3e452..98c8155da4fa 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_onoff_switch.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_onoff_switch.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_portfolio_object.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_portfolio_object.c
index eb17e3b22789..aadd2564e44b 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_portfolio_object.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_portfolio_object.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
 #include "lwm2m_app_utils.h"
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_press_sensor.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_press_sensor.c
index da2e359348c3..9f34a4f1b00d 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_press_sensor.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_press_sensor.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_push_button.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_push_button.c
index ee809eaf197e..ffaa44186075 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_push_button.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_push_button.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_temp_sensor.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_temp_sensor.c
index f67da321bb49..9e43299d912a 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_temp_sensor.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_temp_sensor.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/main.c b/samples/nrf9160/lwm2m_client/src/main.c
index 6075c9f2a4b5..fc3132fb8c5d 100644
--- a/samples/nrf9160/lwm2m_client/src/main.c
+++ b/samples/nrf9160/lwm2m_client/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ctype.h>
 #include <zephyr/drivers/gpio.h>
 #include <stdio.h>
diff --git a/samples/nrf9160/lwm2m_client/src/modules/sensor_module.c b/samples/nrf9160/lwm2m_client/src/modules/sensor_module.c
index 9065764122f6..54dd185cf1c8 100644
--- a/samples/nrf9160/lwm2m_client/src/modules/sensor_module.c
+++ b/samples/nrf9160/lwm2m_client/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 <zephyr/drivers/sensor.h>
 #include <zephyr/net/lwm2m.h>
 #include <lwm2m_resource_ids.h>
diff --git a/samples/nrf9160/lwm2m_client/src/sensors/accelerometer.c b/samples/nrf9160/lwm2m_client/src/sensors/accelerometer.c
index cbe707cb65a4..f9998c9b425a 100644
--- a/samples/nrf9160/lwm2m_client/src/sensors/accelerometer.c
+++ b/samples/nrf9160/lwm2m_client/src/sensors/accelerometer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
diff --git a/samples/nrf9160/lwm2m_client/src/sensors/env_sensor.c b/samples/nrf9160/lwm2m_client/src/sensors/env_sensor.c
index 36a543959154..be88163af783 100644
--- a/samples/nrf9160/lwm2m_client/src/sensors/env_sensor.c
+++ b/samples/nrf9160/lwm2m_client/src/sensors/env_sensor.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdlib.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/sensors/gnss_module.c b/samples/nrf9160/lwm2m_client/src/sensors/gnss_module.c
index a2873b2ad961..23740808a323 100644
--- a/samples/nrf9160/lwm2m_client/src/sensors/gnss_module.c
+++ b/samples/nrf9160/lwm2m_client/src/sensors/gnss_module.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_modem_gnss.h>
 #include <app_event_manager.h>
 #if defined(CONFIG_LWM2M_CLIENT_UTILS_LOCATION_ASSIST_AGPS)
diff --git a/samples/nrf9160/lwm2m_client/src/sensors/include/accelerometer.h b/samples/nrf9160/lwm2m_client/src/sensors/include/accelerometer.h
index 3b4ade7d2dea..3842b447c597 100644
--- a/samples/nrf9160/lwm2m_client/src/sensors/include/accelerometer.h
+++ b/samples/nrf9160/lwm2m_client/src/sensors/include/accelerometer.h
@@ -7,7 +7,7 @@
 #ifndef ACCELEROMETER_H__
 #define ACCELEROMETER_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 
 #ifdef __cplusplus
diff --git a/samples/nrf9160/lwm2m_client/src/sensors/include/env_sensor.h b/samples/nrf9160/lwm2m_client/src/sensors/include/env_sensor.h
index 191de710bc48..14fe5d8b95e0 100644
--- a/samples/nrf9160/lwm2m_client/src/sensors/include/env_sensor.h
+++ b/samples/nrf9160/lwm2m_client/src/sensors/include/env_sensor.h
@@ -7,7 +7,7 @@
 #ifndef ENV_SENSOR_H__
 #define ENV_SENSOR_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 
 #ifdef __cplusplus
diff --git a/samples/nrf9160/lwm2m_client/src/sensors/include/light_sensor.h b/samples/nrf9160/lwm2m_client/src/sensors/include/light_sensor.h
index 9c3e46bc10c3..2cd1dc0fe9c2 100644
--- a/samples/nrf9160/lwm2m_client/src/sensors/include/light_sensor.h
+++ b/samples/nrf9160/lwm2m_client/src/sensors/include/light_sensor.h
@@ -7,7 +7,7 @@
 #ifndef LIGHT_SENSOR_H__
 #define LIGHT_SENSOR_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 
 #ifdef __cplusplus
diff --git a/samples/nrf9160/lwm2m_client/src/sensors/light_sensor.c b/samples/nrf9160/lwm2m_client/src/sensors/light_sensor.c
index bcf49a264b2d..f45026025090 100644
--- a/samples/nrf9160/lwm2m_client/src/sensors/light_sensor.c
+++ b/samples/nrf9160/lwm2m_client/src/sensors/light_sensor.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/samples/nrf9160/lwm2m_client/src/ui/include/ui_buzzer.h b/samples/nrf9160/lwm2m_client/src/ui/include/ui_buzzer.h
index 441a7f949d77..4f0052fcc822 100644
--- a/samples/nrf9160/lwm2m_client/src/ui/include/ui_buzzer.h
+++ b/samples/nrf9160/lwm2m_client/src/ui/include/ui_buzzer.h
@@ -7,7 +7,7 @@
 #ifndef UI_BUZZER_H__
 #define UI_BUZZER_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/samples/nrf9160/lwm2m_client/src/ui/include/ui_input.h b/samples/nrf9160/lwm2m_client/src/ui/include/ui_input.h
index 5a0cb31eda01..e718ebbb86ba 100644
--- a/samples/nrf9160/lwm2m_client/src/ui/include/ui_input.h
+++ b/samples/nrf9160/lwm2m_client/src/ui/include/ui_input.h
@@ -6,7 +6,7 @@
 #ifndef UI_INPUT_H__
 #define UI_INPUT_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/samples/nrf9160/lwm2m_client/src/ui/include/ui_led.h b/samples/nrf9160/lwm2m_client/src/ui/include/ui_led.h
index 1b2b72daec7c..921c99fbae14 100644
--- a/samples/nrf9160/lwm2m_client/src/ui/include/ui_led.h
+++ b/samples/nrf9160/lwm2m_client/src/ui/include/ui_led.h
@@ -7,7 +7,7 @@
 #ifndef UI_LED_H__
 #define UI_LED_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/samples/nrf9160/lwm2m_client/src/ui/include/ui_sense_led.h b/samples/nrf9160/lwm2m_client/src/ui/include/ui_sense_led.h
index f3d724cff466..df1081046e9a 100644
--- a/samples/nrf9160/lwm2m_client/src/ui/include/ui_sense_led.h
+++ b/samples/nrf9160/lwm2m_client/src/ui/include/ui_sense_led.h
@@ -7,7 +7,7 @@
 #ifndef UI_SENSE_LED_H__
 #define UI_SENSE_LED_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/samples/nrf9160/lwm2m_client/src/ui/ui_buzzer.c b/samples/nrf9160/lwm2m_client/src/ui/ui_buzzer.c
index af6797cbc3c7..96cdc759bef3 100644
--- a/samples/nrf9160/lwm2m_client/src/ui/ui_buzzer.c
+++ b/samples/nrf9160/lwm2m_client/src/ui/ui_buzzer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/pwm.h>
 #include <zephyr/devicetree.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/ui/ui_input.c b/samples/nrf9160/lwm2m_client/src/ui/ui_input.c
index 561ade3ec95f..f9f74567a216 100644
--- a/samples/nrf9160/lwm2m_client/src/ui/ui_input.c
+++ b/samples/nrf9160/lwm2m_client/src/ui/ui_input.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <dk_buttons_and_leds.h>
 
 #include "ui_input_event.h"
diff --git a/samples/nrf9160/lwm2m_client/src/ui/ui_led.c b/samples/nrf9160/lwm2m_client/src/ui/ui_led.c
index 44120c331980..c6277d6d7501 100644
--- a/samples/nrf9160/lwm2m_client/src/ui/ui_led.c
+++ b/samples/nrf9160/lwm2m_client/src/ui/ui_led.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/pwm.h>
 #include <zephyr/drivers/gpio.h>
 
diff --git a/samples/nrf9160/lwm2m_client/src/ui/ui_sense_led.c b/samples/nrf9160/lwm2m_client/src/ui/ui_sense_led.c
index 6b1ee8cdf1d4..dae74cd3e52c 100644
--- a/samples/nrf9160/lwm2m_client/src/ui/ui_sense_led.c
+++ b/samples/nrf9160/lwm2m_client/src/ui/ui_sense_led.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/devicetree.h>
 #include <zephyr/drivers/gpio.h>
diff --git a/samples/nrf9160/memfault/src/main.c b/samples/nrf9160/memfault/src/main.c
index 8c35730f7841..d92cf9805937 100644
--- a/samples/nrf9160/memfault/src/main.c
+++ b/samples/nrf9160/memfault/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 <modem/lte_lc.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/nrf9160/modem_callbacks/src/main.c b/samples/nrf9160/modem_callbacks/src/main.c
index 490899df08c3..1183a1554940 100644
--- a/samples/nrf9160/modem_callbacks/src/main.c
+++ b/samples/nrf9160/modem_callbacks/src/main.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/nrf_modem_lib.h>
 #include <modem/lte_lc.h>
 
diff --git a/samples/nrf9160/modem_shell/src/cloud/cloud_shell.c b/samples/nrf9160/modem_shell/src/cloud/cloud_shell.c
index c232beb7cb81..158b852782d6 100644
--- a/samples/nrf9160/modem_shell/src/cloud/cloud_shell.c
+++ b/samples/nrf9160/modem_shell/src/cloud/cloud_shell.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <net/nrf_cloud.h>
 #include <nrf_cloud_fsm.h>
 #include <zephyr/shell/shell.h>
diff --git a/samples/nrf9160/modem_shell/src/drivers/nrf91_non_offloaded_dev.c b/samples/nrf9160/modem_shell/src/drivers/nrf91_non_offloaded_dev.c
index fd54bf2edae8..61cd1e27c548 100644
--- a/samples/nrf9160/modem_shell/src/drivers/nrf91_non_offloaded_dev.c
+++ b/samples/nrf9160/modem_shell/src/drivers/nrf91_non_offloaded_dev.c
@@ -9,7 +9,7 @@
  * i.e. using Zephyr native TCP/IP stack.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/random/rand32.h>
 #include <zephyr/net/dummy.h>
diff --git a/samples/nrf9160/modem_shell/src/fota/fota.c b/samples/nrf9160/modem_shell/src/fota/fota.c
index b0205a8a85dc..8e07d9d6a4c1 100644
--- a/samples/nrf9160/modem_shell/src/fota/fota.c
+++ b/samples/nrf9160/modem_shell/src/fota/fota.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/reboot.h>
 #include <net/fota_download.h>
 
diff --git a/samples/nrf9160/modem_shell/src/fota/fota_shell.c b/samples/nrf9160/modem_shell/src/fota/fota_shell.c
index 69db979f19c5..2c5e4c3777fb 100644
--- a/samples/nrf9160/modem_shell/src/fota/fota_shell.c
+++ b/samples/nrf9160/modem_shell/src/fota/fota_shell.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 
 #include "fota.h"
diff --git a/samples/nrf9160/modem_shell/src/gnss/gnss.c b/samples/nrf9160/modem_shell/src/gnss/gnss.c
index a653c1c2eac8..48952362bfd9 100644
--- a/samples/nrf9160/modem_shell/src/gnss/gnss.c
+++ b/samples/nrf9160/modem_shell/src/gnss/gnss.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <assert.h>
 #include <nrf_modem_at.h>
diff --git a/samples/nrf9160/modem_shell/src/gnss/gnss_shell.c b/samples/nrf9160/modem_shell/src/gnss/gnss_shell.c
index b5b9ef4d9b5e..756ea7add7bd 100644
--- a/samples/nrf9160/modem_shell/src/gnss/gnss_shell.c
+++ b/samples/nrf9160/modem_shell/src/gnss/gnss_shell.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/shell/shell.h>
 #include <getopt.h>
 
diff --git a/samples/nrf9160/modem_shell/src/gnss/gnss_supl_support.c b/samples/nrf9160/modem_shell/src/gnss/gnss_supl_support.c
index 505fe78cb780..67e8371cc24a 100644
--- a/samples/nrf9160/modem_shell/src/gnss/gnss_supl_support.c
+++ b/samples/nrf9160/modem_shell/src/gnss/gnss_supl_support.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #if !defined(CONFIG_NET_SOCKETS_POSIX_NAMES)
 #include <zephyr/posix/unistd.h>
diff --git a/samples/nrf9160/modem_shell/src/main.c b/samples/nrf9160/modem_shell/src/main.c
index 9659e083023b..60941a401382 100644
--- a/samples/nrf9160/modem_shell/src/main.c
+++ b/samples/nrf9160/modem_shell/src/main.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <nrf_modem.h>
 
diff --git a/samples/nrf9160/modem_shell/src/ping/icmp_ping.c b/samples/nrf9160/modem_shell/src/ping/icmp_ping.c
index 8b52e3ae34a9..93c51984b09d 100644
--- a/samples/nrf9160/modem_shell/src/ping/icmp_ping.c
+++ b/samples/nrf9160/modem_shell/src/ping/icmp_ping.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <sys/types.h>
 #include <zephyr/net/net_ip.h>
diff --git a/samples/nrf9160/modem_shell/src/ping/icmp_ping_print.c b/samples/nrf9160/modem_shell/src/ping/icmp_ping_print.c
index f1f9731b8565..f2228034ea0b 100644
--- a/samples/nrf9160/modem_shell/src/ping/icmp_ping_print.c
+++ b/samples/nrf9160/modem_shell/src/ping/icmp_ping_print.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/posix/time.h>
 #include <zephyr/sys/cbprintf.h>
 #include <zephyr/shell/shell.h>
diff --git a/samples/nrf9160/modem_shell/src/ping/icmp_ping_shell.c b/samples/nrf9160/modem_shell/src/ping/icmp_ping_shell.c
index c368de512f35..fbb28f47f1d7 100644
--- a/samples/nrf9160/modem_shell/src/ping/icmp_ping_shell.c
+++ b/samples/nrf9160/modem_shell/src/ping/icmp_ping_shell.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/shell/shell.h>
 #include <getopt.h>
diff --git a/samples/nrf9160/modem_shell/src/ppp/ppp_ctrl.c b/samples/nrf9160/modem_shell/src/ppp/ppp_ctrl.c
index ab37fea1db34..f8b5fd89aeaa 100644
--- a/samples/nrf9160/modem_shell/src/ppp/ppp_ctrl.c
+++ b/samples/nrf9160/modem_shell/src/ppp/ppp_ctrl.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <assert.h>
 
diff --git a/samples/nrf9160/modem_shell/src/ppp/ppp_mdm_data_rcv.c b/samples/nrf9160/modem_shell/src/ppp/ppp_mdm_data_rcv.c
index ebdc5917632a..fb7b9aa3aa72 100644
--- a/samples/nrf9160/modem_shell/src/ppp/ppp_mdm_data_rcv.c
+++ b/samples/nrf9160/modem_shell/src/ppp/ppp_mdm_data_rcv.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <assert.h>
 
diff --git a/samples/nrf9160/modem_shell/src/ppp/ppp_mdm_data_snd.c b/samples/nrf9160/modem_shell/src/ppp/ppp_mdm_data_snd.c
index dbeee1604052..f33b6cea7b09 100644
--- a/samples/nrf9160/modem_shell/src/ppp/ppp_mdm_data_snd.c
+++ b/samples/nrf9160/modem_shell/src/ppp/ppp_mdm_data_snd.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <assert.h>
 
diff --git a/samples/nrf9160/modem_shell/src/ppp/ppp_shell.c b/samples/nrf9160/modem_shell/src/ppp/ppp_shell.c
index ea27bceb0159..e26cc453ad84 100644
--- a/samples/nrf9160/modem_shell/src/ppp/ppp_shell.c
+++ b/samples/nrf9160/modem_shell/src/ppp/ppp_shell.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/shell/shell.h>
 #include <unistd.h>
diff --git a/samples/nrf9160/modem_shell/src/rest/rest_shell.c b/samples/nrf9160/modem_shell/src/rest/rest_shell.c
index 14302a2ed5c5..91cdc142b7a0 100644
--- a/samples/nrf9160/modem_shell/src/rest/rest_shell.c
+++ b/samples/nrf9160/modem_shell/src/rest/rest_shell.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <assert.h>
 
 #include <zephyr/shell/shell.h>
diff --git a/samples/nrf9160/modem_shell/src/shell.c b/samples/nrf9160/modem_shell/src/shell.c
index 56f1c2da905e..958f1981ca93 100644
--- a/samples/nrf9160/modem_shell/src/shell.c
+++ b/samples/nrf9160/modem_shell/src/shell.c
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/shell/shell.h>
 #include <modem/lte_lc.h>
diff --git a/samples/nrf9160/modem_shell/src/sms/sms.c b/samples/nrf9160/modem_shell/src/sms/sms.c
index 734413449b7e..05933bf382da 100644
--- a/samples/nrf9160/modem_shell/src/sms/sms.c
+++ b/samples/nrf9160/modem_shell/src/sms/sms.c
@@ -7,7 +7,7 @@
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <modem/sms.h>
 
diff --git a/samples/nrf9160/modem_shell/src/th/th_ctrl.c b/samples/nrf9160/modem_shell/src/th/th_ctrl.c
index 46b59c8123d0..4c2f95249a69 100644
--- a/samples/nrf9160/modem_shell/src/th/th_ctrl.c
+++ b/samples/nrf9160/modem_shell/src/th/th_ctrl.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/samples/nrf9160/modem_shell/src/uart/uart.c b/samples/nrf9160/modem_shell/src/uart/uart.c
index ebe50edfed21..87da79f0cc03 100644
--- a/samples/nrf9160/modem_shell/src/uart/uart.c
+++ b/samples/nrf9160/modem_shell/src/uart/uart.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/pm/device.h>
diff --git a/samples/nrf9160/modem_shell/src/uart/uart_shell.c b/samples/nrf9160/modem_shell/src/uart/uart_shell.c
index 59021601b60f..c23b365f66b8 100644
--- a/samples/nrf9160/modem_shell/src/uart/uart_shell.c
+++ b/samples/nrf9160/modem_shell/src/uart/uart_shell.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/pm/device.h>
diff --git a/samples/nrf9160/modem_shell/src/utils/mosh_print.c b/samples/nrf9160/modem_shell/src/utils/mosh_print.c
index 0f1427a6d5b3..bcabc9fa10b7 100644
--- a/samples/nrf9160/modem_shell/src/utils/mosh_print.c
+++ b/samples/nrf9160/modem_shell/src/utils/mosh_print.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/posix/time.h>
 #include <zephyr/sys/cbprintf.h>
 #include <zephyr/shell/shell.h>
diff --git a/samples/nrf9160/modem_shell/src/utils/net_utils.c b/samples/nrf9160/modem_shell/src/utils/net_utils.c
index 5c53c3a5b9ca..b1ee91088d47 100644
--- a/samples/nrf9160/modem_shell/src/utils/net_utils.c
+++ b/samples/nrf9160/modem_shell/src/utils/net_utils.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/posix/arpa/inet.h>
 #include <zephyr/posix/sys/socket.h>
diff --git a/samples/nrf9160/modem_shell/src/utils/str_utils.c b/samples/nrf9160/modem_shell/src/utils/str_utils.c
index c7ca442ba301..c0cb262d3f8b 100644
--- a/samples/nrf9160/modem_shell/src/utils/str_utils.c
+++ b/samples/nrf9160/modem_shell/src/utils/str_utils.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 
 #include "str_utils.h"
diff --git a/samples/nrf9160/mqtt_simple/src/main.c b/samples/nrf9160/mqtt_simple/src/main.c
index 51cb63daccb8..962c5d45ab1d 100644
--- a/samples/nrf9160/mqtt_simple/src/main.c
+++ b/samples/nrf9160/mqtt_simple/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 <zephyr/drivers/uart.h>
 #include <string.h>
diff --git a/samples/nrf9160/multicell_location/src/main.c b/samples/nrf9160/multicell_location/src/main.c
index 751b15020592..14bab1f071cd 100644
--- a/samples/nrf9160/multicell_location/src/main.c
+++ b/samples/nrf9160/multicell_location/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 <modem/lte_lc.h>
 #include <dk_buttons_and_leds.h>
diff --git a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/application.c b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/application.c
index 19b040a6e135..ff2924638fef 100644
--- a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/application.c
+++ b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/application.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <modem/location.h>
 #include <net/nrf_cloud.h>
diff --git a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/connection.c b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/connection.c
index 0194def4f7e3..a412b0f679c9 100644
--- a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/connection.c
+++ b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/connection.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <modem/lte_lc.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/fota_support.c b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/fota_support.c
index da12a29df1fe..14dfa9292a32 100644
--- a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/fota_support.c
+++ b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/fota_support.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/fota_support.h b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/fota_support.h
index 2317d4003504..3b1e932621ec 100644
--- a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/fota_support.h
+++ b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/fota_support.h
@@ -6,7 +6,7 @@
 #ifndef _FOTA_SUPPORT_H_
 #define _FOTA_SUPPORT_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /**
  * @brief Check whether we are capable of Firmware Over The Air (FOTA) application or modem update.
diff --git a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/location_tracking.c b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/location_tracking.c
index d76dfbab8235..4ae9c5ae2f95 100644
--- a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/location_tracking.c
+++ b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/location_tracking.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/location.h>
 #include <zephyr/logging/log.h>
 #include <date_time.h>
diff --git a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/main.c b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/main.c
index c777e7c35cd5..4b336c88bd6c 100644
--- a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/main.c
+++ b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/main.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/logging/log.h>
 #include "application.h"
diff --git a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/temperature.c b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/temperature.c
index 7aa8aed09ada..7a8794a4a78d 100644
--- a/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/temperature.c
+++ b/samples/nrf9160/nrf_cloud_mqtt_multi_service/src/temperature.c
@@ -1,4 +1,4 @@
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 #if CONFIG_TEMP_DATA_USE_SENSOR
diff --git a/samples/nrf9160/nrf_cloud_rest_cell_pos/src/main.c b/samples/nrf9160/nrf_cloud_rest_cell_pos/src/main.c
index 864097c18b66..c43055d94c6d 100644
--- a/samples/nrf9160/nrf_cloud_rest_cell_pos/src/main.c
+++ b/samples/nrf9160/nrf_cloud_rest_cell_pos/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 <modem/nrf_modem_lib.h>
 #include <nrf_modem_at.h>
diff --git a/samples/nrf9160/nrf_cloud_rest_device_message/src/main.c b/samples/nrf9160/nrf_cloud_rest_device_message/src/main.c
index 0211cceda30a..edef00ac9a03 100644
--- a/samples/nrf9160/nrf_cloud_rest_device_message/src/main.c
+++ b/samples/nrf9160/nrf_cloud_rest_device_message/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/nrf_modem_lib.h>
 #include <nrf_modem_at.h>
 #include <modem/modem_info.h>
diff --git a/samples/nrf9160/nrf_cloud_rest_fota/src/main.c b/samples/nrf9160/nrf_cloud_rest_fota/src/main.c
index 2d8cc9ab8193..fe09a4c60e4f 100644
--- a/samples/nrf9160/nrf_cloud_rest_fota/src/main.c
+++ b/samples/nrf9160/nrf_cloud_rest_fota/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/nrf_modem_lib.h>
 #include <nrf_modem_at.h>
 #include <modem/modem_info.h>
diff --git a/samples/nrf9160/pdn/src/esm.c b/samples/nrf9160/pdn/src/esm.c
index 2ab1d8134af2..49bd40fb3bf6 100644
--- a/samples/nrf9160/pdn/src/esm.c
+++ b/samples/nrf9160/pdn/src/esm.c
@@ -5,7 +5,7 @@
  */
 
 #include <stddef.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /* From the specification:
  * 3GPP TS 24.301 version 8.7.0
diff --git a/samples/nrf9160/pdn/src/main.c b/samples/nrf9160/pdn/src/main.c
index bda65f5e2ec9..5b480e09c710 100644
--- a/samples/nrf9160/pdn/src/main.c
+++ b/samples/nrf9160/pdn/src/main.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/pdn.h>
 #include <modem/lte_lc.h>
 #include <nrf_modem_at.h>
diff --git a/samples/nrf9160/secure_services/src/main.c b/samples/nrf9160/secure_services/src/main.c
index 487cf1d6aeb9..040919a2a577 100644
--- a/samples/nrf9160/secure_services/src/main.c
+++ b/samples/nrf9160/secure_services/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/reboot.h>
 #include <secure_services.h>
diff --git a/samples/nrf9160/udp/src/main.c b/samples/nrf9160/udp/src/main.c
index 9bc417549794..e07d18218cdf 100644
--- a/samples/nrf9160/udp/src/main.c
+++ b/samples/nrf9160/udp/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 <modem/lte_lc.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/nrf_profiler/src/main.c b/samples/nrf_profiler/src/main.c
index f37904cf3cb2..ff441061e9cb 100644
--- a/samples/nrf_profiler/src/main.c
+++ b/samples/nrf_profiler/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_profiler.h>
 #include <stdio.h>
 
diff --git a/samples/nrf_rpc/entropy_nrf53/cpuapp/src/main.c b/samples/nrf_rpc/entropy_nrf53/cpuapp/src/main.c
index ac773e9a32bd..71aaa1d8f8e8 100644
--- a/samples/nrf_rpc/entropy_nrf53/cpuapp/src/main.c
+++ b/samples/nrf_rpc/entropy_nrf53/cpuapp/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <nrf_rpc.h>
 
diff --git a/samples/nrf_rpc/entropy_nrf53/cpunet/src/main.c b/samples/nrf_rpc/entropy_nrf53/cpunet/src/main.c
index 6fe272d47c8b..b7399229e25e 100644
--- a/samples/nrf_rpc/entropy_nrf53/cpunet/src/main.c
+++ b/samples/nrf_rpc/entropy_nrf53/cpunet/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 void main(void)
 {
diff --git a/samples/openthread/cli/src/ble.c b/samples/openthread/cli/src/ble.c
index ee90efd97038..02a01b1b3e79 100644
--- a/samples/openthread/cli/src/ble.c
+++ b/samples/openthread/cli/src/ble.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/gatt.h>
 
 #include "ble.h"
diff --git a/samples/openthread/cli/src/main.c b/samples/openthread/cli/src/main.c
index a9f9e72037d6..405651c2c3bc 100644
--- a/samples/openthread/cli/src/main.c
+++ b/samples/openthread/cli/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 #if defined(CONFIG_BT)
diff --git a/samples/openthread/coap_client/src/ble_utils.c b/samples/openthread/coap_client/src/ble_utils.c
index bc38bb7d4117..c845e2a51919 100644
--- a/samples/openthread/coap_client/src/ble_utils.c
+++ b/samples/openthread/coap_client/src/ble_utils.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/uuid.h>
diff --git a/samples/openthread/coap_client/src/coap_client.c b/samples/openthread/coap_client/src/coap_client.c
index 75fd87ede311..d3c7a8dff4c5 100644
--- a/samples/openthread/coap_client/src/coap_client.c
+++ b/samples/openthread/coap_client/src/coap_client.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <dk_buttons_and_leds.h>
 #include <zephyr/logging/log.h>
 #include <ram_pwrdn.h>
diff --git a/samples/openthread/coap_client/src/coap_client_utils.c b/samples/openthread/coap_client/src/coap_client_utils.c
index 6cbdce610d57..25ebd4c71bcb 100644
--- a/samples/openthread/coap_client/src/coap_client_utils.c
+++ b/samples/openthread/coap_client/src/coap_client_utils.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <coap_server_client_interface.h>
 #include <net/coap_utils.h>
 #include <zephyr/logging/log.h>
diff --git a/samples/openthread/coap_server/src/coap_server.c b/samples/openthread/coap_server/src/coap_server.c
index 285521118499..f194853525ed 100644
--- a/samples/openthread/coap_server/src/coap_server.c
+++ b/samples/openthread/coap_server/src/coap_server.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <dk_buttons_and_leds.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/net/openthread.h>
diff --git a/samples/openthread/coprocessor/src/main.c b/samples/openthread/coprocessor/src/main.c
index edb8307b164e..a9436f1bcfca 100644
--- a/samples/openthread/coprocessor/src/main.c
+++ b/samples/openthread/coprocessor/src/main.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(coprocessor_sample, CONFIG_OT_COPROCESSOR_LOG_LEVEL);
diff --git a/samples/peripheral/802154_phy_test/src/main.c b/samples/peripheral/802154_phy_test/src/main.c
index d15f639d0505..d1c2eac470df 100644
--- a/samples/peripheral/802154_phy_test/src/main.c
+++ b/samples/peripheral/802154_phy_test/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <zephyr/init.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "rf_proc.h"
 #include "timer_proc.h"
diff --git a/samples/peripheral/lpuart/src/main.c b/samples/peripheral/lpuart/src/main.c
index 24e5ddce4418..aa10c3a14af7 100644
--- a/samples/peripheral/lpuart/src/main.c
+++ b/samples/peripheral/lpuart/src/main.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/devicetree.h>
 #include <zephyr/logging/log.h>
diff --git a/samples/peripheral/radio_test/src/radio_test.c b/samples/peripheral/radio_test/src/radio_test.c
index 3431b53b5c9b..1315cf2275c1 100644
--- a/samples/peripheral/radio_test/src/radio_test.c
+++ b/samples/peripheral/radio_test/src/radio_test.c
@@ -11,7 +11,7 @@
 #include <hal/nrf_power.h>
 #include <hal/nrf_rng.h>
 #include <nrfx_timer.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #if CONFIG_FEM
 #include "fem.h"
diff --git a/samples/sensor/bh1749/src/main.c b/samples/sensor/bh1749/src/main.c
index ee891d5147f4..1be29cd79201 100644
--- a/samples/sensor/bh1749/src/main.c
+++ b/samples/sensor/bh1749/src/main.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <stdio.h>
diff --git a/samples/tfm/tfm_hello_world/src/main.c b/samples/tfm/tfm_hello_world/src/main.c
index 92d22a0454bc..dab09dfc6d08 100644
--- a/samples/tfm/tfm_hello_world/src/main.c
+++ b/samples/tfm/tfm_hello_world/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/samples/tfm/tfm_secure_peripheral/src/main.c b/samples/tfm/tfm_secure_peripheral/src/main.c
index 23879c9826e2..11e5cd925ce4 100644
--- a/samples/tfm/tfm_secure_peripheral/src/main.c
+++ b/samples/tfm/tfm_secure_peripheral/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <tfm_veneers.h>
 #include <tfm_ns_interface.h>
 
diff --git a/samples/zigbee/light_bulb/src/main.c b/samples/zigbee/light_bulb/src/main.c
index 5df74b93e626..1911f984930d 100644
--- a/samples/zigbee/light_bulb/src/main.c
+++ b/samples/zigbee/light_bulb/src/main.c
@@ -10,7 +10,7 @@
  */
 
 #include <zephyr/types.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <soc.h>
 #include <zephyr/drivers/pwm.h>
diff --git a/samples/zigbee/light_switch/src/main.c b/samples/zigbee/light_switch/src/main.c
index b8372504b1d5..2bec3ada9527 100644
--- a/samples/zigbee/light_switch/src/main.c
+++ b/samples/zigbee/light_switch/src/main.c
@@ -8,7 +8,7 @@
  * @brief Dimmer switch for HA profile implementation.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
 #include <dk_buttons_and_leds.h>
diff --git a/samples/zigbee/light_switch/src/nus_cmd.c b/samples/zigbee/light_switch/src/nus_cmd.c
index 6bef9f2c1881..3eda1c9d9217 100644
--- a/samples/zigbee/light_switch/src/nus_cmd.c
+++ b/samples/zigbee/light_switch/src/nus_cmd.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/uuid.h>
diff --git a/samples/zigbee/ncp/src/main.c b/samples/zigbee/ncp/src/main.c
index 6bf6dcb3ab01..fad0e34a5e3b 100644
--- a/samples/zigbee/ncp/src/main.c
+++ b/samples/zigbee/ncp/src/main.c
@@ -14,7 +14,7 @@
 #include <zephyr/logging/log.h>
 #include <zb_nrf_platform.h>
 #include <zb_osif_ext.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <dk_buttons_and_leds.h>
 #include <ncp/ncp_dev_api.h>
diff --git a/samples/zigbee/network_coordinator/src/main.c b/samples/zigbee/network_coordinator/src/main.c
index 83e8b44c4e68..a2905470daa0 100644
--- a/samples/zigbee/network_coordinator/src/main.c
+++ b/samples/zigbee/network_coordinator/src/main.c
@@ -8,7 +8,7 @@
  *  @brief Simple Zigbee network coordinator implementation
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
 #include <dk_buttons_and_leds.h>
diff --git a/samples/zigbee/shell/src/main.c b/samples/zigbee/shell/src/main.c
index 32c6c68fdd4b..9b5f828984a3 100644
--- a/samples/zigbee/shell/src/main.c
+++ b/samples/zigbee/shell/src/main.c
@@ -9,7 +9,7 @@
  * @brief Zigbee shell sample.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <dk_buttons_and_leds.h>
 
diff --git a/samples/zigbee/template/src/main.c b/samples/zigbee/template/src/main.c
index a3fcc9ceae4e..49822beb9933 100644
--- a/samples/zigbee/template/src/main.c
+++ b/samples/zigbee/template/src/main.c
@@ -9,7 +9,7 @@
  * @brief Zigbee application template.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <dk_buttons_and_leds.h>
 
diff --git a/subsys/app_event_manager/app_event_manager.c b/subsys/app_event_manager/app_event_manager.c
index 8aca3bfff883..aad3fe2fe5b6 100644
--- a/subsys/app_event_manager/app_event_manager.c
+++ b/subsys/app_event_manager/app_event_manager.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/spinlock.h>
 #include <zephyr/sys/slist.h>
 #include <app_event_manager.h>
diff --git a/subsys/app_event_manager/app_event_manager_priv.h b/subsys/app_event_manager/app_event_manager_priv.h
index 5be41fe8da96..41407f6821fb 100644
--- a/subsys/app_event_manager/app_event_manager_priv.h
+++ b/subsys/app_event_manager/app_event_manager_priv.h
@@ -12,7 +12,7 @@
 #ifndef _APP_EVENT_MANAGER_PRIV_H_
 #define _APP_EVENT_MANAGER_PRIV_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/logging/log.h>
diff --git a/subsys/bluetooth/controller/ecdh.c b/subsys/bluetooth/controller/ecdh.c
index 5f3dcefcd7e8..e73ac3322a5d 100644
--- a/subsys/bluetooth/controller/ecdh.c
+++ b/subsys/bluetooth/controller/ecdh.c
@@ -1,4 +1,4 @@
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/atomic.h>
 
 #include <zephyr/sys/byteorder.h>
diff --git a/subsys/bluetooth/gatt_dm.c b/subsys/bluetooth/gatt_dm.c
index 98fa7be0f17f..2d3a53d452d6 100644
--- a/subsys/bluetooth/gatt_dm.c
+++ b/subsys/bluetooth/gatt_dm.c
@@ -5,7 +5,7 @@
  */
 
 #include <inttypes.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 #include <bluetooth/gatt_dm.h>
diff --git a/subsys/bluetooth/rpc/client/bt_rpc_internal_client.c b/subsys/bluetooth/rpc/client/bt_rpc_internal_client.c
index 02cc59ceda82..09fa1fdc10b7 100644
--- a/subsys/bluetooth/rpc/client/bt_rpc_internal_client.c
+++ b/subsys/bluetooth/rpc/client/bt_rpc_internal_client.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <nrf_rpc_cbor.h>
 
diff --git a/subsys/bluetooth/rpc/common/bt_rpc_common.c b/subsys/bluetooth/rpc/common/bt_rpc_common.c
index 01fb922c2ef2..90992f0cf07a 100644
--- a/subsys/bluetooth/rpc/common/bt_rpc_common.c
+++ b/subsys/bluetooth/rpc/common/bt_rpc_common.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/types.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <nrf_rpc_cbor.h>
 
diff --git a/subsys/bluetooth/rpc/common/cbkproxy.c b/subsys/bluetooth/rpc/common/cbkproxy.c
index 1f6723a07bbe..500fbd1fd450 100644
--- a/subsys/bluetooth/rpc/common/cbkproxy.c
+++ b/subsys/bluetooth/rpc/common/cbkproxy.c
@@ -7,7 +7,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "cbkproxy.h"
 
diff --git a/subsys/bluetooth/rpc/host/bt_rpc_conn_host.c b/subsys/bluetooth/rpc/host/bt_rpc_conn_host.c
index 6d9aa4c51896..f2c74fcf4007 100644
--- a/subsys/bluetooth/rpc/host/bt_rpc_conn_host.c
+++ b/subsys/bluetooth/rpc/host/bt_rpc_conn_host.c
@@ -7,7 +7,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <nrf_rpc_cbor.h>
 
diff --git a/subsys/bluetooth/rpc/host/bt_rpc_crypto_host.c b/subsys/bluetooth/rpc/host/bt_rpc_crypto_host.c
index bc671dd5eb1a..edb8f5905cbf 100644
--- a/subsys/bluetooth/rpc/host/bt_rpc_crypto_host.c
+++ b/subsys/bluetooth/rpc/host/bt_rpc_crypto_host.c
@@ -6,7 +6,7 @@
 
 #include <nrf_rpc_cbor.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "bluetooth/crypto.h"
 
diff --git a/subsys/bluetooth/rpc/host/bt_rpc_gap_host.c b/subsys/bluetooth/rpc/host/bt_rpc_gap_host.c
index ff8c6e0cf3e7..62580edc730b 100644
--- a/subsys/bluetooth/rpc/host/bt_rpc_gap_host.c
+++ b/subsys/bluetooth/rpc/host/bt_rpc_gap_host.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/bluetooth/bluetooth.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <nrf_rpc_cbor.h>
 
diff --git a/subsys/bluetooth/rpc/host/bt_rpc_gatt_host.c b/subsys/bluetooth/rpc/host/bt_rpc_gatt_host.c
index 2815b71e1f19..bad77ed51c7a 100644
--- a/subsys/bluetooth/rpc/host/bt_rpc_gatt_host.c
+++ b/subsys/bluetooth/rpc/host/bt_rpc_gatt_host.c
@@ -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 <zephyr/bluetooth/att.h>
diff --git a/subsys/bluetooth/rpc/host/bt_rpc_internal_host.c b/subsys/bluetooth/rpc/host/bt_rpc_internal_host.c
index eaee19a71368..edc047230fc8 100644
--- a/subsys/bluetooth/rpc/host/bt_rpc_internal_host.c
+++ b/subsys/bluetooth/rpc/host/bt_rpc_internal_host.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zephyr/bluetooth/conn.h>
 #include <hci_core.h>
diff --git a/subsys/bluetooth/scan.c b/subsys/bluetooth/scan.c
index 77e14a0dfa16..e6f98328a06f 100644
--- a/subsys/bluetooth/scan.c
+++ b/subsys/bluetooth/scan.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <string.h>
 #include <bluetooth/scan.h>
diff --git a/subsys/bluetooth/services/alexa_gadgets/gadgets_profile.c b/subsys/bluetooth/services/alexa_gadgets/gadgets_profile.c
index 17b62395d412..4f71ee848f3c 100644
--- a/subsys/bluetooth/services/alexa_gadgets/gadgets_profile.c
+++ b/subsys/bluetooth/services/alexa_gadgets/gadgets_profile.c
@@ -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/gadgets.h>
diff --git a/subsys/bluetooth/services/bms.c b/subsys/bluetooth/services/bms.c
index 6e44375b992e..90dd4f2dbb78 100644
--- a/subsys/bluetooth/services/bms.c
+++ b/subsys/bluetooth/services/bms.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/subsys/bluetooth/services/ddfs.c b/subsys/bluetooth/services/ddfs.c
index 690e7a3db55d..c8c102b178f3 100644
--- a/subsys/bluetooth/services/ddfs.c
+++ b/subsys/bluetooth/services/ddfs.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/subsys/bluetooth/services/hids.c b/subsys/bluetooth/services/hids.c
index d5e4a4a1f9ce..1f04a2506498 100644
--- a/subsys/bluetooth/services/hids.c
+++ b/subsys/bluetooth/services/hids.c
@@ -9,7 +9,7 @@
 #include <zephyr/sys/byteorder.h>
 #include <stddef.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/subsys/bluetooth/services/lbs.c b/subsys/bluetooth/services/lbs.c
index 2985209c2c0a..1f5416a3d98e 100644
--- a/subsys/bluetooth/services/lbs.c
+++ b/subsys/bluetooth/services/lbs.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/subsys/bluetooth/services/rscs.c b/subsys/bluetooth/services/rscs.c
index f5053d2b06be..0eff598cba8f 100644
--- a/subsys/bluetooth/services/rscs.c
+++ b/subsys/bluetooth/services/rscs.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/subsys/caf/events/factory_reset_event.c b/subsys/caf/events/factory_reset_event.c
index 9ac95348e387..b71cebd72e4d 100644
--- a/subsys/caf/events/factory_reset_event.c
+++ b/subsys/caf/events/factory_reset_event.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <caf/events/factory_reset_event.h>
 
 
diff --git a/subsys/caf/events/force_power_down_event.c b/subsys/caf/events/force_power_down_event.c
index b19b8a10276f..4cd8a12d8f06 100644
--- a/subsys/caf/events/force_power_down_event.c
+++ b/subsys/caf/events/force_power_down_event.c
@@ -6,7 +6,7 @@
 
 #include <caf/events/force_power_down_event.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 
 static void profile_simple_event(struct log_event_buf *buf,
diff --git a/subsys/caf/events/keep_alive_event.c b/subsys/caf/events/keep_alive_event.c
index 0a043b7dce4f..a9148cfe9abd 100644
--- a/subsys/caf/events/keep_alive_event.c
+++ b/subsys/caf/events/keep_alive_event.c
@@ -6,7 +6,7 @@
 
 #include <caf/events/keep_alive_event.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 
 static void profile_simple_result_event(struct log_event_buf *buf,
diff --git a/subsys/caf/modules/click_detector.c b/subsys/caf/modules/click_detector.c
index 4ee4ac65d606..4e535e770b54 100644
--- a/subsys/caf/modules/click_detector.c
+++ b/subsys/caf/modules/click_detector.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define MODULE click_detector
 #include <caf/events/module_state_event.h>
diff --git a/subsys/caf/modules/factory_reset_request.c b/subsys/caf/modules/factory_reset_request.c
index ddd2df4d7d0b..cbe62016e923 100644
--- a/subsys/caf/modules/factory_reset_request.c
+++ b/subsys/caf/modules/factory_reset_request.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <app_event_manager.h>
 
 #include <caf/events/button_event.h>
diff --git a/subsys/caf/modules/leds.c b/subsys/caf/modules/leds.c
index e1a8e93a1ce7..006e295ccd74 100644
--- a/subsys/caf/modules/leds.c
+++ b/subsys/caf/modules/leds.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <assert.h>
 #include <zephyr/drivers/led.h>
 #include <zephyr/pm/device.h>
diff --git a/subsys/caf/modules/net_state_lte.c b/subsys/caf/modules/net_state_lte.c
index 2d08f05d1692..f32e8aea3122 100644
--- a/subsys/caf/modules/net_state_lte.c
+++ b/subsys/caf/modules/net_state_lte.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <modem/lte_lc.h>
 
 #define MODULE net_state
diff --git a/subsys/caf/modules/net_state_ot.c b/subsys/caf/modules/net_state_ot.c
index 87f29d7324cb..a38624c215dc 100644
--- a/subsys/caf/modules/net_state_ot.c
+++ b/subsys/caf/modules/net_state_ot.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 
 #include <zephyr/net/openthread.h>
diff --git a/subsys/caf/modules/power_manager.c b/subsys/caf/modules/power_manager.c
index 483a5fb4fd05..a56c3aa6badf 100644
--- a/subsys/caf/modules/power_manager.c
+++ b/subsys/caf/modules/power_manager.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/pm/pm.h>
 #include <zephyr/pm/policy.h>
diff --git a/subsys/caf/modules/sensor_data_aggregator.c b/subsys/caf/modules/sensor_data_aggregator.c
index 5a156ab20eba..8d653664d1ab 100644
--- a/subsys/caf/modules/sensor_data_aggregator.c
+++ b/subsys/caf/modules/sensor_data_aggregator.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 #include <app_event_manager.h>
 
diff --git a/subsys/caf/modules/sensor_manager.c b/subsys/caf/modules/sensor_manager.c
index 4ddd4b6c5c57..75e84c66ffb4 100644
--- a/subsys/caf/modules/sensor_manager.c
+++ b/subsys/caf/modules/sensor_manager.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <math.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/pm/device.h>
diff --git a/subsys/caf/modules/settings_loader.c b/subsys/caf/modules/settings_loader.c
index a1eab469c445..5f89f2602e8c 100644
--- a/subsys/caf/modules/settings_loader.c
+++ b/subsys/caf/modules/settings_loader.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/settings/settings.h>
 
 #include <app_event_manager.h>
diff --git a/subsys/dfu/dfu_target/src/dfu_target.c b/subsys/dfu/dfu_target/src/dfu_target.c
index 93e05735f3ea..35156ee1db61 100644
--- a/subsys/dfu/dfu_target/src/dfu_target.c
+++ b/subsys/dfu/dfu_target/src/dfu_target.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/dfu/mcuboot.h>
 #include <dfu/dfu_target.h>
diff --git a/subsys/dfu/dfu_target/src/dfu_target_full_modem.c b/subsys/dfu/dfu_target/src/dfu_target_full_modem.c
index bde6e9623461..ea33df852e65 100644
--- a/subsys/dfu/dfu_target/src/dfu_target_full_modem.c
+++ b/subsys/dfu/dfu_target/src/dfu_target_full_modem.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/logging/log.h>
 #include <dfu/dfu_target.h>
diff --git a/subsys/dfu/dfu_target/src/dfu_target_mcuboot.c b/subsys/dfu/dfu_target/src/dfu_target_mcuboot.c
index d4dd07801f75..b5e3d8f9e009 100644
--- a/subsys/dfu/dfu_target/src/dfu_target_mcuboot.c
+++ b/subsys/dfu/dfu_target/src/dfu_target_mcuboot.c
@@ -16,7 +16,7 @@
 #endif
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <pm_config.h>
 #include <zephyr/logging/log.h>
 #include <nrfx.h>
diff --git a/subsys/dfu/dfu_target/src/dfu_target_modem_delta.c b/subsys/dfu/dfu_target/src/dfu_target_modem_delta.c
index aae28acbca52..93b3dfbd7be3 100644
--- a/subsys/dfu/dfu_target/src/dfu_target_modem_delta.c
+++ b/subsys/dfu/dfu_target/src/dfu_target_modem_delta.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/flash.h>
 #include <nrf_modem_delta_dfu.h>
diff --git a/subsys/dfu/dfu_target/src/dfu_target_stream.c b/subsys/dfu/dfu_target/src/dfu_target_stream.c
index 8c1577d6f702..11e305a952af 100644
--- a/subsys/dfu/dfu_target/src/dfu_target_stream.c
+++ b/subsys/dfu/dfu_target/src/dfu_target_stream.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/storage/stream_flash.h>
 #include <stdio.h>
diff --git a/subsys/dm/dm.c b/subsys/dm/dm.c
index 274d576296b6..06a3463bcaac 100644
--- a/subsys/dm/dm.c
+++ b/subsys/dm/dm.c
@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 
 #include <mpsl_timeslot.h>
diff --git a/subsys/dm/dm_io.h b/subsys/dm/dm_io.h
index d707e759d939..47518fb41110 100644
--- a/subsys/dm/dm_io.h
+++ b/subsys/dm/dm_io.h
@@ -7,7 +7,7 @@
 #ifndef DM_IO_H_
 #define DM_IO_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <zephyr/types.h>
 
diff --git a/subsys/dm/timeslot_queue.c b/subsys/dm/timeslot_queue.c
index 5fd647e36571..be0043a1e545 100644
--- a/subsys/dm/timeslot_queue.c
+++ b/subsys/dm/timeslot_queue.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "timeslot_queue.h"
 #include <zephyr/logging/log.h>
 #include "time.h"
diff --git a/subsys/event_manager_proxy/event_manager_proxy.c b/subsys/event_manager_proxy/event_manager_proxy.c
index e30f523f87ad..d03af9e7283b 100644
--- a/subsys/event_manager_proxy/event_manager_proxy.c
+++ b/subsys/event_manager_proxy/event_manager_proxy.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/spinlock.h>
 #include <app_event_manager.h>
 #include <event_manager_proxy.h>
diff --git a/subsys/gazell/gzll_glue.c b/subsys/gazell/gzll_glue.c
index e7f242c6e9c3..33620949c381 100644
--- a/subsys/gazell/gzll_glue.c
+++ b/subsys/gazell/gzll_glue.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/clock_control.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
diff --git a/subsys/gazell/gzp_device.c b/subsys/gazell/gzp_device.c
index 970f46cec19e..b83f137a756b 100644
--- a/subsys/gazell/gzp_device.c
+++ b/subsys/gazell/gzp_device.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/settings/settings.h>
 #include <nrf_gzll.h>
 #include <gzp.h>
diff --git a/subsys/gazell/gzp_host.c b/subsys/gazell/gzp_host.c
index 24d96ddb532d..7d1e2191291d 100644
--- a/subsys/gazell/gzp_host.c
+++ b/subsys/gazell/gzp_host.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/settings/settings.h>
 #include <nrf_gzll.h>
 #include <gzp.h>
diff --git a/subsys/mgmt/fmfu/src/fmfu_mgmt.c b/subsys/mgmt/fmfu/src/fmfu_mgmt.c
index 2f627212eb58..e8def97c59fc 100644
--- a/subsys/mgmt/fmfu/src/fmfu_mgmt.c
+++ b/subsys/mgmt/fmfu/src/fmfu_mgmt.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <mgmt/mgmt.h>
 #include <nrfx_ipc.h>
diff --git a/subsys/mgmt/fmfu/src/fmfu_mgmt_stat.c b/subsys/mgmt/fmfu/src/fmfu_mgmt_stat.c
index d733f8504779..16afe25cffe7 100644
--- a/subsys/mgmt/fmfu/src/fmfu_mgmt_stat.c
+++ b/subsys/mgmt/fmfu/src/fmfu_mgmt_stat.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/stats/stats.h>
 #include <mgmt/mgmt.h>
 #include <stat_mgmt/stat_mgmt.h>
diff --git a/subsys/net/lib/aws_fota/include/aws_fota_json.h b/subsys/net/lib/aws_fota/include/aws_fota_json.h
index cc57b2e14c36..880486c8c07a 100644
--- a/subsys/net/lib/aws_fota/include/aws_fota_json.h
+++ b/subsys/net/lib/aws_fota/include/aws_fota_json.h
@@ -19,7 +19,7 @@
 extern "C" {
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 
 /** @brief The max JOB_ID_LEN according to AWS docs
diff --git a/subsys/net/lib/aws_fota/src/aws_fota.c b/subsys/net/lib/aws_fota/src/aws_fota.c
index 634068ec5f15..f8e7515f431e 100644
--- a/subsys/net/lib/aws_fota/src/aws_fota.c
+++ b/subsys/net/lib/aws_fota/src/aws_fota.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/data/json.h>
 #include <net/fota_download.h>
diff --git a/subsys/net/lib/aws_fota/src/aws_fota_json.c b/subsys/net/lib/aws_fota/src/aws_fota_json.c
index ac1da9eff7a8..d873924b6560 100644
--- a/subsys/net/lib/aws_fota/src/aws_fota_json.c
+++ b/subsys/net/lib/aws_fota/src/aws_fota_json.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <cJSON.h>
 #include <zephyr/sys/util.h>
diff --git a/subsys/net/lib/aws_jobs/src/aws_jobs.c b/subsys/net/lib/aws_jobs/src/aws_jobs.c
index 2d5ab102cf60..eea20082b13c 100644
--- a/subsys/net/lib/aws_jobs/src/aws_jobs.c
+++ b/subsys/net/lib/aws_jobs/src/aws_jobs.c
@@ -3,7 +3,7 @@
  *
  *SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/random/rand32.h>
 #include <stdio.h>
 #include <zephyr/net/mqtt.h>
diff --git a/subsys/net/lib/azure_iot_hub/src/azure_iot_hub_topic.c b/subsys/net/lib/azure_iot_hub/src/azure_iot_hub_topic.c
index 78b1b8ddba07..2ab1947f6f5b 100644
--- a/subsys/net/lib/azure_iot_hub/src/azure_iot_hub_topic.c
+++ b/subsys/net/lib/azure_iot_hub/src/azure_iot_hub_topic.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>
diff --git a/subsys/net/lib/coap_utils/coap_utils.c b/subsys/net/lib/coap_utils/coap_utils.c
index 711eced5f6f0..5f574bdf8194 100644
--- a/subsys/net/lib/coap_utils/coap_utils.c
+++ b/subsys/net/lib/coap_utils/coap_utils.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/net/coap.h>
 #include <net/coap_utils.h>
diff --git a/subsys/net/lib/download_client/src/coap.c b/subsys/net/lib/download_client/src/coap.c
index 488677ab2a89..b755b70106cd 100644
--- a/subsys/net/lib/download_client/src/coap.c
+++ b/subsys/net/lib/download_client/src/coap.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/coap.h>
 #include <net/download_client.h>
 #include <zephyr/logging/log.h>
diff --git a/subsys/net/lib/download_client/src/download_client.c b/subsys/net/lib/download_client/src/download_client.c
index 68bfe51ddfcf..97c7616a848c 100644
--- a/subsys/net/lib/download_client/src/download_client.c
+++ b/subsys/net/lib/download_client/src/download_client.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/toolchain/common.h>
 #if defined(CONFIG_POSIX_API)
diff --git a/subsys/net/lib/download_client/src/sanity.c b/subsys/net/lib/download_client/src/sanity.c
index fcfa0f50a3ae..df2032f6faf2 100644
--- a/subsys/net/lib/download_client/src/sanity.c
+++ b/subsys/net/lib/download_client/src/sanity.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define HOSTNAME_SIZE CONFIG_DOWNLOAD_CLIENT_MAX_HOSTNAME_SIZE
 #define FILENAME_SIZE CONFIG_DOWNLOAD_CLIENT_MAX_FILENAME_SIZE
diff --git a/subsys/net/lib/fota_download/src/fota_download.c b/subsys/net/lib/fota_download/src/fota_download.c
index 41d0d798fbc0..9cbd4abe6c32 100644
--- a/subsys/net/lib/fota_download/src/fota_download.c
+++ b/subsys/net/lib/fota_download/src/fota_download.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <net/fota_download.h>
 #include <net/download_client.h>
diff --git a/subsys/net/lib/ftp_client/src/ftp_client.c b/subsys/net/lib/ftp_client/src/ftp_client.c
index f7a64de365e5..668e60220626 100644
--- a/subsys/net/lib/ftp_client/src/ftp_client.c
+++ b/subsys/net/lib/ftp_client/src/ftp_client.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/subsys/net/lib/icalendar_parser/src/icalendar_parser.c b/subsys/net/lib/icalendar_parser/src/icalendar_parser.c
index 0a68dfb92cac..472ac31a7f47 100644
--- a/subsys/net/lib/icalendar_parser/src/icalendar_parser.c
+++ b/subsys/net/lib/icalendar_parser/src/icalendar_parser.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <strings.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <zephyr/toolchain/common.h>
 #include <net/icalendar_parser.h>
diff --git a/subsys/net/lib/lwm2m_client_utils/fota/settings.c b/subsys/net/lib/lwm2m_client_utils/fota/settings.c
index a8973ea40dd2..5691d391cbf6 100644
--- a/subsys/net/lib/lwm2m_client_utils/fota/settings.c
+++ b/subsys/net/lib/lwm2m_client_utils/fota/settings.c
@@ -5,7 +5,7 @@
  */
 
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/settings/settings.h>
 
 #include <net/lwm2m_client_utils_fota.h>
diff --git a/subsys/net/lib/lwm2m_client_utils/location/location_event_handler.c b/subsys/net/lib/lwm2m_client_utils/location/location_event_handler.c
index 73400706b1a1..5e61f2aba12a 100644
--- a/subsys/net/lib/lwm2m_client_utils/location/location_event_handler.c
+++ b/subsys/net/lib/lwm2m_client_utils/location/location_event_handler.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrf_modem_gnss.h>
 
 #include <zephyr/net/lwm2m_path.h>
diff --git a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_connmon.c b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_connmon.c
index 641ef9f4d527..8759899bec83 100644
--- a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_connmon.c
+++ b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_connmon.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <zephyr/net/lwm2m.h>
 #include <net/lwm2m_client_utils.h>
diff --git a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_device.c b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_device.c
index 3d27d600343f..3a53d936a2b2 100644
--- a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_device.c
+++ b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_device.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <version.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/sys/reboot.h>
diff --git a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_firmware.c b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_firmware.c
index 40a6932288b6..3d391b7eb7ea 100644
--- a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_firmware.c
+++ b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_firmware.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <nrf_modem.h>
 #include <zephyr/drivers/flash.h>
diff --git a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_security.c b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_security.c
index 770e563e78de..67af06f7b0cf 100644
--- a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_security.c
+++ b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_security.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/lwm2m.h>
 #include <net/lwm2m_client_utils.h>
 #include <lwm2m_engine.h>
diff --git a/subsys/net/lib/lwm2m_client_utils/lwm2m/neighbour_cell_info.c b/subsys/net/lib/lwm2m_client_utils/lwm2m/neighbour_cell_info.c
index fae52a4e6bf1..ade369d90454 100644
--- a/subsys/net/lib/lwm2m_client_utils/lwm2m/neighbour_cell_info.c
+++ b/subsys/net/lib/lwm2m_client_utils/lwm2m/neighbour_cell_info.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/subsys/net/lib/nrf_cloud/include/nrf_cloud_agps_schema_v1.h b/subsys/net/lib/nrf_cloud/include/nrf_cloud_agps_schema_v1.h
index f82a36030777..bac5da5d0272 100644
--- a/subsys/net/lib/nrf_cloud/include/nrf_cloud_agps_schema_v1.h
+++ b/subsys/net/lib/nrf_cloud/include/nrf_cloud_agps_schema_v1.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifndef NRF_CLOUD_AGPS_SCHEMA_V1_H_
 #define NRF_CLOUD_AGPS_SCHEMA_V1_H_
diff --git a/subsys/net/lib/nrf_cloud/include/nrf_cloud_client_id.h b/subsys/net/lib/nrf_cloud/include/nrf_cloud_client_id.h
index 46a01bb69f56..3d96b0a1a8a4 100644
--- a/subsys/net/lib/nrf_cloud/include/nrf_cloud_client_id.h
+++ b/subsys/net/lib/nrf_cloud/include/nrf_cloud_client_id.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifndef NRF_CLOUD_CLIENT_ID_H_
 #define NRF_CLOUD_CLIENT_ID_H_
diff --git a/subsys/net/lib/nrf_cloud/include/nrf_cloud_mem.h b/subsys/net/lib/nrf_cloud/include/nrf_cloud_mem.h
index 4b8a8ea7885a..ad669a732bd5 100644
--- a/subsys/net/lib/nrf_cloud/include/nrf_cloud_mem.h
+++ b/subsys/net/lib/nrf_cloud/include/nrf_cloud_mem.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /**@brief Method to allocate zero-initialized memory of size COUNT*SIZE, for
  * internal use in the module.
diff --git a/subsys/net/lib/nrf_cloud/include/nrf_cloud_pgps_schema_v1.h b/subsys/net/lib/nrf_cloud/include/nrf_cloud_pgps_schema_v1.h
index 0a01d5e8cb75..6927ba12f40e 100644
--- a/subsys/net/lib/nrf_cloud/include/nrf_cloud_pgps_schema_v1.h
+++ b/subsys/net/lib/nrf_cloud/include/nrf_cloud_pgps_schema_v1.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "nrf_cloud_agps_schema_v1.h"
 
 #ifndef NRF_CLOUD_PGPS_SCHEMA_V1_H_
diff --git a/subsys/net/lib/nrf_cloud/include/nrf_cloud_pgps_utils.h b/subsys/net/lib/nrf_cloud/include/nrf_cloud_pgps_utils.h
index e7357dc1f9c7..dfb3a80cf32b 100644
--- a/subsys/net/lib/nrf_cloud/include/nrf_cloud_pgps_utils.h
+++ b/subsys/net/lib/nrf_cloud/include/nrf_cloud_pgps_utils.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifndef NRF_CLOUD_PGPS_UTILS_H_
 #define NRF_CLOUD_PGPS_UTILS_H_
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_agps.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_agps.c
index e132614ddfd3..926c55cf061e 100644
--- a/subsys/net/lib/nrf_cloud/src/nrf_cloud_agps.c
+++ b/subsys/net/lib/nrf_cloud/src/nrf_cloud_agps.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 <nrf_modem_gnss.h>
 #include <cJSON.h>
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_agps_utils.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_agps_utils.c
index 386a6e88d328..75cf418bd9f8 100644
--- a/subsys/net/lib/nrf_cloud/src/nrf_cloud_agps_utils.c
+++ b/subsys/net/lib/nrf_cloud/src/nrf_cloud_agps_utils.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <net/nrf_cloud_agps.h>
 #include <nrf_modem_gnss.h>
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_cell_pos.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_cell_pos.c
index 86c616a8ae6a..0d89895dfe63 100644
--- a/subsys/net/lib/nrf_cloud/src/nrf_cloud_cell_pos.c
+++ b/subsys/net/lib/nrf_cloud/src/nrf_cloud_cell_pos.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/net/socket.h>
 #include <nrf_socket.h>
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_client_id.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_client_id.c
index 886f0c04b19d..0c122776a5c0 100644
--- a/subsys/net/lib/nrf_cloud/src/nrf_cloud_client_id.c
+++ b/subsys/net/lib/nrf_cloud/src/nrf_cloud_client_id.c
@@ -11,7 +11,7 @@
 #if defined(CONFIG_NRF_CLOUD_CLIENT_ID_SRC_IMEI)
 #include <nrf_modem_at.h>
 #endif
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <zephyr/logging/log.h>
 #include "nrf_cloud_client_id.h"
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_codec.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_codec.c
index 95ef2954b692..12cd918f7145 100644
--- a/subsys/net/lib/nrf_cloud/src/nrf_cloud_codec.c
+++ b/subsys/net/lib/nrf_cloud/src/nrf_cloud_codec.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <stdlib.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <modem/modem_info.h>
 #include "cJSON_os.h"
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_fota.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_fota.c
index ed2db15ae4ad..6decd559f917 100644
--- a/subsys/net/lib/nrf_cloud/src/nrf_cloud_fota.c
+++ b/subsys/net/lib/nrf_cloud/src/nrf_cloud_fota.c
@@ -9,7 +9,7 @@
 #include "nrf_cloud_transport.h"
 #include "nrf_cloud_codec.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_fsm.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_fsm.c
index 440d2ed62bd0..50a6e1571f9c 100644
--- a/subsys/net/lib/nrf_cloud/src/nrf_cloud_fsm.c
+++ b/subsys/net/lib/nrf_cloud/src/nrf_cloud_fsm.c
@@ -8,7 +8,7 @@
 #include "nrf_cloud_codec.h"
 #include "nrf_cloud_mem.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(nrf_cloud_fsm, CONFIG_NRF_CLOUD_LOG_LEVEL);
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_jwt.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_jwt.c
index 8a4063dcbc2a..e2a40bb3be1d 100644
--- a/subsys/net/lib/nrf_cloud/src/nrf_cloud_jwt.c
+++ b/subsys/net/lib/nrf_cloud/src/nrf_cloud_jwt.c
@@ -5,7 +5,7 @@
  */
 
 #include <net/nrf_cloud.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include "nrf_cloud_client_id.h"
 #include <modem/modem_jwt.h>
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_pgps.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_pgps.c
index 91aa8ce2a623..27acd42f6125 100644
--- a/subsys/net/lib/nrf_cloud/src/nrf_cloud_pgps.c
+++ b/subsys/net/lib/nrf_cloud/src/nrf_cloud_pgps.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrfx_nvmc.h>
 #include <zephyr/device.h>
 #include <zephyr/storage/stream_flash.h>
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_pgps_utils.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_pgps_utils.c
index d4656b35f353..83c894e69973 100644
--- a/subsys/net/lib/nrf_cloud/src/nrf_cloud_pgps_utils.c
+++ b/subsys/net/lib/nrf_cloud/src/nrf_cloud_pgps_utils.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <pm_config.h>
 #include <stdlib.h>
 
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_rest.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_rest.c
index 730ce45d3dee..0ee4797c1972 100644
--- a/subsys/net/lib/nrf_cloud/src/nrf_cloud_rest.c
+++ b/subsys/net/lib/nrf_cloud/src/nrf_cloud_rest.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <stdio.h>
 #if defined(CONFIG_POSIX_API)
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_transport.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_transport.c
index d4271504fa6a..1c431f60874d 100644
--- a/subsys/net/lib/nrf_cloud/src/nrf_cloud_transport.c
+++ b/subsys/net/lib/nrf_cloud/src/nrf_cloud_transport.c
@@ -11,7 +11,7 @@
 #include "nrf_cloud_fota.h"
 #endif
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <zephyr/net/mqtt.h>
diff --git a/subsys/net/lib/rest_client/src/rest_client.c b/subsys/net/lib/rest_client/src/rest_client.c
index f20d115957ed..2e4d7fb241ba 100644
--- a/subsys/net/lib/rest_client/src/rest_client.c
+++ b/subsys/net/lib/rest_client/src/rest_client.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
diff --git a/subsys/net/lib/zzhc/zzhc.c b/subsys/net/lib/zzhc/zzhc.c
index fe9618472a4c..33ec20532b49 100644
--- a/subsys/net/lib/zzhc/zzhc.c
+++ b/subsys/net/lib/zzhc/zzhc.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(zzhc, CONFIG_ZZHC_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/subsys/net/lib/zzhc/zzhc_port.c b/subsys/net/lib/zzhc/zzhc_port.c
index b9c26cc4e5dd..a25321eca2c2 100644
--- a/subsys/net/lib/zzhc/zzhc_port.c
+++ b/subsys/net/lib/zzhc/zzhc_port.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(zzhc_port, CONFIG_ZZHC_LOG_LEVEL);
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/base64.h>
 #include <zephyr/data/json.h>
 #include <modem/at_cmd_parser.h>
diff --git a/subsys/nfc/ndef/text_rec.c b/subsys/nfc/ndef/text_rec.c
index 7354289bdad0..ff4d148f86bd 100644
--- a/subsys/nfc/ndef/text_rec.c
+++ b/subsys/nfc/ndef/text_rec.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <nfc/ndef/text_rec.h>
 
diff --git a/subsys/nfc/ndef/tnep_rec.c b/subsys/nfc/ndef/tnep_rec.c
index 5ff3c557c174..913e48f51e42 100644
--- a/subsys/nfc/ndef/tnep_rec.c
+++ b/subsys/nfc/ndef/tnep_rec.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/byteorder.h>
 #include <nfc/ndef/tnep_rec.h>
diff --git a/subsys/nrf_profiler/profiler_nordic.c b/subsys/nrf_profiler/profiler_nordic.c
index ca66a6425769..9a04203b9852 100644
--- a/subsys/nrf_profiler/profiler_nordic.c
+++ b/subsys/nrf_profiler/profiler_nordic.c
@@ -8,7 +8,7 @@
 #include <zephyr/kernel_structs.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <SEGGER_RTT.h>
 #include <nrf_profiler.h>
 #include <string.h>
diff --git a/subsys/nrf_rpc/include/nrf_rpc_os.h b/subsys/nrf_rpc/include/nrf_rpc_os.h
index 7f69f9549788..5732f036956a 100644
--- a/subsys/nrf_rpc/include/nrf_rpc_os.h
+++ b/subsys/nrf_rpc/include/nrf_rpc_os.h
@@ -7,7 +7,7 @@
 #ifndef NRF_RPC_OS_H_
 #define NRF_RPC_OS_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 /**
  * @defgroup nrf_rpc_os_zephyr nRF PRC OS abstraction for Zephyr.
diff --git a/subsys/partition_manager/flash_map_partition_manager.c b/subsys/partition_manager/flash_map_partition_manager.c
index 7b5ec06f9d9f..f929ae060d09 100644
--- a/subsys/partition_manager/flash_map_partition_manager.c
+++ b/subsys/partition_manager/flash_map_partition_manager.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/storage/flash_map.h>
 #include <pm_config.h>
 #include <zephyr/sys/util_macro.h>
diff --git a/subsys/pcd/src/pcd.c b/subsys/pcd/src/pcd.c
index d2c96af08845..67eea78b8ef8 100644
--- a/subsys/pcd/src/pcd.c
+++ b/subsys/pcd/src/pcd.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 <dfu/pcd.h>
 #include <zephyr/logging/log.h>
diff --git a/subsys/spm/secure_services.c b/subsys/spm/secure_services.c
index 93b74b7d5aae..ddf9b25872a3 100644
--- a/subsys/spm/secure_services.c
+++ b/subsys/spm/secure_services.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 #include <aarch32/cortex_m/tz.h>
 #include <zephyr/sys/reboot.h>
diff --git a/subsys/spm/spm.c b/subsys/spm/spm.c
index 4fb17212c7ca..b81b23edc782 100644
--- a/subsys/spm/spm.c
+++ b/subsys/spm/spm.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/linker/linker-defs.h>
diff --git a/subsys/spm/spm_internal.h b/subsys/spm/spm_internal.h
index 3fda3203795a..422e7dba2e4d 100644
--- a/subsys/spm/spm_internal.h
+++ b/subsys/spm/spm_internal.h
@@ -7,7 +7,7 @@
 #ifndef SPM_INTERNAL_H__
 #define SPM_INTERNAL_H__
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <nrfx.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/__assert.h>
diff --git a/subsys/zigbee/lib/zigbee_fota/src/zigbee_fota.c b/subsys/zigbee/lib/zigbee_fota/src/zigbee_fota.c
index c0148c4632c2..12105cf2c80f 100644
--- a/subsys/zigbee/lib/zigbee_fota/src/zigbee_fota.c
+++ b/subsys/zigbee/lib/zigbee_fota/src/zigbee_fota.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/dfu/mcuboot.h>
 #include <dfu/dfu_target.h>
diff --git a/subsys/zigbee/osif/zb_nrf_transceiver.c b/subsys/zigbee/osif/zb_nrf_transceiver.c
index bfab682ecbad..699f3a4c0a0f 100644
--- a/subsys/zigbee/osif/zb_nrf_transceiver.c
+++ b/subsys/zigbee/osif/zb_nrf_transceiver.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/tests/bluetooth/tester/src/bttester.c b/tests/bluetooth/tester/src/bttester.c
index 22ecfd186677..5212c5b0d5c8 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 74e1bc84d886..2bd20e946bc0 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/lib/at_sms_cert/src/main.c b/tests/lib/at_sms_cert/src/main.c
index 6c458500e2ae..79daa73256d2 100644
--- a/tests/lib/at_sms_cert/src/main.c
+++ b/tests/lib/at_sms_cert/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/lib/edge_impulse/src/edge_impulse_zip/ei_test_params.h b/tests/lib/edge_impulse/src/edge_impulse_zip/ei_test_params.h
index f26708847a30..84dacf8fefa8 100644
--- a/tests/lib/edge_impulse/src/edge_impulse_zip/ei_test_params.h
+++ b/tests/lib/edge_impulse/src/edge_impulse_zip/ei_test_params.h
@@ -7,7 +7,7 @@
 #ifndef _EI_TEST_PARAMS_H_
 #define _EI_TEST_PARAMS_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 
 /* Float comparison tolerance. */
diff --git a/tests/lib/lte_lc/src/main.c b/tests/lib/lte_lc/src/main.c
index 6fd68c77f9cd..6daec1f5e471 100644
--- a/tests/lib/lte_lc/src/main.c
+++ b/tests/lib/lte_lc/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/subsys/app_event_manager/src/modules/test_basic.c b/tests/subsys/app_event_manager/src/modules/test_basic.c
index 41f461fb8772..07a73d234a48 100644
--- a/tests/subsys/app_event_manager/src/modules/test_basic.c
+++ b/tests/subsys/app_event_manager/src/modules/test_basic.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 
 #include <test_events.h>
diff --git a/tests/subsys/app_event_manager/src/modules/test_data.c b/tests/subsys/app_event_manager/src/modules/test_data.c
index 832c6531f355..d513de043555 100644
--- a/tests/subsys/app_event_manager/src/modules/test_data.c
+++ b/tests/subsys/app_event_manager/src/modules/test_data.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 #include <string.h>
 
diff --git a/tests/subsys/app_event_manager/src/modules/test_multicontext.c b/tests/subsys/app_event_manager/src/modules/test_multicontext.c
index 0a10eedb621a..fa6fc8619830 100644
--- a/tests/subsys/app_event_manager/src/modules/test_multicontext.c
+++ b/tests/subsys/app_event_manager/src/modules/test_multicontext.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 
 #include <test_events.h>
diff --git a/tests/subsys/app_event_manager/src/modules/test_multicontext_config.h b/tests/subsys/app_event_manager/src/modules/test_multicontext_config.h
index 803a258e6b1e..1d36b6ccb04e 100644
--- a/tests/subsys/app_event_manager/src/modules/test_multicontext_config.h
+++ b/tests/subsys/app_event_manager/src/modules/test_multicontext_config.h
@@ -6,7 +6,7 @@
 
 /* TEST_MULTICONTEXT */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define THREAD1_PRIORITY K_PRIO_COOP(1)
 #define THREAD2_PRIORITY K_PRIO_COOP(2)
diff --git a/tests/subsys/app_event_manager/src/modules/test_multicontext_handler.c b/tests/subsys/app_event_manager/src/modules/test_multicontext_handler.c
index af044af35ef4..ff1b659ff32a 100644
--- a/tests/subsys/app_event_manager/src/modules/test_multicontext_handler.c
+++ b/tests/subsys/app_event_manager/src/modules/test_multicontext_handler.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 
 #include <test_events.h>
diff --git a/tests/subsys/app_event_manager/src/modules/test_oom.c b/tests/subsys/app_event_manager/src/modules/test_oom.c
index 74e8115e729c..1eea7cfafe17 100644
--- a/tests/subsys/app_event_manager/src/modules/test_oom.c
+++ b/tests/subsys/app_event_manager/src/modules/test_oom.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 
 #include <test_events.h>
diff --git a/tests/subsys/app_event_manager/src/modules/test_subs.c b/tests/subsys/app_event_manager/src/modules/test_subs.c
index d7dcaae4387e..c1c4e44099f2 100644
--- a/tests/subsys/app_event_manager/src/modules/test_subs.c
+++ b/tests/subsys/app_event_manager/src/modules/test_subs.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 
 #include <test_events.h>
diff --git a/tests/subsys/app_event_manager/src/utils/test_event_allocator.c b/tests/subsys/app_event_manager/src/utils/test_event_allocator.c
index d974e57d50dc..7bc1714d4507 100644
--- a/tests/subsys/app_event_manager/src/utils/test_event_allocator.c
+++ b/tests/subsys/app_event_manager/src/utils/test_event_allocator.c
@@ -5,7 +5,7 @@
  */
 
 #include "test_oom.h"
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 void *app_event_manager_alloc(size_t size)
 {
diff --git a/tests/subsys/net/lib/azure_iot_hub/src/main.c b/tests/subsys/net/lib/azure_iot_hub/src/main.c
index c3b05fede034..88129995125d 100644
--- a/tests/subsys/net/lib/azure_iot_hub/src/main.c
+++ b/tests/subsys/net/lib/azure_iot_hub/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <ztest.h>
 #include <net/azure_iot_hub.h>
 
diff --git a/tests/subsys/net/lib/download_client/src/main.c b/tests/subsys/net/lib/download_client/src/main.c
index b0615292a10c..3a6505464ad3 100644
--- a/tests/subsys/net/lib/download_client/src/main.c
+++ b/tests/subsys/net/lib/download_client/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/net/socket_offload.h>
 
 #include <ztest.h>
diff --git a/tests/subsys/net/lib/download_client/src/mock/dl_coap.h b/tests/subsys/net/lib/download_client/src/mock/dl_coap.h
index e1e0ef989424..05301a825d5f 100644
--- a/tests/subsys/net/lib/download_client/src/mock/dl_coap.h
+++ b/tests/subsys/net/lib/download_client/src/mock/dl_coap.h
@@ -6,7 +6,7 @@
 #ifndef _DL_COAP_H_
 #define _DL_COAP_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 struct override_return_values_s {
 	bool func_coap_block_init;
diff --git a/tests/subsys/net/lib/download_client/src/mock/dl_http.h b/tests/subsys/net/lib/download_client/src/mock/dl_http.h
index 771b3aeff24a..b17f62c63506 100644
--- a/tests/subsys/net/lib/download_client/src/mock/dl_http.h
+++ b/tests/subsys/net/lib/download_client/src/mock/dl_http.h
@@ -6,7 +6,7 @@
 #ifndef _DL_HTTP_H_
 #define _DL_HTTP_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 int http_parse(struct download_client *client, size_t len);
 int http_get_request_send(struct download_client *client);
diff --git a/tests/subsys/net/lib/download_client/src/mock/socket.h b/tests/subsys/net/lib/download_client/src/mock/socket.h
index 47f003b871c5..11b58da1a0d8 100644
--- a/tests/subsys/net/lib/download_client/src/mock/socket.h
+++ b/tests/subsys/net/lib/download_client/src/mock/socket.h
@@ -6,7 +6,7 @@
 #ifndef _SOCKET_H_
 #define _SOCKET_H_
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 extern struct mock_socket_iface_data mock_socket_iface_data;
 extern struct net_if_api mock_if_api;
diff --git a/tests/subsys/net/lib/fota_download/src/main.c b/tests/subsys/net/lib/fota_download/src/main.c
index cbbf12c01512..251ba5b50d73 100644
--- a/tests/subsys/net/lib/fota_download/src/main.c
+++ b/tests/subsys/net/lib/fota_download/src/main.c
@@ -168,7 +168,7 @@ void set_s0_active(bool s0_active)
  * where 'fw_info.h' will look for the S0 and S1 metadata. This allows
  * us to dictate what B1 slot should be considered active
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/flash.h>
 #include <nrfx_nvmc.h>
 #include <zephyr/device.h>
diff --git a/tests/subsys/zigbee/zboss_api/alarm_api/src/main.c b/tests/subsys/zigbee/zboss_api/alarm_api/src/main.c
index 47d68b350edf..aa221d4f4ebf 100644
--- a/tests/subsys/zigbee/zboss_api/alarm_api/src/main.c
+++ b/tests/subsys/zigbee/zboss_api/alarm_api/src/main.c
@@ -6,7 +6,7 @@
 
 #include <ztest.h>
 #include <zephyr/types.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zboss_api.h>
 #include <zigbee/zigbee_app_utils.h>
diff --git a/tests/subsys/zigbee/zboss_api/callback_api/src/main.c b/tests/subsys/zigbee/zboss_api/callback_api/src/main.c
index 9b3785aefbba..efd05e880945 100644
--- a/tests/subsys/zigbee/zboss_api/callback_api/src/main.c
+++ b/tests/subsys/zigbee/zboss_api/callback_api/src/main.c
@@ -6,7 +6,7 @@
 
 #include <ztest.h>
 #include <zephyr/types.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <zboss_api.h>
 #include <zigbee/zigbee_app_utils.h>
diff --git a/tests/unity/src/generic_teardown.c b/tests/unity/src/generic_teardown.c
index 8422d58a675f..aa6d05d799ed 100644
--- a/tests/unity/src/generic_teardown.c
+++ b/tests/unity/src/generic_teardown.c
@@ -8,7 +8,7 @@
  * @file
  * @brief Additional Unity support code for the native_posix board.
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #ifdef CONFIG_BOARD_NATIVE_POSIX
 #include "posix_board_if.h"
 #endif