diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 40584ea4f7c0..4d106e31c12c 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.270 1997/11/06 19:28:02 phk Exp $
+ *	$Id: machdep.c,v 1.271 1997/11/07 09:20:15 phk Exp $
  */
 
 #include "apm.h"
@@ -137,8 +137,6 @@ SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
 static MALLOC_DEFINE(M_MBUF, "mbuf", "mbuf");
 
 #ifdef BOUNCE_BUFFERS
-extern char *bouncememory;
-extern int maxbkva;
 #ifdef BOUNCEPAGES
 int	bouncepages = BOUNCEPAGES;
 #else
@@ -146,7 +144,6 @@ int	bouncepages = 0;
 #endif
 #endif	/* BOUNCE_BUFFERS */
 
-extern int freebufspace;
 int	msgbufmapped = 0;		/* set when safe to use msgbuf */
 int _udatasel, _ucodesel;
 u_int	atdevbase;
@@ -178,7 +175,6 @@ SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD,
 
 int boothowto = 0, bootverbose = 0, Maxmem = 0;
 long dumplo;
-extern int bootdev;
 
 vm_offset_t phys_avail[10];
 
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index d6bcef4e296f..36a95145411b 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.46 1997/07/20 08:37:20 bde Exp $
+ *	$Id: mem.c,v 1.47 1997/09/14 03:19:02 peter Exp $
  */
 
 /*
@@ -135,8 +135,6 @@ memdevfs_init()
 }
 #endif /* DEVFS */
 
-extern        char *ptvmmap;            /* poor name! */
-
 static int
 mmclose(dev, flags, fmt, p)
 	dev_t dev;
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 126de55e24d9..2a8561f67992 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.171 1997/11/07 09:20:18 phk Exp $
+ *	$Id: pmap.c,v 1.172 1997/11/07 19:58:34 tegge Exp $
  */
 
 /*
@@ -159,8 +159,6 @@ int pv_npg;
 int nkpt;
 vm_offset_t kernel_vm_end;
 
-extern vm_offset_t clean_sva, clean_eva;
-
 /*
  * Data for the pv entry allocation mechanism
  */
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 7ba75fe3fa0e..3e1c4c64484d 100644
--- a/sys/amd64/include/md_var.h
+++ b/sys/amd64/include/md_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: md_var.h,v 1.18 1997/09/13 16:12:11 joerg Exp $
+ *	$Id: md_var.h,v 1.19 1997/10/27 17:23:04 bde Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
@@ -38,12 +38,19 @@
 
 extern	int	Maxmem;
 extern	u_int	atdevbase;	/* offset in virtual memory of ISA io mem */
+#ifdef BOUNCE_BUFFERS
+extern	char	*bouncememory;
+extern	int	bouncepages;
+#endif
 extern	u_long	cpu_feature;
 extern	u_long	cpu_high;
 extern	u_long	cpu_id;
 extern	u_long	cyrix_did;
 extern	char	cpu_vendor[];
 extern	char	kstack[];
+#ifdef BOUNCE_BUFFERS
+extern	int	maxbkva;
+#endif
 extern	void	(*netisrs[32]) __P((void));
 extern	int	nfs_diskless_valid;
 extern	char	sigcode[];
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 2cc36e08a629..414b70a78df4 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.52 1997/07/17 04:33:48 dyson Exp $
+ * 	$Id: pmap.h,v 1.53 1997/08/05 00:42:01 dyson Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
@@ -238,7 +238,10 @@ extern caddr_t	CADDR1;
 extern pt_entry_t *CMAP1;
 extern vm_offset_t avail_end;
 extern vm_offset_t avail_start;
+extern vm_offset_t clean_eva;
+extern vm_offset_t clean_sva;
 extern vm_offset_t phys_avail[];
+extern char *ptvmmap;		/* poor name! */
 extern vm_offset_t virtual_avail;
 extern vm_offset_t virtual_end;
 
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 40584ea4f7c0..4d106e31c12c 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.270 1997/11/06 19:28:02 phk Exp $
+ *	$Id: machdep.c,v 1.271 1997/11/07 09:20:15 phk Exp $
  */
 
 #include "apm.h"
@@ -137,8 +137,6 @@ SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
 static MALLOC_DEFINE(M_MBUF, "mbuf", "mbuf");
 
 #ifdef BOUNCE_BUFFERS
-extern char *bouncememory;
-extern int maxbkva;
 #ifdef BOUNCEPAGES
 int	bouncepages = BOUNCEPAGES;
 #else
@@ -146,7 +144,6 @@ int	bouncepages = 0;
 #endif
 #endif	/* BOUNCE_BUFFERS */
 
-extern int freebufspace;
 int	msgbufmapped = 0;		/* set when safe to use msgbuf */
 int _udatasel, _ucodesel;
 u_int	atdevbase;
@@ -178,7 +175,6 @@ SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD,
 
 int boothowto = 0, bootverbose = 0, Maxmem = 0;
 long dumplo;
-extern int bootdev;
 
 vm_offset_t phys_avail[10];
 
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index d6bcef4e296f..36a95145411b 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.46 1997/07/20 08:37:20 bde Exp $
+ *	$Id: mem.c,v 1.47 1997/09/14 03:19:02 peter Exp $
  */
 
 /*
@@ -135,8 +135,6 @@ memdevfs_init()
 }
 #endif /* DEVFS */
 
-extern        char *ptvmmap;            /* poor name! */
-
 static int
 mmclose(dev, flags, fmt, p)
 	dev_t dev;
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 126de55e24d9..2a8561f67992 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.171 1997/11/07 09:20:18 phk Exp $
+ *	$Id: pmap.c,v 1.172 1997/11/07 19:58:34 tegge Exp $
  */
 
 /*
@@ -159,8 +159,6 @@ int pv_npg;
 int nkpt;
 vm_offset_t kernel_vm_end;
 
-extern vm_offset_t clean_sva, clean_eva;
-
 /*
  * Data for the pv entry allocation mechanism
  */
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 7ba75fe3fa0e..3e1c4c64484d 100644
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: md_var.h,v 1.18 1997/09/13 16:12:11 joerg Exp $
+ *	$Id: md_var.h,v 1.19 1997/10/27 17:23:04 bde Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
@@ -38,12 +38,19 @@
 
 extern	int	Maxmem;
 extern	u_int	atdevbase;	/* offset in virtual memory of ISA io mem */
+#ifdef BOUNCE_BUFFERS
+extern	char	*bouncememory;
+extern	int	bouncepages;
+#endif
 extern	u_long	cpu_feature;
 extern	u_long	cpu_high;
 extern	u_long	cpu_id;
 extern	u_long	cyrix_did;
 extern	char	cpu_vendor[];
 extern	char	kstack[];
+#ifdef BOUNCE_BUFFERS
+extern	int	maxbkva;
+#endif
 extern	void	(*netisrs[32]) __P((void));
 extern	int	nfs_diskless_valid;
 extern	char	sigcode[];
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 2cc36e08a629..414b70a78df4 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.52 1997/07/17 04:33:48 dyson Exp $
+ * 	$Id: pmap.h,v 1.53 1997/08/05 00:42:01 dyson Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
@@ -238,7 +238,10 @@ extern caddr_t	CADDR1;
 extern pt_entry_t *CMAP1;
 extern vm_offset_t avail_end;
 extern vm_offset_t avail_start;
+extern vm_offset_t clean_eva;
+extern vm_offset_t clean_sva;
 extern vm_offset_t phys_avail[];
+extern char *ptvmmap;		/* poor name! */
 extern vm_offset_t virtual_avail;
 extern vm_offset_t virtual_end;