From bbc3f849b8d3d96bfba85c0a375a7d1059b84ba0 Mon Sep 17 00:00:00 2001
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Sun, 7 Nov 1993 17:54:32 +0000
Subject: [PATCH] Made all header files idempotent and moved incorrect common
 data from headers into a related source file.

---
 sys/isofs/iso.h         |  6 +++++-
 sys/isofs/iso_rrip.h    |  6 +++++-
 sys/isofs/isofs_node.h  |  6 +++++-
 sys/isofs/isofs_rrip.h  |  6 +++++-
 sys/kern/kern_clock.c   |  6 +++++-
 sys/kern/sysv_shm.c     |  6 +++++-
 sys/kern/uipc_domain.c  |  4 +++-
 sys/kern/uipc_mbuf.c    | 11 ++++++++++-
 sys/kern/vfs__bio.c     | 14 +++++++++++++-
 sys/kern/vfs_lookup.c   |  4 +++-
 sys/kern/vfs_subr.c     |  4 +++-
 sys/nfs/nfs.h           |  4 ++--
 sys/nfs/nfs_subs.c      |  4 +++-
 sys/nfs/nfsnode.h       |  4 +++-
 sys/pcfs/bootsect.h     |  6 +++++-
 sys/pcfs/bpb.h          |  6 +++++-
 sys/pcfs/denode.h       |  6 +++++-
 sys/pcfs/direntry.h     |  6 +++++-
 sys/pcfs/fat.h          |  6 +++++-
 sys/pcfs/pcfsmount.h    |  6 +++++-
 sys/scsi/scsi_all.h     |  6 +++++-
 sys/scsi/scsi_cd.h      |  7 +++++--
 sys/scsi/scsi_changer.h |  6 +++++-
 sys/scsi/scsi_disk.h    |  6 +++++-
 sys/scsi/scsi_tape.h    |  6 +++++-
 sys/scsi/scsiconf.h     |  6 +++++-
 sys/ufs/dinode.h        |  6 +++++-
 sys/ufs/fs.h            |  6 +++++-
 sys/ufs/inode.h         |  8 ++++++--
 sys/ufs/lockf.h         |  6 +++++-
 sys/ufs/mfsiom.h        |  6 +++++-
 sys/ufs/mfsnode.h       |  6 +++++-
 sys/ufs/ufs_inode.c     |  4 +++-
 sys/ufs/ufsmount.h      |  8 ++++++--
 sys/vm/device_pager.c   | 11 ++++++++++-
 sys/vm/device_pager.h   | 13 +++----------
 sys/vm/lock.h           | 10 ++++------
 sys/vm/swap_pager.c     | 16 ++++++++++++++--
 sys/vm/swap_pager.h     | 11 ++---------
 sys/vm/vm.h             |  9 +++++----
 sys/vm/vm_fault.c       |  4 +++-
 sys/vm/vm_glue.c        | 25 +++++++++++++++++--------
 sys/vm/vm_kern.c        |  8 +++++++-
 sys/vm/vm_kern.h        | 16 ++++++++++------
 sys/vm/vm_meter.c       | 18 +++++++++++++++++-
 sys/vm/vm_object.c      | 14 +++++++++++++-
 sys/vm/vm_object.h      | 26 +++++++++++++-------------
 sys/vm/vm_page.h        | 12 ++++++------
 sys/vm/vm_pageout.c     |  3 ++-
 sys/vm/vm_pageout.h     |  8 ++++++--
 sys/vm/vm_param.h       | 16 ++++++++--------
 sys/vm/vm_prot.h        |  4 ++--
 sys/vm/vm_statistics.h  |  6 +++---
 sys/vm/vm_user.h        | 17 +++++++++++++++--
 sys/vm/vnode_pager.c    | 11 ++++++++++-
 sys/vm/vnode_pager.h    | 16 +++++-----------
 56 files changed, 345 insertions(+), 137 deletions(-)

diff --git a/sys/isofs/iso.h b/sys/isofs/iso.h
index bff01b142b..462039d725 100644
--- a/sys/isofs/iso.h
+++ b/sys/isofs/iso.h
@@ -1,7 +1,10 @@
 /*
- *	$Id: iso.h,v 1.3 1993/07/19 13:40:01 cgd Exp $
+ *	$Id: iso.h,v 1.2 1993/07/20 03:27:24 jkh Exp $
  */
 
+#ifndef _ISOFS_ISO_H_
+#define _ISOFS_ISO_H_ 1
+
 #define ISODCL(from, to) (to - from + 1)
 
 struct iso_volume_descriptor {
@@ -111,3 +114,4 @@ int isofs_fhtovp __P((struct mount *mp, struct fid *fhp, struct vnode **vpp));
 int isofs_vptofh __P((struct vnode *vp, struct fid *fhp));
 int isofs_init __P(());
 
+#endif /* _ISOFS_ISO_H_ */
diff --git a/sys/isofs/iso_rrip.h b/sys/isofs/iso_rrip.h
index 01df4e49e3..37d10a07c4 100644
--- a/sys/isofs/iso_rrip.h
+++ b/sys/isofs/iso_rrip.h
@@ -29,9 +29,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)iso_rrip.h
- *	$Id: iso_rrip.h,v 1.2 1993/10/16 19:26:44 rgrimes Exp $
+ *	$Id: iso_rrip.h,v 1.3 1993/10/25 19:43:02 rgrimes Exp $
  */
 
+#ifndef _ISOFS_ISO_RRIP_H_
+#define _ISOFS_ISO_RRIP_H_ 1
+
 /*
  *	Analyze function flag
  */
@@ -54,3 +57,4 @@ typedef struct {
 	char		*iso_altname;	/* Alt Name (no Null terminated ) */
 	char		*iso_symname;	/* Symbol Name (no NULL termninated )*/
 } ISO_RRIP_ANALYZE;
+#endif /* _ISOFS_ISO_RRIP_H_ */
diff --git a/sys/isofs/isofs_node.h b/sys/isofs/isofs_node.h
index fc5fdca4e0..51e8a2d85c 100644
--- a/sys/isofs/isofs_node.h
+++ b/sys/isofs/isofs_node.h
@@ -1,7 +1,10 @@
 /*
- *	$Id: isofs_node.h,v 1.5 1993/07/19 13:40:05 cgd Exp $
+ *	$Id: isofs_node.h,v 1.2 1993/07/20 03:27:31 jkh Exp $
  */
 
+#ifndef _ISOFS_ISOFS_NODE_H_
+#define _ISOFS_ISOFS_NODE_H_ 1
+
 
 typedef	struct	{
 	unsigned	iso_cln;	/* Child link */
@@ -90,3 +93,4 @@ int isofs_strategy __P((struct buf *bp));
 int isofs_print __P((struct vnode *vp));
 int isofs_islocked __P((struct vnode *vp));
 
+#endif /* _ISOFS_ISOFS_NODE_H_ */
diff --git a/sys/isofs/isofs_rrip.h b/sys/isofs/isofs_rrip.h
index d4be228cf6..b9e43a0fa3 100644
--- a/sys/isofs/isofs_rrip.h
+++ b/sys/isofs/isofs_rrip.h
@@ -29,9 +29,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isofs_rrip.h
- *	$Id$
+ *	$Id: isofs_rrip.h,v 1.2 1993/10/16 19:26:45 rgrimes Exp $
  */
 
+#ifndef _ISOFS_ISOFS_RRIP_H_
+#define _ISOFS_ISOFS_RRIP_H_ 1
+
 typedef struct {
 	char 	      type		[ISODCL (  0,    1)];
 	unsigned char length		[ISODCL (  2,    2)]; /* 711 */
@@ -122,3 +125,4 @@ typedef struct {
 	unsigned char flags		[ISODCL (  4,    4)];
 } ISO_RRIP_EXFLAG;
 
+#endif /* _ISOFS_ISOFS_RRIP_H_ */
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 4ec550f421..69d0830800 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)kern_clock.c	7.16 (Berkeley) 5/9/91
- *	$Id: kern_clock.c,v 1.4 1993/10/19 09:05:51 davidg Exp $
+ *	$Id: kern_clock.c,v 1.6 1993/10/25 02:02:51 davidg Exp $
  */
 
 #include "param.h"
@@ -51,6 +51,10 @@
 #include "gprof.h"
 #endif
 
+/* From callout.h */
+struct callout *callfree, *callout, calltodo;
+int ncallout;
+
 /*
  * Clock handling routines.
  *
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index a1ffc194bf..adb8111723 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -37,7 +37,7 @@
  *
  *	from: Utah $Hdr: uipc_shm.c 1.9 89/08/14$
  *	from: @(#)sysv_shm.c	7.15 (Berkeley) 5/13/91
- *	$Id$
+ *	$Id: sysv_shm.c,v 1.4 1993/10/16 15:24:52 rgrimes Exp $
  */
 
 /*
@@ -64,6 +64,10 @@
 #include "hp300/hpux/hpux.h"
 #endif
 
+/* From shm.h */
+struct	shmid_ds	*shmsegs;
+struct	shminfo		shminfo;
+
 int	shmat(), shmctl(), shmdt(), shmget();
 int	(*shmcalls[])() = { shmat, shmctl, shmdt, shmget };
 int	shmtot = 0;
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index 6b0d60fb34..9e85ada361 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)uipc_domain.c	7.9 (Berkeley) 3/4/91
- *	$Id$
+ *	$Id: uipc_domain.c,v 1.2 1993/10/16 15:25:06 rgrimes Exp $
  */
 
 #include <sys/cdefs.h>
@@ -43,6 +43,8 @@
 #include "time.h"
 #include "kernel.h"
 
+struct domain *domains;
+
 #define	ADDDOMAIN(x)	{ \
 	extern struct domain __CONCAT(x,domain); \
 	__CONCAT(x,domain.dom_next) = domains; \
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 302fc633d2..8afd4dacad 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)uipc_mbuf.c	7.19 (Berkeley) 4/20/91
- *	$Id$
+ *	$Id: uipc_mbuf.c,v 1.3 1993/10/16 15:25:07 rgrimes Exp $
  */
 
 #include "param.h"
@@ -46,6 +46,15 @@
 #include "protosw.h"
 #include "vm/vm.h"
 
+/* From sys/mbuf.h */
+struct 	mbstat mbstat;
+int	nmbclusters;
+union	mcluster *mclfree;
+int	max_linkhdr;
+int	max_protohdr;
+int	max_hdr;
+int	max_datalen;
+
 extern	vm_map_t mb_map;
 struct	mbuf *mbutl;
 char	*mclrefcnt;
diff --git a/sys/kern/vfs__bio.c b/sys/kern/vfs__bio.c
index e510e59164..66637e73ce 100644
--- a/sys/kern/vfs__bio.c
+++ b/sys/kern/vfs__bio.c
@@ -45,7 +45,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vfs__bio.c,v 1.6 1993/10/16 15:25:16 rgrimes Exp $
+ *	$Id: vfs__bio.c,v 1.7 1993/10/19 01:06:29 nate Exp $
  */
 
 #include "param.h"
@@ -59,6 +59,18 @@
 #include "vm/vm.h"
 #include "resourcevar.h"
 
+/* From sys/buf.h */
+struct	buf *buf;		/* the buffer pool itself */
+char	*buffers;
+int	nbuf;			/* number of buffer headers */
+int	bufpages;		/* number of memory pages in the buffer pool */
+struct	buf *swbuf;		/* swap I/O headers */
+int	nswbuf;
+struct	bufhd bufhash[BUFHSZ];	/* heads of hash lists */
+struct	buf bfreelist[BQUEUES];	/* heads of available lists */
+struct	buf bswlist;		/* head of free swap header list */
+struct	buf *bclnlist;		/* head of cleaned page list */
+
 static struct buf *getnewbuf(int);
 extern	vm_map_t buffer_map;
 
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 6ab1543df5..dd1827f79b 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vfs_lookup.c	7.32 (Berkeley) 5/21/91
- *	$Id$
+ *	$Id: vfs_lookup.c,v 1.2 1993/10/16 15:25:23 rgrimes Exp $
  */
 
 #include "param.h"
@@ -49,6 +49,8 @@
 #include "ktrace.h"
 #endif
 
+u_long nextvnodeid;
+
 /*
  * Convert a pathname into a pointer to a locked inode.
  *
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index c9fcb51f30..8a5ad6d28b 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vfs_subr.c	7.60 (Berkeley) 6/21/91
- *	$Id: vfs_subr.c,v 1.3 1993/10/16 15:25:25 rgrimes Exp $
+ *	$Id: vfs_subr.c,v 1.4 1993/10/18 14:22:16 davidg Exp $
  */
 
 /*
@@ -50,6 +50,8 @@
 #include "errno.h"
 #include "malloc.h"
 
+struct vnode *speclisth[SPECHSZ]; /* device special file vnode hash table */
+
 /*
  * Remove a mount point from the list of mounted filesystems.
  * Unmount of the root is illegal.
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index 4078c4698e..169df5eeee 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	From:	@(#)nfs.h	7.11 (Berkeley) 4/19/91
- *	$Id$
+ *	$Id: nfs.h,v 1.2 1993/09/09 22:05:59 rgrimes Exp $
  */
 
 #ifndef __h_nfs
@@ -164,7 +164,7 @@ struct nfsstats {
 };
 
 #ifdef KERNEL
-struct nfsstats nfsstats;
+extern struct nfsstats nfsstats;
 #endif /* KERNEL */
 
 #endif /* __h_nfs */
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 6d86451f24..f566b57ea7 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	From:	@(#)nfs_subs.c	7.41 (Berkeley) 5/15/91
- *	$Id$
+ *	$Id: nfs_subs.c,v 1.2 1993/09/09 22:06:08 rgrimes Exp $
  */
 
 /*
@@ -71,6 +71,8 @@
 #define TRUE	1
 #define	FALSE	0
 
+struct nfsstats nfsstats;
+
 /*
  * Data items converted to xdr at startup, since they are constant
  * This is kinda hokey, but may save a little time doing byte swaps
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index fc16705044..d0499d14b7 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	From:	@(#)nfsnode.h	7.12 (Berkeley) 4/16/91
- *	$Id: nfsnode.h,v 1.2 1993/09/09 22:06:24 rgrimes Exp $
+ *	$Id: nfsnode.h,v 1.3 1993/10/20 07:31:16 davidg Exp $
  */
 
 #ifndef __h_nfsnode
@@ -87,6 +87,7 @@ struct nfsnode {
 /*
  * Prototypes for NFS vnode operations
  */
+#ifdef KERNEL
 int	nfs_lookup __P((
 		struct vnode *vp,
 		struct nameidata *ndp,
@@ -226,4 +227,5 @@ int	nfs_advlock __P((
 		int flags));
 
 void	nfs_nput __P((struct vnode *));
+#endif /* KERNEL */
 #endif /* __h_nfsnode */
diff --git a/sys/pcfs/bootsect.h b/sys/pcfs/bootsect.h
index 9b836a2cc4..4b0ee8a9d7 100644
--- a/sys/pcfs/bootsect.h
+++ b/sys/pcfs/bootsect.h
@@ -15,9 +15,12 @@
  *
  *  October 1992
  *
- *	$Id$
+ *	$Id: bootsect.h,v 1.2 1993/10/16 19:29:24 rgrimes Exp $
  */
 
+#ifndef _PCFS_BOOTSECT_H_
+#define _PCFS_BOOTSECT_H_ 1
+
 /*
  *  Format of a boot sector.  This is the first sector
  *  on a DOS floppy disk or the fist sector of a partition
@@ -70,3 +73,4 @@ union bootsector {
 #define	bsHeads		bsBPB.bpbHeads
 #define	bsHiddenSecs	bsBPB.bpbHiddenSecs
 #define	bsHugeSectors	bsBPB.bpbHugeSectors
+#endif /* _PCFS_BOOTSECT_H_ */
diff --git a/sys/pcfs/bpb.h b/sys/pcfs/bpb.h
index 844d8513a9..b6d662d1cf 100644
--- a/sys/pcfs/bpb.h
+++ b/sys/pcfs/bpb.h
@@ -15,9 +15,12 @@
  *
  *  October 1992
  *
- *	$Id$
+ *	$Id: bpb.h,v 1.2 1993/10/16 19:29:25 rgrimes Exp $
  */
 
+#ifndef _PCFS_BPB_H_
+#define _PCFS_BPB_H_ 1
+
 /*
  *  BIOS Parameter Block (BPB) for DOS 3.3
  */
@@ -108,3 +111,4 @@ struct byte_bpb50 {
 	char bpbHiddenSecs[4];	/* number of hidden sectors		*/
 	char bpbHugeSectors[4];	/* number of sectrs if bpbSectors == 0	*/
 };
+#endif /* _PCFS_BPB_H_ */
diff --git a/sys/pcfs/denode.h b/sys/pcfs/denode.h
index 4c28393e53..32142fd481 100644
--- a/sys/pcfs/denode.h
+++ b/sys/pcfs/denode.h
@@ -15,9 +15,12 @@
  *
  *  October 1992
  *
- *	$Id$
+ *	$Id: denode.h,v 1.2 1993/10/16 19:29:26 rgrimes Exp $
  */
 
+#ifndef _PCFS_DENODE_H_
+#define _PCFS_DENODE_H_ 1
+
 /*
  *  This is the pc filesystem specific portion of the
  *  vnode structure.
@@ -246,3 +249,4 @@ int pcfs_advlock __P((struct vnode *vp, caddr_t id, int op, struct flock *fl,
 int deget __P((struct pcfsmount *pmp, u_long dirclust, u_long diroffset,
 	struct direntry *direntptr, struct denode **depp));
 #endif /* defined(KERNEL) */
+#endif /* _PCFS_DENODE_H_ */
diff --git a/sys/pcfs/direntry.h b/sys/pcfs/direntry.h
index 7d25f6a80a..8aa06e1c0d 100644
--- a/sys/pcfs/direntry.h
+++ b/sys/pcfs/direntry.h
@@ -15,9 +15,12 @@
  *
  *  October 1992
  *
- *	$Id$
+ *	$Id: direntry.h,v 1.2 1993/10/16 19:29:28 rgrimes Exp $
  */
 
+#ifndef _PCFS_DIRENTRY_H_
+#define _PCFS_DIRENTRY_H_ 1
+
 /*
  *  Structure of a dos directory entry.
  */
@@ -94,3 +97,4 @@ void dos2unixtime __P((union dosdate *ddp,
 int  dos2unixfn __P((u_char dn[11], u_char *un));
 void unix2dosfn __P((u_char *un, u_char dn[11], int unlen));
 #endif /* defined(KERNEL) */
+#endif /* _PCFS_DIRENTRY_H_ */
diff --git a/sys/pcfs/fat.h b/sys/pcfs/fat.h
index 1a3c1cf4a7..4b7d2eb97f 100644
--- a/sys/pcfs/fat.h
+++ b/sys/pcfs/fat.h
@@ -15,9 +15,12 @@
  *
  *  October 1992
  *
- *	$Id$
+ *	$Id: fat.h,v 1.2 1993/10/16 19:29:29 rgrimes Exp $
  */
 
+#ifndef _PCFS_FAT_H_
+#define _PCFS_FAT_H_ 1
+
 /*
  *  Some useful cluster numbers.
  */
@@ -65,3 +68,4 @@ int fatentry __P((int function, struct pcfsmount *pmp,
 	u_long cluster, u_long *oldcontents, u_long newcontents));
 int freeclusterchain __P((struct pcfsmount *pmp, u_long startchain));
 #endif /* defined(KERNEL) */
+#endif /* _PCFS_FAT_H_ */
diff --git a/sys/pcfs/pcfsmount.h b/sys/pcfs/pcfsmount.h
index c7c2537a59..a63962f1c5 100644
--- a/sys/pcfs/pcfsmount.h
+++ b/sys/pcfs/pcfsmount.h
@@ -15,9 +15,12 @@
  *
  *  October 1992
  *
- *	$Id$
+ *	$Id: pcfsmount.h,v 1.2 1993/10/16 19:29:41 rgrimes Exp $
  */
 
+#ifndef _PCFS_PCFSMOUNT_H_
+#define _PCFS_PCFSMOUNT_H_ 1
+
 /*
  *  Layout of the mount control block for a msdos
  *  file system.
@@ -140,3 +143,4 @@ int pcfs_sync __P((struct mount *mp, int waitfor));
 int pcfs_fhtovp __P((struct mount *mp, struct fid *fhp, struct vnode **vpp));
 int pcfs_vptofh __P((struct vnode *vp, struct fid *fhp));
 int pcfs_init __P(());
+#endif /* _PCFS_PCFSMOUNT_H_ */
diff --git a/sys/scsi/scsi_all.h b/sys/scsi/scsi_all.h
index 3f1c348ebe..8de19b04d6 100644
--- a/sys/scsi/scsi_all.h
+++ b/sys/scsi/scsi_all.h
@@ -18,9 +18,12 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id$
+ *	$Id: scsi_all.h,v 1.4 1993/08/21 20:01:51 rgrimes Exp $
  */
 
+#ifndef _SCSI_SCSI_ALL_H_
+#define _SCSI_SCSI_ALL_H_ 1
+
 /*
  * SCSI command format
  */
@@ -321,3 +324,4 @@ struct scsi_mode_header_big
 #define	SCSI_CHECK		0x02
 #define	SCSI_BUSY		0x08	
 #define SCSI_INTERM		0x10
+#endif /* _SCSI_SCSI_ALL_H_ */
diff --git a/sys/scsi/scsi_cd.h b/sys/scsi/scsi_cd.h
index eb9bfac8fc..e9e80ded5a 100644
--- a/sys/scsi/scsi_cd.h
+++ b/sys/scsi/scsi_cd.h
@@ -14,9 +14,12 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id$
+ *	$Id: scsi_cd.h,v 1.4 1993/08/21 20:01:52 rgrimes Exp $
  */
 
+#ifndef _SCSI_SCSI_CD_H_
+#define _SCSI_SCSI_CD_H_ 1
+
 /*
  *	Define two bits always in the same place in byte 2 (flag byte)
  */
@@ -139,7 +142,6 @@ struct scsi_read_toc
 	u_char	data_len[2];
 	u_char	control;
 };
-;
 
 struct scsi_read_cd_capacity
 {
@@ -224,3 +226,4 @@ struct cd_mode_data
 	union cd_pages page;
 };
 
+#endif /* _SCSI_SCSI_CD_H_ */
diff --git a/sys/scsi/scsi_changer.h b/sys/scsi/scsi_changer.h
index 4cadd3221a..dda22eea72 100644
--- a/sys/scsi/scsi_changer.h
+++ b/sys/scsi/scsi_changer.h
@@ -19,9 +19,12 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id$
+ *	$Id: scsi_changer.h,v 1.4 1993/08/21 20:01:53 rgrimes Exp $
  */
 
+#ifndef _SCSI_SCSI_CHANGER_H_
+#define _SCSI_SCSI_CHANGER_H_ 1
+
 /*
  * SCSI command format
  */
@@ -93,3 +96,4 @@ struct element_status_page
 	u_char byte_count_of_descriptor_data[3];
 };
 
+#endif /* _SCSI_SCSI_CHANGER_H_ */
diff --git a/sys/scsi/scsi_disk.h b/sys/scsi/scsi_disk.h
index a4eebf5752..e9cb724126 100644
--- a/sys/scsi/scsi_disk.h
+++ b/sys/scsi/scsi_disk.h
@@ -46,9 +46,12 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id$
+ *	$Id: scsi_disk.h,v 1.4 1993/08/21 20:01:54 rgrimes Exp $
  */
 
+#ifndef _SCSI_SCSI_DISK_H_
+#define _SCSI_SCSI_DISK_H_ 1
+
 /*
  * SCSI command format
  */
@@ -211,3 +214,4 @@ union	disk_pages /* this is the structure copied from osf */
 	   u_char reserved3;
     	} rigid_geometry;
 } ;
+#endif /* _SCSI_SCSI_DISK_H_ */
diff --git a/sys/scsi/scsi_tape.h b/sys/scsi/scsi_tape.h
index eb46092009..103e1165c1 100644
--- a/sys/scsi/scsi_tape.h
+++ b/sys/scsi/scsi_tape.h
@@ -21,10 +21,13 @@
 /*
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_tape.h,v 1.8 93/08/31 21:40:16 julian Exp Locker: julian $
+ *	$Id: scsi_tape.h,v 1.6 1993/09/05 15:42:20 rgrimes Exp $
  */
 
 
+#ifndef _SCSI_SCSI_TAPE_H_
+#define _SCSI_SCSI_TAPE_H_ 1
+
 
 /*
  * SCSI command formats
@@ -200,3 +203,4 @@ struct	blk_desc_cipher
 #define DAT-1		0x13
 
 
+#endif /* _SCSI_SCSI_TAPE_H_ */
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index b0b45efdf5..5738de5be8 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -14,9 +14,12 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsiconf.h,v 1.3 93/08/26 21:09:43 julian Exp Locker: julian $
+ *	$Id: scsiconf.h,v 1.5 1993/08/28 03:08:54 rgrimes Exp $
  */
 
+#ifndef _SCSI_SCSICONF_H_
+#define _SCSI_SCSICONF_H_ 1
+
 /***********************************************\
 * these calls are called by the high-end	*
 * drivers to get services from whatever low-end	*
@@ -123,3 +126,4 @@ struct scsi_xfer
 #define XS_SWTIMEOUT	0x04	/* The Timeout reported was caught by SW  */
 #define XS_BUSY		0x08	/* The device busy, try again later?	  */
 
+#endif /* _SCSI_SCSICONF_H_ */
diff --git a/sys/ufs/dinode.h b/sys/ufs/dinode.h
index abfeab0f5a..8ca8609557 100644
--- a/sys/ufs/dinode.h
+++ b/sys/ufs/dinode.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)dinode.h	7.10 (Berkeley) 5/8/91
- *	$Id$
+ *	$Id: dinode.h,v 1.3 1993/10/16 18:17:35 rgrimes Exp $
  */
 
+#ifndef _UFS_DINODE_H_
+#define _UFS_DINODE_H_ 1
+
 /*
  * A dinode contains all the meta-data associated with a UFS file.
  * This structure defines the on-disk format of a dinode.
@@ -102,3 +105,4 @@ struct dinode {
 	((((di).di_mode & IFMT) == IFLNK) && \
 	 ((di).di_size <= MAXFASTLINK) && \
 	 ((di).di_size == (di).di_spare[0]))
+#endif /* _UFS_DINODE_H_ */
diff --git a/sys/ufs/fs.h b/sys/ufs/fs.h
index f4c280d13b..93005d75e1 100644
--- a/sys/ufs/fs.h
+++ b/sys/ufs/fs.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fs.h	7.12 (Berkeley) 5/8/91
- *	$Id$
+ *	$Id: fs.h,v 1.2 1993/10/16 18:17:38 rgrimes Exp $
  */
 
+#ifndef _UFS_FS_H_
+#define _UFS_FS_H_ 1
+
 /*
  * Each disk drive contains some number of file systems.
  * A file system consists of a number of cylinder groups.
@@ -439,3 +442,4 @@ struct	ocg {
  * NINDIR is the number of indirects in a file system block.
  */
 #define	NINDIR(fs)	((fs)->fs_nindir)
+#endif /* _UFS_FS_H_ */
diff --git a/sys/ufs/inode.h b/sys/ufs/inode.h
index b83c741abf..b0d6480c97 100644
--- a/sys/ufs/inode.h
+++ b/sys/ufs/inode.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)inode.h	7.17 (Berkeley) 5/8/91
- *	$Id$
+ *	$Id: inode.h,v 1.3 1993/10/16 18:17:40 rgrimes Exp $
  */
 
+#ifndef _UFS_INODE_H_
+#define _UFS_INODE_H_ 1
+
 #ifdef KERNEL
 #include "../ufs/dinode.h"
 #else
@@ -121,7 +124,7 @@ extern int		vttoif_tab[];
 
 #define MAKEIMODE(indx, mode)	(int)(VTTOIF(indx) | (mode))
 
-u_long	nextgennumber;		/* next generation number to assign */
+extern u_long	nextgennumber;	/* next generation number to assign */
 
 extern ino_t	dirpref();
 
@@ -232,3 +235,4 @@ int ufs_islocked __P((struct vnode *vp));
 int ufs_advlock __P((struct vnode *vp, caddr_t id, int op, struct flock *fl,
 	int flags));
 #endif /* KERNEL */
+#endif /* _UFS_INODE_H_ */
diff --git a/sys/ufs/lockf.h b/sys/ufs/lockf.h
index df1815ea7c..ec58f5d91f 100644
--- a/sys/ufs/lockf.h
+++ b/sys/ufs/lockf.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)lockf.h	7.1 (Berkeley) 2/1/91
- *	$Id: lockf.h,v 1.2 1993/10/16 18:17:41 rgrimes Exp $
+ *	$Id: lockf.h,v 1.3 1993/10/20 07:31:36 davidg Exp $
  */
 
+#ifndef _UFS_LOCKF_H_
+#define _UFS_LOCKF_H_ 1
+
 /*
  * The lockf structure is a kernel structure which contains all the
  * information associated with a byte range lock. The lockf structures
@@ -70,3 +73,4 @@ extern struct lockf *lf_getblock();	/* Return the first blocking lock */
 extern int lockf_debug;
 #endif	LOCKF_DEBUG
 #endif	KERNEL
+#endif /* _UFS_LOCKF_H_ */
diff --git a/sys/ufs/mfsiom.h b/sys/ufs/mfsiom.h
index 448ae55fc8..267c3b1353 100644
--- a/sys/ufs/mfsiom.h
+++ b/sys/ufs/mfsiom.h
@@ -31,8 +31,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)mfsiom.h	7.2 (Berkeley) 6/28/90
- *	$Id$
+ *	$Id: mfsiom.h,v 1.2 1993/10/16 18:17:45 rgrimes Exp $
  */
 
+#ifndef _UFS_MFSIOM_H_
+#define _UFS_MFSIOM_H_ 1
+
 #define MFS_MAPREG	(MAXPHYS/NBPG + 2) /* Kernel mapping pte's */
 #define MFS_MAPSIZE	10		   /* Size of alloc map for pte's */
+#endif /* _UFS_MFSIOM_H_ */
diff --git a/sys/ufs/mfsnode.h b/sys/ufs/mfsnode.h
index 746cabfa3e..a52e21f986 100644
--- a/sys/ufs/mfsnode.h
+++ b/sys/ufs/mfsnode.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)mfsnode.h	7.3 (Berkeley) 4/16/91
- *	$Id$
+ *	$Id: mfsnode.h,v 1.2 1993/10/16 18:17:46 rgrimes Exp $
  */
 
+#ifndef _UFS_MFSNODE_H_
+#define _UFS_MFSNODE_H_ 1
+
 /*
  * This structure defines the control data for the memory
  * based file system.
@@ -195,3 +198,4 @@ int	mfs_print __P((
 		int op, \
 		struct flock *fl, \
 		int flags))) mfs_badop)
+#endif /* _UFS_MFSNODE_H_ */
diff --git a/sys/ufs/ufs_inode.c b/sys/ufs/ufs_inode.c
index 4a74d34523..c06b1760f0 100644
--- a/sys/ufs/ufs_inode.c
+++ b/sys/ufs/ufs_inode.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ufs_inode.c	7.40 (Berkeley) 5/8/91
- *	$Id$
+ *	$Id: ufs_inode.c,v 1.3 1993/10/16 18:17:52 rgrimes Exp $
  */
 
 #include "param.h"
@@ -56,6 +56,8 @@
 #define	INOHASH(dev,ino)	(((unsigned)((dev)+(ino)))%INOHSZ)
 #endif
 
+u_long	nextgennumber;		/* next generation number to assign */
+
 union ihead {
 	union  ihead *ih_head[2];
 	struct inode *ih_chain[2];
diff --git a/sys/ufs/ufsmount.h b/sys/ufs/ufsmount.h
index e072889a7f..bd26458f5a 100644
--- a/sys/ufs/ufsmount.h
+++ b/sys/ufs/ufsmount.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ufsmount.h	7.9 (Berkeley) 5/8/91
- *	$Id$
+ *	$Id: ufsmount.h,v 1.2 1993/10/16 18:18:05 rgrimes Exp $
  */
 
+#ifndef _UFS_UFSMOUNT_H_
+#define _UFS_UFSMOUNT_H_ 1
+
 /*
  * This structure describes the UFS specific mount structure data.
  */
@@ -59,7 +62,6 @@ struct	ufsmount {
  * Convert mount ptr to ufsmount ptr.
  */
 #define VFSTOUFS(mp)	((struct ufsmount *)((mp)->mnt_data))
-#endif /* KERNEL */
 
 /*
  * Prototypes for UFS mount operations
@@ -76,3 +78,5 @@ int ufs_sync __P((struct mount *mp, int waitfor));
 int ufs_fhtovp __P((struct mount *mp, struct fid *fhp, struct vnode **vpp));
 int ufs_vptofh __P((struct vnode *vp, struct fid *fhp));
 int ufs_init __P(());
+#endif /* KERNEL */
+#endif /* _UFS_UFSMOUNT_H_ */
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 91105c666c..f5fc7def07 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)device_pager.c	7.2 (Berkeley) 4/20/91
- *	$Id$
+ *	$Id: device_pager.c,v 1.4 1993/10/16 16:20:10 rgrimes Exp $
  */
 
 /*
@@ -58,6 +58,15 @@
 #include "vnode.h"
 #include "specdev.h"
 
+struct pagerops devicepagerops = {
+	dev_pager_init,
+	dev_pager_alloc,
+	dev_pager_dealloc,
+	dev_pager_getpage,
+	dev_pager_putpage,
+	dev_pager_haspage
+};
+
 queue_head_t	dev_pager_list;	/* list of managed devices */
 
 #ifdef DEBUG
diff --git a/sys/vm/device_pager.h b/sys/vm/device_pager.h
index 8940fe9da1..b252216fef 100644
--- a/sys/vm/device_pager.h
+++ b/sys/vm/device_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)device_pager.h	7.1 (Berkeley) 12/5/90
- *	$Id$
+ *	$Id: device_pager.h,v 1.2 1993/10/16 16:20:12 rgrimes Exp $
  */
 
 #ifndef	_DEVICE_PAGER_
@@ -65,15 +65,8 @@ void		dev_pager_dealloc();
 boolean_t	dev_pager_getpage(), dev_pager_putpage();
 boolean_t	dev_pager_haspage();
 
-struct pagerops devicepagerops = {
-	dev_pager_init,
-	dev_pager_alloc,
-	dev_pager_dealloc,
-	dev_pager_getpage,
-	dev_pager_putpage,
-	dev_pager_haspage
-};
+extern struct pagerops devicepagerops;
 
-#endif
+#endif /* KERNEL */
 
 #endif	/* _DEVICE_PAGER_ */
diff --git a/sys/vm/lock.h b/sys/vm/lock.h
index aaf1738c36..8642c088cb 100644
--- a/sys/vm/lock.h
+++ b/sys/vm/lock.h
@@ -91,7 +91,7 @@ typedef struct slock	*simple_lock_t;
  */
 
 struct lock {
-#ifdef	vax
+#if defined(vax)
 	/*
 	 *	Efficient VAX implementation -- see field description below.
 	 */
@@ -103,8 +103,7 @@ struct lock {
 			:0;
 
 	simple_lock_data_t	interlock;
-#else	vax
-#ifdef	ns32000
+#elif defined(ns32000)
 	/*
 	 *	Efficient ns32000 implementation --
 	 *	see field description below.
@@ -117,7 +116,7 @@ struct lock {
 			can_sleep:1,
 			:0;
 
-#else	ns32000
+#else /* neither vax nor ns32000 */
 	/*	Only the "interlock" field is used for hardware exclusion;
 	 *	other fields are modified with normal instructions after
 	 *	acquiring the interlock bit.
@@ -129,7 +128,6 @@ struct lock {
 	boolean_t	waiting;	/* Someone is sleeping on lock */
 	boolean_t	can_sleep;	/* Can attempts to lock go to sleep */
 	int		read_count;	/* Number of accepted readers */
-#endif	/* ns32000 */
 #endif	/* vax */
 	char		*thread;	/* Thread that has lock, if recursive locking allowed */
 					/* (should be thread_t, but but we then have mutually
@@ -145,7 +143,7 @@ void		simple_lock_init();
 void		simple_lock();
 void		simple_unlock();
 boolean_t	simple_lock_try();
-#else	NCPUS > 1
+#else  /* NCPUS == 1 */
 /*
  *	No multiprocessor locking is necessary.
  */
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 7ccab9fa6f..2fb31dff31 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -37,7 +37,7 @@
  *
  *	from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
  *	from: @(#)swap_pager.c	7.4 (Berkeley) 5/7/91
- *	$Id$
+ *	$Id: swap_pager.c,v 1.2 1993/10/16 16:20:19 rgrimes Exp $
  */
 
 /*
@@ -69,6 +69,10 @@
 #include "vm_pageout.h"
 #include "swap_pager.h"
 
+#include "dmap.h"
+struct dmap zdmap;		/* not used */
+int dmmin, dmmax, dmtext;	/* dmtext not used */
+
 #define NSWSIZES	16	/* size of swtab */
 #define NPENDINGIO	64	/* max # of pending cleans */
 #define MAXDADDRS	64	/* max # of disk addrs for fixed allocations */
@@ -87,6 +91,15 @@ int	swpagerdebug = 0 /*0x100*/;
 #define SDB_ANOMPANIC	0x200
 #endif
 
+struct pagerops swappagerops = {
+	swap_pager_init,
+	swap_pager_alloc,
+	swap_pager_dealloc,
+	swap_pager_getpage,
+	swap_pager_putpage,
+	swap_pager_haspage
+};
+
 struct swpagerclean {
 	queue_head_t		spc_list;
 	int			spc_flags;
@@ -128,7 +141,6 @@ swap_pager_init()
 {
 	register swp_clean_t spc;
 	register int i, bsize;
-	extern int dmmin, dmmax;
 	int maxbsize;
 
 #ifdef DEBUG
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index 8f403d3631..1a032c4be5 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- *	$Id$
+ *	$Id: swap_pager.h,v 1.2 1993/10/16 16:20:21 rgrimes Exp $
  */
 
 #ifndef	_SWAP_PAGER_
@@ -96,14 +96,7 @@ void		swap_pager_dealloc();
 boolean_t	swap_pager_getpage(), swap_pager_putpage();
 boolean_t	swap_pager_haspage();
 
-struct pagerops swappagerops = {
-	swap_pager_init,
-	swap_pager_alloc,
-	swap_pager_dealloc,
-	swap_pager_getpage,
-	swap_pager_putpage,
-	swap_pager_haspage
-};
+extern struct pagerops swappagerops;
 
 int		swap_pager_iodone();
 boolean_t	swap_pager_clean();
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index 45e876027b..bfbf434bf3 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -31,11 +31,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm.h	7.1 (Berkeley) 5/5/91
- *	$Id$
+ *	$Id: vm.h,v 1.2 1993/10/16 16:20:22 rgrimes Exp $
  */
 
-#ifndef VM_H
-#define VM_H
+#ifndef _VM_H_
+#define _VM_H_ 1
+
 #include <vm/vm_param.h>
 #include <vm/lock.h>
 #include <vm/queue.h>
@@ -72,4 +73,4 @@ struct	vmspace *vmspace_alloc __P((vm_offset_t min, vm_offset_t max,
 			int pageable));
 struct	vmspace *vmspace_fork __P((struct vmspace *));
 void	vmspace_free __P((struct vmspace *));
-#endif /* VM_H */
+#endif /* _VM_H_ */
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index d8b36f4fae..c351f0a2cb 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_fault.c	7.6 (Berkeley) 5/7/91
- *	$Id$
+ *	$Id: vm_fault.c,v 1.5 1993/10/16 16:20:24 rgrimes Exp $
  */
 
 /*
@@ -74,6 +74,8 @@
 #include "vm_page.h"
 #include "vm_pageout.h"
 
+vm_statistics_data_t vm_stat;
+
 /*
  *	vm_fault:
  *
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 2262f31aaa..b642b20e9f 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_glue.c	7.8 (Berkeley) 5/15/91
- *	$Id: vm_glue.c,v 1.8 1993/10/16 16:20:25 rgrimes Exp $
+ *	$Id: vm_glue.c,v 1.9 1993/10/19 00:54:49 nate Exp $
  */
 
 /*
@@ -73,6 +73,7 @@
 #include "vm.h"
 #include "vm_page.h"
 #include "vm_kern.h"
+#include "machine/stdarg.h"
 
 int	avefree = 0;		/* XXX */
 int	readbuffers = 0;	/* XXX allow kgdb to read kernel buffer pool */
@@ -543,18 +544,26 @@ thread_wakeup(event)
 int indent = 0;
 
 /*ARGSUSED2*/
-iprintf(a, b, c, d, e, f, g, h)
-	char *a;
+void
+iprintf(const char *a, ...)
 {
-	register int i;
+	va_list args;
+	int i, j = 0;
+	char indentbuf[indent + 1];
 
+	va_start(args, a);
 	i = indent;
 	while (i >= 8) {
-		printf("\t");
-		i -= 8;
+	  indentbuf[j++] = '\t';
+	  i -= 8;
 	}
 	for (; i > 0; --i)
-		printf(" ");
-	printf(a, b, c, d, e, f, g, h);
+	  indentbuf[j++] = ' ';
+
+	indentbuf[j++] = '\0';
+
+	printf("%s%r", indentbuf, a, args);
+	va_end(args);
 }
 #endif	/* defined(DEBUG) || (NDDB > 0) */
+
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 94539a9c42..ffd017827c 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_kern.c	7.4 (Berkeley) 5/7/91
- *	$Id$
+ *	$Id: vm_kern.c,v 1.3 1993/10/16 16:20:30 rgrimes Exp $
  */
 
 /*
@@ -77,6 +77,12 @@
 #include "vm_pageout.h"
 #include "vm_kern.h"
 
+vm_map_t	kernel_map;
+vm_map_t	mb_map;
+vm_map_t	kmem_map;
+vm_map_t	phys_map;
+vm_map_t	buffer_map;
+
 /*
  *	kmem_alloc_pageable:
  *
diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
index 5f2fe01358..e7b5e90ed2 100644
--- a/sys/vm/vm_kern.h
+++ b/sys/vm/vm_kern.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_kern.h	7.2 (Berkeley) 4/21/91
- *	$Id$
+ *	$Id: vm_kern.h,v 1.2 1993/10/16 16:20:31 rgrimes Exp $
  */
 
 /*
@@ -64,6 +64,9 @@
  * rights to redistribute these changes.
  */
 
+#ifndef _VM_VM_KERN_H_
+#define _VM_VM_KERN_H_ 1
+
 /*
  *	Kernel memory management definitions.
  */
@@ -79,8 +82,9 @@ vm_offset_t	vm_move();
 vm_offset_t	kmem_alloc_wait();
 void		kmem_free_wakeup();
 
-vm_map_t	kernel_map;
-vm_map_t	mb_map;
-vm_map_t	kmem_map;
-vm_map_t	phys_map;
-vm_map_t	buffer_map;
+extern vm_map_t	kernel_map;
+extern vm_map_t	mb_map;
+extern vm_map_t	kmem_map;
+extern vm_map_t	phys_map;
+extern vm_map_t	buffer_map;
+#endif /* _VM_VM_KERN_H_ */
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index 8272915e86..7408471364 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_meter.c	7.11 (Berkeley) 4/20/91
- *	$Id$
+ *	$Id: vm_meter.c,v 1.2 1993/10/16 16:20:37 rgrimes Exp $
  */
 
 #include "param.h"
@@ -42,6 +42,22 @@
 #include "vm_param.h"
 #include "vmmeter.h"
 
+struct vmtotal total;
+struct vmmeter cnt, rate, sum;
+
+#include "dkstat.h"		/* a convenient place to put these */
+long cp_time[CPUSTATES];	/* cpu time per state */
+int dk_busy;			/* number of busy disks */
+long dk_time[DK_NDRIVE];	/* access time per disk */
+long dk_seek[DK_NDRIVE];	/* seeks per disk */
+long dk_wds[DK_NDRIVE];		/*  */
+long dk_wpms[DK_NDRIVE];	/*  */
+long dk_xfer[DK_NDRIVE];	/*  */
+long tk_nin;			/* total characters in */
+long tk_nout;			/* total characters out */
+long tk_cancc;			/* total canonical characters */
+long tk_rawcc;			/* total raw characters */
+
 fixpt_t	averunnable[3];		/* load average, of runnable procs */
 
 int	maxslp = MAXSLP;
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 28845b6b5f..b5c3840aa8 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_object.c	7.4 (Berkeley) 5/7/91
- *	$Id$
+ *	$Id: vm_object.c,v 1.6 1993/10/16 16:20:40 rgrimes Exp $
  */
 
 /*
@@ -102,6 +102,18 @@
  *
  */
 
+queue_head_t	vm_object_cached_list;	/* list of objects persisting */
+int		vm_object_cached;	/* size of cached list */
+simple_lock_data_t	vm_cache_lock;	/* lock for object cache */
+
+queue_head_t	vm_object_list;		/* list of allocated objects */
+long		vm_object_count;	/* count of all objects */
+simple_lock_data_t	vm_object_list_lock;
+					/* lock for object list and count */
+
+vm_object_t	kernel_object;		/* the single kernel object */
+vm_object_t	kmem_object;
+
 struct vm_object	kernel_object_store;
 struct vm_object	kmem_object_store;
 
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 125891a0a1..3fffb86767 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_object.h	7.3 (Berkeley) 4/21/91
- *	$Id$
+ *	$Id: vm_object.h,v 1.2 1993/10/16 16:20:43 rgrimes Exp $
  */
 
 /*
@@ -114,21 +114,21 @@ struct vm_object_hash_entry {
 typedef struct vm_object_hash_entry	*vm_object_hash_entry_t;
 
 #ifdef	KERNEL
-queue_head_t	vm_object_cached_list;	/* list of objects persisting */
-int		vm_object_cached;	/* size of cached list */
-simple_lock_data_t	vm_cache_lock;	/* lock for object cache */
+extern queue_head_t	vm_object_cached_list; /* list of objects persisting */
+extern int		vm_object_cached; /* size of cached list */
+extern simple_lock_data_t	vm_cache_lock;	/* lock for object cache */
 
-queue_head_t	vm_object_list;		/* list of allocated objects */
-long		vm_object_count;	/* count of all objects */
-simple_lock_data_t	vm_object_list_lock;
+extern queue_head_t	vm_object_list;		/* list of allocated objects */
+extern long		vm_object_count;	/* count of all objects */
+extern simple_lock_data_t	vm_object_list_lock;
 					/* lock for object list and count */
 
-vm_object_t	kernel_object;		/* the single kernel object */
-vm_object_t	kmem_object;
+extern vm_object_t	kernel_object;		/* the single kernel object */
+extern vm_object_t	kmem_object;
 
 #define	vm_object_cache_lock()		simple_lock(&vm_cache_lock)
 #define	vm_object_cache_unlock()	simple_unlock(&vm_cache_lock)
-#endif	KERNEL
+#endif /* KERNEL */
 
 /*
  *	Declare procedures that operate on VM objects.
@@ -161,13 +161,13 @@ void		vm_object_print();
 #define	vm_object_lock_try(object)	(simple_lock_try(&(object)->Lock) ? ( ((object)->LockHolder = (int) current_thread()) , TRUE) : FALSE)
 #define	vm_object_sleep(event, object, interruptible) \
 					{ (object)->LockHolder = 0; thread_sleep((event), &(object)->Lock, (interruptible)); }
-#else	VM_OBJECT_DEBUG
+#else  /* VM_OBJECT_DEBUG */
 #define	vm_object_lock_init(object)	simple_lock_init(&(object)->Lock)
 #define	vm_object_lock(object)		simple_lock(&(object)->Lock)
 #define	vm_object_unlock(object)	simple_unlock(&(object)->Lock)
 #define	vm_object_lock_try(object)	simple_lock_try(&(object)->Lock)
 #define	vm_object_sleep(event, object, interruptible) \
 					thread_sleep((event), &(object)->Lock, (interruptible))
-#endif	VM_OBJECT_DEBUG
+#endif /* VM_OBJECT_DEBUG */
 
-#endif	_VM_OBJECT_
+#endif /* _VM_OBJECT_ */
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 6d5f18fbb2..2b1980f5d3 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_page.h	7.3 (Berkeley) 4/21/91
- *	$Id$
+ *	$Id: vm_page.h,v 1.2 1993/10/16 16:20:46 rgrimes Exp $
  */
 
 /*
@@ -117,7 +117,7 @@ struct vm_page {
 			:0;		/* (force to 'long' boundary) */
 #ifdef	ns32000
 	int		pad;		/* extra space for ns32000 bit ops */
-#endif	ns32000
+#endif /* ns32000 */
 	boolean_t	clean;		/* page has not been modified */
 	unsigned int
 	/* boolean_t */	busy:1,		/* page is in transit (O) */
@@ -145,9 +145,9 @@ typedef struct vm_page	*vm_page_t;
 		     (mem->active && mem->inactive) \
 		    ) panic("vm_page_check: not valid!"); \
 		}
-#else	VM_PAGE_DEBUG
+#else /* VM_PAGE_DEBUG */
 #define	VM_PAGE_CHECK(mem)
-#endif	VM_PAGE_DEBUG
+#endif /* VM_PAGE_DEBUG */
 
 #ifdef	KERNEL
 /*
@@ -259,5 +259,5 @@ void		vm_set_page_size();
 #define	vm_page_unlock_queues()	simple_unlock(&vm_page_queue_lock)
 
 #define vm_page_set_modified(m)	{ (m)->clean = FALSE; }
-#endif	KERNEL
-#endif	_VM_PAGE_
+#endif /* KERNEL */
+#endif /* _VM_PAGE_ */
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 62820cee1d..3e5134218c 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_pageout.c	7.4 (Berkeley) 5/7/91
- *	$Id$
+ *	$Id: vm_pageout.c,v 1.2 1993/10/16 16:20:47 rgrimes Exp $
  */
 
 /*
@@ -75,6 +75,7 @@
 #include "vm_pageout.h"
 #include "vmmeter.h"
 
+simple_lock_data_t	vm_pages_needed_lock;
 int	vm_pages_needed;		/* Event on which pageout daemon sleeps */
 int	vm_pageout_free_min = 0;	/* Stop pageout to wait for pagers at this free level */
 
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index ffa94c8b41..fef6ce4bf8 100644
--- a/sys/vm/vm_pageout.h
+++ b/sys/vm/vm_pageout.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_pageout.h	7.3 (Berkeley) 4/21/91
- *	$Id$
+ *	$Id: vm_pageout.h,v 1.2 1993/10/16 16:20:49 rgrimes Exp $
  */
 
 /*
@@ -64,6 +64,9 @@
  * rights to redistribute these changes.
  */
 
+#ifndef _VM_VM_PAGEOUT_H_
+#define _VM_VM_PAGEOUT_H_ 1
+
 /*
  *	Header file for pageout daemon.
  */
@@ -73,7 +76,7 @@
  */
 
 extern int	vm_pages_needed;	/* should be some "event" structure */
-simple_lock_data_t	vm_pages_needed_lock;
+extern simple_lock_data_t	vm_pages_needed_lock;
 
 
 /*
@@ -90,3 +93,4 @@ simple_lock_data_t	vm_pages_needed_lock;
 			thread_sleep((int)&vm_page_free_count, \
 				&vm_pages_needed_lock, FALSE); \
 			}
+#endif /* _VM_VM_PAGEOUT_H_ */
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index db2f0824dd..4fcc52d3af 100644
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_param.h	7.2 (Berkeley) 4/21/91
- *	$Id$
+ *	$Id: vm_param.h,v 1.2 1993/10/16 16:20:53 rgrimes Exp $
  */
 
 /*
@@ -112,7 +112,7 @@ typedef int	boolean_t;
 #define	KERN_NO_ACCESS		8
 
 #ifdef	ASSEMBLER
-#else	ASSEMBLER
+#else /* ASSEMBLER */
 /*
  *	Convert addresses to pages and vice versa.
  *	No rounding is used.
@@ -121,7 +121,7 @@ typedef int	boolean_t;
 #ifdef	KERNEL
 #define	atop(x)		(((unsigned)(x)) >> page_shift)
 #define	ptoa(x)		((vm_offset_t)((x) << page_shift))
-#endif	KERNEL
+#endif /* KERNEL */
 
 /*
  *	Round off or truncate to the nearest page.  These will work
@@ -132,10 +132,10 @@ typedef int	boolean_t;
 #ifdef	KERNEL
 #define round_page(x)	((vm_offset_t)((((vm_offset_t)(x)) + page_mask) & ~page_mask))
 #define trunc_page(x)	((vm_offset_t)(((vm_offset_t)(x)) & ~page_mask))
-#else	KERNEL
+#else /* KERNEL */
 #define	round_page(x)	((((vm_offset_t)(x) + (vm_page_size - 1)) / vm_page_size) * vm_page_size)
 #define	trunc_page(x)	((((vm_offset_t)(x)) / vm_page_size) * vm_page_size)
-#endif	KERNEL
+#endif /* KERNEL */
 
 #ifdef	KERNEL
 extern vm_size_t	page_size;	/* machine independent page size */
@@ -146,8 +146,8 @@ extern int		page_shift;	/* shift to use for page size */
 extern vm_size_t	mem_size;	/* size of physical memory (bytes) */
 extern vm_offset_t	first_addr;	/* first physical page */
 extern vm_offset_t	last_addr;	/* last physical page */
-#endif	KERNEL
+#endif /* KERNEL */
 
-#endif	ASSEMBLER
+#endif /* ASSEMBLER */
 
-#endif	_VM_PARAM_
+#endif /* _VM_PARAM_ */
diff --git a/sys/vm/vm_prot.h b/sys/vm/vm_prot.h
index ffda8f8078..6c5aa3affe 100644
--- a/sys/vm/vm_prot.h
+++ b/sys/vm/vm_prot.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_prot.h	7.2 (Berkeley) 4/21/91
- *	$Id$
+ *	$Id: vm_prot.h,v 1.2 1993/10/16 16:20:54 rgrimes Exp $
  */
 
 /*
@@ -101,4 +101,4 @@ typedef int		vm_prot_t;
 
 #define VM_PROT_ALL	(VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)
 
-#endif	_VM_PROT_
+#endif /* _VM_PROT_ */
diff --git a/sys/vm/vm_statistics.h b/sys/vm/vm_statistics.h
index 4cfd83728d..3b03e7ca81 100644
--- a/sys/vm/vm_statistics.h
+++ b/sys/vm/vm_statistics.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_statistics.h	7.2 (Berkeley) 4/21/91
- *	$Id$
+ *	$Id: vm_statistics.h,v 1.2 1993/10/16 16:20:55 rgrimes Exp $
  */
 
 /*
@@ -91,8 +91,8 @@ typedef struct vm_statistics	*vm_statistics_t;
 typedef struct vm_statistics	vm_statistics_data_t;
 
 #ifdef	KERNEL
-vm_statistics_data_t	vm_stat;
-#endif	KERNEL
+extern vm_statistics_data_t	vm_stat;
+#endif /* KERNEL */
 
 /*
  *	Each machine dependent implementation is expected to
diff --git a/sys/vm/vm_user.h b/sys/vm/vm_user.h
index 420419e65f..1bfbcb6968 100644
--- a/sys/vm/vm_user.h
+++ b/sys/vm/vm_user.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_user.h	7.2 (Berkeley) 4/21/91
- *	$Id$
+ *	$Id: vm_user.h,v 1.2 1993/10/16 16:21:00 rgrimes Exp $
  */
 
 /*
@@ -71,10 +71,23 @@
 #ifndef	_VM_USER_
 #define	_VM_USER_
 
+#include <sys/cdefs.h>
+
+#ifdef KERNEL
 int	vm_allocate();
 int	vm_deallocate();
 int	vm_inherit();
 int	vm_protect();
 int	vm_statistics();
+#else
+__BEGIN_DECLS
+
+int	vm_allocate();
+int	vm_deallocate();
+int	vm_inherit();
+int	vm_protect();
+
+__END_DECLS
+#endif
 
-#endif	_VM_USER_
+#endif /* _VM_USER_ */
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index d3fef2d725..7a40fe180e 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
- *	$Id$
+ *	$Id: vnode_pager.c,v 1.2 1993/10/16 16:21:02 rgrimes Exp $
  */
 
 /*
@@ -64,6 +64,15 @@
 #include "vm_page.h"
 #include "vnode_pager.h"
 
+struct pagerops vnodepagerops = {
+	vnode_pager_init,
+	vnode_pager_alloc,
+	vnode_pager_dealloc,
+	vnode_pager_getpage,
+	vnode_pager_putpage,
+	vnode_pager_haspage
+};
+
 queue_head_t	vnode_pager_list;	/* list of managed vnodes */
 
 #ifdef DEBUG
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index bea6caea59..dd9b37e7d9 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.h	7.1 (Berkeley) 12/5/90
- *	$Id$
+ *	$Id: vnode_pager.h,v 1.2 1993/10/16 16:21:03 rgrimes Exp $
  */
 
 #ifndef	_VNODE_PAGER_
@@ -62,18 +62,12 @@ typedef struct vnpager	*vn_pager_t;
 void		vnode_pager_init();
 vm_pager_t	vnode_pager_alloc();
 void		vnode_pager_dealloc();
-int		vnode_pager_getpage(), vnode_pager_putpage();
+int		vnode_pager_getpage();
+int		vnode_pager_putpage();
 boolean_t	vnode_pager_haspage();
 
-struct pagerops vnodepagerops = {
-	vnode_pager_init,
-	vnode_pager_alloc,
-	vnode_pager_dealloc,
-	vnode_pager_getpage,
-	vnode_pager_putpage,
-	vnode_pager_haspage
-};
+extern struct pagerops vnodepagerops;
 
-#endif
+#endif /* KERNEL */
 
 #endif	/* _VNODE_PAGER_ */
-- 
2.20.1