diff --git a/sys/arch/sun3/include/cpu.h b/sys/arch/sun3/include/cpu.h
index 305ba65d3cd9..db6519d3278e 100644
--- a/sys/arch/sun3/include/cpu.h
+++ b/sys/arch/sun3/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.17 1995/05/05 03:42:13 cgd Exp $	*/
+/*	$NetBSD: cpu.h,v 1.18 1995/05/24 20:55:33 gwr Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -54,12 +54,10 @@
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
-#define	cpu_exec(p) 	/* nothing */
-#define	cpu_wait(p) 	/* nothing */
+#define	cpu_exec(p)			/* nothing */
+#define	cpu_swapin(p)			/* nothing */
+#define	cpu_wait(p)			/* nothing */
 #define cpu_setstack(p, ap)		(p)->p_md.md_regs[SP] = ap
-#define cpu_set_init_frame(p, fp)	(p)->p_md.md_regs = fp
-#define	BROKEN_SWAP
-#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
@@ -138,7 +136,7 @@ union sun3sir {
 	{ "console_device", CTLTYPE_STRUCT }, \
 }
 
-/* values for machineid */
+/* values for cpu_machine_id */
 
 #define CPU_ARCH_MASK  0xf0
 #define SUN3_ARCH      0x10
@@ -150,8 +148,7 @@ union sun3sir {
 #define SUN3_MACH_60   0x07
 #define SUN3_MACH_E    0x08
 
-extern	int machineid, mmutype, ectype;
-extern	char *intiobase, *intiolimit;
+extern	unsigned char cpu_machine_id;
 
 /* 680X0 function codes */
 #define	FC_USERD	1	/* user data space */
diff --git a/sys/arch/sun3/include/vmparam.h b/sys/arch/sun3/include/vmparam.h
index fe52cfeb5b8d..2f3bad03f021 100644
--- a/sys/arch/sun3/include/vmparam.h
+++ b/sys/arch/sun3/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.11 1995/02/13 22:24:20 gwr Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.12 1995/05/24 20:55:34 gwr Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -128,11 +128,6 @@
 /* This is where access by other VME masters starts. */
 #define DVMA_SLAVE_BASE  0x0F000000
 
-/*
- * Kernel VA of kernel u-area for current process
- */
-#define	UADDR	0x0FFE0000	/* mon shortseg */
-
 /*
  * Mach derived constants
  */
diff --git a/sys/arch/sun3/include/vmparam3.h b/sys/arch/sun3/include/vmparam3.h
index 04ffe9f41d5d..6c68d2184910 100644
--- a/sys/arch/sun3/include/vmparam3.h
+++ b/sys/arch/sun3/include/vmparam3.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam3.h,v 1.11 1995/02/13 22:24:20 gwr Exp $	*/
+/*	$NetBSD: vmparam3.h,v 1.12 1995/05/24 20:55:34 gwr Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -128,11 +128,6 @@
 /* This is where access by other VME masters starts. */
 #define DVMA_SLAVE_BASE  0x0F000000
 
-/*
- * Kernel VA of kernel u-area for current process
- */
-#define	UADDR	0x0FFE0000	/* mon shortseg */
-
 /*
  * Mach derived constants
  */