diff --git a/src/ipc/ipc3/handler.c b/src/ipc/ipc3/handler.c
index 8d7bc77fd..ac7e0bed3 100644
--- a/src/ipc/ipc3/handler.c
+++ b/src/ipc/ipc3/handler.c
@@ -19,30 +19,18 @@
 #include <sof/debug/gdb/gdb.h>
 #include <sof/debug/panic.h>
 #include <sof/drivers/idc.h>
-#include <sof/drivers/interrupt.h>
-#include <sof/ipc/topology.h>
 #include <sof/ipc/common.h>
 #include <sof/ipc/msg.h>
 #include <sof/ipc/driver.h>
 #include <sof/ipc/schedule.h>
-#include <sof/drivers/timer.h>
 #include <sof/lib/agent.h>
 #include <sof/lib/alloc.h>
-#include <sof/lib/clk.h>
 #include <sof/lib/cache.h>
-#include <sof/lib/cpu.h>
-#include <sof/lib/dai.h>
-#include <sof/lib/dma.h>
 #include <sof/lib/mailbox.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/mm_heap.h>
 #include <sof/lib/pm_runtime.h>
 #include <sof/list.h>
-#include <sof/math/numbers.h>
 #include <sof/platform.h>
-#include <sof/schedule/schedule.h>
-#include <sof/schedule/task.h>
-#include <sof/spinlock.h>
 #include <sof/string.h>
 #include <sof/trace/dma-trace.h>
 #include <sof/trace/trace.h>
@@ -607,7 +595,7 @@ static int ipc_pm_context_save(uint32_t header)
 	platform_context_save(sof_get());
 
 	/* TODO use Zephyr calls for shutdown */
-#ifndef __ZEPHYR__
+#if !defined(__ZEPHYR__) && !defined(CONFIG_LIBRARY)
 	/* TODO: check we are inactive - all streams are suspended */
 
 	/* TODO: mask ALL platform interrupts except DMA */
diff --git a/src/ipc/ipc3/helper.c b/src/ipc/ipc3/helper.c
index 3052f5d3c..ba76de3ac 100644
--- a/src/ipc/ipc3/helper.c
+++ b/src/ipc/ipc3/helper.c
@@ -11,20 +11,15 @@
 #include <sof/audio/ipc-config.h>
 #include <sof/common.h>
 #include <sof/drivers/idc.h>
-#include <sof/drivers/interrupt.h>
 #include <sof/ipc/topology.h>
 #include <sof/ipc/common.h>
 #include <sof/ipc/msg.h>
-#include <sof/ipc/driver.h>
-#include <sof/ipc/schedule.h>
 #include <sof/lib/alloc.h>
 #include <sof/lib/cache.h>
-#include <sof/lib/cpu.h>
 #include <sof/lib/mailbox.h>
 #include <sof/list.h>
 #include <sof/platform.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
 #include <ipc/dai.h>
 #include <ipc/header.h>
 #include <ipc/stream.h>