diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h
index c7291dada..4c78bd66c 100644
--- a/cores/esp8266/Arduino.h
+++ b/cores/esp8266/Arduino.h
@@ -142,44 +142,8 @@ void loop(void);
 
 #define NOT_A_PIN 0
 #define NOT_A_PORT 0
-
 #define NOT_AN_INTERRUPT -1
 
-#ifdef ARDUINO_MAIN
-#define PA 1
-#define PB 2
-#define PC 3
-#define PD 4
-#define PE 5
-#define PF 6
-#define PG 7
-#define PH 8
-#define PJ 10
-#define PK 11
-#define PL 12
-#endif
-
-#define NOT_ON_TIMER 0
-#define TIMER0A 1
-#define TIMER0B 2
-#define TIMER1A 3
-#define TIMER1B 4
-#define TIMER1C 5
-#define TIMER2  6
-#define TIMER2A 7
-#define TIMER2B 8
-
-#define TIMER3A 9
-#define TIMER3B 10
-#define TIMER3C 11
-#define TIMER4A 12
-#define TIMER4B 13
-#define TIMER4C 14
-#define TIMER4D 15
-#define TIMER5A 16
-#define TIMER5B 17
-#define TIMER5C 18
-
 #ifdef __cplusplus
 } // extern "C"
 #endif
diff --git a/cores/esp8266/HardwareSerial.h b/cores/esp8266/HardwareSerial.h
index c1672ead2..5a5e5190c 100644
--- a/cores/esp8266/HardwareSerial.h
+++ b/cores/esp8266/HardwareSerial.h
@@ -68,12 +68,12 @@ public:
     void begin(unsigned long baud) { begin(baud, 0); }
     void begin(unsigned long, uint8_t);
     void end();
-    virtual int available(void);
-    virtual int peek(void);
-    virtual int read(void);
+    int available(void) override;
+    int peek(void) override;
+    int read(void) override;
     int availableForWrite(void);
-    virtual void flush(void);
-    virtual size_t write(uint8_t);
+    void flush(void) override;
+    size_t write(uint8_t) override;
     inline size_t write(unsigned long n) { return write((uint8_t)n); }
     inline size_t write(long n) { return write((uint8_t)n); }
     inline size_t write(unsigned int n) { return write((uint8_t)n); }
diff --git a/cores/esp8266/Print.h b/cores/esp8266/Print.h
index 23db89cba..21ff6276d 100644
--- a/cores/esp8266/Print.h
+++ b/cores/esp8266/Print.h
@@ -20,8 +20,8 @@
 #ifndef Print_h
 #define Print_h
 
-#include <inttypes.h>
-#include <stdio.h> // for size_t
+#include <stdint.h>
+#include <stddef.h>
 
 #include "WString.h"
 #include "Printable.h"
diff --git a/cores/esp8266/WMath.cpp b/cores/esp8266/WMath.cpp
index ea10726fb..e9fb1dc2b 100644
--- a/cores/esp8266/WMath.cpp
+++ b/cores/esp8266/WMath.cpp
@@ -57,4 +57,4 @@ long map(long x, long in_min, long in_max, long out_min, long out_max)
 }
 
 unsigned int makeWord(unsigned int w) { return w; }
-unsigned int makeWord(unsigned char h, unsigned char l) { return (h << 8) | l; }
\ No newline at end of file
+unsigned int makeWord(unsigned char h, unsigned char l) { return (h << 8) | l; }
diff --git a/cores/esp8266/core_esp8266_wiring_interrupts.c b/cores/esp8266/core_esp8266_wiring_interrupts.c
deleted file mode 100644
index 12dbc60b4..000000000
--- a/cores/esp8266/core_esp8266_wiring_interrupts.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-  Part of the Wiring project - http://wiring.uniandes.edu.co
-
-  Copyright (c) 2004-05 Hernando Barragan
-
-  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., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-  
-  Modified 24 November 2006 by David A. Mellis
-  Modified 1 August 2010 by Mark Sproul
-*/
-
-#include <stdint.h>
-#include <stdio.h>
-
-#include "wiring_private.h"
-
-
-
diff --git a/cores/esp8266/wiring_private.h b/cores/esp8266/wiring_private.h
index a2b9a68d6..92104294d 100644
--- a/cores/esp8266/wiring_private.h
+++ b/cores/esp8266/wiring_private.h
@@ -34,17 +34,6 @@
 extern "C"{
 #endif
 
-#define EXTERNAL_INT_0 0
-#define EXTERNAL_INT_1 1
-#define EXTERNAL_INT_2 2
-#define EXTERNAL_INT_3 3
-#define EXTERNAL_INT_4 4
-#define EXTERNAL_INT_5 5
-#define EXTERNAL_INT_6 6
-#define EXTERNAL_INT_7 7
-
-#define EXTERNAL_NUM_INTERRUPTS 2
-
 typedef void (*voidFuncPtr)(void);
 
 void initPins();
diff --git a/libraries/EEPROM/EEPROM.cpp b/libraries/EEPROM/EEPROM.cpp
index 29873ea76..b2a0fe70b 100644
--- a/libraries/EEPROM/EEPROM.cpp
+++ b/libraries/EEPROM/EEPROM.cpp
@@ -17,11 +17,6 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-/******************************************************************************
- * Includes
- ******************************************************************************/
-
-
 #include "Arduino.h"
 #include "EEPROM.h"