diff --git a/RF24.cpp b/RF24.cpp
index 45623ff..98e0c42 100644
--- a/RF24.cpp
+++ b/RF24.cpp
@@ -6,7 +6,12 @@
  version 2 as published by the Free Software Foundation.
  */
 
+#if ARDUINO < 100
 #include <WProgram.h>
+#else
+#include <Arduino.h>
+#endif
+
 #include <SPI.h>
 #include "nRF24L01.h"
 #include "RF24.h"
diff --git a/examples/led_remote/printf.h b/examples/led_remote/printf.h
index df6c46a..1b853db 100644
--- a/examples/led_remote/printf.h
+++ b/examples/led_remote/printf.h
@@ -16,8 +16,6 @@
 #ifndef __PRINTF_H__
 #define __PRINTF_H__
 
-#include "WProgram.h"
-
 int serial_putc( char c, FILE * ) 
 {
   Serial.write( c );
diff --git a/examples/pingpair/printf.h b/examples/pingpair/printf.h
index df6c46a..1b853db 100644
--- a/examples/pingpair/printf.h
+++ b/examples/pingpair/printf.h
@@ -16,8 +16,6 @@
 #ifndef __PRINTF_H__
 #define __PRINTF_H__
 
-#include "WProgram.h"
-
 int serial_putc( char c, FILE * ) 
 {
   Serial.write( c );
diff --git a/examples/pingpair_dyn/printf.h b/examples/pingpair_dyn/printf.h
index df6c46a..1b853db 100644
--- a/examples/pingpair_dyn/printf.h
+++ b/examples/pingpair_dyn/printf.h
@@ -16,8 +16,6 @@
 #ifndef __PRINTF_H__
 #define __PRINTF_H__
 
-#include "WProgram.h"
-
 int serial_putc( char c, FILE * ) 
 {
   Serial.write( c );
diff --git a/examples/pingpair_irq/printf.h b/examples/pingpair_irq/printf.h
index df6c46a..1b853db 100644
--- a/examples/pingpair_irq/printf.h
+++ b/examples/pingpair_irq/printf.h
@@ -16,8 +16,6 @@
 #ifndef __PRINTF_H__
 #define __PRINTF_H__
 
-#include "WProgram.h"
-
 int serial_putc( char c, FILE * ) 
 {
   Serial.write( c );
diff --git a/examples/pingpair_pl/printf.h b/examples/pingpair_pl/printf.h
index df6c46a..1b853db 100644
--- a/examples/pingpair_pl/printf.h
+++ b/examples/pingpair_pl/printf.h
@@ -16,8 +16,6 @@
 #ifndef __PRINTF_H__
 #define __PRINTF_H__
 
-#include "WProgram.h"
-
 int serial_putc( char c, FILE * ) 
 {
   Serial.write( c );
diff --git a/examples/pingpair_sleepy/printf.h b/examples/pingpair_sleepy/printf.h
index df6c46a..1b853db 100644
--- a/examples/pingpair_sleepy/printf.h
+++ b/examples/pingpair_sleepy/printf.h
@@ -16,8 +16,6 @@
 #ifndef __PRINTF_H__
 #define __PRINTF_H__
 
-#include "WProgram.h"
-
 int serial_putc( char c, FILE * ) 
 {
   Serial.write( c );
diff --git a/examples/scanner/printf.h b/examples/scanner/printf.h
index df6c46a..1b853db 100644
--- a/examples/scanner/printf.h
+++ b/examples/scanner/printf.h
@@ -16,8 +16,6 @@
 #ifndef __PRINTF_H__
 #define __PRINTF_H__
 
-#include "WProgram.h"
-
 int serial_putc( char c, FILE * ) 
 {
   Serial.write( c );
diff --git a/examples/starping/printf.h b/examples/starping/printf.h
index df6c46a..1b853db 100644
--- a/examples/starping/printf.h
+++ b/examples/starping/printf.h
@@ -16,8 +16,6 @@
 #ifndef __PRINTF_H__
 #define __PRINTF_H__
 
-#include "WProgram.h"
-
 int serial_putc( char c, FILE * ) 
 {
   Serial.write( c );