diff --git a/platformio/boards/espressif.json b/platformio/boards/espressif.json
index 968bfb8d..a3d0b621 100644
--- a/platformio/boards/espressif.json
+++ b/platformio/boards/espressif.json
@@ -127,7 +127,7 @@
     "nodemcu": {
         "build": {
             "core": "esp8266",
-            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_NODEMCU",
             "f_cpu": "80000000L",
             "f_flash": "40000000L",
             "flash_mode": "qio",
@@ -152,7 +152,7 @@
     "nodemcuv2": {
         "build": {
             "core": "esp8266",
-            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_NODEMCU",
             "f_cpu": "80000000L",
             "f_flash": "40000000L",
             "flash_mode": "dio",
@@ -352,7 +352,7 @@
     "d1": {
         "build": {
             "core": "esp8266",
-            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_NODEMCU",
             "f_cpu": "80000000L",
             "f_flash": "40000000L",
             "flash_mode": "dio",
@@ -377,7 +377,7 @@
     "d1_mini": {
         "build": {
             "core": "esp8266",
-            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
+            "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_NODEMCU",
             "f_cpu": "80000000L",
             "f_flash": "40000000L",
             "flash_mode": "dio",
diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py
index ce1d4333..122821ff 100644
--- a/platformio/builder/scripts/frameworks/arduino.py
+++ b/platformio/builder/scripts/frameworks/arduino.py
@@ -55,11 +55,20 @@ elif env.get("PLATFORM") == "timsp430":
     )
 elif env.get("PLATFORM") == "espressif":
     env.Prepend(
-        CPPPATH=[join("$PLATFORMFW_DIR", "tools", "sdk", "include")],
+        CPPPATH=[
+            join("$PLATFORMFW_DIR", "tools", "sdk", "include"),
+            join("$PLATFORMFW_DIR", "tools", "sdk", "lwip", "include")
+        ],
         LIBPATH=[join("$PLATFORMFW_DIR", "tools", "sdk", "lib")],
         LIBS=["mesh", "wpa2", "smartconfig", "pp", "main", "wpa", "lwip",
               "net80211", "wps", "crypto", "phy", "hal", "axtls", "gcc", "m"]
     )
+    env.VariantDirWrap(
+        join("$BUILD_DIR", "generic"),
+        join("$PIOPACKAGES_DIR", "framework-arduinoespressif",
+             "variants", "generic")
+    )
+
 elif env.get("PLATFORM") == "nordicnrf51":
     PLATFORMFW_DIR = join(
         "$PIOPACKAGES_DIR",