diff --git a/EtherShield.cpp b/EtherShield.cpp
index 227c0fe..c5ada98 100644
--- a/EtherShield.cpp
+++ b/EtherShield.cpp
@@ -1,11 +1,18 @@
 // a wrapper class for EtherShield
 
+#if (ARDUINO >= 100)
+#include <Arduino.h>
+#endif
+
 extern "C" {
 	#include "ip_config.h"
 	#include "enc28j60.h"
 	#include "ip_arp_udp_tcp.h"
 	#include "websrv_help_functions.h"
+	#if (ARDUINO >= 100)
+#else
 	#include "wiring.h"
+#endif
 #ifdef DNS_client
 	#include "dnslkup.h"
 #endif
diff --git a/enc28j60.c b/enc28j60.c
index d0a209a..362060d 100644
--- a/enc28j60.c
+++ b/enc28j60.c
@@ -14,12 +14,16 @@
  *********************************************/
 // Updated 16/06/2010 ADL Added configurable CS, 16 bit writes and reads.
 
+#include "enc28j60.h"
 #include <avr/io.h>
 #include <inttypes.h>
 #include <avr/interrupt.h>
+#if (ARDUINO >= 100)
+#include <Arduino.h>
+#else
+#include <WProgram.h>
+#endif
 
-#include "enc28j60.h"
-#include "WConstants.h"  //all things wiring / arduino
 
 static uint8_t Enc28j60Bank;
 static uint16_t gNextPacketPtr;