diff --git a/src/init/init.c b/src/init/init.c
index cdfa2b6ef794..af854921271d 100644
--- a/src/init/init.c
+++ b/src/init/init.c
@@ -38,7 +38,7 @@
 #include <zephyr/logging/log_ctrl.h>
 #include <user/abi_dbg.h>
 #include <sof_versions.h>
-#include <version.h>
+#include <zephyr/version.h>
 #endif
 #include <sof/lib/ams.h>
 
diff --git a/src/ipc/ipc-zephyr.c b/src/ipc/ipc-zephyr.c
index 49a448850a99..aa46baec36f3 100644
--- a/src/ipc/ipc-zephyr.c
+++ b/src/ipc/ipc-zephyr.c
@@ -9,7 +9,7 @@
 //         Andrey Borisovich <andrey.borisovich@intel.com>
 //         Adrian Warecki <adrian.warecki@intel.com>
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 #include <intel_adsp_ipc.h>
 #include <sof/ipc/common.h>
diff --git a/src/trace/dma-trace.c b/src/trace/dma-trace.c
index 9d4351c8e8d0..f8aa1c2f96ff 100644
--- a/src/trace/dma-trace.c
+++ b/src/trace/dma-trace.c
@@ -29,7 +29,7 @@
 #include <sof_versions.h>
 
 #ifdef __ZEPHYR__
-#include <version.h>
+#include <zephyr/version.h>
 #endif
 
 #include <errno.h>
diff --git a/zephyr/lib/alloc.c b/zephyr/lib/alloc.c
index ce0dd5401853..31344c972fd6 100644
--- a/zephyr/lib/alloc.c
+++ b/zephyr/lib/alloc.c
@@ -24,7 +24,7 @@
 #include <zephyr/init.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/policy.h>
-#include <version.h>
+#include <zephyr/version.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/cache.h>
 
diff --git a/zephyr/lib/cpu.c b/zephyr/lib/cpu.c
index 9424cdc140e2..ee38cc1a164b 100644
--- a/zephyr/lib/cpu.c
+++ b/zephyr/lib/cpu.c
@@ -17,7 +17,7 @@
 #include <rtos/alloc.h>
 
 /* Zephyr includes */
-#include <version.h>
+#include <zephyr/version.h>
 #include <zephyr/kernel.h>
 #include <zephyr/kernel/smp.h>
 #include <zephyr/device.h>
diff --git a/zephyr/wrapper.c b/zephyr/wrapper.c
index 0d4644ffdfb2..d912e3d8aba2 100644
--- a/zephyr/wrapper.c
+++ b/zephyr/wrapper.c
@@ -29,7 +29,7 @@
 #include <zephyr/kernel_structs.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/policy.h>
-#include <version.h>
+#include <zephyr/version.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>