diff --git a/sys/arch/alpha/pci/a12c.c b/sys/arch/alpha/pci/a12c.c
index a4374d8d8748..ed7274dab046 100644
--- a/sys/arch/alpha/pci/a12c.c
+++ b/sys/arch/alpha/pci/a12c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: a12c.c,v 1.7 2000/06/05 21:47:20 thorpej Exp $ */
+/* $NetBSD: a12c.c,v 1.8 2000/06/29 08:58:45 mrg Exp $ */
 
 /* [Notice revision 2.2]
  * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -38,7 +38,7 @@
 #include "opt_avalon_a12.h"		/* Config options headers */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: a12c.c,v 1.7 2000/06/05 21:47:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a12c.c,v 1.8 2000/06/29 08:58:45 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: a12c.c,v 1.7 2000/06/05 21:47:20 thorpej Exp $");
 #include <sys/malloc.h>
 #include <sys/device.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/rpb.h>
@@ -144,7 +144,7 @@ a12cattach(parent, self, aux)
 	a12c_init(ccp, 1);
 
 	/* XXX print chipset information */
-	printf(": driver %s over logic %x\n", "$Revision: 1.7 $", 
+	printf(": driver %s over logic %x\n", "$Revision: 1.8 $", 
 		A12_ALL_EXTRACT(REGVAL(A12_VERS)));
 
 	pci_a12_pickintr(ccp);
diff --git a/sys/arch/alpha/pci/a12c_dma.c b/sys/arch/alpha/pci/a12c_dma.c
index 45af2ce132b1..b1d34864235a 100644
--- a/sys/arch/alpha/pci/a12c_dma.c
+++ b/sys/arch/alpha/pci/a12c_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: a12c_dma.c,v 1.2 1998/03/02 07:07:41 ross Exp $ */
+/* $NetBSD: a12c_dma.c,v 1.3 2000/06/29 08:58:45 mrg Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -51,14 +51,15 @@
 #include "opt_avalon_a12.h"		/* Config options headers */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: a12c_dma.c,v 1.2 1998/03/02 07:07:41 ross Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a12c_dma.c,v 1.3 2000/06/29 08:58:45 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #define _ALPHA_BUS_DMA_PRIVATE
 #include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/a12c_pci.c b/sys/arch/alpha/pci/a12c_pci.c
index 037d4c3fc186..f5f67887fce9 100644
--- a/sys/arch/alpha/pci/a12c_pci.c
+++ b/sys/arch/alpha/pci/a12c_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: a12c_pci.c,v 1.2 1998/03/02 07:07:41 ross Exp $ */
+/* $NetBSD: a12c_pci.c,v 1.3 2000/06/29 08:58:45 mrg Exp $ */
 
 /* [Notice revision 2.0]
  * Copyright (c) 1997 Avalon Computer Systems, Inc.
@@ -38,7 +38,7 @@
 #include "opt_avalon_a12.h"		/* Config options headers */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: a12c_pci.c,v 1.2 1998/03/02 07:07:41 ross Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a12c_pci.c,v 1.3 2000/06/29 08:58:45 mrg Exp $");
 __KERNEL_COPYRIGHT(0,
     "Copyright (c) 1997 Christopher G. Demetriou.  All rights reserved.");
 
@@ -46,7 +46,8 @@ __KERNEL_COPYRIGHT(0,
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/alpha/pci/apecs.c b/sys/arch/alpha/pci/apecs.c
index 37a0a17dd8be..ecbcaa893b08 100644
--- a/sys/arch/alpha/pci/apecs.c
+++ b/sys/arch/alpha/pci/apecs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs.c,v 1.37 2000/02/26 18:53:12 thorpej Exp $ */
+/* $NetBSD: apecs.c,v 1.38 2000/06/29 08:58:45 mrg Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -70,14 +70,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.37 2000/02/26 18:53:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.38 2000/06/29 08:58:45 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/rpb.h>
diff --git a/sys/arch/alpha/pci/apecs_bus_io.c b/sys/arch/alpha/pci/apecs_bus_io.c
index 49a3db75ec3e..0076f9944f8c 100644
--- a/sys/arch/alpha/pci/apecs_bus_io.c
+++ b/sys/arch/alpha/pci/apecs_bus_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_bus_io.c,v 1.8 1997/09/02 13:19:10 thorpej Exp $ */
+/* $NetBSD: apecs_bus_io.c,v 1.9 2000/06/29 08:58:45 mrg Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,14 +29,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: apecs_bus_io.c,v 1.8 1997/09/02 13:19:10 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: apecs_bus_io.c,v 1.9 2000/06/29 08:58:45 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/apecs_bus_mem.c b/sys/arch/alpha/pci/apecs_bus_mem.c
index 4e8b53b35640..963ef8d3f2c1 100644
--- a/sys/arch/alpha/pci/apecs_bus_mem.c
+++ b/sys/arch/alpha/pci/apecs_bus_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_bus_mem.c,v 1.8 1997/09/02 13:19:12 thorpej Exp $ */
+/* $NetBSD: apecs_bus_mem.c,v 1.9 2000/06/29 08:58:45 mrg Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,14 +29,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: apecs_bus_mem.c,v 1.8 1997/09/02 13:19:12 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: apecs_bus_mem.c,v 1.9 2000/06/29 08:58:45 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/apecs_dma.c b/sys/arch/alpha/pci/apecs_dma.c
index f468ee9fdc87..fa04557ac1e1 100644
--- a/sys/arch/alpha/pci/apecs_dma.c
+++ b/sys/arch/alpha/pci/apecs_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_dma.c,v 1.12 1998/08/14 16:50:04 thorpej Exp $ */
+/* $NetBSD: apecs_dma.c,v 1.13 2000/06/29 08:58:45 mrg Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,14 +39,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.12 1998/08/14 16:50:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.13 2000/06/29 08:58:45 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #define _ALPHA_BUS_DMA_PRIVATE
 #include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/apecs_pci.c b/sys/arch/alpha/pci/apecs_pci.c
index c749655ab924..167820d8c68e 100644
--- a/sys/arch/alpha/pci/apecs_pci.c
+++ b/sys/arch/alpha/pci/apecs_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_pci.c,v 1.17 1999/06/29 17:10:57 ross Exp $ */
+/* $NetBSD: apecs_pci.c,v 1.18 2000/06/29 08:58:45 mrg Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,13 +29,14 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: apecs_pci.c,v 1.17 1999/06/29 17:10:57 ross Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs_pci.c,v 1.18 2000/06/29 08:58:45 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c
index 8988f3400a7d..c5f3f2b72b03 100644
--- a/sys/arch/alpha/pci/cia.c
+++ b/sys/arch/alpha/pci/cia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cia.c,v 1.55 2000/04/03 01:48:07 thorpej Exp $ */
+/* $NetBSD: cia.c,v 1.56 2000/06/29 08:58:45 mrg Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -72,14 +72,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.55 2000/04/03 01:48:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.56 2000/06/29 08:58:45 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/rpb.h>
diff --git a/sys/arch/alpha/pci/cia_bwx_bus_io.c b/sys/arch/alpha/pci/cia_bwx_bus_io.c
index 0ec3439dcea7..a658e26134b4 100644
--- a/sys/arch/alpha/pci/cia_bwx_bus_io.c
+++ b/sys/arch/alpha/pci/cia_bwx_bus_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_bwx_bus_io.c,v 1.2 1999/12/02 19:43:25 thorpej Exp $ */
+/* $NetBSD: cia_bwx_bus_io.c,v 1.3 2000/06/29 08:58:46 mrg Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,14 +29,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: cia_bwx_bus_io.c,v 1.2 1999/12/02 19:43:25 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cia_bwx_bus_io.c,v 1.3 2000/06/29 08:58:46 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/cia_bwx_bus_mem.c b/sys/arch/alpha/pci/cia_bwx_bus_mem.c
index 772abf6d7aea..8c429e6b4100 100644
--- a/sys/arch/alpha/pci/cia_bwx_bus_mem.c
+++ b/sys/arch/alpha/pci/cia_bwx_bus_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_bwx_bus_mem.c,v 1.2 1999/12/02 19:43:25 thorpej Exp $ */
+/* $NetBSD: cia_bwx_bus_mem.c,v 1.3 2000/06/29 08:58:46 mrg Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,14 +29,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: cia_bwx_bus_mem.c,v 1.2 1999/12/02 19:43:25 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cia_bwx_bus_mem.c,v 1.3 2000/06/29 08:58:46 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/cia_dma.c b/sys/arch/alpha/pci/cia_dma.c
index 7f02039cbf55..f4f8783164a3 100644
--- a/sys/arch/alpha/pci/cia_dma.c
+++ b/sys/arch/alpha/pci/cia_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_dma.c,v 1.15 2000/02/06 01:26:50 thorpej Exp $ */
+/* $NetBSD: cia_dma.c,v 1.16 2000/06/29 08:58:46 mrg Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,14 +39,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.15 2000/02/06 01:26:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.16 2000/06/29 08:58:46 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #define _ALPHA_BUS_DMA_PRIVATE
 #include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/cia_pci.c b/sys/arch/alpha/pci/cia_pci.c
index 22783f60f78c..89d7c05acc6c 100644
--- a/sys/arch/alpha/pci/cia_pci.c
+++ b/sys/arch/alpha/pci/cia_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_pci.c,v 1.24 1999/06/29 17:10:57 ross Exp $ */
+/* $NetBSD: cia_pci.c,v 1.25 2000/06/29 08:58:46 mrg Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,13 +29,14 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: cia_pci.c,v 1.24 1999/06/29 17:10:57 ross Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia_pci.c,v 1.25 2000/06/29 08:58:46 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/alpha/pci/cia_swiz_bus_io.c b/sys/arch/alpha/pci/cia_swiz_bus_io.c
index d3536f1c31b3..2aa5b7ffc7f0 100644
--- a/sys/arch/alpha/pci/cia_swiz_bus_io.c
+++ b/sys/arch/alpha/pci/cia_swiz_bus_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_swiz_bus_io.c,v 1.14 1997/09/02 13:19:20 thorpej Exp $ */
+/* $NetBSD: cia_swiz_bus_io.c,v 1.15 2000/06/29 08:58:46 mrg Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,14 +29,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: cia_swiz_bus_io.c,v 1.14 1997/09/02 13:19:20 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cia_swiz_bus_io.c,v 1.15 2000/06/29 08:58:46 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/cia_swiz_bus_mem.c b/sys/arch/alpha/pci/cia_swiz_bus_mem.c
index 309b28683d26..541ecc74a85d 100644
--- a/sys/arch/alpha/pci/cia_swiz_bus_mem.c
+++ b/sys/arch/alpha/pci/cia_swiz_bus_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_swiz_bus_mem.c,v 1.15 1997/09/02 13:19:22 thorpej Exp $ */
+/* $NetBSD: cia_swiz_bus_mem.c,v 1.16 2000/06/29 08:58:46 mrg Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,14 +29,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: cia_swiz_bus_mem.c,v 1.15 1997/09/02 13:19:22 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cia_swiz_bus_mem.c,v 1.16 2000/06/29 08:58:46 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/dwlpx.c b/sys/arch/alpha/pci/dwlpx.c
index 8c0f52280d0b..ce8a9f988063 100644
--- a/sys/arch/alpha/pci/dwlpx.c
+++ b/sys/arch/alpha/pci/dwlpx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx.c,v 1.21 2000/06/05 21:47:21 thorpej Exp $ */
+/* $NetBSD: dwlpx.c,v 1.22 2000/06/29 08:58:46 mrg Exp $ */
 
 /*
  * Copyright (c) 1997 by Matthew Jacob
@@ -32,14 +32,14 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dwlpx.c,v 1.21 2000/06/05 21:47:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx.c,v 1.22 2000/06/29 08:58:46 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/alpha/pci/dwlpx_bus_io.c b/sys/arch/alpha/pci/dwlpx_bus_io.c
index 9648e9730b0c..31b74328485d 100644
--- a/sys/arch/alpha/pci/dwlpx_bus_io.c
+++ b/sys/arch/alpha/pci/dwlpx_bus_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_bus_io.c,v 1.11 1997/09/02 13:19:24 thorpej Exp $ */
+/* $NetBSD: dwlpx_bus_io.c,v 1.12 2000/06/29 08:58:46 mrg Exp $ */
 
 /*
  * Copyright (c) 1997 by Matthew Jacob
@@ -32,14 +32,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: dwlpx_bus_io.c,v 1.11 1997/09/02 13:19:24 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwlpx_bus_io.c,v 1.12 2000/06/29 08:58:46 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/dwlpx_bus_mem.c b/sys/arch/alpha/pci/dwlpx_bus_mem.c
index b06bc62f25a8..d57cc6aba1ff 100644
--- a/sys/arch/alpha/pci/dwlpx_bus_mem.c
+++ b/sys/arch/alpha/pci/dwlpx_bus_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_bus_mem.c,v 1.11 1997/09/02 13:19:25 thorpej Exp $ */
+/* $NetBSD: dwlpx_bus_mem.c,v 1.12 2000/06/29 08:58:46 mrg Exp $ */
 
 /*
  * Copyright (c) 1997 by Matthew Jacob
@@ -32,14 +32,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: dwlpx_bus_mem.c,v 1.11 1997/09/02 13:19:25 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwlpx_bus_mem.c,v 1.12 2000/06/29 08:58:46 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/dwlpx_dma.c b/sys/arch/alpha/pci/dwlpx_dma.c
index 874892b20021..58703a8c6ee5 100644
--- a/sys/arch/alpha/pci/dwlpx_dma.c
+++ b/sys/arch/alpha/pci/dwlpx_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_dma.c,v 1.13 1999/04/06 19:26:32 pk Exp $ */
+/* $NetBSD: dwlpx_dma.c,v 1.14 2000/06/29 08:58:46 mrg Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,14 +39,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.13 1999/04/06 19:26:32 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.14 2000/06/29 08:58:46 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #define _ALPHA_BUS_DMA_PRIVATE
 #include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/dwlpx_pci.c b/sys/arch/alpha/pci/dwlpx_pci.c
index 21012a29d724..7030bd422b28 100644
--- a/sys/arch/alpha/pci/dwlpx_pci.c
+++ b/sys/arch/alpha/pci/dwlpx_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_pci.c,v 1.9 1998/04/15 00:48:58 mjacob Exp $ */
+/* $NetBSD: dwlpx_pci.c,v 1.10 2000/06/29 08:58:47 mrg Exp $ */
 
 /*
  * Copyright (c) 1997 by Matthew Jacob
@@ -32,13 +32,14 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dwlpx_pci.c,v 1.9 1998/04/15 00:48:58 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx_pci.c,v 1.10 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/alpha/pci/irongate_bus_io.c b/sys/arch/alpha/pci/irongate_bus_io.c
index cdde9709dac9..060f327769ae 100644
--- a/sys/arch/alpha/pci/irongate_bus_io.c
+++ b/sys/arch/alpha/pci/irongate_bus_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate_bus_io.c,v 1.3 2000/06/26 19:46:25 thorpej Exp $ */
+/* $NetBSD: irongate_bus_io.c,v 1.4 2000/06/29 08:58:47 mrg Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -38,14 +38,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: irongate_bus_io.c,v 1.3 2000/06/26 19:46:25 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: irongate_bus_io.c,v 1.4 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/irongate_bus_mem.c b/sys/arch/alpha/pci/irongate_bus_mem.c
index 978cb4e0023f..071ba54d00e6 100644
--- a/sys/arch/alpha/pci/irongate_bus_mem.c
+++ b/sys/arch/alpha/pci/irongate_bus_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate_bus_mem.c,v 1.3 2000/06/26 19:46:25 thorpej Exp $ */
+/* $NetBSD: irongate_bus_mem.c,v 1.4 2000/06/29 08:58:47 mrg Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -38,14 +38,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: irongate_bus_mem.c,v 1.3 2000/06/26 19:46:25 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: irongate_bus_mem.c,v 1.4 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/irongate_dma.c b/sys/arch/alpha/pci/irongate_dma.c
index 767d8cb5d556..bb8f2e18199f 100644
--- a/sys/arch/alpha/pci/irongate_dma.c
+++ b/sys/arch/alpha/pci/irongate_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate_dma.c,v 1.2 2000/06/11 22:47:00 thorpej Exp $ */
+/* $NetBSD: irongate_dma.c,v 1.3 2000/06/29 08:58:47 mrg Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -51,14 +51,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: irongate_dma.c,v 1.2 2000/06/11 22:47:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irongate_dma.c,v 1.3 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #define _ALPHA_BUS_DMA_PRIVATE
 #include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/irongate_pci.c b/sys/arch/alpha/pci/irongate_pci.c
index 9a7800d1156d..6fbd7c834def 100644
--- a/sys/arch/alpha/pci/irongate_pci.c
+++ b/sys/arch/alpha/pci/irongate_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate_pci.c,v 1.1 2000/06/01 20:30:30 thorpej Exp $ */
+/* $NetBSD: irongate_pci.c,v 1.2 2000/06/29 08:58:47 mrg Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,13 +43,14 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: irongate_pci.c,v 1.1 2000/06/01 20:30:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irongate_pci.c,v 1.2 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c
index e0b3e8fd34ff..4d07c8241b5f 100644
--- a/sys/arch/alpha/pci/lca.c
+++ b/sys/arch/alpha/pci/lca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lca.c,v 1.35 2000/02/26 18:53:12 thorpej Exp $ */
+/* $NetBSD: lca.c,v 1.36 2000/06/29 08:58:47 mrg Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -69,14 +69,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.35 2000/02/26 18:53:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.36 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/rpb.h>
diff --git a/sys/arch/alpha/pci/lca_bus_io.c b/sys/arch/alpha/pci/lca_bus_io.c
index dff53a2cbc1f..85bec7231af1 100644
--- a/sys/arch/alpha/pci/lca_bus_io.c
+++ b/sys/arch/alpha/pci/lca_bus_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_bus_io.c,v 1.8 1997/09/02 13:19:31 thorpej Exp $ */
+/* $NetBSD: lca_bus_io.c,v 1.9 2000/06/29 08:58:47 mrg Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,14 +29,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: lca_bus_io.c,v 1.8 1997/09/02 13:19:31 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: lca_bus_io.c,v 1.9 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/lca_bus_mem.c b/sys/arch/alpha/pci/lca_bus_mem.c
index a390e727d63d..3430ff5de885 100644
--- a/sys/arch/alpha/pci/lca_bus_mem.c
+++ b/sys/arch/alpha/pci/lca_bus_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_bus_mem.c,v 1.8 1997/09/02 13:19:32 thorpej Exp $ */
+/* $NetBSD: lca_bus_mem.c,v 1.9 2000/06/29 08:58:47 mrg Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -29,14 +29,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: lca_bus_mem.c,v 1.8 1997/09/02 13:19:32 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: lca_bus_mem.c,v 1.9 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/lca_dma.c b/sys/arch/alpha/pci/lca_dma.c
index b988deb289dd..a20d0da01b07 100644
--- a/sys/arch/alpha/pci/lca_dma.c
+++ b/sys/arch/alpha/pci/lca_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_dma.c,v 1.12 1998/08/14 16:50:04 thorpej Exp $ */
+/* $NetBSD: lca_dma.c,v 1.13 2000/06/29 08:58:47 mrg Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,14 +39,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.12 1998/08/14 16:50:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.13 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #define _ALPHA_BUS_DMA_PRIVATE
 #include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/lca_pci.c b/sys/arch/alpha/pci/lca_pci.c
index 4c4bbcde22d2..5ba821081d90 100644
--- a/sys/arch/alpha/pci/lca_pci.c
+++ b/sys/arch/alpha/pci/lca_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_pci.c,v 1.13 1997/09/02 13:19:35 thorpej Exp $ */
+/* $NetBSD: lca_pci.c,v 1.14 2000/06/29 08:58:47 mrg Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,13 +29,14 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lca_pci.c,v 1.13 1997/09/02 13:19:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca_pci.c,v 1.14 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/alpha/pci/mcpcia_bus_io.c b/sys/arch/alpha/pci/mcpcia_bus_io.c
index f2f76b36c0fd..600695448ba0 100644
--- a/sys/arch/alpha/pci/mcpcia_bus_io.c
+++ b/sys/arch/alpha/pci/mcpcia_bus_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_bus_io.c,v 1.2 1999/04/15 22:31:16 thorpej Exp $ */
+/* $NetBSD: mcpcia_bus_io.c,v 1.3 2000/06/29 08:58:47 mrg Exp $ */
 
 /*
  * Copyright (c) 1998 by Matthew Jacob
@@ -32,14 +32,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: mcpcia_bus_io.c,v 1.2 1999/04/15 22:31:16 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: mcpcia_bus_io.c,v 1.3 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/mcpcia_bus_mem.c b/sys/arch/alpha/pci/mcpcia_bus_mem.c
index 32fe12c45cd3..00fc5b0f67e2 100644
--- a/sys/arch/alpha/pci/mcpcia_bus_mem.c
+++ b/sys/arch/alpha/pci/mcpcia_bus_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_bus_mem.c,v 1.2 1999/04/15 22:31:16 thorpej Exp $ */
+/* $NetBSD: mcpcia_bus_mem.c,v 1.3 2000/06/29 08:58:47 mrg Exp $ */
 
 /*
  * Copyright (c) 1998 by Matthew Jacob
@@ -32,14 +32,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: mcpcia_bus_mem.c,v 1.2 1999/04/15 22:31:16 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: mcpcia_bus_mem.c,v 1.3 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/mcpcia_dma.c b/sys/arch/alpha/pci/mcpcia_dma.c
index 522adcec849b..ca415b6fd734 100644
--- a/sys/arch/alpha/pci/mcpcia_dma.c
+++ b/sys/arch/alpha/pci/mcpcia_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_dma.c,v 1.12 1999/04/15 23:47:52 thorpej Exp $ */
+/* $NetBSD: mcpcia_dma.c,v 1.13 2000/06/29 08:58:47 mrg Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -39,14 +39,15 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.12 1999/04/15 23:47:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.13 2000/06/29 08:58:47 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #define _ALPHA_BUS_DMA_PRIVATE
 #include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/mcpcia_pci.c b/sys/arch/alpha/pci/mcpcia_pci.c
index 423150b3177e..b356d12b0052 100644
--- a/sys/arch/alpha/pci/mcpcia_pci.c
+++ b/sys/arch/alpha/pci/mcpcia_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_pci.c,v 1.3 1998/05/05 22:01:54 mjacob Exp $ */
+/* $NetBSD: mcpcia_pci.c,v 1.4 2000/06/29 08:58:48 mrg Exp $ */
 
 /*
  * Copyright (c) 1998 by Matthew Jacob
@@ -32,13 +32,14 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mcpcia_pci.c,v 1.3 1998/05/05 22:01:54 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia_pci.c,v 1.4 2000/06/29 08:58:48 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/arch/alpha/pci/pci_1000.c b/sys/arch/alpha/pci/pci_1000.c
index c83047dc75f3..ef795c5db565 100644
--- a/sys/arch/alpha/pci/pci_1000.c
+++ b/sys/arch/alpha/pci/pci_1000.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_1000.c,v 1.9 2000/06/05 21:47:21 thorpej Exp $ */
+/* $NetBSD: pci_1000.c,v 1.10 2000/06/29 08:58:48 mrg Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.9 2000/06/05 21:47:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.10 2000/06/29 08:58:48 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.9 2000/06/05 21:47:21 thorpej Exp $")
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/alpha/pci/pci_1000a.c b/sys/arch/alpha/pci/pci_1000a.c
index 0720e0982f87..f1dd8f72db80 100644
--- a/sys/arch/alpha/pci/pci_1000a.c
+++ b/sys/arch/alpha/pci/pci_1000a.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_1000a.c,v 1.11 2000/06/05 21:47:22 thorpej Exp $ */
+/* $NetBSD: pci_1000a.c,v 1.12 2000/06/29 08:58:48 mrg Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_1000a.c,v 1.11 2000/06/05 21:47:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_1000a.c,v 1.12 2000/06/29 08:58:48 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_1000a.c,v 1.11 2000/06/05 21:47:22 thorpej Exp $
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index 4ea0ef6c7e88..ce98f68c4823 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_2100_a50.c,v 1.27 2000/06/05 21:47:22 thorpej Exp $ */
+/* $NetBSD: pci_2100_a50.c,v 1.28 2000/06/29 08:58:48 mrg Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.27 2000/06/05 21:47:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.28 2000/06/29 08:58:48 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -37,7 +37,8 @@ __KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.27 2000/06/05 21:47:22 thorpej Ex
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c
index 237f4eaa5b0b..aff201408c00 100644
--- a/sys/arch/alpha/pci/pci_550.c
+++ b/sys/arch/alpha/pci/pci_550.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_550.c,v 1.17 2000/06/06 00:50:15 thorpej Exp $ */
+/* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.17 2000/06/06 00:50:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.17 2000/06/06 00:50:15 thorpej Exp $")
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/rpb.h>
diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c
index cf98a08e96d7..efb5bf891ee9 100644
--- a/sys/arch/alpha/pci/pci_6600.c
+++ b/sys/arch/alpha/pci/pci_6600.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */
+/* $NetBSD: pci_6600.c,v 1.6 2000/06/29 08:58:48 mrg Exp $ */
 
 /*-
  * Copyright (c) 1999 by Ross Harvey.  All rights reserved.
@@ -33,14 +33,15 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.6 2000/06/29 08:58:48 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #define _ALPHA_BUS_DMA_PRIVATE
diff --git a/sys/arch/alpha/pci/pci_a12.c b/sys/arch/alpha/pci/pci_a12.c
index af6bb108466b..7354cfc38901 100644
--- a/sys/arch/alpha/pci/pci_a12.c
+++ b/sys/arch/alpha/pci/pci_a12.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_a12.c,v 1.6 2000/06/05 21:47:23 thorpej Exp $ */
+/* $NetBSD: pci_a12.c,v 1.7 2000/06/29 08:58:48 mrg Exp $ */
 
 /* [Notice revision 2.0]
  * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -38,7 +38,7 @@
 #include "opt_avalon_a12.h"		/* Config options headers */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_a12.c,v 1.6 2000/06/05 21:47:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_a12.c,v 1.7 2000/06/29 08:58:48 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_a12.c,v 1.6 2000/06/05 21:47:23 thorpej Exp $");
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/alpha/pci/pci_alphabook1.c b/sys/arch/alpha/pci/pci_alphabook1.c
index 6cba8a31b8f4..b8d1580ea8ae 100644
--- a/sys/arch/alpha/pci/pci_alphabook1.c
+++ b/sys/arch/alpha/pci/pci_alphabook1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_alphabook1.c,v 1.4 2000/06/05 21:47:23 thorpej Exp $ */
+/* $NetBSD: pci_alphabook1.c,v 1.5 2000/06/29 08:58:48 mrg Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_alphabook1.c,v 1.4 2000/06/05 21:47:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_alphabook1.c,v 1.5 2000/06/29 08:58:48 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -74,7 +74,8 @@ __KERNEL_RCSID(0, "$NetBSD: pci_alphabook1.c,v 1.4 2000/06/05 21:47:23 thorpej E
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index f3c7d3fb9ecc..59939b3ac608 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_axppci_33.c,v 1.24 2000/06/05 21:47:24 thorpej Exp $ */
+/* $NetBSD: pci_axppci_33.c,v 1.25 2000/06/29 08:58:48 mrg Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.24 2000/06/05 21:47:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.25 2000/06/29 08:58:48 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -37,7 +37,8 @@ __KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.24 2000/06/05 21:47:24 thorpej E
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index d7092b723471..3106ddd33d5f 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */
+/* $NetBSD: pci_eb164.c,v 1.28 2000/06/29 08:58:48 mrg Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.28 2000/06/29 08:58:48 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/rpb.h>
diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c
index f6e9d6ae4ee4..5e9b45686635 100644
--- a/sys/arch/alpha/pci/pci_eb64plus.c
+++ b/sys/arch/alpha/pci/pci_eb64plus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb64plus.c,v 1.7 2000/06/05 21:47:25 thorpej Exp $ */
+/* $NetBSD: pci_eb64plus.c,v 1.8 2000/06/29 08:58:49 mrg Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_eb64plus.c,v 1.7 2000/06/05 21:47:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_eb64plus.c,v 1.8 2000/06/29 08:58:49 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_eb64plus.c,v 1.7 2000/06/05 21:47:25 thorpej Exp
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/alpha/pci/pci_eb66.c b/sys/arch/alpha/pci/pci_eb66.c
index 59a1cfe69a84..bbf067f4313c 100644
--- a/sys/arch/alpha/pci/pci_eb66.c
+++ b/sys/arch/alpha/pci/pci_eb66.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb66.c,v 1.7 2000/06/05 21:47:26 thorpej Exp $ */
+/* $NetBSD: pci_eb66.c,v 1.8 2000/06/29 08:58:49 mrg Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_eb66.c,v 1.7 2000/06/05 21:47:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_eb66.c,v 1.8 2000/06/29 08:58:49 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_eb66.c,v 1.7 2000/06/05 21:47:26 thorpej Exp $")
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index 947617d529ed..6f3308d45509 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn20aa.c,v 1.39 2000/06/05 21:47:26 thorpej Exp $ */
+/* $NetBSD: pci_kn20aa.c,v 1.40 2000/06/29 08:58:49 mrg Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.39 2000/06/05 21:47:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.40 2000/06/29 08:58:49 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.39 2000/06/05 21:47:26 thorpej Exp
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/alpha/pci/pci_kn300.c b/sys/arch/alpha/pci/pci_kn300.c
index f6fdc12dfcf0..7a5730b9389a 100644
--- a/sys/arch/alpha/pci/pci_kn300.c
+++ b/sys/arch/alpha/pci/pci_kn300.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn300.c,v 1.20 2000/06/05 21:47:27 thorpej Exp $ */
+/* $NetBSD: pci_kn300.c,v 1.21 2000/06/29 08:58:49 mrg Exp $ */
 
 /*
  * Copyright (c) 1998 by Matthew Jacob
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_kn300.c,v 1.20 2000/06/05 21:47:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_kn300.c,v 1.21 2000/06/29 08:58:49 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_kn300.c,v 1.20 2000/06/05 21:47:27 thorpej Exp $
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/alpha/pci/pci_kn8ae.c b/sys/arch/alpha/pci/pci_kn8ae.c
index dea18982d793..d537947cc5b2 100644
--- a/sys/arch/alpha/pci/pci_kn8ae.c
+++ b/sys/arch/alpha/pci/pci_kn8ae.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn8ae.c,v 1.16 2000/06/05 21:47:28 thorpej Exp $ */
+/* $NetBSD: pci_kn8ae.c,v 1.17 2000/06/29 08:58:49 mrg Exp $ */
 
 /*
  * Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_kn8ae.c,v 1.16 2000/06/05 21:47:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_kn8ae.c,v 1.17 2000/06/29 08:58:49 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_kn8ae.c,v 1.16 2000/06/05 21:47:28 thorpej Exp $
 #include <sys/device.h>
 #include <sys/syslog.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/alpha/pci/pci_machdep.c b/sys/arch/alpha/pci/pci_machdep.c
index 34379674822b..3c4d39ad0832 100644
--- a/sys/arch/alpha/pci/pci_machdep.c
+++ b/sys/arch/alpha/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.13 1998/05/28 16:59:32 drochner Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.14 2000/06/29 08:58:49 mrg Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.13 1998/05/28 16:59:32 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.14 2000/06/29 08:58:49 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -41,7 +41,8 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.13 1998/05/28 16:59:32 drochner Ex
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <dev/isa/isavar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/alpha/pci/pci_sgmap_pte32.c b/sys/arch/alpha/pci/pci_sgmap_pte32.c
index 569b67b310e3..ec2da97e8673 100644
--- a/sys/arch/alpha/pci/pci_sgmap_pte32.c
+++ b/sys/arch/alpha/pci/pci_sgmap_pte32.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_sgmap_pte32.c,v 1.3 1997/09/02 13:19:49 thorpej Exp $ */
+/* $NetBSD: pci_sgmap_pte32.c,v 1.4 2000/06/29 08:58:49 mrg Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte32.c,v 1.3 1997/09/02 13:19:49 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte32.c,v 1.4 2000/06/29 08:58:49 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte32.c,v 1.3 1997/09/02 13:19:49 thorpej
 #include <sys/malloc.h>
 #include <sys/proc.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/pci_sgmap_pte64.c b/sys/arch/alpha/pci/pci_sgmap_pte64.c
index 06c6a97aecee..b6aa2f63153f 100644
--- a/sys/arch/alpha/pci/pci_sgmap_pte64.c
+++ b/sys/arch/alpha/pci/pci_sgmap_pte64.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_sgmap_pte64.c,v 1.3 1997/09/02 13:19:50 thorpej Exp $ */
+/* $NetBSD: pci_sgmap_pte64.c,v 1.4 2000/06/29 08:58:49 mrg Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte64.c,v 1.3 1997/09/02 13:19:50 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte64.c,v 1.4 2000/06/29 08:58:49 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pte64.c,v 1.3 1997/09/02 13:19:50 thorpej
 #include <sys/malloc.h>
 #include <sys/proc.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/alpha/pci/pci_up1000.c b/sys/arch/alpha/pci/pci_up1000.c
index 6347e54d2d51..1857fdbdad6f 100644
--- a/sys/arch/alpha/pci/pci_up1000.c
+++ b/sys/arch/alpha/pci/pci_up1000.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_up1000.c,v 1.4 2000/06/06 00:50:15 thorpej Exp $ */
+/* $NetBSD: pci_up1000.c,v 1.5 2000/06/29 08:58:49 mrg Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_up1000.c,v 1.4 2000/06/06 00:50:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_up1000.c,v 1.5 2000/06/29 08:58:49 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -46,7 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: pci_up1000.c,v 1.4 2000/06/06 00:50:15 thorpej Exp $
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
diff --git a/sys/arch/alpha/pci/tsp_bus_io.c b/sys/arch/alpha/pci/tsp_bus_io.c
index 8ca351752f9d..0a12177fbe87 100644
--- a/sys/arch/alpha/pci/tsp_bus_io.c
+++ b/sys/arch/alpha/pci/tsp_bus_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_bus_io.c,v 1.4 2000/06/26 19:46:24 thorpej Exp $ */
+/* $NetBSD: tsp_bus_io.c,v 1.5 2000/06/29 08:58:50 mrg Exp $ */
 
 /*-
  * Copyright (c) 1999 by Ross Harvey.  All rights reserved.
@@ -33,14 +33,15 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: tsp_bus_io.c,v 1.4 2000/06/26 19:46:24 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: tsp_bus_io.c,v 1.5 2000/06/29 08:58:50 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
diff --git a/sys/arch/alpha/pci/tsp_bus_mem.c b/sys/arch/alpha/pci/tsp_bus_mem.c
index 219f8ff25d4f..a7ec002e2350 100644
--- a/sys/arch/alpha/pci/tsp_bus_mem.c
+++ b/sys/arch/alpha/pci/tsp_bus_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_bus_mem.c,v 1.4 2000/06/26 19:46:25 thorpej Exp $ */
+/* $NetBSD: tsp_bus_mem.c,v 1.5 2000/06/29 08:58:50 mrg Exp $ */
 
 /*-
  * Copyright (c) 1999 by Ross Harvey.  All rights reserved.
@@ -36,7 +36,8 @@
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
diff --git a/sys/arch/alpha/pci/tsp_dma.c b/sys/arch/alpha/pci/tsp_dma.c
index 544d989fa70f..7946f64c4a66 100644
--- a/sys/arch/alpha/pci/tsp_dma.c
+++ b/sys/arch/alpha/pci/tsp_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_dma.c,v 1.1 1999/06/29 06:46:47 ross Exp $ */
+/* $NetBSD: tsp_dma.c,v 1.2 2000/06/29 08:58:50 mrg Exp $ */
 
 /*-
  * Copyright (c) 1999 by Ross Harvey.  All rights reserved.
@@ -73,7 +73,8 @@
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #define _ALPHA_BUS_DMA_PRIVATE
diff --git a/sys/arch/alpha/pci/tsp_pci.c b/sys/arch/alpha/pci/tsp_pci.c
index 60a03975b1af..df9608d1d9cb 100644
--- a/sys/arch/alpha/pci/tsp_pci.c
+++ b/sys/arch/alpha/pci/tsp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_pci.c,v 1.1 1999/06/29 06:46:47 ross Exp $ */
+/* $NetBSD: tsp_pci.c,v 1.2 2000/06/29 08:58:50 mrg Exp $ */
 
 /*-
  * Copyright (c) 1999 by Ross Harvey.  All rights reserved.
@@ -39,7 +39,9 @@ __KERNEL_RCSID(0, "$NetBSD");
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
-#include <vm/vm.h>
+
+#include <uvm/uvm_extern.h>
+
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>