diff --git a/wled00/wled_hue.cpp b/wled00/wled_hue.cpp
index abdb4ffa..61756ec0 100644
--- a/wled00/wled_hue.cpp
+++ b/wled00/wled_hue.cpp
@@ -2,6 +2,8 @@
 #include "wled.h"
 #include "wled_colors.h"
 #include "wled_eeprom.h"
+#include "wled_notify.h"
+#include "wled_led.h"
 
 #ifndef WLED_DISABLE_HUESYNC
 
diff --git a/wled00/wled_hue.h b/wled00/wled_hue.h
index e9aa22b2..8b26f8b6 100644
--- a/wled00/wled_hue.h
+++ b/wled00/wled_hue.h
@@ -4,7 +4,7 @@
  * Sync to Philips hue lights
  */
 #include <Arduino.h>
-#include <ESPAsyncTCP.h>
+class AsyncClient;
 
 void handleHue();
 void reconnectHue();
diff --git a/wled00/wled_mqtt.cpp b/wled00/wled_mqtt.cpp
index ce69513b..5e96a18f 100644
--- a/wled00/wled_mqtt.cpp
+++ b/wled00/wled_mqtt.cpp
@@ -2,6 +2,9 @@
 #include "wled.h"
 #include "wled_notify.h"
 #include "wled_led.h"
+#include "wled_colors.h"
+#include "wled_xml.h"
+#include "wled_set.h"
 
 #ifdef WLED_ENABLE_MQTT
 #define MQTT_KEEP_ALIVE_TIME 60    // contact the MQTT broker every 60 seconds
diff --git a/wled00/wled_notify.h b/wled00/wled_notify.h
index 2a2865b3..04c65aa4 100644
--- a/wled00/wled_notify.h
+++ b/wled00/wled_notify.h
@@ -1,6 +1,7 @@
 #ifndef WLED_NOTIFY_H
 #define WLED_NOTIFY_H
 #include <Arduino.h>
+#include "src/dependencies/e131/ESPAsyncE131.h"
 #include "const.h"
 /*
  * UDP notifier
diff --git a/wled00/wled_overlay.cpp b/wled00/wled_overlay.cpp
index 93348e79..8cb70786 100644
--- a/wled00/wled_overlay.cpp
+++ b/wled00/wled_overlay.cpp
@@ -1,5 +1,7 @@
 #include "wled_overlay.h"
 #include "wled.h"
+#include "wled_cronixie.h"
+#include "wled_ntp.h"
  
 void initCronixie()
 {
diff --git a/wled00/wled_overlay.h b/wled00/wled_overlay.h
index 47573978..ec18f45b 100644
--- a/wled00/wled_overlay.h
+++ b/wled00/wled_overlay.h
@@ -8,5 +8,7 @@
 void initCronixie();
 void handleOverlays();
 void handleOverlayDraw();
+void _overlayAnalogCountdown();
+void _overlayAnalogClock();
 
 #endif // WLED_OVERLAY_H
\ No newline at end of file
diff --git a/wled00/wled_server.h b/wled00/wled_server.h
index a03f83e1..46adc962 100644
--- a/wled00/wled_server.h
+++ b/wled00/wled_server.h
@@ -4,6 +4,8 @@
 /*
  * Server page declarations
  */
+class AsyncWebServerRequest;
+
 
 bool isIp(String str);
 bool captivePortal(AsyncWebServerRequest *request);
diff --git a/wled00/wled_set.cpp b/wled00/wled_set.cpp
index aff3f0cd..66d9ff1e 100644
--- a/wled00/wled_set.cpp
+++ b/wled00/wled_set.cpp
@@ -9,7 +9,7 @@
 #include "wled_cronixie.h"
 #include "wled_xml.h"
 
-void _setRandomColor(bool _sec,bool fromButton=false)
+void _setRandomColor(bool _sec,bool fromButton)
 {
   lastRandomIndex = strip.get_random_wheel_index(lastRandomIndex);
   if (_sec){
@@ -337,7 +337,7 @@ int getNumVal(const String* req, uint16_t pos)
 
 
 //helper to get int value at a position in string
-bool updateVal(const String* req, const char* key, byte* val, byte minv=0, byte maxv=255)
+bool updateVal(const String* req, const char* key, byte* val, byte minv, byte maxv)
 {
   int pos = req->indexOf(key);
   if (pos < 1) return false;
diff --git a/wled00/wled_xml.cpp b/wled00/wled_xml.cpp
index 07009cf3..4f2b3f45 100644
--- a/wled00/wled_xml.cpp
+++ b/wled00/wled_xml.cpp
@@ -1,10 +1,11 @@
 #include "wled_xml.h"
 #include "wled.h"
 #include "wled_eeprom.h"
+#include "wled_ntp.h"
 
 
 //build XML response to HTTP /win API request
-char* XML_response(AsyncWebServerRequest *request, char* dest = nullptr)
+char* XML_response(AsyncWebServerRequest *request, char* dest)
 {
   char sbuf[(dest == nullptr)?1024:1]; //allocate local buffer if none passed
   obuf = (dest == nullptr)? sbuf:dest;