diff --git a/app/src/main.c b/app/src/main.c
index d1d9e9a..27ab1c9 100644
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 
 #include "app_version.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main, CONFIG_APP_LOG_LEVEL);
 
 void main(void)
diff --git a/drivers/sensor/examplesensor/examplesensor.c b/drivers/sensor/examplesensor/examplesensor.c
index 83cd4cb..0e35e20 100644
--- a/drivers/sensor/examplesensor/examplesensor.c
+++ b/drivers/sensor/examplesensor/examplesensor.c
@@ -5,11 +5,11 @@
 
 #define DT_DRV_COMPAT zephyr_examplesensor
 
-#include <device.h>
-#include <drivers/gpio.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/sensor.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(examplesensor, CONFIG_SENSOR_LOG_LEVEL);
 
 struct examplesensor_data {