diff --git a/src/hasp_mqtt.cpp b/src/hasp_mqtt.cpp
index 15cba325..f6298462 100644
--- a/src/hasp_mqtt.cpp
+++ b/src/hasp_mqtt.cpp
@@ -6,7 +6,6 @@
 #include "ArduinoLog.h"
 #include "PubSubClient.h"
 
-#include "hasp_conf.h"
 #include "hasp_mqtt.h"
 
 #if defined(ARDUINO_ARCH_ESP32)
@@ -37,7 +36,6 @@ EthernetClient mqttNetworkClient;
 #include "hasp_tft.h"
 #include "hasp_debug.h"
 #include "hasp_config.h"
-#include "hasp_mqtt.h"
 #include "hasp_wifi.h"
 #include "hasp_dispatch.h"
 #include "hasp.h"
diff --git a/src/hasp_ota.cpp b/src/hasp_ota.cpp
index 4d8d1e4c..3f10aff5 100644
--- a/src/hasp_ota.cpp
+++ b/src/hasp_ota.cpp
@@ -4,21 +4,13 @@
 #include "ArduinoJson.h"
 #include "ArduinoLog.h"
 
+#include "hasp_conf.h"
+
 #include "hasp_debug.h"
 #include "hasp_dispatch.h"
 #include "hasp_ota.h"
 #include "hasp.h"
 
-#include "hasp_conf.h"
-
-#if HASP_USE_MQTT > 0
-#include "hasp_mqtt.h"
-#endif
-
-#if HASP_USE_MDNS > 0
-#include "hasp_mdns.h"
-#endif
-
 #if defined(ARDUINO_ARCH_ESP8266)
 #include <ESP8266HTTPClient.h>
 #include <ESP8266httpUpdate.h>
diff --git a/src/hasp_telnet.cpp b/src/hasp_telnet.cpp
index 70e3a9dc..aab950f9 100644
--- a/src/hasp_telnet.cpp
+++ b/src/hasp_telnet.cpp
@@ -9,7 +9,6 @@
 #include "hasp_config.h"
 #include "hasp_dispatch.h"
 #include "hasp_telnet.h"
-#include "hasp_conf.h"
 
 #if defined(ARDUINO_ARCH_ESP32)
 #include <Wifi.h>
diff --git a/src/main.cpp b/src/main.cpp
index faabd00f..d03940de 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,9 +5,8 @@
 #include "hasp_debug.h"
 #include "hasp_config.h"
 #include "hasp_gui.h"
-#include "hasp.h"
 #include "hasp_oobe.h"
-#include "hasp_gpio.h"
+#include "hasp.h"
 
 bool isConnected;
 uint8_t mainLoopCounter        = 0;