Reduced and cleaned up #includes.

21 files changed, 48 insertions, 76 deletions

diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index 29ac43157659..db046c2bba87 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.9 1995/11/29 10:25:03 phk Exp $
+ *	$Id: db_access.c,v 1.10 1995/12/07 12:44:44 davidg Exp $
  */
 
 /*
@@ -32,8 +32,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_access.h b/sys/ddb/db_access.h
index c5682e796b31..9966251b550e 100644
--- a/sys/ddb/db_access.h
+++ b/sys/ddb/db_access.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_access.h,v 1.4 1995/05/30 07:56:47 rgrimes Exp $
+ *	$Id: db_access.h,v 1.5 1995/11/24 13:52:56 bde Exp $
  */
 
 #ifndef _DDB_DB_ACCESS_H_
@@ -36,8 +36,6 @@
 /*
  * Data access functions for debugger.
  */
-#include <machine/db_machdep.h>		/* expression types */
-
 db_expr_t	db_get_value __P((db_addr_t addr, int size,
 				  boolean_t is_signed));
 void		db_put_value __P((db_addr_t addr, int size, db_expr_t value));
diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c
index f617ea5f8483..e4b4ef831853 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.13 1995/11/29 10:25:06 phk Exp $
+ *	$Id: db_aout.c,v 1.14 1995/12/07 12:44:45 davidg Exp $
  */
 
 /*
@@ -36,8 +36,6 @@
 
 #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 99f77692307c..7f8400d8b926 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.9 1995/12/07 12:44:46 davidg Exp $
+ *	$Id: db_break.c,v 1.10 1995/12/10 13:32:33 phk Exp $
  */
 
 /*
@@ -35,11 +35,11 @@
  */
 #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 <vm/vm_kern.h>
 
+#include <ddb/ddb.h>
 #include <ddb/db_lex.h>
 #include <ddb/db_break.h>
 #include <ddb/db_access.h>
@@ -312,8 +312,6 @@ db_listbreak_cmd(dummy1, dummy2, dummy3, dummy4)
 	db_list_breakpoints();
 }
 
-#include <vm/vm_kern.h>
-
 /*
  *	We want ddb to be usable before most of the kernel has been
  *	initialized.  In particular, current_thread() or kernel_map
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index 5ea5996768c1..2b78b4e31099 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.5 1995/11/29 10:25:11 phk Exp $
+ *	$Id: db_break.h,v 1.6 1995/12/07 12:44:47 davidg Exp $
  */
 
 /*
@@ -33,8 +33,6 @@
 #ifndef _DDB_DB_BREAK_H_
 #define	_DDB_DB_BREAK_H_
 
-#include <machine/db_machdep.h>
-
 /*
  * Breakpoint.
  */
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 9ad1732086f3..869bdc2fcce6 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.16 1995/11/29 10:25:14 phk Exp $
+ *	$Id: db_command.c,v 1.17 1995/12/07 12:44:48 davidg Exp $
  */
 
 /*
@@ -36,12 +36,11 @@
  */
 #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/ddb.h>
 #include <ddb/db_command.h>
 #include <ddb/db_lex.h>
 #include <ddb/db_output.h>
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index d9906b4eed33..ab28975618f9 100644
--- a/sys/ddb/db_command.h
+++ b/sys/ddb/db_command.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_command.h,v 1.6 1995/05/30 07:56:54 rgrimes Exp $
+ *	$Id: db_command.h,v 1.7 1995/11/24 13:52:58 bde Exp $
  */
 
 #ifndef _DDB_DB_COMMAND_H_
@@ -37,10 +37,6 @@
  * Command loop declarations.
  */
 
-#include <sys/param.h>
-#include <sys/proc.h>
-#include <machine/db_machdep.h>
-
 void	db_command_loop __P((void));
 
 extern db_addr_t	db_dot;		/* current location */
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index 52941a103040..9c8c21c4b02d 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.10 1995/11/29 10:25:17 phk Exp $
+ *	$Id: db_examine.c,v 1.11 1995/12/07 12:44:49 davidg Exp $
  */
 
 /*
@@ -32,8 +32,6 @@
  */
 #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 ead501ea4353..6f52d1330f4f 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.7 1995/11/29 10:25:18 phk Exp $
+ *	$Id: db_expr.c,v 1.8 1995/12/07 12:44:50 davidg Exp $
  */
 
 /*
@@ -32,8 +32,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 8d8b02571df6..16c14679ad25 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.10 1995/12/07 12:44:51 davidg Exp $
+ *	$Id: db_input.c,v 1.11 1995/12/10 13:32:37 phk Exp $
  */
 
 /*
@@ -33,11 +33,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <vm/vm_param.h>
+
+#include <machine/cons.h>
+
 #include <ddb/ddb.h>
 #include <ddb/db_output.h>
-#include <machine/cons.h>
 
 /*
  * Character input and editing.
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index 26b8dae24fc7..ce49ff7331a1 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.9 1995/12/07 12:44:52 davidg Exp $
+ *	$Id: db_lex.c,v 1.10 1995/12/10 13:32:38 phk Exp $
  */
 
 /*
@@ -35,7 +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 889c3e372f9e..398dacef7958 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.13 1995/11/29 10:25:29 phk Exp $
+ *	$Id: db_output.c,v 1.14 1995/12/07 12:44:53 davidg Exp $
  */
 
 /*
@@ -37,11 +37,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <vm/vm_param.h>
+
+#include <machine/cons.h>
 #include <machine/stdarg.h>
+
 #include <ddb/ddb.h>
 #include <ddb/db_output.h>
-#include <machine/cons.h>
 
 /*
  *	Character output - tracks position in line.
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index 0dd550ee8f81..8958b079e3dd 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.8 1995/11/24 14:13:39 bde Exp $
+ *	$Id: db_print.c,v 1.9 1995/12/07 12:44:55 davidg Exp $
  */
 
 /*
@@ -36,11 +36,8 @@
  */
 #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_variables.h>
 #include <ddb/db_sym.h>
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index fa3165fc534f..ca47f0f0304b 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -30,15 +30,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: db_ps.c,v 1.8 1995/08/27 02:40:39 bde Exp $
+ *	$Id: db_ps.c,v 1.9 1995/12/07 12:44:56 davidg 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>
 
+#include <ddb/ddb.h>
+
 void
 db_ps(dummy1, dummy2, dummy3, dummy4)
 	db_expr_t	dummy1;
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index 04fe1fe932ee..ae8126d18001 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.8 1995/12/07 12:44:57 davidg Exp $
+ *	$Id: db_run.c,v 1.9 1995/12/10 13:32:39 phk Exp $
  */
 
 /*
@@ -36,11 +36,10 @@
  */
 #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/ddb.h>
 #include <ddb/db_lex.h>
 #include <ddb/db_break.h>
 #include <ddb/db_access.h>
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index a894a5581f04..32975db5ccbe 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.12 1995/12/07 12:44:58 davidg Exp $
+ *	$Id: db_sym.c,v 1.13 1995/12/10 13:32:41 phk Exp $
  */
 
 /*
@@ -32,8 +32,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 904fff22fb37..be6f58e49b88 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.7 1995/05/30 07:57:14 rgrimes Exp $
+ *	$Id: db_trap.c,v 1.8 1995/12/07 12:45:00 davidg Exp $
  */
 
 /*
@@ -36,14 +36,13 @@
  */
 #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>
 
-
 void
 db_trap(type, code)
 	int	type, code;
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index 576d895c4a52..93c313227fd4 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.9 1995/11/29 10:25:41 phk Exp $
+ *	$Id: db_variables.c,v 1.10 1995/12/07 12:45:04 davidg Exp $
  */
 
 /*
@@ -33,10 +33,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <vm/vm_param.h>
-#include <ddb/ddb.h>
 
+#include <ddb/ddb.h>
 #include <ddb/db_lex.h>
 #include <ddb/db_variables.h>
 
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index 9e99c0540a64..0ae8569bd31d 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.9 1995/12/07 12:45:05 davidg Exp $
+ *	$Id: db_watch.c,v 1.10 1995/12/10 13:32:42 phk Exp $
  */
 
 /*
@@ -33,15 +33,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_prot.h>
 
+#include <ddb/ddb.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 e4a417d728fd..7f6d2b9612d6 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.6 1995/11/29 10:25:47 phk Exp $
+ *	$Id: db_watch.h,v 1.7 1995/12/07 12:45:06 davidg Exp $
  */
 
 /*
@@ -34,8 +34,6 @@
 #ifndef _DDB_DB_WATCH_H_
 #define	_DDB_DB_WATCH_H_
 
-#include <machine/db_machdep.h>
-
 /*
  * Watchpoint.
  */
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index e4c9eb00d5ce..807ad7f9b446 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.5 1995/05/30 07:57:23 rgrimes Exp $
+ *	$Id: db_write_cmd.c,v 1.6 1995/12/07 12:45:07 davidg Exp $
  */
 
 /*
@@ -33,10 +33,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <vm/vm_param.h>
-#include <ddb/ddb.h>
 
+#include <ddb/ddb.h>
 #include <ddb/db_lex.h>
 #include <ddb/db_access.h>
 #include <ddb/db_command.h>