20 files changed, 15 insertions, 123 deletions

diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index d867751082bf5..c5683f9d3814e 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.46 1997/03/23 03:34:44 bde Exp $
+ *	$Id: cy.c,v 1.47 1997/03/24 11:23:42 bde Exp $
  */
 
 #include "cy.h"
@@ -70,13 +70,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/reboot.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
-#include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index d867751082bf5..c5683f9d3814e 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.46 1997/03/23 03:34:44 bde Exp $
+ *	$Id: cy.c,v 1.47 1997/03/24 11:23:42 bde Exp $
  */
 
 #include "cy.h"
@@ -70,13 +70,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/reboot.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
-#include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 8adf4e6d3db1c..eafc297d17d48 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.115 1997/02/22 09:36:20 peter Exp $
+ *	$Id: if_ed.c,v 1.116 1997/03/24 11:32:39 bde Exp $
  */
 
 /*
@@ -43,7 +43,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/errno.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
@@ -52,21 +51,12 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_mib.h>
-#include <net/if_types.h>
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif
 
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
@@ -74,7 +64,6 @@
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
-#include <net/bpfdesc.h>
 #endif
 
 #include <machine/clock.h>
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index bba5ca56d4aed..f1af4889e8b18 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.57 1997/02/22 09:36:25 peter Exp $
+ *  $Id: if_ep.c,v 1.58 1997/03/24 11:32:45 bde Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -64,27 +64,19 @@
 #include <sys/param.h>
 #if defined(__FreeBSD__)
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/conf.h>
 #endif
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
 #if defined(__NetBSD__)
 #include <sys/select.h>
 #endif
 
 #include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif
 
@@ -100,7 +92,6 @@
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
-#include <net/bpfdesc.h>
 #endif
 
 #if defined(__FreeBSD__)
@@ -155,7 +146,6 @@ struct isa_driver epdriver = {
 #include "crd.h"
 
 #if NCRD > 0
-#include "apm.h"
 #include <sys/select.h>
 #include <pccard/card.h>
 #include <pccard/driver.h>
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index ecd942c3e5d55..725ece6cfa4c6 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -39,23 +39,15 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/conf.h>
-#include <sys/errno.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/syslog.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif
 
@@ -71,7 +63,6 @@
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
-#include <net/bpfdesc.h>
 #endif
 
 #include <machine/clock.h>
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 562fcbea2d8b8..4754895105701 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.98 1997/03/23 03:34:47 bde Exp $
+ *	$Id: fd.c,v 1.99 1997/03/24 11:23:43 bde Exp $
  *
  */
 
@@ -64,7 +64,6 @@
 #include <machine/ioctl_fd.h>
 #include <sys/disklabel.h>
 #include <sys/buf.h>
-#include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/syslog.h>
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 4d6d344d96559..b53bfe7fa4efa 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.27 1997/02/22 09:36:27 peter Exp $
+ * $Id: if_fe.c,v 1.28 1997/03/24 11:32:49 bde Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -70,7 +70,6 @@
  *  o   To test IPX codes.
  */
 
-#include "isa.h"
 #include "fe.h"
 #include "crd.h"
 #include "bpfilter.h"
@@ -80,7 +79,6 @@
 
 #include <sys/conf.h>
 
-#include <sys/errno.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
@@ -88,13 +86,9 @@
 
 #include <net/if.h>
 #include <net/if_dl.h>
-#include <net/if_types.h>
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif
 
@@ -118,12 +112,10 @@
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
-#include <net/bpfdesc.h>
 #endif
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/icu.h>
 
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 1ddc30c6259e2..b2691c8ecb90f 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.42 1997/05/21 18:26:09 gibbs Exp $
+ *	$Id: if_ie.c,v 1.43 1997/06/27 19:36:27 gibbs Exp $
  */
 
 /*
@@ -114,24 +114,18 @@ iomem and and with 0xffff.
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/mbuf.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <sys/errno.h>
 #include <sys/syslog.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
-#include <net/route.h>
 
 #include "bpfilter.h"
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif
 
@@ -156,11 +150,8 @@ iomem and and with 0xffff.
 #include <i386/isa/if_iee16.h>
 #include <i386/isa/elink.h>
 
-#include <vm/vm.h>
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
-#include <net/bpfdesc.h>
 #endif
 
 #ifdef DEBUG
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 9675e79b6bb40..ee500445344ff 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -30,7 +30,6 @@
 
 #if NJOY > 0
 
-#include <sys/errno.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -252,7 +251,6 @@ SYSINIT(joydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,joy_drvinit,NULL)
 
 #include <sys/exec.h>
 #include <sys/sysent.h>
-#include <sys/sysproto.h>
 #include <sys/lkm.h>
 
 MOD_DEV (joy, LM_DT_CHAR, CDEV_MAJOR, &joy_cdevsw);
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 3da3a5a40d300..24df45392c871 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -73,8 +73,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/errno.h>
-#include <sys/ioccom.h>
 #include <sys/sockio.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
@@ -82,19 +80,14 @@
 #include <sys/syslog.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_types.h>
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
-#include <net/bpfdesc.h>
 #endif
 
 #include <machine/md_var.h>
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 67157ba370661..72fa02989e330 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,23 +40,18 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.91 1997/06/01 15:59:11 peter Exp $
+ *	$Id: mcd.c,v 1.92 1997/06/01 16:03:13 peter Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include "mcd.h"
 #if NMCD > 0
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/uio.h>
 #include <sys/cdio.h>
-#include <sys/errno.h>
 #include <sys/dkbad.h>
 #include <sys/disklabel.h>
 #include <sys/kernel.h>
@@ -66,8 +61,6 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include <machine/clock.h>
 
-#include <i386/i386/cons.h>
-
 #include <i386/isa/isa_device.h>
 #include <i386/isa/mcdreg.h>
 
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index ee196b517a8db..091ff8cc83ded 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.31 1997/02/22 09:36:56 peter Exp $
+ * $Id: mse.c,v 1.32 1997/03/24 11:23:56 bde Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -50,7 +50,6 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
-#include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/uio.h>
 #ifdef DEVFS
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index ea064ea50f316..8a721e05ce47d 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -30,7 +30,6 @@
  *
  */
 
-#include "opt_comconsole.h"
 #include "rc.h"
 
 #if NRC > 0
@@ -44,9 +43,7 @@
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
-#include <sys/uio.h>
 #include <sys/kernel.h>
-#include <sys/syslog.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
@@ -54,7 +51,6 @@
 #include <machine/clock.h>
 
 #include <i386/isa/isa_device.h>
-#include <i386/isa/sioreg.h>
 
 #include <i386/isa/ic/cd180.h>
 #include <i386/isa/rcreg.h>
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index d58f90b161bab..e7fef41f83cd2 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.30 1997/05/04 15:24:20 joerg Exp $ */
+/* $Id: scd.c,v 1.31 1997/05/10 12:13:13 joerg Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -49,17 +49,11 @@
 
 #include "scd.h"
 #if NSCD > 0
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/file.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/uio.h>
 #include <sys/cdio.h>
-#include <sys/errno.h>
 #include <sys/dkbad.h>
 #include <sys/disklabel.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index cb2c4524f2d23..86b9de45d99b0 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.57 1997/03/24 12:02:48 bde Exp $
+ *	$Id: si.c,v 1.58 1997/04/20 15:36:04 bde Exp $
  */
 
 #ifndef lint
@@ -45,14 +45,11 @@ static const char si_copyright1[] =  "@(#) (C) Specialix International, 1990,199
 #include <sys/ioctl_compat.h>
 #endif
 #include <sys/tty.h>
-#include <sys/ttydefaults.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
-#include <sys/uio.h>
 #include <sys/dkstat.h>
 #include <sys/kernel.h>
-#include <sys/syslog.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #ifdef DEVFS
@@ -62,7 +59,6 @@ static const char si_copyright1[] =  "@(#) (C) Specialix International, 1990,199
 #include <machine/clock.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/pmap.h>
 
 #include <i386/isa/icu.h>
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 90e50a4f8b541..0a9ce1bff42a6 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.171 1997/06/04 16:25:14 pst Exp $
+ *	$Id: sio.c,v 1.172 1997/07/17 06:01:15 dyson Exp $
  */
 
 #include "opt_comconsole.h"
@@ -56,7 +56,6 @@
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
-#include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index a9abd8f3c909e..16789ef44dc0e 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.6 1997/02/22 09:36:35 peter Exp $
+ * $Id: if_sr.c,v 1.7 1997/05/19 22:02:49 joerg Exp $
  */
 
 /*
@@ -53,7 +53,6 @@
 #else
 #define NFR	0
 #endif
-#include "pci.h"
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index a9abd8f3c909e..16789ef44dc0e 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.6 1997/02/22 09:36:35 peter Exp $
+ * $Id: if_sr.c,v 1.7 1997/05/19 22:02:49 joerg Exp $
  */
 
 /*
@@ -53,7 +53,6 @@
 #else
 #define NFR	0
 #endif
-#include "pci.h"
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 31d2b26d6f504..a2b843a31a63f 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.224 1997/07/14 03:36:50 yokota Exp $
+ *  $Id: syscons.c,v 1.225 1997/07/15 14:43:22 yokota Exp $
  */
 
 #include "sc.h"
@@ -40,11 +40,7 @@
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/tty.h>
-#include <sys/uio.h>
-#include <sys/callout.h>
 #include <sys/kernel.h>
-#include <sys/syslog.h>
-#include <sys/errno.h>
 #include <sys/malloc.h>
 #ifdef	DEVFS
 #include <sys/devfsext.h>
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index e6b049ba3bbe0..0c12e52f36719 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -162,12 +162,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/errno.h>
-#if __FreeBSD__ >= 3
 #include <sys/sockio.h>
-#else
-#include <sys/ioctl.h>
-#endif
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
@@ -178,32 +173,19 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <net/if.h>
 #include <net/if_dl.h>
-#include <net/if_types.h>
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
-#include <net/bpfdesc.h>
 #endif
 
-#include <machine/cpufunc.h>
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
-#include <i386/isa/icu.h>
 
 #include <i386/isa/ic/if_wl_i82586.h>	/* Definitions for the Intel chip */