diff --git a/include/http_server.h b/include/http_server.h
index 9d20483..85f3ac2 100644
--- a/include/http_server.h
+++ b/include/http_server.h
@@ -2,9 +2,14 @@
 #include "config.h"
 
 #ifdef HTTP_SERVER_ENABLE
-#include <ESP8266WebServer.h>
 
+#include "my_wifi.h"
+
+#if defined ( ESP8266 )
 extern ESP8266WebServer http_server;
+#elif defined ( ESP32 )
+extern ESP32WebServer http_server;
+#endif
 
 void http_server_setup();
 void http_server_loop();
diff --git a/include/my_wifi.h b/include/my_wifi.h
new file mode 100644
index 0000000..5060fb4
--- /dev/null
+++ b/include/my_wifi.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "config.h"
+
+#if defined( ESP8266 )
+	#include <ESP8266WiFi.h>
+	#include <ESP8266mDNS.h>
+	#include <ESP8266WebServer.h>
+#elif defined( ESP32 )
+	#include <WiFi.h>
+	#include <ESPmDNS.h>
+	#include <WiFiClient.h>
+	#include <WiFiServer.h>
+	#include <ESP32WebServer.h>
+#endif
+
+#include <WiFiUdp.h>
+
+void wifi_setup();
diff --git a/include/ntp.h b/include/ntp.h
index a61c97a..1c4298c 100644
--- a/include/ntp.h
+++ b/include/ntp.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <NTPClient.h>
-#include <WiFiUdp.h>
+#include "my_wifi.h"
 #include "config.h"
 
 extern NTPClient ntpClient;
diff --git a/include/ota.h b/include/ota.h
index 68889a8..1bf694c 100644
--- a/include/ota.h
+++ b/include/ota.h
@@ -1,9 +1,6 @@
-#ifndef ota_H
-#define ota_H
+#pragma once
 
 #include <ArduinoOTA.h>
 
 void ota_setup();
 void ota_loop();
-
-#endif
diff --git a/include/wifi.h b/include/wifi.h
deleted file mode 100644
index 0875b78..0000000
--- a/include/wifi.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef wifi_H
-#define wifi_H
-
-void wifi_setup();
-
-#endif
diff --git a/platformio.ini b/platformio.ini
index 75c9bc0..574fd15 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -19,6 +19,7 @@ lib_deps =
 	https://github.com/fabianonline/FastLED.git
 	https://github.com/fabianonline/simplelist.git
 	https://github.com/fabianonline/NTPClient.git
+	ESP8266WebServer
 
 [env:ota]
 upload_port = 10.10.2.78
@@ -39,4 +40,7 @@ lib_deps = ${extra.lib_deps}
 platform = espressif32
 board = esp32dev
 framework = arduino
-lib_deps = ${extra.lib_deps}
+lib_deps =
+	${extra.lib_deps}
+	ESP32WebServer
+	WiFiClient
diff --git a/src/http_server.cpp b/src/http_server.cpp
index f1f06a7..b1078dd 100644
--- a/src/http_server.cpp
+++ b/src/http_server.cpp
@@ -5,7 +5,11 @@
 #include "http_server.h"
 #include "effects.h"
 
+#if defined( ESP8266 )
 ESP8266WebServer http_server(HTTP_SERVER_PORT);
+#elif defined( ESP32 )
+ESP32WebServer http_server(HTTP_SERVER_PORT);
+#endif
 
 void http_server_400() {
 	http_server.send(400);
diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index ce76f7e..0c2f5f7 100644
--- a/src/mqtt.cpp
+++ b/src/mqtt.cpp
@@ -5,13 +5,7 @@
 #pragma message "MQTT_ENABLE is false. Skipping MQTT."
 #else
 
-#if defined( ESP8266 )
-#include <ESP8266WiFi.h>
-#elif defined( ESP32 )
-#include <WiFi.h>
-#else
-#error "Neither ESP32 nor ESP8266 set..."
-#endif
+#include "my_wifi.h"
 #include <PubSubClient.h>
 #include "EffectEntry.h"
 #include "Effect.h"
diff --git a/src/ota.cpp b/src/ota.cpp
index b78dfb9..15673bc 100644
--- a/src/ota.cpp
+++ b/src/ota.cpp
@@ -1,12 +1,6 @@
 #include <ArduinoOTA.h>
 
-#if defined( ESP8266 )
-	#include <ESP8266mDNS.h>
-#elif defined( ESP32 )
-	#include <ESPmDNS.h>
-#else
-	#error Neither ESP32 nor ESP8266 set!
-#endif
+#include "my_wifi.h"
 
 #include <ArduinoOTA.h>
 #include "config.h"
diff --git a/src/pitrix.cpp b/src/pitrix.cpp
index 55eafb3..caeb076 100644
--- a/src/pitrix.cpp
+++ b/src/pitrix.cpp
@@ -4,7 +4,7 @@
 #include "ntp.h"
 #include "config.h"
 #include "animations.h"
-#include "wifi.h"
+#include "my_wifi.h"
 #include "ota.h"
 #include "my_fastled.h"
 #include "EffectEntry.h"
diff --git a/src/wifi.cpp b/src/wifi.cpp
index 7ec20f7..1fa2bcf 100644
--- a/src/wifi.cpp
+++ b/src/wifi.cpp
@@ -1,12 +1,8 @@
 #include <Arduino.h>
-#if defined( ESP8266 )
-	#include <ESP8266WiFi.h>
-#elif defined( ESP32 )
-	#include <WiFi.h>
-#endif
-#include "wifi.h"
+#include "my_wifi.h"
 #include "config.h"
 
+
 void wifi_setup() {
 	WiFi.mode(WIFI_STA);
 	WiFi.begin(WIFI_SSID, WIFI_PASS);