diff --git a/variants/ESPDuino/pins_arduino.h b/variants/ESPDuino/pins_arduino.h
index 2f2e810ce0..f1517e3f32 100644
--- a/variants/ESPDuino/pins_arduino.h
+++ b/variants/ESPDuino/pins_arduino.h
@@ -25,8 +25,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define PIN_WIRE_SDA (4)
 #define PIN_WIRE_SCL (5)
 
@@ -35,4 +33,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 
 #define LED_BUILTIN 16
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/adafruit/pins_arduino.h b/variants/adafruit/pins_arduino.h
index 8e8d55df7d..dd015de027 100644
--- a/variants/adafruit/pins_arduino.h
+++ b/variants/adafruit/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define PIN_WIRE_SDA (4)
 #define PIN_WIRE_SCL (5)
 
@@ -36,4 +34,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 
 #define LED_BUILTIN 0
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/arduino_spi/pins_arduino.h b/variants/arduino_spi/pins_arduino.h
index a06f298e47..169a39fc84 100644
--- a/variants/arduino_spi/pins_arduino.h
+++ b/variants/arduino_spi/pins_arduino.h
@@ -31,8 +31,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define LED_BUILTIN 2
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/arduino_uart/pins_arduino.h b/variants/arduino_uart/pins_arduino.h
index 50cad09358..4999a40473 100644
--- a/variants/arduino_uart/pins_arduino.h
+++ b/variants/arduino_uart/pins_arduino.h
@@ -31,8 +31,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define LED_BUILTIN 14
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/d1/pins_arduino.h b/variants/d1/pins_arduino.h
index 6e15f366e2..d557d38c79 100644
--- a/variants/d1/pins_arduino.h
+++ b/variants/d1/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define PIN_WIRE_SDA (4)
 #define PIN_WIRE_SCL (5)
 
@@ -53,4 +51,6 @@ static const uint8_t D13  = 14;
 static const uint8_t D14  = 4;
 static const uint8_t D15  = 5;
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/d1_mini/pins_arduino.h b/variants/d1_mini/pins_arduino.h
index 8d89f9fca2..fe2a91949f 100644
--- a/variants/d1_mini/pins_arduino.h
+++ b/variants/d1_mini/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define PIN_WIRE_SDA (4)
 #define PIN_WIRE_SCL (5)
 
@@ -48,4 +46,6 @@ static const uint8_t D8   = 15;
 static const uint8_t RX   = 3;
 static const uint8_t TX   = 1;
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/espino/pins_arduino.h b/variants/espino/pins_arduino.h
index 6ec3a78b72..36db702215 100644
--- a/variants/espino/pins_arduino.h
+++ b/variants/espino/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define PIN_WIRE_SDA (4)
 #define PIN_WIRE_SCL (5)
 
@@ -40,5 +38,6 @@ static const uint8_t LED_BUILTIN_G = 4;
 static const uint8_t LED_BUILTIN_B = 5;
 static const uint8_t BUTTON_BUILTIN = 0;
 
+#include "../generic/common.h"
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/espinotee/pins_arduino.h b/variants/espinotee/pins_arduino.h
index 12db2f5741..f7b7402b9b 100644
--- a/variants/espinotee/pins_arduino.h
+++ b/variants/espinotee/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define PIN_WIRE_SDA (4)
 #define PIN_WIRE_SCL (5)
 
@@ -36,4 +34,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 
 #define LED_BUILTIN 16
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/espresso_lite_v1/pins_arduino.h b/variants/espresso_lite_v1/pins_arduino.h
index addbbe90c6..03f716aa3c 100644
--- a/variants/espresso_lite_v1/pins_arduino.h
+++ b/variants/espresso_lite_v1/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define ESPRESSO_LITE_VERSION   1
 
 #define PIN_WIRE_SDA (4)
@@ -38,4 +36,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 
 #define LED_BUILTIN 16
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/espresso_lite_v2/pins_arduino.h b/variants/espresso_lite_v2/pins_arduino.h
index 8d03252647..a3499386c5 100644
--- a/variants/espresso_lite_v2/pins_arduino.h
+++ b/variants/espresso_lite_v2/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define ESPRESSO_LITE_VERSION   2
 
 #define PIN_WIRE_SDA (4)
@@ -38,4 +36,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 
 #define LED_BUILTIN 2
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/generic/pins_arduino.h b/variants/generic/pins_arduino.h
index dcb8ec7be8..475fff2b58 100644
--- a/variants/generic/pins_arduino.h
+++ b/variants/generic/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "common.h"
-
 #define PIN_WIRE_SDA (4)
 #define PIN_WIRE_SCL (5)
 
@@ -38,4 +36,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 #define LED_BUILTIN 1
 #endif
 
+#include "common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/nodemcu/pins_arduino.h b/variants/nodemcu/pins_arduino.h
index ff71048734..ceb30691cb 100644
--- a/variants/nodemcu/pins_arduino.h
+++ b/variants/nodemcu/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define PIN_WIRE_SDA (4)
 #define PIN_WIRE_SCL (5)
 
@@ -48,4 +46,6 @@ static const uint8_t D8   = 15;
 static const uint8_t D9   = 3;
 static const uint8_t D10  = 1;
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/oak/pins_arduino.h b/variants/oak/pins_arduino.h
index 9cd30fd5af..fb87d80e9b 100644
--- a/variants/oak/pins_arduino.h
+++ b/variants/oak/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define PIN_WIRE_SDA (2)
 #define PIN_WIRE_SCL (0)
 
@@ -47,13 +45,8 @@ static const uint8_t P11  = 17;
 static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;
 
-static const uint8_t SS    = 15;
-static const uint8_t MOSI  = 13;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
-
 #define LED_BUILTIN 5
 
-static const uint8_t A0 = 17;
+#include "../generic/common.h"
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/phoenix_v1/pins_arduino.h b/variants/phoenix_v1/pins_arduino.h
index 7c6a02c8d4..a2b0681965 100644
--- a/variants/phoenix_v1/pins_arduino.h
+++ b/variants/phoenix_v1/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define PHOENIX_VERSION   1
 
 #define PIN_WIRE_SDA (4)
@@ -38,4 +36,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 
 #define LED_BUILTIN 16
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/phoenix_v2/pins_arduino.h b/variants/phoenix_v2/pins_arduino.h
index f5b61a49b0..611bb2f3e7 100644
--- a/variants/phoenix_v2/pins_arduino.h
+++ b/variants/phoenix_v2/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define PHOENIX_VERSION   2
 
 #define PIN_WIRE_SDA (4)
@@ -38,4 +36,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 
 #define LED_BUILTIN 2
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/thing/pins_arduino.h b/variants/thing/pins_arduino.h
index a6e65aa1a1..2cc32755f8 100644
--- a/variants/thing/pins_arduino.h
+++ b/variants/thing/pins_arduino.h
@@ -26,8 +26,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define PIN_WIRE_SDA (2)
 #define PIN_WIRE_SCL (14)
 
@@ -36,4 +34,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 
 #define LED_BUILTIN 5
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/wifinfo/pins_arduino.h b/variants/wifinfo/pins_arduino.h
index 68ae7de63e..c5f7212381 100644
--- a/variants/wifinfo/pins_arduino.h
+++ b/variants/wifinfo/pins_arduino.h
@@ -31,8 +31,6 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
-#include "../generic/common.h"
-
 #define PIN_WIRE_SDA (4)
 #define PIN_WIRE_SCL (5)
 
@@ -53,4 +51,6 @@ static const uint8_t D8   = 15;
 static const uint8_t D9   = 3;
 static const uint8_t D10  = 1;
 
+#include "../generic/common.h"
+
 #endif /* Pins_Arduino_h */
diff --git a/variants/wifio/pins_arduino.h b/variants/wifio/pins_arduino.h
index 55832dff5f..edf98a1185 100644
--- a/variants/wifio/pins_arduino.h
+++ b/variants/wifio/pins_arduino.h
@@ -84,4 +84,11 @@ static const uint8_t E16 = ESP_PINS_OFFSET + 16;
 #define SERIAL_PORT_HARDWARE       Serial
 #define SERIAL_PORT_HARDWARE_OPEN  Serial
 
+#ifdef LED_BUILTIN
+#ifdef __cplusplus
+extern "C"
+#endif
+const int BUILTIN_LED __attribute__((deprecated, weak)) = LED_BUILTIN;
+#endif
+
 #endif /* Pins_Arduino_h */