diff --git a/src/audio/aria/aria.c b/src/audio/aria/aria.c
index 8f33c00602e1..0c9ffee5dd39 100644
--- a/src/audio/aria/aria.c
+++ b/src/audio/aria/aria.c
@@ -32,8 +32,6 @@ LOG_MODULE_REGISTER(aria, CONFIG_SOF_LOG_LEVEL);
 /* these ids aligns windows driver requirement to support windows driver */
 SOF_DEFINE_REG_UUID(aria);
 
-DECLARE_TR_CTX(aria_comp_tr, SOF_UUID(aria_uuid), LOG_LEVEL_INFO);
-
 /**
  * \brief Aria gain index mapping table
  */
@@ -326,6 +324,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(aria_comp_tr, SOF_UUID(aria_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(aria_interface, aria_uuid, aria_comp_tr);
 SOF_MODULE_INIT(aria, sys_comp_module_aria_interface_init);
 
diff --git a/src/audio/codec/dts/dts.c b/src/audio/codec/dts/dts.c
index 0bc590017004..e652a9e4ecf0 100644
--- a/src/audio/codec/dts/dts.c
+++ b/src/audio/codec/dts/dts.c
@@ -8,11 +8,9 @@
 #include <sof/audio/module_adapter/module/generic.h>
 #include "DtsSofInterface.h"
 
-
 LOG_MODULE_REGISTER(dts, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(dts);
-DECLARE_TR_CTX(dts_tr, SOF_UUID(dts_uuid), LOG_LEVEL_INFO);
 
 #define MAX_EXPECTED_DTS_CONFIG_DATA_SIZE 8192
 
@@ -480,6 +478,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(dts_tr, SOF_UUID(dts_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(dts_interface, dts_uuid, dts_tr);
 SOF_MODULE_INIT(dts, sys_comp_module_dts_interface_init);
 
diff --git a/src/audio/copier/copier.c b/src/audio/copier/copier.c
index dc4d23335e01..75ec9791ca56 100644
--- a/src/audio/copier/copier.c
+++ b/src/audio/copier/copier.c
@@ -52,8 +52,6 @@ LOG_MODULE_REGISTER(copier, CONFIG_SOF_LOG_LEVEL);
 /* this id aligns windows driver requirement to support windows driver */
 SOF_DEFINE_REG_UUID(copier);
 
-DECLARE_TR_CTX(copier_comp_tr, SOF_UUID(copier_uuid), LOG_LEVEL_INFO);
-
 #if CONFIG_INTEL_ADSP_MIC_PRIVACY
 static void mic_privacy_event(void *arg, enum notify_id type, void *data)
 {
@@ -1213,5 +1211,7 @@ static const struct module_interface copier_interface = {
 	.endpoint_ops = &copier_endpoint_ops,
 };
 
+DECLARE_TR_CTX(copier_comp_tr, SOF_UUID(copier_uuid), LOG_LEVEL_INFO);
+
 DECLARE_MODULE_ADAPTER(copier_interface, copier_uuid, copier_comp_tr);
 SOF_MODULE_INIT(copier, sys_comp_module_copier_interface_init);
diff --git a/src/audio/copier/copier_ipcgtw.c b/src/audio/copier/copier_ipcgtw.c
index 0fb4600e6bbc..d7122b07c05c 100644
--- a/src/audio/copier/copier_ipcgtw.c
+++ b/src/audio/copier/copier_ipcgtw.c
@@ -16,8 +16,6 @@ LOG_MODULE_REGISTER(ipcgtw, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(ipcgw);
 
-DECLARE_TR_CTX(ipcgtw_comp_tr, SOF_UUID(ipcgw_uuid), LOG_LEVEL_INFO);
-
 /* List of existing IPC gateways */
 static struct list_item ipcgtw_list_head = LIST_INIT(ipcgtw_list_head);
 
diff --git a/src/audio/crossover/crossover.c b/src/audio/crossover/crossover.c
index aa453e2a8b20..58d3a8d52023 100644
--- a/src/audio/crossover/crossover.c
+++ b/src/audio/crossover/crossover.c
@@ -40,8 +40,6 @@ LOG_MODULE_REGISTER(crossover, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(crossover);
 
-DECLARE_TR_CTX(crossover_tr, SOF_UUID(crossover_uuid), LOG_LEVEL_INFO);
-
 /**
  * \brief Reset the state (coefficients and delay) of the crossover filter
  *	  across all channels
@@ -648,6 +646,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(crossover_tr, SOF_UUID(crossover_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(crossover_interface, crossover_uuid, crossover_tr);
 SOF_MODULE_INIT(crossover, sys_comp_module_crossover_interface_init);
 
diff --git a/src/audio/dai-legacy.c b/src/audio/dai-legacy.c
index 6e9a3ce3fa9e..6e4efd2944ab 100644
--- a/src/audio/dai-legacy.c
+++ b/src/audio/dai-legacy.c
@@ -41,8 +41,6 @@ LOG_MODULE_REGISTER(dai_comp, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(dai);
 
-DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
-
 #if CONFIG_COMP_DAI_GROUP
 
 static int dai_comp_trigger_internal(struct dai_data *dd, struct comp_dev *dev, int cmd);
@@ -1105,6 +1103,8 @@ static uint64_t dai_get_processed_data(struct comp_dev *dev, uint32_t stream_no,
 	return ret;
 }
 
+DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
+
 static const struct comp_driver comp_dai = {
 	.type	= SOF_COMP_DAI,
 	.uid	= SOF_RT_UUID(dai_uuid),
diff --git a/src/audio/dai-zephyr.c b/src/audio/dai-zephyr.c
index 44ce24f20ea1..d9bcbeb263e7 100644
--- a/src/audio/dai-zephyr.c
+++ b/src/audio/dai-zephyr.c
@@ -64,8 +64,6 @@ LOG_MODULE_REGISTER(dai_comp, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(dai);
 
-DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
-
 #if CONFIG_COMP_DAI_GROUP
 
 static int dai_comp_trigger_internal(struct dai_data *dd, struct comp_dev *dev, int cmd);
@@ -1995,6 +1993,8 @@ int dai_zephyr_unbind(struct dai_data *dd, struct comp_dev *dev, struct bind_inf
 }
 #endif /* CONFIG_IPC_MAJOR_4 */
 
+DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
+
 static const struct comp_driver comp_dai = {
 	.type	= SOF_COMP_DAI,
 	.uid	= SOF_RT_UUID(dai_uuid),
diff --git a/src/audio/dcblock/dcblock.c b/src/audio/dcblock/dcblock.c
index d266f357554f..e6ab4630db38 100644
--- a/src/audio/dcblock/dcblock.c
+++ b/src/audio/dcblock/dcblock.c
@@ -36,8 +36,6 @@ LOG_MODULE_REGISTER(dcblock, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(dcblock);
 
-DECLARE_TR_CTX(dcblock_tr, SOF_UUID(dcblock_uuid), LOG_LEVEL_INFO);
-
 /**
  * \brief Sets the DC Blocking filter in pass through mode.
  * The frequency response of a DCB filter is:
@@ -272,6 +270,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(dcblock_tr, SOF_UUID(dcblock_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(dcblock_interface, dcblock_uuid, dcblock_tr);
 SOF_MODULE_INIT(dcblock, sys_comp_module_dcblock_interface_init);
 
diff --git a/src/audio/eq_fir/eq_fir.c b/src/audio/eq_fir/eq_fir.c
index 65ca0d7d4bdc..8756311ab99e 100644
--- a/src/audio/eq_fir/eq_fir.c
+++ b/src/audio/eq_fir/eq_fir.c
@@ -40,8 +40,6 @@ LOG_MODULE_REGISTER(eq_fir, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(eq_fir);
 
-DECLARE_TR_CTX(eq_fir_tr, SOF_UUID(eq_fir_uuid), LOG_LEVEL_INFO);
-
 /* Pass-through functions to replace FIR core while not configured for
  * response.
  */
@@ -499,6 +497,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(eq_fir_tr, SOF_UUID(eq_fir_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(eq_fir_interface, eq_fir_uuid, eq_fir_tr);
 SOF_MODULE_INIT(eq_fir, sys_comp_module_eq_fir_interface_init);
 
diff --git a/src/audio/eq_iir/eq_iir.c b/src/audio/eq_iir/eq_iir.c
index aaf741b92515..7b3de4f54b22 100644
--- a/src/audio/eq_iir/eq_iir.c
+++ b/src/audio/eq_iir/eq_iir.c
@@ -37,8 +37,6 @@ LOG_MODULE_REGISTER(eq_iir, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(eq_iir);
 
-DECLARE_TR_CTX(eq_iir_tr, SOF_UUID(eq_iir_uuid), LOG_LEVEL_INFO);
-
 /*
  * End of EQ setup code. Next the standard component methods.
  */
@@ -267,6 +265,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(eq_iir_tr, SOF_UUID(eq_iir_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(eq_iir_interface, eq_iir_uuid, eq_iir_tr);
 SOF_MODULE_INIT(eq_iir, sys_comp_module_eq_iir_interface_init);
 
diff --git a/src/audio/google/google_ctc_audio_processing.c b/src/audio/google/google_ctc_audio_processing.c
index 1c9b44ac213e..433fe0c82a27 100644
--- a/src/audio/google/google_ctc_audio_processing.c
+++ b/src/audio/google/google_ctc_audio_processing.c
@@ -22,9 +22,6 @@ LOG_MODULE_REGISTER(google_ctc_audio_processing, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(google_ctc_audio_processing);
 
-DECLARE_TR_CTX(google_ctc_audio_processing_tr, SOF_UUID(google_ctc_audio_processing_uuid),
-	       LOG_LEVEL_INFO);
-
 // TODO(eddyhsu): Share these utils function with RTC.
 static inline float clamp_rescale(float max_val, float x)
 {
@@ -475,6 +472,8 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(google_ctc_audio_processing_tr, SOF_UUID(google_ctc_audio_processing_uuid),
+	       LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(google_ctc_audio_processing_interface,
 		       google_ctc_audio_processing_uuid, google_ctc_audio_processing_tr);
 SOF_MODULE_INIT(google_ctc_audio_processing,
diff --git a/src/audio/google/google_hotword_detect.c b/src/audio/google/google_hotword_detect.c
index e625aba57d93..22aea6a3316a 100644
--- a/src/audio/google/google_hotword_detect.c
+++ b/src/audio/google/google_hotword_detect.c
@@ -45,7 +45,6 @@ static const struct comp_driver ghd_driver;
 LOG_MODULE_REGISTER(google_hotword_detect, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(google_hotword);
-DECLARE_TR_CTX(ghd_tr, SOF_UUID(ghd_uuid), LOG_LEVEL_INFO);
 
 struct comp_data {
 	struct comp_data_blob_handler *model_handler;
@@ -447,6 +446,8 @@ static int ghd_prepare(struct comp_dev *dev)
 	return comp_set_state(dev, COMP_TRIGGER_PREPARE);
 }
 
+DECLARE_TR_CTX(ghd_tr, SOF_UUID(ghd_uuid), LOG_LEVEL_INFO);
+
 static const struct comp_driver ghd_driver = {
 	.type	= SOF_COMP_KEYWORD_DETECT,
 	.uid	= SOF_RT_UUID(ghd_uuid),
diff --git a/src/audio/google/google_rtc_audio_processing.c b/src/audio/google/google_rtc_audio_processing.c
index 2386056edb6a..58dd50efc8d0 100644
--- a/src/audio/google/google_rtc_audio_processing.c
+++ b/src/audio/google/google_rtc_audio_processing.c
@@ -56,10 +56,6 @@ LOG_MODULE_REGISTER(google_rtc_audio_processing, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(google_rtc_audio_processing);
 
-DECLARE_TR_CTX(google_rtc_audio_processing_tr, SOF_UUID(google_rtc_audio_processing_uuid),
-			   LOG_LEVEL_INFO);
-
-
 static __aligned(PLATFORM_DCACHE_ALIGN)
 uint8_t aec_mem_blob[CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING_MEMORY_BUFFER_SIZE_KB * 1024];
 
@@ -864,6 +860,8 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(google_rtc_audio_processing_tr, SOF_UUID(google_rtc_audio_processing_uuid),
+			   LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(google_rtc_audio_processing_interface,
 		       google_rtc_audio_processing_uuid, google_rtc_audio_processing_tr);
 SOF_MODULE_INIT(google_rtc_audio_processing,
diff --git a/src/audio/host-legacy.c b/src/audio/host-legacy.c
index 31262763fb9d..97a2e3cb04fd 100644
--- a/src/audio/host-legacy.c
+++ b/src/audio/host-legacy.c
@@ -40,8 +40,6 @@ LOG_MODULE_REGISTER(host, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(host);
 
-DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
-
 static inline struct dma_sg_elem *next_buffer(struct hc_buf *hc)
 {
 	if (!hc->elem_array.elems || !hc->elem_array.count)
@@ -1005,6 +1003,8 @@ static uint64_t host_get_processed_data(struct comp_dev *dev, uint32_t stream_no
 	return ret;
 }
 
+DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
+
 static const struct comp_driver comp_host = {
 	.type	= SOF_COMP_HOST,
 	.uid	= SOF_RT_UUID(host_uuid),
diff --git a/src/audio/host-zephyr.c b/src/audio/host-zephyr.c
index e6f99eeed3e5..3124f2a18a7a 100644
--- a/src/audio/host-zephyr.c
+++ b/src/audio/host-zephyr.c
@@ -46,8 +46,6 @@ LOG_MODULE_REGISTER(host_comp, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(host);
 
-DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
-
 static inline struct dma_sg_elem *next_buffer(struct hc_buf *hc)
 {
 	if (!hc->elem_array.elems || !hc->elem_array.count)
@@ -1260,6 +1258,8 @@ static uint64_t host_get_processed_data(struct comp_dev *dev, uint32_t stream_no
 	return ret;
 }
 
+DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
+
 static const struct comp_driver comp_host = {
 	.type	= SOF_COMP_HOST,
 	.uid	= SOF_RT_UUID(host_uuid),
diff --git a/src/audio/igo_nr/igo_nr.c b/src/audio/igo_nr/igo_nr.c
index f68d1150b8c5..3cc0862fb124 100644
--- a/src/audio/igo_nr/igo_nr.c
+++ b/src/audio/igo_nr/igo_nr.c
@@ -44,8 +44,6 @@ LOG_MODULE_REGISTER(igo_nr, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(igo_nr);
 
-DECLARE_TR_CTX(igo_nr_tr, SOF_UUID(igo_nr_uuid), LOG_LEVEL_INFO);
-
 static void igo_nr_lib_process(struct comp_data *cd)
 {
 	/* Pass through the active channel if
@@ -901,6 +899,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(igo_nr_tr, SOF_UUID(igo_nr_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(igo_nr_interface, igo_nr_uuid, igo_nr_tr);
 SOF_MODULE_INIT(igo_nr, sys_comp_module_igo_nr_interface_init);
 
diff --git a/src/audio/kpb.c b/src/audio/kpb.c
index e8a8bb104818..c73142ecff48 100644
--- a/src/audio/kpb.c
+++ b/src/audio/kpb.c
@@ -70,8 +70,6 @@ SOF_DEFINE_REG_UUID(kpb);
 #define KPB_UUID kpb_uuid
 #endif
 
-DECLARE_TR_CTX(kpb_tr, SOF_UUID(KPB_UUID), LOG_LEVEL_INFO);
-
 SOF_DEFINE_REG_UUID(kpb_task);
 
 /* KPB private data, runtime data */
@@ -2679,6 +2677,8 @@ static int kpb_set_large_config(struct comp_dev *dev, uint32_t param_id,
 	}
 }
 
+DECLARE_TR_CTX(kpb_tr, SOF_UUID(KPB_UUID), LOG_LEVEL_INFO);
+
 static const struct comp_driver comp_kpb = {
 	.type = SOF_COMP_KPB,
 	.uid = SOF_RT_UUID(KPB_UUID),
diff --git a/src/audio/level_multiplier/level_multiplier.c b/src/audio/level_multiplier/level_multiplier.c
index 68edff07a96e..643e31ef6a48 100644
--- a/src/audio/level_multiplier/level_multiplier.c
+++ b/src/audio/level_multiplier/level_multiplier.c
@@ -17,11 +17,6 @@ SOF_DEFINE_REG_UUID(level_multiplier);
 /* Creates logging data for the component */
 LOG_MODULE_REGISTER(level_multiplier, CONFIG_SOF_LOG_LEVEL);
 
-/* Creates the component trace. Traces show in trace console the component
- * info, warning, and error messages.
- */
-DECLARE_TR_CTX(level_multiplier_tr, SOF_UUID(level_multiplier_uuid), LOG_LEVEL_INFO);
-
 /**
  * level_multiplier_init() - Initialize the level_multiplier component.
  * @mod: Pointer to module data.
@@ -205,6 +200,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(level_multiplier_tr, SOF_UUID(level_multiplier_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(level_multiplier_interface, level_multiplier_uuid, level_multiplier_tr);
 SOF_MODULE_INIT(level_multiplier, sys_comp_module_level_multiplier_interface_init);
 
diff --git a/src/audio/mfcc/mfcc.c b/src/audio/mfcc/mfcc.c
index 868eb13b7c48..6849d68b5e35 100644
--- a/src/audio/mfcc/mfcc.c
+++ b/src/audio/mfcc/mfcc.c
@@ -36,8 +36,6 @@ LOG_MODULE_REGISTER(mfcc, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(mfcc);
 
-DECLARE_TR_CTX(mfcc_tr, SOF_UUID(mfcc_uuid), LOG_LEVEL_INFO);
-
 __cold_rodata const struct mfcc_func_map mfcc_fm[] = {
 #if CONFIG_FORMAT_S16LE
 	{SOF_IPC_FRAME_S16_LE,  mfcc_s16_default},
@@ -274,6 +272,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(mfcc_tr, SOF_UUID(mfcc_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(mfcc_interface, mfcc_uuid, mfcc_tr);
 SOF_MODULE_INIT(mfcc, sys_comp_module_mfcc_interface_init);
 
diff --git a/src/audio/mixer/mixer.c b/src/audio/mixer/mixer.c
index 1ced093327e2..2972a2b59d63 100644
--- a/src/audio/mixer/mixer.c
+++ b/src/audio/mixer/mixer.c
@@ -35,9 +35,6 @@ LOG_MODULE_REGISTER(mixer, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(mixer);
 
-DECLARE_TR_CTX(mixer_tr, SOF_UUID(mixer_uuid), LOG_LEVEL_INFO);
-
-
 static int mixer_init(struct processing_module *mod)
 {
 	struct module_data *mod_data = &mod->priv;
@@ -256,5 +253,6 @@ static const struct module_interface mixer_interface = {
 	.free = mixer_free,
 };
 
+DECLARE_TR_CTX(mixer_tr, SOF_UUID(mixer_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(mixer_interface, mixer_uuid, mixer_tr);
 SOF_MODULE_INIT(mixer, sys_comp_module_mixer_interface_init);
diff --git a/src/audio/mixin_mixout/mixin_mixout.c b/src/audio/mixin_mixout/mixin_mixout.c
index 08d3ebbd9030..1869099feb41 100644
--- a/src/audio/mixin_mixout/mixin_mixout.c
+++ b/src/audio/mixin_mixout/mixin_mixout.c
@@ -35,11 +35,9 @@ LOG_MODULE_REGISTER(mixin_mixout, CONFIG_SOF_LOG_LEVEL);
 
 /* mixin 39656eb2-3b71-4049-8d3f-f92cd5c43c09 */
 SOF_DEFINE_REG_UUID(mixin);
-DECLARE_TR_CTX(mixin_tr, SOF_UUID(mixin_uuid), LOG_LEVEL_INFO);
 
 /* mixout 3c56505a-24d7-418f-bddc-c1f5a3ac2ae0 */
 SOF_DEFINE_REG_UUID(mixout);
-DECLARE_TR_CTX(mixout_tr, SOF_UUID(mixout_uuid), LOG_LEVEL_INFO);
 
 #define MIXIN_MAX_SINKS IPC4_MIXIN_MODULE_MAX_OUTPUT_QUEUES
 #define MIXOUT_MAX_SOURCES IPC4_MIXOUT_MODULE_MAX_INPUT_QUEUES
@@ -1050,9 +1048,11 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(mixin_tr, SOF_UUID(mixin_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(mixin_interface, mixin_uuid, mixin_tr);
 SOF_MODULE_INIT(mixin, sys_comp_module_mixin_interface_init);
 
+DECLARE_TR_CTX(mixout_tr, SOF_UUID(mixout_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(mixout_interface, mixout_uuid, mixout_tr);
 SOF_MODULE_INIT(mixout, sys_comp_module_mixout_interface_init);
 
diff --git a/src/audio/module_adapter/module/cadence.c b/src/audio/module_adapter/module/cadence.c
index df936790bb7e..55a7b692415e 100644
--- a/src/audio/module_adapter/module/cadence.c
+++ b/src/audio/module_adapter/module/cadence.c
@@ -20,8 +20,6 @@ LOG_MODULE_REGISTER(cadence_codec, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(cadence_codec);
 
-DECLARE_TR_CTX(cadence_codec_tr, SOF_UUID(cadence_codec_uuid), LOG_LEVEL_INFO);
-
 enum cadence_api_id {
 	CADENCE_CODEC_WRAPPER_ID	= 0x01,
 	CADENCE_CODEC_AAC_DEC_ID	= 0x02,
@@ -925,5 +923,6 @@ static const struct module_interface cadence_codec_interface = {
 	.free = cadence_codec_free
 };
 
+DECLARE_TR_CTX(cadence_codec_tr, SOF_UUID(cadence_codec_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(cadence_codec_interface, cadence_codec_uuid, cadence_codec_tr);
 SOF_MODULE_INIT(cadence_codec, sys_comp_module_cadence_codec_interface_init);
diff --git a/src/audio/module_adapter/module/dolby/dax.c b/src/audio/module_adapter/module/dolby/dax.c
index ecff1054171f..c027f7985932 100644
--- a/src/audio/module_adapter/module/dolby/dax.c
+++ b/src/audio/module_adapter/module/dolby/dax.c
@@ -19,8 +19,6 @@
 
 LOG_MODULE_REGISTER(dolby_dax_audio_processing, CONFIG_SOF_LOG_LEVEL);
 SOF_DEFINE_REG_UUID(dolby_dax_audio_processing);
-DECLARE_TR_CTX(dolby_dax_audio_processing_tr, SOF_UUID(dolby_dax_audio_processing_uuid),
-	       LOG_LEVEL_INFO);
 
 #define MAX_PARAMS_STR_BUFFER_SIZE 1536
 #define DAX_ENABLE_MASK 0x1
@@ -885,6 +883,8 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(dolby_dax_audio_processing_tr, SOF_UUID(dolby_dax_audio_processing_uuid),
+	       LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(dolby_dax_audio_processing_interface, dolby_dax_audio_processing_uuid,
 		       dolby_dax_audio_processing_tr);
 SOF_MODULE_INIT(dolby_dax_audio_processing,
diff --git a/src/audio/module_adapter/module/modules.c b/src/audio/module_adapter/module/modules.c
index 66f257f62c11..589a25e33887 100644
--- a/src/audio/module_adapter/module/modules.c
+++ b/src/audio/module_adapter/module/modules.c
@@ -43,7 +43,6 @@
 
 LOG_MODULE_REGISTER(sof_modules, CONFIG_SOF_LOG_LEVEL);
 SOF_DEFINE_REG_UUID(modules);
-DECLARE_TR_CTX(intel_codec_tr, SOF_UUID(modules_uuid), LOG_LEVEL_INFO);
 
 /**
  * \brief modules_init.
diff --git a/src/audio/module_adapter/module/passthrough.c b/src/audio/module_adapter/module/passthrough.c
index 484e1319ae3a..4ad42277cbe3 100644
--- a/src/audio/module_adapter/module/passthrough.c
+++ b/src/audio/module_adapter/module/passthrough.c
@@ -12,7 +12,6 @@
 LOG_MODULE_REGISTER(passthrough, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(passthrough);
-DECLARE_TR_CTX(passthrough_tr, SOF_UUID(passthrough_uuid), LOG_LEVEL_INFO);
 
 static int passthrough_codec_init(struct processing_module *mod)
 {
@@ -127,5 +126,6 @@ static const struct module_interface passthrough_interface = {
 	.free = passthrough_codec_free
 };
 
+DECLARE_TR_CTX(passthrough_tr, SOF_UUID(passthrough_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(passthrough_interface, passthrough_uuid, passthrough_tr);
 SOF_MODULE_INIT(passthrough, sys_comp_module_passthrough_interface_init);
diff --git a/src/audio/module_adapter/module/waves/waves.c b/src/audio/module_adapter/module/waves/waves.c
index 624b53f5f75c..0004b0e4d86c 100644
--- a/src/audio/module_adapter/module/waves/waves.c
+++ b/src/audio/module_adapter/module/waves/waves.c
@@ -20,7 +20,6 @@
 
 SOF_DEFINE_REG_UUID(waves);
 
-DECLARE_TR_CTX(waves_tr, SOF_UUID(waves_uuid), LOG_LEVEL_INFO);
 LOG_MODULE_REGISTER(waves, CONFIG_SOF_LOG_LEVEL);
 
 struct waves_codec_data {
@@ -920,6 +919,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(waves_tr, SOF_UUID(waves_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(waves_interface, waves_uuid, waves_tr);
 SOF_MODULE_INIT(waves, sys_comp_module_waves_interface_init);
 
diff --git a/src/audio/multiband_drc/multiband_drc.c b/src/audio/multiband_drc/multiband_drc.c
index 25971b2adbab..5e81fd093b24 100644
--- a/src/audio/multiband_drc/multiband_drc.c
+++ b/src/audio/multiband_drc/multiband_drc.c
@@ -39,8 +39,6 @@ LOG_MODULE_REGISTER(multiband_drc, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(multiband_drc);
 
-DECLARE_TR_CTX(multiband_drc_tr, SOF_UUID(multiband_drc_uuid), LOG_LEVEL_INFO);
-
 /* Called from multiband_drc_setup() from multiband_drc_process(), so cannot be __cold */
 static void multiband_drc_reset_state(struct processing_module *mod,
 				      struct multiband_drc_state *state)
@@ -450,6 +448,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(multiband_drc_tr, SOF_UUID(multiband_drc_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(multiband_drc_interface, multiband_drc_uuid, multiband_drc_tr);
 SOF_MODULE_INIT(multiband_drc, sys_comp_module_multiband_drc_interface_init);
 
diff --git a/src/audio/selector/selector.c b/src/audio/selector/selector.c
index 6b43f7e49513..175edaf19e31 100644
--- a/src/audio/selector/selector.c
+++ b/src/audio/selector/selector.c
@@ -43,7 +43,6 @@ LOG_MODULE_REGISTER(selector, CONFIG_SOF_LOG_LEVEL);
 static const struct comp_driver comp_selector;
 
 SOF_DEFINE_REG_UUID(selector);
-DECLARE_TR_CTX(selector_tr, SOF_UUID(selector_uuid), LOG_LEVEL_INFO);
 
 static int selector_verify_params(struct comp_dev *dev,
 				  struct sof_ipc_stream_params *params)
@@ -510,6 +509,8 @@ static int selector_reset(struct comp_dev *dev)
 	return ret;
 }
 
+DECLARE_TR_CTX(selector_tr, SOF_UUID(selector_uuid), LOG_LEVEL_INFO);
+
 /** \brief Selector component definition. */
 static const struct comp_driver comp_selector = {
 	.type	= SOF_COMP_SELECTOR,
@@ -544,7 +545,6 @@ SOF_MODULE_INIT(selector, sys_comp_selector_init);
 #else
 
 SOF_DEFINE_REG_UUID(selector4);
-DECLARE_TR_CTX(selector_tr, SOF_UUID(selector4_uuid), LOG_LEVEL_INFO);
 
 static void build_config(struct comp_data *cd, struct module_config *cfg)
 {
@@ -937,6 +937,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(selector_tr, SOF_UUID(selector4_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(selector_interface, selector4_uuid, selector_tr);
 SOF_MODULE_INIT(selector, sys_comp_module_selector_interface_init);
 
diff --git a/src/audio/smart_amp/smart_amp.c b/src/audio/smart_amp/smart_amp.c
index 094144812ebc..72e30954be6f 100644
--- a/src/audio/smart_amp/smart_amp.c
+++ b/src/audio/smart_amp/smart_amp.c
@@ -32,9 +32,6 @@ SOF_DEFINE_REG_UUID(passthru_smart_amp);
 
 #endif
 
-DECLARE_TR_CTX(smart_amp_comp_tr, SOF_UUID(UUID_SYM),
-	       LOG_LEVEL_INFO);
-
 LOG_MODULE_REGISTER(smart_amp, CONFIG_SOF_LOG_LEVEL);
 
 /* Amp configuration & model calibration data for tuning/debug */
@@ -817,5 +814,6 @@ static struct module_interface smart_amp_interface = {
 	.trigger = smart_amp_trigger,
 };
 
+DECLARE_TR_CTX(smart_amp_comp_tr, SOF_UUID(UUID_SYM), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(smart_amp_interface, UUID_SYM, smart_amp_comp_tr);
 SOF_MODULE_INIT(smart_amp, sys_comp_module_smart_amp_interface_init);
diff --git a/src/audio/sound_dose/sound_dose.c b/src/audio/sound_dose/sound_dose.c
index dcbac5c643c7..387ee79ec6f0 100644
--- a/src/audio/sound_dose/sound_dose.c
+++ b/src/audio/sound_dose/sound_dose.c
@@ -27,11 +27,6 @@ SOF_DEFINE_REG_UUID(sound_dose);
 /* Creates logging data for the component */
 LOG_MODULE_REGISTER(sound_dose, CONFIG_SOF_LOG_LEVEL);
 
-/* Creates the component trace. Traces show in trace console the component
- * info, warning, and error messages.
- */
-DECLARE_TR_CTX(sound_dose_tr, SOF_UUID(sound_dose_uuid), LOG_LEVEL_INFO);
-
 void sound_dose_report_mel(const struct processing_module *mod)
 {
 	struct sound_dose_comp_data *cd = module_get_private_data(mod);
@@ -369,6 +364,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(sound_dose_tr, SOF_UUID(sound_dose_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(sound_dose_interface, sound_dose_uuid, sound_dose_tr);
 SOF_MODULE_INIT(sound_dose, sys_comp_module_sound_dose_interface_init);
 
diff --git a/src/audio/stft_process/stft_process.c b/src/audio/stft_process/stft_process.c
index 35b3ca29fadf..90b4b14993ab 100644
--- a/src/audio/stft_process/stft_process.c
+++ b/src/audio/stft_process/stft_process.c
@@ -17,11 +17,6 @@ SOF_DEFINE_REG_UUID(stft_process);
 /* Creates logging data for the component */
 LOG_MODULE_REGISTER(stft_process, CONFIG_SOF_LOG_LEVEL);
 
-/* Creates the component trace. Traces show in trace console the component
- * info, warning, and error messages.
- */
-DECLARE_TR_CTX(stft_process_tr, SOF_UUID(stft_process_uuid), LOG_LEVEL_INFO);
-
 #if STFT_DEBUG
 FILE *stft_debug_fft_in_fh;
 FILE *stft_debug_fft_out_fh;
@@ -252,6 +247,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(stft_process_tr, SOF_UUID(stft_process_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(stft_process_interface, stft_process_uuid, stft_process_tr);
 SOF_MODULE_INIT(stft_process, sys_comp_module_stft_process_interface_init);
 
diff --git a/src/audio/tdfb/tdfb.c b/src/audio/tdfb/tdfb.c
index 012900ad1cdb..5d529d497b3c 100644
--- a/src/audio/tdfb/tdfb.c
+++ b/src/audio/tdfb/tdfb.c
@@ -43,8 +43,6 @@ LOG_MODULE_REGISTER(tdfb, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(tdfb);
 
-DECLARE_TR_CTX(tdfb_tr, SOF_UUID(tdfb_uuid), LOG_LEVEL_INFO);
-
 static inline int set_func(struct processing_module *mod, enum sof_ipc_frame fmt)
 {
 	struct tdfb_comp_data *cd = module_get_private_data(mod);
@@ -841,6 +839,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(tdfb_tr, SOF_UUID(tdfb_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(tdfb_interface, tdfb_uuid, tdfb_tr);
 SOF_MODULE_INIT(tdfb, sys_comp_module_tdfb_interface_init);
 
diff --git a/src/audio/template/template.c b/src/audio/template/template.c
index a475ebf02281..5b75ae67c864 100644
--- a/src/audio/template/template.c
+++ b/src/audio/template/template.c
@@ -17,11 +17,6 @@ SOF_DEFINE_REG_UUID(template);
 /* Creates logging data for the component */
 LOG_MODULE_REGISTER(template, CONFIG_SOF_LOG_LEVEL);
 
-/* Creates the component trace. Traces show in trace console the component
- * info, warning, and error messages.
- */
-DECLARE_TR_CTX(template_tr, SOF_UUID(template_uuid), LOG_LEVEL_INFO);
-
 /**
  * template_init() - Initialize the template component.
  * @mod: Pointer to module data.
@@ -205,6 +200,8 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+/* Only used for the module adapter trace context, soon to be deprecated */
+DECLARE_TR_CTX(template_tr, SOF_UUID(template_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(template_interface, template_uuid, template_tr);
 SOF_MODULE_INIT(template, sys_comp_module_template_interface_init);
 
diff --git a/src/audio/tensorflow/tflm-classify.c b/src/audio/tensorflow/tflm-classify.c
index 942bd260ff6f..4d33cf69363c 100644
--- a/src/audio/tensorflow/tflm-classify.c
+++ b/src/audio/tensorflow/tflm-classify.c
@@ -35,8 +35,6 @@
 
 SOF_DEFINE_REG_UUID(tflmcly);
 LOG_MODULE_REGISTER(tflmcly, CONFIG_SOF_LOG_LEVEL);
-DECLARE_TR_CTX(tflm_tr, SOF_UUID(tflmcly_uuid), LOG_LEVEL_INFO);
-EXPORT_SYMBOL(tflm_tr);
 EXPORT_SYMBOL(tflmcly_uuid);
 EXPORT_SYMBOL(log_const_tflmcly);
 
@@ -235,6 +233,7 @@ static const struct module_interface tflmcly_interface = {
 	.free = tflm_free
 };
 
+DECLARE_TR_CTX(tflm_tr, SOF_UUID(tflmcly_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(tflmcly_interface, tflmcly_uuid, tflm_tr);
 SOF_MODULE_INIT(tflmcly, sys_comp_module_tflmcly_interface_init);
 
diff --git a/src/audio/tone/tone-ipc3.c b/src/audio/tone/tone-ipc3.c
index 87df5e130b49..b7daf493a755 100644
--- a/src/audio/tone/tone-ipc3.c
+++ b/src/audio/tone/tone-ipc3.c
@@ -37,7 +37,6 @@
 
 SOF_DEFINE_REG_UUID(tone);
 LOG_MODULE_DECLARE(tone, CONFIG_SOF_LOG_LEVEL);
-DECLARE_TR_CTX(tone_tr, SOF_UUID(tone_uuid), LOG_LEVEL_INFO);
 
 static const struct comp_driver comp_tone;
 
@@ -376,6 +375,8 @@ static int tone_reset(struct comp_dev *dev)
 	return 0;
 }
 
+DECLARE_TR_CTX(tone_tr, SOF_UUID(tone_uuid), LOG_LEVEL_INFO);
+
 static const struct comp_driver comp_tone = {
 	.type = SOF_COMP_TONE,
 	.uid = SOF_RT_UUID(tone_uuid),
diff --git a/src/audio/tone/tone-ipc4.c b/src/audio/tone/tone-ipc4.c
index 2a4a030a6a71..93ed53ae9a3a 100644
--- a/src/audio/tone/tone-ipc4.c
+++ b/src/audio/tone/tone-ipc4.c
@@ -40,7 +40,6 @@
 
 SOF_DEFINE_REG_UUID(tone);
 LOG_MODULE_DECLARE(tone, CONFIG_SOF_LOG_LEVEL);
-DECLARE_TR_CTX(tone_tr, SOF_UUID(tone_uuid), LOG_LEVEL_INFO);
 
 static int tone_init(struct processing_module *mod)
 {
@@ -223,6 +222,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(tone_tr, SOF_UUID(tone_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(tone_interface, tone_uuid, tone_tr);
 SOF_MODULE_INIT(tone, sys_comp_module_tone_interface_init);
 
diff --git a/src/audio/up_down_mixer/up_down_mixer.c b/src/audio/up_down_mixer/up_down_mixer.c
index f3c365578995..bac39504dbb0 100644
--- a/src/audio/up_down_mixer/up_down_mixer.c
+++ b/src/audio/up_down_mixer/up_down_mixer.c
@@ -32,9 +32,6 @@ LOG_MODULE_REGISTER(up_down_mixer, CONFIG_SOF_LOG_LEVEL);
 /* these ids aligns windows driver requirement to support windows driver */
 SOF_DEFINE_REG_UUID(up_down_mixer);
 
-DECLARE_TR_CTX(up_down_mixer_comp_tr, SOF_UUID(up_down_mixer_uuid),
-	       LOG_LEVEL_INFO);
-
 int32_t custom_coeffs[UP_DOWN_MIX_COEFFS_LENGTH];
 
 static int set_downmix_coefficients(struct processing_module *mod,
@@ -447,5 +444,6 @@ static const struct module_interface up_down_mixer_interface = {
 	.free = up_down_mixer_free
 };
 
+DECLARE_TR_CTX(up_down_mixer_comp_tr, SOF_UUID(up_down_mixer_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(up_down_mixer_interface, up_down_mixer_uuid, up_down_mixer_comp_tr);
 SOF_MODULE_INIT(up_down_mixer, sys_comp_module_up_down_mixer_interface_init);
diff --git a/src/debug/tester/tester.c b/src/debug/tester/tester.c
index 869b7d9b2a7a..161b90a7d3f3 100644
--- a/src/debug/tester/tester.c
+++ b/src/debug/tester/tester.c
@@ -40,8 +40,6 @@ LOG_MODULE_REGISTER(tester, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(tester);
 
-DECLARE_TR_CTX(tester_tr, SOF_UUID(tester_uuid), LOG_LEVEL_INFO);
-
 struct tester_init_config {
 	struct ipc4_base_module_cfg ipc4_cfg;
 	int32_t test_type;
@@ -250,6 +248,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(tester_tr, SOF_UUID(tester_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(tester_interface, tester_uuid, tester_tr);
 SOF_MODULE_INIT(tester, sys_comp_module_tester_interface_init);