diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index d5a20de38b3b..6bb4e0fa4d17 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.63 1998/12/07 21:58:22 archie Exp $
+ *	$Id: npx.c,v 1.64 1998/12/14 19:16:17 bde Exp $
  */
 
 #include "npx.h"
@@ -58,9 +58,7 @@
 #include <machine/cputypes.h>
 #include <machine/frame.h>
 #include <machine/ipl.h>
-#ifndef SMP
 #include <machine/md_var.h>
-#endif
 #include <machine/pcb.h>
 #include <machine/psl.h>
 #ifndef SMP
@@ -86,15 +84,6 @@
 #define	NPX_DISABLE_I586_OPTIMIZED_COPYIO	(1 << 2)
 
 /* XXX - should be in header file. */
-extern void (*bcopy_vector) __P((const void *from, void *to, size_t len));
-extern void (*ovbcopy_vector) __P((const void *from, void *to, size_t len));
-extern int (*copyin_vector) __P((const void *udaddr, void *kaddr, size_t len));
-extern int (*copyout_vector) __P((const void *kaddr, void *udaddr, size_t len));
-
-void	i586_bcopy __P((const void *from, void *to, size_t len));
-void	i586_bzero __P((void *buf, size_t len));
-int	i586_copyin __P((const void *udaddr, void *kaddr, size_t len));
-int	i586_copyout __P((const void *kaddr, void *udaddr, size_t len));
 ointhand2_t	npxintr;
 
 #ifdef	__GNUC__
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index 64972ec4960d..f5a1ead3151d 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.53 1998/12/05 16:30:55 kato Exp $
+ *	$Id: identcpu.c,v 1.54 1998/12/27 23:23:26 msmith Exp $
  */
 
 #include "opt_cpu.h"
@@ -59,10 +59,8 @@
 #define	IDENTBLUE_IBMCPU	1
 #define	IDENTBLUE_CYRIXM2	2
 
-/* XXX - should be in header file */
-void	i486_bzero __P((void *buf, size_t len));
-
-void printcpuinfo(void);	/* XXX should be in different header file */
+/* XXX - should be in header file: */
+void printcpuinfo(void);
 void finishidentcpu(void);
 void earlysetcpuclass(void);
 #if defined(I586_CPU) && defined(CPU_WT_ALLOC)
@@ -71,6 +69,7 @@ void	enable_K6_wt_alloc(void);
 void	enable_K6_2_wt_alloc(void);
 #endif
 void panicifcpuunsupported(void);
+
 static void identifycyrix(void);
 static void print_AMD_info(void);
 static void print_AMD_assoc(int i);
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index 977003cb5c23..bd14162c2617 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cpufunc.h,v 1.80 1998/07/11 04:58:25 bde Exp $
+ *	$Id: cpufunc.h,v 1.81 1998/08/17 08:57:05 dfr Exp $
  */
 
 /*
@@ -461,6 +461,5 @@ void	ltr		__P((u_short sel));
 u_int	rcr0		__P((void));
 u_int	rcr3		__P((void));
 u_int	rcr4		__P((void));
-void	i686_pagezero	__P((void *addr));
 
 #endif /* !_MACHINE_CPUFUNC_H_ */
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 82a43348e905..fd7bcfd2c661 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.26 1998/09/25 17:34:49 peter Exp $
+ *	$Id: md_var.h,v 1.27 1998/10/30 05:41:15 msmith Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
@@ -38,7 +38,12 @@
 
 extern	int	Maxmem;
 extern	u_int	atdevbase;	/* offset in virtual memory of ISA io mem */
+extern	void	(*bcopy_vector) __P((const void *from, void *to, size_t len));
 extern	int	busdma_swi_pending;
+extern	int	(*copyin_vector) __P((const void *udaddr, void *kaddr,
+				      size_t len));
+extern	int	(*copyout_vector) __P((const void *kaddr, void *udaddr,
+				       size_t len));
 extern	u_int	cpu_feature;
 extern	u_int	cpu_high;
 extern	u_int	cpu_id;
@@ -51,6 +56,7 @@ extern	int	need_post_dma_flush;
 #endif
 extern	void	(*netisrs[32]) __P((void));
 extern	int	nfs_diskless_valid;
+extern	void	(*ovbcopy_vector) __P((const void *from, void *to, size_t len));
 extern	char	sigcode[];
 extern	int	szsigcode;
 
@@ -74,6 +80,12 @@ void	doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault));
 int	fill_fpregs __P((struct proc *, struct fpreg *));
 int	fill_regs __P((struct proc *p, struct reg *regs));
 void	fillw __P((int /*u_short*/ pat, void *base, size_t cnt));
+void	i486_bzero __P((void *buf, size_t len));
+void	i586_bcopy __P((const void *from, void *to, size_t len));
+void	i586_bzero __P((void *buf, size_t len));
+int	i586_copyin __P((const void *udaddr, void *kaddr, size_t len));
+int	i586_copyout __P((const void *kaddr, void *udaddr, size_t len));
+void	i686_pagezero __P((void *addr));
 int	is_physical_memory __P((vm_offset_t addr));
 u_long	kvtop __P((void *addr));
 void	setidt __P((int idx, alias_for_inthand_t *func, int typ, int dpl,
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index d5a20de38b3b..6bb4e0fa4d17 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.63 1998/12/07 21:58:22 archie Exp $
+ *	$Id: npx.c,v 1.64 1998/12/14 19:16:17 bde Exp $
  */
 
 #include "npx.h"
@@ -58,9 +58,7 @@
 #include <machine/cputypes.h>
 #include <machine/frame.h>
 #include <machine/ipl.h>
-#ifndef SMP
 #include <machine/md_var.h>
-#endif
 #include <machine/pcb.h>
 #include <machine/psl.h>
 #ifndef SMP
@@ -86,15 +84,6 @@
 #define	NPX_DISABLE_I586_OPTIMIZED_COPYIO	(1 << 2)
 
 /* XXX - should be in header file. */
-extern void (*bcopy_vector) __P((const void *from, void *to, size_t len));
-extern void (*ovbcopy_vector) __P((const void *from, void *to, size_t len));
-extern int (*copyin_vector) __P((const void *udaddr, void *kaddr, size_t len));
-extern int (*copyout_vector) __P((const void *kaddr, void *udaddr, size_t len));
-
-void	i586_bcopy __P((const void *from, void *to, size_t len));
-void	i586_bzero __P((void *buf, size_t len));
-int	i586_copyin __P((const void *udaddr, void *kaddr, size_t len));
-int	i586_copyout __P((const void *kaddr, void *udaddr, size_t len));
 ointhand2_t	npxintr;
 
 #ifdef	__GNUC__
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index 64972ec4960d..f5a1ead3151d 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.53 1998/12/05 16:30:55 kato Exp $
+ *	$Id: identcpu.c,v 1.54 1998/12/27 23:23:26 msmith Exp $
  */
 
 #include "opt_cpu.h"
@@ -59,10 +59,8 @@
 #define	IDENTBLUE_IBMCPU	1
 #define	IDENTBLUE_CYRIXM2	2
 
-/* XXX - should be in header file */
-void	i486_bzero __P((void *buf, size_t len));
-
-void printcpuinfo(void);	/* XXX should be in different header file */
+/* XXX - should be in header file: */
+void printcpuinfo(void);
 void finishidentcpu(void);
 void earlysetcpuclass(void);
 #if defined(I586_CPU) && defined(CPU_WT_ALLOC)
@@ -71,6 +69,7 @@ void	enable_K6_wt_alloc(void);
 void	enable_K6_2_wt_alloc(void);
 #endif
 void panicifcpuunsupported(void);
+
 static void identifycyrix(void);
 static void print_AMD_info(void);
 static void print_AMD_assoc(int i);
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index 977003cb5c23..bd14162c2617 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cpufunc.h,v 1.80 1998/07/11 04:58:25 bde Exp $
+ *	$Id: cpufunc.h,v 1.81 1998/08/17 08:57:05 dfr Exp $
  */
 
 /*
@@ -461,6 +461,5 @@ void	ltr		__P((u_short sel));
 u_int	rcr0		__P((void));
 u_int	rcr3		__P((void));
 u_int	rcr4		__P((void));
-void	i686_pagezero	__P((void *addr));
 
 #endif /* !_MACHINE_CPUFUNC_H_ */
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 82a43348e905..fd7bcfd2c661 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.26 1998/09/25 17:34:49 peter Exp $
+ *	$Id: md_var.h,v 1.27 1998/10/30 05:41:15 msmith Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
@@ -38,7 +38,12 @@
 
 extern	int	Maxmem;
 extern	u_int	atdevbase;	/* offset in virtual memory of ISA io mem */
+extern	void	(*bcopy_vector) __P((const void *from, void *to, size_t len));
 extern	int	busdma_swi_pending;
+extern	int	(*copyin_vector) __P((const void *udaddr, void *kaddr,
+				      size_t len));
+extern	int	(*copyout_vector) __P((const void *kaddr, void *udaddr,
+				       size_t len));
 extern	u_int	cpu_feature;
 extern	u_int	cpu_high;
 extern	u_int	cpu_id;
@@ -51,6 +56,7 @@ extern	int	need_post_dma_flush;
 #endif
 extern	void	(*netisrs[32]) __P((void));
 extern	int	nfs_diskless_valid;
+extern	void	(*ovbcopy_vector) __P((const void *from, void *to, size_t len));
 extern	char	sigcode[];
 extern	int	szsigcode;
 
@@ -74,6 +80,12 @@ void	doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault));
 int	fill_fpregs __P((struct proc *, struct fpreg *));
 int	fill_regs __P((struct proc *p, struct reg *regs));
 void	fillw __P((int /*u_short*/ pat, void *base, size_t cnt));
+void	i486_bzero __P((void *buf, size_t len));
+void	i586_bcopy __P((const void *from, void *to, size_t len));
+void	i586_bzero __P((void *buf, size_t len));
+int	i586_copyin __P((const void *udaddr, void *kaddr, size_t len));
+int	i586_copyout __P((const void *kaddr, void *udaddr, size_t len));
+void	i686_pagezero __P((void *addr));
 int	is_physical_memory __P((vm_offset_t addr));
 u_long	kvtop __P((void *addr));
 void	setidt __P((int idx, alias_for_inthand_t *func, int typ, int dpl,
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index d5a20de38b3b..6bb4e0fa4d17 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.63 1998/12/07 21:58:22 archie Exp $
+ *	$Id: npx.c,v 1.64 1998/12/14 19:16:17 bde Exp $
  */
 
 #include "npx.h"
@@ -58,9 +58,7 @@
 #include <machine/cputypes.h>
 #include <machine/frame.h>
 #include <machine/ipl.h>
-#ifndef SMP
 #include <machine/md_var.h>
-#endif
 #include <machine/pcb.h>
 #include <machine/psl.h>
 #ifndef SMP
@@ -86,15 +84,6 @@
 #define	NPX_DISABLE_I586_OPTIMIZED_COPYIO	(1 << 2)
 
 /* XXX - should be in header file. */
-extern void (*bcopy_vector) __P((const void *from, void *to, size_t len));
-extern void (*ovbcopy_vector) __P((const void *from, void *to, size_t len));
-extern int (*copyin_vector) __P((const void *udaddr, void *kaddr, size_t len));
-extern int (*copyout_vector) __P((const void *kaddr, void *udaddr, size_t len));
-
-void	i586_bcopy __P((const void *from, void *to, size_t len));
-void	i586_bzero __P((void *buf, size_t len));
-int	i586_copyin __P((const void *udaddr, void *kaddr, size_t len));
-int	i586_copyout __P((const void *kaddr, void *udaddr, size_t len));
 ointhand2_t	npxintr;
 
 #ifdef	__GNUC__