diff --git a/components/codecs/CMakeLists.txt b/components/codecs/CMakeLists.txt
index 7863a6d5..b38ddc16 100644
--- a/components/codecs/CMakeLists.txt
+++ b/components/codecs/CMakeLists.txt
@@ -1,6 +1,5 @@
 idf_component_register(SRC_DIRS . 
 					   INCLUDE_DIRS .  ./inc  inc/alac inc/faad2 inc/FLAC  inc/helix-aac inc/mad inc/ogg inc/opus inc/opusfile inc/resample16 inc/soxr inc/vorbis
-	                       REQUIRES esp_common platform_config freertos nvs_flash esp32 spi_flash newlib log pthread
 )
 
 add_prebuilt_library(libmad 		lib/libmad.a)
diff --git a/components/display/CMakeLists.txt b/components/display/CMakeLists.txt
index 9735503f..51ccf43a 100644
--- a/components/display/CMakeLists.txt
+++ b/components/display/CMakeLists.txt
@@ -1,7 +1,8 @@
 
 idf_component_register(SRC_DIRS . core core/ifaces  fonts
-						REQUIRES services
-						INCLUDE_DIRS . fonts core                   
+						INCLUDE_DIRS . fonts core
+						REQUIRES platform_config tools esp_common
+						PRIV_REQUIRES services freertos    driver           
 )
 
 set_source_files_properties(display.c
diff --git a/components/platform_bluetooth/CMakeLists.txt b/components/platform_bluetooth/CMakeLists.txt
index 7433b286..66dd9955 100644
--- a/components/platform_bluetooth/CMakeLists.txt
+++ b/components/platform_bluetooth/CMakeLists.txt
@@ -1,6 +1,6 @@
 idf_component_register(	SRC_DIRS .
 						INCLUDE_DIRS .
-						REQUIRES bt display  esp_common freertos  nvs_flash esp32 spi_flash newlib   pthread platform_config
+						PRIV_REQUIRES services bt display console tools platform_config
 
 )
 
diff --git a/components/platform_config/CMakeLists.txt b/components/platform_config/CMakeLists.txt
index 784ba99c..1e41ace3 100644
--- a/components/platform_config/CMakeLists.txt
+++ b/components/platform_config/CMakeLists.txt
@@ -1,6 +1,7 @@
 idf_component_register(	SRC_DIRS . 
 						INCLUDE_DIRS . 
-						REQUIRES newlib nvs_flash json platform_console services vfs
+						PRIV_REQUIRES  json newlib  console esp_common freertos 
+						REQUIRES nvs_flash
 )
 
 
diff --git a/components/platform_console/CMakeLists.txt b/components/platform_console/CMakeLists.txt
index e49f226a..b92312e6 100644
--- a/components/platform_console/CMakeLists.txt
+++ b/components/platform_console/CMakeLists.txt
@@ -1,4 +1,5 @@
 idf_component_register( SRC_DIRS . 
 						INCLUDE_DIRS .   
-						REQUIRES console nvs_flash spi_flash app_update platform_config vfs pthread wifi-manager 
-						PRIV_REQUIRES display squeezelite )
\ No newline at end of file
+						REQUIRES nvs_flash
+						PRIV_REQUIRES console  tools services   spi_flash app_update platform_config vfs pthread wifi-manager platform_config squeezelite )
+						
\ No newline at end of file
diff --git a/components/platform_console/cmd_squeezelite.c b/components/platform_console/cmd_squeezelite.c
index 0d1db085..f6f83088 100644
--- a/components/platform_console/cmd_squeezelite.c
+++ b/components/platform_console/cmd_squeezelite.c
@@ -14,7 +14,7 @@
 #include "freertos/event_groups.h"
 #include "pthread.h"
 #include "platform_esp32.h"
-#include "config.h"
+#include "platform_config.h"
 
 static const char * TAG = "squeezelite_cmd";
 #define SQUEEZELITE_THREAD_STACK_SIZE (6*1024)
diff --git a/components/raop/CMakeLists.txt b/components/raop/CMakeLists.txt
index 866a5d59..b016d10e 100644
--- a/components/raop/CMakeLists.txt
+++ b/components/raop/CMakeLists.txt
@@ -1,6 +1,10 @@
 
 idf_component_register(SRC_DIRS .    
 						INCLUDE_DIRS .   
-						REQUIRES newlib platform_config services codecs tools display
+						PRIV_REQUIRES newlib freertos pthread platform_config mdns services codecs tools display
 						  
 )
+set_source_files_properties(raop.c
+    PROPERTIES COMPILE_FLAGS
+    -Wno-misleading-indentation
+)
\ No newline at end of file
diff --git a/components/squeezelite-ota/CMakeLists.txt b/components/squeezelite-ota/CMakeLists.txt
index bbfeb209..cf52bba1 100644
--- a/components/squeezelite-ota/CMakeLists.txt
+++ b/components/squeezelite-ota/CMakeLists.txt
@@ -1,6 +1,7 @@
 idf_component_register(SRC_DIRS .
-					  INCLUDE_DIRS . 
-					  REQUIRES console spi_flash console freertos platform_console esp_https_ota
+					  INCLUDE_DIRS .
+					  REQUIRES app_update esp_https_ota 
+					  PRIV_REQUIRES  console platform_config spi_flash vfs console freertos platform_console 
 					  )
 
 
diff --git a/components/squeezelite/CMakeLists.txt b/components/squeezelite/CMakeLists.txt
index b03655be..4c6ba362 100644
--- a/components/squeezelite/CMakeLists.txt
+++ b/components/squeezelite/CMakeLists.txt
@@ -5,19 +5,19 @@ idf_component_register( SRC_DIRS . external a1s tas57xx
 						PRIV_REQUIRES 	newlib 
 									esp_common 
 									esp-dsp
-						  			display 
-						 			platform_config 
+						  			platform_config 
 						 			platform_bluetooth 
 						 			codecs 
 						 			services 
 						 			raop   
+						 			display
 )
 
 
 
 set_source_files_properties(mad.c
     PROPERTIES COMPILE_FLAGS
-    -Wno-maybe-uninitialized
+    -Wno-maybe-uninitialized 
 )
 set_source_files_properties(pcm.c
     PROPERTIES COMPILE_FLAGS
diff --git a/components/wifi-manager/CMakeLists.txt b/components/wifi-manager/CMakeLists.txt
index 5760b8aa..fd468dc7 100644
--- a/components/wifi-manager/CMakeLists.txt
+++ b/components/wifi-manager/CMakeLists.txt
@@ -1,6 +1,7 @@
 idf_component_register( SRC_DIRS .
 						INCLUDE_DIRS .
-						REQUIRES esp_common newlib freertos  spi_flash nvs_flash mdns pthread wpa_supplicant platform_console  squeezelite-ota 
+						REQUIRES squeezelite-ota json mdns 
+						PRIV_REQUIRES tools services platform_config esp_common json newlib freertos  spi_flash nvs_flash mdns pthread wpa_supplicant platform_console   
 						EMBED_FILES style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz
 
 
diff --git a/components/wifi-manager/dns_server.c b/components/wifi-manager/dns_server.c
index c231b701..d5f0f529 100644
--- a/components/wifi-manager/dns_server.c
+++ b/components/wifi-manager/dns_server.c
@@ -52,7 +52,7 @@ Contains the freeRTOS task for the DNS server that processes the requests.
 #include <lwip/dns.h>
 
 #include <byteswap.h>
-
+#include "squeezelite-ota.h"
 #include "wifi_manager.h"
 
 static const char TAG[] = "dns_server";
diff --git a/components/wifi-manager/dns_server.h b/components/wifi-manager/dns_server.h
index 62548be1..631fea4b 100644
--- a/components/wifi-manager/dns_server.h
+++ b/components/wifi-manager/dns_server.h
@@ -36,6 +36,7 @@ Contains the freeRTOS task for the DNS server that processes the requests.
 #include <stdbool.h>
 #include "squeezelite-ota.h"
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index a08e6fc2..94fec482 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -1,5 +1,5 @@
 idf_component_register(SRC_DIRS .  
-						REQUIRES esp_common  pthread squeezelite-ota platform_console telnet
+						PRIV_REQUIRES esp_common  wifi-manager pthread squeezelite-ota platform_console telnet
                     	INCLUDE_DIRS .
                     	EMBED_FILES ../server_certs/github.pem
                     	)
diff --git a/main/esp_app_main.c b/main/esp_app_main.c
index 8be23725..7aecce81 100644
--- a/main/esp_app_main.c
+++ b/main/esp_app_main.c
@@ -35,7 +35,7 @@
 #include "nvs_flash.h"
 #include "esp_log.h"
 #include "freertos/event_groups.h"
-#include "mdns.h"
+
 #include "lwip/api.h"
 #include "lwip/err.h"
 #include "lwip/netdb.h"