diff --git a/sys/arch/mips/include/ansi.h b/sys/arch/mips/include/ansi.h
index 289f500136e5..1b329b0d39c1 100644
--- a/sys/arch/mips/include/ansi.h
+++ b/sys/arch/mips/include/ansi.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ansi.h,v 1.5 1994/10/26 21:09:33 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990, 1993
  *	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: @(#)ansi.h	8.2 (Berkeley) 1/4/94
- *      $Id: ansi.h,v 1.4 1994/05/27 09:00:21 glass Exp $
+ *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
  */
 
 #ifndef	_ANSI_H_
diff --git a/sys/arch/mips/include/aout_machdep.h b/sys/arch/mips/include/aout_machdep.h
index 43a4d23b21da..7b6986d0c474 100644
--- a/sys/arch/mips/include/aout_machdep.h
+++ b/sys/arch/mips/include/aout_machdep.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: aout_machdep.h,v 1.5 1994/10/26 21:09:39 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)exec.h	8.1 (Berkeley) 6/10/93
- *      $Id: aout_machdep.h,v 1.4 1994/05/27 09:00:56 glass Exp $
+ *	@(#)exec.h	8.1 (Berkeley) 6/10/93
  */
 
 #define	__LDPGSZ	4096
diff --git a/sys/arch/mips/include/asm.h b/sys/arch/mips/include/asm.h
index 1ad25d55de11..8e997617885a 100644
--- a/sys/arch/mips/include/asm.h
+++ b/sys/arch/mips/include/asm.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: asm.h,v 1.4 1994/10/26 21:09:44 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)machAsmDefs.h	8.1 (Berkeley) 6/10/93
- *      $Id: asm.h,v 1.3 1994/05/27 09:01:19 glass Exp $
+ *	@(#)machAsmDefs.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
@@ -52,7 +53,6 @@
  *
  * from: Header: /sprite/src/kernel/mach/ds3100.md/RCS/machAsmDefs.h,
  *	v 1.2 89/08/15 18:28:24 rab Exp  SPRITE (DECWRL)
- * $Id: asm.h,v 1.3 1994/05/27 09:01:19 glass Exp $
  */
 
 #ifndef _MACHASMDEFS
diff --git a/sys/arch/mips/include/cpu.h b/sys/arch/mips/include/cpu.h
index de5897763e10..c581f1dc20ca 100644
--- a/sys/arch/mips/include/cpu.h
+++ b/sys/arch/mips/include/cpu.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: cpu.h,v 1.8 1994/10/26 21:09:34 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)cpu.h	8.4 (Berkeley) 1/4/94
- *      $Id: cpu.h,v 1.7 1994/06/02 06:15:03 glass Exp $
+ *	@(#)cpu.h	8.4 (Berkeley) 1/4/94
  */
 
 #ifndef _CPU_H_
diff --git a/sys/arch/mips/include/cpuregs.h b/sys/arch/mips/include/cpuregs.h
index 8f20c97aedee..b6c3d38428c3 100644
--- a/sys/arch/mips/include/cpuregs.h
+++ b/sys/arch/mips/include/cpuregs.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: cpuregs.h,v 1.4 1994/10/26 21:09:45 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)machConst.h	8.1 (Berkeley) 6/10/93
- *      $Id: cpuregs.h,v 1.3 1994/05/27 09:01:23 glass Exp $
+ *	@(#)machConst.h	8.1 (Berkeley) 6/10/93
  *
  * machConst.h --
  *
@@ -54,7 +55,6 @@
  *	v 1.2 89/08/15 18:28:21 rab Exp  SPRITE (DECWRL)
  * from: Header: /sprite/src/kernel/vm/ds3100.md/RCS/vmPmaxConst.h,
  *	v 9.1 89/09/18 17:33:00 shirriff Exp  SPRITE (DECWRL)
- * $Id: cpuregs.h,v 1.3 1994/05/27 09:01:23 glass Exp $
  */
 
 #ifndef _MACHCONST
diff --git a/sys/arch/mips/include/ecoff.h b/sys/arch/mips/include/ecoff.h
index 9bc0acd1761e..f63c2ab3b91c 100644
--- a/sys/arch/mips/include/ecoff.h
+++ b/sys/arch/mips/include/ecoff.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ecoff.h,v 1.3 1994/10/26 21:09:38 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Adam Glass
  * All rights reserved.
@@ -27,8 +29,6 @@
  * 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: ecoff.h,v 1.2 1994/05/28 20:21:34 glass Exp $
  */
 
 #define ECOFF_LDPGSZ 4096
diff --git a/sys/arch/mips/include/ecoff_machdep.h b/sys/arch/mips/include/ecoff_machdep.h
index 4fbcaf293b29..f6b7bd521cfc 100644
--- a/sys/arch/mips/include/ecoff_machdep.h
+++ b/sys/arch/mips/include/ecoff_machdep.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ecoff_machdep.h,v 1.3 1994/10/26 21:09:38 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Adam Glass
  * All rights reserved.
@@ -27,8 +29,6 @@
  * 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: ecoff_machdep.h,v 1.2 1994/05/28 20:21:34 glass Exp $
  */
 
 #define ECOFF_LDPGSZ 4096
diff --git a/sys/arch/mips/include/endian.h b/sys/arch/mips/include/endian.h
index 9282e521c021..3aeb69fc3ca5 100644
--- a/sys/arch/mips/include/endian.h
+++ b/sys/arch/mips/include/endian.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: endian.h,v 1.4 1994/10/26 21:09:38 cgd Exp $	*/
+
 /*
  * Copyright (c) 1987, 1991, 1993
  *	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: @(#)endian.h	8.1 (Berkeley) 6/11/93
- *      $Id: endian.h,v 1.3 1994/05/27 09:00:49 glass Exp $
+ *	@(#)endian.h	8.1 (Berkeley) 6/11/93
  */
 
 #ifndef _ENDIAN_H_
diff --git a/sys/arch/mips/include/exec.h b/sys/arch/mips/include/exec.h
index 852e6f0da35f..87dde64bf8e9 100644
--- a/sys/arch/mips/include/exec.h
+++ b/sys/arch/mips/include/exec.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: exec.h,v 1.5 1994/10/26 21:09:39 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)exec.h	8.1 (Berkeley) 6/10/93
- *      $Id: exec.h,v 1.4 1994/05/27 09:00:56 glass Exp $
+ *	@(#)exec.h	8.1 (Berkeley) 6/10/93
  */
 
 #define	__LDPGSZ	4096
diff --git a/sys/arch/mips/include/float.h b/sys/arch/mips/include/float.h
index 86eb4bbaa7b6..8d7e006f5b09 100644
--- a/sys/arch/mips/include/float.h
+++ b/sys/arch/mips/include/float.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: float.h,v 1.4 1994/10/26 21:09:41 cgd Exp $	*/
+
 /*
  * Copyright (c) 1989, 1993
  *	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: @(#)float.h	8.1 (Berkeley) 6/10/93
- *      $Id: float.h,v 1.3 1994/05/27 09:01:04 glass Exp $
+ *	@(#)float.h	8.1 (Berkeley) 6/10/93
  */
 
 #define FLT_RADIX	2		/* b */
diff --git a/sys/arch/mips/include/kdbparam.h b/sys/arch/mips/include/kdbparam.h
index 955b4c3887dc..9104c87aa3c8 100644
--- a/sys/arch/mips/include/kdbparam.h
+++ b/sys/arch/mips/include/kdbparam.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: kdbparam.h,v 1.4 1994/10/26 21:09:42 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)kdbparam.h	8.1 (Berkeley) 6/10/93
- *      $Id: kdbparam.h,v 1.3 1994/05/27 09:01:10 glass Exp $
+ *	@(#)kdbparam.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/mips/include/limits.h b/sys/arch/mips/include/limits.h
index 5674c9735cc0..ca2a8ff731de 100644
--- a/sys/arch/mips/include/limits.h
+++ b/sys/arch/mips/include/limits.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: limits.h,v 1.6 1994/10/26 21:09:43 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988, 1993
  *	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	8.3 (Berkeley) 1/4/94
- *      $Id: limits.h,v 1.5 1994/10/05 17:16:45 jtc Exp $
+ *	@(#)limits.h	8.3 (Berkeley) 1/4/94
  */
 
 #define	CHAR_BIT	8		/* number of bits in a char */
diff --git a/sys/arch/mips/include/mips1_pte.h b/sys/arch/mips/include/mips1_pte.h
index dfd13a258170..e6fb753c9782 100644
--- a/sys/arch/mips/include/mips1_pte.h
+++ b/sys/arch/mips/include/mips1_pte.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: mips1_pte.h,v 1.4 1994/10/26 21:09:55 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: pte.h 1.11 89/09/03
  *
- *	from: @(#)pte.h	8.1 (Berkeley) 6/10/93
- *      $Id: mips1_pte.h,v 1.3 1994/05/27 09:01:59 glass Exp $
+ *	@(#)pte.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/mips/include/mips_opcode.h b/sys/arch/mips/include/mips_opcode.h
index 7423c141034c..ae4612a98654 100644
--- a/sys/arch/mips/include/mips_opcode.h
+++ b/sys/arch/mips/include/mips_opcode.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: mips_opcode.h,v 1.4 1994/10/26 21:09:46 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)mips_opcode.h	8.1 (Berkeley) 6/10/93
- *      $Id: mips_opcode.h,v 1.3 1994/05/27 09:01:30 glass Exp $
+ *	@(#)mips_opcode.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/mips/include/pcb.h b/sys/arch/mips/include/pcb.h
index 23227fa5ea21..ad0299ca0be0 100644
--- a/sys/arch/mips/include/pcb.h
+++ b/sys/arch/mips/include/pcb.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pcb.h,v 1.4 1994/10/26 21:09:49 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: pcb.h 1.13 89/04/23
  *
- *	from: @(#)pcb.h	8.1 (Berkeley) 6/10/93
- *      $Id: pcb.h,v 1.3 1994/05/27 09:01:37 glass Exp $
+ *	@(#)pcb.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/mips/include/pmap.h b/sys/arch/mips/include/pmap.h
index c02b414cf6ee..30069093b8a5 100644
--- a/sys/arch/mips/include/pmap.h
+++ b/sys/arch/mips/include/pmap.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmap.h,v 1.5 1994/10/26 21:09:50 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
  * Copyright (c) 1992, 1993
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)pmap.h	8.1 (Berkeley) 6/10/93
- *      $Id: pmap.h,v 1.4 1994/05/27 09:01:41 glass Exp $
+ *	@(#)pmap.h	8.1 (Berkeley) 6/10/93
  */
 
 #ifndef	_PMAP_MACHINE_
diff --git a/sys/arch/mips/include/proc.h b/sys/arch/mips/include/proc.h
index 43f8f377795d..202d95623147 100644
--- a/sys/arch/mips/include/proc.h
+++ b/sys/arch/mips/include/proc.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: proc.h,v 1.4 1994/10/26 21:09:52 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)proc.h	8.1 (Berkeley) 6/10/93
- *      $Id: proc.h,v 1.3 1994/05/27 09:01:47 glass Exp $
+ *	@(#)proc.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/mips/include/profile.h b/sys/arch/mips/include/profile.h
index 2b6618bcfa46..627c0f05ddcc 100644
--- a/sys/arch/mips/include/profile.h
+++ b/sys/arch/mips/include/profile.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: profile.h,v 1.4 1994/10/26 21:09:53 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)profile.h	8.1 (Berkeley) 6/10/93
- *      $Id: profile.h,v 1.3 1994/05/27 09:01:50 glass Exp $
+ *	@(#)profile.h	8.1 (Berkeley) 6/10/93
  */
 
 #define	_MCOUNT_DECL static void __mcount
diff --git a/sys/arch/mips/include/psl.h b/sys/arch/mips/include/psl.h
index 75733763d2c9..d67c78239bbe 100644
--- a/sys/arch/mips/include/psl.h
+++ b/sys/arch/mips/include/psl.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: psl.h,v 1.4 1994/10/26 21:09:54 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)psl.h	8.1 (Berkeley) 6/10/93
- *      $Id: psl.h,v 1.3 1994/05/27 09:01:53 glass Exp $
+ *	@(#)psl.h	8.1 (Berkeley) 6/10/93
  */
 
 #include <machine/machConst.h>
diff --git a/sys/arch/mips/include/ptrace.h b/sys/arch/mips/include/ptrace.h
index 132f8533c924..fbde035381d5 100644
--- a/sys/arch/mips/include/ptrace.h
+++ b/sys/arch/mips/include/ptrace.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ptrace.h,v 1.4 1994/10/26 21:09:56 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)ptrace.h	8.1 (Berkeley) 6/10/93
- *      $Id: ptrace.h,v 1.3 1994/05/27 09:02:07 glass Exp $
+ *	@(#)ptrace.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/mips/include/reg.h b/sys/arch/mips/include/reg.h
index 473b717cf4a2..22d561f695e6 100644
--- a/sys/arch/mips/include/reg.h
+++ b/sys/arch/mips/include/reg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: reg.h,v 1.4 1994/10/26 21:09:57 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: reg.h 1.1 90/07/09
  *
- *	from: @(#)reg.h	8.2 (Berkeley) 1/11/94
- *      $Id: reg.h,v 1.3 1994/05/27 09:02:12 glass Exp $
+ *	@(#)reg.h	8.2 (Berkeley) 1/11/94
  */
 
 /*
diff --git a/sys/arch/mips/include/regdef.h b/sys/arch/mips/include/regdef.h
index 0eb9f05f75d8..46216b57d00c 100644
--- a/sys/arch/mips/include/regdef.h
+++ b/sys/arch/mips/include/regdef.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: regdef.h,v 1.4 1994/10/26 21:09:58 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)regdef.h	8.1 (Berkeley) 6/10/93
- *      $Id: regdef.h,v 1.3 1994/05/27 09:02:16 glass Exp $
+ *	@(#)regdef.h	8.1 (Berkeley) 6/10/93
  */
 
 #define zero	$0	/* always zero */
diff --git a/sys/arch/mips/include/reloc.h b/sys/arch/mips/include/reloc.h
index 4d4c668c81fe..f81a086fdc18 100644
--- a/sys/arch/mips/include/reloc.h
+++ b/sys/arch/mips/include/reloc.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: reloc.h,v 1.4 1994/10/26 21:09:59 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)reloc.h	8.1 (Berkeley) 6/10/93
- *      $Id: reloc.h,v 1.3 1994/05/27 09:02:19 glass Exp $
+ *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
  *
  * from: Header: reloc.h,v 1.6 92/06/20 09:59:37 torek Exp
  */
diff --git a/sys/arch/mips/include/signal.h b/sys/arch/mips/include/signal.h
index 4ad12f3a67cb..eecfb997d448 100644
--- a/sys/arch/mips/include/signal.h
+++ b/sys/arch/mips/include/signal.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: signal.h,v 1.4 1994/10/26 21:10:01 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)signal.h	8.1 (Berkeley) 6/10/93
- *      $Id: signal.h,v 1.3 1994/05/27 09:02:22 glass Exp $
+ *	@(#)signal.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/mips/include/stdarg.h b/sys/arch/mips/include/stdarg.h
index cbb36fbeb885..2bbee1277dd3 100644
--- a/sys/arch/mips/include/stdarg.h
+++ b/sys/arch/mips/include/stdarg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: stdarg.h,v 1.5 1994/10/26 21:10:03 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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	8.1 (Berkeley) 6/10/93
- *      $Id: stdarg.h,v 1.4 1994/10/15 04:58:02 cgd Exp $
+ *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
  */
 
 #ifndef _PMAX_STDARG_H_
diff --git a/sys/arch/mips/include/trap.h b/sys/arch/mips/include/trap.h
index b60548149e30..72dc62edfddc 100644
--- a/sys/arch/mips/include/trap.h
+++ b/sys/arch/mips/include/trap.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: trap.h,v 1.4 1994/10/26 21:10:04 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: trap.h 1.1 90/07/09
  *
- *	from: @(#)trap.h	8.1 (Berkeley) 6/10/93
- *      $Id: trap.h,v 1.3 1994/05/27 09:02:30 glass Exp $
+ *	@(#)trap.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/mips/include/types.h b/sys/arch/mips/include/types.h
index 68540c5a672f..3a45a3f52ea1 100644
--- a/sys/arch/mips/include/types.h
+++ b/sys/arch/mips/include/types.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: types.h,v 1.7 1994/10/26 21:10:07 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)types.h	8.3 (Berkeley) 1/5/94
- *      $Id: types.h,v 1.6 1994/10/20 05:34:04 cgd Exp $
+ *	@(#)types.h	8.3 (Berkeley) 1/5/94
  */
 
 #ifndef	_MACHTYPES_H_
diff --git a/sys/arch/mips/include/varargs.h b/sys/arch/mips/include/varargs.h
index df7178c489d2..6389c7d5e6e1 100644
--- a/sys/arch/mips/include/varargs.h
+++ b/sys/arch/mips/include/varargs.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: varargs.h,v 1.6 1994/10/26 21:10:09 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)varargs.h	8.2 (Berkeley) 3/22/94
- *      $Id: varargs.h,v 1.5 1994/10/15 04:58:03 cgd Exp $
+ *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
  */
 
 #ifndef _PMAX_VARARGS_H_
diff --git a/sys/arch/mips/include/vmparam.h b/sys/arch/mips/include/vmparam.h
index 62834114c58c..6215614fcf13 100644
--- a/sys/arch/mips/include/vmparam.h
+++ b/sys/arch/mips/include/vmparam.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: vmparam.h 1.16 91/01/18
  *
- *	from: @(#)vmparam.h	8.2 (Berkeley) 4/22/94
- *      $Id: vmparam.h,v 1.4 1994/06/01 18:51:16 glass Exp $
+ *	@(#)vmparam.h	8.2 (Berkeley) 4/22/94
  */
 
 /*
diff --git a/sys/arch/mips/mips/fp.S b/sys/arch/mips/mips/fp.S
index 61b3d521e7a8..be1b8a966e1c 100644
--- a/sys/arch/mips/mips/fp.S
+++ b/sys/arch/mips/mips/fp.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: fp.S,v 1.4 1994/10/26 21:10:21 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)fp.s	8.1 (Berkeley) 6/10/93
- *      $Id: fp.S,v 1.3 1994/05/27 09:03:12 glass Exp $
+ *	@(#)fp.s	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/mips/mips/genassym.c b/sys/arch/mips/mips/genassym.c
index dde986ce7d94..0e3a92c92f5e 100644
--- a/sys/arch/mips/mips/genassym.c
+++ b/sys/arch/mips/mips/genassym.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: genassym.c,v 1.5 1994/10/26 21:10:23 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)genassym.c	8.2 (Berkeley) 9/23/93
- *      $Id: genassym.c,v 1.4 1994/05/27 09:03:15 glass Exp $
+ *	@(#)genassym.c	8.2 (Berkeley) 9/23/93
  */
 
 #define KERNEL
diff --git a/sys/arch/mips/mips/locore.S b/sys/arch/mips/mips/locore.S
index db857bd75a55..7527a67e2367 100644
--- a/sys/arch/mips/mips/locore.S
+++ b/sys/arch/mips/mips/locore.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: locore.S,v 1.5 1994/10/26 21:10:31 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -48,8 +50,7 @@
  * from: Header: /sprite/src/kernel/vm/ds3100.md/vmPmaxAsm.s,
  *	v 1.1 89/07/10 14:27:41 nelson Exp  SPRITE (DECWRL)
  *
- *	from: @(#)locore.s	8.5 (Berkeley) 1/4/94
- *	$Id: locore.S,v 1.4 1994/06/25 07:05:12 glass Exp $
+ *	@(#)locore.s	8.5 (Berkeley) 1/4/94
  */
 
 /*
diff --git a/sys/arch/mips/mips/locore_r2000.S b/sys/arch/mips/mips/locore_r2000.S
index fefeebc7dc04..256f3b513afe 100644
--- a/sys/arch/mips/mips/locore_r2000.S
+++ b/sys/arch/mips/mips/locore_r2000.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: locore_r2000.S,v 1.5 1994/10/26 21:10:31 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -48,8 +50,7 @@
  * from: Header: /sprite/src/kernel/vm/ds3100.md/vmPmaxAsm.s,
  *	v 1.1 89/07/10 14:27:41 nelson Exp  SPRITE (DECWRL)
  *
- *	from: @(#)locore.s	8.5 (Berkeley) 1/4/94
- *	$Id: locore_r2000.S,v 1.4 1994/06/25 07:05:12 glass Exp $
+ *	@(#)locore.s	8.5 (Berkeley) 1/4/94
  */
 
 /*
diff --git a/sys/arch/mips/mips/locore_r4000.S b/sys/arch/mips/mips/locore_r4000.S
index 4ccc1064695b..0c68a36049a9 100644
--- a/sys/arch/mips/mips/locore_r4000.S
+++ b/sys/arch/mips/mips/locore_r4000.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: locore_r4000.S,v 1.5 1994/10/26 21:10:31 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -48,8 +50,7 @@
  * from: Header: /sprite/src/kernel/vm/ds3100.md/vmPmaxAsm.s,
  *	v 1.1 89/07/10 14:27:41 nelson Exp  SPRITE (DECWRL)
  *
- *	from: @(#)locore.s	8.5 (Berkeley) 1/4/94
- *	$Id: locore_r4000.S,v 1.4 1994/06/25 07:05:12 glass Exp $
+ *	@(#)locore.s	8.5 (Berkeley) 1/4/94
  */
 
 /*
diff --git a/sys/arch/mips/mips/mem.c b/sys/arch/mips/mips/mem.c
index a610d4ce4b1e..c52c6efcb530 100644
--- a/sys/arch/mips/mips/mem.c
+++ b/sys/arch/mips/mips/mem.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mem.c,v 1.5 1994/10/26 21:10:37 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: mem.c 1.14 90/10/12
  *
- *	from: @(#)mem.c	8.2 (Berkeley) 3/28/94
- *      $Id: mem.c,v 1.4 1994/05/27 09:03:47 glass Exp $
+ *	@(#)mem.c	8.2 (Berkeley) 3/28/94
  */
 
 /*
diff --git a/sys/arch/mips/mips/pmap.c b/sys/arch/mips/mips/pmap.c
index 084f68f1ecf8..e8da67603bca 100644
--- a/sys/arch/mips/mips/pmap.c
+++ b/sys/arch/mips/mips/pmap.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmap.c,v 1.6 1994/10/26 21:10:38 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)pmap.c	8.4 (Berkeley) 1/26/94
- *      $Id: pmap.c,v 1.5 1994/05/27 09:03:51 glass Exp $
+ *	@(#)pmap.c	8.4 (Berkeley) 1/26/94
  */
 
 /*
diff --git a/sys/arch/mips/mips/process_machdep.c b/sys/arch/mips/mips/process_machdep.c
index 355827c3057a..45f60cd91bed 100644
--- a/sys/arch/mips/mips/process_machdep.c
+++ b/sys/arch/mips/mips/process_machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: process_machdep.c,v 1.3 1994/10/26 21:10:40 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Adam Glass   
  * Copyright (c) 1993 The Regents of the University of California.
@@ -37,8 +39,6 @@
  *
  * From:
  *	Id: procfs_i386.c,v 4.1 1993/12/17 10:47:45 jsp Rel
- *
- *	$Id: process_machdep.c,v 1.2 1994/08/15 16:37:29 cgd Exp $
  */
 
 /*
diff --git a/sys/arch/mips/mips/sys_machdep.c b/sys/arch/mips/mips/sys_machdep.c
index b2c629793ce4..fabbe4c48158 100644
--- a/sys/arch/mips/mips/sys_machdep.c
+++ b/sys/arch/mips/mips/sys_machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: sys_machdep.c,v 1.6 1994/10/26 21:10:42 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)sys_machdep.c	8.1 (Berkeley) 6/10/93
- *      $Id: sys_machdep.c,v 1.5 1994/10/20 05:34:10 cgd Exp $
+ *	@(#)sys_machdep.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/mips/mips/trap.c b/sys/arch/mips/mips/trap.c
index 9ae93aa7238d..1d9035339b13 100644
--- a/sys/arch/mips/mips/trap.c
+++ b/sys/arch/mips/mips/trap.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: trap.c,v 1.8 1994/10/26 21:10:43 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: trap.c 1.32 91/04/06
  *
- *	from: @(#)trap.c	8.5 (Berkeley) 1/11/94
- *      $Id: trap.c,v 1.7 1994/10/20 05:34:11 cgd Exp $
+ *	@(#)trap.c	8.5 (Berkeley) 1/11/94
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/mips/mips/vm_machdep.c b/sys/arch/mips/mips/vm_machdep.c
index 695f89e1b2e0..2f1ca9251a1f 100644
--- a/sys/arch/mips/mips/vm_machdep.c
+++ b/sys/arch/mips/mips/vm_machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: vm_machdep.c,v 1.5 1994/10/26 21:10:46 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: vm_machdep.c 1.21 91/04/06
  *
- *	from: @(#)vm_machdep.c	8.3 (Berkeley) 1/4/94
- *      $Id: vm_machdep.c,v 1.4 1994/05/27 09:04:32 glass Exp $
+ *	@(#)vm_machdep.c	8.3 (Berkeley) 1/4/94
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/Makefile b/sys/arch/pmax/Makefile
index 245dbbd358ef..5612722d044e 100644
--- a/sys/arch/pmax/Makefile
+++ b/sys/arch/pmax/Makefile
@@ -1,5 +1,6 @@
-#	from: @(#)Makefile	8.1 (Berkeley) 6/16/93
-#	$Id: Makefile,v 1.3 1994/05/27 08:57:32 glass Exp $
+#	$NetBSD: Makefile,v 1.4 1994/10/26 21:08:38 cgd Exp $
+
+#	@(#)Makefile	8.1 (Berkeley) 6/16/93
 
 # Makefile for pmax links, tags file
 
diff --git a/sys/arch/pmax/compile/.keep_me b/sys/arch/pmax/compile/.keep_me
index 75270197a54e..413b7769754a 100644
--- a/sys/arch/pmax/compile/.keep_me
+++ b/sys/arch/pmax/compile/.keep_me
@@ -1 +1,3 @@
+$NetBSD: .keep_me,v 1.2 1994/10/26 21:08:40 cgd Exp $
+
 This file must remain so that 'cvs checkout' makes the compile directory.
diff --git a/sys/arch/pmax/conf/DISKLESS b/sys/arch/pmax/conf/DISKLESS
index afc2171b26f1..22e0eae7183b 100644
--- a/sys/arch/pmax/conf/DISKLESS
+++ b/sys/arch/pmax/conf/DISKLESS
@@ -1,8 +1,8 @@
+#	$NetBSD: DISKLESS,v 1.2 1994/10/26 21:08:42 cgd Exp $
 #
 # Diskless DECstation (3100 or 5000/xxx)
 #
-#	from: @(#)GENERIC.pmax	8.1 (Berkeley) 6/29/93
-# 	$Id: DISKLESS,v 1.1 1994/07/24 23:04:32 glass Exp $
+#	@(#)GENERIC.pmax	8.1 (Berkeley) 6/29/93
 #
 machine		pmax
 
diff --git a/sys/arch/pmax/conf/GENERIC.pmax b/sys/arch/pmax/conf/GENERIC.pmax
index d26faa188a18..3e5d444d9bd3 100644
--- a/sys/arch/pmax/conf/GENERIC.pmax
+++ b/sys/arch/pmax/conf/GENERIC.pmax
@@ -1,8 +1,8 @@
+#	$NetBSD: GENERIC.pmax,v 1.5 1994/10/26 21:08:43 cgd Exp $
 #
 # GENERIC DECstation (3100 or 5000/xxx)
 #
-#	from: @(#)GENERIC.pmax	8.1 (Berkeley) 6/29/93
-# 	$Id: GENERIC.pmax,v 1.4 1994/06/22 03:45:26 glass Exp $
+#	@(#)GENERIC.pmax	8.1 (Berkeley) 6/29/93
 #
 machine		pmax
 
diff --git a/sys/arch/pmax/conf/GLUTTON b/sys/arch/pmax/conf/GLUTTON
index fabca567bcff..5542a1c4a731 100644
--- a/sys/arch/pmax/conf/GLUTTON
+++ b/sys/arch/pmax/conf/GLUTTON
@@ -1,8 +1,8 @@
+#	$NetBSD: GLUTTON,v 1.3 1994/10/26 21:08:44 cgd Exp $
 #
 # GLUTTON - Adam's test DS3100
 #
-#	from: @(#)GENERIC.pmax	8.1 (Berkeley) 6/29/93
-# 	$Id: GLUTTON,v 1.2 1994/06/15 05:18:28 glass Exp $
+#	@(#)GENERIC.pmax	8.1 (Berkeley) 6/29/93
 #
 machine		pmax
 
diff --git a/sys/arch/pmax/conf/Makefile.pmax b/sys/arch/pmax/conf/Makefile.pmax
index 079791048ca5..34c120c17ed2 100644
--- a/sys/arch/pmax/conf/Makefile.pmax
+++ b/sys/arch/pmax/conf/Makefile.pmax
@@ -1,5 +1,6 @@
-#	from: @(#)Makefile.pmax	8.2 (Berkeley) 2/16/94
-#       $Id: Makefile.pmax,v 1.7 1994/06/15 05:18:31 glass Exp $
+#	$NetBSD: Makefile.pmax,v 1.8 1994/10/26 21:08:45 cgd Exp $
+
+#	@(#)Makefile.pmax	8.2 (Berkeley) 2/16/94
 #
 # Makefile for 4.4 BSD
 #
diff --git a/sys/arch/pmax/conf/devices.pmax b/sys/arch/pmax/conf/devices.pmax
index c2e57d9576cc..b50eb5b44c38 100644
--- a/sys/arch/pmax/conf/devices.pmax
+++ b/sys/arch/pmax/conf/devices.pmax
@@ -1,3 +1,3 @@
-# $Id: devices.pmax,v 1.3 1994/05/27 08:57:50 glass Exp $
+#	$NetBSD: devices.pmax,v 1.4 1994/10/26 21:08:46 cgd Exp $
 rz	0
 md	1
diff --git a/sys/arch/pmax/conf/devices.pmax.oldconf b/sys/arch/pmax/conf/devices.pmax.oldconf
index 3e7e45b5e7cf..7c1adbd47b0e 100644
--- a/sys/arch/pmax/conf/devices.pmax.oldconf
+++ b/sys/arch/pmax/conf/devices.pmax.oldconf
@@ -1,3 +1,3 @@
-# $Id: devices.pmax.oldconf,v 1.3 1994/05/27 08:57:50 glass Exp $
+#	$NetBSD: devices.pmax.oldconf,v 1.4 1994/10/26 21:08:46 cgd Exp $
 rz	0
 md	1
diff --git a/sys/arch/pmax/conf/files.pmax b/sys/arch/pmax/conf/files.pmax
index 5fc727342067..4d7e7099202e 100644
--- a/sys/arch/pmax/conf/files.pmax
+++ b/sys/arch/pmax/conf/files.pmax
@@ -1,4 +1,4 @@
-# $Id: files.pmax,v 1.6 1994/06/02 06:14:56 glass Exp $
+#	$NetBSD: files.pmax,v 1.7 1994/10/26 21:08:47 cgd Exp $
 arch/pmax/pmax/autoconf.c		standard
 arch/pmax/pmax/clock.c			standard
 arch/pmax/pmax/conf.c			standard
diff --git a/sys/arch/pmax/conf/files.pmax.oldconf b/sys/arch/pmax/conf/files.pmax.oldconf
index a19700118049..6fde0fdfda1f 100644
--- a/sys/arch/pmax/conf/files.pmax.oldconf
+++ b/sys/arch/pmax/conf/files.pmax.oldconf
@@ -1,4 +1,4 @@
-# $Id: files.pmax.oldconf,v 1.6 1994/06/02 06:14:56 glass Exp $
+#	$NetBSD: files.pmax.oldconf,v 1.7 1994/10/26 21:08:47 cgd Exp $
 arch/pmax/pmax/autoconf.c		standard
 arch/pmax/pmax/clock.c			standard
 arch/pmax/pmax/conf.c			standard
diff --git a/sys/arch/pmax/dev/asc.c b/sys/arch/pmax/dev/asc.c
index eb376d75e917..cd9e2df69efc 100644
--- a/sys/arch/pmax/dev/asc.c
+++ b/sys/arch/pmax/dev/asc.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: asc.c,v 1.6 1994/10/26 21:08:50 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)asc.c	8.2 (Berkeley) 1/4/94
- *      $Id: asc.c,v 1.5 1994/05/27 08:58:02 glass Exp $
+ *	@(#)asc.c	8.2 (Berkeley) 1/4/94
  */
 
 /* 
diff --git a/sys/arch/pmax/dev/ascreg.h b/sys/arch/pmax/dev/ascreg.h
index 79fb4917534b..a9673d62ccc1 100644
--- a/sys/arch/pmax/dev/ascreg.h
+++ b/sys/arch/pmax/dev/ascreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ascreg.h,v 1.5 1994/10/26 21:08:52 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)ascreg.h	8.1 (Berkeley) 6/10/93
- *      $Id: ascreg.h,v 1.4 1994/05/27 08:58:07 glass Exp $
+ *	@(#)ascreg.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/dev/cfb.c b/sys/arch/pmax/dev/cfb.c
index 079de4e18ea1..c4f33a9e1f83 100644
--- a/sys/arch/pmax/dev/cfb.c
+++ b/sys/arch/pmax/dev/cfb.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: cfb.c,v 1.4 1994/10/26 21:08:53 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)cfb.c	8.1 (Berkeley) 6/10/93
- *      $Id: cfb.c,v 1.3 1994/05/27 08:58:14 glass Exp $
+ *	@(#)cfb.c	8.1 (Berkeley) 6/10/93
  */
 
 /*
@@ -52,7 +53,6 @@
  *
  * from: Header: /sprite/src/kernel/dev/ds3100.md/RCS/devGraphics.c,
  *	v 9.2 90/02/13 22:16:24 shirriff Exp  SPRITE (DECWRL)";
- * $Id: cfb.c,v 1.3 1994/05/27 08:58:14 glass Exp $
  */
 /*
  * Mach Operating System
diff --git a/sys/arch/pmax/dev/cfbreg.h b/sys/arch/pmax/dev/cfbreg.h
index 09a55655ae93..62e22549895d 100644
--- a/sys/arch/pmax/dev/cfbreg.h
+++ b/sys/arch/pmax/dev/cfbreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: cfbreg.h,v 1.5 1994/10/26 21:08:54 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)cfbreg.h	8.1 (Berkeley) 6/10/93
- *      $Id: cfbreg.h,v 1.4 1994/05/27 08:58:19 glass Exp $
+ *	@(#)cfbreg.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/dev/dc.c b/sys/arch/pmax/dev/dc.c
index 85742b46ae65..be8067133ee9 100644
--- a/sys/arch/pmax/dev/dc.c
+++ b/sys/arch/pmax/dev/dc.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: dc.c,v 1.8 1994/10/26 21:08:56 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)dc.c	8.2 (Berkeley) 11/30/93
- *      $Id: dc.c,v 1.7 1994/06/15 05:18:38 glass Exp $
+ *	@(#)dc.c	8.2 (Berkeley) 11/30/93
  */
 
 /*
diff --git a/sys/arch/pmax/dev/device.h b/sys/arch/pmax/dev/device.h
index 9fff771daab7..8bb3fee09b14 100644
--- a/sys/arch/pmax/dev/device.h
+++ b/sys/arch/pmax/dev/device.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: device.h,v 1.4 1994/10/26 21:08:57 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)device.h	8.1 (Berkeley) 6/10/93
- *      $Id: device.h,v 1.3 1994/05/27 08:58:37 glass Exp $
+ *	@(#)device.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/dev/dtop.c b/sys/arch/pmax/dev/dtop.c
index 3f4bfb430903..532c07c92f85 100644
--- a/sys/arch/pmax/dev/dtop.c
+++ b/sys/arch/pmax/dev/dtop.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: dtop.c,v 1.5 1994/10/26 21:08:58 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)dtop.c	8.2 (Berkeley) 11/30/93
- *      $Id: dtop.c,v 1.4 1994/05/27 08:58:40 glass Exp $
+ *	@(#)dtop.c	8.2 (Berkeley) 11/30/93
  */
 
 /* 
diff --git a/sys/arch/pmax/dev/dtopreg.h b/sys/arch/pmax/dev/dtopreg.h
index d9223645d5a0..74aa68a14056 100644
--- a/sys/arch/pmax/dev/dtopreg.h
+++ b/sys/arch/pmax/dev/dtopreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dtopreg.h,v 1.5 1994/10/26 21:09:00 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)dtopreg.h	8.1 (Berkeley) 6/10/93
- *      $Id: dtopreg.h,v 1.4 1994/05/27 08:58:42 glass Exp $
+ *	@(#)dtopreg.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/dev/fb.c b/sys/arch/pmax/dev/fb.c
index bd5957b08a5d..4583b559a99e 100644
--- a/sys/arch/pmax/dev/fb.c
+++ b/sys/arch/pmax/dev/fb.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: fb.c,v 1.5 1994/10/26 21:09:01 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)fb.c	8.1 (Berkeley) 6/10/93
- *      $Id: fb.c,v 1.4 1994/05/27 08:58:45 glass Exp $
+ *	@(#)fb.c	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/dev/fbreg.h b/sys/arch/pmax/dev/fbreg.h
index 7cae672be7da..0176db07ed7b 100644
--- a/sys/arch/pmax/dev/fbreg.h
+++ b/sys/arch/pmax/dev/fbreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: fbreg.h,v 1.4 1994/10/26 21:09:03 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)fbreg.h	8.1 (Berkeley) 6/10/93
- *      $Id: fbreg.h,v 1.3 1994/05/27 08:58:47 glass Exp $
+ *	@(#)fbreg.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/dev/font.c b/sys/arch/pmax/dev/font.c
index b8c5867370fe..6f021bc3f64a 100644
--- a/sys/arch/pmax/dev/font.c
+++ b/sys/arch/pmax/dev/font.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: font.c,v 1.4 1994/10/26 21:09:04 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1992, 1993
  *	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: @(#)font.c	8.1 (Berkeley) 6/10/93
- *      $Id: font.c,v 1.3 1994/05/27 08:58:50 glass Exp $
+ *	@(#)font.c	8.1 (Berkeley) 6/10/93
  *
  *  font.c --
  *
diff --git a/sys/arch/pmax/dev/if_le.c b/sys/arch/pmax/dev/if_le.c
index aeff16e0a4e9..f8e7e1952843 100644
--- a/sys/arch/pmax/dev/if_le.c
+++ b/sys/arch/pmax/dev/if_le.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: if_le.c,v 1.8 1994/10/26 21:09:07 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)if_le.c	8.2 (Berkeley) 11/16/93
- *      $Id: if_le.c,v 1.7 1994/08/17 01:33:15 deraadt Exp $
+ *	@(#)if_le.c	8.2 (Berkeley) 11/16/93
  */
 
 #include <le.h>
diff --git a/sys/arch/pmax/dev/if_lereg.h b/sys/arch/pmax/dev/if_lereg.h
index d771236b4623..f35479471148 100644
--- a/sys/arch/pmax/dev/if_lereg.h
+++ b/sys/arch/pmax/dev/if_lereg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: if_lereg.h,v 1.4 1994/10/26 21:09:08 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)if_lereg.h	8.1 (Berkeley) 6/10/93
- *      $Id: if_lereg.h,v 1.3 1994/05/27 08:58:58 glass Exp $
+ *	@(#)if_lereg.h	8.1 (Berkeley) 6/10/93
  */
 
 #define	LEMTU		1518
diff --git a/sys/arch/pmax/dev/mfb.c b/sys/arch/pmax/dev/mfb.c
index bedafc59fdea..1ca3f2562661 100644
--- a/sys/arch/pmax/dev/mfb.c
+++ b/sys/arch/pmax/dev/mfb.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mfb.c,v 1.4 1994/10/26 21:09:09 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)mfb.c	8.1 (Berkeley) 6/10/93
- *      $Id: mfb.c,v 1.3 1994/05/27 08:59:01 glass Exp $
+ *	@(#)mfb.c	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/dev/mfbreg.h b/sys/arch/pmax/dev/mfbreg.h
index d1b33788ecb2..d4a25a6f49d3 100644
--- a/sys/arch/pmax/dev/mfbreg.h
+++ b/sys/arch/pmax/dev/mfbreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: mfbreg.h,v 1.4 1994/10/26 21:09:11 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)mfbreg.h	8.1 (Berkeley) 6/10/93
- *      $Id: mfbreg.h,v 1.3 1994/05/27 08:59:04 glass Exp $
+ *	@(#)mfbreg.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/dev/pdma.h b/sys/arch/pmax/dev/pdma.h
index 95605cf09d03..96a74169f018 100644
--- a/sys/arch/pmax/dev/pdma.h
+++ b/sys/arch/pmax/dev/pdma.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pdma.h,v 1.4 1994/10/26 21:09:11 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)pdma.h	8.1 (Berkeley) 6/10/93
- *      $Id: pdma.h,v 1.3 1994/05/27 08:59:06 glass Exp $
+ *	@(#)pdma.h	8.1 (Berkeley) 6/10/93
  */
 
 struct pdma {
diff --git a/sys/arch/pmax/dev/pm.c b/sys/arch/pmax/dev/pm.c
index 8a6fba663fb9..64b77a086d2a 100644
--- a/sys/arch/pmax/dev/pm.c
+++ b/sys/arch/pmax/dev/pm.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: pm.c,v 1.4 1994/10/26 21:09:12 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)pm.c	8.1 (Berkeley) 6/10/93
- *      $Id: pm.c,v 1.3 1994/05/27 08:59:08 glass Exp $
+ *	@(#)pm.c	8.1 (Berkeley) 6/10/93
  */
 
 /* 
@@ -52,7 +53,6 @@
  *
  * from: Header: /sprite/src/kernel/dev/ds3100.md/RCS/devGraphics.c,
  *	v 9.2 90/02/13 22:16:24 shirriff Exp  SPRITE (DECWRL)";
- * $Id: pm.c,v 1.3 1994/05/27 08:59:08 glass Exp $
  */
 
 
diff --git a/sys/arch/pmax/dev/pmreg.h b/sys/arch/pmax/dev/pmreg.h
index 10948656ca39..7b3f8ecd7831 100644
--- a/sys/arch/pmax/dev/pmreg.h
+++ b/sys/arch/pmax/dev/pmreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmreg.h,v 1.4 1994/10/26 21:09:13 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)pmreg.h	8.1 (Berkeley) 6/10/93
- *      $Id: pmreg.h,v 1.3 1994/05/27 08:59:10 glass Exp $
+ *	@(#)pmreg.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/dev/rz.c b/sys/arch/pmax/dev/rz.c
index e94b8081d8da..cd6ee78abfb9 100644
--- a/sys/arch/pmax/dev/rz.c
+++ b/sys/arch/pmax/dev/rz.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: rz.c,v 1.5 1994/10/26 21:09:15 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)rz.c	8.1 (Berkeley) 7/29/93
- *      $Id: rz.c,v 1.4 1994/06/14 02:47:36 glass Exp $
+ *	@(#)rz.c	8.1 (Berkeley) 7/29/93
  */
 
 /*
diff --git a/sys/arch/pmax/dev/scc.c b/sys/arch/pmax/dev/scc.c
index c97d1c01ea88..a08d70d34326 100644
--- a/sys/arch/pmax/dev/scc.c
+++ b/sys/arch/pmax/dev/scc.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: scc.c,v 1.7 1994/10/26 21:09:16 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)scc.c	8.2 (Berkeley) 11/30/93
- *      $Id: scc.c,v 1.6 1994/06/02 06:15:01 glass Exp $
+ *	@(#)scc.c	8.2 (Berkeley) 11/30/93
  */
 
 /* 
diff --git a/sys/arch/pmax/dev/sccreg.h b/sys/arch/pmax/dev/sccreg.h
index 27172f4c55ac..a5f0cc46b8ca 100644
--- a/sys/arch/pmax/dev/sccreg.h
+++ b/sys/arch/pmax/dev/sccreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: sccreg.h,v 1.4 1994/10/26 21:09:17 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)sccreg.h	8.1 (Berkeley) 6/10/93
- *      $Id: sccreg.h,v 1.3 1994/05/27 08:59:19 glass Exp $
+ *	@(#)sccreg.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/dev/scsi.c b/sys/arch/pmax/dev/scsi.c
index f41224618a5c..a5f0f3104630 100644
--- a/sys/arch/pmax/dev/scsi.c
+++ b/sys/arch/pmax/dev/scsi.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsi.c,v 1.4 1994/10/26 21:09:18 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)scsi.c	8.1 (Berkeley) 6/10/93
- *      $Id: scsi.c,v 1.3 1994/05/27 08:59:22 glass Exp $
+ *	@(#)scsi.c	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/dev/scsi.h b/sys/arch/pmax/dev/scsi.h
index 9ac444dedfac..5fe023b8ee2b 100644
--- a/sys/arch/pmax/dev/scsi.h
+++ b/sys/arch/pmax/dev/scsi.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsi.h,v 1.4 1994/10/26 21:09:19 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)scsi.h	8.1 (Berkeley) 6/10/93
- *      $Id: scsi.h,v 1.3 1994/05/27 08:59:28 glass Exp $
+ *	@(#)scsi.h	8.1 (Berkeley) 6/10/93
  *
  * scsi.h --
  *
@@ -46,7 +47,6 @@
  *
  * from: Header: /sprite/src/kernel/dev/RCS/scsi.h,
  *	v 9.1 90/02/13 23:11:24 jhh Exp  SPRITE (Berkeley)
- * $Id: scsi.h,v 1.3 1994/05/27 08:59:28 glass Exp $
  */
 
 #ifndef _SCSI_H
diff --git a/sys/arch/pmax/dev/sii.c b/sys/arch/pmax/dev/sii.c
index 4dd8524f110c..1e515671ad15 100644
--- a/sys/arch/pmax/dev/sii.c
+++ b/sys/arch/pmax/dev/sii.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: sii.c,v 1.4 1994/10/26 21:09:20 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)sii.c	8.2 (Berkeley) 11/30/93
- *      $Id: sii.c,v 1.3 1994/05/27 08:59:32 glass Exp $
+ *	@(#)sii.c	8.2 (Berkeley) 11/30/93
  *
  * from: Header: /sprite/src/kernel/dev/ds3100.md/RCS/devSII.c,
  *	v 9.2 89/09/14 13:37:41 jhh Exp $ SPRITE (DECWRL)";
diff --git a/sys/arch/pmax/dev/siireg.h b/sys/arch/pmax/dev/siireg.h
index df0a1604feda..87044143afd1 100644
--- a/sys/arch/pmax/dev/siireg.h
+++ b/sys/arch/pmax/dev/siireg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: siireg.h,v 1.4 1994/10/26 21:09:22 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)siireg.h	8.1 (Berkeley) 6/10/93
- *      $Id: siireg.h,v 1.3 1994/05/27 08:59:36 glass Exp $
+ *	@(#)siireg.h	8.1 (Berkeley) 6/10/93
  *
  * sii.h --
  *
diff --git a/sys/arch/pmax/dev/tz.c b/sys/arch/pmax/dev/tz.c
index 0dc6c1132a70..ac923424cfd2 100644
--- a/sys/arch/pmax/dev/tz.c
+++ b/sys/arch/pmax/dev/tz.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: tz.c,v 1.4 1994/10/26 21:09:23 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)tz.c	8.4 (Berkeley) 1/11/94
- *      $Id: tz.c,v 1.3 1994/05/27 08:59:40 glass Exp $
+ *	@(#)tz.c	8.4 (Berkeley) 1/11/94
  *
  * from: Header: /sprite/src/kernel/dev/RCS/devSCSITape.c,
  *	v 8.14 89/07/31 17:26:13 mendel Exp  SPRITE (Berkeley)
diff --git a/sys/arch/pmax/dev/xcfb.c b/sys/arch/pmax/dev/xcfb.c
index 75c5201edf4b..578b200218e9 100644
--- a/sys/arch/pmax/dev/xcfb.c
+++ b/sys/arch/pmax/dev/xcfb.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: xcfb.c,v 1.4 1994/10/26 21:09:24 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)xcfb.c	8.1 (Berkeley) 6/10/93
- *      $Id: xcfb.c,v 1.3 1994/05/27 08:59:43 glass Exp $
+ *	@(#)xcfb.c	8.1 (Berkeley) 6/10/93
  */
 
 /* 
@@ -77,7 +78,6 @@
  *
  * from: Header: /sprite/src/kernel/dev/ds3100.md/RCS/devGraphics.c,
  *	v 9.2 90/02/13 22:16:24 shirriff Exp  SPRITE (DECWRL)";
- * $Id: xcfb.c,v 1.3 1994/05/27 08:59:43 glass Exp $
  */
 
 #include <xcfb.h>
diff --git a/sys/arch/pmax/dev/xcfbreg.h b/sys/arch/pmax/dev/xcfbreg.h
index 0218f6f697f3..7be4325b5643 100644
--- a/sys/arch/pmax/dev/xcfbreg.h
+++ b/sys/arch/pmax/dev/xcfbreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: xcfbreg.h,v 1.4 1994/10/26 21:09:25 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)xcfbreg.h	8.1 (Berkeley) 6/10/93
- *      $Id: xcfbreg.h,v 1.3 1994/05/27 08:59:45 glass Exp $
+ *	@(#)xcfbreg.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/dist/README b/sys/arch/pmax/dist/README
index 482a956040cc..ee7ee8bcf3d0 100644
--- a/sys/arch/pmax/dist/README
+++ b/sys/arch/pmax/dist/README
@@ -1,5 +1,5 @@
-#	from: @(#)README	8.1 (Berkeley) 6/10/93
-#	$Id: README,v 1.3 1994/05/27 08:59:49 glass Exp $
+#	$NetBSD: README,v 1.4 1994/10/26 21:09:27 cgd Exp $
+#	@(#)README	8.1 (Berkeley) 6/10/93
 
 The scripts needed to build a boot tape for 4.2 and beyond
 live here.  Before trying anything look at the scripts 
diff --git a/sys/arch/pmax/dist/README_TOO b/sys/arch/pmax/dist/README_TOO
index 5d3b51f1edfe..67cfdccc3aa4 100644
--- a/sys/arch/pmax/dist/README_TOO
+++ b/sys/arch/pmax/dist/README_TOO
@@ -1,5 +1,5 @@
-#	from: @(#)README_TOO	8.1 (Berkeley) 6/29/93
-#	$Id: README_TOO,v 1.3 1994/05/27 08:59:52 glass Exp $
+#	$NetBSD: README_TOO,v 1.4 1994/10/26 21:09:28 cgd Exp $
+#	@(#)README_TOO	8.1 (Berkeley) 6/29/93
 
 Sun Mar 29 22:19:51 PST 1992
 
diff --git a/sys/arch/pmax/dist/buildmini b/sys/arch/pmax/dist/buildmini
index 99a8ba6d2bb3..77c12b943092 100644
--- a/sys/arch/pmax/dist/buildmini
+++ b/sys/arch/pmax/dist/buildmini
@@ -1,4 +1,5 @@
 #!/bin/sh -
+#	$NetBSD: buildmini,v 1.4 1994/10/26 21:09:29 cgd Exp $
 #
 # Copyright (c) 1992, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -31,8 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	from: @(#)buildmini	7.3 (Berkeley) 6/10/93
-#	$Id: buildmini,v 1.3 1994/05/27 08:59:54 glass Exp $
+#	@(#)buildmini	7.3 (Berkeley) 6/10/93
 #
 
 dist=/sys/pmax/dist
diff --git a/sys/arch/pmax/dist/get b/sys/arch/pmax/dist/get
index 4ac99fcaefdc..79f97b294ffd 100644
--- a/sys/arch/pmax/dist/get
+++ b/sys/arch/pmax/dist/get
@@ -1,4 +1,5 @@
 #!/bin/sh -
+#	$NetBSD: get,v 1.4 1994/10/26 21:09:30 cgd Exp $
 #
 # Copyright (c) 1992, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -31,8 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	from: @(#)get	8.2 (Berkeley) 11/30/93
-#	$Id: get,v 1.3 1994/05/27 08:59:59 glass Exp $
+#	@(#)get	8.2 (Berkeley) 11/30/93
 #
 
 # Shell script to build a mini-root file system in preparation for building
diff --git a/sys/arch/pmax/dist/maketape b/sys/arch/pmax/dist/maketape
index 27375df65b5f..b56270bb8e6d 100644
--- a/sys/arch/pmax/dist/maketape
+++ b/sys/arch/pmax/dist/maketape
@@ -1,4 +1,5 @@
 #!/bin/sh -
+#	$NetBSD: maketape,v 1.4 1994/10/26 21:09:31 cgd Exp $
 #
 # Copyright (c) 1992, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -31,8 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	from: @(#)maketape	8.1 (Berkeley) 6/10/93
-#	$Id: maketape,v 1.3 1994/05/27 09:00:05 glass Exp $
+#	@(#)maketape	8.1 (Berkeley) 6/10/93
 #
 
 # maketape [ 6250 | 1600 [ tapename [ remotetapemachine ] ] ]
diff --git a/sys/arch/pmax/include/ansi.h b/sys/arch/pmax/include/ansi.h
index 289f500136e5..1b329b0d39c1 100644
--- a/sys/arch/pmax/include/ansi.h
+++ b/sys/arch/pmax/include/ansi.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ansi.h,v 1.5 1994/10/26 21:09:33 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990, 1993
  *	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: @(#)ansi.h	8.2 (Berkeley) 1/4/94
- *      $Id: ansi.h,v 1.4 1994/05/27 09:00:21 glass Exp $
+ *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
  */
 
 #ifndef	_ANSI_H_
diff --git a/sys/arch/pmax/include/aout_machdep.h b/sys/arch/pmax/include/aout_machdep.h
index 43a4d23b21da..7b6986d0c474 100644
--- a/sys/arch/pmax/include/aout_machdep.h
+++ b/sys/arch/pmax/include/aout_machdep.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: aout_machdep.h,v 1.5 1994/10/26 21:09:39 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)exec.h	8.1 (Berkeley) 6/10/93
- *      $Id: aout_machdep.h,v 1.4 1994/05/27 09:00:56 glass Exp $
+ *	@(#)exec.h	8.1 (Berkeley) 6/10/93
  */
 
 #define	__LDPGSZ	4096
diff --git a/sys/arch/pmax/include/cpu.h b/sys/arch/pmax/include/cpu.h
index de5897763e10..c581f1dc20ca 100644
--- a/sys/arch/pmax/include/cpu.h
+++ b/sys/arch/pmax/include/cpu.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: cpu.h,v 1.8 1994/10/26 21:09:34 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)cpu.h	8.4 (Berkeley) 1/4/94
- *      $Id: cpu.h,v 1.7 1994/06/02 06:15:03 glass Exp $
+ *	@(#)cpu.h	8.4 (Berkeley) 1/4/94
  */
 
 #ifndef _CPU_H_
diff --git a/sys/arch/pmax/include/dc7085cons.h b/sys/arch/pmax/include/dc7085cons.h
index ea21013a44f3..588805f27960 100644
--- a/sys/arch/pmax/include/dc7085cons.h
+++ b/sys/arch/pmax/include/dc7085cons.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dc7085cons.h,v 1.4 1994/10/26 21:09:36 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)dc7085cons.h	8.1 (Berkeley) 6/10/93
- *      $Id: dc7085cons.h,v 1.3 1994/05/27 09:00:37 glass Exp $
+ *	@(#)dc7085cons.h	8.1 (Berkeley) 6/10/93
  *
  * dc7085.h --
  *
@@ -51,7 +52,6 @@
  * from: Header: /sprite/src/kernel/dev/ds3100.md/RCS/dc7085.h,
  *      
  *	v 1.4 89/08/15 19:52:46 rab Exp  SPRITE (DECWRL)
- * $Id: dc7085cons.h,v 1.3 1994/05/27 09:00:37 glass Exp $
  */
 
 #ifndef _DC7085
diff --git a/sys/arch/pmax/include/dec_boot.h b/sys/arch/pmax/include/dec_boot.h
index 195f40fc568b..d5f717a94eab 100644
--- a/sys/arch/pmax/include/dec_boot.h
+++ b/sys/arch/pmax/include/dec_boot.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dec_boot.h,v 1.4 1994/10/26 21:10:51 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)dec_boot.h	8.1 (Berkeley) 6/10/93
- *      $Id: dec_boot.h,v 1.3 1994/05/27 09:05:01 glass Exp $
+ *	@(#)dec_boot.h	8.1 (Berkeley) 6/10/93
  *
  * devDiskLabel.h --
  *
@@ -46,7 +47,6 @@
  *
  * from: Header: /sprite/src/kernel/dev/RCS/devDiskLabel.h,
  *	v 9.4 90/03/01 12:22:36 jhh Exp  SPRITE (Berkeley)
- * $Id: dec_boot.h,v 1.3 1994/05/27 09:05:01 glass Exp $
  */
 
 /*
diff --git a/sys/arch/pmax/include/dec_exec.h b/sys/arch/pmax/include/dec_exec.h
index 73f2e89fad6f..c51ee7417807 100644
--- a/sys/arch/pmax/include/dec_exec.h
+++ b/sys/arch/pmax/include/dec_exec.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dec_exec.h,v 1.4 1994/10/26 21:10:52 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1993
  *	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: @(#)dec_exec.h	8.1 (Berkeley) 6/10/93
- *      $Id: dec_exec.h,v 1.3 1994/05/27 09:05:06 glass Exp $
+ *	@(#)dec_exec.h	8.1 (Berkeley) 6/10/93
  */
 
 
diff --git a/sys/arch/pmax/include/dec_prom.h b/sys/arch/pmax/include/dec_prom.h
index 633495ccf41c..9daa56e214a9 100644
--- a/sys/arch/pmax/include/dec_prom.h
+++ b/sys/arch/pmax/include/dec_prom.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dec_prom.h,v 1.4 1994/10/26 21:10:54 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)dec_prom.h	8.1 (Berkeley) 6/10/93
- *      $Id: dec_prom.h,v 1.3 1994/05/27 09:05:13 glass Exp $
+ *	@(#)dec_prom.h	8.1 (Berkeley) 6/10/93
  *
  * machMon.h --
  *
diff --git a/sys/arch/pmax/include/ecoff.h b/sys/arch/pmax/include/ecoff.h
index 9bc0acd1761e..f63c2ab3b91c 100644
--- a/sys/arch/pmax/include/ecoff.h
+++ b/sys/arch/pmax/include/ecoff.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ecoff.h,v 1.3 1994/10/26 21:09:38 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Adam Glass
  * All rights reserved.
@@ -27,8 +29,6 @@
  * 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: ecoff.h,v 1.2 1994/05/28 20:21:34 glass Exp $
  */
 
 #define ECOFF_LDPGSZ 4096
diff --git a/sys/arch/pmax/include/ecoff_machdep.h b/sys/arch/pmax/include/ecoff_machdep.h
index 4fbcaf293b29..f6b7bd521cfc 100644
--- a/sys/arch/pmax/include/ecoff_machdep.h
+++ b/sys/arch/pmax/include/ecoff_machdep.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ecoff_machdep.h,v 1.3 1994/10/26 21:09:38 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Adam Glass
  * All rights reserved.
@@ -27,8 +29,6 @@
  * 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: ecoff_machdep.h,v 1.2 1994/05/28 20:21:34 glass Exp $
  */
 
 #define ECOFF_LDPGSZ 4096
diff --git a/sys/arch/pmax/include/endian.h b/sys/arch/pmax/include/endian.h
index 9282e521c021..3aeb69fc3ca5 100644
--- a/sys/arch/pmax/include/endian.h
+++ b/sys/arch/pmax/include/endian.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: endian.h,v 1.4 1994/10/26 21:09:38 cgd Exp $	*/
+
 /*
  * Copyright (c) 1987, 1991, 1993
  *	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: @(#)endian.h	8.1 (Berkeley) 6/11/93
- *      $Id: endian.h,v 1.3 1994/05/27 09:00:49 glass Exp $
+ *	@(#)endian.h	8.1 (Berkeley) 6/11/93
  */
 
 #ifndef _ENDIAN_H_
diff --git a/sys/arch/pmax/include/exec.h b/sys/arch/pmax/include/exec.h
index 852e6f0da35f..87dde64bf8e9 100644
--- a/sys/arch/pmax/include/exec.h
+++ b/sys/arch/pmax/include/exec.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: exec.h,v 1.5 1994/10/26 21:09:39 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)exec.h	8.1 (Berkeley) 6/10/93
- *      $Id: exec.h,v 1.4 1994/05/27 09:00:56 glass Exp $
+ *	@(#)exec.h	8.1 (Berkeley) 6/10/93
  */
 
 #define	__LDPGSZ	4096
diff --git a/sys/arch/pmax/include/float.h b/sys/arch/pmax/include/float.h
index 86eb4bbaa7b6..8d7e006f5b09 100644
--- a/sys/arch/pmax/include/float.h
+++ b/sys/arch/pmax/include/float.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: float.h,v 1.4 1994/10/26 21:09:41 cgd Exp $	*/
+
 /*
  * Copyright (c) 1989, 1993
  *	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: @(#)float.h	8.1 (Berkeley) 6/10/93
- *      $Id: float.h,v 1.3 1994/05/27 09:01:04 glass Exp $
+ *	@(#)float.h	8.1 (Berkeley) 6/10/93
  */
 
 #define FLT_RADIX	2		/* b */
diff --git a/sys/arch/pmax/include/kdbparam.h b/sys/arch/pmax/include/kdbparam.h
index 955b4c3887dc..9104c87aa3c8 100644
--- a/sys/arch/pmax/include/kdbparam.h
+++ b/sys/arch/pmax/include/kdbparam.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: kdbparam.h,v 1.4 1994/10/26 21:09:42 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)kdbparam.h	8.1 (Berkeley) 6/10/93
- *      $Id: kdbparam.h,v 1.3 1994/05/27 09:01:10 glass Exp $
+ *	@(#)kdbparam.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/include/limits.h b/sys/arch/pmax/include/limits.h
index 5674c9735cc0..ca2a8ff731de 100644
--- a/sys/arch/pmax/include/limits.h
+++ b/sys/arch/pmax/include/limits.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: limits.h,v 1.6 1994/10/26 21:09:43 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988, 1993
  *	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	8.3 (Berkeley) 1/4/94
- *      $Id: limits.h,v 1.5 1994/10/05 17:16:45 jtc Exp $
+ *	@(#)limits.h	8.3 (Berkeley) 1/4/94
  */
 
 #define	CHAR_BIT	8		/* number of bits in a char */
diff --git a/sys/arch/pmax/include/machAsmDefs.h b/sys/arch/pmax/include/machAsmDefs.h
index 8f8aeb5f6ab4..59f59a3733ab 100644
--- a/sys/arch/pmax/include/machAsmDefs.h
+++ b/sys/arch/pmax/include/machAsmDefs.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: machAsmDefs.h,v 1.4 1994/10/26 21:09:44 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)machAsmDefs.h	8.1 (Berkeley) 6/10/93
- *      $Id: machAsmDefs.h,v 1.3 1994/05/27 09:01:19 glass Exp $
+ *	@(#)machAsmDefs.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
@@ -52,7 +53,6 @@
  *
  * from: Header: /sprite/src/kernel/mach/ds3100.md/RCS/machAsmDefs.h,
  *	v 1.2 89/08/15 18:28:24 rab Exp  SPRITE (DECWRL)
- * $Id: machAsmDefs.h,v 1.3 1994/05/27 09:01:19 glass Exp $
  */
 
 #ifndef _MACHASMDEFS
diff --git a/sys/arch/pmax/include/machConst.h b/sys/arch/pmax/include/machConst.h
index 83c43942ef93..e2e83c8d06bb 100644
--- a/sys/arch/pmax/include/machConst.h
+++ b/sys/arch/pmax/include/machConst.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: machConst.h,v 1.4 1994/10/26 21:09:45 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)machConst.h	8.1 (Berkeley) 6/10/93
- *      $Id: machConst.h,v 1.3 1994/05/27 09:01:23 glass Exp $
+ *	@(#)machConst.h	8.1 (Berkeley) 6/10/93
  *
  * machConst.h --
  *
@@ -54,7 +55,6 @@
  *	v 1.2 89/08/15 18:28:21 rab Exp  SPRITE (DECWRL)
  * from: Header: /sprite/src/kernel/vm/ds3100.md/RCS/vmPmaxConst.h,
  *	v 9.1 89/09/18 17:33:00 shirriff Exp  SPRITE (DECWRL)
- * $Id: machConst.h,v 1.3 1994/05/27 09:01:23 glass Exp $
  */
 
 #ifndef _MACHCONST
diff --git a/sys/arch/pmax/include/mips_opcode.h b/sys/arch/pmax/include/mips_opcode.h
index 7423c141034c..ae4612a98654 100644
--- a/sys/arch/pmax/include/mips_opcode.h
+++ b/sys/arch/pmax/include/mips_opcode.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: mips_opcode.h,v 1.4 1994/10/26 21:09:46 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)mips_opcode.h	8.1 (Berkeley) 6/10/93
- *      $Id: mips_opcode.h,v 1.3 1994/05/27 09:01:30 glass Exp $
+ *	@(#)mips_opcode.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/include/param.h b/sys/arch/pmax/include/param.h
index ef0c84f17114..6ba76a63cc4b 100644
--- a/sys/arch/pmax/include/param.h
+++ b/sys/arch/pmax/include/param.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: param.h,v 1.6 1994/10/26 21:09:47 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,9 +39,7 @@
  *
  * from: Utah Hdr: machparam.h 1.11 89/08/14
  *
- *
- *	from: @(#)param.h	8.1 (Berkeley) 6/10/93
- *      $Id: param.h,v 1.5 1994/08/23 19:13:54 glass Exp $
+ *	@(#)param.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/include/pcb.h b/sys/arch/pmax/include/pcb.h
index 23227fa5ea21..ad0299ca0be0 100644
--- a/sys/arch/pmax/include/pcb.h
+++ b/sys/arch/pmax/include/pcb.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pcb.h,v 1.4 1994/10/26 21:09:49 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: pcb.h 1.13 89/04/23
  *
- *	from: @(#)pcb.h	8.1 (Berkeley) 6/10/93
- *      $Id: pcb.h,v 1.3 1994/05/27 09:01:37 glass Exp $
+ *	@(#)pcb.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/include/pmap.h b/sys/arch/pmax/include/pmap.h
index c02b414cf6ee..30069093b8a5 100644
--- a/sys/arch/pmax/include/pmap.h
+++ b/sys/arch/pmax/include/pmap.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmap.h,v 1.5 1994/10/26 21:09:50 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
  * Copyright (c) 1992, 1993
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)pmap.h	8.1 (Berkeley) 6/10/93
- *      $Id: pmap.h,v 1.4 1994/05/27 09:01:41 glass Exp $
+ *	@(#)pmap.h	8.1 (Berkeley) 6/10/93
  */
 
 #ifndef	_PMAP_MACHINE_
diff --git a/sys/arch/pmax/include/pmioctl.h b/sys/arch/pmax/include/pmioctl.h
index b4ae07201772..c3564f479efc 100644
--- a/sys/arch/pmax/include/pmioctl.h
+++ b/sys/arch/pmax/include/pmioctl.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmioctl.h,v 1.4 1994/10/26 21:09:51 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)pmioctl.h	8.1 (Berkeley) 6/10/93
- *      $Id: pmioctl.h,v 1.3 1994/05/27 09:01:44 glass Exp $
+ *	@(#)pmioctl.h	8.1 (Berkeley) 6/10/93
  *
  * graphics.h --
  *
@@ -62,7 +63,6 @@
  *
  * from: Header: devSerialPmax.c,
  *	v 1.4 89/05/22 13:31:07 mnelson Exp  SPRITE (DECWRL)
- * $Id: pmioctl.h,v 1.3 1994/05/27 09:01:44 glass Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/sys/arch/pmax/include/proc.h b/sys/arch/pmax/include/proc.h
index 43f8f377795d..202d95623147 100644
--- a/sys/arch/pmax/include/proc.h
+++ b/sys/arch/pmax/include/proc.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: proc.h,v 1.4 1994/10/26 21:09:52 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)proc.h	8.1 (Berkeley) 6/10/93
- *      $Id: proc.h,v 1.3 1994/05/27 09:01:47 glass Exp $
+ *	@(#)proc.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/include/profile.h b/sys/arch/pmax/include/profile.h
index 2b6618bcfa46..627c0f05ddcc 100644
--- a/sys/arch/pmax/include/profile.h
+++ b/sys/arch/pmax/include/profile.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: profile.h,v 1.4 1994/10/26 21:09:53 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)profile.h	8.1 (Berkeley) 6/10/93
- *      $Id: profile.h,v 1.3 1994/05/27 09:01:50 glass Exp $
+ *	@(#)profile.h	8.1 (Berkeley) 6/10/93
  */
 
 #define	_MCOUNT_DECL static void __mcount
diff --git a/sys/arch/pmax/include/psl.h b/sys/arch/pmax/include/psl.h
index 75733763d2c9..d67c78239bbe 100644
--- a/sys/arch/pmax/include/psl.h
+++ b/sys/arch/pmax/include/psl.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: psl.h,v 1.4 1994/10/26 21:09:54 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)psl.h	8.1 (Berkeley) 6/10/93
- *      $Id: psl.h,v 1.3 1994/05/27 09:01:53 glass Exp $
+ *	@(#)psl.h	8.1 (Berkeley) 6/10/93
  */
 
 #include <machine/machConst.h>
diff --git a/sys/arch/pmax/include/pte.h b/sys/arch/pmax/include/pte.h
index 60f8671d479c..b442793cb42f 100644
--- a/sys/arch/pmax/include/pte.h
+++ b/sys/arch/pmax/include/pte.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pte.h,v 1.4 1994/10/26 21:09:55 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: pte.h 1.11 89/09/03
  *
- *	from: @(#)pte.h	8.1 (Berkeley) 6/10/93
- *      $Id: pte.h,v 1.3 1994/05/27 09:01:59 glass Exp $
+ *	@(#)pte.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/include/ptrace.h b/sys/arch/pmax/include/ptrace.h
index 132f8533c924..fbde035381d5 100644
--- a/sys/arch/pmax/include/ptrace.h
+++ b/sys/arch/pmax/include/ptrace.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ptrace.h,v 1.4 1994/10/26 21:09:56 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)ptrace.h	8.1 (Berkeley) 6/10/93
- *      $Id: ptrace.h,v 1.3 1994/05/27 09:02:07 glass Exp $
+ *	@(#)ptrace.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/include/reg.h b/sys/arch/pmax/include/reg.h
index 473b717cf4a2..22d561f695e6 100644
--- a/sys/arch/pmax/include/reg.h
+++ b/sys/arch/pmax/include/reg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: reg.h,v 1.4 1994/10/26 21:09:57 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: reg.h 1.1 90/07/09
  *
- *	from: @(#)reg.h	8.2 (Berkeley) 1/11/94
- *      $Id: reg.h,v 1.3 1994/05/27 09:02:12 glass Exp $
+ *	@(#)reg.h	8.2 (Berkeley) 1/11/94
  */
 
 /*
diff --git a/sys/arch/pmax/include/regdef.h b/sys/arch/pmax/include/regdef.h
index 0eb9f05f75d8..46216b57d00c 100644
--- a/sys/arch/pmax/include/regdef.h
+++ b/sys/arch/pmax/include/regdef.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: regdef.h,v 1.4 1994/10/26 21:09:58 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)regdef.h	8.1 (Berkeley) 6/10/93
- *      $Id: regdef.h,v 1.3 1994/05/27 09:02:16 glass Exp $
+ *	@(#)regdef.h	8.1 (Berkeley) 6/10/93
  */
 
 #define zero	$0	/* always zero */
diff --git a/sys/arch/pmax/include/reloc.h b/sys/arch/pmax/include/reloc.h
index 4d4c668c81fe..f81a086fdc18 100644
--- a/sys/arch/pmax/include/reloc.h
+++ b/sys/arch/pmax/include/reloc.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: reloc.h,v 1.4 1994/10/26 21:09:59 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)reloc.h	8.1 (Berkeley) 6/10/93
- *      $Id: reloc.h,v 1.3 1994/05/27 09:02:19 glass Exp $
+ *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
  *
  * from: Header: reloc.h,v 1.6 92/06/20 09:59:37 torek Exp
  */
diff --git a/sys/arch/pmax/include/signal.h b/sys/arch/pmax/include/signal.h
index 4ad12f3a67cb..eecfb997d448 100644
--- a/sys/arch/pmax/include/signal.h
+++ b/sys/arch/pmax/include/signal.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: signal.h,v 1.4 1994/10/26 21:10:01 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)signal.h	8.1 (Berkeley) 6/10/93
- *      $Id: signal.h,v 1.3 1994/05/27 09:02:22 glass Exp $
+ *	@(#)signal.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/include/stdarg.h b/sys/arch/pmax/include/stdarg.h
index cbb36fbeb885..2bbee1277dd3 100644
--- a/sys/arch/pmax/include/stdarg.h
+++ b/sys/arch/pmax/include/stdarg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: stdarg.h,v 1.5 1994/10/26 21:10:03 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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	8.1 (Berkeley) 6/10/93
- *      $Id: stdarg.h,v 1.4 1994/10/15 04:58:02 cgd Exp $
+ *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
  */
 
 #ifndef _PMAX_STDARG_H_
diff --git a/sys/arch/pmax/include/trap.h b/sys/arch/pmax/include/trap.h
index b60548149e30..72dc62edfddc 100644
--- a/sys/arch/pmax/include/trap.h
+++ b/sys/arch/pmax/include/trap.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: trap.h,v 1.4 1994/10/26 21:10:04 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: trap.h 1.1 90/07/09
  *
- *	from: @(#)trap.h	8.1 (Berkeley) 6/10/93
- *      $Id: trap.h,v 1.3 1994/05/27 09:02:30 glass Exp $
+ *	@(#)trap.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/include/types.h b/sys/arch/pmax/include/types.h
index 68540c5a672f..3a45a3f52ea1 100644
--- a/sys/arch/pmax/include/types.h
+++ b/sys/arch/pmax/include/types.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: types.h,v 1.7 1994/10/26 21:10:07 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)types.h	8.3 (Berkeley) 1/5/94
- *      $Id: types.h,v 1.6 1994/10/20 05:34:04 cgd Exp $
+ *	@(#)types.h	8.3 (Berkeley) 1/5/94
  */
 
 #ifndef	_MACHTYPES_H_
diff --git a/sys/arch/pmax/include/varargs.h b/sys/arch/pmax/include/varargs.h
index df7178c489d2..6389c7d5e6e1 100644
--- a/sys/arch/pmax/include/varargs.h
+++ b/sys/arch/pmax/include/varargs.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: varargs.h,v 1.6 1994/10/26 21:10:09 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)varargs.h	8.2 (Berkeley) 3/22/94
- *      $Id: varargs.h,v 1.5 1994/10/15 04:58:03 cgd Exp $
+ *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
  */
 
 #ifndef _PMAX_VARARGS_H_
diff --git a/sys/arch/pmax/include/vmparam.h b/sys/arch/pmax/include/vmparam.h
index 62834114c58c..6215614fcf13 100644
--- a/sys/arch/pmax/include/vmparam.h
+++ b/sys/arch/pmax/include/vmparam.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: vmparam.h 1.16 91/01/18
  *
- *	from: @(#)vmparam.h	8.2 (Berkeley) 4/22/94
- *      $Id: vmparam.h,v 1.4 1994/06/01 18:51:16 glass Exp $
+ *	@(#)vmparam.h	8.2 (Berkeley) 4/22/94
  */
 
 /*
diff --git a/sys/arch/pmax/pmax/asic.h b/sys/arch/pmax/pmax/asic.h
index e66758c80ce2..4f878e4d5b3e 100644
--- a/sys/arch/pmax/pmax/asic.h
+++ b/sys/arch/pmax/pmax/asic.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: asic.h,v 1.4 1994/10/26 21:10:12 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)asic.h	8.1 (Berkeley) 6/10/93
- *      $Id: asic.h,v 1.3 1994/05/27 09:02:48 glass Exp $
+ *	@(#)asic.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/pmax/autoconf.c b/sys/arch/pmax/pmax/autoconf.c
index f710eb8748d6..6d6e8da37c77 100644
--- a/sys/arch/pmax/pmax/autoconf.c
+++ b/sys/arch/pmax/pmax/autoconf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: autoconf.c,v 1.4 1994/10/26 21:10:13 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: autoconf.c 1.31 91/01/21
  *
- *	from: @(#)autoconf.c	8.1 (Berkeley) 6/10/93
- *      $Id: autoconf.c,v 1.3 1994/05/27 09:02:52 glass Exp $
+ *	@(#)autoconf.c	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/pmax/clock.c b/sys/arch/pmax/pmax/clock.c
index d1ee7e57ff17..a7095e87832f 100644
--- a/sys/arch/pmax/pmax/clock.c
+++ b/sys/arch/pmax/pmax/clock.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: clock.c,v 1.4 1994/10/26 21:10:14 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: clock.c 1.18 91/01/21
  *
- *	from: @(#)clock.c	8.1 (Berkeley) 6/10/93
- *      $Id: clock.c,v 1.3 1994/05/27 09:02:56 glass Exp $
+ *	@(#)clock.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/pmax/clockreg.h b/sys/arch/pmax/pmax/clockreg.h
index 445775e7c8d2..2cc20f543015 100644
--- a/sys/arch/pmax/pmax/clockreg.h
+++ b/sys/arch/pmax/pmax/clockreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: clockreg.h,v 1.4 1994/10/26 21:10:15 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: clockreg.h 1.14 91/01/18
  *
- *	from: @(#)clockreg.h	8.1 (Berkeley) 6/10/93
- *      $Id: clockreg.h,v 1.3 1994/05/27 09:03:00 glass Exp $
+ *	@(#)clockreg.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/pmax/conf.c b/sys/arch/pmax/pmax/conf.c
index 6bf041e0741b..d235933cd2fa 100644
--- a/sys/arch/pmax/pmax/conf.c
+++ b/sys/arch/pmax/pmax/conf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: conf.c,v 1.4 1994/10/26 21:10:17 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)conf.c	8.2 (Berkeley) 11/14/93
- *      $Id: conf.c,v 1.3 1994/05/27 09:03:02 glass Exp $
+ *	@(#)conf.c	8.2 (Berkeley) 11/14/93
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/pmax/cons.c b/sys/arch/pmax/pmax/cons.c
index f9e607930436..bf7430df02b5 100644
--- a/sys/arch/pmax/pmax/cons.c
+++ b/sys/arch/pmax/pmax/cons.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: cons.c,v 1.4 1994/10/26 21:10:18 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: cons.c 1.1 90/07/09
  *
- *	from: @(#)cons.c	8.2 (Berkeley) 1/11/94
- *      $Id: cons.c,v 1.3 1994/05/27 09:03:05 glass Exp $
+ *	@(#)cons.c	8.2 (Berkeley) 1/11/94
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/pmax/cons.h b/sys/arch/pmax/pmax/cons.h
index 2d52976ca231..df8ce308f959 100644
--- a/sys/arch/pmax/pmax/cons.h
+++ b/sys/arch/pmax/pmax/cons.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: cons.h,v 1.4 1994/10/26 21:10:19 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -35,8 +37,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)cons.h	8.1 (Berkeley) 6/10/93
- *      $Id: cons.h,v 1.3 1994/05/27 09:03:07 glass Exp $
+ *	@(#)cons.h	8.1 (Berkeley) 6/10/93
  */
 
 struct consdev {
diff --git a/sys/arch/pmax/pmax/disksubr.c b/sys/arch/pmax/pmax/disksubr.c
index 6df93528bba7..a8c2e808b8c9 100644
--- a/sys/arch/pmax/pmax/disksubr.c
+++ b/sys/arch/pmax/pmax/disksubr.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: disksubr.c,v 1.3 1994/10/26 21:10:20 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/05/27 09:03:09 glass Exp $
+ *	@(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  */
 
 #include "param.h"
diff --git a/sys/arch/pmax/pmax/fp.S b/sys/arch/pmax/pmax/fp.S
index 61b3d521e7a8..be1b8a966e1c 100644
--- a/sys/arch/pmax/pmax/fp.S
+++ b/sys/arch/pmax/pmax/fp.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: fp.S,v 1.4 1994/10/26 21:10:21 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)fp.s	8.1 (Berkeley) 6/10/93
- *      $Id: fp.S,v 1.3 1994/05/27 09:03:12 glass Exp $
+ *	@(#)fp.s	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/pmax/fp.s b/sys/arch/pmax/pmax/fp.s
index 12d867486ae9..e1d9284703bb 100644
--- a/sys/arch/pmax/pmax/fp.s
+++ b/sys/arch/pmax/pmax/fp.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: fp.s,v 1.4 1994/10/26 21:10:21 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)fp.s	8.1 (Berkeley) 6/10/93
- *      $Id: fp.s,v 1.3 1994/05/27 09:03:12 glass Exp $
+ *	@(#)fp.s	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/pmax/genassym.c b/sys/arch/pmax/pmax/genassym.c
index dde986ce7d94..0e3a92c92f5e 100644
--- a/sys/arch/pmax/pmax/genassym.c
+++ b/sys/arch/pmax/pmax/genassym.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: genassym.c,v 1.5 1994/10/26 21:10:23 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)genassym.c	8.2 (Berkeley) 9/23/93
- *      $Id: genassym.c,v 1.4 1994/05/27 09:03:15 glass Exp $
+ *	@(#)genassym.c	8.2 (Berkeley) 9/23/93
  */
 
 #define KERNEL
diff --git a/sys/arch/pmax/pmax/kadb.c b/sys/arch/pmax/pmax/kadb.c
index bb8224350da5..beea732ea075 100644
--- a/sys/arch/pmax/pmax/kadb.c
+++ b/sys/arch/pmax/pmax/kadb.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: kadb.c,v 1.4 1994/10/26 21:10:24 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1991, 1993
  *	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: @(#)kadb.c	8.1 (Berkeley) 6/10/93
- *      $Id: kadb.c,v 1.3 1994/05/27 09:03:18 glass Exp $
+ *	@(#)kadb.c	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/pmax/kmin.h b/sys/arch/pmax/pmax/kmin.h
index 7bccfb9901bf..9444d522661c 100644
--- a/sys/arch/pmax/pmax/kmin.h
+++ b/sys/arch/pmax/pmax/kmin.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: kmin.h,v 1.4 1994/10/26 21:10:25 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)kmin.h	8.1 (Berkeley) 6/10/93
- *      $Id: kmin.h,v 1.3 1994/05/27 09:03:21 glass Exp $
+ *	@(#)kmin.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/pmax/kn01.h b/sys/arch/pmax/pmax/kn01.h
index 88d4e862ba3f..efd22948c3f6 100644
--- a/sys/arch/pmax/pmax/kn01.h
+++ b/sys/arch/pmax/pmax/kn01.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: kn01.h,v 1.4 1994/10/26 21:10:27 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)kn01.h	8.1 (Berkeley) 6/10/93
- *      $Id: kn01.h,v 1.3 1994/05/27 09:03:23 glass Exp $
+ *	@(#)kn01.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/pmax/kn02.h b/sys/arch/pmax/pmax/kn02.h
index 35f99055afad..cc1f7fb55e83 100644
--- a/sys/arch/pmax/pmax/kn02.h
+++ b/sys/arch/pmax/pmax/kn02.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: kn02.h,v 1.4 1994/10/26 21:10:28 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)kn02.h	8.1 (Berkeley) 6/10/93
- *      $Id: kn02.h,v 1.3 1994/05/27 09:03:28 glass Exp $
+ *	@(#)kn02.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/pmax/kn03.h b/sys/arch/pmax/pmax/kn03.h
index 90a5037f6181..eecd29834bdb 100644
--- a/sys/arch/pmax/pmax/kn03.h
+++ b/sys/arch/pmax/pmax/kn03.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: kn03.h,v 1.4 1994/10/26 21:10:29 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)kn03.h	8.1 (Berkeley) 6/10/93
- *      $Id: kn03.h,v 1.3 1994/05/27 09:03:31 glass Exp $
+ *	@(#)kn03.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/pmax/locore.S b/sys/arch/pmax/pmax/locore.S
index db857bd75a55..7527a67e2367 100644
--- a/sys/arch/pmax/pmax/locore.S
+++ b/sys/arch/pmax/pmax/locore.S
@@ -1,3 +1,5 @@
+/*	$NetBSD: locore.S,v 1.5 1994/10/26 21:10:31 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -48,8 +50,7 @@
  * from: Header: /sprite/src/kernel/vm/ds3100.md/vmPmaxAsm.s,
  *	v 1.1 89/07/10 14:27:41 nelson Exp  SPRITE (DECWRL)
  *
- *	from: @(#)locore.s	8.5 (Berkeley) 1/4/94
- *	$Id: locore.S,v 1.4 1994/06/25 07:05:12 glass Exp $
+ *	@(#)locore.s	8.5 (Berkeley) 1/4/94
  */
 
 /*
diff --git a/sys/arch/pmax/pmax/locore.s b/sys/arch/pmax/pmax/locore.s
index d1b8b2f99db2..f905a1eb9fb2 100644
--- a/sys/arch/pmax/pmax/locore.s
+++ b/sys/arch/pmax/pmax/locore.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: locore.s,v 1.5 1994/10/26 21:10:31 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -48,8 +50,7 @@
  * from: Header: /sprite/src/kernel/vm/ds3100.md/vmPmaxAsm.s,
  *	v 1.1 89/07/10 14:27:41 nelson Exp  SPRITE (DECWRL)
  *
- *	from: @(#)locore.s	8.5 (Berkeley) 1/4/94
- *	$Id: locore.s,v 1.4 1994/06/25 07:05:12 glass Exp $
+ *	@(#)locore.s	8.5 (Berkeley) 1/4/94
  */
 
 /*
diff --git a/sys/arch/pmax/pmax/machdep.c b/sys/arch/pmax/pmax/machdep.c
index bc0a5ba5482d..809a910878db 100644
--- a/sys/arch/pmax/pmax/machdep.c
+++ b/sys/arch/pmax/pmax/machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: machdep.c,v 1.15 1994/10/26 21:10:33 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -36,8 +38,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)machdep.c	8.3 (Berkeley) 1/12/94
- *      $Id: machdep.c,v 1.14 1994/10/20 05:34:08 cgd Exp $
+ *	@(#)machdep.c	8.3 (Berkeley) 1/12/94
  */
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
diff --git a/sys/arch/pmax/pmax/maxine.h b/sys/arch/pmax/pmax/maxine.h
index 6bca5c4c3f5e..0b0bb9d1b375 100644
--- a/sys/arch/pmax/pmax/maxine.h
+++ b/sys/arch/pmax/pmax/maxine.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: maxine.h,v 1.4 1994/10/26 21:10:34 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)maxine.h	8.1 (Berkeley) 6/10/93
- *      $Id: maxine.h,v 1.3 1994/05/27 09:03:44 glass Exp $
+ *	@(#)maxine.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/pmax/mem.c b/sys/arch/pmax/pmax/mem.c
index a610d4ce4b1e..c52c6efcb530 100644
--- a/sys/arch/pmax/pmax/mem.c
+++ b/sys/arch/pmax/pmax/mem.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mem.c,v 1.5 1994/10/26 21:10:37 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: mem.c 1.14 90/10/12
  *
- *	from: @(#)mem.c	8.2 (Berkeley) 3/28/94
- *      $Id: mem.c,v 1.4 1994/05/27 09:03:47 glass Exp $
+ *	@(#)mem.c	8.2 (Berkeley) 3/28/94
  */
 
 /*
diff --git a/sys/arch/pmax/pmax/pmap.c b/sys/arch/pmax/pmax/pmap.c
index 084f68f1ecf8..e8da67603bca 100644
--- a/sys/arch/pmax/pmax/pmap.c
+++ b/sys/arch/pmax/pmax/pmap.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmap.c,v 1.6 1994/10/26 21:10:38 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)pmap.c	8.4 (Berkeley) 1/26/94
- *      $Id: pmap.c,v 1.5 1994/05/27 09:03:51 glass Exp $
+ *	@(#)pmap.c	8.4 (Berkeley) 1/26/94
  */
 
 /*
diff --git a/sys/arch/pmax/pmax/pmax_trap.c b/sys/arch/pmax/pmax/pmax_trap.c
index 55e984f693d0..c45130f42f53 100644
--- a/sys/arch/pmax/pmax/pmax_trap.c
+++ b/sys/arch/pmax/pmax/pmax_trap.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmax_trap.c,v 1.8 1994/10/26 21:10:43 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: trap.c 1.32 91/04/06
  *
- *	from: @(#)trap.c	8.5 (Berkeley) 1/11/94
- *      $Id: pmax_trap.c,v 1.7 1994/10/20 05:34:11 cgd Exp $
+ *	@(#)trap.c	8.5 (Berkeley) 1/11/94
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/pmax/pmaxtype.h b/sys/arch/pmax/pmax/pmaxtype.h
index a7e355056f23..85fc512f5086 100644
--- a/sys/arch/pmax/pmax/pmaxtype.h
+++ b/sys/arch/pmax/pmax/pmaxtype.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmaxtype.h,v 1.5 1994/10/26 21:10:39 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)pmaxtype.h	8.1 (Berkeley) 6/10/93
- *      $Id: pmaxtype.h,v 1.4 1994/06/02 21:27:50 glass Exp $
+ *	@(#)pmaxtype.h	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pmax/pmax/process_machdep.c b/sys/arch/pmax/pmax/process_machdep.c
index 355827c3057a..45f60cd91bed 100644
--- a/sys/arch/pmax/pmax/process_machdep.c
+++ b/sys/arch/pmax/pmax/process_machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: process_machdep.c,v 1.3 1994/10/26 21:10:40 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Adam Glass   
  * Copyright (c) 1993 The Regents of the University of California.
@@ -37,8 +39,6 @@
  *
  * From:
  *	Id: procfs_i386.c,v 4.1 1993/12/17 10:47:45 jsp Rel
- *
- *	$Id: process_machdep.c,v 1.2 1994/08/15 16:37:29 cgd Exp $
  */
 
 /*
diff --git a/sys/arch/pmax/pmax/swapgeneric.c b/sys/arch/pmax/pmax/swapgeneric.c
index f60e543c9186..115c951d58a6 100644
--- a/sys/arch/pmax/pmax/swapgeneric.c
+++ b/sys/arch/pmax/pmax/swapgeneric.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: swapgeneric.c,v 1.5 1994/10/26 21:10:41 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)swapgeneric.c	8.1 (Berkeley) 6/16/93
- *      $Id: swapgeneric.c,v 1.4 1994/06/16 05:11:06 glass Exp $
+ *	@(#)swapgeneric.c	8.1 (Berkeley) 6/16/93
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/pmax/sys_machdep.c b/sys/arch/pmax/pmax/sys_machdep.c
index b2c629793ce4..fabbe4c48158 100644
--- a/sys/arch/pmax/pmax/sys_machdep.c
+++ b/sys/arch/pmax/pmax/sys_machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: sys_machdep.c,v 1.6 1994/10/26 21:10:42 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)sys_machdep.c	8.1 (Berkeley) 6/10/93
- *      $Id: sys_machdep.c,v 1.5 1994/10/20 05:34:10 cgd Exp $
+ *	@(#)sys_machdep.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/pmax/trap.c b/sys/arch/pmax/pmax/trap.c
index 9ae93aa7238d..1d9035339b13 100644
--- a/sys/arch/pmax/pmax/trap.c
+++ b/sys/arch/pmax/pmax/trap.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: trap.c,v 1.8 1994/10/26 21:10:43 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: trap.c 1.32 91/04/06
  *
- *	from: @(#)trap.c	8.5 (Berkeley) 1/11/94
- *      $Id: trap.c,v 1.7 1994/10/20 05:34:11 cgd Exp $
+ *	@(#)trap.c	8.5 (Berkeley) 1/11/94
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/pmax/turbochannel.h b/sys/arch/pmax/pmax/turbochannel.h
index fe08540dceb1..7ac919d0f8c0 100644
--- a/sys/arch/pmax/pmax/turbochannel.h
+++ b/sys/arch/pmax/pmax/turbochannel.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: turbochannel.h,v 1.4 1994/10/26 21:10:45 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,8 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)turbochannel.h	8.1 (Berkeley) 6/10/93
- *      $Id: turbochannel.h,v 1.3 1994/05/27 09:04:23 glass Exp $
+ *	@(#)turbochannel.h	8.1 (Berkeley) 6/10/93
  */
 
 /* 
diff --git a/sys/arch/pmax/pmax/vm_machdep.c b/sys/arch/pmax/pmax/vm_machdep.c
index 695f89e1b2e0..2f1ca9251a1f 100644
--- a/sys/arch/pmax/pmax/vm_machdep.c
+++ b/sys/arch/pmax/pmax/vm_machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: vm_machdep.c,v 1.5 1994/10/26 21:10:46 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -37,8 +39,7 @@
  *
  * from: Utah Hdr: vm_machdep.c 1.21 91/04/06
  *
- *	from: @(#)vm_machdep.c	8.3 (Berkeley) 1/4/94
- *      $Id: vm_machdep.c,v 1.4 1994/05/27 09:04:32 glass Exp $
+ *	@(#)vm_machdep.c	8.3 (Berkeley) 1/4/94
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/stand/Makefile b/sys/arch/pmax/stand/Makefile
index 894a78b112f0..b06280068437 100644
--- a/sys/arch/pmax/stand/Makefile
+++ b/sys/arch/pmax/stand/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	8.3 (Berkeley) 2/16/94
-#	$Id: Makefile,v 1.3 1994/05/27 09:04:44 glass Exp $
+#	$NetBSD: Makefile,v 1.4 1994/10/26 21:10:48 cgd Exp $
+#	@(#)Makefile	8.3 (Berkeley) 2/16/94
 
 DESTDIR=
 STAND=	../../stand
diff --git a/sys/arch/pmax/stand/Makefile.booters b/sys/arch/pmax/stand/Makefile.booters
index ea02671c74b5..e6b9f1304ce9 100644
--- a/sys/arch/pmax/stand/Makefile.booters
+++ b/sys/arch/pmax/stand/Makefile.booters
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	8.3 (Berkeley) 2/16/94
-#	$Id: Makefile.booters,v 1.3 1994/05/27 09:04:44 glass Exp $
+#	$NetBSD: Makefile.booters,v 1.4 1994/10/26 21:10:48 cgd Exp $
+#	@(#)Makefile	8.3 (Berkeley) 2/16/94
 
 DESTDIR=
 STAND=	../../stand
diff --git a/sys/arch/pmax/stand/boot.c b/sys/arch/pmax/stand/boot.c
index 2828afd638b7..fdec1df071be 100644
--- a/sys/arch/pmax/stand/boot.c
+++ b/sys/arch/pmax/stand/boot.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: boot.c,v 1.4 1994/10/26 21:10:49 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)boot.c	8.1 (Berkeley) 6/10/93
- *      $Id: boot.c,v 1.3 1994/05/27 09:04:50 glass Exp $
+ *	@(#)boot.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/stand/conf.c b/sys/arch/pmax/stand/conf.c
index 9ef0bacfe410..6b7009f8f282 100644
--- a/sys/arch/pmax/stand/conf.c
+++ b/sys/arch/pmax/stand/conf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: conf.c,v 1.4 1994/10/26 21:10:50 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)conf.c	8.1 (Berkeley) 6/10/93
- *      $Id: conf.c,v 1.3 1994/05/27 09:04:57 glass Exp $
+ *	@(#)conf.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <stand/stand.h>
diff --git a/sys/arch/pmax/stand/dec_boot.h b/sys/arch/pmax/stand/dec_boot.h
index 195f40fc568b..d5f717a94eab 100644
--- a/sys/arch/pmax/stand/dec_boot.h
+++ b/sys/arch/pmax/stand/dec_boot.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dec_boot.h,v 1.4 1994/10/26 21:10:51 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)dec_boot.h	8.1 (Berkeley) 6/10/93
- *      $Id: dec_boot.h,v 1.3 1994/05/27 09:05:01 glass Exp $
+ *	@(#)dec_boot.h	8.1 (Berkeley) 6/10/93
  *
  * devDiskLabel.h --
  *
@@ -46,7 +47,6 @@
  *
  * from: Header: /sprite/src/kernel/dev/RCS/devDiskLabel.h,
  *	v 9.4 90/03/01 12:22:36 jhh Exp  SPRITE (Berkeley)
- * $Id: dec_boot.h,v 1.3 1994/05/27 09:05:01 glass Exp $
  */
 
 /*
diff --git a/sys/arch/pmax/stand/dec_exec.h b/sys/arch/pmax/stand/dec_exec.h
index 73f2e89fad6f..c51ee7417807 100644
--- a/sys/arch/pmax/stand/dec_exec.h
+++ b/sys/arch/pmax/stand/dec_exec.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dec_exec.h,v 1.4 1994/10/26 21:10:52 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1993
  *	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: @(#)dec_exec.h	8.1 (Berkeley) 6/10/93
- *      $Id: dec_exec.h,v 1.3 1994/05/27 09:05:06 glass Exp $
+ *	@(#)dec_exec.h	8.1 (Berkeley) 6/10/93
  */
 
 
diff --git a/sys/arch/pmax/stand/dec_label.c b/sys/arch/pmax/stand/dec_label.c
index 6f76f139c586..78e2ac2c7242 100644
--- a/sys/arch/pmax/stand/dec_label.c
+++ b/sys/arch/pmax/stand/dec_label.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: dec_label.c,v 1.3 1994/10/26 21:10:53 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1993
  *	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: @(#)dec_label.c	8.1 (Berkeley) 6/10/93
- *      $Id: dec_label.c,v 1.2 1994/05/27 09:05:10 glass Exp $
+ *	@(#)dec_label.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <stdio.h>
diff --git a/sys/arch/pmax/stand/dec_label/dec_label.c b/sys/arch/pmax/stand/dec_label/dec_label.c
index 6f76f139c586..78e2ac2c7242 100644
--- a/sys/arch/pmax/stand/dec_label/dec_label.c
+++ b/sys/arch/pmax/stand/dec_label/dec_label.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: dec_label.c,v 1.3 1994/10/26 21:10:53 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1993
  *	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: @(#)dec_label.c	8.1 (Berkeley) 6/10/93
- *      $Id: dec_label.c,v 1.2 1994/05/27 09:05:10 glass Exp $
+ *	@(#)dec_label.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <stdio.h>
diff --git a/sys/arch/pmax/stand/dec_prom.h b/sys/arch/pmax/stand/dec_prom.h
index 633495ccf41c..9daa56e214a9 100644
--- a/sys/arch/pmax/stand/dec_prom.h
+++ b/sys/arch/pmax/stand/dec_prom.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dec_prom.h,v 1.4 1994/10/26 21:10:54 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)dec_prom.h	8.1 (Berkeley) 6/10/93
- *      $Id: dec_prom.h,v 1.3 1994/05/27 09:05:13 glass Exp $
+ *	@(#)dec_prom.h	8.1 (Berkeley) 6/10/93
  *
  * machMon.h --
  *
diff --git a/sys/arch/pmax/stand/lib/callvec.c b/sys/arch/pmax/stand/lib/callvec.c
index dc7a9e95e9ed..7d25cfc40414 100644
--- a/sys/arch/pmax/stand/lib/callvec.c
+++ b/sys/arch/pmax/stand/lib/callvec.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: callvec.c,v 1.4 1994/10/26 21:11:02 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)callvec.c	8.1 (Berkeley) 6/10/93
- *      $Id: callvec.c,v 1.3 1994/05/27 09:05:47 glass Exp $
+ *	@(#)callvec.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <pmax/stand/dec_prom.h>
diff --git a/sys/arch/pmax/stand/lib/conf.c b/sys/arch/pmax/stand/lib/conf.c
index 9ef0bacfe410..6b7009f8f282 100644
--- a/sys/arch/pmax/stand/lib/conf.c
+++ b/sys/arch/pmax/stand/lib/conf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: conf.c,v 1.4 1994/10/26 21:10:50 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)conf.c	8.1 (Berkeley) 6/10/93
- *      $Id: conf.c,v 1.3 1994/05/27 09:04:57 glass Exp $
+ *	@(#)conf.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <stand/stand.h>
diff --git a/sys/arch/pmax/stand/lib/devopen.c b/sys/arch/pmax/stand/lib/devopen.c
index f23b6b4747ac..661f1c74efac 100644
--- a/sys/arch/pmax/stand/lib/devopen.c
+++ b/sys/arch/pmax/stand/lib/devopen.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: devopen.c,v 1.4 1994/10/26 21:11:03 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)devopen.c	8.1 (Berkeley) 6/10/93
- *      $Id: devopen.c,v 1.3 1994/05/27 09:05:51 glass Exp $
+ *	@(#)devopen.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <stand/stand.h>
diff --git a/sys/arch/pmax/stand/lib/rz.c b/sys/arch/pmax/stand/lib/rz.c
index 54ab58c0caa7..81f510bfe8e4 100644
--- a/sys/arch/pmax/stand/lib/rz.c
+++ b/sys/arch/pmax/stand/lib/rz.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: rz.c,v 1.4 1994/10/26 21:10:58 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)rz.c	8.1 (Berkeley) 6/10/93
- *      $Id: rz.c,v 1.3 1994/05/27 09:05:26 glass Exp $
+ *	@(#)rz.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <stand/stand.h>
diff --git a/sys/arch/pmax/stand/libsa/Makefile b/sys/arch/pmax/stand/libsa/Makefile
index 04df9b42f7a6..5ed9ca5eff07 100644
--- a/sys/arch/pmax/stand/libsa/Makefile
+++ b/sys/arch/pmax/stand/libsa/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	8.2 (Berkeley) 2/16/94
-#       $Id: Makefile,v 1.3 1994/05/27 09:05:41 glass Exp $
+#	$NetBSD: Makefile,v 1.4 1994/10/26 21:11:01 cgd Exp $
+#	@(#)Makefile	8.2 (Berkeley) 2/16/94
 
 LIB=	sa
 SRCS=	alloc.c bcopy.c bzero.c close.c dev.c disklabel.c getfile.c \
diff --git a/sys/arch/pmax/stand/libsa/callvec.c b/sys/arch/pmax/stand/libsa/callvec.c
index dc7a9e95e9ed..7d25cfc40414 100644
--- a/sys/arch/pmax/stand/libsa/callvec.c
+++ b/sys/arch/pmax/stand/libsa/callvec.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: callvec.c,v 1.4 1994/10/26 21:11:02 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)callvec.c	8.1 (Berkeley) 6/10/93
- *      $Id: callvec.c,v 1.3 1994/05/27 09:05:47 glass Exp $
+ *	@(#)callvec.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <pmax/stand/dec_prom.h>
diff --git a/sys/arch/pmax/stand/libsa/dec_boot.h b/sys/arch/pmax/stand/libsa/dec_boot.h
index 195f40fc568b..d5f717a94eab 100644
--- a/sys/arch/pmax/stand/libsa/dec_boot.h
+++ b/sys/arch/pmax/stand/libsa/dec_boot.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dec_boot.h,v 1.4 1994/10/26 21:10:51 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)dec_boot.h	8.1 (Berkeley) 6/10/93
- *      $Id: dec_boot.h,v 1.3 1994/05/27 09:05:01 glass Exp $
+ *	@(#)dec_boot.h	8.1 (Berkeley) 6/10/93
  *
  * devDiskLabel.h --
  *
@@ -46,7 +47,6 @@
  *
  * from: Header: /sprite/src/kernel/dev/RCS/devDiskLabel.h,
  *	v 9.4 90/03/01 12:22:36 jhh Exp  SPRITE (Berkeley)
- * $Id: dec_boot.h,v 1.3 1994/05/27 09:05:01 glass Exp $
  */
 
 /*
diff --git a/sys/arch/pmax/stand/libsa/dec_exec.h b/sys/arch/pmax/stand/libsa/dec_exec.h
index 73f2e89fad6f..c51ee7417807 100644
--- a/sys/arch/pmax/stand/libsa/dec_exec.h
+++ b/sys/arch/pmax/stand/libsa/dec_exec.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dec_exec.h,v 1.4 1994/10/26 21:10:52 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1993
  *	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: @(#)dec_exec.h	8.1 (Berkeley) 6/10/93
- *      $Id: dec_exec.h,v 1.3 1994/05/27 09:05:06 glass Exp $
+ *	@(#)dec_exec.h	8.1 (Berkeley) 6/10/93
  */
 
 
diff --git a/sys/arch/pmax/stand/libsa/dec_prom.h b/sys/arch/pmax/stand/libsa/dec_prom.h
index 633495ccf41c..9daa56e214a9 100644
--- a/sys/arch/pmax/stand/libsa/dec_prom.h
+++ b/sys/arch/pmax/stand/libsa/dec_prom.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dec_prom.h,v 1.4 1994/10/26 21:10:54 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)dec_prom.h	8.1 (Berkeley) 6/10/93
- *      $Id: dec_prom.h,v 1.3 1994/05/27 09:05:13 glass Exp $
+ *	@(#)dec_prom.h	8.1 (Berkeley) 6/10/93
  *
  * machMon.h --
  *
diff --git a/sys/arch/pmax/stand/libsa/devopen.c b/sys/arch/pmax/stand/libsa/devopen.c
index f23b6b4747ac..661f1c74efac 100644
--- a/sys/arch/pmax/stand/libsa/devopen.c
+++ b/sys/arch/pmax/stand/libsa/devopen.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: devopen.c,v 1.4 1994/10/26 21:11:03 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)devopen.c	8.1 (Berkeley) 6/10/93
- *      $Id: devopen.c,v 1.3 1994/05/27 09:05:51 glass Exp $
+ *	@(#)devopen.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <stand/stand.h>
diff --git a/sys/arch/pmax/stand/libsa/getenv.c b/sys/arch/pmax/stand/libsa/getenv.c
index 162b13d58666..4313dd88ce16 100644
--- a/sys/arch/pmax/stand/libsa/getenv.c
+++ b/sys/arch/pmax/stand/libsa/getenv.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: getenv.c,v 1.4 1994/10/26 21:11:04 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)getenv.c	8.1 (Berkeley) 6/10/93
- *      $Id: getenv.c,v 1.3 1994/05/27 09:05:57 glass Exp $
+ *	@(#)getenv.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <pmax/stand/dec_prom.h>
diff --git a/sys/arch/pmax/stand/libsa/gets.c b/sys/arch/pmax/stand/libsa/gets.c
index 45903750dc86..f87b5c1b87e2 100644
--- a/sys/arch/pmax/stand/libsa/gets.c
+++ b/sys/arch/pmax/stand/libsa/gets.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: gets.c,v 1.4 1994/10/26 21:11:05 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)gets.c	8.1 (Berkeley) 6/10/93
- *      $Id: gets.c,v 1.3 1994/05/27 09:06:02 glass Exp $
+ *	@(#)gets.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <pmax/stand/dec_prom.h>
diff --git a/sys/arch/pmax/stand/libsa/strcat.c b/sys/arch/pmax/stand/libsa/strcat.c
index 23e386902e79..d573bac8f891 100644
--- a/sys/arch/pmax/stand/libsa/strcat.c
+++ b/sys/arch/pmax/stand/libsa/strcat.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: strcat.c,v 1.4 1994/10/26 21:11:07 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)strcat.c	8.1 (Berkeley) 6/10/93
- *      $Id: strcat.c,v 1.3 1994/05/27 09:06:07 glass Exp $
+ *	@(#)strcat.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <pmax/stand/dec_prom.h>
diff --git a/sys/arch/pmax/stand/libsa/strcmp.c b/sys/arch/pmax/stand/libsa/strcmp.c
index 07b2922ce05f..4d3dfa99c8c0 100644
--- a/sys/arch/pmax/stand/libsa/strcmp.c
+++ b/sys/arch/pmax/stand/libsa/strcmp.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: strcmp.c,v 1.4 1994/10/26 21:11:08 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)strcmp.c	8.1 (Berkeley) 6/10/93
- *      $Id: strcmp.c,v 1.3 1994/05/27 09:06:12 glass Exp $
+ *	@(#)strcmp.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <pmax/stand/dec_prom.h>
diff --git a/sys/arch/pmax/stand/libsa/strcpy.c b/sys/arch/pmax/stand/libsa/strcpy.c
index a3c3e218b55b..440bc5cdb090 100644
--- a/sys/arch/pmax/stand/libsa/strcpy.c
+++ b/sys/arch/pmax/stand/libsa/strcpy.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: strcpy.c,v 1.4 1994/10/26 21:11:09 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)strcpy.c	8.1 (Berkeley) 6/10/93
- *      $Id: strcpy.c,v 1.3 1994/05/27 09:06:19 glass Exp $
+ *	@(#)strcpy.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <pmax/stand/dec_prom.h>
diff --git a/sys/arch/pmax/stand/mkboot.c b/sys/arch/pmax/stand/mkboot.c
index 410ce28b029f..5be7f57e8395 100644
--- a/sys/arch/pmax/stand/mkboot.c
+++ b/sys/arch/pmax/stand/mkboot.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mkboot.c,v 1.4 1994/10/26 21:10:56 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -33,18 +35,20 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)mkboot.c	8.1 (Berkeley) 6/10/93
- *      $Id: mkboot.c,v 1.3 1994/05/27 09:05:17 glass Exp $
+ *	@(#)mkboot.c	8.1 (Berkeley) 6/10/93
  */
 
 #ifndef lint
 static char copyright[] =
-"from: @(#) Copyright (c) 1992, 1993\n\
+"@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif not lint
 
 #ifndef lint
-static char sccsid[] = "from: @(#)mkboot.c	8.1 (Berkeley) 6/10/93";
+#ifdef notdef
+static char sccsid[] = "@(#)mkboot.c	8.1 (Berkeley) 6/10/93";
+#endif
+static char rcsid[] = "$NetBSD: mkboot.c,v 1.4 1994/10/26 21:10:56 cgd Exp $";
 #endif not lint
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/stand/mkboottape.c b/sys/arch/pmax/stand/mkboottape.c
index dc28c383f759..4808bbf7f1f1 100644
--- a/sys/arch/pmax/stand/mkboottape.c
+++ b/sys/arch/pmax/stand/mkboottape.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mkboottape.c,v 1.5 1994/10/26 21:10:57 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)mkboottape.c	8.1 (Berkeley) 6/10/93
- *      $Id: mkboottape.c,v 1.4 1994/09/17 00:24:06 mycroft Exp $
+ *	@(#)mkboottape.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/stand/rz.c b/sys/arch/pmax/stand/rz.c
index 54ab58c0caa7..81f510bfe8e4 100644
--- a/sys/arch/pmax/stand/rz.c
+++ b/sys/arch/pmax/stand/rz.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: rz.c,v 1.4 1994/10/26 21:10:58 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)rz.c	8.1 (Berkeley) 6/10/93
- *      $Id: rz.c,v 1.3 1994/05/27 09:05:26 glass Exp $
+ *	@(#)rz.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <stand/stand.h>
diff --git a/sys/arch/pmax/stand/scsiboot/boot.c b/sys/arch/pmax/stand/scsiboot/boot.c
index 2828afd638b7..fdec1df071be 100644
--- a/sys/arch/pmax/stand/scsiboot/boot.c
+++ b/sys/arch/pmax/stand/scsiboot/boot.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: boot.c,v 1.4 1994/10/26 21:10:49 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)boot.c	8.1 (Berkeley) 6/10/93
- *      $Id: boot.c,v 1.3 1994/05/27 09:04:50 glass Exp $
+ *	@(#)boot.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/stand/scsiboot/bootxx.c b/sys/arch/pmax/stand/scsiboot/bootxx.c
index 5803730b7a3d..490fec8de134 100644
--- a/sys/arch/pmax/stand/scsiboot/bootxx.c
+++ b/sys/arch/pmax/stand/scsiboot/bootxx.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: bootxx.c,v 1.4 1994/10/26 21:10:49 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)boot.c	8.1 (Berkeley) 6/10/93
- *      $Id: bootxx.c,v 1.3 1994/05/27 09:04:50 glass Exp $
+ *	@(#)boot.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/stand/scsiboot/conf.c b/sys/arch/pmax/stand/scsiboot/conf.c
index 9ef0bacfe410..6b7009f8f282 100644
--- a/sys/arch/pmax/stand/scsiboot/conf.c
+++ b/sys/arch/pmax/stand/scsiboot/conf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: conf.c,v 1.4 1994/10/26 21:10:50 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)conf.c	8.1 (Berkeley) 6/10/93
- *      $Id: conf.c,v 1.3 1994/05/27 09:04:57 glass Exp $
+ *	@(#)conf.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <stand/stand.h>
diff --git a/sys/arch/pmax/stand/scsiboot/mkboot.c b/sys/arch/pmax/stand/scsiboot/mkboot.c
index 410ce28b029f..5be7f57e8395 100644
--- a/sys/arch/pmax/stand/scsiboot/mkboot.c
+++ b/sys/arch/pmax/stand/scsiboot/mkboot.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mkboot.c,v 1.4 1994/10/26 21:10:56 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -33,18 +35,20 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)mkboot.c	8.1 (Berkeley) 6/10/93
- *      $Id: mkboot.c,v 1.3 1994/05/27 09:05:17 glass Exp $
+ *	@(#)mkboot.c	8.1 (Berkeley) 6/10/93
  */
 
 #ifndef lint
 static char copyright[] =
-"from: @(#) Copyright (c) 1992, 1993\n\
+"@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif not lint
 
 #ifndef lint
-static char sccsid[] = "from: @(#)mkboot.c	8.1 (Berkeley) 6/10/93";
+#ifdef notdef
+static char sccsid[] = "@(#)mkboot.c	8.1 (Berkeley) 6/10/93";
+#endif
+static char rcsid[] = "$NetBSD: mkboot.c,v 1.4 1994/10/26 21:10:56 cgd Exp $";
 #endif not lint
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/stand/scsiboot/mkboottape.c b/sys/arch/pmax/stand/scsiboot/mkboottape.c
index dc28c383f759..4808bbf7f1f1 100644
--- a/sys/arch/pmax/stand/scsiboot/mkboottape.c
+++ b/sys/arch/pmax/stand/scsiboot/mkboottape.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mkboottape.c,v 1.5 1994/10/26 21:10:57 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)mkboottape.c	8.1 (Berkeley) 6/10/93
- *      $Id: mkboottape.c,v 1.4 1994/09/17 00:24:06 mycroft Exp $
+ *	@(#)mkboottape.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/stand/scsiboot/rz.c b/sys/arch/pmax/stand/scsiboot/rz.c
index 54ab58c0caa7..81f510bfe8e4 100644
--- a/sys/arch/pmax/stand/scsiboot/rz.c
+++ b/sys/arch/pmax/stand/scsiboot/rz.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: rz.c,v 1.4 1994/10/26 21:10:58 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)rz.c	8.1 (Berkeley) 6/10/93
- *      $Id: rz.c,v 1.3 1994/05/27 09:05:26 glass Exp $
+ *	@(#)rz.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <stand/stand.h>
diff --git a/sys/arch/pmax/stand/start.s b/sys/arch/pmax/stand/start.s
index beea1dc19d37..7ea8581fc319 100644
--- a/sys/arch/pmax/stand/start.s
+++ b/sys/arch/pmax/stand/start.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: start.s,v 1.4 1994/10/26 21:10:59 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	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: @(#)start.s	8.2 (Berkeley) 1/21/94
- *      $Id: start.s,v 1.3 1994/05/27 09:05:33 glass Exp $
+ *	@(#)start.s	8.2 (Berkeley) 1/21/94
  */
 
 /*
diff --git a/sys/dev/tc/asc.c b/sys/dev/tc/asc.c
index eb376d75e917..cd9e2df69efc 100644
--- a/sys/dev/tc/asc.c
+++ b/sys/dev/tc/asc.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: asc.c,v 1.6 1994/10/26 21:08:50 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	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: @(#)asc.c	8.2 (Berkeley) 1/4/94
- *      $Id: asc.c,v 1.5 1994/05/27 08:58:02 glass Exp $
+ *	@(#)asc.c	8.2 (Berkeley) 1/4/94
  */
 
 /*