diff --git a/sys/arch/evbmips/alchemy/autoconf.c b/sys/arch/evbmips/alchemy/autoconf.c
index ef24dd7e54c4..14d0b1ac6289 100644
--- a/sys/arch/evbmips/alchemy/autoconf.c
+++ b/sys/arch/evbmips/alchemy/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.14 2007/02/22 05:26:18 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.15 2008/01/04 22:15:58 ad Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,17 +37,18 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2007/02/22 05:26:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2008/01/04 22:15:58 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/bus.h>
 
 #include <sys/socket.h>		/* these three just to get ETHER_ADDR_LEN(!) */
 #include <net/if.h>
 #include <net/if_ether.h>
 
-#include <machine/bus.h>
 #include <machine/yamon.h>
 
 #include <mips/alchemy/include/aureg.h>
diff --git a/sys/arch/mips/mips/mips3_clockintr.c b/sys/arch/mips/mips/mips3_clockintr.c
index 88abce5fd249..38ffe53e217a 100644
--- a/sys/arch/mips/mips/mips3_clockintr.c
+++ b/sys/arch/mips/mips/mips3_clockintr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mips3_clockintr.c,v 1.5 2007/10/17 19:55:38 garbled Exp $	*/
+/*	$NetBSD: mips3_clockintr.c,v 1.6 2008/01/04 22:16:12 ad Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -78,15 +78,16 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mips3_clockintr.c,v 1.5 2007/10/17 19:55:38 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips3_clockintr.c,v 1.6 2008/01/04 22:16:12 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
+#include <sys/evcnt.h>
+#include <sys/intr.h>
 
 #include <mips/mips3_clock.h>
 
-#include <machine/intr.h>
 #include <machine/locore.h>
 
 struct evcnt mips_int5_evcnt =