diff --git a/lib/system/zephyr/alloc.h b/lib/system/zephyr/alloc.h
index b200461..9e0213d 100644
--- a/lib/system/zephyr/alloc.h
+++ b/lib/system/zephyr/alloc.h
@@ -16,7 +16,7 @@
 #ifndef __METAL_ZEPHYR_ALLOC__H__
 #define __METAL_ZEPHYR_ALLOC__H__
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 
 #ifdef __cplusplus
diff --git a/lib/system/zephyr/assert.h b/lib/system/zephyr/assert.h
index 88f321c..7c88b79 100644
--- a/lib/system/zephyr/assert.h
+++ b/lib/system/zephyr/assert.h
@@ -16,7 +16,7 @@
 #ifndef __METAL_ZEPHYR_ASSERT__H__
 #define __METAL_ZEPHYR_ASSERT__H__
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 /**
  * @brief Assertion macro for Zephyr-based applications.
diff --git a/lib/system/zephyr/cache.h b/lib/system/zephyr/cache.h
index 700d6e5..164bff0 100644
--- a/lib/system/zephyr/cache.h
+++ b/lib/system/zephyr/cache.h
@@ -16,7 +16,7 @@
 #ifndef __METAL_ZEPHYR_CACHE__H__
 #define __METAL_ZEPHYR_CACHE__H__
 
-#include <cache.h>
+#include <zephyr/cache.h>
 #include <metal/utilities.h>
 
 #ifdef __cplusplus
diff --git a/lib/system/zephyr/log.c b/lib/system/zephyr/log.c
index 81e3379..9761a9d 100644
--- a/lib/system/zephyr/log.c
+++ b/lib/system/zephyr/log.c
@@ -11,7 +11,7 @@
 
 #include <stdarg.h>
 #include <metal/log.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 static const char * const level_strs[] = {
 	"metal: emergency: ",
diff --git a/lib/system/zephyr/mutex.h b/lib/system/zephyr/mutex.h
index 3572494..a7876bc 100644
--- a/lib/system/zephyr/mutex.h
+++ b/lib/system/zephyr/mutex.h
@@ -17,7 +17,7 @@
 #define __METAL_ZEPHYR_MUTEX__H__
 
 #include <metal/atomic.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/system/zephyr/sleep.h b/lib/system/zephyr/sleep.h
index ac269dc..55b3b96 100644
--- a/lib/system/zephyr/sleep.h
+++ b/lib/system/zephyr/sleep.h
@@ -16,7 +16,7 @@
 #ifndef __METAL_ZEPHYR_SLEEP__H__
 #define __METAL_ZEPHYR_SLEEP__H__
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/system/zephyr/sys.c b/lib/system/zephyr/sys.c
index 4c0f63b..18dacea 100644
--- a/lib/system/zephyr/sys.c
+++ b/lib/system/zephyr/sys.c
@@ -12,7 +12,7 @@
 #include <metal/io.h>
 #include <metal/sys.h>
 
-#include <sys/arch_interface.h>
+#include <zephyr/sys/arch_interface.h>
 
 /**
  * @brief poll function until some event happens
diff --git a/lib/system/zephyr/time.c b/lib/system/zephyr/time.c
index 93a30a7..16ef980 100644
--- a/lib/system/zephyr/time.c
+++ b/lib/system/zephyr/time.c
@@ -10,7 +10,7 @@
  */
 
 #include <metal/time.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 unsigned long long metal_get_timestamp(void)
 {
diff --git a/test/system/zephyr/alloc.c b/test/system/zephyr/alloc.c
index d96c257..0f7009b 100644
--- a/test/system/zephyr/alloc.c
+++ b/test/system/zephyr/alloc.c
@@ -10,7 +10,7 @@
 #include <metal/errno.h>
 #include <metal/log.h>
 #include <metal/sys.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include "metal-test-internal.h"
 
 static int alloc(void)
diff --git a/test/system/zephyr/main.c b/test/system/zephyr/main.c
index e92b53b..1b5b0ef 100644
--- a/test/system/zephyr/main.c
+++ b/test/system/zephyr/main.c
@@ -5,9 +5,9 @@
  */
 
 #include "metal-test-internal.h"
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <metal/log.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>