diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index 4313a548649b..c2d6a6bb0feb 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: ppc.c,v 1.1 1997/08/14 14:01:35 msmith Exp $
  *
  */
 #include "ppc.h"
@@ -32,14 +32,8 @@
 
 #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>
 
@@ -47,7 +41,6 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
 #include <dev/ppbus/ppbconf.h>
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index 44cdf30c67bd..8b0ef3ea2008 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -36,29 +36,15 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/reboot.h>
 #include <sys/fcntl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
-#include <sys/dkstat.h>
-#include <sys/file.h>
-#include <sys/uio.h>
 #include <sys/kernel.h>
-#include <sys/syslog.h>
 #include <sys/malloc.h>
-#ifdef DEVFS
-#include  <sys/devfsext.h>
-#endif
 
-#include <machine/clock.h>
-
-#include <i386/isa/icu.h>
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
-#include <pci.h>
-#include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
 #define ROCKET_C
diff --git a/sys/i386/isa/ipl_funcs.c b/sys/i386/isa/ipl_funcs.c
index ecc34e7ecdcb..67463eeee95b 100644
--- a/sys/i386/isa/ipl_funcs.c
+++ b/sys/i386/isa/ipl_funcs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ipl_funcs.c,v 1.8 1997/08/28 09:51:32 smp Exp smp $
+ *	$Id: ipl_funcs.c,v 1.6 1997/08/29 18:45:23 fsmp Exp $
  */
 
 #include <sys/types.h>
@@ -96,7 +96,6 @@ splx(unsigned ipl)
 
 #else /* !SMP */
 
-#include <machine/param.h>
 #include <machine/smp.h>
 extern int bspEarly; /* XXX */
 
diff --git a/sys/i386/isa/ppc.c b/sys/i386/isa/ppc.c
index 4313a548649b..c2d6a6bb0feb 100644
--- a/sys/i386/isa/ppc.c
+++ b/sys/i386/isa/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: ppc.c,v 1.1 1997/08/14 14:01:35 msmith Exp $
  *
  */
 #include "ppc.h"
@@ -32,14 +32,8 @@
 
 #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>
 
@@ -47,7 +41,6 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
 #include <dev/ppbus/ppbconf.h>
diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c
index 44cdf30c67bd..8b0ef3ea2008 100644
--- a/sys/i386/isa/rp.c
+++ b/sys/i386/isa/rp.c
@@ -36,29 +36,15 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/reboot.h>
 #include <sys/fcntl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
-#include <sys/dkstat.h>
-#include <sys/file.h>
-#include <sys/uio.h>
 #include <sys/kernel.h>
-#include <sys/syslog.h>
 #include <sys/malloc.h>
-#ifdef DEVFS
-#include  <sys/devfsext.h>
-#endif
 
-#include <machine/clock.h>
-
-#include <i386/isa/icu.h>
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
-#include <pci.h>
-#include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
 #define ROCKET_C
diff --git a/sys/isa/ppc.c b/sys/isa/ppc.c
index 4313a548649b..c2d6a6bb0feb 100644
--- a/sys/isa/ppc.c
+++ b/sys/isa/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: ppc.c,v 1.1 1997/08/14 14:01:35 msmith Exp $
  *
  */
 #include "ppc.h"
@@ -32,14 +32,8 @@
 
 #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>
 
@@ -47,7 +41,6 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
 #include <dev/ppbus/ppbconf.h>