From a33556809cc40b99b56478f7f31162d959f1a286 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Tue, 8 Oct 2024 18:44:02 +0300
Subject: [PATCH] audio: remove unnecessary inclusion of lib/memory.h

Remove unnecessary incluce statements for lib/memory.h in large number
of files in audio. Some are pure bad copy and paste, while in some
cases the module has in the past used SHARED_DATA macro, but this has
been since been removed. The SHARED_DATA use might be removed later,
so add a comment to files where lib/memory.h is only included for
this one macro.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 src/audio/aria/aria.c                                 | 1 -
 src/audio/asrc/asrc.c                                 | 1 -
 src/audio/asrc/asrc_ipc3.c                            | 1 -
 src/audio/asrc/asrc_ipc4.c                            | 1 -
 src/audio/base_fw.c                                   | 2 +-
 src/audio/buffers/comp_buffer.c                       | 1 -
 src/audio/component.c                                 | 2 +-
 src/audio/copier/copier.c                             | 1 -
 src/audio/copier/copier_ipcgtw.c                      | 1 -
 src/audio/crossover/crossover.c                       | 1 -
 src/audio/dai-legacy.c                                | 2 +-
 src/audio/dai-zephyr.c                                | 2 +-
 src/audio/dcblock/dcblock.c                           | 1 -
 src/audio/drc/drc.c                                   | 1 -
 src/audio/eq_fir/eq_fir.c                             | 1 -
 src/audio/eq_iir/eq_iir.c                             | 1 -
 src/audio/eq_iir/eq_iir_generic.c                     | 1 -
 src/audio/eq_iir/eq_iir_ipc3.c                        | 1 -
 src/audio/eq_iir/eq_iir_ipc4.c                        | 1 -
 src/audio/google/google_hotword_detect.c              | 2 +-
 src/audio/google/google_rtc_audio_processing.c        | 1 -
 src/audio/host-legacy.c                               | 2 +-
 src/audio/host-zephyr.c                               | 2 +-
 src/audio/igo_nr/igo_nr.c                             | 1 -
 src/audio/kpb.c                                       | 2 +-
 src/audio/mfcc/mfcc.c                                 | 1 -
 src/audio/mixer/mixer.c                               | 1 -
 src/audio/mixin_mixout/mixin_mixout.c                 | 1 -
 src/audio/multiband_drc/multiband_drc.c               | 1 -
 src/audio/mux/mux.c                                   | 1 -
 src/audio/pipeline/pipeline-params.c                  | 1 -
 src/audio/rtnr/rtnr.c                                 | 1 -
 src/audio/selector/selector.c                         | 2 +-
 src/audio/src/src_common.c                            | 1 -
 src/audio/src/src_ipc3.c                              | 1 -
 src/audio/src/src_ipc4.c                              | 1 -
 src/audio/tdfb/tdfb.c                                 | 1 -
 src/audio/tone.c                                      | 2 +-
 src/audio/up_down_mixer/up_down_mixer.c               | 1 -
 src/audio/volume/volume.c                             | 1 -
 src/audio/volume/volume_ipc3.c                        | 1 -
 src/audio/volume/volume_ipc4.c                        | 1 -
 src/idc/idc.c                                         | 1 -
 src/include/sof/audio/module_adapter/module/generic.h | 1 -
 src/include/sof/audio/pipeline.h                      | 1 -
 src/samples/audio/detect_test.c                       | 1 -
 46 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/src/audio/aria/aria.c b/src/audio/aria/aria.c
index 37e8f6098d1b..6516ab86e759 100644
--- a/src/audio/aria/aria.c
+++ b/src/audio/aria/aria.c
@@ -12,7 +12,6 @@
 #include <rtos/alloc.h>
 #include <rtos/cache.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
diff --git a/src/audio/asrc/asrc.c b/src/audio/asrc/asrc.c
index 055fdab8dfa1..45a0acc81bfb 100644
--- a/src/audio/asrc/asrc.c
+++ b/src/audio/asrc/asrc.c
@@ -13,7 +13,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/math/numbers.h>
 #include <sof/trace/trace.h>
diff --git a/src/audio/asrc/asrc_ipc3.c b/src/audio/asrc/asrc_ipc3.c
index ef002e1b0310..30dfbecddc6b 100644
--- a/src/audio/asrc/asrc_ipc3.c
+++ b/src/audio/asrc/asrc_ipc3.c
@@ -6,7 +6,6 @@
 #include <sof/audio/ipc-config.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/trace/trace.h>
 #include <sof/common.h>
diff --git a/src/audio/asrc/asrc_ipc4.c b/src/audio/asrc/asrc_ipc4.c
index 9caf3a898e12..3e5d8bf7818f 100644
--- a/src/audio/asrc/asrc_ipc4.c
+++ b/src/audio/asrc/asrc_ipc4.c
@@ -6,7 +6,6 @@
 #include <sof/audio/ipc-config.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/trace/trace.h>
 #include <sof/common.h>
diff --git a/src/audio/base_fw.c b/src/audio/base_fw.c
index a6e5394f3618..cc86358a32cf 100644
--- a/src/audio/base_fw.c
+++ b/src/audio/base_fw.c
@@ -4,7 +4,7 @@
 //
 
 #include <sof/audio/component.h>
-#include <sof/lib/memory.h>
+#include <sof/lib/memory.h> /* for SHARED_DATA */
 #include <sof/ut.h>
 #include <sof/tlv.h>
 #include <ipc4/base_fw.h>
diff --git a/src/audio/buffers/comp_buffer.c b/src/audio/buffers/comp_buffer.c
index 93b681c09ef9..ff32f3942244 100644
--- a/src/audio/buffers/comp_buffer.c
+++ b/src/audio/buffers/comp_buffer.c
@@ -15,7 +15,6 @@
 #include <rtos/interrupt.h>
 #include <rtos/alloc.h>
 #include <rtos/cache.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/list.h>
 #include <rtos/spinlock.h>
diff --git a/src/audio/component.c b/src/audio/component.c
index 27eb4b1a3a00..4956e9ec0359 100644
--- a/src/audio/component.c
+++ b/src/audio/component.c
@@ -12,7 +12,7 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/cache.h>
-#include <sof/lib/memory.h>
+#include <sof/lib/memory.h> /* for SHARED_DATA */
 #include <sof/list.h>
 #include <rtos/sof.h>
 #include <rtos/string.h>
diff --git a/src/audio/copier/copier.c b/src/audio/copier/copier.c
index c9f81a213d70..dc2c0d3d2b87 100644
--- a/src/audio/copier/copier.c
+++ b/src/audio/copier/copier.c
@@ -18,7 +18,6 @@
 #include <rtos/alloc.h>
 #include <rtos/cache.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <rtos/string.h>
diff --git a/src/audio/copier/copier_ipcgtw.c b/src/audio/copier/copier_ipcgtw.c
index 604d9fecced4..20d20b864652 100644
--- a/src/audio/copier/copier_ipcgtw.c
+++ b/src/audio/copier/copier_ipcgtw.c
@@ -5,7 +5,6 @@
 #include <sof/audio/component_ext.h>
 #include <sof/trace/trace.h>
 #include <sof/lib/uuid.h>
-#include <sof/lib/memory.h>
 #include <sof/ut.h>
 #include <rtos/init.h>
 #include "copier.h"
diff --git a/src/audio/crossover/crossover.c b/src/audio/crossover/crossover.c
index 914168aa395f..dae27ff12b56 100644
--- a/src/audio/crossover/crossover.c
+++ b/src/audio/crossover/crossover.c
@@ -17,7 +17,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/math/iir_df2t.h>
 #include <sof/list.h>
diff --git a/src/audio/dai-legacy.c b/src/audio/dai-legacy.c
index 189926f6f3d9..84220a133f1f 100644
--- a/src/audio/dai-legacy.c
+++ b/src/audio/dai-legacy.c
@@ -19,7 +19,7 @@
 #include <rtos/cache.h>
 #include <rtos/init.h>
 #include <sof/lib/dai.h>
-#include <sof/lib/memory.h>
+#include <sof/lib/memory.h> /* for SHARED_DATA */
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
diff --git a/src/audio/dai-zephyr.c b/src/audio/dai-zephyr.c
index ff378be8cd9d..58499b8a699f 100644
--- a/src/audio/dai-zephyr.c
+++ b/src/audio/dai-zephyr.c
@@ -19,7 +19,7 @@
 #include <rtos/cache.h>
 #include <rtos/init.h>
 #include <sof/lib/dai.h>
-#include <sof/lib/memory.h>
+#include <sof/lib/memory.h> /* for SHARED_DATA */
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <sof/lib/dma.h>
diff --git a/src/audio/dcblock/dcblock.c b/src/audio/dcblock/dcblock.c
index b94373489538..4d4888d8b4f8 100644
--- a/src/audio/dcblock/dcblock.c
+++ b/src/audio/dcblock/dcblock.c
@@ -16,7 +16,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/platform.h>
diff --git a/src/audio/drc/drc.c b/src/audio/drc/drc.c
index f02c8ff2a4fe..5543de987456 100644
--- a/src/audio/drc/drc.c
+++ b/src/audio/drc/drc.c
@@ -12,7 +12,6 @@
 #include <sof/audio/ipc-config.h>
 #include <sof/audio/pipeline.h>
 #include <sof/ipc/msg.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/math/numbers.h>
 #include <sof/trace/trace.h>
diff --git a/src/audio/eq_fir/eq_fir.c b/src/audio/eq_fir/eq_fir.c
index 0fb40145aa97..b02c104cdf89 100644
--- a/src/audio/eq_fir/eq_fir.c
+++ b/src/audio/eq_fir/eq_fir.c
@@ -17,7 +17,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/fir_config.h>
diff --git a/src/audio/eq_iir/eq_iir.c b/src/audio/eq_iir/eq_iir.c
index 7e2e54df7df6..e11d9454433b 100644
--- a/src/audio/eq_iir/eq_iir.c
+++ b/src/audio/eq_iir/eq_iir.c
@@ -19,7 +19,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/platform.h>
diff --git a/src/audio/eq_iir/eq_iir_generic.c b/src/audio/eq_iir/eq_iir_generic.c
index 2f891e240b10..1941fbda3a8b 100644
--- a/src/audio/eq_iir/eq_iir_generic.c
+++ b/src/audio/eq_iir/eq_iir_generic.c
@@ -19,7 +19,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/iir_df1.h>
diff --git a/src/audio/eq_iir/eq_iir_ipc3.c b/src/audio/eq_iir/eq_iir_ipc3.c
index 7ccc375021fe..ca611bc8a819 100644
--- a/src/audio/eq_iir/eq_iir_ipc3.c
+++ b/src/audio/eq_iir/eq_iir_ipc3.c
@@ -19,7 +19,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/iir_df1.h>
diff --git a/src/audio/eq_iir/eq_iir_ipc4.c b/src/audio/eq_iir/eq_iir_ipc4.c
index 7106ec3d7343..94e984e8a4ac 100644
--- a/src/audio/eq_iir/eq_iir_ipc4.c
+++ b/src/audio/eq_iir/eq_iir_ipc4.c
@@ -19,7 +19,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/iir_df1.h>
diff --git a/src/audio/google/google_hotword_detect.c b/src/audio/google/google_hotword_detect.c
index f1ff718487da..920945209dbf 100644
--- a/src/audio/google/google_hotword_detect.c
+++ b/src/audio/google/google_hotword_detect.c
@@ -15,7 +15,7 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
+#include <sof/lib/memory.h> /* for SHARED_DATA */
 #include <sof/lib/notifier.h>
 #include <rtos/wait.h>
 #include <sof/lib/uuid.h>
diff --git a/src/audio/google/google_rtc_audio_processing.c b/src/audio/google/google_rtc_audio_processing.c
index 0fb3bf344b42..78354123b1ec 100644
--- a/src/audio/google/google_rtc_audio_processing.c
+++ b/src/audio/google/google_rtc_audio_processing.c
@@ -20,7 +20,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <rtos/wait.h>
diff --git a/src/audio/host-legacy.c b/src/audio/host-legacy.c
index 73fa30e1b61c..9bb6e1efa2ae 100644
--- a/src/audio/host-legacy.c
+++ b/src/audio/host-legacy.c
@@ -17,7 +17,7 @@
 #include <rtos/init.h>
 #include <sof/lib/dma.h>
 #include <sof/lib/mailbox.h>
-#include <sof/lib/memory.h>
+#include <sof/lib/memory.h> /* for SHARED_DATA */
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
diff --git a/src/audio/host-zephyr.c b/src/audio/host-zephyr.c
index d3bc506d2fbf..6addb947f7c0 100644
--- a/src/audio/host-zephyr.c
+++ b/src/audio/host-zephyr.c
@@ -17,7 +17,7 @@
 #include <rtos/init.h>
 #include <sof/lib/dma.h>
 #include <sof/lib/mailbox.h>
-#include <sof/lib/memory.h>
+#include <sof/lib/memory.h> /* for SHARED_DATA */
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
diff --git a/src/audio/igo_nr/igo_nr.c b/src/audio/igo_nr/igo_nr.c
index 469cc5405b02..78eead2b1e97 100644
--- a/src/audio/igo_nr/igo_nr.c
+++ b/src/audio/igo_nr/igo_nr.c
@@ -14,7 +14,6 @@
 #include <rtos/panic.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/platform.h>
diff --git a/src/audio/kpb.c b/src/audio/kpb.c
index e5b8827d4ec0..2141cc8ac1d5 100644
--- a/src/audio/kpb.c
+++ b/src/audio/kpb.c
@@ -26,7 +26,7 @@
 #include <rtos/alloc.h>
 #include <rtos/clk.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
+#include <sof/lib/memory.h> /* for SHARED_DATA */
 #include <sof/lib/pm_runtime.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
diff --git a/src/audio/mfcc/mfcc.c b/src/audio/mfcc/mfcc.c
index 21465e40e4ac..fd0e0223b533 100644
--- a/src/audio/mfcc/mfcc.c
+++ b/src/audio/mfcc/mfcc.c
@@ -15,7 +15,6 @@
 #include <sof/common.h>
 #include <rtos/panic.h>
 #include <sof/ipc/msg.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/platform.h>
diff --git a/src/audio/mixer/mixer.c b/src/audio/mixer/mixer.c
index 2ed75b1e9e0b..f7583c8b4d1b 100644
--- a/src/audio/mixer/mixer.c
+++ b/src/audio/mixer/mixer.c
@@ -16,7 +16,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
diff --git a/src/audio/mixin_mixout/mixin_mixout.c b/src/audio/mixin_mixout/mixin_mixout.c
index fe2c424efdb1..94a61c89d097 100644
--- a/src/audio/mixin_mixout/mixin_mixout.c
+++ b/src/audio/mixin_mixout/mixin_mixout.c
@@ -14,7 +14,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
diff --git a/src/audio/multiband_drc/multiband_drc.c b/src/audio/multiband_drc/multiband_drc.c
index 019f5274c2bc..3ffe8e0f511e 100644
--- a/src/audio/multiband_drc/multiband_drc.c
+++ b/src/audio/multiband_drc/multiband_drc.c
@@ -10,7 +10,6 @@
 #include <sof/audio/ipc-config.h>
 #include <sof/audio/pipeline.h>
 #include <sof/ipc/msg.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/math/numbers.h>
 #include <module/crossover/crossover_common.h>
diff --git a/src/audio/mux/mux.c b/src/audio/mux/mux.c
index bde073a7b269..bd2ae7d5c7d1 100644
--- a/src/audio/mux/mux.c
+++ b/src/audio/mux/mux.c
@@ -13,7 +13,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
diff --git a/src/audio/pipeline/pipeline-params.c b/src/audio/pipeline/pipeline-params.c
index 6bd07e35e883..c9b4f132c9e4 100644
--- a/src/audio/pipeline/pipeline-params.c
+++ b/src/audio/pipeline/pipeline-params.c
@@ -8,7 +8,6 @@
 #include <sof/audio/buffer.h>
 #include <sof/audio/component_ext.h>
 #include <sof/audio/pipeline.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/mm_heap.h>
 #include <sof/compiler_attributes.h>
 #include <sof/list.h>
diff --git a/src/audio/rtnr/rtnr.c b/src/audio/rtnr/rtnr.c
index bc78126059c2..830bbde413e7 100644
--- a/src/audio/rtnr/rtnr.c
+++ b/src/audio/rtnr/rtnr.c
@@ -17,7 +17,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/platform.h>
diff --git a/src/audio/selector/selector.c b/src/audio/selector/selector.c
index a386dc5c1a63..8032a3d7dea9 100644
--- a/src/audio/selector/selector.c
+++ b/src/audio/selector/selector.c
@@ -22,7 +22,7 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
+#include <sof/lib/memory.h> /* for SHARED_DATA */
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <rtos/string.h>
diff --git a/src/audio/src/src_common.c b/src/audio/src/src_common.c
index e2d16dc7e2d3..3a8fa8541bfa 100644
--- a/src/audio/src/src_common.c
+++ b/src/audio/src/src_common.c
@@ -20,7 +20,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
diff --git a/src/audio/src/src_ipc3.c b/src/audio/src/src_ipc3.c
index f61c2345f2d9..175263deae7a 100644
--- a/src/audio/src/src_ipc3.c
+++ b/src/audio/src/src_ipc3.c
@@ -20,7 +20,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
diff --git a/src/audio/src/src_ipc4.c b/src/audio/src/src_ipc4.c
index c337f34b404c..c1244801d1c1 100644
--- a/src/audio/src/src_ipc4.c
+++ b/src/audio/src/src_ipc4.c
@@ -20,7 +20,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
diff --git a/src/audio/tdfb/tdfb.c b/src/audio/tdfb/tdfb.c
index 9adc6a64af6d..dbb99bddb5aa 100644
--- a/src/audio/tdfb/tdfb.c
+++ b/src/audio/tdfb/tdfb.c
@@ -16,7 +16,6 @@
 #include <sof/audio/module_adapter/module/generic.h>
 #include <sof/audio/pipeline.h>
 #include <sof/ipc/msg.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/math/fir_generic.h>
 #include <sof/math/fir_hifi2ep.h>
diff --git a/src/audio/tone.c b/src/audio/tone.c
index d289c12d5f57..c07be0302b8c 100644
--- a/src/audio/tone.c
+++ b/src/audio/tone.c
@@ -16,7 +16,7 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
+#include <sof/lib/memory.h> /* for SHARED_DATA */
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/trig.h>
diff --git a/src/audio/up_down_mixer/up_down_mixer.c b/src/audio/up_down_mixer/up_down_mixer.c
index d96ce0d38cf7..e1cb4d9e13bc 100644
--- a/src/audio/up_down_mixer/up_down_mixer.c
+++ b/src/audio/up_down_mixer/up_down_mixer.c
@@ -14,7 +14,6 @@
 #include <rtos/alloc.h>
 #include <rtos/cache.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
diff --git a/src/audio/volume/volume.c b/src/audio/volume/volume.c
index 9d5ad6d43e4c..ed0bbc99dec1 100644
--- a/src/audio/volume/volume.c
+++ b/src/audio/volume/volume.c
@@ -27,7 +27,6 @@
 #include <rtos/alloc.h>
 #include <rtos/init.h>
 #include <sof/lib/cpu.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
diff --git a/src/audio/volume/volume_ipc3.c b/src/audio/volume/volume_ipc3.c
index 2ae1d362a787..0e599a0dabd6 100644
--- a/src/audio/volume/volume_ipc3.c
+++ b/src/audio/volume/volume_ipc3.c
@@ -17,7 +17,6 @@
 #include <rtos/alloc.h>
 #include <rtos/init.h>
 #include <sof/lib/cpu.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
diff --git a/src/audio/volume/volume_ipc4.c b/src/audio/volume/volume_ipc4.c
index 1e3f8fe3705f..5db67be04cb5 100644
--- a/src/audio/volume/volume_ipc4.c
+++ b/src/audio/volume/volume_ipc4.c
@@ -17,7 +17,6 @@
 #include <rtos/alloc.h>
 #include <rtos/init.h>
 #include <sof/lib/cpu.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
diff --git a/src/idc/idc.c b/src/idc/idc.c
index 4ace39cf3fc9..3661900164b2 100644
--- a/src/idc/idc.c
+++ b/src/idc/idc.c
@@ -15,7 +15,6 @@
 #include <rtos/alloc.h>
 #include <rtos/clk.h>
 #include <sof/lib/cpu.h>
-#include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/lib/pm_runtime.h>
 #include <sof/lib/uuid.h>
diff --git a/src/include/sof/audio/module_adapter/module/generic.h b/src/include/sof/audio/module_adapter/module/generic.h
index 2952d86c375d..f8081c6b4c6a 100644
--- a/src/include/sof/audio/module_adapter/module/generic.h
+++ b/src/include/sof/audio/module_adapter/module/generic.h
@@ -15,7 +15,6 @@
 
 #include <sof/audio/component.h>
 #include <sof/ut.h>
-#include <sof/lib/memory.h>
 #include <sof/audio/sink_api.h>
 #include <sof/audio/source_api.h>
 #include "module_interface.h"
diff --git a/src/include/sof/audio/pipeline.h b/src/include/sof/audio/pipeline.h
index 2410f774f00d..f7ca0e999e2c 100644
--- a/src/include/sof/audio/pipeline.h
+++ b/src/include/sof/audio/pipeline.h
@@ -10,7 +10,6 @@
 
 #include <sof/lib/cpu.h>
 #include <sof/lib/mailbox.h>
-#include <sof/lib/memory.h>
 #include <sof/list.h>
 #include <rtos/task.h>
 #include <rtos/sof.h>
diff --git a/src/samples/audio/detect_test.c b/src/samples/audio/detect_test.c
index d7067243dad3..0b7d12d8914c 100644
--- a/src/samples/audio/detect_test.c
+++ b/src/samples/audio/detect_test.c
@@ -16,7 +16,6 @@
 #include <sof/ipc/msg.h>
 #include <rtos/alloc.h>
 #include <rtos/init.h>
-#include <sof/lib/memory.h>
 #include <rtos/wait.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>