diff --git a/libraries/Servo/arch/avr/Servo.cpp b/libraries/Servo/arch/avr/Servo.cpp
index e4801b97e..9474cf98a 100644
--- a/libraries/Servo/arch/avr/Servo.cpp
+++ b/libraries/Servo/arch/avr/Servo.cpp
@@ -20,7 +20,8 @@
 #include <avr/interrupt.h>
 #include <Arduino.h> 
 
-#include "Servo.h"
+#include <Servo.h>
+#include "ServoTimers.h"
 
 #define usToTicks(_us)    (( clockCyclesPerMicrosecond()* _us) / 8)     // converts microseconds to tick (assumes prescale of 8)  // 12 Aug 2009
 #define ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds
diff --git a/libraries/Servo/arch/sam/Servo.cpp b/libraries/Servo/arch/sam/Servo.cpp
index dec911019..78c404079 100644
--- a/libraries/Servo/arch/sam/Servo.cpp
+++ b/libraries/Servo/arch/sam/Servo.cpp
@@ -19,6 +19,7 @@
 
 #include <Arduino.h> 
 #include <Servo.h>
+#include "ServoTimers.h"
 
 #define usToTicks(_us)    (( clockCyclesPerMicrosecond() * _us) / 32)     // converts microseconds to tick
 #define ticksToUs(_ticks) (( (unsigned)_ticks * 32)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds
diff --git a/libraries/Servo/src/Servo.h b/libraries/Servo/src/Servo.h
index 10e79a87e..48948f73d 100644
--- a/libraries/Servo/src/Servo.h
+++ b/libraries/Servo/src/Servo.h
@@ -58,9 +58,6 @@
  * _Nbr_16timers indicates how many 16 bit timers are available.
  */
 
-// Architecture specific include
-#include <ServoTimers.h>
-
 #define Servo_VERSION           2     // software version of this library
 
 #define MIN_PULSE_WIDTH       544     // the shortest pulse sent to a servo