diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 5fef52a8952..2abbecdc083 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.c
@@ -23,19 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: ppb_1284.c,v 1.1 1997/08/16 14:05:32 msmith Exp $
  *
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/conf.h>
-#include <sys/proc.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/uio.h>
-#include <sys/syslog.h>
 
 #include <machine/clock.h>
 
diff --git a/sys/dev/ppbus/ppb_base.c b/sys/dev/ppbus/ppb_base.c
index 97aee424e6a..8c956be0e57 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.c
@@ -23,25 +23,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_base.c,v 1.1 1997/08/16 14:05:34 msmith Exp $
+ *	$Id: ppb_base.c,v 1.2 1997/08/28 10:15:12 msmith Exp $
  *
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/conf.h>
-#include <sys/proc.h>
-#include <sys/buf.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/uio.h>
-#include <sys/syslog.h>
-
-#include <machine/clock.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
 
 #include <dev/ppbus/ppbconf.h>
 
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 49c93f62945..756550c3498 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -23,24 +23,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppbconf.c,v 1.2 1997/08/16 14:05:35 msmith Exp $
+ *	$Id: ppbconf.c,v 1.3 1997/08/28 10:15:14 msmith Exp $
  *
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/conf.h>
-#include <sys/proc.h>
-#include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/uio.h>
-#include <sys/syslog.h>
-
-#include <machine/clock.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/pmap.h>
 
 #include <dev/ppbus/ppbconf.h>
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index 9cb3873c80b..9d261e872d6 100644
--- a/sys/dev/ppbus/ppbconf.h
+++ b/sys/dev/ppbus/ppbconf.h
@@ -23,14 +23,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppbconf.h,v 1.2 1997/08/16 14:05:36 msmith Exp $
+ *	$Id: ppbconf.h,v 1.3 1997/09/01 00:18:02 bde Exp $
  *
  */
 #ifndef __PPBCONF_H
 #define __PPBCONF_H
 
-#include <sys/queue.h>
-
 /*
  * Parallel Port Bus sleep/wakeup queue.
  */
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index aaf54b31f06..7e34cb912e5 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -23,32 +23,19 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppi.c,v 1.3 1997/08/16 14:16:58 msmith Exp $
+ *	$Id: ppi.c,v 1.4 1997/08/28 10:15:16 msmith Exp $
  *
  */
 #include "ppi.h"
 
 #if NPPI > 0
 
-#include <sys/types.h>
-
-#ifdef KERNEL
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/proc.h>
-#include <sys/buf.h>
 #include <sys/kernel.h>
-#include <sys/uio.h>
-#include <sys/syslog.h>
 #include <sys/malloc.h>
 
-#include <machine/stdarg.h>
-#include <machine/clock.h>
-
-#include <sys/kernel.h>
-#endif /*KERNEL */
-
 #include <dev/ppbus/ppbconf.h>
 
 struct ppi_data {
@@ -169,10 +156,6 @@ ppiioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
 
 #ifdef PPI_MODULE
 
-#include <sys/exec.h>
-#include <sys/sysent.h>
-#include <sys/lkm.h>
-
 MOD_DEV(ppi, LM_DT_CHAR, CDEV_MAJOR, &ppi_cdevsw);
 
 static int
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index 15cd706d3f7..8f61c056b1c 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -23,25 +23,19 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vpo.c,v 1.2 1997/08/16 14:05:37 msmith Exp $
+ *	$Id: vpo.c,v 1.3 1997/08/28 10:15:20 msmith Exp $
  *
  */
-#include <sys/types.h>
 
 #ifdef KERNEL
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
-#include <sys/syslog.h>
 
-#include <machine/stdarg.h>
 #include <machine/clock.h>
 
 #endif	/* KERNEL */
-#include <scsi/scsi_all.h>
 #include <scsi/scsi_disk.h>
 #include <scsi/scsiconf.h>