44 files changed, 0 insertions, 84 deletions

diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index 408b17404d6d..f13c229dd5a1 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -103,7 +103,6 @@
 
 #ifdef __FreeBSD__
 #include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
 #include <machine/i4b_debug.h>
 #else
 #include <i4b/i4b_ioctl.h>
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index 8daf30d5ce6b..1652b20a93a9 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -94,7 +94,6 @@
 
 /* minor number: lower 6 bits = unit number */
 
-#include <i4b/layer4/i4b_l4.h>
 
 #define UNITBITS	6
 #define UNITMASK	0x3f
diff --git a/sys/i4b/layer1/i4b_l1lib.c b/sys/i4b/layer1/i4b_l1lib.c
index 6e2791e8b9f1..d2e69e48bf94 100644
--- a/sys/i4b/layer1/i4b_l1lib.c
+++ b/sys/i4b/layer1/i4b_l1lib.c
@@ -39,7 +39,6 @@
 #include <sys/systm.h>
 
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_trace.h>
 
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
index e89a4aee8df0..168506daba10 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
@@ -47,7 +47,6 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-#include <machine/stdarg.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
index 5ec686bd8661..3d417a35fb95 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
@@ -45,7 +45,6 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-#include <machine/stdarg.h>
 
 #include <net/if.h>
 
@@ -55,7 +54,6 @@
 
 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_isac.h>
-#include <i4b/layer1/isic/i4b_hscx.h>
 
 #include <i4b/layer1/ifpi/i4b_ifpi_ext.h>
 
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
index 514157ec2348..274ab9896906 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
@@ -45,7 +45,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/stdarg.h>
 
 #include <net/if.h>
 
@@ -54,8 +53,6 @@
 #include <machine/i4b_trace.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
-#include <i4b/layer1/isic/i4b_hscx.h>
 
 #include <i4b/layer1/i4b_l1.h>
 
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
index 15884a04f394..a59e07df2164 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -52,9 +52,7 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 
-#include <machine/bus_pio.h> /* this device uses port accesses only */
 #include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
index fac02b17dba4..401a19dfbfb7 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
@@ -52,9 +52,7 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 
-#include <machine/bus_pio.h> 
 #include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
index 8ae893ae7c04..83fe1bf7ef58 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
@@ -47,7 +47,6 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-#include <machine/stdarg.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
index 2e1e4777d9aa..f2b4ad228397 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
@@ -45,7 +45,6 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-#include <machine/stdarg.h>
 
 #include <net/if.h>
 
@@ -55,7 +54,6 @@
 
 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_isac.h>
-#include <i4b/layer1/isic/i4b_hscx.h>
 
 #include <i4b/layer1/ifpnp/i4b_ifpnp_ext.h>
 
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
index 88c124f04ae1..26b154031b5e 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
@@ -45,7 +45,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/stdarg.h>
 
 #include <net/if.h>
 
@@ -54,8 +53,6 @@
 #include <machine/i4b_trace.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
-#include <i4b/layer1/isic/i4b_hscx.h>
 
 #include <i4b/layer1/i4b_l1.h>
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
index 3fb4dafda082..814a40afaa16 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
@@ -62,7 +62,6 @@
 #include <i4b/layer1/ihfc/i4b_ihfc_drv.h>
 
 #include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/rman.h>
 
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
index 69343fa60c13..5b9e6cf1bf37 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
@@ -50,7 +50,6 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-#include <machine/stdarg.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
index 4c09c6550fc4..8c6ed231466e 100644
--- a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
+++ b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
@@ -60,13 +60,10 @@
 
 #include <net/if.h>
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_ipac.h>
-#include <i4b/layer1/isic/i4b_isac.h>
-#include <i4b/layer1/isic/i4b_hscx.h>
 
 /* masks for register encoded in base addr */
 
diff --git a/sys/i4b/layer1/isic/i4b_avm_a1.c b/sys/i4b/layer1/isic/i4b_avm_a1.c
index d102783e1e6d..d1ec0e1975f3 100644
--- a/sys/i4b/layer1/isic/i4b_avm_a1.c
+++ b/sys/i4b/layer1/isic/i4b_avm_a1.c
@@ -55,12 +55,10 @@
 #include <net/if.h>
 
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 /*---------------------------------------------------------------------------*
diff --git a/sys/i4b/layer1/isic/i4b_bchan.c b/sys/i4b/layer1/isic/i4b_bchan.c
index d1b92054dbf7..f1db0ea5cef6 100644
--- a/sys/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/i4b/layer1/isic/i4b_bchan.c
@@ -42,7 +42,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <machine/stdarg.h>
 
 
 #include <sys/socket.h>
@@ -55,7 +54,6 @@
 #include <i4b/layer1/i4b_l1.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 #include <i4b/include/i4b_mbuf.h>
diff --git a/sys/i4b/layer1/isic/i4b_ctx_s0P.c b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
index 0d43a330aef3..1ea97cea9574 100644
--- a/sys/i4b/layer1/isic/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
@@ -54,12 +54,10 @@
 
 #include <net/if.h>
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 /*---------------------------------------------------------------------------*
diff --git a/sys/i4b/layer1/isic/i4b_drn_ngo.c b/sys/i4b/layer1/isic/i4b_drn_ngo.c
index 85ff646be5c5..fde16b88c4fe 100644
--- a/sys/i4b/layer1/isic/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/isic/i4b_drn_ngo.c
@@ -47,12 +47,10 @@
 
 #include <net/if.h>
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 /*---------------------------------------------------------------------------*
diff --git a/sys/i4b/layer1/isic/i4b_dynalink.c b/sys/i4b/layer1/isic/i4b_dynalink.c
index 8228152368b5..389342a72288 100644
--- a/sys/i4b/layer1/isic/i4b_dynalink.c
+++ b/sys/i4b/layer1/isic/i4b_dynalink.c
@@ -81,11 +81,9 @@
 
 #include <net/if.h>
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 /* io address mapping */
diff --git a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
index 4903de97a114..caa51af9f3bd 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
@@ -48,11 +48,9 @@
 #include <net/if.h>
 
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 static void i4b_epcc16_clrirq(struct l1_softc *sc);
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
index fcae2bf32be7..12a227a5cc50 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
@@ -46,11 +46,9 @@
 #include <net/if.h>
 
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 static void i4b_eq1i_clrirq(struct l1_softc *sc);
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
index 05b11edc3d27..4923169fb0bc 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
@@ -51,19 +51,15 @@
 
 
 #include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
-#include <i4b/layer1/isic/i4b_hscx.h>
 #include <i4b/layer1/isic/i4b_ipac.h>
 
 #define MEM0_MAPOFF	0
diff --git a/sys/i4b/layer1/isic/i4b_hscx.c b/sys/i4b/layer1/isic/i4b_hscx.c
index 125454e07605..121b8c58c465 100644
--- a/sys/i4b/layer1/isic/i4b_hscx.c
+++ b/sys/i4b/layer1/isic/i4b_hscx.c
@@ -44,7 +44,6 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-#include <machine/stdarg.h>
 
 #include <net/if.h>
 
@@ -53,7 +52,6 @@
 #include <machine/i4b_trace.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 #include <i4b/layer1/i4b_l1.h>
diff --git a/sys/i4b/layer1/isic/i4b_isac.c b/sys/i4b/layer1/isic/i4b_isac.c
index ad6bb91b80c8..1f3a99d91beb 100644
--- a/sys/i4b/layer1/isic/i4b_isac.c
+++ b/sys/i4b/layer1/isic/i4b_isac.c
@@ -46,7 +46,6 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-#include <machine/stdarg.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_isic_isa.c b/sys/i4b/layer1/isic/i4b_isic_isa.c
index 71101dad853b..f5aff0095841 100644
--- a/sys/i4b/layer1/isic/i4b_isic_isa.c
+++ b/sys/i4b/layer1/isic/i4b_isic_isa.c
@@ -47,14 +47,9 @@
 #include <net/if.h>
 
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_ipac.h>
-#include <i4b/layer1/isic/i4b_isac.h>
-#include <i4b/layer1/isic/i4b_hscx.h>
 
 #include <sys/bus.h>
 #include <isa/isavar.h>
diff --git a/sys/i4b/layer1/isic/i4b_itk_ix1.c b/sys/i4b/layer1/isic/i4b_itk_ix1.c
index 9d043c1a286b..baf2e3152826 100644
--- a/sys/i4b/layer1/isic/i4b_itk_ix1.c
+++ b/sys/i4b/layer1/isic/i4b_itk_ix1.c
@@ -74,11 +74,9 @@
 
 #include <net/if.h>
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 
diff --git a/sys/i4b/layer1/isic/i4b_l1.c b/sys/i4b/layer1/isic/i4b_l1.c
index 86e111b8d3bc..c2f07b15a951 100644
--- a/sys/i4b/layer1/isic/i4b_l1.c
+++ b/sys/i4b/layer1/isic/i4b_l1.c
@@ -44,7 +44,6 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-#include <machine/stdarg.h>
 
 #include <net/if.h>
 
@@ -54,7 +53,6 @@
 
 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_isac.h>
-#include <i4b/layer1/isic/i4b_hscx.h>
 
 #include <i4b/layer1/i4b_l1.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_l1fsm.c b/sys/i4b/layer1/isic/i4b_l1fsm.c
index a125bd5cb436..ff72bfc4e75e 100644
--- a/sys/i4b/layer1/isic/i4b_l1fsm.c
+++ b/sys/i4b/layer1/isic/i4b_l1fsm.c
@@ -44,7 +44,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/stdarg.h>
 
 #include <net/if.h>
 
@@ -53,8 +52,6 @@
 #include <machine/i4b_trace.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
-#include <i4b/layer1/isic/i4b_hscx.h>
 
 #include <i4b/layer1/i4b_l1.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_siemens_isurf.c b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
index 21a9757a5b10..12f73791aba4 100644
--- a/sys/i4b/layer1/isic/i4b_siemens_isurf.c
+++ b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
@@ -57,13 +57,10 @@
 
 #include <net/if.h>
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_ipac.h>
-#include <i4b/layer1/isic/i4b_isac.h>
-#include <i4b/layer1/isic/i4b_hscx.h>
 
 /* masks for register encoded in base addr */
 
diff --git a/sys/i4b/layer1/isic/i4b_sws.c b/sys/i4b/layer1/isic/i4b_sws.c
index 95d944f74516..3704b0609023 100644
--- a/sys/i4b/layer1/isic/i4b_sws.c
+++ b/sys/i4b/layer1/isic/i4b_sws.c
@@ -74,11 +74,9 @@
 
 #include <net/if.h>
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 /*---------------------------------------------------------------------------*
diff --git a/sys/i4b/layer1/isic/i4b_tel_s016.c b/sys/i4b/layer1/isic/i4b_tel_s016.c
index 4a658cea285a..66a6e87d4af3 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s016.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s016.c
@@ -58,11 +58,9 @@
 
 #include <net/if.h>
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 #define TELES_S016_MEMSIZE 0x1000
diff --git a/sys/i4b/layer1/isic/i4b_tel_s0163.c b/sys/i4b/layer1/isic/i4b_tel_s0163.c
index 0b1f4d0845e8..8e7418c591bc 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s0163.c
@@ -57,11 +57,9 @@
 
 #include <net/if.h>
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 static u_char intr_no[] = { 1, 1, 0, 2, 4, 6, 1, 1, 1, 0, 8, 10, 12, 1, 1, 14 };
diff --git a/sys/i4b/layer1/isic/i4b_tel_s08.c b/sys/i4b/layer1/isic/i4b_tel_s08.c
index bed99c28fcf0..8991d1dfc0fb 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s08.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s08.c
@@ -58,11 +58,9 @@
 
 #include <net/if.h>
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 #define TELES_S08_MEMSIZE 0x1000
diff --git a/sys/i4b/layer1/isic/i4b_usr_sti.c b/sys/i4b/layer1/isic/i4b_usr_sti.c
index 1885f45c74f6..735d89af9af7 100644
--- a/sys/i4b/layer1/isic/i4b_usr_sti.c
+++ b/sys/i4b/layer1/isic/i4b_usr_sti.c
@@ -49,7 +49,6 @@
 
 #ifdef __FreeBSD__
 #include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 #else
@@ -61,7 +60,6 @@
 #include <net/if.h>
 
 #ifdef __FreeBSD__
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 #else
 #include <i4b/i4b_debug.h>
@@ -69,7 +67,6 @@
 #endif
 
 #include <i4b/layer1/isic/i4b_isic.h>
-#include <i4b/layer1/isic/i4b_isac.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
 
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
index f5004f8a78b7..ee745c3c347d 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
@@ -47,8 +47,6 @@
 #include <net/if.h>
 
 
-#include <machine/bus.h>
-#include <machine/resource.h>
 
 
 #include <machine/i4b_debug.h>
@@ -62,7 +60,6 @@
 
 #include <i4b/layer1/iwic/i4b_iwic.h>
 #include <i4b/layer1/iwic/i4b_iwic_ext.h>
-#include <i4b/layer1/iwic/i4b_w6692.h>
 
 /* jump table for multiplex routines */
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_pci.c b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
index d675891ab23f..0aad926ce1f0 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_pci.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
@@ -56,7 +56,6 @@
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_trace.h>
 
@@ -66,7 +65,6 @@
 #include <i4b/layer1/i4b_l1.h>
 
 #include <i4b/layer1/iwic/i4b_iwic.h>
-#include <i4b/layer1/iwic/i4b_iwic_ext.h>
 #include <i4b/layer1/iwic/i4b_w6692.h>
 
 extern struct i4b_l1mux_func iwic_l1mux_func;
diff --git a/sys/i4b/layer2/i4b_iframe.c b/sys/i4b/layer2/i4b_iframe.c
index da9285bce39a..428052869a61 100644
--- a/sys/i4b/layer2/i4b_iframe.c
+++ b/sys/i4b/layer2/i4b_iframe.c
@@ -55,7 +55,6 @@
 
 #ifdef __FreeBSD__
 #include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
 #include <machine/i4b_trace.h>
 #else
 #include <i4b/i4b_debug.h>
diff --git a/sys/i4b/layer2/i4b_l2.c b/sys/i4b/layer2/i4b_l2.c
index 8d565e028d89..59a09ba2a5e4 100644
--- a/sys/i4b/layer2/i4b_l2.c
+++ b/sys/i4b/layer2/i4b_l2.c
@@ -54,7 +54,6 @@
 
 #ifdef __FreeBSD__
 #include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
 #else
 #include <i4b/i4b_debug.h>
 #include <i4b/i4b_ioctl.h>
diff --git a/sys/i4b/layer2/i4b_l2timer.c b/sys/i4b/layer2/i4b_l2timer.c
index 1192466fad27..4ee335af7f12 100644
--- a/sys/i4b/layer2/i4b_l2timer.c
+++ b/sys/i4b/layer2/i4b_l2timer.c
@@ -54,7 +54,6 @@
 
 #ifdef __FreeBSD__
 #include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
 #else
 #include <i4b/i4b_debug.h>
 #include <i4b/i4b_ioctl.h>
diff --git a/sys/i4b/layer2/i4b_lme.c b/sys/i4b/layer2/i4b_lme.c
index c3c82c39160e..7bc08ab6894a 100644
--- a/sys/i4b/layer2/i4b_lme.c
+++ b/sys/i4b/layer2/i4b_lme.c
@@ -53,7 +53,6 @@
 
 #ifdef __FreeBSD__
 #include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
 #else
 #include <i4b/i4b_debug.h>
 #include <i4b/i4b_ioctl.h>
diff --git a/sys/i4b/layer2/i4b_sframe.c b/sys/i4b/layer2/i4b_sframe.c
index 31da52265761..34697c9540cc 100644
--- a/sys/i4b/layer2/i4b_sframe.c
+++ b/sys/i4b/layer2/i4b_sframe.c
@@ -54,7 +54,6 @@
 
 #ifdef __FreeBSD__
 #include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
 #else
 #include <i4b/i4b_debug.h>
 #include <i4b/i4b_ioctl.h>
diff --git a/sys/i4b/layer2/i4b_tei.c b/sys/i4b/layer2/i4b_tei.c
index 53ed1fe844ae..9beadf5c7525 100644
--- a/sys/i4b/layer2/i4b_tei.c
+++ b/sys/i4b/layer2/i4b_tei.c
@@ -55,7 +55,6 @@
 
 #ifdef __FreeBSD__
 #include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
 #else
 #include <i4b/i4b_debug.h>
 #include <i4b/i4b_ioctl.h>
diff --git a/sys/i4b/layer2/i4b_uframe.c b/sys/i4b/layer2/i4b_uframe.c
index c29eb5e9f430..1a29f279b882 100644
--- a/sys/i4b/layer2/i4b_uframe.c
+++ b/sys/i4b/layer2/i4b_uframe.c
@@ -54,7 +54,6 @@
 
 #ifdef __FreeBSD__
 #include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
 #else
 #include <i4b/i4b_debug.h>
 #include <i4b/i4b_ioctl.h>
diff --git a/sys/i4b/layer2/i4b_util.c b/sys/i4b/layer2/i4b_util.c
index ba94bd0fa449..982760d4161b 100644
--- a/sys/i4b/layer2/i4b_util.c
+++ b/sys/i4b/layer2/i4b_util.c
@@ -54,7 +54,6 @@
 
 #ifdef __FreeBSD__
 #include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
 #else
 #include <i4b/i4b_debug.h>
 #include <i4b/i4b_ioctl.h>