diff --git a/sys/arch/newsmips/dev/fb_probe.c b/sys/arch/newsmips/dev/fb_probe.c
index 0196f050c376..637ca12ef7bb 100644
--- a/sys/arch/newsmips/dev/fb_probe.c
+++ b/sys/arch/newsmips/dev/fb_probe.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: fb_probe.c,v 1.3 1999/02/15 04:36:34 hubertf Exp $	*/
+/*	$NetBSD: fb_probe.c,v 1.4 2000/01/23 14:57:10 tsubai Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,21 +40,14 @@
  *	@(#)fb_probe.c	8.1 (Berkeley) 6/11/93
  */
 
-#ifdef IPC_MRX
-#include "../../dev/framebuf.h"
-#include "types.h"
-#include "exec.h"
-#include "romsw.h"
-#else
-#include <machine/framebuf.h>
 #include <sys/types.h>
 #include <sys/exec.h>
-#endif
+
+#include <machine/autoconf.h>
+#include <machine/framebuf.h>
 
 #include <newsmips/dev/fbdefs.h>
 
-extern int badaddr();
-
 #ifdef CPU_SINGLE
 #define SW_CONSOLE	0x07
 #define SW_NWB512	0x04
diff --git a/sys/arch/newsmips/dev/fbbm_253.c b/sys/arch/newsmips/dev/fbbm_253.c
index 5841fc055709..fa34a0fea069 100644
--- a/sys/arch/newsmips/dev/fbbm_253.c
+++ b/sys/arch/newsmips/dev/fbbm_253.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fbbm_253.c,v 1.3 1999/02/15 04:36:34 hubertf Exp $	*/
+/*	$NetBSD: fbbm_253.c,v 1.4 2000/01/23 14:57:11 tsubai Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -49,6 +49,7 @@
 #if NNWB253 > 0
 #include <sys/param.h>
 
+#include <machine/autoconf.h>
 #include <machine/framebuf.h>
 #include <machine/locore.h>
 
@@ -204,8 +205,6 @@ int
 fb253_probe(unit)
 	int unit;
 {
-	extern int badaddr __P((caddr_t, int));
-
 	if (unit >= NNWB253)
 		return 0;
 	if (badaddr((caddr_t)0xb8ff0000, 2) || badaddr((caddr_t)0xb8e00000, 2))