$OpenBSD$

136 files changed, 169 insertions, 139 deletions

diff --git a/sys/arch/arc/Makefile b/sys/arch/arc/Makefile
index bf6efe7852c..6bf5aeaf816 100644
--- a/sys/arch/arc/Makefile
+++ b/sys/arch/arc/Makefile
@@ -1,5 +1,5 @@
+#	$OpenBSD: Makefile,v 1.6 2000/03/03 00:54:45 todd Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/16/93
-#	$Id: Makefile,v 1.5 1997/05/19 10:34:53 pefo Exp $
 
 # Makefile for arc links, tags file
 
diff --git a/sys/arch/arm32/arm32/bcopy.S b/sys/arch/arm32/arm32/bcopy.S
index 09134c1a9f0..d2092567df5 100644
--- a/sys/arch/arm32/arm32/bcopy.S
+++ b/sys/arch/arm32/arm32/bcopy.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: bcopy.S,v 1.2 2000/03/03 00:54:46 todd Exp $ */
 /* $NetBSD: bcopy.S,v 1.1 1996/01/31 23:15:12 mark Exp $ */
 
 /*
@@ -43,7 +44,6 @@
  * Created      : 16/05/95
  * Last updated : 16/05/95
  *
- *    $Id: bcopy.S,v 1.1 1996/04/24 11:08:23 deraadt Exp $
  */
 
 sp	.req	r13
diff --git a/sys/arch/arm32/arm32/bcopy_page.S b/sys/arch/arm32/arm32/bcopy_page.S
index 59dbf61896c..c1f3d895b60 100644
--- a/sys/arch/arm32/arm32/bcopy_page.S
+++ b/sys/arch/arm32/arm32/bcopy_page.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: bcopy_page.S,v 1.2 2000/03/03 00:54:46 todd Exp $ */
 /* $NetBSD: bcopy_page.S,v 1.1 1996/01/31 23:15:17 mark Exp $ */
 
 /*
@@ -38,7 +39,6 @@
  * Created      : 08/04/95
  * Last updated : 12/05/95
  *
- *    $Id: bcopy_page.S,v 1.1 1996/04/24 11:08:23 deraadt Exp $
  */
 
 #include <machine/param.h>
diff --git a/sys/arch/arm32/arm32/bcopyinout.S b/sys/arch/arm32/arm32/bcopyinout.S
index c56e07b9655..b119f256482 100644
--- a/sys/arch/arm32/arm32/bcopyinout.S
+++ b/sys/arch/arm32/arm32/bcopyinout.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: bcopyinout.S,v 1.2 2000/03/03 00:54:46 todd Exp $ */
 /* $NetBSD: bcopyinout.S,v 1.3 1996/02/02 18:05:47 mycroft Exp $ */
 
 /*
@@ -43,7 +44,6 @@
  * Created      : 16/05/95
  * Last updated : 16/05/95
  *
- *    $Id: bcopyinout.S,v 1.1 1996/04/24 11:08:24 deraadt Exp $
  */
 
 #include "assym.h"
diff --git a/sys/arch/arm32/arm32/blockio.S b/sys/arch/arm32/arm32/blockio.S
index 71eb6012d6b..ae69bfe3847 100644
--- a/sys/arch/arm32/arm32/blockio.S
+++ b/sys/arch/arm32/arm32/blockio.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: blockio.S,v 1.2 2000/03/03 00:54:46 todd Exp $ */
 /* $NetBSD: blockio.S,v 1.1 1996/01/31 23:15:22 mark Exp $ */
 
 /*
@@ -43,7 +44,6 @@
  * Created      : 08/10/94
  * Last updated : 12/05/95
  *
- *    $Id: blockio.S,v 1.1 1996/04/24 11:08:24 deraadt Exp $
  */
 
 sp	.req	r13
diff --git a/sys/arch/arm32/arm32/coproc15.S b/sys/arch/arm32/arm32/coproc15.S
index 5371442b7d5..7ca9bab5349 100644
--- a/sys/arch/arm32/arm32/coproc15.S
+++ b/sys/arch/arm32/arm32/coproc15.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: coproc15.S,v 1.2 2000/03/03 00:54:46 todd Exp $ */
 /* $NetBSD: coproc15.S,v 1.1 1996/01/31 23:15:33 mark Exp $ */
 
 /*
@@ -45,7 +46,6 @@
  *
  * Based on arm/readcoproc15.S & arm/writecoproc15.S
  *
- *    $Id: coproc15.S,v 1.1 1996/04/24 11:08:24 deraadt Exp $
  */
 
 lr	.req	r14
diff --git a/sys/arch/arm32/arm32/fiq.S b/sys/arch/arm32/arm32/fiq.S
index 0d33ab34478..1fe9f1bf88a 100644
--- a/sys/arch/arm32/arm32/fiq.S
+++ b/sys/arch/arm32/arm32/fiq.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: fiq.S,v 1.2 2000/03/03 00:54:46 todd Exp $ */
 /* $NetBSD: fiq.S,v 1.1 1996/01/31 23:15:55 mark Exp $ */
 
 /*
@@ -43,7 +44,6 @@
  * Created      : 27/09/94
  * Last updated : 28/11/94
  *
- *    $Id: fiq.S,v 1.1 1996/04/24 11:08:26 deraadt Exp $
  */
 
 #include <machine/cpu.h>
diff --git a/sys/arch/arm32/arm32/mcount.S b/sys/arch/arm32/arm32/mcount.S
index adf47d493de..9d032d8769c 100644
--- a/sys/arch/arm32/arm32/mcount.S
+++ b/sys/arch/arm32/arm32/mcount.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: mcount.S,v 1.2 2000/03/03 00:54:46 todd Exp $ */
 /* $NetBSD: mcount.S,v 1.1 1996/01/31 23:16:32 mark Exp $ */
 
 /*
@@ -30,7 +31,6 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcount.S,v 1.1 1996/04/24 11:08:27 deraadt Exp $
  */
 
 fp	.req	r11
diff --git a/sys/arch/arm32/arm32/memset.S b/sys/arch/arm32/arm32/memset.S
index 22dc289daac..99f32875ba3 100644
--- a/sys/arch/arm32/arm32/memset.S
+++ b/sys/arch/arm32/arm32/memset.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: memset.S,v 1.2 2000/03/03 00:54:46 todd Exp $ */
 /* $NetBSD: memset.S,v 1.1 1996/01/31 23:16:35 mark Exp $ */
 
 /*
@@ -41,7 +42,6 @@
  * Created      : 16/05/95
  * Last updated : 16/05/95
  *
- *    $Id: memset.S,v 1.1 1996/04/24 11:08:28 deraadt Exp $
  */
 
 sp	.req	r13
diff --git a/sys/arch/arm32/arm32/scratch.S b/sys/arch/arm32/arm32/scratch.S
index 75181a93225..9e7ed161846 100644
--- a/sys/arch/arm32/arm32/scratch.S
+++ b/sys/arch/arm32/arm32/scratch.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: scratch.S,v 1.2 2000/03/03 00:54:46 todd Exp $ */
 /* $NetBSD: scratch.S,v 1.2 1996/02/02 02:35:49 mycroft Exp $ */
 
 /*
@@ -41,7 +42,6 @@
  * Created      : 02/04/95
  * Last updated : 04/06/95
  *
- *    $Id: scratch.S,v 1.1 1996/04/24 11:08:28 deraadt Exp $
  */
 
 #include "assym.h"
diff --git a/sys/arch/arm32/arm32/setcpsr.S b/sys/arch/arm32/arm32/setcpsr.S
index d365a54f483..50d2e7c7aaa 100644
--- a/sys/arch/arm32/arm32/setcpsr.S
+++ b/sys/arch/arm32/arm32/setcpsr.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: setcpsr.S,v 1.2 2000/03/03 00:54:46 todd Exp $ */
 /* $NetBSD: setcpsr.S,v 1.1 1996/01/31 23:16:54 mark Exp $ */
 
 /*
@@ -47,7 +48,6 @@
  *
  * Based of kate/display/setcpsr.s
  *
- *    $Id: setcpsr.S,v 1.1 1996/04/24 11:08:28 deraadt Exp $
  */
 
 fp      .req    r11
diff --git a/sys/arch/arm32/arm32/setstack.S b/sys/arch/arm32/arm32/setstack.S
index 5992d323a13..87e3591f14b 100644
--- a/sys/arch/arm32/arm32/setstack.S
+++ b/sys/arch/arm32/arm32/setstack.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: setstack.S,v 1.2 2000/03/03 00:54:46 todd Exp $ */
 /* $NetBSD: setstack.S,v 1.1 1996/01/31 23:16:59 mark Exp $ */
 
 /*
@@ -47,7 +48,6 @@
  *
  * Based of kate/display/setstack.s
  *
- *    $Id: setstack.S,v 1.1 1996/04/24 11:08:28 deraadt Exp $
  */
 
 #include <machine/cpu.h>
diff --git a/sys/arch/arm32/arm32/spl.S b/sys/arch/arm32/arm32/spl.S
index d5b10c96569..62733c69e82 100644
--- a/sys/arch/arm32/arm32/spl.S
+++ b/sys/arch/arm32/arm32/spl.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: spl.S,v 1.2 2000/03/03 00:54:46 todd Exp $ */
 /* $NetBSD: spl.S,v 1.1 1996/03/08 18:03:15 mark Exp $ */
 
 /*
@@ -40,7 +41,6 @@
  *
  * Created      : 01/03/96
  *
- *    $Id: spl.S,v 1.1 1996/04/24 11:08:28 deraadt Exp $
  */
 
 #include "assym.h"
diff --git a/sys/arch/arm32/boot/Makefile b/sys/arch/arm32/boot/Makefile
index 1e7620c74d4..22eba77ebe4 100644
--- a/sys/arch/arm32/boot/Makefile
+++ b/sys/arch/arm32/boot/Makefile
@@ -1,3 +1,4 @@
+# $OpenBSD: Makefile,v 1.2 2000/03/03 00:54:46 todd Exp $
 # $NetBSD: Makefile,v 1.2 1996/02/01 22:29:25 mycroft Exp $
 
 # Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +43,6 @@
 # Created      : 14/01/96
 # Last updated : 14/01/96
 #
-#	$Id: Makefile,v 1.1 1996/04/24 11:08:30 deraadt Exp $
 #
 
 S=	../../..
diff --git a/sys/arch/arm32/boot/_bsdboot.S b/sys/arch/arm32/boot/_bsdboot.S
index 423a9545f98..26de26c5999 100644
--- a/sys/arch/arm32/boot/_bsdboot.S
+++ b/sys/arch/arm32/boot/_bsdboot.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: _bsdboot.S,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: _bsdboot.S,v 1.1 1996/01/31 23:17:52 mark Exp $ */
 
 /* Copyright (c) 1994 Mark Brinicombe.
@@ -44,7 +45,6 @@
  *
  * Based on kate/boot/_boot.s
  *
- *	$Id: _bsdboot.S,v 1.1 1996/04/24 11:08:31 deraadt Exp $
  */
 
 #include "regs.h"
diff --git a/sys/arch/arm32/boot/_main.S b/sys/arch/arm32/boot/_main.S
index 9ea91fe6cd2..94f95b1d2a3 100644
--- a/sys/arch/arm32/boot/_main.S
+++ b/sys/arch/arm32/boot/_main.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: _main.S,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: _main.S,v 1.1 1996/01/31 23:17:57 mark Exp $ */
 
 /* Copyright (c) 1994 Mark Brinicombe.
@@ -44,7 +45,6 @@
  *
  * Based on kate/boot/_main.s
  *
- *	$Id: _main.S,v 1.1 1996/04/24 11:08:31 deraadt Exp $
  */
 
 #include "regs.h"
diff --git a/sys/arch/arm32/boot/areahand.S b/sys/arch/arm32/boot/areahand.S
index fe0a2f26e54..fa5cb98ec36 100644
--- a/sys/arch/arm32/boot/areahand.S
+++ b/sys/arch/arm32/boot/areahand.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: areahand.S,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: areahand.S,v 1.1 1996/01/31 23:18:01 mark Exp $ */
 
 /*
@@ -43,7 +44,6 @@
  * Created      : 12/09/94
  * Last updated : 12/09/94
  *
- *    $Id: areahand.S,v 1.1 1996/04/24 11:08:31 deraadt Exp $
  */
 
 #include "regs.h"
diff --git a/sys/arch/arm32/boot/bsdbooter.c b/sys/arch/arm32/boot/bsdbooter.c
index 4e9e8eca485..7ac1b66221a 100644
--- a/sys/arch/arm32/boot/bsdbooter.c
+++ b/sys/arch/arm32/boot/bsdbooter.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: bsdbooter.c,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: bsdbooter.c,v 1.1 1996/01/31 23:18:08 mark Exp $ */
 
 /*
@@ -44,7 +45,6 @@
  *
  * Based on kate/boot/boot.c
  *
- *    $Id: bsdbooter.c,v 1.1 1996/04/24 11:08:31 deraadt Exp $
  */
 
 /* Include standard header files */
diff --git a/sys/arch/arm32/boot/enteros.S b/sys/arch/arm32/boot/enteros.S
index d3ba96691ef..4989efbb991 100644
--- a/sys/arch/arm32/boot/enteros.S
+++ b/sys/arch/arm32/boot/enteros.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: enteros.S,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: enteros.S,v 1.1 1996/01/31 23:18:11 mark Exp $ */
 
 /*
@@ -43,7 +44,6 @@
  *
  * Based on kate/library/enteros.s
  *
- *    $Id: enteros.S,v 1.1 1996/04/24 11:08:31 deraadt Exp $
  */
 
 #include "regs.h"
diff --git a/sys/arch/arm32/boot/exit.S b/sys/arch/arm32/boot/exit.S
index 5b80912bb74..cdd76e21507 100644
--- a/sys/arch/arm32/boot/exit.S
+++ b/sys/arch/arm32/boot/exit.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: exit.S,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: exit.S,v 1.1 1996/01/31 23:18:14 mark Exp $ */
 
 /*
@@ -45,7 +46,6 @@
  *
  * Based on kate/boot/_exit.s
  *
- *    $Id: exit.S,v 1.1 1996/04/24 11:08:32 deraadt Exp $
  */
 
 #include "regs.h"
diff --git a/sys/arch/arm32/boot/exitos.S b/sys/arch/arm32/boot/exitos.S
index be9639067d2..5e956ae76dc 100644
--- a/sys/arch/arm32/boot/exitos.S
+++ b/sys/arch/arm32/boot/exitos.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: exitos.S,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: exitos.S,v 1.1 1996/01/31 23:18:16 mark Exp $ */
 
 /*
@@ -45,7 +46,6 @@
  *
  * Based on kate/library/exitos.s
  *
- *    $Id: exitos.S,v 1.1 1996/04/24 11:08:32 deraadt Exp $
  *
  */
 
diff --git a/sys/arch/arm32/boot/memcpy.S b/sys/arch/arm32/boot/memcpy.S
index 68f843c7771..e7243b0f939 100644
--- a/sys/arch/arm32/boot/memcpy.S
+++ b/sys/arch/arm32/boot/memcpy.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: memcpy.S,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: memcpy.S,v 1.1 1996/01/31 23:18:17 mark Exp $ */
 
 /*
@@ -43,7 +44,6 @@
  * Created      : 16/05/95
  * Last updated : 16/05/95
  *
- *    $Id: memcpy.S,v 1.1 1996/04/24 11:08:32 deraadt Exp $
  */
 
 sp	.req	r13
diff --git a/sys/arch/arm32/boot/memset.S b/sys/arch/arm32/boot/memset.S
index ea7d5186889..46796be5fca 100644
--- a/sys/arch/arm32/boot/memset.S
+++ b/sys/arch/arm32/boot/memset.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: memset.S,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: memset.S,v 1.1 1996/01/31 23:18:19 mark Exp $ */
 
 /*
@@ -41,7 +42,6 @@
  * Created      : 16/05/95
  * Last updated : 16/05/95
  *
- *    $Id: memset.S,v 1.1 1996/04/24 11:08:32 deraadt Exp $
  */
 
 sp	.req	r13
diff --git a/sys/arch/arm32/boot/regs.h b/sys/arch/arm32/boot/regs.h
index da4d78b5e2f..2a08b6424ed 100644
--- a/sys/arch/arm32/boot/regs.h
+++ b/sys/arch/arm32/boot/regs.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: regs.h,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: regs.h,v 1.1 1996/01/31 23:18:21 mark Exp $ */
 
 /* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +43,6 @@
  * Created      : 14/01/96
  * Last updated : 14/01/96
  *
- *	$Id: regs.h,v 1.1 1996/04/24 11:08:32 deraadt Exp $
  */
 
 fp	.req	r11
diff --git a/sys/arch/arm32/boot/setcpsr.S b/sys/arch/arm32/boot/setcpsr.S
index e8324c6c67d..d0ab3ff21c2 100644
--- a/sys/arch/arm32/boot/setcpsr.S
+++ b/sys/arch/arm32/boot/setcpsr.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: setcpsr.S,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: setcpsr.S,v 1.1 1996/01/31 23:18:27 mark Exp $ */
 
 /*
@@ -47,7 +48,6 @@
  *
  * Based of kate/display/setcpsr.s
  *
- *    $Id: setcpsr.S,v 1.1 1996/04/24 11:08:32 deraadt Exp $
  */
 
 fp      .req    r11
diff --git a/sys/arch/arm32/boot/start.S b/sys/arch/arm32/boot/start.S
index 9f459fcd262..2ccb54700a5 100644
--- a/sys/arch/arm32/boot/start.S
+++ b/sys/arch/arm32/boot/start.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: start.S,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: start.S,v 1.1 1996/01/31 23:18:30 mark Exp $ */
 
 /* Copyright (c) 1994 Mark Brinicombe.
@@ -44,7 +45,6 @@
  *
  * Based on kate/boot/_main.s
  *
- *	$Id: start.S,v 1.1 1996/04/24 11:08:32 deraadt Exp $
  */
 
 #include "regs.h"
diff --git a/sys/arch/arm32/boot/strstr.c b/sys/arch/arm32/boot/strstr.c
index b05275a4339..ce199dff82a 100644
--- a/sys/arch/arm32/boot/strstr.c
+++ b/sys/arch/arm32/boot/strstr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strstr.c,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: strstr.c,v 1.1 1996/01/31 23:18:34 mark Exp $ */
 
 /*
@@ -37,7 +38,6 @@
  *
  *	from: strstr.c,v 1.4 1995/06/15 00:08:43 jtc Exp 
  *
- *	$Id: strstr.c,v 1.1 1996/04/24 11:08:32 deraadt Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/arm32/boot/svc32.S b/sys/arch/arm32/boot/svc32.S
index 7e46c938197..db6cabae3f4 100644
--- a/sys/arch/arm32/boot/svc32.S
+++ b/sys/arch/arm32/boot/svc32.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: svc32.S,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: svc32.S,v 1.1 1996/01/31 23:18:38 mark Exp $ */
 
 /*
@@ -43,7 +44,6 @@
  *
  * Based on kate/library/svc32.s
  *
- *    $Id: svc32.S,v 1.1 1996/04/24 11:08:32 deraadt Exp $
  */
 
 #include "regs.h"
diff --git a/sys/arch/arm32/dev/console/fonts/font_bold.h b/sys/arch/arm32/dev/console/fonts/font_bold.h
index 86d6000e2d4..f3a792f24f5 100644
--- a/sys/arch/arm32/dev/console/fonts/font_bold.h
+++ b/sys/arch/arm32/dev/console/fonts/font_bold.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: font_bold.h,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: font_bold.h,v 1.1 1996/01/31 23:20:07 mark Exp $ */
 
 /*
@@ -45,7 +46,6 @@
  *
  * Based on kate/display/14bold.h
  *
- *    $Id: font_bold.h,v 1.1 1996/04/24 11:08:37 deraadt Exp $
  */
  
 unsigned char font_terminal_14bold_data[] = {
diff --git a/sys/arch/arm32/dev/console/fonts/font_italic.h b/sys/arch/arm32/dev/console/fonts/font_italic.h
index 30b80f489b3..dd9b00dedbe 100644
--- a/sys/arch/arm32/dev/console/fonts/font_italic.h
+++ b/sys/arch/arm32/dev/console/fonts/font_italic.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: font_italic.h,v 1.2 2000/03/03 00:54:47 todd Exp $ */
 /* $NetBSD: font_italic.h,v 1.1 1996/01/31 23:20:13 mark Exp $ */
 
 /*
@@ -45,7 +46,6 @@
  *
  * Based on kate/display/14norm.h
  *
- *    $Id: font_italic.h,v 1.1 1996/04/24 11:08:37 deraadt Exp $
  */
  
 unsigned char font_terminal_14italic_data[] = {
diff --git a/sys/arch/arm32/dev/console/fonts/font_normal.h b/sys/arch/arm32/dev/console/fonts/font_normal.h
index 946cfc7065a..dfe8c017061 100644
--- a/sys/arch/arm32/dev/console/fonts/font_normal.h
+++ b/sys/arch/arm32/dev/console/fonts/font_normal.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: font_normal.h,v 1.2 2000/03/03 00:54:48 todd Exp $ */
 /* $NetBSD: font_normal.h,v 1.1 1996/01/31 23:20:16 mark Exp $ */
 
 /*
@@ -45,7 +46,6 @@
  *
  * Based on kate/display/14norm.h
  *
- *    $Id: font_normal.h,v 1.1 1996/04/24 11:08:38 deraadt Exp $
  */
  
 unsigned char font_terminal_14normal_data[] = {
diff --git a/sys/arch/arm32/dev/console/fonts/font_wide.h b/sys/arch/arm32/dev/console/fonts/font_wide.h
index eab1b466e57..646ecec35a9 100644
--- a/sys/arch/arm32/dev/console/fonts/font_wide.h
+++ b/sys/arch/arm32/dev/console/fonts/font_wide.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: font_wide.h,v 1.2 2000/03/03 00:54:48 todd Exp $ */
 /* $NetBSD: font_wide.h,v 1.1 1996/01/31 23:20:22 mark Exp $ */
 
 /*
@@ -45,7 +46,6 @@
  *
  * Based on kate/display/14widen.h
  *
- *    $Id: font_wide.h,v 1.1 1996/04/24 11:08:38 deraadt Exp $
  */
  
 unsigned char font_terminal_14widen_data[] = {
diff --git a/sys/arch/arm32/doc/majors+minors b/sys/arch/arm32/doc/majors+minors
index 7d8bb241a42..e7db42e6d8c 100644
--- a/sys/arch/arm32/doc/majors+minors
+++ b/sys/arch/arm32/doc/majors+minors
@@ -1,3 +1,4 @@
+/* $OpenBSD: majors+minors,v 1.2 2000/03/03 00:54:48 todd Exp $ */
 /* $NetBSD: majors+minors,v 1.3 1996/04/19 20:04:29 mark Exp $ */
 
 /*
@@ -40,7 +41,6 @@
  * Created      : 17/09/94
  * Last updated : 30/12/95
  *
- *    $Id: majors+minors,v 1.1 1996/04/24 11:08:39 deraadt Exp $
  */
 
 List of allocated and reserved major and minor numbers
diff --git a/sys/arch/arm32/include/vconsole.h b/sys/arch/arm32/include/vconsole.h
index 06276d58213..fa4f66dc3c9 100644
--- a/sys/arch/arm32/include/vconsole.h
+++ b/sys/arch/arm32/include/vconsole.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: vconsole.h,v 1.2 2000/03/03 00:54:48 todd Exp $ */
 /* $NetBSD: vconsole.h,v 1.1 1996/01/31 23:23:29 mark Exp $ */
 
 /*
@@ -42,7 +43,6 @@
  * Created      : 18/09/94
  * Last updated : 10/01/96
  *
- *    $Id: vconsole.h,v 1.1 1996/04/24 11:08:46 deraadt Exp $
  */
 
 #ifdef _KERNEL
diff --git a/sys/arch/arm32/include/vidc.h b/sys/arch/arm32/include/vidc.h
index 65a71342f98..d6a03030ef4 100644
--- a/sys/arch/arm32/include/vidc.h
+++ b/sys/arch/arm32/include/vidc.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: vidc.h,v 1.2 2000/03/03 00:54:48 todd Exp $ */
 /* $NetBSD: vidc.h,v 1.2 1996/03/28 21:22:24 mark Exp $ */
 
 /*
@@ -45,7 +46,6 @@
  *
  * Based on kate/display/vidc.h
  *
- *    $Id: vidc.h,v 1.1 1996/04/24 11:08:46 deraadt Exp $
  */
 
 #ifndef __vidc_h
diff --git a/sys/arch/arm32/include/vmparam.h b/sys/arch/arm32/include/vmparam.h
index 7d3e86adeda..1eee5defba7 100644
--- a/sys/arch/arm32/include/vmparam.h
+++ b/sys/arch/arm32/include/vmparam.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: vmparam.h,v 1.2 2000/03/03 00:54:48 todd Exp $ */
 /* $NetBSD: vmparam.h,v 1.1 1996/01/31 23:23:37 mark Exp $ */
 
 /*
@@ -32,7 +33,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vmparam.h,v 1.1 1996/04/24 11:08:46 deraadt Exp $
  */
 
 #ifndef	_ARM32_VMPARAM_H_
diff --git a/sys/arch/atari/stand/tostools/aptck/aptck.in b/sys/arch/atari/stand/tostools/aptck/aptck.in
index a16c3d31428..7026db9dd13 100644
--- a/sys/arch/atari/stand/tostools/aptck/aptck.in
+++ b/sys/arch/atari/stand/tostools/aptck/aptck.in
@@ -1,3 +1,4 @@
+/*	$OpenBSD: aptck.in,v 1.2 2000/03/03 00:54:48 todd Exp $	*/
 /*	$NetBSD: aptck.in,v 1.1.1.1 1996/01/07 21:54:17 leo Exp $	*/
 
 /*
@@ -44,7 +45,7 @@ static void	usage   PROTO((void)) NORETURN;
 static void
 version()
 {
-	eprintf("%s\n", "$Revision: 1.1 $");
+	eprintf("%s\n", "$Revision: 1.2 $");
 	xexit(EXIT_SUCCESS);
 }
 
diff --git a/sys/arch/atari/stand/tostools/chg_pid/chg_pid.c b/sys/arch/atari/stand/tostools/chg_pid/chg_pid.c
index 553f75ff398..c9ee76c6207 100644
--- a/sys/arch/atari/stand/tostools/chg_pid/chg_pid.c
+++ b/sys/arch/atari/stand/tostools/chg_pid/chg_pid.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: chg_pid.c,v 1.4 2000/03/03 00:54:48 todd Exp $	*/
 /*	$NetBSD: chg_pid.c,v 1.3 1996/01/09 09:55:06 leo Exp $	*/
 
 /*
@@ -95,7 +96,7 @@ int	read_block	PROTO((void *, int, int));
 int	write_block	PROTO((void *, int, int));
 void	set_csum	PROTO((char *));
 
-const char version[] = "$Revision: 1.3 $";
+const char version[] = "$Revision: 1.4 $";
 
 char	*Progname = NULL;		/* What are we called		*/
 int	t_flag    = 0;			/* Test -- don't actually do it	*/
diff --git a/sys/arch/atari/stand/tostools/loadbsd/loadbsd.c b/sys/arch/atari/stand/tostools/loadbsd/loadbsd.c
index 649b4ff664b..31d1070538f 100644
--- a/sys/arch/atari/stand/tostools/loadbsd/loadbsd.c
+++ b/sys/arch/atari/stand/tostools/loadbsd/loadbsd.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: loadbsd.c,v 1.4 2000/03/03 00:54:49 todd Exp $	*/
 /*	$NetBSD: loadbsd.c,v 1.11 1996/01/09 09:55:15 leo Exp $	*/
 
 /*
@@ -52,7 +53,7 @@ int	s_flag  = 0;		/* St-ram only			*/
 int	t_flag  = 0;		/* Just test, do not execute	*/
 int	v_flag  = 0;		/* show version			*/
 
-const char version[] = "$Revision: 1.3 $";
+const char version[] = "$Revision: 1.4 $";
 
 /*
  * Default name of kernel to boot, large enough to patch
diff --git a/sys/arch/atari/stand/tostools/rawwrite/rawwrite.c b/sys/arch/atari/stand/tostools/rawwrite/rawwrite.c
index d9eed90059a..cf770b0aad8 100644
--- a/sys/arch/atari/stand/tostools/rawwrite/rawwrite.c
+++ b/sys/arch/atari/stand/tostools/rawwrite/rawwrite.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: rawwrite.c,v 1.4 2000/03/03 00:54:49 todd Exp $	*/
 /*	$NetBSD: rawwrite.c,v 1.3 1996/01/09 09:55:17 leo Exp $	*/
 
 /*
@@ -53,7 +54,7 @@ int	v_flag = 0;	/* Verbose (a dot for each track copied)	*/
 int	V_flag = 0;	/* Show version					*/
 char	*progname;
 
-const char version[] = "$Revision: 1.3 $";
+const char version[] = "$Revision: 1.4 $";
 
 int
 main(argc, argv)
diff --git a/sys/arch/kbus/dev/rd.c b/sys/arch/kbus/dev/rd.c
index aa9d9be66d6..195e0e0b8f3 100644
--- a/sys/arch/kbus/dev/rd.c
+++ b/sys/arch/kbus/dev/rd.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: rd.c,v 1.2 2000/03/03 00:54:49 todd Exp $	*/
 /*
  * Copyright (c) 1995 Philip A. Nelson.
  * All rights reserved.
@@ -27,7 +28,6 @@
  * (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: rd.c,v 1.1 1997/10/14 07:25:30 gingold Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/kbus/kbus/clockreg.h b/sys/arch/kbus/kbus/clockreg.h
index 715fdc5cd02..675088b10aa 100644
--- a/sys/arch/kbus/kbus/clockreg.h
+++ b/sys/arch/kbus/kbus/clockreg.h
@@ -1,4 +1,4 @@
-/*	$Id: clockreg.h,v 1.1 1997/10/14 07:25:34 gingold Exp $ */
+/*	$OpenBSD: clockreg.h,v 1.2 2000/03/03 00:54:49 todd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
diff --git a/sys/arch/kbus/stand/netboot/Makefile b/sys/arch/kbus/stand/netboot/Makefile
index 90e67a4604d..6678c54e378 100644
--- a/sys/arch/kbus/stand/netboot/Makefile
+++ b/sys/arch/kbus/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1997/10/14 07:25:32 gingold Exp $
+#	$OpenBSD: Makefile,v 1.2 2000/03/03 00:54:49 todd Exp $
 
 RELOC=0xfff10000
 
diff --git a/sys/arch/kbus/stand/netboot/boot.c b/sys/arch/kbus/stand/netboot/boot.c
index 794604b42ff..a004e0394de 100644
--- a/sys/arch/kbus/stand/netboot/boot.c
+++ b/sys/arch/kbus/stand/netboot/boot.c
@@ -1,4 +1,4 @@
-/*	$Id: boot.c,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: boot.c,v 1.2 2000/03/03 00:54:49 todd Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/kbus/stand/netboot/clockreg.h b/sys/arch/kbus/stand/netboot/clockreg.h
index 187d23f97a4..eb9b5160c81 100644
--- a/sys/arch/kbus/stand/netboot/clockreg.h
+++ b/sys/arch/kbus/stand/netboot/clockreg.h
@@ -1,4 +1,4 @@
-/*	$Id: clockreg.h,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: clockreg.h,v 1.2 2000/03/03 00:54:50 todd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
diff --git a/sys/arch/kbus/stand/netboot/conf.c b/sys/arch/kbus/stand/netboot/conf.c
index 52fac630459..2f916cedcf2 100644
--- a/sys/arch/kbus/stand/netboot/conf.c
+++ b/sys/arch/kbus/stand/netboot/conf.c
@@ -1,4 +1,4 @@
-/*	$Id: conf.c,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: conf.c,v 1.2 2000/03/03 00:54:50 todd Exp $ */
 
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/sys/arch/kbus/stand/netboot/config.h b/sys/arch/kbus/stand/netboot/config.h
index 87c8c588354..40fcdcde198 100644
--- a/sys/arch/kbus/stand/netboot/config.h
+++ b/sys/arch/kbus/stand/netboot/config.h
@@ -1,4 +1,4 @@
-/*	$Id: config.h,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: config.h,v 1.2 2000/03/03 00:54:50 todd Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/kbus/stand/netboot/dev_disk.c b/sys/arch/kbus/stand/netboot/dev_disk.c
index 00b4a229942..d21fa2b942e 100644
--- a/sys/arch/kbus/stand/netboot/dev_disk.c
+++ b/sys/arch/kbus/stand/netboot/dev_disk.c
@@ -1,4 +1,4 @@
-/*	$Id: dev_disk.c,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: dev_disk.c,v 1.2 2000/03/03 00:54:50 todd Exp $ */
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
diff --git a/sys/arch/kbus/stand/netboot/dev_net.c b/sys/arch/kbus/stand/netboot/dev_net.c
index 1fa0ec84fb9..8e0f80dc4b9 100644
--- a/sys/arch/kbus/stand/netboot/dev_net.c
+++ b/sys/arch/kbus/stand/netboot/dev_net.c
@@ -1,4 +1,4 @@
-/*	$Id: dev_net.c,v 1.2 1999/01/11 05:11:30 millert Exp $ */
+/*	$OpenBSD: dev_net.c,v 1.3 2000/03/03 00:54:50 todd Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
diff --git a/sys/arch/kbus/stand/netboot/exec_sun.c b/sys/arch/kbus/stand/netboot/exec_sun.c
index 0b377467614..6fd253ee258 100644
--- a/sys/arch/kbus/stand/netboot/exec_sun.c
+++ b/sys/arch/kbus/stand/netboot/exec_sun.c
@@ -1,4 +1,4 @@
-/*	$Id: exec_sun.c,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: exec_sun.c,v 1.2 2000/03/03 00:54:50 todd Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/kbus/stand/netboot/gets.c b/sys/arch/kbus/stand/netboot/gets.c
index 20f4c4bb4ca..1670f5586eb 100644
--- a/sys/arch/kbus/stand/netboot/gets.c
+++ b/sys/arch/kbus/stand/netboot/gets.c
@@ -1,4 +1,4 @@
-/*	$Id: gets.c,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: gets.c,v 1.2 2000/03/03 00:54:50 todd Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/kbus/stand/netboot/if_le.c b/sys/arch/kbus/stand/netboot/if_le.c
index 68b8ea5413f..f0d9bda665a 100644
--- a/sys/arch/kbus/stand/netboot/if_le.c
+++ b/sys/arch/kbus/stand/netboot/if_le.c
@@ -1,4 +1,4 @@
-/*	$Id: if_le.c,v 1.2 1999/01/11 05:11:30 millert Exp $ */
+/*	$OpenBSD: if_le.c,v 1.3 2000/03/03 00:54:50 todd Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/kbus/stand/netboot/if_lereg.h b/sys/arch/kbus/stand/netboot/if_lereg.h
index 5eb92b63a34..87c1b847436 100644
--- a/sys/arch/kbus/stand/netboot/if_lereg.h
+++ b/sys/arch/kbus/stand/netboot/if_lereg.h
@@ -1,4 +1,4 @@
-/*	$Id: if_lereg.h,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: if_lereg.h,v 1.2 2000/03/03 00:54:50 todd Exp $ */
 
 /*-
  * Copyright (c) 1982, 1992, 1993
diff --git a/sys/arch/kbus/stand/netboot/promboot.c b/sys/arch/kbus/stand/netboot/promboot.c
index 25363a5dd58..6eae8184a4a 100644
--- a/sys/arch/kbus/stand/netboot/promboot.c
+++ b/sys/arch/kbus/stand/netboot/promboot.c
@@ -1,4 +1,4 @@
-/*	$Id: promboot.c,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: promboot.c,v 1.2 2000/03/03 00:54:50 todd Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/kbus/stand/netboot/promcons.c b/sys/arch/kbus/stand/netboot/promcons.c
index 6bc8cf473a2..0f96a159b50 100644
--- a/sys/arch/kbus/stand/netboot/promcons.c
+++ b/sys/arch/kbus/stand/netboot/promcons.c
@@ -1,4 +1,4 @@
-/*	$Id: promcons.c,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: promcons.c,v 1.2 2000/03/03 00:54:51 todd Exp $ */
 
 /*
  * Copyright (c) 1996 Nivas Madhur
diff --git a/sys/arch/kbus/stand/netboot/version.c b/sys/arch/kbus/stand/netboot/version.c
index 2954c683589..78cc563da62 100644
--- a/sys/arch/kbus/stand/netboot/version.c
+++ b/sys/arch/kbus/stand/netboot/version.c
@@ -1,4 +1,4 @@
-/*	$Id: version.c,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: version.c,v 1.2 2000/03/03 00:54:51 todd Exp $ */
 
 /*
  *	NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.
@@ -6,4 +6,4 @@
  *	1.1
  */
 
-char version[] = "$Revision: 1.1 $";
+char version[] = "$Revision: 1.2 $";
diff --git a/sys/arch/kbus/stand/sk/Makefile b/sys/arch/kbus/stand/sk/Makefile
index 8a07f3e0316..5de2cb45554 100644
--- a/sys/arch/kbus/stand/sk/Makefile
+++ b/sys/arch/kbus/stand/sk/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1997/10/14 07:25:32 gingold Exp $
+#	$OpenBSD: Makefile,v 1.2 2000/03/03 00:54:51 todd Exp $
 
 RELOC=0xfff10000
 
diff --git a/sys/arch/kbus/stand/sk/boot.c b/sys/arch/kbus/stand/sk/boot.c
index 7cbc9a15c52..f313c5fc8da 100644
--- a/sys/arch/kbus/stand/sk/boot.c
+++ b/sys/arch/kbus/stand/sk/boot.c
@@ -1,4 +1,4 @@
-/*	$Id: boot.c,v 1.1 1997/10/14 07:25:31 gingold Exp $ */
+/*	$OpenBSD: boot.c,v 1.2 2000/03/03 00:54:51 todd Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/kbus/stand/sk/clockreg.h b/sys/arch/kbus/stand/sk/clockreg.h
index ff46693e2e2..96691a77c92 100644
--- a/sys/arch/kbus/stand/sk/clockreg.h
+++ b/sys/arch/kbus/stand/sk/clockreg.h
@@ -1,4 +1,4 @@
-/*	$Id: clockreg.h,v 1.1 1997/10/14 07:25:31 gingold Exp $ */
+/*	$OpenBSD: clockreg.h,v 1.2 2000/03/03 00:54:51 todd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
diff --git a/sys/arch/kbus/stand/sk/conf.c b/sys/arch/kbus/stand/sk/conf.c
index 69218ec3c93..f16d2c7f12f 100644
--- a/sys/arch/kbus/stand/sk/conf.c
+++ b/sys/arch/kbus/stand/sk/conf.c
@@ -1,4 +1,4 @@
-/*	$Id: conf.c,v 1.1 1997/10/14 07:25:31 gingold Exp $ */
+/*	$OpenBSD: conf.c,v 1.2 2000/03/03 00:54:51 todd Exp $ */
 
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/sys/arch/kbus/stand/sk/config.h b/sys/arch/kbus/stand/sk/config.h
index 04449843278..0bbb22e09f9 100644
--- a/sys/arch/kbus/stand/sk/config.h
+++ b/sys/arch/kbus/stand/sk/config.h
@@ -1,4 +1,4 @@
-/*	$Id: config.h,v 1.1 1997/10/14 07:25:31 gingold Exp $ */
+/*	$OpenBSD: config.h,v 1.2 2000/03/03 00:54:51 todd Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/kbus/stand/sk/dev_disk.c b/sys/arch/kbus/stand/sk/dev_disk.c
index 228d710c50d..d038f7def29 100644
--- a/sys/arch/kbus/stand/sk/dev_disk.c
+++ b/sys/arch/kbus/stand/sk/dev_disk.c
@@ -1,4 +1,4 @@
-/*	$Id: dev_disk.c,v 1.1 1997/10/14 07:25:31 gingold Exp $ */
+/*	$OpenBSD: dev_disk.c,v 1.2 2000/03/03 00:54:51 todd Exp $ */
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
diff --git a/sys/arch/kbus/stand/sk/dev_net.c b/sys/arch/kbus/stand/sk/dev_net.c
index 64371891759..4a200a45360 100644
--- a/sys/arch/kbus/stand/sk/dev_net.c
+++ b/sys/arch/kbus/stand/sk/dev_net.c
@@ -1,4 +1,4 @@
-/*	$Id: dev_net.c,v 1.2 1999/01/11 05:11:31 millert Exp $ */
+/*	$OpenBSD: dev_net.c,v 1.3 2000/03/03 00:54:51 todd Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
diff --git a/sys/arch/kbus/stand/sk/exec_sun.c b/sys/arch/kbus/stand/sk/exec_sun.c
index 3553a679e0e..4e523cecd65 100644
--- a/sys/arch/kbus/stand/sk/exec_sun.c
+++ b/sys/arch/kbus/stand/sk/exec_sun.c
@@ -1,4 +1,4 @@
-/*	$Id: exec_sun.c,v 1.1 1997/10/14 07:25:31 gingold Exp $ */
+/*	$OpenBSD: exec_sun.c,v 1.2 2000/03/03 00:54:51 todd Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/kbus/stand/sk/gets.c b/sys/arch/kbus/stand/sk/gets.c
index fe50ebf5be6..b8594f49259 100644
--- a/sys/arch/kbus/stand/sk/gets.c
+++ b/sys/arch/kbus/stand/sk/gets.c
@@ -1,4 +1,4 @@
-/*	$Id: gets.c,v 1.1 1997/10/14 07:25:31 gingold Exp $ */
+/*	$OpenBSD: gets.c,v 1.2 2000/03/03 00:54:51 todd Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/kbus/stand/sk/if_le.c b/sys/arch/kbus/stand/sk/if_le.c
index b295a091246..5e3cb3ff613 100644
--- a/sys/arch/kbus/stand/sk/if_le.c
+++ b/sys/arch/kbus/stand/sk/if_le.c
@@ -1,4 +1,4 @@
-/*	$Id: if_le.c,v 1.2 1999/01/11 05:11:31 millert Exp $ */
+/*	$OpenBSD: if_le.c,v 1.3 2000/03/03 00:54:51 todd Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/kbus/stand/sk/if_lereg.h b/sys/arch/kbus/stand/sk/if_lereg.h
index 2742840935e..685de65b796 100644
--- a/sys/arch/kbus/stand/sk/if_lereg.h
+++ b/sys/arch/kbus/stand/sk/if_lereg.h
@@ -1,4 +1,4 @@
-/*	$Id: if_lereg.h,v 1.1 1997/10/14 07:25:31 gingold Exp $ */
+/*	$OpenBSD: if_lereg.h,v 1.2 2000/03/03 00:54:51 todd Exp $ */
 
 /*-
  * Copyright (c) 1982, 1992, 1993
diff --git a/sys/arch/kbus/stand/sk/promboot.c b/sys/arch/kbus/stand/sk/promboot.c
index f1dde276802..1b203999eb1 100644
--- a/sys/arch/kbus/stand/sk/promboot.c
+++ b/sys/arch/kbus/stand/sk/promboot.c
@@ -1,4 +1,4 @@
-/*	$Id: promboot.c,v 1.1 1997/10/14 07:25:31 gingold Exp $ */
+/*	$OpenBSD: promboot.c,v 1.2 2000/03/03 00:54:51 todd Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/kbus/stand/sk/promcons.c b/sys/arch/kbus/stand/sk/promcons.c
index 6bc8cf473a2..2c4cee4bbe4 100644
--- a/sys/arch/kbus/stand/sk/promcons.c
+++ b/sys/arch/kbus/stand/sk/promcons.c
@@ -1,4 +1,4 @@
-/*	$Id: promcons.c,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: promcons.c,v 1.2 2000/03/03 00:54:52 todd Exp $ */
 
 /*
  * Copyright (c) 1996 Nivas Madhur
diff --git a/sys/arch/kbus/stand/sk/version.c b/sys/arch/kbus/stand/sk/version.c
index 2954c683589..ef29a415411 100644
--- a/sys/arch/kbus/stand/sk/version.c
+++ b/sys/arch/kbus/stand/sk/version.c
@@ -1,4 +1,4 @@
-/*	$Id: version.c,v 1.1 1997/10/14 07:25:32 gingold Exp $ */
+/*	$OpenBSD: version.c,v 1.2 2000/03/03 00:54:52 todd Exp $ */
 
 /*
  *	NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.
@@ -6,4 +6,4 @@
  *	1.1
  */
 
-char version[] = "$Revision: 1.1 $";
+char version[] = "$Revision: 1.2 $";
diff --git a/sys/arch/mvme68k/stand/Makefile b/sys/arch/mvme68k/stand/Makefile
index 27c0831431d..a3872b95ee0 100644
--- a/sys/arch/mvme68k/stand/Makefile
+++ b/sys/arch/mvme68k/stand/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1997/04/22 16:13:38 gvf Exp $
+#	$OpenBSD: Makefile,v 1.5 2000/03/03 00:54:52 todd Exp $
 
 SUBDIR= bugcrt libbug libsa libz sboot netboot bootxx bootsd bootst \
 	installboot prtvid wrtvid
diff --git a/sys/arch/mvme68k/stand/Makefile.inc b/sys/arch/mvme68k/stand/Makefile.inc
index 4b22a25bf4b..a3f02f3f7c9 100644
--- a/sys/arch/mvme68k/stand/Makefile.inc
+++ b/sys/arch/mvme68k/stand/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id: Makefile.inc,v 1.2 1995/11/07 08:50:33 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 2000/03/03 00:54:52 todd Exp $
 
 MDEC_DIR?=/usr/mdec
diff --git a/sys/arch/mvme68k/stand/installboot/installboot.8 b/sys/arch/mvme68k/stand/installboot/installboot.8
index c45304ad0fd..8d42cdc43c9 100644
--- a/sys/arch/mvme68k/stand/installboot/installboot.8
+++ b/sys/arch/mvme68k/stand/installboot/installboot.8
@@ -1,4 +1,4 @@
-.\"	$Id: installboot.8,v 1.7 2000/01/24 05:20:55 smurph Exp $
+.\"	$OpenBSD: installboot.8,v 1.8 2000/03/03 00:54:52 todd Exp $
 .\"
 .Dd 31 May 1995
 .Dt INSTALLBOOT 8 mvme68k
diff --git a/sys/arch/mvme88k/Makefile b/sys/arch/mvme88k/Makefile
index 710a5ca6f74..a1ff9c5f7b7 100644
--- a/sys/arch/mvme88k/Makefile
+++ b/sys/arch/mvme88k/Makefile
@@ -1,5 +1,5 @@
+#	$OpenBSD: Makefile,v 1.3 2000/03/03 00:54:52 todd Exp $
 #	from: @(#)Makefile	7.3 (Berkeley) 6/9/91
-#	$Id: Makefile,v 1.2 1998/09/15 04:01:21 smurph Exp $
 
 SUBDIR= stand
 DIRS= conf dev ddb mvme88k include
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index a00328aba3d..53d8caaeae8 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,5 +1,5 @@
+#	$OpenBSD: Makefile.mvme88k,v 1.8 2000/03/03 00:54:52 todd Exp $
 #	@(#)Makefile.hp300	7.10 (Berkeley) 6/27/91
-#	$Id: Makefile.mvme88k,v 1.7 1999/09/27 21:30:11 smurph Exp $
 #
 # Makefile for OpenBSD
 #
diff --git a/sys/arch/mvme88k/dev/if_ie.c b/sys/arch/mvme88k/dev/if_ie.c
index 10ac1ef6b4b..c3c1d4bf0a9 100644
--- a/sys/arch/mvme88k/dev/if_ie.c
+++ b/sys/arch/mvme88k/dev/if_ie.c
@@ -1,4 +1,4 @@
-/*	$Id: if_ie.c,v 1.6 1999/09/27 18:43:24 smurph Exp $ */
+/*	$OpenBSD: if_ie.c,v 1.7 2000/03/03 00:54:53 todd Exp $ */
 
 /*-
  * Copyright (c) 1998 Steve Murphree, Jr. 
diff --git a/sys/arch/mvme88k/include/ansi.h b/sys/arch/mvme88k/include/ansi.h
index 4ff6a9f11ea..c2e2c3ac2db 100644
--- a/sys/arch/mvme88k/include/ansi.h
+++ b/sys/arch/mvme88k/include/ansi.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: ansi.h,v 1.9 2000/03/03 00:54:53 todd Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -31,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ansi.h	8.2 (Berkeley) 1/4/94
- *      $Id: ansi.h,v 1.8 2000/02/22 17:29:13 millert Exp $
  */
 
 #ifndef	_ANSI_H_
diff --git a/sys/arch/mvme88k/mvme88k/autoconf.c b/sys/arch/mvme88k/mvme88k/autoconf.c
index 41d99f42166..8455273da8b 100644
--- a/sys/arch/mvme88k/mvme88k/autoconf.c
+++ b/sys/arch/mvme88k/mvme88k/autoconf.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: autoconf.c,v 1.7 2000/03/03 00:54:53 todd Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -29,7 +30,6 @@
  * (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.6 1999/09/27 19:13:20 smurph Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/mvme88k/mvme88k/cmmu.c b/sys/arch/mvme88k/mvme88k/cmmu.c
index 63f2eb8e78a..8c8d8df0d50 100644
--- a/sys/arch/mvme88k/mvme88k/cmmu.c
+++ b/sys/arch/mvme88k/mvme88k/cmmu.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cmmu.c,v 1.6 2000/03/03 00:54:53 todd Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -28,7 +29,6 @@
  * (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: cmmu.c,v 1.5 1999/09/27 19:13:21 smurph Exp $
  */
 /*
  * Mach Operating System
diff --git a/sys/arch/mvme88k/mvme88k/m18x_cmmu.c b/sys/arch/mvme88k/mvme88k/m18x_cmmu.c
index bae0c4ea69d..ca7c7ce3f06 100644
--- a/sys/arch/mvme88k/mvme88k/m18x_cmmu.c
+++ b/sys/arch/mvme88k/mvme88k/m18x_cmmu.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: m18x_cmmu.c,v 1.2 2000/03/03 00:54:53 todd Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -28,7 +29,6 @@
  * (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: m18x_cmmu.c,v 1.1 1999/09/27 19:13:22 smurph Exp $
  */
 
 /*
diff --git a/sys/arch/mvme88k/mvme88k/m197_cmmu.c b/sys/arch/mvme88k/mvme88k/m197_cmmu.c
index f104b42a9d9..33aa0a7e44e 100644
--- a/sys/arch/mvme88k/mvme88k/m197_cmmu.c
+++ b/sys/arch/mvme88k/mvme88k/m197_cmmu.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: m197_cmmu.c,v 1.2 2000/03/03 00:54:53 todd Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -28,7 +29,6 @@
  * (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: m197_cmmu.c,v 1.1 1999/09/27 19:13:22 smurph Exp $
  */
 
 /*
diff --git a/sys/arch/mvme88k/stand/installboot/installboot.8 b/sys/arch/mvme88k/stand/installboot/installboot.8
index e95afd4016a..51b40d2a5ff 100644
--- a/sys/arch/mvme88k/stand/installboot/installboot.8
+++ b/sys/arch/mvme88k/stand/installboot/installboot.8
@@ -1,4 +1,4 @@
-.\"	$Id: installboot.8,v 1.6 2000/01/03 20:04:30 pjanzen Exp $
+.\"	$OpenBSD: installboot.8,v 1.7 2000/03/03 00:54:53 todd Exp $
 .\"
 .Dd 31 May 1995
 .Dt INSTALLBOOT 8 mvme88k
diff --git a/sys/arch/mvme88k/stand/libsa/SRT0.S b/sys/arch/mvme88k/stand/libsa/SRT0.S
index ff7cf90e3c4..bb0192b82ef 100644
--- a/sys/arch/mvme88k/stand/libsa/SRT0.S
+++ b/sys/arch/mvme88k/stand/libsa/SRT0.S
@@ -1,4 +1,4 @@
-;	$Id: SRT0.S,v 1.2 1998/12/15 06:32:34 smurph Exp $
+;	$OpenBSD: SRT0.S,v 1.3 2000/03/03 00:54:54 todd Exp $
 
 ; Copyright (c) 1996 Nivas Madhur
 ; Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme88k/stand/libsa/SRT1.c b/sys/arch/mvme88k/stand/libsa/SRT1.c
index 312751c6974..56b6c44b1f1 100644
--- a/sys/arch/mvme88k/stand/libsa/SRT1.c
+++ b/sys/arch/mvme88k/stand/libsa/SRT1.c
@@ -1,4 +1,4 @@
-/*	$Id: SRT1.c,v 1.1 1997/03/03 19:30:35 rahnds Exp $ */
+/*	$OpenBSD: SRT1.c,v 1.2 2000/03/03 00:54:54 todd Exp $ */
 
 /*
  * Copyright (c) 1996 Nivas Madhur
diff --git a/sys/arch/mvme88k/stand/sboot/Makefile b/sys/arch/mvme88k/stand/sboot/Makefile
index 2ce290527cc..aaf1eec8a88 100644
--- a/sys/arch/mvme88k/stand/sboot/Makefile
+++ b/sys/arch/mvme88k/stand/sboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1998/08/22 09:25:11 smurph Exp $
+#	$OpenBSD: Makefile,v 1.4 2000/03/03 00:54:54 todd Exp $
 
 S=	${.CURDIR}/../../../..
 INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
diff --git a/sys/arch/mvme88k/stand/sboot/clock.c b/sys/arch/mvme88k/stand/sboot/clock.c
index fb7e4dd426e..5ed9f87d146 100644
--- a/sys/arch/mvme88k/stand/sboot/clock.c
+++ b/sys/arch/mvme88k/stand/sboot/clock.c
@@ -1,4 +1,4 @@
-/*	$Id: clock.c,v 1.1 1997/03/03 19:30:41 rahnds Exp $ */
+/*	$OpenBSD: clock.c,v 1.2 2000/03/03 00:54:54 todd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
diff --git a/sys/arch/mvme88k/stand/sboot/clockreg.h b/sys/arch/mvme88k/stand/sboot/clockreg.h
index 0fcac06446b..8ec11e98bcb 100644
--- a/sys/arch/mvme88k/stand/sboot/clockreg.h
+++ b/sys/arch/mvme88k/stand/sboot/clockreg.h
@@ -1,4 +1,4 @@
-/*	$Id: clockreg.h,v 1.1 1997/03/03 19:30:41 rahnds Exp $ */
+/*	$OpenBSD: clockreg.h,v 1.2 2000/03/03 00:54:54 todd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
diff --git a/sys/arch/mvme88k/stand/sboot/if_le.c b/sys/arch/mvme88k/stand/sboot/if_le.c
index 34cfd777217..14e6248426b 100644
--- a/sys/arch/mvme88k/stand/sboot/if_le.c
+++ b/sys/arch/mvme88k/stand/sboot/if_le.c
@@ -1,4 +1,4 @@
-/*	$Id: if_le.c,v 1.1 1997/03/03 19:30:41 rahnds Exp $ */
+/*	$OpenBSD: if_le.c,v 1.2 2000/03/03 00:54:54 todd Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme88k/stand/sboot/if_lereg.h b/sys/arch/mvme88k/stand/sboot/if_lereg.h
index a8728b13891..02a2018e810 100644
--- a/sys/arch/mvme88k/stand/sboot/if_lereg.h
+++ b/sys/arch/mvme88k/stand/sboot/if_lereg.h
@@ -1,4 +1,4 @@
-/*	$Id: if_lereg.h,v 1.1 1997/03/03 19:30:41 rahnds Exp $ */
+/*	$OpenBSD: if_lereg.h,v 1.2 2000/03/03 00:54:54 todd Exp $ */
 
 /*-
  * Copyright (c) 1982, 1992, 1993
diff --git a/sys/arch/mvme88k/stand/sboot/oc_cksum.S b/sys/arch/mvme88k/stand/sboot/oc_cksum.S
index c8b96b79817..374120508a4 100644
--- a/sys/arch/mvme88k/stand/sboot/oc_cksum.S
+++ b/sys/arch/mvme88k/stand/sboot/oc_cksum.S
@@ -1,4 +1,4 @@
-|	$Id: oc_cksum.S,v 1.1 1997/03/03 19:30:41 rahnds Exp $
+|	$OpenBSD: oc_cksum.S,v 1.2 2000/03/03 00:54:54 todd Exp $
 
 | Copyright (c) 1988 Regents of the University of California.
 | All rights reserved.
diff --git a/sys/arch/pc532/dev/ncr.c b/sys/arch/pc532/dev/ncr.c
index 414a31d1a0d..06e179f7a85 100644
--- a/sys/arch/pc532/dev/ncr.c
+++ b/sys/arch/pc532/dev/ncr.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: ncr.c,v 1.4 2000/03/03 00:54:54 todd Exp $ */
 /*	$NetBSD: ncr.c,v 1.21 1995/11/30 00:58:47 jtc Exp $ */
 
 /*
@@ -29,7 +30,6 @@
  * (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.3 1995/12/14 05:29:21 deraadt Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pc532/dev/ncrreg.h b/sys/arch/pc532/dev/ncrreg.h
index 7016e37550d..f9b0c47dd50 100644
--- a/sys/arch/pc532/dev/ncrreg.h
+++ b/sys/arch/pc532/dev/ncrreg.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: ncrreg.h,v 1.4 2000/03/03 00:54:54 todd Exp $ */
 /*	$NetBSD: ncrreg.h,v 1.3 1995/11/30 00:58:56 jtc Exp $ */
 
 /*
@@ -29,7 +30,6 @@
  * (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: ncrreg.h,v 1.3 1995/12/14 05:29:24 deraadt Exp $
  */
 
 #ifndef _NCRREG_H
diff --git a/sys/arch/pc532/dev/rd.c b/sys/arch/pc532/dev/rd.c
index e32ea8ec8a5..4feb90bb7d1 100644
--- a/sys/arch/pc532/dev/rd.c
+++ b/sys/arch/pc532/dev/rd.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: rd.c,v 1.3 2000/03/03 00:54:54 todd Exp $	*/
 /*
  * Copyright (c) 1995 Philip A. Nelson.
  * All rights reserved.
@@ -27,7 +28,6 @@
  * (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: rd.c,v 1.2 1996/01/12 20:20:38 deraadt Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pc532/pc532/bzero.s b/sys/arch/pc532/pc532/bzero.s
index 3e242b44b8f..470b7fc68ce 100644
--- a/sys/arch/pc532/pc532/bzero.s
+++ b/sys/arch/pc532/pc532/bzero.s
@@ -1,3 +1,4 @@
+/*	$OpenBSD: bzero.s,v 1.3 2000/03/03 00:54:55 todd Exp $	*/
 /*	$NetBSD: bzero.s,v 1.3 1996/01/26 08:11:47 phil Exp $	*/
 
 /* 
@@ -31,7 +32,6 @@
  * 	File: ns532/bzero.s
  *	Author: Tero Kivinen, Helsinki University of Technology 1992.
  *
- *	$Id: bzero.s,v 1.2 1996/01/31 06:36:15 deraadt Exp $
  */
 
 
diff --git a/sys/arch/pc532/pc532/intr.c b/sys/arch/pc532/pc532/intr.c
index 5960b18becd..fe97663614b 100644
--- a/sys/arch/pc532/pc532/intr.c
+++ b/sys/arch/pc532/pc532/intr.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: intr.c,v 1.6 2000/03/03 00:54:55 todd Exp $  */
 /*	$NetBSD: intr.c,v 1.5 1995/09/26 20:16:26 phil Exp $  */
 
 /*
@@ -29,7 +30,6 @@
  * (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: intr.c,v 1.5 1999/12/08 06:50:16 itojun Exp $
  */
 
 #define DEFINE_SPLX
diff --git a/sys/arch/pc532/stand/boot.c b/sys/arch/pc532/stand/boot.c
index 2aa99d1e2d7..2dbc986aba7 100644
--- a/sys/arch/pc532/stand/boot.c
+++ b/sys/arch/pc532/stand/boot.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: boot.c,v 1.4 2000/03/03 00:54:55 todd Exp $	*/
 /*	$NetBSD: boot.c,v 1.5 1995/11/30 00:59:06 jtc Exp $	*/
 
 /*-
@@ -36,7 +37,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$NetBSD: boot.c,v 1.5 1995/11/30 00:59:06 jtc Exp $";
+static char rcsid[] = "$OpenBSD: boot.c,v 1.4 2000/03/03 00:54:55 todd Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -74,7 +75,7 @@ main()
 	cninit();
 	scsiinit();
 
-	printf("\n>> NetBSD BOOT pc532 [$Revision: 1.3 $]\n");
+	printf("\n>> NetBSD BOOT pc532 [$Revision: 1.4 $]\n");
 
 	bdev  = B_TYPE(bootdev);
 	bctlr = B_CONTROLLER(bootdev);
diff --git a/sys/arch/pc532/stand/inflate.c b/sys/arch/pc532/stand/inflate.c
index a8036c731a5..ec9fb67efa6 100644
--- a/sys/arch/pc532/stand/inflate.c
+++ b/sys/arch/pc532/stand/inflate.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: inflate.c,v 1.3 2000/03/03 00:54:55 todd Exp $	*/
 /*
  * Copyright (c) 1995 Matthias Pfaller.
  *
@@ -31,7 +32,6 @@
  * (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: inflate.c,v 1.2 1999/01/11 05:11:48 millert Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pmax/dev/sfbreg.h b/sys/arch/pmax/dev/sfbreg.h
index fdecb7bc71a..f4de7aa4f43 100644
--- a/sys/arch/pmax/dev/sfbreg.h
+++ b/sys/arch/pmax/dev/sfbreg.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: sfbreg.h,v 1.5 2000/03/03 00:54:55 todd Exp $	*/
 /*-
  * Copyright (c) 1995
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sfb.c	8.1 (Berkeley) 6/10/93
- *      $Id: sfbreg.h,v 1.4 1996/12/22 15:22:07 graichen Exp $
  */
 
 #define	SFB_OFFSET_VRAM		0x201000	/* from module's base */
diff --git a/sys/arch/pmax/stand/filesystem.c b/sys/arch/pmax/stand/filesystem.c
index 3d34cb86ca1..e3d29887c65 100644
--- a/sys/arch/pmax/stand/filesystem.c
+++ b/sys/arch/pmax/stand/filesystem.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: filesystem.c,v 1.5 2000/03/03 00:54:55 todd Exp $	*/
 /*
  * Copyright (c) 1993 Philip A. Nelson.
  * All rights reserved.
@@ -30,7 +31,6 @@
  *
  *	filesystem.c
  *
- *	$Id: filesystem.c,v 1.4 1996/12/22 15:23:01 graichen Exp $
  */
 
 #include <stand.h>
diff --git a/sys/arch/sparc/dev/power.h b/sys/arch/sparc/dev/power.h
index 252195b210c..4ed01e64b5b 100644
--- a/sys/arch/sparc/dev/power.h
+++ b/sys/arch/sparc/dev/power.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: power.h,v 1.2 2000/03/03 00:54:55 todd Exp $ */
 /*	$NetBSD: power.h,v 1.2 1996/05/16 15:56:57 abrown Exp $ */
 
 /*
@@ -38,7 +39,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: power.h,v 1.1 1996/08/11 05:34:25 deraadt Exp $
  *
  */
 
diff --git a/sys/arch/sun3/stand/installboot/installboot.8 b/sys/arch/sun3/stand/installboot/installboot.8
index d8d8f1e5cf2..d9cef9f304d 100644
--- a/sys/arch/sun3/stand/installboot/installboot.8
+++ b/sys/arch/sun3/stand/installboot/installboot.8
@@ -1,4 +1,4 @@
-.\"	$Id: installboot.8,v 1.8 2000/01/03 20:04:32 pjanzen Exp $
+.\"	$OpenBSD: installboot.8,v 1.9 2000/03/03 00:54:56 todd Exp $
 .\"
 .Dd 31 May 1995
 .Dt INSTALLBOOT 8 sun3
diff --git a/sys/arch/sun3/stand/netboot/version.c b/sys/arch/sun3/stand/netboot/version.c
index d98db932634..3bf0e0e3df1 100644
--- a/sys/arch/sun3/stand/netboot/version.c
+++ b/sys/arch/sun3/stand/netboot/version.c
@@ -1,7 +1,8 @@
+/*	$OpenBSD: version.c,v 1.5 2000/03/03 00:54:56 todd Exp $ */
 /*	$NetBSD: version.c,v 1.5 1996/03/17 02:04:20 thorpej Exp $ */
 
 /*
  *	NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.
  */
 
-char *version = "$Revision: 1.4 $";
+char *version = "$Revision: 1.5 $";
diff --git a/sys/arch/sun3/stand/tapeboot/version.c b/sys/arch/sun3/stand/tapeboot/version.c
index 8f44b32e7ad..61890ad1e62 100644
--- a/sys/arch/sun3/stand/tapeboot/version.c
+++ b/sys/arch/sun3/stand/tapeboot/version.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: version.c,v 1.4 2000/03/03 00:54:56 todd Exp $ */
 /*	$NetBSD: version.c,v 1.3 1995/10/17 22:58:32 gwr Exp $ */
 
 /*
@@ -7,4 +8,4 @@
  *	device access stays strictly on block boundaries.
  */
 
-char *version = "$Revision: 1.3 $";
+char *version = "$Revision: 1.4 $";
diff --git a/sys/arch/sun3/stand/ufsboot/version.c b/sys/arch/sun3/stand/ufsboot/version.c
index 1f8b884dcd6..ba751fa230b 100644
--- a/sys/arch/sun3/stand/ufsboot/version.c
+++ b/sys/arch/sun3/stand/ufsboot/version.c
@@ -1,7 +1,8 @@
+/*	$OpenBSD: version.c,v 1.3 2000/03/03 00:54:56 todd Exp $ */
 /*	$NetBSD: version.c,v 1.2 1995/10/13 21:33:29 gwr Exp $ */
 
 /*
  *	NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.
  */
 
-char *version = "$Revision: 1.2 $";
+char *version = "$Revision: 1.3 $";
diff --git a/sys/arch/wgrisc/Makefile b/sys/arch/wgrisc/Makefile
index 155b6984107..f7662790d1b 100644
--- a/sys/arch/wgrisc/Makefile
+++ b/sys/arch/wgrisc/Makefile
@@ -1,5 +1,5 @@
+#	$OpenBSD: Makefile,v 1.3 2000/03/03 00:54:56 todd Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/16/93
-#	$Id: Makefile,v 1.2 1997/10/23 13:14:37 deraadt Exp $
 
 # Makefile for pica links, tags file
 
diff --git a/sys/lib/libz/adler32.c b/sys/lib/libz/adler32.c
index 98b772c2e60..166a918e488 100644
--- a/sys/lib/libz/adler32.c
+++ b/sys/lib/libz/adler32.c
@@ -1,9 +1,9 @@
+/*	$OpenBSD: adler32.c,v 1.5 2000/03/03 00:54:57 todd Exp $	*/
 /* adler32.c -- compute the Adler-32 checksum of a data stream
  * Copyright (C) 1995-1998 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: adler32.c,v 1.4 1998/09/08 04:07:47 millert Exp $ */
 
 #include "zlib.h"
 
diff --git a/sys/lib/libz/crc32.c b/sys/lib/libz/crc32.c
index 5e3a262d07b..d46ea2ccb9f 100644
--- a/sys/lib/libz/crc32.c
+++ b/sys/lib/libz/crc32.c
@@ -1,9 +1,9 @@
+/*	$OpenBSD: crc32.c,v 1.7 2000/03/03 00:54:57 todd Exp $	*/
 /* crc32.c -- compute the CRC-32 of a data stream
  * Copyright (C) 1995-1998 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: crc32.c,v 1.6 1998/09/08 04:07:47 millert Exp $ */
 
 #include "zlib.h"
 
diff --git a/sys/lib/libz/zconf.h b/sys/lib/libz/zconf.h
index 8d2f566a35c..f842c008bd1 100644
--- a/sys/lib/libz/zconf.h
+++ b/sys/lib/libz/zconf.h
@@ -1,9 +1,9 @@
+/*	$OpenBSD: zconf.h,v 1.5 2000/03/03 00:54:57 todd Exp $	*/
 /* zconf.h -- configuration of the zlib compression library
  * Copyright (C) 1995-1998 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: zconf.h,v 1.4 1998/09/08 04:07:49 millert Exp $ */
 
 #ifndef _ZCONF_H
 #define _ZCONF_H
diff --git a/sys/lib/libz/zutil.h b/sys/lib/libz/zutil.h
index 9b7250de2e5..2aa4405129d 100644
--- a/sys/lib/libz/zutil.h
+++ b/sys/lib/libz/zutil.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: zutil.h,v 1.10 2000/03/03 00:54:57 todd Exp $	*/
 /* zutil.h -- internal interface and configuration of the compression library
  * Copyright (C) 1995-1998 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
@@ -8,7 +9,6 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: zutil.h,v 1.9 1999/02/14 20:06:05 mickey Exp $ */
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index e7147ef2dfd..da76c12db17 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: if_spppsubr.c,v 1.4 2000/03/03 00:54:57 todd Exp $	*/
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
@@ -17,7 +18,6 @@
  *
  * Version 2.6, Tue May 12 17:10:39 MSD 1998
  *
- * $Id: if_spppsubr.c,v 1.3 1999/08/06 23:02:27 niklas Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/xfs/xfs_attr.h b/sys/xfs/xfs_attr.h
index a1a921ea7f8..29057b04a46 100644
--- a/sys/xfs/xfs_attr.h
+++ b/sys/xfs/xfs_attr.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_attr.h,v 1.3 2000/03/03 00:54:57 todd Exp $ */
 /*
  * Copyright (c) 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_attr.h,v 1.2 1999/04/30 01:58:59 art Exp $ */
 
 #ifndef _XFS_ATTR_H
 #define _XFS_ATTR_H
diff --git a/sys/xfs/xfs_common-bsd.c b/sys/xfs/xfs_common-bsd.c
index a157cbfd939..ce9c86b0c07 100644
--- a/sys/xfs/xfs_common-bsd.c
+++ b/sys/xfs/xfs_common-bsd.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: xfs_common-bsd.c,v 1.2 2000/03/03 00:54:57 todd Exp $	*/
+
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -41,7 +43,7 @@
 #include <xfs/xfs_common.h>
 #include <xfs/xfs_deb.h>
 
-RCSID("$Id: xfs_common-bsd.c,v 1.1 1999/04/30 01:58:59 art Exp $");
+RCSID("$OpenBSD: xfs_common-bsd.c,v 1.2 2000/03/03 00:54:57 todd Exp $");
 
 static u_int xfs_allocs;
 static u_int xfs_frees;
diff --git a/sys/xfs/xfs_common.h b/sys/xfs/xfs_common.h
index 4193434a3e6..97ed1a8dba1 100644
--- a/sys/xfs/xfs_common.h
+++ b/sys/xfs/xfs_common.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_common.h,v 1.4 2000/03/03 00:54:58 todd Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_common.h,v 1.3 1999/04/30 01:58:59 art Exp $ */
 
 #ifndef _xfs_common_h
 #define _xfs_common_h
diff --git a/sys/xfs/xfs_deb.c b/sys/xfs/xfs_deb.c
index 2e838360af7..f6891e93154 100644
--- a/sys/xfs/xfs_deb.c
+++ b/sys/xfs/xfs_deb.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_deb.c,v 1.3 2000/03/03 00:54:58 todd Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -39,7 +40,6 @@
 #include <xfs/xfs_deb.h>
 #include <xfs/xfs_debug.h>
 
-/* $Id: xfs_deb.c,v 1.2 1999/04/30 01:59:00 art Exp $ */
 
 /* X is on */
 #define X(y) y
diff --git a/sys/xfs/xfs_deb.h b/sys/xfs/xfs_deb.h
index dcfb21f97d9..88073ff9794 100644
--- a/sys/xfs/xfs_deb.h
+++ b/sys/xfs/xfs_deb.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_deb.h,v 1.4 2000/03/03 00:54:58 todd Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_deb.h,v 1.3 1999/04/30 01:59:00 art Exp $ */
 
 #ifndef _xfs_deb_h
 #define _xfs_deb_h
diff --git a/sys/xfs/xfs_debug.h b/sys/xfs/xfs_debug.h
index 04201a25b85..dd008204081 100644
--- a/sys/xfs/xfs_debug.h
+++ b/sys/xfs/xfs_debug.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_debug.h,v 1.2 2000/03/03 00:54:58 todd Exp $ */
 /*
  * Copyright (c) 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_debug.h,v 1.1 1999/04/30 01:59:00 art Exp $ */
 
 #ifndef __XFS_DEBUG_H
 #define __XFS_DEBUG_H
diff --git a/sys/xfs/xfs_dev-bsd.c b/sys/xfs/xfs_dev-bsd.c
index b7c7ddf9f1d..86af610ba85 100644
--- a/sys/xfs/xfs_dev-bsd.c
+++ b/sys/xfs/xfs_dev-bsd.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: xfs_dev-bsd.c,v 1.2 2000/03/03 00:54:58 todd Exp $	*/
+
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -43,7 +45,7 @@
 #include <xfs/xfs_dev.h>
 #include <xfs/xfs_deb.h>
 
-RCSID("$Id: xfs_dev-bsd.c,v 1.1 1999/04/30 01:59:00 art Exp $");
+RCSID("$OpenBSD: xfs_dev-bsd.c,v 1.2 2000/03/03 00:54:58 todd Exp $");
 
 int
 xfs_devopen(dev_t dev, int flag, int devtype, struct proc *proc)
diff --git a/sys/xfs/xfs_dev-common.c b/sys/xfs/xfs_dev-common.c
index d1ab98d67d8..d9e5af3fcd6 100644
--- a/sys/xfs/xfs_dev-common.c
+++ b/sys/xfs/xfs_dev-common.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: xfs_dev-common.c,v 1.2 2000/03/03 00:54:58 todd Exp $	*/
+
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -44,7 +46,7 @@
 #include <xfs/xfs_dev.h>
 #include <xfs/xfs_deb.h>
 
-RCSID("$Id: xfs_dev-common.c,v 1.1 1999/04/30 01:59:00 art Exp $");
+RCSID("$OpenBSD: xfs_dev-common.c,v 1.2 2000/03/03 00:54:58 todd Exp $");
 
 struct xfs_channel xfs_channel[NXFS];
 
diff --git a/sys/xfs/xfs_dev.h b/sys/xfs/xfs_dev.h
index 095d004976d..89a1b38ed98 100644
--- a/sys/xfs/xfs_dev.h
+++ b/sys/xfs/xfs_dev.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_dev.h,v 1.4 2000/03/03 00:54:58 todd Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_dev.h,v 1.3 1999/04/30 01:59:00 art Exp $ */
 
 #ifndef _xfs_dev_h
 #define _xfs_dev_h
diff --git a/sys/xfs/xfs_fs.h b/sys/xfs/xfs_fs.h
index 51f9bb4dbcd..06bc2dd42b4 100644
--- a/sys/xfs/xfs_fs.h
+++ b/sys/xfs/xfs_fs.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_fs.h,v 1.4 2000/03/03 00:54:58 todd Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_fs.h,v 1.3 1999/04/30 01:59:00 art Exp $ */
 
 #ifndef _xfs_h
 #define _xfs_h
diff --git a/sys/xfs/xfs_locl.h b/sys/xfs/xfs_locl.h
index c87c4c92b9c..bf23a6577ff 100644
--- a/sys/xfs/xfs_locl.h
+++ b/sys/xfs/xfs_locl.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_locl.h,v 1.2 2000/03/03 00:54:58 todd Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_locl.h,v 1.1 1999/04/30 01:59:00 art Exp $ */
 
 #if 1 /* XXX - ugly hack */
 #include <xfs/xfs_config.h>
diff --git a/sys/xfs/xfs_message.c b/sys/xfs/xfs_message.c
index 2c6bcb43a4b..7e64ab6576a 100644
--- a/sys/xfs/xfs_message.c
+++ b/sys/xfs/xfs_message.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: xfs_message.c,v 1.6 2000/03/03 00:54:58 todd Exp $	*/
+
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -45,7 +47,7 @@
 #include <xfs/xfs_vfsops.h>
 #include <xfs/xfs_vnodeops.h>
 
-RCSID("$Id: xfs_message.c,v 1.5 1999/06/03 19:49:38 art Exp $");
+RCSID("$OpenBSD: xfs_message.c,v 1.6 2000/03/03 00:54:58 todd Exp $");
 
 int
 xfs_message_installroot(int fd,
diff --git a/sys/xfs/xfs_message.h b/sys/xfs/xfs_message.h
index d3741a1d3bd..16e1ca71a1f 100644
--- a/sys/xfs/xfs_message.h
+++ b/sys/xfs/xfs_message.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_message.h,v 1.3 2000/03/03 00:54:58 todd Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_message.h,v 1.2 1999/04/30 01:59:00 art Exp $ */
 
 #ifndef _xmsg_h
 #define _xmsg_h
diff --git a/sys/xfs/xfs_msg_locl.h b/sys/xfs/xfs_msg_locl.h
index b552e8c148f..30abc31337d 100644
--- a/sys/xfs/xfs_msg_locl.h
+++ b/sys/xfs/xfs_msg_locl.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_msg_locl.h,v 1.4 2000/03/03 00:54:58 todd Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_msg_locl.h,v 1.3 1999/04/30 01:59:00 art Exp $ */
 
 #ifndef _xfs_msg_locl_h
 #define _xfs_msg_locl_h
diff --git a/sys/xfs/xfs_node-bsd.c b/sys/xfs/xfs_node-bsd.c
index 71d1b8faae1..7205fd5e1b1 100644
--- a/sys/xfs/xfs_node-bsd.c
+++ b/sys/xfs/xfs_node-bsd.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: xfs_node-bsd.c,v 1.2 2000/03/03 00:54:58 todd Exp $	*/
+
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -41,7 +43,7 @@
 #include <xfs/xfs_fs.h>
 #include <xfs/xfs_deb.h>
 
-RCSID("$Id: xfs_node-bsd.c,v 1.1 1999/04/30 01:59:00 art Exp $");
+RCSID("$OpenBSD: xfs_node-bsd.c,v 1.2 2000/03/03 00:54:58 todd Exp $");
 
 extern vop_t **xfs_vnodeop_p;
 
diff --git a/sys/xfs/xfs_node.h b/sys/xfs/xfs_node.h
index a77ab61d993..dec3b0acc19 100644
--- a/sys/xfs/xfs_node.h
+++ b/sys/xfs/xfs_node.h
@@ -1,3 +1,4 @@
+/* 	$OpenBSD: xfs_node.h,v 1.5 2000/03/03 00:54:58 todd Exp $	 */
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* 	$Id: xfs_node.h,v 1.4 1999/04/30 01:59:01 art Exp $	 */
 
 #ifndef _xfs_xnode_h
 #define _xfs_xnode_h
diff --git a/sys/xfs/xfs_syscalls-common.c b/sys/xfs/xfs_syscalls-common.c
index 6dc34eb611e..ce26bf82d87 100644
--- a/sys/xfs/xfs_syscalls-common.c
+++ b/sys/xfs/xfs_syscalls-common.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: xfs_syscalls-common.c,v 1.2 2000/03/03 00:54:58 todd Exp $	*/
+
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -38,7 +40,7 @@
 
 #include <xfs/xfs_locl.h>
 
-RCSID("$Id: xfs_syscalls-common.c,v 1.1 1999/04/30 01:59:01 art Exp $");
+RCSID("$OpenBSD: xfs_syscalls-common.c,v 1.2 2000/03/03 00:54:58 todd Exp $");
 
 /*
  * XFS system calls.
diff --git a/sys/xfs/xfs_syscalls.h b/sys/xfs/xfs_syscalls.h
index 2ebdaa17674..4b5470c635d 100644
--- a/sys/xfs/xfs_syscalls.h
+++ b/sys/xfs/xfs_syscalls.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_syscalls.h,v 1.4 2000/03/03 00:54:58 todd Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_syscalls.h,v 1.3 1999/04/30 01:59:01 art Exp $ */
 
 #ifndef  __xfs_syscalls
 #define  __xfs_syscalls
diff --git a/sys/xfs/xfs_vfsops-bsd.c b/sys/xfs/xfs_vfsops-bsd.c
index 745eea9d4c2..e35ccb4f790 100644
--- a/sys/xfs/xfs_vfsops-bsd.c
+++ b/sys/xfs/xfs_vfsops-bsd.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: xfs_vfsops-bsd.c,v 1.4 2000/03/03 00:54:59 todd Exp $	*/
+
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -38,7 +40,7 @@
 
 #include <xfs/xfs_locl.h>
 
-RCSID("$Id: xfs_vfsops-bsd.c,v 1.3 2000/02/07 04:57:19 assar Exp $");
+RCSID("$OpenBSD: xfs_vfsops-bsd.c,v 1.4 2000/03/03 00:54:59 todd Exp $");
 
 /*
  * XFS vfs operations.
diff --git a/sys/xfs/xfs_vfsops-bsd.h b/sys/xfs/xfs_vfsops-bsd.h
index e2582d34364..401a2a82075 100644
--- a/sys/xfs/xfs_vfsops-bsd.h
+++ b/sys/xfs/xfs_vfsops-bsd.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_vfsops-bsd.h,v 1.3 2000/03/03 00:54:59 todd Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_vfsops-bsd.h,v 1.2 2000/02/07 04:57:19 assar Exp $ */
 
 #ifndef _xfs_vfsops_bsd_h
 #define _xfs_vfsops_bsd_h
diff --git a/sys/xfs/xfs_vfsops-common.c b/sys/xfs/xfs_vfsops-common.c
index 8f1210cbc9c..e7727c7da60 100644
--- a/sys/xfs/xfs_vfsops-common.c
+++ b/sys/xfs/xfs_vfsops-common.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: xfs_vfsops-common.c,v 1.2 2000/03/03 00:54:59 todd Exp $	*/
+
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -38,7 +40,7 @@
 
 #include <xfs/xfs_locl.h>
 
-RCSID("$Id: xfs_vfsops-common.c,v 1.1 1999/04/30 01:59:01 art Exp $");
+RCSID("$OpenBSD: xfs_vfsops-common.c,v 1.2 2000/03/03 00:54:59 todd Exp $");
 
 /*
  * XFS vfs operations.
diff --git a/sys/xfs/xfs_vfsops-openbsd.c b/sys/xfs/xfs_vfsops-openbsd.c
index 8c4ddc58e28..1da0cb180ab 100644
--- a/sys/xfs/xfs_vfsops-openbsd.c
+++ b/sys/xfs/xfs_vfsops-openbsd.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: xfs_vfsops-openbsd.c,v 1.3 2000/03/03 00:54:59 todd Exp $	*/
+
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -38,7 +40,7 @@
 
 #include <xfs/xfs_locl.h>
 
-RCSID("$Id: xfs_vfsops-openbsd.c,v 1.2 2000/02/07 04:57:19 assar Exp $");
+RCSID("$OpenBSD: xfs_vfsops-openbsd.c,v 1.3 2000/03/03 00:54:59 todd Exp $");
 
 #include <xfs/xfs_common.h>
 #include <xfs/xfs_message.h>
diff --git a/sys/xfs/xfs_vfsops.h b/sys/xfs/xfs_vfsops.h
index 55a5ff1c175..35c2f2b4b0d 100644
--- a/sys/xfs/xfs_vfsops.h
+++ b/sys/xfs/xfs_vfsops.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_vfsops.h,v 1.2 2000/03/03 00:54:59 todd Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_vfsops.h,v 1.1 1999/04/30 01:59:01 art Exp $ */
 
 #ifndef _xfs_vfsops_h
 #define _xfs_vfsops_h
diff --git a/sys/xfs/xfs_vnodeops-bsd.c b/sys/xfs/xfs_vnodeops-bsd.c
index 01b1f096a81..d4495d04321 100644
--- a/sys/xfs/xfs_vnodeops-bsd.c
+++ b/sys/xfs/xfs_vnodeops-bsd.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: xfs_vnodeops-bsd.c,v 1.2 2000/03/03 00:54:59 todd Exp $	*/
+
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -51,7 +53,7 @@
 #include <vm/vm.h>
 #include <vm/vnode_pager.h>
 
-RCSID("$Id: xfs_vnodeops-bsd.c,v 1.1 1999/04/30 01:59:01 art Exp $");
+RCSID("$OpenBSD: xfs_vnodeops-bsd.c,v 1.2 2000/03/03 00:54:59 todd Exp $");
 
 /*
  * vnode functions
diff --git a/sys/xfs/xfs_vnodeops-common.c b/sys/xfs/xfs_vnodeops-common.c
index 584785cd2dd..0fae847867d 100644
--- a/sys/xfs/xfs_vnodeops-common.c
+++ b/sys/xfs/xfs_vnodeops-common.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: xfs_vnodeops-common.c,v 1.3 2000/03/03 00:54:59 todd Exp $	*/
+
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -49,7 +51,7 @@
 #include <xfs/xfs_syscalls.h>
 #include <xfs/xfs_vnodeops.h>
 
-RCSID("$Id: xfs_vnodeops-common.c,v 1.2 1999/06/03 19:49:37 art Exp $");
+RCSID("$OpenBSD: xfs_vnodeops-common.c,v 1.3 2000/03/03 00:54:59 todd Exp $");
 
 int
 xfs_open_valid(struct vnode * vp, struct ucred * cred, u_int tok)
diff --git a/sys/xfs/xfs_vnodeops.h b/sys/xfs/xfs_vnodeops.h
index c608f6669b1..1838fd388f8 100644
--- a/sys/xfs/xfs_vnodeops.h
+++ b/sys/xfs/xfs_vnodeops.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xfs_vnodeops.h,v 1.2 2000/03/03 00:54:59 todd Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -36,7 +37,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: xfs_vnodeops.h,v 1.1 1999/04/30 01:59:02 art Exp $ */
 
 #ifndef _xfs_vnodeops_h
 #define _xfs_vnodeops_h