zap rcsid

53 files changed, 53 insertions, 364 deletions

diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c
index 14d1180144c..688c03f06e9 100644
--- a/lib/libc/db/btree/bt_close.c
+++ b/lib/libc/db/btree/bt_close.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_close.c,v 1.8 2005/03/23 19:34:58 otto Exp $	*/
+/*	$OpenBSD: bt_close.c,v 1.9 2005/08/05 13:02:59 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_close.c	8.7 (Berkeley) 8/17/94";
-#else
-static const char rcsid[] = "$OpenBSD: bt_close.c,v 1.8 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/param.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/btree/bt_conv.c b/lib/libc/db/btree/bt_conv.c
index 5a7251fe400..a15b1daccab 100644
--- a/lib/libc/db/btree/bt_conv.c
+++ b/lib/libc/db/btree/bt_conv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_conv.c,v 1.8 2005/03/23 19:34:58 otto Exp $	*/
+/*	$OpenBSD: bt_conv.c,v 1.9 2005/08/05 13:02:59 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_conv.c	8.5 (Berkeley) 8/17/94";
-#else
-static const char rcsid[] = "$OpenBSD: bt_conv.c,v 1.8 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/param.h>
 
 #include <stdio.h>
diff --git a/lib/libc/db/btree/bt_delete.c b/lib/libc/db/btree/bt_delete.c
index 9f5ca782c8a..31c97ecf74b 100644
--- a/lib/libc/db/btree/bt_delete.c
+++ b/lib/libc/db/btree/bt_delete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_delete.c,v 1.10 2005/03/23 19:34:58 otto Exp $	*/
+/*	$OpenBSD: bt_delete.c,v 1.11 2005/08/05 13:02:59 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_delete.c	8.13 (Berkeley) 7/28/94";
-#else
-static const char rcsid[] = "$OpenBSD: bt_delete.c,v 1.10 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/btree/bt_get.c b/lib/libc/db/btree/bt_get.c
index 9563d6be6dc..52cf427b632 100644
--- a/lib/libc/db/btree/bt_get.c
+++ b/lib/libc/db/btree/bt_get.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_get.c,v 1.7 2005/03/23 19:34:58 otto Exp $	*/
+/*	$OpenBSD: bt_get.c,v 1.8 2005/08/05 13:02:59 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_get.c	8.6 (Berkeley) 7/20/94";
-#else
-static const char rcsid[] = "$OpenBSD: bt_get.c,v 1.7 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c
index 618369697de..cdc439cba22 100644
--- a/lib/libc/db/btree/bt_open.c
+++ b/lib/libc/db/btree/bt_open.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_open.c,v 1.12 2005/03/23 19:34:58 otto Exp $	*/
+/*	$OpenBSD: bt_open.c,v 1.13 2005/08/05 13:02:59 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_open.c	8.11 (Berkeley) 11/2/95";
-#else
-static const char rcsid[] = "$OpenBSD: bt_open.c,v 1.12 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 /*
  * Implementation of btree access method for 4.4BSD.
  *
diff --git a/lib/libc/db/btree/bt_overflow.c b/lib/libc/db/btree/bt_overflow.c
index ff7fd38abdf..1867073b4e0 100644
--- a/lib/libc/db/btree/bt_overflow.c
+++ b/lib/libc/db/btree/bt_overflow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_overflow.c,v 1.8 2005/03/23 19:34:58 otto Exp $	*/
+/*	$OpenBSD: bt_overflow.c,v 1.9 2005/08/05 13:02:59 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_overflow.c	8.5 (Berkeley) 7/16/94";
-#else
-static const char rcsid[] = "$OpenBSD: bt_overflow.c,v 1.8 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/param.h>
 
 #include <stdio.h>
diff --git a/lib/libc/db/btree/bt_page.c b/lib/libc/db/btree/bt_page.c
index a820f1d1eff..d559d0ef197 100644
--- a/lib/libc/db/btree/bt_page.c
+++ b/lib/libc/db/btree/bt_page.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_page.c,v 1.8 2005/03/23 19:34:58 otto Exp $	*/
+/*	$OpenBSD: bt_page.c,v 1.9 2005/08/05 13:02:59 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -29,14 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_page.c	8.3 (Berkeley) 7/14/94";
-#else
-static const char rcsid[] = "$OpenBSD: bt_page.c,v 1.8 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <stdio.h>
diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c
index a106a7231e6..435ff18be6b 100644
--- a/lib/libc/db/btree/bt_put.c
+++ b/lib/libc/db/btree/bt_put.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_put.c,v 1.12 2005/03/23 19:34:58 otto Exp $	*/
+/*	$OpenBSD: bt_put.c,v 1.13 2005/08/05 13:02:59 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_put.c   8.8 (Berkeley) 7/26/94";
-#else
-static const char rcsid[] = "$OpenBSD: bt_put.c,v 1.12 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/btree/bt_search.c b/lib/libc/db/btree/bt_search.c
index 21c2b35bd9a..373aab3394b 100644
--- a/lib/libc/db/btree/bt_search.c
+++ b/lib/libc/db/btree/bt_search.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_search.c,v 1.9 2005/03/23 19:34:58 otto Exp $	*/
+/*	$OpenBSD: bt_search.c,v 1.10 2005/08/05 13:02:59 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_search.c	8.8 (Berkeley) 7/31/94";
-#else
-static const char rcsid[] = "$OpenBSD: bt_search.c,v 1.9 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <stdio.h>
diff --git a/lib/libc/db/btree/bt_seq.c b/lib/libc/db/btree/bt_seq.c
index 64b3819aa48..f67287f72dd 100644
--- a/lib/libc/db/btree/bt_seq.c
+++ b/lib/libc/db/btree/bt_seq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_seq.c,v 1.10 2005/03/23 19:34:58 otto Exp $	*/
+/*	$OpenBSD: bt_seq.c,v 1.11 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_seq.c	8.7 (Berkeley) 7/20/94";
-#else
-static const char rcsid[] = "$OpenBSD: bt_seq.c,v 1.10 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
index d96f12bea6e..84480a0a73b 100644
--- a/lib/libc/db/btree/bt_split.c
+++ b/lib/libc/db/btree/bt_split.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_split.c,v 1.12 2005/03/23 19:34:58 otto Exp $	*/
+/*	$OpenBSD: bt_split.c,v 1.13 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_split.c	8.10 (Berkeley) 1/9/95";
-#else
-static const char rcsid[] = "$OpenBSD: bt_split.c,v 1.12 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <limits.h>
diff --git a/lib/libc/db/btree/bt_utils.c b/lib/libc/db/btree/bt_utils.c
index 8f816bbecca..9d404ec5a1a 100644
--- a/lib/libc/db/btree/bt_utils.c
+++ b/lib/libc/db/btree/bt_utils.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_utils.c,v 1.8 2005/03/23 19:34:58 otto Exp $	*/
+/*	$OpenBSD: bt_utils.c,v 1.9 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)bt_utils.c	8.8 (Berkeley) 7/20/94";
-#else
-static const char rcsid[] = "$OpenBSD: bt_utils.c,v 1.8 2005/03/23 19:34:58 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/param.h>
 
 #include <stdio.h>
diff --git a/lib/libc/db/db/db.c b/lib/libc/db/db/db.c
index 066bda92bae..0e1c84417d1 100644
--- a/lib/libc/db/db/db.c
+++ b/lib/libc/db/db/db.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db.c,v 1.9 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: db.c,v 1.10 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -29,14 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)db.c	8.4 (Berkeley) 2/21/94";
-#else
-static const char rcsid[] = "$OpenBSD: db.c,v 1.9 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
index b2b5b6c40e3..2cab5ea10da 100644
--- a/lib/libc/db/hash/hash.c
+++ b/lib/libc/db/hash/hash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash.c,v 1.19 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: hash.c,v 1.20 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
-#else
-static const char rcsid[] = "$OpenBSD: hash.c,v 1.19 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c
index 2b67c093d19..4443ac9e0ed 100644
--- a/lib/libc/db/hash/hash_bigkey.c
+++ b/lib/libc/db/hash/hash_bigkey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash_bigkey.c,v 1.15 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: hash_bigkey.c,v 1.16 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
-#else
-static const char rcsid[] = "$OpenBSD: hash_bigkey.c,v 1.15 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 /*
  * PACKAGE: hash
  * DESCRIPTION:
diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c
index 0e2050b25b3..2d31534305e 100644
--- a/lib/libc/db/hash/hash_buf.c
+++ b/lib/libc/db/hash/hash_buf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash_buf.c,v 1.15 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: hash_buf.c,v 1.16 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
-#else
-static const char rcsid[] = "$OpenBSD: hash_buf.c,v 1.15 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 /*
  * PACKAGE: hash
  *
diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c
index 870ce3d939b..aa7f2d920bc 100644
--- a/lib/libc/db/hash/hash_func.c
+++ b/lib/libc/db/hash/hash_func.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash_func.c,v 1.9 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: hash_func.c,v 1.10 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)hash_func.c	8.4 (Berkeley) 11/7/95";
-#else
-static const char rcsid[] = "$OpenBSD: hash_func.c,v 1.9 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <db.h>
diff --git a/lib/libc/db/hash/hash_log2.c b/lib/libc/db/hash/hash_log2.c
index ae3731e141a..533e2cd19a6 100644
--- a/lib/libc/db/hash/hash_log2.c
+++ b/lib/libc/db/hash/hash_log2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash_log2.c,v 1.7 2003/06/25 21:15:05 deraadt Exp $	*/
+/*	$OpenBSD: hash_log2.c,v 1.8 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)hash_log2.c	8.4 (Berkeley) 11/7/95";
-#else
-static const char rcsid[] = "$OpenBSD: hash_log2.c,v 1.7 2003/06/25 21:15:05 deraadt Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <db.h>
 #include "hash.h"
 #include "page.h"
diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c
index 8526680c5f7..c32e2820069 100644
--- a/lib/libc/db/hash/hash_page.c
+++ b/lib/libc/db/hash/hash_page.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash_page.c,v 1.16 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: hash_page.c,v 1.17 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)hash_page.c	8.7 (Berkeley) 8/16/94";
-#else
-static const char rcsid[] = "$OpenBSD: hash_page.c,v 1.16 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 /*
  * PACKAGE:  hashing
  *
diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c
index ecba238bfed..9792a1c5ce3 100644
--- a/lib/libc/db/mpool/mpool.c
+++ b/lib/libc/db/mpool/mpool.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpool.c,v 1.13 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: mpool.c,v 1.14 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -29,14 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)mpool.c	8.7 (Berkeley) 11/2/95";
-#else
-static const char rcsid[] = "$OpenBSD: mpool.c,v 1.13 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
diff --git a/lib/libc/db/recno/rec_close.c b/lib/libc/db/recno/rec_close.c
index d2dd6ba887a..dae2dc2ee40 100644
--- a/lib/libc/db/recno/rec_close.c
+++ b/lib/libc/db/recno/rec_close.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rec_close.c,v 1.10 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: rec_close.c,v 1.11 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -29,14 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rec_close.c	8.6 (Berkeley) 8/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: rec_close.c,v 1.10 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/mman.h>
diff --git a/lib/libc/db/recno/rec_delete.c b/lib/libc/db/recno/rec_delete.c
index b720eea264a..bdef6b1800e 100644
--- a/lib/libc/db/recno/rec_delete.c
+++ b/lib/libc/db/recno/rec_delete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rec_delete.c,v 1.9 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: rec_delete.c,v 1.10 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rec_delete.c	8.7 (Berkeley) 7/14/94";
-#else
-static const char rcsid[] = "$OpenBSD: rec_delete.c,v 1.9 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/recno/rec_get.c b/lib/libc/db/recno/rec_get.c
index 867c4903033..98995bb0089 100644
--- a/lib/libc/db/recno/rec_get.c
+++ b/lib/libc/db/recno/rec_get.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rec_get.c,v 1.9 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: rec_get.c,v 1.10 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -29,14 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rec_get.c	8.9 (Berkeley) 8/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: rec_get.c,v 1.9 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/recno/rec_open.c b/lib/libc/db/recno/rec_open.c
index eb9f271d06f..02005cae25f 100644
--- a/lib/libc/db/recno/rec_open.c
+++ b/lib/libc/db/recno/rec_open.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rec_open.c,v 1.10 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: rec_open.c,v 1.11 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rec_open.c	8.10 (Berkeley) 9/1/94";
-#else
-static const char rcsid[] = "$OpenBSD: rec_open.c,v 1.10 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/lib/libc/db/recno/rec_put.c b/lib/libc/db/recno/rec_put.c
index 6b17901006f..708db159e1f 100644
--- a/lib/libc/db/recno/rec_put.c
+++ b/lib/libc/db/recno/rec_put.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rec_put.c,v 1.9 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: rec_put.c,v 1.10 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -29,14 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rec_put.c	8.7 (Berkeley) 8/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: rec_put.c,v 1.9 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/recno/rec_search.c b/lib/libc/db/recno/rec_search.c
index 3a20ff1d6e6..a609ca4f44a 100644
--- a/lib/libc/db/recno/rec_search.c
+++ b/lib/libc/db/recno/rec_search.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rec_search.c,v 1.10 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: rec_search.c,v 1.11 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -29,14 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)rec_search.c	8.4 (Berkeley) 7/14/94";
-#else
-static const char rcsid[] = "$OpenBSD: rec_search.c,v 1.10 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/recno/rec_seq.c b/lib/libc/db/recno/rec_seq.c
index ef88eccc39e..cf193aa1952 100644
--- a/lib/libc/db/recno/rec_seq.c
+++ b/lib/libc/db/recno/rec_seq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rec_seq.c,v 1.7 2005/03/23 19:34:59 otto Exp $	*/
+/*	$OpenBSD: rec_seq.c,v 1.8 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -29,14 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)rec_utils.c	8.6 (Berkeley) 7/16/94";
-#else
-static const char rcsid[] = "$OpenBSD: rec_seq.c,v 1.7 2005/03/23 19:34:59 otto Exp $";
-#endif
-#endif /* not lint */
-
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/db/recno/rec_utils.c b/lib/libc/db/recno/rec_utils.c
index 0212ee1936b..7e1f44be38f 100644
--- a/lib/libc/db/recno/rec_utils.c
+++ b/lib/libc/db/recno/rec_utils.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: rec_utils.c,v 1.7 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: rec_utils.c,v 1.6 2005/03/23 19:34:59 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/param.h>
 
 #include <stdio.h>
diff --git a/lib/libc/nls/_catclose.c b/lib/libc/nls/_catclose.c
index 8e847cf21e5..239f5304386 100644
--- a/lib/libc/nls/_catclose.c
+++ b/lib/libc/nls/_catclose.c
@@ -1,12 +1,9 @@
+/*	$OpenBSD: _catclose.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*
  * Written by J.T. Conklin, 10/05/94
  * Public domain.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _catclose.c,v 1.4 2005/03/23 21:13:28 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/cdefs.h>
 
 #ifdef __indr_reference
diff --git a/lib/libc/nls/_catgets.c b/lib/libc/nls/_catgets.c
index c342871a60a..36402bd0ef6 100644
--- a/lib/libc/nls/_catgets.c
+++ b/lib/libc/nls/_catgets.c
@@ -1,12 +1,9 @@
+/*	$OpenBSD: _catgets.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*
  * Written by J.T. Conklin, 10/05/94
  * Public domain.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _catgets.c,v 1.4 2005/03/23 21:13:28 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/cdefs.h>
 
 #ifdef __indr_reference
diff --git a/lib/libc/nls/_catopen.c b/lib/libc/nls/_catopen.c
index c0f000bef0e..d07c2a85cc9 100644
--- a/lib/libc/nls/_catopen.c
+++ b/lib/libc/nls/_catopen.c
@@ -1,12 +1,9 @@
+/*	$OpenBSD: _catopen.c,v 1.6 2005/08/05 13:03:00 espie Exp $ */
 /*
  * Written by J.T. Conklin, 10/05/94
  * Public domain.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _catopen.c,v 1.5 2005/03/23 21:13:28 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/cdefs.h>
 
 #ifdef __indr_reference
diff --git a/lib/libc/nls/catclose.c b/lib/libc/nls/catclose.c
index 3cc8b9457a4..b12642f8439 100644
--- a/lib/libc/nls/catclose.c
+++ b/lib/libc/nls/catclose.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: catclose.c,v 1.6 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,10 +35,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: catclose.c,v 1.5 2005/03/23 21:13:28 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #define _NLS_PRIVATE
 
 #include <sys/types.h>
diff --git a/lib/libc/nls/catgets.c b/lib/libc/nls/catgets.c
index 54faf6af253..5d30d082cab 100644
--- a/lib/libc/nls/catgets.c
+++ b/lib/libc/nls/catgets.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: catgets.c,v 1.7 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,10 +35,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: catgets.c,v 1.6 2005/03/23 21:13:28 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #define _NLS_PRIVATE
 
 #include <errno.h>
diff --git a/lib/libc/nls/catopen.c b/lib/libc/nls/catopen.c
index bf316a26841..8dac5f558de 100644
--- a/lib/libc/nls/catopen.c
+++ b/lib/libc/nls/catopen.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: catopen.c,v 1.12 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,10 +35,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: catopen.c,v 1.11 2005/03/23 21:13:28 otto Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #define _NLS_PRIVATE
 
 #include <limits.h>
diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c
index 466a8208e88..024c4ea3844 100644
--- a/lib/libc/regex/engine.c
+++ b/lib/libc/regex/engine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: engine.c,v 1.14 2005/01/03 19:51:14 otto Exp $	*/
+/*	$OpenBSD: engine.c,v 1.15 2005/08/05 13:03:00 espie Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994 Henry Spencer.
@@ -35,10 +35,6 @@
  *	@(#)engine.c	8.5 (Berkeley) 3/20/94
  */
 
-#if defined(SNAMES) && defined(LIBC_SCCS) && !defined(lint)
-static char enginercsid[] = "$OpenBSD: engine.c,v 1.14 2005/01/03 19:51:14 otto Exp $";
-#endif /* SNAMES and LIBC_SCCS and not lint */
-
 /*
  * The matching engine and friends.  This file is #included by regexec.c
  * after suitable #defines of a variety of macros used herein, so that
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index ad90f1975c7..ad65f3622b8 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: regcomp.c,v 1.15 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994 Henry Spencer.
  * Copyright (c) 1992, 1993, 1994
@@ -33,14 +34,6 @@
  *	@(#)regcomp.c	8.5 (Berkeley) 3/20/94
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
-#else
-static char rcsid[] = "$OpenBSD: regcomp.c,v 1.14 2004/11/30 17:04:23 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
index 5f7e2b67446..e75be186a26 100644
--- a/lib/libc/regex/regerror.c
+++ b/lib/libc/regex/regerror.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: regerror.c,v 1.13 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994 Henry Spencer.
  * Copyright (c) 1992, 1993, 1994
@@ -33,14 +34,6 @@
  *	@(#)regerror.c	8.4 (Berkeley) 3/20/94
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
-#else
-static char rcsid[] = "$OpenBSD: regerror.c,v 1.12 2004/11/30 17:04:23 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/regex/regexec.c b/lib/libc/regex/regexec.c
index c644b4ff41b..7b3bfc7a0b1 100644
--- a/lib/libc/regex/regexec.c
+++ b/lib/libc/regex/regexec.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: regexec.c,v 1.11 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994 Henry Spencer.
  * Copyright (c) 1992, 1993, 1994
@@ -33,14 +34,6 @@
  *	@(#)regexec.c	8.3 (Berkeley) 3/20/94
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
-#else
-static char rcsid[] = "$OpenBSD: regexec.c,v 1.10 2004/11/30 17:04:23 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 /*
  * the outer shell of regexec()
  *
diff --git a/lib/libc/regex/regfree.c b/lib/libc/regex/regfree.c
index db8a38d97f0..a57eba3c1f0 100644
--- a/lib/libc/regex/regfree.c
+++ b/lib/libc/regex/regfree.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: regfree.c,v 1.7 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994 Henry Spencer.
  * Copyright (c) 1992, 1993, 1994
@@ -33,14 +34,6 @@
  *	@(#)regfree.c	8.3 (Berkeley) 3/20/94
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)regfree.c	8.3 (Berkeley) 3/20/94";
-#else
-static char rcsid[] = "$OpenBSD: regfree.c,v 1.6 2004/11/30 17:04:23 otto Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/termios/cfgetispeed.c b/lib/libc/termios/cfgetispeed.c
index 21ed71e3b1c..dec51fdcf3d 100644
--- a/lib/libc/termios/cfgetispeed.c
+++ b/lib/libc/termios/cfgetispeed.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cfgetispeed.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: cfgetispeed.c,v 1.4 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <termios.h>
 
 speed_t
diff --git a/lib/libc/termios/cfgetospeed.c b/lib/libc/termios/cfgetospeed.c
index fcc546a3b62..c6de6555e96 100644
--- a/lib/libc/termios/cfgetospeed.c
+++ b/lib/libc/termios/cfgetospeed.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cfgetospeed.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: cfgetospeed.c,v 1.4 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <termios.h>
 
 speed_t
diff --git a/lib/libc/termios/cfmakeraw.c b/lib/libc/termios/cfmakeraw.c
index 5877add33c6..f0144fb8781 100644
--- a/lib/libc/termios/cfmakeraw.c
+++ b/lib/libc/termios/cfmakeraw.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cfmakeraw.c,v 1.6 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: cfmakeraw.c,v 1.5 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <termios.h>
 
 /*
diff --git a/lib/libc/termios/cfsetispeed.c b/lib/libc/termios/cfsetispeed.c
index 3e4f8c4cdea..4fb6aafd485 100644
--- a/lib/libc/termios/cfsetispeed.c
+++ b/lib/libc/termios/cfsetispeed.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cfsetispeed.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: cfsetispeed.c,v 1.4 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <termios.h>
 
 int
diff --git a/lib/libc/termios/cfsetospeed.c b/lib/libc/termios/cfsetospeed.c
index 5aa83c4e570..6e4e663a801 100644
--- a/lib/libc/termios/cfsetospeed.c
+++ b/lib/libc/termios/cfsetospeed.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cfsetospeed.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: cfsetospeed.c,v 1.4 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <termios.h>
 
 int
diff --git a/lib/libc/termios/cfsetspeed.c b/lib/libc/termios/cfsetspeed.c
index d5bbed307a8..ab32201d60e 100644
--- a/lib/libc/termios/cfsetspeed.c
+++ b/lib/libc/termios/cfsetspeed.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cfsetspeed.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: cfsetspeed.c,v 1.4 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <termios.h>
 
 int
diff --git a/lib/libc/termios/tcdrain.c b/lib/libc/termios/tcdrain.c
index c9869db485f..ac74b496fa8 100644
--- a/lib/libc/termios/tcdrain.c
+++ b/lib/libc/termios/tcdrain.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: tcdrain.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tcdrain.c,v 1.4 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/ioctl.h>
 #include <termios.h>
 
diff --git a/lib/libc/termios/tcflow.c b/lib/libc/termios/tcflow.c
index d6c48ce0a31..458999da488 100644
--- a/lib/libc/termios/tcflow.c
+++ b/lib/libc/termios/tcflow.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: tcflow.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tcflow.c,v 1.4 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <unistd.h>
diff --git a/lib/libc/termios/tcflush.c b/lib/libc/termios/tcflush.c
index bbce84de096..c35801c55f7 100644
--- a/lib/libc/termios/tcflush.c
+++ b/lib/libc/termios/tcflush.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: tcflush.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tcflush.c,v 1.4 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <termios.h>
diff --git a/lib/libc/termios/tcgetattr.c b/lib/libc/termios/tcgetattr.c
index f3f627f6b61..638cdba53bc 100644
--- a/lib/libc/termios/tcgetattr.c
+++ b/lib/libc/termios/tcgetattr.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: tcgetattr.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tcgetattr.c,v 1.4 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/ioctl.h>
 #include <termios.h>
 
diff --git a/lib/libc/termios/tcgetpgrp.c b/lib/libc/termios/tcgetpgrp.c
index 06ef8bc2b71..70f3a313f51 100644
--- a/lib/libc/termios/tcgetpgrp.c
+++ b/lib/libc/termios/tcgetpgrp.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: tcgetpgrp.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tcgetpgrp.c,v 1.4 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <termios.h>
diff --git a/lib/libc/termios/tcsendbreak.c b/lib/libc/termios/tcsendbreak.c
index ffc775c6f39..79e80f5958b 100644
--- a/lib/libc/termios/tcsendbreak.c
+++ b/lib/libc/termios/tcsendbreak.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: tcsendbreak.c,v 1.6 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tcsendbreak.c,v 1.5 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
diff --git a/lib/libc/termios/tcsetattr.c b/lib/libc/termios/tcsetattr.c
index d7770039bc1..9251a98bc23 100644
--- a/lib/libc/termios/tcsetattr.c
+++ b/lib/libc/termios/tcsetattr.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: tcsetattr.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tcsetattr.c,v 1.4 2003/06/11 21:03:09 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <errno.h>
diff --git a/lib/libc/termios/tcsetpgrp.c b/lib/libc/termios/tcsetpgrp.c
index 894e85c64e4..d101666d3e8 100644
--- a/lib/libc/termios/tcsetpgrp.c
+++ b/lib/libc/termios/tcsetpgrp.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: tcsetpgrp.c,v 1.6 2005/08/05 13:03:00 espie Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tcsetpgrp.c,v 1.5 2003/06/02 20:18:40 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <termios.h>