Cleanup includes. Switch from <machine/XXX.h> to <sys/XXX.h> from

bus, cpu, and intr.  Remove unneeded includes.

sys/arch/vax/vsa/asc_vsbus.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: asc_vsbus.c,v 1.41 2009/11/21 04:45:39 rmind Exp $	*/
+/*	$NetBSD: asc_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,35 +31,30 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: asc_vsbus.c,v 1.41 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $");
 
 #include "locators.h"
 #include "opt_cputype.h"
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
-#include <sys/device.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
-#include <sys/reboot.h>
-#include <sys/queue.h>
 
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
 #include <dev/scsipi/scsi_message.h>
 
-#include <machine/bus.h>
-#include <machine/vmparam.h>
-
 #include <dev/ic/ncr53c9xreg.h>
 #include <dev/ic/ncr53c9xvar.h>
 
-#include <machine/cpu.h>
+#include <machine/vmparam.h>
 #include <machine/sid.h>
 #include <machine/scb.h>
 #include <machine/vsbus.h>

sys/arch/vax/vsa/dz_vsbus.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: dz_vsbus.c,v 1.41 2010/05/09 22:24:44 hans Exp $ */
+/*	$NetBSD: dz_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -31,25 +31,22 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.41 2010/05/09 22:24:44 hans Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $");
 
 #include <sys/param.h>
-#include <sys/proc.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
-#include <sys/tty.h>
-#include <sys/file.h>
 #include <sys/conf.h>
+#include <sys/cpu.h>
 #include <sys/device.h>
-#include <sys/reboot.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
 
 #include <dev/cons.h>
 
-#include <machine/mtpr.h>
 #include <machine/sid.h>
-#include <machine/uvax.h>
 #include <machine/vsbus.h>
-#include <machine/cpu.h>
 #include <machine/scb.h>
 
 #include <arch/vax/vax/gencons.h>

sys/arch/vax/vsa/hdc9224.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: hdc9224.c,v 1.50 2009/11/21 04:45:39 rmind Exp $ */
+/*	$NetBSD: hdc9224.c,v 1.51 2010/12/14 23:31:16 matt Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -51,33 +51,29 @@
 #undef	RDDEBUG
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.50 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.51 2010/12/14 23:31:16 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/file.h>
-#include <sys/stat.h> 
-#include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
-#include <sys/proc.h>
+#include <sys/cpu.h>
+#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/stat.h> 
 #include <sys/syslog.h>
-#include <sys/reboot.h>
 
 #include <uvm/uvm_extern.h>
 
 #include <ufs/ufs/dinode.h> /* For BBSIZE */
 #include <ufs/ffs/fs.h>
 
-#include <machine/pte.h>
 #include <machine/sid.h>
-#include <machine/cpu.h>
-#include <machine/uvax.h>
 #include <machine/ka410.h>
 #include <machine/vsbus.h>
 #include <machine/rpb.h>

sys/arch/vax/vsa/leds.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: leds.c,v 1.8 2008/05/04 00:10:42 jklos Exp $	*/
+/*	$NetBSD: leds.c,v 1.9 2010/12/14 23:31:16 matt Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -34,17 +34,16 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: leds.c,v 1.8 2008/05/04 00:10:42 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: leds.c,v 1.9 2010/12/14 23:31:16 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
+#include <sys/cpu.h>
 #include <sys/conf.h>
-#include <sys/buf.h>
+#include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 
-#include <machine/cpu.h>
 #include <machine/sid.h>
 #include <machine/leds.h>
 

sys/arch/vax/vsa/ncr.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr.c,v 1.47 2009/11/21 04:45:39 rmind Exp $	*/
+/*	$NetBSD: ncr.c,v 1.48 2010/12/14 23:31:16 matt Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -42,15 +42,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr.c,v 1.47 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr.c,v 1.48 2010/12/14 23:31:16 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/device.h>
-#include <sys/buf.h>
 #include <sys/proc.h>
 
 #include <dev/scsipi/scsi_all.h>
@@ -61,9 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: ncr.c,v 1.47 2009/11/21 04:45:39 rmind Exp $");
 #include <dev/ic/ncr5380reg.h>
 #include <dev/ic/ncr5380var.h>
 
-#include <machine/cpu.h>
 #include <machine/vsbus.h>
-#include <machine/bus.h>
 #include <machine/sid.h>
 #include <machine/scb.h>
 #include <machine/clock.h>

sys/arch/vax/vsa/smg.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: smg.c,v 1.53 2009/10/26 19:16:58 cegger Exp $ */
+/*	$NetBSD: smg.c,v 1.54 2010/12/14 23:31:16 matt Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -31,20 +31,20 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.53 2009/10/26 19:16:58 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.54 2010/12/14 23:31:16 matt Exp $");
 
 #include <sys/param.h>
-#include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
-#include <sys/time.h>
-#include <sys/malloc.h>
 #include <sys/conf.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/time.h>
 
 #include <machine/vsbus.h>
 #include <machine/sid.h>
-#include <machine/cpu.h>
 #include <machine/ka420.h>
 
 #include <dev/cons.h>

sys/arch/vax/vsa/spx.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: spx.c,v 1.3 2010/05/09 22:19:46 hans Exp $ */
+/*	$NetBSD: spx.c,v 1.4 2010/12/14 23:31:16 matt Exp $ */
 /*
  * SPX/LCSPX/SPXg/SPXgt accelerated framebuffer driver for NetBSD/VAX
  * Copyright (c) 2005 Blaz Antonic
@@ -32,22 +32,19 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.3 2010/05/09 22:19:46 hans Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.4 2010/12/14 23:31:16 matt Exp $");
 
 #include <sys/param.h>
-#include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
-#include <sys/time.h>
-#include <sys/malloc.h>
 #include <sys/conf.h>
-#include <sys/kernel.h>
+#include <sys/cpu.h>
-
+#include <sys/device.h>
-#include <uvm/uvm.h>
+#include <sys/malloc.h>
+#include <sys/time.h>
 
 #include <machine/vsbus.h>
 #include <machine/sid.h>
-#include <machine/cpu.h>
 #include <machine/ka420.h>
 
 #include <dev/cons.h>

sys/arch/vax/vsa/tc_vsbus.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: tc_vsbus.c,v 1.4 2008/04/28 20:23:39 martin Exp $	*/
+/*	$NetBSD: tc_vsbus.c,v 1.5 2010/12/14 23:31:17 matt Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,10 +29,10 @@
  */
 
 #include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
-#include <machine/cpu.h>
 #include <machine/pte.h>
 #include <machine/scb.h>
 #include <machine/vsbus.h>

sys/arch/vax/vsa/vsbus.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: vsbus.c,v 1.58 2009/11/21 04:45:39 rmind Exp $ */
+/*	$NetBSD: vsbus.c,v 1.59 2010/12/14 23:31:17 matt Exp $ */
 /*
  * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -33,29 +33,21 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.58 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.59 2010/12/14 23:31:17 matt Exp $");
+
+#include "opt_cputype.h"
+
+#define _VAX_BUS_DMA_PRIVATE
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
+#include <sys/bus.h>
-#include <sys/conf.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/proc.h>
 #include <sys/device.h>
-#include <sys/disklabel.h>
-#include <sys/syslog.h>
-#include <sys/stat.h>
 
 #include <uvm/uvm_extern.h>
 
-#define _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/pte.h>
 #include <machine/sid.h>
 #include <machine/scb.h>
-#include <machine/cpu.h>
-#include <machine/trap.h>
 #include <machine/nexus.h>
 
 #include <machine/uvax.h>
@@ -68,7 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.58 2009/11/21 04:45:39 rmind Exp $");
 
 #include "ioconf.h"
 #include "locators.h"
-#include "opt_cputype.h"
 
 static int	vsbus_match(device_t, cfdata_t, void *);
 static void	vsbus_attach(device_t, device_t, void *);

sys/arch/vax/vsa/vsbus_dma.c

@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus_dma.c,v 1.15 2008/04/28 20:23:39 martin Exp $ */
+/* $NetBSD: vsbus_dma.c,v 1.16 2010/12/14 23:31:17 matt Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,18 +31,18 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsbus_dma.c,v 1.15 2008/04/28 20:23:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus_dma.c,v 1.16 2010/12/14 23:31:17 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
+#include <sys/bus.h>
-#include <sys/device.h>
+#include <sys/cpu.h>
 #include <sys/malloc.h>
+
 #include <uvm/uvm_extern.h>
 
-#define _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/cpu.h>
 #include <machine/sid.h>
 #include <machine/sgmap.h>
 #include <machine/vsbus.h>