Moved some #includes from <sys/param.h> nearer to where they are actually

used.

47 files changed, 108 insertions, 48 deletions

diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 5e1bb32..f4475bb 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.122 1998/02/06 12:13:10 eivind Exp $
+ *	$Id: trap.c,v 1.123 1998/03/23 19:52:37 jlemon Exp $
  */
 
 /*
@@ -57,6 +57,7 @@
 #include <sys/signalvar.h>
 #include <sys/syscall.h>
 #include <sys/sysent.h>
+#include <sys/uio.h>
 #include <sys/vmmeter.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index aac40a0..b50cf58 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_socket.c,v 1.11 1997/12/16 17:40:11 eivind Exp $
+ *  $Id: linux_socket.c,v 1.12 1998/02/07 02:13:27 msmith Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -41,6 +41,7 @@
 #include <sys/sysproto.h>
 #include <sys/fcntl.h>
 #include <sys/socket.h>
+#include <sys/uio.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 84682a9..072be4e 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -39,6 +39,7 @@
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
+#include <sys/uio.h>
 
 #include <machine/clock.h>
 #include <machine/joystick.h>
diff --git a/sys/gnu/ext2fs/ext2_balloc.c b/sys/gnu/ext2fs/ext2_balloc.c
index 3d87123..b2317a2 100644
--- a/sys/gnu/ext2fs/ext2_balloc.c
+++ b/sys/gnu/ext2fs/ext2_balloc.c
@@ -43,6 +43,7 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/lock.h>
+#include <sys/ucred.h>
 #include <sys/vnode.h>
 
 #include <ufs/ufs/quota.h>
diff --git a/sys/gnu/ext2fs/ext2_subr.c b/sys/gnu/ext2fs/ext2_subr.c
index 1f1ce96..3040d24 100644
--- a/sys/gnu/ext2fs/ext2_subr.c
+++ b/sys/gnu/ext2fs/ext2_subr.c
@@ -45,6 +45,7 @@
 
 #include <sys/lock.h>
 #include <sys/systm.h>
+#include <sys/ucred.h>
 #include <sys/vnode.h>
 #include <gnu/ext2fs/ext2_extern.h>
 #include <sys/buf.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_balloc.c b/sys/gnu/fs/ext2fs/ext2_balloc.c
index 3d87123..b2317a2 100644
--- a/sys/gnu/fs/ext2fs/ext2_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_balloc.c
@@ -43,6 +43,7 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/lock.h>
+#include <sys/ucred.h>
 #include <sys/vnode.h>
 
 #include <ufs/ufs/quota.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index 1f1ce96..3040d24 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -45,6 +45,7 @@
 
 #include <sys/lock.h>
 #include <sys/systm.h>
+#include <sys/ucred.h>
 #include <sys/vnode.h>
 #include <gnu/ext2fs/ext2_extern.h>
 #include <sys/buf.h>
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 6cccc4f..a90283a 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.55 1997/09/14 03:19:01 peter Exp $
+ *	$Id: cons.c,v 1.56 1998/01/24 02:54:12 eivind Exp $
  */
 
 #include "opt_devfs.h"
@@ -52,6 +52,7 @@
 #include <sys/sysctl.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
+#include <sys/uio.h>
 
 #include <machine/cpu.h>
 #include <machine/cons.h>
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 5e1bb32..f4475bb 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.122 1998/02/06 12:13:10 eivind Exp $
+ *	$Id: trap.c,v 1.123 1998/03/23 19:52:37 jlemon Exp $
  */
 
 /*
@@ -57,6 +57,7 @@
 #include <sys/signalvar.h>
 #include <sys/syscall.h>
 #include <sys/sysent.h>
+#include <sys/uio.h>
 #include <sys/vmmeter.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index 7965ddf..cd40df4 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $Id: asc.c,v 1.27 1997/09/14 03:19:05 peter Exp $
+ * $Id: asc.c,v 1.28 1998/01/24 02:54:15 eivind Exp $
  */
 
 #include "asc.h"
@@ -67,6 +67,7 @@
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
+#include <sys/uio.h>
 
 #include <machine/asc_ioctl.h>
 
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index c9aa02d..966249f 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -46,6 +46,7 @@
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
+#include <sys/uio.h>
 
 #include <machine/gsc.h>
 
diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c
index 84682a9..072be4e 100644
--- a/sys/i386/isa/joy.c
+++ b/sys/i386/isa/joy.c
@@ -39,6 +39,7 @@
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
+#include <sys/uio.h>
 
 #include <machine/clock.h>
 #include <machine/joystick.h>
diff --git a/sys/i386/isa/pcvt/pcvt_sup.c b/sys/i386/isa/pcvt/pcvt_sup.c
index d34c01b..24144e1 100644
--- a/sys/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/i386/isa/pcvt/pcvt_sup.c
@@ -66,6 +66,8 @@
 
 #include <i386/isa/pcvt/pcvt_hdr.h>	/* global include */
 
+#include <sys/resource.h>
+
 static void vid_cursor ( struct cursorshape *data );
 static void vgasetfontattr ( struct vgafontattr *data );
 static void vgagetfontattr ( struct vgafontattr *data );
diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c
index c7c00fa..cc7b94d 100644
--- a/sys/i386/isa/psm.c
+++ b/sys/i386/isa/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: psm.c,v 1.49 1998/01/24 02:54:23 eivind Exp $
+ * $Id: psm.c,v 1.50 1998/01/24 12:12:32 yokota Exp $
  */
 
 /*
@@ -79,9 +79,11 @@
 #include <sys/devfsext.h>
 #endif
 #include <sys/select.h>
+#include <sys/uio.h>
 
 #include <machine/apm_bios.h>
 #include <machine/clock.h>
+#include <machine/limits.h>
 #include <machine/mouse.h>
 
 #include <i386/isa/isa_device.h>
diff --git a/sys/i386/linux/linux_socket.c b/sys/i386/linux/linux_socket.c
index aac40a0..b50cf58 100644
--- a/sys/i386/linux/linux_socket.c
+++ b/sys/i386/linux/linux_socket.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_socket.c,v 1.11 1997/12/16 17:40:11 eivind Exp $
+ *  $Id: linux_socket.c,v 1.12 1998/02/07 02:13:27 msmith Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -41,6 +41,7 @@
 #include <sys/sysproto.h>
 #include <sys/fcntl.h>
 #include <sys/socket.h>
+#include <sys/uio.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/sys/isa/joy.c b/sys/isa/joy.c
index 84682a9..072be4e 100644
--- a/sys/isa/joy.c
+++ b/sys/isa/joy.c
@@ -39,6 +39,7 @@
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
+#include <sys/uio.h>
 
 #include <machine/clock.h>
 #include <machine/joystick.h>
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index 0d3f31c..6397843 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: kern_physio.c,v 1.23 1998/01/24 02:01:18 dyson Exp $
+ * $Id: kern_physio.c,v 1.24 1998/03/19 22:48:05 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -24,6 +24,8 @@
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
+#include <sys/uio.h>
+
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index b8f8c47..46089c7 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_synch.c	8.9 (Berkeley) 5/19/95
- * $Id: kern_synch.c,v 1.49 1998/03/08 09:56:59 julian Exp $
+ * $Id: kern_synch.c,v 1.50 1998/03/11 20:50:42 dufault Exp $
  */
 
 #include "opt_ktrace.h"
@@ -52,6 +52,7 @@
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #ifdef KTRACE
+#include <sys/uio.h>
 #include <sys/ktrace.h>
 #endif
 
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 5e1bb32..f4475bb 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.122 1998/02/06 12:13:10 eivind Exp $
+ *	$Id: trap.c,v 1.123 1998/03/23 19:52:37 jlemon Exp $
  */
 
 /*
@@ -57,6 +57,7 @@
 #include <sys/signalvar.h>
 #include <sys/syscall.h>
 #include <sys/sysent.h>
+#include <sys/uio.h>
 #include <sys/vmmeter.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index c237952..c6b9320 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: sys_pipe.c,v 1.39 1998/02/09 06:09:25 eivind Exp $
+ * $Id: sys_pipe.c,v 1.40 1998/03/26 20:51:47 phk Exp $
  */
 
 /*
@@ -62,6 +62,7 @@
 #include <sys/signalvar.h>
 #include <sys/sysproto.h>
 #include <sys/pipe.h>
+#include <sys/uio.h>
 
 #include <vm/vm.h>
 #include <vm/vm_prot.h>
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 5f9c5e3..5814c3a 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_socket.c	8.1 (Berkeley) 6/10/93
- * $Id: sys_socket.c,v 1.15 1997/08/16 19:15:02 wollman Exp $
+ * $Id: sys_socket.c,v 1.16 1997/09/14 02:52:15 peter Exp $
  */
 
 #include <sys/param.h>
@@ -43,6 +43,7 @@
 #include <sys/filio.h>			/* XXX */
 #include <sys/sockio.h>
 #include <sys/stat.h>
+#include <sys/uio.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 6cccc4f..a90283a 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.55 1997/09/14 03:19:01 peter Exp $
+ *	$Id: cons.c,v 1.56 1998/01/24 02:54:12 eivind Exp $
  */
 
 #include "opt_devfs.h"
@@ -52,6 +52,7 @@
 #include <sys/sysctl.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
+#include <sys/uio.h>
 
 #include <machine/cpu.h>
 #include <machine/cons.h>
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 4debb5f..58e309a 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
- *	$Id: uipc_socket.c,v 1.37 1998/02/19 19:38:20 fenner Exp $
+ *	$Id: uipc_socket.c,v 1.38 1998/03/01 19:39:17 guido Exp $
  */
 
 #include <sys/param.h>
@@ -49,6 +49,7 @@
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
 #include <sys/sysctl.h>
+#include <sys/uio.h>
 
 #include <machine/limits.h>
 
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index c1a5826..76470e9 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_syscalls.c	8.4 (Berkeley) 2/21/94
- * $Id: uipc_syscalls.c,v 1.35 1997/12/16 17:40:30 eivind Exp $
+ * $Id: uipc_syscalls.c,v 1.36 1998/02/09 06:09:27 eivind Exp $
  */
 
 #include "opt_compat.h"
@@ -50,6 +50,7 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/signalvar.h>
+#include <sys/uio.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 3f74014..33e524e 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: vfs_aio.c,v 1.23 1998/02/09 06:09:28 eivind Exp $
+ * $Id: vfs_aio.c,v 1.24 1998/02/25 06:30:15 bde Exp $
  */
 
 /*
@@ -49,6 +49,7 @@
 #include <sys/user.h>
 
 #include <machine/cpu.h>
+#include <machine/limits.h>
 
 static	int jobrefid;
 
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index 41d5430..9d90c31 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vnops.c	8.15 (Berkeley) 5/21/95
- * $Id: kernfs_vnops.c,v 1.28 1997/10/27 13:33:40 bde Exp $
+ * $Id: kernfs_vnops.c,v 1.29 1998/03/26 20:52:21 phk Exp $
  */
 
 /*
@@ -52,6 +52,8 @@
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/dirent.h>
+#include <sys/resource.h>
+
 #include <miscfs/kernfs/kernfs.h>
 
 #define KSTRING	256		/* Largest I/O available via this filesystem */
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index f12a85c..9d774e4 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -70,7 +70,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: ppp_tty.c,v 1.29 1997/12/06 13:24:37 bde Exp $ */
+/* $Id: ppp_tty.c,v 1.30 1998/02/13 12:46:15 phk Exp $ */
 
 #include "ppp.h"
 #if NPPP > 0
@@ -88,7 +88,7 @@
 #include <sys/fcntl.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
-
+#include <sys/uio.h>
 
 /*
  * XXX stop <sys/vnode.h> from including <vnode_if.h>.  <vnode_if.h> doesn't
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 849e26f..6ea3795 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
- *	$Id: in_pcb.c,v 1.40 1998/03/24 18:06:08 wollman Exp $
+ *	$Id: in_pcb.c,v 1.41 1998/03/28 10:18:21 bde Exp $
  */
 
 #include <sys/param.h>
@@ -45,6 +45,8 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
+#include <machine/limits.h>
+
 #include <vm/vm_zone.h>
 
 #include <net/if.h>
diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c
index 7dbcd9e..1cc0ec8 100644
--- a/sys/nfs/bootp_subr.c
+++ b/sys/nfs/bootp_subr.c
@@ -1,4 +1,4 @@
-/*	$Id: bootp_subr.c,v 1.10 1998/03/14 03:25:14 tegge Exp $	*/
+/*	$Id: bootp_subr.c,v 1.11 1998/03/14 04:13:56 tegge Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -53,6 +53,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/uio.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c
index be53843..f1dfa96 100644
--- a/sys/nfs/krpc_subr.c
+++ b/sys/nfs/krpc_subr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $	*/
-/*	$Id: krpc_subr.c,v 1.7 1997/10/28 15:59:03 bde Exp $	*/
+/*	$Id: krpc_subr.c,v 1.8 1998/03/14 03:25:16 tegge Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -49,6 +49,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/uio.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index 7dbcd9e..1cc0ec8 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -1,4 +1,4 @@
-/*	$Id: bootp_subr.c,v 1.10 1998/03/14 03:25:14 tegge Exp $	*/
+/*	$Id: bootp_subr.c,v 1.11 1998/03/14 04:13:56 tegge Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -53,6 +53,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/uio.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c
index be53843..f1dfa96 100644
--- a/sys/nfsclient/krpc_subr.c
+++ b/sys/nfsclient/krpc_subr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $	*/
-/*	$Id: krpc_subr.c,v 1.7 1997/10/28 15:59:03 bde Exp $	*/
+/*	$Id: krpc_subr.c,v 1.8 1998/03/14 03:25:16 tegge Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -49,6 +49,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
+#include <sys/uio.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index ac24de7..f836d14 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -157,6 +157,8 @@
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /* DEVFS */
+#include <sys/uio.h>
+
 #if defined(METEOR_FreeBSD_210)
 #include <machine/cpu.h>	/* bootverbose */
 #endif
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c
index 7998282..086f426 100644
--- a/sys/scsi/scsi_ioctl.c
+++ b/sys/scsi/scsi_ioctl.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *End copyright
  *
- * $Id: scsi_ioctl.c,v 1.28 1998/02/01 04:13:00 wollman Exp $
+ * $Id: scsi_ioctl.c,v 1.29 1998/02/01 18:09:46 wollman Exp $
  *
  *
  */
@@ -54,6 +54,7 @@
 
 #include <sys/fcntl.h>
 #include <sys/proc.h>
+#include <sys/uio.h>
 
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_debug.h>
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 6d6b356..329a4b0 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id: buf.h,v 1.48 1998/03/16 01:55:33 dyson Exp $
+ * $Id: buf.h,v 1.49 1998/03/19 22:49:01 dyson Exp $
  */
 
 #ifndef _SYS_BUF_H_
@@ -276,6 +276,8 @@ extern int	needsbuffer, numdirtybuffers;
 extern TAILQ_HEAD(swqueue, buf) bswlist;
 extern TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
 
+struct uio;
+
 void	bufinit __P((void));
 void	bremfree __P((struct buf *));
 int	bread __P((struct vnode *, daddr_t, int,
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 6d6b356..329a4b0 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id: buf.h,v 1.48 1998/03/16 01:55:33 dyson Exp $
+ * $Id: buf.h,v 1.49 1998/03/19 22:49:01 dyson Exp $
  */
 
 #ifndef _SYS_BUF_H_
@@ -276,6 +276,8 @@ extern int	needsbuffer, numdirtybuffers;
 extern TAILQ_HEAD(swqueue, buf) bswlist;
 extern TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
 
+struct uio;
+
 void	bufinit __P((void));
 void	bremfree __P((struct buf *));
 int	bread __P((struct vnode *, daddr_t, int,
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 05eae82..09b919c 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -31,15 +31,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.21 (Berkeley) 5/20/95
- *	$Id: mount.h,v 1.57 1998/03/01 22:46:36 msmith Exp $
+ *	$Id: mount.h,v 1.58 1998/03/08 09:58:29 julian Exp $
  */
 
 #ifndef _SYS_MOUNT_H_
 #define _SYS_MOUNT_H_
 
-#ifndef KERNEL
 #include <sys/ucred.h>
-#endif
 #include <sys/queue.h>
 #include <sys/lock.h>
 #include <net/radix.h>
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index ebeb853..27f8343 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)namei.h	8.5 (Berkeley) 1/9/95
- * $Id: namei.h,v 1.18 1998/01/06 05:22:51 dyson Exp $
+ * $Id: namei.h,v 1.19 1998/01/12 19:10:43 phk Exp $
  */
 
 #ifndef _SYS_NAMEI_H_
 #define	_SYS_NAMEI_H_
 
 #include <sys/queue.h>
+#include <sys/uio.h>
 
 /*
  * Encapsulation of namei parameters.
diff --git a/sys/sys/param.h b/sys/sys/param.h
index a8c0f0a..68ac09c 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $Id: param.h,v 1.26 1997/03/03 09:51:10 ache Exp $
+ * $Id: param.h,v 1.27 1997/09/21 22:09:16 gibbs Exp $
  */
 
 #ifndef _SYS_PARAM_H_
@@ -78,21 +78,21 @@
 #include <sys/cdefs.h>
 #include <sys/errno.h>
 #include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/ucred.h>
-#include <sys/uio.h>
-#include <sys/rtprio.h>
 
 #define	FALSE	0
 #define	TRUE	1
 #endif
 
+#ifndef KERNEL
 /* Signals. */
 #include <sys/signal.h>
+#endif
 
 /* Machine type dependent parameters. */
 #include <machine/param.h>
+#ifndef KERNEL
 #include <machine/limits.h>
+#endif
 
 /*
  * Priorities.  Note that with 32 run queues, differences less than 4 are
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index bed9f51..1b58ebd 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.15 (Berkeley) 5/19/95
- * $Id: proc.h,v 1.54 1998/02/20 13:52:15 bde Exp $
+ * $Id: proc.h,v 1.55 1998/03/04 10:26:37 dufault Exp $
  */
 
 #ifndef _SYS_PROC_H_
@@ -46,9 +46,12 @@
 #include <sys/callout.h>		/* For struct callout_handle. */
 #include <sys/rtprio.h>			/* For struct rtprio. */
 #include <sys/select.h>			/* For struct selinfo. */
+#include <sys/signal.h>
+#ifndef KERNEL
 #include <sys/time.h>			/* For structs itimerval, timeval. */
+#endif
+#include <sys/ucred.h>
 #include <sys/queue.h>
-#include <sys/param.h>
 
 /*
  * One structure allocated per session.
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index 7a6c5c1..086b62f 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -31,12 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)resourcevar.h	8.4 (Berkeley) 1/9/95
- * $Id$
+ * $Id: resourcevar.h,v 1.10 1997/02/22 09:45:46 peter Exp $
  */
 
 #ifndef	_SYS_RESOURCEVAR_H_
 #define	_SYS_RESOURCEVAR_H_
 
+#include <sys/resource.h>
+
 /*
  * Kernel per-process accounting / statistics
  * (not necessarily resident except when running).
@@ -78,6 +80,8 @@ struct plimit {
 };
 
 #ifdef KERNEL
+struct proc;
+
 void	 addupc_intr __P((struct proc *p, u_long pc, u_int ticks));
 void	 addupc_task __P((struct proc *p, u_long pc, u_int ticks));
 void	 calcru __P((struct proc *p, struct timeval *up, struct timeval *sp,
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index 54e68a9..320120e 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -31,12 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
- * $Id: signalvar.h,v 1.16 1997/08/30 11:24:05 peter Exp $
+ * $Id: signalvar.h,v 1.17 1998/02/24 02:01:11 bde Exp $
  */
 
 #ifndef	_SYS_SIGNALVAR_H_		/* tmp for user.h */
 #define	_SYS_SIGNALVAR_H_
 
+#include <sys/signal.h>
+
 /*
  * Kernel signal definitions and data structures,
  * not exported to user programs.
@@ -149,6 +151,7 @@ static int sigprop[NSIG + 1] = {
 
 #ifdef KERNEL
 struct pgrp;
+struct proc;
 
 /*
  * Machine-independent functions:
diff --git a/sys/sys/user.h b/sys/sys/user.h
index e05e0ea..ab85860 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
- * $Id: user.h,v 1.13 1997/03/03 08:34:08 ache Exp $
+ * $Id: user.h,v 1.14 1997/03/03 09:51:15 ache Exp $
  */
 
 #ifndef _SYS_USER_H_
@@ -51,11 +51,13 @@
 #include <vm/pmap.h>		/* XXX */
 #include <sys/lock.h>		/* XXX */
 #include <vm/vm_map.h>		/* XXX */
-#else
-#include <vm/vm.h>		/* XXX */
 #endif /* !KERNEL */
+#ifndef _SYS_RESOURCEVAR_H_
 #include <sys/resourcevar.h>
+#endif
+#ifndef _SYS_SIGNALVAR_H_
 #include <sys/signalvar.h>
+#endif
 
 /*
  * KERN_PROC subtype ops return arrays of augmented proc structures:
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 6cd92bd..c109a0a 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,14 +31,15 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $Id: vnode.h,v 1.68 1998/03/08 09:58:35 julian Exp $
+ * $Id: vnode.h,v 1.69 1998/03/16 01:55:35 dyson Exp $
  */
 
 #ifndef _SYS_VNODE_H_
 #define	_SYS_VNODE_H_
 
 #include <sys/queue.h>
-#include <sys/select.h>		/* needed for struct selinfo in vnodes */
+#include <sys/select.h>
+#include <sys/uio.h>
 
 #include <machine/lock.h>
 
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 7d7de14..3653718 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.5 (Berkeley) 3/21/95
- * $Id: ffs_subr.c,v 1.19 1998/02/13 00:20:36 bde Exp $
+ * $Id: ffs_subr.c,v 1.20 1998/03/08 09:58:59 julian Exp $
  */
 
 #include <sys/param.h>
@@ -46,6 +46,8 @@
 #include <sys/lock.h>
 #include <sys/vnode.h>
 #include <sys/buf.h>
+#include <sys/ucred.h>
+
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 #include <ufs/ffs/ffs_extern.h>
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 0f7f210..9e42e63 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vnops.c	8.15 (Berkeley) 5/14/95
- * $Id: ffs_vnops.c,v 1.45 1998/03/19 22:49:44 dyson Exp $
+ * $Id: ffs_vnops.c,v 1.46 1998/03/21 05:16:09 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -46,6 +46,8 @@
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 
+#include <machine/limits.h>
+
 #include <vm/vm.h>
 #include <vm/vm_prot.h>
 #include <vm/vm_page.h>
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index edfaf9b..08ab104 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_meter.c	8.4 (Berkeley) 1/4/94
- * $Id: vm_meter.c,v 1.22 1997/09/01 03:17:19 bde Exp $
+ * $Id: vm_meter.c,v 1.23 1997/11/24 15:15:33 bde Exp $
  */
 
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/resource.h>
 #include <sys/vmmeter.h>
 
 #include <vm/vm.h>