diff --git a/sys/arch/sun3/compile/.keep_me b/sys/arch/sun3/compile/.keep_me
index 75270197a54e..505f8d9ad1d1 100644
--- a/sys/arch/sun3/compile/.keep_me
+++ b/sys/arch/sun3/compile/.keep_me
@@ -1 +1,3 @@
+$NetBSD: .keep_me,v 1.3 1994/10/26 09:07:55 cgd Exp $
+
 This file must remain so that 'cvs checkout' makes the compile directory.
diff --git a/sys/arch/sun3/conf/DISKLESS b/sys/arch/sun3/conf/DISKLESS
index 5ea858383c91..684c84a1750e 100644
--- a/sys/arch/sun3/conf/DISKLESS
+++ b/sys/arch/sun3/conf/DISKLESS
@@ -1,7 +1,6 @@
+#	$NetBSD: DISKLESS,v 1.2 1994/10/26 09:08:05 cgd Exp $
 #
 # DISKLESS -- config file for a diskless Sun3/50 or Sun3/60
-# $Id: DISKLESS,v 1.1 1994/07/29 04:19:59 gwr Exp $
-#
 
 include "std.sun3"
 
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index dcfb1aa4f480..53f53eb89439 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -1,7 +1,6 @@
+#	$NetBSD: GENERIC,v 1.8 1994/10/26 09:08:09 cgd Exp $
 #
 # GENERIC kernel - supports root on: le0, sd*
-# $Id: GENERIC,v 1.7 1994/09/20 16:17:08 gwr Exp $
-#
 
 include "std.sun3"
 
diff --git a/sys/arch/sun3/conf/Makefile.sun3 b/sys/arch/sun3/conf/Makefile.sun3
index 1d11309a2158..994834ee3c99 100644
--- a/sys/arch/sun3/conf/Makefile.sun3
+++ b/sys/arch/sun3/conf/Makefile.sun3
@@ -1,4 +1,5 @@
-# $Id: Makefile.sun3,v 1.22 1994/09/20 16:17:53 gwr Exp $
+#	$NetBSD: Makefile.sun3,v 1.23 1994/10/26 09:08:12 cgd Exp $
+
 # Makefile for 4.4 BSD
 #
 # This makefile is constructed from a machine description:
diff --git a/sys/arch/sun3/conf/SCSITEST b/sys/arch/sun3/conf/SCSITEST
index 476b5c9cfe71..ca9c6847ac56 100644
--- a/sys/arch/sun3/conf/SCSITEST
+++ b/sys/arch/sun3/conf/SCSITEST
@@ -1,3 +1,4 @@
+#	$NetBSD: SCSITEST,v 1.5 1994/10/26 09:08:15 cgd Exp $
 #
 # new config file for SCSITEST
 #
diff --git a/sys/arch/sun3/conf/SOLIPSIST b/sys/arch/sun3/conf/SOLIPSIST
index bea7ba4c1958..d194dce54c39 100644
--- a/sys/arch/sun3/conf/SOLIPSIST
+++ b/sys/arch/sun3/conf/SOLIPSIST
@@ -1,6 +1,5 @@
+#	$NetBSD: SOLIPSIST,v 1.4 1994/10/26 09:08:18 cgd Exp $
 #
-#
-
 
 include "std.sun3"
 
diff --git a/sys/arch/sun3/conf/TIMESINK b/sys/arch/sun3/conf/TIMESINK
index c5a5d9a7e8d1..9311b2995103 100644
--- a/sys/arch/sun3/conf/TIMESINK
+++ b/sys/arch/sun3/conf/TIMESINK
@@ -1,7 +1,6 @@
+#	$NetBSD: TIMESINK,v 1.13 1994/10/26 09:08:20 cgd Exp $
 #
 # config file for TIMESINK, Adam's test machine
-# $Id: TIMESINK,v 1.12 1994/05/27 15:03:19 gwr Exp $
-#
 
 include "std.sun3"
 
diff --git a/sys/arch/sun3/conf/files.sun3.newconf b/sys/arch/sun3/conf/files.sun3.newconf
index 5a816a7a56ac..2c18572fb7cc 100644
--- a/sys/arch/sun3/conf/files.sun3.newconf
+++ b/sys/arch/sun3/conf/files.sun3.newconf
@@ -1,4 +1,5 @@
-# $Id: files.sun3.newconf,v 1.14 1994/09/20 16:18:34 gwr Exp $
+#	$NetBSD: files.sun3.newconf,v 1.15 1994/10/26 09:08:22 cgd Exp $
+#
 # sun3-specific configuration info
 
 maxusers 2 8 64
diff --git a/sys/arch/sun3/conf/std.sun3 b/sys/arch/sun3/conf/std.sun3
index b350968212d6..0fa58b8e0e96 100644
--- a/sys/arch/sun3/conf/std.sun3
+++ b/sys/arch/sun3/conf/std.sun3
@@ -1,4 +1,5 @@
-# $Id: std.sun3,v 1.7 1994/03/01 08:24:05 glass Exp $
+#	$NetBSD: std.sun3,v 1.8 1994/10/26 09:08:24 cgd Exp $
+#
 # Standard information for sun3's.
 
 machine	sun3 m68k
diff --git a/sys/arch/sun3/dev/README b/sys/arch/sun3/dev/README
index 7dafe89e3f6b..aecbfe7708e1 100644
--- a/sys/arch/sun3/dev/README
+++ b/sys/arch/sun3/dev/README
@@ -1,4 +1,4 @@
-							<$Revision: 1.1 $>
+$NetBSD: README,v 1.2 1994/10/26 09:08:31 cgd Exp $
 
 NetBSD/sun3 supports the following busses:
 
diff --git a/sys/arch/sun3/dev/eeprom.c b/sys/arch/sun3/dev/eeprom.c
index 04c2d10bb920..a24e7f8aec9c 100644
--- a/sys/arch/sun3/dev/eeprom.c
+++ b/sys/arch/sun3/dev/eeprom.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: eeprom.c,v 1.2 1994/10/26 09:08:34 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * 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.
- *
- *	$Id: eeprom.c,v 1.1 1994/09/20 16:35:44 gwr Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/dev/event.c b/sys/arch/sun3/dev/event.c
index 80c74263b8b1..56c7f2e8571a 100644
--- a/sys/arch/sun3/dev/event.c
+++ b/sys/arch/sun3/dev/event.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: event.c,v 1.2 1994/10/26 09:08:38 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -42,7 +44,6 @@
  *	@(#)event.c	8.1 (Berkeley) 6/11/93
  *
  * from: Header: event.c,v 1.5 92/11/26 01:10:44 torek Exp  (LBL)
- * $Id: event.c,v 1.1 1994/02/23 08:28:33 glass Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/dev/event_var.h b/sys/arch/sun3/dev/event_var.h
index e8307cc767e0..99b64f87bc08 100644
--- a/sys/arch/sun3/dev/event_var.h
+++ b/sys/arch/sun3/dev/event_var.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: event_var.h,v 1.2 1994/10/26 09:08:41 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -42,7 +44,6 @@
  *	@(#)event_var.h	8.1 (Berkeley) 6/11/93
  *
  * from: Header: event_var.h,v 1.5 92/11/26 01:11:51 torek Exp  (LBL)
- * $Id: event_var.h,v 1.1 1994/02/23 08:28:36 glass Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/dev/idprom.c b/sys/arch/sun3/dev/idprom.c
index 413679cecd6c..809a72f84f36 100644
--- a/sys/arch/sun3/dev/idprom.c
+++ b/sys/arch/sun3/dev/idprom.c
@@ -1,6 +1,7 @@
+/*	$NetBSD: idprom.c,v 1.7 1994/10/26 09:08:43 cgd Exp $	*/
+
 /*
  * Machine ID PROM - system type and serial number
- * $Id: idprom.c,v 1.6 1994/05/06 07:49:15 gwr Exp $
  */
 
 #include "sys/param.h"
diff --git a/sys/arch/sun3/dev/if_le.c b/sys/arch/sun3/dev/if_le.c
index 211048ab3021..2f5ee791b7c8 100644
--- a/sys/arch/sun3/dev/if_le.c
+++ b/sys/arch/sun3/dev/if_le.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: if_le.c,v 1.12 1994/10/26 09:08:46 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1982, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -31,8 +33,8 @@
  * SUCH DAMAGE.
  *
  * from: Header: if_le.c,v 1.25 93/10/31 04:47:50 leres Locked 
- * from: @(#)if_le.c	8.2 (Berkeley) 10/30/93
- * $Id: if_le.c,v 1.11 1994/07/11 03:31:17 gwr Exp $
+ *
+ *	@(#)if_le.c	8.2 (Berkeley) 10/30/93
  */
 
 #include "bpfilter.h"
diff --git a/sys/arch/sun3/dev/if_le.h b/sys/arch/sun3/dev/if_le.h
index 900401ff74fa..2b71fbe258ae 100644
--- a/sys/arch/sun3/dev/if_le.h
+++ b/sys/arch/sun3/dev/if_le.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: if_le.h,v 1.3 1994/10/26 09:08:49 cgd Exp $	*/
+
 /*
  * Ethernet software status per interface.
  */
diff --git a/sys/arch/sun3/dev/if_le_subr.c b/sys/arch/sun3/dev/if_le_subr.c
index 6c8aee887773..478e2604fb2d 100644
--- a/sys/arch/sun3/dev/if_le_subr.c
+++ b/sys/arch/sun3/dev/if_le_subr.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: if_le_subr.c,v 1.7 1994/10/26 09:08:51 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: if_le_subr.c,v 1.6 1994/09/20 16:21:44 gwr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/dev/if_le_subr.h b/sys/arch/sun3/dev/if_le_subr.h
index 162c28fe8553..5d884f94f388 100644
--- a/sys/arch/sun3/dev/if_le_subr.h
+++ b/sys/arch/sun3/dev/if_le_subr.h
@@ -1,4 +1,4 @@
+/*	$NetBSD: if_le_subr.h,v 1.4 1994/10/26 09:08:53 cgd Exp $	*/
 
 /* One might also set: LE_C3_ACON | LE_C3_BCON */
 #define	LE_C3_CONFIG LE_C3_BSWP
-
diff --git a/sys/arch/sun3/dev/if_lereg.h b/sys/arch/sun3/dev/if_lereg.h
index a36f9a4cd47b..f0b09e3ac636 100644
--- a/sys/arch/sun3/dev/if_lereg.h
+++ b/sys/arch/sun3/dev/if_lereg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: if_lereg.h,v 1.6 1994/10/26 09:08:55 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1982, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -31,8 +33,8 @@
  * SUCH DAMAGE.
  *
  * from: Header: if_lereg.h,v 1.7 93/10/31 04:41:00 leres Locked
- * from: @(#)if_lereg.h	8.2 (Berkeley) 10/30/93
- * $Id: if_lereg.h,v 1.5 1994/07/11 03:31:20 gwr Exp $
+ *
+ *	@(#)if_lereg.h	8.2 (Berkeley) 10/30/93
  */
 
 #define	LEMTU		1518
diff --git a/sys/arch/sun3/dev/kbd.c b/sys/arch/sun3/dev/kbd.c
index 4390192a713f..3d189b6fb96d 100644
--- a/sys/arch/sun3/dev/kbd.c
+++ b/sys/arch/sun3/dev/kbd.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: kbd.c,v 1.4 1994/10/26 09:08:58 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -40,8 +42,8 @@
  * SUCH DAMAGE.
  *
  *	@(#)kbd.c	8.1 (Berkeley) 6/11/93
- *	from: Header: kbd.c,v 1.16 92/11/26 01:28:44 torek Exp  (LBL)
- *	$Id: kbd.c,v 1.3 1994/06/03 02:05:18 gwr Exp $
+ *
+ * Header: kbd.c,v 1.16 92/11/26 01:28:44 torek Exp  (LBL)
  */
 
 /*
diff --git a/sys/arch/sun3/dev/kbd.h b/sys/arch/sun3/dev/kbd.h
index 34a3c78f2f8d..17e18b355b30 100644
--- a/sys/arch/sun3/dev/kbd.h
+++ b/sys/arch/sun3/dev/kbd.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: kbd.h,v 1.2 1994/10/26 09:09:00 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,8 +43,7 @@
  *
  *	@(#)kbd.h	8.1 (Berkeley) 6/11/93
  *
- * from: Header: kbd.h,v 1.5 92/11/26 01:15:33 torek Exp  (LBL)
- * $Id: kbd.h,v 1.1 1994/02/23 08:28:45 glass Exp $
+ * Header: kbd.h,v 1.5 92/11/26 01:15:33 torek Exp  (LBL)
  */
 
 /*
diff --git a/sys/arch/sun3/dev/kbio.h b/sys/arch/sun3/dev/kbio.h
index 9380b0042b40..543389e753ab 100644
--- a/sys/arch/sun3/dev/kbio.h
+++ b/sys/arch/sun3/dev/kbio.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: kbio.h,v 1.2 1994/10/26 09:09:03 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,8 +43,7 @@
  *
  *	@(#)kbio.h	8.1 (Berkeley) 6/11/93
  *
- * from: Header: kbio.h,v 1.4 92/11/26 01:16:32 torek Exp  (LBL)
- * $Id: kbio.h,v 1.1 1994/02/23 08:28:47 glass Exp $
+ * Header: kbio.h,v 1.4 92/11/26 01:16:32 torek Exp  (LBL)
  */
 
 /*
diff --git a/sys/arch/sun3/dev/kd.c b/sys/arch/sun3/dev/kd.c
index 9754ef7eb9ea..8834f3c31956 100644
--- a/sys/arch/sun3/dev/kd.c
+++ b/sys/arch/sun3/dev/kd.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: kd.c,v 1.4 1994/10/26 09:09:05 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * 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.
- *
- *	$Id: kd.c,v 1.3 1994/06/03 02:05:19 gwr Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/dev/ms.c b/sys/arch/sun3/dev/ms.c
index a6098885cb68..8685bf654276 100644
--- a/sys/arch/sun3/dev/ms.c
+++ b/sys/arch/sun3/dev/ms.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: ms.c,v 1.2 1994/10/26 09:09:10 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,8 +43,7 @@
  *
  *	@(#)ms.c	8.1 (Berkeley) 6/11/93
  *
- * from: Header: ms.c,v 1.5 92/11/26 01:28:47 torek Exp  (LBL)
- * $Id: ms.c,v 1.1 1994/02/23 08:28:49 glass Exp $
+ * Header: ms.c,v 1.5 92/11/26 01:28:47 torek Exp  (LBL)
  */
 
 /*
diff --git a/sys/arch/sun3/dev/obctl.c b/sys/arch/sun3/dev/obctl.c
index 6d62c63a9e0c..e0ec4ad749af 100644
--- a/sys/arch/sun3/dev/obctl.c
+++ b/sys/arch/sun3/dev/obctl.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: obctl.c,v 1.4 1994/10/26 09:09:12 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: obctl.c,v 1.3 1994/05/06 07:49:18 gwr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/dev/obio.c b/sys/arch/sun3/dev/obio.c
index a01ab56d0eda..899503659c9a 100644
--- a/sys/arch/sun3/dev/obio.c
+++ b/sys/arch/sun3/dev/obio.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: obio.c,v 1.12 1994/10/26 09:09:14 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -27,8 +29,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: obio.c,v 1.11 1994/09/20 16:24:45 gwr Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/sun3/dev/obmem.c b/sys/arch/sun3/dev/obmem.c
index 7dae7b047e42..4b6daeb99c11 100644
--- a/sys/arch/sun3/dev/obmem.c
+++ b/sys/arch/sun3/dev/obmem.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: obmem.c,v 1.4 1994/10/26 09:09:16 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: obmem.c,v 1.3 1994/05/06 07:49:19 gwr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/dev/prom.c b/sys/arch/sun3/dev/prom.c
index 534aabb3ac2e..4c9fdb035bf5 100644
--- a/sys/arch/sun3/dev/prom.c
+++ b/sys/arch/sun3/dev/prom.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: prom.c,v 1.13 1994/10/26 09:09:19 cgd Exp $	*/
+
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
diff --git a/sys/arch/sun3/dev/scsi_5380.h b/sys/arch/sun3/dev/scsi_5380.h
index 89559ed61b2e..04fa361f6082 100644
--- a/sys/arch/sun3/dev/scsi_5380.h
+++ b/sys/arch/sun3/dev/scsi_5380.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsi_5380.h,v 1.3 1994/10/26 09:09:22 cgd Exp $	*/
+
 /* 
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
diff --git a/sys/arch/sun3/dev/scsi_defs.h b/sys/arch/sun3/dev/scsi_defs.h
index c048833f8d96..614cec8ce0cf 100644
--- a/sys/arch/sun3/dev/scsi_defs.h
+++ b/sys/arch/sun3/dev/scsi_defs.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: scsi_defs.h,v 1.2 1994/10/26 09:09:24 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: scsi_defs.h,v 1.1 1994/02/23 08:28:55 glass Exp $
- *
  */
 
 #ifndef _SCSI_DEFS_H
diff --git a/sys/arch/sun3/dev/si.c b/sys/arch/sun3/dev/si.c
index 54ab14a0c3db..f7ebbd6a443d 100644
--- a/sys/arch/sun3/dev/si.c
+++ b/sys/arch/sun3/dev/si.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: si.c,v 1.8 1994/10/26 09:09:27 cgd Exp $	*/
+
 /*
  * Copyright (C) 1994 Adam Glass, Gordon W. Ross
  * Copyright (C) 1993	Allen K. Briggs, Chris P. Caputo,
@@ -30,8 +32,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: si.c,v 1.7 1994/09/20 16:21:46 gwr Exp $
  */
 
 /* #define DEBUG 1 */
diff --git a/sys/arch/sun3/dev/vuid_event.h b/sys/arch/sun3/dev/vuid_event.h
index 0084c4ed8168..bede335dc508 100644
--- a/sys/arch/sun3/dev/vuid_event.h
+++ b/sys/arch/sun3/dev/vuid_event.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: vuid_event.h,v 1.2 1994/10/26 09:09:30 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -42,7 +44,6 @@
  *	@(#)vuid_event.h	8.1 (Berkeley) 6/11/93
  *
  * from: Header: vuid_event.h,v 1.4 92/11/26 01:20:27 torek Exp  (LBL)
- * $Id: vuid_event.h,v 1.1 1994/02/23 08:28:58 glass Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/dev/zs.c b/sys/arch/sun3/dev/zs.c
index 3f066973eede..6e7797ca0f1a 100644
--- a/sys/arch/sun3/dev/zs.c
+++ b/sys/arch/sun3/dev/zs.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: zs.c,v 1.10 1994/10/26 09:09:33 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1992, 1993
@@ -41,8 +43,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)zs.c	8.1 (Berkeley) 7/19/93
- *
- * $Id: zs.c,v 1.9 1994/09/20 16:21:48 gwr Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/dev/zsreg.h b/sys/arch/sun3/dev/zsreg.h
index 40cac1bf0426..5245159492bb 100644
--- a/sys/arch/sun3/dev/zsreg.h
+++ b/sys/arch/sun3/dev/zsreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: zsreg.h,v 1.3 1994/10/26 09:09:38 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -42,7 +44,6 @@
  *	@(#)zsreg.h	8.1 (Berkeley) 6/11/93
  *
  * from: Header: zsreg.h,v 1.7 92/11/26 01:27:18 torek Exp  (LBL)
- * $Id: zsreg.h,v 1.2 1994/03/15 07:40:34 glass Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/dev/zsvar.h b/sys/arch/sun3/dev/zsvar.h
index dd7f962e4a98..c97165488b96 100644
--- a/sys/arch/sun3/dev/zsvar.h
+++ b/sys/arch/sun3/dev/zsvar.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: zsvar.h,v 1.5 1994/10/26 09:09:41 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1992, 1993
@@ -41,8 +43,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)zsvar.h	8.1 (Berkeley) 6/11/93
- *
- * $Id: zsvar.h,v 1.4 1994/09/20 16:23:06 gwr Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/include/ansi.h b/sys/arch/sun3/include/ansi.h
index 5cf49e234220..34930edbf61d 100644
--- a/sys/arch/sun3/include/ansi.h
+++ b/sys/arch/sun3/include/ansi.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: ansi.h,v 1.3 1994/02/04 08:19:48 glass Exp $
- */
+/*	$NetBSD: ansi.h,v 1.4 1994/10/26 09:09:52 cgd Exp $	*/
 
 /* Just use the common m68k definition */
 #include <m68k/ansi.h>
diff --git a/sys/arch/sun3/include/aout_machdep.h b/sys/arch/sun3/include/aout_machdep.h
index 7df917b9db6c..2b374ff76c6b 100644
--- a/sys/arch/sun3/include/aout_machdep.h
+++ b/sys/arch/sun3/include/aout_machdep.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: aout_machdep.h,v 1.6 1994/10/26 09:10:21 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
  * 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.3 1993/06/04 01:12:04 cgd Exp
  */
 
 #ifndef _SUN3_EXEC_H_
diff --git a/sys/arch/sun3/include/asm.h b/sys/arch/sun3/include/asm.h
index ccba82dd4405..067abd880a50 100644
--- a/sys/arch/sun3/include/asm.h
+++ b/sys/arch/sun3/include/asm.h
@@ -1,5 +1,3 @@
-/*
- *	$Id: asm.h,v 1.5 1994/02/04 08:19:49 glass Exp $
- */
+/*	$NetBSD: asm.h,v 1.6 1994/10/26 09:09:56 cgd Exp $	*/
 
 #include <m68k/asm.h>
diff --git a/sys/arch/sun3/include/autoconf.h b/sys/arch/sun3/include/autoconf.h
index 9d4844a3a225..9beb97642783 100644
--- a/sys/arch/sun3/include/autoconf.h
+++ b/sys/arch/sun3/include/autoconf.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: autoconf.h,v 1.4 1994/10/26 09:09:59 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/include/autoconf.h,v 1.3 1994/02/04 08:19:50 glass Exp $
  */
 
 int always_match __P((struct device *, struct cfdata *, void *));
diff --git a/sys/arch/sun3/include/control.h b/sys/arch/sun3/include/control.h
index 8a98539ba649..6237a8fbacbe 100644
--- a/sys/arch/sun3/include/control.h
+++ b/sys/arch/sun3/include/control.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: control.h,v 1.10 1994/10/26 09:10:01 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/include/Attic/control.h,v 1.9 1994/02/23 08:29:13 glass Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/include/cpu.h b/sys/arch/sun3/include/cpu.h
index 0ce8ca781a52..9c0010907124 100644
--- a/sys/arch/sun3/include/cpu.h
+++ b/sys/arch/sun3/include/cpu.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: cpu.h,v 1.13 1994/10/26 09:10:06 cgd Exp $	*/
+
 /* Copyright (c) 1993 Adam Glass
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -35,10 +37,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: Utah Hdr: cpu.h 1.16 91/03/25
- *	from: @(#)cpu.h	7.7 (Berkeley) 6/27/91
- *	cpu.h,v 1.2 1993/05/22 07:58:17 cgd Exp
- *	$Id: cpu.h,v 1.12 1994/06/28 21:47:56 gwr Exp $
+ * from: Utah Hdr: cpu.h 1.16 91/03/25
+ *
+ *	@(#)cpu.h	7.7 (Berkeley) 6/27/91
  */
 
 #ifdef KERNEL
diff --git a/sys/arch/sun3/include/cpufunc.h b/sys/arch/sun3/include/cpufunc.h
index b119c8d0cad5..5439cde7539b 100644
--- a/sys/arch/sun3/include/cpufunc.h
+++ b/sys/arch/sun3/include/cpufunc.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: cpufunc.h,v 1.4 1994/10/26 09:10:11 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/include/Attic/cpufunc.h,v 1.3 1994/02/04 08:19:53 glass Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/include/db_machdep.h b/sys/arch/sun3/include/db_machdep.h
index 8b113428d6d7..927467ef17c7 100644
--- a/sys/arch/sun3/include/db_machdep.h
+++ b/sys/arch/sun3/include/db_machdep.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: db_machdep.h,v 1.4 1994/02/04 08:19:53 glass Exp $
- */
+/*	$NetBSD: db_machdep.h,v 1.5 1994/10/26 09:10:13 cgd Exp $	*/
 
 /* Just use the common m68k definition */
 #include <m68k/db_machdep.h>
diff --git a/sys/arch/sun3/include/eeprom.h b/sys/arch/sun3/include/eeprom.h
index 71c1db2e5abd..f3e13aa4f4f5 100644
--- a/sys/arch/sun3/include/eeprom.h
+++ b/sys/arch/sun3/include/eeprom.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: eeprom.h,v 1.5 1994/10/26 09:10:16 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * 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.
- *
- *	$Id: eeprom.h,v 1.4 1994/09/20 16:26:00 gwr Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/include/endian.h b/sys/arch/sun3/include/endian.h
index 6b03490a0119..8f22344c0328 100644
--- a/sys/arch/sun3/include/endian.h
+++ b/sys/arch/sun3/include/endian.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: endian.h,v 1.4 1994/02/04 08:19:54 glass Exp $
- */
+/*	$NetBSD: endian.h,v 1.5 1994/10/26 09:10:18 cgd Exp $	*/
 
 /* Just use the common m68k definition */
 #include <m68k/endian.h>
diff --git a/sys/arch/sun3/include/exec.h b/sys/arch/sun3/include/exec.h
index 7df917b9db6c..cb4b585cb2e1 100644
--- a/sys/arch/sun3/include/exec.h
+++ b/sys/arch/sun3/include/exec.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: exec.h,v 1.6 1994/10/26 09:10:21 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
  * 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.3 1993/06/04 01:12:04 cgd Exp
  */
 
 #ifndef _SUN3_EXEC_H_
diff --git a/sys/arch/sun3/include/fbio.h b/sys/arch/sun3/include/fbio.h
index c5b620dfa067..2d473476f502 100644
--- a/sys/arch/sun3/include/fbio.h
+++ b/sys/arch/sun3/include/fbio.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: fbio.h,v 1.2 1994/10/26 09:10:23 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992 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: @(#)fbio.h	7.2 (Berkeley) 4/1/92
- * $Id: fbio.h,v 1.1 1994/08/08 21:14:15 gwr Exp $
+ *	@(#)fbio.h	7.2 (Berkeley) 4/1/92
  */
 
 /*
diff --git a/sys/arch/sun3/include/float.h b/sys/arch/sun3/include/float.h
index dc4ef779248b..52892baf3075 100644
--- a/sys/arch/sun3/include/float.h
+++ b/sys/arch/sun3/include/float.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: float.h,v 1.3 1994/02/04 08:19:56 glass Exp $
- */
+/*	$NetBSD: float.h,v 1.4 1994/10/26 09:10:25 cgd Exp $	*/
 
 /* Just use the common m68k definition */
 #include <m68k/float.h>
diff --git a/sys/arch/sun3/include/frame.h b/sys/arch/sun3/include/frame.h
index 91edc7b0a1bb..5b9596f43097 100644
--- a/sys/arch/sun3/include/frame.h
+++ b/sys/arch/sun3/include/frame.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: frame.h,v 1.4 1994/02/04 08:19:57 glass Exp $
- */
+/*	$NetBSD: frame.h,v 1.5 1994/10/26 09:10:27 cgd Exp $	*/
 
 /* use the common m68k definition */
 #include <m68k/frame.h>
diff --git a/sys/arch/sun3/include/idprom.h b/sys/arch/sun3/include/idprom.h
index 38ff91f06312..8d4b41ad0fcb 100644
--- a/sys/arch/sun3/include/idprom.h
+++ b/sys/arch/sun3/include/idprom.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: idprom.h,v 1.8 1994/10/26 09:10:30 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/include/idprom.h,v 1.7 1994/02/04 08:19:58 glass Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/include/isr.h b/sys/arch/sun3/include/isr.h
index 67cad5b6341b..0cc74635afd8 100644
--- a/sys/arch/sun3/include/isr.h
+++ b/sys/arch/sun3/include/isr.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: isr.h,v 1.5 1994/10/26 09:10:33 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1982 Regents of the University of California.
@@ -31,8 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)isr.h	7.1 (Berkeley) 5/8/90
- *	isr.h,v 1.2 1993/05/22 07:57:26 cgd Exp
+ *	@(#)isr.h	7.1 (Berkeley) 5/8/90
  */
 
 struct isr {
diff --git a/sys/arch/sun3/include/limits.h b/sys/arch/sun3/include/limits.h
index e8bffef8f049..a5bc1da7892d 100644
--- a/sys/arch/sun3/include/limits.h
+++ b/sys/arch/sun3/include/limits.h
@@ -1,5 +1,3 @@
-/*
- *	$Id: limits.h,v 1.4 1994/07/26 18:15:18 gwr Exp $
- */
+/*	$NetBSD: limits.h,v 1.5 1994/10/26 09:10:37 cgd Exp $	*/
 
 #include <m68k/limits.h>
diff --git a/sys/arch/sun3/include/memmap.h b/sys/arch/sun3/include/memmap.h
index 98518c480efa..65e29bbb9a73 100644
--- a/sys/arch/sun3/include/memmap.h
+++ b/sys/arch/sun3/include/memmap.h
@@ -1,2 +1,4 @@
+/*	$NetBSD: memmap.h,v 1.3 1994/10/26 09:10:40 cgd Exp $	*/
+
 /* this file should just go away */
 #define MAINMEM_MONMAP 0x800000
diff --git a/sys/arch/sun3/include/mon.h b/sys/arch/sun3/include/mon.h
index 51cdffbe5073..52c98fd9c245 100644
--- a/sys/arch/sun3/include/mon.h
+++ b/sys/arch/sun3/include/mon.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: mon.h,v 1.14 1994/10/26 09:10:43 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: mon.h,v 1.13 1994/09/20 16:26:40 gwr Exp $
  */
 /*
  * This file derived from kernel/mach/sun3.md/machMon.h from the
diff --git a/sys/arch/sun3/include/mtpr.h b/sys/arch/sun3/include/mtpr.h
index b8eca5e7758e..2e626635b1ad 100644
--- a/sys/arch/sun3/include/mtpr.h
+++ b/sys/arch/sun3/include/mtpr.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: mtpr.h,v 1.2 1994/10/26 09:10:45 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,8 +39,7 @@
  *
  * from: Utah $Hdr: mtpr.h 1.1 90/07/09$
  *
- *	from: @(#)mtpr.h	7.2 (Berkeley) 11/3/90
- *	mtpr.h,v 1.2 1993/05/22 07:58:24 cgd Exp
+ *	@(#)mtpr.h	7.2 (Berkeley) 11/3/90
  */
 
 /*
diff --git a/sys/arch/sun3/include/obctl.h b/sys/arch/sun3/include/obctl.h
index 93714ecffea6..6ff4e95750dd 100644
--- a/sys/arch/sun3/include/obctl.h
+++ b/sys/arch/sun3/include/obctl.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: obctl.h,v 1.4 1994/10/26 09:10:47 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/include/Attic/obctl.h,v 1.3 1994/02/04 08:20:01 glass Exp $
  */
 
 struct obctl_cf_loc {
diff --git a/sys/arch/sun3/include/obio.h b/sys/arch/sun3/include/obio.h
index 4aec339a1102..c050bd4d8b7d 100644
--- a/sys/arch/sun3/include/obio.h
+++ b/sys/arch/sun3/include/obio.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: obio.h,v 1.11 1994/10/26 09:10:50 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: obio.h,v 1.10 1994/09/20 16:28:00 gwr Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/include/obmem.h b/sys/arch/sun3/include/obmem.h
index a952384aaed3..b15fc0494713 100644
--- a/sys/arch/sun3/include/obmem.h
+++ b/sys/arch/sun3/include/obmem.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: obmem.h,v 1.4 1994/10/26 09:10:52 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/include/Attic/obmem.h,v 1.3 1994/02/04 08:20:03 glass Exp $
  */
 
 /* put something in here about framebuffers... */
diff --git a/sys/arch/sun3/include/param.h b/sys/arch/sun3/include/param.h
index 7a63969f1c0c..eb9233a81676 100644
--- a/sys/arch/sun3/include/param.h
+++ b/sys/arch/sun3/include/param.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: param.h,v 1.19 1994/10/26 09:10:54 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -38,8 +40,7 @@
  * SUCH DAMAGE.
  *
  *	from: Utah Hdr: machparam.h 1.16 92/12/20
- *	from: @(#)param.h	8.1 (Berkeley) 6/10/93
- *	$Id: param.h,v 1.18 1994/09/20 16:31:03 gwr Exp $
+ *	@(#)param.h	8.1 (Berkeley) 6/10/93
  */
 
 #ifndef	MACHINE
diff --git a/sys/arch/sun3/include/param3.h b/sys/arch/sun3/include/param3.h
index 5c9c8c7d9b3a..4e4cef18c809 100644
--- a/sys/arch/sun3/include/param3.h
+++ b/sys/arch/sun3/include/param3.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: param3.h,v 1.19 1994/10/26 09:10:54 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -38,8 +40,7 @@
  * SUCH DAMAGE.
  *
  *	from: Utah Hdr: machparam.h 1.16 92/12/20
- *	from: @(#)param.h	8.1 (Berkeley) 6/10/93
- *	$Id: param3.h,v 1.18 1994/09/20 16:31:03 gwr Exp $
+ *	@(#)param.h	8.1 (Berkeley) 6/10/93
  */
 
 #ifndef	MACHINE
diff --git a/sys/arch/sun3/include/pcb.h b/sys/arch/sun3/include/pcb.h
index a647778e001a..7425a3a18def 100644
--- a/sys/arch/sun3/include/pcb.h
+++ b/sys/arch/sun3/include/pcb.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pcb.h,v 1.7 1994/10/26 09:10:56 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1988 University of Utah.
@@ -37,8 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from: Utah Hdr: pcb.h 1.14 91/03/25
- *	from: @(#)pcb.h	8.1 (Berkeley) 6/10/93
- *	$Id: pcb.h,v 1.6 1994/05/27 14:55:24 gwr Exp $
+ *	@(#)pcb.h	8.1 (Berkeley) 6/10/93
  */
 
 #include <machine/frame.h>
diff --git a/sys/arch/sun3/include/pmap.h b/sys/arch/sun3/include/pmap.h
index 5f0d1d381036..875a9d0fc09e 100644
--- a/sys/arch/sun3/include/pmap.h
+++ b/sys/arch/sun3/include/pmap.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmap.h,v 1.10 1994/10/26 09:10:59 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: pmap.h,v 1.9 1994/06/29 05:32:53 gwr Exp $
  */
 
 #ifndef	_PMAP_MACHINE_
diff --git a/sys/arch/sun3/include/pmap3.h b/sys/arch/sun3/include/pmap3.h
index 69591424f4ab..ad06e288b133 100644
--- a/sys/arch/sun3/include/pmap3.h
+++ b/sys/arch/sun3/include/pmap3.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmap3.h,v 1.10 1994/10/26 09:10:59 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: pmap3.h,v 1.9 1994/06/29 05:32:53 gwr Exp $
  */
 
 #ifndef	_PMAP_MACHINE_
diff --git a/sys/arch/sun3/include/proc.h b/sys/arch/sun3/include/proc.h
index 171e82ec206a..243bcde58a26 100644
--- a/sys/arch/sun3/include/proc.h
+++ b/sys/arch/sun3/include/proc.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: proc.h,v 1.6 1994/10/26 09:11:00 cgd Exp $	*/
+
 /*
  * Copyright (c) 1991 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: @(#)proc.h	7.1 (Berkeley) 5/15/91
- *	proc.h,v 1.2 1993/05/22 07:58:30 cgd Exp
- *	$Id: proc.h,v 1.5 1994/07/23 03:23:44 gwr Exp $
+ *	@(#)proc.h	7.1 (Berkeley) 5/15/91
  */
 
 /*
diff --git a/sys/arch/sun3/include/profile.h b/sys/arch/sun3/include/profile.h
index f99b9f079c64..b7345c749ba9 100644
--- a/sys/arch/sun3/include/profile.h
+++ b/sys/arch/sun3/include/profile.h
@@ -1 +1,3 @@
+/*	$NetBSD: profile.h,v 1.2 1994/10/26 09:11:03 cgd Exp $	*/
+
 #include <m68k/profile.h>
diff --git a/sys/arch/sun3/include/psl.h b/sys/arch/sun3/include/psl.h
index d2e0d15fdd33..0958dc4bd676 100644
--- a/sys/arch/sun3/include/psl.h
+++ b/sys/arch/sun3/include/psl.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: psl.h,v 1.3 1994/02/04 08:20:05 glass Exp $
- */
+/*	$NetBSD: psl.h,v 1.4 1994/10/26 09:11:07 cgd Exp $	*/
 
 /* Just use the common m68k definition */
 #include <m68k/psl.h>
diff --git a/sys/arch/sun3/include/pte.h b/sys/arch/sun3/include/pte.h
index f9f870522fa5..e2f0771eba3e 100644
--- a/sys/arch/sun3/include/pte.h
+++ b/sys/arch/sun3/include/pte.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pte.h,v 1.7 1994/10/26 09:11:10 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/include/pte.h,v 1.6 1994/05/27 14:55:26 gwr Exp $
  */
 
 #ifndef _MACHINE_PTE_H
diff --git a/sys/arch/sun3/include/pte3.h b/sys/arch/sun3/include/pte3.h
index 0ed2bc9f88d1..83bddc433180 100644
--- a/sys/arch/sun3/include/pte3.h
+++ b/sys/arch/sun3/include/pte3.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pte3.h,v 1.7 1994/10/26 09:11:10 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/include/pte3.h,v 1.6 1994/05/27 14:55:26 gwr Exp $
  */
 
 #ifndef _MACHINE_PTE_H
diff --git a/sys/arch/sun3/include/ptrace.h b/sys/arch/sun3/include/ptrace.h
index f81a6faf35b1..293483bbb0a3 100644
--- a/sys/arch/sun3/include/ptrace.h
+++ b/sys/arch/sun3/include/ptrace.h
@@ -1,12 +1,4 @@
-/*
- *	$Id: ptrace.h,v 1.2 1994/02/23 08:29:22 glass Exp $
- */
-
-/* Just use the common m68k definition */
-#include <m68k/ptrace.h>
-/*
- *	$Id: ptrace.h,v 1.2 1994/02/23 08:29:22 glass Exp $
- */
+/*	$NetBSD: ptrace.h,v 1.3 1994/10/26 09:11:12 cgd Exp $	*/
 
 /* Just use the common m68k definition */
 #include <m68k/ptrace.h>
diff --git a/sys/arch/sun3/include/reg.h b/sys/arch/sun3/include/reg.h
index d71f3743e6de..413f16d4653f 100644
--- a/sys/arch/sun3/include/reg.h
+++ b/sys/arch/sun3/include/reg.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: reg.h,v 1.9 1994/02/04 08:20:07 glass Exp $
- */
+/*	$NetBSD: reg.h,v 1.10 1994/10/26 09:11:14 cgd Exp $	*/
 
 #ifndef _MACHINE_REG_H_
 #define	_MACHINE_REG_H_
diff --git a/sys/arch/sun3/include/signal.h b/sys/arch/sun3/include/signal.h
index 0ea406aed4b3..28649b4b76a7 100644
--- a/sys/arch/sun3/include/signal.h
+++ b/sys/arch/sun3/include/signal.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: signal.h,v 1.3 1994/02/04 08:20:08 glass Exp $
- */
+/*	$NetBSD: signal.h,v 1.4 1994/10/26 09:11:16 cgd Exp $	*/
 
 /* Just use the common m68k definition */
 #include <m68k/signal.h>
diff --git a/sys/arch/sun3/include/stdarg.h b/sys/arch/sun3/include/stdarg.h
index b367da38ac65..aacbd9e64e44 100644
--- a/sys/arch/sun3/include/stdarg.h
+++ b/sys/arch/sun3/include/stdarg.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: stdarg.h,v 1.3 1994/02/04 08:20:09 glass Exp $
- */
+/*	$NetBSD: stdarg.h,v 1.4 1994/10/26 09:11:19 cgd Exp $	*/
 
 /* Just use the common m68k definition */
 #include <m68k/stdarg.h>
diff --git a/sys/arch/sun3/include/sun_disklabel.h b/sys/arch/sun3/include/sun_disklabel.h
index 981cb6f09477..2a5fe6fbdd84 100644
--- a/sys/arch/sun3/include/sun_disklabel.h
+++ b/sys/arch/sun3/include/sun_disklabel.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: sun_disklabel.h,v 1.2 1994/10/26 09:11:20 cgd Exp $	*/
+
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,9 +43,7 @@
  *
  *	@(#)sun_disklabel.h	8.1 (Berkeley) 6/11/93
  *
- *	from: Header: sun_disklabel.h,v 1.4 92/06/17 07:04:13 torek Exp
- *	from: sun_disklabel.h,v 1.1 1993/11/14 10:47:13 deraadt Exp
- *	$Id: sun_disklabel.h,v 1.1 1994/05/13 21:30:29 gwr Exp $
+ * from: Header: sun_disklabel.h,v 1.4 92/06/17 07:04:13 torek Exp
  */
 
 /*
diff --git a/sys/arch/sun3/include/trap.h b/sys/arch/sun3/include/trap.h
index 04d08b34b418..22d7d9d36265 100644
--- a/sys/arch/sun3/include/trap.h
+++ b/sys/arch/sun3/include/trap.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: trap.h,v 1.5 1994/02/04 08:20:09 glass Exp $
- */
+/*	$NetBSD: trap.h,v 1.6 1994/10/26 09:11:22 cgd Exp $	*/
 
 /* Just use the common m68k definition */
 #include <m68k/trap.h>
diff --git a/sys/arch/sun3/include/types.h b/sys/arch/sun3/include/types.h
index c8498db33e0a..a78fd632f536 100644
--- a/sys/arch/sun3/include/types.h
+++ b/sys/arch/sun3/include/types.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: types.h,v 1.3 1994/02/04 08:20:10 glass Exp $
- */
+/*	$NetBSD: types.h,v 1.4 1994/10/26 09:11:25 cgd Exp $	*/
 
 /* Just use the common m68k definition */
 #include <m68k/types.h>
diff --git a/sys/arch/sun3/include/varargs.h b/sys/arch/sun3/include/varargs.h
index 2eadfd2c6ea4..aa8245868374 100644
--- a/sys/arch/sun3/include/varargs.h
+++ b/sys/arch/sun3/include/varargs.h
@@ -1,6 +1,4 @@
-/*
- *	$Id: varargs.h,v 1.3 1994/05/23 18:31:53 gwr Exp $
- */
+/*	$NetBSD: varargs.h,v 1.4 1994/10/26 09:11:27 cgd Exp $	*/
 
 /* Just use the common m68k definition */
 #include <m68k/varargs.h>
diff --git a/sys/arch/sun3/include/vmparam.h b/sys/arch/sun3/include/vmparam.h
index 4f734365727c..75fd096ac0c1 100644
--- a/sys/arch/sun3/include/vmparam.h
+++ b/sys/arch/sun3/include/vmparam.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: vmparam.h,v 1.9 1994/10/26 09:11:29 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1988 University of Utah.
@@ -38,8 +40,7 @@
  *
  * from: Utah $Hdr: vmparam.h 1.16 91/01/18$
  *
- *	from: @(#)vmparam.h	7.3 (Berkeley) 5/7/91
- *	vmparam.h,v 1.2 1993/05/22 07:58:38 cgd Exp
+ *	@(#)vmparam.h	7.3 (Berkeley) 5/7/91
  */
 
 #define USRTEXT         NBPG
diff --git a/sys/arch/sun3/include/vmparam3.h b/sys/arch/sun3/include/vmparam3.h
index 4f734365727c..9880fafbba34 100644
--- a/sys/arch/sun3/include/vmparam3.h
+++ b/sys/arch/sun3/include/vmparam3.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: vmparam3.h,v 1.9 1994/10/26 09:11:29 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1988 University of Utah.
@@ -38,8 +40,7 @@
  *
  * from: Utah $Hdr: vmparam.h 1.16 91/01/18$
  *
- *	from: @(#)vmparam.h	7.3 (Berkeley) 5/7/91
- *	vmparam.h,v 1.2 1993/05/22 07:58:38 cgd Exp
+ *	@(#)vmparam.h	7.3 (Berkeley) 5/7/91
  */
 
 #define USRTEXT         NBPG
diff --git a/sys/arch/sun3/netboot/Makefile b/sys/arch/sun3/netboot/Makefile
index 39b8500bb149..ea14eb117839 100644
--- a/sys/arch/sun3/netboot/Makefile
+++ b/sys/arch/sun3/netboot/Makefile
@@ -1,3 +1,5 @@
+#	$NetBSD: Makefile,v 1.2 1994/10/26 09:11:38 cgd Exp $
+
 .include <../../common/netboot/Makefile>
 
 CFLAGS += -I../../common -I. -DDEBUG -Dsun3
diff --git a/sys/arch/sun3/netboot/conf.c b/sys/arch/sun3/netboot/conf.c
index a312a3e362ce..19afed8e0853 100644
--- a/sys/arch/sun3/netboot/conf.c
+++ b/sys/arch/sun3/netboot/conf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: conf.c,v 1.3 1994/10/26 09:11:42 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/netboot/Attic/conf.c,v 1.2 1994/02/04 08:20:13 glass Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/netboot/config.h b/sys/arch/sun3/netboot/config.h
index f9cd55a86f40..109ed0f8e94f 100644
--- a/sys/arch/sun3/netboot/config.h
+++ b/sys/arch/sun3/netboot/config.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: config.h,v 1.2 1994/10/26 09:11:44 cgd Exp $	*/
+
 /* configuration information for base-line code */
 
 #include "../include/mon.h"
diff --git a/sys/arch/sun3/netboot/genassym.c b/sys/arch/sun3/netboot/genassym.c
index bb6d5b47a3d1..de44f78b0b31 100644
--- a/sys/arch/sun3/netboot/genassym.c
+++ b/sys/arch/sun3/netboot/genassym.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: genassym.c,v 1.2 1994/10/26 09:11:46 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Adam Glass 
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -31,8 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)genassym.c	7.8 (Berkeley) 5/7/91
- *	genassym.c,v 1.2 1993/05/22 07:57:23 cgd Exp
+ *	@(#)genassym.c	7.8 (Berkeley) 5/7/91
  */
 
 #define KERNEL
diff --git a/sys/arch/sun3/netboot/le_poll.c b/sys/arch/sun3/netboot/le_poll.c
index 06d150d585d1..8af0bd5901b6 100644
--- a/sys/arch/sun3/netboot/le_poll.c
+++ b/sys/arch/sun3/netboot/le_poll.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: le_poll.c,v 1.3 1994/10/26 09:11:48 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/netboot/Attic/le_poll.c,v 1.2 1994/02/04 08:20:14 glass Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/netboot/machdep.c b/sys/arch/sun3/netboot/machdep.c
index 37d54c9b6f87..e70d4823d512 100644
--- a/sys/arch/sun3/netboot/machdep.c
+++ b/sys/arch/sun3/netboot/machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: machdep.c,v 1.2 1994/10/26 09:11:51 cgd Exp $	*/
+
 #include <sys/param.h>
 #include <sys/types.h>
 
diff --git a/sys/arch/sun3/netboot/start.s b/sys/arch/sun3/netboot/start.s
index 6ebd40b80539..819dec4edbc3 100644
--- a/sys/arch/sun3/netboot/start.s
+++ b/sys/arch/sun3/netboot/start.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: start.s,v 1.3 1994/10/26 09:11:54 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/netboot/Attic/start.s,v 1.2 1994/02/04 08:20:15 glass Exp $
  */
 
 #include "assym.s"
diff --git a/sys/arch/sun3/netboot/sunos_exec.c b/sys/arch/sun3/netboot/sunos_exec.c
index e43c059bb9ce..7cc7b275a9a8 100644
--- a/sys/arch/sun3/netboot/sunos_exec.c
+++ b/sys/arch/sun3/netboot/sunos_exec.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: sunos_exec.c,v 1.3 1994/10/26 09:11:57 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/netboot/Attic/sunos_exec.c,v 1.2 1994/02/04 08:20:17 glass Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/sun3/TODO b/sys/arch/sun3/sun3/TODO
index bda9554abfbd..d1604ad699a7 100644
--- a/sys/arch/sun3/sun3/TODO
+++ b/sys/arch/sun3/sun3/TODO
@@ -1,3 +1,5 @@
+$NetBSD: TODO,v 1.4 1994/10/26 09:12:05 cgd Exp $
+
 	figure out stack issues
 	some interface to vector table useable by isr stuff, and by
 		trap stuff. would be nice only to turn traps on before
diff --git a/sys/arch/sun3/sun3/autoconf.c b/sys/arch/sun3/sun3/autoconf.c
index a5b8e03c3243..77252163af58 100644
--- a/sys/arch/sun3/sun3/autoconf.c
+++ b/sys/arch/sun3/sun3/autoconf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: autoconf.c,v 1.14 1994/10/26 09:12:10 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -27,8 +29,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: autoconf.c,v 1.13 1994/09/20 16:52:21 gwr Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/sun3/buserr.h b/sys/arch/sun3/sun3/buserr.h
index 1f6484feddb7..7b85c35c7188 100644
--- a/sys/arch/sun3/sun3/buserr.h
+++ b/sys/arch/sun3/sun3/buserr.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: buserr.h,v 1.3 1994/10/26 09:12:13 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/sun3/buserr.h,v 1.2 1994/02/04 08:20:50 glass Exp $
  */
 
 #define BUSERR_WATCHDOG   0x01
diff --git a/sys/arch/sun3/sun3/clock.c b/sys/arch/sun3/sun3/clock.c
index 9baeb832c67b..208ed800c50f 100644
--- a/sys/arch/sun3/sun3/clock.c
+++ b/sys/arch/sun3/sun3/clock.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: clock.c,v 1.19 1994/10/26 09:12:16 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -39,8 +41,7 @@
  *
  * from: Utah $Hdr: clock.c 1.18 91/01/21$
  *
- *	from: @(#)clock.c	8.2 (Berkeley) 1/12/94
- *	$Id: clock.c,v 1.18 1994/09/26 17:25:23 gwr Exp $
+ *	@(#)clock.c	8.2 (Berkeley) 1/12/94
  */
 
 /*
diff --git a/sys/arch/sun3/sun3/conf.c b/sys/arch/sun3/sun3/conf.c
index 482329b9f5f0..a34ea13acde7 100644
--- a/sys/arch/sun3/sun3/conf.c
+++ b/sys/arch/sun3/sun3/conf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: conf.c,v 1.22 1994/10/26 09:12:19 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1994 Adam Glass, Gordon W. Ross
  * Copyright (c) 1982, 1986, 1989, 1991, 1992, 1993
@@ -36,9 +38,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
- *	conf.c,v 1.2 1993/05/22 07:57:16 cgd Exp
- *	$Id: conf.c,v 1.21 1994/09/20 16:52:56 gwr Exp $
+ *	@(#)conf.c	7.9 (Berkeley) 5/28/91
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/sun3/control.c b/sys/arch/sun3/sun3/control.c
index c990d41b5eef..57eb35a768fd 100644
--- a/sys/arch/sun3/sun3/control.c
+++ b/sys/arch/sun3/sun3/control.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: control.c,v 1.9 1994/10/26 09:12:21 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: control.c,v 1.8 1994/07/05 03:00:37 gwr Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/sun3/sun3/control.h b/sys/arch/sun3/sun3/control.h
index 9c3c3d615669..6237a8fbacbe 100644
--- a/sys/arch/sun3/sun3/control.h
+++ b/sys/arch/sun3/sun3/control.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: control.h,v 1.10 1994/10/26 09:10:01 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/sun3/control.h,v 1.9 1994/02/23 08:29:13 glass Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/sun3/delay.s b/sys/arch/sun3/sun3/delay.s
index fa87b37fc14d..c94837536d6d 100644
--- a/sys/arch/sun3/sun3/delay.s
+++ b/sys/arch/sun3/sun3/delay.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: delay.s,v 1.3 1994/10/26 09:12:24 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * 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.
- *
- *	$Id: delay.s,v 1.2 1994/07/19 02:39:18 gwr Exp $
  */
 
 | These two routines depend on the variable "cpuspeed"
diff --git a/sys/arch/sun3/sun3/disksubr.c b/sys/arch/sun3/sun3/disksubr.c
index add80de57fb5..4108de2a8a6f 100644
--- a/sys/arch/sun3/sun3/disksubr.c
+++ b/sys/arch/sun3/sun3/disksubr.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: disksubr.c,v 1.7 1994/10/26 09:12:26 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross (Sun3 changes)
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -30,9 +32,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: i386/disksubr.c,v 1.4 1994/01/11 16:38:48 mycroft
- *	$Id: disksubr.c,v 1.6 1994/07/23 03:27:28 gwr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/sun3/genassym.c b/sys/arch/sun3/sun3/genassym.c
index 72aef1016790..146cfe0ae1fe 100644
--- a/sys/arch/sun3/sun3/genassym.c
+++ b/sys/arch/sun3/sun3/genassym.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: genassym.c,v 1.22 1994/10/26 09:12:28 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Adam Glass, Gordon Ross
  * Copyright (c) 1982, 1990, 1993
@@ -31,9 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)genassym.c	8.3 (Berkeley) 1/4/94
- *	from: genassym.c,v 1.9 1994/05/23 06:14:19 mycroft
- *	$Id: genassym.c,v 1.21 1994/09/20 16:53:40 gwr Exp $
+ *	@(#)genassym.c	8.3 (Berkeley) 1/4/94
  */
 
 #define KERNEL
diff --git a/sys/arch/sun3/sun3/idprom.c b/sys/arch/sun3/sun3/idprom.c
index 413679cecd6c..809a72f84f36 100644
--- a/sys/arch/sun3/sun3/idprom.c
+++ b/sys/arch/sun3/sun3/idprom.c
@@ -1,6 +1,7 @@
+/*	$NetBSD: idprom.c,v 1.7 1994/10/26 09:08:43 cgd Exp $	*/
+
 /*
  * Machine ID PROM - system type and serial number
- * $Id: idprom.c,v 1.6 1994/05/06 07:49:15 gwr Exp $
  */
 
 #include "sys/param.h"
diff --git a/sys/arch/sun3/sun3/interreg.h b/sys/arch/sun3/sun3/interreg.h
index a948430ff894..abb7d93ec9dc 100644
--- a/sys/arch/sun3/sun3/interreg.h
+++ b/sys/arch/sun3/sun3/interreg.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: interreg.h,v 1.5 1994/10/26 09:12:31 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: interreg.h,v 1.4 1994/09/20 16:52:24 gwr Exp $
  */
 #define IREG_CLOCK_ENAB_7  0x80
 #define IREG_RESERVED      0x40
diff --git a/sys/arch/sun3/sun3/interrupt.s b/sys/arch/sun3/sun3/interrupt.s
index 7c3c3998dc4f..b23ec880d64d 100644
--- a/sys/arch/sun3/sun3/interrupt.s
+++ b/sys/arch/sun3/sun3/interrupt.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: interrupt.s,v 1.14 1994/10/26 09:12:33 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -27,8 +29,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: interrupt.s,v 1.13 1994/09/20 16:52:25 gwr Exp $
  */
 
 	.data
diff --git a/sys/arch/sun3/sun3/intersil7170.h b/sys/arch/sun3/sun3/intersil7170.h
index 35e4f14ef3d3..3a68a786d67b 100644
--- a/sys/arch/sun3/sun3/intersil7170.h
+++ b/sys/arch/sun3/sun3/intersil7170.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: intersil7170.h,v 1.7 1994/10/26 09:12:37 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: intersil7170.h,v 1.6 1994/09/26 17:25:21 gwr Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/sun3/isr.c b/sys/arch/sun3/sun3/isr.c
index dbee399a84a3..280f62252322 100644
--- a/sys/arch/sun3/sun3/isr.c
+++ b/sys/arch/sun3/sun3/isr.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: isr.c,v 1.12 1994/10/26 09:12:40 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -27,8 +29,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: isr.c,v 1.11 1994/09/20 16:52:27 gwr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/sun3/lib.s b/sys/arch/sun3/sun3/lib.s
index b369876f276b..0fc1cbb4c7b5 100644
--- a/sys/arch/sun3/sun3/lib.s
+++ b/sys/arch/sun3/sun3/lib.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: lib.s,v 1.7 1994/10/26 09:12:41 cgd Exp $	*/
+
 /*
  * This file contains excerpts from the hp300 locore.s, and no original code.
  *
@@ -39,8 +41,7 @@
  *
  * from: Utah $Hdr: locore.s 1.58 91/04/22$
  *
- *	from: @(#)locore.s	7.11 (Berkeley) 5/9/91
- *	locore.s,v 1.2 1993/05/22 07:57:30 cgd Exp
+ *	@(#)locore.s	7.11 (Berkeley) 5/9/91
  */
 /*
  * Primitives
diff --git a/sys/arch/sun3/sun3/locore.s b/sys/arch/sun3/sun3/locore.s
index 35c4fb62255d..bbf5ca8f8285 100644
--- a/sys/arch/sun3/sun3/locore.s
+++ b/sys/arch/sun3/sun3/locore.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: locore.s,v 1.21 1994/10/26 09:12:43 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -27,8 +29,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: locore.s,v 1.20 1994/09/20 16:52:28 gwr Exp $
  */
 
 #include "assym.s"
diff --git a/sys/arch/sun3/sun3/locore2.c b/sys/arch/sun3/sun3/locore2.c
index 0521b5f86bcc..b326dfe6fce8 100644
--- a/sys/arch/sun3/sun3/locore2.c
+++ b/sys/arch/sun3/sun3/locore2.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: locore2.c,v 1.25 1994/10/26 09:13:09 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -27,8 +29,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: locore2.c,v 1.24 1994/09/20 16:50:30 gwr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/sun3/m68k.s b/sys/arch/sun3/sun3/m68k.s
index 9b0a09df7ed6..4908241a888a 100644
--- a/sys/arch/sun3/sun3/m68k.s
+++ b/sys/arch/sun3/sun3/m68k.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: m68k.s,v 1.13 1994/10/26 09:12:45 cgd Exp $	*/
+
 /* XXXX some code at the bottom is from the hp300, should be moved to lib.s
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/sun3/Attic/m68k.s,v 1.12 1994/05/27 14:58:30 gwr Exp $
  */
 
 ENTRY(getvbr)
diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c
index 84eb60887c04..97cd5d586b47 100644
--- a/sys/arch/sun3/sun3/machdep.c
+++ b/sys/arch/sun3/sun3/machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: machdep.c,v 1.39 1994/10/26 09:12:47 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -37,10 +39,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: Utah Hdr: machdep.c 1.63 91/04/24
- *	from: @(#)machdep.c	7.16 (Berkeley) 6/3/91
- *	machdep.c,v 1.3 1993/07/07 07:20:03 cgd Exp
- *	$Id: machdep.c,v 1.38 1994/10/20 05:10:08 cgd Exp $
+ * from: Utah Hdr: machdep.c 1.63 91/04/24
+ *
+ *	@(#)machdep.c	7.16 (Berkeley) 6/3/91
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/sun3/mem.c b/sys/arch/sun3/sun3/mem.c
index d493c02d4a11..36ac25cbdd95 100644
--- a/sys/arch/sun3/sun3/mem.c
+++ b/sys/arch/sun3/sun3/mem.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mem.c,v 1.11 1994/10/26 09:12:50 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass 
@@ -37,9 +39,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: Utah $Hdr: mem.c 1.14 90/10/12$
- *	from: @(#)mem.c	8.3 (Berkeley) 1/12/94
- *	$Id: mem.c,v 1.10 1994/09/20 16:51:09 gwr Exp $
+ * from: Utah $Hdr: mem.c 1.14 90/10/12$
+ *
+ *	@(#)mem.c	8.3 (Berkeley) 1/12/94
  */
 
 /*
diff --git a/sys/arch/sun3/sun3/obio.c b/sys/arch/sun3/sun3/obio.c
index a01ab56d0eda..899503659c9a 100644
--- a/sys/arch/sun3/sun3/obio.c
+++ b/sys/arch/sun3/sun3/obio.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: obio.c,v 1.12 1994/10/26 09:09:14 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -27,8 +29,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: obio.c,v 1.11 1994/09/20 16:24:45 gwr Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/sun3/sun3/obio.h b/sys/arch/sun3/sun3/obio.h
index 4aec339a1102..c050bd4d8b7d 100644
--- a/sys/arch/sun3/sun3/obio.h
+++ b/sys/arch/sun3/sun3/obio.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: obio.h,v 1.11 1994/10/26 09:10:50 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: obio.h,v 1.10 1994/09/20 16:28:00 gwr Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/sun3/obmem.c b/sys/arch/sun3/sun3/obmem.c
index 7dae7b047e42..4b6daeb99c11 100644
--- a/sys/arch/sun3/sun3/obmem.c
+++ b/sys/arch/sun3/sun3/obmem.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: obmem.c,v 1.4 1994/10/26 09:09:16 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: obmem.c,v 1.3 1994/05/06 07:49:19 gwr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/sun3/obmem.h b/sys/arch/sun3/sun3/obmem.h
index 1d7c884f9a9d..b15fc0494713 100644
--- a/sys/arch/sun3/sun3/obmem.h
+++ b/sys/arch/sun3/sun3/obmem.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: obmem.h,v 1.4 1994/10/26 09:10:52 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/sun3/obmem.h,v 1.3 1994/02/04 08:20:03 glass Exp $
  */
 
 /* put something in here about framebuffers... */
diff --git a/sys/arch/sun3/sun3/pmap.c b/sys/arch/sun3/sun3/pmap.c
index 6527873a6807..7aea5af69105 100644
--- a/sys/arch/sun3/sun3/pmap.c
+++ b/sys/arch/sun3/sun3/pmap.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: pmap.c,v 1.36 1994/10/26 09:12:54 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993, 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: pmap.c,v 1.35 1994/07/29 04:04:31 gwr Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/sun3/sun3/process.s b/sys/arch/sun3/sun3/process.s
index 03041bb107b0..4dde5640b18b 100644
--- a/sys/arch/sun3/sun3/process.s
+++ b/sys/arch/sun3/sun3/process.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: process.s,v 1.18 1994/10/26 09:12:59 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Adam Glass	
  * Copyright (c) 1988 University of Utah.
@@ -38,9 +40,7 @@
  *
  * from: Utah $Hdr: locore.s 1.58 91/04/22$
  *
- *	from: @(#)locore.s	7.11 (Berkeley) 5/9/91
- *	locore.s,v 1.2 1993/05/22 07:57:30 cgd Exp
- *	$Id: process.s,v 1.17 1994/06/28 22:05:55 gwr Exp $
+ *	@(#)locore.s	7.11 (Berkeley) 5/9/91
  */
 
 /*
diff --git a/sys/arch/sun3/sun3/signal.s b/sys/arch/sun3/sun3/signal.s
index 8026642631b9..4450ec996a6c 100644
--- a/sys/arch/sun3/sun3/signal.s
+++ b/sys/arch/sun3/sun3/signal.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: signal.s,v 1.5 1994/10/26 09:13:01 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1980, 1990 The Regents of the University of California.
@@ -37,8 +39,7 @@
  *
  * from: Utah $Hdr: locore.s 1.58 91/04/22$
  *
- *	from: @(#)locore.s	7.11 (Berkeley) 5/9/91
- *	locore.s,v 1.2 1993/05/22 07:57:30 cgd Exp
+ *	@(#)locore.s	7.11 (Berkeley) 5/9/91
  */
 
 .text
diff --git a/sys/arch/sun3/sun3/softint.s b/sys/arch/sun3/sun3/softint.s
index 68b2fa3d9274..9823c45419ed 100644
--- a/sys/arch/sun3/sun3/softint.s
+++ b/sys/arch/sun3/sun3/softint.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: softint.s,v 1.8 1994/10/26 09:13:03 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1988 University of Utah.
@@ -36,10 +38,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: Utah $Hdr: locore.s 1.58 91/04/22$
- *	from: @(#)locore.s	7.11 (Berkeley) 5/9/91
+ * from: Utah $Hdr: locore.s 1.58 91/04/22$
  *
- *	$Id: softint.s,v 1.7 1994/09/20 16:52:29 gwr Exp $
+ *	@(#)locore.s	7.11 (Berkeley) 5/9/91
  */
 
 /*
diff --git a/sys/arch/sun3/sun3/stub.c b/sys/arch/sun3/sun3/stub.c
index 013b49120108..746601e2741e 100644
--- a/sys/arch/sun3/sun3/stub.c
+++ b/sys/arch/sun3/sun3/stub.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: stub.c,v 1.8 1994/10/26 09:13:05 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/sun3/Attic/stub.c,v 1.7 1994/02/04 08:21:06 glass Exp $
  */
 
 char	*memcpy(char *to, char *from, unsigned int size)
diff --git a/sys/arch/sun3/sun3/sun3_startup.c b/sys/arch/sun3/sun3/sun3_startup.c
index 501f69ddf42f..cd86218034c4 100644
--- a/sys/arch/sun3/sun3/sun3_startup.c
+++ b/sys/arch/sun3/sun3/sun3_startup.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: sun3_startup.c,v 1.25 1994/10/26 09:13:09 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass
@@ -27,8 +29,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: sun3_startup.c,v 1.24 1994/09/20 16:50:30 gwr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/sun3/swapgeneric.c b/sys/arch/sun3/sun3/swapgeneric.c
index 1194113658ce..cf58f7e6fc1e 100644
--- a/sys/arch/sun3/sun3/swapgeneric.c
+++ b/sys/arch/sun3/sun3/swapgeneric.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: swapgeneric.c,v 1.10 1994/10/26 09:13:12 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * 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: swapgeneric.c,v 1.9 1994/09/20 16:49:51 gwr Exp $
  */
 
 /*
diff --git a/sys/arch/sun3/sun3/trap.c b/sys/arch/sun3/sun3/trap.c
index 6e6442efc895..9ca85f4e4aca 100644
--- a/sys/arch/sun3/sun3/trap.c
+++ b/sys/arch/sun3/sun3/trap.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: trap.c,v 1.30 1994/10/26 09:13:14 cgd Exp $	*/
+
 /*
  * Copyright (c) 1994 Gordon W. Ross
  * Copyright (c) 1993 Adam Glass 
@@ -37,9 +39,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: Utah Hdr: trap.c 1.37 92/12/20
- *	from: @(#)trap.c	8.5 (Berkeley) 1/4/94
- *	$Id: trap.c,v 1.29 1994/10/20 05:10:15 cgd Exp $
+ * from: Utah Hdr: trap.c 1.37 92/12/20
+ *
+ *	@(#)trap.c	8.5 (Berkeley) 1/4/94
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/sun3/trap.s b/sys/arch/sun3/sun3/trap.s
index 426e6abffcb2..40c12d9e9a49 100644
--- a/sys/arch/sun3/sun3/trap.s
+++ b/sys/arch/sun3/sun3/trap.s
@@ -1,3 +1,5 @@
+/*	$NetBSD: trap.s,v 1.8 1994/10/26 09:13:17 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Adam Glass
  * Copyright (c) 1988 University of Utah.
@@ -38,8 +40,7 @@
  *
  * from: Utah $Hdr: locore.s 1.58 91/04/22$
  *
- *	from: @(#)locore.s	7.11 (Berkeley) 5/9/91
- *	locore.s,v 1.2 1993/05/22 07:57:30 cgd Exp
+ *	@(#)locore.s	7.11 (Berkeley) 5/9/91
  */
 
 /*
diff --git a/sys/arch/sun3/sun3/vector.c b/sys/arch/sun3/sun3/vector.c
index 089583a49997..42aa629dd42f 100644
--- a/sys/arch/sun3/sun3/vector.c
+++ b/sys/arch/sun3/sun3/vector.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: vector.c,v 1.9 1994/10/26 09:13:19 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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: vector.c,v 1.8 1994/05/06 07:47:14 gwr Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/sun3/sun3/vector.h b/sys/arch/sun3/sun3/vector.h
index 87211baffd94..01c04c0887de 100644
--- a/sys/arch/sun3/sun3/vector.h
+++ b/sys/arch/sun3/sun3/vector.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: vector.h,v 1.6 1994/10/26 09:13:21 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 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.
- *
- * $Header: /cvsroot/src/sys/arch/sun3/sun3/Attic/vector.h,v 1.5 1994/02/04 08:21:12 glass Exp $
  */
 
 #define COPY_ENTRY 0
diff --git a/sys/arch/sun3/sun3/vm_machdep.c b/sys/arch/sun3/sun3/vm_machdep.c
index 51d9c03dfef1..b67356e863a2 100644
--- a/sys/arch/sun3/sun3/vm_machdep.c
+++ b/sys/arch/sun3/sun3/vm_machdep.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: vm_machdep.c,v 1.19 1994/10/26 09:13:23 cgd Exp $	*/
+
 /*
  * Copyright (c) 1993 Adam Glass 
  * Copyright (c) 1988 University of Utah.
@@ -36,10 +38,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: Utah $Hdr: vm_machdep.c 1.21 91/04/06$
- *	from: @(#)vm_machdep.c	7.10 (Berkeley) 5/7/91
- *	vm_machdep.c,v 1.3 1993/07/07 07:09:32 cgd Exp
- *	$Id: vm_machdep.c,v 1.18 1994/07/23 03:23:15 gwr Exp $
+ * from: Utah $Hdr: vm_machdep.c 1.21 91/04/06$
+ *
+ *	@(#)vm_machdep.c	7.10 (Berkeley) 5/7/91
  */
 
 #include <sys/param.h>