diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h
index d21089cc3fe..9048249a873 100644
--- a/cores/esp32/Arduino.h
+++ b/cores/esp32/Arduino.h
@@ -41,7 +41,6 @@
 #include "extra_attr.h"
 
 #include "pins_arduino.h"
-#include "io_pin_remap.h"
 #include "esp32-hal.h"
 
 #define PI         3.1415926535897932384626433832795
@@ -251,4 +250,8 @@ void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
 void noTone(uint8_t _pin);
 
 #endif /* __cplusplus */
+
+// must be applied last as it overrides some of the above
+#include "io_pin_remap.h"
+
 #endif /* _ESP32_CORE_ARDUINO_H_ */