diff --git a/sys/arch/xen/i386/autoconf.c b/sys/arch/xen/i386/autoconf.c
index 558a34e75096..74ee4b020c9f 100644
--- a/sys/arch/xen/i386/autoconf.c
+++ b/sys/arch/xen/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.21 2007/01/01 02:59:50 yamt Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.22 2007/01/29 01:52:46 hubertf Exp $	*/
 /*	NetBSD: autoconf.c,v 1.75 2003/12/30 12:33:22 pk Exp 	*/
 
 /*-
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.21 2007/01/01 02:59:50 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.22 2007/01/29 01:52:46 hubertf Exp $");
 
 #include "opt_xen.h"
 #include "opt_compat_oldboot.h"
@@ -117,8 +117,6 @@ int x86_ndisks;
 #include <machine/kvm86.h>
 #endif
 
-#include "opt_xen.h"
-
 /*
  * Determine i/o configuration for a machine.
  */
diff --git a/sys/arch/xen/i386/hypervisor_machdep.c b/sys/arch/xen/i386/hypervisor_machdep.c
index 1427fe171cbe..1376c0e0cd91 100644
--- a/sys/arch/xen/i386/hypervisor_machdep.c
+++ b/sys/arch/xen/i386/hypervisor_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hypervisor_machdep.c,v 1.16 2006/12/08 15:05:18 yamt Exp $	*/
+/*	$NetBSD: hypervisor_machdep.c,v 1.17 2007/01/29 01:52:46 hubertf Exp $	*/
 
 /*
  *
@@ -59,9 +59,8 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.16 2006/12/08 15:05:18 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.17 2007/01/29 01:52:46 hubertf Exp $");
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/arch/xen/i386/machdep.c b/sys/arch/xen/i386/machdep.c
index 3e5754182b30..852f98f827d5 100644
--- a/sys/arch/xen/i386/machdep.c
+++ b/sys/arch/xen/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.31 2006/10/23 18:10:44 gson Exp $	*/
+/*	$NetBSD: machdep.c,v 1.32 2007/01/29 01:52:46 hubertf Exp $	*/
 /*	NetBSD: machdep.c,v 1.559 2004/07/22 15:12:46 mycroft Exp 	*/
 
 /*-
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.31 2006/10/23 18:10:44 gson Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.32 2007/01/29 01:52:46 hubertf Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -172,7 +172,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.31 2006/10/23 18:10:44 gson Exp $");
 #include <machine/apmvar.h>
 #endif
 
-#include "isa.h"
 #include "isadma.h"
 #include "npx.h"
 #include "ksyms.h"
diff --git a/sys/arch/xen/x86/consinit.c b/sys/arch/xen/x86/consinit.c
index 28d2288ab3a4..d4eda3f029f1 100644
--- a/sys/arch/xen/x86/consinit.c
+++ b/sys/arch/xen/x86/consinit.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: consinit.c,v 1.7 2006/12/09 10:37:52 bouyer Exp $	*/
+/*	$NetBSD: consinit.c,v 1.8 2007/01/29 01:52:46 hubertf Exp $	*/
 /*	NetBSD: consinit.c,v 1.4 2004/03/13 17:31:34 bjh21 Exp 	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.7 2006/12/09 10:37:52 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.8 2007/01/29 01:52:46 hubertf Exp $");
 
 #include "opt_kgdb.h"
 
@@ -91,11 +91,6 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.7 2006/12/09 10:37:52 bouyer Exp $");
 #include <dev/ic/comvar.h>
 #endif
 
-#include "ukbd.h"
-#if (NUKBD > 0)
-#include <dev/usb/ukbdvar.h>
-#endif
-
 #ifndef CONSDEVNAME
 #define CONSDEVNAME "pc"
 #endif
diff --git a/sys/arch/xen/x86/intr.c b/sys/arch/xen/x86/intr.c
index 922f0945f7f1..a21b53622474 100644
--- a/sys/arch/xen/x86/intr.c
+++ b/sys/arch/xen/x86/intr.c
@@ -103,14 +103,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.12 2006/12/08 15:05:18 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.13 2007/01/29 01:52:46 hubertf Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
 #include "isa.h"
 #include "pci.h"
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/arch/xen/xen/hypervisor.c b/sys/arch/xen/xen/hypervisor.c
index b309d53befd0..731f7621c1f0 100644
--- a/sys/arch/xen/xen/hypervisor.c
+++ b/sys/arch/xen/xen/hypervisor.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.28 2006/10/15 13:31:18 yamt Exp $ */
+/* $NetBSD: hypervisor.c,v 1.29 2007/01/29 01:52:46 hubertf Exp $ */
 
 /*
  * Copyright (c) 2005 Manuel Bouyer.
@@ -63,7 +63,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.28 2006/10/15 13:31:18 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.29 2007/01/29 01:52:46 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -126,12 +126,6 @@ __KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.28 2006/10/15 13:31:18 yamt Exp $")
 #endif
 #endif /* NPCI */
 
-#if NXENBUS > 0
-#include <machine/xenbus.h>
-#endif
-#ifdef XEN3
-#include <machine/granttables.h>
-#endif
 #if NXENBUS > 0
 #include <machine/xenbus.h>
 #endif
diff --git a/sys/arch/xen/xen/xencons.c b/sys/arch/xen/xen/xencons.c
index 94f4b3478721..aa8e0273b22a 100644
--- a/sys/arch/xen/xen/xencons.c
+++ b/sys/arch/xen/xen/xencons.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xencons.c,v 1.20 2007/01/07 00:02:36 bouyer Exp $	*/
+/*	$NetBSD: xencons.c,v 1.21 2007/01/29 01:52:46 hubertf Exp $	*/
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -63,7 +63,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.20 2007/01/07 00:02:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.21 2007/01/29 01:52:46 hubertf Exp $");
 
 #include "opt_xen.h"
 
@@ -81,7 +81,6 @@ __KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.20 2007/01/07 00:02:36 bouyer Exp $");
 #include <machine/hypervisor.h>
 #include <machine/evtchn.h>
 #ifdef XEN3
-#include <sys/param.h>
 #include <uvm/uvm.h>
 #include <machine/pmap.h>
 #include <machine/xen3-public/io/console.h>
diff --git a/sys/arch/zaurus/zaurus/machdep.c b/sys/arch/zaurus/zaurus/machdep.c
index e9afb4b500a1..8307b686b3d2 100644
--- a/sys/arch/zaurus/zaurus/machdep.c
+++ b/sys/arch/zaurus/zaurus/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.3 2006/12/18 15:30:56 nonaka Exp $	*/
+/*	$NetBSD: machdep.c,v 1.4 2007/01/29 01:52:45 hubertf Exp $	*/
 /*	$OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $	*/
 
 /*
@@ -107,7 +107,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2006/12/18 15:30:56 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.4 2007/01/29 01:52:45 hubertf Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -133,7 +133,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2006/12/18 15:30:56 nonaka Exp $");
 #include <dev/cons.h>
 #include <sys/conf.h>
 #include <sys/queue.h>
-#include <sys/device.h>
 
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
@@ -1020,7 +1019,6 @@ process_kernel_args(char *args)
  */
 #include "com.h"
 #if (NCOM > 0)
-#include <dev/ic/comreg.h>
 #include <dev/ic/comvar.h>
 #endif
 
diff --git a/sys/compat/common/kern_exit_43.c b/sys/compat/common/kern_exit_43.c
index 55e99635b2b4..8e7e86357611 100644
--- a/sys/compat/common/kern_exit_43.c
+++ b/sys/compat/common/kern_exit_43.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exit_43.c,v 1.15 2006/11/16 01:32:41 christos Exp $	*/
+/*	$NetBSD: kern_exit_43.c,v 1.16 2007/01/29 01:52:44 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exit_43.c,v 1.15 2006/11/16 01:32:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exit_43.c,v 1.16 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_exit_43.c,v 1.15 2006/11/16 01:32:41 christos E
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/wait.h>
 #include <sys/file.h>
diff --git a/sys/compat/common/uipc_syscalls_43.c b/sys/compat/common/uipc_syscalls_43.c
index 76b137a6f527..03c15716a1be 100644
--- a/sys/compat/common/uipc_syscalls_43.c
+++ b/sys/compat/common/uipc_syscalls_43.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_syscalls_43.c,v 1.25 2005/12/11 12:19:56 christos Exp $	*/
+/*	$NetBSD: uipc_syscalls_43.c,v 1.26 2007/01/29 01:52:44 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.25 2005/12/11 12:19:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.26 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,7 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.25 2005/12/11 12:19:56 christ
 #include <net/if.h>
 
 #include <compat/common/compat_util.h>
-#include <compat/sys/socket.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/compat/ibcs2/ibcs2_socksys.c b/sys/compat/ibcs2/ibcs2_socksys.c
index e9e22bc69b16..0a05ad1ca499 100644
--- a/sys/compat/ibcs2/ibcs2_socksys.c
+++ b/sys/compat/ibcs2/ibcs2_socksys.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibcs2_socksys.c,v 1.13 2006/06/26 21:23:57 mrg Exp $	*/
+/*	$NetBSD: ibcs2_socksys.c,v 1.14 2007/01/29 01:52:44 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Scott Bartram
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_socksys.c,v 1.13 2006/06/26 21:23:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_socksys.c,v 1.14 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -37,7 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: ibcs2_socksys.c,v 1.13 2006/06/26 21:23:57 mrg Exp $
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <net/if.h>
 
diff --git a/sys/compat/linux/arch/amd64/linux_exec_machdep.c b/sys/compat/linux/arch/amd64/linux_exec_machdep.c
index 49160d9ed12a..b42a1cf54f86 100644
--- a/sys/compat/linux/arch/amd64/linux_exec_machdep.c
+++ b/sys/compat/linux/arch/amd64/linux_exec_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_exec_machdep.c,v 1.8 2006/07/23 22:06:08 ad Exp $ */
+/*	$NetBSD: linux_exec_machdep.c,v 1.9 2007/01/29 01:52:44 hubertf Exp $ */
 
 /*-
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.8 2006/07/23 22:06:08 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.9 2007/01/29 01:52:44 hubertf Exp $");
 
 #ifdef __amd64__
 #define ELFSIZE 64
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.8 2006/07/23 22:06:08 ad Ex
 #include <sys/lwp.h>
 #include <sys/exec.h>
 #include <sys/stat.h>
-#include <sys/exec_elf.h>
 #include <sys/kauth.h>
 
 #include <machine/cpu.h>
diff --git a/sys/compat/linux/arch/i386/linux_machdep.c b/sys/compat/linux/arch/i386/linux_machdep.c
index 319751c80668..7666df3dabe2 100644
--- a/sys/compat/linux/arch/i386/linux_machdep.c
+++ b/sys/compat/linux/arch/i386/linux_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_machdep.c,v 1.120 2006/12/26 16:42:06 elad Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.121 2007/01/29 01:52:44 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1995, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.120 2006/12/26 16:42:06 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.121 2007/01/29 01:52:44 hubertf Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
@@ -109,7 +109,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.120 2006/12/26 16:42:06 elad Exp
 #endif
 
 #ifdef USER_LDT
-#include <machine/cpu.h>
 int linux_read_ldt __P((struct lwp *, struct linux_sys_modify_ldt_args *,
     register_t *));
 int linux_write_ldt __P((struct lwp *, struct linux_sys_modify_ldt_args *,
diff --git a/sys/compat/mach/mach_task.c b/sys/compat/mach/mach_task.c
index 822b28b39243..70e7d112960f 100644
--- a/sys/compat/mach/mach_task.c
+++ b/sys/compat/mach/mach_task.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mach_task.c,v 1.62 2007/01/04 18:27:36 elad Exp $ */
+/*	$NetBSD: mach_task.c,v 1.63 2007/01/29 01:52:44 hubertf Exp $ */
 
 /*-
  * Copyright (c) 2002-2003 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #include "opt_compat_darwin.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_task.c,v 1.62 2007/01/04 18:27:36 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_task.c,v 1.63 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: mach_task.c,v 1.62 2007/01/04 18:27:36 elad Exp $");
 #include <sys/malloc.h>
 #include <sys/sa.h>
 #include <sys/mount.h>
-#include <sys/ktrace.h>
 #include <sys/syscallargs.h>
 #include <sys/kauth.h>
 
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c
index d7f77359bdec..d2fc39865b03 100644
--- a/sys/compat/ndis/kern_ndis.c
+++ b/sys/compat/ndis/kern_ndis.c
@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60.2.5 2005/04/01 17:14:20 wpaul Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.7 2006/11/16 01:32:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.8 2007/01/29 01:52:44 hubertf Exp $");
 #endif
 
 #include <sys/param.h>
@@ -71,7 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.7 2006/11/16 01:32:44 christos Exp $
 #endif
 
 #ifdef __NetBSD__
-#include <machine/bus.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #endif
diff --git a/sys/compat/ndis/subr_ntoskrnl.c b/sys/compat/ndis/subr_ntoskrnl.c
index c0842a6448a1..69993df2b9ee 100644
--- a/sys/compat/ndis/subr_ntoskrnl.c
+++ b/sys/compat/ndis/subr_ntoskrnl.c
@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.43.2.5 2005/03/31 04:24:36 wpaul Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.6 2006/11/24 19:38:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.7 2007/01/29 01:52:44 hubertf Exp $");
 #endif
 
 #ifdef __FreeBSD__
@@ -63,7 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.6 2006/11/24 19:38:55 christos E
 #include <sys/module.h>
 #else
 #include <sys/lkm.h>
-#include <sys/callout.h>
 #endif
 
 #include <machine/atomic.h>
diff --git a/sys/compat/netbsd32/netbsd32_ioctl.c b/sys/compat/netbsd32/netbsd32_ioctl.c
index 7435febecf76..ccfd9fb10be7 100644
--- a/sys/compat/netbsd32/netbsd32_ioctl.c
+++ b/sys/compat/netbsd32/netbsd32_ioctl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_ioctl.c,v 1.26 2006/09/24 10:20:16 fvdl Exp $	*/
+/*	$NetBSD: netbsd32_ioctl.c,v 1.27 2007/01/29 01:52:44 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.26 2006/09/24 10:20:16 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.27 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.26 2006/09/24 10:20:16 fvdl Exp
 #include <sys/disklabel.h>
 #include <sys/dkio.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
 #include <sys/ttycom.h>
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index 85cde1b5cb8f..3c971bddc4c7 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_filio.c,v 1.14 2005/12/11 12:20:26 christos Exp $	 */
+/*	$NetBSD: svr4_filio.c,v 1.15 2007/01/29 01:52:44 hubertf Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_filio.c,v 1.14 2005/12/11 12:20:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_filio.c,v 1.15 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_filio.c,v 1.14 2005/12/11 12:20:26 christos Exp
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <net/if.h>
 #include <sys/malloc.h>
diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c
index 64208605eafa..6577257c108e 100644
--- a/sys/compat/svr4/svr4_ioctl.c
+++ b/sys/compat/svr4/svr4_ioctl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_ioctl.c,v 1.27 2005/12/11 12:20:26 christos Exp $	 */
+/*	$NetBSD: svr4_ioctl.c,v 1.28 2007/01/29 01:52:44 hubertf Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_ioctl.c,v 1.27 2005/12/11 12:20:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_ioctl.c,v 1.28 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_ioctl.c,v 1.27 2005/12/11 12:20:26 christos Exp
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <net/if.h>
 #include <sys/malloc.h>
diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c
index 18df1895be67..c2f2641acb2c 100644
--- a/sys/compat/svr4/svr4_signal.c
+++ b/sys/compat/svr4/svr4_signal.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_signal.c,v 1.56 2006/11/16 01:32:44 christos Exp $	 */
+/*	$NetBSD: svr4_signal.c,v 1.57 2007/01/29 01:52:44 hubertf Exp $	 */
 
 /*-
  * Copyright (c) 1994, 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_signal.c,v 1.56 2006/11/16 01:32:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_signal.c,v 1.57 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -63,7 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_signal.c,v 1.56 2006/11/16 01:32:44 christos Ex
 #include <compat/svr4/svr4_ucontext.h>
 #include <compat/svr4/svr4_syscallargs.h>
 #include <compat/svr4/svr4_util.h>
-#include <compat/svr4/svr4_ucontext.h>
 
 #define	svr4_sigmask(n)		(1 << (((n) - 1) & 31))
 #define	svr4_sigword(n)		(((n) - 1) >> 5)
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index c5c1508c5103..3d2f97c33dcf 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_sockio.c,v 1.26 2006/11/16 01:32:44 christos Exp $	 */
+/*	$NetBSD: svr4_sockio.c,v 1.27 2007/01/29 01:52:44 hubertf Exp $	 */
 
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_sockio.c,v 1.26 2006/11/16 01:32:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_sockio.c,v 1.27 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_sockio.c,v 1.26 2006/11/16 01:32:44 christos Ex
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <net/if.h>
 #include <sys/malloc.h>
diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c
index ebf0c2b44309..ed661961f6e2 100644
--- a/sys/compat/svr4/svr4_termios.c
+++ b/sys/compat/svr4/svr4_termios.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_termios.c,v 1.20 2005/12/11 12:20:26 christos Exp $	 */
+/*	$NetBSD: svr4_termios.c,v 1.21 2007/01/29 01:52:44 hubertf Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_termios.c,v 1.20 2005/12/11 12:20:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_termios.c,v 1.21 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_termios.c,v 1.20 2005/12/11 12:20:26 christos E
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <net/if.h>
 #include <sys/malloc.h>
diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c
index 192961b27ca8..cdf7d6ebe297 100644
--- a/sys/compat/svr4/svr4_ttold.c
+++ b/sys/compat/svr4/svr4_ttold.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_ttold.c,v 1.26 2006/11/16 01:32:44 christos Exp $	 */
+/*	$NetBSD: svr4_ttold.c,v 1.27 2007/01/29 01:52:44 hubertf Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_ttold.c,v 1.26 2006/11/16 01:32:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_ttold.c,v 1.27 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_ttold.c,v 1.26 2006/11/16 01:32:44 christos Exp
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <net/if.h>
 #include <sys/malloc.h>
diff --git a/sys/compat/svr4_32/svr4_32_filio.c b/sys/compat/svr4_32/svr4_32_filio.c
index 9f1af1b11cb8..ae2adc42c0b6 100644
--- a/sys/compat/svr4_32/svr4_32_filio.c
+++ b/sys/compat/svr4_32/svr4_32_filio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_filio.c,v 1.8 2005/12/11 12:20:26 christos Exp $	 */
+/*	$NetBSD: svr4_32_filio.c,v 1.9 2007/01/29 01:52:44 hubertf Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_filio.c,v 1.8 2005/12/11 12:20:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_filio.c,v 1.9 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_32_filio.c,v 1.8 2005/12/11 12:20:26 christos E
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <net/if.h>
 #include <sys/malloc.h>
diff --git a/sys/compat/svr4_32/svr4_32_ioctl.c b/sys/compat/svr4_32/svr4_32_ioctl.c
index 5c7864550a63..e4d981b38b6f 100644
--- a/sys/compat/svr4_32/svr4_32_ioctl.c
+++ b/sys/compat/svr4_32/svr4_32_ioctl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_ioctl.c,v 1.11 2005/12/11 12:20:26 christos Exp $	 */
+/*	$NetBSD: svr4_32_ioctl.c,v 1.12 2007/01/29 01:52:44 hubertf Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_ioctl.c,v 1.11 2005/12/11 12:20:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_ioctl.c,v 1.12 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_32_ioctl.c,v 1.11 2005/12/11 12:20:26 christos
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <net/if.h>
 #include <sys/malloc.h>
diff --git a/sys/compat/svr4_32/svr4_32_signal.c b/sys/compat/svr4_32/svr4_32_signal.c
index 0ba4d090ff75..30b30f7c7c0d 100644
--- a/sys/compat/svr4_32/svr4_32_signal.c
+++ b/sys/compat/svr4_32/svr4_32_signal.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_signal.c,v 1.16 2006/10/16 20:18:55 martin Exp $	 */
+/*	$NetBSD: svr4_32_signal.c,v 1.17 2007/01/29 01:52:44 hubertf Exp $	 */
 
 /*-
  * Copyright (c) 1994, 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_signal.c,v 1.16 2006/10/16 20:18:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_signal.c,v 1.17 2007/01/29 01:52:44 hubertf Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_svr4.h"
@@ -65,7 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_32_signal.c,v 1.16 2006/10/16 20:18:55 martin E
 #include <compat/svr4_32/svr4_32_ucontext.h>
 #include <compat/svr4_32/svr4_32_syscallargs.h>
 #include <compat/svr4_32/svr4_32_util.h>
-#include <compat/svr4_32/svr4_32_ucontext.h>
 
 #define	svr4_sigmask(n)		(1 << (((n) - 1) & 31))
 #define	svr4_sigword(n)		(((n) - 1) >> 5)
diff --git a/sys/compat/svr4_32/svr4_32_sockio.c b/sys/compat/svr4_32/svr4_32_sockio.c
index 8fe388f149d0..d94af85d3e27 100644
--- a/sys/compat/svr4_32/svr4_32_sockio.c
+++ b/sys/compat/svr4_32/svr4_32_sockio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_sockio.c,v 1.11 2005/12/11 12:20:26 christos Exp $	 */
+/*	$NetBSD: svr4_32_sockio.c,v 1.12 2007/01/29 01:52:44 hubertf Exp $	 */
 
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_sockio.c,v 1.11 2005/12/11 12:20:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_sockio.c,v 1.12 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_32_sockio.c,v 1.11 2005/12/11 12:20:26 christos
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <net/if.h>
 #include <sys/malloc.h>
diff --git a/sys/compat/svr4_32/svr4_32_termios.c b/sys/compat/svr4_32/svr4_32_termios.c
index 2f4075ff71c2..29f148ffc7bc 100644
--- a/sys/compat/svr4_32/svr4_32_termios.c
+++ b/sys/compat/svr4_32/svr4_32_termios.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_termios.c,v 1.10 2005/12/11 12:20:26 christos Exp $	 */
+/*	$NetBSD: svr4_32_termios.c,v 1.11 2007/01/29 01:52:44 hubertf Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_termios.c,v 1.10 2005/12/11 12:20:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_termios.c,v 1.11 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_32_termios.c,v 1.10 2005/12/11 12:20:26 christo
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <net/if.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/hpc/hpckbd.c b/sys/dev/hpc/hpckbd.c
index 06bf2757a38e..43b6c76a4a69 100644
--- a/sys/dev/hpc/hpckbd.c
+++ b/sys/dev/hpc/hpckbd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpckbd.c,v 1.20 2006/11/16 01:32:50 christos Exp $ */
+/*	$NetBSD: hpckbd.c,v 1.21 2007/01/29 01:52:44 hubertf Exp $ */
 
 /*-
  * Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.20 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.21 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.20 2006/11/16 01:32:50 christos Exp $")
 #include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wskbdvar.h>
-#include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/wsksymvar.h>
 #include <dev/pckbport/wskbdmap_mfii.h>
 #ifdef WSDISPLAY_COMPAT_RAWKBD
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 6fe1d73db236..dde4bb97dcd3 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ath.c,v 1.80 2007/01/09 09:30:24 dyoung Exp $	*/
+/*	$NetBSD: ath.c,v 1.81 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
 __FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.80 2007/01/09 09:30:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.81 2007/01/29 01:52:45 hubertf Exp $");
 #endif
 
 /*
@@ -73,8 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.80 2007/01/09 09:30:24 dyoung Exp $");
 #include <machine/bus.h>
 #include <sys/endian.h>
 
-#include <machine/bus.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/ic/ath_netbsd.c b/sys/dev/ic/ath_netbsd.c
index de7130fce535..81d6a51c0976 100644
--- a/sys/dev/ic/ath_netbsd.c
+++ b/sys/dev/ic/ath_netbsd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ath_netbsd.c,v 1.8 2006/05/11 22:26:54 mrg Exp $ */
+/*	$NetBSD: ath_netbsd.c,v 1.9 2007/01/29 01:52:45 hubertf Exp $ */
 
 /*-
  * Copyright (c) 2003, 2004 David Young
@@ -28,14 +28,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.8 2006/05/11 22:26:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.9 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/errno.h>
-#include <sys/systm.h> 
+#include <sys/systm.h>
 #include <sys/sysctl.h>
-#include <sys/mbuf.h>   
+#include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c
index 5d9412dda382..bacb09cf16c2 100644
--- a/sys/dev/ic/cy.c
+++ b/sys/dev/ic/cy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cy.c,v 1.48 2006/11/16 01:32:51 christos Exp $	*/
+/*	$NetBSD: cy.c,v 1.49 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*
  * cy.c
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy.c,v 1.48 2006/11/16 01:32:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy.c,v 1.49 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -26,7 +26,6 @@ __KERNEL_RCSID(0, "$NetBSD: cy.c,v 1.48 2006/11/16 01:32:51 christos Exp $");
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/user.h>
-#include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/ic/nslm7x.c b/sys/dev/ic/nslm7x.c
index 136aeaca551f..c7a3e76d26b6 100644
--- a/sys/dev/ic/nslm7x.c
+++ b/sys/dev/ic/nslm7x.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nslm7x.c,v 1.28 2007/01/07 12:10:18 tsutsui Exp $ */
+/*	$NetBSD: nslm7x.c,v 1.29 2007/01/29 01:52:45 hubertf Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.28 2007/01/07 12:10:18 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.29 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -62,7 +62,6 @@ __KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.28 2007/01/07 12:10:18 tsutsui Exp $");
 #include <dev/ic/nslm7xvar.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
 
 #if defined(LMDEBUG)
 #define DPRINTF(x)		printf x
diff --git a/sys/dev/ic/smc93cx6.c b/sys/dev/ic/smc93cx6.c
index 90abeeade112..c1e0738d3821 100644
--- a/sys/dev/ic/smc93cx6.c
+++ b/sys/dev/ic/smc93cx6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smc93cx6.c,v 1.12 2005/12/11 12:21:28 christos Exp $	*/
+/*	$NetBSD: smc93cx6.c,v 1.13 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*
  * Interface for the 93C66/56/46/26/06 serial eeprom parts.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc93cx6.c,v 1.12 2005/12/11 12:21:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc93cx6.c,v 1.13 2007/01/29 01:52:45 hubertf Exp $");
 
 #ifndef __NetBSD__
 #include "opt_aic7xxx.h"
@@ -66,13 +66,12 @@ __KERNEL_RCSID(0, "$NetBSD: smc93cx6.c,v 1.12 2005/12/11 12:21:28 christos Exp $
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#ifdef __NetBSD__
 #include <machine/bus.h>
+#ifdef __NetBSD__
 #include <dev/ic/smc93cx6var.h>
 #else
 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>
-#include <machine/bus.h>
 #include <dev/aic7xxx/93cx6.h>
 #endif
 
diff --git a/sys/dev/isa/lm_isa.c b/sys/dev/isa/lm_isa.c
index dc35d7860288..80f37531b62e 100644
--- a/sys/dev/isa/lm_isa.c
+++ b/sys/dev/isa/lm_isa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lm_isa.c,v 1.14 2006/11/24 22:04:25 wiz Exp $ */
+/*	$NetBSD: lm_isa.c,v 1.15 2007/01/29 01:52:45 hubertf Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.14 2006/11/24 22:04:25 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.15 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.14 2006/11/24 22:04:25 wiz Exp $");
 #include <dev/isa/isavar.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
 
 #include <dev/sysmon/sysmonvar.h>
 
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index 358063df2659..bcd645722077 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sb.c,v 1.85 2006/09/03 05:12:54 christos Exp $	*/
+/*	$NetBSD: sb.c,v 1.86 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.85 2006/09/03 05:12:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.86 2007/01/29 01:52:45 hubertf Exp $");
 
 #include "midi.h"
 
@@ -55,8 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.85 2006/09/03 05:12:54 christos Exp $");
 #include <dev/audio_if.h>
 #include <dev/midi_if.h>
 
-#include <dev/midi_if.h>
-
 #include <dev/isa/isavar.h>
 #include <dev/isa/isadmavar.h>
 
diff --git a/sys/dev/isa/toaster.c b/sys/dev/isa/toaster.c
index 1953da50d03e..a290411781f8 100644
--- a/sys/dev/isa/toaster.c
+++ b/sys/dev/isa/toaster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: toaster.c,v 1.2 2005/12/11 12:22:03 christos Exp $ */
+/* $NetBSD: toaster.c,v 1.3 2007/01/29 01:52:45 hubertf Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.2 2005/12/11 12:22:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.3 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.2 2005/12/11 12:22:03 christos Exp $")
 #include <sys/device.h>
 #include <sys/callout.h>
 #include <sys/select.h>
-#include <sys/conf.h>
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
diff --git a/sys/dev/isa/toasterlcd.c b/sys/dev/isa/toasterlcd.c
index 4f87c1188a03..b368437728b3 100644
--- a/sys/dev/isa/toasterlcd.c
+++ b/sys/dev/isa/toasterlcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: toasterlcd.c,v 1.2 2005/12/11 12:22:03 christos Exp $ */
+/* $NetBSD: toasterlcd.c,v 1.3 2007/01/29 01:52:45 hubertf Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toasterlcd.c,v 1.2 2005/12/11 12:22:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toasterlcd.c,v 1.3 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,7 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: toasterlcd.c,v 1.2 2005/12/11 12:22:03 christos Exp
 #include <sys/device.h>
 #include <sys/callout.h>
 #include <sys/select.h>
-#include <sys/conf.h>
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
diff --git a/sys/dev/isapnp/isic_isapnp.c b/sys/dev/isapnp/isic_isapnp.c
index 09ca7a7bc79e..fa04c59c09e2 100644
--- a/sys/dev/isapnp/isic_isapnp.c
+++ b/sys/dev/isapnp/isic_isapnp.c
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.24 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.25 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -62,12 +62,10 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.24 2006/11/16 01:33:05 christos Ex
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_trace.h>
 #else
-#include <netisdn/i4b_global.h>
 #include <netisdn/i4b_debug.h>
 #include <netisdn/i4b_ioctl.h>
 #include <netisdn/i4b_trace.h>
 #include <netisdn/i4b_l2.h>
-#include <netisdn/i4b_l1l2.h>
 #endif
 
 #include <dev/ic/isic_l1.h>
diff --git a/sys/dev/isapnp/isic_isapnp_ctx_s0P.c b/sys/dev/isapnp/isic_isapnp_ctx_s0P.c
index 86e94094ba27..2e72bc0ad850 100644
--- a/sys/dev/isapnp/isic_isapnp_ctx_s0P.c
+++ b/sys/dev/isapnp/isic_isapnp_ctx_s0P.c
@@ -27,14 +27,14 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Creatix PnP cards
  *	============================================================
  *
- *	$Id: isic_isapnp_ctx_s0P.c,v 1.8 2005/12/11 12:22:16 christos Exp $
+ *	$Id: isic_isapnp_ctx_s0P.c,v 1.9 2007/01/29 01:52:45 hubertf Exp $
  *
  *      last edit-date: [Fri Jan  5 11:38:29 2001]
  *
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.8 2005/12/11 12:22:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.9 2007/01/29 01:52:45 hubertf Exp $");
 
 #include "opt_isicpnp.h"
 #if ISICPNP_CRTX_S0_P
@@ -82,7 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.8 2005/12/11 12:22:16 chri
 #include <dev/ic/isac.h>
 #include <dev/ic/hscx.h>
 
-#include <netisdn/i4b_l1l2.h>
 #include <netisdn/i4b_mbuf.h>
 
 #ifndef __FreeBSD__
diff --git a/sys/dev/isapnp/isic_isapnp_siemens_isurf.c b/sys/dev/isapnp/isic_isapnp_siemens_isurf.c
index d699df179378..29cebe2a072e 100644
--- a/sys/dev/isapnp/isic_isapnp_siemens_isurf.c
+++ b/sys/dev/isapnp/isic_isapnp_siemens_isurf.c
@@ -37,14 +37,14 @@
  *	Siemens I-Surf 2.0 PnP specific routines for isic driver
  *	--------------------------------------------------------
  *
- *	$Id: isic_isapnp_siemens_isurf.c,v 1.8 2005/12/11 12:22:16 christos Exp $
+ *	$Id: isic_isapnp_siemens_isurf.c,v 1.9 2007/01/29 01:52:45 hubertf Exp $
  *
  *      last edit-date: [Fri Jan  5 11:38:29 2001]
  *
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_siemens_isurf.c,v 1.8 2005/12/11 12:22:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_siemens_isurf.c,v 1.9 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -74,10 +74,8 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_siemens_isurf.c,v 1.8 2005/12/11 12:22:1
 #include <net/if.h>
 
 #if defined(__FreeBSD__)
-#include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 #else
-#include <netisdn/i4b_debug.h>
 #include <netisdn/i4b_ioctl.h>
 #endif
 
diff --git a/sys/dev/isapnp/isic_isapnp_sws.c b/sys/dev/isapnp/isic_isapnp_sws.c
index 956ea7b136f1..706beb33de5e 100644
--- a/sys/dev/isapnp/isic_isapnp_sws.c
+++ b/sys/dev/isapnp/isic_isapnp_sws.c
@@ -47,7 +47,7 @@
  *		EXPERIMENTAL !!!!
  *		=================
  *
- *	$Id: isic_isapnp_sws.c,v 1.9 2005/12/11 12:22:16 christos Exp $
+ *	$Id: isic_isapnp_sws.c,v 1.10 2007/01/29 01:52:45 hubertf Exp $
  *
  *	last edit-date: [Fri Jan  5 11:38:29 2001]
  *
@@ -57,7 +57,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_sws.c,v 1.9 2005/12/11 12:22:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_sws.c,v 1.10 2007/01/29 01:52:45 hubertf Exp $");
 
 #include "opt_isicpnp.h"
 #ifdef ISICPNP_SEDLBAUER
@@ -109,9 +109,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_sws.c,v 1.9 2005/12/11 12:22:16 christos
 #else
 #include <netisdn/i4b_debug.h>
 #include <netisdn/i4b_ioctl.h>
-#include <netisdn/i4b_global.h>
 #include <netisdn/i4b_l2.h>
-#include <netisdn/i4b_l1l2.h>
 #endif
 
 #include <dev/ic/isic_l1.h>
diff --git a/sys/dev/isapnp/isic_isapnp_tel_s0P.c b/sys/dev/isapnp/isic_isapnp_tel_s0P.c
index 59152f111750..58203d487453 100644
--- a/sys/dev/isapnp/isic_isapnp_tel_s0P.c
+++ b/sys/dev/isapnp/isic_isapnp_tel_s0P.c
@@ -38,14 +38,14 @@
  *		EXPERIMENTAL !!!
  *		================
  *
- *	$Id: isic_isapnp_tel_s0P.c,v 1.8 2005/12/11 12:22:16 christos Exp $
+ *	$Id: isic_isapnp_tel_s0P.c,v 1.9 2007/01/29 01:52:45 hubertf Exp $
  *
  *      last edit-date: [Fri Jan  5 11:38:29 2001]
  *
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_tel_s0P.c,v 1.8 2005/12/11 12:22:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_tel_s0P.c,v 1.9 2007/01/29 01:52:45 hubertf Exp $");
 
 #include "opt_isicpnp.h"
 #ifdef ISICPNP_TEL_S0_16_3_P
@@ -79,11 +79,9 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_tel_s0P.c,v 1.8 2005/12/11 12:22:16 chri
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 #else
-#include <netisdn/i4b_global.h>
 #include <netisdn/i4b_debug.h>
 #include <netisdn/i4b_ioctl.h>
 #include <netisdn/i4b_l2.h>
-#include <netisdn/i4b_l1l2.h>
 #endif
 
 #include <dev/ic/isic_l1.h>
diff --git a/sys/dev/lockstat.h b/sys/dev/lockstat.h
index 4c0792ae57d3..7caee54194e9 100644
--- a/sys/dev/lockstat.h
+++ b/sys/dev/lockstat.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: lockstat.h,v 1.2 2006/12/25 11:57:40 ad Exp $	*/
+/*	$NetBSD: lockstat.h,v 1.3 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -46,7 +46,6 @@
 #include <sys/types.h>
 #include <sys/ioccom.h>
 #include <sys/queue.h>
-#include <sys/types.h>
 #include <sys/time.h>
 
 #if defined(_KERNEL) && defined(__HAVE_CPU_COUNTER)
diff --git a/sys/dev/marvell/gt.c b/sys/dev/marvell/gt.c
index d58b992363b5..4f5db6f01041 100644
--- a/sys/dev/marvell/gt.c
+++ b/sys/dev/marvell/gt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gt.c,v 1.12 2005/12/24 20:27:41 perry Exp $	*/
+/*	$NetBSD: gt.c,v 1.13 2007/01/29 01:52:44 hubertf Exp $	*/
 
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,14 +42,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.12 2005/12/24 20:27:41 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.13 2007/01/29 01:52:44 hubertf Exp $");
 
 #include "opt_marvell.h"
 #include "locators.h"
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/extent.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/marvell/gtmpsc.c b/sys/dev/marvell/gtmpsc.c
index 717cb970657a..125a2ca00779 100644
--- a/sys/dev/marvell/gtmpsc.c
+++ b/sys/dev/marvell/gtmpsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gtmpsc.c,v 1.21 2006/10/01 19:28:43 elad Exp $	*/
+/*	$NetBSD: gtmpsc.c,v 1.22 2007/01/29 01:52:44 hubertf Exp $	*/
 
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.21 2006/10/01 19:28:43 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.22 2007/01/29 01:52:44 hubertf Exp $");
 
 #include "opt_kgdb.h"
 
@@ -201,8 +201,6 @@ STATIC int gt_reva_gtmpsc_bug;
 unsigned int sdma_imask;        /* soft copy of SDMA IMASK reg */
 
 #ifdef KGDB
-#include <sys/kgdb.h>
-
 static int gtmpsc_kgdb_addr;
 static int gtmpsc_kgdb_attached;
 
diff --git a/sys/dev/marvell/gtpci.c b/sys/dev/marvell/gtpci.c
index 6abd73a4038d..49cbbd6c15e3 100644
--- a/sys/dev/marvell/gtpci.c
+++ b/sys/dev/marvell/gtpci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gtpci.c,v 1.14 2006/03/29 06:55:32 thorpej Exp $	*/
+/*	$NetBSD: gtpci.c,v 1.15 2007/01/29 01:52:44 hubertf Exp $	*/
 
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.14 2006/03/29 06:55:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.15 2007/01/29 01:52:44 hubertf Exp $");
 
 #include "opt_marvell.h"
 #include <sys/param.h>
@@ -60,7 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.14 2006/03/29 06:55:32 thorpej Exp $");
 #include <dev/marvell/gtintrreg.h>
 #include <dev/marvell/gtpcireg.h>
 #include <dev/marvell/gtpcivar.h>
-#include <dev/marvell/gtvar.h>
 
 static int	gtpci_error_intr(void *);
 
diff --git a/sys/dev/marvell/obio.c b/sys/dev/marvell/obio.c
index bee8ddc5ffb3..166add8d2775 100644
--- a/sys/dev/marvell/obio.c
+++ b/sys/dev/marvell/obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.8 2006/03/29 06:55:32 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.9 2007/01/29 01:52:44 hubertf Exp $	*/
 
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,13 +42,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.8 2006/03/29 06:55:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9 2007/01/29 01:52:44 hubertf Exp $");
 
 #include "opt_marvell.h"
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/extent.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c
index 529158e55fb6..7300f155e88d 100644
--- a/sys/dev/ofw/ofdisk.c
+++ b/sys/dev/ofw/ofdisk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofdisk.c,v 1.33 2006/03/29 07:10:25 thorpej Exp $	*/
+/*	$NetBSD: ofdisk.c,v 1.34 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.33 2006/03/29 07:10:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.34 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.33 2006/03/29 07:10:25 thorpej Exp $");
 #include <sys/stat.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/conf.h>
 
 #include <dev/ofw/openfirm.h>
 
diff --git a/sys/dev/raidframe/rf_evenodd.c b/sys/dev/raidframe/rf_evenodd.c
index c3942416fe0a..3759c5d42c99 100644
--- a/sys/dev/raidframe/rf_evenodd.c
+++ b/sys/dev/raidframe/rf_evenodd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_evenodd.c,v 1.18 2006/11/16 01:33:23 christos Exp $	*/
+/*	$NetBSD: rf_evenodd.c,v 1.19 2007/01/29 01:52:45 hubertf Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,7 @@
  ****************************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.18 2006/11/16 01:33:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.19 2007/01/29 01:52:45 hubertf Exp $");
 
 #include "rf_archs.h"
 
@@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.18 2006/11/16 01:33:23 christos Exp
 #include "rf_map.h"
 #include "rf_pq.h"
 #include "rf_mcpair.h"
-#include "rf_evenodd.h"
 #include "rf_evenodd_dagfuncs.h"
 #include "rf_evenodd_dags.h"
 #include "rf_engine.h"
diff --git a/sys/dev/sun/fb.c b/sys/dev/sun/fb.c
index 061495f6b280..2b9c090cabcc 100644
--- a/sys/dev/sun/fb.c
+++ b/sys/dev/sun/fb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fb.c,v 1.25 2006/10/15 19:53:27 martin Exp $ */
+/*	$NetBSD: fb.c,v 1.26 2007/01/29 01:52:45 hubertf Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.25 2006/10/15 19:53:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.26 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -400,8 +400,6 @@ fb_setsize_eeprom(fb, depth, def_width, def_height)
 
 
 #ifdef RASTERCONSOLE
-#include <machine/kbd.h>
-
 static void fb_bell(int);
 
 static void
diff --git a/sys/dev/sun/sunms.c b/sys/dev/sun/sunms.c
index 502f3ce7e678..d9d5c22af2b9 100644
--- a/sys/dev/sun/sunms.c
+++ b/sys/dev/sun/sunms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunms.c,v 1.24 2006/03/30 16:12:10 thorpej Exp $	*/
+/*	$NetBSD: sunms.c,v 1.25 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.24 2006/03/30 16:12:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.25 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,7 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.24 2006/03/30 16:12:10 thorpej Exp $");
 
 #include <machine/vuid_event.h>
 
-#include <sys/tty.h>
 #include <dev/sun/event_var.h>
 #include <dev/sun/msvar.h>
 #include <dev/sun/kbd_ms_ttyvar.h>
diff --git a/sys/dev/sysmon/swwdog.c b/sys/dev/sysmon/swwdog.c
index d73e655c726b..d1722e370ea9 100644
--- a/sys/dev/sysmon/swwdog.c
+++ b/sys/dev/sysmon/swwdog.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: swwdog.c,v 1.5 2006/12/19 21:17:17 smb Exp $	*/
+/*	$NetBSD: swwdog.c,v 1.6 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Steven M. Bellovin
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.5 2006/12/19 21:17:17 smb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.6 2007/01/29 01:52:45 hubertf Exp $");
 
 /*
  *
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.5 2006/12/19 21:17:17 smb Exp $");
  */
 #include <sys/param.h>
 #include <sys/callout.h>
-#include <sys/cdefs.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index cd4c2dea8ab5..6a92101f4238 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uaudio.c,v 1.107 2006/11/16 01:33:26 christos Exp $	*/
+/*	$NetBSD: uaudio.c,v 1.108 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.107 2006/11/16 01:33:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.108 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -58,7 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.107 2006/11/16 01:33:26 christos Exp $"
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/device.h>
 #include <sys/poll.h>
 
 #include <sys/audioio.h>
diff --git a/sys/dev/usb/ukyopon.c b/sys/dev/usb/ukyopon.c
index c21cd2ad1ea9..a07528698dd5 100644
--- a/sys/dev/usb/ukyopon.c
+++ b/sys/dev/usb/ukyopon.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ukyopon.c,v 1.4 2005/12/11 12:24:01 christos Exp $	*/
+/*	$NetBSD: ukyopon.c,v 1.5 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.4 2005/12/11 12:24:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.5 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -67,7 +67,6 @@ __KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.4 2005/12/11 12:24:01 christos Exp $")
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/usb_quirks.h>
 
-#include <dev/usb/usbdevs.h>
 #include <dev/usb/ucomvar.h>
 #include <dev/usb/umodemvar.h>
 #include <dev/usb/ukyopon.h>
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index dafde69ff7f9..3f00996eefb8 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: umct.c,v 1.20 2006/11/16 01:33:27 christos Exp $	*/
+/*	$NetBSD: umct.c,v 1.21 2007/01/29 01:52:45 hubertf Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.20 2006/11/16 01:33:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.21 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,9 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.20 2006/11/16 01:33:27 christos Exp $");
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/usb_quirks.h>
 
-#include <dev/usb/usbdevs.h>
 #include <dev/usb/ucomvar.h>
-
 #include <dev/usb/umct.h>
 
 #ifdef UMCT_DEBUG
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 99063f836de0..893da3fec4b6 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: umodem.c,v 1.54 2005/12/11 12:24:01 christos Exp $	*/
+/*	$NetBSD: umodem.c,v 1.55 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.54 2005/12/11 12:24:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.55 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -74,7 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.54 2005/12/11 12:24:01 christos Exp $")
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/usb_quirks.h>
 
-#include <dev/usb/usbdevs.h>
 #include <dev/usb/ucomvar.h>
 #include <dev/usb/umodemvar.h>
 
diff --git a/sys/dev/usb/umodem_common.c b/sys/dev/usb/umodem_common.c
index 0adea4556035..b8adf046ffd8 100644
--- a/sys/dev/usb/umodem_common.c
+++ b/sys/dev/usb/umodem_common.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: umodem_common.c,v 1.9 2006/11/16 01:33:27 christos Exp $	*/
+/*	$NetBSD: umodem_common.c,v 1.10 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.9 2006/11/16 01:33:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.10 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -74,7 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.9 2006/11/16 01:33:27 christos E
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/usb_quirks.h>
 
-#include <dev/usb/usbdevs.h>
 #include <dev/usb/ucomvar.h>
 #include <dev/usb/umodemvar.h>
 
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 3550964a6e5f..0fa4b9bee93c 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uplcom.c,v 1.50 2006/11/16 01:33:27 christos Exp $	*/
+/*	$NetBSD: uplcom.c,v 1.51 2007/01/29 01:52:45 hubertf Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.50 2006/11/16 01:33:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.51 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -64,7 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.50 2006/11/16 01:33:27 christos Exp $")
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/usb_quirks.h>
 
-#include <dev/usb/usbdevs.h>
 #include <dev/usb/ucomvar.h>
 
 #ifdef UPLCOM_DEBUG
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index d8480b33632d..89faa91b1c47 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi.c,v 1.116 2006/12/05 20:45:36 macallan Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.117 2007/01/29 01:52:45 hubertf Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.116 2006/12/05 20:45:36 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.117 2007/01/29 01:52:45 hubertf Exp $");
 
 #include "opt_compat_netbsd.h"
 
@@ -69,10 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.116 2006/12/05 20:45:36 macallan Exp $")
 #include <dev/usb/usb_mem.h>
 #include <dev/usb/usb_quirks.h>
 
-#if defined(__FreeBSD__)
-#include "usb_if.h"
-#endif
-
 #ifdef USB_DEBUG
 #define DPRINTF(x)	if (usbdebug) logprintf x
 #define DPRINTFN(n,x)	if (usbdebug>(n)) logprintf x
diff --git a/sys/dev/wscons/wskbdutil.c b/sys/dev/wscons/wskbdutil.c
index c23c46ac8511..320d844234da 100644
--- a/sys/dev/wscons/wskbdutil.c
+++ b/sys/dev/wscons/wskbdutil.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wskbdutil.c,v 1.13 2006/04/01 23:02:32 christos Exp $	*/
+/*	$NetBSD: wskbdutil.c,v 1.14 2007/01/29 01:52:45 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,10 +37,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbdutil.c,v 1.13 2006/04/01 23:02:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdutil.c,v 1.14 2007/01/29 01:52:45 hubertf Exp $");
 
 #include <sys/param.h>
-#include <sys/cdefs.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/fs/puffs/puffs_sys.h b/sys/fs/puffs/puffs_sys.h
index 09bbe1d220c5..999c6cfec104 100644
--- a/sys/fs/puffs/puffs_sys.h
+++ b/sys/fs/puffs/puffs_sys.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_sys.h,v 1.22 2007/01/26 22:59:49 pooka Exp $	*/
+/*	$NetBSD: puffs_sys.h,v 1.23 2007/01/29 01:52:44 hubertf Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006  Antti Kantee.  All Rights Reserved.
@@ -40,7 +40,6 @@
 #include <sys/kauth.h>
 #include <sys/lock.h>
 #include <sys/queue.h>
-#include <sys/lock.h>
 #include <sys/pool.h>
 
 #include <fs/puffs/puffs_msgif.h>
diff --git a/sys/fs/sysvbfs/sysvbfs_vnops.c b/sys/fs/sysvbfs/sysvbfs_vnops.c
index f01fdce54c2d..a2422a1613c2 100644
--- a/sys/fs/sysvbfs/sysvbfs_vnops.c
+++ b/sys/fs/sysvbfs/sysvbfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysvbfs_vnops.c,v 1.7 2006/12/25 18:32:16 wiz Exp $	*/
+/*	$NetBSD: sysvbfs_vnops.c,v 1.8 2007/01/29 01:52:44 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,14 +37,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.7 2006/12/25 18:32:16 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.8 2007/01/29 01:52:44 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/resource.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
-#include <sys/vnode.h>
 #include <sys/dirent.h>
 #include <sys/malloc.h>
 #include <sys/lockf.h>
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c
index 19767471da19..f7d32330e681 100644
--- a/sys/fs/udf/udf_vfsops.c
+++ b/sys/fs/udf/udf_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vfsops.c,v 1.21 2007/01/19 14:49:10 hannken Exp $ */
+/* $NetBSD: udf_vfsops.c,v 1.22 2007/01/29 01:52:43 hubertf Exp $ */
 
 /*
  * Copyright (c) 2006 Reinoud Zandijk
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: udf_vfsops.c,v 1.21 2007/01/19 14:49:10 hannken Exp $");
+__RCSID("$NetBSD: udf_vfsops.c,v 1.22 2007/01/29 01:52:43 hubertf Exp $");
 #endif /* not lint */
 
 
@@ -63,7 +63,6 @@ __RCSID("$NetBSD: udf_vfsops.c,v 1.21 2007/01/19 14:49:10 hannken Exp $");
 #include <sys/dirent.h>
 #include <sys/stat.h>
 #include <sys/conf.h>
-#include <sys/sysctl.h>
 #include <sys/kauth.h>
 
 #include <fs/udf/ecma167-udf.h>
diff --git a/sys/fs/union/union_subr.c b/sys/fs/union/union_subr.c
index 1defbc5bc22e..ae58b9db3787 100644
--- a/sys/fs/union/union_subr.c
+++ b/sys/fs/union/union_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: union_subr.c,v 1.22 2006/12/09 16:11:51 chs Exp $	*/
+/*	$NetBSD: union_subr.c,v 1.23 2007/01/29 01:52:43 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1994
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.22 2006/12/09 16:11:51 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.23 2007/01/29 01:52:43 hubertf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -93,10 +93,6 @@ __KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.22 2006/12/09 16:11:51 chs Exp $");
 
 #include <fs/union/union.h>
 
-#ifdef DIAGNOSTIC
-#include <sys/proc.h>
-#endif
-
 /* must be power of two, otherwise change UNION_HASH() */
 #define NHASH 32
 
diff --git a/sys/ipkdb/ipkdb_ipkdb.c b/sys/ipkdb/ipkdb_ipkdb.c
index 247a8d6bc1f7..b40cc828e555 100644
--- a/sys/ipkdb/ipkdb_ipkdb.c
+++ b/sys/ipkdb/ipkdb_ipkdb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipkdb_ipkdb.c,v 1.18 2007/01/13 18:54:43 cube Exp $	*/
+/*	$NetBSD: ipkdb_ipkdb.c,v 1.19 2007/01/29 01:52:44 hubertf Exp $	*/
 
 /*
  * Copyright (C) 1993-2000 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipkdb_ipkdb.c,v 1.18 2007/01/13 18:54:43 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipkdb_ipkdb.c,v 1.19 2007/01/29 01:52:44 hubertf Exp $");
 
 #include "opt_ipkdb.h"
 
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipkdb_ipkdb.c,v 1.18 2007/01/13 18:54:43 cube Exp $"
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/if_inarp.h>
-#include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 2f695e7efce1..dba681898ec7 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_balloc.c,v 1.43 2006/05/14 21:32:45 elad Exp $	*/
+/*	$NetBSD: ffs_balloc.c,v 1.44 2007/01/29 01:52:46 hubertf Exp $	*/
 
 /*
  * Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.43 2006/05/14 21:32:45 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.44 2007/01/29 01:52:46 hubertf Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -53,7 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.43 2006/05/14 21:32:45 elad Exp $")
 #include <sys/file.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
-#include <sys/mount.h>
 #include <sys/kauth.h>
 
 #include <ufs/ufs/quota.h>
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 712c6759d964..b7c39d5e5847 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_subr.c,v 1.43 2006/11/16 01:33:53 christos Exp $	*/
+/*	$NetBSD: ffs_subr.c,v 1.44 2007/01/29 01:52:46 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -36,7 +36,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.43 2006/11/16 01:33:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.44 2007/01/29 01:52:46 hubertf Exp $");
 
 #include <sys/param.h>
 
@@ -44,11 +44,12 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.43 2006/11/16 01:33:53 christos Exp $
 extern const int inside[], around[];
 extern const u_char * const fragtbl[];
 
-#ifndef _KERNEL
-#include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 #include <ufs/ufs/ufs_bswap.h>
+
+#ifndef _KERNEL
+#include <ufs/ufs/dinode.h>
 void    panic(const char *, ...)
     __attribute__((__noreturn__,__format__(__printf__,1,2)));
 
@@ -62,9 +63,6 @@ void    panic(const char *, ...)
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
-#include <ufs/ffs/fs.h>
-#include <ufs/ffs/ffs_extern.h>
-#include <ufs/ufs/ufs_bswap.h>
 
 /*
  * Load up the contents of an inode and copy the appropriate pieces