diff --git a/code/nrf-connect/prstlib/include/prstlib/led.h b/code/nrf-connect/prstlib/include/prstlib/led.h
index ec81070..ddff5c2 100644
--- a/code/nrf-connect/prstlib/include/prstlib/led.h
+++ b/code/nrf-connect/prstlib/include/prstlib/led.h
@@ -1,8 +1,8 @@
 #ifndef _PRST_LED_H_
 #define _PRST_LED_H_
 
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "prstlib/macros.h"
 
diff --git a/code/nrf-connect/prstlib/src/adc.c b/code/nrf-connect/prstlib/src/adc.c
index 6cb9101..aa89a98 100644
--- a/code/nrf-connect/prstlib/src/adc.c
+++ b/code/nrf-connect/prstlib/src/adc.c
@@ -1,10 +1,10 @@
 #include "prstlib/adc.h"
 
-#include <drivers/adc.h>
-#include <drivers/gpio.h>
-#include <drivers/pwm.h>
-#include <logging/log.h>
 #include <math.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/zephyr.h>
 
 #include "prstlib/macros.h"
diff --git a/code/nrf-connect/prstlib/src/button.c b/code/nrf-connect/prstlib/src/button.c
index d9e352d..a27eda2 100644
--- a/code/nrf-connect/prstlib/src/button.c
+++ b/code/nrf-connect/prstlib/src/button.c
@@ -1,7 +1,7 @@
 #include "prstlib/button.h"
 
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "prstlib/led.h"
 #include "prstlib/macros.h"
diff --git a/code/nrf-connect/prstlib/src/led.c b/code/nrf-connect/prstlib/src/led.c
index 8b16afd..415296f 100644
--- a/code/nrf-connect/prstlib/src/led.c
+++ b/code/nrf-connect/prstlib/src/led.c
@@ -1,6 +1,6 @@
 #include "prstlib/led.h"
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "prstlib/macros.h"
 
diff --git a/code/nrf-connect/prstlib/src/sensors.c b/code/nrf-connect/prstlib/src/sensors.c
index 0522679..8b8cc2a 100644
--- a/code/nrf-connect/prstlib/src/sensors.c
+++ b/code/nrf-connect/prstlib/src/sensors.c
@@ -1,6 +1,6 @@
 #include "prstlib/sensors.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "prstlib/adc.h"
 #include "prstlib/led.h"
diff --git a/code/nrf-connect/prstlib/src/shtc3.c b/code/nrf-connect/prstlib/src/shtc3.c
index e17aad0..722e817 100644
--- a/code/nrf-connect/prstlib/src/shtc3.c
+++ b/code/nrf-connect/prstlib/src/shtc3.c
@@ -1,7 +1,7 @@
 #include "prstlib/shtc3.h"
 
-#include <drivers/i2c.h>
-#include <logging/log.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/zephyr.h>
 
 #include "prstlib/macros.h"
diff --git a/code/nrf-connect/samples/ble/src/ble.c b/code/nrf-connect/samples/ble/src/ble.c
index 1d84a83..5d9077c 100644
--- a/code/nrf-connect/samples/ble/src/ble.c
+++ b/code/nrf-connect/samples/ble/src/ble.c
@@ -1,8 +1,8 @@
 #include "ble.h"
 
-#include <logging/log.h>
 #include <prstlib/macros.h>
 #include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/settings/settings.h>
 
 #include "encoding.h"
diff --git a/code/nrf-connect/samples/ble/src/encoding.c b/code/nrf-connect/samples/ble/src/encoding.c
index 45f69e0..d802200 100644
--- a/code/nrf-connect/samples/ble/src/encoding.c
+++ b/code/nrf-connect/samples/ble/src/encoding.c
@@ -1,7 +1,7 @@
 #include "encoding.h"
 
-#include <logging/log.h>
 #include <prstlib/macros.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(ble, LOG_LEVEL_INF);
 
diff --git a/code/nrf-connect/samples/ble/src/main.c b/code/nrf-connect/samples/ble/src/main.c
index ef2e770..4ad9c5b 100644
--- a/code/nrf-connect/samples/ble/src/main.c
+++ b/code/nrf-connect/samples/ble/src/main.c
@@ -1,10 +1,10 @@
-#include <logging/log.h>
 #include <prstlib/adc.h>
 #include <prstlib/button.h>
 #include <prstlib/led.h>
 #include <prstlib/macros.h>
 #include <prstlib/sensors.h>
 #include <prstlib/shtc3.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/pm.h>
 #include <zephyr/pm/policy.h>
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 22a48f8..b748d23 100644
--- a/code/nrf-connect/samples/soil_read_loop/src/main.c
+++ b/code/nrf-connect/samples/soil_read_loop/src/main.c
@@ -1,8 +1,8 @@
-#include <drivers/adc.h>
-#include <drivers/gpio.h>
-#include <drivers/pwm.h>
-#include <logging/log.h>
 #include <prstlib/macros.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/zephyr.h>
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);