diff --git a/src/audio/selector/selector.c b/src/audio/selector/selector.c
index 59be98a28427..9c167ce70f5c 100644
--- a/src/audio/selector/selector.c
+++ b/src/audio/selector/selector.c
@@ -579,14 +579,12 @@ static void build_config(struct comp_data *cd, struct module_config *cfg)
 	enum sof_ipc_frame __sparse_cache frame_fmt, valid_fmt;
 	int i;
 
-	frame_fmt = cfg->base_cfg.audio_fmt.depth;
 	audio_stream_fmt_conversion(cfg->base_cfg.audio_fmt.depth,
 				    cfg->base_cfg.audio_fmt.valid_bit_depth,
 				    &frame_fmt, &valid_fmt,
 				    cfg->base_cfg.audio_fmt.s_type);
 	cd->source_format = frame_fmt;
 
-	frame_fmt = cd->sink_format;
 	audio_stream_fmt_conversion(cd->output_format.depth,
 				    cd->output_format.valid_bit_depth,
 				    &frame_fmt, &valid_fmt,
diff --git a/src/include/sof/audio/module_adapter/iadk/system_service.h b/src/include/sof/audio/module_adapter/iadk/system_service.h
index b39c060e7664..ae253b99cd90 100644
--- a/src/include/sof/audio/module_adapter/iadk/system_service.h
+++ b/src/include/sof/audio/module_adapter/iadk/system_service.h
@@ -13,6 +13,11 @@
 
 #include <stdint.h>
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wextern-c-compat"
+#endif //__clang__
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -233,4 +238,8 @@ struct SystemService : public AdspSystemService {};
 }
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic pop // ignored "-Wextern-c-compat"
+#endif //__clang__
+
 #endif /* _ADSP_SYSTEM_SERVICE_H_ */