diff --git a/smex/CMakeLists.txt b/smex/CMakeLists.txt
index 631104982d51..1b2ed57bf8c8 100644
--- a/smex/CMakeLists.txt
+++ b/smex/CMakeLists.txt
@@ -22,7 +22,10 @@ target_compile_options(smex PRIVATE
 	-Wall -Werror -Wl,-EL -Wmissing-prototypes -Wimplicit-fallthrough=3
 )
 
+# TODO: The xtos-wrapper include PATH will eventually become optional based on the
+# RTOS selection. It's manadatory atm until the native Zephyr integration is ready.
 target_include_directories(smex PRIVATE
 	"${SOF_ROOT_SOURCE_DIRECTORY}/src/include"
 	"${SOF_ROOT_SOURCE_DIRECTORY}/rimage/src/include"
+	"${SOF_ROOT_SOURCE_DIRECTORY}/src/arch/xtos-wrapper/include"
 )
diff --git a/src/arch/xtensa/CMakeLists.txt b/src/arch/xtensa/CMakeLists.txt
index e6aff9fabc83..c41df557d207 100644
--- a/src/arch/xtensa/CMakeLists.txt
+++ b/src/arch/xtensa/CMakeLists.txt
@@ -60,9 +60,12 @@ if(CONFIG_REMBRANDT)
 endif()
 # includes
 
+# TODO: The xtos-wrapper include PATH will eventually become optional based on the
+# RTOS selection. It's manadatory atm until the native Zephyr integration is ready.
 target_include_directories(sof_options INTERFACE
 	${PROJECT_SOURCE_DIR}/src/arch/xtensa/include
 	${PROJECT_SOURCE_DIR}/src/arch/xtensa/xtos
+	${PROJECT_SOURCE_DIR}/src/arch/xtos-wrapper/include
 )
 
 target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/src/platform/${platform_folder}/include)
diff --git a/src/arch/xtensa/init.c b/src/arch/xtensa/init.c
index 51ec1f802edb..dea8c9ba0e01 100644
--- a/src/arch/xtensa/init.c
+++ b/src/arch/xtensa/init.c
@@ -16,7 +16,7 @@
 #include <sof/init.h>
 #include <sof/lib/cpu.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 #include <ipc/trace.h>
 
diff --git a/src/include/sof/atomic.h b/src/arch/xtos-wrapper/include/sof/atomic.h
similarity index 100%
rename from src/include/sof/atomic.h
rename to src/arch/xtos-wrapper/include/sof/atomic.h
diff --git a/src/include/sof/bit.h b/src/arch/xtos-wrapper/include/sof/bit.h
similarity index 100%
rename from src/include/sof/bit.h
rename to src/arch/xtos-wrapper/include/sof/bit.h
diff --git a/src/include/sof/compiler_attributes.h b/src/arch/xtos-wrapper/include/sof/compiler_attributes.h
similarity index 100%
rename from src/include/sof/compiler_attributes.h
rename to src/arch/xtos-wrapper/include/sof/compiler_attributes.h
diff --git a/src/include/sof/compiler_info.h b/src/arch/xtos-wrapper/include/sof/compiler_info.h
similarity index 100%
rename from src/include/sof/compiler_info.h
rename to src/arch/xtos-wrapper/include/sof/compiler_info.h
diff --git a/src/include/sof/init.h b/src/arch/xtos-wrapper/include/sof/init.h
similarity index 100%
rename from src/include/sof/init.h
rename to src/arch/xtos-wrapper/include/sof/init.h
diff --git a/src/include/sof/lib/agent.h b/src/arch/xtos-wrapper/include/sof/lib/agent.h
similarity index 100%
rename from src/include/sof/lib/agent.h
rename to src/arch/xtos-wrapper/include/sof/lib/agent.h
diff --git a/src/include/sof/lib/alloc.h b/src/arch/xtos-wrapper/include/sof/lib/alloc.h
similarity index 100%
rename from src/include/sof/lib/alloc.h
rename to src/arch/xtos-wrapper/include/sof/lib/alloc.h
diff --git a/src/include/sof/lib/cache.h b/src/arch/xtos-wrapper/include/sof/lib/cache.h
similarity index 100%
rename from src/include/sof/lib/cache.h
rename to src/arch/xtos-wrapper/include/sof/lib/cache.h
diff --git a/src/include/sof/lib/clk.h b/src/arch/xtos-wrapper/include/sof/lib/clk.h
similarity index 98%
rename from src/include/sof/lib/clk.h
rename to src/arch/xtos-wrapper/include/sof/lib/clk.h
index 95d7eee966b4..c4f90eebef8c 100644
--- a/src/include/sof/lib/clk.h
+++ b/src/arch/xtos-wrapper/include/sof/lib/clk.h
@@ -11,7 +11,7 @@
 
 #include <platform/lib/clk.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/src/include/sof/lib/cpu.h b/src/arch/xtos-wrapper/include/sof/lib/cpu.h
similarity index 100%
rename from src/include/sof/lib/cpu.h
rename to src/arch/xtos-wrapper/include/sof/lib/cpu.h
diff --git a/src/include/sof/lib/dai.h b/src/arch/xtos-wrapper/include/sof/lib/dai.h
similarity index 100%
rename from src/include/sof/lib/dai.h
rename to src/arch/xtos-wrapper/include/sof/lib/dai.h
diff --git a/src/include/sof/lib/dma.h b/src/arch/xtos-wrapper/include/sof/lib/dma.h
similarity index 99%
rename from src/include/sof/lib/dma.h
rename to src/arch/xtos-wrapper/include/sof/lib/dma.h
index 4f8f24bb35f5..403e3497baab 100644
--- a/src/include/sof/lib/dma.h
+++ b/src/arch/xtos-wrapper/include/sof/lib/dma.h
@@ -23,7 +23,7 @@
 #include <sof/lib/io.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/include/sof/lib/io.h b/src/arch/xtos-wrapper/include/sof/lib/io.h
similarity index 100%
rename from src/include/sof/lib/io.h
rename to src/arch/xtos-wrapper/include/sof/lib/io.h
diff --git a/src/include/sof/lib/mailbox.h b/src/arch/xtos-wrapper/include/sof/lib/mailbox.h
similarity index 100%
rename from src/include/sof/lib/mailbox.h
rename to src/arch/xtos-wrapper/include/sof/lib/mailbox.h
diff --git a/src/include/sof/lib/memory.h b/src/arch/xtos-wrapper/include/sof/lib/memory.h
similarity index 100%
rename from src/include/sof/lib/memory.h
rename to src/arch/xtos-wrapper/include/sof/lib/memory.h
diff --git a/src/include/sof/lib/mm_heap.h b/src/arch/xtos-wrapper/include/sof/lib/mm_heap.h
similarity index 99%
rename from src/include/sof/lib/mm_heap.h
rename to src/arch/xtos-wrapper/include/sof/lib/mm_heap.h
index 29c0ba57f993..6303f09f51be 100644
--- a/src/include/sof/lib/mm_heap.h
+++ b/src/arch/xtos-wrapper/include/sof/lib/mm_heap.h
@@ -14,7 +14,7 @@
 #include <sof/lib/cache.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/include/sof/lib/perf_cnt.h b/src/arch/xtos-wrapper/include/sof/lib/perf_cnt.h
similarity index 100%
rename from src/include/sof/lib/perf_cnt.h
rename to src/arch/xtos-wrapper/include/sof/lib/perf_cnt.h
diff --git a/src/include/sof/lib/pm_runtime.h b/src/arch/xtos-wrapper/include/sof/lib/pm_runtime.h
similarity index 99%
rename from src/include/sof/lib/pm_runtime.h
rename to src/arch/xtos-wrapper/include/sof/lib/pm_runtime.h
index 064b7584a1a7..fb4faaef32fd 100644
--- a/src/include/sof/lib/pm_runtime.h
+++ b/src/arch/xtos-wrapper/include/sof/lib/pm_runtime.h
@@ -17,7 +17,7 @@
 
 #include <platform/lib/pm_runtime.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <user/trace.h>
 #include <stdint.h>
diff --git a/src/include/sof/lib/shim.h b/src/arch/xtos-wrapper/include/sof/lib/shim.h
similarity index 100%
rename from src/include/sof/lib/shim.h
rename to src/arch/xtos-wrapper/include/sof/lib/shim.h
diff --git a/src/include/sof/lib/wait.h b/src/arch/xtos-wrapper/include/sof/lib/wait.h
similarity index 98%
rename from src/include/sof/lib/wait.h
rename to src/arch/xtos-wrapper/include/sof/lib/wait.h
index 92d07f24aa9f..141ae93431e4 100644
--- a/src/include/sof/lib/wait.h
+++ b/src/arch/xtos-wrapper/include/sof/lib/wait.h
@@ -18,7 +18,7 @@
 #include <sof/schedule/ll_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <user/trace.h>
 
diff --git a/src/include/sof/list.h b/src/arch/xtos-wrapper/include/sof/list.h
similarity index 100%
rename from src/include/sof/list.h
rename to src/arch/xtos-wrapper/include/sof/list.h
diff --git a/src/include/sof/string.h b/src/arch/xtos-wrapper/include/sof/string.h
similarity index 100%
rename from src/include/sof/string.h
rename to src/arch/xtos-wrapper/include/sof/string.h
diff --git a/src/include/sof/spinlock.h b/src/arch/xtos-wrapper/include/zephyr/spinlock.h
similarity index 94%
rename from src/include/sof/spinlock.h
rename to src/arch/xtos-wrapper/include/zephyr/spinlock.h
index ce17dc1b6a5d..4100a8a30805 100644
--- a/src/include/sof/spinlock.h
+++ b/src/arch/xtos-wrapper/include/zephyr/spinlock.h
@@ -13,10 +13,8 @@
 #ifndef __SOF_SPINLOCK_H__
 #define __SOF_SPINLOCK_H__
 
-#ifndef __ZEPHYR__
 #include <arch/spinlock.h>
 typedef uint32_t k_spinlock_key_t;
-#endif
 #include <sof/lib/memory.h>
 #include <ipc/trace.h>
 
@@ -143,8 +141,6 @@ extern struct tr_ctx sl_tr;
 
 #endif /* CONFIG_DEBUG_LOCKS */
 
-#ifndef __ZEPHYR__
-
 /* all SMP spinlocks need init, nothing todo on UP */
 static inline void _spinlock_init(struct k_spinlock *lock, int line)
 {
@@ -164,18 +160,4 @@ k_spinlock_key_t _k_spin_lock_irq(struct k_spinlock *lock);
 void _k_spin_unlock_irq(struct k_spinlock *lock, k_spinlock_key_t key, int line);
 #define k_spin_unlock(lock, key) _k_spin_unlock_irq(lock, key, __LINE__)
 
-#else
-
-#include <zephyr/kernel.h>
-
-/* This has to be moved to Zephyr */
-static inline void k_spinlock_init(struct k_spinlock *lock)
-{
-#ifdef CONFIG_SMP
-	atomic_set(&lock->locked, 0);
-#endif
-}
-
-#endif /* __ZEPHYR__ */
-
 #endif /* __SOF_SPINLOCK_H__ */
diff --git a/src/audio/buffer.c b/src/audio/buffer.c
index dba8dd8d3531..1088e13df736 100644
--- a/src/audio/buffer.c
+++ b/src/audio/buffer.c
@@ -13,7 +13,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/topology.h>
 #include <errno.h>
 #include <stddef.h>
diff --git a/src/audio/pipeline/pipeline-graph.c b/src/audio/pipeline/pipeline-graph.c
index fdb933f84108..2b1a9ec132cf 100644
--- a/src/audio/pipeline/pipeline-graph.c
+++ b/src/audio/pipeline/pipeline-graph.c
@@ -14,7 +14,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/compiler_attributes.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/string.h>
 #include <ipc/header.h>
 #include <ipc/stream.h>
diff --git a/src/audio/pipeline/pipeline-params.c b/src/audio/pipeline/pipeline-params.c
index be61afcba1e6..0e1f315ee401 100644
--- a/src/audio/pipeline/pipeline-params.c
+++ b/src/audio/pipeline/pipeline-params.c
@@ -12,7 +12,7 @@
 #include <sof/lib/mm_heap.h>
 #include <sof/compiler_attributes.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/stream.h>
 #include <ipc/topology.h>
 #include <ipc4/error_status.h>
diff --git a/src/audio/pipeline/pipeline-schedule.c b/src/audio/pipeline/pipeline-schedule.c
index 2dc3ee5924a8..7edadb62226e 100644
--- a/src/audio/pipeline/pipeline-schedule.c
+++ b/src/audio/pipeline/pipeline-schedule.c
@@ -14,7 +14,7 @@
 #include <sof/schedule/ll_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/string.h>
 #include <ipc/header.h>
 #include <ipc/stream.h>
diff --git a/src/audio/pipeline/pipeline-stream.c b/src/audio/pipeline/pipeline-stream.c
index c649cda4691d..c452cf0aa2d9 100644
--- a/src/audio/pipeline/pipeline-stream.c
+++ b/src/audio/pipeline/pipeline-stream.c
@@ -11,7 +11,7 @@
 #include <sof/lib/dai.h>
 #include <sof/lib/wait.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/string.h>
 #include <ipc/stream.h>
 #include <ipc/topology.h>
diff --git a/src/audio/pipeline/pipeline-xrun.c b/src/audio/pipeline/pipeline-xrun.c
index 1bd7e20c63a2..3842e1885116 100644
--- a/src/audio/pipeline/pipeline-xrun.c
+++ b/src/audio/pipeline/pipeline-xrun.c
@@ -10,7 +10,7 @@
 #include <sof/audio/pipeline.h>
 #include <sof/ipc/msg.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/string.h>
 #include <ipc/header.h>
 #include <ipc/stream.h>
diff --git a/src/drivers/amd/rembrandt/acp_bt_dma.c b/src/drivers/amd/rembrandt/acp_bt_dma.c
index 0629fc1e1619..b0afb9fc01c7 100644
--- a/src/drivers/amd/rembrandt/acp_bt_dma.c
+++ b/src/drivers/amd/rembrandt/acp_bt_dma.c
@@ -20,7 +20,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/platform.h>
 #include <sof/schedule/schedule.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/math/numbers.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
diff --git a/src/drivers/amd/rembrandt/acp_dmic_dma.c b/src/drivers/amd/rembrandt/acp_dmic_dma.c
index 9a66cd1e6ede..acd247aa45a2 100644
--- a/src/drivers/amd/rembrandt/acp_dmic_dma.c
+++ b/src/drivers/amd/rembrandt/acp_dmic_dma.c
@@ -20,7 +20,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/platform.h>
 #include <sof/schedule/schedule.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/math/numbers.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
diff --git a/src/drivers/amd/rembrandt/acp_hs_dma.c b/src/drivers/amd/rembrandt/acp_hs_dma.c
index 294c0265c7e9..c8105f5489b1 100644
--- a/src/drivers/amd/rembrandt/acp_hs_dma.c
+++ b/src/drivers/amd/rembrandt/acp_hs_dma.c
@@ -20,7 +20,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/platform.h>
 #include <sof/schedule/schedule.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/math/numbers.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
diff --git a/src/drivers/amd/rembrandt/acp_sp_dma.c b/src/drivers/amd/rembrandt/acp_sp_dma.c
index 0ca810934f37..9a738c6cfee6 100644
--- a/src/drivers/amd/rembrandt/acp_sp_dma.c
+++ b/src/drivers/amd/rembrandt/acp_sp_dma.c
@@ -20,7 +20,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/platform.h>
 #include <sof/schedule/schedule.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/math/numbers.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
diff --git a/src/drivers/amd/rembrandt/interrupt.c b/src/drivers/amd/rembrandt/interrupt.c
index 90762782427a..8c5cdc9b71f9 100644
--- a/src/drivers/amd/rembrandt/interrupt.c
+++ b/src/drivers/amd/rembrandt/interrupt.c
@@ -13,7 +13,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <xtensa/hal.h>
 #include <xtensa/config/core.h>
 #include <xtensa/config/specreg.h>
diff --git a/src/drivers/amd/rembrandt/ipc.c b/src/drivers/amd/rembrandt/ipc.c
index a302e49809b5..c3ad91478c72 100644
--- a/src/drivers/amd/rembrandt/ipc.c
+++ b/src/drivers/amd/rembrandt/ipc.c
@@ -24,7 +24,7 @@
 #include <sof/schedule/edf_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/header.h>
 #include <ipc/topology.h>
 #include <errno.h>
diff --git a/src/drivers/amd/renoir/acp_bt_dma.c b/src/drivers/amd/renoir/acp_bt_dma.c
index d3364f432b28..f54486b4d2d8 100644
--- a/src/drivers/amd/renoir/acp_bt_dma.c
+++ b/src/drivers/amd/renoir/acp_bt_dma.c
@@ -21,7 +21,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/platform.h>
 #include <sof/schedule/schedule.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/math/numbers.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
diff --git a/src/drivers/amd/renoir/acp_dmic_dma.c b/src/drivers/amd/renoir/acp_dmic_dma.c
index e89efb85b65e..ec943143f74d 100644
--- a/src/drivers/amd/renoir/acp_dmic_dma.c
+++ b/src/drivers/amd/renoir/acp_dmic_dma.c
@@ -20,7 +20,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/platform.h>
 #include <sof/schedule/schedule.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/math/numbers.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
diff --git a/src/drivers/amd/renoir/acp_sp_dma.c b/src/drivers/amd/renoir/acp_sp_dma.c
index 8ca162119538..d4c00f54e168 100644
--- a/src/drivers/amd/renoir/acp_sp_dma.c
+++ b/src/drivers/amd/renoir/acp_sp_dma.c
@@ -21,7 +21,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/platform.h>
 #include <sof/schedule/schedule.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/math/numbers.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
diff --git a/src/drivers/amd/renoir/interrupt.c b/src/drivers/amd/renoir/interrupt.c
index 80a9f02fc097..c7e411b3f331 100644
--- a/src/drivers/amd/renoir/interrupt.c
+++ b/src/drivers/amd/renoir/interrupt.c
@@ -14,7 +14,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <xtensa/hal.h>
 #include <xtensa/config/core.h>
 #include <xtensa/config/specreg.h>
diff --git a/src/drivers/amd/renoir/ipc.c b/src/drivers/amd/renoir/ipc.c
index be2ff79e441d..b7adfdf60809 100644
--- a/src/drivers/amd/renoir/ipc.c
+++ b/src/drivers/amd/renoir/ipc.c
@@ -25,7 +25,7 @@
 #include <sof/schedule/edf_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/header.h>
 #include <ipc/topology.h>
 #include <errno.h>
diff --git a/src/drivers/dw/dma.c b/src/drivers/dw/dma.c
index 1531cb83cefa..8f4e267ab68d 100644
--- a/src/drivers/dw/dma.c
+++ b/src/drivers/dw/dma.c
@@ -36,7 +36,7 @@
 #include <sof/lib/wait.h>
 #include <sof/lib/notifier.h>
 #include <sof/platform.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/topology.h>
 
 #include <errno.h>
diff --git a/src/drivers/dw/ssi-spi.c b/src/drivers/dw/ssi-spi.c
index 42ef1c67bc22..4898fcc5120e 100644
--- a/src/drivers/dw/ssi-spi.c
+++ b/src/drivers/dw/ssi-spi.c
@@ -23,7 +23,7 @@
 #include <sof/schedule/ll_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/string.h>
 #include <ipc/header.h>
 #include <ipc/topology.h>
diff --git a/src/drivers/generic/dummy-dma.c b/src/drivers/generic/dummy-dma.c
index fdccec5e623c..49a206f828d1 100644
--- a/src/drivers/generic/dummy-dma.c
+++ b/src/drivers/generic/dummy-dma.c
@@ -34,7 +34,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <sof/platform.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/string.h>
 #include <sof/trace/trace.h>
 #include <sys/types.h>
diff --git a/src/drivers/imx/interrupt-generic.c b/src/drivers/imx/interrupt-generic.c
index 00223ee4bdd3..bee75e6f2d11 100644
--- a/src/drivers/imx/interrupt-generic.c
+++ b/src/drivers/imx/interrupt-generic.c
@@ -11,7 +11,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <stdbool.h>
diff --git a/src/drivers/imx/interrupt-irqsteer.c b/src/drivers/imx/interrupt-irqsteer.c
index 27352f9e65e3..e77fa923877a 100644
--- a/src/drivers/imx/interrupt-irqsteer.c
+++ b/src/drivers/imx/interrupt-irqsteer.c
@@ -12,7 +12,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <stdbool.h>
diff --git a/src/drivers/imx/ipc.c b/src/drivers/imx/ipc.c
index 1857c1dceade..e6e9c6a7d4e9 100644
--- a/src/drivers/imx/ipc.c
+++ b/src/drivers/imx/ipc.c
@@ -21,7 +21,7 @@
 #include <sof/schedule/edf_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/header.h>
 #include <ipc/topology.h>
 #include <ipc/trace.h>
diff --git a/src/drivers/intel/baytrail/ipc.c b/src/drivers/intel/baytrail/ipc.c
index f6e8267d2354..6292723e5c01 100644
--- a/src/drivers/intel/baytrail/ipc.c
+++ b/src/drivers/intel/baytrail/ipc.c
@@ -20,7 +20,7 @@
 #include <sof/platform.h>
 #include <sof/schedule/edf_schedule.h>
 #include <sof/schedule/schedule.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/header.h>
 #include <ipc/topology.h>
 #include <stdbool.h>
diff --git a/src/drivers/intel/baytrail/ssp.c b/src/drivers/intel/baytrail/ssp.c
index efc0a7a38a81..0bf9a2fe856e 100644
--- a/src/drivers/intel/baytrail/ssp.c
+++ b/src/drivers/intel/baytrail/ssp.c
@@ -11,7 +11,7 @@
 #include <sof/lib/alloc.h>
 #include <sof/lib/dai.h>
 #include <sof/lib/dma.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <ipc/dai.h>
 #include <ipc/dai-intel.h>
diff --git a/src/drivers/intel/cavs/interrupt.c b/src/drivers/intel/cavs/interrupt.c
index 0a7e1909723f..2e6f34f4384d 100644
--- a/src/drivers/intel/cavs/interrupt.c
+++ b/src/drivers/intel/cavs/interrupt.c
@@ -14,7 +14,7 @@
 #include <sof/lib/shim.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/drivers/intel/cavs/ipc.c b/src/drivers/intel/cavs/ipc.c
index 0d232d677792..a3b3d0faa208 100644
--- a/src/drivers/intel/cavs/ipc.c
+++ b/src/drivers/intel/cavs/ipc.c
@@ -21,7 +21,7 @@
 #include <sof/schedule/edf_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/header.h>
 
 #include <stdbool.h>
diff --git a/src/drivers/intel/cavs/sue-ipc.c b/src/drivers/intel/cavs/sue-ipc.c
index 35b8a7fa25a2..0c6c5a9d83b0 100644
--- a/src/drivers/intel/cavs/sue-ipc.c
+++ b/src/drivers/intel/cavs/sue-ipc.c
@@ -17,7 +17,7 @@
 #include <sof/schedule/edf_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/header.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/drivers/intel/dmic/dmic.c b/src/drivers/intel/dmic/dmic.c
index 07b9e4b02bc2..84373177fb12 100644
--- a/src/drivers/intel/dmic/dmic.c
+++ b/src/drivers/intel/dmic/dmic.c
@@ -22,7 +22,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/math/decibels.h>
 #include <sof/math/numbers.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/string.h>
 #include <ipc/dai.h>
 #include <ipc/dai-intel.h>
diff --git a/src/drivers/intel/haswell/ipc.c b/src/drivers/intel/haswell/ipc.c
index 542f5d4f277e..62e28d2c0a71 100644
--- a/src/drivers/intel/haswell/ipc.c
+++ b/src/drivers/intel/haswell/ipc.c
@@ -20,7 +20,7 @@
 #include <sof/schedule/edf_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/header.h>
 #include <ipc/topology.h>
 #include <stdbool.h>
diff --git a/src/drivers/intel/haswell/ssp.c b/src/drivers/intel/haswell/ssp.c
index d15896962620..15780489d47e 100644
--- a/src/drivers/intel/haswell/ssp.c
+++ b/src/drivers/intel/haswell/ssp.c
@@ -11,7 +11,7 @@
 #include <sof/lib/dai.h>
 #include <sof/lib/dma.h>
 #include <sof/lib/shim.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <ipc/dai.h>
 #include <ipc/dai-intel.h>
diff --git a/src/drivers/intel/hda/hda-dma.c b/src/drivers/intel/hda/hda-dma.c
index 4fb82a879658..0c3484bca178 100644
--- a/src/drivers/intel/hda/hda-dma.c
+++ b/src/drivers/intel/hda/hda-dma.c
@@ -20,7 +20,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/platform.h>
 #include <sof/schedule/schedule.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
 #include <user/trace.h>
diff --git a/src/drivers/intel/ssp/mn.c b/src/drivers/intel/ssp/mn.c
index 56607d02f0a3..ec7247599f07 100644
--- a/src/drivers/intel/ssp/mn.c
+++ b/src/drivers/intel/ssp/mn.c
@@ -11,7 +11,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/math/numbers.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 
 #include <cavs/version.h>
diff --git a/src/drivers/intel/ssp/ssp.c b/src/drivers/intel/ssp/ssp.c
index e6a20f540295..26fa4647e2d6 100644
--- a/src/drivers/intel/ssp/ssp.c
+++ b/src/drivers/intel/ssp/ssp.c
@@ -20,7 +20,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/lib/wait.h>
 #include <sof/platform.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <ipc/dai.h>
 #include <ipc/dai-intel.h>
diff --git a/src/drivers/interrupt.c b/src/drivers/interrupt.c
index 89df6c61453d..187eff57c945 100644
--- a/src/drivers/interrupt.c
+++ b/src/drivers/interrupt.c
@@ -13,7 +13,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
 #include <errno.h>
diff --git a/src/drivers/mediatek/mt8186/interrupt.c b/src/drivers/mediatek/mt8186/interrupt.c
index 2cb86830f412..e9f070108951 100644
--- a/src/drivers/mediatek/mt8186/interrupt.c
+++ b/src/drivers/mediatek/mt8186/interrupt.c
@@ -15,7 +15,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/drivers/mediatek/mt8186/ipc.c b/src/drivers/mediatek/mt8186/ipc.c
index af3f1dd1a4c4..1f2833ed0d88 100644
--- a/src/drivers/mediatek/mt8186/ipc.c
+++ b/src/drivers/mediatek/mt8186/ipc.c
@@ -21,7 +21,7 @@
 #include <sof/schedule/edf_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/header.h>
 #include <ipc/topology.h>
 #include <ipc/trace.h>
diff --git a/src/drivers/mediatek/mt8195/interrupt.c b/src/drivers/mediatek/mt8195/interrupt.c
index 02ce1684a1ff..b56319dd79b8 100644
--- a/src/drivers/mediatek/mt8195/interrupt.c
+++ b/src/drivers/mediatek/mt8195/interrupt.c
@@ -12,7 +12,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <stdbool.h>
diff --git a/src/drivers/mediatek/mt8195/ipc.c b/src/drivers/mediatek/mt8195/ipc.c
index ee101be4f332..aaf5c0f559e0 100644
--- a/src/drivers/mediatek/mt8195/ipc.c
+++ b/src/drivers/mediatek/mt8195/ipc.c
@@ -20,7 +20,7 @@
 #include <sof/schedule/edf_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/header.h>
 #include <ipc/topology.h>
 #include <ipc/trace.h>
diff --git a/src/idc/zephyr_idc.c b/src/idc/zephyr_idc.c
index bf525dfda02e..1d5eb5366bda 100644
--- a/src/idc/zephyr_idc.c
+++ b/src/idc/zephyr_idc.c
@@ -26,7 +26,7 @@
 #include <sof/init.h>
 #include <sof/ipc/common.h>
 #include <sof/lib/alloc.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/topology.h>
 
 /*
diff --git a/src/include/sof/audio/buffer.h b/src/include/sof/audio/buffer.h
index 78cf4a34c570..2785beedcce6 100644
--- a/src/include/sof/audio/buffer.h
+++ b/src/include/sof/audio/buffer.h
@@ -19,7 +19,7 @@
 #include <sof/list.h>
 #include <sof/coherent.h>
 #include <sof/math/numbers.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/string.h>
 #include <sof/trace/trace.h>
 #include <ipc/stream.h>
diff --git a/src/include/sof/audio/pipeline.h b/src/include/sof/audio/pipeline.h
index cac507443c36..e638e363ec43 100644
--- a/src/include/sof/audio/pipeline.h
+++ b/src/include/sof/audio/pipeline.h
@@ -14,7 +14,7 @@
 #include <sof/list.h>
 #include <sof/schedule/task.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/audio/pipeline-trace.h>
 #include <ipc/topology.h>
 #include <user/trace.h>
diff --git a/src/include/sof/coherent.h b/src/include/sof/coherent.h
index e6fa0c2a1cef..785b923dbfe8 100644
--- a/src/include/sof/coherent.h
+++ b/src/include/sof/coherent.h
@@ -12,7 +12,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/list.h>
 #include <sof/lib/memory.h>
 #include <sof/lib/cpu.h>
diff --git a/src/include/sof/drivers/interrupt.h b/src/include/sof/drivers/interrupt.h
index d5da3af20470..f1b2b6c12bdf 100644
--- a/src/include/sof/drivers/interrupt.h
+++ b/src/include/sof/drivers/interrupt.h
@@ -15,7 +15,7 @@
 #include <sof/lib/cpu.h>
 #include <sof/list.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <user/trace.h>
 #include <stdbool.h>
diff --git a/src/include/sof/ipc/common.h b/src/include/sof/ipc/common.h
index d357c6f79360..13e2aa5f5722 100644
--- a/src/include/sof/ipc/common.h
+++ b/src/include/sof/ipc/common.h
@@ -13,7 +13,7 @@
 #include <sof/lib/alloc.h>
 #include <sof/list.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/sof.h>
 #include <user/trace.h>
 #include <stdbool.h>
diff --git a/src/include/sof/ipc/msg.h b/src/include/sof/ipc/msg.h
index 0ba3f107f8ab..9199e7fc4a40 100644
--- a/src/include/sof/ipc/msg.h
+++ b/src/include/sof/ipc/msg.h
@@ -18,7 +18,7 @@
 #include <sof/platform.h>
 #include <sof/schedule/task.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <sof/ipc/common.h>
 #include <stdbool.h>
diff --git a/src/include/sof/ipc/topology.h b/src/include/sof/ipc/topology.h
index f13de0f9742a..f9de801d273b 100644
--- a/src/include/sof/ipc/topology.h
+++ b/src/include/sof/ipc/topology.h
@@ -18,7 +18,7 @@
 #include <sof/platform.h>
 #include <sof/schedule/task.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <sof/ipc/common.h>
 #include <stdbool.h>
diff --git a/src/include/sof/lib/dai-legacy.h b/src/include/sof/lib/dai-legacy.h
index 270746703fd5..0ac21a25909b 100644
--- a/src/include/sof/lib/dai-legacy.h
+++ b/src/include/sof/lib/dai-legacy.h
@@ -29,7 +29,7 @@
 #include <sof/lib/dma.h>
 #include <sof/list.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <sof/ipc/topology.h>
 #include <sof/audio/pcm_converter.h>
diff --git a/src/include/sof/lib/dai-zephyr.h b/src/include/sof/lib/dai-zephyr.h
index 6f8508228860..b0af14f9017c 100644
--- a/src/include/sof/lib/dai-zephyr.h
+++ b/src/include/sof/lib/dai-zephyr.h
@@ -7,7 +7,7 @@
  */
 
 /**
-  * \file include/sof/lib/dai.h
+  * \file include/sof/lib/dai-zephyr.h
   * \brief DAI Drivers definition
   * \author Liam Girdwood <liam.r.girdwood@linux.intel.com>
   * \author Keyon Jie <yang.jie@linux.intel.com>
@@ -24,7 +24,7 @@
 #include <sof/lib/dma.h>
 #include <sof/list.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <sof/ipc/topology.h>
 #include <sof/audio/pcm_converter.h>
diff --git a/src/include/sof/lib/notifier.h b/src/include/sof/lib/notifier.h
index 9bdc7bce0449..47d6c056c2d8 100644
--- a/src/include/sof/lib/notifier.h
+++ b/src/include/sof/lib/notifier.h
@@ -10,7 +10,7 @@
 
 #include <sof/bit.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/sof.h>
 #include <stdint.h>
 
diff --git a/src/include/sof/schedule/ll_schedule_domain.h b/src/include/sof/schedule/ll_schedule_domain.h
index cb9254c1c503..aaabb1f7c600 100644
--- a/src/include/sof/schedule/ll_schedule_domain.h
+++ b/src/include/sof/schedule/ll_schedule_domain.h
@@ -15,7 +15,7 @@
 #include <sof/lib/clk.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
 #include <user/trace.h>
diff --git a/src/include/sof/sof.h b/src/include/sof/sof.h
index a11b09456fac..2f041984be99 100644
--- a/src/include/sof/sof.h
+++ b/src/include/sof/sof.h
@@ -8,6 +8,11 @@
 #ifndef __SOF_SOF_H__
 #define __SOF_SOF_H__
 
+/* catch any Zephyr APIs that still need upstreamed */
+#ifdef __ZEPHYR__
+#include <sof/zephyr-wrap.h>
+#endif
+
 #include <arch/sof.h>
 #include <sof/common.h>
 #include <sof/lib/memory.h>
diff --git a/src/include/sof/trace/dma-trace.h b/src/include/sof/trace/dma-trace.h
index 8c7dbcd394e4..4a701ecb9e9c 100644
--- a/src/include/sof/trace/dma-trace.h
+++ b/src/include/sof/trace/dma-trace.h
@@ -11,7 +11,7 @@
 #include <sof/lib/dma.h>
 #include <sof/schedule/task.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/trace.h>
 #include <stdint.h>
 
diff --git a/src/include/sof/zephyr-wrap.h b/src/include/sof/zephyr-wrap.h
new file mode 100644
index 000000000000..b2ae1c291056
--- /dev/null
+++ b/src/include/sof/zephyr-wrap.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Temporary wrapper for stuff that is NOT yet upstream in Zephyr.
+ * Will go away at some point.
+ */
+
+#ifndef __SOF_ZEPHYR_WRAP_H__
+#define __SOF_ZEPHYR_WRAP_H__
+
+#include <zephyr/kernel.h>
+
+/* This has to be moved to Zephyr */
+static inline void k_spinlock_init(struct k_spinlock *lock)
+{
+#ifdef CONFIG_SMP
+	atomic_set(&lock->locked, 0);
+#endif
+}
+
+#endif /* __SOF_ZEPHYR_WRAP_H__ */
diff --git a/src/ipc/ipc-common.c b/src/ipc/ipc-common.c
index 641367471f58..ec7bab776dd8 100644
--- a/src/ipc/ipc-common.c
+++ b/src/ipc/ipc-common.c
@@ -22,7 +22,7 @@
 #include <sof/list.h>
 #include <sof/platform.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/dai.h>
 #include <ipc/header.h>
 #include <ipc/stream.h>
diff --git a/src/ipc/ipc-helper.c b/src/ipc/ipc-helper.c
index 539842fec361..5c19e1bd3970 100644
--- a/src/ipc/ipc-helper.c
+++ b/src/ipc/ipc-helper.c
@@ -23,7 +23,7 @@
 #include <sof/list.h>
 #include <sof/platform.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/dai.h>
 #include <ipc/header.h>
 #include <ipc/stream.h>
diff --git a/src/ipc/ipc4/helper.c b/src/ipc/ipc4/helper.c
index 2f13a36e2396..ed5952e939e7 100644
--- a/src/ipc/ipc4/helper.c
+++ b/src/ipc/ipc4/helper.c
@@ -21,7 +21,7 @@
 #include <sof/lib/wait.h>
 
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <rimage/cavs/cavs_ext_manifest.h>
 #include <rimage/sof/user/manifest.h>
 #include <ipc4/base-config.h>
diff --git a/src/lib/alloc.c b/src/lib/alloc.c
index fca16283bdcb..7dfb0ba672dd 100644
--- a/src/lib/alloc.c
+++ b/src/lib/alloc.c
@@ -14,7 +14,7 @@
 #include <sof/lib/mm_heap.h>
 #include <sof/lib/uuid.h>
 #include <sof/math/numbers.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/string.h>
 #include <ipc/topology.h>
 #include <ipc/trace.h>
diff --git a/src/lib/clk.c b/src/lib/clk.c
index 7898d7b2b4e8..80760ab5f801 100644
--- a/src/lib/clk.c
+++ b/src/lib/clk.c
@@ -13,7 +13,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <sof/platform.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <user/trace.h>
 #include <stdint.h>
diff --git a/src/lib/dai.c b/src/lib/dai.c
index 82439284181e..3b66ec818d9f 100644
--- a/src/lib/dai.c
+++ b/src/lib/dai.c
@@ -9,7 +9,7 @@
 #include <sof/lib/cpu.h>
 #include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
 #include <ipc/dai.h>
diff --git a/src/lib/dma.c b/src/lib/dma.c
index 27374690aa1d..b928a8153e07 100644
--- a/src/lib/dma.c
+++ b/src/lib/dma.c
@@ -12,7 +12,7 @@
 #include <sof/lib/dma.h>
 #include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
 #include <user/trace.h>
diff --git a/src/lib/pm_runtime.c b/src/lib/pm_runtime.c
index e334241d2a28..adc5a66d0f5b 100644
--- a/src/lib/pm_runtime.c
+++ b/src/lib/pm_runtime.c
@@ -16,7 +16,7 @@
 #include <sof/lib/pm_runtime.h>
 #include <sof/lib/uuid.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/topology.h>
 #include <stdint.h>
 
diff --git a/src/platform/amd/rembrandt/lib/clk.c b/src/platform/amd/rembrandt/lib/clk.c
index 95792cbd9bdc..5f3ee596cb32 100644
--- a/src/platform/amd/rembrandt/lib/clk.c
+++ b/src/platform/amd/rembrandt/lib/clk.c
@@ -10,7 +10,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <platform/chip_registers.h>
 
 const struct freq_table platform_cpu_freq[] = {
diff --git a/src/platform/amd/rembrandt/lib/dai.c b/src/platform/amd/rembrandt/lib/dai.c
index 896ec8a8b9f5..789a0bb1013c 100644
--- a/src/platform/amd/rembrandt/lib/dai.c
+++ b/src/platform/amd/rembrandt/lib/dai.c
@@ -10,7 +10,7 @@
 #include <sof/lib/dai.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/dai.h>
 #include <ipc/stream.h>
 
diff --git a/src/platform/amd/rembrandt/lib/dma.c b/src/platform/amd/rembrandt/lib/dma.c
index 779c05114ae7..2b2f1d532bf3 100644
--- a/src/platform/amd/rembrandt/lib/dma.c
+++ b/src/platform/amd/rembrandt/lib/dma.c
@@ -12,7 +12,7 @@
 #include <sof/lib/dma.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 extern struct dma_ops acp_dma_ops;
 extern struct dma_ops acp_dmic_dma_ops;
diff --git a/src/platform/amd/renoir/lib/clk.c b/src/platform/amd/renoir/lib/clk.c
index 7450a3350ffc..9f13ddd24d71 100644
--- a/src/platform/amd/renoir/lib/clk.c
+++ b/src/platform/amd/renoir/lib/clk.c
@@ -10,7 +10,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <platform/chip_registers.h>
 
 static struct freq_table platform_cpu_freq[] = {
diff --git a/src/platform/amd/renoir/lib/dai.c b/src/platform/amd/renoir/lib/dai.c
index b34edafa78c0..35802e0a41d4 100644
--- a/src/platform/amd/renoir/lib/dai.c
+++ b/src/platform/amd/renoir/lib/dai.c
@@ -11,7 +11,7 @@
 #include <sof/lib/dai.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/dai.h>
 #include <ipc/stream.h>
 
diff --git a/src/platform/amd/renoir/lib/dma.c b/src/platform/amd/renoir/lib/dma.c
index cbc09f49dba0..3e5864caffc8 100644
--- a/src/platform/amd/renoir/lib/dma.c
+++ b/src/platform/amd/renoir/lib/dma.c
@@ -13,7 +13,7 @@
 #include <sof/lib/dma.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 #define ACP_ADDR_MASK	0x20000000
 
diff --git a/src/platform/baytrail/lib/clk.c b/src/platform/baytrail/lib/clk.c
index 9994802111ab..f194f7755176 100644
--- a/src/platform/baytrail/lib/clk.c
+++ b/src/platform/baytrail/lib/clk.c
@@ -11,7 +11,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 #if CONFIG_BAYTRAIL
 static const struct freq_table platform_cpu_freq[] = {
diff --git a/src/platform/baytrail/lib/dma.c b/src/platform/baytrail/lib/dma.c
index 0e1ea80e17f8..8458aa9050e6 100644
--- a/src/platform/baytrail/lib/dma.c
+++ b/src/platform/baytrail/lib/dma.c
@@ -10,7 +10,7 @@
 #include <sof/lib/dma.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 static const struct dw_drv_plat_data dmac0 = {
 	.chan[0] = {
diff --git a/src/platform/haswell/lib/clk.c b/src/platform/haswell/lib/clk.c
index 03fde94cecf1..470823880313 100644
--- a/src/platform/haswell/lib/clk.c
+++ b/src/platform/haswell/lib/clk.c
@@ -11,7 +11,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 static const struct freq_table platform_cpu_freq[] = {
 	{ 32000000, 32000 },
diff --git a/src/platform/haswell/lib/dma.c b/src/platform/haswell/lib/dma.c
index 907b05774f5d..d4ec4a205c9e 100644
--- a/src/platform/haswell/lib/dma.c
+++ b/src/platform/haswell/lib/dma.c
@@ -12,7 +12,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/shim.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 static const struct dw_drv_plat_data dmac0 = {
 	.chan[0] = {
diff --git a/src/platform/imx8/lib/clk.c b/src/platform/imx8/lib/clk.c
index 45d014b56417..170c33a9f548 100644
--- a/src/platform/imx8/lib/clk.c
+++ b/src/platform/imx8/lib/clk.c
@@ -10,7 +10,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 #ifdef __ZEPHYR__
 #include <zephyr/sys/util.h>
diff --git a/src/platform/imx8/lib/dai.c b/src/platform/imx8/lib/dai.c
index c908bd8c575f..9c9d1bb89a7b 100644
--- a/src/platform/imx8/lib/dai.c
+++ b/src/platform/imx8/lib/dai.c
@@ -11,7 +11,7 @@
 #include <sof/lib/dai.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/dai.h>
 #include <ipc/stream.h>
 
diff --git a/src/platform/imx8/lib/dma.c b/src/platform/imx8/lib/dma.c
index 9ef2a13f9207..19de5aaf40b5 100644
--- a/src/platform/imx8/lib/dma.c
+++ b/src/platform/imx8/lib/dma.c
@@ -10,7 +10,7 @@
 #include <sof/lib/dma.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 extern struct dma_ops dummy_dma_ops;
 extern struct dma_ops edma_ops;
diff --git a/src/platform/imx8m/lib/clk.c b/src/platform/imx8m/lib/clk.c
index 666e455c17f1..e75d51710ea6 100644
--- a/src/platform/imx8m/lib/clk.c
+++ b/src/platform/imx8m/lib/clk.c
@@ -9,7 +9,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 #ifdef __ZEPHYR__
 #include <zephyr/sys/util.h>
diff --git a/src/platform/imx8m/lib/dai.c b/src/platform/imx8m/lib/dai.c
index 323782c6b0ba..bcba9c451a4d 100644
--- a/src/platform/imx8m/lib/dai.c
+++ b/src/platform/imx8m/lib/dai.c
@@ -9,7 +9,7 @@
 #include <sof/lib/dai.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/dai.h>
 #include <ipc/stream.h>
 
diff --git a/src/platform/imx8m/lib/dma.c b/src/platform/imx8m/lib/dma.c
index 5444773b9efa..91ce86f0b03a 100644
--- a/src/platform/imx8m/lib/dma.c
+++ b/src/platform/imx8m/lib/dma.c
@@ -9,7 +9,7 @@
 #include <sof/lib/dma.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 extern struct dma_ops dummy_dma_ops;
 extern struct dma_ops sdma_ops;
diff --git a/src/platform/imx8ulp/lib/clk.c b/src/platform/imx8ulp/lib/clk.c
index a031f751cf4b..1cc058a494eb 100644
--- a/src/platform/imx8ulp/lib/clk.c
+++ b/src/platform/imx8ulp/lib/clk.c
@@ -10,7 +10,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 const struct freq_table platform_cpu_freq[] = {
 	{ 528000000, 528000 },
diff --git a/src/platform/imx8ulp/lib/dai.c b/src/platform/imx8ulp/lib/dai.c
index 45d7a241023a..2a34dfd69385 100644
--- a/src/platform/imx8ulp/lib/dai.c
+++ b/src/platform/imx8ulp/lib/dai.c
@@ -10,7 +10,7 @@
 #include <sof/lib/dai.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/dai.h>
 #include <ipc/stream.h>
 
diff --git a/src/platform/imx8ulp/lib/dma.c b/src/platform/imx8ulp/lib/dma.c
index 5515f595bd0e..6d69504e089a 100644
--- a/src/platform/imx8ulp/lib/dma.c
+++ b/src/platform/imx8ulp/lib/dma.c
@@ -10,7 +10,7 @@
 #include <sof/lib/dma.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 extern struct dma_ops dummy_dma_ops;
 extern struct dma_ops edma_ops;
diff --git a/src/platform/intel/cavs/lib/clk.c b/src/platform/intel/cavs/lib/clk.c
index 21d471cd4a5a..fa2889bb3980 100644
--- a/src/platform/intel/cavs/lib/clk.c
+++ b/src/platform/intel/cavs/lib/clk.c
@@ -11,7 +11,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/lib/pm_runtime.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 #include <cavs/version.h>
 
diff --git a/src/platform/intel/cavs/lib/dai.c b/src/platform/intel/cavs/lib/dai.c
index 0cf77c323f5b..1956e7e397d6 100644
--- a/src/platform/intel/cavs/lib/dai.c
+++ b/src/platform/intel/cavs/lib/dai.c
@@ -15,7 +15,7 @@
 #include <sof/lib/dma.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/dai.h>
 #include <ipc/stream.h>
 
diff --git a/src/platform/intel/cavs/lib/dma.c b/src/platform/intel/cavs/lib/dma.c
index dee9d2518a76..655394ab7ce6 100644
--- a/src/platform/intel/cavs/lib/dma.c
+++ b/src/platform/intel/cavs/lib/dma.c
@@ -14,7 +14,7 @@
 #include <sof/lib/dma.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #ifdef __ZEPHYR__
 #include <zephyr/device.h>
 #endif
diff --git a/src/platform/intel/cavs/lib/pm_runtime.c b/src/platform/intel/cavs/lib/pm_runtime.c
index 7e282863842e..17df2d6aa8b9 100644
--- a/src/platform/intel/cavs/lib/pm_runtime.c
+++ b/src/platform/intel/cavs/lib/pm_runtime.c
@@ -25,7 +25,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/lib/wait.h>
 #include <sof/platform.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 #include <ipc/topology.h>
 #include <user/trace.h>
diff --git a/src/platform/mt8186/lib/clk.c b/src/platform/mt8186/lib/clk.c
index 7d21da9a0a1e..c496aab36e69 100644
--- a/src/platform/mt8186/lib/clk.c
+++ b/src/platform/mt8186/lib/clk.c
@@ -14,7 +14,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/trace.h>
 
 /* 53863428-9a72-44df-af0f-fe45ea2348ba */
diff --git a/src/platform/mt8186/lib/dai.c b/src/platform/mt8186/lib/dai.c
index 2403836d94e1..e078441c8804 100644
--- a/src/platform/mt8186/lib/dai.c
+++ b/src/platform/mt8186/lib/dai.c
@@ -8,7 +8,7 @@
 #include <sof/lib/dai.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/dai.h>
 #include <ipc/stream.h>
 
diff --git a/src/platform/mt8186/lib/dma.c b/src/platform/mt8186/lib/dma.c
index a0b46d615d96..deda251ac6b7 100644
--- a/src/platform/mt8186/lib/dma.c
+++ b/src/platform/mt8186/lib/dma.c
@@ -10,7 +10,7 @@
 #include <sof/lib/dma.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 #include <mt8186-afe-regs.h>
 #include <mt8186-afe-common.h>
diff --git a/src/platform/mt8195/lib/clk.c b/src/platform/mt8195/lib/clk.c
index 47cfc793c1f7..f83431a86c0e 100644
--- a/src/platform/mt8195/lib/clk.c
+++ b/src/platform/mt8195/lib/clk.c
@@ -12,7 +12,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/lib/wait.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 DECLARE_SOF_UUID("clkdrv", clkdrv_uuid, 0x23b12fd5, 0xc2a9, 0x41a8,
 		 0xa2, 0xb3, 0x23, 0x1a, 0xb7, 0xdc, 0xdc, 0x70);
diff --git a/src/platform/mt8195/lib/dai.c b/src/platform/mt8195/lib/dai.c
index 2a0472704469..f4db6174c53f 100644
--- a/src/platform/mt8195/lib/dai.c
+++ b/src/platform/mt8195/lib/dai.c
@@ -8,7 +8,7 @@
 #include <sof/lib/dai.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/dai.h>
 #include <ipc/stream.h>
 
diff --git a/src/platform/mt8195/lib/dma.c b/src/platform/mt8195/lib/dma.c
index ff0c97add467..7bd3255494eb 100644
--- a/src/platform/mt8195/lib/dma.c
+++ b/src/platform/mt8195/lib/dma.c
@@ -9,7 +9,7 @@
 #include <sof/lib/dma.h>
 #include <sof/lib/memory.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 #include <mt8195-afe-regs.h>
 #include <mt8195-afe-common.h>
diff --git a/src/schedule/ll_schedule.c b/src/schedule/ll_schedule.c
index 840b03678ebe..8ea23a1379b9 100644
--- a/src/schedule/ll_schedule.c
+++ b/src/schedule/ll_schedule.c
@@ -24,7 +24,7 @@
 #include <sof/schedule/ll_schedule_domain.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <ipc/topology.h>
 
 #include <errno.h>
diff --git a/src/schedule/zephyr_ll.c b/src/schedule/zephyr_ll.c
index 3f4fdb793df0..200b4baba32c 100644
--- a/src/schedule/zephyr_ll.c
+++ b/src/schedule/zephyr_ll.c
@@ -5,7 +5,7 @@
 // Author: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
 
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/audio/component.h>
 #include <sof/drivers/interrupt.h>
 #include <sof/lib/notifier.h>
diff --git a/src/spinlock.c b/src/spinlock.c
index 34cc5e533968..9dfdeef25653 100644
--- a/src/spinlock.c
+++ b/src/spinlock.c
@@ -8,7 +8,7 @@
 #if CONFIG_DEBUG_LOCKS
 #include <sof/lib/uuid.h>
 #endif
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 
 #include <stdint.h>
 
diff --git a/src/trace/dma-trace.c b/src/trace/dma-trace.c
index 2a76d323a0d1..8ae0ded91bd6 100644
--- a/src/trace/dma-trace.c
+++ b/src/trace/dma-trace.c
@@ -19,7 +19,7 @@
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/string.h>
 #include <sof/trace/dma-trace.h>
 #include <ipc/topology.h>
diff --git a/src/trace/trace.c b/src/trace/trace.c
index 40a8bc63974c..335d3176bf8f 100644
--- a/src/trace/trace.c
+++ b/src/trace/trace.c
@@ -18,7 +18,7 @@
 #include <sof/platform.h>
 #include <sof/string.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/trace/dma-trace.h>
 #include <sof/trace/preproc.h>
 #include <sof/trace/trace.h>
diff --git a/test/cmocka/src/common_mocks.c b/test/cmocka/src/common_mocks.c
index 168b8cac2626..a3dc19be4bd5 100644
--- a/test/cmocka/src/common_mocks.c
+++ b/test/cmocka/src/common_mocks.c
@@ -15,7 +15,7 @@
 #include <sof/schedule/edf_schedule.h>
 #include <sof/schedule/ll_schedule.h>
 #include <sof/schedule/schedule.h>
-#include <sof/spinlock.h>
+#include <zephyr/spinlock.h>
 #include <sof/audio/component_ext.h>
 #include <sof/lib/clk.h>
 #include <sof/lib/notifier.h>
diff --git a/tools/tplg_parser/CMakeLists.txt b/tools/tplg_parser/CMakeLists.txt
index 1e56ea4d3ebd..c820227d2ba3 100644
--- a/tools/tplg_parser/CMakeLists.txt
+++ b/tools/tplg_parser/CMakeLists.txt
@@ -27,6 +27,10 @@ target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/i
 target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/arch/host/include)
 target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/platform/library/include)
 
+# TODO: The xtos-wrapper include PATH will eventually become optional based on the
+# RTOS selection. It's manadatory atm until the native Zephyr integration is ready.
+target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/arch/xtos-wrapper/include)
+
 # TODO: add IPC4 option when it's ready.
 target_compile_options(sof_tplg_parser PRIVATE
 	-g -O -Wall -Werror -Wl,-EL
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 39c199a367df..555efdd269c9 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -88,6 +88,10 @@ target_include_directories(SOF INTERFACE ../zephyr/include)
 target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/include)
 target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/arch/${ARCH}/include)
 
+# TODO: The xtos-wrapper include PATH will eventually become optional based on the
+# RTOS selection. It's manadatory atm until the native Zephyr integration is ready.
+target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/arch/xtos-wrapper/include)
+
 # SOF module init
 zephyr_library_named(modules_sof)
 zephyr_include_directories(