diff --git a/libraries/DNSServer/src/DNSServer.cpp b/libraries/DNSServer/src/DNSServer.cpp
index d2c41f79d7..4ffeb88a37 100644
--- a/libraries/DNSServer/src/DNSServer.cpp
+++ b/libraries/DNSServer/src/DNSServer.cpp
@@ -2,7 +2,7 @@
 #include "DNSServer.h"
 #include <lwip/def.h>
 #include <Arduino.h>
-#include <memory>
+
 extern struct rst_info resetInfo;
 
 #ifdef DEBUG_ESP_PORT
diff --git a/libraries/DNSServer/src/DNSServer.h b/libraries/DNSServer/src/DNSServer.h
index 1ca16697f9..44af7e4d90 100644
--- a/libraries/DNSServer/src/DNSServer.h
+++ b/libraries/DNSServer/src/DNSServer.h
@@ -1,5 +1,7 @@
 #ifndef DNSServer_h
 #define DNSServer_h
+
+#include <memory>
 #include <WiFiUdp.h>
 
 // #define DEBUG_DNSSERVER
diff --git a/tests/host/common/MockEsp.cpp b/tests/host/common/MockEsp.cpp
index 75c609ef65..18e7be6c83 100644
--- a/tests/host/common/MockEsp.cpp
+++ b/tests/host/common/MockEsp.cpp
@@ -36,6 +36,9 @@
 
 #include <stdlib.h>
 
+#include <user_interface.h>
+struct rst_info resetInfo;
+
 unsigned long long operator"" _kHz(unsigned long long x)
 {
     return x * 1000;