27 files changed, 59 insertions, 5 deletions

diff --git a/lib/libc/string/bzero.c b/lib/libc/string/bzero.c
index 7bc2b3a7008ad..201bd64f808d7 100644
--- a/lib/libc/string/bzero.c
+++ b/lib/libc/string/bzero.c
@@ -1,2 +1,5 @@
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define	BZERO
 #include "memset.c"
diff --git a/lib/libc/string/memcpy.c b/lib/libc/string/memcpy.c
index ee1150473aa91..ed03856e54b4e 100644
--- a/lib/libc/string/memcpy.c
+++ b/lib/libc/string/memcpy.c
@@ -1,2 +1,5 @@
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define	MEMCOPY
 #include "bcopy.c"
diff --git a/lib/libc/string/memmove.c b/lib/libc/string/memmove.c
index e9bb2c2ed14c9..05cf75a2ce6a5 100644
--- a/lib/libc/string/memmove.c
+++ b/lib/libc/string/memmove.c
@@ -1,2 +1,5 @@
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define	MEMMOVE
 #include "bcopy.c"
diff --git a/lib/libc/string/strchr.c b/lib/libc/string/strchr.c
index ee33662442d48..1d82abe86fd56 100644
--- a/lib/libc/string/strchr.c
+++ b/lib/libc/string/strchr.c
@@ -1,2 +1,5 @@
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define	STRCHR
 #include "index.c"
diff --git a/lib/libc/string/strrchr.c b/lib/libc/string/strrchr.c
index 8fcf3a19f2042..11cbd31e38472 100644
--- a/lib/libc/string/strrchr.c
+++ b/lib/libc/string/strrchr.c
@@ -1,2 +1,5 @@
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define	STRRCHR
 #include "rindex.c"
diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c
index 11e63c1a39599..e17e904921aa1 100644
--- a/lib/libc/string/strtok.c
+++ b/lib/libc/string/strtok.c
@@ -36,14 +36,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strtok.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stddef.h>
 #ifdef DEBUG_STRTOK
diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c
index 391ca94d63fd5..62752eee9799a 100644
--- a/lib/libc/string/wcscat.c
+++ b/lib/libc/string/wcscat.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c
index ad713f961123f..eb2674384bc65 100644
--- a/lib/libc/string/wcschr.c
+++ b/lib/libc/string/wcschr.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcschr.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c
index f25479cc65d67..26ea03d618511 100644
--- a/lib/libc/string/wcscmp.c
+++ b/lib/libc/string/wcscmp.c
@@ -37,7 +37,9 @@
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strcmp.c	8.1 (Berkeley) 6/4/93";
+#if 0
 __RCSID("$NetBSD$");
+#endif
 #endif /* LIBC_SCCS and not lint */
 __FBSDID("$FreeBSD$");
 
diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c
index 890d27ade6fae..fbe56d61c3d6a 100644
--- a/lib/libc/string/wcscpy.c
+++ b/lib/libc/string/wcscpy.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c
index 334b60b4c7d24..1035cb016ece5 100644
--- a/lib/libc/string/wcscspn.c
+++ b/lib/libc/string/wcscspn.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcscspn.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c
index fd81fcaab24aa..9edfbdbd96d8a 100644
--- a/lib/libc/string/wcslcat.c
+++ b/lib/libc/string/wcslcat.c
@@ -28,9 +28,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c
index 1cde15f42c6f6..575b264cdca7d 100644
--- a/lib/libc/string/wcslcpy.c
+++ b/lib/libc/string/wcslcpy.c
@@ -28,9 +28,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c
index 852a829707327..82ff51bf46c71 100644
--- a/lib/libc/string/wcslen.c
+++ b/lib/libc/string/wcslen.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcslen.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c
index c4103c525d375..11e0281c6b3d2 100644
--- a/lib/libc/string/wcsncat.c
+++ b/lib/libc/string/wcsncat.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcsncat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c
index 01d995c564d60..81bc86c0de531 100644
--- a/lib/libc/string/wcsncmp.c
+++ b/lib/libc/string/wcsncmp.c
@@ -32,10 +32,12 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strncmp.c	8.1 (Berkeley) 6/4/93";
 __RCSID("$NetBSD$");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c
index 1660bbc622596..8f155650a9492 100644
--- a/lib/libc/string/wcsncpy.c
+++ b/lib/libc/string/wcsncpy.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcsncpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c
index e2d24a7ba6cd7..2a24d0566a515 100644
--- a/lib/libc/string/wcspbrk.c
+++ b/lib/libc/string/wcspbrk.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcspbrk.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c
index 96365754d938a..b7b236b68a144 100644
--- a/lib/libc/string/wcsrchr.c
+++ b/lib/libc/string/wcsrchr.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcsrchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c
index 42dd1e6733bcc..7fc996a781a87 100644
--- a/lib/libc/string/wcsspn.c
+++ b/lib/libc/string/wcsspn.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcsspn.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c
index 1f7137d01d729..546ae9b9a9636 100644
--- a/lib/libc/string/wcsstr.c
+++ b/lib/libc/string/wcsstr.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcsstr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c
index e484dacd67594..84dc42bfcadf2 100644
--- a/lib/libc/string/wcswidth.c
+++ b/lib/libc/string/wcswidth.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wcswidth.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c
index 61fa4a2c7a71a..2aaec09203bac 100644
--- a/lib/libc/string/wmemchr.c
+++ b/lib/libc/string/wmemchr.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wmemchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c
index d47c332197bb7..4491cf0622a0b 100644
--- a/lib/libc/string/wmemcmp.c
+++ b/lib/libc/string/wmemcmp.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wmemcmp.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c
index 14888be9328d9..787e07c83e644 100644
--- a/lib/libc/string/wmemcpy.c
+++ b/lib/libc/string/wmemcpy.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wmemcpy.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c
index ef37044795d78..e4e80b25b5156 100644
--- a/lib/libc/string/wmemmove.c
+++ b/lib/libc/string/wmemmove.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wmemmove.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c
index 569b65d20dae1..1680cdbe0e8df 100644
--- a/lib/libc/string/wmemset.c
+++ b/lib/libc/string/wmemset.c
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: wmemset.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>