diff --git a/sys/arch/sparc/include/autoconf.h b/sys/arch/sparc/include/autoconf.h
index 1f938e19fd29..dfa095663d6b 100644
--- a/sys/arch/sparc/include/autoconf.h
+++ b/sys/arch/sparc/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.h,v 1.30 1998/10/06 20:50:18 thorpej Exp $ */
+/*	$NetBSD: autoconf.h,v 1.31 1999/02/14 12:26:16 pk Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -86,6 +86,7 @@
 
 #include <machine/bus.h>
 #include <machine/bsd_openprom.h>
+#include <machine/promlib.h>
 #include <dev/sbus/sbusvar.h>
 
 /*
diff --git a/sys/arch/sparc/include/bsd_openprom.h b/sys/arch/sparc/include/bsd_openprom.h
index 780d6d3f61c3..215321913434 100644
--- a/sys/arch/sparc/include/bsd_openprom.h
+++ b/sys/arch/sparc/include/bsd_openprom.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: bsd_openprom.h,v 1.14 1998/09/26 19:08:09 pk Exp $ */
+/*	$NetBSD: bsd_openprom.h,v 1.15 1999/02/14 12:26:16 pk Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -194,6 +194,7 @@ struct openprom_addr {
 struct promvec {
 	/* Version numbers. */
 	u_int	pv_magic;		/* Magic number */
+#define OBP_MAGIC	0x10010407
 	u_int	pv_romvec_vers;		/* interface version (0, 2) */
 	u_int	pv_plugin_vers;		/* ??? */
 	u_int	pv_printrev;		/* PROM rev # (* 10, e.g 1.9 = 19) */
@@ -231,7 +232,7 @@ struct promvec {
 	void	(*pv_putstr) __P((char *str, int len));
 
 	/* Miscellany. */
-	void	(*pv_reboot) __P((char *bootstr));
+	void	(*pv_reboot) __P((char *bootstr)) __attribute__((noreturn));
 	void	(*pv_printf) __P((const char *fmt, ...));
 	void	(*pv_abort) __P((void));	/* L1-A abort */
 	int	*pv_ticks;		/* Ticks since last reset */
@@ -274,12 +275,12 @@ struct promvec {
 	 * The following are V3 ROM functions to handle MP machines in the
 	 * Sun4m series. They have undefined results when run on a uniprocessor!
 	 */
-	int	(*pv_v3cpustart) __P((u_int module,
+	int	(*pv_v3cpustart) __P((int module,
 				      struct openprom_addr *ctxtbl,
 				      int context, caddr_t pc));
-	int 	(*pv_v3cpustop) __P((u_int module));
-	int	(*pv_v3cpuidle) __P((u_int module));
-	int 	(*pv_v3cpuresume) __P((u_int module));
+	int 	(*pv_v3cpustop) __P((int module));
+	int	(*pv_v3cpuidle) __P((int module));
+	int 	(*pv_v3cpuresume) __P((int module));
 };
 
 /*
@@ -319,43 +320,13 @@ struct nodeops {
 	 * proplen first to make sure it fits.  Kind of a pain, but no
 	 * doubt more convenient for the PROM coder.
 	 */
-	int	(*no_proplen) __P((int node, caddr_t name));
-	int	(*no_getprop) __P((int node, caddr_t name, caddr_t val));
-	int	(*no_setprop) __P((int node, caddr_t name, caddr_t val,
+	int	(*no_proplen) __P((int node, char *name));
+	int	(*no_getprop) __P((int node, char *name, void *val));
+	int	(*no_setprop) __P((int node, char *name, void *val,
 				   int len));
-	caddr_t	(*no_nextprop) __P((int node, caddr_t name));
+	char	*(*no_nextprop) __P((int node, char *name));
 };
 
-void	romhalt __P((void))	__attribute__((__noreturn__));
-void	romboot __P((char *))	__attribute__((__noreturn__));
-void	rominterpret __P((char *));
-void	callrom __P((void));
-void	rom_cpustart __P((int, struct openprom_addr *, int, caddr_t));
-void	rom_cpustop __P((int));
-void	rom_cpuidle __P((int));
-void	rom_cpuresume __P((int));
-
-int	findroot __P((void));
-int	findnode __P((int, const char *));
-int	opennode __P((char *));
-int	firstchild __P((int));
-int	nextsibling __P((int));
-
-/*
- * The various getprop* functions obtain `properties' from the ROMs.
- * getprop() obtains a property as a byte-sequence, and returns its
- * length; the others convert or make some other guarantee.
- */
-int	getproplen __P((int node, char *name));
-int	getprop __P((int, char *, int, int *, void **));
-int	getpropint __P((int node, char *name, int deflt));
-char	*getpropstring __P((int node, char *name));
-char	*getpropstringA __P((int, char *, char *));
-int	search_prom __P((int, char *));
-int	node_has_property __P((int, const char *));
-
-
-extern struct promvec *promvec;
 /* Frequently used options node */
 extern int optionsnode;
 
diff --git a/sys/arch/sparc/include/oldmon.h b/sys/arch/sparc/include/oldmon.h
index d18a256f05c6..a2079662b059 100644
--- a/sys/arch/sparc/include/oldmon.h
+++ b/sys/arch/sparc/include/oldmon.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: oldmon.h,v 1.11 1996/03/31 22:21:38 pk Exp $ */
+/*	$NetBSD: oldmon.h,v 1.12 1999/02/14 12:26:16 pk Exp $ */
 
 /*
  * Copyright (C) 1985 Regents of the University of California
@@ -193,7 +193,8 @@ struct om_vector {
 					/* Quickly write string to FB */
 
 	/* Reboot interface routine -- resets and reboots system. */
-	void	(*reBoot) __P((char *));	/* e.g. reBoot("xy()vmunix") */
+	void	(*reBoot) __P((char *))	/* e.g. reBoot("xy()vmunix") */
+					__attribute__((__noreturn__));
 
 	/* Line input and parsing */
 	u_char	*lineBuf;		/* The line input buffer */
@@ -233,8 +234,8 @@ struct om_vector {
 	long	*resetMap;		/* pgmap entry for resetaddr */
 					/* Really struct pgmapent *  */
 
-	__dead void (*exitToMon)
-	    __P((void)) __attribute__((noreturn));/* Exit from user program */
+	__dead void (*exitToMon) __P((void))	/* Exit from user program */
+				__attribute__((noreturn));
 	u_char	**memorybitmap;		/* V1: &{0 or &bits} */
 	void	(*setcxsegmap)		/* Set seg in any context */
 		    __P((int, caddr_t, int));
@@ -258,7 +259,6 @@ struct om_vector {
 
 #define mon_setcxsegmap(context, va, sme) \
     romVectorPtr->setcxsegmap(context, va, sme)
-#define romp (romVectorPtr)
 
 /*
  * OLDMON_STARTVADDR and OLDMON_ENDVADDR denote the range of the damn monitor.
diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h
index c1a6b50be311..cebe9f383b43 100644
--- a/sys/arch/sparc/include/param.h
+++ b/sys/arch/sparc/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.37 1999/02/01 22:20:02 mrg Exp $ */
+/*	$NetBSD: param.h,v 1.38 1999/02/14 12:26:16 pk Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -84,7 +84,7 @@
  * of the `options SUN4?' combination a particular kernel was configured with.
  * See also the definitions of NBPG, PGOFSET and PGSHIFT below.
  */
-#if defined(_KERNEL) && !defined(_LOCORE)
+#if (defined(_KERNEL) || defined(_STANDALONE)) && !defined(_LOCORE)
 extern int nbpg, pgofset, pgshift;
 #endif
 
@@ -167,7 +167,7 @@ extern int nbpg, pgofset, pgshift;
  * Note that `phys_map' can still be used to allocate memory-backed pages
  * in DVMA space.
  */
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_STANDALONE)
 #ifndef _LOCORE
 
 extern void	delay __P((unsigned int));