diff --git a/sys/arch/pc532/Makefile b/sys/arch/pc532/Makefile
index d751e5f0673c..56051070bd5e 100644
--- a/sys/arch/pc532/Makefile
+++ b/sys/arch/pc532/Makefile
@@ -1,5 +1,6 @@
-#	from: @(#)Makefile	7.3 (Berkeley) 6/9/91
-#	$Id: Makefile,v 1.1 1994/05/26 23:48:00 phil Exp $
+#	$NetBSD: Makefile,v 1.2 1994/10/26 08:23:50 cgd Exp $
+
+#	@(#)Makefile	7.3 (Berkeley) 6/9/91
 
 COMM=	../net/*.[ch] ../netimp/*.[ch] ../netinet/*.[ch] ../netns/*.[ch] \
 	../netiso/*.[ch] ../netccitt/*.[ch] \
diff --git a/sys/arch/pc532/To.Do b/sys/arch/pc532/To.Do
index d1cb4ae0ff02..b0f1dadf1557 100644
--- a/sys/arch/pc532/To.Do
+++ b/sys/arch/pc532/To.Do
@@ -1,3 +1,5 @@
+$NetBSD: To.Do,v 1.2 1994/10/26 08:23:51 cgd Exp $
+
 This is the "To Do" list for NetBSD/pc532
   (Order is not in order of importance.)
 
diff --git a/sys/arch/pc532/compile/.keep_me b/sys/arch/pc532/compile/.keep_me
index aedb72a50a73..a3950d5c483c 100644
--- a/sys/arch/pc532/compile/.keep_me
+++ b/sys/arch/pc532/compile/.keep_me
@@ -1 +1,3 @@
+$NetBSD: .keep_me,v 1.2 1994/10/26 08:23:53 cgd Exp $
+
 This normally empty directory needs to be kept in the distribution.
diff --git a/sys/arch/pc532/conf/GENERIC_O b/sys/arch/pc532/conf/GENERIC_O
index 6aeca205d8c5..f82864804434 100644
--- a/sys/arch/pc532/conf/GENERIC_O
+++ b/sys/arch/pc532/conf/GENERIC_O
@@ -1,8 +1,7 @@
+#	$NetBSD: GENERIC_O,v 1.3 1994/10/26 08:23:55 cgd Exp $
 #
 # GENERIC 532 Distribution - sd1 version
 #
-#	$Id: GENERIC_O,v 1.2 1994/05/25 00:00:48 phil Exp $
-#
 machine		"pc532"
 cpu		"ns532"
 ident		GENERIC_O
diff --git a/sys/arch/pc532/conf/GENERIC_OF b/sys/arch/pc532/conf/GENERIC_OF
index 3b3f32033224..a98ed9ecef54 100644
--- a/sys/arch/pc532/conf/GENERIC_OF
+++ b/sys/arch/pc532/conf/GENERIC_OF
@@ -1,8 +1,7 @@
+#	$NetBSD: GENERIC_OF,v 1.3 1994/10/26 08:23:56 cgd Exp $
 #
 # GENERIC 532 Distribution - sd1 version
 #
-#	$Id: GENERIC_OF,v 1.2 1994/05/25 00:00:49 phil Exp $
-#
 machine		"pc532"
 cpu		"ns532"
 ident		GENERIC_OF
diff --git a/sys/arch/pc532/conf/GENERIC_RD b/sys/arch/pc532/conf/GENERIC_RD
index 97edfee86081..d8a17ad479e2 100644
--- a/sys/arch/pc532/conf/GENERIC_RD
+++ b/sys/arch/pc532/conf/GENERIC_RD
@@ -1,8 +1,7 @@
+#	$NetBSD: GENERIC_RD,v 1.3 1994/10/26 08:23:57 cgd Exp $
 #
 # GENERIC 532 Distribution - RAM DISK
 #
-#	$Id: GENERIC_RD,v 1.2 1994/05/25 00:00:50 phil Exp $
-#
 machine		"pc532"
 cpu		"ns532"
 ident		GENERIC_RD
diff --git a/sys/arch/pc532/conf/GENERIC_Z b/sys/arch/pc532/conf/GENERIC_Z
index b6ec514cd165..fe99c75fbe9a 100644
--- a/sys/arch/pc532/conf/GENERIC_Z
+++ b/sys/arch/pc532/conf/GENERIC_Z
@@ -1,8 +1,7 @@
+#	$NetBSD: GENERIC_Z,v 1.3 1994/10/26 08:23:58 cgd Exp $
 #
 # GENERIC 532 Distribution - sd0 version
 #
-#	$Id: GENERIC_Z,v 1.2 1994/05/25 00:00:51 phil Exp $
-#
 machine		"pc532"
 cpu		"ns532"
 ident		GENERIC_Z
diff --git a/sys/arch/pc532/conf/GENERIC_ZF b/sys/arch/pc532/conf/GENERIC_ZF
index 7a93014788b1..923c0e00a689 100644
--- a/sys/arch/pc532/conf/GENERIC_ZF
+++ b/sys/arch/pc532/conf/GENERIC_ZF
@@ -1,8 +1,7 @@
+#	$NetBSD: GENERIC_ZF,v 1.3 1994/10/26 08:23:59 cgd Exp $
 #
 # GENERIC 532 Distribution - sd0 version, 19200 console
 #
-#	$Id: GENERIC_ZF,v 1.2 1994/05/25 00:00:52 phil Exp $
-#
 machine		"pc532"
 cpu		"ns532"
 ident		GENERIC_ZF
diff --git a/sys/arch/pc532/conf/Makefile.pc532 b/sys/arch/pc532/conf/Makefile.pc532
index 461c223d7727..ec3613b45a74 100644
--- a/sys/arch/pc532/conf/Makefile.pc532
+++ b/sys/arch/pc532/conf/Makefile.pc532
@@ -1,6 +1,7 @@
+#	$NetBSD: Makefile.pc532,v 1.9 1994/10/26 08:24:00 cgd Exp $
+
 # Copyright 1990 W. Jolitz
-# 	from: @(#)Makefile.i386	7.1 5/10/91
-#	Makefile.pc532,v 1.2 1993/09/23 18:25:14 phil Exp
+# 	@(#)Makefile.i386	7.1 5/10/91
 #
 # Makefile for NetBSD/532
 #
diff --git a/sys/arch/pc532/conf/NEWCONF b/sys/arch/pc532/conf/NEWCONF
index 83963a403e5e..7cefc757acbe 100644
--- a/sys/arch/pc532/conf/NEWCONF
+++ b/sys/arch/pc532/conf/NEWCONF
@@ -1,8 +1,7 @@
+#	$NetBSD: NEWCONF,v 1.4 1994/10/26 08:24:01 cgd Exp $
 #
 # TINY 532 Distribution, used only for early testing and initial distribution.
 #
-#	TINY_NS,v 1.2 1993/09/13 07:23:47 phil Exp
-#
 machine		"pc532"
 
 maxusers	8			# estimated number of users
diff --git a/sys/arch/pc532/conf/STEELHEAD b/sys/arch/pc532/conf/STEELHEAD
index c06b0cfbd868..2c5c1e254e1d 100644
--- a/sys/arch/pc532/conf/STEELHEAD
+++ b/sys/arch/pc532/conf/STEELHEAD
@@ -1,8 +1,7 @@
+#	$NetBSD: STEELHEAD,v 1.4 1994/10/26 08:24:02 cgd Exp $
 #
 # STEELHEAD: Phil Nelson's pc532.
 #
-#	$Id: STEELHEAD,v 1.3 1994/08/01 23:44:08 phil Exp $
-#
 machine		"pc532"
 cpu		"ns532"
 ident		STEELHEAD
diff --git a/sys/arch/pc532/conf/devices.pc532 b/sys/arch/pc532/conf/devices.pc532
index 9a7b15b16455..564a952f1a0b 100644
--- a/sys/arch/pc532/conf/devices.pc532
+++ b/sys/arch/pc532/conf/devices.pc532
@@ -1,6 +1,6 @@
-# Swap device numbers
+#	$NetBSD: devices.pc532,v 1.2 1994/10/26 08:24:03 cgd Exp $
 #
-#	$Id: devices.pc532,v 1.1.1.1 1993/09/09 23:53:45 phil Exp $
+# Swap device numbers
 #
 sd	0
 st	2
diff --git a/sys/arch/pc532/conf/files.pc532 b/sys/arch/pc532/conf/files.pc532
index aad8471fd6a4..6346eb7e5b55 100644
--- a/sys/arch/pc532/conf/files.pc532
+++ b/sys/arch/pc532/conf/files.pc532
@@ -1,5 +1,4 @@
-#
-#	$Id: files.pc532,v 1.9 1994/09/25 04:23:17 phil Exp $
+#	$NetBSD: files.pc532,v 1.10 1994/10/26 08:24:04 cgd Exp $
 #
 arch/pc532/pc532/autoconf.c		standard 
 arch/pc532/pc532/clock.c		standard
diff --git a/sys/arch/pc532/conf/files.pc532.newconf b/sys/arch/pc532/conf/files.pc532.newconf
index de8ce68823fb..25db66d9bbc4 100644
--- a/sys/arch/pc532/conf/files.pc532.newconf
+++ b/sys/arch/pc532/conf/files.pc532.newconf
@@ -1,3 +1,4 @@
+#	$NetBSD: files.pc532.newconf,v 1.4 1994/10/26 08:24:05 cgd Exp $
 #
 # new style config file for pc532 architecture
 #
diff --git a/sys/arch/pc532/dev/aic.c b/sys/arch/pc532/dev/aic.c
index 4938b043a541..9ed06aa66c84 100644
--- a/sys/arch/pc532/dev/aic.c
+++ b/sys/arch/pc532/dev/aic.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: aic.c,v 1.2 1994/10/26 08:24:07 cgd Exp $	*/
+
 /* Written by Phil Nelson for the pc532.  Used source with the following
  * copyrights as a model.
  *
@@ -16,8 +18,6 @@
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
- *
- *	$Id: aic.c,v 1.1.1.1 1993/09/09 23:53:53 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/dev/device.h b/sys/arch/pc532/dev/device.h
index c721f7867d67..ed5aba7f4a07 100644
--- a/sys/arch/pc532/dev/device.h
+++ b/sys/arch/pc532/dev/device.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: device.h,v 1.2 1994/10/26 08:24:09 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
  * All rights reserved.
@@ -30,9 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *
- *	$Id: device.h,v 1.1.1.1 1993/09/09 23:53:53 phil Exp $
+ *	@(#)isa_device.h	7.1 (Berkeley) 5/9/91
  */
 
 /*
diff --git a/sys/arch/pc532/dev/dp.c b/sys/arch/pc532/dev/dp.c
index ba461646cf84..2d4218b04561 100644
--- a/sys/arch/pc532/dev/dp.c
+++ b/sys/arch/pc532/dev/dp.c
@@ -1,9 +1,9 @@
+/*	$NetBSD: dp.c,v 1.6 1994/10/26 08:24:10 cgd Exp $	*/
+
 /* Written by Phil Nelson for the pc532.  Used source with the following
  * copyrights as a model. 
  *
  *	dp.c:  A NCR DP8490 driver for the pc532.
- *
- *	dp.c,v 1.2 1993/10/01 22:59:31 phil Exp
  */
 
 /*
diff --git a/sys/arch/pc532/dev/dpreg.h b/sys/arch/pc532/dev/dpreg.h
index 5e7c04709d58..df1af1257bd8 100644
--- a/sys/arch/pc532/dev/dpreg.h
+++ b/sys/arch/pc532/dev/dpreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dpreg.h,v 1.6 1994/10/26 08:24:11 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1993 Philip A. Nelson.
  * All rights reserved.
@@ -29,8 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	dp.h:  defines for the dp driver.
- *
- *	dpreg.h,v 1.2 1993/10/01 22:59:44 phil Exp
  */
 
 /* Most of this comes from the Minix dp driver by Bruce Culbertson. */
diff --git a/sys/arch/pc532/dev/ncr.c b/sys/arch/pc532/dev/ncr.c
index 9ea826fbed70..349536176abe 100644
--- a/sys/arch/pc532/dev/ncr.c
+++ b/sys/arch/pc532/dev/ncr.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: ncr.c,v 1.10 1994/10/26 08:24:12 cgd Exp $	*/
+
 /*-
  * Copyright (C) 1993	Allen K. Briggs, Chris P. Caputo,
  *			Michael L. Finch, Bradley A. Grantham, and
@@ -29,9 +31,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: ncr.c,v 1.9 1994/07/10 17:21:56 phil Exp $
- *
  */
 
 /* Modified for use with the pc532 by Phil Nelson, Feb 94. */
diff --git a/sys/arch/pc532/dev/ncr_5380.h b/sys/arch/pc532/dev/ncr_5380.h
index aaaeb3626932..cd8c093c27a3 100644
--- a/sys/arch/pc532/dev/ncr_5380.h
+++ b/sys/arch/pc532/dev/ncr_5380.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ncr_5380.h,v 1.2 1994/10/26 08:24:13 cgd Exp $	*/
+
 /*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
@@ -23,27 +25,6 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
-/*
- * HISTORY
- * $Log: ncr_5380.h,v $
- * Revision 1.1  1994/02/22 22:55:06  phil
- * Changes to get the "ncr" driver in the tree.  Still trying to get a working
- * scsi driver.
- *
- * Revision 1.2  1993/11/29  00:38:38  briggs
- * Added signal.h for -current.  The rest is formatting changes.
- *
- * Revision 2.3  91/08/24  12:25:10  af
- * 	Moved padding of regmap in impl file.
- * 	[91/08/02  04:22:39  af]
- * 
- * Revision 2.2  91/06/19  16:28:35  rvb
- * 	From the NCR data sheets
- * 	"NCR 5380 Family, SCSI Protocol Controller Data Manual"
- * 	NCR Microelectronics Division, Colorado Spring, 6/98 T01891L
- * 	[91/04/21            af]
- * 
- */
 /*
  *	File: scsi_5380.h
  * 	Author: Alessandro Forin, Carnegie Mellon University
diff --git a/sys/arch/pc532/dev/ncr_defs.h b/sys/arch/pc532/dev/ncr_defs.h
index 0ac7dcea0946..303c8aa70faf 100644
--- a/sys/arch/pc532/dev/ncr_defs.h
+++ b/sys/arch/pc532/dev/ncr_defs.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ncr_defs.h,v 1.2 1994/10/26 08:24:14 cgd Exp $	*/
+
 /*-
  * Copyright (C) 1993	Allen K. Briggs, Chris P. Caputo,
  *			Michael L. Finch, Bradley A. Grantham, and
@@ -29,9 +31,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: ncr_defs.h,v 1.1 1994/02/22 22:55:07 phil Exp $
- *
  */
 
 #ifndef _SCSI_DEFS_H
diff --git a/sys/arch/pc532/dev/nncr.c b/sys/arch/pc532/dev/nncr.c
index 12d5a94abc8a..3d061d731935 100644
--- a/sys/arch/pc532/dev/nncr.c
+++ b/sys/arch/pc532/dev/nncr.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: nncr.c,v 1.3 1994/10/26 08:24:15 cgd Exp $	*/
+
 /*
  * Copyright (C) 1993	Allen K. Briggs, Chris P. Caputo,
  *			Michael L. Finch, Bradley A. Grantham, and
@@ -29,9 +31,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: nncr.c,v 1.2 1994/07/01 04:24:11 phil Exp $
- *
  */
 
 /* Modified for use with the pc532 by Phil Nelson, June 94. */
diff --git a/sys/arch/pc532/dev/nscn.c b/sys/arch/pc532/dev/nscn.c
index cb8d62b45e3a..6849d4b214d4 100644
--- a/sys/arch/pc532/dev/nscn.c
+++ b/sys/arch/pc532/dev/nscn.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: nscn.c,v 1.3 1994/10/26 08:24:16 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: nscn.c,v 1.2 1994/07/01 04:24:14 phil Exp $
+ *	@(#)com.c	7.5 (Berkeley) 5/16/91
  */
 
 #include "scn.h"
diff --git a/sys/arch/pc532/dev/scn.c b/sys/arch/pc532/dev/scn.c
index 23c1975f8028..934b26e8af63 100644
--- a/sys/arch/pc532/dev/scn.c
+++ b/sys/arch/pc532/dev/scn.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: scn.c,v 1.12 1994/10/26 08:24:18 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: scn.c,v 1.11 1994/05/17 17:29:37 phil Exp $
+ *	@(#)com.c	7.5 (Berkeley) 5/16/91
  */
 
 #include "scn.h"
diff --git a/sys/arch/pc532/dev/scnreg.h b/sys/arch/pc532/dev/scnreg.h
index 23c0d58b464b..569ce9c5db7e 100644
--- a/sys/arch/pc532/dev/scnreg.h
+++ b/sys/arch/pc532/dev/scnreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: scnreg.h,v 1.5 1994/10/26 08:24:19 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1993 Philip A. Nelson.
  * All rights reserved.
@@ -29,8 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	scnreg.h: definitions for the scn serial driver.
- *
- *	$Id: scnreg.h,v 1.4 1994/07/01 04:24:18 phil Exp $
  */
 
 /* Constants. */
diff --git a/sys/arch/pc532/include/ansi.h b/sys/arch/pc532/include/ansi.h
index 7757d326f8c1..4251db0c7986 100644
--- a/sys/arch/pc532/include/ansi.h
+++ b/sys/arch/pc532/include/ansi.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ansi.h,v 1.6 1994/10/26 08:24:21 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.5 1994/05/25 00:02:24 phil Exp $
+ *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
  */
 
 #ifndef	_ANSI_H_
diff --git a/sys/arch/pc532/include/aout_machdep.h b/sys/arch/pc532/include/aout_machdep.h
index c60f2a4acdb7..e6842f9abaf2 100644
--- a/sys/arch/pc532/include/aout_machdep.h
+++ b/sys/arch/pc532/include/aout_machdep.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: aout_machdep.h,v 1.7 1994/10/26 08:24:26 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Paul Kranenburg
  * All rights reserved.
@@ -23,8 +25,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	exec.h,v 1.2 1993/10/18 09:47:34 pk Exp
  */
 
 #ifndef _PC532_EXEC_H_
diff --git a/sys/arch/pc532/include/asm.h b/sys/arch/pc532/include/asm.h
index 8e6a601059dc..fbb3a42206a4 100644
--- a/sys/arch/pc532/include/asm.h
+++ b/sys/arch/pc532/include/asm.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: asm.h,v 1.5 1994/10/26 08:24:22 cgd Exp $	*/
+
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -24,8 +26,6 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon 
  * the rights to redistribute these changes.
- *
- *	asm.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
  */
 
 /*
diff --git a/sys/arch/pc532/include/cpu.h b/sys/arch/pc532/include/cpu.h
index 683f3ab8b4eb..a99323631d33 100644
--- a/sys/arch/pc532/include/cpu.h
+++ b/sys/arch/pc532/include/cpu.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: cpu.h,v 1.7 1994/10/26 08:24:23 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)cpu.h	5.4 (Berkeley) 5/9/91
- *
- *	cpu.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/arch/pc532/include/db_machdep.h b/sys/arch/pc532/include/db_machdep.h
index 8a45c4c166da..a20ea5465d0a 100644
--- a/sys/arch/pc532/include/db_machdep.h
+++ b/sys/arch/pc532/include/db_machdep.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: db_machdep.h,v 1.3 1994/10/26 08:24:24 cgd Exp $	*/
+
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -24,8 +26,6 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon 
  * the rights to redistribute these changes.
- *
- *	db_machdep.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
  */
 /*
  * HISTORY
diff --git a/sys/arch/pc532/include/endian.h b/sys/arch/pc532/include/endian.h
index ffd077920268..0e1b3fd390f1 100644
--- a/sys/arch/pc532/include/endian.h
+++ b/sys/arch/pc532/include/endian.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: endian.h,v 1.7 1994/10/26 08:24:25 cgd Exp $	*/
+
 /*
  * Copyright (c) 1987, 1991 Regents of the University of California.
  * All rights reserved.
@@ -31,8 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)endian.h	7.8 (Berkeley) 4/3/91
- *
- *	endian.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/arch/pc532/include/exec.h b/sys/arch/pc532/include/exec.h
index c60f2a4acdb7..ecbac2d452fc 100644
--- a/sys/arch/pc532/include/exec.h
+++ b/sys/arch/pc532/include/exec.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: exec.h,v 1.7 1994/10/26 08:24:26 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Paul Kranenburg
  * All rights reserved.
@@ -23,8 +25,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	exec.h,v 1.2 1993/10/18 09:47:34 pk Exp
  */
 
 #ifndef _PC532_EXEC_H_
diff --git a/sys/arch/pc532/include/float.h b/sys/arch/pc532/include/float.h
index ad60967c6c39..bc64a4cbe648 100644
--- a/sys/arch/pc532/include/float.h
+++ b/sys/arch/pc532/include/float.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: float.h,v 1.4 1994/10/26 08:24:27 cgd Exp $	*/
+
 /*
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- *	$Id: float.h,v 1.3 1994/10/18 00:25:27 jtc Exp $
+ *	@(#)float.h	7.1 (Berkeley) 5/8/90
  */
 
 #define FLT_RADIX	2		/* b */
diff --git a/sys/arch/pc532/include/frame.h b/sys/arch/pc532/include/frame.h
index efeb102d1398..674f8eb7d5dc 100644
--- a/sys/arch/pc532/include/frame.h
+++ b/sys/arch/pc532/include/frame.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: frame.h,v 1.4 1994/10/26 08:24:28 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)frame.h	5.2 (Berkeley) 1/18/91
- *
- * 	frame.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
  */
 
 #ifndef _MACHINE_FRAME_H_
@@ -107,4 +107,4 @@ struct sigframe {
 	struct	sigcontext sf_sc;
 } ;
 
-#endif
\ No newline at end of file
+#endif
diff --git a/sys/arch/pc532/include/icu.h b/sys/arch/pc532/include/icu.h
index 9653e55c3533..3d298891b2fc 100644
--- a/sys/arch/pc532/include/icu.h
+++ b/sys/arch/pc532/include/icu.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: icu.h,v 1.2 1994/10/26 08:24:29 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1993 Philip A. Nelson.
  * All rights reserved.
@@ -29,8 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	icu.h
- *
- *	$Id: icu.h,v 1.1 1994/05/17 17:31:04 phil Exp $
  */
 
 /* icu.h: defines for use with the ns32532 icu. */
diff --git a/sys/arch/pc532/include/jmpbuf.h b/sys/arch/pc532/include/jmpbuf.h
index 32a38ad76f4e..4b477c7a3b5d 100644
--- a/sys/arch/pc532/include/jmpbuf.h
+++ b/sys/arch/pc532/include/jmpbuf.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: jmpbuf.h,v 1.3 1994/10/26 08:24:30 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1993 Philip A. Nelson.
  * All rights reserved.
@@ -30,8 +32,6 @@
  *
  *
  *  machine/setjmp.h : for support of the library routines.
- *
- *	jmpbuf.h,v 1.1.1.1 1993/09/09 23:53:47 phil Exp
  */
 
 #ifndef _MACHINE_JMPBUF_H_
diff --git a/sys/arch/pc532/include/limits.h b/sys/arch/pc532/include/limits.h
index d177cefef747..4c53bb0489f6 100644
--- a/sys/arch/pc532/include/limits.h
+++ b/sys/arch/pc532/include/limits.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: limits.h,v 1.7 1994/10/26 08:24:31 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 The Regents of the University of California.
  * All rights reserved.
@@ -31,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	7.2 (Berkeley) 6/28/90
- *	$Id: limits.h,v 1.6 1994/10/18 00:25:29 jtc Exp $
  */
 
 #define	CHAR_BIT	8		/* number of bits in a char */
diff --git a/sys/arch/pc532/include/mtpr.h b/sys/arch/pc532/include/mtpr.h
index 5540e96f60b4..c487c474e9fc 100644
--- a/sys/arch/pc532/include/mtpr.h
+++ b/sys/arch/pc532/include/mtpr.h
@@ -1,4 +1,3 @@
-/* Another empty file!  Phil Nelson.
- *
- *	mtpr.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
- */
+/*	$NetBSD: mtpr.h,v 1.3 1994/10/26 08:24:32 cgd Exp $	*/
+
+/* EMPTY */
diff --git a/sys/arch/pc532/include/param.h b/sys/arch/pc532/include/param.h
index e24ba5cab16b..7afb20f6ea8f 100644
--- a/sys/arch/pc532/include/param.h
+++ b/sys/arch/pc532/include/param.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: param.h,v 1.8 1994/10/26 08:24:33 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	5.8 (Berkeley) 6/28/91
- *
- *	param.h,v 1.3 1993/09/12 06:26:13 phil Exp
  */
 
 /*
diff --git a/sys/arch/pc532/include/pcb.h b/sys/arch/pc532/include/pcb.h
index faa9a80d472b..368ac4a4a66f 100644
--- a/sys/arch/pc532/include/pcb.h
+++ b/sys/arch/pc532/include/pcb.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pcb.h,v 1.5 1994/10/26 08:24:34 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pcb.h	5.10 (Berkeley) 5/12/91
- *
- *	pcb.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
  */
 
 #ifndef _MACHINE_PCB_H_
diff --git a/sys/arch/pc532/include/pmap.h b/sys/arch/pc532/include/pmap.h
index 3ec25810f2ef..4a0725415c07 100644
--- a/sys/arch/pc532/include/pmap.h
+++ b/sys/arch/pc532/include/pmap.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmap.h,v 1.3 1994/10/26 08:24:36 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
@@ -35,8 +37,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 
- *	pmap.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
  */
 
 /*
diff --git a/sys/arch/pc532/include/proc.h b/sys/arch/pc532/include/proc.h
index a41b78e0d65a..c4a53bfb7760 100644
--- a/sys/arch/pc532/include/proc.h
+++ b/sys/arch/pc532/include/proc.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: proc.h,v 1.4 1994/10/26 08:24:37 cgd Exp $	*/
+
 /*
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
@@ -31,8 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	7.1 (Berkeley) 5/15/91
- *
- *	proc.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/arch/pc532/include/profile.h b/sys/arch/pc532/include/profile.h
index c97b9e6c3ca2..76fddc662049 100644
--- a/sys/arch/pc532/include/profile.h
+++ b/sys/arch/pc532/include/profile.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: profile.h,v 1.3 1994/10/26 08:24:38 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: @(#)profile.h	8.1 (Berkeley) 6/11/93
- *	$Id: profile.h,v 1.2 1994/08/01 19:32:59 phil Exp $
+ *	@(#)profile.h	8.1 (Berkeley) 6/11/93
  */
 
 /*	pc532 version, 5/15/94.
diff --git a/sys/arch/pc532/include/psl.h b/sys/arch/pc532/include/psl.h
index 8866c603510c..dafecdbea87f 100644
--- a/sys/arch/pc532/include/psl.h
+++ b/sys/arch/pc532/include/psl.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: psl.h,v 1.5 1994/10/26 08:24:39 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)psl.h	5.2 (Berkeley) 1/18/91
- *
- *	psl.h,v 1.1.1.1 1993/09/09 23:53:47 phil Exp
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/arch/pc532/include/ptrace.h b/sys/arch/pc532/include/ptrace.h
index 884092394d5c..8da30183a22f 100644
--- a/sys/arch/pc532/include/ptrace.h
+++ b/sys/arch/pc532/include/ptrace.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: ptrace.h,v 1.5 1994/10/26 08:24:40 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
  * All rights reserved.
@@ -26,8 +28,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: ptrace.h,v 1.4 1994/02/02 08:02:45 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/include/reg.h b/sys/arch/pc532/include/reg.h
index 8027d2879ede..d891b0236378 100644
--- a/sys/arch/pc532/include/reg.h
+++ b/sys/arch/pc532/include/reg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: reg.h,v 1.8 1994/10/26 08:24:41 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)reg.h	5.5 (Berkeley) 1/18/91
- *
- *	reg.h,v 1.2 1993/09/13 07:25:44 phil Exp
  */
 
 /* Modified for the pc532... 2/1/93 by Phil Nelson
diff --git a/sys/arch/pc532/include/signal.h b/sys/arch/pc532/include/signal.h
index eaa65c0fa884..bb9b15942ff7 100644
--- a/sys/arch/pc532/include/signal.h
+++ b/sys/arch/pc532/include/signal.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: signal.h,v 1.4 1994/10/26 08:24:42 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)signal.h	7.16 (Berkeley) 3/17/91
- *	signal.h,v 1.1 1993/10/01 23:01:25 phil Exp
+ *	@(#)signal.h	7.16 (Berkeley) 3/17/91
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/arch/pc532/include/stdarg.h b/sys/arch/pc532/include/stdarg.h
index 450e3211a93e..44b79d2198c1 100644
--- a/sys/arch/pc532/include/stdarg.h
+++ b/sys/arch/pc532/include/stdarg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: stdarg.h,v 1.6 1994/10/26 08:24:43 cgd Exp $	*/
+
 /*-
  * Copyright (c) 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: @(#)stdarg.h	8.1 (Berkeley) 6/10/93
- *	$Id: stdarg.h,v 1.5 1994/10/15 04:57:57 cgd Exp $
+ *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
  */
 
 #ifndef _PC532_STDARG_H_
diff --git a/sys/arch/pc532/include/trap.h b/sys/arch/pc532/include/trap.h
index 3ce989fa8a2b..034423fa8eaf 100644
--- a/sys/arch/pc532/include/trap.h
+++ b/sys/arch/pc532/include/trap.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: trap.h,v 1.3 1994/10/26 08:24:44 cgd Exp $	*/
+
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -30,8 +32,6 @@
  *	Author: Tatu Ylonen, Helsinki University of Technology 1992.
  *      Modified for NetBSD by Phil Nelson
  *	Hardware trap vectors for ns532.
- *
- *	trap.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/arch/pc532/include/types.h b/sys/arch/pc532/include/types.h
index 9453d2f7839b..6197ab20d383 100644
--- a/sys/arch/pc532/include/types.h
+++ b/sys/arch/pc532/include/types.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: types.h,v 1.7 1994/10/26 08:24:44 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -31,8 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	7.5 (Berkeley) 3/9/91
- *
- *	types.h,v 1.1.1.1 1993/09/09 23:53:46 phil Exp
  */
 
 #ifndef	_MACHINE_TYPES_H_
diff --git a/sys/arch/pc532/include/varargs.h b/sys/arch/pc532/include/varargs.h
index 268da04b5023..10953ad4d293 100644
--- a/sys/arch/pc532/include/varargs.h
+++ b/sys/arch/pc532/include/varargs.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: varargs.h,v 1.5 1994/10/26 08:24:45 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990, 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.4 1994/10/15 04:57:58 cgd Exp $
+ *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
  */
 
 #ifndef _PC532_VARARGS_H_
diff --git a/sys/arch/pc532/include/vmparam.h b/sys/arch/pc532/include/vmparam.h
index 20723d2218ad..054849fab6a4 100644
--- a/sys/arch/pc532/include/vmparam.h
+++ b/sys/arch/pc532/include/vmparam.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: vmparam.h,v 1.5 1994/10/26 08:24:46 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)vmparam.h	5.9 (Berkeley) 5/12/91
- *
- *	vmparam.h,v 1.1.1.1 1993/09/09 23:53:47 phil Exp
  */
 
 #ifndef _MACHINE_VMPARAM_H_
diff --git a/sys/arch/pc532/pc532/autoconf.c b/sys/arch/pc532/pc532/autoconf.c
index 09136585d974..15273a6a1b78 100644
--- a/sys/arch/pc532/pc532/autoconf.c
+++ b/sys/arch/pc532/pc532/autoconf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: autoconf.c,v 1.9 1994/10/26 08:24:49 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *
- *	$Id: autoconf.c,v 1.8 1994/07/01 04:25:48 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/pc532/bcopy.s b/sys/arch/pc532/pc532/bcopy.s
index e7f6a5f465d9..ba9c8e768558 100644
--- a/sys/arch/pc532/pc532/bcopy.s
+++ b/sys/arch/pc532/pc532/bcopy.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: bcopy.s,v 1.4 1994/10/26 08:24:50 cgd Exp $	*/
+
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -29,8 +31,6 @@
  * 	File: ns532/bcopy.s
  *	Author: Tatu Ylonen, Jukka Virtanen
  *	Helsinki University of Technology 1992.
- *
- *	$Id: bcopy.s,v 1.3 1994/03/22 00:18:28 phil Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/arch/pc532/pc532/bzero.s b/sys/arch/pc532/pc532/bzero.s
index c84b362daa9f..24fd99529d3b 100644
--- a/sys/arch/pc532/pc532/bzero.s
+++ b/sys/arch/pc532/pc532/bzero.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: bzero.s,v 1.2 1994/10/26 08:24:51 cgd Exp $	*/
+
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -29,7 +31,7 @@
  * 	File: ns532/bzero.s
  *	Author: Tero Kivinen, Helsinki University of Technology 1992.
  *
- *	$Id: bzero.s,v 1.1.1.1 1993/09/09 23:53:47 phil Exp $
+ *	$Id: bzero.s,v 1.2 1994/10/26 08:24:51 cgd Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/arch/pc532/pc532/clock.c b/sys/arch/pc532/pc532/clock.c
index f6dd8dd43bf4..08c8c7cdd40f 100644
--- a/sys/arch/pc532/pc532/clock.c
+++ b/sys/arch/pc532/pc532/clock.c
@@ -1,5 +1,4 @@
-/*	$NetBSD: clock.c,v 1.7 1994/10/19 17:15:16 phil Exp $
-*/
+/*	$NetBSD: clock.c,v 1.8 1994/10/26 08:24:52 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/sys/arch/pc532/pc532/conf.c b/sys/arch/pc532/pc532/conf.c
index 3ed942a2bf9c..52fec00d8b55 100644
--- a/sys/arch/pc532/pc532/conf.c
+++ b/sys/arch/pc532/pc532/conf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: conf.c,v 1.13 1994/10/26 08:24:53 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
  * All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      from: @(#)conf.c	7.9 (Berkeley) 5/28/91
- *	$Id: conf.c,v 1.12 1994/08/02 23:39:59 phil Exp $
+ *      @(#)conf.c	7.9 (Berkeley) 5/28/91
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pc532/pc532/db_disasm.c b/sys/arch/pc532/pc532/db_disasm.c
index 2785c8fc26cc..71336343565d 100644
--- a/sys/arch/pc532/pc532/db_disasm.c
+++ b/sys/arch/pc532/pc532/db_disasm.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: db_disasm.c,v 1.2 1994/10/26 08:24:55 cgd Exp $	*/
+
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -32,8 +34,6 @@
  * From Bruce Culbertson's and Bob Krause's ROM monitor for the pc532 
  * adapted to pc532 Mach by Tero Kivinen and Tatu Ylonen at Helsinki 
  * University of Technology.
- *
- *	$Id: db_disasm.c,v 1.1.1.1 1993/09/09 23:53:48 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/pc532/db_interface.c b/sys/arch/pc532/pc532/db_interface.c
index 941924d2a7a2..a79a8ec7a6e9 100644
--- a/sys/arch/pc532/pc532/db_interface.c
+++ b/sys/arch/pc532/pc532/db_interface.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: db_interface.c,v 1.2 1994/10/26 08:24:57 cgd Exp $	*/
+
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -30,8 +32,6 @@
  *	Author: Tero Kivinen, Helsinki University of Technology 1992.
  *
  *	Interface to new kernel debugger.
- *
- *	$Id: db_interface.c,v 1.1.1.1 1993/09/09 23:53:48 phil Exp $
  */
 
 #include <sys/reboot.h>
diff --git a/sys/arch/pc532/pc532/db_trace.c b/sys/arch/pc532/pc532/db_trace.c
index e628f2da60ef..3d32b0df2d19 100644
--- a/sys/arch/pc532/pc532/db_trace.c
+++ b/sys/arch/pc532/pc532/db_trace.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: db_trace.c,v 1.2 1994/10/26 08:24:58 cgd Exp $	*/
+
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -31,8 +33,6 @@
  *	Helsinki University of Technology 1992.
  *
  *	Stack trace and special register support for debugger.
- *
- *	$Id: db_trace.c,v 1.1.1.1 1993/09/09 23:53:48 phil Exp $
  */
 
 
diff --git a/sys/arch/pc532/pc532/disksubr.c b/sys/arch/pc532/pc532/disksubr.c
index d3b829834154..af20cc0a0c7f 100644
--- a/sys/arch/pc532/pc532/disksubr.c
+++ b/sys/arch/pc532/pc532/disksubr.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: disksubr.c,v 1.6 1994/10/26 08:25:00 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
  * All rights reserved.
@@ -30,9 +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.5 1994/04/01 23:16:56 phil Exp $
+ *	@(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  */
 
 #include "param.h"
diff --git a/sys/arch/pc532/pc532/genassym.c b/sys/arch/pc532/pc532/genassym.c
index bdbb86e63410..37a7e6d10732 100644
--- a/sys/arch/pc532/pc532/genassym.c
+++ b/sys/arch/pc532/pc532/genassym.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: genassym.c,v 1.6 1994/10/26 08:25:01 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)genassym.c	5.11 (Berkeley) 5/10/91
- *
- *	$Id: genassym.c,v 1.5 1994/05/25 00:03:09 phil Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pc532/pc532/icuinit.c b/sys/arch/pc532/pc532/icuinit.c
index 82112b96e949..79ed7d7b7183 100644
--- a/sys/arch/pc532/pc532/icuinit.c
+++ b/sys/arch/pc532/pc532/icuinit.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: icuinit.c,v 1.3 1994/10/26 08:25:03 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1993 Philip A. Nelson.
  * All rights reserved.
@@ -27,10 +29,6 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	icuinit.c
- *
- *	$Id: icuinit.c,v 1.2 1994/05/17 17:31:36 phil Exp $
  */
 
 /* icuinit.c - C support for 532 icu stuff. */
diff --git a/sys/arch/pc532/pc532/in_cksum.c b/sys/arch/pc532/pc532/in_cksum.c
index cfde845e4e49..9fbcc7627627 100644
--- a/sys/arch/pc532/pc532/in_cksum.c
+++ b/sys/arch/pc532/pc532/in_cksum.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: in_cksum.c,v 1.3 1994/10/26 08:25:04 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -42,7 +44,6 @@
  *	@(#)in_cksum.c	8.1 (Berkeley) 6/11/93
  *
  * from: Header: in_cksum.c,v 1.7 92/11/26 03:04:52 torek Exp 
- * $Id: in_cksum.c,v 1.2 1994/03/22 00:18:32 phil Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pc532/pc532/locore.s b/sys/arch/pc532/pc532/locore.s
index 869883dfdf5b..880d48739e79 100644
--- a/sys/arch/pc532/pc532/locore.s
+++ b/sys/arch/pc532/pc532/locore.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: locore.s,v 1.22 1994/10/26 08:25:07 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Philip A. Nelson.
  * All rights reserved.
@@ -27,10 +29,6 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	locore.s
- *
- *	locore.s,v 1.2 1993/09/13 07:26:47 phil Exp
  */
 
 /*
diff --git a/sys/arch/pc532/pc532/machdep.c b/sys/arch/pc532/pc532/machdep.c
index 66c4559872e9..73dddb0dc31a 100644
--- a/sys/arch/pc532/pc532/machdep.c
+++ b/sys/arch/pc532/pc532/machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: machdep.c,v 1.26 1994/10/26 08:25:09 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
- *
- *	machdep.c,v 1.2 1993/09/13 07:26:49 phil Exp
  */
 
 /*
diff --git a/sys/arch/pc532/pc532/mem.c b/sys/arch/pc532/pc532/mem.c
index 3f7b26267c7e..2827dbcff522 100644
--- a/sys/arch/pc532/pc532/mem.c
+++ b/sys/arch/pc532/pc532/mem.c
@@ -1,6 +1,9 @@
-/*- Copyright (c) 1988 University of Utah.  Copyright (c) 1982, 1986,
- *1990 The Regents of the University of California.  All rights
- *reserved.
+/*	$NetBSD: mem.c,v 1.8 1994/10/26 08:25:10 cgd Exp $	*/
+
+/*-
+ * Copyright (c) 1988 University of Utah.
+ * Copyright (c) 1982, 1986, 1990 The Regents of the University of
+ * California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
@@ -36,9 +39,9 @@
  * SUCH DAMAGE.
  *
  * from: Utah $Hdr: mem.c 1.13 89/10/08$
- *	@(#)mem.c	7.2 (Berkeley) 5/9/91
  *
- *	mem.c,v 1.1.1.1 1993/09/09 23:53:47 phil Exp /
+ *	@(#)mem.c	7.2 (Berkeley) 5/9/91
+ */
 
 /*
  * Memory special file
diff --git a/sys/arch/pc532/pc532/ns_cksum.c b/sys/arch/pc532/pc532/ns_cksum.c
index 842cc18be326..34660d2ecd2c 100644
--- a/sys/arch/pc532/pc532/ns_cksum.c
+++ b/sys/arch/pc532/pc532/ns_cksum.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: ns_cksum.c,v 1.2 1994/10/26 08:25:11 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 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: @(#)ns_cksum.c	7.7 (Berkeley) 4/29/91
- *	$Id: ns_cksum.c,v 1.1.1.1 1993/09/09 23:53:50 phil Exp $
+ *	@(#)ns_cksum.c	7.7 (Berkeley) 4/29/91
  */
 
 #include "sys/param.h"
diff --git a/sys/arch/pc532/pc532/ntoh.s b/sys/arch/pc532/pc532/ntoh.s
index 0e1e580489b5..8801e9a1bbfa 100644
--- a/sys/arch/pc532/pc532/ntoh.s
+++ b/sys/arch/pc532/pc532/ntoh.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: ntoh.s,v 1.2 1994/10/26 08:25:12 cgd Exp $	*/
+
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -24,8 +26,6 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon 
  * the rights to redistribute these changes.
- *
- *	$Id: ntoh.s,v 1.1.1.1 1993/09/09 23:53:49 phil Exp $
  */
 
 #include <machine/asm.h>
diff --git a/sys/arch/pc532/pc532/oc_cksum.s b/sys/arch/pc532/pc532/oc_cksum.s
index a215a693d22a..cb42cdb26f33 100644
--- a/sys/arch/pc532/pc532/oc_cksum.s
+++ b/sys/arch/pc532/pc532/oc_cksum.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: oc_cksum.s,v 1.2 1994/10/26 08:25:13 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1993 Philip A. Nelson.
  * All rights reserved.
@@ -28,10 +30,6 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	oc_cksum.s
- *
- *	$Id: oc_cksum.s,v 1.1.1.1 1993/09/09 23:53:51 phil Exp $
- *
  *
  * oc_cksum: ones complement 16 bit checksum for NS32532
  *
diff --git a/sys/arch/pc532/pc532/pmap.c b/sys/arch/pc532/pc532/pmap.c
index 1f29d16cc617..739ebaa0899e 100644
--- a/sys/arch/pc532/pc532/pmap.c
+++ b/sys/arch/pc532/pc532/pmap.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmap.c,v 1.7 1994/10/26 08:25:15 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
@@ -35,8 +37,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *
- *	$Id: pmap.c,v 1.6 1994/05/25 00:03:17 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/pc532/process_machdep.c b/sys/arch/pc532/pc532/process_machdep.c
index 9ac02a8c97ef..2a65cb9a28a4 100644
--- a/sys/arch/pc532/pc532/process_machdep.c
+++ b/sys/arch/pc532/pc532/process_machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: process_machdep.c,v 1.4 1994/10/26 08:25:16 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 The Regents of the University of California.
  * Copyright (c) 1993 Jan-Simon Pendry
@@ -33,14 +35,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.
- *
- * From:
- *	Id: procfs_i386.c,v 4.1 1993/12/17 10:47:45 jsp Rel
- *
- * And then from:
- *	Id: process_machdep.c,v 1.2 1994/01/09 15:02:24 mycroft Exp 
- *
- *	$Id: process_machdep.c,v 1.3 1994/10/06 06:07:28 phil Exp $
  */
 
 /* Modified by Phil Nelson for the pc532 port.  1/12/94 */
diff --git a/sys/arch/pc532/pc532/random.s b/sys/arch/pc532/pc532/random.s
index d53d6a6631c1..174d296cd04e 100644
--- a/sys/arch/pc532/pc532/random.s
+++ b/sys/arch/pc532/pc532/random.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: random.s,v 1.2 1994/10/26 08:25:17 cgd Exp $	*/
+
 /*
  * Copyright (c) 1990,1993 The Regents of the University of California.
  * All rights reserved.
@@ -39,7 +41,6 @@
  * The result is in (0,2^31), e.g., it's always positive.
  *
  * written by Phil Nelson for ns32k.
- *
  */
 
 #include <machine/asm.h>
diff --git a/sys/arch/pc532/pc532/sys_machdep.c b/sys/arch/pc532/pc532/sys_machdep.c
index 4a7920b30a8a..03db3876bdc5 100644
--- a/sys/arch/pc532/pc532/sys_machdep.c
+++ b/sys/arch/pc532/pc532/sys_machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: sys_machdep.c,v 1.3 1994/10/26 08:25:18 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *
- *	$Id: sys_machdep.c,v 1.2 1994/10/20 05:27:03 cgd Exp $
  */
 
 #include "param.h"
diff --git a/sys/arch/pc532/pc532/trap.c b/sys/arch/pc532/pc532/trap.c
index 908a88c18337..13f9ba5dc4c6 100644
--- a/sys/arch/pc532/pc532/trap.c
+++ b/sys/arch/pc532/pc532/trap.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: trap.c,v 1.9 1994/10/26 08:25:19 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -34,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)trap.c	7.4 (Berkeley) 5/13/91
- *
- *	trap.c,v 1.1.1.1 1993/09/09 23:53:50 phil Exp
  */
 
 /*
diff --git a/sys/arch/pc532/pc532/umprintf.c b/sys/arch/pc532/pc532/umprintf.c
index d4a149533a01..21d4d2cb108d 100644
--- a/sys/arch/pc532/pc532/umprintf.c
+++ b/sys/arch/pc532/pc532/umprintf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: umprintf.c,v 1.3 1994/10/26 08:25:20 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1986, 1988, 1991 The Regents of the University of California.
  * All rights reserved.
@@ -31,8 +33,7 @@
  * SUCH DAMAGE.
  *
  *      hacked out from ..
- *	from: @(#)subr_prf.c	7.30 (Berkeley) 6/29/91
- *	$Id: umprintf.c,v 1.2 1994/04/19 17:18:31 phil Exp $
+ *	@(#)subr_prf.c	7.30 (Berkeley) 6/29/91
  */
 
 #include <stdarg.h>
diff --git a/sys/arch/pc532/pc532/vm_machdep.c b/sys/arch/pc532/pc532/vm_machdep.c
index 1f7bb4be0934..044fd6b6ad10 100644
--- a/sys/arch/pc532/pc532/vm_machdep.c
+++ b/sys/arch/pc532/pc532/vm_machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: vm_machdep.c,v 1.6 1994/10/26 08:25:21 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * Copyright (c) 1989, 1990 William Jolitz
@@ -36,14 +38,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
- *
- *	$Id: vm_machdep.c,v 1.5 1994/07/13 15:09:15 phil Exp $
  */
 
 /*
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  */
-static char rcsid[] = "$Header: /cvsroot/src/sys/arch/pc532/pc532/Attic/vm_machdep.c,v 1.5 1994/07/13 15:09:15 phil Exp $";
+static char rcsid[] = "$Header: /cvsroot/src/sys/arch/pc532/pc532/Attic/vm_machdep.c,v 1.6 1994/10/26 08:25:21 cgd Exp $";
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/pc532/scsi/cd.c b/sys/arch/pc532/scsi/cd.c
index 1393fb448073..276239d2a7fb 100644
--- a/sys/arch/pc532/scsi/cd.c
+++ b/sys/arch/pc532/scsi/cd.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: cd.c,v 1.5 1994/10/26 08:25:24 cgd Exp $	*/
+
 /*
  * Written by Julian Elischer (julian@tfs.com)
  * for TRW Financial Systems for use under the MACH(2.5) operating system.
@@ -12,8 +14,6 @@
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
- *
- *	$Id: cd.c,v 1.4 1994/10/14 18:27:17 cgd Exp $
  */
 
 #define SPLCD splbio
diff --git a/sys/arch/pc532/scsi/cddefs.h b/sys/arch/pc532/scsi/cddefs.h
index e99127323e7e..24699c2459d5 100644
--- a/sys/arch/pc532/scsi/cddefs.h
+++ b/sys/arch/pc532/scsi/cddefs.h
@@ -1,6 +1,4 @@
-/*
- * 	$Id: cddefs.h,v 1.1 1994/04/01 23:18:07 phil Exp $
- */
+/*	$NetBSD: cddefs.h,v 1.2 1994/10/26 08:25:25 cgd Exp $	*/
 
 struct cd_data {
 	int	flags;
diff --git a/sys/arch/pc532/scsi/ch.c b/sys/arch/pc532/scsi/ch.c
index 0c8196226364..8787eec5f3cc 100644
--- a/sys/arch/pc532/scsi/ch.c
+++ b/sys/arch/pc532/scsi/ch.c
@@ -1,6 +1,4 @@
-/*
- *	$Id: ch.c,v 1.2 1994/06/30 01:12:47 phil Exp $
- */
+/*	$NetBSD: ch.c,v 1.3 1994/10/26 08:25:26 cgd Exp $	*/
 
 #include "ch.h"
 
diff --git a/sys/arch/pc532/scsi/scsi_all.h b/sys/arch/pc532/scsi/scsi_all.h
index 5b3f3d950ce2..b5c37b599ce8 100644
--- a/sys/arch/pc532/scsi/scsi_all.h
+++ b/sys/arch/pc532/scsi/scsi_all.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsi_all.h,v 1.2 1994/10/26 08:25:28 cgd Exp $	*/
+
 /*
  * SCSI general  interface description
  *
@@ -13,8 +15,6 @@
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
- *
- *	$Id: scsi_all.h,v 1.1 1994/04/01 23:18:09 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/scsi/scsi_cd.h b/sys/arch/pc532/scsi/scsi_cd.h
index 4a8c0e3461b5..21895f903a62 100644
--- a/sys/arch/pc532/scsi/scsi_cd.h
+++ b/sys/arch/pc532/scsi/scsi_cd.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsi_cd.h,v 1.2 1994/10/26 08:25:29 cgd Exp $	*/
+
 /*
  * Written by Julian Elischer (julian@tfs.com)
  * for TRW Financial Systems.
@@ -11,8 +13,6 @@
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
- *
- *	$Id: scsi_cd.h,v 1.1 1994/04/01 23:18:10 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/scsi/scsi_changer.h b/sys/arch/pc532/scsi/scsi_changer.h
index 5327ddf41a6c..538d9ba11394 100644
--- a/sys/arch/pc532/scsi/scsi_changer.h
+++ b/sys/arch/pc532/scsi/scsi_changer.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsi_changer.h,v 1.2 1994/10/26 08:25:30 cgd Exp $	*/
+
 /*
  * SCSI changer interface description
  *
@@ -14,8 +16,6 @@
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
- *
- *	$Id: scsi_changer.h,v 1.1 1994/04/01 23:18:11 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/scsi/scsi_debug.h b/sys/arch/pc532/scsi/scsi_debug.h
index c6b41bf432e8..56b605b5d542 100644
--- a/sys/arch/pc532/scsi/scsi_debug.h
+++ b/sys/arch/pc532/scsi/scsi_debug.h
@@ -1,8 +1,8 @@
+/*	$NetBSD: scsi_debug.h,v 1.2 1994/10/26 08:25:31 cgd Exp $	*/
+
 /*#define SCSIDEBUG 1*/
 /*
  * Written by Julian Elischer (julian@tfs.com)
- *
- *	$Id: scsi_debug.h,v 1.1 1994/04/01 23:18:12 phil Exp $
  */
 #ifndef	_SCSI_SCSI_DEBUG_H
 #define _SCSI_SCSI_DEBUG_H 1
diff --git a/sys/arch/pc532/scsi/scsi_disk.h b/sys/arch/pc532/scsi/scsi_disk.h
index b122d15adcc5..4f886e881e14 100644
--- a/sys/arch/pc532/scsi/scsi_disk.h
+++ b/sys/arch/pc532/scsi/scsi_disk.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsi_disk.h,v 1.2 1994/10/26 08:25:32 cgd Exp $	*/
+
 /*
  * SCSI interface description
  *
@@ -41,8 +43,6 @@
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
- *
- *	$Id: scsi_disk.h,v 1.1 1994/04/01 23:18:13 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/scsi/scsi_tape.h b/sys/arch/pc532/scsi/scsi_tape.h
index 7bbeebb5c8f4..31ef4b9a7bfe 100644
--- a/sys/arch/pc532/scsi/scsi_tape.h
+++ b/sys/arch/pc532/scsi/scsi_tape.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsi_tape.h,v 1.2 1994/10/26 08:25:33 cgd Exp $	*/
+
 /*
  * SCSI tape interface description
  *
@@ -13,8 +15,6 @@
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
- *
- *	$Id: scsi_tape.h,v 1.1 1994/04/01 23:18:14 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/scsi/scsiconf.c b/sys/arch/pc532/scsi/scsiconf.c
index a32166336a5c..e6242e3e1819 100644
--- a/sys/arch/pc532/scsi/scsiconf.c
+++ b/sys/arch/pc532/scsi/scsiconf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsiconf.c,v 1.3 1994/10/26 08:25:34 cgd Exp $	*/
+
 /*
  * Written by Julian Elischer (julian@tfs.com)
  * for TRW Financial Systems for use under the MACH(2.5) operating system.
@@ -12,8 +14,6 @@
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
- *
- *	$Id: scsiconf.c,v 1.2 1994/06/30 01:12:49 phil Exp $
  */
 
 #include <sys/types.h>
diff --git a/sys/arch/pc532/scsi/scsiconf.h b/sys/arch/pc532/scsi/scsiconf.h
index a2215a3b04c5..8e2022e2bca7 100644
--- a/sys/arch/pc532/scsi/scsiconf.h
+++ b/sys/arch/pc532/scsi/scsiconf.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsiconf.h,v 1.2 1994/10/26 08:25:35 cgd Exp $	*/
+
 /*
  * Written by Julian Elischer (julian@tfs.com)
  * for TRW Financial Systems for use under the MACH(2.5) operating system.
@@ -12,8 +14,6 @@
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
- *
- *	$Id: scsiconf.h,v 1.1 1994/04/01 23:18:16 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/scsi/sd.c b/sys/arch/pc532/scsi/sd.c
index 94de26ba8e4b..2947205f9899 100644
--- a/sys/arch/pc532/scsi/sd.c
+++ b/sys/arch/pc532/scsi/sd.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: sd.c,v 1.5 1994/10/26 08:25:37 cgd Exp $	*/
+
 /*
  * Written by Julian Elischer (julian@tfs.com)
  * for TRW Financial Systems for use under the MACH(2.5) operating system.
@@ -12,8 +14,6 @@
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
- *
- *	$Id: sd.c,v 1.4 1994/10/14 18:27:19 cgd Exp $
  */
 
 #include "sd.h"
diff --git a/sys/arch/pc532/scsi/sddefs.h b/sys/arch/pc532/scsi/sddefs.h
index 9cfac5494e40..90d57378d1f1 100644
--- a/sys/arch/pc532/scsi/sddefs.h
+++ b/sys/arch/pc532/scsi/sddefs.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: sddefs.h,v 1.1 1994/04/01 23:18:18 phil Exp $
- */
+/*	$NetBSD: sddefs.h,v 1.2 1994/10/26 08:25:38 cgd Exp $	*/
 
 struct sd_data {
 	int flags;
diff --git a/sys/arch/pc532/scsi/st.c b/sys/arch/pc532/scsi/st.c
index 23ce911028e0..ffa1e640d510 100644
--- a/sys/arch/pc532/scsi/st.c
+++ b/sys/arch/pc532/scsi/st.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: st.c,v 1.3 1994/10/26 08:25:39 cgd Exp $	*/
+
 /*
  * Written by Julian Elischer (julian@tfs.com)
  * for TRW Financial Systems for use under the MACH(2.5) operating system.
@@ -12,8 +14,6 @@
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
- *
- *	$Id: st.c,v 1.2 1994/06/30 01:12:52 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/scsi/stdefs.h b/sys/arch/pc532/scsi/stdefs.h
index 7ddeda5963fa..3c3e2412c8e9 100644
--- a/sys/arch/pc532/scsi/stdefs.h
+++ b/sys/arch/pc532/scsi/stdefs.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: stdefs.h,v 1.1 1994/04/01 23:18:22 phil Exp $
- */
+/*	$NetBSD: stdefs.h,v 1.2 1994/10/26 08:25:40 cgd Exp $	*/
 
 #define STQSIZE		4
 struct	st_data {
diff --git a/sys/arch/pc532/stand/Makefile b/sys/arch/pc532/stand/Makefile
index cf931fb2ab2e..5807bba422a1 100644
--- a/sys/arch/pc532/stand/Makefile
+++ b/sys/arch/pc532/stand/Makefile
@@ -1,5 +1,6 @@
-#	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	     $Id: Makefile,v 1.2 1994/07/24 20:29:45 phil Exp $
+#	$NetBSD: Makefile,v 1.3 1994/10/26 08:25:42 cgd Exp $
+
+#	@(#)Makefile	8.1 (Berkeley) 6/10/93
 
 DESTDIR=
 STANDDIR=${DESTDIR}/stand
diff --git a/sys/arch/pc532/stand/README b/sys/arch/pc532/stand/README
index c441f893e84d..a835dde57e65 100644
--- a/sys/arch/pc532/stand/README
+++ b/sys/arch/pc532/stand/README
@@ -1,3 +1,5 @@
+$NetBSD: README,v 1.2 1994/10/26 08:25:43 cgd Exp $
+
 pc532 stand/boot
 Phil Budne <phil@ultimate.com> 5/19/1994
 
diff --git a/sys/arch/pc532/stand/boot.c b/sys/arch/pc532/stand/boot.c
index 0956bafff757..09a2a4febdcb 100644
--- a/sys/arch/pc532/stand/boot.c
+++ b/sys/arch/pc532/stand/boot.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: boot.c,v 1.2 1994/10/26 08:25:44 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -30,12 +32,11 @@
  * 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.1 1994/05/30 19:58:45 phil Exp $
+ *	@(#)boot.c	8.1 (Berkeley) 6/10/93
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: boot.c,v 1.1 1994/05/30 19:58:45 phil Exp $";
+static char rcsid[] = "$NetBSD: boot.c,v 1.2 1994/10/26 08:25:44 cgd Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -72,7 +73,7 @@ main()
 	cninit();
 	scsiinit();
 
-	printf("\n>> NetBSD BOOT pc532 [$Revision: 1.1 $]\n");
+	printf("\n>> NetBSD BOOT pc532 [$Revision: 1.2 $]\n");
 
 	bdev  = B_TYPE(bootdev);
 	bctlr = B_CONTROLLER(bootdev);
diff --git a/sys/arch/pc532/stand/conf.c b/sys/arch/pc532/stand/conf.c
index 427e8fe312b9..95c3ba686905 100644
--- a/sys/arch/pc532/stand/conf.c
+++ b/sys/arch/pc532/stand/conf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: conf.c,v 1.2 1994/10/26 08:25:45 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986, 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: @(#)conf.c	8.1 (Berkeley) 6/10/93
- *	     $Id: conf.c,v 1.1 1994/05/30 19:58:46 phil Exp $
+ *	@(#)conf.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pc532/stand/cons.c b/sys/arch/pc532/stand/cons.c
index 045de1480b35..8914af454a8a 100644
--- a/sys/arch/pc532/stand/cons.c
+++ b/sys/arch/pc532/stand/cons.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: cons.c,v 1.2 1994/10/26 08:25:46 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1990, 1993
@@ -36,9 +38,8 @@
  * SUCH DAMAGE.
  *
  * from: Utah Hdr: cons.c 1.7 92/02/28
- * from: @(#)cons.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: cons.c,v 1.1 1994/05/30 19:58:47 phil Exp $
+ *	@(#)cons.c	8.1 (Berkeley) 6/10/93
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pc532/stand/devopen.c b/sys/arch/pc532/stand/devopen.c
index 5e3aad3ea180..a5047fab6bcc 100644
--- a/sys/arch/pc532/stand/devopen.c
+++ b/sys/arch/pc532/stand/devopen.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: devopen.c,v 1.2 1994/10/26 08:25:47 cgd Exp $	*/
+
 /*-
  *  Copyright (c) 1993 John Brezak
  *  All rights reserved.
@@ -24,8 +26,6 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: devopen.c,v 1.1 1994/05/30 19:58:48 phil Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pc532/stand/filesystem.c b/sys/arch/pc532/stand/filesystem.c
index d896e58e31c9..3d0ff77b8d1e 100644
--- a/sys/arch/pc532/stand/filesystem.c
+++ b/sys/arch/pc532/stand/filesystem.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: filesystem.c,v 1.2 1994/10/26 08:25:48 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Philip A. Nelson.
  * All rights reserved.
@@ -27,10 +29,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	filesystem.c
- *
- *	$Id: filesystem.c,v 1.1 1994/05/30 19:58:49 phil Exp $
  */
 
 #include <stand.h>
diff --git a/sys/arch/pc532/stand/machdep.c b/sys/arch/pc532/stand/machdep.c
index 4fddf03549c4..ec044477f0bd 100644
--- a/sys/arch/pc532/stand/machdep.c
+++ b/sys/arch/pc532/stand/machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: machdep.c,v 1.2 1994/10/26 08:25:49 cgd Exp $	*/
+
 /* 
  * Copyright (c) 1994 Philip L. Budne.
  * All rights reserved.
@@ -27,10 +29,6 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	scn.c
- *
- *	$Id: machdep.c,v 1.1 1994/05/30 19:58:50 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/stand/prf.c b/sys/arch/pc532/stand/prf.c
index 4d3a7fe06e3d..e9db7e63e57a 100644
--- a/sys/arch/pc532/stand/prf.c
+++ b/sys/arch/pc532/stand/prf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: prf.c,v 1.2 1994/10/26 08:25:50 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1986, 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: @(#)prf.c	8.1 (Berkeley) 6/10/93
- *	$Id: prf.c,v 1.1 1994/05/30 19:58:51 phil Exp $
+ *	@(#)prf.c	8.1 (Berkeley) 6/10/93
  */
 
 getchar()
diff --git a/sys/arch/pc532/stand/samachdep.h b/sys/arch/pc532/stand/samachdep.h
index 9f4cdd65e968..a48383f54d51 100644
--- a/sys/arch/pc532/stand/samachdep.h
+++ b/sys/arch/pc532/stand/samachdep.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: samachdep.h,v 1.2 1994/10/26 08:25:51 cgd Exp $	*/
+
 /*
  * Copyright (c) 1982, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -30,9 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * from: @(#)samachdep.h	8.1 (Berkeley) 6/10/93
- *
- * $Id: samachdep.h,v 1.1 1994/05/30 19:58:53 phil Exp $
+ *	@(#)samachdep.h	8.1 (Berkeley) 6/10/93
  */
 
 #define	NSCSI		1
diff --git a/sys/arch/pc532/stand/scn.c b/sys/arch/pc532/stand/scn.c
index 15852423e81f..8bf9f2728982 100644
--- a/sys/arch/pc532/stand/scn.c
+++ b/sys/arch/pc532/stand/scn.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: scn.c,v 1.2 1994/10/26 08:25:52 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1994 Philip L. Budne.
  * All rights reserved.
@@ -27,10 +29,6 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	scn.c
- *
- *	$Id: scn.c,v 1.1 1994/05/30 19:58:54 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/stand/scsi_hi.c b/sys/arch/pc532/stand/scsi_hi.c
index a46fc4766526..866273596d5b 100644
--- a/sys/arch/pc532/stand/scsi_hi.c
+++ b/sys/arch/pc532/stand/scsi_hi.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsi_hi.c,v 1.3 1994/10/26 08:25:53 cgd Exp $	*/
+
 /****************************************************************************
  * NS32K Monitor SCSI high-level driver
  * Bruce Culbertson
diff --git a/sys/arch/pc532/stand/scsi_low.c b/sys/arch/pc532/stand/scsi_low.c
index c4d04aad9809..a8a47a183435 100644
--- a/sys/arch/pc532/stand/scsi_low.c
+++ b/sys/arch/pc532/stand/scsi_low.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsi_low.c,v 1.3 1994/10/26 08:25:54 cgd Exp $	*/
+
 /****************************************************************************
  * NS32K Monitor SCSI low-level driver
  * Bruce Culbertson
diff --git a/sys/arch/pc532/stand/sd.c b/sys/arch/pc532/stand/sd.c
index 5b42b727cfb0..5e4f0199af00 100644
--- a/sys/arch/pc532/stand/sd.c
+++ b/sys/arch/pc532/stand/sd.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: sd.c,v 1.2 1994/10/26 08:25:56 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1990, 1993
@@ -36,9 +38,8 @@
  * SUCH DAMAGE.
  *
  * from: Utah $Hdr: sd.c 1.9 92/12/21$
- * from: @(#)sd.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: sd.c,v 1.1 1994/05/30 19:58:58 phil Exp $
+ *	@(#)sd.c	8.1 (Berkeley) 6/10/93
  */
 
 /*
diff --git a/sys/arch/pc532/stand/so.h b/sys/arch/pc532/stand/so.h
index 846739e3b95b..63c85ef9d5a6 100644
--- a/sys/arch/pc532/stand/so.h
+++ b/sys/arch/pc532/stand/so.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: so.h,v 1.2 1994/10/26 08:25:57 cgd Exp $	*/
+
 #ifndef _SO_H_INCLUDE
 #define _SO_H_INCLUDE
 
diff --git a/sys/arch/pc532/stand/srt0.s b/sys/arch/pc532/stand/srt0.s
index 892ec2843585..139771154f1d 100644
--- a/sys/arch/pc532/stand/srt0.s
+++ b/sys/arch/pc532/stand/srt0.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: srt0.s,v 1.2 1994/10/26 08:25:58 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1994 Philip L. Budne.
  * All rights reserved.
@@ -27,10 +29,6 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	srt0.s
- *
- *	$Id: srt0.s,v 1.1 1994/05/30 19:59:00 phil Exp $
  */
 
 /*
diff --git a/sys/arch/pc532/stand/test.c b/sys/arch/pc532/stand/test.c
index 065a88ace24c..9d41480cb190 100644
--- a/sys/arch/pc532/stand/test.c
+++ b/sys/arch/pc532/stand/test.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: test.c,v 1.2 1994/10/26 08:25:59 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1994 Philip L. Budne.
  * All rights reserved.
@@ -27,10 +29,6 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	test.c
- *
- *	$Id: test.c,v 1.1 1994/05/30 19:59:01 phil Exp $
  */
 
 /*-
diff --git a/sys/arch/pc532/stand/tgets.c b/sys/arch/pc532/stand/tgets.c
index 0a405360b4c5..232affa930aa 100644
--- a/sys/arch/pc532/stand/tgets.c
+++ b/sys/arch/pc532/stand/tgets.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: tgets.c,v 1.2 1994/10/26 08:26:00 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -30,9 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * from: @(#)gets.c	8.1 (Berkeley) 6/11/93
- *
- * $Id: tgets.c,v 1.1 1994/05/30 19:59:02 phil Exp $
+ *	@(#)gets.c	8.1 (Berkeley) 6/11/93
  */
 
 tgets(buf)