diff --git a/code/nrf-connect/prstlib/include/prstlib/led.h b/code/nrf-connect/prstlib/include/prstlib/led.h
index ddff5c2..83fd27f 100644
--- a/code/nrf-connect/prstlib/include/prstlib/led.h
+++ b/code/nrf-connect/prstlib/include/prstlib/led.h
@@ -2,6 +2,7 @@
 #define _PRST_LED_H_
 
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
 #include "prstlib/macros.h"
diff --git a/code/nrf-connect/samples/ble/src/main.c b/code/nrf-connect/samples/ble/src/main.c
index 4ad9c5b..1557700 100644
--- a/code/nrf-connect/samples/ble/src/main.c
+++ b/code/nrf-connect/samples/ble/src/main.c
@@ -4,11 +4,11 @@
 #include <prstlib/macros.h>
 #include <prstlib/sensors.h>
 #include <prstlib/shtc3.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/pm.h>
 #include <zephyr/pm/policy.h>
-#include <zephyr/zephyr.h>
 
 #include "ble.h"
 
diff --git a/code/nrf-connect/samples/blinky/src/main.c b/code/nrf-connect/samples/blinky/src/main.c
index 5fed333..9924a3e 100644
--- a/code/nrf-connect/samples/blinky/src/main.c
+++ b/code/nrf-connect/samples/blinky/src/main.c
@@ -1,5 +1,5 @@
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define SLEEP_TIME_MS 1000
 
diff --git a/code/nrf-connect/samples/soil_read_loop/src/main.c b/code/nrf-connect/samples/soil_read_loop/src/main.c
index b748d23..7fc1c08 100644
--- a/code/nrf-connect/samples/soil_read_loop/src/main.c
+++ b/code/nrf-connect/samples/soil_read_loop/src/main.c
@@ -2,8 +2,8 @@
 #include <zephyr/drivers/adc.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/pwm.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);