diff --git a/libraries/SPI/src/SPI.h b/libraries/SPI/src/SPI.h
index e38fb3ec3867f59ab1acca2c5836216d9a78e215..e232e1628e4798b69d58c52359d96f682d7380ca 100644
--- a/libraries/SPI/src/SPI.h
+++ b/libraries/SPI/src/SPI.h
@@ -22,6 +22,7 @@
 #define _SPI_H_INCLUDED
 
 #include <stdlib.h>
+#include "pins_arduino.h"
 #include "esp32-hal-spi.h"
 
 class SPISettings
diff --git a/variants/esp32/pins_arduino.h b/variants/esp32/pins_arduino.h
index 85452d36dd57ec4caa658f9392c0b52f5fb331bf..d50715e5c912451b198d93d12a6f726e594875c0 100644
--- a/variants/esp32/pins_arduino.h
+++ b/variants/esp32/pins_arduino.h
@@ -1,6 +1,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#include <stdint.h>
+
 #define EXTERNAL_NUM_INTERRUPTS 16
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
diff --git a/variants/esp320/pins_arduino.h b/variants/esp320/pins_arduino.h
index f69cc98b0fe94ba81ac9869bece8e9f3fb8b6619..0c357f519291aa6e86e33f96e85a6c9ae995920d 100644
--- a/variants/esp320/pins_arduino.h
+++ b/variants/esp320/pins_arduino.h
@@ -1,6 +1,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#include <stdint.h>
+
 #define EXTERNAL_NUM_INTERRUPTS 11
 #define NUM_DIGITAL_PINS        12
 #define NUM_ANALOG_INPUTS       5
diff --git a/variants/esp32thing/pins_arduino.h b/variants/esp32thing/pins_arduino.h
index 3da4bf2ba007b4735c1f169db1b3b0183ba94bd0..c035ee26eba90934c31bf62cf057aa4395312a82 100644
--- a/variants/esp32thing/pins_arduino.h
+++ b/variants/esp32thing/pins_arduino.h
@@ -1,6 +1,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#include <stdint.h>
+
 #define EXTERNAL_NUM_INTERRUPTS 16
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h
index 8ce2507d6272938ce7fdf90b69aea33bef742d3e..5e7293563406cc7f1e8b50b5ae410e0d5d1e7a05 100644
--- a/variants/espea32/pins_arduino.h
+++ b/variants/espea32/pins_arduino.h
@@ -1,6 +1,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#include <stdint.h>
+
 #define EXTERNAL_NUM_INTERRUPTS 16
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
diff --git a/variants/firebeetle32/pins_arduino.h b/variants/firebeetle32/pins_arduino.h
index e5cc7f092664f6daa7fd401c4a3e1dcaae8bb99f..7fd3583e18d0f60f18e4a73ccb2dc21d79db000d 100644
--- a/variants/firebeetle32/pins_arduino.h
+++ b/variants/firebeetle32/pins_arduino.h
@@ -1,6 +1,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#include <stdint.h>
+
 #define EXTERNAL_NUM_INTERRUPTS 16
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
diff --git a/variants/hornbill32dev/pins_arduino.h b/variants/hornbill32dev/pins_arduino.h
index ef1005755944cc61c20541bd1753a77ce187463d..3a991e3f2f1582eb7e2e5e949e5ee8e0c6b92255 100644
--- a/variants/hornbill32dev/pins_arduino.h
+++ b/variants/hornbill32dev/pins_arduino.h
@@ -1,6 +1,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#include <stdint.h>
+
 #define EXTERNAL_NUM_INTERRUPTS 16
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
diff --git a/variants/hornbill32minima/pins_arduino.h b/variants/hornbill32minima/pins_arduino.h
index 169ee04b34395d30151499a8a96d214d9697b341..d18c4dacd5844d5caf7f46309f088d8a49423ba6 100644
--- a/variants/hornbill32minima/pins_arduino.h
+++ b/variants/hornbill32minima/pins_arduino.h
@@ -1,6 +1,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#include <stdint.h>
+
 #define EXTERNAL_NUM_INTERRUPTS 16
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
diff --git a/variants/lolin32/pins_arduino.h b/variants/lolin32/pins_arduino.h
index e341357b0c56e26196061712a619681f338439a1..3bb26f1e94c85984f19262f41d62b1901eb352d0 100644
--- a/variants/lolin32/pins_arduino.h
+++ b/variants/lolin32/pins_arduino.h
@@ -1,6 +1,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#include <stdint.h>
+
 #define EXTERNAL_NUM_INTERRUPTS 16
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
diff --git a/variants/nano32/pins_arduino.h b/variants/nano32/pins_arduino.h
index e50bd30d988097db010833cddb7ec9623fd868da..4d65b6b40e72aeb2709020942141c22f3c906734 100644
--- a/variants/nano32/pins_arduino.h
+++ b/variants/nano32/pins_arduino.h
@@ -1,6 +1,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#include <stdint.h>
+
 #define EXTERNAL_NUM_INTERRUPTS 16
 #define NUM_DIGITAL_PINS        38
 #define NUM_ANALOG_INPUTS       16
diff --git a/variants/node32s/pins_arduino.h b/variants/node32s/pins_arduino.h
index e341357b0c56e26196061712a619681f338439a1..3bb26f1e94c85984f19262f41d62b1901eb352d0 100644
--- a/variants/node32s/pins_arduino.h
+++ b/variants/node32s/pins_arduino.h
@@ -1,6 +1,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#include <stdint.h>
+
 #define EXTERNAL_NUM_INTERRUPTS 16
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16
diff --git a/variants/quantum/pins_arduino.h b/variants/quantum/pins_arduino.h
index 85452d36dd57ec4caa658f9392c0b52f5fb331bf..d50715e5c912451b198d93d12a6f726e594875c0 100644
--- a/variants/quantum/pins_arduino.h
+++ b/variants/quantum/pins_arduino.h
@@ -1,6 +1,8 @@
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 
+#include <stdint.h>
+
 #define EXTERNAL_NUM_INTERRUPTS 16
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16