diff --git a/lib/libc/alpha/SYS.h b/lib/libc/alpha/SYS.h
index 94e9ee0677bc..5d28260f9380 100644
--- a/lib/libc/alpha/SYS.h
+++ b/lib/libc/alpha/SYS.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	From: NetBSD: SYS.h,v 1.5 1997/05/02 18:15:15 kleink Exp */
 
 /*
@@ -26,6 +25,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $FreeBSD$
  */
 
 #include <machine/asm.h>
diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index 2e0f70898140..5a636f8b33b9 100644
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@@ -33,8 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)SYS.h	5.5 (Berkeley) 5/7/91
- *
+ *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
  * $FreeBSD$
  */
 
diff --git a/lib/libc/db/btree/btree.h b/lib/libc/db/btree/btree.h
index 251dd3f98e68..1ac6fe106efc 100644
--- a/lib/libc/db/btree/btree.h
+++ b/lib/libc/db/btree/btree.h
@@ -34,11 +34,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)btree.h	8.11 (Berkeley) 8/17/94
+ * $FreeBSD$
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* Macros to set/clear/test flags. */
 #define	F_SET(p, f)	(p)->flags |= (f)
 #define	F_CLR(p, f)	(p)->flags &= ~(f)
diff --git a/lib/libc/db/hash/page.h b/lib/libc/db/hash/page.h
index 0fc0d5a3e96d..6ad92484661d 100644
--- a/lib/libc/db/hash/page.h
+++ b/lib/libc/db/hash/page.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)page.h	8.2 (Berkeley) 5/31/94
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/db/recno/recno.h b/lib/libc/db/recno/recno.h
index bec772c2fab4..031857112915 100644
--- a/lib/libc/db/recno/recno.h
+++ b/lib/libc/db/recno/recno.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)recno.h	8.1 (Berkeley) 6/4/93
+ * $FreeBSD$
  */
 
 enum SRCHOP { SDELETE, SINSERT, SEARCH};	/* Rec_search operation. */
diff --git a/lib/libc/gen/pw_scan.h b/lib/libc/gen/pw_scan.h
index 954854b79793..f83df2cdec68 100644
--- a/lib/libc/gen/pw_scan.h
+++ b/lib/libc/gen/pw_scan.h
@@ -31,8 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pw_scan.h	8.1 (Berkeley) 4/1/94
- *
- *	$FreeBSD$
+ * $FreeBSD$
  */
 
 #define _PWSCAN_MASTER 0x01
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index 2e0f70898140..5a636f8b33b9 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -33,8 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)SYS.h	5.5 (Berkeley) 5/7/91
- *
+ *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
  * $FreeBSD$
  */
 
diff --git a/lib/libc/ia64/SYS.h b/lib/libc/ia64/SYS.h
index 86fec08dee77..64d50d2a18a6 100644
--- a/lib/libc/ia64/SYS.h
+++ b/lib/libc/ia64/SYS.h
@@ -1,5 +1,4 @@
-/* $FreeBSD$ */
-/*	From: NetBSD: SYS.h,v 1.5 1997/05/02 18:15:15 kleink Exp */
+/*	$NetBSD: SYS.h,v 1.5 1997/05/02 18:15:15 kleink Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -26,6 +25,8 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
+ * $FreeBSD$
  */
 
 #include <machine/asm.h>
diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
index 68babbea36a6..7753f98083f9 100644
--- a/lib/libc/include/namespace.h
+++ b/lib/libc/include/namespace.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD$
- *
  */
 
 #ifndef _NAMESPACE_H_
diff --git a/lib/libc/mips/SYS.h b/lib/libc/mips/SYS.h
index ccce710bc02c..37fb3ccd84e7 100644
--- a/lib/libc/mips/SYS.h
+++ b/lib/libc/mips/SYS.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *      $OpenBSD: SYS.h,v 1.3 1996/07/30 20:27:48 pefo Exp $ 
+ * $FreeBSD$
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/mipseb/SYS.h b/lib/libc/mipseb/SYS.h
index ccce710bc02c..37fb3ccd84e7 100644
--- a/lib/libc/mipseb/SYS.h
+++ b/lib/libc/mipseb/SYS.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *      $OpenBSD: SYS.h,v 1.3 1996/07/30 20:27:48 pefo Exp $ 
+ * $FreeBSD$
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/net/res_config.h b/lib/libc/net/res_config.h
index 644e7d796add..b17fd2de594d 100644
--- a/lib/libc/net/res_config.h
+++ b/lib/libc/net/res_config.h
@@ -1,3 +1,5 @@
+/* $FreeBSD$ */
+
 #define	DEBUG	1	/* enable debugging code (needed for dig) */
 #define	RESOLVSORT	/* allow sorting of addresses in gethostbyname */
 #define	RFC1535		/* comply with RFC1535 (STRONGLY reccomended by vixie)*/
diff --git a/lib/libc/regex/cclass.h b/lib/libc/regex/cclass.h
index 581909c869cd..32a25fa36017 100644
--- a/lib/libc/regex/cclass.h
+++ b/lib/libc/regex/cclass.h
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cclass.h	8.3 (Berkeley) 3/20/94
+ * $FreeBSD$
  */
 
 
diff --git a/lib/libc/regex/cname.h b/lib/libc/regex/cname.h
index 72bbe5ece1f0..b03085e485cc 100644
--- a/lib/libc/regex/cname.h
+++ b/lib/libc/regex/cname.h
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cname.h	8.3 (Berkeley) 3/20/94
+ * $FreeBSD$
  */
 
 /* character-name table */
diff --git a/lib/libc/regex/grot/limits.h b/lib/libc/regex/grot/limits.h
index 6049fdf2e1b6..7f4988c68738 100644
--- a/lib/libc/regex/grot/limits.h
+++ b/lib/libc/regex/grot/limits.h
@@ -1,5 +1,6 @@
 /* $FreeBSD$
  */
+
 #define	_POSIX2_RE_DUP_MAX	255
 #define	CHAR_MIN	(-128)
 #define	CHAR_MAX	127
diff --git a/lib/libc/regex/grot/stdlib.h b/lib/libc/regex/grot/stdlib.h
index 7e58a4564423..ae859ac7fb23 100644
--- a/lib/libc/regex/grot/stdlib.h
+++ b/lib/libc/regex/grot/stdlib.h
@@ -1,4 +1,5 @@
 /* $FreeBSD$
  */
+
 extern char *malloc();
 extern char *realloc();
diff --git a/lib/libc/regex/regex2.h b/lib/libc/regex/regex2.h
index cd634db249b4..8c645ce4d8cd 100644
--- a/lib/libc/regex/regex2.h
+++ b/lib/libc/regex/regex2.h
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)regex2.h	8.4 (Berkeley) 3/20/94
- *
  * $FreeBSD$
  */
 
diff --git a/lib/libc/regex/utils.h b/lib/libc/regex/utils.h
index d804d8db116f..9d6eba3cf8cb 100644
--- a/lib/libc/regex/utils.h
+++ b/lib/libc/regex/utils.h
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utils.h	8.3 (Berkeley) 3/20/94
+ * $FreeBSD$
  */
 
 /* utility definitions */
diff --git a/lib/libc/sparc64/SYS.h b/lib/libc/sparc64/SYS.h
index 8a5f515c5e0d..6fe4ccdb29d9 100644
--- a/lib/libc/sparc64/SYS.h
+++ b/lib/libc/sparc64/SYS.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)SYS.h	5.5 (Berkeley) 5/7/91
+ *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
  *	from: FreeBSD: src/lib/libc/i386/SYS.h,v 1.20 2001/01/29
  * $FreeBSD$
  */
diff --git a/lib/libc/sparc64/fpu/fpu_arith.h b/lib/libc/sparc64/fpu/fpu_arith.h
index 106e4917460c..9cb7488454df 100644
--- a/lib/libc/sparc64/fpu/fpu_arith.h
+++ b/lib/libc/sparc64/fpu/fpu_arith.h
@@ -39,9 +39,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)fpu_arith.h	8.1 (Berkeley) 6/11/93
- *	from: NetBSD: fpu_arith.h,v 1.3 2000/07/24 04:11:03 mycroft
- *
+ *	@(#)fpu_arith.h	8.1 (Berkeley) 6/11/93
+ *	$NetBSD: fpu_arith.h,v 1.3 2000/07/24 04:11:03 mycroft Exp $
  * $FreeBSD$
  */
 
diff --git a/lib/libc/sparc64/fpu/fpu_emu.h b/lib/libc/sparc64/fpu/fpu_emu.h
index b09d94f86890..51996b16e3c2 100644
--- a/lib/libc/sparc64/fpu/fpu_emu.h
+++ b/lib/libc/sparc64/fpu/fpu_emu.h
@@ -39,8 +39,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)fpu_emu.h	8.1 (Berkeley) 6/11/93
- *	from: NetBSD: fpu_emu.h,v 1.4 2000/08/03 18:32:07 eeh
+ *	@(#)fpu_emu.h	8.1 (Berkeley) 6/11/93
+ *	$NetBSD: fpu_emu.h,v 1.4 2000/08/03 18:32:07 eeh Exp $
  * $FreeBSD$
  */
 
diff --git a/lib/libc/sparc64/fpu/fpu_extern.h b/lib/libc/sparc64/fpu/fpu_extern.h
index 922bc493815f..fca0f065c04c 100644
--- a/lib/libc/sparc64/fpu/fpu_extern.h
+++ b/lib/libc/sparc64/fpu/fpu_extern.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *	from: NetBSD: fpu_extern.h,v 1.4 2000/08/03 18:32:08 eeh Exp
+ *	$NetBSD: fpu_extern.h,v 1.4 2000/08/03 18:32:08 eeh Exp $
  * $FreeBSD$
  */
 
diff --git a/lib/libc/stdio/floatio.h b/lib/libc/stdio/floatio.h
index c2089fe415e4..a40df0020bad 100644
--- a/lib/libc/stdio/floatio.h
+++ b/lib/libc/stdio/floatio.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)floatio.h	8.1 (Berkeley) 6/4/93
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/stdio/fvwrite.h b/lib/libc/stdio/fvwrite.h
index ec6bc0beeffa..e55341b4033b 100644
--- a/lib/libc/stdio/fvwrite.h
+++ b/lib/libc/stdio/fvwrite.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fvwrite.h	8.1 (Berkeley) 6/4/93
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/stdio/glue.h b/lib/libc/stdio/glue.h
index 5dcdafff18a9..79e1cd404466 100644
--- a/lib/libc/stdio/glue.h
+++ b/lib/libc/stdio/glue.h
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)glue.h	8.1 (Berkeley) 6/4/93
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index 217380819b50..5b2e23ee1b64 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)local.h	8.3 (Berkeley) 7/3/94
- *
  * $FreeBSD$
  */
 
diff --git a/lib/libc/stdlib/atexit.h b/lib/libc/stdlib/atexit.h
index 819151e2b952..96ef95f8bb02 100644
--- a/lib/libc/stdlib/atexit.h
+++ b/lib/libc/stdlib/atexit.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)atexit.h	8.2 (Berkeley) 7/3/94
+ * $FreeBSD$
  */
 
 /* must be at least 32 to guarantee ANSI conformance */
diff --git a/lib/libc/stdtime/private.h b/lib/libc/stdtime/private.h
index f1d7125244e2..8568ab1d2a61 100644
--- a/lib/libc/stdtime/private.h
+++ b/lib/libc/stdtime/private.h
@@ -1,11 +1,11 @@
-/* $FreeBSD$ */
-
 #ifndef PRIVATE_H
 
 #define PRIVATE_H
 /*
 ** This file is in the public domain, so clarified as of
 ** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
+**
+** $FreeBSD$
 */
 
 /* Stuff moved from Makefile.inc to reduce clutter */
diff --git a/lib/libc/stdtime/tzfile.h b/lib/libc/stdtime/tzfile.h
index c1b27ea9409b..89c569453c21 100644
--- a/lib/libc/stdtime/tzfile.h
+++ b/lib/libc/stdtime/tzfile.h
@@ -1,10 +1,12 @@
 #ifndef TZFILE_H
-
 #define TZFILE_H
 
+
 /*
 ** This file is in the public domain, so clarified as of
 ** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
+**
+** $FreeBSD$
 */
 
 /*