diff --git a/src/arch/xtensa/init.c b/src/arch/xtensa/init.c
index c255b4561..424ac1cf1 100644
--- a/src/arch/xtensa/init.c
+++ b/src/arch/xtensa/init.c
@@ -12,11 +12,14 @@
 
 #include "xtos-internal.h"
 #include <sof/common.h>
+#include <sof/debug/panic.h>
 #include <sof/init.h>
 #include <sof/lib/cpu.h>
 #include <sof/sof.h>
 #include <sof/spinlock.h>
 
+#include <ipc/trace.h>
+
 #include <xtensa/xtruntime-frames.h>
 #include <xtos-structs.h>
 #include <stddef.h>
diff --git a/src/arch/xtensa/lib/cpu.c b/src/arch/xtensa/lib/cpu.c
index 9452b3e5c..2eda47fa6 100644
--- a/src/arch/xtensa/lib/cpu.c
+++ b/src/arch/xtensa/lib/cpu.c
@@ -24,6 +24,7 @@
 #include <sof/schedule/schedule.h>
 #include <sof/sof.h>
 #include <sof/trace/trace.h>
+#include <ipc/trace.h>
 #include <user/trace.h>
 #include <xtos-structs.h>
 #include <stdint.h>
diff --git a/src/drivers/imx/ipc.c b/src/drivers/imx/ipc.c
index 10663c2cd..4a7276536 100644
--- a/src/drivers/imx/ipc.c
+++ b/src/drivers/imx/ipc.c
@@ -22,6 +22,7 @@
 #include <sof/spinlock.h>
 #include <ipc/header.h>
 #include <ipc/topology.h>
+#include <ipc/trace.h>
 
 #include <errno.h>
 #include <stdbool.h>
diff --git a/src/include/sof/spinlock.h b/src/include/sof/spinlock.h
index f387b4ae6..e3a5df290 100644
--- a/src/include/sof/spinlock.h
+++ b/src/include/sof/spinlock.h
@@ -15,6 +15,7 @@
 
 #include <arch/spinlock.h>
 #include <sof/lib/memory.h>
+#include <ipc/trace.h>
 
 #include <stdint.h>
 
diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h
index 99b724a1b..62874679a 100644
--- a/src/platform/baytrail/include/platform/platform.h
+++ b/src/platform/baytrail/include/platform/platform.h
@@ -25,6 +25,7 @@
 #include <sof/lib/clk.h>
 #include <sof/lib/mailbox.h>
 #include <sof/lib/shim.h>
+#include <ipc/trace.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/src/platform/haswell/include/platform/platform.h b/src/platform/haswell/include/platform/platform.h
index dd10aa93e..49a400f5f 100644
--- a/src/platform/haswell/include/platform/platform.h
+++ b/src/platform/haswell/include/platform/platform.h
@@ -21,6 +21,7 @@
 #include <sof/lib/clk.h>
 #include <sof/lib/mailbox.h>
 #include <sof/lib/shim.h>
+#include <ipc/trace.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/src/platform/intel/cavs/boot_loader.c b/src/platform/intel/cavs/boot_loader.c
index 0670d17dc..4c79ddb65 100644
--- a/src/platform/intel/cavs/boot_loader.c
+++ b/src/platform/intel/cavs/boot_loader.c
@@ -14,6 +14,7 @@
 #include <sof/platform.h>
 #include <sof/sof.h>
 #include <sof/trace/trace.h>
+#include <ipc/trace.h>
 #include <rimage/sof/user/manifest.h>
 
 #include <stdbool.h>