diff --git a/devices/e1000/e1000-3.6-ethercat.h b/devices/e1000/e1000-3.6-ethercat.h
index 881520e6..6cb8da9c 100644
--- a/devices/e1000/e1000-3.6-ethercat.h
+++ b/devices/e1000/e1000-3.6-ethercat.h
@@ -81,7 +81,7 @@
 
 struct e1000_adapter;
 
-#include "e1000_hw-3.4-ethercat.h"
+#include "e1000_hw-3.6-ethercat.h"
 
 #define E1000_MAX_INTR 10
 
diff --git a/devices/e1000/e1000_ethtool-2.6.28-ethercat.c b/devices/e1000/e1000_ethtool-2.6.28-ethercat.c
index 49265960..a9ff5c32 100644
--- a/devices/e1000/e1000_ethtool-2.6.28-ethercat.c
+++ b/devices/e1000/e1000_ethtool-2.6.28-ethercat.c
@@ -28,7 +28,7 @@
 
 /* ethtool support for e1000 */
 
-#include "e1000-2.6.27-ethercat.h"
+#include "e1000-2.6.28-ethercat.h"
 #include <asm/uaccess.h>
 
 struct e1000_stats {
diff --git a/devices/e1000/e1000_ethtool-3.6-ethercat.c b/devices/e1000/e1000_ethtool-3.6-ethercat.c
index 53d0bb84..8059c0eb 100644
--- a/devices/e1000/e1000_ethtool-3.6-ethercat.c
+++ b/devices/e1000/e1000_ethtool-3.6-ethercat.c
@@ -28,7 +28,7 @@
 
 /* ethtool support for e1000 */
 
-#include "e1000-3.4-ethercat.h"
+#include "e1000-3.6-ethercat.h"
 #include <asm/uaccess.h>
 
 enum {NETDEV_STATS, E1000_STATS};
diff --git a/devices/e1000/e1000_hw-2.6.28-ethercat.c b/devices/e1000/e1000_hw-2.6.28-ethercat.c
index 3f38c16c..5a67b6ff 100644
--- a/devices/e1000/e1000_hw-2.6.28-ethercat.c
+++ b/devices/e1000/e1000_hw-2.6.28-ethercat.c
@@ -31,7 +31,7 @@
  */
 
 
-#include "e1000_hw-2.6.27-ethercat.h"
+#include "e1000_hw-2.6.28-ethercat.h"
 
 static s32 e1000_swfw_sync_acquire(struct e1000_hw *hw, u16 mask);
 static void e1000_swfw_sync_release(struct e1000_hw *hw, u16 mask);
diff --git a/devices/e1000/e1000_hw-3.6-ethercat.c b/devices/e1000/e1000_hw-3.6-ethercat.c
index 715d8dd8..bc164779 100644
--- a/devices/e1000/e1000_hw-3.6-ethercat.c
+++ b/devices/e1000/e1000_hw-3.6-ethercat.c
@@ -30,7 +30,7 @@
  * Shared functions for accessing and configuring the MAC
  */
 
-#include "e1000-3.4-ethercat.h"
+#include "e1000-3.6-ethercat.h"
 
 static s32 e1000_check_downshift(struct e1000_hw *hw);
 static s32 e1000_check_polarity(struct e1000_hw *hw,
diff --git a/devices/e1000/e1000_hw-3.6-ethercat.h b/devices/e1000/e1000_hw-3.6-ethercat.h
index f7cd0f38..aa0473bb 100644
--- a/devices/e1000/e1000_hw-3.6-ethercat.h
+++ b/devices/e1000/e1000_hw-3.6-ethercat.h
@@ -33,7 +33,7 @@
 #ifndef _E1000_HW_H_
 #define _E1000_HW_H_
 
-#include "e1000_osdep-3.4-ethercat.h"
+#include "e1000_osdep-3.6-ethercat.h"
 
 
 /* Forward declarations of structures used by the shared code */
diff --git a/devices/e1000/e1000_main-2.6.28-ethercat.c b/devices/e1000/e1000_main-2.6.28-ethercat.c
index a2012e12..904e6685 100644
--- a/devices/e1000/e1000_main-2.6.28-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.28-ethercat.c
@@ -28,7 +28,7 @@
 
 *******************************************************************************/
 
-#include "e1000-2.6.27-ethercat.h"
+#include "e1000-2.6.28-ethercat.h"
 #include <net/ip6_checksum.h>
 
 char e1000_driver_name[] = "ec_e1000";
diff --git a/devices/e1000/e1000_main-3.6-ethercat.c b/devices/e1000/e1000_main-3.6-ethercat.c
index e14a2573..95cb1914 100644
--- a/devices/e1000/e1000_main-3.6-ethercat.c
+++ b/devices/e1000/e1000_main-3.6-ethercat.c
@@ -28,7 +28,7 @@
 
 *******************************************************************************/
 
-#include "e1000-3.4-ethercat.h"
+#include "e1000-3.6-ethercat.h"
 #include <net/ip6_checksum.h>
 #include <linux/io.h>
 #include <linux/prefetch.h>
diff --git a/devices/e1000/e1000_param-2.6.27-orig.c b/devices/e1000/e1000_param-2.6.27-orig.c
index 3eb1a249..213437d1 100644
--- a/devices/e1000/e1000_param-2.6.27-orig.c
+++ b/devices/e1000/e1000_param-2.6.27-orig.c
@@ -26,7 +26,7 @@
 
 *******************************************************************************/
 
-#include "e1000-2.6.27-ethercat.h"
+#include "e1000.h"
 
 /* This is the only thing that needs to be changed to adjust the
  * maximum number of ports that the driver can manage.
diff --git a/devices/e1000/e1000_param-3.6-ethercat.c b/devices/e1000/e1000_param-3.6-ethercat.c
index 709752b1..66d7b611 100644
--- a/devices/e1000/e1000_param-3.6-ethercat.c
+++ b/devices/e1000/e1000_param-3.6-ethercat.c
@@ -26,7 +26,7 @@
 
 *******************************************************************************/
 
-#include "e1000-3.4-ethercat.h"
+#include "e1000-3.6-ethercat.h"
 
 /* This is the only thing that needs to be changed to adjust the
  * maximum number of ports that the driver can manage.