diff --git a/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/AsyncEventSource.h b/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/AsyncEventSource.h
index fe4c8404..c2fe96e5 100644
--- a/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/AsyncEventSource.h
+++ b/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/AsyncEventSource.h
@@ -7,7 +7,7 @@
 #include <Arduino.h>
 
 #ifdef ESP32
-#include <AsyncTCP.h>
+#include "../../ESP32Async-AsyncTCP/src/AsyncTCP.h"
 #include <mutex>
 #ifndef SSE_MAX_QUEUED_MESSAGES
 #define SSE_MAX_QUEUED_MESSAGES 32
@@ -30,7 +30,7 @@
 #define SSE_MAX_INFLIGH 16 * 1024  // but no more than 16k, no need to blow it, since same data is kept in local Q
 #endif
 
-#include <ESPAsyncWebServer.h>
+#include "ESPAsyncWebServer.h"
 
 #ifdef ESP8266
 #include <Hash.h>
diff --git a/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/AsyncWebHeader.cpp b/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/AsyncWebHeader.cpp
index 6d82f749..b35de815 100644
--- a/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/AsyncWebHeader.cpp
+++ b/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/AsyncWebHeader.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
 
-#include <ESPAsyncWebServer.h>
+#include "ESPAsyncWebServer.h"
 
 AsyncWebHeader::AsyncWebHeader(const String &data) {
   if (!data) {
diff --git a/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/AsyncWebSocket.h b/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/AsyncWebSocket.h
index 1963e757..3316c76e 100644
--- a/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/AsyncWebSocket.h
+++ b/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/AsyncWebSocket.h
@@ -6,7 +6,7 @@
 
 #include <Arduino.h>
 #ifdef ESP32
-#include <AsyncTCP.h>
+#include "../../ESP32Async-AsyncTCP/src/AsyncTCP.h"
 #include <mutex>
 #ifndef WS_MAX_QUEUED_MESSAGES
 #define WS_MAX_QUEUED_MESSAGES 32
@@ -23,7 +23,7 @@
 #endif
 #endif
 
-#include <ESPAsyncWebServer.h>
+#include "ESPAsyncWebServer.h"
 
 #include <memory>
 
diff --git a/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/ChunkPrint.cpp b/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/ChunkPrint.cpp
index 4617d34a..de5a1cf2 100644
--- a/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/ChunkPrint.cpp
+++ b/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/ChunkPrint.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
 
-#include <ChunkPrint.h>
+#include "ChunkPrint.h"
 
 ChunkPrint::ChunkPrint(uint8_t *destination, size_t from, size_t len) : _destination(destination), _to_skip(from), _to_write(len), _pos{0} {}
 
diff --git a/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/ESPAsyncWebServer.h b/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/ESPAsyncWebServer.h
index 009d648d..5951112e 100644
--- a/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/ESPAsyncWebServer.h
+++ b/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/ESPAsyncWebServer.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #ifdef ESP32
-#include <AsyncTCP.h>
+#include "../../ESP32Async-AsyncTCP/src/AsyncTCP.h"
 #include <WiFi.h>
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
@@ -58,10 +58,6 @@ class AsyncCallbackWebHandler;
 class AsyncResponseStream;
 class AsyncMiddlewareChain;
 
-#if defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
-typedef enum http_method WebRequestMethod;
-#else
-#ifndef WEBSERVER_H
 typedef enum {
   HTTP_GET = 0b00000001,
   HTTP_POST = 0b00000010,
@@ -72,8 +68,6 @@ typedef enum {
   HTTP_OPTIONS = 0b01000000,
   HTTP_ANY = 0b01111111,
 } WebRequestMethod;
-#endif
-#endif
 
 #ifndef HAVE_FS_FILE_OPEN_MODE
 namespace fs {
diff --git a/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/Middleware.cpp b/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/Middleware.cpp
index 890303de..8598563e 100644
--- a/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/Middleware.cpp
+++ b/Software/src/lib/ESP32Async-ESPAsyncWebServer/src/Middleware.cpp
@@ -2,7 +2,7 @@
 // Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
 
 #include "WebAuthentication.h"
-#include <ESPAsyncWebServer.h>
+#include "ESPAsyncWebServer.h"
 
 AsyncMiddlewareChain::~AsyncMiddlewareChain() {
   for (AsyncMiddleware *m : _middlewares) {