diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index 510cacd63463..204a228efabb 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.49 1996/04/07 18:30:56 bde Exp $
+ *	$Id: cpufunc.h,v 1.50 1996/06/14 11:01:01 asami Exp $
  */
 
 /*
@@ -398,28 +398,10 @@ void	wrmsr		__P((u_int msr, quad_t newval));
 
 #endif	/* __GNUC__ */
 
-/*
- * These variables and functions in support.s are used.
- */
-extern u_int atdevbase;	/* offset in virtual memory of ISA io mem */
-
-void	bcopyb		__P((const void *from, void *to, size_t len));
-void	fillw		__P((int /*u_short*/ pat, void *base, size_t cnt));
-int	fusword		__P((void *base));
 void	load_cr0	__P((u_long cr0));
 void	load_cr3	__P((u_long cr3));
 void	ltr		__P((u_short sel));
 u_int	rcr0		__P((void));
 u_long	rcr3		__P((void));
 
-/*
- * These functions are NOT in support.s and should be declared elsewhere.
- */
-void	Debugger	__P((const char *msg));
-u_long	kvtop		__P((void *addr));
-typedef void alias_for_inthand_t __P((u_int cs, u_int ef, u_int esp,
-				      u_int ss));
-void	setidt		__P((int idx, alias_for_inthand_t *func, int typ,
-			     int dpl, int selec));
-
 #endif /* !_MACHINE_CPUFUNC_H_ */
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 5e280304abdc..b8faa151de64 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.7 1996/02/04 21:20:52 davidg Exp $
+ *	$Id: md_var.h,v 1.8 1996/03/02 19:37:45 peter Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
@@ -37,6 +37,7 @@
  */
 
 extern	int	Maxmem;
+extern	u_int	atdevbase;	/* offset in virtual memory of ISA io mem */
 extern	u_long	cpu_feature;
 extern	u_long	cpu_high;
 extern	u_long	cpu_id;
@@ -48,9 +49,11 @@ extern	int	nfs_diskless_valid;
 extern	char	sigcode[];
 extern	int	szsigcode;
 
+typedef void alias_for_inthand_t __P((u_int cs, u_int ef, u_int esp, u_int ss));
 struct	proc;
 struct	reg;
 
+void	bcopyb __P((const void *from, void *to, size_t len));
 void	cpu_reset __P((void));
 void	doreti_iret __P((void)) __asm(__STRING(doreti_iret));
 void	doreti_iret_fault __P((void)) __asm(__STRING(doreti_iret_fault));
@@ -59,6 +62,11 @@ void	doreti_popl_ds_fault __P((void)) __asm(__STRING(doreti_popl_ds_fault));
 void	doreti_popl_es __P((void)) __asm(__STRING(doreti_popl_es));
 void	doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault));
 int	fill_regs __P((struct proc *p, struct reg *regs));
+void	fillw __P((int /*u_short*/ pat, void *base, size_t cnt));
+int	fusword __P((void *base));
+u_long	kvtop __P((void *addr));
+void	setidt __P((int idx, alias_for_inthand_t *func, int typ, int dpl,
+		    int selec));
 void	userconfig __P((void));
 void	vm_bounce_init __P((void));
 int	vm_page_zero_idle __P((void));
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index 510cacd63463..204a228efabb 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.49 1996/04/07 18:30:56 bde Exp $
+ *	$Id: cpufunc.h,v 1.50 1996/06/14 11:01:01 asami Exp $
  */
 
 /*
@@ -398,28 +398,10 @@ void	wrmsr		__P((u_int msr, quad_t newval));
 
 #endif	/* __GNUC__ */
 
-/*
- * These variables and functions in support.s are used.
- */
-extern u_int atdevbase;	/* offset in virtual memory of ISA io mem */
-
-void	bcopyb		__P((const void *from, void *to, size_t len));
-void	fillw		__P((int /*u_short*/ pat, void *base, size_t cnt));
-int	fusword		__P((void *base));
 void	load_cr0	__P((u_long cr0));
 void	load_cr3	__P((u_long cr3));
 void	ltr		__P((u_short sel));
 u_int	rcr0		__P((void));
 u_long	rcr3		__P((void));
 
-/*
- * These functions are NOT in support.s and should be declared elsewhere.
- */
-void	Debugger	__P((const char *msg));
-u_long	kvtop		__P((void *addr));
-typedef void alias_for_inthand_t __P((u_int cs, u_int ef, u_int esp,
-				      u_int ss));
-void	setidt		__P((int idx, alias_for_inthand_t *func, int typ,
-			     int dpl, int selec));
-
 #endif /* !_MACHINE_CPUFUNC_H_ */
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 5e280304abdc..b8faa151de64 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.7 1996/02/04 21:20:52 davidg Exp $
+ *	$Id: md_var.h,v 1.8 1996/03/02 19:37:45 peter Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_
@@ -37,6 +37,7 @@
  */
 
 extern	int	Maxmem;
+extern	u_int	atdevbase;	/* offset in virtual memory of ISA io mem */
 extern	u_long	cpu_feature;
 extern	u_long	cpu_high;
 extern	u_long	cpu_id;
@@ -48,9 +49,11 @@ extern	int	nfs_diskless_valid;
 extern	char	sigcode[];
 extern	int	szsigcode;
 
+typedef void alias_for_inthand_t __P((u_int cs, u_int ef, u_int esp, u_int ss));
 struct	proc;
 struct	reg;
 
+void	bcopyb __P((const void *from, void *to, size_t len));
 void	cpu_reset __P((void));
 void	doreti_iret __P((void)) __asm(__STRING(doreti_iret));
 void	doreti_iret_fault __P((void)) __asm(__STRING(doreti_iret_fault));
@@ -59,6 +62,11 @@ void	doreti_popl_ds_fault __P((void)) __asm(__STRING(doreti_popl_ds_fault));
 void	doreti_popl_es __P((void)) __asm(__STRING(doreti_popl_es));
 void	doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault));
 int	fill_regs __P((struct proc *p, struct reg *regs));
+void	fillw __P((int /*u_short*/ pat, void *base, size_t cnt));
+int	fusword __P((void *base));
+u_long	kvtop __P((void *addr));
+void	setidt __P((int idx, alias_for_inthand_t *func, int typ, int dpl,
+		    int selec));
 void	userconfig __P((void));
 void	vm_bounce_init __P((void));
 int	vm_page_zero_idle __P((void));
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index dcf901834cbe..36099e9af30e 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $Id: systm.h,v 1.38 1996/04/07 16:46:27 bde Exp $
+ * $Id: systm.h,v 1.39 1996/05/08 04:29:01 gpalmer Exp $
  */
 
 #ifndef _SYS_SYSTM_H_
@@ -106,6 +106,7 @@ extern int bootverbose;		/* nonzero to print verbose messages */
 /*
  * General function declarations.
  */
+void	Debugger __P((const char *msg));
 int	nullop __P((void));
 int	eopnotsupp __P((void));
 int	einval __P((void));