diff --git a/sys/alpha/alpha/alpha-gdbstub.c b/sys/alpha/alpha/alpha-gdbstub.c
index c9608dd398d2..1be2c26eed66 100644
--- a/sys/alpha/alpha/alpha-gdbstub.c
+++ b/sys/alpha/alpha/alpha-gdbstub.c
@@ -95,20 +95,20 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_ddb.h"
+
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/cons.h>
 
+#include <machine/md_var.h>
 #include <machine/prom.h>
 #include <machine/reg.h>
-
-#include <ddb/ddb.h>
-
 #include <machine/setjmp.h>
 
-#include "opt_ddb.h"
+#include <ddb/ddb.h>
 
 /************************************************************************/
 
diff --git a/sys/alpha/alpha/api_up1000.c b/sys/alpha/alpha/api_up1000.c
index 99c49f5c1061..26437a28123b 100644
--- a/sys/alpha/alpha/api_up1000.c
+++ b/sys/alpha/alpha/api_up1000.c
@@ -28,26 +28,27 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_dev_sc.h"
+
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <machine/intr.h>
-
 #include <sys/termios.h>
 
-#include <machine/rpb.h>
-#include <machine/cpuconf.h>
 #include <machine/clock.h>
+#include <machine/cpuconf.h>
+#include <machine/intr.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
+
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 #include <alpha/pci/irongatereg.h>
 #include <alpha/pci/irongatevar.h>
 
-#include "opt_dev_sc.h"
-
 #ifndef CONSPEED
 #define CONSPEED TTYDEF_SPEED
 #endif
diff --git a/sys/alpha/alpha/clock.c b/sys/alpha/alpha/clock.c
index e08056f47137..662c3d71b508 100644
--- a/sys/alpha/alpha/clock.c
+++ b/sys/alpha/alpha/clock.c
@@ -58,13 +58,15 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/timetc.h>
 
-#include <machine/cpuconf.h>
 #include <machine/bus.h>
 #include <machine/clock.h>
 #include <machine/clockvar.h>
+#include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>	/* for CPU definitions, etc */
+
 #include <isa/isareg.h>
 #include <alpha/alpha/timerreg.h>
-#include <machine/rpb.h>	/* for CPU definitions, etc */
 
 #define	SECMIN	((unsigned)60)			/* seconds per minute */
 #define	SECHOUR	((unsigned)(60*SECMIN))		/* seconds per hour */
diff --git a/sys/alpha/alpha/cpuconf.c b/sys/alpha/alpha/cpuconf.c
index 35b2d65648ff..0669b30d5f96 100644
--- a/sys/alpha/alpha/cpuconf.c
+++ b/sys/alpha/alpha/cpuconf.c
@@ -33,13 +33,15 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_cpu.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <machine/cpuconf.h>
-#include <machine/rpb.h>
 
-#include "opt_cpu.h"
+#include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
 
 #ifdef DEC_AXPPCI_33
 extern void dec_axppci_33_init(int);
diff --git a/sys/alpha/alpha/db_trace.c b/sys/alpha/alpha/db_trace.c
index 9240e1e46c9a..9067be1efc37 100644
--- a/sys/alpha/alpha/db_trace.c
+++ b/sys/alpha/alpha/db_trace.c
@@ -50,8 +50,9 @@
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/sysent.h>
-#include <machine/db_machdep.h>
 
+#include <machine/db_machdep.h>
+#include <machine/md_var.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_sym.h> 
diff --git a/sys/alpha/alpha/dec_1000a.c b/sys/alpha/alpha/dec_1000a.c
index 47eab9a7af5c..9c6fd09a4bf5 100644
--- a/sys/alpha/alpha/dec_1000a.c
+++ b/sys/alpha/alpha/dec_1000a.c
@@ -75,6 +75,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_dev_sc.h"
 
 #include <sys/param.h>
 #include <sys/reboot.h>
@@ -82,18 +83,17 @@ __FBSDID("$FreeBSD$");
 #include <sys/termios.h>
 #include <sys/bus.h>
 
-#include <machine/rpb.h>
-#include <machine/cpuconf.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
+#include <machine/clock.h>
+#include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
 
 #include <alpha/pci/apecsvar.h>
 #include <alpha/pci/ciavar.h>
 
 #include <pci/pcivar.h>
 
-#include "opt_dev_sc.h"
-
 #ifndef CONSPEED
 #define CONSPEED TTYDEF_SPEED
 #endif
diff --git a/sys/alpha/alpha/dec_2100_a50.c b/sys/alpha/alpha/dec_2100_a50.c
index 1eb9bd45c53e..f2ceebd8f66b 100644
--- a/sys/alpha/alpha/dec_2100_a50.c
+++ b/sys/alpha/alpha/dec_2100_a50.c
@@ -36,6 +36,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_dev_sc.h"
 
 #include <sys/param.h>
 #include <sys/reboot.h>
@@ -43,15 +44,16 @@ __FBSDID("$FreeBSD$");
 #include <sys/termios.h>
 #include <sys/bus.h>
 
-#include <machine/rpb.h>
-#include <machine/cpuconf.h>
 #include <machine/clock.h>
+#include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
+
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 #include <alpha/pci/apecsreg.h>
 #include <alpha/pci/apecsvar.h>
 
-#include "opt_dev_sc.h"
 #ifndef	CONSPEED
 #define	CONSPEED TTYDEF_SPEED
 #endif
diff --git a/sys/alpha/alpha/dec_2100_a500.c b/sys/alpha/alpha/dec_2100_a500.c
index 64f2158c32b8..1ae80892583c 100644
--- a/sys/alpha/alpha/dec_2100_a500.c
+++ b/sys/alpha/alpha/dec_2100_a500.c
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_dev_sc.h"
 
 #include <sys/param.h>
 #include <sys/reboot.h>
@@ -35,16 +36,17 @@ __FBSDID("$FreeBSD$");
 #include <sys/termios.h>
 #include <sys/bus.h>
 
-#include <machine/rpb.h>
-#include <machine/cpuconf.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
+#include <machine/clock.h>
+#include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
+
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 #include <alpha/pci/t2var.h>
 #include <alpha/pci/t2reg.h>
 
-#include "opt_dev_sc.h"
 #ifndef	CONSPEED
 #define	CONSPEED TTYDEF_SPEED
 #endif
diff --git a/sys/alpha/alpha/dec_3000_300.c b/sys/alpha/alpha/dec_3000_300.c
index 893e9660d20b..b98fbd354740 100644
--- a/sys/alpha/alpha/dec_3000_300.c
+++ b/sys/alpha/alpha/dec_3000_300.c
@@ -38,8 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/termios.h>
 #include <sys/bus.h>
 
-#include <machine/rpb.h>
 #include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
 
 #include <alpha/tlsb/tlsbreg.h>
 #include <alpha/tlsb/gbusreg.h>
diff --git a/sys/alpha/alpha/dec_3000_500.c b/sys/alpha/alpha/dec_3000_500.c
index f21a899ffce7..05902c69db61 100644
--- a/sys/alpha/alpha/dec_3000_500.c
+++ b/sys/alpha/alpha/dec_3000_500.c
@@ -38,8 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/termios.h>
 #include <sys/bus.h>
 
-#include <machine/rpb.h>
 #include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
 
 #include <alpha/tlsb/tlsbreg.h>
 #include <alpha/tlsb/gbusreg.h>
diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c
index 070357727b6b..9d1d81727881 100644
--- a/sys/alpha/alpha/dec_axppci_33.c
+++ b/sys/alpha/alpha/dec_axppci_33.c
@@ -33,6 +33,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_dev_sc.h"
 
 #include <sys/param.h>
 #include <sys/reboot.h>
@@ -40,15 +41,16 @@ __FBSDID("$FreeBSD$");
 #include <sys/termios.h>
 #include <sys/bus.h>
 
-#include <machine/rpb.h>
-#include <machine/cpuconf.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
+#include <machine/clock.h>
+#include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
+
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 #include <alpha/pci/lcavar.h>
 
-#include "opt_dev_sc.h"
 #ifndef	CONSPEED
 #define	CONSPEED TTYDEF_SPEED
 #endif
diff --git a/sys/alpha/alpha/dec_eb164.c b/sys/alpha/alpha/dec_eb164.c
index 64dbcf67851b..7ee174dda057 100644
--- a/sys/alpha/alpha/dec_eb164.c
+++ b/sys/alpha/alpha/dec_eb164.c
@@ -33,6 +33,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_dev_sc.h"
 
 #include <sys/param.h>
 #include <sys/reboot.h>
@@ -40,14 +41,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/termios.h>
 #include <sys/bus.h>
 
-#include <machine/rpb.h>
-#include <machine/cpuconf.h>
 #include <machine/clock.h>
+#include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
 
 #include <alpha/pci/ciavar.h>
 
-#include "opt_dev_sc.h"
-
 #ifndef	CONSPEED
 #define	CONSPEED TTYDEF_SPEED
 #endif
diff --git a/sys/alpha/alpha/dec_eb64plus.c b/sys/alpha/alpha/dec_eb64plus.c
index 0df660c86039..37ff65e0fb41 100644
--- a/sys/alpha/alpha/dec_eb64plus.c
+++ b/sys/alpha/alpha/dec_eb64plus.c
@@ -49,6 +49,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_dev_sc.h"
 
 #include <sys/param.h>
 #include <sys/reboot.h>
@@ -56,9 +57,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/termios.h>
 #include <sys/bus.h>
 
-#include <machine/rpb.h>
-#include <machine/cpuconf.h>
 #include <machine/clock.h>
+#include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
 
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
@@ -66,8 +68,6 @@ __FBSDID("$FreeBSD$");
 #include <alpha/pci/apecsreg.h>
 #include <alpha/pci/apecsvar.h>
 
-#include "opt_dev_sc.h"
-
 #ifndef	CONSPEED
 #define	CONSPEED TTYDEF_SPEED
 #endif
diff --git a/sys/alpha/alpha/dec_kn20aa.c b/sys/alpha/alpha/dec_kn20aa.c
index 57fd5788bdb2..7f0d27d814d4 100644
--- a/sys/alpha/alpha/dec_kn20aa.c
+++ b/sys/alpha/alpha/dec_kn20aa.c
@@ -33,6 +33,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_dev_sc.h"
 
 #include <sys/param.h>
 #include <sys/reboot.h>
@@ -40,16 +41,16 @@ __FBSDID("$FreeBSD$");
 #include <sys/termios.h>
 #include <sys/bus.h>
 
-#include <machine/rpb.h>
-#include <machine/cpuconf.h>
 #include <machine/clock.h>
+#include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
+
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 #include <alpha/pci/ciareg.h>
 #include <alpha/pci/ciavar.h>
 
-#include "opt_dev_sc.h"
-
 #ifndef	CONSPEED
 #define	CONSPEED TTYDEF_SPEED
 #endif
diff --git a/sys/alpha/alpha/dec_kn300.c b/sys/alpha/alpha/dec_kn300.c
index 24e1a322eacb..ce46fabc3bad 100644
--- a/sys/alpha/alpha/dec_kn300.c
+++ b/sys/alpha/alpha/dec_kn300.c
@@ -32,31 +32,27 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_dev_sc.h"
+
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <machine/intr.h>
-
 #include <sys/termios.h>
 
-#include <machine/rpb.h>
-#include <machine/cpuconf.h>
 #include <machine/clock.h>
+#include <machine/cpuconf.h>
+#include <machine/intr.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
+
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
 #include <alpha/mcbus/mcbusreg.h>
 #include <alpha/mcbus/mcbusvar.h>
-#if	0
-#include <alpha/mcbus/mcpciareg.h>
-#include <alpha/mcbsu/mcpciavar.h>
-#include <alpha/pci/pci_kn300.h>
-#endif
-
-#include "opt_dev_sc.h"
 
 #ifndef	CONSPEED
 #define	CONSPEED	TTYDEF_SPEED
diff --git a/sys/alpha/alpha/dec_kn8ae.c b/sys/alpha/alpha/dec_kn8ae.c
index cc76b99f395e..aa4fc35cdfd3 100644
--- a/sys/alpha/alpha/dec_kn8ae.c
+++ b/sys/alpha/alpha/dec_kn8ae.c
@@ -39,8 +39,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/reboot.h>
 #include <sys/bus.h>
 
-#include <machine/rpb.h>
 #include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
 
 #include <alpha/tlsb/tlsbreg.h>
 #include <alpha/tlsb/gbusreg.h>
diff --git a/sys/alpha/alpha/dec_st550.c b/sys/alpha/alpha/dec_st550.c
index 6a071e69a394..0068602a3116 100644
--- a/sys/alpha/alpha/dec_st550.c
+++ b/sys/alpha/alpha/dec_st550.c
@@ -35,6 +35,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_dev_sc.h"
 
 #include <sys/param.h>
 #include <sys/reboot.h>
@@ -42,20 +43,19 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <machine/intr.h>
-
 #include <sys/termios.h>
 
-#include <machine/rpb.h>
-#include <machine/cpuconf.h>
 #include <machine/clock.h>
+#include <machine/cpuconf.h>
+#include <machine/intr.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
+
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 #include <alpha/pci/ciareg.h>
 #include <alpha/pci/ciavar.h>
 
-#include "opt_dev_sc.h"
-
 #ifndef	CONSPEED
 #define	CONSPEED TTYDEF_SPEED
 #endif
diff --git a/sys/alpha/alpha/dec_st6600.c b/sys/alpha/alpha/dec_st6600.c
index 13992698307a..d7e298f9b21d 100644
--- a/sys/alpha/alpha/dec_st6600.c
+++ b/sys/alpha/alpha/dec_st6600.c
@@ -28,25 +28,26 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_dev_sc.h"
+
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <machine/intr.h>
-
 #include <sys/termios.h>
 
-#include <machine/rpb.h>
-#include <machine/cpuconf.h>
 #include <machine/clock.h>
+#include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/intr.h>
+#include <machine/rpb.h>
+
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 #include <alpha/pci/tsunamivar.h>
 
-#include "opt_dev_sc.h"
-
 #ifndef	CONSPEED
 #define	CONSPEED TTYDEF_SPEED
 #endif
diff --git a/sys/alpha/alpha/fp_emulate.c b/sys/alpha/alpha/fp_emulate.c
index 1d9f0ce5fc8b..e24ce8895736 100644
--- a/sys/alpha/alpha/fp_emulate.c
+++ b/sys/alpha/alpha/fp_emulate.c
@@ -34,6 +34,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#include <sys/user.h>
+
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
@@ -41,10 +43,12 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
-#include <sys/user.h>
-#include <machine/inst.h>
+
 #include <machine/fpu.h>
+#include <machine/inst.h>
+#include <machine/md_var.h>
 #include <machine/reg.h>
+
 #include <alpha/alpha/ieee_float.h>
 
 #define GETREG(regs, i)		(*(fp_register_t*) &regs->fpr_regs[i])
diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c
index e45f45109ca4..75f59c87b956 100644
--- a/sys/alpha/alpha/interrupt.c
+++ b/sys/alpha/alpha/interrupt.c
@@ -51,11 +51,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/unistd.h>
 #include <sys/vmmeter.h>
 
-#include <machine/reg.h>
-#include <machine/frame.h>
-#include <machine/cpuconf.h>
 #include <machine/bwx.h>
+#include <machine/cpuconf.h>
+#include <machine/frame.h>
 #include <machine/intr.h>
+#include <machine/md_var.h>
+#include <machine/reg.h>
 #include <machine/rpb.h>
 #include <machine/smp.h>
 
diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c
index 6323515b95df..7edc6f13dd92 100644
--- a/sys/alpha/alpha/mem.c
+++ b/sys/alpha/alpha/mem.c
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/signalvar.h>
 #include <sys/uio.h>
 
+#include <machine/md_var.h>
 #ifdef PERFMON
 #include <machine/perfmon.h>
 #endif
diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c
index 8d395592bbaf..914410c48879 100644
--- a/sys/alpha/alpha/mp_machdep.c
+++ b/sys/alpha/alpha/mp_machdep.c
@@ -42,17 +42,18 @@ __FBSDID("$FreeBSD$");
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 #include <sys/bus.h>
+#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
-#include <sys/user.h>
 
 #include <machine/atomic.h>
-#include <machine/pmap.h>
-#include <machine/rpb.h>
 #include <machine/clock.h>
+#include <machine/md_var.h>
+#include <machine/pmap.h>
 #include <machine/prom.h>
+#include <machine/rpb.h>
 #include <machine/smp.h>
 
 /* Set to 1 once we're ready to let the APs out of the pen. */
diff --git a/sys/alpha/alpha/prom.c b/sys/alpha/alpha/prom.c
index a73343df926d..fe0a6957b881 100644
--- a/sys/alpha/alpha/prom.c
+++ b/sys/alpha/alpha/prom.c
@@ -38,8 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/user.h>
 #include <sys/cons.h>
 
-#include <machine/rpb.h>
+#include <machine/md_var.h>
 #include <machine/prom.h>
+#include <machine/rpb.h>
 #include <machine/vmparam.h>
 
 struct rpb	*hwrpb;
diff --git a/sys/alpha/include/cpu.h b/sys/alpha/include/cpu.h
index 75edd1d719df..d9a76e41cbb2 100644
--- a/sys/alpha/include/cpu.h
+++ b/sys/alpha/include/cpu.h
@@ -52,8 +52,6 @@
 
 #include <machine/frame.h>
 
-#define	cpu_getstack(td)		(alpha_pal_rdusp())
-
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
  * machine state in an opaque clockframe.  One the Alpha, we use
@@ -98,67 +96,14 @@ struct clockframe {
 
 #ifdef _KERNEL
 
-struct pcb;
-struct thread;
-struct reg;
-struct rpb;
-struct trapframe;
-
-extern struct rpb *hwrpb;
-extern volatile int mc_expected, mc_received;
+#define	cpu_getstack(td)	(alpha_pal_rdusp())
+#define	get_cyclecount		alpha_rpcc
 
 void	cpu_halt(void);
 void	cpu_reset(void);
 void	fork_trampoline(void);					/* MAGIC */
 void	swi_vm(void *);
 
-/* XXX the following should not be here. */
-void	XentArith(u_int64_t, u_int64_t, u_int64_t);		/* MAGIC */
-void	XentIF(u_int64_t, u_int64_t, u_int64_t);		/* MAGIC */
-void	XentInt(u_int64_t, u_int64_t, u_int64_t);		/* MAGIC */
-void	XentMM(u_int64_t, u_int64_t, u_int64_t);		/* MAGIC */
-void	XentRestart(void);					/* MAGIC */
-void	XentSys(u_int64_t, u_int64_t, u_int64_t);		/* MAGIC */
-void	XentUna(u_int64_t, u_int64_t, u_int64_t);		/* MAGIC */
-void	alpha_init(u_long, u_long, u_long, u_long, u_long);
-void	alpha_fpstate_check(struct thread *td);
-void	alpha_fpstate_drop(struct thread *td);
-void	alpha_fpstate_save(struct thread *td, int write);
-void	alpha_fpstate_switch(struct thread *td);
-int	alpha_pa_access(u_long);
-int	badaddr	(void *, size_t);
-int	badaddr_read(void *, size_t, void *);
-u_int64_t console_restart(u_int64_t, u_int64_t, u_int64_t);
-void	dumpconf(void);
-void	exception_return(void);					/* MAGIC */
-void	frametoreg(struct trapframe *, struct reg *);
-long	fswintrberr(void);					/* MAGIC */
-void	init_prom_interface(struct rpb*);
-void	interrupt(unsigned long, unsigned long, unsigned long,
-	    struct trapframe *);
-void	machine_check(unsigned long, struct trapframe *, unsigned long,
-	    unsigned long);
-u_int64_t hwrpb_checksum(void);
-void	hwrpb_restart_setup(void);
-void	regdump(struct trapframe *);
-void	regtoframe(struct reg *, struct trapframe *);
-void	savectx(struct pcb *);
-void	set_iointr(void (*)(void *, unsigned long));
-void    switch_exit(struct thread *);				/* MAGIC */
-void	syscall(u_int64_t, struct trapframe *);
-void	trap(unsigned long, unsigned long, unsigned long, unsigned long,
-	    struct trapframe *);
-
-/*
- * Return contents of in-cpu fast counter as a sort of "bogo-time"
- * for non-critical timing.
- */
-static __inline u_int64_t
-get_cyclecount(void)
-{
-	return (alpha_rpcc());
-}
-
 #endif /* _KERNEL */
 
 #endif /* _ALPHA_CPU_H_ */
diff --git a/sys/alpha/include/md_var.h b/sys/alpha/include/md_var.h
index 763b32507969..d57664786e41 100644
--- a/sys/alpha/include/md_var.h
+++ b/sys/alpha/include/md_var.h
@@ -33,6 +33,12 @@
  * Miscellaneous machine-dependent declarations.
  */
 
+struct cam_sim;
+struct reg;
+struct rpb;
+struct thread;
+struct trapframe;
+
 extern	char	sigcode[];
 extern	char	esigcode[];
 extern	int	szsigcode;
@@ -44,31 +50,60 @@ extern	int	szfreebsd4_sigcode;
 #endif
 extern	long	Maxmem;
 extern	int	busdma_swi_pending;
+extern struct rpb *hwrpb;
+extern volatile int mc_expected;
+extern volatile int mc_received;
 
-struct fpreg;
-struct thread;
-struct reg;
-struct cam_sim;
-struct pcicfg;
-
-void	busdma_swi(void);
-int	is_physical_memory(vm_offset_t addr);
+void	XentArith(u_int64_t, u_int64_t, u_int64_t);		/* MAGIC */
+void	XentIF(u_int64_t, u_int64_t, u_int64_t);		/* MAGIC */
+void	XentInt(u_int64_t, u_int64_t, u_int64_t);		/* MAGIC */
+void	XentMM(u_int64_t, u_int64_t, u_int64_t);		/* MAGIC */
+void	XentRestart(void);					/* MAGIC */
+void	XentSys(u_int64_t, u_int64_t, u_int64_t);		/* MAGIC */
+void	XentUna(u_int64_t, u_int64_t, u_int64_t);		/* MAGIC */
+void	alpha_fpstate_check(struct thread *td);
+void	alpha_fpstate_drop(struct thread *td);
+void	alpha_fpstate_save(struct thread *td, int write);
+void	alpha_fpstate_switch(struct thread *td);
+void	alpha_init(u_long, u_long, u_long, u_long, u_long);
+int	alpha_pa_access(u_long);
 void	alpha_register_pci_scsi(int bus, int slot, struct cam_sim *sim);
+int	badaddr(void *, size_t);
+int	badaddr_read(void *, size_t, void *);
+void	busdma_swi(void);
+u_int64_t console_restart(u_int64_t, u_int64_t, u_int64_t);
+void	dumpconf(void);
+void	exception_return(void);					/* MAGIC */
+void	frametoreg(struct trapframe *, struct reg *);
+long	fswintrberr(void);					/* MAGIC */
+u_int64_t hwrpb_checksum(void);
+void	hwrpb_restart_setup(void);
+void	init_prom_interface(struct rpb*);
+void	interrupt(unsigned long, unsigned long, unsigned long,
+	    struct trapframe *);
+int	is_physical_memory(vm_offset_t addr);
+void	machine_check(unsigned long, struct trapframe *, unsigned long,
+	    unsigned long);
+void	regdump(struct trapframe *);
+void	regtoframe(struct reg *, struct trapframe *);
+void	set_iointr(void (*)(void *, unsigned long));
+void    switch_exit(struct thread *);				/* MAGIC */
+void	syscall(u_int64_t, struct trapframe *);
+void	trap(unsigned long, unsigned long, unsigned long, unsigned long,
+	    struct trapframe *);
+
 #ifdef _SYS_BUS_H_
 struct resource *alpha_platform_alloc_ide_intr(int chan);
 int	alpha_platform_release_ide_intr(int chan, struct resource *res);
-int	alpha_platform_setup_ide_intr(struct device *dev,
-				      struct resource *res,
-				      driver_intr_t *fn, void *arg,
-				      void **cookiep);
+int	alpha_platform_setup_ide_intr(struct device *dev, struct resource *res,
+	    driver_intr_t *fn, void *arg, void **cookiep);
 int	alpha_platform_teardown_ide_intr(struct device *dev,
-					 struct resource *res, void *cookie);
+	    struct resource *res, void *cookie);
 int	alpha_platform_pci_setup_intr(device_t dev, device_t child,
-				      struct resource *irq,  int flags,
-				      driver_intr_t *intr, void *arg,
-				      void **cookiep);
+	    struct resource *irq,  int flags, driver_intr_t *intr, void *arg,
+	    void **cookiep);
 int	alpha_platform_pci_teardown_intr(device_t dev, device_t child,
-					 struct resource *irq, void *cookie);
+	    struct resource *irq, void *cookie);
 int	alpha_pci_route_interrupt(device_t bus, device_t dev, int pin);
 #endif
 
diff --git a/sys/alpha/include/pcb.h b/sys/alpha/include/pcb.h
index e1c063be9300..982e97b458b3 100644
--- a/sys/alpha/include/pcb.h
+++ b/sys/alpha/include/pcb.h
@@ -57,4 +57,8 @@ struct pcb {
 	unsigned long	pcb_accessaddr;		/* for [fs]uswintr	[SW] */
 };
 
+#ifdef _KERNEL
+void	savectx(struct pcb *);
+#endif
+
 #endif	/* _MACHINE_PCB_H */
diff --git a/sys/alpha/mcbus/mcbus.c b/sys/alpha/mcbus/mcbus.c
index effb07c3533d..7046b2bbca5e 100644
--- a/sys/alpha/mcbus/mcbus.c
+++ b/sys/alpha/mcbus/mcbus.c
@@ -40,8 +40,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/malloc.h>
 
-#include <machine/rpb.h>
 #include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
 
 #include <alpha/mcbus/mcbusreg.h>
 #include <alpha/mcbus/mcbusvar.h>
diff --git a/sys/alpha/osf1/osf1_misc.c b/sys/alpha/osf1/osf1_misc.c
index 3c63adc3e1a0..cc743360a443 100644
--- a/sys/alpha/osf1/osf1_misc.c
+++ b/sys/alpha/osf1/osf1_misc.c
@@ -69,13 +69,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/utsname.h>
 #include <sys/vnode.h>
 
-#include <alpha/osf1/exec_ecoff.h>
-#include <alpha/osf1/osf1_signal.h>
-#include <alpha/osf1/osf1_proto.h>
-#include <alpha/osf1/osf1_syscall.h>
-#include <alpha/osf1/osf1_util.h>
-#include <alpha/osf1/osf1.h>
-
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_param.h>
@@ -86,8 +79,16 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpuconf.h>
 #include <machine/fpu.h>
+#include <machine/md_var.h>
 #include <machine/rpb.h>
 
+#include <alpha/osf1/exec_ecoff.h>
+#include <alpha/osf1/osf1_signal.h>
+#include <alpha/osf1/osf1_proto.h>
+#include <alpha/osf1/osf1_syscall.h>
+#include <alpha/osf1/osf1_util.h>
+#include <alpha/osf1/osf1.h>
+
 static void cvtstat2osf1(struct stat *, struct osf1_stat *);
 static int  osf2bsd_pathconf(int *);
 
diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c
index 3f895deae9f1..a94ac84cde14 100644
--- a/sys/alpha/pci/apecs.c
+++ b/sys/alpha/pci/apecs.c
@@ -73,13 +73,15 @@ __FBSDID("$FreeBSD$");
 #include <alpha/pci/apecsreg.h>
 #include <alpha/pci/apecsvar.h>
 #include <alpha/isa/isavar.h>
-#include <machine/intr.h>
-#include <machine/resource.h>
-#include <machine/intrcnt.h>
+
 #include <machine/cpuconf.h>
-#include <machine/swiz.h>
+#include <machine/intr.h>
+#include <machine/intrcnt.h>
+#include <machine/md_var.h>
+#include <machine/resource.h>
 #include <machine/rpb.h>
 #include <machine/sgmap.h>
+#include <machine/swiz.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c
index e3f0615a4eba..962ac65b74c6 100644
--- a/sys/alpha/pci/cia.c
+++ b/sys/alpha/pci/cia.c
@@ -107,14 +107,16 @@ __FBSDID("$FreeBSD$");
 #include <alpha/pci/ciareg.h>
 #include <alpha/pci/ciavar.h>
 #include <alpha/isa/isavar.h>
+
 #include <machine/bwx.h>
-#include <machine/swiz.h>
+#include <machine/cpuconf.h>
 #include <machine/intr.h>
 #include <machine/intrcnt.h>
-#include <machine/cpuconf.h>
-#include <machine/rpb.h>
+#include <machine/md_var.h>
 #include <machine/resource.h>
+#include <machine/rpb.h>
 #include <machine/sgmap.h>
+#include <machine/swiz.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
diff --git a/sys/alpha/pci/irongate.c b/sys/alpha/pci/irongate.c
index 017e6f9c6d8b..ea314cbaa27a 100644
--- a/sys/alpha/pci/irongate.c
+++ b/sys/alpha/pci/irongate.c
@@ -43,12 +43,14 @@ __FBSDID("$FreeBSD$");
 #include <alpha/isa/isavar.h>
 #include <alpha/pci/irongatereg.h>
 #include <alpha/pci/irongatevar.h>
+
 #include <machine/bwx.h>
+#include <machine/cpuconf.h>
 #include <machine/intr.h>
 #include <machine/intrcnt.h>
-#include <machine/cpuconf.h>
-#include <machine/rpb.h>
+#include <machine/md_var.h>
 #include <machine/resource.h>
+#include <machine/rpb.h>
 #include <machine/sgmap.h>
 
 #include <vm/vm.h>
diff --git a/sys/alpha/pci/lca.c b/sys/alpha/pci/lca.c
index 548881e921a9..b00cadb5ca8a 100644
--- a/sys/alpha/pci/lca.c
+++ b/sys/alpha/pci/lca.c
@@ -39,10 +39,12 @@ __FBSDID("$FreeBSD$");
 #include <alpha/pci/lcareg.h>
 #include <alpha/pci/lcavar.h>
 #include <alpha/isa/isavar.h>
-#include <machine/intr.h>
+
 #include <machine/cpuconf.h>
-#include <machine/swiz.h>
+#include <machine/intr.h>
+#include <machine/md_var.h>
 #include <machine/sgmap.h>
+#include <machine/swiz.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
diff --git a/sys/alpha/pci/t2.c b/sys/alpha/pci/t2.c
index c3f0f19dfcf8..8db8a71f8868 100644
--- a/sys/alpha/pci/t2.c
+++ b/sys/alpha/pci/t2.c
@@ -66,16 +66,18 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/interrupt.h>
 
+#include <pci/pcivar.h>
 #include <alpha/pci/t2reg.h>
 #include <alpha/pci/t2var.h>
 #include <alpha/isa/isavar.h>
-#include <machine/intr.h>
-#include <machine/resource.h>
-#include <machine/intrcnt.h>
+
 #include <machine/cpuconf.h>
-#include <machine/swiz.h>
+#include <machine/intr.h>
+#include <machine/intrcnt.h>
+#include <machine/md_var.h>
+#include <machine/resource.h>
 #include <machine/sgmap.h>
-#include <pci/pcivar.h>
+#include <machine/swiz.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
diff --git a/sys/alpha/pci/tsunami.c b/sys/alpha/pci/tsunami.c
index 6e43d8de3c38..29e77186ebbb 100644
--- a/sys/alpha/pci/tsunami.c
+++ b/sys/alpha/pci/tsunami.c
@@ -46,12 +46,14 @@ __FBSDID("$FreeBSD$");
 #include <alpha/isa/isavar.h>
 #include <alpha/pci/tsunamireg.h>
 #include <alpha/pci/tsunamivar.h>
+
 #include <machine/bwx.h>
+#include <machine/cpuconf.h>
 #include <machine/intr.h>
 #include <machine/intrcnt.h>
-#include <machine/cpuconf.h>
-#include <machine/rpb.h>
+#include <machine/md_var.h>
 #include <machine/resource.h>
+#include <machine/rpb.h>
 #include <machine/sgmap.h>
 
 #include <vm/vm.h>
diff --git a/sys/alpha/tlsb/tlsb.c b/sys/alpha/tlsb/tlsb.c
index b5fdef3952c9..10e5cfce4a98 100644
--- a/sys/alpha/tlsb/tlsb.c
+++ b/sys/alpha/tlsb/tlsb.c
@@ -44,8 +44,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/malloc.h>
 
-#include <machine/rpb.h>
 #include <machine/cpuconf.h>
+#include <machine/md_var.h>
+#include <machine/rpb.h>
 
 #include <alpha/tlsb/tlsbreg.h>
 #include <alpha/tlsb/tlsbvar.h>
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index 201a9fc22f52..55498f73f50d 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -177,6 +177,7 @@ linprocfs_domeminfo(PFS_FILL_ARGS)
 }
 
 #ifdef __alpha__
+extern struct rpb *hwrpb;
 /*
  * Filler function for proc/cpuinfo (Alpha version)
  */