diff --git a/src/ocre/api/ocre_common.c b/src/ocre/api/ocre_common.c
index 7117f915..6d26d16e 100644
--- a/src/ocre/api/ocre_common.c
+++ b/src/ocre/api/ocre_common.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 LOG_MODULE_DECLARE(ocre_cs_component, OCRE_LOG_LEVEL);
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include "../../../../../wasm-micro-runtime/core/iwasm/include/lib_export.h"
 #include "bh_log.h"
 #include "../ocre_timers/ocre_timer.h"
diff --git a/src/shared/platform/zephyr/core_internal.h b/src/shared/platform/zephyr/core_internal.h
index 0415e8df..87e0cddb 100644
--- a/src/shared/platform/zephyr/core_internal.h
+++ b/src/shared/platform/zephyr/core_internal.h
@@ -15,9 +15,9 @@
 #include <zephyr/device.h>
 #include <zephyr/kernel/mm.h>
 
-#include <version.h>
-#include <app_version.h>
-#include <autoconf.h>
+#include <zephyr/version.h>
+#include <zephyr/app_version.h>
+#include <zephyr/autoconf.h>
 
 // clang-format off