diff --git a/src/audio/CMakeLists.txt b/src/audio/CMakeLists.txt
index 2810a0e452de..85f3216d4c0f 100644
--- a/src/audio/CMakeLists.txt
+++ b/src/audio/CMakeLists.txt
@@ -12,14 +12,37 @@ set(base_files
 
 ### Common actions for Zephyr/XTOS ###
 if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
+	# directories included unconditionally (alphabetical order)
 	add_subdirectory(buffers)
+	add_subdirectory(pcm_converter)
 	add_subdirectory(pipeline)
+
+	# directories and files included conditionally (alphabetical order)
+	if(CONFIG_COMP_ARIA)
+		add_subdirectory(aria)
+	endif()
 	if(CONFIG_COMP_ASRC)
 		add_subdirectory(asrc)
 	endif()
+	if(CONFIG_COMP_BASEFW_IPC4 AND NOT CONFIG_LIBRARY)
+		add_local_sources(sof base_fw.c)
+	endif()
+	add_local_sources_ifdef(CONFIG_IPC4_BASE_FW_INTEL sof base_fw_intel.c)
+	if(CONFIG_COMP_CHAIN_DMA)
+		add_local_sources(sof chain_dma.c)
+	endif()
+	if(CONFIG_COMP_COPIER)
+		add_subdirectory(copier)
+	endif()
+	if(CONFIG_COMP_CROSSOVER)
+		add_subdirectory(crossover)
+	endif()
 	if(CONFIG_COMP_DCBLOCK)
 		add_subdirectory(dcblock)
 	endif()
+	if(CONFIG_COMP_DRC)
+		add_subdirectory(drc)
+	endif()
 	if(CONFIG_COMP_FIR)
 		add_subdirectory(eq_fir)
 	endif()
@@ -31,13 +54,41 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 			kpb.c
 		)
 	endif()
+	if(CONFIG_COMP_MFCC)
+		add_subdirectory(mfcc)
+	endif()
+	if(CONFIG_COMP_MIXER)
+                add_subdirectory(mixer)
+	endif()
+	if(CONFIG_COMP_MIXIN_MIXOUT)
+                add_subdirectory(mixin_mixout)
+	endif()
+	if(CONFIG_COMP_MULTIBAND_DRC)
+		add_subdirectory(multiband_drc)
+	endif()
+	if(CONFIG_COMP_MUX)
+		add_subdirectory(mux)
+	endif()
 	if(CONFIG_COMP_SEL)
 		add_subdirectory(selector)
 	endif()
 	if(CONFIG_COMP_SRC)
 		add_subdirectory(src)
 	endif()
-
+	if(CONFIG_COMP_TDFB)
+		add_subdirectory(tdfb)
+	endif()
+	if(CONFIG_COMP_TONE)
+		add_local_sources(sof
+			tone.c
+		)
+	endif()
+	if(CONFIG_COMP_UP_DOWN_MIXER)
+		add_subdirectory(up_down_mixer)
+	endif()
+	if(CONFIG_COMP_VOLUME)
+		add_subdirectory(volume)
+	endif()
 	if(CONFIG_ZEPHYR_NATIVE_DRIVERS)
 		list(APPEND base_files host-zephyr.c)
 		sof_list_append_ifdef(CONFIG_COMP_DAI base_files dai-zephyr.c)
@@ -47,8 +98,12 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 	endif()
 endif()
 
+### Common files (also used in shared library build)
+
 sof_list_append_ifdef(CONFIG_COMP_BLOB base_files data_blob.c)
 
+### (end of common files)
+
 is_zephyr(it_is)
 if(it_is) ###  Zephyr ###
 
@@ -67,32 +122,6 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 		${base_files}
 	)
 
-	if(CONFIG_COMP_CROSSOVER)
-		add_subdirectory(crossover)
-	endif()
-	if(CONFIG_COMP_TDFB)
-		add_subdirectory(tdfb)
-	endif()
-	if(CONFIG_COMP_DRC)
-		add_subdirectory(drc)
-	endif()
-	if(CONFIG_COMP_MULTIBAND_DRC)
-		add_subdirectory(multiband_drc)
-	endif()
-	if(CONFIG_COMP_TONE)
-		add_local_sources(sof
-			tone.c
-		)
-	endif()
-	if(CONFIG_COMP_MIXER)
-                add_subdirectory(mixer)
-	endif()
-	if(CONFIG_COMP_MIXIN_MIXOUT)
-                add_subdirectory(mixin_mixout)
-	endif()
-	if(CONFIG_COMP_MUX)
-		add_subdirectory(mux)
-	endif()
 	if(CONFIG_COMP_DAI)
 		add_local_sources(sof
 			dai-legacy.c
@@ -101,43 +130,19 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 	if(CONFIG_COMP_SMART_AMP)
 		add_subdirectory(smart_amp)
 	endif()
-	add_subdirectory(pcm_converter)
 	if(CONFIG_COMP_MODULE_ADAPTER)
 		add_subdirectory(module_adapter)
 	endif()
 	if(CONFIG_COMP_IGO_NR)
 		add_subdirectory(igo_nr)
 	endif()
-	if(CONFIG_COMP_COPIER)
-		add_subdirectory(copier)
-	endif()
 	if(CONFIG_COMP_RTNR)
 		add_subdirectory(rtnr)
 	endif()
-	if(CONFIG_COMP_BASEFW_IPC4 AND NOT CONFIG_LIBRARY)
-                add_local_sources(sof
-                        base_fw.c
-                )
-        endif()
-	if(CONFIG_COMP_ARIA)
-		add_subdirectory(aria)
-	endif()
-	if(CONFIG_COMP_UP_DOWN_MIXER)
-		add_subdirectory(up_down_mixer)
-	endif()
-	if(CONFIG_COMP_MFCC)
-		add_subdirectory(mfcc)
-	endif()
-	if(CONFIG_COMP_VOLUME)
-		add_subdirectory(volume)
-	endif()
 	if(CONFIG_INTEL_ADSP_MIC_PRIVACY)
 		add_subdirectory(mic_privacy_manager)
 	endif()
 	add_subdirectory(google)
-	if(CONFIG_COMP_CHAIN_DMA)
-		add_local_sources(sof chain_dma.c)
-	endif()
 	if(CONFIG_DTS_CODEC)
 		add_subdirectory(codec)
 	endif()
diff --git a/src/audio/aria/CMakeLists.txt b/src/audio/aria/CMakeLists.txt
index 36af35cc76fd..b8c1cd7ea761 100644
--- a/src/audio/aria/CMakeLists.txt
+++ b/src/audio/aria/CMakeLists.txt
@@ -1,3 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-add_local_sources(sof aria.c aria_hifi5.c aria_hifi3.c aria_generic.c)
+if(CONFIG_COMP_ARIA STREQUAL "m")
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/aria_llext)
+  add_dependencies(app aria)
+else()
+  add_local_sources(sof aria.c aria_hifi5.c aria_hifi3.c aria_generic.c)
+endif()
diff --git a/src/audio/crossover/CMakeLists.txt b/src/audio/crossover/CMakeLists.txt
index c58c01460cd7..8cea3e0c5156 100644
--- a/src/audio/crossover/CMakeLists.txt
+++ b/src/audio/crossover/CMakeLists.txt
@@ -1,3 +1,11 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
+if(CONFIG_COMP_CROSSOVER STREQUAL "m")
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/crossover_llext)
+  add_dependencies(app crossover)
+  return()
+endif()
+
 add_local_sources(sof crossover.c)
 add_local_sources(sof crossover_generic.c)
 if(CONFIG_IPC_MAJOR_3)
diff --git a/src/audio/drc/CMakeLists.txt b/src/audio/drc/CMakeLists.txt
index 4e2751035ee5..b497284d6bb8 100644
--- a/src/audio/drc/CMakeLists.txt
+++ b/src/audio/drc/CMakeLists.txt
@@ -1,9 +1,19 @@
-add_local_sources(sof
-	drc.c
-	drc_generic.c
-	drc_hifi3.c
-	drc_hifi4.c
-	drc_math_generic.c
-	drc_math_hifi3.c
-	drc_log.c
-)
+# SPDX-License-Identifier: BSD-3-Clause
+
+if(CONFIG_COMP_DRC STREQUAL "m")
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/drc_llext)
+  add_dependencies(app drc)
+else()
+  add_local_sources(sof
+    drc.c
+    drc_generic.c
+    drc_hifi3.c
+    drc_hifi4.c
+    drc_math_generic.c
+    drc_math_hifi3.c
+    )
+endif()
+
+if(NOT CONFIG_COMP_DRC STREQUAL "n")
+  add_local_sources(sof drc_log.c)
+endif()
diff --git a/src/audio/mfcc/CMakeLists.txt b/src/audio/mfcc/CMakeLists.txt
index c8ed971f2da6..83a34a75e324 100644
--- a/src/audio/mfcc/CMakeLists.txt
+++ b/src/audio/mfcc/CMakeLists.txt
@@ -1,3 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-add_local_sources(sof mfcc.c mfcc_setup.c mfcc_common.c mfcc_generic.c mfcc_hifi4.c mfcc_hifi3.c)
+if(CONFIG_COMP_MFCC STREQUAL "m")
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/mfcc_llext)
+  add_dependencies(app mfcc)
+else()
+  add_local_sources(sof mfcc.c mfcc_setup.c mfcc_common.c mfcc_generic.c mfcc_hifi4.c mfcc_hifi3.c)
+endif()
diff --git a/src/audio/mixin_mixout/CMakeLists.txt b/src/audio/mixin_mixout/CMakeLists.txt
index 2e6dc7456ae5..e6f0776b8b92 100644
--- a/src/audio/mixin_mixout/CMakeLists.txt
+++ b/src/audio/mixin_mixout/CMakeLists.txt
@@ -1 +1,12 @@
-add_local_sources(sof mixin_mixout.c mixin_mixout_generic.c mixin_mixout_hifi3.c mixin_mixout_hifi5.c)
+# SPDX-License-Identifier: BSD-3-Clause
+
+if(CONFIG_COMP_MIXIN_MIXOUT STREQUAL "m")
+
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/mixin_mixout_llext)
+  add_dependencies(app mixin_mixout)
+
+else()
+
+  add_local_sources(sof mixin_mixout.c mixin_mixout_generic.c mixin_mixout_hifi3.c mixin_mixout_hifi5.c)
+
+endif()
diff --git a/src/audio/multiband_drc/CMakeLists.txt b/src/audio/multiband_drc/CMakeLists.txt
index 3579af97f97b..6267948030a8 100644
--- a/src/audio/multiband_drc/CMakeLists.txt
+++ b/src/audio/multiband_drc/CMakeLists.txt
@@ -1,8 +1,15 @@
-add_local_sources(sof multiband_drc.c)
-add_local_sources(sof multiband_drc_generic.c)
+# SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_IPC_MAJOR_3)
-	add_local_sources(sof multiband_drc_ipc3.c)
-elseif(CONFIG_IPC_MAJOR_4)
-	add_local_sources(sof multiband_drc_ipc4.c)
+if(CONFIG_COMP_MULTIBAND_DRC STREQUAL "m")
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/multiband_drc_llext)
+  add_dependencies(app multiband_drc)
+else()
+  add_local_sources(sof multiband_drc.c)
+  add_local_sources(sof multiband_drc_generic.c)
+
+  if(CONFIG_IPC_MAJOR_3)
+    add_local_sources(sof multiband_drc_ipc3.c)
+  elseif(CONFIG_IPC_MAJOR_4)
+    add_local_sources(sof multiband_drc_ipc4.c)
+  endif()
 endif()
diff --git a/src/audio/mux/CMakeLists.txt b/src/audio/mux/CMakeLists.txt
index a7b890cb3512..6064c738aa29 100644
--- a/src/audio/mux/CMakeLists.txt
+++ b/src/audio/mux/CMakeLists.txt
@@ -1,10 +1,14 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-add_local_sources(sof mux.c mux_generic.c)
+if(CONFIG_COMP_MUX STREQUAL "m")
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/mux_llext)
+  add_dependencies(app mux)
+else()
+  add_local_sources(sof mux.c mux_generic.c)
 
-if(CONFIG_IPC_MAJOR_3)
-	add_local_sources(sof mux_ipc3.c)
-elseif(CONFIG_IPC_MAJOR_4)
-	add_local_sources(sof mux_ipc4.c)
+  if(CONFIG_IPC_MAJOR_3)
+    add_local_sources(sof mux_ipc3.c)
+  elseif(CONFIG_IPC_MAJOR_4)
+    add_local_sources(sof mux_ipc4.c)
+  endif()
 endif()
-
diff --git a/src/audio/tdfb/CMakeLists.txt b/src/audio/tdfb/CMakeLists.txt
index a476cd5b9f1a..2ecc72640349 100644
--- a/src/audio/tdfb/CMakeLists.txt
+++ b/src/audio/tdfb/CMakeLists.txt
@@ -1,8 +1,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-add_local_sources(sof tdfb.c tdfb_generic.c tdfb_hifiep.c tdfb_hifi3.c tdfb_direction.c)
-if(CONFIG_IPC_MAJOR_3)
-	add_local_sources(sof tdfb_ipc3.c)
-elseif(CONFIG_IPC_MAJOR_4)
-	add_local_sources(sof tdfb_ipc4.c)
+if(CONFIG_COMP_TDFB STREQUAL "m")
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/tdfb_llext)
+  add_dependencies(app tdfb)
+else()
+  add_local_sources(sof tdfb.c tdfb_generic.c tdfb_hifiep.c tdfb_hifi3.c tdfb_direction.c)
+  if(CONFIG_IPC_MAJOR_3)
+    add_local_sources(sof tdfb_ipc3.c)
+  elseif(CONFIG_IPC_MAJOR_4)
+    add_local_sources(sof tdfb_ipc4.c)
+  endif()
 endif()
diff --git a/src/audio/volume/CMakeLists.txt b/src/audio/volume/CMakeLists.txt
index 5c5b764b5912..8c743ba1f464 100644
--- a/src/audio/volume/CMakeLists.txt
+++ b/src/audio/volume/CMakeLists.txt
@@ -1,19 +1,22 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_VOLUME)
-	add_local_sources(sof
-		volume_generic.c
-		volume_hifi3.c
-		volume_hifi4.c
-		volume_hifi5.c
-		volume_generic_with_peakvol.c
-		volume_hifi3_with_peakvol.c
-		volume_hifi4_with_peakvol.c
-		volume_hifi5_with_peakvol.c
-		volume.c)
-	if(CONFIG_IPC_MAJOR_3)
-		add_local_sources(sof volume_ipc3.c)
-	elseif(CONFIG_IPC_MAJOR_4)
-		add_local_sources(sof volume_ipc4.c)
-	endif()
-endif()
\ No newline at end of file
+if(CONFIG_COMP_VOLUME STREQUAL "m")
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/volume_llext)
+  add_dependencies(app volume)
+else()
+  add_local_sources(sof
+    volume_generic.c
+    volume_hifi3.c
+    volume_hifi4.c
+    volume_hifi5.c
+    volume_generic_with_peakvol.c
+    volume_hifi3_with_peakvol.c
+    volume_hifi4_with_peakvol.c
+    volume_hifi5_with_peakvol.c
+    volume.c)
+  if(CONFIG_IPC_MAJOR_3)
+    add_local_sources(sof volume_ipc3.c)
+  elseif(CONFIG_IPC_MAJOR_4)
+    add_local_sources(sof volume_ipc4.c)
+  endif()
+endif()
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 7a3c92f9ce64..ddc530878fc2 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -203,13 +203,17 @@ macro(sof_list_append_ifdef feature_toggle list)
   endif()
 endmacro()
 
+# directories with auxiliary modules need to be listed first
+# - llext dependencies need to added to linkage first
+add_subdirectory(../src/math/  math_unused_install/)
+
+# remaining directories (in alphabetical order)
 add_subdirectory(../src/audio/ audio_unused_install/)
 add_subdirectory(../src/debug/debug_stream/  debug_stream_unused_install/)
 add_subdirectory(../src/debug/telemetry/  telemetry_unused_install/)
 add_subdirectory(../src/debug/tester/  debug_tester_unused_install/)
 add_subdirectory(../src/init/ init_unused_install/)
 add_subdirectory(../src/ipc/  ipc_unused_install/)
-add_subdirectory(../src/math/  math_unused_install/)
 add_subdirectory(../src/schedule/  schedule_unused_install/)
 add_subdirectory(test/)
 
@@ -506,60 +510,10 @@ elseif(CONFIG_IPC_MAJOR_4)
 set(ipc_suffix ipc4)
 endif()
 
-zephyr_library_sources_ifdef(CONFIG_COMP_MIXER
-	${SOF_AUDIO_PATH}/mixer/mixer.c
-	${SOF_AUDIO_PATH}/mixer/mixer_generic.c
-	${SOF_AUDIO_PATH}/mixer/mixer_hifi3.c
-)
-
-if(CONFIG_COMP_MIXIN_MIXOUT STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/mixin_mixout/llext
-			 ${PROJECT_BINARY_DIR}/mixin_mixout_llext)
-	add_dependencies(app mixin_mixout)
-elseif(CONFIG_COMP_MIXIN_MIXOUT)
-	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout.c
-		${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout_generic.c
-		${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout_hifi3.c
-		${SOF_AUDIO_PATH}/mixin_mixout/mixin_mixout_hifi5.c
-	)
-endif()
-
-zephyr_library_sources_ifdef(CONFIG_COMP_TONE
-	${SOF_AUDIO_PATH}/tone.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_IPC4_GATEWAY
-	${SOF_AUDIO_PATH}/copier/copier_ipcgtw.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_COPIER_GAIN
-	${SOF_AUDIO_PATH}/copier/copier_gain.c
-)
-
 zephyr_library_sources_ifdef(CONFIG_SAMPLE_KEYPHRASE
 	${SOF_SAMPLES_PATH}/audio/detect_test.c
 )
 
-if(CONFIG_COMP_VOLUME STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/volume/llext
-			 ${PROJECT_BINARY_DIR}/volume_llext)
-	add_dependencies(app volume)
-elseif(CONFIG_COMP_VOLUME)
-	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/volume/volume_hifi5.c
-		${SOF_AUDIO_PATH}/volume/volume_hifi4.c
-		${SOF_AUDIO_PATH}/volume/volume_hifi3.c
-		${SOF_AUDIO_PATH}/volume/volume_generic.c
-		${SOF_AUDIO_PATH}/volume/volume_hifi5_with_peakvol.c
-		${SOF_AUDIO_PATH}/volume/volume_hifi4_with_peakvol.c
-		${SOF_AUDIO_PATH}/volume/volume_hifi3_with_peakvol.c
-		${SOF_AUDIO_PATH}/volume/volume_generic_with_peakvol.c
-		${SOF_AUDIO_PATH}/volume/volume.c
-		${SOF_AUDIO_PATH}/volume/volume_${ipc_suffix}.c
-	)
-endif()
-
 zephyr_library_sources_ifdef(CONFIG_COMP_MODULE_ADAPTER
 	${SOF_AUDIO_PATH}/module_adapter/module_adapter.c
 	${SOF_AUDIO_PATH}/module_adapter/module_adapter_${ipc_suffix}.c
@@ -613,35 +567,6 @@ zephyr_library_sources_ifdef(CONFIG_PASSTHROUGH_CODEC
 )
 endif()
 
-zephyr_library_sources_ifdef(CONFIG_COMP_CHAIN_DMA
-	${SOF_AUDIO_PATH}/chain_dma.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_COMP_BASEFW_IPC4
-	${SOF_AUDIO_PATH}/base_fw.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_IPC4_BASE_FW_INTEL
-	${SOF_AUDIO_PATH}/base_fw_intel.c
-)
-
-zephyr_library_sources_ifdef(CONFIG_COMP_COPIER
-	${SOF_AUDIO_PATH}/copier/copier_generic.c
-	${SOF_AUDIO_PATH}/copier/copier_hifi.c
-	${SOF_AUDIO_PATH}/copier/copier.c
-	${SOF_AUDIO_PATH}/copier/copier_host.c
-	${SOF_AUDIO_PATH}/copier/copier_dai.c
-)
-
-zephyr_library_sources(
-	${SOF_AUDIO_PATH}/pcm_converter/pcm_converter_hifi3.c
-	${SOF_AUDIO_PATH}/pcm_converter/pcm_converter.c
-	${SOF_AUDIO_PATH}/pcm_converter/pcm_converter_generic.c
-)
-zephyr_library_sources_ifdef(CONFIG_PCM_REMAPPING_CONVERTERS
-	${SOF_AUDIO_PATH}/pcm_converter/pcm_remap.c
-)
-
 zephyr_library_sources_ifdef(CONFIG_MAXIM_DSM
 	${SOF_AUDIO_PATH}/smart_amp/smart_amp.c
 	${SOF_AUDIO_PATH}/smart_amp/smart_amp_generic.c
@@ -656,64 +581,6 @@ zephyr_library_sources_ifdef(CONFIG_MAXIM_DSM_STUB
 	${SOF_AUDIO_PATH}/smart_amp/maxim_dsm_stub.c
 )
 
-if(CONFIG_COMP_ARIA STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/aria/llext
-			 ${PROJECT_BINARY_DIR}/aria_llext)
-	add_dependencies(app aria)
-elseif(CONFIG_COMP_ARIA)
-	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/aria/aria.c
-		${SOF_AUDIO_PATH}/aria/aria_hifi5.c
-		${SOF_AUDIO_PATH}/aria/aria_hifi3.c
-		${SOF_AUDIO_PATH}/aria/aria_generic.c
-	)
-endif()
-
-if(CONFIG_COMP_CROSSOVER STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/crossover/llext
-			 ${PROJECT_BINARY_DIR}/crossover_llext)
-	add_dependencies(app crossover)
-elseif(CONFIG_COMP_CROSSOVER)
-	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/crossover/crossover.c
-		${SOF_AUDIO_PATH}/crossover/crossover_generic.c
-		${SOF_AUDIO_PATH}/crossover/crossover_${ipc_suffix}.c
-	)
-endif()
-
-if(CONFIG_COMP_DRC STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/drc/llext
-			 ${PROJECT_BINARY_DIR}/drc_llext)
-	add_dependencies(app drc)
-elseif(CONFIG_COMP_DRC)
-	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/drc/drc.c
-		${SOF_AUDIO_PATH}/drc/drc_generic.c
-		${SOF_AUDIO_PATH}/drc/drc_math_generic.c
-		${SOF_AUDIO_PATH}/drc/drc_hifi3.c
-		${SOF_AUDIO_PATH}/drc/drc_hifi4.c
-		${SOF_AUDIO_PATH}/drc/drc_math_hifi3.c
-	)
-endif()
-
-if(NOT CONFIG_COMP_DRC STREQUAL "n")
-	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/drc/drc_log.c
-	)
-endif()
-
-if(CONFIG_COMP_MULTIBAND_DRC STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/multiband_drc/llext
-			 ${PROJECT_BINARY_DIR}/multiband_drc_llext)
-	add_dependencies(app multiband_drc)
-elseif(CONFIG_COMP_MULTIBAND_DRC)
-	zephyr_library_sources_ifdef(CONFIG_COMP_MULTIBAND_DRC
-		${SOF_AUDIO_PATH}/multiband_drc/multiband_drc.c
-		${SOF_AUDIO_PATH}/multiband_drc/multiband_drc_generic.c
-		${SOF_AUDIO_PATH}/multiband_drc/multiband_drc_${ipc_suffix}.c
-	)
-endif()
-
 if(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING STREQUAL "m")
 	add_subdirectory(${SOF_AUDIO_PATH}/google/llext_rtc
 			 ${PROJECT_BINARY_DIR}/google_rtc_audio_processing_llext)
@@ -803,53 +670,6 @@ elseif(CONFIG_SAMPLE_SMART_AMP)
 	)
 endif()
 
-if(CONFIG_COMP_TDFB STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/tdfb/llext
-			 ${PROJECT_BINARY_DIR}/tdfb_llext)
-	add_dependencies(app tdfb)
-elseif(CONFIG_COMP_TDFB)
-	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/tdfb/tdfb.c
-		${SOF_AUDIO_PATH}/tdfb/tdfb_direction.c
-		${SOF_AUDIO_PATH}/tdfb/tdfb_generic.c
-		${SOF_AUDIO_PATH}/tdfb/tdfb_hifiep.c
-		${SOF_AUDIO_PATH}/tdfb/tdfb_hifi3.c
-		${SOF_AUDIO_PATH}/tdfb/tdfb_${ipc_suffix}.c
-	)
-endif()
-
-zephyr_library_sources_ifdef(CONFIG_COMP_UP_DOWN_MIXER
-	${SOF_AUDIO_PATH}/up_down_mixer/up_down_mixer.c
-	${SOF_AUDIO_PATH}/up_down_mixer/up_down_mixer_hifi3.c
-)
-
-if(CONFIG_COMP_MUX STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/mux/llext
-			 ${PROJECT_BINARY_DIR}/mux_llext)
-	add_dependencies(app mux)
-elseif(CONFIG_COMP_MUX)
-	zephyr_library_sources_ifdef(CONFIG_COMP_MUX
-		${SOF_AUDIO_PATH}/mux/mux.c
-		${SOF_AUDIO_PATH}/mux/mux_generic.c
-		${SOF_AUDIO_PATH}/mux/mux_${ipc_suffix}.c
-	)
-endif()
-
-if(CONFIG_COMP_MFCC STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/mfcc/llext
-			 ${PROJECT_BINARY_DIR}/mfcc_llext)
-	add_dependencies(app mfcc)
-elseif(CONFIG_COMP_MFCC)
-	zephyr_library_sources_ifdef(CONFIG_COMP_MFCC
-		${SOF_AUDIO_PATH}/mfcc/mfcc.c
-		${SOF_AUDIO_PATH}/mfcc/mfcc_setup.c
-		${SOF_AUDIO_PATH}/mfcc/mfcc_common.c
-		${SOF_AUDIO_PATH}/mfcc/mfcc_generic.c
-		${SOF_AUDIO_PATH}/mfcc/mfcc_hifi3.c
-		${SOF_AUDIO_PATH}/mfcc/mfcc_hifi4.c
-	)
-endif()
-
 zephyr_library_sources_ifdef(CONFIG_COMP_GOOGLE_HOTWORD_DETECT
 	${SOF_AUDIO_PATH}/google/google_hotword_detect.c
 )