diff --git a/sys/arch/hp300/hp300/autoconf.c b/sys/arch/hp300/hp300/autoconf.c
index c7f6a29fcda9..5e773348b565 100644
--- a/sys/arch/hp300/hp300/autoconf.c
+++ b/sys/arch/hp300/hp300/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.54 2002/02/23 21:52:26 gmcgarry Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.55 2002/03/04 02:25:21 simonb Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -310,7 +310,6 @@ cpu_configure()
 void
 cpu_rootconf()
 {
-	extern int (*mountroot) __P((void));
 	struct dev_data *dd;
 	struct device *dv;
 	struct vfsops *vops;
diff --git a/sys/arch/hpcmips/hpcmips/machdep.c b/sys/arch/hpcmips/hpcmips/machdep.c
index ff697cd34b25..afa30ffea9f4 100644
--- a/sys/arch/hpcmips/hpcmips/machdep.c
+++ b/sys/arch/hpcmips/hpcmips/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.71 2002/03/04 02:19:08 simonb Exp $	*/
+/*	$NetBSD: machdep.c,v 1.72 2002/03/04 02:25:22 simonb Exp $	*/
 
 /*-
  * Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.71 2002/03/04 02:19:08 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.72 2002/03/04 02:25:22 simonb Exp $");
 
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
@@ -138,12 +138,14 @@ static int __bicons_enable;
 #endif /* NBICONSDEV > 0 */
 
 #ifdef NFS
-extern int nfs_mountroot(void);
-extern int (*mountroot)(void);
+#include <nfs/rpcv2.h>
+#include <nfs/nfsproto.h>
+#include <nfs/nfs.h>
+#include <nfs/nfsmount.h>
 #endif
 
 #ifdef MEMORY_DISK_DYNAMIC
-void md_root_setconf(caddr_t, size_t);
+#include <dev/md.h>
 #endif
 
 /* the following is used externally (sysctl_hw) */
diff --git a/sys/arch/hpcsh/hpcsh/machdep.c b/sys/arch/hpcsh/hpcsh/machdep.c
index 2dc73d3db4ea..a8a2f75e0c8a 100644
--- a/sys/arch/hpcsh/hpcsh/machdep.c
+++ b/sys/arch/hpcsh/hpcsh/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.31 2002/03/04 02:19:08 simonb Exp $	*/
+/*	$NetBSD: machdep.c,v 1.32 2002/03/04 02:25:22 simonb Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -115,8 +115,10 @@
 #define DRAM_BANK1_END		(DRAM_BANK1_START + DRAM_BANK_SIZE)
 
 #ifdef NFS
-extern int nfs_mountroot(void);
-extern int (*mountroot)(void);
+#include <nfs/rpcv2.h>
+#include <nfs/nfsproto.h>
+#include <nfs/nfs.h>
+#include <nfs/nfsmount.h>
 #endif
 
 struct user *proc0paddr;
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index b0baefe32200..e93e04e63595 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_subr.c,v 1.78 2002/02/08 00:58:58 thorpej Exp $	*/
+/*	$NetBSD: kern_subr.c,v 1.79 2002/03/04 02:25:23 simonb Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.78 2002/02/08 00:58:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.79 2002/03/04 02:25:23 simonb Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -625,7 +625,6 @@ setroot(bootdv, bootpartition)
 	struct ifnet *ifp;
 	const char *deffsname;
 	struct vfsops *vops;
-	extern int (*mountroot) __P((void));
 
 #ifdef MEMORY_DISK_HOOKS
 	for (i = 0; i < NMD; i++) {
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 2603f4c6d816..a87a11469da3 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_subr.c,v 1.169 2002/02/05 07:50:58 chs Exp $	*/
+/*	$NetBSD: vfs_subr.c,v 1.170 2002/03/04 02:25:23 simonb Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.169 2002/02/05 07:50:58 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.170 2002/03/04 02:25:23 simonb Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -2545,7 +2545,6 @@ fail:
 int
 vfs_mountroot()
 {
-	extern int (*mountroot) __P((void));
 	struct vfsops *v;
 
 	if (root_device == NULL)
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index eebe3bee84c8..b2fda96f2519 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mfs_vfsops.c,v 1.37 2002/02/03 03:51:57 chs Exp $	*/
+/*	$NetBSD: mfs_vfsops.c,v 1.38 2002/03/04 02:25:24 simonb Exp $	*/
 
 /*
  * Copyright (c) 1989, 1990, 1993, 1994
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfs_vfsops.c,v 1.37 2002/02/03 03:51:57 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfs_vfsops.c,v 1.38 2002/03/04 02:25:24 simonb Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -200,7 +200,6 @@ mfs_initminiroot(base)
 	caddr_t base;
 {
 	struct fs *fs = (struct fs *)(base + SBOFF);
-	extern int (*mountroot) __P((void));
 
 	/* check for valid super block */
 	if (fs->fs_magic != FS_MAGIC || fs->fs_bsize > MAXBSIZE ||