From d62187c043850a8665374b0e08c66bed0edc54da Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Wed, 26 Oct 1994 08:01:33 +0000
Subject: [PATCH] new RCS ID format.

---
 sys/arch/vax/README                 | 3 +--
 sys/arch/vax/compile/.keep_me       | 2 ++
 sys/arch/vax/conf/GENERIC           | 2 +-
 sys/arch/vax/conf/Makefile.vax      | 5 +++--
 sys/arch/vax/conf/files.vax         | 2 +-
 sys/arch/vax/conf/files.vax.newconf | 2 +-
 sys/arch/vax/conf/std.vax           | 2 +-
 sys/arch/vax/if/if_de.c             | 3 ++-
 sys/arch/vax/if/if_dereg.h          | 3 ++-
 sys/arch/vax/if/if_uba.c            | 3 ++-
 sys/arch/vax/if/if_uba.h            | 3 ++-
 sys/arch/vax/include/ansi.h         | 3 ++-
 sys/arch/vax/include/aout_machdep.h | 4 ++--
 sys/arch/vax/include/asm.h          | 5 +++--
 sys/arch/vax/include/cpu.h          | 7 ++++---
 sys/arch/vax/include/endian.h       | 3 ++-
 sys/arch/vax/include/exec.h         | 4 ++--
 sys/arch/vax/include/float.h        | 5 +++--
 sys/arch/vax/include/ioa.h          | 4 ++--
 sys/arch/vax/include/ka750.h        | 4 ++--
 sys/arch/vax/include/kg.h           | 4 ++--
 sys/arch/vax/include/limits.h       | 5 +++--
 sys/arch/vax/include/loconf.h       | 4 ++--
 sys/arch/vax/include/macros.h       | 4 ++--
 sys/arch/vax/include/mtpr.h         | 4 ++--
 sys/arch/vax/include/nexus.h        | 5 +++--
 sys/arch/vax/include/param.h        | 5 +++--
 sys/arch/vax/include/pcb.h          | 4 ++--
 sys/arch/vax/include/pmap.h         | 5 +++--
 sys/arch/vax/include/proc.h         | 5 +++--
 sys/arch/vax/include/psl.h          | 5 +++--
 sys/arch/vax/include/pte.h          | 4 ++--
 sys/arch/vax/include/ptrace.h       | 4 ++--
 sys/arch/vax/include/reg.h          | 4 ++--
 sys/arch/vax/include/scb.h          | 4 ++--
 sys/arch/vax/include/sid.h          | 4 ++--
 sys/arch/vax/include/signal.h       | 4 ++--
 sys/arch/vax/include/stdarg.h       | 5 +++--
 sys/arch/vax/include/trap.h         | 5 +++--
 sys/arch/vax/include/types.h        | 5 +++--
 sys/arch/vax/include/varargs.h      | 5 +++--
 sys/arch/vax/include/vmparam.h      | 5 +++--
 sys/arch/vax/uba/uba.c              | 7 ++++---
 sys/arch/vax/uba/ubareg.h           | 5 +++--
 sys/arch/vax/uba/ubavar.h           | 5 +++--
 sys/arch/vax/uba/uda.c              | 5 +++--
 sys/arch/vax/uba/udareg.h           | 5 +++--
 sys/arch/vax/vax/bcopy.s            | 5 +++--
 sys/arch/vax/vax/clock.c            | 2 ++
 sys/arch/vax/vax/conf.c             | 5 +++--
 sys/arch/vax/vax/cpu_machdep.c      | 2 ++
 sys/arch/vax/vax/disksubr.c         | 7 ++++---
 sys/arch/vax/vax/gencons.c          | 5 +++--
 sys/arch/vax/vax/glue.c             | 2 ++
 sys/arch/vax/vax/intvec.s           | 4 ++--
 sys/arch/vax/vax/ka750.c            | 7 ++++---
 sys/arch/vax/vax/machdep.c          | 9 +++++----
 sys/arch/vax/vax/mem.c              | 4 ++--
 sys/arch/vax/vax/mscp.c             | 5 +++--
 sys/arch/vax/vax/mscp.h             | 5 +++--
 sys/arch/vax/vax/mscpvar.h          | 5 +++--
 sys/arch/vax/vax/pmap.c             | 5 ++---
 sys/arch/vax/vax/random.s           | 4 ++--
 sys/arch/vax/vax/rootfil.c          | 8 +++++---
 sys/arch/vax/vax/skit.c             | 2 ++
 sys/arch/vax/vax/subr.s             | 4 ++--
 sys/arch/vax/vax/swapgeneric.c      | 5 +++--
 sys/arch/vax/vax/trap.c             | 4 ++--
 sys/arch/vax/vax/udiv.s             | 5 +++--
 sys/arch/vax/vax/urem.s             | 5 +++--
 sys/arch/vax/vax/vm_machdep.c       | 4 ++--
 sys/arch/vax/vax/yyyin_cksum.c      | 3 ++-
 sys/dev/dec/qbus/uba.c              | 7 ++++---
 sys/dev/dec/qbus/ubareg.h           | 5 +++--
 sys/dev/dec/qbus/ubavar.h           | 5 +++--
 75 files changed, 190 insertions(+), 138 deletions(-)

diff --git a/sys/arch/vax/README b/sys/arch/vax/README
index 94cd74dbddf2..e75fbb4a24b7 100644
--- a/sys/arch/vax/README
+++ b/sys/arch/vax/README
@@ -1,5 +1,4 @@
-
-	$Id: README,v 1.3 1994/10/08 15:41:42 ragge Exp $
+	$NetBSD: README,v 1.4 1994/10/26 08:01:33 cgd Exp $
 
 Some information and status of VAX port:
 
diff --git a/sys/arch/vax/compile/.keep_me b/sys/arch/vax/compile/.keep_me
index aedb72a50a73..eb81e929457d 100644
--- a/sys/arch/vax/compile/.keep_me
+++ b/sys/arch/vax/compile/.keep_me
@@ -1 +1,3 @@
+/*	$NetBSD: .keep_me,v 1.2 1994/10/26 08:01:38 cgd Exp $	*/
+
 This normally empty directory needs to be kept in the distribution.
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index f3e29837880a..ab0896cf8110 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,6 +1,6 @@
+#	$NetBSD: GENERIC,v 1.3 1994/10/26 08:01:40 cgd Exp $
 #
 # GENERIC VAX, currently only supports 11/750 anyway.
-#	$Id: GENERIC,v 1.2 1994/10/08 15:42:27 ragge Exp $
 #
 
 include "std.vax"
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index e21ac3e22558..c6ebb20db3c2 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,5 +1,6 @@
-#	from: @(#)Makefile.vax	7.18 (Berkeley) 12/16/90
-#	$Id: Makefile.vax,v 1.3 1994/10/08 15:42:28 ragge Exp $
+#	$NetBSD: Makefile.vax,v 1.4 1994/10/26 08:01:42 cgd Exp $
+
+#	@(#)Makefile.vax	7.18 (Berkeley) 12/16/90
 #
 # This makefile is constructed from a machine description:
 #	config machineid
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index 76150a5df899..8d53ba0ac082 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,6 +1,6 @@
+#	$NetBSD: files.vax,v 1.4 1994/10/26 08:01:44 cgd Exp $
 #
 # new style config file for vax architecture
-#	$Id: files.vax,v 1.3 1994/10/08 15:42:29 ragge Exp $
 #
 
 maxusers 8 32 64
diff --git a/sys/arch/vax/conf/files.vax.newconf b/sys/arch/vax/conf/files.vax.newconf
index f69b030fb765..4b2eb2fdf7b0 100644
--- a/sys/arch/vax/conf/files.vax.newconf
+++ b/sys/arch/vax/conf/files.vax.newconf
@@ -1,6 +1,6 @@
+#	$NetBSD: files.vax.newconf,v 1.4 1994/10/26 08:01:44 cgd Exp $
 #
 # new style config file for vax architecture
-#	$Id: files.vax.newconf,v 1.3 1994/10/08 15:42:29 ragge Exp $
 #
 
 maxusers 8 32 64
diff --git a/sys/arch/vax/conf/std.vax b/sys/arch/vax/conf/std.vax
index b65308919f01..b709a32e5464 100644
--- a/sys/arch/vax/conf/std.vax
+++ b/sys/arch/vax/conf/std.vax
@@ -1,6 +1,6 @@
+#	$NetBSD: std.vax,v 1.2 1994/10/26 08:01:46 cgd Exp $
 #
 # Std vaxfiles, will be completed with Abus etc. later.
-#	$Id: std.vax,v 1.1 1994/08/02 20:19:27 ragge Exp $
 #
 machine	vax
 
diff --git a/sys/arch/vax/if/if_de.c b/sys/arch/vax/if/if_de.c
index 435ee5288a0d..740ca74a4b46 100644
--- a/sys/arch/vax/if/if_de.c
+++ b/sys/arch/vax/if/if_de.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: if_de.c,v 1.3 1994/10/26 08:01:49 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
@@ -31,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_de.c	7.12 (Berkeley) 12/16/90
- *	$Id: if_de.c,v 1.2 1994/10/08 15:42:54 ragge Exp $
  */
 
 #include "de.h"
diff --git a/sys/arch/vax/if/if_dereg.h b/sys/arch/vax/if/if_dereg.h
index e4cd701d7fa7..2f2b48c9796c 100644
--- a/sys/arch/vax/if/if_dereg.h
+++ b/sys/arch/vax/if/if_dereg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: if_dereg.h,v 1.2 1994/10/26 08:01:51 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.
@@ -31,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_dereg.h	7.3 (Berkeley) 6/28/90
- *	$Id: if_dereg.h,v 1.1 1994/08/02 20:19:48 ragge Exp $
  */
 
 /*
diff --git a/sys/arch/vax/if/if_uba.c b/sys/arch/vax/if/if_uba.c
index 036634c0c77e..e1358f71e41f 100644
--- a/sys/arch/vax/if/if_uba.c
+++ b/sys/arch/vax/if/if_uba.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: if_uba.c,v 1.3 1994/10/26 08:01:53 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
  * All rights reserved.
@@ -31,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_uba.c	7.16 (Berkeley) 12/16/90
- *	$Id: if_uba.c,v 1.2 1994/10/08 15:42:57 ragge Exp $
  */
 
 #include "sys/param.h"
diff --git a/sys/arch/vax/if/if_uba.h b/sys/arch/vax/if/if_uba.h
index 432dc85e9567..a9c13e56e14b 100644
--- a/sys/arch/vax/if/if_uba.h
+++ b/sys/arch/vax/if/if_uba.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: if_uba.h,v 1.2 1994/10/26 08:01:55 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.
@@ -31,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_uba.h	7.4 (Berkeley) 6/28/90
- *	$Id: if_uba.h,v 1.1 1994/08/02 20:19:51 ragge Exp $
  */
 
 /*
diff --git a/sys/arch/vax/include/ansi.h b/sys/arch/vax/include/ansi.h
index e7ed2d84feba..5af1f55f91a6 100644
--- a/sys/arch/vax/include/ansi.h
+++ b/sys/arch/vax/include/ansi.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ansi.h,v 1.3 1994/10/26 08:01:59 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -31,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *      @(#)ansi.h      7.1 (Berkeley) 3/9/91
- *	$Id: ansi.h,v 1.2 1994/10/08 15:43:53 ragge Exp $
  */
 
 #ifndef _ANSI_H_
diff --git a/sys/arch/vax/include/aout_machdep.h b/sys/arch/vax/include/aout_machdep.h
index c5756774fa37..9f446e56bfa0 100644
--- a/sys/arch/vax/include/aout_machdep.h
+++ b/sys/arch/vax/include/aout_machdep.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: aout_machdep.h,v 1.3 1994/10/26 08:02:05 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: aout_machdep.h,v 1.2 1994/08/16 23:41:53 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/asm.h b/sys/arch/vax/include/asm.h
index 0d5c9862ade6..75d6a3052d38 100644
--- a/sys/arch/vax/include/asm.h
+++ b/sys/arch/vax/include/asm.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: asm.h,v 1.2 1994/10/26 08:02:01 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)asm.h	5.5 (Berkeley) 5/7/91
- *	$Id: asm.h,v 1.1 1994/08/02 20:20:10 ragge Exp $
+ *	@(#)asm.h	5.5 (Berkeley) 5/7/91
  */
 
 #ifndef _SYS_ASM_H_
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index e37ab4feb123..fc50446dfbfe 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: cpu.h,v 1.3 1994/10/26 08:02:02 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden
  * All rights reserved.
@@ -26,9 +28,8 @@
  * 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: cpu.h,v 1.2 1994/10/08 15:43:54 ragge Exp $
  */
+
  /* All bugs are subject to removal without further notice */
 
 #include "cdefs.h"
@@ -81,7 +82,7 @@ struct clockops {
  * The following code are from the hp300 port/ragge.
  *      from: Utah Hdr: cpu.h 1.16 91/03/25
  *      from: @(#)cpu.h 7.7 (Berkeley) 6/27/91
- *      $Id: cpu.h,v 1.2 1994/10/08 15:43:54 ragge Exp $
+ *      $Id: cpu.h,v 1.3 1994/10/26 08:02:02 cgd Exp $
  */
 /*
  * Preempt the current process if in interrupt from user mode,
diff --git a/sys/arch/vax/include/endian.h b/sys/arch/vax/include/endian.h
index e3f491b449ca..f1a16092464e 100644
--- a/sys/arch/vax/include/endian.h
+++ b/sys/arch/vax/include/endian.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: endian.h,v 1.2 1994/10/26 08:02:04 cgd Exp $	*/
+
 /*
  * Copyright (c) 1987, 1991 Regents of the University of California.
  * All rights reserved.
@@ -31,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *      @(#)endian.h    7.8 (Berkeley) 4/3/91
- *	$Id: endian.h,v 1.1 1994/08/02 20:20:17 ragge Exp $
  */
 
 /*
diff --git a/sys/arch/vax/include/exec.h b/sys/arch/vax/include/exec.h
index dea99faa5324..4d0648fa5613 100644
--- a/sys/arch/vax/include/exec.h
+++ b/sys/arch/vax/include/exec.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: exec.h,v 1.3 1994/10/26 08:02:05 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: exec.h,v 1.2 1994/08/16 23:41:53 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/float.h b/sys/arch/vax/include/float.h
index 32c3fee9c283..4ec3fa86bafd 100644
--- a/sys/arch/vax/include/float.h
+++ b/sys/arch/vax/include/float.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: float.h,v 1.2 1994/10/26 08:02:08 cgd Exp $	*/
+
 /*
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      from: @(#)float.h     7.2 (Berkeley) 6/28/90
- *	$Id: float.h,v 1.1 1994/08/02 20:20:22 ragge Exp $
+ *      @(#)float.h     7.2 (Berkeley) 6/28/90
  */
 
 #define FLT_RADIX       2               /* b */
diff --git a/sys/arch/vax/include/ioa.h b/sys/arch/vax/include/ioa.h
index 4ae0c9a92048..b09da95056f1 100644
--- a/sys/arch/vax/include/ioa.h
+++ b/sys/arch/vax/include/ioa.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ioa.h,v 1.2 1994/10/26 08:02:09 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: ioa.h,v 1.1 1994/08/02 20:20:28 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/ka750.h b/sys/arch/vax/include/ka750.h
index bdea3914ed97..c6c0b494fa4a 100644
--- a/sys/arch/vax/include/ka750.h
+++ b/sys/arch/vax/include/ka750.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ka750.h,v 1.2 1994/10/26 08:02:10 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: ka750.h,v 1.1 1994/08/02 20:20:30 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/kg.h b/sys/arch/vax/include/kg.h
index ecb442b31494..e37e6f94c2c1 100644
--- a/sys/arch/vax/include/kg.h
+++ b/sys/arch/vax/include/kg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: kg.h,v 1.2 1994/10/26 08:02:11 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: kg.h,v 1.1 1994/08/02 20:20:31 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/limits.h b/sys/arch/vax/include/limits.h
index 46ef747ca1ee..e87976f23ac3 100644
--- a/sys/arch/vax/include/limits.h
+++ b/sys/arch/vax/include/limits.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: limits.h,v 1.3 1994/10/26 08:02:12 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 The Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      from: @(#)limits.h    7.2 (Berkeley) 6/28/90
- *	$Id: limits.h,v 1.2 1994/10/05 17:16:54 jtc Exp $
+ *      @(#)limits.h    7.2 (Berkeley) 6/28/90
  */
 
 #define CHAR_BIT        8               /* number of bits in a char */
diff --git a/sys/arch/vax/include/loconf.h b/sys/arch/vax/include/loconf.h
index 23c516993916..62fb2f2b8020 100644
--- a/sys/arch/vax/include/loconf.h
+++ b/sys/arch/vax/include/loconf.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: loconf.h,v 1.2 1994/10/26 08:02:13 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: loconf.h,v 1.1 1994/08/02 20:20:34 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/macros.h b/sys/arch/vax/include/macros.h
index 8decc1d77a9f..c77d9b2109ef 100644
--- a/sys/arch/vax/include/macros.h
+++ b/sys/arch/vax/include/macros.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: macros.h,v 1.2 1994/10/26 08:02:14 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: macros.h,v 1.1 1994/08/02 20:20:36 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/mtpr.h b/sys/arch/vax/include/mtpr.h
index de2cf94001f3..d6c3462d84f8 100644
--- a/sys/arch/vax/include/mtpr.h
+++ b/sys/arch/vax/include/mtpr.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: mtpr.h,v 1.2 1994/10/26 08:02:15 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: mtpr.h,v 1.1 1994/08/02 20:20:38 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/nexus.h b/sys/arch/vax/include/nexus.h
index cf79f3988087..577299074aac 100644
--- a/sys/arch/vax/include/nexus.h
+++ b/sys/arch/vax/include/nexus.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: nexus.h,v 1.2 1994/10/26 08:02:17 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)nexus.h	7.3 (Berkeley) 5/9/91
- *	$Id: nexus.h,v 1.1 1994/08/02 20:20:39 ragge Exp $
+ *	@(#)nexus.h	7.3 (Berkeley) 5/9/91
  */
 
 /*
diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h
index e5f8f851cf2e..98b20934b499 100644
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: param.h,v 1.3 1994/10/26 08:02:18 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,8 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- *	$Id: param.h,v 1.2 1994/08/16 23:41:54 ragge Exp $
+ *	@(#)param.h	5.8 (Berkeley) 6/28/91
  */
 
 #ifndef PARAM_H
diff --git a/sys/arch/vax/include/pcb.h b/sys/arch/vax/include/pcb.h
index ce6b571c728f..6130bdef76c2 100644
--- a/sys/arch/vax/include/pcb.h
+++ b/sys/arch/vax/include/pcb.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pcb.h,v 1.3 1994/10/26 08:02:19 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: pcb.h,v 1.2 1994/10/08 15:43:55 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h
index a6753857da97..444a1608ccd1 100644
--- a/sys/arch/vax/include/pmap.h
+++ b/sys/arch/vax/include/pmap.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmap.h,v 1.4 1994/10/26 08:02:20 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
  * Copyright (c) 1991 Regents of the University of California.
@@ -37,8 +39,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)pmap.h	7.6 (Berkeley) 5/10/91
- *	$Id: pmap.h,v 1.3 1994/10/08 15:43:56 ragge Exp $
+ *	@(#)pmap.h	7.6 (Berkeley) 5/10/91
  */
 
 
diff --git a/sys/arch/vax/include/proc.h b/sys/arch/vax/include/proc.h
index b90fcabce39a..07559a36d244 100644
--- a/sys/arch/vax/include/proc.h
+++ b/sys/arch/vax/include/proc.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: proc.h,v 1.2 1994/10/26 08:02:21 cgd Exp $	*/
+
 /*
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- *	$Id: proc.h,v 1.1 1994/08/02 20:20:46 ragge Exp $
+ *	@(#)proc.h	7.1 (Berkeley) 5/15/91
  */
 
 /*
diff --git a/sys/arch/vax/include/psl.h b/sys/arch/vax/include/psl.h
index 52d67a70e70e..656653e912db 100644
--- a/sys/arch/vax/include/psl.h
+++ b/sys/arch/vax/include/psl.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: psl.h,v 1.3 1994/10/26 08:02:22 cgd Exp $	*/
+
 /*
  * Rewritten for the VAX port. Based on Berkeley code. /IC
  *
@@ -32,8 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)psl.h	7.2 (Berkeley) 5/4/91
- *	$Id: psl.h,v 1.2 1994/10/08 15:43:57 ragge Exp $
+ *	@(#)psl.h	7.2 (Berkeley) 5/4/91
  */
 
 #ifndef PSL_C
diff --git a/sys/arch/vax/include/pte.h b/sys/arch/vax/include/pte.h
index 0ee12fdbab6b..ce1a094c469b 100644
--- a/sys/arch/vax/include/pte.h
+++ b/sys/arch/vax/include/pte.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pte.h,v 1.2 1994/10/26 08:02:23 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: pte.h,v 1.1 1994/08/02 20:20:50 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/ptrace.h b/sys/arch/vax/include/ptrace.h
index b2a9b240afd6..8231d0079060 100644
--- a/sys/arch/vax/include/ptrace.h
+++ b/sys/arch/vax/include/ptrace.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ptrace.h,v 1.2 1994/10/26 08:02:24 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: ptrace.h,v 1.1 1994/08/02 20:20:51 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/reg.h b/sys/arch/vax/include/reg.h
index 1179e4084231..e6ace99aaaa6 100644
--- a/sys/arch/vax/include/reg.h
+++ b/sys/arch/vax/include/reg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: reg.h,v 1.2 1994/10/26 08:02:25 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: reg.h,v 1.1 1994/08/02 20:20:53 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/scb.h b/sys/arch/vax/include/scb.h
index aaaf8431e323..f56631831493 100644
--- a/sys/arch/vax/include/scb.h
+++ b/sys/arch/vax/include/scb.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: scb.h,v 1.2 1994/10/26 08:02:26 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: scb.h,v 1.1 1994/08/02 20:20:56 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/sid.h b/sys/arch/vax/include/sid.h
index 987277118fc3..e3ad2e574caa 100644
--- a/sys/arch/vax/include/sid.h
+++ b/sys/arch/vax/include/sid.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: sid.h,v 1.3 1994/10/26 08:02:28 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: sid.h,v 1.2 1994/10/08 15:43:58 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/signal.h b/sys/arch/vax/include/signal.h
index bdc61ffe5535..34b0ab6bfad0 100644
--- a/sys/arch/vax/include/signal.h
+++ b/sys/arch/vax/include/signal.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: signal.h,v 1.2 1994/10/26 08:02:29 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: signal.h,v 1.1 1994/08/02 20:20:58 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/include/stdarg.h b/sys/arch/vax/include/stdarg.h
index 468bba95463d..32102881ee93 100644
--- a/sys/arch/vax/include/stdarg.h
+++ b/sys/arch/vax/include/stdarg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: stdarg.h,v 1.3 1994/10/26 08:02:29 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      from: @(#)stdarg.h    7.2 (Berkeley) 5/4/91
- *	$Id: stdarg.h,v 1.2 1994/10/15 04:58:13 cgd Exp $
+ *      @(#)stdarg.h    7.2 (Berkeley) 5/4/91
  */
 
 #ifndef _VAX_STDARG_H_
diff --git a/sys/arch/vax/include/trap.h b/sys/arch/vax/include/trap.h
index 0b2cee3a55ad..2e08e3d61bb7 100644
--- a/sys/arch/vax/include/trap.h
+++ b/sys/arch/vax/include/trap.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: trap.h,v 1.2 1994/10/26 08:02:31 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- *	$Id: trap.h,v 1.1 1994/08/02 20:21:01 ragge Exp $
+ *	@(#)trap.h	5.4 (Berkeley) 5/9/91
  */
 
 /*
diff --git a/sys/arch/vax/include/types.h b/sys/arch/vax/include/types.h
index 1fdff969a6f8..22f96745fb2c 100644
--- a/sys/arch/vax/include/types.h
+++ b/sys/arch/vax/include/types.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: types.h,v 1.2 1994/10/26 08:02:32 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)types.h	7.5 (Berkeley) 3/9/91
- *	$Id: types.h,v 1.1 1994/08/02 20:21:03 ragge Exp $
+ *	@(#)types.h	7.5 (Berkeley) 3/9/91
  */
 
 #ifndef	_MACHTYPES_H_
diff --git a/sys/arch/vax/include/varargs.h b/sys/arch/vax/include/varargs.h
index 8cff62f06daf..2793d66515cd 100644
--- a/sys/arch/vax/include/varargs.h
+++ b/sys/arch/vax/include/varargs.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: varargs.h,v 1.3 1994/10/26 08:02:34 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)varargs.h	5.3 (Berkeley) 4/3/91
- *	$Id: varargs.h,v 1.2 1994/10/15 04:58:14 cgd Exp $
+ *	@(#)varargs.h	5.3 (Berkeley) 4/3/91
  */
 
 #ifndef _VAX_VARARGS_H_
diff --git a/sys/arch/vax/include/vmparam.h b/sys/arch/vax/include/vmparam.h
index b57e8b1a60a8..8059ffc5f476 100644
--- a/sys/arch/vax/include/vmparam.h
+++ b/sys/arch/vax/include/vmparam.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: vmparam.h,v 1.4 1994/10/26 08:02:36 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -35,8 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- *	$Id: vmparam.h,v 1.3 1994/10/08 15:43:59 ragge Exp $
+ *	@(#)vmparam.h	5.9 (Berkeley) 5/12/91
  */
 #ifndef ASSEMBLER
 #include <vm/vm_param.h>
diff --git a/sys/arch/vax/uba/uba.c b/sys/arch/vax/uba/uba.c
index 620284e3efe6..64859af79b42 100644
--- a/sys/arch/vax/uba/uba.c
+++ b/sys/arch/vax/uba/uba.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: uba.c,v 1.3 1994/10/26 08:02:41 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,9 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)uba.c	7.10 (Berkeley) 12/16/90
- *      also from: @(#)autoconf.c  7.20 (Berkeley) 5/9/91
- *	$Id: uba.c,v 1.2 1994/10/08 15:46:15 ragge Exp $
+ *	@(#)uba.c	7.10 (Berkeley) 12/16/90
+ *      @(#)autoconf.c  7.20 (Berkeley) 5/9/91
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/uba/ubareg.h b/sys/arch/vax/uba/ubareg.h
index 3be1da1d48c7..a0b49cdfcc8a 100644
--- a/sys/arch/vax/uba/ubareg.h
+++ b/sys/arch/vax/uba/ubareg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ubareg.h,v 1.2 1994/10/26 08:02:43 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -35,8 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)ubareg.h	7.8 (Berkeley) 5/9/91
- *	$Id: ubareg.h,v 1.1 1994/08/02 20:21:27 ragge Exp $
+ *	@(#)ubareg.h	7.8 (Berkeley) 5/9/91
  */
 
 /*
diff --git a/sys/arch/vax/uba/ubavar.h b/sys/arch/vax/uba/ubavar.h
index 2ddc09b5b365..338357df19ce 100644
--- a/sys/arch/vax/uba/ubavar.h
+++ b/sys/arch/vax/uba/ubavar.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ubavar.h,v 1.2 1994/10/26 08:02:45 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)ubavar.h	7.7 (Berkeley) 6/28/90
- *	$Id: ubavar.h,v 1.1 1994/08/02 20:21:28 ragge Exp $
+ *	@(#)ubavar.h	7.7 (Berkeley) 6/28/90
  */
 
 /*
diff --git a/sys/arch/vax/uba/uda.c b/sys/arch/vax/uba/uda.c
index fa23b93d8cd8..aecd17447586 100644
--- a/sys/arch/vax/uba/uda.c
+++ b/sys/arch/vax/uba/uda.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: uda.c,v 1.3 1994/10/26 08:02:47 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)uda.c	7.32 (Berkeley) 2/13/91
- *	$Id: uda.c,v 1.2 1994/10/08 15:46:17 ragge Exp $
+ *	@(#)uda.c	7.32 (Berkeley) 2/13/91
  */
 
 /*
diff --git a/sys/arch/vax/uba/udareg.h b/sys/arch/vax/uba/udareg.h
index fd8c91e73d9e..f6107a496052 100644
--- a/sys/arch/vax/uba/udareg.h
+++ b/sys/arch/vax/uba/udareg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: udareg.h,v 1.2 1994/10/26 08:02:51 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)udareg.h	7.3 (Berkeley) 5/8/91
- *	$Id: udareg.h,v 1.1 1994/08/02 20:21:31 ragge Exp $
+ *	@(#)udareg.h	7.3 (Berkeley) 5/8/91
  */
 
 /*
diff --git a/sys/arch/vax/vax/bcopy.s b/sys/arch/vax/vax/bcopy.s
index aad71abe0827..b27d16fded90 100644
--- a/sys/arch/vax/vax/bcopy.s
+++ b/sys/arch/vax/vax/bcopy.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: bcopy.s,v 1.2 1994/10/26 08:02:55 cgd Exp $	*/
+
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)bcopy.s     5.6 (Berkeley) 6/1/90
- *	$Id: bcopy.s,v 1.1 1994/08/02 18:43:00 ragge Exp $
+ *	@(#)bcopy.s     5.6 (Berkeley) 6/1/90
  */
 
 /* bcopy(from, to, size) */
diff --git a/sys/arch/vax/vax/clock.c b/sys/arch/vax/vax/clock.c
index 5674005018ec..e0ad52e26bae 100644
--- a/sys/arch/vax/vax/clock.c
+++ b/sys/arch/vax/vax/clock.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: clock.c,v 1.2 1994/10/26 08:02:57 cgd Exp $	*/
+
 /******************************************************************************
 
   clock.c
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index 7036f3972709..0a90369e3334 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: conf.c,v 1.4 1994/10/26 08:02:58 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)conf.c	7.18 (Berkeley) 5/9/91
- *	$Id: conf.c,v 1.3 1994/10/08 15:48:02 ragge Exp $
+ *	@(#)conf.c	7.18 (Berkeley) 5/9/91
  */
 
 #include "param.h"
diff --git a/sys/arch/vax/vax/cpu_machdep.c b/sys/arch/vax/vax/cpu_machdep.c
index e48b5643a643..30a95958e4ca 100644
--- a/sys/arch/vax/vax/cpu_machdep.c
+++ b/sys/arch/vax/vax/cpu_machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: cpu_machdep.c,v 1.2 1994/10/26 08:02:59 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
diff --git a/sys/arch/vax/vax/disksubr.c b/sys/arch/vax/vax/disksubr.c
index e71fe513e59a..9953a4c3a54c 100644
--- a/sys/arch/vax/vax/disksubr.c
+++ b/sys/arch/vax/vax/disksubr.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: disksubr.c,v 1.3 1994/10/26 08:03:01 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
- *	$Id: disksubr.c,v 1.2 1994/10/14 18:27:35 cgd Exp $
+ *	@(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  */
 
 #include "param.h"
@@ -139,7 +140,7 @@ writedisklabel(dev, strat, lp, osdep)
 }
 /*
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
- *	$Id: disksubr.c,v 1.2 1994/10/14 18:27:35 cgd Exp $
+ *	$Id: disksubr.c,v 1.3 1994/10/26 08:03:01 cgd Exp $
  */
 
 /*
diff --git a/sys/arch/vax/vax/gencons.c b/sys/arch/vax/vax/gencons.c
index 36a60f8319c9..c2481b0d832d 100644
--- a/sys/arch/vax/vax/gencons.c
+++ b/sys/arch/vax/vax/gencons.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: gencons.c,v 1.3 1994/10/26 08:03:03 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -28,8 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	from: kd.c,v 1.2 1994/05/05 04:46:51 gwr Exp $
- *	$Id: gencons.c,v 1.2 1994/10/08 15:48:04 ragge Exp $
+ *	kd.c,v 1.2 1994/05/05 04:46:51 gwr Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/vax/glue.c b/sys/arch/vax/vax/glue.c
index 4a875cadcd7d..b22132ddbb8f 100644
--- a/sys/arch/vax/vax/glue.c
+++ b/sys/arch/vax/vax/glue.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: glue.c,v 1.2 1994/10/26 08:03:06 cgd Exp $	*/
+
 /* This glue file will go away SOON! */
 
 #include "vax/include/pte.h"
diff --git a/sys/arch/vax/vax/intvec.s b/sys/arch/vax/vax/intvec.s
index 12c9a01fac3f..4b1ed8c60895 100644
--- a/sys/arch/vax/vax/intvec.s
+++ b/sys/arch/vax/vax/intvec.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: intvec.s,v 1.4 1994/10/26 08:03:10 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: intvec.s,v 1.3 1994/10/08 15:48:06 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/vax/ka750.c b/sys/arch/vax/vax/ka750.c
index a6a87f331d59..839264dbe14b 100644
--- a/sys/arch/vax/vax/ka750.c
+++ b/sys/arch/vax/vax/ka750.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: ka750.c,v 1.3 1994/10/26 08:03:12 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,9 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)ka750.c	7.4 (Berkeley) 5/9/91
- *      also from: @(#)autoconf.c  7.20 (Berkeley) 5/9/91
- *	$Id: ka750.c,v 1.2 1994/10/08 15:48:07 ragge Exp $
+ *	@(#)ka750.c	7.4 (Berkeley) 5/9/91
+ *      @(#)autoconf.c  7.20 (Berkeley) 5/9/91
  */
 
 /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index a1ece84e0671..521aa2bded4d 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: machdep.c,v 1.4 1994/10/26 08:03:14 cgd Exp $	*/
+
 /* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1988 University of Utah.
@@ -38,10 +40,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: Utah Hdr: machdep.c 1.63 91/04/24
- *	from: @(#)machdep.c	7.16 (Berkeley) 6/3/91
- *	from: machdep.c,v 1.12 1993/10/13 09:36:43 cgd Exp $
- *	$Id: machdep.c,v 1.3 1994/10/08 15:48:09 ragge Exp $
+ * from: Utah Hdr: machdep.c 1.63 91/04/24
+ *
+ *	@(#)machdep.c	7.16 (Berkeley) 6/3/91
  */
 
 #include "sys/param.h"
diff --git a/sys/arch/vax/vax/mem.c b/sys/arch/vax/vax/mem.c
index c312f804123e..e86c1a01ce1d 100644
--- a/sys/arch/vax/vax/mem.c
+++ b/sys/arch/vax/vax/mem.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mem.c,v 1.2 1994/10/26 08:03:15 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: mem.c,v 1.1 1994/10/08 15:48:10 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/vax/mscp.c b/sys/arch/vax/vax/mscp.c
index bb3fca44f617..fccc0e1f7126 100644
--- a/sys/arch/vax/vax/mscp.c
+++ b/sys/arch/vax/vax/mscp.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mscp.c,v 1.3 1994/10/26 08:03:16 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)mscp.c	7.5 (Berkeley) 12/16/90
- *	$Id: mscp.c,v 1.2 1994/10/08 15:48:11 ragge Exp $
+ *	@(#)mscp.c	7.5 (Berkeley) 12/16/90
  */
 
 /*
diff --git a/sys/arch/vax/vax/mscp.h b/sys/arch/vax/vax/mscp.h
index aa237e67fef3..76817ce59848 100644
--- a/sys/arch/vax/vax/mscp.h
+++ b/sys/arch/vax/vax/mscp.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: mscp.h,v 1.2 1994/10/26 08:03:18 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)mscp.h	7.5 (Berkeley) 6/28/90
- *	$Id: mscp.h,v 1.1 1994/08/02 20:22:06 ragge Exp $
+ *	@(#)mscp.h	7.5 (Berkeley) 6/28/90
  */
 
 /*
diff --git a/sys/arch/vax/vax/mscpvar.h b/sys/arch/vax/vax/mscpvar.h
index bc800bcd2b15..3cfd3f321577 100644
--- a/sys/arch/vax/vax/mscpvar.h
+++ b/sys/arch/vax/vax/mscpvar.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: mscpvar.h,v 1.3 1994/10/26 08:03:20 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)mscpvar.h	7.3 (Berkeley) 6/28/90
- *	$Id: mscpvar.h,v 1.2 1994/10/08 15:48:13 ragge Exp $
+ *	@(#)mscpvar.h	7.3 (Berkeley) 6/28/90
  */
 
 /*
diff --git a/sys/arch/vax/vax/pmap.c b/sys/arch/vax/vax/pmap.c
index cf22f5772d9b..6f6dcb6b6af6 100644
--- a/sys/arch/vax/vax/pmap.c
+++ b/sys/arch/vax/vax/pmap.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmap.c,v 1.4 1994/10/26 08:03:22 cgd Exp $	*/
+
 #define DEBUG
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -27,9 +29,6 @@
  * 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: pmap.c,v 1.3 1994/10/08 15:48:14 ragge Exp $
- *	With ideas from HP300 port/IC
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/vax/random.s b/sys/arch/vax/vax/random.s
index a0ffd7e0ea47..b6dc4db0bff7 100644
--- a/sys/arch/vax/vax/random.s
+++ b/sys/arch/vax/vax/random.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: random.s,v 1.2 1994/10/26 08:03:24 cgd Exp $	*/
+
 /*
  * Copyright (c) 1990,1993 The Regents of the University of California.
  * All rights reserved.
@@ -42,8 +44,6 @@
  * return (seed);
  *
  * The result is in (0,2^31), e.g., it's always positive.
- *
- *	$Id: random.s,v 1.1 1994/08/02 20:22:11 ragge Exp $
  */
 
 	.data
diff --git a/sys/arch/vax/vax/rootfil.c b/sys/arch/vax/vax/rootfil.c
index 678e2e18d57c..ceaf23c905ad 100644
--- a/sys/arch/vax/vax/rootfil.c
+++ b/sys/arch/vax/vax/rootfil.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: rootfil.c,v 1.2 1994/10/26 08:03:25 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -36,9 +38,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: Utah Hdr: machdep.c 1.63 91/04/24
- *	from: @(#)machdep.c	7.16 (Berkeley) 6/3/91
- *	$Id: rootfil.c,v 1.1 1994/08/02 20:22:12 ragge Exp $
+ * from: Utah Hdr: machdep.c 1.63 91/04/24
+ *
+ *	@(#)machdep.c	7.16 (Berkeley) 6/3/91
  */
  /* All bugs are subject to removal without further notice */
 
diff --git a/sys/arch/vax/vax/skit.c b/sys/arch/vax/vax/skit.c
index 5fd00e1cc51b..b75a0f616557 100644
--- a/sys/arch/vax/vax/skit.c
+++ b/sys/arch/vax/vax/skit.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: skit.c,v 1.4 1994/10/26 08:03:27 cgd Exp $	*/
+
 /*
  * This file shouldn't exist; it contains all undefines that currently is.
  * (even undefined pointers, bleh!) It is actually created from an awk
diff --git a/sys/arch/vax/vax/subr.s b/sys/arch/vax/vax/subr.s
index 8b6f4bfeafbd..73ebb7959f16 100644
--- a/sys/arch/vax/vax/subr.s
+++ b/sys/arch/vax/vax/subr.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: subr.s,v 1.2 1994/10/26 08:03:29 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -26,8 +28,6 @@
  * 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: subr.s,v 1.1 1994/10/08 15:48:16 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/vax/swapgeneric.c b/sys/arch/vax/vax/swapgeneric.c
index 7782b1c38bfb..8143973eb379 100644
--- a/sys/arch/vax/vax/swapgeneric.c
+++ b/sys/arch/vax/vax/swapgeneric.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: swapgeneric.c,v 1.3 1994/10/26 08:03:31 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)swapgeneric.c	7.11 (Berkeley) 5/9/91
- *	$Id: swapgeneric.c,v 1.2 1994/10/08 15:48:18 ragge Exp $
+ *	@(#)swapgeneric.c	7.11 (Berkeley) 5/9/91
  */
 
 #include "mba.h"
diff --git a/sys/arch/vax/vax/trap.c b/sys/arch/vax/vax/trap.c
index 5190c0289dce..a2ed4b127746 100644
--- a/sys/arch/vax/vax/trap.c
+++ b/sys/arch/vax/vax/trap.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: trap.c,v 1.4 1994/10/26 08:03:32 cgd Exp $	*/
+
 #define SCHEDDEBUG
 #undef FAULTDEBUG
 /*
@@ -28,8 +30,6 @@
  * 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: trap.c,v 1.3 1994/10/08 15:48:19 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/vax/udiv.s b/sys/arch/vax/vax/udiv.s
index 0e55bb2f81f5..99fb0fcab211 100644
--- a/sys/arch/vax/vax/udiv.s
+++ b/sys/arch/vax/vax/udiv.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: udiv.s,v 1.2 1994/10/26 08:03:34 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
  * All rights reserved.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)udiv.s      5.6 (Berkeley) 4/15/91
- *	$Id: udiv.s,v 1.1 1994/08/02 20:22:19 ragge Exp $
+ *	@(#)udiv.s      5.6 (Berkeley) 4/15/91
  */
 
 /*
diff --git a/sys/arch/vax/vax/urem.s b/sys/arch/vax/vax/urem.s
index 487fbef80567..c0f0857df02a 100644
--- a/sys/arch/vax/vax/urem.s
+++ b/sys/arch/vax/vax/urem.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: urem.s,v 1.2 1994/10/26 08:03:37 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
  * All rights reserved.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)urem.s      5.6 (Berkeley) 4/15/91
- *	$Id: urem.s,v 1.1 1994/08/02 20:22:20 ragge Exp $
+ *	@(#)urem.s      5.6 (Berkeley) 4/15/91
  */
 
 /*
diff --git a/sys/arch/vax/vax/vm_machdep.c b/sys/arch/vax/vax/vm_machdep.c
index dc875de7878d..cd89cf118462 100644
--- a/sys/arch/vax/vax/vm_machdep.c
+++ b/sys/arch/vax/vax/vm_machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: vm_machdep.c,v 1.4 1994/10/26 08:03:38 cgd Exp $	*/
+
 #undef SWDEBUG
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -27,8 +29,6 @@
  * 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: vm_machdep.c,v 1.3 1994/10/08 15:48:20 ragge Exp $
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/arch/vax/vax/yyyin_cksum.c b/sys/arch/vax/vax/yyyin_cksum.c
index aced6142792c..6c1dd74d9063 100644
--- a/sys/arch/vax/vax/yyyin_cksum.c
+++ b/sys/arch/vax/vax/yyyin_cksum.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: yyyin_cksum.c,v 1.2 1994/10/26 08:03:08 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.
@@ -31,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_cksum.c	7.6 (Berkeley) 12/16/90
- *	$Id: yyyin_cksum.c,v 1.1 1994/08/02 20:21:55 ragge Exp $
  */
 
 #include "sys/param.h"
diff --git a/sys/dev/dec/qbus/uba.c b/sys/dev/dec/qbus/uba.c
index 620284e3efe6..64859af79b42 100644
--- a/sys/dev/dec/qbus/uba.c
+++ b/sys/dev/dec/qbus/uba.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: uba.c,v 1.3 1994/10/26 08:02:41 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,9 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)uba.c	7.10 (Berkeley) 12/16/90
- *      also from: @(#)autoconf.c  7.20 (Berkeley) 5/9/91
- *	$Id: uba.c,v 1.2 1994/10/08 15:46:15 ragge Exp $
+ *	@(#)uba.c	7.10 (Berkeley) 12/16/90
+ *      @(#)autoconf.c  7.20 (Berkeley) 5/9/91
  */
 
  /* All bugs are subject to removal without further notice */
diff --git a/sys/dev/dec/qbus/ubareg.h b/sys/dev/dec/qbus/ubareg.h
index 3be1da1d48c7..a0b49cdfcc8a 100644
--- a/sys/dev/dec/qbus/ubareg.h
+++ b/sys/dev/dec/qbus/ubareg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ubareg.h,v 1.2 1994/10/26 08:02:43 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -35,8 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)ubareg.h	7.8 (Berkeley) 5/9/91
- *	$Id: ubareg.h,v 1.1 1994/08/02 20:21:27 ragge Exp $
+ *	@(#)ubareg.h	7.8 (Berkeley) 5/9/91
  */
 
 /*
diff --git a/sys/dev/dec/qbus/ubavar.h b/sys/dev/dec/qbus/ubavar.h
index 2ddc09b5b365..338357df19ce 100644
--- a/sys/dev/dec/qbus/ubavar.h
+++ b/sys/dev/dec/qbus/ubavar.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ubavar.h,v 1.2 1994/10/26 08:02:45 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)ubavar.h	7.7 (Berkeley) 6/28/90
- *	$Id: ubavar.h,v 1.1 1994/08/02 20:21:28 ragge Exp $
+ *	@(#)ubavar.h	7.7 (Berkeley) 6/28/90
  */
 
 /*