Clean up include files.

6 files changed, 6 insertions, 23 deletions

diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index 5583c8d..0d474c7 100644
--- a/sys/dev/firewire/firewire.c
+++ b/sys/dev/firewire/firewire.c
@@ -38,9 +38,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
 
 #include <sys/kernel.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/firewire/fwdma.c b/sys/dev/firewire/fwdma.c
index e8c6cce..7183939 100644
--- a/sys/dev/firewire/fwdma.c
+++ b/sys/dev/firewire/fwdma.c
@@ -38,8 +38,10 @@
 #include <sys/types.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#if __FreeBSD_version >= 501102 
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#endif
 
 #include <sys/bus.h>
 #include <machine/bus.h>
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index 986d1a3..5cfb328 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -43,14 +43,8 @@
 #define IRX_CH 0x24
 
 #include <sys/param.h>
-#include <sys/proc.h>
 #include <sys/systm.h>
-#include <sys/types.h>
 #include <sys/mbuf.h>
-#include <sys/mman.h> 
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/signalvar.h> 
 #include <sys/malloc.h>
 #include <sys/sockio.h>
 #include <sys/bus.h>
@@ -59,16 +53,11 @@
 #include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
 
 #if __FreeBSD_version < 500000
 #include <machine/clock.h>		/* for DELAY() */
 #endif
 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
-
 #include <dev/firewire/firewire.h>
 #include <dev/firewire/firewirereg.h>
 #include <dev/firewire/fwdma.h>
@@ -76,8 +65,6 @@
 #include <dev/firewire/fwohcivar.h>
 #include <dev/firewire/firewire_phy.h>
 
-#include <dev/firewire/iec68113.h>
-
 #undef OHCI_DEBUG
 
 static char dbcode[16][0x10]={"OUTM", "OUTL","INPM","INPL",
diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index 96cc01c..0ac6b00 100644
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@@ -45,8 +45,10 @@
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <sys/malloc.h>
+#if __FreeBSD_version >= 501102
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#endif
 #include <machine/resource.h>
 
 #if __FreeBSD_version < 500000
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index d029533..4b2bb91 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -37,7 +37,6 @@
 #include "opt_inet.h"
 
 #include <sys/param.h>
-#include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
@@ -54,9 +53,6 @@
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <net/if_vlan_var.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
 
 #include <dev/firewire/firewire.h>
 #include <dev/firewire/firewirereg.h>
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index e97a908..6cf09cb 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -39,12 +39,13 @@
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/mbuf.h>
 #include <sys/sysctl.h>
 #include <machine/bus.h>
 #include <sys/malloc.h>
+#if __FreeBSD_version >= 501102
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#endif
 
 #if __FreeBSD_version < 500106
 #include <sys/devicestat.h>	/* for struct devstat */
@@ -58,8 +59,6 @@
 #include <cam/cam_periph.h>
 
 #include <cam/scsi/scsi_all.h>
-#include <cam/scsi/scsi_message.h>
-#include <cam/scsi/scsi_da.h>
 
 #include <sys/kernel.h>