diff --git a/platformio.ini b/platformio.ini
index 927d58cb89..bac2486907 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -44,12 +44,15 @@ src_filter =
     +<./>
     +<../tests/dummy_main.cpp>
     +<../.temp/all-include.cpp>
+lib_ldf_mode = off
 
 ; This are common settings for all Arduino-framework based environments.
 [common:arduino]
 extends = common
 lib_deps =
     ${common.lib_deps}
+    SPI                                                   ; spi (Arduino built-in)
+    Wire                                                  ; i2c (Arduino built-int)
     ottowinter/AsyncMqttClient-esphome@0.8.6              ; mqtt
     esphome/ESPAsyncWebServer-esphome@2.1.0               ; web_server_base
     fastled/FastLED@3.3.2                                 ; fastled_base
@@ -85,6 +88,9 @@ lib_deps =
     ESP8266WiFi                           ; wifi (Arduino built-in)
     Update                                ; ota (Arduino built-in)
     ottowinter/ESPAsyncTCP-esphome@1.2.3  ; async_tcp
+    ESP8266HTTPClient                     ; http_request (Arduino built-in)
+    ESP8266mDNS                           ; mdns (Arduino built-in)
+    DNSServer                             ; captive_portal (Arduino built-in)
 build_flags =
     ${common:arduino.build_flags}
     -DUSE_ESP8266
@@ -101,8 +107,17 @@ platform_packages =
 framework = arduino
 board = nodemcu-32s
 lib_deps =
+    ; order matters with lib-deps; some of the libs in common:arduino.lib_deps
+    ; don't declare built-in libraries as dependencies, so they have to be declared first
+    FS                              ; web_server_base (Arduino built-in)
+    WiFi                            ; wifi,web_server_base,ethernet (Arduino built-in)
+    Update                          ; ota,web_server_base (Arduino built-in)
     ${common:arduino.lib_deps}
     esphome/AsyncTCP-esphome@1.2.2  ; async_tcp
+    WiFiClientSecure                ; http_request,nextion (Arduino built-in)
+    HTTPClient                      ; http_request,nextion (Arduino built-in)
+    ESPmDNS                         ; mdns (Arduino built-in)
+    DNSServer                       ; captive_portal (Arduino built-in)
 build_flags =
     ${common:arduino.build_flags}
     -DUSE_ESP32