diff --git a/sys/uvm/uvm_amap.c b/sys/uvm/uvm_amap.c
index e8a0fd9ffe03..d03924886634 100644
--- a/sys/uvm/uvm_amap.c
+++ b/sys/uvm/uvm_amap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_amap.c,v 1.36 2001/11/06 06:31:06 simonb Exp $	*/
+/*	$NetBSD: uvm_amap.c,v 1.37 2001/11/10 07:36:59 lukem Exp $	*/
 
 /*
  *
@@ -41,6 +41,9 @@
  * uvm_amap.h for a brief explanation of the role of amaps in uvm.
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.37 2001/11/10 07:36:59 lukem Exp $");
+
 #undef UVM_AMAP_INLINE		/* enable/disable amap inlines */
 
 #include "opt_uvmhist.h"
diff --git a/sys/uvm/uvm_anon.c b/sys/uvm/uvm_anon.c
index 6c998bd28616..c59b3490186b 100644
--- a/sys/uvm/uvm_anon.c
+++ b/sys/uvm/uvm_anon.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_anon.c,v 1.20 2001/11/06 08:07:49 chs Exp $	*/
+/*	$NetBSD: uvm_anon.c,v 1.21 2001/11/10 07:36:59 lukem Exp $	*/
 
 /*
  *
@@ -36,6 +36,9 @@
  * uvm_anon.c: uvm anon ops
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_anon.c,v 1.21 2001/11/10 07:36:59 lukem Exp $");
+
 #include "opt_uvmhist.h"
 
 #include <sys/param.h>
diff --git a/sys/uvm/uvm_aobj.c b/sys/uvm/uvm_aobj.c
index a1d74811be08..f7b0092ba13c 100644
--- a/sys/uvm/uvm_aobj.c
+++ b/sys/uvm/uvm_aobj.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_aobj.c,v 1.48 2001/11/07 14:07:23 chs Exp $	*/
+/*	$NetBSD: uvm_aobj.c,v 1.49 2001/11/10 07:36:59 lukem Exp $	*/
 
 /*
  * Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -42,6 +42,9 @@
  * - design mostly from Chuck Cranor
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.49 2001/11/10 07:36:59 lukem Exp $");
+
 #include "opt_uvmhist.h"
 
 #include <sys/param.h>
diff --git a/sys/uvm/uvm_bio.c b/sys/uvm/uvm_bio.c
index 3875f787208f..0c80985e427d 100644
--- a/sys/uvm/uvm_bio.c
+++ b/sys/uvm/uvm_bio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_bio.c,v 1.20 2001/10/16 05:56:23 chs Exp $	*/
+/*	$NetBSD: uvm_bio.c,v 1.21 2001/11/10 07:36:59 lukem Exp $	*/
 
 /*
  * Copyright (c) 1998 Chuck Silvers.
@@ -29,12 +29,14 @@
  *
  */
 
-#include "opt_uvmhist.h"
-
 /*
  * uvm_bio.c: buffered i/o vnode mapping cache
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.21 2001/11/10 07:36:59 lukem Exp $");
+
+#include "opt_uvmhist.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/uvm/uvm_device.c b/sys/uvm/uvm_device.c
index a4290a76c345..49e995a5f4cb 100644
--- a/sys/uvm/uvm_device.c
+++ b/sys/uvm/uvm_device.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_device.c,v 1.38 2001/09/15 20:36:45 chs Exp $	*/
+/*	$NetBSD: uvm_device.c,v 1.39 2001/11/10 07:36:59 lukem Exp $	*/
 
 /*
  *
@@ -34,12 +34,15 @@
  * from: Id: uvm_device.c,v 1.1.2.9 1998/02/06 05:11:47 chs Exp
  */
 
-#include "opt_uvmhist.h"
-
 /*
  * uvm_device.c: the device pager.
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.39 2001/11/10 07:36:59 lukem Exp $");
+
+#include "opt_uvmhist.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c
index ac1960e3a342..7d86ed55ff7c 100644
--- a/sys/uvm/uvm_fault.c
+++ b/sys/uvm/uvm_fault.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_fault.c,v 1.70 2001/10/03 05:17:58 chs Exp $	*/
+/*	$NetBSD: uvm_fault.c,v 1.71 2001/11/10 07:36:59 lukem Exp $	*/
 
 /*
  *
@@ -34,12 +34,15 @@
  * from: Id: uvm_fault.c,v 1.1.2.23 1998/02/06 05:29:05 chs Exp
  */
 
-#include "opt_uvmhist.h"
-
 /*
  * uvm_fault.c: fault handler
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.71 2001/11/10 07:36:59 lukem Exp $");
+
+#include "opt_uvmhist.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/uvm/uvm_glue.c b/sys/uvm/uvm_glue.c
index 489482486ea1..1cb0ffa498bf 100644
--- a/sys/uvm/uvm_glue.c
+++ b/sys/uvm/uvm_glue.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_glue.c,v 1.54 2001/11/06 05:34:42 chs Exp $	*/
+/*	$NetBSD: uvm_glue.c,v 1.55 2001/11/10 07:36:59 lukem Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,6 +66,9 @@
  * rights to redistribute these changes.
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.55 2001/11/10 07:36:59 lukem Exp $");
+
 #include "opt_kgdb.h"
 #include "opt_sysv.h"
 #include "opt_uvmhist.h"
diff --git a/sys/uvm/uvm_init.c b/sys/uvm/uvm_init.c
index 9f93f982903a..c941f48fcc7b 100644
--- a/sys/uvm/uvm_init.c
+++ b/sys/uvm/uvm_init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_init.c,v 1.14 2000/06/27 17:29:23 mrg Exp $	*/
+/*	$NetBSD: uvm_init.c,v 1.15 2001/11/10 07:37:00 lukem Exp $	*/
 
 /*
  *
@@ -38,6 +38,9 @@
  * uvm_init.c: init the vm system.
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_init.c,v 1.15 2001/11/10 07:37:00 lukem Exp $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/file.h>
diff --git a/sys/uvm/uvm_io.c b/sys/uvm/uvm_io.c
index 4f687f228dce..e2e734b207cb 100644
--- a/sys/uvm/uvm_io.c
+++ b/sys/uvm/uvm_io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_io.c,v 1.16 2001/09/15 20:36:46 chs Exp $	*/
+/*	$NetBSD: uvm_io.c,v 1.17 2001/11/10 07:37:00 lukem Exp $	*/
 
 /*
  *
@@ -38,6 +38,9 @@
  * uvm_io.c: uvm i/o ops
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_io.c,v 1.17 2001/11/10 07:37:00 lukem Exp $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mman.h>
diff --git a/sys/uvm/uvm_km.c b/sys/uvm/uvm_km.c
index cee7ab9b27f7..ff28bd56a5de 100644
--- a/sys/uvm/uvm_km.c
+++ b/sys/uvm/uvm_km.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_km.c,v 1.54 2001/11/07 08:43:32 chs Exp $	*/
+/*	$NetBSD: uvm_km.c,v 1.55 2001/11/10 07:37:00 lukem Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,8 +66,6 @@
  * rights to redistribute these changes.
  */
 
-#include "opt_uvmhist.h"
-
 /*
  * uvm_km.c: handle kernel memory allocation and management
  */
@@ -135,6 +133,11 @@
  * and no need to save them after they are no longer referenced.
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.55 2001/11/10 07:37:00 lukem Exp $");
+
+#include "opt_uvmhist.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/uvm/uvm_loan.c b/sys/uvm/uvm_loan.c
index c9217b08fd2a..8b9a64b8942d 100644
--- a/sys/uvm/uvm_loan.c
+++ b/sys/uvm/uvm_loan.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_loan.c,v 1.34 2001/11/06 08:07:50 chs Exp $	*/
+/*	$NetBSD: uvm_loan.c,v 1.35 2001/11/10 07:37:00 lukem Exp $	*/
 
 /*
  *
@@ -38,6 +38,9 @@
  * uvm_loan.c: page loanout handler
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_loan.c,v 1.35 2001/11/10 07:37:00 lukem Exp $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c
index 02d2b10cd2ba..203c78c04b4b 100644
--- a/sys/uvm/uvm_map.c
+++ b/sys/uvm/uvm_map.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_map.c,v 1.113 2001/11/06 05:27:17 chs Exp $	*/
+/*	$NetBSD: uvm_map.c,v 1.114 2001/11/10 07:37:00 lukem Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,14 +66,17 @@
  * rights to redistribute these changes.
  */
 
-#include "opt_ddb.h"
-#include "opt_uvmhist.h"
-#include "opt_sysv.h"
-
 /*
  * uvm_map.c: uvm map operations
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.114 2001/11/10 07:37:00 lukem Exp $");
+
+#include "opt_ddb.h"
+#include "opt_uvmhist.h"
+#include "opt_sysv.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mman.h>
diff --git a/sys/uvm/uvm_meter.c b/sys/uvm/uvm_meter.c
index cab94cb53c0f..89f21faf1cb6 100644
--- a/sys/uvm/uvm_meter.c
+++ b/sys/uvm/uvm_meter.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_meter.c,v 1.21 2001/07/14 06:36:03 matt Exp $	*/
+/*	$NetBSD: uvm_meter.c,v 1.22 2001/11/10 07:37:00 lukem Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -40,6 +40,9 @@
  * from: Id: uvm_meter.c,v 1.1.2.1 1997/08/14 19:10:35 chuck Exp
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.22 2001/11/10 07:37:00 lukem Exp $");
+
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c
index ec7aa86da1be..039f1f98311b 100644
--- a/sys/uvm/uvm_mmap.c
+++ b/sys/uvm/uvm_mmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_mmap.c,v 1.59 2001/10/30 19:05:26 thorpej Exp $	*/
+/*	$NetBSD: uvm_mmap.c,v 1.60 2001/11/10 07:37:00 lukem Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -49,6 +49,10 @@
  * uvm_mmap.c: system call interface into VM system, plus kernel vm_mmap
  * function.
  */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.60 2001/11/10 07:37:00 lukem Exp $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/file.h>
diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c
index 783ebe4559af..eaf3045bed16 100644
--- a/sys/uvm/uvm_page.c
+++ b/sys/uvm/uvm_page.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_page.c,v 1.70 2001/11/06 08:07:51 chs Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.71 2001/11/10 07:37:00 lukem Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -70,6 +70,9 @@
  * uvm_page.c: page ops.
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.71 2001/11/10 07:37:00 lukem Exp $");
+
 #include "opt_uvmhist.h"
 
 #include <sys/param.h>
diff --git a/sys/uvm/uvm_pager.c b/sys/uvm/uvm_pager.c
index 5f34ede4de3d..92224af509ae 100644
--- a/sys/uvm/uvm_pager.c
+++ b/sys/uvm/uvm_pager.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_pager.c,v 1.53 2001/11/06 08:07:51 chs Exp $	*/
+/*	$NetBSD: uvm_pager.c,v 1.54 2001/11/10 07:37:00 lukem Exp $	*/
 
 /*
  *
@@ -34,12 +34,15 @@
  * from: Id: uvm_pager.c,v 1.1.2.23 1998/02/02 20:38:06 chuck Exp
  */
 
-#include "opt_uvmhist.h"
-
 /*
  * uvm_pager.c: generic functions used to assist the pagers.
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.54 2001/11/10 07:37:00 lukem Exp $");
+
+#include "opt_uvmhist.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/uvm/uvm_pdaemon.c b/sys/uvm/uvm_pdaemon.c
index fa01141f1566..bb47fde79f1f 100644
--- a/sys/uvm/uvm_pdaemon.c
+++ b/sys/uvm/uvm_pdaemon.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_pdaemon.c,v 1.41 2001/11/06 08:07:52 chs Exp $	*/
+/*	$NetBSD: uvm_pdaemon.c,v 1.42 2001/11/10 07:37:01 lukem Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,12 +66,15 @@
  * rights to redistribute these changes.
  */
 
-#include "opt_uvmhist.h"
-
 /*
  * uvm_pdaemon.c: the page daemon
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.42 2001/11/10 07:37:01 lukem Exp $");
+
+#include "opt_uvmhist.h"
+
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
diff --git a/sys/uvm/uvm_pglist.c b/sys/uvm/uvm_pglist.c
index 0c28e5734f1b..49e34148420f 100644
--- a/sys/uvm/uvm_pglist.c
+++ b/sys/uvm/uvm_pglist.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_pglist.c,v 1.18 2001/09/15 20:36:47 chs Exp $	*/
+/*	$NetBSD: uvm_pglist.c,v 1.19 2001/11/10 07:37:01 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -41,6 +41,9 @@
  * uvm_pglist.c: pglist functions
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.19 2001/11/10 07:37:01 lukem Exp $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/uvm/uvm_stat.c b/sys/uvm/uvm_stat.c
index f31084669b63..bc35453b2919 100644
--- a/sys/uvm/uvm_stat.c
+++ b/sys/uvm/uvm_stat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_stat.c,v 1.20 2001/09/15 20:36:47 chs Exp $	 */
+/*	$NetBSD: uvm_stat.c,v 1.21 2001/11/10 07:37:01 lukem Exp $	 */
 
 /*
  *
@@ -34,13 +34,16 @@
  * from: Id: uvm_stat.c,v 1.1.2.3 1997/12/19 15:01:00 mrg Exp
  */
 
-#include "opt_uvmhist.h"
-#include "opt_ddb.h"
-
 /*
  * uvm_stat.c
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_stat.c,v 1.21 2001/11/10 07:37:01 lukem Exp $");
+
+#include "opt_uvmhist.h"
+#include "opt_ddb.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index 7ef9211ef3cc..271c868241d6 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_swap.c,v 1.56 2001/11/06 05:44:25 chs Exp $	*/
+/*	$NetBSD: uvm_swap.c,v 1.57 2001/11/10 07:37:01 lukem Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1997 Matthew R. Green
@@ -31,6 +31,9 @@
  * from: Id: uvm_swap.c,v 1.1.2.42 1998/02/02 20:38:06 chuck Exp
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.57 2001/11/10 07:37:01 lukem Exp $");
+
 #include "fs_nfs.h"
 #include "opt_uvmhist.h"
 #include "opt_compat_netbsd.h"
diff --git a/sys/uvm/uvm_unix.c b/sys/uvm/uvm_unix.c
index a2b042b95e25..9f6c82be756f 100644
--- a/sys/uvm/uvm_unix.c
+++ b/sys/uvm/uvm_unix.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_unix.c,v 1.24 2001/06/06 21:28:51 mrg Exp $	*/
+/*	$NetBSD: uvm_unix.c,v 1.25 2001/11/10 07:37:01 lukem Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -49,6 +49,9 @@
  * uvm_unix.c: traditional sbrk/grow interface to vm.
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.25 2001/11/10 07:37:01 lukem Exp $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/uvm/uvm_user.c b/sys/uvm/uvm_user.c
index 03e044e64574..3f9dc952bad3 100644
--- a/sys/uvm/uvm_user.c
+++ b/sys/uvm/uvm_user.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_user.c,v 1.10 2001/06/02 18:09:27 chs Exp $	*/
+/*	$NetBSD: uvm_user.c,v 1.11 2001/11/10 07:37:01 lukem Exp $	*/
 
 /*
  *
@@ -38,6 +38,8 @@
  * uvm_user.c: high level uvm_allocate/uvm_deallocate interface into vm.
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_user.c,v 1.11 2001/11/10 07:37:01 lukem Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c
index fadabcbb8ede..800fcb4557cc 100644
--- a/sys/uvm/uvm_vnode.c
+++ b/sys/uvm/uvm_vnode.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_vnode.c,v 1.54 2001/09/26 07:23:51 chs Exp $	*/
+/*	$NetBSD: uvm_vnode.c,v 1.55 2001/11/10 07:37:01 lukem Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -45,14 +45,17 @@
  * from: Id: uvm_vnode.c,v 1.1.2.26 1998/02/02 20:38:07 chuck Exp
  */
 
-#include "fs_nfs.h"
-#include "opt_uvmhist.h"
-#include "opt_ddb.h"
-
 /*
  * uvm_vnode.c: the vnode pager.
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.55 2001/11/10 07:37:01 lukem Exp $");
+
+#include "fs_nfs.h"
+#include "opt_uvmhist.h"
+#include "opt_ddb.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>