20 files changed, 47 insertions, 24 deletions

diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index c7860d1b24ff5..29ac431576595 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: db_access.c,v 1.8 1995/11/24 14:13:29 bde Exp $
+ *	$Id: db_access.c,v 1.9 1995/11/29 10:25:03 phk Exp $
  */
 
 /*
@@ -33,6 +33,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm_param.h>
 #include <ddb/ddb.h>
 #include <ddb/db_access.h>
 
diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c
index edf811de4ff1a..f617ea5f8483b 100644
--- a/sys/ddb/db_aout.c
+++ b/sys/ddb/db_aout.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_aout.c,v 1.12 1995/11/24 14:13:30 bde Exp $
+ *	$Id: db_aout.c,v 1.13 1995/11/29 10:25:06 phk Exp $
  */
 
 /*
@@ -37,6 +37,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm_param.h>
 
 #include <machine/bootinfo.h>
 
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index 89000a1dcdf3b..2887b45e00f38 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: db_break.c,v 1.7 1995/11/24 14:13:31 bde Exp $
+ *	$Id: db_break.c,v 1.8 1995/11/29 10:25:09 phk Exp $
  */
 
 /*
@@ -36,6 +36,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <ddb/ddb.h>
 
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index 51eec48d6670a..5ea5996768c10 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_break.h,v 1.4 1995/11/24 13:52:57 bde Exp $
+ *	$Id: db_break.h,v 1.5 1995/11/29 10:25:11 phk Exp $
  */
 
 /*
@@ -33,7 +33,6 @@
 #ifndef _DDB_DB_BREAK_H_
 #define	_DDB_DB_BREAK_H_
 
-#include <vm/vm_map.h>
 #include <machine/db_machdep.h>
 
 /*
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 26147e1d14120..9ad1732086f3d 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_command.c,v 1.15 1995/11/24 14:13:32 bde Exp $
+ *	$Id: db_command.c,v 1.16 1995/11/29 10:25:14 phk Exp $
  */
 
 /*
@@ -37,6 +37,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 #include <ddb/ddb.h>
 
 #include <ddb/db_command.h>
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index 46fc66dcd755e..52941a1030401 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_examine.c,v 1.9 1995/11/24 14:13:33 bde Exp $
+ *	$Id: db_examine.c,v 1.10 1995/11/29 10:25:17 phk Exp $
  */
 
 /*
@@ -33,6 +33,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm_param.h>
 
 #include <ddb/ddb.h>
 
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 4a919c25d2c95..ead501ea43538 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: db_expr.c,v 1.6 1995/11/24 14:13:34 bde Exp $
+ *	$Id: db_expr.c,v 1.7 1995/11/29 10:25:18 phk Exp $
  */
 
 /*
@@ -33,6 +33,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm_param.h>
 #include <ddb/ddb.h>
 #include <ddb/db_lex.h>
 #include <ddb/db_access.h>
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index 25a7e8bb52633..c7b44702683f4 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_input.c,v 1.8 1995/11/24 14:13:36 bde Exp $
+ *	$Id: db_input.c,v 1.9 1995/11/29 10:25:21 phk Exp $
  */
 
 /*
@@ -34,6 +34,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm_param.h>
 #include <ddb/ddb.h>
 #include <ddb/db_output.h>
 #include <machine/cons.h>
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index 36abdd23c92c1..38f95a52564cc 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: db_lex.c,v 1.7 1995/11/24 14:13:37 bde Exp $
+ *	$Id: db_lex.c,v 1.8 1995/11/29 10:25:23 phk Exp $
  */
 
 /*
@@ -35,6 +35,7 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <vm/vm_param.h>
 #include <ddb/ddb.h>
 #include <ddb/db_lex.h>
 
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index c512092d18c77..889c3e372f9e9 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_output.c,v 1.12 1995/11/24 14:13:38 bde Exp $
+ *	$Id: db_output.c,v 1.13 1995/11/29 10:25:29 phk Exp $
  */
 
 /*
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <vm/vm_param.h>
 #include <machine/stdarg.h>
 #include <ddb/ddb.h>
 #include <ddb/db_output.h>
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index 91c43f3936e3f..0dd550ee8f812 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: db_print.c,v 1.7 1995/05/30 07:57:06 rgrimes Exp $
+ *	$Id: db_print.c,v 1.8 1995/11/24 14:13:39 bde Exp $
  */
 
 /*
@@ -37,6 +37,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm_param.h>
 
 #include <ddb/ddb.h>
 
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index 9e203a4b5e26c..fa3165fc534fc 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -30,11 +30,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: db_ps.c,v 1.7 1995/08/20 05:25:11 davidg Exp $
+ *	$Id: db_ps.c,v 1.8 1995/08/27 02:40:39 bde Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm_param.h>
 #include <ddb/ddb.h>
 #include <machine/cons.h>
 
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index dc0e2ab50483c..86b83d27999e2 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: db_run.c,v 1.6 1995/11/24 14:13:40 bde Exp $
+ *	$Id: db_run.c,v 1.7 1995/11/29 10:25:31 phk Exp $
  */
 
 /*
@@ -37,6 +37,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <ddb/ddb.h>
 
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 02e5383c75e73..61f8cbe52d70d 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_sym.c,v 1.10 1995/11/24 14:13:41 bde Exp $
+ *	$Id: db_sym.c,v 1.11 1995/11/29 10:25:35 phk Exp $
  */
 
 /*
@@ -33,6 +33,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm_param.h>
 #include <ddb/ddb.h>
 #include <ddb/db_sym.h>
 
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index 83419b8255374..904fff22fb37e 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.6 1994/10/02 19:36:21 phk Exp $
+ *	$Id: db_trap.c,v 1.7 1995/05/30 07:57:14 rgrimes Exp $
  */
 
 /*
@@ -37,6 +37,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <ddb/ddb.h>
 #include <ddb/db_command.h>
 #include <ddb/db_break.h>
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index 041c49eeeb5a5..576d895c4a52f 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: db_variables.c,v 1.8 1995/11/24 14:13:41 bde Exp $
+ *	$Id: db_variables.c,v 1.9 1995/11/29 10:25:41 phk Exp $
  */
 
 /*
@@ -34,6 +34,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm_param.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 740d2e819d08e..4cec857bee369 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: db_watch.c,v 1.7 1995/11/24 14:13:42 bde Exp $
+ *	$Id: db_watch.c,v 1.8 1995/11/29 10:25:44 phk Exp $
  */
 
 /*
@@ -34,9 +34,14 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/lock.h>
+#include <vm/vm_prot.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
 #include <ddb/ddb.h>
 
-#include <vm/vm_map.h>
 #include <ddb/db_lex.h>
 #include <ddb/db_watch.h>
 #include <ddb/db_access.h>
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index f6a39834cdca8..e4a417d728fdf 100644
--- a/sys/ddb/db_watch.h
+++ b/sys/ddb/db_watch.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_watch.h,v 1.5 1995/11/24 13:53:03 bde Exp $
+ *	$Id: db_watch.h,v 1.6 1995/11/29 10:25:47 phk Exp $
  */
 
 /*
@@ -34,7 +34,6 @@
 #ifndef _DDB_DB_WATCH_H_
 #define	_DDB_DB_WATCH_H_
 
-#include <vm/vm_map.h>
 #include <machine/db_machdep.h>
 
 /*
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 1b2a99e42c1f2..e4c9eb00d5ce6 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: db_write_cmd.c,v 1.4 1994/08/13 03:49:26 wollman Exp $
+ *	$Id: db_write_cmd.c,v 1.5 1995/05/30 07:57:23 rgrimes Exp $
  */
 
 /*
@@ -34,6 +34,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <vm/vm_param.h>
 #include <ddb/ddb.h>
 
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index fc57f1e3c0cd0..e270b933128cd 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ddb.h,v 1.7 1995/11/24 13:53:05 bde Exp $
+ *	$Id: ddb.h,v 1.8 1995/11/29 10:25:50 phk Exp $
  */
 
 /*
@@ -38,7 +38,6 @@
 #define	_DDB_DDB_H_
 
 #include <machine/db_machdep.h>		/* type definitions */
-#include <vm/vm.h>
 
 typedef void db_cmdfcn_t __P((db_expr_t addr, boolean_t have_addr,
 			      db_expr_t count, char *modif));