diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h
deleted file mode 100644
index 436a0f03..00000000
--- a/cores/esp32/Arduino.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- Arduino.h - Main include file for the Arduino SDK
- Copyright (c) 2005-2013 Arduino Team.  All right reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef Arduino_h
-#define Arduino_h
-
-//#include <stdbool.h>
-//#include <stdint.h>
-//#include <stdarg.h>
-//#include <stddef.h>
-//#include <stdio.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <inttypes.h>
-
-//#include "esp_arduino_version.h"
-//#include "freertos/FreeRTOS.h"
-//#include "freertos/task.h"
-//#include "freertos/semphr.h"
-//#include "esp32-hal.h"
-//#include "esp8266-compat.h"
-//#include "soc/gpio_reg.h"
-
-//#include "stdlib_noniso.h"
-
-//#define PI 3.1415926535897932384626433832795
-//#define HALF_PI 1.5707963267948966192313216916398
-//#define TWO_PI 6.283185307179586476925286766559
-//#define DEG_TO_RAD 0.017453292519943295769236907684886
-//#define RAD_TO_DEG 57.295779513082320876798154814105
-//#define EULER 2.718281828459045235360287471352
-
-//#define SERIAL  0x0
-//#define DISPLAY 0x1
-
-//Interrupt Modes
-//#define RISING    0x01
-//#define FALLING   0x02
-//#define CHANGE    0x03
-//#define ONLOW     0x04
-//#define ONHIGH    0x05
-//#define ONLOW_WE  0x0C
-//#define ONHIGH_WE 0x0D
-
-//#define DEFAULT 1
-//#define EXTERNAL 0
-
-//#ifndef __STRINGIFY
-//#define __STRINGIFY(a) #a
-//#endif
-
-//#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
-//#define radians(deg) ((deg)*DEG_TO_RAD)
-//#define degrees(rad) ((rad)*RAD_TO_DEG)
-//#define sq(x) ((x)*(x))
-
-//#define sei()
-//#define cli()
-//#define interrupts() sei()
-//#define noInterrupts() cli()
-
-//#define lowByte(w) ((uint8_t) ((w) & 0xff))
-//#define highByte(w) ((uint8_t) ((w) >> 8))
-
-//#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
-//#define bitSet(value, bit) ((value) |= (1UL << (bit)))
-//#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
-//#define bitWrite(value, bit, bitvalue) ((bitvalue) ? bitSet(value, bit) : bitClear(value, bit))
-
-//// avr-libc defines _NOP() since 1.6.2
-//#ifndef _NOP
-//#define _NOP() do { __asm__ volatile ("nop"); } while (0)
-//#endif
-
-//#define bit(b) (1UL << (b))
-//#define _BV(b) (1UL << (b))
-
-//#define digitalPinToPort(pin)       (((pin)>31)?1:0)
-//#define digitalPinToBitMask(pin)    (1UL << (((pin)>31)?((pin)-32):(pin)))
-//#define digitalPinToTimer(pin)      (0)
-//#define analogInPinToBit(P)         (P)
-//#define portOutputRegister(port)    ((volatile uint32_t*)((port)?GPIO_OUT1_REG:GPIO_OUT_REG))
-//#define portInputRegister(port)     ((volatile uint32_t*)((port)?GPIO_IN1_REG:GPIO_IN_REG))
-//#define portModeRegister(port)      ((volatile uint32_t*)((port)?GPIO_ENABLE1_REG:GPIO_ENABLE_REG))
-
-//#define NOT_A_PIN -1
-//#define NOT_A_PORT -1
-//#define NOT_AN_INTERRUPT -1
-//#define NOT_ON_TIMER 0
-
-//typedef bool boolean;
-//typedef uint8_t byte;
-//typedef unsigned int word;
-
-//long map(long, long, long, long, long);
-
-//#ifdef __cplusplus
-//extern "C" {
-//#endif
-
-//unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
-//unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout);
-
-//#ifdef __cplusplus
-//}
-
-//#include <algorithm>
-//#include <cmath>
-
-//#include "WCharacter.h"
-
-//using std::abs;
-//using std::isinf;
-//using std::isnan;
-//using std::max;
-//using std::min;
-//using ::round;
-
-//uint16_t makeWord(uint16_t w);
-//uint16_t makeWord(byte h, byte l);
-
-//#define word(...) makeWord(__VA_ARGS__)
-
-//unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
-//unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
-
-//#endif /* __cplusplus */
-
-//#define _min(a,b) ((a)<(b)?(a):(b))
-//#define _max(a,b) ((a)>(b)?(a):(b))
-
-//#include "pins_arduino.h"
-
-#endif /* _ESP32_CORE_ARDUINO_H_ */
diff --git a/cores/esp32/wiring_private.h b/cores/esp32/wiring_private.h
index 2c53565a..35918da3 100644
--- a/cores/esp32/wiring_private.h
+++ b/cores/esp32/wiring_private.h
@@ -28,8 +28,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "Arduino.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/libraries/FS/src/FS.h b/libraries/FS/src/FS.h
index e2c0b213..f9dcd17b 100644
--- a/libraries/FS/src/FS.h
+++ b/libraries/FS/src/FS.h
@@ -22,7 +22,6 @@
 #define FS_H
 
 #include <memory>
-#include <Arduino.h>
 
 namespace fs
 {