diff --git a/src/APSettingsService.h b/src/APSettingsService.h
index 6d9a1ba..3fcd2a7 100644
--- a/src/APSettingsService.h
+++ b/src/APSettingsService.h
@@ -1,9 +1,9 @@
 #ifndef APSettingsConfig_h
 #define APSettingsConfig_h
 
+#include <SettingsService.h>
 #include <DNSServer.h>
 #include <IPAddress.h>
-#include <SettingsService.h>
 
 #define MANAGE_NETWORK_DELAY 10000
 
diff --git a/src/AsyncJsonCallbackResponse.h b/src/AsyncJsonCallbackResponse.h
index 0a3a868..b384f69 100644
--- a/src/AsyncJsonCallbackResponse.h
+++ b/src/AsyncJsonCallbackResponse.h
@@ -1,8 +1,8 @@
 #ifndef _AsyncJsonCallbackResponse_H_
 #define _AsyncJsonCallbackResponse_H_
 
-#include <AsyncJson.h>
 #include <ESPAsyncWebServer.h>
+#include <AsyncJson.h>
 
 /*
 * Listens for a response being destroyed and calls a callback during said distruction.
diff --git a/src/AsyncJsonRequestWebHandler.h b/src/AsyncJsonRequestWebHandler.h
index 7737b7f..ddfdba7 100644
--- a/src/AsyncJsonRequestWebHandler.h
+++ b/src/AsyncJsonRequestWebHandler.h
@@ -1,5 +1,6 @@
 #ifndef Async_Json_Request_Web_Handler_H_
 #define Async_Json_Request_Web_Handler_H_
+
 #include <ArduinoJson.h>
 
 #define ASYNC_JSON_REQUEST_DEFAULT_MAX_SIZE 1024
diff --git a/src/NTPSettingsService.h b/src/NTPSettingsService.h
index 386385f..b6d14f0 100644
--- a/src/NTPSettingsService.h
+++ b/src/NTPSettingsService.h
@@ -2,7 +2,6 @@
 #define NTPSettingsService_h
 
 #include <SettingsService.h>
-#include <ESP8266WiFi.h>
 
 #include <TimeLib.h>
 #include <NtpClientLib.h>
diff --git a/src/OTASettingsService.h b/src/OTASettingsService.h
index 9e9fc8b..671f2a7 100644
--- a/src/OTASettingsService.h
+++ b/src/OTASettingsService.h
@@ -2,7 +2,6 @@
 #define OTASettingsService_h
 
 #include <SettingsService.h>
-#include <ESP8266WiFi.h> // ??
 #include <ESP8266mDNS.h>
 #include <WiFiUdp.h>
 #include <ArduinoOTA.h>
diff --git a/src/WiFiSettingsService.h b/src/WiFiSettingsService.h
index 5838d74..14ffe53 100644
--- a/src/WiFiSettingsService.h
+++ b/src/WiFiSettingsService.h
@@ -1,8 +1,8 @@
 #ifndef WiFiSettingsService_h
 #define WiFiSettingsService_h
 
-#include <IPAddress.h>
 #include <SettingsService.h>
+#include <IPAddress.h>
 
 #define WIFI_SETTINGS_FILE "/config/wifiSettings.json"
 #define WIFI_SETTINGS_SERVICE_PATH "/rest/wifiSettings"
diff --git a/src/main.cpp b/src/main.cpp
index 40d7a16..7134a7b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,9 @@
 #include <Arduino.h>
+
 #include <ESPAsyncTCP.h>
 #include <ESPAsyncWebServer.h>
 #include <FS.h>
+
 #include <WiFiSettingsService.h>
 #include <WiFiStatus.h>
 #include <WiFiScanner.h>