diff --git a/esp8266_deauther/Accesspoints.h b/esp8266_deauther/Accesspoints.h
index cd8725f..314880c 100644
--- a/esp8266_deauther/Accesspoints.h
+++ b/esp8266_deauther/Accesspoints.h
@@ -3,9 +3,12 @@
 
 #include "Arduino.h"
 #include <ESP8266WiFi.h>
-#include "Names.h"
+extern "C" {
+  #include "user_interface.h"
+}
 #include "language.h"
 #include "SimpleList.h"
+#include "Names.h"
 
 extern Names names;
 
diff --git a/esp8266_deauther/Attack.h b/esp8266_deauther/Attack.h
index 32cbe2e..b86a878 100644
--- a/esp8266_deauther/Attack.h
+++ b/esp8266_deauther/Attack.h
@@ -3,12 +3,15 @@
 
 #include "Arduino.h"
 #include <ESP8266WiFi.h>
+extern "C" {
+  #include "user_interface.h"
+}
+#include "language.h"
 #include "Accesspoints.h"
 #include "Stations.h"
 #include "SSIDs.h"
 #include "Settings.h"
 #include "Scan.h"
-#include "language.h"
 
 extern Settings settings;
 extern SSIDs ssids;
diff --git a/esp8266_deauther/DigitalLed.h b/esp8266_deauther/DigitalLed.h
index 6e96c17..fdcac28 100644
--- a/esp8266_deauther/DigitalLed.h
+++ b/esp8266_deauther/DigitalLed.h
@@ -2,11 +2,14 @@
 #define DigitalLed_h
 
 #include "Arduino.h"
+extern "C" {
+  #include "user_interface.h"
+}
+#include "language.h"
+#include "A_config.h"
 #include "Settings.h"
 #include "Attack.h"
 #include "Scan.h"
-#include "language.h"
-#include "A_config.h"
 
 #define LED_MODE_OFF 0
 #define LED_MODE_SCAN 1
diff --git a/esp8266_deauther/DisplayUI.h b/esp8266_deauther/DisplayUI.h
index d9bc1a4..ef5ab84 100644
--- a/esp8266_deauther/DisplayUI.h
+++ b/esp8266_deauther/DisplayUI.h
@@ -4,18 +4,18 @@
 #include "Arduino.h"
 #include <ESP8266WiFi.h>
 #include <FS.h>
-
+extern "C" {
+  #include "user_interface.h"
+}
 #include "language.h"
+#include "A_config.h"
 #include "Settings.h"
 #include "Names.h"
 #include "SSIDs.h"
 #include "Scan.h"
 #include "Attack.h"
-#include "A_config.h"
 
-extern "C" {
-  #include "user_interface.h"
-}
+
 
 extern Settings settings;
 extern Names names;
diff --git a/esp8266_deauther/Names.h b/esp8266_deauther/Names.h
index 05f62dc..998777b 100644
--- a/esp8266_deauther/Names.h
+++ b/esp8266_deauther/Names.h
@@ -2,10 +2,14 @@
 #define Names_h
 
 #include "Arduino.h"
-#include "FS.h"
+#include <FS.h>
+#include <ESP8266WiFi.h>
+extern "C" {
+  #include "user_interface.h"
+}
 #include <ArduinoJson.h>
-#include "SimpleList.h"
 #include "language.h"
+#include "SimpleList.h"
 
 #define NAME_LIST_SIZE 25
 #define NAME_MAX_LENGTH 16
diff --git a/esp8266_deauther/Neopixel.h b/esp8266_deauther/Neopixel.h
index 8af1a01..94507ed 100644
--- a/esp8266_deauther/Neopixel.h
+++ b/esp8266_deauther/Neopixel.h
@@ -2,12 +2,16 @@
 #define Neopixel_h
 
 #include "Arduino.h"
+#include <ESP8266WiFi.h>
+extern "C" {
+  #include "user_interface.h"
+}
+#include <Adafruit_NeoPixel.h>
+#include "language.h"
+#include "A_config.h"
 #include "Settings.h"
 #include "Attack.h"
 #include "Scan.h"
-#include "language.h"
-#include <Adafruit_NeoPixel.h>
-#include "A_config.h"
 
 #define LED_MODE_OFF 0
 #define LED_MODE_SCAN 1
diff --git a/esp8266_deauther/RGBLed.h b/esp8266_deauther/RGBLed.h
index a5ba8a8..951995f 100644
--- a/esp8266_deauther/RGBLed.h
+++ b/esp8266_deauther/RGBLed.h
@@ -2,11 +2,15 @@
 #define RGBLed_h
 
 #include "Arduino.h"
+#include <ESP8266WiFi.h>
+extern "C" {
+  #include "user_interface.h"
+}
+#include "language.h"
+#include "A_config.h"
 #include "Settings.h"
 #include "Attack.h"
 #include "Scan.h"
-#include "language.h"
-#include "A_config.h"
 
 #define LED_MODE_OFF 0
 #define LED_MODE_SCAN 1
diff --git a/esp8266_deauther/SSIDs.h b/esp8266_deauther/SSIDs.h
index 742b2e3..43e6d5b 100644
--- a/esp8266_deauther/SSIDs.h
+++ b/esp8266_deauther/SSIDs.h
@@ -2,11 +2,15 @@
 #define SSIDs_h
 
 #include "Arduino.h"
-#include "FS.h"
+#include <ESP8266WiFi.h>
+#include <FS.h>
+extern "C" {
+  #include "user_interface.h"
+}
 #include <ArduinoJson.h>
+#include "language.h"
 #include "SimpleList.h"
 #include "Settings.h"
-#include "language.h"
 #include "Accesspoints.h"
 
 #define SSID_LIST_SIZE 60
diff --git a/esp8266_deauther/SerialInterface.h b/esp8266_deauther/SerialInterface.h
index 1234955..82db39b 100644
--- a/esp8266_deauther/SerialInterface.h
+++ b/esp8266_deauther/SerialInterface.h
@@ -2,15 +2,14 @@
 #define SerialInterface_h
 
 #include "Arduino.h"
-#include "pgmspace.h"
 #include <ESP8266WiFi.h>
 #include <FS.h>
-
 extern "C" {
   #include "user_interface.h"
 }
-
 #include "language.h"
+#include "A_config.h"
+#include "SimpleList.h"
 #include "Settings.h"
 #include "Names.h"
 #include "SSIDs.h"
@@ -20,8 +19,6 @@ extern "C" {
 #include "DigitalLed.h"
 #include "RGBLed.h"
 #include "Neopixel.h"
-#include "A_config.h"
-#include "SimpleList.h"
 
 #ifdef DIGITAL_LED
 extern DigitalLed led;
diff --git a/esp8266_deauther/Settings.h b/esp8266_deauther/Settings.h
index ac56bbb..cdb10bf 100644
--- a/esp8266_deauther/Settings.h
+++ b/esp8266_deauther/Settings.h
@@ -2,14 +2,13 @@
 #define Settings_h
 
 #include "Arduino.h"
-#include "FS.h"
-#include <ArduinoJson.h>
-#include "language.h"
-#include "A_config.h"
-
+#include <FS.h>
 extern "C" {
   #include "user_interface.h"
 }
+#include <ArduinoJson.h>
+#include "language.h"
+#include "A_config.h"
 
 #define VERSION "v2.0.1"
 
diff --git a/esp8266_deauther/SimpleList.h b/esp8266_deauther/SimpleList.h
index a36b1d8..bb7e218 100644
--- a/esp8266_deauther/SimpleList.h
+++ b/esp8266_deauther/SimpleList.h
@@ -44,7 +44,6 @@ class SimpleList{
     Node<T>* getNode(int index);
 };
 
-// Initialize LinkedList with default values
 template<typename T>
 SimpleList<T>::SimpleList(){
   listBegin = NULL;
diff --git a/esp8266_deauther/Stations.h b/esp8266_deauther/Stations.h
index fb79c86..3e4943d 100644
--- a/esp8266_deauther/Stations.h
+++ b/esp8266_deauther/Stations.h
@@ -5,10 +5,10 @@
 extern "C" {
   #include "user_interface.h"
 }
-#include "Accesspoints.h"
-#include "Names.h"
 #include "language.h"
 #include "SimpleList.h"
+#include "Accesspoints.h"
+#include "Names.h"
 
 #define STATION_LIST_SIZE 60
 extern Accesspoints accesspoints;
diff --git a/esp8266_deauther/functions.h b/esp8266_deauther/functions.h
index ef71a1f..ee4e271 100644
--- a/esp8266_deauther/functions.h
+++ b/esp8266_deauther/functions.h
@@ -1,12 +1,12 @@
 #ifndef functions_h
 #define functions_h
 
+#include "Arduino.h"
 #include <FS.h>
-#include "ArduinoJson.h"
-
 extern "C" {
   #include "user_interface.h"
 }
+#include <ArduinoJson.h>
 
 /*
   Here is a collection of useful functions and variables.
diff --git a/esp8266_deauther/wifi.h b/esp8266_deauther/wifi.h
index c9f778e..b137f80 100644
--- a/esp8266_deauther/wifi.h
+++ b/esp8266_deauther/wifi.h
@@ -1,12 +1,16 @@
 #ifndef WifiManager_h
 #define WifiManager_h
 
+#include "Arduino.h"
 #include <ESP8266WiFi.h>
 #include <WiFiClient.h>
 #include <ESP8266WebServer.h>
 #include <DNSServer.h>
 #include <ESP8266mDNS.h>
 #include <FS.h>
+extern "C" {
+  #include "user_interface.h"
+}
 
 #define WIFI_MODE_OFF 0
 #define WIFI_MODE_AP 1