diff --git a/.travis.yml b/.travis.yml
index 72060eed7f..b6d99abb52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,6 @@ before_script:
   - cd $TRAVIS_BUILD_DIR
   # ino needs files in src directory
   - ln -s Marlin src
-  # remove Marlin.pde as it confuses ino after it finds Marlin.ino
-  - rm Marlin/Marlin.pde
   - generate_version_header_for_marlin . Marlin/_Version.h
   - cat Marlin/_Version.h
 script:
diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h
index dab2f23768..1164a0e1b7 100644
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@@ -219,11 +219,7 @@
     #define HardwareSerial_h // trick to disable the standard HWserial
   #endif
 
-  #if (ARDUINO >= 100)
-    #include "Arduino.h"
-  #else
-    #include "WProgram.h"
-  #endif
+  #include "Arduino.h"
 
   /**
    * ENDSTOPPULLUPS
diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index 0c3a3ac6d9..f4e353a5d7 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -26,11 +26,7 @@
   #error Your Configuration.h and Configuration_adv.h files are outdated!
 #endif
 
-#if (ARDUINO >= 100)
-  #include "Arduino.h"
-#else
-  #include "WProgram.h"
-#endif
+#include "Arduino.h"
 
 #define BIT(b) (1<<(b))
 #define TEST(n,b) (((n)&BIT(b))!=0)
diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
deleted file mode 100644
index 9eae6d440e..0000000000
--- a/Marlin/Marlin.pde
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-
-/*
-    Reprap firmware based on Sprinter and grbl.
- Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- This firmware is a mashup between Sprinter and grbl.
-  (https://github.com/kliment/Sprinter)
-  (https://github.com/simen/grbl/tree)
-
- It has preliminary support for Matthew Roberts advance algorithm
-    http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
- */
-
-/* All the implementation is done in *.cpp files to get better compatibility with avr-gcc without the Arduino IDE */
-/* Use this file to help the Arduino IDE find which Arduino libraries are needed and to keep documentation on GCode */
-
-#include "Configuration.h"
-#include "pins.h"
-
-#ifdef ULTRA_LCD
-  #if defined(LCD_I2C_TYPE_PCF8575)
-    #include <Wire.h>
-    #include <LiquidCrystal_I2C.h>
-  #elif defined(LCD_I2C_TYPE_MCP23017) || defined(LCD_I2C_TYPE_MCP23008)
-    #include <Wire.h>
-    #include <LiquidTWI2.h>
-  #elif defined(DOGLCD)
-    #include <U8glib.h> // library for graphics LCD by Oli Kraus (https://code.google.com/p/u8glib/)
-  #else
-    #include <LiquidCrystal.h> // library for character LCD
-  #endif
-#endif
-
-#if HAS_DIGIPOTSS
-  #include <SPI.h>
-#endif
-
-#if defined(DIGIPOT_I2C)
-  #include <Wire.h>
-#endif
diff --git a/Marlin/blinkm.h b/Marlin/blinkm.h
index 08169e589c..df11c9931d 100644
--- a/Marlin/blinkm.h
+++ b/Marlin/blinkm.h
@@ -2,12 +2,8 @@
   blinkm.h
   Library header file for BlinkM library
  */
-#if ARDUINO >= 100
-  #include "Arduino.h"
-#else
-  #include "WProgram.h"
-#endif
 
+#include "Arduino.h"
 #include "Wire.h"
 
 void SendColors(byte red, byte grn, byte blu);