diff --git a/sys/arch/alpha/alpha/prom.c b/sys/arch/alpha/alpha/prom.c
index 051dff8aac3d..717547dbd945 100644
--- a/sys/arch/alpha/alpha/prom.c
+++ b/sys/arch/alpha/alpha/prom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: prom.c,v 1.44 2003/03/08 01:18:42 he Exp $ */
+/* $NetBSD: prom.c,v 1.45 2008/01/05 00:31:50 ad Exp $ */
 
 /* 
  * Copyright (c) 1992, 1994, 1995, 1996 Carnegie Mellon University
@@ -27,19 +27,19 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.44 2003/03/08 01:18:42 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.45 2008/01/05 00:31:50 ad Exp $");
 
 #include "opt_multiprocessor.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/lock.h>
+#include <sys/simplelock.h>
 #include <sys/proc.h>
 #include <sys/user.h>
+#include <sys/cpu.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/cpu.h>
 #include <machine/rpb.h>
 #include <machine/alpha.h>
 #define	ENABLEPROM
diff --git a/sys/arch/alpha/jensenio/pckbc_jensenio.c b/sys/arch/alpha/jensenio/pckbc_jensenio.c
index 9cd0af3492d0..2cd1d123ba70 100644
--- a/sys/arch/alpha/jensenio/pckbc_jensenio.c
+++ b/sys/arch/alpha/jensenio/pckbc_jensenio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_jensenio.c,v 1.7 2007/12/03 15:33:05 ad Exp $ */
+/* $NetBSD: pckbc_jensenio.c,v 1.8 2008/01/05 00:31:50 ad Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pckbc_jensenio.c,v 1.7 2007/12/03 15:33:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_jensenio.c,v 1.8 2008/01/05 00:31:50 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,10 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_jensenio.c,v 1.7 2007/12/03 15:33:05 ad Exp $"
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
-#include <sys/lock.h> 
-
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
 
 #include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h> 
diff --git a/sys/arch/alpha/pci/ttwoga_pci.c b/sys/arch/alpha/pci/ttwoga_pci.c
index 08ce37057aae..ea296a81ee8f 100644
--- a/sys/arch/alpha/pci/ttwoga_pci.c
+++ b/sys/arch/alpha/pci/ttwoga_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwoga_pci.c,v 1.2 2002/05/15 16:57:43 thorpej Exp $ */
+/* $NetBSD: ttwoga_pci.c,v 1.3 2008/01/05 00:31:51 ad Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -38,13 +38,13 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: ttwoga_pci.c,v 1.2 2002/05/15 16:57:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttwoga_pci.c,v 1.3 2008/01/05 00:31:51 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h> 
-#include <sys/lock.h>
+#include <sys/simplelock.h>
 
 #include <dev/pci/pcireg.h> 
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/alpha/sableio/pckbc_sableio.c b/sys/arch/alpha/sableio/pckbc_sableio.c
index 0e1171ac2c71..b60c7e5f9111 100644
--- a/sys/arch/alpha/sableio/pckbc_sableio.c
+++ b/sys/arch/alpha/sableio/pckbc_sableio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_sableio.c,v 1.5 2002/10/02 04:06:39 thorpej Exp $ */
+/* $NetBSD: pckbc_sableio.c,v 1.6 2008/01/05 00:31:51 ad Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pckbc_sableio.c,v 1.5 2002/10/02 04:06:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_sableio.c,v 1.6 2008/01/05 00:31:51 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,10 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_sableio.c,v 1.5 2002/10/02 04:06:39 thorpej Ex
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
-#include <sys/lock.h> 
-
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
 
 #include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h> 
diff --git a/sys/arch/arc/jazz/pckbc_jazzio.c b/sys/arch/arc/jazz/pckbc_jazzio.c
index 40eda73de94c..f16dc180e1c3 100644
--- a/sys/arch/arc/jazz/pckbc_jazzio.c
+++ b/sys/arch/arc/jazz/pckbc_jazzio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_jazzio.c,v 1.16 2007/10/17 19:53:29 garbled Exp $ */
+/* $NetBSD: pckbc_jazzio.c,v 1.17 2008/01/05 00:31:53 ad Exp $ */
 /* NetBSD: pckbc_isa.c,v 1.2 2000/03/23 07:01:35 thorpej Exp  */
 
 /*
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_jazzio.c,v 1.16 2007/10/17 19:53:29 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_jazzio.c,v 1.17 2008/01/05 00:31:53 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -37,10 +37,9 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_jazzio.c,v 1.16 2007/10/17 19:53:29 garbled Ex
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
-#include <sys/lock.h>
+#include <sys/bus.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
 #include <arc/jazz/pica.h>
 #include <arc/jazz/jazziovar.h>
 
diff --git a/sys/arch/arm/iomd/iomd_clock.c b/sys/arch/arm/iomd/iomd_clock.c
index 1531154a9391..cdf80e3eb816 100644
--- a/sys/arch/arm/iomd/iomd_clock.c
+++ b/sys/arch/arm/iomd/iomd_clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iomd_clock.c,v 1.22 2007/02/22 05:14:05 thorpej Exp $	*/
+/*	$NetBSD: iomd_clock.c,v 1.23 2008/01/05 00:31:54 ad Exp $	*/
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
@@ -47,19 +47,17 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: iomd_clock.c,v 1.22 2007/02/22 05:14:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomd_clock.c,v 1.23 2008/01/05 00:31:54 ad Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/timetc.h>
 #include <sys/device.h>
-#include <sys/lock.h>
+#include <sys/intr.h>
 
 #include <dev/clock_subr.h>
 
-#include <machine/intr.h>
-
 #include <arm/cpufunc.h>
 
 #include <arm/iomd/iomdvar.h>
diff --git a/sys/arch/arm/sa11x0/sa1111_kbc.c b/sys/arch/arm/sa11x0/sa1111_kbc.c
index dfe4503b5110..68d681d1dc7a 100644
--- a/sys/arch/arm/sa11x0/sa1111_kbc.c
+++ b/sys/arch/arm/sa11x0/sa1111_kbc.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: sa1111_kbc.c,v 1.9 2006/06/27 13:58:08 peter Exp $ */
+/*      $NetBSD: sa1111_kbc.c,v 1.10 2008/01/05 00:31:55 ad Exp $ */
 
 /*
  * Copyright (c) 2004  Ben Harris.
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa1111_kbc.c,v 1.9 2006/06/27 13:58:08 peter Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa1111_kbc.c,v 1.10 2008/01/05 00:31:55 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -70,9 +70,8 @@ __KERNEL_RCSID(0, "$NetBSD: sa1111_kbc.c,v 1.9 2006/06/27 13:58:08 peter Exp $")
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
-#include <sys/lock.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <arm/sa11x0/sa1111_reg.h>
 #include <arm/sa11x0/sa1111_var.h>
 
diff --git a/sys/arch/arm/xscale/i80321_aau.c b/sys/arch/arm/xscale/i80321_aau.c
index 6b0e239167e3..ee02632b95de 100644
--- a/sys/arch/arm/xscale/i80321_aau.c
+++ b/sys/arch/arm/xscale/i80321_aau.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: i80321_aau.c,v 1.11 2007/11/20 01:53:50 ad Exp $	*/
+/*	$NetBSD: i80321_aau.c,v 1.12 2008/01/05 00:31:55 ad Exp $	*/
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,20 +40,18 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_aau.c,v 1.11 2007/11/20 01:53:50 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_aau.c,v 1.12 2008/01/05 00:31:55 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/pool.h>
-#include <sys/lock.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/uio.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
 
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
-#include <machine/intr.h>
-
 #include <arm/xscale/i80321reg.h>
 #include <arm/xscale/i80321var.h>
 
diff --git a/sys/arch/arm/xscale/iopaau.c b/sys/arch/arm/xscale/iopaau.c
index ec5d02b0f40c..5e601bc5d5d7 100644
--- a/sys/arch/arm/xscale/iopaau.c
+++ b/sys/arch/arm/xscale/iopaau.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iopaau.c,v 1.15 2007/11/13 22:09:37 ad Exp $	*/
+/*	$NetBSD: iopaau.c,v 1.16 2008/01/05 00:31:55 ad Exp $	*/
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -43,19 +43,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iopaau.c,v 1.15 2007/11/13 22:09:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopaau.c,v 1.16 2008/01/05 00:31:55 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/pool.h>
-#include <sys/lock.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/uio.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
-
 #include <arm/xscale/iopaaureg.h>
 #include <arm/xscale/iopaauvar.h>
 
diff --git a/sys/arch/mac68k/mac68k/macrom.c b/sys/arch/mac68k/mac68k/macrom.c
index c296071cab99..019385924750 100644
--- a/sys/arch/mac68k/mac68k/macrom.c
+++ b/sys/arch/mac68k/mac68k/macrom.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: macrom.c,v 1.67 2007/12/03 15:33:53 ad Exp $	*/
+/*	$NetBSD: macrom.c,v 1.68 2008/01/05 00:31:55 ad Exp $	*/
 
 /*-
  * Copyright (C) 1994	Bradley A. Grantham
@@ -46,14 +46,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: macrom.c,v 1.67 2007/12/03 15:33:53 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: macrom.c,v 1.68 2008/01/05 00:31:55 ad Exp $");
 
 #include "opt_adb.h"
 #include "opt_ddb.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/cpu.h>
diff --git a/sys/arch/next68k/dev/nextcons.c b/sys/arch/next68k/dev/nextcons.c
index e9d0d47684f4..1ffc65834b3a 100644
--- a/sys/arch/next68k/dev/nextcons.c
+++ b/sys/arch/next68k/dev/nextcons.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nextcons.c,v 1.9 2007/01/24 13:08:14 hubertf Exp $	*/
+/*	$NetBSD: nextcons.c,v 1.10 2008/01/05 00:31:55 ad Exp $	*/
 
 /*
  * Copyright (c) 1999 Darrin B. Jewell
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextcons.c,v 1.9 2007/01/24 13:08:14 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextcons.c,v 1.10 2008/01/05 00:31:55 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,12 +41,11 @@ __KERNEL_RCSID(0, "$NetBSD: nextcons.c,v 1.9 2007/01/24 13:08:14 hubertf Exp $")
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
-#include <sys/lock.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
 
 #include <dev/cons.h>
 #include <dev/wscons/wskbdvar.h>
diff --git a/sys/arch/next68k/dev/nextkbd.c b/sys/arch/next68k/dev/nextkbd.c
index accdcc9bd419..8306a280a349 100644
--- a/sys/arch/next68k/dev/nextkbd.c
+++ b/sys/arch/next68k/dev/nextkbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nextkbd.c,v 1.12 2007/03/04 06:00:27 christos Exp $ */
+/* $NetBSD: nextkbd.c,v 1.13 2008/01/05 00:31:56 ad Exp $ */
 /*
  * Copyright (c) 1998 Matt DeBergalis
  * All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextkbd.c,v 1.12 2007/03/04 06:00:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextkbd.c,v 1.13 2008/01/05 00:31:56 ad Exp $");
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
@@ -42,12 +42,11 @@ __KERNEL_RCSID(0, "$NetBSD: nextkbd.c,v 1.12 2007/03/04 06:00:27 christos Exp $"
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
-#include <sys/lock.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
 
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wskbdvar.h>
diff --git a/sys/arch/prep/pnpbus/nvram_pnpbus.c b/sys/arch/prep/pnpbus/nvram_pnpbus.c
index c0e866bf1588..51b5b84ee08f 100644
--- a/sys/arch/prep/pnpbus/nvram_pnpbus.c
+++ b/sys/arch/prep/pnpbus/nvram_pnpbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nvram_pnpbus.c,v 1.9 2007/10/17 19:56:52 garbled Exp $ */
+/* $NetBSD: nvram_pnpbus.c,v 1.10 2008/01/05 00:31:56 ad Exp $ */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvram_pnpbus.c,v 1.9 2007/10/17 19:56:52 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvram_pnpbus.c,v 1.10 2008/01/05 00:31:56 ad Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -47,10 +47,10 @@ __KERNEL_RCSID(0, "$NetBSD: nvram_pnpbus.c,v 1.9 2007/10/17 19:56:52 garbled Exp
 #include <sys/kthread.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/lock.h>
+#include <sys/simplelock.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
 
-#include <machine/bus.h>
-#include <machine/intr.h>
 #include <machine/isa_machdep.h>
 /* clock stuff for motorolla machines */
 #include <dev/clock_subr.h>
diff --git a/sys/arch/sgimips/hpc/pckbc_hpc.c b/sys/arch/sgimips/hpc/pckbc_hpc.c
index b3e2e7337932..8f5ea889546e 100644
--- a/sys/arch/sgimips/hpc/pckbc_hpc.c
+++ b/sys/arch/sgimips/hpc/pckbc_hpc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_hpc.c,v 1.7 2007/10/17 19:57:04 garbled Exp $	 */
+/* $NetBSD: pckbc_hpc.c,v 1.8 2008/01/05 00:31:56 ad Exp $	 */
 
 /*
  * Copyright (c) 2003 Christopher SEKIYA
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_hpc.c,v 1.7 2007/10/17 19:57:04 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_hpc.c,v 1.8 2008/01/05 00:31:56 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -43,10 +43,9 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_hpc.c,v 1.7 2007/10/17 19:57:04 garbled Exp $"
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
-#include <sys/lock.h>
+#include <sys/bus.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
 #include <machine/machtype.h>
 
 #include <dev/ic/i8042reg.h>
diff --git a/sys/arch/xen/xen/xbd.c b/sys/arch/xen/xen/xbd.c
index aea9191ffe43..b8e76687f0a0 100644
--- a/sys/arch/xen/xen/xbd.c
+++ b/sys/arch/xen/xen/xbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xbd.c,v 1.41 2007/11/22 16:17:08 bouyer Exp $ */
+/* $NetBSD: xbd.c,v 1.42 2008/01/05 00:31:56 ad Exp $ */
 
 /*
  *
@@ -33,7 +33,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbd.c,v 1.41 2007/11/22 16:17:08 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd.c,v 1.42 2008/01/05 00:31:56 ad Exp $");
 
 #include "xbd_hypervisor.h"
 #include "rnd.h"
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: xbd.c,v 1.41 2007/11/22 16:17:08 bouyer Exp $");
 #include <sys/disklabel.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
-#include <sys/lock.h>
+#include <sys/simplelock.h>
 #include <sys/conf.h>
 #include <sys/queue.h>
 #include <sys/stat.h>