diff --git a/components/platform_config/platform_config.h b/components/platform_config/platform_config.h
index 6215e6b2..4c7c8e49 100644
--- a/components/platform_config/platform_config.h
+++ b/components/platform_config/platform_config.h
@@ -8,9 +8,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#ifdef __cplusplus
-}
-#endif
+
 #define DECLARE_SET_DEFAULT(t) void config_set_default_## t (const char *key, t  value);
 #define DECLARE_GET_NUM(t) esp_err_t config_get_## t (const char *key, t *  value);
 #ifndef FREE_RESET
@@ -45,3 +43,7 @@ esp_err_t config_set_value(nvs_type_t nvs_type, const char *key, const void * va
 nvs_type_t  config_get_item_type(cJSON * entry);
 void * config_safe_alloc_get_entry_value(nvs_type_t nvs_type, cJSON * entry);
 
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/components/squeezelite/CMakeLists.txt b/components/squeezelite/CMakeLists.txt
index 391774a5..f78c7b8f 100644
--- a/components/squeezelite/CMakeLists.txt
+++ b/components/squeezelite/CMakeLists.txt
@@ -15,19 +15,10 @@ idf_component_register( SRC_DIRS . external ac101 tas57xx wm8978
 						 EMBED_FILES vu.data
 )
 
-set_source_files_properties(mad.c
+set_source_files_properties(mad.c pcm.c flac.c alac.c helix-aac.c vorbis.c opus.c
     PROPERTIES COMPILE_FLAGS
     -Wno-maybe-uninitialized 
 )
-set_source_files_properties(pcm.c
-    PROPERTIES COMPILE_FLAGS
-    -Wno-maybe-uninitialized
-)
-
-set_source_files_properties(flac.c
-    PROPERTIES COMPILE_FLAGS
-    -Wno-maybe-uninitialized
-)
 
 add_definitions(-DLINKALL -DLOOPBACK -DNO_FAAD -DEMBEDDED -DTREMOR_ONLY -DCUSTOM_VERSION=${BUILD_NUMBER})