diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
index a3926a406..9a412ebb1 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
@@ -28,6 +28,8 @@
 #define WIFICLIENTMULTI_H_
 
 #include "ESP8266WiFi.h"
+#undef min
+#undef max
 #include <vector>
 
 //#define DEBUG_WIFI_MULTI(...) os_printf( __VA_ARGS__ )