diff --git a/sys/Makefile b/sys/Makefile
index 0e0ac3a82a6..d9ccd53097e 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 SUBDIR=	libkern
 
diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h
index 4af0b97a8ab..3b2fdf91149 100644
--- a/sys/amd64/include/asmacros.h
+++ b/sys/amd64/include/asmacros.h
@@ -1,3 +1,38 @@
+/*-
+ * Copyright (c) 1993 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
 #define ALIGN_DATA	.align	2	/* 4 byte alignment, zero filled */
 #define ALIGN_TEXT	.align	2,0x90	/* 4-byte alignment, nop filled */
 #define SUPERALIGN_TEXT	.align	4,0x90	/* 16-byte alignment (better for 486), nop filled */
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index df871cbc0b6..02f044f7439 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -1,8 +1,41 @@
+/*-
+ * Copyright (c) 1993 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
 /*
  * Functions to provide access to special i386 instructions.
  * XXX - bezillions more are defined in locore.s but are not declared anywhere.
- *
- *	$Id: cpufunc.h,v 1.9 1994/01/31 23:48:23 davidg Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/amd64/include/exec.h b/sys/amd64/include/exec.h
index f63ec49cc8c..2e8b31616f7 100644
--- a/sys/amd64/include/exec.h
+++ b/sys/amd64/include/exec.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 #ifndef	_EXEC_H_
diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h
index f30efff8264..62dd697b451 100644
--- a/sys/amd64/include/profile.h
+++ b/sys/amd64/include/profile.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 #define	_MCOUNT_DECL static inline void _mcount
diff --git a/sys/amd64/include/ptrace.h b/sys/amd64/include/ptrace.h
index bfcc55f7aab..0892b83e260 100644
--- a/sys/amd64/include/ptrace.h
+++ b/sys/amd64/include/ptrace.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 /*
diff --git a/sys/amd64/include/reloc.h b/sys/amd64/include/reloc.h
index 386241d908a..28b10c19820 100644
--- a/sys/amd64/include/reloc.h
+++ b/sys/amd64/include/reloc.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /* Relocation format. */
diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index 16cbef22265..e688d8d6d34 100644
--- a/sys/amd64/include/signal.h
+++ b/sys/amd64/include/signal.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 /*
diff --git a/sys/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h
index 2649ba5fe21..746cef1011f 100644
--- a/sys/amd64/include/sysarch.h
+++ b/sys/amd64/include/sysarch.h
@@ -1,7 +1,40 @@
+/*-
+ * Copyright (c) 1993 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
 /*
  * Architecture specific syscalls (i386)
- *
- *	$Id: sysarch.h,v 1.2 1993/10/16 14:39:35 rgrimes Exp $
  */
 #ifndef _MACHINE_SYSARCH_H_
 #define _MACHINE_SYSARCH_H_ 1
diff --git a/sys/amd64/include/varargs.h b/sys/amd64/include/varargs.h
index 1a913ec5947..fa6c9a7a954 100644
--- a/sys/amd64/include/varargs.h
+++ b/sys/amd64/include/varargs.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
+ * $Id$
  */
 
 #ifndef _VARARGS_H_
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 03fdc253b61..6ee1edaa397 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,6 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
+# $Id$
 
 if [ ! -r version ]
 then
diff --git a/sys/conf/nfsswapvmunix.c b/sys/conf/nfsswapvmunix.c
index f9812eb3314..7ca9a1da2df 100644
--- a/sys/conf/nfsswapvmunix.c
+++ b/sys/conf/nfsswapvmunix.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsswapvmunix.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/conf/param.c b/sys/conf/param.c
index c871594221d..2fdecf06708 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.2 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh
index 90714d76974..4cda02af41d 100644
--- a/sys/conf/systags.sh
+++ b/sys/conf/systags.sh
@@ -38,7 +38,7 @@
 #
 # First written May 16, 1992 by Van Jacobson, Lawrence Berkeley Laboratory.
 #
-# from: $Header: systags.sh,v 1.7 92/07/12 08:18:21 torek Exp $
+# $Id$
 
 rm -f tags tags.tmp tags.cfiles tags.sfiles tags.hfiles
 MACHINE=`machine`
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 26e3ebdfb39..572cc1f00f9 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -13,10 +13,7 @@
  *   the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
  *   and a variety of similar clones.
  *
- */
-
-/*
- * $Id: if_ed.c,v 1.36 1994/04/10 20:06:26 davidg Exp $
+ * $Id: if_ed.c,v 1.38 1994/05/25 08:59:02 rgrimes Exp $
  */
 
 #include "ed.h"
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index f75e261ef66..f691a6e3f20 100644
--- a/sys/dev/ed/if_edreg.h
+++ b/sys/dev/ed/if_edreg.h
@@ -1,7 +1,16 @@
+/*
+ * Copyright (C) 1993, David Greenman. This software may be used, modified,
+ *   copied, distributed, and sold, in both source and binary form provided
+ *   that the above copyright and these terms are retained. Under no
+ *   circumstances is the author responsible for the proper functioning
+ *   of this software, nor does the author assume any responsibility
+ *   for damages incurred with its use.
+ *
+ * $Id: if_edreg.h,v 1.14 1994/04/10 20:06:28 davidg Exp $
+ */
 /*
  * National Semiconductor DS8390 NIC register definitions 
  *
- * $Id: if_edreg.h,v 1.13 1994/02/02 14:05:58 davidg Exp $
  *
  * Modification history
  *
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 466e93635ea..3653610371b 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -10,6 +10,8 @@
  * University of Guelph makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
+ *
+ * $Id$
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h
index 87af5bcc587..7e3df422418 100644
--- a/sys/dev/ppbus/lptio.h
+++ b/sys/dev/ppbus/lptio.h
@@ -11,6 +11,7 @@
  *
  *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
  *
+ * $Id$
  */
 
 #ifndef _LPT_PRINTER_H_
diff --git a/sys/dev/speaker/speaker.h b/sys/dev/speaker/speaker.h
index af80a282e28..f097e4807cf 100644
--- a/sys/dev/speaker/speaker.h
+++ b/sys/dev/speaker/speaker.h
@@ -3,6 +3,8 @@
  *
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  *      modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
+ *
+ * $Id$
  */
 
 #ifndef _SPEAKER_H_
diff --git a/sys/fs/cd9660/cd9660_bmap.c b/sys/fs/cd9660/cd9660_bmap.c
index 911eedfd06a..32439ce96ab 100644
--- a/sys/fs/cd9660/cd9660_bmap.c
+++ b/sys/fs/cd9660/cd9660_bmap.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_bmap.c	8.3 (Berkeley) 1/23/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index 36daffd6b2a..6540c44949c 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -38,6 +38,7 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index f9641ffded7..43b1ffe4a82 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 45de67f1a6b..bc4ec4b497a 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.2 (Berkeley) 1/23/94
+ * $Id$
  */
 
 /*
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index 0923fa01477..6d73374c708 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.c	8.2 (Berkeley) 1/23/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_rrip.h b/sys/fs/cd9660/cd9660_rrip.h
index b4017281f06..8a140febb39 100644
--- a/sys/fs/cd9660/cd9660_rrip.h
+++ b/sys/fs/cd9660/cd9660_rrip.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.h	8.1 (Berkeley) 1/21/94
+ * $Id$
  */
 
 typedef struct {
diff --git a/sys/fs/cd9660/cd9660_util.c b/sys/fs/cd9660/cd9660_util.c
index 39c5fe491a4..52a80d75ce4 100644
--- a/sys/fs/cd9660/cd9660_util.c
+++ b/sys/fs/cd9660/cd9660_util.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_util.c	8.1 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index bc48367a38c..a4aeaaf5784 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.3 (Berkeley) 1/31/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 7a2964bf22d..691a6ec59b5 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.3 (Berkeley) 1/23/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index e3567066e1c..a329afa3f9e 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.2 (Berkeley) 1/23/94
+ * $Id$
  */
 
 #define ISODCL(from, to) (to - from + 1)
diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h
index 78e4a775201..031aaa37358 100644
--- a/sys/fs/cd9660/iso_rrip.h
+++ b/sys/fs/cd9660/iso_rrip.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_rrip.h	8.2 (Berkeley) 1/23/94
+ * $Id$
  */
 
 
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index cac8775810c..947b885faab 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index e89186d8b89..c57ba91393a 100644
--- a/sys/fs/fifofs/fifo.h
+++ b/sys/fs/fifofs/fifo.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.2 (Berkeley) 2/2/94
+ * $Id$
  */
 
 #ifdef FIFO
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index a1ba3f4abf9..b09c77b286e 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 115ff6f4643..0fed55342f6 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -35,11 +35,7 @@
  *
  *	@(#)null_vnops.c	8.1 (Berkeley) 6/10/93
  *
- * Ancestors:
- *	@(#)lofs_vnops.c	1.2 (Berkeley) 6/18/92
- *	$Id: lofs_vnops.c,v 1.11 1992/05/30 10:05:43 jsp Exp jsp $
- *	...and...
- *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
+ * $Id$
  */
 
 /*
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index f7b8fa3ef0e..7a1bbb81214 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs.h	8.6 (Berkeley) 2/3/94
  *
- * From:
- *	$Id: procfs.h,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs.h,v 1.1.1.1 1994/05/24 10:05:07 rgrimes Exp $
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index a42a03ce91c..44ee3fd4bb1 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_ctl.c	8.3 (Berkeley) 1/21/94
  *
- * From:
- *	$Id: procfs_ctl.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_ctl.c,v 1.1.1.1 1994/05/24 10:05:10 rgrimes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index 6d850a6a881..331a671279e 100644
--- a/sys/fs/procfs/procfs_fpregs.c
+++ b/sys/fs/procfs/procfs_fpregs.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_fpregs.c	8.1 (Berkeley) 1/27/94
  *
- * From:
- *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_fpregs.c,v 1.1.1.1 1994/05/24 10:05:09 rgrimes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index 039983da09c..f297df0bfeb 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -37,8 +37,7 @@
  *
  *	@(#)procfs_mem.c	8.4 (Berkeley) 1/21/94
  *
- * From:
- *	$Id: procfs_mem.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_mem.c,v 1.1.1.1 1994/05/24 10:05:09 rgrimes Exp $
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_note.c b/sys/fs/procfs/procfs_note.c
index bf2f160baa0..a7699f29e12 100644
--- a/sys/fs/procfs/procfs_note.c
+++ b/sys/fs/procfs/procfs_note.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_note.c	8.2 (Berkeley) 1/21/94
  *
- * From:
- *	$Id: procfs_note.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_note.c,v 1.1.1.1 1994/05/24 10:05:09 rgrimes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_regs.c b/sys/fs/procfs/procfs_regs.c
index fa95fef8f10..8b0600a480d 100644
--- a/sys/fs/procfs/procfs_regs.c
+++ b/sys/fs/procfs/procfs_regs.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_regs.c	8.3 (Berkeley) 1/27/94
  *
- * From:
- *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_regs.c,v 1.1.1.1 1994/05/24 10:05:08 rgrimes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index d88aaabdfb0..1792dfde006 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- * From:
- *	$Id: procfs_status.c,v 3.1 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_status.c,v 1.1.1.1 1994/05/24 10:05:08 rgrimes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_subr.c b/sys/fs/procfs/procfs_subr.c
index b371af19af0..b5ab705dd26 100644
--- a/sys/fs/procfs/procfs_subr.c
+++ b/sys/fs/procfs/procfs_subr.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_subr.c	8.4 (Berkeley) 1/27/94
  *
- * From:
- *	$Id: procfs_subr.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_subr.c,v 1.1.1.1 1994/05/24 10:05:08 rgrimes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c
index 67dc31f78b3..b5c9c7d9226 100644
--- a/sys/fs/procfs/procfs_vfsops.c
+++ b/sys/fs/procfs/procfs_vfsops.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- * From:
- *	$Id: procfs_vfsops.c,v 3.1 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_vfsops.c,v 1.2 1994/05/25 09:08:33 rgrimes Exp $
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index b6c6e6fa572..e06d1316e98 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.6 (Berkeley) 2/7/94
  *
- * From:
- *	$Id: procfs_vnops.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_vnops.c,v 1.2 1994/05/25 09:08:39 rgrimes Exp $
  */
 
 /*
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 55b5dd8d433..08907a2c272 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.6 (Berkeley) 4/9/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index 9f4d1e7ace5..5903d30e3fa 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.3 (Berkeley) 1/21/94
  *
- * @(#)null_vnops.c       1.5 (Berkeley) 7/10/92
+ * $Id$
  */
 
 #define MAPFILEENTRIES 64
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index 2480a85e440..67adb98ea9b 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.3 (Berkeley) 1/21/94
  *
- * @(#)null_vfsops.c       1.5 (Berkeley) 7/10/92
+ * $Id$
  */
 
 /*
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index 0c1955f1ed3..cda81532453 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.3 (Berkeley) 1/5/94
+ * $Id$
  */
 
 /*
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index 463218ac3ed..b66e17caa82 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.2 (Berkeley) 2/17/94
+ * $Id$
  */
 
 struct union_args {
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index ea4f804a24d..b73b63846c5 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.4 (Berkeley) 2/17/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 42931d7c7bc..0dbcc0152c2 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.7 (Berkeley) 3/5/94
+ * $Id$
  */
 
 /*
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 30f223350b2..bad3b1369da 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.6 (Berkeley) 2/17/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index a424d31d7a8..6f38edc4d21 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.6 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c
index 4a37c907ef6..53181c4a2ca 100644
--- a/sys/gnu/ext2fs/ext2_ihash.c
+++ b/sys/gnu/ext2fs/ext2_ihash.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.4 (Berkeley) 12/30/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_mount.h b/sys/gnu/ext2fs/ext2_mount.h
index 237871fdaac..084abeb795d 100644
--- a/sys/gnu/ext2fs/ext2_mount.h
+++ b/sys/gnu/ext2fs/ext2_mount.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.2 (Berkeley) 1/12/94
+ * $Id$
  */
 
 struct buf;
diff --git a/sys/gnu/ext2fs/inode.h b/sys/gnu/ext2fs/inode.h
index df155967a7d..e37944321b4 100644
--- a/sys/gnu/ext2fs/inode.h
+++ b/sys/gnu/ext2fs/inode.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <ufs/ufs/dinode.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index a424d31d7a8..6f38edc4d21 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.6 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h
index 237871fdaac..084abeb795d 100644
--- a/sys/gnu/fs/ext2fs/ext2_mount.h
+++ b/sys/gnu/fs/ext2fs/ext2_mount.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.2 (Berkeley) 1/12/94
+ * $Id$
  */
 
 struct buf;
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index df155967a7d..e37944321b4 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <ufs/ufs/dinode.h>
diff --git a/sys/i386/include/_limits.h b/sys/i386/include/_limits.h
index e507313a046..3ae9518597d 100644
--- a/sys/i386/include/_limits.h
+++ b/sys/i386/include/_limits.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h
index 0ef060a3b5b..77ec887cd6a 100644
--- a/sys/i386/include/ansi.h
+++ b/sys/i386/include/ansi.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef	_ANSI_H_
diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h
index 4af0b97a8ab..3b2fdf91149 100644
--- a/sys/i386/include/asmacros.h
+++ b/sys/i386/include/asmacros.h
@@ -1,3 +1,38 @@
+/*-
+ * Copyright (c) 1993 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
 #define ALIGN_DATA	.align	2	/* 4 byte alignment, zero filled */
 #define ALIGN_TEXT	.align	2,0x90	/* 4-byte alignment, nop filled */
 #define SUPERALIGN_TEXT	.align	4,0x90	/* 16-byte alignment (better for 486), nop filled */
diff --git a/sys/i386/include/cons.h b/sys/i386/include/cons.h
index f66277e1f04..faa17d12332 100644
--- a/sys/i386/include/cons.h
+++ b/sys/i386/include/cons.h
@@ -2,5 +2,7 @@
  * Console support headers should be in <machine/cons.h> since MI software
  * needs to access these functions.  In the mean time, just include the
  * header where it sits.
+ *
+ * $Id$
  */
 #include <i386/i386/cons.h>
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index df871cbc0b6..02f044f7439 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -1,8 +1,41 @@
+/*-
+ * Copyright (c) 1993 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
 /*
  * Functions to provide access to special i386 instructions.
  * XXX - bezillions more are defined in locore.s but are not declared anywhere.
- *
- *	$Id: cpufunc.h,v 1.9 1994/01/31 23:48:23 davidg Exp $
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h
index f63ec49cc8c..2e8b31616f7 100644
--- a/sys/i386/include/exec.h
+++ b/sys/i386/include/exec.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 #ifndef	_EXEC_H_
diff --git a/sys/i386/include/ioctl_fd.h b/sys/i386/include/ioctl_fd.h
index 2e3ac310472..103f11ba99c 100644
--- a/sys/i386/include/ioctl_fd.h
+++ b/sys/i386/include/ioctl_fd.h
@@ -22,6 +22,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
 #ifndef _IOCTL_FD_H
diff --git a/sys/i386/include/ipl.h b/sys/i386/include/ipl.h
index 248ca5666d6..773fa9c700c 100644
--- a/sys/i386/include/ipl.h
+++ b/sys/i386/include/ipl.h
@@ -1,3 +1,38 @@
+/*-
+ * Copyright (c) 1993 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
 #ifndef _ISA_IPL_H_
 #define _ISA_IPL_H_
 
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index e507313a046..3ae9518597d 100644
--- a/sys/i386/include/limits.h
+++ b/sys/i386/include/limits.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/lpt.h b/sys/i386/include/lpt.h
index 87af5bcc587..7e3df422418 100644
--- a/sys/i386/include/lpt.h
+++ b/sys/i386/include/lpt.h
@@ -11,6 +11,7 @@
  *
  *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
  *
+ * $Id$
  */
 
 #ifndef _LPT_PRINTER_H_
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index f30efff8264..62dd697b451 100644
--- a/sys/i386/include/profile.h
+++ b/sys/i386/include/profile.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 #define	_MCOUNT_DECL static inline void _mcount
diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h
index bfcc55f7aab..0892b83e260 100644
--- a/sys/i386/include/ptrace.h
+++ b/sys/i386/include/ptrace.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 /*
diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h
index 386241d908a..28b10c19820 100644
--- a/sys/i386/include/reloc.h
+++ b/sys/i386/include/reloc.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /* Relocation format. */
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index 16cbef22265..e688d8d6d34 100644
--- a/sys/i386/include/signal.h
+++ b/sys/i386/include/signal.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 /*
diff --git a/sys/i386/include/soundcard.h b/sys/i386/include/soundcard.h
index ce28a144242..3bac78da7e9 100644
--- a/sys/i386/include/soundcard.h
+++ b/sys/i386/include/soundcard.h
@@ -25,6 +25,7 @@
  * SUCH DAMAGE.
  *
  * 
+ * $Id$
  */
 
  /* 
diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h
index af80a282e28..f097e4807cf 100644
--- a/sys/i386/include/speaker.h
+++ b/sys/i386/include/speaker.h
@@ -3,6 +3,8 @@
  *
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  *      modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
+ *
+ * $Id$
  */
 
 #ifndef _SPEAKER_H_
diff --git a/sys/i386/include/spl.h b/sys/i386/include/spl.h
index c916df36da2..739fc209e9e 100644
--- a/sys/i386/include/spl.h
+++ b/sys/i386/include/spl.h
@@ -1,3 +1,38 @@
+/*-
+ * Copyright (c) 1993 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
 #ifndef _MACHINE_IPL_H_
 #define _MACHINE_IPL_H_
 
diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h
index 1110b667083..5880242723b 100644
--- a/sys/i386/include/stdarg.h
+++ b/sys/i386/include/stdarg.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #ifndef _STDARG_H_
diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h
index 2649ba5fe21..746cef1011f 100644
--- a/sys/i386/include/sysarch.h
+++ b/sys/i386/include/sysarch.h
@@ -1,7 +1,40 @@
+/*-
+ * Copyright (c) 1993 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$Id$
+ */
+
 /*
  * Architecture specific syscalls (i386)
- *
- *	$Id: sysarch.h,v 1.2 1993/10/16 14:39:35 rgrimes Exp $
  */
 #ifndef _MACHINE_SYSARCH_H_
 #define _MACHINE_SYSARCH_H_ 1
diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h
index dcbb29c08fe..78ce8d568ff 100644
--- a/sys/i386/include/types.h
+++ b/sys/i386/include/types.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.3 (Berkeley) 1/5/94
+ * $Id$
  */
 
 #ifndef	_MACHTYPES_H_
diff --git a/sys/i386/include/ultrasound.h b/sys/i386/include/ultrasound.h
index 40e2443e6f6..42d968850c1 100644
--- a/sys/i386/include/ultrasound.h
+++ b/sys/i386/include/ultrasound.h
@@ -24,6 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 /*
diff --git a/sys/i386/include/varargs.h b/sys/i386/include/varargs.h
index 1a913ec5947..fa6c9a7a954 100644
--- a/sys/i386/include/varargs.h
+++ b/sys/i386/include/varargs.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
+ * $Id$
  */
 
 #ifndef _VARARGS_H_
diff --git a/sys/i386/isa/ft.c b/sys/i386/isa/ft.c
index 5f4f62c33d0..bc5d7ccb6a1 100644
--- a/sys/i386/isa/ft.c
+++ b/sys/i386/isa/ft.c
@@ -17,7 +17,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  *
  *  ft.c - QIC-40/80 floppy tape driver
- *  $Id: ft.c,v 1.4 1994/02/14 22:24:28 nate Exp $
+ *  $Id: ft.c,v 1.6 1994/05/25 08:58:47 rgrimes Exp $
  *
  *
  *  01/26/94 v0.3b - Jim Babb
@@ -51,6 +51,8 @@
  *
  *  06/03/93 v0.1 Alpha release
  *  Hopefully the last re-write.  Many bugs fixed, many remain.
+ *
+ * $Id$
  */
 
 #include "ft.h"
diff --git a/sys/i386/isa/ftreg.h b/sys/i386/isa/ftreg.h
index 7b4ca6a2723..c54249f3e8a 100644
--- a/sys/i386/isa/ftreg.h
+++ b/sys/i386/isa/ftreg.h
@@ -26,6 +26,8 @@
  *
  *  06/03/93 v0.1 Alpha release
  *  Initial revision.  Many more things should be moved here.
+ * 
+ * $Id$
  */
 
 /* QIC-117 command set. */
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 26e3ebdfb39..572cc1f00f9 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -13,10 +13,7 @@
  *   the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
  *   and a variety of similar clones.
  *
- */
-
-/*
- * $Id: if_ed.c,v 1.36 1994/04/10 20:06:26 davidg Exp $
+ * $Id: if_ed.c,v 1.38 1994/05/25 08:59:02 rgrimes Exp $
  */
 
 #include "ed.h"
diff --git a/sys/i386/isa/if_edreg.h b/sys/i386/isa/if_edreg.h
index f75e261ef66..f691a6e3f20 100644
--- a/sys/i386/isa/if_edreg.h
+++ b/sys/i386/isa/if_edreg.h
@@ -1,7 +1,16 @@
+/*
+ * Copyright (C) 1993, David Greenman. This software may be used, modified,
+ *   copied, distributed, and sold, in both source and binary form provided
+ *   that the above copyright and these terms are retained. Under no
+ *   circumstances is the author responsible for the proper functioning
+ *   of this software, nor does the author assume any responsibility
+ *   for damages incurred with its use.
+ *
+ * $Id: if_edreg.h,v 1.14 1994/04/10 20:06:28 davidg Exp $
+ */
 /*
  * National Semiconductor DS8390 NIC register definitions 
  *
- * $Id: if_edreg.h,v 1.13 1994/02/02 14:05:58 davidg Exp $
  *
  * Modification history
  *
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index a9033ec0b25..c16c5dfb77c 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -5,6 +5,8 @@
  * portions thereof.
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
+ * 
+ * $Id$
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
diff --git a/sys/i386/isa/if_elreg.h b/sys/i386/isa/if_elreg.h
index 806d6ff68d1..4d7859dd71c 100644
--- a/sys/i386/isa/if_elreg.h
+++ b/sys/i386/isa/if_elreg.h
@@ -3,6 +3,8 @@
  * the copyright notice and this permission notice appear in all copies
  * of the software, derivative works or modified versions, and any
  * portions thereof.
+ *
+ * $Id$
  */
 /* 3COM Etherlink 3C501 Register Definitions */
 
diff --git a/sys/i386/isa/if_is.c b/sys/i386/isa/if_is.c
index fc0dcaee990..8817a69411d 100644
--- a/sys/i386/isa/if_is.c
+++ b/sys/i386/isa/if_is.c
@@ -11,7 +11,8 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
-*/
+ * $Id$
+ */
 
 /* TODO
 
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 466e93635ea..3653610371b 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -10,6 +10,8 @@
  * University of Guelph makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
+ *
+ * $Id$
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/i386/isa/sound/adlib_card.c b/sys/i386/isa/sound/adlib_card.c
index 6365069384a..36c2f5ea2c9 100644
--- a/sys/i386/isa/sound/adlib_card.c
+++ b/sys/i386/isa/sound/adlib_card.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/audio.c b/sys/i386/isa/sound/audio.c
index f27f9d5fa09..092a5e52a85 100644
--- a/sys/i386/isa/sound/audio.c
+++ b/sys/i386/isa/sound/audio.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/dev_table.c b/sys/i386/isa/sound/dev_table.c
index 7f7cae11d02..ccc32bc85a0 100644
--- a/sys/i386/isa/sound/dev_table.c
+++ b/sys/i386/isa/sound/dev_table.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #define _DEV_TABLE_C_
diff --git a/sys/i386/isa/sound/dev_table.h b/sys/i386/isa/sound/dev_table.h
index 4b656ba39c2..a814d5bfc01 100644
--- a/sys/i386/isa/sound/dev_table.h
+++ b/sys/i386/isa/sound/dev_table.h
@@ -26,8 +26,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
-
-*/
+ * $Id$
+ */
 
 #ifndef _DEV_TABLE_H_
 #define _DEV_TABLE_H_
diff --git a/sys/i386/isa/sound/dmabuf.c b/sys/i386/isa/sound/dmabuf.c
index 851a70a16b1..745271744a0 100644
--- a/sys/i386/isa/sound/dmabuf.c
+++ b/sys/i386/isa/sound/dmabuf.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/finetune.h b/sys/i386/isa/sound/finetune.h
index b86a0eb15a1..59e76fea943 100644
--- a/sys/i386/isa/sound/finetune.h
+++ b/sys/i386/isa/sound/finetune.h
@@ -23,6 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
   unsigned short finetune_table[128] =
diff --git a/sys/i386/isa/sound/gus_card.c b/sys/i386/isa/sound/gus_card.c
index c7cfc0a7ab6..f3e8119df39 100644
--- a/sys/i386/isa/sound/gus_card.c
+++ b/sys/i386/isa/sound/gus_card.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/gus_hw.h b/sys/i386/isa/sound/gus_hw.h
index f97a0b8670e..b3dc32f73a5 100644
--- a/sys/i386/isa/sound/gus_hw.h
+++ b/sys/i386/isa/sound/gus_hw.h
@@ -1,4 +1,6 @@
-
+/*
+ * $Id$
+ */
 /*
  * I/O addresses
  */
diff --git a/sys/i386/isa/sound/gus_linearvol.h b/sys/i386/isa/sound/gus_linearvol.h
index 7ad0c30d4fd..6e41f092d75 100644
--- a/sys/i386/isa/sound/gus_linearvol.h
+++ b/sys/i386/isa/sound/gus_linearvol.h
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 static unsigned short gus_linearvol[128] = {
  0x0000, 0x08ff, 0x09ff, 0x0a80, 0x0aff, 0x0b40, 0x0b80, 0x0bc0,
  0x0bff, 0x0c20, 0x0c40, 0x0c60, 0x0c80, 0x0ca0, 0x0cc0, 0x0ce0,
diff --git a/sys/i386/isa/sound/gus_midi.c b/sys/i386/isa/sound/gus_midi.c
index 935c5c90b32..15931cc66aa 100644
--- a/sys/i386/isa/sound/gus_midi.c
+++ b/sys/i386/isa/sound/gus_midi.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/gus_vol.c b/sys/i386/isa/sound/gus_vol.c
index 055a1170e9f..0ec141796f7 100644
--- a/sys/i386/isa/sound/gus_vol.c
+++ b/sys/i386/isa/sound/gus_vol.c
@@ -2,6 +2,7 @@
  * gus_vol.c - Compute volume for GUS.
  *
  * Greg Lee 1993.
+ * $Id$
  */
 #include "sound_config.h"
 #ifndef EXCLUDE_GUS
diff --git a/sys/i386/isa/sound/gus_wave.c b/sys/i386/isa/sound/gus_wave.c
index 9f6442e0fcf..621286f9e1e 100644
--- a/sys/i386/isa/sound/gus_wave.c
+++ b/sys/i386/isa/sound/gus_wave.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/gustest/gmidi.h b/sys/i386/isa/sound/gustest/gmidi.h
index ab951e72532..106cfa23f60 100644
--- a/sys/i386/isa/sound/gustest/gmidi.h
+++ b/sys/i386/isa/sound/gustest/gmidi.h
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 	char patch_names[][9] =
 	  {
 		/*   0 */	"acpiano",
diff --git a/sys/i386/isa/sound/gustest/gmod.c b/sys/i386/isa/sound/gustest/gmod.c
index a1184a0bc79..298878370da 100644
--- a/sys/i386/isa/sound/gustest/gmod.c
+++ b/sys/i386/isa/sound/gustest/gmod.c
@@ -6,6 +6,7 @@
  *		It's just a too I used while developing the driver. In
  *		addition it can be used as an example on programming
  *		the LInux Sound Driver with GUS.
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/sys/i386/isa/sound/gustest/gpatinfo.c b/sys/i386/isa/sound/gustest/gpatinfo.c
index 121020dfe29..17dcb12bb4f 100644
--- a/sys/i386/isa/sound/gustest/gpatinfo.c
+++ b/sys/i386/isa/sound/gustest/gpatinfo.c
@@ -6,6 +6,7 @@
  *	      currently incompletely implemented prototype and
  *	      will change before final implementation.
  * 
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/sys/i386/isa/sound/gustest/gusload.c b/sys/i386/isa/sound/gustest/gusload.c
index 1e04a7d7077..1ed9a3b0596 100644
--- a/sys/i386/isa/sound/gustest/gusload.c
+++ b/sys/i386/isa/sound/gustest/gusload.c
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 /*
  * patutil.c	- A sample program which loads patches to the Gravis
  * Ultrasound
diff --git a/sys/i386/isa/sound/gustest/midithru.c b/sys/i386/isa/sound/gustest/midithru.c
index 78f58c1d7eb..c4fab7f2c6d 100644
--- a/sys/i386/isa/sound/gustest/midithru.c
+++ b/sys/i386/isa/sound/gustest/midithru.c
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 #include <stdio.h>
 #include <machine/soundcard.h>
 #include <unistd.h>
diff --git a/sys/i386/isa/sound/gustest/pmtest.c b/sys/i386/isa/sound/gustest/pmtest.c
index 05b5b9e9dc3..0520545e165 100644
--- a/sys/i386/isa/sound/gustest/pmtest.c
+++ b/sys/i386/isa/sound/gustest/pmtest.c
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 /*
  * CAUTION!	This program is just an incompletely implemented version
  *		of the patch manager daemon for GUS. Using this program
diff --git a/sys/i386/isa/sound/ics2101.c b/sys/i386/isa/sound/ics2101.c
index 0e54c608de3..c06fec0a4d4 100644
--- a/sys/i386/isa/sound/ics2101.c
+++ b/sys/i386/isa/sound/ics2101.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h
index 36092e37d97..a5e7e54c941 100644
--- a/sys/i386/isa/sound/local.h
+++ b/sys/i386/isa/sound/local.h
@@ -1,4 +1,7 @@
 /* for FreeBSD */
+/*
+ * $Id$
+ */
 #include "snd.h"
 
 #if NSND > 0
diff --git a/sys/i386/isa/sound/midi.c b/sys/i386/isa/sound/midi.c
index 6ea51b061b9..a11a4df6dbb 100644
--- a/sys/i386/isa/sound/midi.c
+++ b/sys/i386/isa/sound/midi.c
@@ -22,6 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 #define _MIDI_TABLE_C_
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/midibuf.c b/sys/i386/isa/sound/midibuf.c
index 7dadb3f8fa7..399fdfd19c0 100644
--- a/sys/i386/isa/sound/midibuf.c
+++ b/sys/i386/isa/sound/midibuf.c
@@ -27,6 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/mpu401.c b/sys/i386/isa/sound/mpu401.c
index 38ba486b142..0b1685d15fc 100644
--- a/sys/i386/isa/sound/mpu401.c
+++ b/sys/i386/isa/sound/mpu401.c
@@ -27,6 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/opl3.c b/sys/i386/isa/sound/opl3.c
index 6e3dccab8c4..4278d1907dd 100644
--- a/sys/i386/isa/sound/opl3.c
+++ b/sys/i386/isa/sound/opl3.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 /* Major improvements to the FM handling 30AUG92 by Rob Hooft, */
diff --git a/sys/i386/isa/sound/opl3.h b/sys/i386/isa/sound/opl3.h
index ea7901fc60a..eeb8fef3334 100644
--- a/sys/i386/isa/sound/opl3.h
+++ b/sys/i386/isa/sound/opl3.h
@@ -24,6 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 /*
diff --git a/sys/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h
index fea169b7081..ec3c47f0d5d 100644
--- a/sys/i386/isa/sound/os.h
+++ b/sys/i386/isa/sound/os.h
@@ -36,6 +36,8 @@
  * If you have to make changes to other than these two files, please contact me
  * before making the changes. It's possible that I have already made the
  * change. 
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/i386/isa/sound/pas.h b/sys/i386/isa/sound/pas.h
index 9902e03e4bf..29f9ff62841 100644
--- a/sys/i386/isa/sound/pas.h
+++ b/sys/i386/isa/sound/pas.h
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 /* 																*/
 /*	Port addresses and bit fields for the Media Vision Pro AudioSpectrum second generation sound cards.			*/
 /* 																*/
diff --git a/sys/i386/isa/sound/pas2_card.c b/sys/i386/isa/sound/pas2_card.c
index cc99a9ef516..fc023a088f0 100644
--- a/sys/i386/isa/sound/pas2_card.c
+++ b/sys/i386/isa/sound/pas2_card.c
@@ -27,6 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/pas2_midi.c b/sys/i386/isa/sound/pas2_midi.c
index 4a07b0b59bf..e502db9d4a0 100644
--- a/sys/i386/isa/sound/pas2_midi.c
+++ b/sys/i386/isa/sound/pas2_midi.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/pas2_mixer.c b/sys/i386/isa/sound/pas2_mixer.c
index b3868773d64..8d83df44158 100644
--- a/sys/i386/isa/sound/pas2_mixer.c
+++ b/sys/i386/isa/sound/pas2_mixer.c
@@ -27,6 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/pas2_pcm.c b/sys/i386/isa/sound/pas2_pcm.c
index ec571c5e808..1eef59b3500 100644
--- a/sys/i386/isa/sound/pas2_pcm.c
+++ b/sys/i386/isa/sound/pas2_pcm.c
@@ -26,6 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/patmgr.c b/sys/i386/isa/sound/patmgr.c
index 042d42d4067..f5754370e3c 100644
--- a/sys/i386/isa/sound/patmgr.c
+++ b/sys/i386/isa/sound/patmgr.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #define PATMGR_C
diff --git a/sys/i386/isa/sound/pro_midi.c b/sys/i386/isa/sound/pro_midi.c
index b9ffa26a9ab..93c1937309d 100644
--- a/sys/i386/isa/sound/pro_midi.c
+++ b/sys/i386/isa/sound/pro_midi.c
@@ -22,6 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 #define ALL_EXTERNAL_TO_ME
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/sb.h b/sys/i386/isa/sound/sb.h
index bb8ae12d7e6..c701bc183ac 100644
--- a/sys/i386/isa/sound/sb.h
+++ b/sys/i386/isa/sound/sb.h
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 #define DSP_RESET	(sbc_base + 0x6)
 #define DSP_READ	(sbc_base + 0xA)
 #define DSP_WRITE	(sbc_base + 0xC)
diff --git a/sys/i386/isa/sound/sb16_dsp.c b/sys/i386/isa/sound/sb16_dsp.c
index b545f8cac22..20c597d7484 100644
--- a/sys/i386/isa/sound/sb16_dsp.c
+++ b/sys/i386/isa/sound/sb16_dsp.c
@@ -27,6 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #define DEB(x)
diff --git a/sys/i386/isa/sound/sb16_midi.c b/sys/i386/isa/sound/sb16_midi.c
index 39808c80fe0..d15fe17456a 100644
--- a/sys/i386/isa/sound/sb16_midi.c
+++ b/sys/i386/isa/sound/sb16_midi.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/sb_card.c b/sys/i386/isa/sound/sb_card.c
index f7588e1ca17..e56ebd3f3f7 100644
--- a/sys/i386/isa/sound/sb_card.c
+++ b/sys/i386/isa/sound/sb_card.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/sb_dsp.c b/sys/i386/isa/sound/sb_dsp.c
index 17fb4b70dc6..9e296c66f72 100644
--- a/sys/i386/isa/sound/sb_dsp.c
+++ b/sys/i386/isa/sound/sb_dsp.c
@@ -29,6 +29,7 @@
  *	Hunyue Yau	Jan 6 1994
  *	Added code to support Sound Galaxy NX Pro
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/sb_midi.c b/sys/i386/isa/sound/sb_midi.c
index fed19aba3a0..dc6bba07108 100644
--- a/sys/i386/isa/sound/sb_midi.c
+++ b/sys/i386/isa/sound/sb_midi.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/sb_mixer.c b/sys/i386/isa/sound/sb_mixer.c
index 39b97caf8cd..508dc67378d 100644
--- a/sys/i386/isa/sound/sb_mixer.c
+++ b/sys/i386/isa/sound/sb_mixer.c
@@ -30,6 +30,7 @@
  *	Hunyue Yau	Jan 6 1994
  *	Added code to support the Sound Galaxy NX Pro mixer.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/sb_mixer.h b/sys/i386/isa/sound/sb_mixer.h
index 4caf7730226..89b66d0110d 100644
--- a/sys/i386/isa/sound/sb_mixer.h
+++ b/sys/i386/isa/sound/sb_mixer.h
@@ -29,6 +29,7 @@
  *	Hunyue Yau	Jan 6 1994
  *	Added defines for the Sound Galaxy NX Pro mixer.
  * 
+ * $Id$
  */
 
 #define SBPRO_RECORDING_DEVICES	(SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD)
diff --git a/sys/i386/isa/sound/sequencer.c b/sys/i386/isa/sound/sequencer.c
index 98854736a32..57480122520 100644
--- a/sys/i386/isa/sound/sequencer.c
+++ b/sys/i386/isa/sound/sequencer.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #define SEQUENCER_C
diff --git a/sys/i386/isa/sound/sound_calls.h b/sys/i386/isa/sound/sound_calls.h
index abc82001b77..789d1d08f7a 100644
--- a/sys/i386/isa/sound/sound_calls.h
+++ b/sys/i386/isa/sound/sound_calls.h
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 /*
  *	DMA buffer calls
  */
diff --git a/sys/i386/isa/sound/sound_config.h b/sys/i386/isa/sound/sound_config.h
index 0d30c12aadc..e692eae0a35 100644
--- a/sys/i386/isa/sound/sound_config.h
+++ b/sys/i386/isa/sound/sound_config.h
@@ -26,6 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "local.h"
diff --git a/sys/i386/isa/sound/sound_switch.c b/sys/i386/isa/sound/sound_switch.c
index 68c75758608..a271a6af911 100644
--- a/sys/i386/isa/sound/sound_switch.c
+++ b/sys/i386/isa/sound/sound_switch.c
@@ -25,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index 9691e4f07be..bc44b003019 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -26,6 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $Id$
  */
 
 #include "sound_config.h"
diff --git a/sys/i386/isa/sound/tuning.h b/sys/i386/isa/sound/tuning.h
index 858e1fe6c61..23086af15c9 100644
--- a/sys/i386/isa/sound/tuning.h
+++ b/sys/i386/isa/sound/tuning.h
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 #ifdef SEQUENCER_C
 
 unsigned short semitone_tuning[24] = 
diff --git a/sys/i386/isa/sound/ulaw.h b/sys/i386/isa/sound/ulaw.h
index be9f92d9984..9984e363c4a 100644
--- a/sys/i386/isa/sound/ulaw.h
+++ b/sys/i386/isa/sound/ulaw.h
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 static unsigned char ulaw_dsp[] = {
      0,    0,    0,    0,    0,    0,    0,    0, 
      0,    0,    0,    0,    0,    0,    0,    0, 
diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c
index 911eedfd06a..32439ce96ab 100644
--- a/sys/isofs/cd9660/cd9660_bmap.c
+++ b/sys/isofs/cd9660/cd9660_bmap.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_bmap.c	8.3 (Berkeley) 1/23/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index 36daffd6b2a..6540c44949c 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -38,6 +38,7 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index f9641ffded7..43b1ffe4a82 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index 45de67f1a6b..bc4ec4b497a 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.2 (Berkeley) 1/23/94
+ * $Id$
  */
 
 /*
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index 0923fa01477..6d73374c708 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.c	8.2 (Berkeley) 1/23/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_rrip.h b/sys/isofs/cd9660/cd9660_rrip.h
index b4017281f06..8a140febb39 100644
--- a/sys/isofs/cd9660/cd9660_rrip.h
+++ b/sys/isofs/cd9660/cd9660_rrip.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.h	8.1 (Berkeley) 1/21/94
+ * $Id$
  */
 
 typedef struct {
diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c
index 39c5fe491a4..52a80d75ce4 100644
--- a/sys/isofs/cd9660/cd9660_util.c
+++ b/sys/isofs/cd9660/cd9660_util.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_util.c	8.1 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index bc48367a38c..a4aeaaf5784 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.3 (Berkeley) 1/31/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 7a2964bf22d..691a6ec59b5 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.3 (Berkeley) 1/23/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index e3567066e1c..a329afa3f9e 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.2 (Berkeley) 1/23/94
+ * $Id$
  */
 
 #define ISODCL(from, to) (to - from + 1)
diff --git a/sys/isofs/cd9660/iso_rrip.h b/sys/isofs/cd9660/iso_rrip.h
index 78e4a775201..031aaa37358 100644
--- a/sys/isofs/cd9660/iso_rrip.h
+++ b/sys/isofs/cd9660/iso_rrip.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_rrip.h	8.2 (Berkeley) 1/23/94
+ * $Id$
  */
 
 
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index 1563c4165f1..a09e4848a08 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -1,4 +1,5 @@
 #	@(#)Make.tags.inc	8.1 (Berkeley) 6/11/93
+# $Id$
 
 # Common files for "make tags".
 # Included by the Makefile for each architecture.
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index ea604ab4213..7e8c70bf559 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 3cbde510f84..456eb33c5a6 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)kern_acct.c	8.1 (Berkeley) 6/14/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 4017e966ee6..c963fdae4fe 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 9258e811f1b..df984d15be0 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 7db9830abb6..0a0ac8ff507 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index c285017013f..a415fc0c1c6 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_fork.c	8.6 (Berkeley) 4/8/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 4b6f721c3a2..711f1b65f0f 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_ktrace.c	8.2 (Berkeley) 9/23/93
+ * $Id$
  */
 
 #ifdef KTRACE
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 3da06d9c04a..fecf154e7b1 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_malloc.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index 9e0405fc6ab..21a3c3844e6 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -15,6 +15,8 @@
  *    John S. Dyson.
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
+ *
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 63a22c966c5..11b38162538 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.4 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 1e205eecd5a..50458ad8839 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_prot.c	8.6 (Berkeley) 1/21/94
+ * $Id$
  */
 
 /*
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index e38471a41e5..a6b11c0431e 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_resource.c	8.5 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index f778c364d67..c076dcd67cf 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
+ * $Id$
  */
 
 #define	SIGPROP		/* include signal properties table */
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 8eb4dee65a7..8df444c58d4 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_subr.c	8.3 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index a299dbaf7aa..f9d43a6ca3c 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_synch.c	8.6 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 7e5f196dfb0..71c8d56d2da 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
+ * $Id$
  */
 
 /*
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 4017e966ee6..c963fdae4fe 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 2e86376de46..d03098341ff 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_time.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 4017e966ee6..c963fdae4fe 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index 656430d5b10..5f7ba517f97 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_xxx.c	8.2 (Berkeley) 11/14/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index 0ddea0c28fa..bafd07eb6e4 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -1,5 +1,6 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
+# $Id$
 
 set -e
 
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index af17988c935..f48ce99f0a3 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -41,7 +41,7 @@
  *
  *	@(#)subr_autoconf.c	8.1 (Berkeley) 6/10/93
  *
- * from: $Header: subr_autoconf.c,v 1.12 93/02/01 19:31:48 torek Exp $ (LBL)
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index d0b14966d25..1b6886c6630 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -6,6 +6,11 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
+ * $Id$
+ */
+
+/*
+ * clist support routines
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index cc0f28d37f1..0c787f7e866 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 92e4543f38d..751b7417581 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index c871594221d..2fdecf06708 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.2 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 5ef4925856f..fb2866c5c70 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index efe56b098d2..a8425e95fba 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prof.c	8.3 (Berkeley) 9/23/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_rmap.c b/sys/kern/subr_rmap.c
index 2f31173321d..a43899e8b19 100644
--- a/sys/kern/subr_rmap.c
+++ b/sys/kern/subr_rmap.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)subr_rmap.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c
index 3304d57da6e..e866b8aaf90 100644
--- a/sys/kern/subr_xxx.c
+++ b/sys/kern/subr_xxx.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_xxx.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 919c8664c5d..af58a5cc1f9 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 527371df71b..cb05cb76b21 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_process.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 63f52984117..d909cf30c6e 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_socket.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 4ba7df2ba2f..0b4574b3304 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,6 @@
-	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
+	$Id$
+;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
+;
 ; System call name/number master file.
 ; Processed to created init_sysent.c, syscalls.c and syscall.h.
 
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index fd3c051a50c..b207bc3210b 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index 7047230844d..4ce472b7d3c 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_compat.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /* 
diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c
index f517a37f0ed..fe5f3eca8a4 100644
--- a/sys/kern/tty_conf.c
+++ b/sys/kern/tty_conf.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_conf.c	8.4 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 50f0581f761..d6d487045db 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.2 (Berkeley) 9/23/93
+ * $Id$
  */
 
 /*
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index d0b14966d25..1b6886c6630 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -6,6 +6,11 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
+ * $Id$
+ */
+
+/*
+ * clist support routines
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/tty_tb.c b/sys/kern/tty_tb.c
index 242301a52e8..8f4c84c6638 100644
--- a/sys/kern/tty_tb.c
+++ b/sys/kern/tty_tb.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tb.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include "tb.h"
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 6baba993240..b710d5b2d47 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
+ * $Id$
  */
 
 /*
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index db082c73660..e1f76dee1e8 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 5569bea97db..a75ba75c978 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index da9828aa267..b484737e545 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_proto.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index dc153bd0cae..6f16e2300e4 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 510556c62c8..b50b26333f6 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index dc153bd0cae..6f16e2300e4 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 5113f78f4ee..1674039b77e 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_syscalls.c	8.4 (Berkeley) 2/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index b61e9f4a237..a1ec080f53b 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index b3ab4caf2be..b3e3c07f179 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -15,6 +15,8 @@
  *    John S. Dyson.
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
+ *
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 2ddf644c98d..1bc4872ae53 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cache.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 40fa3be52f9..46eb0adbea1 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cluster.c	8.7 (Berkeley) 2/13/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 2fe39eb674b..70acd9b8b5e 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 9535b8a7231..a1a24f8ea2d 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
+ * $Id$
  */
 
 /*
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index f5c3d783531..7c35066ac4b 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 3ab520d652e..6b11461ec8e 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_init.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 0fa5aa19b78..bd51adcc9bf 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_lookup.c	8.4 (Berkeley) 2/16/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 2fe39eb674b..70acd9b8b5e 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 9535b8a7231..a1a24f8ea2d 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
+ * $Id$
  */
 
 /*
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index f5c3d783531..7c35066ac4b 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index d63a39c158b..2b6429912f2 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vnode_if.pl b/sys/kern/vnode_if.pl
index e190fa04836..339e6589437 100644
--- a/sys/kern/vnode_if.pl
+++ b/sys/kern/vnode_if.pl
@@ -32,6 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
+# $Id$
 #
 
 # Script to produce VFS front-end sugar.
diff --git a/sys/kern/vnode_if.sh b/sys/kern/vnode_if.sh
index e190fa04836..339e6589437 100644
--- a/sys/kern/vnode_if.sh
+++ b/sys/kern/vnode_if.sh
@@ -32,6 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
+# $Id$
 #
 
 # Script to produce VFS front-end sugar.
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index caee21dce0b..c2b012edddf 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -31,6 +31,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.src	8.3 (Berkeley) 2/3/94
+# $Id$
 #
 vop_lookup {
 	IN struct vnode *dvp;
diff --git a/sys/libkern/Makefile b/sys/libkern/Makefile
index 991a4350144..2d6bafbb65f 100644
--- a/sys/libkern/Makefile
+++ b/sys/libkern/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	7.9 (Berkeley) 6/1/93
+# $Id$
 
 LIB=	kern
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/..
diff --git a/sys/libkern/adddi3.c b/sys/libkern/adddi3.c
index d10da47e0cf..38b9df95e66 100644
--- a/sys/libkern/adddi3.c
+++ b/sys/libkern/adddi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)adddi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/anddi3.c b/sys/libkern/anddi3.c
index 5ae45ac1a86..9f92718ea67 100644
--- a/sys/libkern/anddi3.c
+++ b/sys/libkern/anddi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)anddi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/ashldi3.c b/sys/libkern/ashldi3.c
index 72501adfaed..74fa0fdcdbc 100644
--- a/sys/libkern/ashldi3.c
+++ b/sys/libkern/ashldi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ashldi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/ashrdi3.c b/sys/libkern/ashrdi3.c
index 9ffa5ed06b5..51b9da5fefd 100644
--- a/sys/libkern/ashrdi3.c
+++ b/sys/libkern/ashrdi3.c
@@ -33,6 +33,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/sys/libkern/bcmp.c b/sys/libkern/bcmp.c
index 5a3ae616800..de9449b4671 100644
--- a/sys/libkern/bcmp.c
+++ b/sys/libkern/bcmp.c
@@ -29,12 +29,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bcmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include <string.h>
 
 /*
diff --git a/sys/libkern/cmpdi2.c b/sys/libkern/cmpdi2.c
index f6e4bdd6a4d..238bd4eb743 100644
--- a/sys/libkern/cmpdi2.c
+++ b/sys/libkern/cmpdi2.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)cmpdi2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/divdi3.c b/sys/libkern/divdi3.c
index da7b2fccd01..f6687f9c960 100644
--- a/sys/libkern/divdi3.c
+++ b/sys/libkern/divdi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)divdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/ffs.c b/sys/libkern/ffs.c
index 099ff8e4c91..74e24502cae 100644
--- a/sys/libkern/ffs.c
+++ b/sys/libkern/ffs.c
@@ -29,12 +29,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ffs.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include <string.h>
 
 /*
diff --git a/sys/libkern/iordi3.c b/sys/libkern/iordi3.c
index e225005d414..2819cf8e5a0 100644
--- a/sys/libkern/iordi3.c
+++ b/sys/libkern/iordi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)iordi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/libkern.h b/sys/libkern/libkern.h
index 0e465e03dfd..d4669c7dd3d 100644
--- a/sys/libkern/libkern.h
+++ b/sys/libkern/libkern.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/types.h>
diff --git a/sys/libkern/locc.c b/sys/libkern/locc.c
index 3767222c5f0..8a67e0f740f 100644
--- a/sys/libkern/locc.c
+++ b/sys/libkern/locc.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)locc.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <libkern/libkern.h>
diff --git a/sys/libkern/lshldi3.c b/sys/libkern/lshldi3.c
index 0af6051c1a6..0aba85e0081 100644
--- a/sys/libkern/lshldi3.c
+++ b/sys/libkern/lshldi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)lshldi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/lshrdi3.c b/sys/libkern/lshrdi3.c
index add2eda988c..b93de210cec 100644
--- a/sys/libkern/lshrdi3.c
+++ b/sys/libkern/lshrdi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)lshrdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/mcount.c b/sys/libkern/mcount.c
index 523217d1d2d..fd8e6a30cd2 100644
--- a/sys/libkern/mcount.c
+++ b/sys/libkern/mcount.c
@@ -29,12 +29,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if !defined(lint) && !defined(KERNEL) && defined(LIBC_SCCS)
-static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
-#endif
-
 #include <sys/param.h>
 #include <sys/gmon.h>
 
diff --git a/sys/libkern/moddi3.c b/sys/libkern/moddi3.c
index f31c6e84f2b..efb6f92a538 100644
--- a/sys/libkern/moddi3.c
+++ b/sys/libkern/moddi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)moddi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/muldi3.c b/sys/libkern/muldi3.c
index a8d7cfc7eab..49adc513a8f 100644
--- a/sys/libkern/muldi3.c
+++ b/sys/libkern/muldi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)muldi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/negdi2.c b/sys/libkern/negdi2.c
index bb8670d8e2c..c4065e218d0 100644
--- a/sys/libkern/negdi2.c
+++ b/sys/libkern/negdi2.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)negdi2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/notdi2.c b/sys/libkern/notdi2.c
index d6247339a80..f451088c350 100644
--- a/sys/libkern/notdi2.c
+++ b/sys/libkern/notdi2.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)notdi2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/qdivrem.c b/sys/libkern/qdivrem.c
index 34b94ceaab2..caf4d7c7512 100644
--- a/sys/libkern/qdivrem.c
+++ b/sys/libkern/qdivrem.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)qdivrem.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 /*
  * Multiprecision divide.  This algorithm is from Knuth vol. 2 (2nd ed),
  * section 4.3.1, pp. 257--259.
diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h
index bc6a2f83632..dadd02c8a0f 100644
--- a/sys/libkern/quad.h
+++ b/sys/libkern/quad.h
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
+ * $Id$
  */
 
 /*
diff --git a/sys/libkern/random.c b/sys/libkern/random.c
index 5153124e3fd..7cdfd32f33e 100644
--- a/sys/libkern/random.c
+++ b/sys/libkern/random.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)random.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <libkern/libkern.h>
diff --git a/sys/libkern/rindex.c b/sys/libkern/rindex.c
index 69dced4c46d..bd661fbeb06 100644
--- a/sys/libkern/rindex.c
+++ b/sys/libkern/rindex.c
@@ -29,12 +29,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rindex.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include <stddef.h>
 #include <string.h>
 
diff --git a/sys/libkern/scanc.c b/sys/libkern/scanc.c
index 2d8b6a06dd6..88bc3ffebc6 100644
--- a/sys/libkern/scanc.c
+++ b/sys/libkern/scanc.c
@@ -31,6 +31,8 @@
  * SUCH DAMAGE.
  *
  *	@(#)scanc.c	8.1 (Berkeley) 6/10/93
+ *
+ * $Id$
  */
 
 #include <libkern/libkern.h>
diff --git a/sys/libkern/skpc.c b/sys/libkern/skpc.c
index 11b269ee7e7..43894ef2d51 100644
--- a/sys/libkern/skpc.c
+++ b/sys/libkern/skpc.c
@@ -31,6 +31,8 @@
  * SUCH DAMAGE.
  *
  *	@(#)skpc.c	8.1 (Berkeley) 6/10/93
+ *
+ * $Id$
  */
 
 #include <libkern/libkern.h>
diff --git a/sys/libkern/strcat.c b/sys/libkern/strcat.c
index 343696719b7..07e79231ddb 100644
--- a/sys/libkern/strcat.c
+++ b/sys/libkern/strcat.c
@@ -29,12 +29,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcat.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include <string.h>
 
 char *
diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c
index 79cfaa831b2..c9c397b5712 100644
--- a/sys/libkern/strcmp.c
+++ b/sys/libkern/strcmp.c
@@ -32,12 +32,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/cdefs.h>
 #include <string.h>
 
diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c
index d1791dd00c3..2715720e3d2 100644
--- a/sys/libkern/strcpy.c
+++ b/sys/libkern/strcpy.c
@@ -29,12 +29,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/cdefs.h>
 #include <string.h>
 
diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c
index 323fbe48452..1d1352c09e6 100644
--- a/sys/libkern/strlen.c
+++ b/sys/libkern/strlen.c
@@ -29,12 +29,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strlen.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/cdefs.h>
 #include <string.h>
 
diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c
index 9e72740b8b9..8aea6908849 100644
--- a/sys/libkern/strncpy.c
+++ b/sys/libkern/strncpy.c
@@ -32,12 +32,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/cdefs.h>
 #include <string.h>
 
diff --git a/sys/libkern/subdi3.c b/sys/libkern/subdi3.c
index e9763452e4f..cb54477a4d4 100644
--- a/sys/libkern/subdi3.c
+++ b/sys/libkern/subdi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)subdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/ucmpdi2.c b/sys/libkern/ucmpdi2.c
index e5dfc435d9c..4aa3e50637d 100644
--- a/sys/libkern/ucmpdi2.c
+++ b/sys/libkern/ucmpdi2.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ucmpdi2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/udivdi3.c b/sys/libkern/udivdi3.c
index 8ddd5598911..f9a77ec432c 100644
--- a/sys/libkern/udivdi3.c
+++ b/sys/libkern/udivdi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)udivdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/umoddi3.c b/sys/libkern/umoddi3.c
index 2a85f7699a6..ccd457d0adc 100644
--- a/sys/libkern/umoddi3.c
+++ b/sys/libkern/umoddi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)umoddi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/libkern/xordi3.c b/sys/libkern/xordi3.c
index e3a85889360..e49190902a2 100644
--- a/sys/libkern/xordi3.c
+++ b/sys/libkern/xordi3.c
@@ -33,12 +33,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)xordi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include "quad.h"
 
 /*
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index cac8775810c..947b885faab 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h
index e89186d8b89..c57ba91393a 100644
--- a/sys/miscfs/fifofs/fifo.h
+++ b/sys/miscfs/fifofs/fifo.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.2 (Berkeley) 2/2/94
+ * $Id$
  */
 
 #ifdef FIFO
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index a1ba3f4abf9..b09c77b286e 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h
index 75ddecc6db1..2def608e55f 100644
--- a/sys/miscfs/kernfs/kernfs.h
+++ b/sys/miscfs/kernfs/kernfs.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs.h	8.4 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #define	_PATH_KERNFS	"/kern"		/* Default mountpoint */
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index a3fa803b3e0..be0f7a9a2f9 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vfsops.c	8.4 (Berkeley) 1/21/94
+ * $Id$
  */
 
 /*
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index db7377dfe3b..0d925939fb2 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vnops.c	8.6 (Berkeley) 2/10/94
+ * $Id$
  */
 
 /*
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 115ff6f4643..0fed55342f6 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -35,11 +35,7 @@
  *
  *	@(#)null_vnops.c	8.1 (Berkeley) 6/10/93
  *
- * Ancestors:
- *	@(#)lofs_vnops.c	1.2 (Berkeley) 6/18/92
- *	$Id: lofs_vnops.c,v 1.11 1992/05/30 10:05:43 jsp Exp jsp $
- *	...and...
- *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
+ * $Id$
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h
index f7b8fa3ef0e..7a1bbb81214 100644
--- a/sys/miscfs/procfs/procfs.h
+++ b/sys/miscfs/procfs/procfs.h
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs.h	8.6 (Berkeley) 2/3/94
  *
- * From:
- *	$Id: procfs.h,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs.h,v 1.1.1.1 1994/05/24 10:05:07 rgrimes Exp $
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c
index a42a03ce91c..44ee3fd4bb1 100644
--- a/sys/miscfs/procfs/procfs_ctl.c
+++ b/sys/miscfs/procfs/procfs_ctl.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_ctl.c	8.3 (Berkeley) 1/21/94
  *
- * From:
- *	$Id: procfs_ctl.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_ctl.c,v 1.1.1.1 1994/05/24 10:05:10 rgrimes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_fpregs.c b/sys/miscfs/procfs/procfs_fpregs.c
index 6d850a6a881..331a671279e 100644
--- a/sys/miscfs/procfs/procfs_fpregs.c
+++ b/sys/miscfs/procfs/procfs_fpregs.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_fpregs.c	8.1 (Berkeley) 1/27/94
  *
- * From:
- *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_fpregs.c,v 1.1.1.1 1994/05/24 10:05:09 rgrimes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c
index 039983da09c..f297df0bfeb 100644
--- a/sys/miscfs/procfs/procfs_mem.c
+++ b/sys/miscfs/procfs/procfs_mem.c
@@ -37,8 +37,7 @@
  *
  *	@(#)procfs_mem.c	8.4 (Berkeley) 1/21/94
  *
- * From:
- *	$Id: procfs_mem.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_mem.c,v 1.1.1.1 1994/05/24 10:05:09 rgrimes Exp $
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_note.c b/sys/miscfs/procfs/procfs_note.c
index bf2f160baa0..a7699f29e12 100644
--- a/sys/miscfs/procfs/procfs_note.c
+++ b/sys/miscfs/procfs/procfs_note.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_note.c	8.2 (Berkeley) 1/21/94
  *
- * From:
- *	$Id: procfs_note.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_note.c,v 1.1.1.1 1994/05/24 10:05:09 rgrimes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_regs.c b/sys/miscfs/procfs/procfs_regs.c
index fa95fef8f10..8b0600a480d 100644
--- a/sys/miscfs/procfs/procfs_regs.c
+++ b/sys/miscfs/procfs/procfs_regs.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_regs.c	8.3 (Berkeley) 1/27/94
  *
- * From:
- *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_regs.c,v 1.1.1.1 1994/05/24 10:05:08 rgrimes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c
index d88aaabdfb0..1792dfde006 100644
--- a/sys/miscfs/procfs/procfs_status.c
+++ b/sys/miscfs/procfs/procfs_status.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- * From:
- *	$Id: procfs_status.c,v 3.1 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_status.c,v 1.1.1.1 1994/05/24 10:05:08 rgrimes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_subr.c b/sys/miscfs/procfs/procfs_subr.c
index b371af19af0..b5ab705dd26 100644
--- a/sys/miscfs/procfs/procfs_subr.c
+++ b/sys/miscfs/procfs/procfs_subr.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_subr.c	8.4 (Berkeley) 1/27/94
  *
- * From:
- *	$Id: procfs_subr.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_subr.c,v 1.1.1.1 1994/05/24 10:05:08 rgrimes Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 67dc31f78b3..b5c9c7d9226 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- * From:
- *	$Id: procfs_vfsops.c,v 3.1 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_vfsops.c,v 1.2 1994/05/25 09:08:33 rgrimes Exp $
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index b6c6e6fa572..e06d1316e98 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,8 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.6 (Berkeley) 2/7/94
  *
- * From:
- *	$Id: procfs_vnops.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
+ *	$Id: procfs_vnops.c,v 1.2 1994/05/25 09:08:39 rgrimes Exp $
  */
 
 /*
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 55b5dd8d433..08907a2c272 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.6 (Berkeley) 4/9/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h
index a13b66e5113..bc26f9d59d1 100644
--- a/sys/miscfs/specfs/specdev.h
+++ b/sys/miscfs/specfs/specdev.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)specdev.h	8.2 (Berkeley) 2/2/94
+ * $Id$
  */
 
 /*
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index 9f4d1e7ace5..5903d30e3fa 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.3 (Berkeley) 1/21/94
  *
- * @(#)null_vnops.c       1.5 (Berkeley) 7/10/92
+ * $Id$
  */
 
 #define MAPFILEENTRIES 64
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index 2480a85e440..67adb98ea9b 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.3 (Berkeley) 1/21/94
  *
- * @(#)null_vfsops.c       1.5 (Berkeley) 7/10/92
+ * $Id$
  */
 
 /*
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index 0c1955f1ed3..cda81532453 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.3 (Berkeley) 1/5/94
+ * $Id$
  */
 
 /*
diff --git a/sys/miscfs/union/libc.opendir.c b/sys/miscfs/union/libc.opendir.c
index 99ed58b86fd..15e3a0ce763 100644
--- a/sys/miscfs/union/libc.opendir.c
+++ b/sys/miscfs/union/libc.opendir.c
@@ -29,13 +29,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char orig_sccsid[] = "@(#)opendir.c	8.2 (Berkeley) 2/12/94";
-static char sccsid[] = "@(#)libc.opendir.c	8.1 (Berkeley) 2/15/94";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/param.h>
 #include <sys/mount.h>
 
diff --git a/sys/miscfs/union/union.h b/sys/miscfs/union/union.h
index 463218ac3ed..b66e17caa82 100644
--- a/sys/miscfs/union/union.h
+++ b/sys/miscfs/union/union.h
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.2 (Berkeley) 2/17/94
+ * $Id$
  */
 
 struct union_args {
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index ea4f804a24d..b73b63846c5 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.4 (Berkeley) 2/17/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index 42931d7c7bc..0dbcc0152c2 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.7 (Berkeley) 3/5/94
+ * $Id$
  */
 
 /*
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index 30f223350b2..bad3b1369da 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.6 (Berkeley) 2/17/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index e40b769b980..91c60f45696 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,8 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * static char rcsid[] =
- * "$Header: bpf.c,v 1.33 91/10/27 21:21:58 mccanne Exp $";
+ * $Id$
  */
 
 #include "bpfilter.h"
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 2e093ac5ce1..ccea1ea78c6 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
  *
- * @(#) $Header: bpf.h,v 1.24 91/10/27 21:22:32 mccanne Exp $ (LBL)
+ * $Id$
  */
 
 /*
diff --git a/sys/net/bpf_compat.h b/sys/net/bpf_compat.h
index 132a6df6452..682426c9663 100644
--- a/sys/net/bpf_compat.h
+++ b/sys/net/bpf_compat.h
@@ -31,10 +31,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)bpf_compat.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
-/* from: $Header: bpf_compat.h,v 1.1 92/05/22 15:33:20 mccanne Exp $ (LBL) */
-
 /*
  * Some hacks for compatibility across SunOS and 4.4BSD.  We emulate malloc
  * and free with mbuf clusters.  We store a pointer to the mbuf in the first
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index cfae7769fc4..8265410b37f 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -37,8 +37,7 @@
  *
  *      @(#)bpf_filter.c	8.1 (Berkeley) 6/10/93
  *
- * static char rcsid[] =
- * "$Header: bpf_filter.c,v 1.16 91/10/27 21:22:35 mccanne Exp $";
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index 36e3d261824..fbcc3ffe448 100644
--- a/sys/net/bpfdesc.h
+++ b/sys/net/bpfdesc.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpfdesc.h	8.1 (Berkeley) 6/10/93
  *
- * @(#) $Header: bpfdesc.h,v 1.9 91/10/27 21:22:38 mccanne Exp $ (LBL)
+ * $Id$
  */
 
 #include <sys/select.h>
diff --git a/sys/net/if.c b/sys/net/if.c
index 36963885cc7..c82aafc1f2c 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if.h b/sys/net/if.h
index e0bf7958b73..b1b7de913ab 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index 84581cbb98d..9642ddfbbf1 100644
--- a/sys/net/if_arp.h
+++ b/sys/net/if_arp.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index 3e53449085a..d08f393d53e 100644
--- a/sys/net/if_dl.h
+++ b/sys/net/if_dl.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /* 
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index d4d6680fdb0..daba4b65f5b 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h
index 90dcb07991d..b5793daa637 100644
--- a/sys/net/if_llc.h
+++ b/sys/net/if_llc.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)if_llc.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 9a5a9575d4c..ff29dc054eb 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 46ae9adf809..7865c3c41d9 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
+ * $Id$
  */
 
 /*
diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h
index e7b27647284..b3626f3c667 100644
--- a/sys/net/if_slvar.h
+++ b/sys/net/if_slvar.h
@@ -32,7 +32,7 @@
  *
  *	@(#)if_slvar.h	8.3 (Berkeley) 2/1/94
  *
- * $Header: if_slvar.h,v 1.3 89/05/31 02:25:18 van Exp $
+ * $Id$
  */
 
 /*
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index 030f234fbac..3f1b59ea3fc 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_types.h	8.2 (Berkeley) 4/20/94
+ * $Id$
  */
 
 /*
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 03c5288d8d2..48bec1c37e4 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)netisr.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/net/radix.c b/sys/net/radix.c
index fb34adb9e0a..29fd378e356 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.c	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 /*
diff --git a/sys/net/radix.h b/sys/net/radix.h
index a11057f0439..1f79cd5caec 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #ifndef _RADIX_H_
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index e44192d2e83..f710eedc9bb 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index 6003e181edb..65b3621e92f 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 560106ef95c..41c72fab6cf 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index f37e84c6f6e..9673a7abb2e 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/route.h b/sys/net/route.h
index 92f672c19ec..e9c387395c6 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.3 (Berkeley) 4/19/94
+ * $Id$
  */
 
 /*
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index db0192f4d91..0e1378caed1 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index 70af9358e37..4439ce4b5f4 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slcompress.c	8.2 (Berkeley) 4/16/94
+ * $Id$
  */
 
 /*
@@ -40,8 +41,6 @@
  * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
  *
- * static char rcsid[] =
- * "$Header: slcompress.c,v 1.19 89/12/31 08:52:59 van Exp $";
  */
 
 #include <sys/param.h>
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index cefe940f198..6df5fa6443f 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -2,8 +2,6 @@
 /*
  * Definitions for tcp compression routines.
  *
- * $Header: slcompress.h,v 1.10 89/12/31 08:53:02 van Exp $
- *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -37,6 +35,7 @@
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
+ * $Id$
  */
 
 #define MAX_STATES 16		/* must be > 2 and < 256 */
diff --git a/sys/net/slip.h b/sys/net/slip.h
index 4caeb464df3..52ecfed6036 100644
--- a/sys/net/slip.h
+++ b/sys/net/slip.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slip.h	8.1 (Berkeley) 2/12/94
+ * $Id$
  */
 
 /* Ioctls operating on SLIP ttys. */
diff --git a/sys/netccitt/ccitt_proto.c b/sys/netccitt/ccitt_proto.c
index d832fd38f92..6204dcd89c3 100644
--- a/sys/netccitt/ccitt_proto.c
+++ b/sys/netccitt/ccitt_proto.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ccitt_proto.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/dll.h b/sys/netccitt/dll.h
index 46ded88eda8..082d3d3c8cc 100644
--- a/sys/netccitt/dll.h
+++ b/sys/netccitt/dll.h
@@ -33,6 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dll.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /* 
diff --git a/sys/netccitt/hd_debug.c b/sys/netccitt/hd_debug.c
index b8a45a3f59a..058a21caaff 100644
--- a/sys/netccitt/hd_debug.c
+++ b/sys/netccitt/hd_debug.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_debug.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/hd_input.c b/sys/netccitt/hd_input.c
index eb939d03199..9bdab0b72f9 100644
--- a/sys/netccitt/hd_input.c
+++ b/sys/netccitt/hd_input.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_input.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/hd_output.c b/sys/netccitt/hd_output.c
index 05992e1deb1..c1db5f08a15 100644
--- a/sys/netccitt/hd_output.c
+++ b/sys/netccitt/hd_output.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_output.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/hd_subr.c b/sys/netccitt/hd_subr.c
index c75ab07568e..7d051274a37 100644
--- a/sys/netccitt/hd_subr.c
+++ b/sys/netccitt/hd_subr.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_subr.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/hd_timer.c b/sys/netccitt/hd_timer.c
index a3bf12addf0..8b2ede482c7 100644
--- a/sys/netccitt/hd_timer.c
+++ b/sys/netccitt/hd_timer.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_timer.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/hd_var.h b/sys/netccitt/hd_var.h
index 5fefe0869a4..0ae196279dc 100644
--- a/sys/netccitt/hd_var.h
+++ b/sys/netccitt/hd_var.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hd_var.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netccitt/hdlc.h b/sys/netccitt/hdlc.h
index 60cf7adf072..62e717757be 100644
--- a/sys/netccitt/hdlc.h
+++ b/sys/netccitt/hdlc.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)hdlc.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #ifndef ORDER4
diff --git a/sys/netccitt/if_x25subr.c b/sys/netccitt/if_x25subr.c
index 6f00496a18b..68812f4303c 100644
--- a/sys/netccitt/if_x25subr.c
+++ b/sys/netccitt/if_x25subr.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_x25subr.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/llc_input.c b/sys/netccitt/llc_input.c
index 7a01973d979..94400c18285 100644
--- a/sys/netccitt/llc_input.c
+++ b/sys/netccitt/llc_input.c
@@ -37,6 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_input.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/llc_output.c b/sys/netccitt/llc_output.c
index 98d0328a5f5..aacba3d0c09 100644
--- a/sys/netccitt/llc_output.c
+++ b/sys/netccitt/llc_output.c
@@ -37,6 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_output.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/llc_subr.c b/sys/netccitt/llc_subr.c
index 46848fdf5bc..dd604a378f9 100644
--- a/sys/netccitt/llc_subr.c
+++ b/sys/netccitt/llc_subr.c
@@ -37,6 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_subr.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/llc_timer.c b/sys/netccitt/llc_timer.c
index 0aecd08b68d..06d3cf3c3f3 100644
--- a/sys/netccitt/llc_timer.c
+++ b/sys/netccitt/llc_timer.c
@@ -37,6 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_timer.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/llc_var.h b/sys/netccitt/llc_var.h
index a27db52d37a..18b6be96ac9 100644
--- a/sys/netccitt/llc_var.h
+++ b/sys/netccitt/llc_var.h
@@ -37,6 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_var.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #ifdef __STDC__
diff --git a/sys/netccitt/pk.h b/sys/netccitt/pk.h
index 528e0a68080..da96bf1adb9 100644
--- a/sys/netccitt/pk.h
+++ b/sys/netccitt/pk.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netccitt/pk_acct.c b/sys/netccitt/pk_acct.c
index fccd875285e..e05cf698785 100644
--- a/sys/netccitt/pk_acct.c
+++ b/sys/netccitt/pk_acct.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_acct.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_debug.c b/sys/netccitt/pk_debug.c
index b5103557c56..338d167b37f 100644
--- a/sys/netccitt/pk_debug.c
+++ b/sys/netccitt/pk_debug.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_debug.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_input.c b/sys/netccitt/pk_input.c
index 1f8f0bc7127..0438b84259d 100644
--- a/sys/netccitt/pk_input.c
+++ b/sys/netccitt/pk_input.c
@@ -39,6 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_input.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_llcsubr.c b/sys/netccitt/pk_llcsubr.c
index d8cc5016a28..7269fb29f22 100644
--- a/sys/netccitt/pk_llcsubr.c
+++ b/sys/netccitt/pk_llcsubr.c
@@ -37,6 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_llcsubr.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_output.c b/sys/netccitt/pk_output.c
index ccc02a4c327..95b6026c0f8 100644
--- a/sys/netccitt/pk_output.c
+++ b/sys/netccitt/pk_output.c
@@ -39,6 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_output.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_subr.c b/sys/netccitt/pk_subr.c
index 44c43b6f3f6..ffbc8576b0b 100644
--- a/sys/netccitt/pk_subr.c
+++ b/sys/netccitt/pk_subr.c
@@ -39,6 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_subr.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_timer.c b/sys/netccitt/pk_timer.c
index 52c1860b4b4..4b7db0a41de 100644
--- a/sys/netccitt/pk_timer.c
+++ b/sys/netccitt/pk_timer.c
@@ -39,6 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_timer.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_usrreq.c b/sys/netccitt/pk_usrreq.c
index d0dc42c0d40..1d1c0e70a1f 100644
--- a/sys/netccitt/pk_usrreq.c
+++ b/sys/netccitt/pk_usrreq.c
@@ -39,6 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_usrreq.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netccitt/pk_var.h b/sys/netccitt/pk_var.h
index beda05dc375..df29acfcbbe 100644
--- a/sys/netccitt/pk_var.h
+++ b/sys/netccitt/pk_var.h
@@ -39,6 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_var.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netccitt/x25.h b/sys/netccitt/x25.h
index e86af39a1a6..1fbbe3eb137 100644
--- a/sys/netccitt/x25.h
+++ b/sys/netccitt/x25.h
@@ -38,6 +38,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)x25.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #ifdef KERNEL
diff --git a/sys/netccitt/x25acct.h b/sys/netccitt/x25acct.h
index 71f3fd89603..ee5b3249070 100644
--- a/sys/netccitt/x25acct.h
+++ b/sys/netccitt/x25acct.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)x25acct.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netccitt/x25err.h b/sys/netccitt/x25err.h
index 44d5490b422..9cf5ade99f6 100644
--- a/sys/netccitt/x25err.h
+++ b/sys/netccitt/x25err.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)x25err.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /* 
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index beef16e1836..43534534241 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 41f07c017b8..3b9e3d84ec0 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 6b4def054f7..db5a3da5e50 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index cc240eb806f..e39d2d9945d 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
+ * $Id$
  */
 
 /* Internet Group Management Protocol (IGMP) routines. */
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index 29ce21dee6f..bb3462d2ddc 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /* Internet Group Management Protocol (IGMP) definitions. */
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index ff70f70e2b3..a0d380914c1 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp_var.h	8.1 (Berkeley) 7/19/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index bcf34e81693..a070c6d5f34 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.c	8.2 (Berkeley) 11/15/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 1ce9948f6e3..e25fb5d6f07 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c
index c19a9200836..daac1290376 100644
--- a/sys/netinet/in_cksum.c
+++ b/sys/netinet/in_cksum.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index a8b1c6f8cbf..f4a3287cecd 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.c	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index baa8be30a8b..5309b37cddc 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 9927c5acb59..fda64a13c94 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_proto.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index cbd8e539a1e..d8939a07879 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index d3d4c258d47..544d8017a37 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index 8a31dfaf13d..2542175e982 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index c9b82bca908..1b7f80a74eb 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index 3c3462d3266..583a049afc5 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index c720ff47f4c..38c341d82e9 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index bb26c874182..b07d9193e1b 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_mroute.c	8.2 (Berkeley) 11/15/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index adb40be9552..cbedcf5a17a 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 89c6de4ad59..f20ab71c85a 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 27eda5e67cd..c5bd50cc946 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index c8092ee9ec7..86c2b5a618e 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_ip.c	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index 6b77ff663a4..fc9ae26ee2e 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 typedef	u_long	tcp_seq;
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index ddb30927b4a..c759626b318 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #ifdef TCPDEBUG
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index c02c0cd521d..851809fb29b 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 struct	tcp_debug {
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index c5da7fc32d9..70518a93829 100644
--- a/sys/netinet/tcp_fsm.h
+++ b/sys/netinet/tcp_fsm.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 121cb94762f..d6e779bde4d 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.5 (Berkeley) 4/10/94
+ * $Id$
  */
 
 #ifndef TUBA_INCLUDE
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 667579fc0ed..92ad379133b 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_output.c	8.3 (Berkeley) 12/30/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 121cb94762f..d6e779bde4d 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.5 (Berkeley) 4/10/94
+ * $Id$
  */
 
 #ifndef TUBA_INCLUDE
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index 8912299ff79..7305eb7d704 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_seq.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index dd5940bbf4a..b0fd7a55fdf 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 0c0f0f8c2f1..3c7fb1fe932 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #ifndef TUBA_INCLUDE
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 7c31125e40f..19ea6c25d30 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index dd5940bbf4a..b0fd7a55fdf 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 37dac23af77..be544a6eea8 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 8a8e7512114..1b9730a1e8a 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.3 (Berkeley) 4/10/94
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index 5000ae303ce..3059c8e7cb3 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index 354a213cbc2..61a5021f35c 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 9ed53e8bef6..fbd83ae0ed5 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_usrreq.c	8.4 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index e8a21d261c5..8060ab028dd 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netiso/argo_debug.h b/sys/netiso/argo_debug.h
index 653982f005a..7aff1c20cd9 100644
--- a/sys/netiso/argo_debug.h
+++ b/sys/netiso/argo_debug.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)argo_debug.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*****************************************************************
@@ -60,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /* 
- * $Header: argo_debug.h,v 4.6 88/07/19 15:53:40 hagens Exp $
- * $Source: /usr/argo/sys/netiso/RCS/argo_debug.h,v $
+ * $Header: /home/ncvs/src/sys/netiso/argo_debug.h,v 1.1.1.1 1994/05/24 10:06:38 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/argo_debug.h,v $
  */
 
 #ifndef __ARGO_DEBUG__
diff --git a/sys/netiso/clnl.h b/sys/netiso/clnl.h
index 87227dc273b..ff5451af5b5 100644
--- a/sys/netiso/clnl.h
+++ b/sys/netiso/clnl.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnl.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
diff --git a/sys/netiso/clnp.h b/sys/netiso/clnp.h
index 4c81ba37d9c..541204bdf96 100644
--- a/sys/netiso/clnp.h
+++ b/sys/netiso/clnp.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp.h	8.2 (Berkeley) 4/16/94
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /big/BSD4.4/isis-usr/src/sys/netiso/RCS/clnp.h,v 1.1 1992/02/07 18:14:59 hagens Exp hagens $ */
-/* $Source: /big/BSD4.4/isis-usr/src/sys/netiso/RCS/clnp.h,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp.h,v 1.1.1.1 1994/05/24 10:07:27 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/clnp.h,v $ */
 
 /* should be config option but cpp breaks with too many #defines */
 #define	DECBIT
diff --git a/sys/netiso/clnp_debug.c b/sys/netiso/clnp_debug.c
index 964638e244b..d3898349a3c 100644
--- a/sys/netiso/clnp_debug.c
+++ b/sys/netiso/clnp_debug.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_debug.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: clnp_debug.c,v 4.2 88/06/29 14:58:34 hagens Exp $ */
-/* $Source: /usr/argo/sys/netargo/RCS/clnp_debug.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_debug.c,v 1.1.1.1 1994/05/24 10:07:26 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/clnp_debug.c,v $ */
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/netiso/clnp_er.c b/sys/netiso/clnp_er.c
index 8b7f45b77a4..fb17e5f3688 100644
--- a/sys/netiso/clnp_er.c
+++ b/sys/netiso/clnp_er.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_er.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /var/src/sys/netiso/RCS/clnp_er.c,v 5.1 89/02/09 16:20:18 hagens Exp $ */
-/* $Source: /var/src/sys/netiso/RCS/clnp_er.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_er.c,v 1.1.1.1 1994/05/24 10:07:26 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/clnp_er.c,v $ */
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/netiso/clnp_frag.c b/sys/netiso/clnp_frag.c
index 546a592ccf7..50e13d413a5 100644
--- a/sys/netiso/clnp_frag.c
+++ b/sys/netiso/clnp_frag.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_frag.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /var/src/sys/netiso/RCS/clnp_frag.c,v 5.1 89/02/09 16:20:26 hagens Exp $ */
-/* $Source: /var/src/sys/netiso/RCS/clnp_frag.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_frag.c,v 1.1.1.1 1994/05/24 10:07:25 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/clnp_frag.c,v $ */
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netiso/clnp_input.c b/sys/netiso/clnp_input.c
index c49de95e5fa..362bd8745c4 100644
--- a/sys/netiso/clnp_input.c
+++ b/sys/netiso/clnp_input.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_input.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /var/src/sys/netiso/RCS/clnp_input.c,v 5.1 89/02/09 16:20:32 hagens Exp $ */
-/* $Source: /var/src/sys/netiso/RCS/clnp_input.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_input.c,v 1.1.1.1 1994/05/24 10:07:24 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/clnp_input.c,v $ */
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/netiso/clnp_options.c b/sys/netiso/clnp_options.c
index 250b438664f..de44ff0ffb6 100644
--- a/sys/netiso/clnp_options.c
+++ b/sys/netiso/clnp_options.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_options.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /var/src/sys/netiso/RCS/clnp_options.c,v 5.1 89/02/09 16:20:37 hagens Exp $ */
-/* $Source: /var/src/sys/netiso/RCS/clnp_options.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_options.c,v 1.1.1.1 1994/05/24 10:07:23 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/clnp_options.c,v $ */
 
 #ifdef ISO
 
diff --git a/sys/netiso/clnp_output.c b/sys/netiso/clnp_output.c
index aba9f6e00bd..de035c22f16 100644
--- a/sys/netiso/clnp_output.c
+++ b/sys/netiso/clnp_output.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_output.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /var/src/sys/netiso/RCS/clnp_output.c,v 5.0 89/02/08 12:00:15 hagens Exp $ */
-/* $Source: /var/src/sys/netiso/RCS/clnp_output.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_output.c,v 1.1.1.1 1994/05/24 10:07:22 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/clnp_output.c,v $ */
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/netiso/clnp_raw.c b/sys/netiso/clnp_raw.c
index 0bc3dbac4b1..df6878c65e3 100644
--- a/sys/netiso/clnp_raw.c
+++ b/sys/netiso/clnp_raw.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_raw.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: clnp_raw.c,v 4.2 88/06/29 14:58:56 hagens Exp $ */
-/* $Source: /usr/argo/sys/netiso/RCS/clnp_raw.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_raw.c,v 1.1.1.1 1994/05/24 10:07:22 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/clnp_raw.c,v $ */
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/netiso/clnp_stat.h b/sys/netiso/clnp_stat.h
index 07cd72c63e4..dff55adeb90 100644
--- a/sys/netiso/clnp_stat.h
+++ b/sys/netiso/clnp_stat.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_stat.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /var/src/sys/netiso/RCS/clnp_stat.h,v 5.1 89/02/09 16:20:42 hagens Exp $ */
-/* $Source: /var/src/sys/netiso/RCS/clnp_stat.h,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_stat.h,v 1.1.1.1 1994/05/24 10:07:21 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/clnp_stat.h,v $ */
 
 
 #ifndef __CLNP_STAT__
diff --git a/sys/netiso/clnp_subr.c b/sys/netiso/clnp_subr.c
index c877811be16..29a2ab14921 100644
--- a/sys/netiso/clnp_subr.c
+++ b/sys/netiso/clnp_subr.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_subr.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /var/src/sys/netiso/RCS/clnp_subr.c,v 5.1 89/02/09 16:20:46 hagens Exp $ */
-/* $Source: /var/src/sys/netiso/RCS/clnp_subr.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_subr.c,v 1.1.1.1 1994/05/24 10:07:20 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/clnp_subr.c,v $ */
 
 #ifdef ISO
 
diff --git a/sys/netiso/clnp_timer.c b/sys/netiso/clnp_timer.c
index 718d5302f77..a6247395b68 100644
--- a/sys/netiso/clnp_timer.c
+++ b/sys/netiso/clnp_timer.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_timer.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: clnp_timer.c,v 4.2 88/06/29 14:59:05 hagens Exp $ */
-/* $Source: /usr/argo/sys/netiso/RCS/clnp_timer.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_timer.c,v 1.1.1.1 1994/05/24 10:07:20 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/clnp_timer.c,v $ */
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/sys/netiso/cltp_usrreq.c b/sys/netiso/cltp_usrreq.c
index 93f8d1c398e..5b6f44080aa 100644
--- a/sys/netiso/cltp_usrreq.c
+++ b/sys/netiso/cltp_usrreq.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cltp_usrreq.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #ifndef CLTPOVAL_SRC /* XXX -- till files gets changed */
diff --git a/sys/netiso/cltp_var.h b/sys/netiso/cltp_var.h
index b4e08f2c99b..7c4948c4632 100644
--- a/sys/netiso/cltp_var.h
+++ b/sys/netiso/cltp_var.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cltp_var.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #define UD_TPDU_type	0x40	/* packet type */
diff --git a/sys/netiso/cons.h b/sys/netiso/cons.h
index b0739de1eac..5b0faedabda 100644
--- a/sys/netiso/cons.h
+++ b/sys/netiso/cons.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cons.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -60,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: cons.h,v 4.4 88/09/09 19:01:28 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/cons.h,v $
+ * $Header: /home/ncvs/src/sys/netiso/cons.h,v 1.1.1.1 1994/05/24 10:07:18 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/cons.h,v $
  *
  * interface between TP and CONS
  */
diff --git a/sys/netiso/cons_pcb.h b/sys/netiso/cons_pcb.h
index b8adc373947..c132b560689 100644
--- a/sys/netiso/cons_pcb.h
+++ b/sys/netiso/cons_pcb.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cons_pcb.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: cons_pcb.h,v 4.2 88/06/29 14:59:08 hagens Exp $ */
-/* $Source: /usr/argo/sys/netiso/RCS/cons_pcb.h,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/cons_pcb.h,v 1.1.1.1 1994/05/24 10:07:17 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/cons_pcb.h,v $ */
 
 /*
  * protocol control block for the connection oriented network service
diff --git a/sys/netiso/eonvar.h b/sys/netiso/eonvar.h
index 93f99172f74..946652622f0 100644
--- a/sys/netiso/eonvar.h
+++ b/sys/netiso/eonvar.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)eonvar.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
diff --git a/sys/netiso/esis.c b/sys/netiso/esis.c
index f4ade0f4fc9..03ecedca5a0 100644
--- a/sys/netiso/esis.c
+++ b/sys/netiso/esis.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)esis.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
diff --git a/sys/netiso/esis.h b/sys/netiso/esis.h
index 81dd74ac310..317603604d1 100644
--- a/sys/netiso/esis.h
+++ b/sys/netiso/esis.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)esis.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -60,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- *	$Header: esis.h,v 4.7 88/09/15 11:24:18 hagens Exp $
- *	$Source: /usr/argo/sys/netiso/RCS/esis.h,v $
+ *	$Header: /home/ncvs/src/sys/netiso/esis.h,v 1.1.1.1 1994/05/24 10:07:15 rgrimes Exp $
+ *	$Source: /home/ncvs/src/sys/netiso/esis.h,v $
  */
 
 #ifndef BYTE_ORDER
diff --git a/sys/netiso/idrp_usrreq.c b/sys/netiso/idrp_usrreq.c
index 3109936b415..b5512312c3d 100644
--- a/sys/netiso/idrp_usrreq.c
+++ b/sys/netiso/idrp_usrreq.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idrp_usrreq.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netiso/if_cons.c b/sys/netiso/if_cons.c
index 7724b048be5..4878365197d 100644
--- a/sys/netiso/if_cons.c
+++ b/sys/netiso/if_cons.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_cons.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -60,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: if_cons.c,v 4.7 88/08/11 15:52:55 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/if_cons.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/if_cons.c,v 1.1.1.1 1994/05/24 10:07:14 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/if_cons.c,v $
  *
  * cons.c - Connection Oriented Network Service:
  * including support for a) user transport-level service, 
diff --git a/sys/netiso/if_eon.c b/sys/netiso/if_eon.c
index 3c05133040a..75e92648297 100644
--- a/sys/netiso/if_eon.c
+++ b/sys/netiso/if_eon.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_eon.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -60,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: if_eon.c,v 1.4 88/07/19 15:53:59 hagens Exp $ 
- * $Source: /usr/argo/sys/netiso/RCS/if_eon.c,v $ 
+ * $Header: /home/ncvs/src/sys/netiso/if_eon.c,v 1.1.1.1 1994/05/24 10:07:13 rgrimes Exp $ 
+ * $Source: /home/ncvs/src/sys/netiso/if_eon.c,v $ 
  *
  *	EON rfc 
  *  Layer between IP and CLNL
diff --git a/sys/netiso/iso.c b/sys/netiso/iso.c
index cd64e687152..922947fc59e 100644
--- a/sys/netiso/iso.c
+++ b/sys/netiso/iso.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.c	8.2 (Berkeley) 11/15/93
+ * $Id$
  */
 
 /***********************************************************
@@ -60,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: iso.c,v 4.11 88/09/19 14:58:35 root Exp $ 
- * $Source: /usr/argo/sys/netiso/RCS/iso.c,v $ 
+ * $Header: /home/ncvs/src/sys/netiso/iso.c,v 1.1.1.1 1994/05/24 10:07:13 rgrimes Exp $ 
+ * $Source: /home/ncvs/src/sys/netiso/iso.c,v $ 
  *
  * iso.c: miscellaneous routines to support the iso address family
  */
diff --git a/sys/netiso/iso.h b/sys/netiso/iso.h
index 9237e6aaa73..ad5043d9d57 100644
--- a/sys/netiso/iso.h
+++ b/sys/netiso/iso.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: iso.h,v 4.9 88/09/11 18:06:38 hagens Exp $ */
-/* $Source: /usr/argo/sys/netiso/RCS/iso.h,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/iso.h,v 1.1.1.1 1994/05/24 10:07:12 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/iso.h,v $ */
 
 #ifndef __ISO__
 #define __ISO__
diff --git a/sys/netiso/iso_chksum.c b/sys/netiso/iso_chksum.c
index 5b1aae59e16..c95a9b7fed4 100644
--- a/sys/netiso/iso_chksum.c
+++ b/sys/netiso/iso_chksum.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_chksum.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -60,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /* 
- * $Header: iso_chksum.c,v 4.7 88/07/29 15:31:26 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/iso_chksum.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/iso_chksum.c,v 1.1.1.1 1994/05/24 10:07:12 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/iso_chksum.c,v $
  *
  * ISO CHECKSUM
  *
diff --git a/sys/netiso/iso_errno.h b/sys/netiso/iso_errno.h
index 0d75589ca0e..3516908c53c 100644
--- a/sys/netiso/iso_errno.h
+++ b/sys/netiso/iso_errno.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_errno.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
diff --git a/sys/netiso/iso_pcb.c b/sys/netiso/iso_pcb.c
index 0b50c603422..ad91ff41f7c 100644
--- a/sys/netiso/iso_pcb.c
+++ b/sys/netiso/iso_pcb.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_pcb.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -60,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: iso_pcb.c,v 4.5 88/06/29 14:59:56 hagens Exp $
- * $Source: /usr/argo/sys/netiso/RCS/iso_pcb.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/iso_pcb.c,v 1.1.1.1 1994/05/24 10:07:10 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/iso_pcb.c,v $
  *
  * Iso address family net-layer(s) pcb stuff. NEH 1/29/87
  */
diff --git a/sys/netiso/iso_pcb.h b/sys/netiso/iso_pcb.h
index aad76bcc065..015d578c300 100644
--- a/sys/netiso/iso_pcb.h
+++ b/sys/netiso/iso_pcb.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_pcb.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: iso_pcb.h,v 4.3 88/06/29 15:00:01 hagens Exp $ */
-/* $Source: /usr/argo/sys/netiso/RCS/iso_pcb.h,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/iso_pcb.h,v 1.1.1.1 1994/05/24 10:07:10 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/iso_pcb.h,v $ */
 
 #define	MAXX25CRUDLEN	16	/* 16 bytes of call request user data */
 
diff --git a/sys/netiso/iso_proto.c b/sys/netiso/iso_proto.c
index 59575c7513b..6706e570a65 100644
--- a/sys/netiso/iso_proto.c
+++ b/sys/netiso/iso_proto.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_proto.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: iso_proto.c,v 4.4 88/09/08 08:38:42 hagens Exp $ 
- * $Source: /usr/argo/sys/netiso/RCS/iso_proto.c,v $ 
+/* $Header: /home/ncvs/src/sys/netiso/iso_proto.c,v 1.1.1.1 1994/05/24 10:07:09 rgrimes Exp $ 
+ * $Source: /home/ncvs/src/sys/netiso/iso_proto.c,v $ 
  *
  * iso_proto.c : protocol switch tables in the ISO domain
  *
diff --git a/sys/netiso/iso_snpac.c b/sys/netiso/iso_snpac.c
index 2473ae7a12d..5ade7aea8e4 100644
--- a/sys/netiso/iso_snpac.c
+++ b/sys/netiso/iso_snpac.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_snpac.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: iso_snpac.c,v 1.8 88/09/19 13:51:36 hagens Exp $ */
-/* $Source: /usr/argo/sys/netiso/RCS/iso_snpac.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/iso_snpac.c,v 1.1.1.1 1994/05/24 10:07:07 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/iso_snpac.c,v $ */
 
 #ifdef ISO
 
diff --git a/sys/netiso/iso_snpac.h b/sys/netiso/iso_snpac.h
index 105e8dd11d6..3bc1114287f 100644
--- a/sys/netiso/iso_snpac.h
+++ b/sys/netiso/iso_snpac.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_snpac.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
diff --git a/sys/netiso/iso_var.h b/sys/netiso/iso_var.h
index 946aeea93fe..b470db105d6 100644
--- a/sys/netiso/iso_var.h
+++ b/sys/netiso/iso_var.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_var.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -59,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: iso_var.h,v 4.2 88/06/29 15:00:08 hagens Exp $
- * $Source: /usr/argo/sys/netiso/RCS/iso_var.h,v $
+/* $Header: /home/ncvs/src/sys/netiso/iso_var.h,v 1.1.1.1 1994/05/24 10:07:03 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/iso_var.h,v $
  */
 
 /*
diff --git a/sys/netiso/tp_astring.c b/sys/netiso/tp_astring.c
index af08cebbc86..5bfa7111510 100644
--- a/sys/netiso/tp_astring.c
+++ b/sys/netiso/tp_astring.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_astring.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 char *tp_sstring[] = {
diff --git a/sys/netiso/tp_clnp.h b/sys/netiso/tp_clnp.h
index 81a7cffc13e..aecca194500 100644
--- a/sys/netiso/tp_clnp.h
+++ b/sys/netiso/tp_clnp.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_clnp.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_clnp.h,v 5.1 88/10/12 12:16:36 root Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_clnp.h,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_clnp.h,v 1.1.1.1 1994/05/24 10:07:00 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_clnp.h,v $
  *
  * AF_ISO net-dependent structures and include files
  *
diff --git a/sys/netiso/tp_cons.c b/sys/netiso/tp_cons.c
index 797ee9ef829..b40cd06cf7e 100644
--- a/sys/netiso/tp_cons.c
+++ b/sys/netiso/tp_cons.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_cons.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -61,8 +62,8 @@ SOFTWARE.
  */
 /* 
  * ARGO TP
- * $Header: tp_cons.c,v 5.6 88/11/18 17:27:13 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_cons.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_cons.c,v 1.1.1.1 1994/05/24 10:06:58 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_cons.c,v $
  *
  * Here is where you find the iso- and cons-dependent code.  We've tried
  * keep all net-level and (primarily) address-family-dependent stuff
diff --git a/sys/netiso/tp_driver.c b/sys/netiso/tp_driver.c
index 586ef4e2ade..ead2c892906 100644
--- a/sys/netiso/tp_driver.c
+++ b/sys/netiso/tp_driver.c
@@ -1,8 +1,6 @@
-/* $Header$ */
-/* $Source$ */
-#ifndef lint
-static char *rcsid = "$Header/**/$";
-#endif lint
+/*
+ * $Id$
+ */
 #define _XEBEC_PG static
 
 #include "tp_states.h"
diff --git a/sys/netiso/tp_emit.c b/sys/netiso/tp_emit.c
index 16ed5bc7b7b..0c9a831ed58 100644
--- a/sys/netiso/tp_emit.c
+++ b/sys/netiso/tp_emit.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_emit.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_emit.c,v 5.5 88/11/18 17:27:20 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_emit.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_emit.c,v 1.1.1.1 1994/05/24 10:06:56 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_emit.c,v $
  *
  * This file contains tp_emit() and tp_error_emit(), which
  * form TPDUs and hand them to ip.
diff --git a/sys/netiso/tp_events.h b/sys/netiso/tp_events.h
index 48222830a0d..68379043582 100644
--- a/sys/netiso/tp_events.h
+++ b/sys/netiso/tp_events.h
@@ -1,5 +1,6 @@
-/* $Header$ */
-/* $Source$ */
+/*
+ * $Id$
+ */
 struct tp_event {
 	int ev_number;
 	 struct timeval e_time; 
diff --git a/sys/netiso/tp_inet.c b/sys/netiso/tp_inet.c
index fb013718ba2..f4fc35f680c 100644
--- a/sys/netiso/tp_inet.c
+++ b/sys/netiso/tp_inet.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_inet.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -61,8 +62,8 @@ SOFTWARE.
  */
 /* 
  * ARGO TP
- * $Header: tp_inet.c,v 5.3 88/11/18 17:27:29 nhall Exp $ 
- * $Source: /usr/argo/sys/netiso/RCS/tp_inet.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_inet.c,v 1.1.1.1 1994/05/24 10:06:55 rgrimes Exp $ 
+ * $Source: /home/ncvs/src/sys/netiso/tp_inet.c,v $
  *
  * Here is where you find the inet-dependent code.  We've tried
  * keep all net-level and (primarily) address-family-dependent stuff
diff --git a/sys/netiso/tp_input.c b/sys/netiso/tp_input.c
index a071a5d4add..1eac4061b32 100644
--- a/sys/netiso/tp_input.c
+++ b/sys/netiso/tp_input.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_input.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_input.c,v 5.6 88/11/18 17:27:38 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_input.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_input.c,v 1.1.1.1 1994/05/24 10:06:54 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_input.c,v $
  *
  * tp_input() gets an mbuf chain from ip.  Actually, not directly
  * from ip, because ip calls a net-level routine that strips off
diff --git a/sys/netiso/tp_ip.h b/sys/netiso/tp_ip.h
index f2777676e13..63a50ccdef8 100644
--- a/sys/netiso/tp_ip.h
+++ b/sys/netiso/tp_ip.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_ip.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_ip.h,v 5.1 88/10/12 12:19:47 root Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_ip.h,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_ip.h,v 1.1.1.1 1994/05/24 10:06:53 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_ip.h,v $
  *
  * internet IP-dependent structures and include files
  *
diff --git a/sys/netiso/tp_iso.c b/sys/netiso/tp_iso.c
index 1cf67f86648..21f3f7db313 100644
--- a/sys/netiso/tp_iso.c
+++ b/sys/netiso/tp_iso.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_iso.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -61,8 +62,8 @@ SOFTWARE.
  */
 /* 
  * ARGO TP
- * $Header: /var/src/sys/netiso/RCS/tp_iso.c,v 5.1 89/02/09 16:20:51 hagens Exp $
- * $Source: /var/src/sys/netiso/RCS/tp_iso.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_iso.c,v 1.1.1.1 1994/05/24 10:06:52 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_iso.c,v $
  *
  * Here is where you find the iso-dependent code.  We've tried
  * keep all net-level and (primarily) address-family-dependent stuff
diff --git a/sys/netiso/tp_meas.c b/sys/netiso/tp_meas.c
index f8bbbe6dceb..460403e0eab 100644
--- a/sys/netiso/tp_meas.c
+++ b/sys/netiso/tp_meas.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_meas.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -60,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: tp_meas.c,v 5.2 88/11/18 17:28:04 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_meas.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_meas.c,v 1.1.1.1 1994/05/24 10:06:52 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_meas.c,v $
  * 
  * tp_meas.c : create a performance measurement event
  * in the circular buffer tp_Meas[]
diff --git a/sys/netiso/tp_meas.h b/sys/netiso/tp_meas.h
index 10ef93d350b..ab61124cb87 100644
--- a/sys/netiso/tp_meas.h
+++ b/sys/netiso/tp_meas.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_meas.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
diff --git a/sys/netiso/tp_output.c b/sys/netiso/tp_output.c
index cdd7c4fe76b..35ba0bed1de 100644
--- a/sys/netiso/tp_output.c
+++ b/sys/netiso/tp_output.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_output.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_output.c,v 5.4 88/11/18 17:28:08 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_output.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_output.c,v 1.1.1.1 1994/05/24 10:06:50 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_output.c,v $
  *
  * In here is tp_ctloutput(), the guy called by [sg]etsockopt(),
  */
diff --git a/sys/netiso/tp_param.h b/sys/netiso/tp_param.h
index f1862a24392..16d4153d680 100644
--- a/sys/netiso/tp_param.h
+++ b/sys/netiso/tp_param.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_param.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_param.h,v 5.3 88/11/18 17:28:18 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_param.h,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_param.h,v 1.1.1.1 1994/05/24 10:06:50 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_param.h,v $
  *
  */
 
diff --git a/sys/netiso/tp_pcb.c b/sys/netiso/tp_pcb.c
index de345c1e377..f35761b9ac0 100644
--- a/sys/netiso/tp_pcb.c
+++ b/sys/netiso/tp_pcb.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_pcb.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_pcb.c,v 5.4 88/11/18 17:28:24 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_pcb.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_pcb.c,v 1.1.1.1 1994/05/24 10:06:49 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_pcb.c,v $
  *
  *
  * This is the initialization and cleanup stuff - 
diff --git a/sys/netiso/tp_pcb.h b/sys/netiso/tp_pcb.h
index 0353cb47b20..86e414dc458 100644
--- a/sys/netiso/tp_pcb.h
+++ b/sys/netiso/tp_pcb.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_pcb.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_pcb.h,v 5.2 88/11/18 17:09:32 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_pcb.h,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_pcb.h,v 1.1.1.1 1994/05/24 10:06:49 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_pcb.h,v $
  *
  * 
  * This file defines the transport protocol control block (tpcb).
diff --git a/sys/netiso/tp_seq.h b/sys/netiso/tp_seq.h
index f14e5ae7c7d..046f38b463d 100644
--- a/sys/netiso/tp_seq.h
+++ b/sys/netiso/tp_seq.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_seq.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_seq.h,v 5.1 88/10/12 12:20:59 root Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_seq.h,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_seq.h,v 1.1.1.1 1994/05/24 10:06:48 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_seq.h,v $
  *
  * These macros perform sequence number arithmetic modulo (2**7 or 2**31).
  * The relevant fields in the tpcb are:
diff --git a/sys/netiso/tp_stat.h b/sys/netiso/tp_stat.h
index bf6e1a5e124..c18869de400 100644
--- a/sys/netiso/tp_stat.h
+++ b/sys/netiso/tp_stat.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_stat.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_stat.h,v 5.4 88/11/18 17:28:38 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_stat.h,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_stat.h,v 1.1.1.1 1994/05/24 10:06:47 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_stat.h,v $
  *
  * Here are the data structures in which the global
  * statistics(counters) are gathered.
diff --git a/sys/netiso/tp_states.h b/sys/netiso/tp_states.h
index ac6213a64d7..d3d015645fa 100644
--- a/sys/netiso/tp_states.h
+++ b/sys/netiso/tp_states.h
@@ -1,6 +1,6 @@
-/* $Header$ */
-/* $Source$ */
-#define ST_ERROR 0x0
+/*
+ * $Id$
+ */
 #define TP_CLOSED 0x1
 #define TP_CRSENT 0x2
 #define TP_AKWAIT 0x3
diff --git a/sys/netiso/tp_subr.c b/sys/netiso/tp_subr.c
index 1259ee41253..7b92db74e53 100644
--- a/sys/netiso/tp_subr.c
+++ b/sys/netiso/tp_subr.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_subr.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_subr.c,v 5.3 88/11/18 17:28:43 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_subr.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_subr.c,v 1.1.1.1 1994/05/24 10:06:46 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_subr.c,v $
  *
  * The main work of data transfer is done here.
  * These routines are called from tp.trans.
diff --git a/sys/netiso/tp_subr2.c b/sys/netiso/tp_subr2.c
index 60c7ce2a50b..a0c59dcec70 100644
--- a/sys/netiso/tp_subr2.c
+++ b/sys/netiso/tp_subr2.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_subr2.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_subr2.c,v 5.5 88/11/18 17:28:55 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_subr2.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_subr2.c,v 1.1.1.1 1994/05/24 10:06:45 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_subr2.c,v $
  *
  * Some auxiliary routines:
  * 	tp_protocol_error: required by xebec- called when a combo of state,
diff --git a/sys/netiso/tp_timer.c b/sys/netiso/tp_timer.c
index b3a0be3a945..34fa0cc3b7f 100644
--- a/sys/netiso/tp_timer.c
+++ b/sys/netiso/tp_timer.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_timer.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_timer.c,v 5.2 88/11/18 17:29:07 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_timer.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_timer.c,v 1.1.1.1 1994/05/24 10:06:44 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_timer.c,v $
  *
  */
 
diff --git a/sys/netiso/tp_timer.h b/sys/netiso/tp_timer.h
index a6f7735586b..966745bdc93 100644
--- a/sys/netiso/tp_timer.h
+++ b/sys/netiso/tp_timer.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_timer.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_timer.h,v 5.1 88/10/12 12:21:41 root Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_timer.h,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_timer.h,v 1.1.1.1 1994/05/24 10:06:43 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_timer.h,v $
  *
  * ARGO TP
  * The callout structures used by the tp timers.
diff --git a/sys/netiso/tp_tpdu.h b/sys/netiso/tp_tpdu.h
index 15f130d1703..5779d5dc659 100644
--- a/sys/netiso/tp_tpdu.h
+++ b/sys/netiso/tp_tpdu.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_tpdu.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_tpdu.h,v 4.4 88/07/26 16:45:40 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_tpdu.h,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_tpdu.h,v 1.1.1.1 1994/05/24 10:06:43 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_tpdu.h,v $
  *
  * This ghastly set of macros makes it possible to
  * refer to tpdu structures without going mad.
diff --git a/sys/netiso/tp_trace.c b/sys/netiso/tp_trace.c
index 115597bf472..1f80e84f841 100644
--- a/sys/netiso/tp_trace.c
+++ b/sys/netiso/tp_trace.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_trace.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_trace.c,v 5.3 88/11/18 17:29:14 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_trace.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_trace.c,v 1.1.1.1 1994/05/24 10:06:42 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_trace.c,v $
  *
  * The whole protocol trace module.
  * We keep a circular buffer of trace structures, which are big
diff --git a/sys/netiso/tp_trace.h b/sys/netiso/tp_trace.h
index 885730549e5..b6b36e24496 100644
--- a/sys/netiso/tp_trace.h
+++ b/sys/netiso/tp_trace.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_trace.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_trace.h,v 5.1 88/10/12 12:21:51 root Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_trace.h,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_trace.h,v 1.1.1.1 1994/05/24 10:06:42 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_trace.h,v $
  *
  * 
  * Definitions needed for the protocol trace mechanism.
diff --git a/sys/netiso/tp_user.h b/sys/netiso/tp_user.h
index b81491b7650..557d12ad1e7 100644
--- a/sys/netiso/tp_user.h
+++ b/sys/netiso/tp_user.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_user.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_user.h,v 5.2 88/11/04 15:44:44 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_user.h,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_user.h,v 1.1.1.1 1994/05/24 10:06:41 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_user.h,v $
  *
  * These are the values a real-live user ;-) needs. 
  */
diff --git a/sys/netiso/tp_usrreq.c b/sys/netiso/tp_usrreq.c
index 8060c947f54..898b3606c53 100644
--- a/sys/netiso/tp_usrreq.c
+++ b/sys/netiso/tp_usrreq.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_usrreq.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /***********************************************************
@@ -62,8 +63,8 @@ SOFTWARE.
 /* 
  * ARGO TP
  *
- * $Header: tp_usrreq.c,v 5.4 88/11/18 17:29:18 nhall Exp $
- * $Source: /usr/argo/sys/netiso/RCS/tp_usrreq.c,v $
+ * $Header: /home/ncvs/src/sys/netiso/tp_usrreq.c,v 1.1.1.1 1994/05/24 10:06:40 rgrimes Exp $
+ * $Source: /home/ncvs/src/sys/netiso/tp_usrreq.c,v $
  *
  * tp_usrreq(), the fellow that gets called from most of the socket code.
  * Pretty straighforward.
diff --git a/sys/netiso/tuba_subr.c b/sys/netiso/tuba_subr.c
index d346927255c..b7131ad3e2c 100644
--- a/sys/netiso/tuba_subr.c
+++ b/sys/netiso/tuba_subr.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tuba_subr.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netiso/tuba_table.c b/sys/netiso/tuba_table.c
index a1bf5f98de0..0b0a977bf5a 100644
--- a/sys/netiso/tuba_table.c
+++ b/sys/netiso/tuba_table.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tuba_table.c	8.2 (Berkeley) 11/15/93
+ * $Id$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netiso/tuba_table.h b/sys/netiso/tuba_table.h
index 6be8afaf523..501544625a5 100644
--- a/sys/netiso/tuba_table.h
+++ b/sys/netiso/tuba_table.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tuba_table.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 struct tuba_cache {
diff --git a/sys/netiso/tuba_usrreq.c b/sys/netiso/tuba_usrreq.c
index 2d9211707a4..e1e922ab652 100644
--- a/sys/netiso/tuba_usrreq.c
+++ b/sys/netiso/tuba_usrreq.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tuba_usrreq.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/idp.h b/sys/netns/idp.h
index 254208dfad8..b3df648afab 100644
--- a/sys/netns/idp.h
+++ b/sys/netns/idp.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c
index b548a12574b..31eb5e8b0ce 100644
--- a/sys/netns/idp_usrreq.c
+++ b/sys/netns/idp_usrreq.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp_usrreq.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/idp_var.h b/sys/netns/idp_var.h
index fc9a4f45d81..c1e52ecd664 100644
--- a/sys/netns/idp_var.h
+++ b/sys/netns/idp_var.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp_var.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netns/ns.c b/sys/netns/ns.c
index 8b76543fce3..e465c937502 100644
--- a/sys/netns/ns.c
+++ b/sys/netns/ns.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns.c	8.2 (Berkeley) 11/15/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns.h b/sys/netns/ns.h
index cf51f0047e9..69af051c366 100644
--- a/sys/netns/ns.h
+++ b/sys/netns/ns.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netns/ns_cksum.c b/sys/netns/ns_cksum.c
index 52eba8bce81..617fb2c0f2e 100644
--- a/sys/netns/ns_cksum.c
+++ b/sys/netns/ns_cksum.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_cksum.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_error.c b/sys/netns/ns_error.c
index 03473a23680..56261660934 100644
--- a/sys/netns/ns_error.c
+++ b/sys/netns/ns_error.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_error.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_error.h b/sys/netns/ns_error.h
index 992911f1552..628de176372 100644
--- a/sys/netns/ns_error.h
+++ b/sys/netns/ns_error.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_error.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netns/ns_if.h b/sys/netns/ns_if.h
index 3abb284a1dd..f4f9f64d84f 100644
--- a/sys/netns/ns_if.h
+++ b/sys/netns/ns_if.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_if.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c
index 7a6e1babc7c..91a5b31c9f1 100644
--- a/sys/netns/ns_input.c
+++ b/sys/netns/ns_input.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_input.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c
index 09deb8fe7c4..c10af1f142b 100644
--- a/sys/netns/ns_ip.c
+++ b/sys/netns/ns_ip.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_ip.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netns/ns_output.c b/sys/netns/ns_output.c
index 4c9f364f1ea..8b044896d4e 100644
--- a/sys/netns/ns_output.c
+++ b/sys/netns/ns_output.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_output.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_pcb.c b/sys/netns/ns_pcb.c
index ca88472d594..155d6ba1734 100644
--- a/sys/netns/ns_pcb.c
+++ b/sys/netns/ns_pcb.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_pcb.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_pcb.h b/sys/netns/ns_pcb.h
index 68cf744f738..f63c31be2b3 100644
--- a/sys/netns/ns_pcb.h
+++ b/sys/netns/ns_pcb.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_pcb.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netns/ns_proto.c b/sys/netns/ns_proto.c
index fc9f8238c55..a19e8cbc420 100644
--- a/sys/netns/ns_proto.c
+++ b/sys/netns/ns_proto.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_proto.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/sp.h b/sys/netns/sp.h
index b55dac26039..fb84740289a 100644
--- a/sys/netns/sp.h
+++ b/sys/netns/sp.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sp.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netns/spidp.h b/sys/netns/spidp.h
index 332df5be235..19c6bfaa52e 100644
--- a/sys/netns/spidp.h
+++ b/sys/netns/spidp.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spidp.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netns/spp_debug.c b/sys/netns/spp_debug.c
index eaa1d023f87..f979a1ec9b8 100644
--- a/sys/netns/spp_debug.c
+++ b/sys/netns/spp_debug.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_debug.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/spp_debug.h b/sys/netns/spp_debug.h
index 8dfe2422069..6ad091ddaa7 100644
--- a/sys/netns/spp_debug.h
+++ b/sys/netns/spp_debug.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_debug.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 struct	spp_debug {
diff --git a/sys/netns/spp_timer.h b/sys/netns/spp_timer.h
index f84e3282a23..0a02fef80dc 100644
--- a/sys/netns/spp_timer.h
+++ b/sys/netns/spp_timer.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_timer.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c
index 062bbec5fab..08aee83d626 100644
--- a/sys/netns/spp_usrreq.c
+++ b/sys/netns/spp_usrreq.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_usrreq.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/spp_var.h b/sys/netns/spp_var.h
index 0d44f63904f..cc4fbf4687d 100644
--- a/sys/netns/spp_var.h
+++ b/sys/netns/spp_var.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_var.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index 261fd42657a..82fa6ca56d6 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index 9ef81fe7199..893aabf9178 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_bio.c	8.5 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index d17cde79f60..f4e9cbfa395 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfs_common.h b/sys/nfs/nfs_common.h
index 879db360057..4a849db66ae 100644
--- a/sys/nfs/nfs_common.h
+++ b/sys/nfs/nfs_common.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.1 (Berkeley) 6/16/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 9c70c535820..2054fdf3cb1 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.2 (Berkeley) 12/30/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index 7ba69e5b859..ba388adb782 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_nqlease.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 32b0da20dd2..4ae812028f2 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index c00f7d06cc7..a7b3dfc66ac 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.3 (Berkeley) 1/12/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index 45bfe1bb042..5cdd84c4994 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_srvcache.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index d17cde79f60..f4e9cbfa395 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index b00a225de34..ef134f691d9 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 1f186760689..d806e26a533 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 9e76ded9843..6d7eb922aa4 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.5 (Berkeley) 2/13/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h
index 74e6b7bca43..7fed901baf8 100644
--- a/sys/nfs/nfsdiskless.h
+++ b/sys/nfs/nfsdiskless.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfsm_subs.h b/sys/nfs/nfsm_subs.h
index 879db360057..4a849db66ae 100644
--- a/sys/nfs/nfsm_subs.h
+++ b/sys/nfs/nfsm_subs.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.1 (Berkeley) 6/16/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index 4d74acb38a5..5cb1cc278c4 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index f5fee5bf2f3..0fe5d48d5fb 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfsrtt.h b/sys/nfs/nfsrtt.h
index 0d23880019b..f0be0e02f2d 100644
--- a/sys/nfs/nfsrtt.h
+++ b/sys/nfs/nfsrtt.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrtt.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfsrvcache.h b/sys/nfs/nfsrvcache.h
index 26da2c275df..8fa2246348a 100644
--- a/sys/nfs/nfsrvcache.h
+++ b/sys/nfs/nfsrvcache.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nfsv2.h b/sys/nfs/nfsv2.h
index e9d2985efac..0b1d347bae7 100644
--- a/sys/nfs/nfsv2.h
+++ b/sys/nfs/nfsv2.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsv2.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index 730741a4137..94193d08467 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nqnfs.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/rpcv2.h b/sys/nfs/rpcv2.h
index 9c793a7f875..67a1f692053 100644
--- a/sys/nfs/rpcv2.h
+++ b/sys/nfs/rpcv2.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rpcv2.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h
index c2aa4f3f343..98a1c01a574 100644
--- a/sys/nfs/xdr_subs.h
+++ b/sys/nfs/xdr_subs.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)xdr_subs.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 261fd42657a..82fa6ca56d6 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 9ef81fe7199..893aabf9178 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_bio.c	8.5 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index b00a225de34..ef134f691d9 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index 9c70c535820..2054fdf3cb1 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.2 (Berkeley) 12/30/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index c00f7d06cc7..a7b3dfc66ac 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.3 (Berkeley) 1/12/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index d17cde79f60..f4e9cbfa395 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index 1f186760689..d806e26a533 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 9e76ded9843..6d7eb922aa4 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.5 (Berkeley) 2/13/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 261fd42657a..82fa6ca56d6 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsclient/nfsdiskless.h b/sys/nfsclient/nfsdiskless.h
index 74e6b7bca43..7fed901baf8 100644
--- a/sys/nfsclient/nfsdiskless.h
+++ b/sys/nfsclient/nfsdiskless.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsclient/nfsm_subs.h b/sys/nfsclient/nfsm_subs.h
index 879db360057..4a849db66ae 100644
--- a/sys/nfsclient/nfsm_subs.h
+++ b/sys/nfsclient/nfsm_subs.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.1 (Berkeley) 6/16/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index 4d74acb38a5..5cb1cc278c4 100644
--- a/sys/nfsclient/nfsmount.h
+++ b/sys/nfsclient/nfsmount.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index f5fee5bf2f3..0fe5d48d5fb 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 261fd42657a..82fa6ca56d6 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 261fd42657a..82fa6ca56d6 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index 32b0da20dd2..4ae812028f2 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c
index 45bfe1bb042..5cdd84c4994 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/nfs_srvcache.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_srvcache.c	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index c00f7d06cc7..a7b3dfc66ac 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.3 (Berkeley) 1/12/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index d17cde79f60..f4e9cbfa395 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index b00a225de34..ef134f691d9 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index 879db360057..4a849db66ae 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.1 (Berkeley) 6/16/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsserver/nfsrvcache.h b/sys/nfsserver/nfsrvcache.h
index 26da2c275df..8fa2246348a 100644
--- a/sys/nfsserver/nfsrvcache.h
+++ b/sys/nfsserver/nfsrvcache.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 261fd42657a..82fa6ca56d6 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 /*
diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h
index e507313a046..3ae9518597d 100644
--- a/sys/powerpc/include/_limits.h
+++ b/sys/powerpc/include/_limits.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/powerpc/include/limits.h b/sys/powerpc/include/limits.h
index e507313a046..3ae9518597d 100644
--- a/sys/powerpc/include/limits.h
+++ b/sys/powerpc/include/limits.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/powerpc/include/ptrace.h b/sys/powerpc/include/ptrace.h
index bfcc55f7aab..0892b83e260 100644
--- a/sys/powerpc/include/ptrace.h
+++ b/sys/powerpc/include/ptrace.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 /*
diff --git a/sys/scsi/scsi_all.h b/sys/scsi/scsi_all.h
index 2e7bdcff7e5..ad05f0f5295 100644
--- a/sys/scsi/scsi_all.h
+++ b/sys/scsi/scsi_all.h
@@ -1,7 +1,3 @@
-/*
- * SCSI general  interface description
- */
-
 /*
  * Largely written by Julian Elischer (julian@tfs.com)
  * for TRW Financial Systems.
@@ -18,7 +14,11 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_all.h,v 2.0 93/10/06 21:10:28 julian Exp Locker: julian $
+ *	$Id: scsi_all.h,v 1.6 1993/11/18 05:02:49 rgrimes Exp $
+ */
+
+/*
+ * SCSI general  interface description
  */
 
 #ifndef	_SCSI_SCSI_ALL_H
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c
index d35ad2de53d..0cc137ad827 100644
--- a/sys/scsi/scsi_ioctl.c
+++ b/sys/scsi/scsi_ioctl.c
@@ -5,6 +5,7 @@
  * Berkeley style copyright.  
  *
  *
+ * $Id$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index b72cb762054..65a3109d1a6 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -12,22 +12,12 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         1       00098
- * --------------------         -----   ----------------------
- *
- * 16 Feb 93    Julian Elischer         ADDED for SCSI system
- * 1.15 is the last version to support MACH and OSF/1
+ * $Id$
  */
-/* $Revision: 1.15 $ */
 
 /*
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  * major changes by Julian Elischer (julian@jules.dialix.oz.au) May 1993
- *
- *      $Id: st.c,v 1.15 1994/01/29 10:30:41 rgrimes Exp $
  */
 
 /*
diff --git a/sys/sys/_sigset.h b/sys/sys/_sigset.h
index 8ccded41c3b..a116e9bc736 100644
--- a/sys/sys/_sigset.h
+++ b/sys/sys/_sigset.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.2 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef	_SYS_SIGNAL_H_
diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index edc5bdbd563..a3af776d1ee 100644
--- a/sys/sys/acct.h
+++ b/sys/sys/acct.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)acct.h	8.2 (Berkeley) 1/21/94
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 96517b64de7..e12b5fc2893 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.7 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef _SYS_BUF_H_
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 96517b64de7..e12b5fc2893 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.7 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef _SYS_BUF_H_
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index d685e56d3f0..67ad0d6ed3d 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)callout.h	8.2 (Berkeley) 1/21/94
+ * $Id$
  */
 
 struct callout {
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 3c50711f530..d0823580f80 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cdefs.h	8.7 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef	_CDEFS_H_
diff --git a/sys/sys/clist.h b/sys/sys/clist.h
index 3e05cf6b770..857f85d94e3 100644
--- a/sys/sys/clist.h
+++ b/sys/sys/clist.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clist.h	8.1 (Berkeley) 6/4/93
+ * $Id$
  */
 
 struct cblock {
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 58cb6fa8339..15f7361b28d 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.3 (Berkeley) 1/21/94
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/device.h b/sys/sys/device.h
index 0a233ed3e5c..2fe1d6a70b3 100644
--- a/sys/sys/device.h
+++ b/sys/sys/device.h
@@ -40,6 +40,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device.h	8.2 (Berkeley) 2/17/94
+ * $Id$
  */
 
 #ifndef _SYS_DEVICE_H_
diff --git a/sys/sys/dir.h b/sys/sys/dir.h
index 0c4cd679cee..c0347c1ec55 100644
--- a/sys/sys/dir.h
+++ b/sys/sys/dir.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h
index 1c4b96aa29c..4fef84128f6 100644
--- a/sys/sys/dirent.h
+++ b/sys/sys/dirent.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index 352ecf00274..5a935037a66 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -41,7 +41,7 @@
  *
  *	@(#)disk.h	8.1 (Berkeley) 6/2/93
  *
- * from: $Header: disk.h,v 1.5 92/11/19 04:33:03 torek Exp $ (LBL)
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 60b8f8f8aaf..30c16c8da3d 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 60b8f8f8aaf..30c16c8da3d 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h
index 60b8f8f8aaf..30c16c8da3d 100644
--- a/sys/sys/diskpc98.h
+++ b/sys/sys/diskpc98.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/dkbad.h b/sys/sys/dkbad.h
index c574000aaf8..99af34b48e9 100644
--- a/sys/sys/dkbad.h
+++ b/sys/sys/dkbad.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkbad.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index f7f5f1594a2..5cc6bdd843c 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkstat.h	8.2 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #define	CP_USER		0
diff --git a/sys/sys/dmap.h b/sys/sys/dmap.h
index 2a6f538259e..b9ca5a1e55c 100644
--- a/sys/sys/dmap.h
+++ b/sys/sys/dmap.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dmap.h	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef _SYS_DMAP_H_
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index b056347d539..0d708335cc4 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)domain.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index a4e4ea6eb69..96d52f323b0 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)errno.h	8.5 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef KERNEL
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index be8cd7194dd..93f1c9d2354 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <machine/exec.h>
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index 63371b77ed8..c1c4385adf4 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -36,7 +36,7 @@
  *
  *	@(#)fbio.h	8.2 (Berkeley) 10/30/93
  *
- * from: $Header: fbio.h,v 1.6 93/10/31 06:01:56 torek Exp $ (LBL)
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 62762f3498a..33afa9a454d 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef _SYS_FCNTL_H_
diff --git a/sys/sys/fdcio.h b/sys/sys/fdcio.h
index 2e3ac310472..103f11ba99c 100644
--- a/sys/sys/fdcio.h
+++ b/sys/sys/fdcio.h
@@ -22,6 +22,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
 #ifndef _IOCTL_FD_H
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 3d82190669a..308485cae2d 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)file.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 #include <sys/fcntl.h>
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index 1071bc10597..10ba495c2d0 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/filio.h b/sys/sys/filio.h
index 5c8789b882b..b82a649c0fe 100644
--- a/sys/sys/filio.h
+++ b/sys/sys/filio.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filio.h	8.1 (Berkeley) 3/28/94
+ * $Id$
  */
 
 #ifndef	_SYS_FILIO_H_
diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h
index b103df80a8a..bd1c9004893 100644
--- a/sys/sys/gmon.h
+++ b/sys/sys/gmon.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef _SYS_GMON_H_
diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h
index 5bc11b328bd..9958ac77d34 100644
--- a/sys/sys/ioccom.h
+++ b/sys/sys/ioccom.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioccom.h	8.2 (Berkeley) 3/28/94
+ * $Id$
  */
 
 #ifndef	_SYS_IOCCOM_H_
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index d04394fd181..abe902f5782 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
+ * $Id$
  */
 
 #ifndef	_SYS_IOCTL_H_
diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h
index fd87b514cf8..ab067b97e42 100644
--- a/sys/sys/ioctl_compat.h
+++ b/sys/sys/ioctl_compat.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl_compat.h	8.4 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef _SYS_IOCTL_COMPAT_H_
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index cc036a8e83b..7cd33da5138 100644
--- a/sys/sys/ipc.h
+++ b/sys/sys/ipc.h
@@ -41,6 +41,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ipc.h	8.3 (Berkeley) 1/21/94
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index aafa8430eaa..48cf0d14dcb 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
+ * $Id$
  */
 
 /* Global variables for the kernel. */
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index 1623c3562fe..d7d773a1dc0 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 0e465e03dfd..d4669c7dd3d 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
+ * $Id$
  */
 
 #include <sys/types.h>
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 58cb6fa8339..15f7361b28d 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.3 (Berkeley) 1/21/94
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index aa10965feda..46c7df710db 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)malloc.h	8.3 (Berkeley) 1/12/94
+ * $Id$
  */
 
 #ifndef _SYS_MALLOC_H_
diff --git a/sys/sys/map.h b/sys/sys/map.h
index 6cec4b55653..6877a3d6c7d 100644
--- a/sys/sys/map.h
+++ b/sys/sys/map.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)map.h	8.3 (Berkeley) 1/26/94
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index f3ea7edefe6..681b289e2d0 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mbuf.h	8.3 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef M_WAITOK
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index b3951c202cb..786817bcc76 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mman.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 4561675ef0d..aec0f43cd8b 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.13 (Berkeley) 3/27/94
+ * $Id$
  */
 
 #ifndef KERNEL
diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h
index 57ee0b6f30a..d47058b2066 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 #define	MSG_BSIZE	(4096 - 3 * sizeof(long))
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index e5e69657454..93004041c88 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mtio.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 #ifndef _SYS_MTIO_H_
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 74ff3602c26..bb8f0a9326c 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)namei.h	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef _SYS_NAMEI_H_
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 661af88f8eb..0d5b1a7347d 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.2 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #define	BSD	199306		/* System version (year & month). */
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 883227e829a..98940e14aee 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.8 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef _SYS_PROC_H_
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index 76ac720d85f..f1030d77ff9 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h
index f7f99d474a4..d25655bb5c8 100644
--- a/sys/sys/ptrace.h
+++ b/sys/sys/ptrace.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef	_SYS_PTRACE_H_
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index c200c9f4ccf..2a257e096de 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)queue.h	8.4 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef	_SYS_QUEUE_H_
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index c3c957e17ee..a05266ea5d5 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reboot.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index 559f1ac6c37..398acea6660 100644
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resource.h	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef _SYS_RESOURCE_H_
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index 0f8d5e30eed..530ac860392 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resourcevar.h	8.3 (Berkeley) 2/22/94
+ * $Id$
  */
 
 #ifndef	_SYS_RESOURCEVAR_H_
diff --git a/sys/sys/scsiio.h b/sys/sys/scsiio.h
index 05753e41e9a..2b7b24250c6 100644
--- a/sys/sys/scsiio.h
+++ b/sys/sys/scsiio.h
@@ -1,4 +1,6 @@
-
+/*
+ * $Id$
+ */
 #ifndef _SYS_SCSIIO_H_
 #define _SYS_SCSIIO_H_
 
diff --git a/sys/sys/select.h b/sys/sys/select.h
index a279c592fbe..e69971e3b68 100644
--- a/sys/sys/select.h
+++ b/sys/sys/select.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)select.h	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef _SYS_SELECT_H_
diff --git a/sys/sys/selinfo.h b/sys/sys/selinfo.h
index a279c592fbe..e69971e3b68 100644
--- a/sys/sys/selinfo.h
+++ b/sys/sys/selinfo.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)select.h	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef _SYS_SELECT_H_
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 8ccded41c3b..a116e9bc736 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.2 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef	_SYS_SIGNAL_H_
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index 3d7e68bc530..463e2e44282 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signalvar.h	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef	_SYS_SIGNALVAR_H_		/* tmp for user.h */
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index f6728e98854..c5473ab7fb9 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socket.h	8.4 (Berkeley) 2/21/94
+ * $Id$
  */
 
 #ifndef _SYS_SOCKET_H_
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index ff104046c7c..82719376b41 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socketvar.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 #include <sys/select.h>			/* for struct selinfo */
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h
index eb5a44a598d..ab696b1675c 100644
--- a/sys/sys/sockio.h
+++ b/sys/sys/sockio.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
+ * $Id$
  */
 
 #ifndef	_SYS_SOCKIO_H_
diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h
index ce28a144242..3bac78da7e9 100644
--- a/sys/sys/soundcard.h
+++ b/sys/sys/soundcard.h
@@ -25,6 +25,7 @@
  * SUCH DAMAGE.
  *
  * 
+ * $Id$
  */
 
  /* 
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 07020c36770..ab44103579a 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stat.h	8.6 (Berkeley) 3/8/94
+ * $Id$
  */
 
 #ifndef _SYS_STAT_H_
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 4ad83a74542..a27ec38bf9f 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 #ifndef _SYS_SYSCTL_H_
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 550000c6503..c5e4608a89c 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 #define	ARG_MAX			20480	/* max bytes for an exec function */
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index 935db2d4484..821f6a7c56b 100644
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 #define	_PATH_LOG	"/dev/log"
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index ba2f12b69f6..5e79af3381f 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.4 (Berkeley) 2/23/94
+ * $Id$
  */
 
 #include <machine/cpufunc.h>
diff --git a/sys/sys/tablet.h b/sys/sys/tablet.h
index cbb3f23d006..f9aefc0cac9 100644
--- a/sys/sys/tablet.h
+++ b/sys/sys/tablet.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tablet.h	8.3 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef _SYS_TABLET_H_
diff --git a/sys/sys/termios.h b/sys/sys/termios.h
index 09c34a10466..5abe2d916b8 100644
--- a/sys/sys/termios.h
+++ b/sys/sys/termios.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)termios.h	8.3 (Berkeley) 3/28/94
+ * $Id$
  */
 
 #ifndef _SYS_TERMIOS_H_
diff --git a/sys/sys/time.h b/sys/sys/time.h
index 53227712a3b..00b9e2e8da9 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 #ifndef _SYS_TIME_H_
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index 2ab010514b6..a1b33799272 100644
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)timeb.h	8.2 (Berkeley) 1/21/94
+ * $Id$
  */
 
 /* The ftime(2) system call structure -- deprecated. */
diff --git a/sys/sys/times.h b/sys/sys/times.h
index 23a15008291..961ebfd1826 100644
--- a/sys/sys/times.h
+++ b/sys/sys/times.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)times.h	8.4 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef	_SYS_TIMES_H_
diff --git a/sys/sys/timetc.h b/sys/sys/timetc.h
index 53227712a3b..00b9e2e8da9 100644
--- a/sys/sys/timetc.h
+++ b/sys/sys/timetc.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 #ifndef _SYS_TIME_H_
diff --git a/sys/sys/tprintf.h b/sys/sys/tprintf.h
index 5b83aaec029..01a90d79c48 100644
--- a/sys/sys/tprintf.h
+++ b/sys/sys/tprintf.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tprintf.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 typedef struct session *tpr_t;
diff --git a/sys/sys/trace.h b/sys/sys/trace.h
index d401f1459d7..57592ce3d3f 100644
--- a/sys/sys/trace.h
+++ b/sys/sys/trace.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)trace.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index 4a89b0382ad..93957a42706 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.h	8.6 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/termios.h>
diff --git a/sys/sys/ttychars.h b/sys/sys/ttychars.h
index 1a23aa77091..58f489abe26 100644
--- a/sys/sys/ttychars.h
+++ b/sys/sys/ttychars.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttychars.h	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h
index 3dade47daad..899cee05175 100644
--- a/sys/sys/ttycom.h
+++ b/sys/sys/ttycom.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttycom.h	8.1 (Berkeley) 3/28/94
+ * $Id$
  */
 
 #ifndef	_SYS_TTYCOM_H_
diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h
index 1a8aaa5bd00..b8ab6c02dfc 100644
--- a/sys/sys/ttydefaults.h
+++ b/sys/sys/ttydefaults.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/ttydev.h b/sys/sys/ttydev.h
index c52a2136926..cf23b0aab9a 100644
--- a/sys/sys/ttydev.h
+++ b/sys/sys/ttydev.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydev.h	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 /* COMPATABILITY HEADER FILE */
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 76d2975d31b..5ae8da2c44b 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.4 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef _SYS_TYPES_H_
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index d3ee02dbde3..2b4dc7dd3f9 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ucred.h	8.2 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef _SYS_UCRED_H_
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index 3356ebfee89..66ce0fc9048 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
+ * $Id$
  */
 
 #ifndef _SYS_UIO_H_
diff --git a/sys/sys/un.h b/sys/sys/un.h
index dcbf800c113..8ee3038c0dc 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)un.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index e086f6f6e39..9d434b44dfb 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.2 (Berkeley) 1/7/94
+ * $Id$
  */
 
 #ifndef _SYS_UNISTD_H_
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index efcfd0e23c1..d7afc6135e4 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unpcb.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 85fdd130c2d..4c1f6a65439 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
+ * $Id$
  */
 
 #include <machine/pcb.h>
diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h
index 60e6091067b..0387cc1d206 100644
--- a/sys/sys/utsname.h
+++ b/sys/sys/utsname.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utsname.h	8.1 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #ifndef	_SYS_UTSNAME_H
diff --git a/sys/sys/vadvise.h b/sys/sys/vadvise.h
index be793e8e721..e9a07b9314a 100644
--- a/sys/sys/vadvise.h
+++ b/sys/sys/vadvise.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vadvise.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/vcmd.h b/sys/sys/vcmd.h
index de27ec1b0af..8c4554e7ef6 100644
--- a/sys/sys/vcmd.h
+++ b/sys/sys/vcmd.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vcmd.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 #include <sys/ioctl.h>
diff --git a/sys/sys/vlimit.h b/sys/sys/vlimit.h
index b6457e64ddf..ec45285642d 100644
--- a/sys/sys/vlimit.h
+++ b/sys/sys/vlimit.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vlimit.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index ef890c295f1..a64277028a2 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vmmeter.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index fa51d994a21..c6c0e46b875 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
+ * $Id$
  */
 
 #include <sys/queue.h>
diff --git a/sys/sys/vsio.h b/sys/sys/vsio.h
index d84218cc238..f15cc0bf96f 100644
--- a/sys/sys/vsio.h
+++ b/sys/sys/vsio.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vsio.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
  /****************************************************************************
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index 33a68d9f33f..6f7411a5535 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)wait.h	8.1 (Berkeley) 6/2/93
+ * $Id$
  */
 
 /*
diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk
index e190fa04836..339e6589437 100644
--- a/sys/tools/vnode_if.awk
+++ b/sys/tools/vnode_if.awk
@@ -32,6 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
+# $Id$
 #
 
 # Script to produce VFS front-end sugar.
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 15e871836f2..f6b274df1e5 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.8 (Berkeley) 2/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 2addf95b6c6..de51704694b 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_balloc.c	8.4 (Berkeley) 9/23/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 6c30389f49a..9b1bb50adc2 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.3 (Berkeley) 4/16/94
+ * $Id$
  */
 
 struct buf;
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index cf4fae3fa41..357f9aa4508 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_inode.c	8.5 (Berkeley) 12/30/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index c251b16e697..faebf637fce 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.2 (Berkeley) 9/21/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c
index 8cf46b0150a..cc70ee17841 100644
--- a/sys/ufs/ffs/ffs_tables.c
+++ b/sys/ufs/ffs/ffs_tables.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_tables.c	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 41f4a0d2e85..def856c6604 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.8 (Berkeley) 4/18/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 59814f2f378..9be65e427a4 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vnops.c	8.7 (Berkeley) 2/3/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index bef052feef4..19b15efdb65 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.7 (Berkeley) 4/19/94
+ * $Id$
  */
 
 /*
diff --git a/sys/ufs/lfs/lfs.h b/sys/ufs/lfs/lfs.h
index 87b8c22ccc0..123858353ea 100644
--- a/sys/ufs/lfs/lfs.h
+++ b/sys/ufs/lfs/lfs.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs.h	8.3 (Berkeley) 9/23/93
+ * $Id$
  */
 
 #define	LFS_LABELPAD	8192		/* LFS label size */
diff --git a/sys/ufs/lfs/lfs_alloc.c b/sys/ufs/lfs/lfs_alloc.c
index 3f06c813930..7e5e2a96ba1 100644
--- a/sys/ufs/lfs/lfs_alloc.c
+++ b/sys/ufs/lfs/lfs_alloc.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_alloc.c	8.4 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_balloc.c b/sys/ufs/lfs/lfs_balloc.c
index b56bc9ec51b..b7cf75502c4 100644
--- a/sys/ufs/lfs/lfs_balloc.c
+++ b/sys/ufs/lfs/lfs_balloc.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_balloc.c	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 #include <sys/param.h>
 #include <sys/buf.h>
diff --git a/sys/ufs/lfs/lfs_bio.c b/sys/ufs/lfs/lfs_bio.c
index d2254271d32..86d3e33dcca 100644
--- a/sys/ufs/lfs/lfs_bio.c
+++ b/sys/ufs/lfs/lfs_bio.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_bio.c	8.4 (Berkeley) 12/30/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_cksum.c b/sys/ufs/lfs/lfs_cksum.c
index 77b011aa2c4..8b70a40c646 100644
--- a/sys/ufs/lfs/lfs_cksum.c
+++ b/sys/ufs/lfs/lfs_cksum.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_cksum.c	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 #include <sys/types.h>
diff --git a/sys/ufs/lfs/lfs_debug.c b/sys/ufs/lfs/lfs_debug.c
index cc28d609023..5816c89c9a3 100644
--- a/sys/ufs/lfs/lfs_debug.c
+++ b/sys/ufs/lfs/lfs_debug.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_debug.c	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 #ifdef DEBUG
diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h
index c1157ade02a..c54b0d47ba6 100644
--- a/sys/ufs/lfs/lfs_extern.h
+++ b/sys/ufs/lfs/lfs_extern.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_extern.h	8.2 (Berkeley) 4/16/94
+ * $Id$
  */
 
 struct fid;
diff --git a/sys/ufs/lfs/lfs_inode.c b/sys/ufs/lfs/lfs_inode.c
index 1a06aa23ed8..263c8bc7f5b 100644
--- a/sys/ufs/lfs/lfs_inode.c
+++ b/sys/ufs/lfs/lfs_inode.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_inode.c	8.5 (Berkeley) 12/30/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c
index 65cab73f51b..986a2429710 100644
--- a/sys/ufs/lfs/lfs_segment.c
+++ b/sys/ufs/lfs/lfs_segment.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_segment.c	8.5 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_subr.c b/sys/ufs/lfs/lfs_subr.c
index 79e36f4f49b..eb7de08201b 100644
--- a/sys/ufs/lfs/lfs_subr.c
+++ b/sys/ufs/lfs/lfs_subr.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_subr.c	8.2 (Berkeley) 9/21/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c
index a4b1501179b..2180378a4c0 100644
--- a/sys/ufs/lfs/lfs_syscalls.c
+++ b/sys/ufs/lfs/lfs_syscalls.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_syscalls.c	8.5 (Berkeley) 4/20/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c
index f5dd1c6a809..7181936b98c 100644
--- a/sys/ufs/lfs/lfs_vfsops.c
+++ b/sys/ufs/lfs/lfs_vfsops.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vfsops.c	8.7 (Berkeley) 4/16/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c
index e5da7fccf0b..3d17c39cba7 100644
--- a/sys/ufs/lfs/lfs_vnops.c
+++ b/sys/ufs/lfs/lfs_vnops.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vnops.c	8.5 (Berkeley) 12/30/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/mfs/mfs_extern.h b/sys/ufs/mfs/mfs_extern.h
index e357faf6fa5..ec8b3f32a14 100644
--- a/sys/ufs/mfs/mfs_extern.h
+++ b/sys/ufs/mfs/mfs_extern.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_extern.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 struct buf;
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index fd8777107e2..9238fb3f19c 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vfsops.c	8.4 (Berkeley) 4/16/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index c70657b4f33..ded8c79ab94 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vnops.c	8.3 (Berkeley) 9/21/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/mfs/mfsiom.h b/sys/ufs/mfs/mfsiom.h
index 98aca855f6a..16eebbe474f 100644
--- a/sys/ufs/mfs/mfsiom.h
+++ b/sys/ufs/mfs/mfsiom.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfsiom.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 #define MFS_MAPREG	(MAXPHYS/NBPG + 2) /* Kernel mapping pte's */
diff --git a/sys/ufs/mfs/mfsnode.h b/sys/ufs/mfs/mfsnode.h
index 4480ab02407..886edd8cce8 100644
--- a/sys/ufs/mfs/mfsnode.h
+++ b/sys/ufs/mfs/mfsnode.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfsnode.h	8.2 (Berkeley) 8/11/93
+ * $Id$
  */
 
 /*
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index 5b9915d9cfd..fc39dfb785c 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
+ * $Id$
  */
 
 /*
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h
index c51bd1cf6e1..6dca4dce804 100644
--- a/sys/ufs/ufs/dir.h
+++ b/sys/ufs/ufs/dir.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifndef _DIR_H_
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index df155967a7d..e37944321b4 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <ufs/ufs/dinode.h>
diff --git a/sys/ufs/ufs/lockf.h b/sys/ufs/ufs/lockf.h
index 0ec61dbb0cf..f54916656fe 100644
--- a/sys/ufs/ufs/lockf.h
+++ b/sys/ufs/ufs/lockf.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lockf.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 /*
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index 11efb402c91..039a6fd7075 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quota.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 #ifndef _QUOTA_
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index a424d31d7a8..6f38edc4d21 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.6 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index cc0f28d37f1..0c787f7e866 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index e25923e947d..590b343bb8f 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_extern.h	8.3 (Berkeley) 4/16/94
+ * $Id$
  */
 
 struct buf;
diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c
index 4a37c907ef6..53181c4a2ca 100644
--- a/sys/ufs/ufs/ufs_ihash.c
+++ b/sys/ufs/ufs/ufs_ihash.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.4 (Berkeley) 12/30/93
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index ac876f9d34d..567f3033178 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_inode.c	8.4 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_lockf.c b/sys/ufs/ufs/ufs_lockf.c
index cb9a7375de1..bdc22cd5818 100644
--- a/sys/ufs/ufs/ufs_lockf.c
+++ b/sys/ufs/ufs/ufs_lockf.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lockf.c	8.3 (Berkeley) 1/6/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index 87c6802c79f..6eb7bbb02b0 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lookup.c	8.6 (Berkeley) 4/1/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 15cb1cfbb23..6b17ec7b58f 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_quota.c	8.2 (Berkeley) 12/30/93
+ * $Id$
  */
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c
index 212210c583a..d7fd562b211 100644
--- a/sys/ufs/ufs/ufs_readwrite.c
+++ b/sys/ufs/ufs/ufs_readwrite.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_readwrite.c	8.7 (Berkeley) 1/21/94
+ * $Id$
  */
 
 #ifdef LFS_READWRITE
diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c
index f806e0b2a83..1b82917f46b 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vfsops.c	8.4 (Berkeley) 4/16/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 83bef926a82..76cdc5c44e1 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.10 (Berkeley) 4/1/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 237871fdaac..084abeb795d 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.2 (Berkeley) 1/12/94
+ * $Id$
  */
 
 struct buf;
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index b8083df1627..1c92122306d 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device_pager.c	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/device_pager.h b/sys/vm/device_pager.h
index 8840622919d..677017f997e 100644
--- a/sys/vm/device_pager.h
+++ b/sys/vm/device_pager.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device_pager.h	8.3 (Berkeley) 12/13/93
+ * $Id$
  */
 
 #ifndef	_DEVICE_PAGER_
diff --git a/sys/vm/kern_lock.c b/sys/vm/kern_lock.c
index c4fa05230a7..d87d321b7e4 100644
--- a/sys/vm/kern_lock.c
+++ b/sys/vm/kern_lock.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)kern_lock.c	8.1 (Berkeley) 6/11/93
+ *	from: @(#)kern_lock.c	8.1 (Berkeley) 6/11/93
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/lock.h b/sys/vm/lock.h
index 26bed1f048a..308d9411c96 100644
--- a/sys/vm/lock.h
+++ b/sys/vm/lock.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)lock.h	8.1 (Berkeley) 6/11/93
+ *	from: @(#)lock.h	8.1 (Berkeley) 6/11/93
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index 63a83c90578..3a95abc4232 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)pmap.h	8.1 (Berkeley) 6/11/93
+ *	from: @(#)pmap.h	8.1 (Berkeley) 6/11/93
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index a534d42a850..cec9a3f4993 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -39,6 +39,7 @@
  * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index bc18dd26b20..9f51c9481ac 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm.h	8.2 (Berkeley) 12/13/93
+ * $Id$
  */
 
 #ifndef VM_H
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index bc62e4253d4..818e1491a55 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
+ * $Id$
  */
 
 struct buf;
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 3ce2d6e452b..c91935f0704 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -38,7 +38,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_fault.c	8.4 (Berkeley) 1/12/94
+ *	from: @(#)vm_fault.c	8.4 (Berkeley) 1/12/94
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -65,6 +65,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index f181ab034f1..e2116974f25 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_glue.c	8.6 (Berkeley) 1/5/94
+ *	from: @(#)vm_glue.c	8.6 (Berkeley) 1/5/94
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -58,6 +58,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_inherit.h b/sys/vm/vm_inherit.h
index 455f91c9390..b4691b4ac56 100644
--- a/sys/vm/vm_inherit.h
+++ b/sys/vm/vm_inherit.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_inherit.h	8.1 (Berkeley) 6/11/93
+ *	from: @(#)vm_inherit.h	8.1 (Berkeley) 6/11/93
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index a0eac7045e5..3b6214450dd 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_init.c	8.1 (Berkeley) 6/11/93
+ *	from: @(#)vm_init.c	8.1 (Berkeley) 6/11/93
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -61,6 +61,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 55a094992aa..0d73b415a16 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_kern.c	8.3 (Berkeley) 1/12/94
+ *	from: @(#)vm_kern.c	8.3 (Berkeley) 1/12/94
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
index c032560f764..5c82528bc7a 100644
--- a/sys/vm/vm_kern.h
+++ b/sys/vm/vm_kern.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_kern.h	8.1 (Berkeley) 6/11/93
+ *	from: @(#)vm_kern.h	8.1 (Berkeley) 6/11/93
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /* Kernel memory management definitions. */
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index ffffa963c99..c4eeb2d5b15 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_map.c	8.3 (Berkeley) 1/12/94
+ *	from: @(#)vm_map.c	8.3 (Berkeley) 1/12/94
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index ee253ef70f6..4f5b64533c4 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_map.h	8.3 (Berkeley) 3/15/94
+ *	from: @(#)vm_map.h	8.3 (Berkeley) 3/15/94
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index 2a8029b5ad1..d99f30629e7 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_meter.c	8.4 (Berkeley) 1/4/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 2e7204a96a1..d0fb654c954 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,6 +38,7 @@
  * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index a6419dc22aa..8b8e60644e6 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_object.c	8.5 (Berkeley) 3/22/94
+ *	from: @(#)vm_object.c	8.5 (Berkeley) 3/22/94
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 5e220acd47c..1ca8ec3a4cf 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_object.h	8.3 (Berkeley) 1/12/94
+ *	from: @(#)vm_object.h	8.3 (Berkeley) 1/12/94
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index e8049c4955f..57ffbe843e6 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_page.h	8.2 (Berkeley) 12/13/93
+ *	from: @(#)vm_page.h	8.2 (Berkeley) 12/13/93
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index cabb102077a..99d7365900c 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -37,7 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_pageout.c	7.4 (Berkeley) 5/7/91
+ *	from: @(#)vm_pageout.c	7.4 (Berkeley) 5/7/91
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -65,7 +65,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.c,v 1.3 1994/06/06 11:56:27 davidg Exp $
+ * $Id: vm_pageout.c,v 1.4 1994/08/01 11:25:45 davidg Exp $
  */
 
 /*
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index 834aee53688..5412ddba9bd 100644
--- a/sys/vm/vm_pageout.h
+++ b/sys/vm/vm_pageout.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_pageout.h	8.2 (Berkeley) 1/12/94
+ *	from: @(#)vm_pageout.h	8.2 (Berkeley) 1/12/94
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 1e4b201120f..f7de85399e6 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_pager.c	8.6 (Berkeley) 1/12/94
+ *	from: @(#)vm_pager.c	8.6 (Berkeley) 1/12/94
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index 3e20e50bcad..a6cef9f3352 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -37,6 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index 4a785ce6e4e..4fc3449452e 100644
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_param.h	8.1 (Berkeley) 6/11/93
+ *	from: @(#)vm_param.h	8.1 (Berkeley) 6/11/93
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_prot.h b/sys/vm/vm_prot.h
index ee009bc4d03..e34dc0e6954 100644
--- a/sys/vm/vm_prot.h
+++ b/sys/vm/vm_prot.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_prot.h	8.1 (Berkeley) 6/11/93
+ *	from: @(#)vm_prot.h	8.1 (Berkeley) 6/11/93
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 5008a09ce16..a504ffdebe1 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index ee6ddf6ab53..d9216deef57 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -38,6 +38,7 @@
  * from: Utah $Hdr: vm_unix.c 1.1 89/11/07$
  *
  *	@(#)vm_unix.c	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vm_user.c b/sys/vm/vm_user.c
index 0f2c23432f5..0d9087ba357 100644
--- a/sys/vm/vm_user.c
+++ b/sys/vm/vm_user.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)vm_user.c	8.2 (Berkeley) 1/12/94
+ *	from: @(#)vm_user.c	8.2 (Berkeley) 1/12/94
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
@@ -60,6 +60,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $Id$
  */
 
 /*
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index b01dc54ec09..9270b2c153c 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode_pager.h	8.1 (Berkeley) 6/11/93
+ * $Id$
  */
 
 #ifndef	_VNODE_PAGER_