Eliminate sloppy common-style declarations. There should be none left for

the LINT configuation.

80 files changed, 316 insertions, 277 deletions

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index d673232..cd56d9f 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.133 1995/07/19 06:37:06 davidg Exp $
+ *	$Id: machdep.c,v 1.134 1995/07/28 11:21:03 davidg Exp $
  */
 
 #include "npx.h"
@@ -147,16 +147,6 @@ struct kern_devconf kdc_cpu0 = {
 #define PANIC_REBOOT_WAIT_TIME 15 /* default to 15 seconds */
 #endif
 
-/*
- * Declare these as initialized data so we can patch them.
- */
-int	nswbuf = 0;
-#ifdef	NBUF
-int	nbuf = NBUF;
-#else
-int	nbuf = 0;
-#endif
-
 #ifdef BOUNCE_BUFFERS
 extern char *bouncememory;
 extern int maxbkva;
@@ -193,7 +183,6 @@ void setup_netisrs __P((struct linker_set *)); /* XXX declare elsewhere */
 vm_offset_t buffer_sva, buffer_eva;
 vm_offset_t clean_sva, clean_eva;
 vm_offset_t pager_sva, pager_eva;
-extern int pager_map_size;
 extern struct linker_set netisr_set;
 
 #define offsetof(type, member)	((size_t)(&((type *)0)->member))
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index c73e86e..08dab53 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.39 1995/05/30 07:59:46 rgrimes Exp $
+ *	$Id: vm_machdep.c,v 1.40 1995/07/13 08:47:29 davidg Exp $
  */
 
 #include "npx.h"
@@ -61,10 +61,8 @@
 #include <i386/isa/isa.h>
 
 #ifdef BOUNCE_BUFFERS
-vm_map_t	io_map;
 volatile int	kvasfreecnt;
 
-
 caddr_t		bouncememory;
 int		bouncepages, bpwait;
 vm_offset_t	*bouncepa;
diff --git a/sys/conf/param.c b/sys/conf/param.c
index 3bba6e6..0a03cd6 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.2 (Berkeley) 1/21/94
- * $Id: param.c,v 1.10 1995/06/29 07:06:53 davidg Exp $
+ * $Id: param.c,v 1.11 1995/06/29 08:21:32 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -162,19 +162,24 @@ struct msginfo msginfo = {
 #endif
 
 /*
- * These are initialized at bootstrap time
- * to values dependent on memory size
+ * These may be set to nonzero here or by patching.
+ * If they are nonzero at bootstrap time then they are
+ * initialized to values dependent on the memory size.
  */
-int	nbuf, nswbuf;
+#ifdef	NBUF
+int	nbuf = NBUF;
+#else
+int	nbuf = 0;
+#endif
+int	nswbuf = 0;
 
 /*
  * These have to be allocated somewhere; allocating
  * them here forces loader errors if this file is omitted
  * (if they've been externed everywhere else; hah!).
  */
-struct 	callout *callout;
 struct	cblock *cfree;
-struct	buf *buf, *swbuf;
+struct	buf *swbuf;
 char	*buffers;
 
 /*
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index f3b88f0..8e17858 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.6 (Berkeley) 4/9/94
- * $Id: spec_vnops.c,v 1.11 1995/04/09 06:03:10 davidg Exp $
+ * $Id: spec_vnops.c,v 1.12 1995/07/08 04:03:12 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -50,15 +50,7 @@
 #include <sys/disklabel.h>
 #include <miscfs/specfs/specdev.h>
 
-/* symbolic sleep message strings for devices */
-char	devopn[] = "devopn";
-char	devio[] = "devio";
-char	devwait[] = "devwait";
-char	devin[] = "devin";
-char	devout[] = "devout";
-char	devioc[] = "devioc";
-char	devcls[] = "devcls";
-
+struct vnode *speclisth[SPECHSZ];
 int (**spec_vnodeop_p)();
 struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index d673232..cd56d9f 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.133 1995/07/19 06:37:06 davidg Exp $
+ *	$Id: machdep.c,v 1.134 1995/07/28 11:21:03 davidg Exp $
  */
 
 #include "npx.h"
@@ -147,16 +147,6 @@ struct kern_devconf kdc_cpu0 = {
 #define PANIC_REBOOT_WAIT_TIME 15 /* default to 15 seconds */
 #endif
 
-/*
- * Declare these as initialized data so we can patch them.
- */
-int	nswbuf = 0;
-#ifdef	NBUF
-int	nbuf = NBUF;
-#else
-int	nbuf = 0;
-#endif
-
 #ifdef BOUNCE_BUFFERS
 extern char *bouncememory;
 extern int maxbkva;
@@ -193,7 +183,6 @@ void setup_netisrs __P((struct linker_set *)); /* XXX declare elsewhere */
 vm_offset_t buffer_sva, buffer_eva;
 vm_offset_t clean_sva, clean_eva;
 vm_offset_t pager_sva, pager_eva;
-extern int pager_map_size;
 extern struct linker_set netisr_set;
 
 #define offsetof(type, member)	((size_t)(&((type *)0)->member))
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index c73e86e..08dab53 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.39 1995/05/30 07:59:46 rgrimes Exp $
+ *	$Id: vm_machdep.c,v 1.40 1995/07/13 08:47:29 davidg Exp $
  */
 
 #include "npx.h"
@@ -61,10 +61,8 @@
 #include <i386/isa/isa.h>
 
 #ifdef BOUNCE_BUFFERS
-vm_map_t	io_map;
 volatile int	kvasfreecnt;
 
-
 caddr_t		bouncememory;
 int		bouncepages, bpwait;
 vm_offset_t	*bouncepa;
diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h
index 93add9a..7f0ad9e 100644
--- a/sys/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/i386/isa/pcvt/pcvt_hdr.h
@@ -1143,14 +1143,14 @@ extern u_char		kbd_polling;
 extern u_char		keyboard_show;
 #endif /* PCVT_SHOWKEYS */
 
-u_char	cursor_pos_valid;
+extern	u_char	cursor_pos_valid;
 
-u_char	critical_scroll;
-int	switch_page;
+extern	u_char	critical_scroll;
+extern	int	switch_page;
 
 #if PCVT_SCREENSAVER
-u_char	reset_screen_saver;
-u_char	scrnsv_active;
+extern	u_char	reset_screen_saver;
+extern	u_char	scrnsv_active;
 #endif /* PCVT_SCREENSAVER */
 
 extern u_char		sgr_tab_color[];
diff --git a/sys/i386/isa/sound/dev_table.h b/sys/i386/isa/sound/dev_table.h
index 7aca8d0..3bee217 100644
--- a/sys/i386/isa/sound/dev_table.h
+++ b/sys/i386/isa/sound/dev_table.h
@@ -398,7 +398,7 @@ struct sound_timer_operations {
 	    sizeof(sound_drivers) / sizeof (struct driver_info);
 
 #else
-	extern struct audio_operations * audio_devs[MAX_AUDIO_DEV]; int num_audiodevs;
+	extern struct audio_operations * audio_devs[MAX_AUDIO_DEV]; extern int num_audiodevs;
 	extern struct mixer_operations * mixer_devs[MAX_MIXER_DEV]; extern int num_mixers;
 	extern struct synth_operations * synth_devs[MAX_SYNTH_DEV+MAX_MIDI_DEV]; extern int num_synths;
 	extern struct midi_operations * midi_devs[MAX_MIDI_DEV]; extern int num_midis;
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 7a6d79b..fb686b1 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.12 1995/03/16 18:12:29 bde Exp $
+ * $Id: kern_clock.c,v 1.13 1995/05/30 08:05:20 rgrimes Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -77,7 +77,6 @@
 
 /* Does anybody else really care about these? */
 struct callout *callfree, *callout, calltodo;
-int ncallout;
 
 /* Some of these don't belong here, but it's easiest to concentrate them. */
 long cp_time[CPUSTATES];
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 7a6d79b..fb686b1 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.12 1995/03/16 18:12:29 bde Exp $
+ * $Id: kern_clock.c,v 1.13 1995/05/30 08:05:20 rgrimes Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -77,7 +77,6 @@
 
 /* Does anybody else really care about these? */
 struct callout *callfree, *callout, calltodo;
-int ncallout;
 
 /* Some of these don't belong here, but it's easiest to concentrate them. */
 long cp_time[CPUSTATES];
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 7a6d79b..fb686b1 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.12 1995/03/16 18:12:29 bde Exp $
+ * $Id: kern_clock.c,v 1.13 1995/05/30 08:05:20 rgrimes Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -77,7 +77,6 @@
 
 /* Does anybody else really care about these? */
 struct callout *callfree, *callout, calltodo;
-int ncallout;
 
 /* Some of these don't belong here, but it's easiest to concentrate them. */
 long cp_time[CPUSTATES];
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index 3bba6e6..0a03cd6 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.2 (Berkeley) 1/21/94
- * $Id: param.c,v 1.10 1995/06/29 07:06:53 davidg Exp $
+ * $Id: param.c,v 1.11 1995/06/29 08:21:32 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -162,19 +162,24 @@ struct msginfo msginfo = {
 #endif
 
 /*
- * These are initialized at bootstrap time
- * to values dependent on memory size
+ * These may be set to nonzero here or by patching.
+ * If they are nonzero at bootstrap time then they are
+ * initialized to values dependent on the memory size.
  */
-int	nbuf, nswbuf;
+#ifdef	NBUF
+int	nbuf = NBUF;
+#else
+int	nbuf = 0;
+#endif
+int	nswbuf = 0;
 
 /*
  * These have to be allocated somewhere; allocating
  * them here forces loader errors if this file is omitted
  * (if they've been externed everywhere else; hah!).
  */
-struct 	callout *callout;
 struct	cblock *cfree;
-struct	buf *buf, *swbuf;
+struct	buf *swbuf;
 char	*buffers;
 
 /*
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 4444f6e..09ed9ab 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_msg.c,v 1.3 1994/10/02 17:35:26 phk Exp $ */
+/*	$Id: sysv_msg.c,v 1.4 1995/05/30 08:06:01 rgrimes Exp $ */
 
 /*
  * Implementation of SVID messages
@@ -36,6 +36,10 @@ int	(*msgcalls[])() = { msgctl, msgget, msgsnd, msgrcv };
 int nfree_msgmaps;		/* # of free map entries */
 short free_msgmaps;		/* head of linked list of free map entries */
 struct msg *free_msghdrs;	/* list of free msg headers */
+char *msgpool;			/* MSGMAX byte long msg buffer pool */
+struct msgmap *msgmaps;		/* MSGSEG msgmap structures */
+struct msg *msghdrs;		/* MSGTQL msg headers */
+struct msqid_ds *msqids;	/* MSGMNI msqid_ds struct's */
 
 void
 msginit()
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 0be0e34..9141c6f 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_sem.c,v 1.4 1994/10/06 21:06:32 davidg Exp $ */
+/*	$Id: sysv_sem.c,v 1.5 1995/05/30 08:06:02 rgrimes Exp $ */
 
 /*
  * Implementation of SVID semaphores
@@ -18,6 +18,11 @@
 static int	semctl(), semget(), semop(), semconfig();
 int	(*semcalls[])() = { semctl, semget, semop, semconfig };
 int	semtot = 0;
+struct semid_ds *sema;		/* semaphore id pool */
+struct sem *sem;		/* semaphore pool */
+struct map *semmap;		/* semaphore allocation map */
+struct sem_undo *semu_list; 	/* list of active undo structures */
+int	*semu;			/* undo structure pool */
 
 static struct proc *semlock_holder = NULL;
 
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index de8379c..8610d90 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_shm.c,v 1.4 1995/02/20 22:23:13 davidg Exp $ */
+/*	$Id: sysv_shm.c,v 1.5 1995/05/30 08:06:04 rgrimes Exp $ */
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 
 /*
@@ -72,6 +72,7 @@ int	(*shmcalls[])() = { shmat, oshmctl, shmdt, shmget, shmctl };
 
 vm_map_t sysvshm_map;
 int shm_last_free, shm_nused, shm_committed;
+struct shmid_ds	*shmsegs;
 
 struct shm_handle {
 	vm_offset_t kva;
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index d71ff9f..652fe66 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $Id: uipc_mbuf.c,v 1.8 1995/02/23 19:10:21 davidg Exp $
+ * $Id: uipc_mbuf.c,v 1.9 1995/03/15 07:51:53 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -46,11 +46,16 @@
 #include <sys/protosw.h>
 
 #include <vm/vm.h>
+#include <vm/vm_kern.h>
 
-extern	vm_map_t mb_map;
-struct	mbuf *mbutl;
+struct mbuf *mbutl;
 char	*mclrefcnt;
-int	mb_map_full;
+struct mbstat mbstat;
+union mcluster *mclfree;
+int	max_linkhdr;
+int	max_protohdr;
+int	max_hdr;
+int	max_datalen;
 
 void
 mbinit()
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 636340a..e9f27d5 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: vfs_bio.c,v 1.54 1995/07/25 05:03:06 davidg Exp $
+ * $Id: vfs_bio.c,v 1.55 1995/07/25 05:41:57 davidg Exp $
  */
 
 /*
@@ -52,8 +52,6 @@
 #include <miscfs/specfs/specdev.h>
 
 struct buf *buf;		/* buffer header pool */
-int nbuf;			/* number of buffer headers calculated
-				 * elsewhere */
 struct swqueue bswlist;
 
 void vm_hold_free_pages(struct buf * bp, vm_offset_t from, vm_offset_t to);
@@ -92,6 +90,9 @@ int bufspace, maxbufspace;
  */
 int minbuf;
 
+struct bufhashhdr bufhashtbl[BUFHSZ], invalhash;
+struct bqueues bufqueues[BUFFER_QUEUES];
+
 /*
  * Initialize buffer headers and related structures.
  */
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index a05b4a0..7b0fc56 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cache.c	8.3 (Berkeley) 8/22/94
- * $Id: vfs_cache.c,v 1.14 1995/04/15 00:49:35 davidg Exp $
+ * $Id: vfs_cache.c,v 1.15 1995/05/30 08:06:28 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -73,9 +73,12 @@
 LIST_HEAD(nchashhead, namecache) *nchashtbl;	/* Hash Table */
 TAILQ_HEAD(, namecache) nclruhead;	/* LRU chain */
 u_long	nchash;				/* size of hash table */
-struct	nchstats nchstats;		/* cache effectiveness statistics */
-struct vnode nchENOENT;		/* our own "novnode" */
+struct nchstats nchstats;		/* cache effectiveness statistics */
+struct vnode nchENOENT;			/* our own "novnode" */
 int doingcache = 1;			/* 1 => enable the cache */
+u_long	nextvnodeid;
+u_long	numcache;
+u_long	numvnodes;
 
 #ifdef NCH_STATISTICS
 u_long	nchnbr;
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index f3b88f0..8e17858 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.6 (Berkeley) 4/9/94
- * $Id: spec_vnops.c,v 1.11 1995/04/09 06:03:10 davidg Exp $
+ * $Id: spec_vnops.c,v 1.12 1995/07/08 04:03:12 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -50,15 +50,7 @@
 #include <sys/disklabel.h>
 #include <miscfs/specfs/specdev.h>
 
-/* symbolic sleep message strings for devices */
-char	devopn[] = "devopn";
-char	devio[] = "devio";
-char	devwait[] = "devwait";
-char	devin[] = "devin";
-char	devout[] = "devout";
-char	devioc[] = "devioc";
-char	devcls[] = "devcls";
-
+struct vnode *speclisth[SPECHSZ];
 int (**spec_vnodeop_p)();
 struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h
index bc26f9d..af0f7a2 100644
--- a/sys/miscfs/specfs/specdev.h
+++ b/sys/miscfs/specfs/specdev.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)specdev.h	8.2 (Berkeley) 2/2/94
- * $Id$
+ * $Id: specdev.h,v 1.2 1994/08/02 07:45:30 davidg Exp $
  */
 
 /*
@@ -68,7 +68,7 @@ struct specinfo {
 #define	SPECHASH(rdev)	(((unsigned)((rdev>>5)+(rdev)))%SPECHSZ)
 #endif
 
-struct vnode *speclisth[SPECHSZ];
+extern	struct vnode *speclisth[SPECHSZ];
 
 /*
  * Prototypes for special file operations on vnodes.
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index dfb08e4..274c546 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- * $Id: raw_cb.c,v 1.3 1994/10/08 22:38:24 phk Exp $
+ * $Id: raw_cb.c,v 1.4 1995/05/30 08:08:21 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -57,6 +57,7 @@
  *	redo address binding to allow wildcards
  */
 
+struct rawcb rawcb;
 u_long	raw_sendspace = RAWSNDQ;
 u_long	raw_recvspace = RAWRCVQ;
 
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index e975432..17bf46c 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $Id: raw_cb.h,v 1.2 1994/08/02 07:46:36 davidg Exp $
+ * $Id: raw_cb.h,v 1.3 1994/08/21 05:11:46 paul Exp $
  */
 
 #ifndef _NET_RAW_CB_H_
@@ -59,7 +59,7 @@ struct rawcb {
 #define	RAWRCVQ		8192
 
 #ifdef KERNEL
-struct rawcb rawcb;			/* head of list */
+extern struct rawcb rawcb;		/* head of list */
 
 int	 raw_attach __P((struct socket *, int));
 void	 raw_ctlinput __P((int, struct sockaddr *));
diff --git a/sys/net/route.c b/sys/net/route.c
index 1e76436..4f5fdf7 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id: route.c,v 1.23 1995/05/30 08:08:24 rgrimes Exp $
+ *	$Id: route.c,v 1.24 1995/07/10 15:22:37 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -55,6 +55,10 @@
 
 #define	SA(p) ((struct sockaddr *)(p))
 
+struct route_cb route_cb;
+struct rtstat rtstat;
+struct radix_node_head *rt_tables[AF_MAX+1];
+
 int	rttrash;		/* routes not in table but not freed */
 struct	sockaddr wildcard;	/* zero valued cookie for wildcard searches */
 
diff --git a/sys/net/route.h b/sys/net/route.h
index e12f986..fa0e9f7 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $Id: route.h,v 1.13 1995/03/20 21:30:21 wollman Exp $
+ * $Id: route.h,v 1.14 1995/05/30 08:08:26 rgrimes Exp $
  */
 
 #ifndef _NET_ROUTE_H_
@@ -254,9 +254,9 @@ struct route_cb {
 	else \
 		(rt)->rt_refcnt--;
 
-struct	route_cb route_cb;
-struct	rtstat	rtstat;
-struct	radix_node_head *rt_tables[AF_MAX+1];
+extern struct route_cb route_cb;
+extern struct rtstat rtstat;
+extern struct radix_node_head *rt_tables[AF_MAX+1];
 
 void	 route_init __P((void));
 int	 route_output __P((struct mbuf *, struct socket *));
diff --git a/sys/netccitt/hd_subr.c b/sys/netccitt/hd_subr.c
index c379188..7ba5b03 100644
--- a/sys/netccitt/hd_subr.c
+++ b/sys/netccitt/hd_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: hd_subr.c,v 1.3 1995/02/15 06:29:45 jkh Exp $
+ * $Id: hd_subr.c,v 1.4 1995/05/30 08:08:43 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -57,6 +57,14 @@
 #include <netccitt/x25.h>
 #include <netccitt/pk_var.h>
 
+struct	hdcb *hdcbhead;
+struct	Frmr_frame hd_frmr;
+struct	ifqueue hdintrq;
+
+int	hd_t1;
+int	hd_t3;
+int	hd_n2;
+
 void
 hd_init ()
 {
diff --git a/sys/netccitt/hd_var.h b/sys/netccitt/hd_var.h
index 24679ac..4fa3229 100644
--- a/sys/netccitt/hd_var.h
+++ b/sys/netccitt/hd_var.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_var.h	8.1 (Berkeley) 6/10/93
- * $Id: hd_var.h,v 1.2 1994/08/02 07:47:10 davidg Exp $
+ * $Id: hd_var.h,v 1.3 1994/08/21 05:44:06 paul Exp $
  */
 
 #ifndef _NETCCITT_HD_VAR_H_
@@ -101,13 +101,13 @@ struct	hdcb {
 };
 
 #ifdef KERNEL
-struct	hdcb *hdcbhead;		/* head of linked list of hdcb's */
-struct	Frmr_frame hd_frmr;	/* rejected frame diagnostic info */
-struct	ifqueue hdintrq;	/* hdlc packet input queue */
+extern struct	hdcb *hdcbhead;		/* head of linked list of hdcb's */
+extern struct	Frmr_frame hd_frmr;	/* rejected frame diagnostic info */
+extern struct	ifqueue hdintrq;	/* hdlc packet input queue */
 
-int	hd_t1;			/* timer T1 value */
-int	hd_t3;			/* RR send timer */
-int	hd_n2;			/* frame retransmission limit */
+extern int	hd_t1;			/* timer T1 value */
+extern int	hd_t3;			/* RR send timer */
+extern int	hd_n2;			/* frame retransmission limit */
 #endif
 
 #endif
diff --git a/sys/netccitt/if_x25subr.c b/sys/netccitt/if_x25subr.c
index 7b85f4a..8cdc22e 100644
--- a/sys/netccitt/if_x25subr.c
+++ b/sys/netccitt/if_x25subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_x25subr.c	8.1 (Berkeley) 6/10/93
- * $Id: if_x25subr.c,v 1.5 1995/04/26 18:10:50 pst Exp $
+ * $Id: if_x25subr.c,v 1.6 1995/05/30 08:08:46 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -601,7 +601,6 @@ register struct x25_ifaddr *ia;
 		 * First determine our IP addr for network
 		 */
 		register struct in_ifaddr *ina;
-		extern struct in_ifaddr *in_ifaddr;
 
 		for (ina = in_ifaddr; ina; ina = ina->ia_next)
 			if (ina->ia_ifp == ia->ia_ifp) {
diff --git a/sys/netccitt/llc_subr.c b/sys/netccitt/llc_subr.c
index 9699be6..af5adb6 100644
--- a/sys/netccitt/llc_subr.c
+++ b/sys/netccitt/llc_subr.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: llc_subr.c,v 1.4 1995/05/11 19:26:40 rgrimes Exp $
+ * $Id: llc_subr.c,v 1.5 1995/05/30 08:08:52 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -85,6 +85,8 @@ struct bitslice llc_bitslice[] = {
 	{ 0x1f, 0x0 }
 };
 
+struct ifqueue llcintrq;
+
 /*
  * We keep the link control blocks on a doubly linked list -
  * primarily for checking in llc_time()
@@ -99,7 +101,6 @@ struct llccb_q llccb_q = { &llccb_q, &llccb_q };
 
 int af_link_rts_init_done = 0;
 
-
 /*
  * Functions dealing with struct sockaddr_dl */
 
diff --git a/sys/netccitt/llc_var.h b/sys/netccitt/llc_var.h
index 6de1aa2..c6327c6 100644
--- a/sys/netccitt/llc_var.h
+++ b/sys/netccitt/llc_var.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_var.h	8.1 (Berkeley) 6/10/93
- * $Id: llc_var.h,v 1.3 1994/08/21 05:44:08 paul Exp $
+ * $Id: llc_var.h,v 1.4 1995/05/30 08:08:55 rgrimes Exp $
  */
 
 #ifndef _NETCCITT_LLC_VAR_H_
@@ -595,7 +595,7 @@ extern int af_link_rts_init_done;
 	       } \
 	 }
 
-struct ifqueue llcintrq;
+extern struct ifqueue llcintrq;
 
 extern struct llccb_q llccb_q;
 extern char *frame_names[];
diff --git a/sys/netccitt/pk_input.c b/sys/netccitt/pk_input.c
index 777de53..d783825 100644
--- a/sys/netccitt/pk_input.c
+++ b/sys/netccitt/pk_input.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_input.c	8.1 (Berkeley) 6/10/93
- * $Id: pk_input.c,v 1.4 1995/05/11 00:13:14 wollman Exp $
+ * $Id: pk_input.c,v 1.5 1995/05/30 08:08:59 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -61,6 +61,7 @@
 #include <netccitt/pk_var.h>
 #include <netccitt/llc_var.h>
 
+struct pklcd *pk_listenhead;
 struct pkcb_q pkcb_q = {&pkcb_q, &pkcb_q};
 
 /*
@@ -73,7 +74,6 @@ ccittintr (void)
 {
 	extern struct ifqueue pkintrq;
 	extern struct ifqueue hdintrq;
-	extern struct ifqueue llcintrq;
 
 #ifdef HDLC
 	if (hdintrq.ifq_len)
diff --git a/sys/netccitt/pk_subr.c b/sys/netccitt/pk_subr.c
index a64375f..4666c27 100644
--- a/sys/netccitt/pk_subr.c
+++ b/sys/netccitt/pk_subr.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: pk_subr.c,v 1.3 1994/12/13 22:32:17 wollman Exp $
+ * $Id: pk_subr.c,v 1.4 1995/05/30 08:09:07 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -1138,7 +1138,7 @@ register struct pklcd *lcp;
 	register struct mbuf *m = m0;
 	register struct x25_packet *xp;
 	register struct sockbuf *sb;
-	struct mbuf *head = 0, *next, **mp = &head, *m_split ();
+	struct mbuf *head = 0, *next, **mp = &head;
 	int totlen, psize = 1 << (lcp -> lcd_packetsize);
 
 	if (m == 0)
diff --git a/sys/netccitt/pk_var.h b/sys/netccitt/pk_var.h
index 6bfe7bd..ea0907d 100644
--- a/sys/netccitt/pk_var.h
+++ b/sys/netccitt/pk_var.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_var.h	8.1 (Berkeley) 6/10/93
- * $Id: pk_var.h,v 1.4 1995/03/16 18:14:40 bde Exp $
+ * $Id: pk_var.h,v 1.5 1995/05/30 08:09:11 rgrimes Exp $
  */
 
 #ifndef _NETCCITT_PK_VAR_H_
@@ -227,12 +227,12 @@ struct mbuf_cache {
 
 #if defined(KERNEL) && defined(CCITT)
 extern struct pkcb_q pkcb_q;
-struct	pklcd *pk_listenhead;
+extern struct	pklcd *pk_listenhead;
 void	ccittintr __P((void));
 struct	pklcd *pk_attach();
 
 extern char	*pk_name[], *pk_state[];
-int	pk_t20, pk_t21, pk_t22, pk_t23;
+extern int	pk_t20, pk_t21, pk_t22, pk_t23;
 #endif
 
 #endif
diff --git a/sys/netns/idp_var.h b/sys/netns/idp_var.h
index 7ff3823..afbc8fa 100644
--- a/sys/netns/idp_var.h
+++ b/sys/netns/idp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: idp_var.h,v 1.2 1994/08/02 07:51:42 davidg Exp $
+ * $Id: idp_var.h,v 1.3 1994/08/21 06:22:06 paul Exp $
  */
 
 #ifndef _NETNS_IDP_VAR_H_
@@ -48,8 +48,4 @@ struct	idpstat {
 	int	idps_badlen;		/* ip length < ip header length */
 };
 
-#ifdef KERNEL
-struct	idpstat	idpstat;
-#endif
-
 #endif
diff --git a/sys/netns/ns.h b/sys/netns/ns.h
index 527c695..7dd35a6 100644
--- a/sys/netns/ns.h
+++ b/sys/netns/ns.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns.h	8.1 (Berkeley) 6/10/93
- * $Id: ns.h,v 1.2 1994/08/02 07:51:44 davidg Exp $
+ * $Id: ns.h,v 1.3 1994/08/21 06:22:07 paul Exp $
  */
 
 #ifndef _NETNS_NS_H_
@@ -137,11 +137,11 @@ struct sockaddr_ns {
 
 #ifdef KERNEL
 extern struct domain nsdomain;
-union ns_host ns_thishost;
-union ns_host ns_zerohost;
-union ns_host ns_broadhost;
-union ns_net ns_zeronet;
-union ns_net ns_broadnet;
+extern union ns_host ns_thishost;
+extern union ns_host ns_zerohost;
+extern union ns_host ns_broadhost;
+extern union ns_net ns_zeronet;
+extern union ns_net ns_broadnet;
 u_short ns_cksum();
 #else
 
diff --git a/sys/netns/ns_error.c b/sys/netns/ns_error.c
index 0e7e24f..2bc32a4 100644
--- a/sys/netns/ns_error.c
+++ b/sys/netns/ns_error.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_error.c	8.1 (Berkeley) 6/10/93
- * $Id: ns_error.c,v 1.2 1994/08/02 07:51:46 davidg Exp $
+ * $Id: ns_error.c,v 1.3 1995/05/30 08:12:22 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -62,6 +62,8 @@
 int	ns_errprintfs = 0;
 #endif
 
+struct	ns_errstat ns_errstat;
+
 ns_err_x(c)
 {
 	register u_short *w, *lim, *base = ns_errstat.ns_es_codes;
diff --git a/sys/netns/ns_error.h b/sys/netns/ns_error.h
index 5e88b2c..942a28d 100644
--- a/sys/netns/ns_error.h
+++ b/sys/netns/ns_error.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_error.h	8.1 (Berkeley) 6/10/93
- * $Id: ns_error.h,v 1.2 1994/08/02 07:51:47 davidg Exp $
+ * $Id: ns_error.h,v 1.3 1994/08/21 06:22:07 paul Exp $
  */
 
 #ifndef _NETNS_NS_ERROR_H_
@@ -90,7 +90,7 @@ struct	ns_errstat {
 };
 
 #ifdef KERNEL
-struct	ns_errstat ns_errstat;
+extern struct	ns_errstat ns_errstat;
 #endif
 
 #endif
diff --git a/sys/netns/ns_if.h b/sys/netns/ns_if.h
index a4a955a..b6d99e8 100644
--- a/sys/netns/ns_if.h
+++ b/sys/netns/ns_if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_if.h	8.1 (Berkeley) 6/10/93
- * $Id: ns_if.h,v 1.3 1994/08/21 06:22:08 paul Exp $
+ * $Id: ns_if.h,v 1.4 1995/03/16 18:15:27 bde Exp $
  */
 
 #ifndef _NETNS_NS_IF_H_
@@ -80,10 +80,10 @@ struct nsip_req {
 #endif
 
 #ifdef	KERNEL
-struct	ns_ifaddr *ns_ifaddr;
+extern struct	ns_ifaddr *ns_ifaddr;
 struct	ns_ifaddr *ns_iaonnetof();
 void	nsintr __P((void));
-struct	ifqueue	nsintrq;	/* XNS input packet queue */
+extern struct	ifqueue	nsintrq;	/* XNS input packet queue */
 #endif
 
 #endif
diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c
index 6fa2e9c..3d1a6a5 100644
--- a/sys/netns/ns_input.c
+++ b/sys/netns/ns_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_input.c	8.1 (Berkeley) 6/10/93
- * $Id: ns_input.c,v 1.4 1995/05/11 00:13:22 wollman Exp $
+ * $Id: ns_input.c,v 1.5 1995/05/30 08:12:27 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -76,12 +76,12 @@ struct nspcb nsrawpcb;
 struct ifqueue	nsintrq;
 int	nsqmaxlen = IFQ_MAXLEN;
 
+struct	idpstat	idpstat;
 int	idpcksum = 1;
 long	ns_pexseq;
 
 ns_init()
 {
-	extern struct timeval time;
 
 	ns_broadhost = * (union ns_host *) allones;
 	ns_broadnet = * (union ns_net *) allones;
diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c
index e87e165..2702997 100644
--- a/sys/netns/ns_ip.c
+++ b/sys/netns/ns_ip.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_ip.c	8.1 (Berkeley) 6/10/93
- * $Id: ns_ip.c,v 1.2 1994/08/02 07:51:50 davidg Exp $
+ * $Id: ns_ip.c,v 1.3 1995/03/19 14:29:03 davidg Exp $
  */
 
 /*
@@ -401,7 +401,6 @@ nsip_ctlinput(cmd, sa)
 	int cmd;
 	struct sockaddr *sa;
 {
-	extern u_char inetctlerrmap[];
 	struct sockaddr_in *sin;
 	int in_rtchange();
 
diff --git a/sys/netns/ns_pcb.h b/sys/netns/ns_pcb.h
index 69bd331..eccd70d 100644
--- a/sys/netns/ns_pcb.h
+++ b/sys/netns/ns_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: ns_pcb.h,v 1.2 1994/08/02 07:51:53 davidg Exp $
+ * $Id: ns_pcb.h,v 1.3 1994/08/21 06:22:09 paul Exp $
  */
 
 #ifndef _NETNS_NS_PCB_H_
@@ -79,7 +79,7 @@ struct nspcb {
 
 
 #ifdef KERNEL
-struct	nspcb nspcb;			/* head of list */
+extern struct	nspcb nspcb;		/* head of list */
 struct	nspcb *ns_pcblookup();
 #endif
 
diff --git a/sys/netns/ns_proto.c b/sys/netns/ns_proto.c
index 3352aa0..0f09dce 100644
--- a/sys/netns/ns_proto.c
+++ b/sys/netns/ns_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)ns_proto.c	8.1 (Berkeley) 6/10/93
- *	$Id: ns_proto.c,v 1.3 1995/05/11 00:13:23 wollman Exp $
+ *	$Id: ns_proto.c,v 1.4 1995/05/30 08:12:30 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -56,8 +56,6 @@ int	spp_usrreq(), spp_usrreq_sp(), spp_ctloutput();
 int	spp_init(), spp_fasttimo(), spp_slowtimo();
 extern	int raw_usrreq();
 
-extern	struct domain nsdomain;
-
 struct protosw nssw[] = {
 { 0,		&nsdomain,	0,		0,
   0,		idp_output,	0,		0,
diff --git a/sys/netns/spp_debug.c b/sys/netns/spp_debug.c
index f979a1e..66314e3 100644
--- a/sys/netns/spp_debug.c
+++ b/sys/netns/spp_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: spp_debug.c,v 1.2 1994/08/02 07:51:57 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -59,6 +59,9 @@
 #include <netns/spp_debug.h>
 
 int	sppconsdebug = 0;
+struct	spp_debug spp_debug[SPP_NDEBUG];
+int	spp_debx;
+
 /*
  * spp debug routines
  */
diff --git a/sys/netns/spp_debug.h b/sys/netns/spp_debug.h
index 51132e5..16ce4b2 100644
--- a/sys/netns/spp_debug.h
+++ b/sys/netns/spp_debug.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_debug.h	8.1 (Berkeley) 6/10/93
- * $Id: spp_debug.h,v 1.2 1994/08/02 07:51:58 davidg Exp $
+ * $Id: spp_debug.h,v 1.3 1994/08/21 06:22:11 paul Exp $
  */
 
 #ifndef _NETNS_SPP_DEBUG_H_
@@ -59,7 +59,7 @@ char	*sanames[] =
 #endif
 
 #define	SPP_NDEBUG 100
-struct	spp_debug spp_debug[SPP_NDEBUG];
-int	spp_debx;
+extern struct	spp_debug spp_debug[SPP_NDEBUG];
+extern int	spp_debx;
 
 #endif
diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c
index fbce16a..f0df56f 100644
--- a/sys/netns/spp_usrreq.c
+++ b/sys/netns/spp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id: spp_usrreq.c,v 1.3 1995/03/19 14:29:04 davidg Exp $
+ * $Id: spp_usrreq.c,v 1.4 1995/05/30 08:12:31 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -68,8 +68,9 @@ spp_init()
 }
 struct spidp spp_savesi;
 int traceallspps = 0;
-extern int sppconsdebug;
 int spp_hardnosed;
+struct spp_istat spp_istat;
+u_short spp_iss;
 int spp_use_delack = 0;
 u_short spp_newchecks[50];
 
@@ -1116,7 +1117,6 @@ spp_setpersist(cb)
 	register struct sppcb *cb;
 {
 	register t = ((cb->s_srtt >> 2) + cb->s_rttvar) >> 1;
-	extern int spp_backoff[];
 
 	if (cb->s_timer[SPPT_REXMT] && spp_do_persist_panics)
 		panic("spp_output REXMT");
diff --git a/sys/netns/spp_var.h b/sys/netns/spp_var.h
index 9814167..f92d0ff 100644
--- a/sys/netns/spp_var.h
+++ b/sys/netns/spp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: spp_var.h,v 1.2 1994/08/02 07:52:01 davidg Exp $
+ * $Id: spp_var.h,v 1.3 1994/08/21 06:22:12 paul Exp $
  */
 
 #ifndef _NETNS_SPP_VAR_H_
@@ -187,14 +187,14 @@ struct	spp_istat {
 };
 
 #ifdef KERNEL
-struct spp_istat spp_istat;
+extern struct spp_istat spp_istat;
 
 /* Following was struct sppstat sppstat; */
 #ifndef sppstat
 #define sppstat spp_istat.newstats
 #endif
 
-u_short spp_iss;
+extern u_short spp_iss;
 extern struct sppcb *spp_close(), *spp_disconnect(),
 	*spp_usrclosed(), *spp_timers(), *spp_drop();
 #endif
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index e1a0f07..2a3b3de 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.9 1995/02/14 06:22:18 phk Exp $
+ * $Id: nfs.h,v 1.10 1995/06/27 11:06:33 dfr Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -304,7 +304,7 @@ struct nfsreq {
 /*
  * Queue head for nfsreq's
  */
-TAILQ_HEAD(, nfsreq) nfs_reqq;
+extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
 
 /* Flag values for r_flags */
 #define R_TIMING	0x01		/* timing request (in mntp) */
@@ -398,8 +398,8 @@ struct nfssvc_sock {
 #define	SLP_LASTFRAG	0x20
 #define SLP_ALLFLAGS	0xff
 
-TAILQ_HEAD(, nfssvc_sock) nfssvc_sockhead;
-int nfssvc_sockhead_flag;
+extern TAILQ_HEAD(nfssvc_sockhead, nfssvc_sock) nfssvc_sockhead;
+extern int nfssvc_sockhead_flag;
 #define	SLP_INIT	0x01
 #define	SLP_WANTINIT	0x02
 
@@ -464,8 +464,8 @@ struct nfsrv_descript {
 #define ND_KERBFULL	0x40
 #define ND_KERBAUTH	(ND_KERBNICK | ND_KERBFULL)
 
-TAILQ_HEAD(, nfsd) nfsd_head;
-int nfsd_head_flag;
+extern TAILQ_HEAD(nfsd_head, nfsd) nfsd_head;
+extern int nfsd_head_flag;
 #define	NFSD_CHECKSLP	0x01
 
 /*
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index f01e1b0..4c6d4bb 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.20 1995/07/13 08:47:53 davidg Exp $
+ * $Id: nfs_subs.c,v 1.21 1995/07/20 09:43:12 davidg Exp $
  */
 
 /*
@@ -94,6 +94,16 @@ enum vtype nv2tov_type[8] = { VNON, VREG, VDIR, VBLK, VCHR, VLNK, VNON, VNON };
 enum vtype nv3tov_type[8]={ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO };
 int nfs_ticks;
 
+struct nfs_reqq nfs_reqq;
+struct nfssvc_sockhead nfssvc_sockhead;
+int nfssvc_sockhead_flag;
+struct nfsd_head nfsd_head;
+int nfsd_head_flag;
+struct nfs_bufq nfs_bufq;
+struct nqtimerhead nqtimerhead;
+struct nqfhhashhead *nqfhhashtbl;
+u_long nqfhhash;
+
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index f01e1b0..4c6d4bb 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.20 1995/07/13 08:47:53 davidg Exp $
+ * $Id: nfs_subs.c,v 1.21 1995/07/20 09:43:12 davidg Exp $
  */
 
 /*
@@ -94,6 +94,16 @@ enum vtype nv2tov_type[8] = { VNON, VREG, VDIR, VBLK, VCHR, VLNK, VNON, VNON };
 enum vtype nv3tov_type[8]={ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO };
 int nfs_ticks;
 
+struct nfs_reqq nfs_reqq;
+struct nfssvc_sockhead nfssvc_sockhead;
+int nfssvc_sockhead_flag;
+struct nfsd_head nfsd_head;
+int nfsd_head_flag;
+struct nfs_bufq nfs_bufq;
+struct nqtimerhead nqtimerhead;
+struct nqfhhashhead *nqfhhashtbl;
+u_long nqfhhash;
+
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 18dbde2..0bd359f 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
- * $Id: nfsnode.h,v 1.9 1995/03/16 18:15:42 bde Exp $
+ * $Id: nfsnode.h,v 1.10 1995/06/27 11:06:57 dfr Exp $
  */
 
 #ifndef _NFS_NFSNODE_H_
@@ -148,7 +148,7 @@ struct nfsnode {
 /*
  * Queue head for nfsiod's
  */
-TAILQ_HEAD(, buf) nfs_bufq;
+extern TAILQ_HEAD(nfs_bufq, buf) nfs_bufq;
 
 #if defined(KERNEL) || defined(_KERNEL)
 extern	int	(**fifo_nfsv2nodeop_p)();
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index 194bc90..3861ac6 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nqnfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nqnfs.h,v 1.6 1994/10/17 17:47:45 phk Exp $
+ * $Id: nqnfs.h,v 1.7 1995/06/27 11:07:01 dfr Exp $
  */
 
 #ifndef _NFS_NQNFS_H_
@@ -181,15 +181,15 @@ struct nqm {
 /*
  * List head for timer queue.
  */
-CIRCLEQ_HEAD(, nqlease) nqtimerhead;
+extern CIRCLEQ_HEAD(nqtimerhead, nqlease) nqtimerhead;
 
 /*
  * List head for the file handle hash table.
  */
 #define	NQFHHASH(f) \
 	(&nqfhhashtbl[(*((u_long *)(f))) & nqfhhash])
-LIST_HEAD(nqfhhashhead, nqlease) *nqfhhashtbl;
-u_long nqfhhash;
+extern LIST_HEAD(nqfhhashhead, nqlease) *nqfhhashtbl;
+extern u_long nqfhhash;
 
 /*
  * Nqnfs return status numbers.
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index e1a0f07..2a3b3de 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.9 1995/02/14 06:22:18 phk Exp $
+ * $Id: nfs.h,v 1.10 1995/06/27 11:06:33 dfr Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -304,7 +304,7 @@ struct nfsreq {
 /*
  * Queue head for nfsreq's
  */
-TAILQ_HEAD(, nfsreq) nfs_reqq;
+extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
 
 /* Flag values for r_flags */
 #define R_TIMING	0x01		/* timing request (in mntp) */
@@ -398,8 +398,8 @@ struct nfssvc_sock {
 #define	SLP_LASTFRAG	0x20
 #define SLP_ALLFLAGS	0xff
 
-TAILQ_HEAD(, nfssvc_sock) nfssvc_sockhead;
-int nfssvc_sockhead_flag;
+extern TAILQ_HEAD(nfssvc_sockhead, nfssvc_sock) nfssvc_sockhead;
+extern int nfssvc_sockhead_flag;
 #define	SLP_INIT	0x01
 #define	SLP_WANTINIT	0x02
 
@@ -464,8 +464,8 @@ struct nfsrv_descript {
 #define ND_KERBFULL	0x40
 #define ND_KERBAUTH	(ND_KERBNICK | ND_KERBFULL)
 
-TAILQ_HEAD(, nfsd) nfsd_head;
-int nfsd_head_flag;
+extern TAILQ_HEAD(nfsd_head, nfsd) nfsd_head;
+extern int nfsd_head_flag;
 #define	NFSD_CHECKSLP	0x01
 
 /*
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index f01e1b0..4c6d4bb 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.20 1995/07/13 08:47:53 davidg Exp $
+ * $Id: nfs_subs.c,v 1.21 1995/07/20 09:43:12 davidg Exp $
  */
 
 /*
@@ -94,6 +94,16 @@ enum vtype nv2tov_type[8] = { VNON, VREG, VDIR, VBLK, VCHR, VLNK, VNON, VNON };
 enum vtype nv3tov_type[8]={ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO };
 int nfs_ticks;
 
+struct nfs_reqq nfs_reqq;
+struct nfssvc_sockhead nfssvc_sockhead;
+int nfssvc_sockhead_flag;
+struct nfsd_head nfsd_head;
+int nfsd_head_flag;
+struct nfs_bufq nfs_bufq;
+struct nqtimerhead nqtimerhead;
+struct nqfhhashhead *nqfhhashtbl;
+u_long nqfhhash;
+
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index e1a0f07..2a3b3de 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.9 1995/02/14 06:22:18 phk Exp $
+ * $Id: nfs.h,v 1.10 1995/06/27 11:06:33 dfr Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -304,7 +304,7 @@ struct nfsreq {
 /*
  * Queue head for nfsreq's
  */
-TAILQ_HEAD(, nfsreq) nfs_reqq;
+extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
 
 /* Flag values for r_flags */
 #define R_TIMING	0x01		/* timing request (in mntp) */
@@ -398,8 +398,8 @@ struct nfssvc_sock {
 #define	SLP_LASTFRAG	0x20
 #define SLP_ALLFLAGS	0xff
 
-TAILQ_HEAD(, nfssvc_sock) nfssvc_sockhead;
-int nfssvc_sockhead_flag;
+extern TAILQ_HEAD(nfssvc_sockhead, nfssvc_sock) nfssvc_sockhead;
+extern int nfssvc_sockhead_flag;
 #define	SLP_INIT	0x01
 #define	SLP_WANTINIT	0x02
 
@@ -464,8 +464,8 @@ struct nfsrv_descript {
 #define ND_KERBFULL	0x40
 #define ND_KERBAUTH	(ND_KERBNICK | ND_KERBFULL)
 
-TAILQ_HEAD(, nfsd) nfsd_head;
-int nfsd_head_flag;
+extern TAILQ_HEAD(nfsd_head, nfsd) nfsd_head;
+extern int nfsd_head_flag;
 #define	NFSD_CHECKSLP	0x01
 
 /*
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index 18dbde2..0bd359f 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
- * $Id: nfsnode.h,v 1.9 1995/03/16 18:15:42 bde Exp $
+ * $Id: nfsnode.h,v 1.10 1995/06/27 11:06:57 dfr Exp $
  */
 
 #ifndef _NFS_NFSNODE_H_
@@ -148,7 +148,7 @@ struct nfsnode {
 /*
  * Queue head for nfsiod's
  */
-TAILQ_HEAD(, buf) nfs_bufq;
+extern TAILQ_HEAD(nfs_bufq, buf) nfs_bufq;
 
 #if defined(KERNEL) || defined(_KERNEL)
 extern	int	(**fifo_nfsv2nodeop_p)();
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index e1a0f07..2a3b3de 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.9 1995/02/14 06:22:18 phk Exp $
+ * $Id: nfs.h,v 1.10 1995/06/27 11:06:33 dfr Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -304,7 +304,7 @@ struct nfsreq {
 /*
  * Queue head for nfsreq's
  */
-TAILQ_HEAD(, nfsreq) nfs_reqq;
+extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
 
 /* Flag values for r_flags */
 #define R_TIMING	0x01		/* timing request (in mntp) */
@@ -398,8 +398,8 @@ struct nfssvc_sock {
 #define	SLP_LASTFRAG	0x20
 #define SLP_ALLFLAGS	0xff
 
-TAILQ_HEAD(, nfssvc_sock) nfssvc_sockhead;
-int nfssvc_sockhead_flag;
+extern TAILQ_HEAD(nfssvc_sockhead, nfssvc_sock) nfssvc_sockhead;
+extern int nfssvc_sockhead_flag;
 #define	SLP_INIT	0x01
 #define	SLP_WANTINIT	0x02
 
@@ -464,8 +464,8 @@ struct nfsrv_descript {
 #define ND_KERBFULL	0x40
 #define ND_KERBAUTH	(ND_KERBNICK | ND_KERBFULL)
 
-TAILQ_HEAD(, nfsd) nfsd_head;
-int nfsd_head_flag;
+extern TAILQ_HEAD(nfsd_head, nfsd) nfsd_head;
+extern int nfsd_head_flag;
 #define	NFSD_CHECKSLP	0x01
 
 /*
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index e1a0f07..2a3b3de 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.9 1995/02/14 06:22:18 phk Exp $
+ * $Id: nfs.h,v 1.10 1995/06/27 11:06:33 dfr Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -304,7 +304,7 @@ struct nfsreq {
 /*
  * Queue head for nfsreq's
  */
-TAILQ_HEAD(, nfsreq) nfs_reqq;
+extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
 
 /* Flag values for r_flags */
 #define R_TIMING	0x01		/* timing request (in mntp) */
@@ -398,8 +398,8 @@ struct nfssvc_sock {
 #define	SLP_LASTFRAG	0x20
 #define SLP_ALLFLAGS	0xff
 
-TAILQ_HEAD(, nfssvc_sock) nfssvc_sockhead;
-int nfssvc_sockhead_flag;
+extern TAILQ_HEAD(nfssvc_sockhead, nfssvc_sock) nfssvc_sockhead;
+extern int nfssvc_sockhead_flag;
 #define	SLP_INIT	0x01
 #define	SLP_WANTINIT	0x02
 
@@ -464,8 +464,8 @@ struct nfsrv_descript {
 #define ND_KERBFULL	0x40
 #define ND_KERBAUTH	(ND_KERBNICK | ND_KERBFULL)
 
-TAILQ_HEAD(, nfsd) nfsd_head;
-int nfsd_head_flag;
+extern TAILQ_HEAD(nfsd_head, nfsd) nfsd_head;
+extern int nfsd_head_flag;
 #define	NFSD_CHECKSLP	0x01
 
 /*
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index f01e1b0..4c6d4bb 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.20 1995/07/13 08:47:53 davidg Exp $
+ * $Id: nfs_subs.c,v 1.21 1995/07/20 09:43:12 davidg Exp $
  */
 
 /*
@@ -94,6 +94,16 @@ enum vtype nv2tov_type[8] = { VNON, VREG, VDIR, VBLK, VCHR, VLNK, VNON, VNON };
 enum vtype nv3tov_type[8]={ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO };
 int nfs_ticks;
 
+struct nfs_reqq nfs_reqq;
+struct nfssvc_sockhead nfssvc_sockhead;
+int nfssvc_sockhead_flag;
+struct nfsd_head nfsd_head;
+int nfsd_head_flag;
+struct nfs_bufq nfs_bufq;
+struct nqtimerhead nqtimerhead;
+struct nqfhhashhead *nqfhhashtbl;
+u_long nqfhhash;
+
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index e1a0f07..2a3b3de 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.9 1995/02/14 06:22:18 phk Exp $
+ * $Id: nfs.h,v 1.10 1995/06/27 11:06:33 dfr Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -304,7 +304,7 @@ struct nfsreq {
 /*
  * Queue head for nfsreq's
  */
-TAILQ_HEAD(, nfsreq) nfs_reqq;
+extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
 
 /* Flag values for r_flags */
 #define R_TIMING	0x01		/* timing request (in mntp) */
@@ -398,8 +398,8 @@ struct nfssvc_sock {
 #define	SLP_LASTFRAG	0x20
 #define SLP_ALLFLAGS	0xff
 
-TAILQ_HEAD(, nfssvc_sock) nfssvc_sockhead;
-int nfssvc_sockhead_flag;
+extern TAILQ_HEAD(nfssvc_sockhead, nfssvc_sock) nfssvc_sockhead;
+extern int nfssvc_sockhead_flag;
 #define	SLP_INIT	0x01
 #define	SLP_WANTINIT	0x02
 
@@ -464,8 +464,8 @@ struct nfsrv_descript {
 #define ND_KERBFULL	0x40
 #define ND_KERBAUTH	(ND_KERBNICK | ND_KERBFULL)
 
-TAILQ_HEAD(, nfsd) nfsd_head;
-int nfsd_head_flag;
+extern TAILQ_HEAD(nfsd_head, nfsd) nfsd_head;
+extern int nfsd_head_flag;
 #define	NFSD_CHECKSLP	0x01
 
 /*
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 89d289f..75f2cfb 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.7 (Berkeley) 1/21/94
- * $Id: buf.h,v 1.18 1995/04/19 10:31:56 davidg Exp $
+ * $Id: buf.h,v 1.19 1995/05/30 08:14:07 rgrimes Exp $
  */
 
 #ifndef _SYS_BUF_H_
@@ -172,8 +172,8 @@ struct cluster_save {
  */
 #define BUFFER_QUEUES	6	/* number of free buffer queues */
 
-LIST_HEAD(bufhashhdr, buf) bufhashtbl[BUFHSZ], invalhash;
-TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
+extern LIST_HEAD(bufhashhdr, buf) bufhashtbl[BUFHSZ], invalhash;
+extern TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
 
 #define QUEUE_NONE	0	/* on no queue */
 #define QUEUE_LOCKED	1	/* locked buffers */
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 89d289f..75f2cfb 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.7 (Berkeley) 1/21/94
- * $Id: buf.h,v 1.18 1995/04/19 10:31:56 davidg Exp $
+ * $Id: buf.h,v 1.19 1995/05/30 08:14:07 rgrimes Exp $
  */
 
 #ifndef _SYS_BUF_H_
@@ -172,8 +172,8 @@ struct cluster_save {
  */
 #define BUFFER_QUEUES	6	/* number of free buffer queues */
 
-LIST_HEAD(bufhashhdr, buf) bufhashtbl[BUFHSZ], invalhash;
-TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
+extern LIST_HEAD(bufhashhdr, buf) bufhashtbl[BUFHSZ], invalhash;
+extern TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
 
 #define QUEUE_NONE	0	/* on no queue */
 #define QUEUE_LOCKED	1	/* locked buffers */
diff --git a/sys/sys/device.h b/sys/sys/device.h
index 2fe1d6a..188564e 100644
--- a/sys/sys/device.h
+++ b/sys/sys/device.h
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device.h	8.2 (Berkeley) 2/17/94
- * $Id$
+ * $Id: device.h,v 1.2 1994/08/02 07:52:45 davidg Exp $
  */
 
 #ifndef _SYS_DEVICE_H_
@@ -132,8 +132,8 @@ struct pdevinit {
 	int	pdev_count;
 };
 
-struct	device *alldevs;	/* head of list of all devices */
-struct	evcnt *allevents;	/* head of list of all events */
+extern struct	device *alldevs;	/* head of list of all devices */
+extern struct	evcnt *allevents;	/* head of list of all events */
 
 struct cfdata *config_search __P((cfmatch_t, struct device *, void *));
 struct cfdata *config_rootsearch __P((cfmatch_t, char *, void *));
diff --git a/sys/sys/dmap.h b/sys/sys/dmap.h
index b9ca5a1..bab44ee 100644
--- a/sys/sys/dmap.h
+++ b/sys/sys/dmap.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dmap.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * $Id: dmap.h,v 1.2 1994/08/02 07:52:52 davidg Exp $
  */
 
 #ifndef _SYS_DMAP_H_
@@ -49,8 +49,8 @@ struct dmap {
 	swblk_t dm_map[NDMAP];	/* first disk block number in each chunk */
 };
 #ifdef KERNEL
-struct dmap zdmap;
-int dmmin, dmmax, dmtext;
+extern struct dmap zdmap;
+extern int dmmin, dmmax, dmtext;
 #endif
 
 /* The following structure is that ``returned'' from a call to vstodb(). */
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 3f888a6..b1d98e8 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mbuf.h	8.3 (Berkeley) 1/21/94
- * $Id: mbuf.h,v 1.8 1994/11/04 00:28:38 davidg Exp $
+ * $Id: mbuf.h,v 1.9 1994/11/14 13:54:20 bde Exp $
  */
 
 #ifndef _SYS_MBUF_H_
@@ -358,16 +358,16 @@ struct mbstat {
 };
 
 #ifdef	KERNEL
-extern	struct mbuf *mbutl;		/* virtual address of mclusters */
-extern	char *mclrefcnt;		/* cluster reference counts */
-struct	mbstat mbstat;
-extern	int nmbclusters;
-union	mcluster *mclfree;
-int	max_linkhdr;			/* largest link-level header */
-int	max_protohdr;			/* largest protocol header */
-int	max_hdr;			/* largest link+protocol header */
-int	max_datalen;			/* MHLEN - max_hdr */
-extern	int mbtypes[];			/* XXX */
+extern struct mbuf *mbutl;		/* virtual address of mclusters */
+extern char	*mclrefcnt;		/* cluster reference counts */
+extern struct mbstat mbstat;
+extern int	nmbclusters;
+extern union mcluster *mclfree;
+extern int	max_linkhdr;		/* largest link-level header */
+extern int	max_protohdr;		/* largest protocol header */
+extern int	max_hdr;		/* largest link+protocol header */
+extern int	max_datalen;		/* MHLEN - max_hdr */
+extern int	mbtypes[];		/* XXX */
 
 int	m_clalloc __P((int, int));
 void	m_copyback __P((struct mbuf *, int, int, caddr_t));
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index 48e7c5b..894ce9ac 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -1,4 +1,4 @@
-/* $Id: msg.h,v 1.2 1994/09/17 13:24:27 davidg Exp $ */
+/* $Id: msg.h,v 1.3 1995/03/28 07:57:34 bde Exp $ */
 /*	$NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $	*/
 
 /*
@@ -135,10 +135,10 @@ struct msgmap {
     				/* 0..(MSGSEG-1) -> index of next segment */
 };
 
-char *msgpool;			/* MSGMAX byte long msg buffer pool */
-struct msgmap *msgmaps;		/* MSGSEG msgmap structures */
-struct msg *msghdrs;		/* MSGTQL msg headers */
-struct msqid_ds *msqids;	/* MSGMNI msqid_ds struct's */
+extern char *msgpool;		/* MSGMAX byte long msg buffer pool */
+extern struct msgmap *msgmaps;	/* MSGSEG msgmap structures */
+extern struct msg *msghdrs;	/* MSGTQL msg headers */
+extern struct msqid_ds *msqids;	/* MSGMNI msqid_ds struct's */
 
 #define MSG_LOCKED	01000	/* Is this msqid_ds locked? */
 
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 3474c01..bd15fe2 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)namei.h	8.2 (Berkeley) 1/4/94
- * $Id: namei.h,v 1.4 1995/03/06 06:45:47 phk Exp $
+ * $Id: namei.h,v 1.5 1995/03/09 20:27:21 phk Exp $
  */
 
 #ifndef _SYS_NAMEI_H_
@@ -176,8 +176,10 @@ struct	namecache {
 };
 
 #ifdef KERNEL
-u_long	nextvnodeid;
-u_long	numvnodes, numcache;
+extern u_long	nextvnodeid;
+extern u_long	numcache;
+extern u_long	numvnodes;
+
 int	namei __P((struct nameidata *ndp));
 int	lookup __P((struct nameidata *ndp));
 int	relookup __P((struct vnode *dvp, struct vnode **vpp,
@@ -197,4 +199,7 @@ struct	nchstats {
 	long	ncs_pass2;		/* names found with passes == 2 */
 	long	ncs_2passes;		/* number of times we attempt it */
 };
+
+extern struct nchstats nchstats;
+
 #endif /* !_SYS_NAMEI_H_ */
diff --git a/sys/sys/sem.h b/sys/sys/sem.h
index 1efd4c9..b49165e 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,4 +1,4 @@
-/* $Id: sem.h,v 1.3 1995/03/28 07:57:35 bde Exp $ */
+/* $Id: sem.h,v 1.4 1995/07/08 16:36:28 joerg Exp $ */
 /*	$NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $	*/
 
 /*
@@ -143,14 +143,11 @@ extern struct seminfo	seminfo;
 /* actual size of an undo structure */
 #define SEMUSZ	(sizeof(struct sem_undo)+sizeof(struct undo)*SEMUME)
 
-/*
- * Structures allocated in machdep.c
- */
-struct	semid_ds *sema;		/* semaphore id pool */
-struct	sem *sem;		/* semaphore pool */
-struct	map *semmap;		/* semaphore allocation map */
-struct	sem_undo *semu_list;	/* list of active undo structures */
-int	*semu;			/* undo structure pool */
+extern struct semid_ds *sema;	/* semaphore id pool */
+extern struct sem *sem;		/* semaphore pool */
+extern struct map *semmap;	/* semaphore allocation map */
+extern struct sem_undo *semu_list; /* list of active undo structures */
+extern int	*semu;		/* undo structure pool */
 
 /*
  * Macro to find a particular sem_undo vector
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 4053445..ed02cc1 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,4 @@
-/* $Id: shm.h,v 1.3 1994/10/02 17:24:54 phk Exp $ */
+/* $Id: shm.h,v 1.4 1995/07/08 16:36:30 joerg Exp $ */
 /*	$NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $	*/
 
 /*
@@ -77,7 +77,7 @@ struct shminfo {
 		shmall;		/* max amount of shared memory (pages) */
 };
 extern struct shminfo	shminfo;
-struct shmid_ds	*shmsegs;
+extern struct shmid_ds	*shmsegs;
 
 void	shminit __P((void));
 void	shmexit __P((struct proc *));
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index d351bde..aa21e30 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vmmeter.h	8.1 (Berkeley) 6/2/93
- * $Id: vmmeter.h,v 1.10 1995/03/25 08:42:04 davidg Exp $
+ * $Id: vmmeter.h,v 1.11 1995/07/29 10:47:05 bde Exp $
  */
 
 #ifndef _SYS_VMMETER_H_
@@ -90,7 +90,7 @@ struct vmmeter {
 	unsigned v_interrupt_free_min;	/* reserved number of pages for int code */
 };
 #ifdef KERNEL
-struct	vmmeter cnt;
+extern struct vmmeter cnt;
 #endif
 
 /* systemwide totals computed every five seconds */
diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h
index 9a1fb4a..d183d44 100644
--- a/sys/ufs/lfs/lfs_extern.h
+++ b/sys/ufs/lfs/lfs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_extern.h	8.2 (Berkeley) 4/16/94
- * $Id: lfs_extern.h,v 1.4 1994/09/22 19:38:34 wollman Exp $
+ * $Id: lfs_extern.h,v 1.5 1995/03/28 07:58:04 bde Exp $
  */
 
 #ifndef _UFS_LFS_LFS_EXTERN_H_
@@ -106,6 +106,8 @@ void	lfs_dump_dinode __P((struct dinode *));
 void	lfs_dump_super __P((struct lfs *));
 #endif
 __END_DECLS
+
+extern int lfs_allclean_wakeup;
 extern int (**lfs_vnodeop_p)();
 extern int (**lfs_specop_p)();
 extern int (**lfs_fifoop_p)();
diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c
index 48a73ce..454e8e4 100644
--- a/sys/ufs/lfs/lfs_segment.c
+++ b/sys/ufs/lfs/lfs_segment.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_segment.c	8.5 (Berkeley) 1/4/94
- * $Id: lfs_segment.c,v 1.10 1995/05/11 19:26:51 rgrimes Exp $
+ * $Id: lfs_segment.c,v 1.11 1995/05/30 08:15:22 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -158,8 +158,6 @@ void	 lfs_writefile __P((struct lfs *, struct segment *, struct vnode *));
 void	 lfs_writevnodes __P((struct lfs *fs, struct mount *mp,
 	    struct segment *sp, int dirops));
 
-int	lfs_allclean_wakeup;		/* Cleaner wakeup address. */
-
 /* Statistics Counters */
 #define DOSTATS
 struct lfs_stats lfs_stats;
diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c
index 1ec0cdc..5da8659 100644
--- a/sys/ufs/lfs/lfs_syscalls.c
+++ b/sys/ufs/lfs/lfs_syscalls.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_syscalls.c	8.5 (Berkeley) 4/20/94
- * $Id: lfs_syscalls.c,v 1.9 1995/05/11 19:26:52 rgrimes Exp $
+ * $Id: lfs_syscalls.c,v 1.10 1995/05/30 08:15:25 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -388,7 +388,6 @@ lfs_segwait(p, uap, retval)
 	struct lfs_segwait_args *uap;
 	int *retval;
 {
-	extern int lfs_allclean_wakeup;
 	struct mount *mntp;
 	struct timeval atv;
 	fsid_t fsid;
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index b8de08b..2994c5c 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lookup.c	8.6 (Berkeley) 4/1/94
- * $Id: ufs_lookup.c,v 1.2 1994/08/02 07:54:58 davidg Exp $
+ * $Id: ufs_lookup.c,v 1.3 1994/10/08 06:57:26 phk Exp $
  */
 
 #include <sys/param.h>
@@ -53,7 +53,6 @@
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
 
-struct	nchstats nchstats;
 #ifdef DIAGNOSTIC
 int	dirchk = 1;
 #else
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index bf1b90f..1f21ec5 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.c,v 1.13 1995/05/30 08:16:04 rgrimes Exp $
+ * $Id: vm_kern.c,v 1.14 1995/07/13 08:48:25 davidg Exp $
  */
 
 /*
@@ -84,13 +84,12 @@ vm_map_t buffer_map;
 vm_map_t kernel_map;
 vm_map_t kmem_map;
 vm_map_t mb_map;
+int mb_map_full;
 vm_map_t io_map;
 vm_map_t clean_map;
-vm_map_t pager_map;
 vm_map_t phys_map;
 vm_map_t exec_map;
 vm_map_t u_map;
-extern int mb_map_full;
 
 /*
  *	kmem_alloc_pageable:
diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
index 627c70d..57f4f1a 100644
--- a/sys/vm/vm_kern.h
+++ b/sys/vm/vm_kern.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.h,v 1.4 1994/08/18 22:36:03 wollman Exp $
+ * $Id: vm_kern.h,v 1.5 1995/01/09 16:05:44 davidg Exp $
  */
 
 #ifndef _VM_VM_KERN_H_
@@ -72,9 +72,9 @@ extern vm_map_t buffer_map;
 extern vm_map_t kernel_map;
 extern vm_map_t kmem_map;
 extern vm_map_t mb_map;
+extern int mb_map_full;
 extern vm_map_t io_map;
 extern vm_map_t clean_map;
-extern vm_map_t pager_map;
 extern vm_map_t phys_map;
 extern vm_map_t exec_map;
 extern vm_map_t u_map;
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index d85f5db..f7ec9b9 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_meter.c	8.4 (Berkeley) 1/4/94
- * $Id: vm_meter.c,v 1.6 1995/01/10 07:32:47 davidg Exp $
+ * $Id: vm_meter.c,v 1.7 1995/07/13 08:48:30 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -42,6 +42,7 @@
 #include <sys/sysctl.h>
 
 struct loadavg averunnable;	/* load average, of runnable procs */
+struct vmmeter cnt;
 
 int maxslp = MAXSLP;
 
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 13c7b22..50191aa 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.c,v 1.49 1995/07/13 08:48:34 davidg Exp $
+ * $Id: vm_object.c,v 1.50 1995/07/16 13:28:36 davidg Exp $
  */
 
 /*
@@ -112,12 +112,16 @@ static void _vm_object_allocate(objtype_t, vm_size_t, vm_object_t);
  *
  */
 
-
+int vm_object_cache_max;
+struct object_q vm_object_cached_list;
+int vm_object_cached;
+struct object_q vm_object_list;
+long vm_object_count;
+vm_object_t kernel_object;
+vm_object_t kmem_object;
 struct vm_object kernel_object_store;
 struct vm_object kmem_object_store;
 
-int vm_object_cache_max;
-
 long object_collapses;
 long object_bypasses;
 
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 08dab3b..b0d5656 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.h,v 1.19 1995/07/13 08:48:36 davidg Exp $
+ * $Id: vm_object.h,v 1.20 1995/07/16 13:28:37 davidg Exp $
  */
 
 /*
@@ -133,16 +133,16 @@ extern int vm_object_cache_max;
 
 TAILQ_HEAD(object_q, vm_object);
 
-struct object_q vm_object_cached_list;	/* list of objects persisting */
-int vm_object_cached;			/* size of cached list */
+extern struct object_q vm_object_cached_list; /* list of objects persisting */
+extern int vm_object_cached;		/* size of cached list */
 
-struct object_q vm_object_list;		/* list of allocated objects */
-long vm_object_count;			/* count of all objects */
+extern struct object_q vm_object_list;	/* list of allocated objects */
+extern long vm_object_count;		/* count of all objects */
 
  /* 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;
 
 #endif				/* KERNEL */
 
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index b897c76..1c9fb70 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pager.c,v 1.15 1995/05/10 18:56:07 davidg Exp $
+ * $Id: vm_pager.c,v 1.16 1995/07/13 08:48:42 davidg Exp $
  */
 
 /*
@@ -107,7 +107,6 @@ int npagers = sizeof(pagertab) / sizeof(pagertab[0]);
 int pager_map_size = PAGER_MAP_SIZE;
 vm_map_t pager_map;
 boolean_t pager_map_wanted;
-vm_offset_t pager_sva, pager_eva;
 int bswneeded;
 vm_offset_t swapbkva;		/* swap buffers kva */
 
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index a367f4b..c7adb83 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
- * $Id: vm_pager.h,v 1.7 1995/05/10 18:56:08 davidg Exp $
+ * $Id: vm_pager.h,v 1.8 1995/07/13 08:48:44 davidg Exp $
  */
 
 /*
@@ -75,6 +75,9 @@ struct pagerops {
 #define VM_PAGER_AGAIN	5
 
 #ifdef KERNEL
+extern vm_map_t pager_map;
+extern int pager_map_size;
+
 vm_object_t vm_pager_allocate __P((objtype_t, void *, vm_size_t, vm_prot_t, vm_offset_t));
 vm_page_t vm_pager_atop __P((vm_offset_t));
 void vm_pager_bufferinit __P((void));
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 6f63fae..ed3e0bc 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $Id: vm_swap.c,v 1.21 1995/05/30 08:16:21 rgrimes Exp $
+ * $Id: vm_swap.c,v 1.22 1995/07/13 08:48:45 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -62,8 +62,6 @@ struct vnode *swapdev_vp;
 int nswap;			/* first block after the interleaved devs */
 int nswdev = NSWAPDEV;
 int vm_swap_size;
-int bswneeded;
-vm_offset_t swapbkva;		/* swap buffers kva */
 
 void
 swstrategy(bp)