diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index 7c762974eca..6c2b6271416 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -38,30 +38,15 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/sockio.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
 #include <sys/eventhandler.h>
 #include <machine/clock.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
 #include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <net/netisr.h>
-#include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
 #include <netatm/atm.h>
@@ -69,9 +54,6 @@
 #include <netatm/atm_sap.h>
 #include <netatm/atm_cm.h>
 #include <netatm/atm_if.h>
-#include <netatm/atm_vc.h>
-#include <netatm/atm_ioctl.h>
-#include <netatm/atm_sigmgr.h>
 #include <netatm/atm_stack.h>
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
diff --git a/sys/dev/hea/eni_buffer.c b/sys/dev/hea/eni_buffer.c
index a6e4964e7ea..d080e003706 100644
--- a/sys/dev/hea/eni_buffer.c
+++ b/sys/dev/hea/eni_buffer.c
@@ -38,30 +38,11 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
-#include <sys/errno.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/sockio.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/syslog.h>
-#include <sys/eventhandler.h>
-#include <machine/clock.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
 #include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <net/netisr.h>
-#include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
 #include <netatm/atm.h>
@@ -69,12 +50,8 @@
 #include <netatm/atm_sap.h>
 #include <netatm/atm_cm.h>
 #include <netatm/atm_if.h>
-#include <netatm/atm_vc.h>
-#include <netatm/atm_ioctl.h>
-#include <netatm/atm_sigmgr.h>
 #include <netatm/atm_stack.h>
 #include <netatm/atm_pcb.h>
-#include <netatm/atm_var.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
diff --git a/sys/dev/hea/eni_globals.c b/sys/dev/hea/eni_globals.c
index baefde502be..c09cef18318 100644
--- a/sys/dev/hea/eni_globals.c
+++ b/sys/dev/hea/eni_globals.c
@@ -38,30 +38,11 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/sockio.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/syslog.h>
-#include <sys/eventhandler.h>
-#include <machine/clock.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
 #include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <net/netisr.h>
-#include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
 #include <netatm/atm.h>
@@ -69,9 +50,6 @@
 #include <netatm/atm_sap.h>
 #include <netatm/atm_cm.h>
 #include <netatm/atm_if.h>
-#include <netatm/atm_vc.h>
-#include <netatm/atm_ioctl.h>
-#include <netatm/atm_sigmgr.h>
 #include <netatm/atm_stack.h>
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c
index 887c019f33d..125359583b0 100644
--- a/sys/dev/hea/eni_if.c
+++ b/sys/dev/hea/eni_if.c
@@ -39,29 +39,12 @@
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/sockio.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/syslog.h>
-#include <sys/eventhandler.h>
 #include <machine/clock.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
 #include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <net/netisr.h>
-#include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
 #include <netatm/atm.h>
@@ -69,9 +52,7 @@
 #include <netatm/atm_sap.h>
 #include <netatm/atm_cm.h>
 #include <netatm/atm_if.h>
-#include <netatm/atm_vc.h>
 #include <netatm/atm_ioctl.h>
-#include <netatm/atm_sigmgr.h>
 #include <netatm/atm_stack.h>
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
diff --git a/sys/dev/hea/eni_init.c b/sys/dev/hea/eni_init.c
index 4879bb25f86..9b76598702e 100644
--- a/sys/dev/hea/eni_init.c
+++ b/sys/dev/hea/eni_init.c
@@ -39,29 +39,10 @@
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/sockio.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/syslog.h>
-#include <sys/eventhandler.h>
-#include <machine/clock.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
 #include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <net/netisr.h>
-#include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
 #include <netatm/atm.h>
@@ -69,12 +50,8 @@
 #include <netatm/atm_sap.h>
 #include <netatm/atm_cm.h>
 #include <netatm/atm_if.h>
-#include <netatm/atm_vc.h>
-#include <netatm/atm_ioctl.h>
-#include <netatm/atm_sigmgr.h>
 #include <netatm/atm_stack.h>
 #include <netatm/atm_pcb.h>
-#include <netatm/atm_var.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c
index 5d57140a70d..83983c00115 100644
--- a/sys/dev/hea/eni_intr.c
+++ b/sys/dev/hea/eni_intr.c
@@ -38,30 +38,11 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/sockio.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <sys/eventhandler.h>
-#include <machine/clock.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
 #include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <net/netisr.h>
-#include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
 #include <netatm/atm.h>
@@ -69,12 +50,8 @@
 #include <netatm/atm_sap.h>
 #include <netatm/atm_cm.h>
 #include <netatm/atm_if.h>
-#include <netatm/atm_vc.h>
-#include <netatm/atm_ioctl.h>
-#include <netatm/atm_sigmgr.h>
 #include <netatm/atm_stack.h>
 #include <netatm/atm_pcb.h>
-#include <netatm/atm_var.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c
index 6c8962bc17a..fd4eb983f7c 100644
--- a/sys/dev/hea/eni_receive.c
+++ b/sys/dev/hea/eni_receive.c
@@ -38,30 +38,12 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/sockio.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/syslog.h>
-#include <sys/eventhandler.h>
-#include <machine/clock.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
 #include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
 #include <net/netisr.h>
-#include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
 #include <netatm/atm.h>
@@ -70,8 +52,6 @@
 #include <netatm/atm_cm.h>
 #include <netatm/atm_if.h>
 #include <netatm/atm_vc.h>
-#include <netatm/atm_ioctl.h>
-#include <netatm/atm_sigmgr.h>
 #include <netatm/atm_stack.h>
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
diff --git a/sys/dev/hea/eni_transmit.c b/sys/dev/hea/eni_transmit.c
index 5e91211bfe4..2f6f9450315 100644
--- a/sys/dev/hea/eni_transmit.c
+++ b/sys/dev/hea/eni_transmit.c
@@ -39,30 +39,13 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/sockio.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/syslog.h>
-#include <sys/eventhandler.h>
-#include <machine/clock.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <net/netisr.h>
-#include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
 #include <netatm/atm.h>
@@ -71,8 +54,6 @@
 #include <netatm/atm_cm.h>
 #include <netatm/atm_if.h>
 #include <netatm/atm_vc.h>
-#include <netatm/atm_ioctl.h>
-#include <netatm/atm_sigmgr.h>
 #include <netatm/atm_stack.h>
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
diff --git a/sys/dev/hea/eni_vcm.c b/sys/dev/hea/eni_vcm.c
index 3331ef5b595..377d3a0dbf4 100644
--- a/sys/dev/hea/eni_vcm.c
+++ b/sys/dev/hea/eni_vcm.c
@@ -40,29 +40,11 @@
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/sockio.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/syslog.h>
-#include <sys/eventhandler.h>
 #include <machine/clock.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
 #include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <net/netisr.h>
-#include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
 #include <netatm/atm.h>
@@ -71,11 +53,8 @@
 #include <netatm/atm_cm.h>
 #include <netatm/atm_if.h>
 #include <netatm/atm_vc.h>
-#include <netatm/atm_ioctl.h>
-#include <netatm/atm_sigmgr.h>
 #include <netatm/atm_stack.h>
 #include <netatm/atm_pcb.h>
-#include <netatm/atm_var.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>