diff --git a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncEventSource.h b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncEventSource.h
index b097fa62..d3d1b1d4 100644
--- a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncEventSource.h
+++ b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncEventSource.h
@@ -22,13 +22,13 @@
 
 #include <Arduino.h>
 #ifdef ESP32
-#include <AsyncTCP.h>
+#include "../../me-no-dev-AsyncTCP/src/AsyncTCP.h"
 #define SSE_MAX_QUEUED_MESSAGES 32
 #else
 #include <ESPAsyncTCP.h>
 #define SSE_MAX_QUEUED_MESSAGES 8
 #endif
-#include <ESPAsyncWebServer.h>
+#include "ESPAsyncWebServer.h"
 
 #include "AsyncWebSynchronization.h"
 
diff --git a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncJson.h b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncJson.h
index 2fa6a2d2..131ad599 100644
--- a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncJson.h
+++ b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncJson.h
@@ -35,7 +35,7 @@
 #ifndef ASYNC_JSON_H_
 #define ASYNC_JSON_H_
 #include <ArduinoJson.h>
-#include <ESPAsyncWebServer.h>
+#include "ESPAsyncWebServer.h"
 #include <Print.h>
 
 #if ARDUINOJSON_VERSION_MAJOR == 5
diff --git a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSocket.h b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSocket.h
index 5b03aceb..747399b8 100644
--- a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSocket.h
+++ b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSocket.h
@@ -23,13 +23,13 @@
 
 #include <Arduino.h>
 #ifdef ESP32
-#include <AsyncTCP.h>
+#include "../../me-no-dev-AsyncTCP/src/AsyncTCP.h"
 #define WS_MAX_QUEUED_MESSAGES 32
 #else
 #include <ESPAsyncTCP.h>
 #define WS_MAX_QUEUED_MESSAGES 8
 #endif
-#include <ESPAsyncWebServer.h>
+#include "ESPAsyncWebServer.h"
 
 #include "AsyncWebSynchronization.h"
 
diff --git a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSynchronization.h b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSynchronization.h
index f36c52dc..d1d20acd 100644
--- a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSynchronization.h
+++ b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSynchronization.h
@@ -3,7 +3,7 @@
 
 // Synchronisation is only available on ESP32, as the ESP8266 isn't using FreeRTOS by default
 
-#include <ESPAsyncWebServer.h>
+#include "ESPAsyncWebServer.h"
 
 #ifdef ESP32
 
diff --git a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/ESPAsyncWebServer.h b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/ESPAsyncWebServer.h
index 7cd21aa8..664c0a5c 100644
--- a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/ESPAsyncWebServer.h
+++ b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/ESPAsyncWebServer.h
@@ -30,10 +30,10 @@
 
 #ifdef ESP32
 #include <WiFi.h>
-#include <AsyncTCP.h>
+#include "../../me-no-dev-AsyncTCP/src/AsyncTCP.h"
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
-#include <ESPAsyncTCP.h>
+#include "../../me-no-dev-AsyncTCP/src/AsyncTCP.h"
 #else
 #error Platform not supported
 #endif
@@ -57,7 +57,7 @@ class AsyncStaticWebHandler;
 class AsyncCallbackWebHandler;
 class AsyncResponseStream;
 
-#ifndef WEBSERVER_H
+#ifndef ESPWEBSERVER_H
 typedef enum {
   HTTP_GET     = 0b00000001,
   HTTP_POST    = 0b00000010,
diff --git a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/SPIFFSEditor.h b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/SPIFFSEditor.h
index 3586429e..6b5896ea 100644
--- a/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/SPIFFSEditor.h
+++ b/Software/src/lib/me-no-dev-ESPAsyncWebServer/src/SPIFFSEditor.h
@@ -1,6 +1,6 @@
 #ifndef SPIFFSEditor_H_
 #define SPIFFSEditor_H_
-#include <ESPAsyncWebServer.h>
+#include "ESPAsyncWebServer.h"
 
 class SPIFFSEditor: public AsyncWebHandler {
   private: