diff --git a/bin/cp/extern.h b/bin/cp/extern.h
index f42315f0739..a5b86c12b2f 100644
--- a/bin/cp/extern.h
+++ b/bin/cp/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- * $FreeBSD$
  */
 
 typedef struct {
diff --git a/bin/dd/dd.h b/bin/dd/dd.h
index ea606f288f3..ce00412073e 100644
--- a/bin/dd/dd.h
+++ b/bin/dd/dd.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
  */
 
 /* Input/output stream state. */
diff --git a/bin/dd/extern.h b/bin/dd/extern.h
index c9de42a152d..760eecb14b5 100644
--- a/bin/dd/extern.h
+++ b/bin/dd/extern.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
  */
 
 void block(void);
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index 4dcf5eb36f3..e4562be8d33 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index 0e577a88547..c3a4eafc353 100644
--- a/bin/ls/extern.h
+++ b/bin/ls/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
  */
 
 #include <stdbool.h>
diff --git a/bin/ls/ls.h b/bin/ls/ls.h
index 1f19858720b..79e91754538 100644
--- a/bin/ls/ls.h
+++ b/bin/ls/ls.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ls.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
  */
 
 #define NO_PRINT	1
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
index 8a7cca9f457..d2045f51516 100644
--- a/bin/pax/cache.h
+++ b/bin/pax/cache.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *      @(#)cache.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h
index e5d61dea36f..a5976d9b7a6 100644
--- a/bin/pax/cpio.h
+++ b/bin/pax/cpio.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)cpio.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index 12b7fe162a6..44d0ab0b40f 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h
index 8e0a710e4ca..39d08afad0a 100644
--- a/bin/pax/ftree.h
+++ b/bin/pax/ftree.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ftree.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/options.h b/bin/pax/options.h
index 973ea0bd546..637fd404997 100644
--- a/bin/pax/options.h
+++ b/bin/pax/options.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h
index e28064e6a08..897d50a1a32 100644
--- a/bin/pax/pat_rep.h
+++ b/bin/pax/pat_rep.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pat_rep.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index 530f8aa0d33..d48a267fbca 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pax.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h
index a628e6981b1..e2ffae52a50 100644
--- a/bin/pax/sel_subs.h
+++ b/bin/pax/sel_subs.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)sel_subs.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index fb5bc437b0a..eaa48066f70 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tables.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index 91c2400e35c..0b95bddc1fe 100644
--- a/bin/pax/tar.h
+++ b/bin/pax/tar.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tar.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index ea4362eeadd..6b07a79fbc2 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD$
  */
 
 struct kinfo;
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index 03e38af9d51..429dff63287 100644
--- a/bin/ps/ps.h
+++ b/bin/ps/ps.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ps.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/bin/sh/alias.h b/bin/sh/alias.h
index 92de705bc96..0c6ea99e8b6 100644
--- a/bin/sh/alias.h
+++ b/bin/sh/alias.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)alias.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 #define ALIASINUSE	1
diff --git a/bin/sh/arith.h b/bin/sh/arith.h
index 569d0c58651..124fd5944a5 100644
--- a/bin/sh/arith.h
+++ b/bin/sh/arith.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)arith.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 #include "shell.h"
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index 8149895815d..226d630694b 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)bltin.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/sh/error.h b/bin/sh/error.h
index 3a79dec81b9..c097c529dc0 100644
--- a/bin/sh/error.h
+++ b/bin/sh/error.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)error.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/sh/eval.h b/bin/sh/eval.h
index d8a12eb79c7..361e0f2ba26 100644
--- a/bin/sh/eval.h
+++ b/bin/sh/eval.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)eval.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 extern char *commandname;	/* currently executing command */
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index 03e7e6ab0b0..04d1b97d738 100644
--- a/bin/sh/exec.h
+++ b/bin/sh/exec.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 6/8/95
- * $FreeBSD$
  */
 
 /* values of cmdtype */
diff --git a/bin/sh/expand.h b/bin/sh/expand.h
index a60ea29514d..2cf6d2ee097 100644
--- a/bin/sh/expand.h
+++ b/bin/sh/expand.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)expand.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 struct arglist {
diff --git a/bin/sh/input.h b/bin/sh/input.h
index edb622b6ec2..b46e2c021e7 100644
--- a/bin/sh/input.h
+++ b/bin/sh/input.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)input.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 /* PEOF (the end of file marker) is defined in syntax.h */
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index 411d08f27a6..050c86a91ff 100644
--- a/bin/sh/jobs.h
+++ b/bin/sh/jobs.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)jobs.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 /* Mode argument to forkshell.  Don't change FORK_FG or FORK_BG. */
diff --git a/bin/sh/mail.h b/bin/sh/mail.h
index 0bb565209c7..0a52e9f198a 100644
--- a/bin/sh/mail.h
+++ b/bin/sh/mail.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)mail.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 void chkmail(int);
diff --git a/bin/sh/main.h b/bin/sh/main.h
index d12c7ab77fe..38f9b271c30 100644
--- a/bin/sh/main.h
+++ b/bin/sh/main.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)main.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 extern int rootpid;	/* pid of main shell */
diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h
index 6cb7bd818fb..038d18173c7 100644
--- a/bin/sh/memalloc.h
+++ b/bin/sh/memalloc.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)memalloc.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h
index 1f513f0ae20..ef84a90bf5b 100644
--- a/bin/sh/myhistedit.h
+++ b/bin/sh/myhistedit.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)myhistedit.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 #include <histedit.h>
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index ff4384d21c3..dcbdc91cb5d 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)mystring.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat
index 43fa515fe90..9172c544de3 100644
--- a/bin/sh/nodes.c.pat
+++ b/bin/sh/nodes.c.pat
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nodes.c.pat	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/bin/sh/options.h b/bin/sh/options.h
index 7c9c4513aa3..9c516b07ad2 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 struct shparam {
diff --git a/bin/sh/output.h b/bin/sh/output.h
index 62f006d32a3..409cc16df75 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)output.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 #ifndef OUTPUT_INCL
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index aee8244ecf0..5f5249866b0 100644
--- a/bin/sh/parser.h
+++ b/bin/sh/parser.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)parser.h	8.3 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 /* control characters in argument strings */
diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index 08c52359c59..f49d0ddc9a7 100644
--- a/bin/sh/redir.h
+++ b/bin/sh/redir.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)redir.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 /* flags passed to redirect */
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index 536efe6ce22..64a2be86b4f 100644
--- a/bin/sh/shell.h
+++ b/bin/sh/shell.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)shell.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 #ifndef SHELL_H_
diff --git a/bin/sh/show.h b/bin/sh/show.h
index 790a62e2942..9dc77c6857d 100644
--- a/bin/sh/show.h
+++ b/bin/sh/show.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)show.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 void showtree(union node *);
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index fdc4b7a9683..f7985e8e70a 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)trap.h	8.3 (Berkeley) 6/5/95
- * $FreeBSD$
  */
 
 extern volatile sig_atomic_t pendingsig;
diff --git a/bin/sh/var.h b/bin/sh/var.h
index eaf4f427f63..abd2a47c197 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)var.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 /*
diff --git a/bin/stty/extern.h b/bin/stty/extern.h
index 88b58890f7d..40aa92c35de 100644
--- a/bin/stty/extern.h
+++ b/bin/stty/extern.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
  */
 
 int	c_cchars(const void *, const void *);
diff --git a/bin/stty/stty.h b/bin/stty/stty.h
index d48ccaa20b6..d4236b09cb6 100644
--- a/bin/stty/stty.h
+++ b/bin/stty/stty.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)stty.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD$
  */
 
 #include <sys/ioctl.h>
diff --git a/cddl/compat/opensolaris/include/thread_pool.h b/cddl/compat/opensolaris/include/thread_pool.h
index 3bd23a6dd2a..3f4f74212d7 100644
--- a/cddl/compat/opensolaris/include/thread_pool.h
+++ b/cddl/compat/opensolaris/include/thread_pool.h
@@ -25,7 +25,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef	_THREAD_POOL_H_
diff --git a/include/_ctype.h b/include/_ctype.h
index 96fbaeba00d..91e6b1d14f6 100644
--- a/include/_ctype.h
+++ b/include/_ctype.h
@@ -38,7 +38,6 @@
  *
  * From @(#)ctype.h	8.4 (Berkeley) 1/21/94
  * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp
- * $FreeBSD$
  */
 
 #ifndef __CTYPE_H_
diff --git a/include/a.out.h b/include/a.out.h
index d532d062cac..8e0a3c34bfe 100644
--- a/include/a.out.h
+++ b/include/a.out.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)a.out.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef	_AOUT_H_
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 357a444a0d2..881027a0d63 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -54,7 +54,6 @@
 /*%
  *	@(#)inet.h	8.1 (Berkeley) 6/2/93
  *	$Id: inet.h,v 1.3 2005/04/27 04:56:16 sra Exp $
- * $FreeBSD$
  */
 
 #ifndef _ARPA_INET_H_
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 69ec06dd723..4c4d0788b7d 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -48,7 +48,6 @@
 
 /*
  *	$Id: nameser.h,v 1.16 2009/03/03 01:52:48 each Exp $
- * $FreeBSD$
  */
 
 #ifndef _ARPA_NAMESER_H_
diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h
index d70bc199b82..fd5e397092d 100644
--- a/include/arpa/nameser_compat.h
+++ b/include/arpa/nameser_compat.h
@@ -32,7 +32,6 @@
 /*%
  *      from nameser.h	8.1 (Berkeley) 6/2/93
  *	$Id: nameser_compat.h,v 1.8 2006/05/19 02:33:40 marka Exp $
- * $FreeBSD$
  */
 
 #ifndef _ARPA_NAMESER_COMPAT_
diff --git a/include/arpa/telnet.h b/include/arpa/telnet.h
index 855b3d26f9c..922a0656346 100644
--- a/include/arpa/telnet.h
+++ b/include/arpa/telnet.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- * $FreeBSD$
  */
 
 #ifndef _ARPA_TELNET_H_
diff --git a/include/arpa/tftp.h b/include/arpa/tftp.h
index 50147137db1..c62429cf16a 100644
--- a/include/arpa/tftp.h
+++ b/include/arpa/tftp.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tftp.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _ARPA_TFTP_H_
diff --git a/include/assert.h b/include/assert.h
index 702e231603e..54e1456b9e0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)assert.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/include/ctype.h b/include/ctype.h
index 13173139777..46e8f3b23d9 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -37,7 +37,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ctype.h	8.4 (Berkeley) 1/21/94
- *      $FreeBSD$
  */
 
 #ifndef _CTYPE_H_
diff --git a/include/db.h b/include/db.h
index 13fa91d6804..19db882f8ef 100644
--- a/include/db.h
+++ b/include/db.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)db.h	8.7 (Berkeley) 6/16/94
- * $FreeBSD$
  */
 
 #ifndef _DB_H_
diff --git a/include/dirent.h b/include/dirent.h
index 751a016838c..5db7fe43b24 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.2 (Berkeley) 7/28/94
- * $FreeBSD$
  */
 
 #ifndef _DIRENT_H_
diff --git a/include/err.h b/include/err.h
index 4b67275a345..85b229a05d2 100644
--- a/include/err.h
+++ b/include/err.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)err.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _ERR_H_
diff --git a/include/fstab.h b/include/fstab.h
index 364d132bc4c..e61bb7c6d5d 100644
--- a/include/fstab.h
+++ b/include/fstab.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)fstab.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _FSTAB_H_
diff --git a/include/fts.h b/include/fts.h
index 6f4674e4a76..6c6a30e2d8c 100644
--- a/include/fts.h
+++ b/include/fts.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)fts.h	8.3 (Berkeley) 8/14/94
- * $FreeBSD$
  */
 
 #ifndef	_FTS_H_
diff --git a/include/glob.h b/include/glob.h
index 80d78a21944..c5d17ef65ec 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)glob.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _GLOB_H_
diff --git a/include/grp.h b/include/grp.h
index 655bfdc66ec..3798fd3ea43 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)grp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _GRP_H_
diff --git a/include/limits.h b/include/limits.h
index fc1470c058c..73036ca3ad7 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef _LIMITS_H_
diff --git a/include/locale.h b/include/locale.h
index de8e03ade5c..0e2abc04dcc 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)locale.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _LOCALE_H_
diff --git a/include/malloc.h b/include/malloc.h
index 75673c72ed8..37cde282bda 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
- * $FreeBSD$
  */
 #include <stdlib.h>
 #include <malloc_np.h>
diff --git a/include/mpool.h b/include/mpool.h
index 2c6866020e7..7fc66b62f04 100644
--- a/include/mpool.h
+++ b/include/mpool.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)mpool.h	8.4 (Berkeley) 11/2/95
- * $FreeBSD$
  */
 
 #ifndef _MPOOL_H_
diff --git a/include/ndbm.h b/include/ndbm.h
index f9b0d2b4b0f..c520999ee8a 100644
--- a/include/ndbm.h
+++ b/include/ndbm.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ndbm.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _NDBM_H_
diff --git a/include/netdb.h b/include/netdb.h
index 7eba378482a..0f9e4b41032 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -53,7 +53,6 @@
 /*
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
  *      From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETDB_H_
diff --git a/include/paths.h b/include/paths.h
index a0c3c9de613..55f7d117561 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)paths.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _PATHS_H_
diff --git a/include/pwd.h b/include/pwd.h
index 1548400b7eb..6b56e6f9c5e 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pwd.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _PWD_H_
diff --git a/include/regex.h b/include/regex.h
index 3bea3df4f3d..2644040899f 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)regex.h	8.2 (Berkeley) 1/3/94
- * $FreeBSD$
  */
 
 #ifndef _REGEX_H_
diff --git a/include/res_update.h b/include/res_update.h
index 32d363bacfa..9f2d550b726 100644
--- a/include/res_update.h
+++ b/include/res_update.h
@@ -19,7 +19,6 @@
 
 /*
  *	$Id: res_update.h,v 1.3 2005/04/27 04:56:15 sra Exp $
- * $FreeBSD$
  */
 
 #ifndef __RES_UPDATE_H
diff --git a/include/resolv.h b/include/resolv.h
index 2226c481c7e..467648b2aa5 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -49,7 +49,6 @@
 /*%
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
  *	$Id: resolv.h,v 1.30 2009/03/03 01:52:48 each Exp $
- * $FreeBSD$
  */
 
 #ifndef _RESOLV_H_
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 8773e7115d1..a894625ac40 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -32,7 +32,6 @@
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
  *	from: @(#)auth.h	1.43 	98/02/02 SMI
- * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 6d1fc315a18..6d9d5e0f45e 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -29,7 +29,6 @@
  *
  *	from: @(#)auth_unix.h 1.8 88/02/08 SMI
  *	from: @(#)auth_unix.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 8d9ce1eccb0..a7112d496f0 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -31,7 +31,6 @@
  *
  *	from: @(#)clnt.h 1.31 94/04/29 SMI
  *	from: @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/des_crypt.h b/include/rpc/des_crypt.h
index ef938c5cc90..0dcd897495d 100644
--- a/include/rpc/des_crypt.h
+++ b/include/rpc/des_crypt.h
@@ -1,6 +1,5 @@
 /*
  * @(#)des_crypt.h	2.1 88/08/11 4.0 RPCSRC;	from 1.4 88/02/08 (C) 1986 SMI
- * $FreeBSD$
  *
  * des_crypt.h, des library routine interface
  * Copyright (C) 1986, Sun Microsystems, Inc.
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index 465cb0c0262..363c283e676 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -31,7 +31,6 @@
  *
  *	from: @(#)pmap_clnt.h 1.11 88/02/08 SMI 
  *	from: @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index f69bad9ca1a..a1451880281 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -31,7 +31,6 @@
  *
  *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI 
  *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 791b3f486bc..9a9042a7149 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -31,7 +31,6 @@
  *
  *	from: @(#)pmap_rmt.h 1.2 88/02/08 SMI
  *	from: @(#)pmap_rmt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 561437c3094..783c84280ae 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -31,7 +31,6 @@
  *
  *	from: @(#)rpc.h 1.9 88/02/08 SMI
  *	from: @(#)rpc.h	2.4 89/07/11 4.0 RPCSRC
- * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index a384c92606c..f1bd4935f3c 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -31,7 +31,6 @@
  *
  *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 4cffd407081..cb4b70a64ce 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -31,7 +31,6 @@
  *
  *	from: @(#)svc.h 1.35 88/12/17 SMI
  *	from: @(#)svc.h      1.27    94/04/25 SMI
- * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index e9b6cd4be4f..6652deff085 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -31,7 +31,6 @@
  *
  *	from: @(#)svc_auth.h 1.6 86/07/16 SMI
  *	@(#)svc_auth.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index ad1672cd1db..624a3c29465 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -31,7 +31,6 @@
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD$
  */
 
 /*
diff --git a/include/runetype.h b/include/runetype.h
index 93007809dbf..e0ea07b1ae6 100644
--- a/include/runetype.h
+++ b/include/runetype.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)runetype.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef	_RUNETYPE_H_
diff --git a/include/search.h b/include/search.h
index 068446fdcb8..0615da2b42b 100644
--- a/include/search.h
+++ b/include/search.h
@@ -3,7 +3,6 @@
  * Public domain.
  *
  *	$NetBSD: search.h,v 1.16 2005/02/03 04:39:32 perry Exp $
- * $FreeBSD$
  */
 
 #ifndef _SEARCH_H_
diff --git a/include/setjmp.h b/include/setjmp.h
index 1cc8b776249..88980df9faa 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)setjmp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _SETJMP_H_
diff --git a/include/signal.h b/include/signal.h
index 3b20875290d..ee73b8ed492 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.3 (Berkeley) 3/30/94
- * $FreeBSD$
  */
 
 #ifndef _SIGNAL_H_
diff --git a/include/stdio.h b/include/stdio.h
index e392bd5eb3e..b7c412c81da 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD$
  */
 
 #ifndef	_STDIO_H_
diff --git a/include/stdlib.h b/include/stdlib.h
index 730223e7fd7..67a1cb82761 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdlib.h	8.5 (Berkeley) 5/19/95
- * $FreeBSD$
  */
 
 #ifndef _STDLIB_H_
diff --git a/include/string.h b/include/string.h
index dc575683020..7b0cb9f5652 100644
--- a/include/string.h
+++ b/include/string.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)string.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _STRING_H_
diff --git a/include/termios.h b/include/termios.h
index 9b808329a42..f3f06a54dd2 100644
--- a/include/termios.h
+++ b/include/termios.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)termios.h	8.3 (Berkeley) 3/28/94
- * $FreeBSD$
  */
 
 #ifndef _TERMIOS_H_
diff --git a/include/time.h b/include/time.h
index f8560a285bb..c6c08331642 100644
--- a/include/time.h
+++ b/include/time.h
@@ -37,7 +37,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef _TIME_H_
diff --git a/include/timeconv.h b/include/timeconv.h
index 1298cc238e5..ebbe112233c 100644
--- a/include/timeconv.h
+++ b/include/timeconv.h
@@ -37,7 +37,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef _TIMECONV_H_
diff --git a/include/ttyent.h b/include/ttyent.h
index a98fbdffb86..3060512c87c 100644
--- a/include/ttyent.h
+++ b/include/ttyent.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttyent.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef	_TTYENT_H_
diff --git a/include/unistd.h b/include/unistd.h
index 8e44e472c6d..337f6befd71 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
- * $FreeBSD$
  */
 
 #ifndef _UNISTD_H_
diff --git a/include/utime.h b/include/utime.h
index ec1d28b93e3..0a9ef00aee8 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)utime.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef	_UTIME_H_
diff --git a/include/wctype.h b/include/wctype.h
index 5882615ce04..d823f97fc84 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -27,7 +27,6 @@
  *
  *	citrus Id: wctype.h,v 1.4 2000/12/21 01:50:21 itojun Exp
  *	$NetBSD: wctype.h,v 1.3 2000/12/22 14:16:16 itojun Exp $
- * $FreeBSD$
  */
 
 #ifndef _WCTYPE_H_
diff --git a/lib/libbluetooth/bluetooth.c b/lib/libbluetooth/bluetooth.c
index 8bd816d7e56..2f24e086502 100644
--- a/lib/libbluetooth/bluetooth.c
+++ b/lib/libbluetooth/bluetooth.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: bluetooth.c,v 1.3 2003/05/20 23:04:30 max Exp $
- * $FreeBSD$
  */
 #define L2CAP_SOCKET_CHECKED
 #include <bluetooth.h>
diff --git a/lib/libbluetooth/bluetooth.h b/lib/libbluetooth/bluetooth.h
index dee52c18a5d..52f402ce209 100644
--- a/lib/libbluetooth/bluetooth.h
+++ b/lib/libbluetooth/bluetooth.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: bluetooth.h,v 1.5 2003/09/14 23:28:42 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _BLUETOOTH_H_
diff --git a/lib/libc/aarch64/Symbol.map b/lib/libc/aarch64/Symbol.map
index 0a5d8782d3a..7f5b9ee9b56 100644
--- a/lib/libc/aarch64/Symbol.map
+++ b/lib/libc/aarch64/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index 3adc0b7fb65..c2c8ef8a56e 100644
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD$
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/amd64/Symbol.map b/lib/libc/amd64/Symbol.map
index 297792eb0e8..39a913bd5e8 100644
--- a/lib/libc/amd64/Symbol.map
+++ b/lib/libc/amd64/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/arm/SYS.h b/lib/libc/arm/SYS.h
index 2e88cde8b43..97e37d6aca7 100644
--- a/lib/libc/arm/SYS.h
+++ b/lib/libc/arm/SYS.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD$
  */
 
 #include <machine/asm.h>
diff --git a/lib/libc/arm/Symbol.map b/lib/libc/arm/Symbol.map
index 61c7ccc070f..7b3d173d72e 100644
--- a/lib/libc/arm/Symbol.map
+++ b/lib/libc/arm/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/arm/Symbol_vfp.map b/lib/libc/arm/Symbol_vfp.map
index 692b72f544c..29d2b66af1b 100644
--- a/lib/libc/arm/Symbol_vfp.map
+++ b/lib/libc/arm/Symbol_vfp.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/arm/aeabi/Symbol.map b/lib/libc/arm/aeabi/Symbol.map
index 4a08d31d601..823e4ad0d79 100644
--- a/lib/libc/arm/aeabi/Symbol.map
+++ b/lib/libc/arm/aeabi/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/capability/Symbol.map b/lib/libc/capability/Symbol.map
index c5c18c2f531..65e11234801 100644
--- a/lib/libc/capability/Symbol.map
+++ b/lib/libc/capability/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.3 {
diff --git a/lib/libc/compat-43/Symbol.map b/lib/libc/compat-43/Symbol.map
index bd49f99e2df..588a693dabb 100644
--- a/lib/libc/compat-43/Symbol.map
+++ b/lib/libc/compat-43/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/db/Symbol.map b/lib/libc/db/Symbol.map
index 225fd401cb5..cb00d6bd129 100644
--- a/lib/libc/db/Symbol.map
+++ b/lib/libc/db/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/db/btree/btree.h b/lib/libc/db/btree/btree.h
index 1db1e348571..4b167652e37 100644
--- a/lib/libc/db/btree/btree.h
+++ b/lib/libc/db/btree/btree.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)btree.h	8.11 (Berkeley) 8/17/94
- * $FreeBSD$
  */
 
 /* Macros to set/clear/test flags. */
diff --git a/lib/libc/db/btree/extern.h b/lib/libc/db/btree/extern.h
index 581504cc683..023d9ffe49b 100644
--- a/lib/libc/db/btree/extern.h
+++ b/lib/libc/db/btree/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.10 (Berkeley) 7/20/94
- * $FreeBSD$
  */
 
 int	 __bt_close(DB *);
diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h
index e938f912391..181b2b80c8a 100644
--- a/lib/libc/db/hash/extern.h
+++ b/lib/libc/db/hash/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.4 (Berkeley) 6/16/94
- * $FreeBSD$
  */
 
 BUFHEAD	*__add_ovflpage(HTAB *, BUFHEAD *);
diff --git a/lib/libc/db/hash/hash.h b/lib/libc/db/hash/hash.h
index 5d4f8d5e873..2e77025c56e 100644
--- a/lib/libc/db/hash/hash.h
+++ b/lib/libc/db/hash/hash.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)hash.h	8.3 (Berkeley) 5/31/94
- * $FreeBSD$
  */
 
 /* Operations */
diff --git a/lib/libc/db/hash/page.h b/lib/libc/db/hash/page.h
index 17070e1ff58..5d9b6fedb6a 100644
--- a/lib/libc/db/hash/page.h
+++ b/lib/libc/db/hash/page.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)page.h	8.2 (Berkeley) 5/31/94
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/db/recno/extern.h b/lib/libc/db/recno/extern.h
index 11e3ca22362..9b61d3c19fe 100644
--- a/lib/libc/db/recno/extern.h
+++ b/lib/libc/db/recno/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 6/4/94
- * $FreeBSD$
  */
 
 #include "../btree/extern.h"
diff --git a/lib/libc/db/recno/recno.h b/lib/libc/db/recno/recno.h
index ae0eb85cc3c..a484983c1f8 100644
--- a/lib/libc/db/recno/recno.h
+++ b/lib/libc/db/recno/recno.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)recno.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
  */
 
 enum SRCHOP { SDELETE, SINSERT, SEARCH};	/* Rec_search operation. */
diff --git a/lib/libc/gdtoa/Symbol.map b/lib/libc/gdtoa/Symbol.map
index 4483e9a3adf..a3cfd8df681 100644
--- a/lib/libc/gdtoa/Symbol.map
+++ b/lib/libc/gdtoa/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map
index 84432432f4e..9dd7334728a 100644
--- a/lib/libc/gen/Symbol.map
+++ b/lib/libc/gen/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/gen/fts-compat.h b/lib/libc/gen/fts-compat.h
index 6367ec9ebc4..f1794fe3264 100644
--- a/lib/libc/gen/fts-compat.h
+++ b/lib/libc/gen/fts-compat.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)fts.h	8.3 (Berkeley) 8/14/94
- * $FreeBSD$
  */
 
 #ifndef	_FTS_H_
diff --git a/lib/libc/gen/fts-compat11.h b/lib/libc/gen/fts-compat11.h
index 52c0637395f..ca77b9e491c 100644
--- a/lib/libc/gen/fts-compat11.h
+++ b/lib/libc/gen/fts-compat11.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)fts.h	8.3 (Berkeley) 8/14/94
- * $FreeBSD$
  */
 
 #ifndef	_FTS_COPMAT11_H_
diff --git a/lib/libc/gen/pw_scan.h b/lib/libc/gen/pw_scan.h
index b56703677ac..d3e33454195 100644
--- a/lib/libc/gen/pw_scan.h
+++ b/lib/libc/gen/pw_scan.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pw_scan.h	8.1 (Berkeley) 4/1/94
- * $FreeBSD$
  */
 
 #define _PWSCAN_MASTER 0x01
diff --git a/lib/libc/gmon/Symbol.map b/lib/libc/gmon/Symbol.map
index 822789972eb..9d880afd884 100644
--- a/lib/libc/gmon/Symbol.map
+++ b/lib/libc/gmon/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index 18bcb102691..f6966aacf23 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD$
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/i386/Symbol.map b/lib/libc/i386/Symbol.map
index b169c322987..9d6ea7fff9f 100644
--- a/lib/libc/i386/Symbol.map
+++ b/lib/libc/i386/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/iconv/Symbol.map b/lib/libc/iconv/Symbol.map
index 8a9a75d519e..f883fe0d3e8 100644
--- a/lib/libc/iconv/Symbol.map
+++ b/lib/libc/iconv/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.3 {
diff --git a/lib/libc/inet/Symbol.map b/lib/libc/inet/Symbol.map
index f188b137de9..e26556cd5fe 100644
--- a/lib/libc/inet/Symbol.map
+++ b/lib/libc/inet/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/isc/eventlib_p.h b/lib/libc/isc/eventlib_p.h
index a56334f0a87..72b17a7a855 100644
--- a/lib/libc/isc/eventlib_p.h
+++ b/lib/libc/isc/eventlib_p.h
@@ -22,7 +22,6 @@
  * \author vix 09sep95 [initial]
  *
  * $Id: eventlib_p.h,v 1.9 2006/03/09 23:57:56 marka Exp $
- * $FreeBSD$
  */
 
 #ifndef _EVENTLIB_P_H
diff --git a/lib/libc/locale/Symbol.map b/lib/libc/locale/Symbol.map
index b2f2a35f2fe..f29e6226855 100644
--- a/lib/libc/locale/Symbol.map
+++ b/lib/libc/locale/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/nameser/Symbol.map b/lib/libc/nameser/Symbol.map
index b91977b9a07..db66ed0951e 100644
--- a/lib/libc/nameser/Symbol.map
+++ b/lib/libc/nameser/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/net/Symbol.map b/lib/libc/net/Symbol.map
index 01d3bcb888d..b2ecd4f0873 100644
--- a/lib/libc/net/Symbol.map
+++ b/lib/libc/net/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/nls/Symbol.map b/lib/libc/nls/Symbol.map
index 818466e6ffb..d8ee248d60f 100644
--- a/lib/libc/nls/Symbol.map
+++ b/lib/libc/nls/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/posix1e/Symbol.map b/lib/libc/posix1e/Symbol.map
index d78691419c9..87e18493d1e 100644
--- a/lib/libc/posix1e/Symbol.map
+++ b/lib/libc/posix1e/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/powerpc/SYS.h b/lib/libc/powerpc/SYS.h
index 8d019144cdd..7fdf7c73431 100644
--- a/lib/libc/powerpc/SYS.h
+++ b/lib/libc/powerpc/SYS.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	$NetBSD: SYS.h,v 1.8 2002/01/14 00:55:56 thorpej Exp $
- * $FreeBSD$
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/powerpc/Symbol.map b/lib/libc/powerpc/Symbol.map
index 8b4418b8eaa..fb82bcdb27f 100644
--- a/lib/libc/powerpc/Symbol.map
+++ b/lib/libc/powerpc/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/powerpc64/SYS.h b/lib/libc/powerpc64/SYS.h
index 9ca5af4b70e..c364090a548 100644
--- a/lib/libc/powerpc64/SYS.h
+++ b/lib/libc/powerpc64/SYS.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	$NetBSD: SYS.h,v 1.8 2002/01/14 00:55:56 thorpej Exp $
- * $FreeBSD$
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/powerpc64/Symbol.map b/lib/libc/powerpc64/Symbol.map
index 57b20a5984c..7d010fda669 100644
--- a/lib/libc/powerpc64/Symbol.map
+++ b/lib/libc/powerpc64/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/quad/Symbol.map b/lib/libc/quad/Symbol.map
index 82ad9402a9f..2752be26abb 100644
--- a/lib/libc/quad/Symbol.map
+++ b/lib/libc/quad/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/quad/quad.h b/lib/libc/quad/quad.h
index a9f84470876..0bda2b67398 100644
--- a/lib/libc/quad/quad.h
+++ b/lib/libc/quad/quad.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/regex/Symbol.map b/lib/libc/regex/Symbol.map
index 1da7b81ba11..3b907257174 100644
--- a/lib/libc/regex/Symbol.map
+++ b/lib/libc/regex/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/regex/cname.h b/lib/libc/regex/cname.h
index 3419181aac9..a50ebbe54cb 100644
--- a/lib/libc/regex/cname.h
+++ b/lib/libc/regex/cname.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)cname.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD$
  */
 
 /* character-name table */
diff --git a/lib/libc/regex/regex2.h b/lib/libc/regex/regex2.h
index 38bbed90fd8..369c0231b67 100644
--- a/lib/libc/regex/regex2.h
+++ b/lib/libc/regex/regex2.h
@@ -33,7 +33,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 72f2286a026..6a486a9a9b6 100644
--- a/lib/libc/regex/utils.h
+++ b/lib/libc/regex/utils.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)utils.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD$
  */
 
 /* utility definitions */
diff --git a/lib/libc/resolv/Symbol.map b/lib/libc/resolv/Symbol.map
index 170333343cf..c93d8bea6f1 100644
--- a/lib/libc/resolv/Symbol.map
+++ b/lib/libc/resolv/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/riscv/Symbol.map b/lib/libc/riscv/Symbol.map
index 4214db12ed5..c19f7ddf631 100644
--- a/lib/libc/riscv/Symbol.map
+++ b/lib/libc/riscv/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/rpc/Symbol.map b/lib/libc/rpc/Symbol.map
index 4f356de9974..89b434ce67d 100644
--- a/lib/libc/rpc/Symbol.map
+++ b/lib/libc/rpc/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/secure/Symbol.map b/lib/libc/secure/Symbol.map
index aaa76c17291..4f9f3484413 100644
--- a/lib/libc/secure/Symbol.map
+++ b/lib/libc/secure/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/softfloat/Symbol.map b/lib/libc/softfloat/Symbol.map
index c5849d3f1ef..ee6d1b0eac5 100644
--- a/lib/libc/softfloat/Symbol.map
+++ b/lib/libc/softfloat/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/stdio/Symbol.map b/lib/libc/stdio/Symbol.map
index 4926b6f3572..575dc3cd923 100644
--- a/lib/libc/stdio/Symbol.map
+++ b/lib/libc/stdio/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/stdio/floatio.h b/lib/libc/stdio/floatio.h
index 00af7eaba56..4abf972f5f4 100644
--- a/lib/libc/stdio/floatio.h
+++ b/lib/libc/stdio/floatio.h
@@ -32,7 +32,6 @@
  * 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 406f138d7db..f9e89dfd245 100644
--- a/lib/libc/stdio/fvwrite.h
+++ b/lib/libc/stdio/fvwrite.h
@@ -32,7 +32,6 @@
  * 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 6c805e03832..3fcb5231613 100644
--- a/lib/libc/stdio/glue.h
+++ b/lib/libc/stdio/glue.h
@@ -32,7 +32,6 @@
  * 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 64156336f5e..a5c465bcdcb 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -37,7 +37,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)local.h	8.3 (Berkeley) 7/3/94
- * $FreeBSD$
  */
 
 #ifndef _STDIO_LOCAL_H
diff --git a/lib/libc/stdlib/Symbol.map b/lib/libc/stdlib/Symbol.map
index a105f781734..e10789ceab1 100644
--- a/lib/libc/stdlib/Symbol.map
+++ b/lib/libc/stdlib/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/stdlib/atexit.h b/lib/libc/stdlib/atexit.h
index fdf2fc15838..456168325e4 100644
--- a/lib/libc/stdlib/atexit.h
+++ b/lib/libc/stdlib/atexit.h
@@ -29,7 +29,6 @@
  * 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/stdlib/jemalloc/Symbol.map b/lib/libc/stdlib/jemalloc/Symbol.map
index 087ca53ff75..4356337d1c3 100644
--- a/lib/libc/stdlib/jemalloc/Symbol.map
+++ b/lib/libc/stdlib/jemalloc/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/stdtime/Symbol.map b/lib/libc/stdtime/Symbol.map
index 53aa448204d..acdd3bbb89b 100644
--- a/lib/libc/stdtime/Symbol.map
+++ b/lib/libc/stdtime/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/string/Symbol.map b/lib/libc/string/Symbol.map
index 4fcd194bafd..ec4778ff3c2 100644
--- a/lib/libc/string/Symbol.map
+++ b/lib/libc/string/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map
index cc90998e83f..c09c3696c17 100644
--- a/lib/libc/sys/Symbol.map
+++ b/lib/libc/sys/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/uuid/Symbol.map b/lib/libc/uuid/Symbol.map
index 10acc781225..49fb239913d 100644
--- a/lib/libc/uuid/Symbol.map
+++ b/lib/libc/uuid/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/xdr/Symbol.map b/lib/libc/xdr/Symbol.map
index a8eb3a101ec..1ee5afda242 100644
--- a/lib/libc/xdr/Symbol.map
+++ b/lib/libc/xdr/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libc/yp/Symbol.map b/lib/libc/yp/Symbol.map
index cf2470a2dcb..ecd17af4a29 100644
--- a/lib/libc/yp/Symbol.map
+++ b/lib/libc/yp/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libdl/Symbol.map b/lib/libdl/Symbol.map
index 82ab6012e12..67d26c1f1df 100644
--- a/lib/libdl/Symbol.map
+++ b/lib/libdl/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libgcc_s/Symbol.map b/lib/libgcc_s/Symbol.map
index 29293219817..72b083c698b 100644
--- a/lib/libgcc_s/Symbol.map
+++ b/lib/libgcc_s/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 GCC_3.0 {
diff --git a/lib/libgcc_s/SymbolDefault.map b/lib/libgcc_s/SymbolDefault.map
index b3da3a8688b..8563b26efa1 100644
--- a/lib/libgcc_s/SymbolDefault.map
+++ b/lib/libgcc_s/SymbolDefault.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 /* _Unwind_Backtrace should be exported with different version on ARM */
 GCC_3.3 {
diff --git a/lib/libgcc_s/arm/Symbol.map b/lib/libgcc_s/arm/Symbol.map
index c431bd464f5..92b54761d81 100644
--- a/lib/libgcc_s/arm/Symbol.map
+++ b/lib/libgcc_s/arm/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 GCC_3.5 {
diff --git a/lib/libgssapi/Symbol.map b/lib/libgssapi/Symbol.map
index f90b7ab92ab..ef0d7f86f6f 100644
--- a/lib/libgssapi/Symbol.map
+++ b/lib/libgssapi/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.1 {
diff --git a/lib/libkvm/kvm.h b/lib/libkvm/kvm.h
index e6dd767c919..6e56f73f465 100644
--- a/lib/libkvm/kvm.h
+++ b/lib/libkvm/kvm.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)kvm.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _KVM_H_
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
index d4ec1ff1837..86e9a16bb7c 100644
--- a/lib/libkvm/kvm_private.h
+++ b/lib/libkvm/kvm_private.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)kvm_private.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
  */
 
 #include <sys/endian.h>
diff --git a/lib/libmd/md4.h b/lib/libmd/md4.h
index c05c690f80e..f8d762dbec2 100644
--- a/lib/libmd/md4.h
+++ b/lib/libmd/md4.h
@@ -1,5 +1,4 @@
 /* MD4.H - header file for MD4C.C
- * $FreeBSD$
  */
 
 /*-
diff --git a/lib/libmd/ripemd.h b/lib/libmd/ripemd.h
index 8f202a53ed8..337f0f6e466 100644
--- a/lib/libmd/ripemd.h
+++ b/lib/libmd/ripemd.h
@@ -57,7 +57,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef HEADER_RIPEMD_H
diff --git a/lib/libmixer/Symbol.map b/lib/libmixer/Symbol.map
index cee4e3bdbc1..f16e13d66e4 100644
--- a/lib/libmixer/Symbol.map
+++ b/lib/libmixer/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.7 {
diff --git a/lib/libmp/Symbol.map b/lib/libmp/Symbol.map
index df040986e53..f00906af633 100644
--- a/lib/libmp/Symbol.map
+++ b/lib/libmp/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.1 {
diff --git a/lib/libnetbsd/sys/event.h b/lib/libnetbsd/sys/event.h
index ed52135ee85..7b5b11e1934 100644
--- a/lib/libnetbsd/sys/event.h
+++ b/lib/libnetbsd/sys/event.h
@@ -24,7 +24,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$ *
  */
 
 #ifndef _LIBNETBSD_SYS_EVENT_H_
diff --git a/lib/libnetbsd/sys/types.h b/lib/libnetbsd/sys/types.h
index e14dd498fe4..97040b5cdec 100644
--- a/lib/libnetbsd/sys/types.h
+++ b/lib/libnetbsd/sys/types.h
@@ -24,7 +24,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$ *
  */
 
 #ifndef _LIBNETBSD_SYS_TYPES_H_
diff --git a/lib/libnetbsd/sys/wait.h b/lib/libnetbsd/sys/wait.h
index a9369808d8e..5227efbfb48 100644
--- a/lib/libnetbsd/sys/wait.h
+++ b/lib/libnetbsd/sys/wait.h
@@ -24,7 +24,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$ *
  */
 
 #ifndef _LIBNETBSD_SYS_WAIT_H_
diff --git a/lib/libnetmap/libnetmap.h b/lib/libnetmap/libnetmap.h
index 72a171f6fd0..280132035ac 100644
--- a/lib/libnetmap/libnetmap.h
+++ b/lib/libnetmap/libnetmap.h
@@ -25,7 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * $FreeBSD$
  */
 
 #ifndef LIBNETMAP_H_
diff --git a/lib/libpmc/pmu-events/pmu-events.h b/lib/libpmc/pmu-events/pmu-events.h
index 654f33c7fa4..d9edbfba7ce 100644
--- a/lib/libpmc/pmu-events/pmu-events.h
+++ b/lib/libpmc/pmu-events/pmu-events.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #ifndef PMU_EVENTS_H
diff --git a/lib/libprocstat/Symbol.map b/lib/libprocstat/Symbol.map
index 3d0f37b5981..4c8a0c7edef 100644
--- a/lib/libprocstat/Symbol.map
+++ b/lib/libprocstat/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 FBSD_1.2 {
 	procstat_close;
diff --git a/lib/libregex/Symbol.map b/lib/libregex/Symbol.map
index 09cd2118372..0aa63b86ae0 100644
--- a/lib/libregex/Symbol.map
+++ b/lib/libregex/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/librpcsec_gss/Symbol.map b/lib/librpcsec_gss/Symbol.map
index 7f69c98e8af..28f66eefd8e 100644
--- a/lib/librpcsec_gss/Symbol.map
+++ b/lib/librpcsec_gss/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 FBSD_1.1 {
 	rpc_gss_seccreate;
diff --git a/lib/librt/Symbol.map b/lib/librt/Symbol.map
index b8fde3dd33b..1c1ed4c5e81 100644
--- a/lib/librt/Symbol.map
+++ b/lib/librt/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libsbuf/Symbol.map b/lib/libsbuf/Symbol.map
index 3efd20bdf5c..1db91383e9d 100644
--- a/lib/libsbuf/Symbol.map
+++ b/lib/libsbuf/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.2 {
diff --git a/lib/libsdp/sdp-int.h b/lib/libsdp/sdp-int.h
index acf0469d3a7..c260582af33 100644
--- a/lib/libsdp/sdp-int.h
+++ b/lib/libsdp/sdp-int.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: sdp-int.h,v 1.1 2003/09/01 23:01:07 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _SDP_INT_H_
diff --git a/lib/libsdp/sdp.h b/lib/libsdp/sdp.h
index 87c18a30822..faad36aefca 100644
--- a/lib/libsdp/sdp.h
+++ b/lib/libsdp/sdp.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: sdp.h,v 1.3 2003/09/05 00:33:59 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _SDP_H_
diff --git a/lib/libsdp/search.c b/lib/libsdp/search.c
index 1ccf5533952..eeed5c89ab6 100644
--- a/lib/libsdp/search.c
+++ b/lib/libsdp/search.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: search.c,v 1.2 2003/09/04 22:12:13 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/uio.h>
diff --git a/lib/libsdp/service.c b/lib/libsdp/service.c
index 2240f0da82c..9f07d1ba86b 100644
--- a/lib/libsdp/service.c
+++ b/lib/libsdp/service.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: service.c,v 1.1 2004/01/13 19:32:36 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/uio.h>
diff --git a/lib/libsdp/session.c b/lib/libsdp/session.c
index 0f8e954c738..87d3cecb09e 100644
--- a/lib/libsdp/session.c
+++ b/lib/libsdp/session.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: session.c,v 1.2 2003/09/04 22:12:13 max Exp $
- * $FreeBSD$
  */
 #define L2CAP_SOCKET_CHECKED
 #include <bluetooth.h>
diff --git a/lib/libsdp/util.c b/lib/libsdp/util.c
index c45aac78411..36bfb531faa 100644
--- a/lib/libsdp/util.c
+++ b/lib/libsdp/util.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: util.c,v 1.5 2003/09/08 02:29:35 max Exp $
- * $FreeBSD$
  */
 
 #include <netinet/in.h>
diff --git a/lib/libsecureboot/h/libsecureboot.h b/lib/libsecureboot/h/libsecureboot.h
index f07988a8206..01755853682 100644
--- a/lib/libsecureboot/h/libsecureboot.h
+++ b/lib/libsecureboot/h/libsecureboot.h
@@ -23,7 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $FreeBSD$
  */
 #ifndef _LIBSECUREBOOT_H_
 #define _LIBSECUREBOOT_H_
diff --git a/lib/libsecureboot/libsecureboot-priv.h b/lib/libsecureboot/libsecureboot-priv.h
index 713ba6266cc..039b03c70ca 100644
--- a/lib/libsecureboot/libsecureboot-priv.h
+++ b/lib/libsecureboot/libsecureboot-priv.h
@@ -23,7 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $FreeBSD$
  */
 #ifndef _LIBSECUREBOOT_PRIV_H_
 #define _LIBSECUREBOOT_PRIV_H_
diff --git a/lib/libsecureboot/openpgp/decode.h b/lib/libsecureboot/openpgp/decode.h
index 8da39c9cf14..1e7e2ea1f91 100644
--- a/lib/libsecureboot/openpgp/decode.h
+++ b/lib/libsecureboot/openpgp/decode.h
@@ -23,7 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $FreeBSD$
  */
 
 #ifdef USE_BEARSSL
diff --git a/lib/libsecureboot/openpgp/packet.h b/lib/libsecureboot/openpgp/packet.h
index 28ac3c9b40f..58f797cd165 100644
--- a/lib/libsecureboot/openpgp/packet.h
+++ b/lib/libsecureboot/openpgp/packet.h
@@ -23,7 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/lib/libssp/Symbol.map b/lib/libssp/Symbol.map
index 51f9b784c81..5c2e089c6ab 100644
--- a/lib/libssp/Symbol.map
+++ b/lib/libssp/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 LIBSSP_1.0 {
diff --git a/lib/libstdthreads/Symbol.map b/lib/libstdthreads/Symbol.map
index 0fe6eacda4e..36b4c54f84e 100644
--- a/lib/libstdthreads/Symbol.map
+++ b/lib/libstdthreads/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.3 {
diff --git a/lib/libthr/pthread.map b/lib/libthr/pthread.map
index 15195ce0847..348fd48df39 100644
--- a/lib/libthr/pthread.map
+++ b/lib/libthr/pthread.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/lib/libthread_db/Symbol.map b/lib/libthread_db/Symbol.map
index 4e690f9f22a..204f885de6b 100644
--- a/lib/libthread_db/Symbol.map
+++ b/lib/libthread_db/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/lib/libulog/Symbol.map b/lib/libulog/Symbol.map
index 0abc40f6cdc..d3eaae075d4 100644
--- a/lib/libulog/Symbol.map
+++ b/lib/libulog/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.2 {
diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h
index ec1421b8066..7312914900a 100644
--- a/lib/libutil/login_cap.h
+++ b/lib/libutil/login_cap.h
@@ -22,7 +22,6 @@
  * Low-level routines relating to the user capabilities database
  *
  *	Was login_cap.h,v 1.9 1997/05/07 20:00:01 eivind Exp
- * $FreeBSD$
  */
 
 #ifndef _LOGIN_CAP_H_
diff --git a/lib/libz/Symbol.map b/lib/libz/Symbol.map
index 2cc2c76787b..7bfe7cceda7 100644
--- a/lib/libz/Symbol.map
+++ b/lib/libz/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 ZLIB_1.2.12 {
diff --git a/lib/msun/Symbol.map b/lib/msun/Symbol.map
index 8650d56eb9d..6e74918ade6 100644
--- a/lib/msun/Symbol.map
+++ b/lib/msun/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /* 7.0-CURRENT */
diff --git a/lib/msun/amd64/Symbol.map b/lib/msun/amd64/Symbol.map
index 3da32ffcc99..ed2f1d2119b 100644
--- a/lib/msun/amd64/Symbol.map
+++ b/lib/msun/amd64/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 FBSD_1.0 {
 	fesetexceptflag;
diff --git a/lib/msun/arm/Symbol.map b/lib/msun/arm/Symbol.map
index 40fbc549560..2bc6215688b 100644
--- a/lib/msun/arm/Symbol.map
+++ b/lib/msun/arm/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 FBSD_1.0 {
 };
diff --git a/lib/msun/bsdsrc/mathimpl.h b/lib/msun/bsdsrc/mathimpl.h
index abf29965861..3d6554747da 100644
--- a/lib/msun/bsdsrc/mathimpl.h
+++ b/lib/msun/bsdsrc/mathimpl.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)mathimpl.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
  */
 
 #ifndef _MATHIMPL_H_
diff --git a/lib/msun/i387/Symbol.map b/lib/msun/i387/Symbol.map
index 35e6e18d025..f22361cc34d 100644
--- a/lib/msun/i387/Symbol.map
+++ b/lib/msun/i387/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 FBSD_1.0 {
 	__has_sse;
diff --git a/lib/msun/powerpc/Symbol.map b/lib/msun/powerpc/Symbol.map
index 47eca6f99f3..9e3c5d47180 100644
--- a/lib/msun/powerpc/Symbol.map
+++ b/lib/msun/powerpc/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 FBSD_1.0 {
 };
diff --git a/lib/msun/riscv/Symbol.map b/lib/msun/riscv/Symbol.map
index 40fbc549560..2bc6215688b 100644
--- a/lib/msun/riscv/Symbol.map
+++ b/lib/msun/riscv/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 FBSD_1.0 {
 };
diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h
index a0edea04dde..8e72beb757f 100644
--- a/lib/msun/src/math.h
+++ b/lib/msun/src/math.h
@@ -11,7 +11,6 @@
 
 /*
  * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD$
  */
 
 #ifndef _MATH_H_
diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h
index a55d97a780d..eae2a2a317b 100644
--- a/lib/msun/src/math_private.h
+++ b/lib/msun/src/math_private.h
@@ -11,7 +11,6 @@
 
 /*
  * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD$
  */
 
 #ifndef _MATH_PRIVATE_H_
diff --git a/lib/ncurses/ncurses/pathnames.h b/lib/ncurses/ncurses/pathnames.h
index 582d7e8b4b0..4a5b8840c2b 100644
--- a/lib/ncurses/ncurses/pathnames.h
+++ b/lib/ncurses/ncurses/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
  */
 
 #define	_PATH_DEF	".termcap /usr/share/misc/termcap /etc/termcap.small"
diff --git a/lib/ncurses/tinfo/pathnames.h b/lib/ncurses/tinfo/pathnames.h
index 582d7e8b4b0..4a5b8840c2b 100644
--- a/lib/ncurses/tinfo/pathnames.h
+++ b/lib/ncurses/tinfo/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
  */
 
 #define	_PATH_DEF	".termcap /usr/share/misc/termcap /etc/termcap.small"
diff --git a/libexec/bootpd/hash.h b/libexec/bootpd/hash.h
index 969703d04e5..14aefe969d0 100644
--- a/libexec/bootpd/hash.h
+++ b/libexec/bootpd/hash.h
@@ -25,7 +25,6 @@ SOFTWARE.
 
 /*
  * Generalized hash table ADT
- * $FreeBSD$
  *
  * Provides multiple, dynamically-allocated, variable-sized hash tables on
  * various data and keys.
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index aa48ea67e32..2e314ba5c11 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/4/94
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/ftpd/pathnames.h b/libexec/ftpd/pathnames.h
index 47dc25a5dfe..75bec0d18a6 100644
--- a/libexec/ftpd/pathnames.h
+++ b/libexec/ftpd/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index 6872acb4f6f..d20c2b119cf 100644
--- a/libexec/getty/extern.h
+++ b/libexec/getty/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
  */
 
 struct delayval;
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index 2d3972e3bc1..1ef0f8acc20 100644
--- a/libexec/getty/gettytab.h
+++ b/libexec/getty/gettytab.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)gettytab.h	8.2 (Berkeley) 3/30/94
- * $FreeBSD$
  */
 
 /*
diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h
index 749875a6d18..4e01ec7954d 100644
--- a/libexec/getty/pathnames.h
+++ b/libexec/getty/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pathnames.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/libexec/rtld-elf/Symbol.map b/libexec/rtld-elf/Symbol.map
index 0a9eac82cf0..0b7ad63f60a 100644
--- a/libexec/rtld-elf/Symbol.map
+++ b/libexec/rtld-elf/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/libexec/rtld-elf/i386/Symbol.map b/libexec/rtld-elf/i386/Symbol.map
index b8073108724..c7dcd4ce503 100644
--- a/libexec/rtld-elf/i386/Symbol.map
+++ b/libexec/rtld-elf/i386/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.0 {
diff --git a/libexec/rtld-elf/libmap.c b/libexec/rtld-elf/libmap.c
index a9d859dc60f..26386efcf48 100644
--- a/libexec/rtld-elf/libmap.c
+++ b/libexec/rtld-elf/libmap.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/rtld-elf/libmap.h b/libexec/rtld-elf/libmap.h
index 2998b7b27cc..a785f1b6c43 100644
--- a/libexec/rtld-elf/libmap.h
+++ b/libexec/rtld-elf/libmap.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #ifndef LIBMAP_H
diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c
index 10473618f78..0c790450dce 100644
--- a/libexec/rtld-elf/rtld_lock.c
+++ b/libexec/rtld-elf/rtld_lock.c
@@ -25,7 +25,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/libexec/rtld-elf/sparc64/lockdflt.c,v 1.3 2002/10/09
- * $FreeBSD$
  */
 
 /*
diff --git a/sbin/bsdlabel/pathnames.h b/sbin/bsdlabel/pathnames.h
index 77ee59e0279..f28593e71e5 100644
--- a/sbin/bsdlabel/pathnames.h
+++ b/sbin/bsdlabel/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/sbin/ccdconfig/pathnames.h b/sbin/ccdconfig/pathnames.h
index 83392b665f4..4924323e5a8 100644
--- a/sbin/ccdconfig/pathnames.h
+++ b/sbin/ccdconfig/pathnames.h
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: pathnames.h,v 1.4 2008/04/28 20:23:07 martin Exp $
- * $FreeBSD$
  */
 
 #define _PATH_CCDCONF		"/etc/ccd.conf"
diff --git a/sbin/dump/pathnames.h b/sbin/dump/pathnames.h
index 120bd72f5f1..3ee966a55ff 100644
--- a/sbin/dump/pathnames.h
+++ b/sbin/dump/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index e48f3e0aa69..1864ea19f4c 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -59,7 +59,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)fsck.h	8.4 (Berkeley) 5/9/95
- * $FreeBSD$
  */
 
 #ifndef _FSCK_H_
diff --git a/sbin/fsck_msdosfs/dosfs.h b/sbin/fsck_msdosfs/dosfs.h
index 6016a5077df..a8da745b1ce 100644
--- a/sbin/fsck_msdosfs/dosfs.h
+++ b/sbin/fsck_msdosfs/dosfs.h
@@ -26,7 +26,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.
  *	$NetBSD: dosfs.h,v 1.4 1997/01/03 14:32:48 ws Exp $
- * $FreeBSD$
  */
 
 #ifndef DOSFS_H
diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h
index 1f6453dedb7..d0f4dd6279f 100644
--- a/sbin/fsck_msdosfs/ext.h
+++ b/sbin/fsck_msdosfs/ext.h
@@ -24,7 +24,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.
  *	$NetBSD: ext.h,v 1.6 2000/04/25 23:02:51 jdolecek Exp $
- * $FreeBSD$
  */
 
 #ifndef EXT_H
diff --git a/sbin/growfs/debug.h b/sbin/growfs/debug.h
index 068e89c3441..527f4ed63b7 100644
--- a/sbin/growfs/debug.h
+++ b/sbin/growfs/debug.h
@@ -38,7 +38,6 @@
  * SUCH DAMAGE.
  *
  * $TSHeader: src/sbin/growfs/debug.h,v 1.2 2000/11/16 18:43:50 tom Exp $
- * $FreeBSD$
  *
  */
 
diff --git a/sbin/init/pathnames.h b/sbin/init/pathnames.h
index 7dc75ba5249..e385aed648b 100644
--- a/sbin/init/pathnames.h
+++ b/sbin/init/pathnames.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/sbin/ipf/iplang/iplang_y.y b/sbin/ipf/iplang/iplang_y.y
index e6c88ddcd9b..efddeacbf9c 100644
--- a/sbin/ipf/iplang/iplang_y.y
+++ b/sbin/ipf/iplang/iplang_y.y
@@ -7,7 +7,6 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * Id: iplang_y.y,v 2.9.2.4 2006/03/17 12:11:29 darrenr Exp $
- * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 3488d34fe96..21d4965ea39 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)mntopts.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD$
  */
 
 struct mntopt {
diff --git a/sbin/mount/pathnames.h b/sbin/mount/pathnames.h
index 7dfb3f1a30e..f584d7ce9f1 100644
--- a/sbin/mount/pathnames.h
+++ b/sbin/mount/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.2 (Berkeley) 3/27/94
- *	$FreeBSD$
  */
 
 #define	_PATH_MOUNTDPID	"/var/run/mountd.pid"
diff --git a/sbin/rcorder/sprite.h b/sbin/rcorder/sprite.h
index e311ee6e0f6..29b25b0ba26 100644
--- a/sbin/rcorder/sprite.h
+++ b/sbin/rcorder/sprite.h
@@ -40,7 +40,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sprite.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 /*
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index c33034c48c5..fac58891a35 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 1/7/94
- * $FreeBSD$
  */
 
 struct entry	*addentry(char *, ino_t, int);
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index 2e6ff623dc3..e4db29340b8 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)restore.h	8.3 (Berkeley) 9/13/94
- * $FreeBSD$
  */
 
 /*
diff --git a/share/syscons/scrnmaps/iso-8859-7_to_cp437 b/share/syscons/scrnmaps/iso-8859-7_to_cp437
index 7c1b49dba2d..88d18d98cc2 100644
--- a/share/syscons/scrnmaps/iso-8859-7_to_cp437
+++ b/share/syscons/scrnmaps/iso-8859-7_to_cp437
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 static scrmap_t scrmap = {
diff --git a/share/syscons/scrnmaps/us-ascii_to_cp437 b/share/syscons/scrnmaps/us-ascii_to_cp437
index 5e7d631237b..3993fd84220 100644
--- a/share/syscons/scrnmaps/us-ascii_to_cp437
+++ b/share/syscons/scrnmaps/us-ascii_to_cp437
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 static scrmap_t scrmap = {
diff --git a/stand/efi/loader/arch/amd64/start.S b/stand/efi/loader/arch/amd64/start.S
index 774ef4fa790..34bf166c650 100644
--- a/stand/efi/loader/arch/amd64/start.S
+++ b/stand/efi/loader/arch/amd64/start.S
@@ -33,7 +33,6 @@
 
 /*
  * crt0-efi-x86_64.S - x86_64 EFI startup code.
- * $FreeBSD$
  */
 
 	.text
diff --git a/stand/ficl/aarch64/sysdep.h b/stand/ficl/aarch64/sysdep.h
index 3726b9ef838..1bb45efcae2 100644
--- a/stand/ficl/aarch64/sysdep.h
+++ b/stand/ficl/aarch64/sysdep.h
@@ -46,7 +46,6 @@
 ** contact me by email at the address above.
 **
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
-** $FreeBSD$
 */
 
 #if !defined (__SYSDEP_H__)
diff --git a/stand/ficl/arm/sysdep.h b/stand/ficl/arm/sysdep.h
index 00718eedd35..e376aa9d334 100644
--- a/stand/ficl/arm/sysdep.h
+++ b/stand/ficl/arm/sysdep.h
@@ -46,7 +46,6 @@
 ** contact me by email at the address above.
 **
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
-** $FreeBSD$
 */
 
 #if !defined (__SYSDEP_H__)
diff --git a/stand/ficl/mips/sysdep.h b/stand/ficl/mips/sysdep.h
index 3ae748e259c..9c2f1d2140b 100644
--- a/stand/ficl/mips/sysdep.h
+++ b/stand/ficl/mips/sysdep.h
@@ -46,7 +46,6 @@
 ** contact me by email at the address above.
 **
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
-** $FreeBSD$
 */
 
 #if !defined (__SYSDEP_H__)
diff --git a/stand/ficl/mips64/sysdep.h b/stand/ficl/mips64/sysdep.h
index 5c9e163acb7..6c1d8486137 100644
--- a/stand/ficl/mips64/sysdep.h
+++ b/stand/ficl/mips64/sysdep.h
@@ -46,7 +46,6 @@
 ** contact me by email at the address above.
 **
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
-** $FreeBSD$
 */
 
 #if !defined (__SYSDEP_H__)
diff --git a/stand/ficl/powerpc/sysdep.h b/stand/ficl/powerpc/sysdep.h
index b31625e1864..405d4c38176 100644
--- a/stand/ficl/powerpc/sysdep.h
+++ b/stand/ficl/powerpc/sysdep.h
@@ -46,7 +46,6 @@
 ** contact me by email at the address above.
 **
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
-** $FreeBSD$
 */
 
 #if !defined (__SYSDEP_H__)
diff --git a/stand/ficl/riscv/sysdep.h b/stand/ficl/riscv/sysdep.h
index 3726b9ef838..1bb45efcae2 100644
--- a/stand/ficl/riscv/sysdep.h
+++ b/stand/ficl/riscv/sysdep.h
@@ -46,7 +46,6 @@
 ** contact me by email at the address above.
 **
 ** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
-** $FreeBSD$
 */
 
 #if !defined (__SYSDEP_H__)
diff --git a/stand/i386/boot2/lib.h b/stand/i386/boot2/lib.h
index d8d3317e5aa..d25dd0f7d28 100644
--- a/stand/i386/boot2/lib.h
+++ b/stand/i386/boot2/lib.h
@@ -14,7 +14,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 int sio_init(int) __attribute__((regparm (3)));
diff --git a/stand/i386/btx/lib/btxv86.h b/stand/i386/btx/lib/btxv86.h
index 0dca768cc2a..567fdf4690f 100644
--- a/stand/i386/btx/lib/btxv86.h
+++ b/stand/i386/btx/lib/btxv86.h
@@ -14,7 +14,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef _BTXV86_H_
diff --git a/stand/i386/libi386/multiboot.h b/stand/i386/libi386/multiboot.h
index 819fa2e5019..d68f17b5281 100644
--- a/stand/i386/libi386/multiboot.h
+++ b/stand/i386/libi386/multiboot.h
@@ -18,7 +18,6 @@
 *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
 *  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
-* $FreeBSD$
 */
 
 #ifndef MULTIBOOT_HEADER
diff --git a/stand/kboot/arch/powerpc64/kerneltramp.S b/stand/kboot/arch/powerpc64/kerneltramp.S
index 15fdfc26bd9..211a6e474d2 100644
--- a/stand/kboot/arch/powerpc64/kerneltramp.S
+++ b/stand/kboot/arch/powerpc64/kerneltramp.S
@@ -9,7 +9,6 @@
  * to the absolute address 0x60. Here we implement a loop waiting on the release
  * of a lock by the kernel at 0x40.
  * 
- * $FreeBSD$
  */
 
 #include <machine/asm.h>
diff --git a/tests/sys/cddl/zfs/bin/chg_usr_exec.c b/tests/sys/cddl/zfs/bin/chg_usr_exec.c
index c1de099aa1b..bcc7027f550 100644
--- a/tests/sys/cddl/zfs/bin/chg_usr_exec.c
+++ b/tests/sys/cddl/zfs/bin/chg_usr_exec.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/devname2devid.c b/tests/sys/cddl/zfs/bin/devname2devid.c
index 09de8168eba..ee5f2e997e8 100644
--- a/tests/sys/cddl/zfs/bin/devname2devid.c
+++ b/tests/sys/cddl/zfs/bin/devname2devid.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/dir_rd_update.c b/tests/sys/cddl/zfs/bin/dir_rd_update.c
index 6e7fd93e10a..a2202cfa758 100644
--- a/tests/sys/cddl/zfs/bin/dir_rd_update.c
+++ b/tests/sys/cddl/zfs/bin/dir_rd_update.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/file_check.c b/tests/sys/cddl/zfs/bin/file_check.c
index dc2f348a724..10d69b424f4 100644
--- a/tests/sys/cddl/zfs/bin/file_check.c
+++ b/tests/sys/cddl/zfs/bin/file_check.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/file_common.h b/tests/sys/cddl/zfs/bin/file_common.h
index 3ae1b07cd22..adc0bd47f94 100644
--- a/tests/sys/cddl/zfs/bin/file_common.h
+++ b/tests/sys/cddl/zfs/bin/file_common.h
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/file_trunc.c b/tests/sys/cddl/zfs/bin/file_trunc.c
index 5fe3ad61a32..685b05eb5df 100644
--- a/tests/sys/cddl/zfs/bin/file_trunc.c
+++ b/tests/sys/cddl/zfs/bin/file_trunc.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/file_write.c b/tests/sys/cddl/zfs/bin/file_write.c
index 07ba6503dff..68e45253064 100644
--- a/tests/sys/cddl/zfs/bin/file_write.c
+++ b/tests/sys/cddl/zfs/bin/file_write.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/largest_file.c b/tests/sys/cddl/zfs/bin/largest_file.c
index 67b7b95dbbe..5b57ef048da 100644
--- a/tests/sys/cddl/zfs/bin/largest_file.c
+++ b/tests/sys/cddl/zfs/bin/largest_file.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/mktree.c b/tests/sys/cddl/zfs/bin/mktree.c
index 03aa2d67609..149c981ec7a 100644
--- a/tests/sys/cddl/zfs/bin/mktree.c
+++ b/tests/sys/cddl/zfs/bin/mktree.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/mmapwrite.c b/tests/sys/cddl/zfs/bin/mmapwrite.c
index 756b33b5cb9..57ff66d7ec0 100644
--- a/tests/sys/cddl/zfs/bin/mmapwrite.c
+++ b/tests/sys/cddl/zfs/bin/mmapwrite.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/randfree_file.c b/tests/sys/cddl/zfs/bin/randfree_file.c
index 3c43abcf6c2..ff5f99e28cc 100644
--- a/tests/sys/cddl/zfs/bin/randfree_file.c
+++ b/tests/sys/cddl/zfs/bin/randfree_file.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/readmmap.c b/tests/sys/cddl/zfs/bin/readmmap.c
index c2169779828..4e360c762e4 100644
--- a/tests/sys/cddl/zfs/bin/readmmap.c
+++ b/tests/sys/cddl/zfs/bin/readmmap.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/rename_dir.c b/tests/sys/cddl/zfs/bin/rename_dir.c
index 3a475f2544d..b84cb46f5ba 100644
--- a/tests/sys/cddl/zfs/bin/rename_dir.c
+++ b/tests/sys/cddl/zfs/bin/rename_dir.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/bin/rm_lnkcnt_zero_file.c b/tests/sys/cddl/zfs/bin/rm_lnkcnt_zero_file.c
index c6ebb22b3d3..0ece80a6813 100644
--- a/tests/sys/cddl/zfs/bin/rm_lnkcnt_zero_file.c
+++ b/tests/sys/cddl/zfs/bin/rm_lnkcnt_zero_file.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/tests/ctime/ctime_001_pos.c b/tests/sys/cddl/zfs/tests/ctime/ctime_001_pos.c
index d858cebd26a..02feb0343f8 100644
--- a/tests/sys/cddl/zfs/tests/ctime/ctime_001_pos.c
+++ b/tests/sys/cddl/zfs/tests/ctime/ctime_001_pos.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/tests/exec/mmap_exec.c b/tests/sys/cddl/zfs/tests/exec/mmap_exec.c
index 409bf2ffca1..23e61b5cf77 100644
--- a/tests/sys/cddl/zfs/tests/exec/mmap_exec.c
+++ b/tests/sys/cddl/zfs/tests/exec/mmap_exec.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/tests/threadsappend/threadsappend.c b/tests/sys/cddl/zfs/tests/threadsappend/threadsappend.c
index bd264cd66c5..2c311675431 100644
--- a/tests/sys/cddl/zfs/tests/threadsappend/threadsappend.c
+++ b/tests/sys/cddl/zfs/tests/threadsappend/threadsappend.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c b/tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c
index b2d4bf0dc11..17c6b63d45d 100644
--- a/tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c
+++ b/tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.c b/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.c
index ec1275dfccc..388d838f4d3 100644
--- a/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.c
+++ b/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.c
@@ -17,7 +17,6 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$
  */
 
 /*
diff --git a/tests/sys/geom/class/eli/hmac_test.c b/tests/sys/geom/class/eli/hmac_test.c
index 5f4e795cd5a..6e22c23fb41 100644
--- a/tests/sys/geom/class/eli/hmac_test.c
+++ b/tests/sys/geom/class/eli/hmac_test.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/tests/sys/kern/pipe/pipe_fstat_bug_test.c b/tests/sys/kern/pipe/pipe_fstat_bug_test.c
index 89060a2f049..fec7797a55d 100644
--- a/tests/sys/kern/pipe/pipe_fstat_bug_test.c
+++ b/tests/sys/kern/pipe/pipe_fstat_bug_test.c
@@ -36,7 +36,6 @@ SUCH DAMAGE.
 #include <unistd.h>
 
 /*
- * $FreeBSD$
  * The goal of this program is to see if fstat reports the correct
  * data count for a pipe.  Prior to revision 1.172 of sys_pipe.c,
  * 0 would be returned once the pipe entered direct write mode.
diff --git a/tests/sys/kern/pipe/pipe_ino_test.c b/tests/sys/kern/pipe/pipe_ino_test.c
index c31e4d5cfa5..08efbc37b18 100644
--- a/tests/sys/kern/pipe/pipe_ino_test.c
+++ b/tests/sys/kern/pipe/pipe_ino_test.c
@@ -25,7 +25,6 @@
  */
 
 /*
- * $FreeBSD$
  * Test conformance to stat(2) SUSv4 description:
  *  "For all other file types defined in this volume of POSIX.1-2008, the
  *  structure members st_mode, st_ino, st_dev, st_uid, st_gid, st_atim,
diff --git a/tests/sys/kern/pipe/pipe_overcommit1_test.c b/tests/sys/kern/pipe/pipe_overcommit1_test.c
index 4e40be7c699..eac414bfdd2 100644
--- a/tests/sys/kern/pipe/pipe_overcommit1_test.c
+++ b/tests/sys/kern/pipe/pipe_overcommit1_test.c
@@ -32,7 +32,6 @@
 #include <unistd.h>
 
 /*
- * $FreeBSD$
  * This program just allocates as many pipes as it can to ensure
  * that using up all pipe memory doesn't cause a panic.
  */
diff --git a/tests/sys/kern/pipe/pipe_overcommit2_test.c b/tests/sys/kern/pipe/pipe_overcommit2_test.c
index ee1e714d0d8..d88d32c3257 100644
--- a/tests/sys/kern/pipe/pipe_overcommit2_test.c
+++ b/tests/sys/kern/pipe/pipe_overcommit2_test.c
@@ -35,7 +35,6 @@
 #include <unistd.h>
 
 /*
- * $FreeBSD$
  * This program tests how sys_pipe.c handles the case where there
  * is ample memory to allocate a pipe, but the file descriptor
  * limit for that user has been exceeded.
diff --git a/tests/sys/kern/pipe/pipe_reverse_test.c b/tests/sys/kern/pipe/pipe_reverse_test.c
index fd4518d76fb..0ca48155876 100644
--- a/tests/sys/kern/pipe/pipe_reverse_test.c
+++ b/tests/sys/kern/pipe/pipe_reverse_test.c
@@ -35,7 +35,6 @@ SUCH DAMAGE.
 #include <unistd.h>
 
 /*
- * $FreeBSD$
  * This program simply tests writing through the reverse direction of
  * a pipe.  Nothing too fancy, it's only needed because most pipe-using
  * programs never touch the reverse direction (it doesn't exist on
diff --git a/tests/sys/kern/pipe/pipe_wraparound_test.c b/tests/sys/kern/pipe/pipe_wraparound_test.c
index 1ee02035aa7..178f0fd2d0e 100644
--- a/tests/sys/kern/pipe/pipe_wraparound_test.c
+++ b/tests/sys/kern/pipe/pipe_wraparound_test.c
@@ -35,7 +35,6 @@ SUCH DAMAGE.
 #include <unistd.h>
 
 /*
- * $FreeBSD$
  * This program tests to make sure that wraparound writes and reads
  * are working, assuming that 16K socket buffers are used.  In order
  * to really stress the pipe code with this test, kernel modifications
diff --git a/tools/build/dummy.c b/tools/build/dummy.c
index b656a0305a9..8aff747b3f7 100644
--- a/tools/build/dummy.c
+++ b/tools/build/dummy.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Empty file to keep linker happy.
  */
diff --git a/tools/regression/p1003_1b/prutil.c b/tools/regression/p1003_1b/prutil.c
index 2910b7fdd2c..be8c6588e1a 100644
--- a/tools/regression/p1003_1b/prutil.c
+++ b/tools/regression/p1003_1b/prutil.c
@@ -9,7 +9,6 @@
 #include "prutil.h"
 
 /*
- * $FreeBSD$
  */
 void quit(const char *text)
 {
diff --git a/tools/regression/p1003_1b/prutil.h b/tools/regression/p1003_1b/prutil.h
index 3387b994b15..5eaaa784920 100644
--- a/tools/regression/p1003_1b/prutil.h
+++ b/tools/regression/p1003_1b/prutil.h
@@ -2,7 +2,6 @@
 #define _PRUTIL_H_
 
 /*
- * $FreeBSD$
  */
 
 struct sched_param;
diff --git a/tools/regression/p1003_1b/sched.c b/tools/regression/p1003_1b/sched.c
index ea6fcc7a461..b9340db8923 100644
--- a/tools/regression/p1003_1b/sched.c
+++ b/tools/regression/p1003_1b/sched.c
@@ -30,7 +30,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * $FreeBSD$
  *
  */
 
diff --git a/tools/regression/p1003_1b/yield.c b/tools/regression/p1003_1b/yield.c
index 479ce50ef88..f25e71b48b3 100644
--- a/tools/regression/p1003_1b/yield.c
+++ b/tools/regression/p1003_1b/yield.c
@@ -30,7 +30,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/tools/regression/pthread/unwind/cond_wait_cancel2.cpp b/tools/regression/pthread/unwind/cond_wait_cancel2.cpp
index ba71289fad9..1763e115435 100644
--- a/tools/regression/pthread/unwind/cond_wait_cancel2.cpp
+++ b/tools/regression/pthread/unwind/cond_wait_cancel2.cpp
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Test stack unwinding for mixed pthread_cleanup_push/pop and C++
  * object, both should work together.
diff --git a/tools/regression/sysvmsg/msgtest.c b/tools/regression/sysvmsg/msgtest.c
index 058a3210664..164fcf69201 100644
--- a/tools/regression/sysvmsg/msgtest.c
+++ b/tools/regression/sysvmsg/msgtest.c
@@ -28,7 +28,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  * Obtained from: $NetBSD: msgtest.c,v 1.7 2002/07/20 08:36:25 grant Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/tools/regression/sysvsem/semtest.c b/tools/regression/sysvsem/semtest.c
index 39c416403c6..f4ab8e876ec 100644
--- a/tools/regression/sysvsem/semtest.c
+++ b/tools/regression/sysvsem/semtest.c
@@ -28,7 +28,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * Obtained from: $NetBSD: semtest.c,v 1.4 2002/07/20 08:36:25 grant Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/tools/regression/sysvshm/shmtest.c b/tools/regression/sysvshm/shmtest.c
index c84ddfd7657..edac85b21bd 100644
--- a/tools/regression/sysvshm/shmtest.c
+++ b/tools/regression/sysvshm/shmtest.c
@@ -28,7 +28,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * Obtained from: $NetBSD: shmtest.c,v 1.3 2002/07/20 08:36:26 grant Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/tools/test/popss/popss.c b/tools/test/popss/popss.c
index 56c5f789602..004ccb29c54 100644
--- a/tools/test/popss/popss.c
+++ b/tools/test/popss/popss.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  * $Id: popss.c,v 1.28 2018/05/09 21:35:29 kostik Exp kostik $
- * $FreeBSD$
  *
  * cc -m32 -Wall -Wextra -O2 -g -o popss popss.c
  * Use as "popss <instruction>", where instruction is one of
diff --git a/tools/tools/cxgbtool/reg_defs.c b/tools/tools/cxgbtool/reg_defs.c
index 687bb75cee9..fc65a652601 100644
--- a/tools/tools/cxgbtool/reg_defs.c
+++ b/tools/tools/cxgbtool/reg_defs.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /* This file is automatically generated --- do not edit */
diff --git a/tools/tools/cxgbtool/reg_defs_t3.c b/tools/tools/cxgbtool/reg_defs_t3.c
index 6e9b8b1176f..d4259b4e543 100644
--- a/tools/tools/cxgbtool/reg_defs_t3.c
+++ b/tools/tools/cxgbtool/reg_defs_t3.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 
diff --git a/tools/tools/cxgbtool/reg_defs_t3b.c b/tools/tools/cxgbtool/reg_defs_t3b.c
index cd85d840a1d..31942e335eb 100644
--- a/tools/tools/cxgbtool/reg_defs_t3b.c
+++ b/tools/tools/cxgbtool/reg_defs_t3b.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /* This file is automatically generated --- do not edit */
diff --git a/tools/tools/cxgbtool/reg_defs_t3c.c b/tools/tools/cxgbtool/reg_defs_t3c.c
index b9181b68e9a..75c89a90b0b 100644
--- a/tools/tools/cxgbtool/reg_defs_t3c.c
+++ b/tools/tools/cxgbtool/reg_defs_t3c.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /* This file is automatically generated --- do not edit */
diff --git a/tools/tools/cxgbtool/version.h b/tools/tools/cxgbtool/version.h
index 403a8beeafc..183684bdb18 100644
--- a/tools/tools/cxgbtool/version.h
+++ b/tools/tools/cxgbtool/version.h
@@ -19,7 +19,6 @@
 /* $Date: 2007/02/05 18:46:24 $ $RCSfile: version.h,v $ $Revision: 1.9 $ */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef __CXGBTOOL_VERSION_H
diff --git a/tools/tools/netmap/pkt-gen.c b/tools/tools/netmap/pkt-gen.c
index 621e3e21511..c17579a142b 100644
--- a/tools/tools/netmap/pkt-gen.c
+++ b/tools/tools/netmap/pkt-gen.c
@@ -25,7 +25,6 @@
  */
 
 /*
- * $FreeBSD$
  * $Id: pkt-gen.c 12346 2013-06-12 17:36:25Z luigi $
  *
  * Example program to show how to build a multithreaded packet
diff --git a/tools/tools/shlib-compat/test/libtest1/Symbol.map b/tools/tools/shlib-compat/test/libtest1/Symbol.map
index 67649ae0186..5b5bcec8853 100644
--- a/tools/tools/shlib-compat/test/libtest1/Symbol.map
+++ b/tools/tools/shlib-compat/test/libtest1/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 TEST_1.0 {
diff --git a/tools/tools/shlib-compat/test/libtest1/test.c b/tools/tools/shlib-compat/test/libtest1/test.c
index dc3a561d678..73789bdb67b 100644
--- a/tools/tools/shlib-compat/test/libtest1/test.c
+++ b/tools/tools/shlib-compat/test/libtest1/test.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/shlib-compat/test/libtest2/Symbol.map b/tools/tools/shlib-compat/test/libtest2/Symbol.map
index d4b7826913d..11ffa7b08be 100644
--- a/tools/tools/shlib-compat/test/libtest2/Symbol.map
+++ b/tools/tools/shlib-compat/test/libtest2/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 TEST_1.0 {
diff --git a/tools/tools/shlib-compat/test/libtest2/test.c b/tools/tools/shlib-compat/test/libtest2/test.c
index c26935cec33..2731a60836f 100644
--- a/tools/tools/shlib-compat/test/libtest2/test.c
+++ b/tools/tools/shlib-compat/test/libtest2/test.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/shlib-compat/test/libtest3/Symbol.map b/tools/tools/shlib-compat/test/libtest3/Symbol.map
index 67649ae0186..5b5bcec8853 100644
--- a/tools/tools/shlib-compat/test/libtest3/Symbol.map
+++ b/tools/tools/shlib-compat/test/libtest3/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 TEST_1.0 {
diff --git a/tools/tools/shlib-compat/test/libtest3/test.c b/tools/tools/shlib-compat/test/libtest3/test.c
index 95a169c6823..27d3fd98919 100644
--- a/tools/tools/shlib-compat/test/libtest3/test.c
+++ b/tools/tools/shlib-compat/test/libtest3/test.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/tools/tools/shlib-compat/test/libtestsys/Symbol.map b/tools/tools/shlib-compat/test/libtestsys/Symbol.map
index d596923bf07..5f4c2477b03 100644
--- a/tools/tools/shlib-compat/test/libtestsys/Symbol.map
+++ b/tools/tools/shlib-compat/test/libtestsys/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 TEST_1.0 {
diff --git a/usr.bin/bluetooth/bthost/bthost.c b/usr.bin/bluetooth/bthost/bthost.c
index 95d672317e6..23c81f985c5 100644
--- a/usr.bin/bluetooth/bthost/bthost.c
+++ b/usr.bin/bluetooth/bthost/bthost.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: bthost.c,v 1.5 2003/05/21 20:30:01 max Exp $
- * $FreeBSD$
  */
 
 #define L2CAP_SOCKET_CHECKED
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.c b/usr.bin/bluetooth/btsockstat/btsockstat.c
index 46ee0e10135..99e972f515c 100644
--- a/usr.bin/bluetooth/btsockstat/btsockstat.c
+++ b/usr.bin/bluetooth/btsockstat/btsockstat.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: btsockstat.c,v 1.8 2003/05/21 22:40:25 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
index 778169486ed..1506eeb3058 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: rfcomm_sdp.c,v 1.1 2003/09/07 18:15:55 max Exp $
- * $FreeBSD$
  */
 #define L2CAP_SOCKET_CHECKED
 #include <bluetooth.h>
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
index f28c145ce42..15298920d3c 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: rfcomm_sppd.c,v 1.4 2003/09/07 18:15:55 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/stat.h>
diff --git a/usr.bin/calendar/pathnames.h b/usr.bin/calendar/pathnames.h
index fa46eb0c7e5..a35198a0d81 100644
--- a/usr.bin/calendar/pathnames.h
+++ b/usr.bin/calendar/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h
index b655c5dd0b5..ce8b7c4f1e9 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -40,7 +40,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)chpass.h	8.4 (Berkeley) 4/2/94
- * $FreeBSD$
  */
 
 struct passwd;
diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h
index ce18531d0f1..a337fefae41 100644
--- a/usr.bin/cksum/extern.h
+++ b/usr.bin/cksum/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h
index fd649b01721..4ece1979795 100644
--- a/usr.bin/diff/diff.h
+++ b/usr.bin/diff/diff.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)diff.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h
index 9abd97099ce..8c98a6d86bc 100644
--- a/usr.bin/find/extern.h
+++ b/usr.bin/find/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/16/94
- *	$FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/find/find.h b/usr.bin/find/find.h
index 703cb677708..44e1d97c045 100644
--- a/usr.bin/find/find.h
+++ b/usr.bin/find/find.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)find.h	8.1 (Berkeley) 6/6/93
- *	$FreeBSD$
  */
 
 #include <regex.h>
diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h
index 05918171ae0..74494579004 100644
--- a/usr.bin/finger/extern.h
+++ b/usr.bin/finger/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
  */
 
 #ifndef	_EXTERN_H_
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index f750d256cf1..2675240c43f 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)finger.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #ifndef	_FINGER_H_
diff --git a/usr.bin/fortune/fortune/pathnames.h b/usr.bin/fortune/fortune/pathnames.h
index b6c9985ea88..bb14e9957e6 100644
--- a/usr.bin/fortune/fortune/pathnames.h
+++ b/usr.bin/fortune/fortune/pathnames.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$FreeBSD$
  */
 
 #include <paths.h>
diff --git a/usr.bin/gcore/extern.h b/usr.bin/gcore/extern.h
index cf37d6f3c37..3820327f258 100644
--- a/usr.bin/gcore/extern.h
+++ b/usr.bin/gcore/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #define	PFLAGS_FULL	0x01
diff --git a/usr.bin/gprof/gprof.h b/usr.bin/gprof/gprof.h
index d13d4eb0445..6b92e2b6e70 100644
--- a/usr.bin/gprof/gprof.h
+++ b/usr.bin/gprof/gprof.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)gprof.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/gprof/pathnames.h b/usr.bin/gprof/pathnames.h
index fd152db3f60..8b97811e2ec 100644
--- a/usr.bin/gprof/pathnames.h
+++ b/usr.bin/gprof/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- *  $FreeBSD$
  */
 
 #define	_PATH_FLAT_BLURB	"/usr/share/misc/gprof.flat"
diff --git a/usr.bin/gzip/zuncompress.c b/usr.bin/gzip/zuncompress.c
index b2f3e8d51bd..79f3983037f 100644
--- a/usr.bin/gzip/zuncompress.c
+++ b/usr.bin/gzip/zuncompress.c
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  * from: NetBSD: zopen.c,v 1.8 2003/08/07 11:13:29 agc Exp
- * $FreeBSD$
  */
 
 /* This file is #included by gzip.c */
diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
index f21e2f240b1..b58d826c172 100644
--- a/usr.bin/hexdump/hexdump.h
+++ b/usr.bin/hexdump/hexdump.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)hexdump.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <wchar.h>
diff --git a/usr.bin/indent/indent_codes.h b/usr.bin/indent/indent_codes.h
index 0d043279c4e..8eb80f166ef 100644
--- a/usr.bin/indent/indent_codes.h
+++ b/usr.bin/indent/indent_codes.h
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)indent_codes.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #define newline		1
diff --git a/usr.bin/indent/indent_globs.h b/usr.bin/indent/indent_globs.h
index cadf442a2c9..640ba1bf48e 100644
--- a/usr.bin/indent/indent_globs.h
+++ b/usr.bin/indent/indent_globs.h
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)indent_globs.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #define BACKSLASH '\\'
diff --git a/usr.bin/ktrace/ktrace.h b/usr.bin/ktrace/ktrace.h
index 09d5e989ad3..cecd0adc732 100644
--- a/usr.bin/ktrace/ktrace.h
+++ b/usr.bin/ktrace/ktrace.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #define DEF_POINTS (KTRFAC_SYSCALL | KTRFAC_SYSRET | KTRFAC_NAMEI | \
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index 18187ca00d8..c66a40cb55b 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)locate.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 /* Symbolic constants shared by locate.c and code.c */
diff --git a/usr.bin/locate/locate/pathnames.h b/usr.bin/locate/locate/pathnames.h
index 21fc9a172f8..53d0d607373 100644
--- a/usr.bin/locate/locate/pathnames.h
+++ b/usr.bin/locate/locate/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #define	_PATH_FCODES	"/var/db/locate.database"
diff --git a/usr.bin/login/pathnames.h b/usr.bin/login/pathnames.h
index 5dca6f2cbb4..9dc97619f4f 100644
--- a/usr.bin/login/pathnames.h
+++ b/usr.bin/login/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/9/93
- * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index b2aff26cda1..07e83179682 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 /* eval.c */
diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h
index b15f2b5bce3..6d738876b22 100644
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)mdef.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #ifdef __GNUC__
diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h
index 742edc14772..3ec165f08a7 100644
--- a/usr.bin/m4/pathnames.h
+++ b/usr.bin/m4/pathnames.h
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #define _PATH_DIVNAME	"/tmp/m4.0XXXXXXXXXX"	/* unix diversion files */
diff --git a/usr.bin/m4/stdd.h b/usr.bin/m4/stdd.h
index 2ef1bb1f3bd..3a90bc60688 100644
--- a/usr.bin/m4/stdd.h
+++ b/usr.bin/m4/stdd.h
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdd.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/netstat/common.h b/usr.bin/netstat/common.h
index 113180c0a6f..b40ae5b6a8a 100644
--- a/usr.bin/netstat/common.h
+++ b/usr.bin/netstat/common.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)netstat.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef _NETSTAT_COMMON_H_
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 32dbbc9d557..9f23252ee71 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)netstat.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/patch/backupfile.c b/usr.bin/patch/backupfile.c
index a35e6fd21dc..630733009eb 100644
--- a/usr.bin/patch/backupfile.c
+++ b/usr.bin/patch/backupfile.c
@@ -13,7 +13,6 @@
  * David MacKenzie <djm@ai.mit.edu>. Some algorithms adapted from GNU Emacs.
  *
  * $OpenBSD: backupfile.c,v 1.20 2009/10/27 23:59:41 deraadt Exp $
- * $FreeBSD$
  */
 
 #include <ctype.h>
diff --git a/usr.bin/patch/backupfile.h b/usr.bin/patch/backupfile.h
index 71999f75434..925212be377 100644
--- a/usr.bin/patch/backupfile.h
+++ b/usr.bin/patch/backupfile.h
@@ -11,7 +11,6 @@
  * backupfile.h -- declarations for making Emacs style backup file names
  *
  * $OpenBSD: backupfile.h,v 1.6 2003/07/28 18:35:36 otto Exp $
- * $FreeBSD$
  */
 
 /* When to make backup files. */
diff --git a/usr.bin/patch/common.h b/usr.bin/patch/common.h
index 3253df27e68..0e73bd89767 100644
--- a/usr.bin/patch/common.h
+++ b/usr.bin/patch/common.h
@@ -24,7 +24,6 @@
  * behaviour
  *
  * $OpenBSD: common.h,v 1.26 2006/03/11 19:41:30 otto Exp $
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c
index 99be70957f0..24fdcac1b7c 100644
--- a/usr.bin/patch/inp.c
+++ b/usr.bin/patch/inp.c
@@ -24,7 +24,6 @@
  * behaviour
  *
  * $OpenBSD: inp.c,v 1.44 2015/07/26 14:32:19 millert Exp $
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/patch/inp.h b/usr.bin/patch/inp.h
index 062798a6926..bfdc88a8c57 100644
--- a/usr.bin/patch/inp.h
+++ b/usr.bin/patch/inp.h
@@ -24,7 +24,6 @@
  * behaviour
  *
  * $OpenBSD: inp.h,v 1.8 2003/08/15 08:00:51 otto Exp $
- * $FreeBSD$
  */
 
 void		re_input(void);
diff --git a/usr.bin/patch/mkpath.c b/usr.bin/patch/mkpath.c
index 2214d4d42e4..0fbd58a759a 100644
--- a/usr.bin/patch/mkpath.c
+++ b/usr.bin/patch/mkpath.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  * $OpenBSD: mkpath.c,v 1.2 2005/06/20 07:14:06 otto Exp $
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c
index 48d3bd37fe5..ecaf799fe9b 100644
--- a/usr.bin/patch/patch.c
+++ b/usr.bin/patch/patch.c
@@ -24,7 +24,6 @@
  * behaviour
  *
  * $OpenBSD: patch.c,v 1.54 2014/12/13 10:31:07 tobias Exp $
- * $FreeBSD$
  *
  */
 
diff --git a/usr.bin/patch/pathnames.h b/usr.bin/patch/pathnames.h
index 79d8faea628..4d4672fd83f 100644
--- a/usr.bin/patch/pathnames.h
+++ b/usr.bin/patch/pathnames.h
@@ -3,7 +3,6 @@
  * on July 29, 2003.
  *
  * $OpenBSD: pathnames.h,v 1.1 2003/07/29 20:10:17 millert Exp $
- * $FreeBSD$
  */
 
 
diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c
index e180c707571..d528f06235b 100644
--- a/usr.bin/patch/pch.c
+++ b/usr.bin/patch/pch.c
@@ -24,7 +24,6 @@
  * behaviour
  *
  * $OpenBSD: pch.c,v 1.43 2014/11/18 17:03:35 tobias Exp $
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/patch/pch.h b/usr.bin/patch/pch.h
index 53ed71780e2..5ce4f72497c 100644
--- a/usr.bin/patch/pch.h
+++ b/usr.bin/patch/pch.h
@@ -24,7 +24,6 @@
  * behaviour
  *
  * $OpenBSD: pch.h,v 1.9 2003/10/31 20:20:45 millert Exp $
- * $FreeBSD$
  */
 
 #define	OLD_FILE	0
diff --git a/usr.bin/patch/util.c b/usr.bin/patch/util.c
index 080a3a266e3..bb4c97e4211 100644
--- a/usr.bin/patch/util.c
+++ b/usr.bin/patch/util.c
@@ -24,7 +24,6 @@
  * behaviour
  *
  * $OpenBSD: util.c,v 1.35 2010/07/24 01:10:12 ray Exp $
- * $FreeBSD$
  */
 
 #include <sys/stat.h>
diff --git a/usr.bin/patch/util.h b/usr.bin/patch/util.h
index 2ef6b2f3ec1..a968a64aa19 100644
--- a/usr.bin/patch/util.h
+++ b/usr.bin/patch/util.h
@@ -24,7 +24,6 @@
  * behaviour
  *
  * $OpenBSD: util.h,v 1.16 2014/12/13 10:31:07 tobias Exp $
- * $FreeBSD$
  */
 
 char		*fetchname(const char *, bool *, int);
diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h
index b44eb418775..d84bca5d144 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -37,7 +37,6 @@
  * SUCH DAMAGE.
  *
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 extern int eopterr;
diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index 2c9e50f6b4f..6c0c810f371 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -37,7 +37,6 @@
  * SUCH DAMAGE.
  *
  *      @(#)pr.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/primes/primes.h b/usr.bin/primes/primes.h
index ae0bbcba542..9c8d29a5041 100644
--- a/usr.bin/primes/primes.h
+++ b/usr.bin/primes/primes.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)primes.h	8.2 (Berkeley) 3/1/94
- * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/rpcgen/rpc_parse.h b/usr.bin/rpcgen/rpc_parse.h
index 3ca874e4494..1e1716bb507 100644
--- a/usr.bin/rpcgen/rpc_parse.h
+++ b/usr.bin/rpcgen/rpc_parse.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_scan.h b/usr.bin/rpcgen/rpc_scan.h
index a57eb3bb194..1c86498780e 100644
--- a/usr.bin/rpcgen/rpc_scan.h
+++ b/usr.bin/rpcgen/rpc_scan.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_util.h b/usr.bin/rpcgen/rpc_util.h
index 59f38eec23f..375ec0f627f 100644
--- a/usr.bin/rpcgen/rpc_util.h
+++ b/usr.bin/rpcgen/rpc_util.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/sed/defs.h b/usr.bin/sed/defs.h
index 3a95fcf82e3..460152a344e 100644
--- a/usr.bin/sed/defs.h
+++ b/usr.bin/sed/defs.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/sed/extern.h b/usr.bin/sed/extern.h
index 4d88650417a..2dee73587e5 100644
--- a/usr.bin/sed/extern.h
+++ b/usr.bin/sed/extern.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 extern struct s_command *prog;
diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h
index fc58b7a2af9..c44a06a1a82 100644
--- a/usr.bin/systat/extern.h
+++ b/usr.bin/systat/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index 4ced36c3293..e64a0ad4fb5 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)systat.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <sys/stdint.h>
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index 04960b8a52c..41e8281305f 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)talk.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/tftp/tftp.h b/usr.bin/tftp/tftp.h
index 680ea2ea4fb..59e5c9f3991 100644
--- a/usr.bin/tftp/tftp.h
+++ b/usr.bin/tftp/tftp.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 int	recvfile(int peer, char *port, int fd, char *name, char *mode);
diff --git a/usr.bin/top/machine.h b/usr.bin/top/machine.h
index af66eaead76..57f2846cdba 100644
--- a/usr.bin/top/machine.h
+++ b/usr.bin/top/machine.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/top/utils.h b/usr.bin/top/utils.h
index 2688f551857..a730e339d20 100644
--- a/usr.bin/top/utils.h
+++ b/usr.bin/top/utils.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  *  Top users/processes display for Unix
  *
diff --git a/usr.bin/tr/extern.h b/usr.bin/tr/extern.h
index e939d2cf780..f7e15b9db3a 100644
--- a/usr.bin/tr/extern.h
+++ b/usr.bin/tr/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <limits.h>
diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h
index e9d57b6e037..45d139c61ee 100644
--- a/usr.bin/vgrind/extern.h
+++ b/usr.bin/vgrind/extern.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 extern bool     _escaped;             /* if last character was an escape */
diff --git a/usr.bin/w/extern.h b/usr.bin/w/extern.h
index 427f479f3d3..c1dc3804bb7 100644
--- a/usr.bin/w/extern.h
+++ b/usr.bin/w/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 extern	int use_ampm;
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.c b/usr.sbin/acpi/acpiconf/acpiconf.c
index 053c1c61ec3..44c39ca6636 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.c
+++ b/usr.sbin/acpi/acpiconf/acpiconf.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  *
  *	$Id: acpiconf.c,v 1.5 2000/08/08 14:12:19 iwasaki Exp $
- *	$FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.c b/usr.sbin/bluetooth/bcmfw/bcmfw.c
index 328790b1b83..1361c7fe6d5 100644
--- a/usr.sbin/bluetooth/bcmfw/bcmfw.c
+++ b/usr.sbin/bluetooth/bcmfw/bcmfw.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: bcmfw.c,v 1.4 2003/04/27 19:28:09 max Exp $
- * $FreeBSD$
  *
  * Based on Linux BlueZ BlueFW-0.9 package
  *
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
index c7d4369e5f6..40ece6ce063 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: bthidcontrol.c,v 1.2 2004/02/13 21:44:41 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
index 26706698994..e44b670f8f7 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: bthidcontrol.h,v 1.1 2004/02/12 23:25:51 max Exp $
- * $FreeBSD$
  */
 
 #ifndef __BTHIDCONTROL_H__
diff --git a/usr.sbin/bluetooth/bthidcontrol/hid.c b/usr.sbin/bluetooth/bthidcontrol/hid.c
index 05c06e20bbf..727eb8a716e 100644
--- a/usr.sbin/bluetooth/bthidcontrol/hid.c
+++ b/usr.sbin/bluetooth/bthidcontrol/hid.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: hid.c,v 1.3 2004/02/17 22:14:57 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidcontrol/sdp.c b/usr.sbin/bluetooth/bthidcontrol/sdp.c
index 38b3dbc24a9..dc83229f080 100644
--- a/usr.sbin/bluetooth/bthidcontrol/sdp.c
+++ b/usr.sbin/bluetooth/bthidcontrol/sdp.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: sdp.c,v 1.3 2004/02/17 22:14:57 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/bthidd/bthid_config.h b/usr.sbin/bluetooth/bthidd/bthid_config.h
index bccadd3be59..829af57aff4 100644
--- a/usr.sbin/bluetooth/bthidd/bthid_config.h
+++ b/usr.sbin/bluetooth/bthidd/bthid_config.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: bthid_config.h,v 1.4 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _BTHID_CONFIG_H_
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.c b/usr.sbin/bluetooth/bthidd/bthidd.c
index 83471936365..fad467667bd 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.c
+++ b/usr.sbin/bluetooth/bthidd/bthidd.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: bthidd.c,v 1.8 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/time.h>
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.h b/usr.sbin/bluetooth/bthidd/bthidd.h
index 842b59a9c04..55fd03e5733 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.h
+++ b/usr.sbin/bluetooth/bthidd/bthidd.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: bthidd.h,v 1.7 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _BTHIDD_H_
diff --git a/usr.sbin/bluetooth/bthidd/client.c b/usr.sbin/bluetooth/bthidd/client.c
index 6fa7baf915b..63fef5867b9 100644
--- a/usr.sbin/bluetooth/bthidd/client.c
+++ b/usr.sbin/bluetooth/bthidd/client.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: client.c,v 1.7 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/hid.c b/usr.sbin/bluetooth/bthidd/hid.c
index 17c2d92f831..4de3c07119e 100644
--- a/usr.sbin/bluetooth/bthidd/hid.c
+++ b/usr.sbin/bluetooth/bthidd/hid.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: hid.c,v 1.5 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/consio.h>
diff --git a/usr.sbin/bluetooth/bthidd/kbd.c b/usr.sbin/bluetooth/bthidd/kbd.c
index a3b6ec95c19..c1616c7e4bd 100644
--- a/usr.sbin/bluetooth/bthidd/kbd.c
+++ b/usr.sbin/bluetooth/bthidd/kbd.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: kbd.c,v 1.4 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/consio.h>
diff --git a/usr.sbin/bluetooth/bthidd/kbd.h b/usr.sbin/bluetooth/bthidd/kbd.h
index 80988139f1a..d12d51d0e62 100644
--- a/usr.sbin/bluetooth/bthidd/kbd.h
+++ b/usr.sbin/bluetooth/bthidd/kbd.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: kbd.h,v 1.3 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _KBD_H_
diff --git a/usr.sbin/bluetooth/bthidd/lexer.l b/usr.sbin/bluetooth/bthidd/lexer.l
index d8b1921fc9a..d8933e4ea5d 100644
--- a/usr.sbin/bluetooth/bthidd/lexer.l
+++ b/usr.sbin/bluetooth/bthidd/lexer.l
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * $Id: lexer.l,v 1.3 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
  */
 #define L2CAP_SOCKET_CHECKED
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/bthidd/parser.y b/usr.sbin/bluetooth/bthidd/parser.y
index 40c62686eee..a18ef3515b8 100644
--- a/usr.sbin/bluetooth/bthidd/parser.y
+++ b/usr.sbin/bluetooth/bthidd/parser.y
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * $Id: parser.y,v 1.7 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/server.c b/usr.sbin/bluetooth/bthidd/server.c
index dc9cf891faa..c532561265c 100644
--- a/usr.sbin/bluetooth/bthidd/server.c
+++ b/usr.sbin/bluetooth/bthidd/server.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: server.c,v 1.9 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/bthidd/session.c b/usr.sbin/bluetooth/bthidd/session.c
index 0cac823c940..ab9fa59dab6 100644
--- a/usr.sbin/bluetooth/bthidd/session.c
+++ b/usr.sbin/bluetooth/bthidd/session.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: session.c,v 1.3 2006/09/07 21:06:53 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/hccontrol/adv_data.c b/usr.sbin/bluetooth/hccontrol/adv_data.c
index 35ca7f2ab66..e8d91ff5915 100644
--- a/usr.sbin/bluetooth/hccontrol/adv_data.c
+++ b/usr.sbin/bluetooth/hccontrol/adv_data.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id$
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.c b/usr.sbin/bluetooth/hccontrol/hccontrol.c
index b74d7b6fa84..c1ce016e624 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.c
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: hccontrol.c,v 1.5 2003/09/05 00:38:24 max Exp $
- * $FreeBSD$
  */
 
 #define L2CAP_SOCKET_CHECKED
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.h b/usr.sbin/bluetooth/hccontrol/hccontrol.h
index 2cb7e8017da..9dd6345dd59 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.h
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: hccontrol.h,v 1.2 2003/05/19 17:29:29 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _HCCONTROL_H_
diff --git a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
index d89a481e8e2..38bfcc32104 100644
--- a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
+++ b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: host_controller_baseband.c,v 1.4 2003/08/18 19:19:53 max Exp $
- * $FreeBSD$
  */
 
 #define L2CAP_SOCKET_CHECKED
diff --git a/usr.sbin/bluetooth/hccontrol/info.c b/usr.sbin/bluetooth/hccontrol/info.c
index b8d6e3b234f..b1b2aa36c59 100644
--- a/usr.sbin/bluetooth/hccontrol/info.c
+++ b/usr.sbin/bluetooth/hccontrol/info.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: info.c,v 1.3 2003/08/18 19:19:54 max Exp $
- * $FreeBSD$
  */
 
 #define L2CAP_SOCKET_CHECKED
diff --git a/usr.sbin/bluetooth/hccontrol/le.c b/usr.sbin/bluetooth/hccontrol/le.c
index c8ae335fcbe..6d5440643b4 100644
--- a/usr.sbin/bluetooth/hccontrol/le.c
+++ b/usr.sbin/bluetooth/hccontrol/le.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  *
  * $Id: hccontrol.c,v 1.5 2003/09/05 00:38:24 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/hccontrol/link_control.c b/usr.sbin/bluetooth/hccontrol/link_control.c
index db84a58a437..b43515aa0d5 100644
--- a/usr.sbin/bluetooth/hccontrol/link_control.c
+++ b/usr.sbin/bluetooth/hccontrol/link_control.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: link_control.c,v 1.4 2003/08/18 19:19:54 max Exp $
- * $FreeBSD$
  */
 
 #define L2CAP_SOCKET_CHECKED
diff --git a/usr.sbin/bluetooth/hccontrol/link_policy.c b/usr.sbin/bluetooth/hccontrol/link_policy.c
index b8a809d14a9..b99ef2196eb 100644
--- a/usr.sbin/bluetooth/hccontrol/link_policy.c
+++ b/usr.sbin/bluetooth/hccontrol/link_policy.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: link_policy.c,v 1.3 2003/08/18 19:19:54 max Exp $
- * $FreeBSD$
  */
 
 #define L2CAP_SOCKET_CHECKED
diff --git a/usr.sbin/bluetooth/hccontrol/node.c b/usr.sbin/bluetooth/hccontrol/node.c
index 8d8ee205959..b100900f527 100644
--- a/usr.sbin/bluetooth/hccontrol/node.c
+++ b/usr.sbin/bluetooth/hccontrol/node.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: node.c,v 1.6 2003/07/22 21:14:02 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/ioctl.h>
diff --git a/usr.sbin/bluetooth/hccontrol/send_recv.c b/usr.sbin/bluetooth/hccontrol/send_recv.c
index 05ed1537ec3..4f9bb05aec4 100644
--- a/usr.sbin/bluetooth/hccontrol/send_recv.c
+++ b/usr.sbin/bluetooth/hccontrol/send_recv.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: send_recv.c,v 1.2 2003/05/21 22:40:30 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/hccontrol/status.c b/usr.sbin/bluetooth/hccontrol/status.c
index 4e6ea48b58e..9306c10fec8 100644
--- a/usr.sbin/bluetooth/hccontrol/status.c
+++ b/usr.sbin/bluetooth/hccontrol/status.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: status.c,v 1.2 2003/05/21 22:40:30 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/hccontrol/util.c b/usr.sbin/bluetooth/hccontrol/util.c
index fd2f509bc38..029ced6e28f 100644
--- a/usr.sbin/bluetooth/hccontrol/util.c
+++ b/usr.sbin/bluetooth/hccontrol/util.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: util.c,v 1.2 2003/05/19 17:29:29 max Exp $
- * $FreeBSD$
  */
  
 #include <sys/param.h>
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.c b/usr.sbin/bluetooth/hcsecd/hcsecd.c
index 43db3e6f6a3..824b0ba6971 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.c
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: hcsecd.c,v 1.6 2003/08/18 19:19:55 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.h b/usr.sbin/bluetooth/hcsecd/hcsecd.h
index a1cbcac792f..e13139e7cf1 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.h
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: hcsecd.h,v 1.3 2003/09/08 18:54:21 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _HCSECD_H_
diff --git a/usr.sbin/bluetooth/hcsecd/lexer.l b/usr.sbin/bluetooth/hcsecd/lexer.l
index 801bbc8ea18..71bfd7d5c7b 100644
--- a/usr.sbin/bluetooth/hcsecd/lexer.l
+++ b/usr.sbin/bluetooth/hcsecd/lexer.l
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  * $Id: lexer.l,v 1.1 2002/11/24 20:22:39 max Exp $
- * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/usr.sbin/bluetooth/hcsecd/parser.y b/usr.sbin/bluetooth/hcsecd/parser.y
index 86138a71ac5..bf8d33f565b 100644
--- a/usr.sbin/bluetooth/hcsecd/parser.y
+++ b/usr.sbin/bluetooth/hcsecd/parser.y
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  * $Id: parser.y,v 1.5 2003/06/07 21:22:30 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/fcntl.h>
diff --git a/usr.sbin/bluetooth/l2control/l2cap.c b/usr.sbin/bluetooth/l2control/l2cap.c
index f459c492749..0f410d3c6a8 100644
--- a/usr.sbin/bluetooth/l2control/l2cap.c
+++ b/usr.sbin/bluetooth/l2control/l2cap.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: l2cap.c,v 1.5 2003/05/16 19:52:37 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/ioctl.h>
diff --git a/usr.sbin/bluetooth/l2control/l2control.c b/usr.sbin/bluetooth/l2control/l2control.c
index 54429a368aa..7312371345e 100644
--- a/usr.sbin/bluetooth/l2control/l2control.c
+++ b/usr.sbin/bluetooth/l2control/l2control.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: l2control.c,v 1.6 2003/09/05 00:38:25 max Exp $
- * $FreeBSD$
  */
 
 #include <assert.h>
diff --git a/usr.sbin/bluetooth/l2control/l2control.h b/usr.sbin/bluetooth/l2control/l2control.h
index af86f7a953e..e18691d84ca 100644
--- a/usr.sbin/bluetooth/l2control/l2control.h
+++ b/usr.sbin/bluetooth/l2control/l2control.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: l2control.h,v 1.1 2002/11/24 20:22:41 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _L2CONTROL_H_
diff --git a/usr.sbin/bluetooth/l2ping/l2ping.c b/usr.sbin/bluetooth/l2ping/l2ping.c
index 93c606bcae5..25ddf06e853 100644
--- a/usr.sbin/bluetooth/l2ping/l2ping.c
+++ b/usr.sbin/bluetooth/l2ping/l2ping.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: l2ping.c,v 1.5 2003/05/16 19:54:40 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/ioctl.h>
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
index 5623dd1d494..439b4157f59 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
+++ b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: rfcomm_pppd.c,v 1.5 2003/09/07 18:32:11 max Exp $
- * $FreeBSD$
  */
 #define L2CAP_SOCKET_CHECKED
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
index 2c36d7536e1..890e6e3cfdb 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: sdpcontrol.c,v 1.1 2003/09/08 02:27:27 max Exp $
- * $FreeBSD$
  */
 
 #include <assert.h>
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
index afbb210753c..818005ee34c 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: sdpcontrol.h,v 1.1 2003/09/08 02:27:27 max Exp $
- * $FreeBSD$
  */
 
 #ifndef __SDPCONTROL_H__
diff --git a/usr.sbin/bluetooth/sdpcontrol/search.c b/usr.sbin/bluetooth/sdpcontrol/search.c
index ccb9ed365ea..94c34828a94 100644
--- a/usr.sbin/bluetooth/sdpcontrol/search.c
+++ b/usr.sbin/bluetooth/sdpcontrol/search.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: search.c,v 1.2 2003/09/08 17:35:15 max Exp $
- * $FreeBSD$
  */
 
 #include <netinet/in.h>
diff --git a/usr.sbin/bluetooth/sdpd/bgd.c b/usr.sbin/bluetooth/sdpd/bgd.c
index 0345d7b9b62..628389efc8e 100644
--- a/usr.sbin/bluetooth/sdpd/bgd.c
+++ b/usr.sbin/bluetooth/sdpd/bgd.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: bgd.c,v 1.4 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 #define L2CAP_SOCKET_CHECKED
 #include <bluetooth.h>
diff --git a/usr.sbin/bluetooth/sdpd/dun.c b/usr.sbin/bluetooth/sdpd/dun.c
index 50ec3685f66..3f415992627 100644
--- a/usr.sbin/bluetooth/sdpd/dun.c
+++ b/usr.sbin/bluetooth/sdpd/dun.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: dun.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/ftrn.c b/usr.sbin/bluetooth/sdpd/ftrn.c
index a3a0e2cde66..32b4912f25e 100644
--- a/usr.sbin/bluetooth/sdpd/ftrn.c
+++ b/usr.sbin/bluetooth/sdpd/ftrn.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ftrn.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/gn.c b/usr.sbin/bluetooth/sdpd/gn.c
index cecb93a38a6..17879c4fb19 100644
--- a/usr.sbin/bluetooth/sdpd/gn.c
+++ b/usr.sbin/bluetooth/sdpd/gn.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: gn.c,v 1.1 2008/03/11 00:02:42 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/irmc.c b/usr.sbin/bluetooth/sdpd/irmc.c
index 9de370c70ae..90155e06549 100644
--- a/usr.sbin/bluetooth/sdpd/irmc.c
+++ b/usr.sbin/bluetooth/sdpd/irmc.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: irmc.c,v 1.6 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/irmc_command.c b/usr.sbin/bluetooth/sdpd/irmc_command.c
index 0280016856b..e8d0723fa8a 100644
--- a/usr.sbin/bluetooth/sdpd/irmc_command.c
+++ b/usr.sbin/bluetooth/sdpd/irmc_command.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: irmc_command.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/lan.c b/usr.sbin/bluetooth/sdpd/lan.c
index 0fc22df94d6..66a71754ef4 100644
--- a/usr.sbin/bluetooth/sdpd/lan.c
+++ b/usr.sbin/bluetooth/sdpd/lan.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: lan.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #include <arpa/inet.h>
diff --git a/usr.sbin/bluetooth/sdpd/log.c b/usr.sbin/bluetooth/sdpd/log.c
index 57394c89b15..f7d4fa350c6 100644
--- a/usr.sbin/bluetooth/sdpd/log.c
+++ b/usr.sbin/bluetooth/sdpd/log.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: log.c,v 1.1 2004/01/07 23:15:00 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/bluetooth/sdpd/log.h b/usr.sbin/bluetooth/sdpd/log.h
index fcc53a02c64..e00ed4d8c83 100644
--- a/usr.sbin/bluetooth/sdpd/log.h
+++ b/usr.sbin/bluetooth/sdpd/log.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: log.h,v 1.1 2004/01/07 23:15:00 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _LOG_H_
diff --git a/usr.sbin/bluetooth/sdpd/main.c b/usr.sbin/bluetooth/sdpd/main.c
index e438d5b9e00..cc21b314f48 100644
--- a/usr.sbin/bluetooth/sdpd/main.c
+++ b/usr.sbin/bluetooth/sdpd/main.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: main.c,v 1.8 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/select.h>
diff --git a/usr.sbin/bluetooth/sdpd/nap.c b/usr.sbin/bluetooth/sdpd/nap.c
index 529bfd52837..229600b9c95 100644
--- a/usr.sbin/bluetooth/sdpd/nap.c
+++ b/usr.sbin/bluetooth/sdpd/nap.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: nap.c,v 1.1 2008/03/11 00:02:42 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/opush.c b/usr.sbin/bluetooth/sdpd/opush.c
index b2a7255c5da..6f246419129 100644
--- a/usr.sbin/bluetooth/sdpd/opush.c
+++ b/usr.sbin/bluetooth/sdpd/opush.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: opush.c,v 1.6 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/panu.c b/usr.sbin/bluetooth/sdpd/panu.c
index e0498e89a18..bba1dbd45d1 100644
--- a/usr.sbin/bluetooth/sdpd/panu.c
+++ b/usr.sbin/bluetooth/sdpd/panu.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: panu.c,v 1.1 2008/03/11 00:02:42 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/profile.c b/usr.sbin/bluetooth/sdpd/profile.c
index 1b576e44d91..3c6ada6871c 100644
--- a/usr.sbin/bluetooth/sdpd/profile.c
+++ b/usr.sbin/bluetooth/sdpd/profile.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: profile.c,v 1.6 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/profile.h b/usr.sbin/bluetooth/sdpd/profile.h
index b8c5cda7d6a..7184c0fd742 100644
--- a/usr.sbin/bluetooth/sdpd/profile.h
+++ b/usr.sbin/bluetooth/sdpd/profile.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: profile.h,v 1.6 2004/01/13 19:31:54 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _PROFILE_H_
diff --git a/usr.sbin/bluetooth/sdpd/provider.c b/usr.sbin/bluetooth/sdpd/provider.c
index 2f7ed67f185..7ac800a8500 100644
--- a/usr.sbin/bluetooth/sdpd/provider.c
+++ b/usr.sbin/bluetooth/sdpd/provider.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: provider.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/provider.h b/usr.sbin/bluetooth/sdpd/provider.h
index eeb63ef1ba8..b4f3bb0a46d 100644
--- a/usr.sbin/bluetooth/sdpd/provider.h
+++ b/usr.sbin/bluetooth/sdpd/provider.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: provider.h,v 1.6 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _PROVIDER_H_
diff --git a/usr.sbin/bluetooth/sdpd/sar.c b/usr.sbin/bluetooth/sdpd/sar.c
index 99d63e4e7ff..0470109ebc0 100644
--- a/usr.sbin/bluetooth/sdpd/sar.c
+++ b/usr.sbin/bluetooth/sdpd/sar.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: sar.c,v 1.2 2004/01/08 23:46:51 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/scr.c b/usr.sbin/bluetooth/sdpd/scr.c
index 3f2b7882044..a5bced947f8 100644
--- a/usr.sbin/bluetooth/sdpd/scr.c
+++ b/usr.sbin/bluetooth/sdpd/scr.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: scr.c,v 1.1 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/sd.c b/usr.sbin/bluetooth/sdpd/sd.c
index 2ee22084f8c..cd4f7fa3364 100644
--- a/usr.sbin/bluetooth/sdpd/sd.c
+++ b/usr.sbin/bluetooth/sdpd/sd.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: sd.c,v 1.4 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/server.c b/usr.sbin/bluetooth/sdpd/server.c
index dcca8d15b83..ab398cd9339 100644
--- a/usr.sbin/bluetooth/sdpd/server.c
+++ b/usr.sbin/bluetooth/sdpd/server.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: server.c,v 1.6 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/bluetooth/sdpd/server.h b/usr.sbin/bluetooth/sdpd/server.h
index 3fd8e59bcf2..9a1cb86eb3d 100644
--- a/usr.sbin/bluetooth/sdpd/server.h
+++ b/usr.sbin/bluetooth/sdpd/server.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: server.h,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _SERVER_H_
diff --git a/usr.sbin/bluetooth/sdpd/sp.c b/usr.sbin/bluetooth/sdpd/sp.c
index ed911e7d6e5..3c79dd93965 100644
--- a/usr.sbin/bluetooth/sdpd/sp.c
+++ b/usr.sbin/bluetooth/sdpd/sp.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: sp.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/srr.c b/usr.sbin/bluetooth/sdpd/srr.c
index 01ec2bdf1c9..8e887a4841d 100644
--- a/usr.sbin/bluetooth/sdpd/srr.c
+++ b/usr.sbin/bluetooth/sdpd/srr.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: srr.c,v 1.1 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/ssar.c b/usr.sbin/bluetooth/sdpd/ssar.c
index 594c410c9f4..fad498c2b34 100644
--- a/usr.sbin/bluetooth/sdpd/ssar.c
+++ b/usr.sbin/bluetooth/sdpd/ssar.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ssar.c,v 1.4 2004/01/12 22:54:31 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/ssr.c b/usr.sbin/bluetooth/sdpd/ssr.c
index f176ec77d8b..c6b3a1f65fe 100644
--- a/usr.sbin/bluetooth/sdpd/ssr.c
+++ b/usr.sbin/bluetooth/sdpd/ssr.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ssr.c,v 1.5 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/sur.c b/usr.sbin/bluetooth/sdpd/sur.c
index 8348240fa93..43581be0bbf 100644
--- a/usr.sbin/bluetooth/sdpd/sur.c
+++ b/usr.sbin/bluetooth/sdpd/sur.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: sur.c,v 1.1 2004/01/13 01:54:39 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/sdpd/uuid-private.h b/usr.sbin/bluetooth/sdpd/uuid-private.h
index 7a8f96f049d..8a3f9bb1c62 100644
--- a/usr.sbin/bluetooth/sdpd/uuid-private.h
+++ b/usr.sbin/bluetooth/sdpd/uuid-private.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: uuid-private.h,v 1.1 2004/12/09 18:20:26 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _UUID_PRIVATE_H_
diff --git a/usr.sbin/bluetooth/sdpd/uuid.c b/usr.sbin/bluetooth/sdpd/uuid.c
index e3adba047e4..90a6d5b1732 100644
--- a/usr.sbin/bluetooth/sdpd/uuid.c
+++ b/usr.sbin/bluetooth/sdpd/uuid.c
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: uuid.c,v 1.1 2004/12/09 18:20:26 max Exp $
- * $FreeBSD$
  */
 #define L2CAP_SOCKET_CHECKED
 #include <bluetooth.h>
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 8555bf000d0..df0428b5907 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)config.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 /*
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index c4a3522ebbc..c475f15f56e 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -68,7 +68,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)config.y	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <assert.h>
diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l
index 243b66666d0..e3315b028df 100644
--- a/usr.sbin/config/lang.l
+++ b/usr.sbin/config/lang.l
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)lang.l	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <assert.h>
diff --git a/usr.sbin/dconschat/dconschat.c b/usr.sbin/dconschat/dconschat.c
index 0896280d515..72d1aa276bd 100644
--- a/usr.sbin/dconschat/dconschat.c
+++ b/usr.sbin/dconschat/dconschat.c
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  * 
  * $Id: dconschat.c,v 1.76 2003/10/23 06:21:13 simokawa Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/usr.sbin/edquota/pathnames.h b/usr.sbin/edquota/pathnames.h
index e5be2d24c51..19b9df68d56 100644
--- a/usr.sbin/edquota/pathnames.h
+++ b/usr.sbin/edquota/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/usr.sbin/fifolog/lib/getdate.y b/usr.sbin/fifolog/lib/getdate.y
index 57f3cb1d46f..dfbfad9a9fd 100644
--- a/usr.sbin/fifolog/lib/getdate.y
+++ b/usr.sbin/fifolog/lib/getdate.y
@@ -12,7 +12,6 @@
 **  Picked up from CVS and slightly cleaned up by to WARNS=5 level by
 **  Poul-Henning Kamp <phk@FreeBSD.org>
 **
-** $FreeBSD$
 */
 
 #include <stdio.h>
diff --git a/usr.sbin/fstyp/hammer_disk.h b/usr.sbin/fstyp/hammer_disk.h
index 8b5654f748f..4b5182d7e86 100644
--- a/usr.sbin/fstyp/hammer_disk.h
+++ b/usr.sbin/fstyp/hammer_disk.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  * $DragonFly: src/sys/vfs/hammer/hammer_disk.h,v 1.55 2008/11/13 02:18:43 dillon Exp $
- * $FreeBSD$
  */
 
 #ifndef VFS_HAMMER_DISK_H_
diff --git a/usr.sbin/fwcontrol/fwmpegts.c b/usr.sbin/fwcontrol/fwmpegts.c
index c744b53a7d4..5a6551c62a8 100644
--- a/usr.sbin/fwcontrol/fwmpegts.c
+++ b/usr.sbin/fwcontrol/fwmpegts.c
@@ -33,7 +33,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/inetd/pathnames.h b/usr.sbin/inetd/pathnames.h
index d725cad4c62..e9cc994bd08 100644
--- a/usr.sbin/inetd/pathnames.h
+++ b/usr.sbin/inetd/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/usr.sbin/keyserv/keyserv.h b/usr.sbin/keyserv/keyserv.h
index 07e4ab6efa8..7eb5b4bae29 100644
--- a/usr.sbin/keyserv/keyserv.h
+++ b/usr.sbin/keyserv/keyserv.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 extern void setmodulus(char *modx);
 
diff --git a/usr.sbin/lpr/chkprintcap/skimprintcap.h b/usr.sbin/lpr/chkprintcap/skimprintcap.h
index c161234737b..d7250ff6fff 100644
--- a/usr.sbin/lpr/chkprintcap/skimprintcap.h
+++ b/usr.sbin/lpr/chkprintcap/skimprintcap.h
@@ -31,7 +31,6 @@
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/lpr/common_source/ctlinfo.h b/usr.sbin/lpr/common_source/ctlinfo.h
index 87140e5380e..82d0c92df45 100644
--- a/usr.sbin/lpr/common_source/ctlinfo.h
+++ b/usr.sbin/lpr/common_source/ctlinfo.h
@@ -31,7 +31,6 @@
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/lpr/common_source/lp.cdefs.h b/usr.sbin/lpr/common_source/lp.cdefs.h
index 091a84baea5..c3ca409b6a8 100644
--- a/usr.sbin/lpr/common_source/lp.cdefs.h
+++ b/usr.sbin/lpr/common_source/lp.cdefs.h
@@ -31,7 +31,6 @@
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index bf9262db02a..6b328427800 100644
--- a/usr.sbin/lpr/common_source/lp.h
+++ b/usr.sbin/lpr/common_source/lp.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  * 	From: @(#)lp.h	8.2 (Berkeley) 4/28/95
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/usr.sbin/lpr/common_source/lp.local.h b/usr.sbin/lpr/common_source/lp.local.h
index 6cf200c356c..56439d9274c 100644
--- a/usr.sbin/lpr/common_source/lp.local.h
+++ b/usr.sbin/lpr/common_source/lp.local.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)lp.local.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 /*
diff --git a/usr.sbin/lpr/common_source/matchjobs.h b/usr.sbin/lpr/common_source/matchjobs.h
index 4a3073db9f2..a3c28623e21 100644
--- a/usr.sbin/lpr/common_source/matchjobs.h
+++ b/usr.sbin/lpr/common_source/matchjobs.h
@@ -32,7 +32,6 @@
  * or FreeBSD, Inc.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h
index 5b3d50d2690..513bc1ea19e 100644
--- a/usr.sbin/lpr/lpd/extern.h
+++ b/usr.sbin/lpr/lpd/extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *      From: @(#)extern.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
diff --git a/usr.sbin/makefs/ffs/ffs_extern.h b/usr.sbin/makefs/ffs/ffs_extern.h
index 12ba0b77989..7b66b1c6ba1 100644
--- a/usr.sbin/makefs/ffs/ffs_extern.h
+++ b/usr.sbin/makefs/ffs/ffs_extern.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #include "ffs/buf.h"
diff --git a/usr.sbin/makefs/ffs/ufs_inode.h b/usr.sbin/makefs/ffs/ufs_inode.h
index e7baff23cbf..67581dda335 100644
--- a/usr.sbin/makefs/ffs/ufs_inode.h
+++ b/usr.sbin/makefs/ffs/ufs_inode.h
@@ -37,7 +37,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
  */
 
 union dinode {
diff --git a/usr.sbin/mountd/pathnames.h b/usr.sbin/mountd/pathnames.h
index 0a0c74644cb..293fe878eb1 100644
--- a/usr.sbin/mountd/pathnames.h
+++ b/usr.sbin/mountd/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
- * $FreeBSD$
  */
 #include <paths.h>
 
diff --git a/usr.sbin/newsyslog/extern.h b/usr.sbin/newsyslog/extern.h
index 54d86b6135d..8337b314508 100644
--- a/usr.sbin/newsyslog/extern.h
+++ b/usr.sbin/newsyslog/extern.h
@@ -31,7 +31,6 @@
  * official policies, either expressed or implied, of the FreeBSD Project.
  *
  * ------+---------+---------+---------+---------+---------+---------+---------*
- * $FreeBSD$
  * ------+---------+---------+---------+---------+---------+---------+---------*
  */
 
diff --git a/usr.sbin/ntp/libntpevent/event2/event-config.h b/usr.sbin/ntp/libntpevent/event2/event-config.h
index 920b7bada25..e636a9fba1d 100644
--- a/usr.sbin/ntp/libntpevent/event2/event-config.h
+++ b/usr.sbin/ntp/libntpevent/event2/event-config.h
@@ -1,5 +1,4 @@
 /* event2/event-config.h
-* $FreeBSD$ 
 *
 * This file was generated by autoconf when libevent was built, and post-
 * processed by Libevent so that its macros would have a uniform prefix.
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_extern.h b/usr.sbin/rpc.ypupdated/ypupdated_extern.h
index 2cacb9511e1..90968df3674 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_extern.h
+++ b/usr.sbin/rpc.ypupdated/ypupdated_extern.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #include <db.h>
diff --git a/usr.sbin/rpcbind/rpcb_stat.c b/usr.sbin/rpcbind/rpcb_stat.c
index 361ae4c7f2b..296fb8206c2 100644
--- a/usr.sbin/rpcbind/rpcb_stat.c
+++ b/usr.sbin/rpcbind/rpcb_stat.c
@@ -1,6 +1,5 @@
 /*
  * $NetBSD: rpcb_stat.c,v 1.2 2000/07/04 20:27:40 matt Exp $
- * $FreeBSD$
  */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
diff --git a/usr.sbin/rpcbind/rpcb_svc_4.c b/usr.sbin/rpcbind/rpcb_svc_4.c
index ac96f3c39f8..49ef3be6dab 100644
--- a/usr.sbin/rpcbind/rpcb_svc_4.c
+++ b/usr.sbin/rpcbind/rpcb_svc_4.c
@@ -1,6 +1,5 @@
 /*
  * $NetBSD: rpcb_svc_4.c,v 1.1 2000/06/02 23:15:41 fvdl Exp $
- * $FreeBSD$
  */
 
 /*-
diff --git a/usr.sbin/rpcbind/util.c b/usr.sbin/rpcbind/util.c
index de792fc9f28..491c3e53b9e 100644
--- a/usr.sbin/rpcbind/util.c
+++ b/usr.sbin/rpcbind/util.c
@@ -1,6 +1,5 @@
 /*
  * $NetBSD: util.c,v 1.4 2000/08/03 00:04:30 fvdl Exp $
- * $FreeBSD$
  */
 
 /*-
diff --git a/usr.sbin/rpcbind/warmstart.c b/usr.sbin/rpcbind/warmstart.c
index 74ad91231e3..0d259085aae 100644
--- a/usr.sbin/rpcbind/warmstart.c
+++ b/usr.sbin/rpcbind/warmstart.c
@@ -36,7 +36,6 @@
 
 /*
  * #ident	"@(#)warmstart.c	1.7	93/07/05 SMI"
- * $FreeBSD$/
  */
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/syslogd/pathnames.h b/usr.sbin/syslogd/pathnames.h
index 7297ba5b95d..78c356fa35b 100644
--- a/usr.sbin/syslogd/pathnames.h
+++ b/usr.sbin/syslogd/pathnames.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
  */
 
 #define	_PATH_KLOG	"/dev/klog"
diff --git a/usr.sbin/ypbind/yp_ping.h b/usr.sbin/ypbind/yp_ping.h
index 80e6a787301..09f88b9442c 100644
--- a/usr.sbin/ypbind/yp_ping.h
+++ b/usr.sbin/ypbind/yp_ping.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 extern int __yp_ping(struct in_addr *, int, char *, short *);