4 files changed, 3 insertions, 27 deletions

diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 1124923ca91f..f0c25d6fbd92 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -185,14 +185,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
 #include <sys/uio.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/mman.h>
 #ifdef DEVFS
@@ -202,7 +196,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index cdef3f50cd55..ae48965f69e6 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: cy_pci.c,v 1.5 1997/02/22 09:44:00 peter Exp $
  */
 
 /*
@@ -36,7 +36,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 05b7bc466290..460c74a40bd0 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -21,7 +21,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: if_de.c,v 1.65 1997/06/22 09:48:42 peter Exp $
+ * $Id: if_de.c,v 1.66 1997/08/03 13:00:42 peter Exp $
  *
  */
 
@@ -39,17 +39,10 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
-#if defined(__FreeBSD__)
 #include <sys/sockio.h>
-#else
-#include <sys/ioctl.h>
-#endif
-#include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>	/* only for declaration of wakeup() used by vm.h */
 #if defined(__FreeBSD__)
 #include <machine/clock.h>
 #elif defined(__bsdi__) || defined(__NetBSD__)
@@ -60,9 +53,7 @@
 #if defined(SIOCSIFMEDIA) && !defined(TULIP_NOIFMEDIA)
 #include <net/if_media.h>
 #endif
-#include <net/if_types.h>
 #include <net/if_dl.h>
-#include <net/route.h>
 #include <net/netisr.h>
 
 #if defined(__bsdi__) && _BSDI_VERSION >= 199701
@@ -73,14 +64,10 @@
 #include "bpfilter.h"
 #if NBPFILTER > 0
 #include <net/bpf.h>
-#include <net/bpfdesc.h>
 #endif
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
 #endif
 
 #ifdef NS
@@ -89,8 +76,6 @@
 #endif
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_kern.h>
 
 #if defined(__FreeBSD__)
 #include <vm/pmap.h>
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index a7bc08cb1919..e122c812c207 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $Id: if_sr_p.c,v 1.4 1997/02/22 09:44:07 peter Exp $
  */
 
 #include "pci.h"
@@ -40,7 +40,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 
-#include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
 #ifndef BUGGY