diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index 2f4f9064eed9..511f978280c7 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ *	$Id: db_access.c,v 1.13 1997/02/22 09:28:18 peter Exp $
  */
 
 /*
@@ -31,7 +31,6 @@
  *	Date:	7/90
  */
 #include <sys/param.h>
-#include <sys/systm.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_access.h>
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index a404a3b5f8ff..6f7776b6b90f 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ *	$Id: db_break.c,v 1.13 1997/02/22 09:28:20 peter Exp $
  */
 
 /*
@@ -34,13 +34,11 @@
  * Breakpoints.
  */
 #include <sys/param.h>
-#include <sys/systm.h>
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 
 #include <ddb/ddb.h>
-#include <ddb/db_lex.h>
 #include <ddb/db_break.h>
 #include <ddb/db_access.h>
 #include <ddb/db_sym.h>
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 4372e71b2f24..0603d9d91857 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ *	$Id: db_expr.c,v 1.11 1997/02/22 09:28:23 peter Exp $
  */
 
 /*
@@ -31,7 +31,6 @@
  *	Date:	7/90
  */
 #include <sys/param.h>
-#include <sys/systm.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index 62f86ebbdf7d..edcaa0c7fcea 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ *	$Id: db_lex.c,v 1.13 1997/02/22 09:28:25 peter Exp $
  */
 
 /*
@@ -34,7 +34,6 @@
  * Lexical analyzer.
  */
 #include <sys/param.h>
-#include <sys/systm.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index cbc5ab17f7d3..8f7528fcbf62 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ *	$Id: db_print.c,v 1.13 1997/02/22 09:28:27 peter Exp $
  */
 
 /*
@@ -35,10 +35,8 @@
  * Miscellaneous printing.
  */
 #include <sys/param.h>
-#include <sys/systm.h>
 
 #include <ddb/ddb.h>
-#include <ddb/db_lex.h>
 #include <ddb/db_variables.h>
 #include <ddb/db_sym.h>
 
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index dfd4f1265f27..598a117c3c95 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ *	$Id: db_run.c,v 1.12 1997/02/22 09:28:29 peter Exp $
  */
 
 /*
@@ -35,12 +35,10 @@
  * Commands to run process.
  */
 #include <sys/param.h>
-#include <sys/systm.h>
 
 #include <vm/vm.h>
 
 #include <ddb/ddb.h>
-#include <ddb/db_lex.h>
 #include <ddb/db_break.h>
 #include <ddb/db_access.h>
 
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index 5a9317c19b09..f4da0f8eaff1 100644
--- a/sys/ddb/db_trap.c
+++ b/sys/ddb/db_trap.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_trap.c,v 1.11 1997/02/22 09:28:31 peter Exp $
+ *	$Id: db_trap.c,v 1.12 1997/03/28 12:39:43 bde Exp $
  */
 
 /*
@@ -35,13 +35,9 @@
  * Trap entry point to kernel debugger.
  */
 #include <sys/param.h>
-#include <sys/systm.h>
-
-#include <vm/vm.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_command.h>
-#include <ddb/db_break.h>
 
 #include <setjmp.h>
 
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index 2bb58c7e359c..0cab001585a0 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ *	$Id: db_variables.c,v 1.13 1997/02/22 09:28:31 peter Exp $
  */
 
 /*
@@ -32,7 +32,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index 8846ad0c27a7..c0f951e72689 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ *	$Id: db_watch.c,v 1.14 1997/02/22 09:28:33 peter Exp $
  */
 
 /*
@@ -32,7 +32,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
 
 #include <vm/vm.h>
 #include <sys/lock.h>
@@ -41,10 +40,7 @@
 #include <vm/vm_prot.h>
 
 #include <ddb/ddb.h>
-#include <ddb/db_lex.h>
 #include <ddb/db_watch.h>
-#include <ddb/db_access.h>
-#include <ddb/db_sym.h>
 
 /*
  * Watchpoints.
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 09000666e3a7..9881234a4210 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ *	$Id: db_write_cmd.c,v 1.9 1997/02/22 09:28:34 peter Exp $
  */
 
 /*
@@ -32,10 +32,8 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
 
 #include <ddb/ddb.h>
-#include <ddb/db_lex.h>
 #include <ddb/db_access.h>
 #include <ddb/db_command.h>
 #include <ddb/db_sym.h>