These do not need the extremely poorly named uvm/uvm_extern.h (which

pulls in the universe). occasionally they need sys/systm.h

15 files changed, 26 insertions, 42 deletions

diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index ade4914f48c..5d209e6d709 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_access.c,v 1.10 2007/03/15 17:10:22 miod Exp $	*/
+/*	$OpenBSD: db_access.c,v 1.11 2014/07/08 13:02:57 deraadt Exp $	*/
 /*	$NetBSD: db_access.c,v 1.8 1994/10/09 08:37:35 mycroft Exp $	*/
 
 /* 
@@ -33,8 +33,6 @@
 #include <sys/param.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/db_machdep.h>		/* type definitions */
 #include <machine/endian.h>
 
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index 04706be4540..81fb3480773 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_break.c,v 1.14 2010/11/27 19:59:11 miod Exp $	*/
+/*	$OpenBSD: db_break.c,v 1.15 2014/07/08 13:02:57 deraadt Exp $	*/
 /*	$NetBSD: db_break.c,v 1.7 1996/03/30 22:30:03 christos Exp $	*/
 
 /* 
@@ -34,10 +34,9 @@
  * Breakpoints.
  */
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/db_machdep.h>		/* type definitions */
 
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index e6254aecca6..be67d4ae873 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_examine.c,v 1.18 2011/11/07 20:29:56 miod Exp $	*/
+/*	$OpenBSD: db_examine.c,v 1.19 2014/07/08 13:02:57 deraadt Exp $	*/
 /*	$NetBSD: db_examine.c,v 1.11 1996/03/30 22:30:07 christos Exp $	*/
 
 /*
@@ -31,10 +31,9 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/db_machdep.h>		/* type definitions */
 
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 2a94f70dcb4..5c98e51e201 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_expr.c,v 1.9 2011/05/22 19:21:55 ariane Exp $	*/
+/*	$OpenBSD: db_expr.c,v 1.10 2014/07/08 13:02:57 deraadt Exp $	*/
 /*	$NetBSD: db_expr.c,v 1.5 1996/02/05 01:56:58 christos Exp $	*/
 
 /* 
@@ -33,8 +33,6 @@
 #include <sys/param.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/db_machdep.h>
 
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/db_hangman.c b/sys/ddb/db_hangman.c
index b3bbe4739f0..136ad98d80c 100644
--- a/sys/ddb/db_hangman.c
+++ b/sys/ddb/db_hangman.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_hangman.c,v 1.29 2014/01/18 01:58:33 deraadt Exp $	*/
+/*	$OpenBSD: db_hangman.c,v 1.30 2014/07/08 13:02:57 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 Theo de Raadt, Michael Shalayeff
@@ -27,8 +27,7 @@
  */
 
 #include <sys/param.h>
-
-#include <uvm/uvm_extern.h>
+#include <sys/systm.h>
 
 #include <machine/db_machdep.h>
 
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index 2e8e44ef0ca..a43fea7da85 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_input.c,v 1.11 2006/07/06 18:14:14 miod Exp $	*/
+/*	$OpenBSD: db_input.c,v 1.12 2014/07/08 13:02:57 deraadt Exp $	*/
 /*	$NetBSD: db_input.c,v 1.7 1996/02/05 01:57:02 christos Exp $	*/
 
 /* 
@@ -31,10 +31,9 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/db_machdep.h>
 
 #include <ddb/db_var.h>
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index 1bc9352f5f2..c5ac26be34e 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_lex.c,v 1.9 2006/03/13 06:23:20 jsg Exp $	*/
+/*	$OpenBSD: db_lex.c,v 1.10 2014/07/08 13:02:57 deraadt Exp $	*/
 /*	$NetBSD: db_lex.c,v 1.8 1996/02/05 01:57:05 christos Exp $	*/
 
 /* 
@@ -34,10 +34,9 @@
  * Lexical analyzer.
  */
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/db_machdep.h>
 
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index e85e8a1c959..ee4eba41cf3 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_output.c,v 1.26 2010/09/08 04:28:29 marco Exp $	*/
+/*	$OpenBSD: db_output.c,v 1.27 2014/07/08 13:02:57 deraadt Exp $	*/
 /*	$NetBSD: db_output.c,v 1.13 1996/04/01 17:27:14 christos Exp $	*/
 
 /*
@@ -37,8 +37,6 @@
 
 #include <dev/cons.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/db_machdep.h>
 
 #include <ddb/db_command.h>
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index 5515f740dc9..f87f54f0926 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_print.c,v 1.12 2007/11/05 19:23:24 miod Exp $	*/
+/*	$OpenBSD: db_print.c,v 1.13 2014/07/08 13:02:57 deraadt Exp $	*/
 /*	$NetBSD: db_print.c,v 1.5 1996/02/05 01:57:11 christos Exp $	*/
 
 /* 
@@ -34,10 +34,9 @@
  * Miscellaneous printing.
  */
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/db_machdep.h>
 
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index ec30a0b59a9..8153e9e7ae4 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_run.c,v 1.22 2010/11/27 19:59:11 miod Exp $	*/
+/*	$OpenBSD: db_run.c,v 1.23 2014/07/08 13:02:57 deraadt Exp $	*/
 /*	$NetBSD: db_run.c,v 1.8 1996/02/05 01:57:12 christos Exp $	*/
 
 /* 
@@ -34,10 +34,9 @@
  * Commands to run process.
  */
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/db_machdep.h>
 
 #include <ddb/db_run.h>
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index 01b15fe7519..bd3c73d08a3 100644
--- a/sys/ddb/db_trap.c
+++ b/sys/ddb/db_trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trap.c,v 1.16 2011/04/03 16:46:19 drahn Exp $	*/
+/*	$OpenBSD: db_trap.c,v 1.17 2014/07/08 13:02:57 deraadt Exp $	*/
 /*	$NetBSD: db_trap.c,v 1.9 1996/02/05 01:57:18 christos Exp $	*/
 
 /* 
@@ -37,8 +37,6 @@
 #include <sys/proc.h>
 #include <sys/systm.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/db_machdep.h>
 
 #include <ddb/db_run.h>
diff --git a/sys/ddb/db_usrreq.c b/sys/ddb/db_usrreq.c
index 7dc503f15a4..e7d77a35457 100644
--- a/sys/ddb/db_usrreq.c
+++ b/sys/ddb/db_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_usrreq.c,v 1.15 2013/06/10 22:46:13 bluhm Exp $	*/
+/*	$OpenBSD: db_usrreq.c,v 1.16 2014/07/08 13:02:57 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff.  All rights reserved.
@@ -26,10 +26,10 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
-#include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 #include <dev/cons.h>
 
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index d9ea62aeac7..69538ee216b 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_variables.c,v 1.13 2011/04/05 19:54:35 jasper Exp $	*/
+/*	$OpenBSD: db_variables.c,v 1.14 2014/07/08 13:02:57 deraadt Exp $	*/
 /*	$NetBSD: db_variables.c,v 1.8 1996/02/05 01:57:19 christos Exp $	*/
 
 /* 
@@ -28,10 +28,9 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/db_machdep.h>
 
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index ca30469e679..e2988afe04f 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_watch.c,v 1.10 2010/11/27 19:59:11 miod Exp $ */
+/*	$OpenBSD: db_watch.c,v 1.11 2014/07/08 13:02:57 deraadt Exp $ */
 /*	$NetBSD: db_watch.c,v 1.9 1996/03/30 22:30:12 christos Exp $	*/
 
 /* 
@@ -31,6 +31,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/proc.h>
 
 #include <machine/db_machdep.h>
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 9567548ddf0..f1db795d971 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_write_cmd.c,v 1.11 2009/05/30 20:58:49 miod Exp $	*/
+/*	$OpenBSD: db_write_cmd.c,v 1.12 2014/07/08 13:02:57 deraadt Exp $	*/
 /*	$NetBSD: db_write_cmd.c,v 1.6 1996/02/05 01:57:25 christos Exp $	*/
 
 /* 
@@ -31,10 +31,9 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/db_machdep.h>
 
 #include <ddb/db_lex.h>