diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S
index 5515213cd15..6e51ebff298 100644
--- a/sys/amd64/amd64/apic_vector.S
+++ b/sys/amd64/amd64/apic_vector.S
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/atpic_vector.S b/sys/amd64/amd64/atpic_vector.S
index c6471999c23..938235e866b 100644
--- a/sys/amd64/amd64/atpic_vector.S
+++ b/sys/amd64/amd64/atpic_vector.S
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h
index a0f886443e5..29bac121222 100644
--- a/sys/amd64/include/asm.h
+++ b/sys/amd64/include/asm.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- * $FreeBSD$
  */
 
 #ifdef __i386__
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index f7732435fc3..530ba746e0b 100644
--- a/sys/amd64/include/cpu.h
+++ b/sys/amd64/include/cpu.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/amd64/include/exec.h b/sys/amd64/include/exec.h
index 099ea263e20..f3a8caa5b88 100644
--- a/sys/amd64/include/exec.h
+++ b/sys/amd64/include/exec.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/amd64/include/floatingpoint.h b/sys/amd64/include/floatingpoint.h
index b7c154743d0..392fb1957fa 100644
--- a/sys/amd64/include/floatingpoint.h
+++ b/sys/amd64/include/floatingpoint.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index 8f957eede39..cb46325d70b 100644
--- a/sys/amd64/include/fpu.h
+++ b/sys/amd64/include/fpu.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/ieeefp.h b/sys/amd64/include/ieeefp.h
index 48d879f0b80..4de2dd8db61 100644
--- a/sys/amd64/include/ieeefp.h
+++ b/sys/amd64/include/ieeefp.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/amd64/include/in_cksum.h b/sys/amd64/include/in_cksum.h
index d9830168f5a..356c7c564f3 100644
--- a/sys/amd64/include/in_cksum.h
+++ b/sys/amd64/include/in_cksum.h
@@ -31,7 +31,6 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/amd64/include/limits.h b/sys/amd64/include/limits.h
index f2a4bf75fe2..c6da8ec92fd 100644
--- a/sys/amd64/include/limits.h
+++ b/sys/amd64/include/limits.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h
index c7e5a5c7fc4..2478ef8d037 100644
--- a/sys/amd64/include/param.h
+++ b/sys/amd64/include/param.h
@@ -38,7 +38,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _AMD64_INCLUDE_PARAM_H_
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index 6ce6d972836..f98e5f68dd9 100644
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/include/pcb.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- * $FreeBSD$
  */
 
 #ifndef _AMD64_PCB_H_
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 08da0ccdfb8..09bfc7aa568 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -41,7 +41,6 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD$
  */
 
 #ifdef __i386__
diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index 8015fe5da81..e9ed7f5182b 100644
--- a/sys/amd64/include/proc.h
+++ b/sys/amd64/include/proc.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- * $FreeBSD$
  */
 
 #ifdef __i386__
diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h
index 31b6379d473..80130911e5d 100644
--- a/sys/amd64/include/profile.h
+++ b/sys/amd64/include/profile.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
  */
 
 #ifdef __i386__
diff --git a/sys/amd64/include/reloc.h b/sys/amd64/include/reloc.h
index ea5ed128ef8..777cafe1d6b 100644
--- a/sys/amd64/include/reloc.h
+++ b/sys/amd64/include/reloc.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h
index 1a04774e986..6cb8b385c22 100644
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/include/segments.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
  */
 
 #ifdef __i386__
diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h
index 12cb3a22e0e..585a4970439 100644
--- a/sys/amd64/include/tss.h
+++ b/sys/amd64/include/tss.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h
index 880c46bba84..0d23ff34e96 100644
--- a/sys/amd64/include/vmparam.h
+++ b/sys/amd64/include/vmparam.h
@@ -40,7 +40,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- * $FreeBSD$
  */
 
 #ifdef __i386__
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_wdog.h b/sys/arm/broadcom/bcm2835/bcm2835_wdog.h
index 00a85333d39..5dba6c0e6e4 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_wdog.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_wdog.h
@@ -25,7 +25,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 #ifndef _BCM2835_WDOG_H_
 #define _BCM2835_WDOG_H_
diff --git a/sys/arm/include/_align.h b/sys/arm/include/_align.h
index a8c6df4304f..28e24994cd4 100644
--- a/sys/arm/include/_align.h
+++ b/sys/arm/include/_align.h
@@ -37,7 +37,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
  */
 
 #ifndef _ARM_INCLUDE__ALIGN_H_
diff --git a/sys/arm/include/_inttypes.h b/sys/arm/include/_inttypes.h
index e3f9b52ed08..ab51edc73ab 100644
--- a/sys/arm/include/_inttypes.h
+++ b/sys/arm/include/_inttypes.h
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/arm/include/_limits.h b/sys/arm/include/_limits.h
index fe816e50f9c..fb42b17a77f 100644
--- a/sys/arm/include/_limits.h
+++ b/sys/arm/include/_limits.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h
index fb52df9dfcd..38b0809da30 100644
--- a/sys/arm/include/_types.h
+++ b/sys/arm/include/_types.h
@@ -35,7 +35,6 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/arm/include/db_machdep.h b/sys/arm/include/db_machdep.h
index d6d5ade51a8..3b0b5f7e1e5 100644
--- a/sys/arm/include/db_machdep.h
+++ b/sys/arm/include/db_machdep.h
@@ -24,7 +24,6 @@
  * the rights to redistribute these changes.
  *
  *	from: FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_DB_MACHDEP_H_
diff --git a/sys/arm/include/endian.h b/sys/arm/include/endian.h
index eb3f0d14232..ffaac94c7d0 100644
--- a/sys/arm/include/endian.h
+++ b/sys/arm/include/endian.h
@@ -29,7 +29,6 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/arm/include/float.h b/sys/arm/include/float.h
index 857d76ea57e..cfb383de761 100644
--- a/sys/arm/include/float.h
+++ b/sys/arm/include/float.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/arm/include/floatingpoint.h b/sys/arm/include/floatingpoint.h
index b1c28e91d79..8b803ed8d6b 100644
--- a/sys/arm/include/floatingpoint.h
+++ b/sys/arm/include/floatingpoint.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/arm/include/in_cksum.h b/sys/arm/include/in_cksum.h
index 343052f4556..262f39777f6 100644
--- a/sys/arm/include/in_cksum.h
+++ b/sys/arm/include/in_cksum.h
@@ -31,7 +31,6 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/arm/include/limits.h b/sys/arm/include/limits.h
index f2a4bf75fe2..c6da8ec92fd 100644
--- a/sys/arm/include/limits.h
+++ b/sys/arm/include/limits.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/arm/include/md_var.h b/sys/arm/include/md_var.h
index b41a2424795..77a9d54d671 100644
--- a/sys/arm/include/md_var.h
+++ b/sys/arm/include/md_var.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_MD_VAR_H_
diff --git a/sys/arm/include/minidump.h b/sys/arm/include/minidump.h
index dcfef9cbbb2..cd9d09feb62 100644
--- a/sys/arm/include/minidump.h
+++ b/sys/arm/include/minidump.h
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * From: FreeBSD: src/sys/i386/include/minidump.h,v 1.1 2006/04/21 04:28:43
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_MINIDUMP_H_
diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
index 807b492324f..3c94ee08d16 100644
--- a/sys/arm/include/param.h
+++ b/sys/arm/include/param.h
@@ -37,7 +37,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
  */
 
 #ifndef _ARM_INCLUDE_PARAM_H_
diff --git a/sys/arm/include/pcpu.h b/sys/arm/include/pcpu.h
index 89f1e1df4e2..764ebdd987f 100644
--- a/sys/arm/include/pcpu.h
+++ b/sys/arm/include/pcpu.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/arm/include/pl310.h b/sys/arm/include/pl310.h
index 63e60667581..003f5b360b0 100644
--- a/sys/arm/include/pl310.h
+++ b/sys/arm/include/pl310.h
@@ -25,7 +25,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef PL310_H_
diff --git a/sys/arm/include/proc.h b/sys/arm/include/proc.h
index 9db28358cc3..ebddbd65892 100644
--- a/sys/arm/include/proc.h
+++ b/sys/arm/include/proc.h
@@ -34,7 +34,6 @@
  *
  *      from: @(#)proc.h        7.1 (Berkeley) 5/15/91
  *	from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_PROC_H_
diff --git a/sys/arm/include/profile.h b/sys/arm/include/profile.h
index cab8f89ddad..df4337decde 100644
--- a/sys/arm/include/profile.h
+++ b/sys/arm/include/profile.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/arm/include/reloc.h b/sys/arm/include/reloc.h
index 68847570322..be37f024799 100644
--- a/sys/arm/include/reloc.h
+++ b/sys/arm/include/reloc.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_RELOC_H_
diff --git a/sys/arm/include/signal.h b/sys/arm/include/signal.h
index 2286bcea2d2..1c283261268 100644
--- a/sys/arm/include/signal.h
+++ b/sys/arm/include/signal.h
@@ -31,7 +31,6 @@
  *      @(#)signal.h    8.1 (Berkeley) 6/11/93
  *	from: FreeBSD: src/sys/i386/include/signal.h,v 1.13 2000/11/09
  *	from: FreeBSD: src/sys/sparc64/include/signal.h,v 1.6 2001/09/30 18:52:17
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
diff --git a/sys/arm/include/vfp.h b/sys/arm/include/vfp.h
index 963fd620263..1a9f8e2c448 100644
--- a/sys/arm/include/vfp.h
+++ b/sys/arm/include/vfp.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 _MACHINE__VFP_H_
diff --git a/sys/arm/ti/omap4/omap4_smc.h b/sys/arm/ti/omap4/omap4_smc.h
index e287882e6f6..fcf68fe4d01 100644
--- a/sys/arm/ti/omap4/omap4_smc.h
+++ b/sys/arm/ti/omap4/omap4_smc.h
@@ -25,7 +25,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef OMAP4_SMC_H_
diff --git a/sys/arm/ti/ti_smc.h b/sys/arm/ti/ti_smc.h
index 83241d0202b..63cf656aaa1 100644
--- a/sys/arm/ti/ti_smc.h
+++ b/sys/arm/ti/ti_smc.h
@@ -25,7 +25,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef TI_SMC_H_
diff --git a/sys/arm64/freescale/imx/imx8mq_ccm.h b/sys/arm64/freescale/imx/imx8mq_ccm.h
index fb36c4b5d35..944ed22918f 100644
--- a/sys/arm64/freescale/imx/imx8mq_ccm.h
+++ b/sys/arm64/freescale/imx/imx8mq_ccm.h
@@ -24,7 +24,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 #ifndef	__IMX8MQ_CCM_H__
diff --git a/sys/arm64/include/_align.h b/sys/arm64/include/_align.h
index 5c153779aca..a457a20fea3 100644
--- a/sys/arm64/include/_align.h
+++ b/sys/arm64/include/_align.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/_inttypes.h b/sys/arm64/include/_inttypes.h
index 4c21d47f6c5..67ae82fbf03 100644
--- a/sys/arm64/include/_inttypes.h
+++ b/sys/arm64/include/_inttypes.h
@@ -27,7 +27,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.4 2008/04/28 20:23:36 martin Exp $
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/_limits.h b/sys/arm64/include/_limits.h
index d64a9afe1a1..39d65d56c48 100644
--- a/sys/arm64/include/_limits.h
+++ b/sys/arm64/include/_limits.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/_types.h b/sys/arm64/include/_types.h
index 69610b96fa3..4f4c6814e62 100644
--- a/sys/arm64/include/_types.h
+++ b/sys/arm64/include/_types.h
@@ -29,7 +29,6 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h
index 6d83ef25793..9ef5b7897a7 100644
--- a/sys/arm64/include/cpu.h
+++ b/sys/arm64/include/cpu.h
@@ -35,7 +35,6 @@
  *
  *	from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
  *	from: FreeBSD: src/sys/i386/include/cpu.h,v 1.62 2001/06/29
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/endian.h b/sys/arm64/include/endian.h
index 0f06010b7e4..82337e3a848 100644
--- a/sys/arm64/include/endian.h
+++ b/sys/arm64/include/endian.h
@@ -27,7 +27,6 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/arm64/include/float.h b/sys/arm64/include/float.h
index 0fe90637fda..978c03d8015 100644
--- a/sys/arm64/include/float.h
+++ b/sys/arm64/include/float.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/ieeefp.h b/sys/arm64/include/ieeefp.h
index 8c7166741c0..7f2ba092c50 100644
--- a/sys/arm64/include/ieeefp.h
+++ b/sys/arm64/include/ieeefp.h
@@ -1,7 +1,6 @@
 /*-
  * Based on sys/sparc64/include/ieeefp.h
  * Public domain.
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/in_cksum.h b/sys/arm64/include/in_cksum.h
index add7569a9f4..6e1329bb564 100644
--- a/sys/arm64/include/in_cksum.h
+++ b/sys/arm64/include/in_cksum.h
@@ -29,7 +29,6 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/arm64/include/md_var.h b/sys/arm64/include/md_var.h
index d6c1b4ca276..e0f707f3d88 100644
--- a/sys/arm64/include/md_var.h
+++ b/sys/arm64/include/md_var.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_MD_VAR_H_
diff --git a/sys/arm64/include/minidump.h b/sys/arm64/include/minidump.h
index c27d2c71bc1..d3640d38107 100644
--- a/sys/arm64/include/minidump.h
+++ b/sys/arm64/include/minidump.h
@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * From i386: FreeBSD:  157909 2006-04-21 04:28:43Z peter
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_MINIDUMP_H_
diff --git a/sys/arm64/include/param.h b/sys/arm64/include/param.h
index 417bd38574e..cf630be21c5 100644
--- a/sys/arm64/include/param.h
+++ b/sys/arm64/include/param.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/pcpu.h b/sys/arm64/include/pcpu.h
index de0383c4cd8..ff2bf4df127 100644
--- a/sys/arm64/include/pcpu.h
+++ b/sys/arm64/include/pcpu.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/proc.h b/sys/arm64/include/proc.h
index 9538c3ea1e4..4c90e82ed2c 100644
--- a/sys/arm64/include/proc.h
+++ b/sys/arm64/include/proc.h
@@ -28,7 +28,6 @@
  *
  *      from: @(#)proc.h        7.1 (Berkeley) 5/15/91
  *	from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/profile.h b/sys/arm64/include/profile.h
index 0f077e4ba6e..3e4a3466936 100644
--- a/sys/arm64/include/profile.h
+++ b/sys/arm64/include/profile.h
@@ -28,7 +28,6 @@
  *
  *	from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp
  *	from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/signal.h b/sys/arm64/include/signal.h
index 2684a89952d..5cd5121b2c8 100644
--- a/sys/arm64/include/signal.h
+++ b/sys/arm64/include/signal.h
@@ -29,7 +29,6 @@
  *      @(#)signal.h    8.1 (Berkeley) 6/11/93
  *	from: FreeBSD: src/sys/i386/include/signal.h,v 1.13 2000/11/09
  *	from: FreeBSD: src/sys/sparc64/include/signal.h,v 1.6 2001/09/30 18:52:17
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/sysarch.h b/sys/arm64/include/sysarch.h
index 22248cf1b86..2bd45d38474 100644
--- a/sys/arm64/include/sysarch.h
+++ b/sys/arm64/include/sysarch.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/sysarch.h,v 1.14 2000/09/21
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h
index 0839e20578a..29fbf622198 100644
--- a/sys/arm64/include/vmparam.h
+++ b/sys/arm64/include/vmparam.h
@@ -33,7 +33,6 @@
  *
  *	from: @(#)vmparam.h     5.9 (Berkeley) 5/12/91
  *	from: FreeBSD: src/sys/i386/include/vmparam.h,v 1.33 2000/03/30
- * $FreeBSD$
  */
 
 #ifdef __arm__
diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h
index 17757917870..9d08e3bb28e 100644
--- a/sys/arm64/linux/linux.h
+++ b/sys/arm64/linux/linux.h
@@ -26,7 +26,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 #ifndef _ARM64_LINUX_H_
 #define	_ARM64_LINUX_H_
diff --git a/sys/cam/ctl/ctl.h b/sys/cam/ctl/ctl.h
index e097ee2d248..1b7d7ad4ec3 100644
--- a/sys/cam/ctl/ctl.h
+++ b/sys/cam/ctl/ctl.h
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl.h#5 $
- * $FreeBSD$
  */
 /*
  * Function definitions used both within CTL and potentially in various CTL
diff --git a/sys/cam/ctl/ctl_backend.h b/sys/cam/ctl/ctl_backend.h
index bfcb6343c2f..6ebf104fb0d 100644
--- a/sys/cam/ctl/ctl_backend.h
+++ b/sys/cam/ctl/ctl_backend.h
@@ -31,7 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_backend.h#2 $
- * $FreeBSD$
  */
 /*
  * CTL backend driver definitions
diff --git a/sys/cam/ctl/ctl_cmd_table.c b/sys/cam/ctl/ctl_cmd_table.c
index 0e4be105fd2..353236b1c1b 100644
--- a/sys/cam/ctl/ctl_cmd_table.c
+++ b/sys/cam/ctl/ctl_cmd_table.c
@@ -31,7 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_cmd_table.c#4 $
- * $FreeBSD$
  */
 /*
  * CAM Target Layer command table.
diff --git a/sys/cam/ctl/ctl_debug.h b/sys/cam/ctl/ctl_debug.h
index 2c1113bcdb8..f390ea1c1e4 100644
--- a/sys/cam/ctl/ctl_debug.h
+++ b/sys/cam/ctl/ctl_debug.h
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_debug.h#2 $
- * $FreeBSD$
  */
 /*
  * CAM Target Layer debugging interface.
diff --git a/sys/cam/ctl/ctl_error.h b/sys/cam/ctl/ctl_error.h
index cec434e2cf0..6628f63db34 100644
--- a/sys/cam/ctl/ctl_error.h
+++ b/sys/cam/ctl/ctl_error.h
@@ -31,7 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_error.h#1 $
- * $FreeBSD$
  */
 /*
  * Function definitions for various error reporting routines used both
diff --git a/sys/cam/ctl/ctl_frontend.h b/sys/cam/ctl/ctl_frontend.h
index c0a929bbaea..f04e0d56488 100644
--- a/sys/cam/ctl/ctl_frontend.h
+++ b/sys/cam/ctl/ctl_frontend.h
@@ -31,7 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_frontend.h#2 $
- * $FreeBSD$
  */
 /*
  * CAM Target Layer front end registration hooks
diff --git a/sys/cam/ctl/ctl_ha.h b/sys/cam/ctl/ctl_ha.h
index ac182d6e0fc..5a6f6502da8 100644
--- a/sys/cam/ctl/ctl_ha.h
+++ b/sys/cam/ctl/ctl_ha.h
@@ -32,7 +32,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_ha.h#1 $
- * $FreeBSD$
  */
 
 #ifndef _CTL_HA_H_
diff --git a/sys/cam/ctl/ctl_io.h b/sys/cam/ctl/ctl_io.h
index 2b6ac8a6bab..add8ed2e3ac 100644
--- a/sys/cam/ctl/ctl_io.h
+++ b/sys/cam/ctl/ctl_io.h
@@ -31,7 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_io.h#5 $
- * $FreeBSD$
  */
 /*
  * CAM Target Layer data movement structures/interface.
diff --git a/sys/cam/ctl/ctl_ioctl.h b/sys/cam/ctl/ctl_ioctl.h
index df66d6d6719..9fef169c300 100644
--- a/sys/cam/ctl/ctl_ioctl.h
+++ b/sys/cam/ctl/ctl_ioctl.h
@@ -32,7 +32,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_ioctl.h#4 $
- * $FreeBSD$
  */
 /*
  * CAM Target Layer ioctl interface.
diff --git a/sys/cam/ctl/ctl_private.h b/sys/cam/ctl/ctl_private.h
index 0129096d20c..9a87345015f 100644
--- a/sys/cam/ctl/ctl_private.h
+++ b/sys/cam/ctl/ctl_private.h
@@ -31,7 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_private.h#7 $
- * $FreeBSD$
  */
 /*
  * CAM Target Layer driver private data structures/definitions.
diff --git a/sys/cam/ctl/ctl_ser_table.c b/sys/cam/ctl/ctl_ser_table.c
index 72b2b09663e..9af16168c35 100644
--- a/sys/cam/ctl/ctl_ser_table.c
+++ b/sys/cam/ctl/ctl_ser_table.c
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_ser_table.c#1 $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/cam/ctl/ctl_util.h b/sys/cam/ctl/ctl_util.h
index 77e18466c5c..9f4e1439dfa 100644
--- a/sys/cam/ctl/ctl_util.h
+++ b/sys/cam/ctl/ctl_util.h
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_util.h#2 $
- * $FreeBSD$
  */
 /*
  * CAM Target Layer SCSI library interface
diff --git a/sys/cam/mmc/mmc_bus.h b/sys/cam/mmc/mmc_bus.h
index db77da51078..8567c47c81e 100644
--- a/sys/cam/mmc/mmc_bus.h
+++ b/sys/cam/mmc/mmc_bus.h
@@ -1,5 +1,4 @@
 /*
  * This file is in the public domain.
- * $FreeBSD$
  */
 #include <dev/mmc/bridge.h>
diff --git a/sys/cam/scsi/scsi_cd.h b/sys/cam/scsi/scsi_cd.h
index 7aad972555a..d6740285943 100644
--- a/sys/cam/scsi/scsi_cd.h
+++ b/sys/cam/scsi/scsi_cd.h
@@ -43,7 +43,6 @@
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
  *	from: scsi_cd.h,v 1.10 1997/02/22 09:44:28 peter Exp $
- * $FreeBSD$
  */
 #ifndef	_SCSI_SCSI_CD_H
 #define _SCSI_SCSI_CD_H 1
diff --git a/sys/cam/scsi/scsi_iu.h b/sys/cam/scsi/scsi_iu.h
index 6b616822914..243be20aa08 100644
--- a/sys/cam/scsi/scsi_iu.h
+++ b/sys/cam/scsi/scsi_iu.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
- * $FreeBSD$
  */
 #ifndef	_SCSI_SCSI_IU_H
 #define _SCSI_SCSI_IU_H 1
diff --git a/sys/cam/scsi/scsi_message.h b/sys/cam/scsi/scsi_message.h
index c6fb7fca4c2..6ecacc96281 100644
--- a/sys/cam/scsi/scsi_message.h
+++ b/sys/cam/scsi/scsi_message.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
- * $FreeBSD$
  */
 
 /* Messages (1 byte) */		     /* I/T (M)andatory or (O)ptional */
diff --git a/sys/cam/scsi/smp_all.h b/sys/cam/scsi/smp_all.h
index fe4b7a0863b..3c310ee864c 100644
--- a/sys/cam/scsi/smp_all.h
+++ b/sys/cam/scsi/smp_all.h
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  *
  * $Id: //depot/users/kenm/FreeBSD-test/sys/cam/scsi/smp_all.h#4 $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c b/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c
index e6b760e6981..e1cc8f80276 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c
@@ -37,7 +37,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/cddl/dev/dtrace/aarch64/regset.h b/sys/cddl/dev/dtrace/aarch64/regset.h
index 492405d4a25..f5b494045da 100644
--- a/sys/cddl/dev/dtrace/aarch64/regset.h
+++ b/sys/cddl/dev/dtrace/aarch64/regset.h
@@ -19,7 +19,6 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$ 
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/cddl/dev/dtrace/arm/regset.h b/sys/cddl/dev/dtrace/arm/regset.h
index ce9e97ea7a0..f2341388123 100644
--- a/sys/cddl/dev/dtrace/arm/regset.h
+++ b/sys/cddl/dev/dtrace/arm/regset.h
@@ -19,7 +19,6 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$ 
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/cddl/dev/dtrace/powerpc/regset.h b/sys/cddl/dev/dtrace/powerpc/regset.h
index 64973885fc9..b414e7e079a 100644
--- a/sys/cddl/dev/dtrace/powerpc/regset.h
+++ b/sys/cddl/dev/dtrace/powerpc/regset.h
@@ -19,7 +19,6 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$ 
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/cddl/dev/dtrace/riscv/regset.h b/sys/cddl/dev/dtrace/riscv/regset.h
index 034781f1123..623e67b937c 100644
--- a/sys/cddl/dev/dtrace/riscv/regset.h
+++ b/sys/cddl/dev/dtrace/riscv/regset.h
@@ -19,7 +19,6 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$ 
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/cddl/dev/dtrace/x86/dis_tables.c b/sys/cddl/dev/dtrace/x86/dis_tables.c
index ad3b453f884..1afadc94afc 100644
--- a/sys/cddl/dev/dtrace/x86/dis_tables.c
+++ b/sys/cddl/dev/dtrace/x86/dis_tables.c
@@ -34,7 +34,6 @@
 /*	  All Rights Reserved	*/
 
 /*
- * $FreeBSD$
  */
 
 #include	"dis_tables.h"
diff --git a/sys/cddl/dev/dtrace/x86/dis_tables.h b/sys/cddl/dev/dtrace/x86/dis_tables.h
index 87b006cf784..fa0aa5e9430 100644
--- a/sys/cddl/dev/dtrace/x86/dis_tables.h
+++ b/sys/cddl/dev/dtrace/x86/dis_tables.h
@@ -27,7 +27,6 @@
 /*	  All Rights Reserved  	*/
 
 /*
- * $FreeBSD$
  */
 
 #ifndef _DIS_TABLES_H
diff --git a/sys/cddl/dev/dtrace/x86/regset.h b/sys/cddl/dev/dtrace/x86/regset.h
index b480e411e6c..d7a19143e9f 100644
--- a/sys/cddl/dev/dtrace/x86/regset.h
+++ b/sys/cddl/dev/dtrace/x86/regset.h
@@ -19,7 +19,6 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$ 
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/compat/linux/linux_persona.h b/sys/compat/linux/linux_persona.h
index 7ae166aeb2c..c3d669c8ea6 100644
--- a/sys/compat/linux/linux_persona.h
+++ b/sys/compat/linux/linux_persona.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #ifndef LINUX_PERSONALITY_H
diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index aceb6e1da79..e651eb39145 100644
--- a/sys/compat/linux/linux_util.h
+++ b/sys/compat/linux/linux_util.h
@@ -30,7 +30,6 @@
  *
  * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
  * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
- * $FreeBSD$
  */
 
 #ifndef	_LINUX_UTIL_H_
diff --git a/sys/compat/linux/linux_videodev2_compat.h b/sys/compat/linux/linux_videodev2_compat.h
index 0d9a3a348b8..d9c3b3d0737 100644
--- a/sys/compat/linux/linux_videodev2_compat.h
+++ b/sys/compat/linux/linux_videodev2_compat.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/linux/linux_videodev_compat.h b/sys/compat/linux/linux_videodev_compat.h
index 98034bcbb04..0d612fb6f97 100644
--- a/sys/compat/linux/linux_videodev_compat.h
+++ b/sys/compat/linux/linux_videodev_compat.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/arcmsr/arcmsr.h b/sys/dev/arcmsr/arcmsr.h
index 16b708cc5f3..285cff3f2a1 100644
--- a/sys/dev/arcmsr/arcmsr.h
+++ b/sys/dev/arcmsr/arcmsr.h
@@ -34,7 +34,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.
 **************************************************************************
-* $FreeBSD$
 */
 #define ARCMSR_SCSI_INITIATOR_ID	255
 #define ARCMSR_DEV_SECTOR_SIZE		512
diff --git a/sys/dev/atkbdc/atkbdc_subr.h b/sys/dev/atkbdc/atkbdc_subr.h
index a9f755e03c2..a9a8d29a7c6 100644
--- a/sys/dev/atkbdc/atkbdc_subr.h
+++ b/sys/dev/atkbdc/atkbdc_subr.h
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/isa/atkbdc_isa.c,v 1.31 2005/05/29 04:42:28 nyan Exp
- * $FreeBSD$
  */
 
 #ifndef _DEV_ATKBDC_ATKBDC_SUBR_H_
diff --git a/sys/dev/atkbdc/psm.h b/sys/dev/atkbdc/psm.h
index e687728f56e..1fa94881ddd 100644
--- a/sys/dev/atkbdc/psm.h
+++ b/sys/dev/atkbdc/psm.h
@@ -21,7 +21,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/isa/psm.c,v 1.84 2005/01/10 13:05:58 philip
- * $FreeBSD$
  */
 
 #ifndef _DEV_ATKBDC_PSM_H_
diff --git a/sys/dev/bhnd/bcma/bcma.h b/sys/dev/bhnd/bcma/bcma.h
index 24d9c9652c1..b64305fe9da 100644
--- a/sys/dev/bhnd/bcma/bcma.h
+++ b/sys/dev/bhnd/bcma/bcma.h
@@ -28,7 +28,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BCMA_BCMA_H_
diff --git a/sys/dev/bhnd/bcma/bcma_dmp.h b/sys/dev/bhnd/bcma/bcma_dmp.h
index 8530b1a1730..5a18ee74535 100644
--- a/sys/dev/bhnd/bcma/bcma_dmp.h
+++ b/sys/dev/bhnd/bcma/bcma_dmp.h
@@ -20,7 +20,6 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
- * $FreeBSD$
  */
 
 #ifndef	_BCMA_BCMA_DMP_H_
diff --git a/sys/dev/bhnd/bcma/bcma_eromreg.h b/sys/dev/bhnd/bcma/bcma_eromreg.h
index e1bde43a0c4..8758b3b0c8a 100644
--- a/sys/dev/bhnd/bcma/bcma_eromreg.h
+++ b/sys/dev/bhnd/bcma/bcma_eromreg.h
@@ -20,7 +20,6 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
- * $FreeBSD$
  */
 
 #ifndef	_BCMA_BCMA_EROM_REG_H_
diff --git a/sys/dev/bhnd/bcma/bcma_eromvar.h b/sys/dev/bhnd/bcma/bcma_eromvar.h
index 5a64ccc93e2..7786d902d51 100644
--- a/sys/dev/bhnd/bcma/bcma_eromvar.h
+++ b/sys/dev/bhnd/bcma/bcma_eromvar.h
@@ -28,7 +28,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef	_BCMA_BCMA_EROMVAR_H_
diff --git a/sys/dev/bhnd/bcma/bcmavar.h b/sys/dev/bhnd/bcma/bcmavar.h
index 4789757186a..1a019b62970 100644
--- a/sys/dev/bhnd/bcma/bcmavar.h
+++ b/sys/dev/bhnd/bcma/bcmavar.h
@@ -32,7 +32,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BCMA_BCMAVAR_H_
diff --git a/sys/dev/bhnd/bhnd.h b/sys/dev/bhnd/bhnd.h
index fb1413abfea..c21cca0f48d 100644
--- a/sys/dev/bhnd/bhnd.h
+++ b/sys/dev/bhnd/bhnd.h
@@ -32,7 +32,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_BHND_H_
diff --git a/sys/dev/bhnd/bhnd_erom.h b/sys/dev/bhnd/bhnd_erom.h
index 96728e740d5..241902b9d7f 100644
--- a/sys/dev/bhnd/bhnd_erom.h
+++ b/sys/dev/bhnd/bhnd_erom.h
@@ -32,7 +32,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_EROM_BHND_EROM_H_
diff --git a/sys/dev/bhnd/bhnd_erom_types.h b/sys/dev/bhnd/bhnd_erom_types.h
index 5f5dd689e96..6dfbda1b3ac 100644
--- a/sys/dev/bhnd/bhnd_erom_types.h
+++ b/sys/dev/bhnd/bhnd_erom_types.h
@@ -28,7 +28,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_EROM_BHND_EROM_TYPES_H_
diff --git a/sys/dev/bhnd/bhnd_eromvar.h b/sys/dev/bhnd/bhnd_eromvar.h
index b7407d52f91..6bf796e75b3 100644
--- a/sys/dev/bhnd/bhnd_eromvar.h
+++ b/sys/dev/bhnd/bhnd_eromvar.h
@@ -29,7 +29,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_EROM_BHND_EROMVAR_H_
diff --git a/sys/dev/bhnd/bhnd_match.h b/sys/dev/bhnd/bhnd_match.h
index 404faac7898..fa6f1aa662c 100644
--- a/sys/dev/bhnd/bhnd_match.h
+++ b/sys/dev/bhnd/bhnd_match.h
@@ -28,7 +28,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_BHND_MATCH_H_
diff --git a/sys/dev/bhnd/bhnd_types.h b/sys/dev/bhnd/bhnd_types.h
index aef63831194..5cfa424d18e 100644
--- a/sys/dev/bhnd/bhnd_types.h
+++ b/sys/dev/bhnd/bhnd_types.h
@@ -32,7 +32,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_BHND_TYPES_H_
diff --git a/sys/dev/bhnd/bhndb/bhndb.h b/sys/dev/bhnd/bhndb/bhndb.h
index cf3432a7710..e86e36b7a64 100644
--- a/sys/dev/bhnd/bhndb/bhndb.h
+++ b/sys/dev/bhnd/bhndb/bhndb.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_BHNDB_H_
diff --git a/sys/dev/bhnd/bhndb/bhndb_hwdata.h b/sys/dev/bhnd/bhndb/bhndb_hwdata.h
index 7e7fb19d9f7..6a20b3ee76a 100644
--- a/sys/dev/bhnd/bhndb/bhndb_hwdata.h
+++ b/sys/dev/bhnd/bhndb/bhndb_hwdata.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_BHNDB_HWDATA_H_
diff --git a/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.h b/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.h
index 874c540156b..edfe3fbcdfd 100644
--- a/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.h
+++ b/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_BHNDB_PCI_HWDATA_H_
diff --git a/sys/dev/bhnd/bhndb/bhndb_pcireg.h b/sys/dev/bhnd/bhndb/bhndb_pcireg.h
index 5b5af3ac85b..2b83f216b92 100644
--- a/sys/dev/bhnd/bhndb/bhndb_pcireg.h
+++ b/sys/dev/bhnd/bhndb/bhndb_pcireg.h
@@ -18,7 +18,6 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_BHNDB_PCIREG_H_
diff --git a/sys/dev/bhnd/bhndb/bhndb_pcivar.h b/sys/dev/bhnd/bhndb/bhndb_pcivar.h
index 315cdd6f1fc..ed749518ed5 100644
--- a/sys/dev/bhnd/bhndb/bhndb_pcivar.h
+++ b/sys/dev/bhnd/bhndb/bhndb_pcivar.h
@@ -30,7 +30,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_BHNDB_PCIVAR_H_
diff --git a/sys/dev/bhnd/bhndb/bhndb_private.h b/sys/dev/bhnd/bhndb/bhndb_private.h
index 269310ade73..851cbe82d3a 100644
--- a/sys/dev/bhnd/bhndb/bhndb_private.h
+++ b/sys/dev/bhnd/bhndb/bhndb_private.h
@@ -33,7 +33,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_BHNDB_PRIVATE_H_
diff --git a/sys/dev/bhnd/bhndb/bhndbvar.h b/sys/dev/bhnd/bhndb/bhndbvar.h
index d56e60e630c..1a0d5422c88 100644
--- a/sys/dev/bhnd/bhndb/bhndbvar.h
+++ b/sys/dev/bhnd/bhndb/bhndbvar.h
@@ -30,7 +30,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_BHNDBVAR_H_
diff --git a/sys/dev/bhnd/bhndvar.h b/sys/dev/bhnd/bhndvar.h
index 1033079512d..133e7b1027c 100644
--- a/sys/dev/bhnd/bhndvar.h
+++ b/sys/dev/bhnd/bhndvar.h
@@ -32,7 +32,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_BHNDVAR_H_
diff --git a/sys/dev/bhnd/cores/chipc/chipc.h b/sys/dev/bhnd/cores/chipc/chipc.h
index 47231e802d7..70c6969d8f5 100644
--- a/sys/dev/bhnd/cores/chipc/chipc.h
+++ b/sys/dev/bhnd/cores/chipc/chipc.h
@@ -28,7 +28,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_CHIPC_CHIPC_H_
diff --git a/sys/dev/bhnd/cores/chipc/chipc_gpiovar.h b/sys/dev/bhnd/cores/chipc/chipc_gpiovar.h
index 57310c0ead4..a0fc2b9ce99 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_gpiovar.h
+++ b/sys/dev/bhnd/cores/chipc/chipc_gpiovar.h
@@ -27,7 +27,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_CHIPC_CHIPC_GPIOVAR_H_
diff --git a/sys/dev/bhnd/cores/chipc/chipc_private.h b/sys/dev/bhnd/cores/chipc/chipc_private.h
index da0010d3280..f94f3a25677 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_private.h
+++ b/sys/dev/bhnd/cores/chipc/chipc_private.h
@@ -32,7 +32,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_CHIPC_CHIPC_PRIVATE_H_
diff --git a/sys/dev/bhnd/cores/chipc/chipc_spi.h b/sys/dev/bhnd/cores/chipc/chipc_spi.h
index 11afa67836b..0f506f4b942 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_spi.h
+++ b/sys/dev/bhnd/cores/chipc/chipc_spi.h
@@ -30,7 +30,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_CHIPC_CHIPC_SPI_H_
diff --git a/sys/dev/bhnd/cores/chipc/chipcvar.h b/sys/dev/bhnd/cores/chipc/chipcvar.h
index 3e3f88b36fe..babce575f90 100644
--- a/sys/dev/bhnd/cores/chipc/chipcvar.h
+++ b/sys/dev/bhnd/cores/chipc/chipcvar.h
@@ -32,7 +32,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_CHIPC_CHIPCVAR_H_
diff --git a/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_private.h b/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_private.h
index 8bf04e7ed65..bd50d6f5c70 100644
--- a/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_private.h
+++ b/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_private.h
@@ -30,7 +30,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_PWRCTL_BHND_PWRCTL_PRIVATE_H_
diff --git a/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctlvar.h b/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctlvar.h
index 8d3c93ae22a..b37d16f430f 100644
--- a/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctlvar.h
+++ b/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctlvar.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_PWRCTL_BHND_PWRCTLVAR_H_
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h b/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h
index 387a4dab7e0..87ed7030cbb 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h
+++ b/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h
@@ -28,7 +28,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_PCI_BHND_PCI_HOSTBVAR_H_
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pcibvar.h b/sys/dev/bhnd/cores/pci/bhnd_pcibvar.h
index 79cd2246a82..06e5af8a042 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pcibvar.h
+++ b/sys/dev/bhnd/cores/pci/bhnd_pcibvar.h
@@ -28,7 +28,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_PCI_BHND_PCIBVAR_H_
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pcivar.h b/sys/dev/bhnd/cores/pci/bhnd_pcivar.h
index ccacd17649f..14026d1b8b4 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pcivar.h
+++ b/sys/dev/bhnd/cores/pci/bhnd_pcivar.h
@@ -28,7 +28,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_PCI_BHND_PCIVAR_H_
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h
index 7ce0d73ac63..6700e741008 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h
@@ -28,7 +28,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_PCIE2_BHND_PCI_HOSTBVAR_H_
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h
index 55f8a387103..6930b29cc85 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h
@@ -28,7 +28,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_PCIE2_BHND_PCIE2_VAR_H_
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h
index ef3109e6d4d..5f1aa8eec5f 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h
@@ -28,7 +28,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_PCIE2_BHND_PCIE2BVAR_H_
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu.h b/sys/dev/bhnd/cores/pmu/bhnd_pmu.h
index 2523c0ab51f..ef1cb169d70 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmu.h
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu.h
@@ -32,7 +32,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_PMU_BHND_PMU_H_
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h b/sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h
index ac4079c2758..93fc4cf4b68 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h
@@ -21,7 +21,6 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_PMU_BHND_PMU_PRIVATE_H_
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h b/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h
index dcb9527f666..665d513aa60 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h
@@ -28,7 +28,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_CORES_PMU_BHND_PMUVAR_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram.h b/sys/dev/bhnd/nvram/bhnd_nvram.h
index 5bc0655a0a4..52c66db150d 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_data.h b/sys/dev/bhnd/nvram/bhnd_nvram_data.h
index 5176634caa4..c35062a56fd 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_data.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_data.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_DATA_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_data_spromvar.h b/sys/dev/bhnd/nvram/bhnd_nvram_data_spromvar.h
index d168c0faec1..1f40501c934 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_data_spromvar.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_data_spromvar.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_SPROMVAR_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_data_tlvreg.h b/sys/dev/bhnd/nvram/bhnd_nvram_data_tlvreg.h
index 0daa745aa56..49e1fd52ceb 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_data_tlvreg.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_data_tlvreg.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_TLVREG_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_datavar.h b/sys/dev/bhnd/nvram/bhnd_nvram_datavar.h
index 42f767d6ad3..00e8ee9b54d 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_datavar.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_datavar.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_DATAVAR_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_io.h b/sys/dev/bhnd/nvram/bhnd_nvram_io.h
index cf86ca8ff02..6f8e3744c39 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_io.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_io.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_IO_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_iovar.h b/sys/dev/bhnd/nvram/bhnd_nvram_iovar.h
index 137f505dddb..84cf9b3c425 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_iovar.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_iovar.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_IOVAR_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_plist.h b/sys/dev/bhnd/nvram/bhnd_nvram_plist.h
index e49402a36a0..a5d094949ab 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_plist.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_plist.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_PLIST_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_plistvar.h b/sys/dev/bhnd/nvram/bhnd_nvram_plistvar.h
index b9a0af1af12..e1f614b7b33 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_plistvar.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_plistvar.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_PLISTVAR_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_private.h b/sys/dev/bhnd/nvram/bhnd_nvram_private.h
index 5034a629b4c..8513039c2c7 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_private.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_private.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_PRIVATE_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_store.h b/sys/dev/bhnd/nvram/bhnd_nvram_store.h
index c557d2fabc2..ae06f6a0120 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_store.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_store.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_STORE_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_storevar.h b/sys/dev/bhnd/nvram/bhnd_nvram_storevar.h
index 31894b4ec73..dc2994e8101 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_storevar.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_storevar.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_STOREVAR_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_value.h b/sys/dev/bhnd/nvram/bhnd_nvram_value.h
index 3720f0468db..3e7e94d9c81 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_value.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_value.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_VALUE_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_valuevar.h b/sys/dev/bhnd/nvram/bhnd_nvram_valuevar.h
index c73602232aa..5935e965aaf 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_valuevar.h
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_valuevar.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_NVRAM_VALUEVAR_H_
diff --git a/sys/dev/bhnd/nvram/bhnd_spromvar.h b/sys/dev/bhnd/nvram/bhnd_spromvar.h
index f3a9bc3c4dc..d4f2db49409 100644
--- a/sys/dev/bhnd/nvram/bhnd_spromvar.h
+++ b/sys/dev/bhnd/nvram/bhnd_spromvar.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_NVRAM_BHND_SPROMVAR_H_
diff --git a/sys/dev/bhnd/siba/siba.h b/sys/dev/bhnd/siba/siba.h
index 1ac0e0fc177..605fae64232 100644
--- a/sys/dev/bhnd/siba/siba.h
+++ b/sys/dev/bhnd/siba/siba.h
@@ -26,7 +26,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _SIBA_SIBA_H_
diff --git a/sys/dev/bhnd/siba/siba_eromvar.h b/sys/dev/bhnd/siba/siba_eromvar.h
index 9ae6a4b4cb0..5436f607c30 100644
--- a/sys/dev/bhnd/siba/siba_eromvar.h
+++ b/sys/dev/bhnd/siba/siba_eromvar.h
@@ -25,7 +25,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 #ifndef	_SIBA_SIBA_EROMVAR_H_
diff --git a/sys/dev/bhnd/siba/sibareg.h b/sys/dev/bhnd/siba/sibareg.h
index 6d8e23e0fb9..bec1fa7b5e7 100644
--- a/sys/dev/bhnd/siba/sibareg.h
+++ b/sys/dev/bhnd/siba/sibareg.h
@@ -18,7 +18,6 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
- * $FreeBSD$
  */
 
 #ifndef _BHND_SIBA_SIBAREG_
diff --git a/sys/dev/bhnd/siba/sibavar.h b/sys/dev/bhnd/siba/sibavar.h
index 88aef2bd103..7fc1bcf228d 100644
--- a/sys/dev/bhnd/siba/sibavar.h
+++ b/sys/dev/bhnd/siba/sibavar.h
@@ -30,7 +30,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #ifndef _SIBA_SIBAVAR_H_
diff --git a/sys/dev/bwi/bitops.h b/sys/dev/bwi/bitops.h
index af4f3ea0c3f..9a5964a847d 100644
--- a/sys/dev/bwi/bitops.h
+++ b/sys/dev/bwi/bitops.h
@@ -31,7 +31,6 @@
  * OF SUCH DAMAGE.
  *
  * $DragonFly: src/sys/dev/netif/bwi/bitops.h,v 1.1 2007/09/08 06:15:54 sephe Exp $
- * $FreeBSD$
  */
 
 #ifndef _BITOPS_H
diff --git a/sys/dev/bwi/bwimac.h b/sys/dev/bwi/bwimac.h
index 3572114fbc8..de1d70dfd6e 100644
--- a/sys/dev/bwi/bwimac.h
+++ b/sys/dev/bwi/bwimac.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  * 
  * $DragonFly: src/sys/dev/netif/bwi/bwimac.h,v 1.2 2008/02/15 11:15:38 sephe Exp $
- * $FreeBSD$
  */
 
 #ifndef _BWI_MAC_H
diff --git a/sys/dev/bwi/bwiphy.h b/sys/dev/bwi/bwiphy.h
index e3fb8252f1c..b21f009b40e 100644
--- a/sys/dev/bwi/bwiphy.h
+++ b/sys/dev/bwi/bwiphy.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  * 
  * $DragonFly: src/sys/dev/netif/bwi/bwiphy.h,v 1.1 2007/09/08 06:15:54 sephe Exp $
- * $FreeBSD$
  */
 
 #ifndef _BWI_PHY_H
diff --git a/sys/dev/bwi/bwirf.h b/sys/dev/bwi/bwirf.h
index d381563d48b..31424ceb027 100644
--- a/sys/dev/bwi/bwirf.h
+++ b/sys/dev/bwi/bwirf.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  * 
  * $DragonFly: src/sys/dev/netif/bwi/bwirf.h,v 1.3 2007/10/03 04:53:19 sephe Exp $
- * $FreeBSD$
  */
 
 #ifndef _BWI_RF_H
diff --git a/sys/dev/bwi/if_bwireg.h b/sys/dev/bwi/if_bwireg.h
index d1d37c49163..a12f9c3503d 100644
--- a/sys/dev/bwi/if_bwireg.h
+++ b/sys/dev/bwi/if_bwireg.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  * 
  * $DragonFly: src/sys/dev/netif/bwi/if_bwireg.h,v 1.4 2007/10/19 14:27:04 sephe Exp $
- * $FreeBSD$
  */
 
 #ifndef _IF_BWIREG_H
diff --git a/sys/dev/bwi/if_bwivar.h b/sys/dev/bwi/if_bwivar.h
index 9961cfca919..fb0b229d059 100644
--- a/sys/dev/bwi/if_bwivar.h
+++ b/sys/dev/bwi/if_bwivar.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  * 
  * $DragonFly: src/sys/dev/netif/bwi/if_bwivar.h,v 1.14 2008/02/15 11:15:38 sephe Exp $
- * $FreeBSD$
  */
 
 #ifndef _IF_BWIVAR_H
diff --git a/sys/dev/bwn/if_bwn_pcivar.h b/sys/dev/bwn/if_bwn_pcivar.h
index 6f9c2fb9af9..cbb64c0ff52 100644
--- a/sys/dev/bwn/if_bwn_pcivar.h
+++ b/sys/dev/bwn/if_bwn_pcivar.h
@@ -25,7 +25,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 #ifndef _IF_BWN_PCIVAR_H_
diff --git a/sys/dev/cxgb/cxgb_include.h b/sys/dev/cxgb/cxgb_include.h
index d98ef5771ba..cf7fcf96ae3 100644
--- a/sys/dev/cxgb/cxgb_include.h
+++ b/sys/dev/cxgb/cxgb_include.h
@@ -1,5 +1,4 @@
 /*
- *  $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/dev/dcons/dcons.c b/sys/dev/dcons/dcons.c
index 07dda294062..aaacebb53ee 100644
--- a/sys/dev/dcons/dcons.c
+++ b/sys/dev/dcons/dcons.c
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  * 
  * $Id: dcons.c,v 1.65 2003/10/24 03:24:55 simokawa Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dcons/dcons.h b/sys/dev/dcons/dcons.h
index c7ade863b6e..f1d34eb33f6 100644
--- a/sys/dev/dcons/dcons.h
+++ b/sys/dev/dcons/dcons.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  * 
  * $Id: dcons.h,v 1.15 2003/10/23 15:05:31 simokawa Exp $
- * $FreeBSD$
  */
 
 #if defined(_KERNEL) || defined(_BOOT)
diff --git a/sys/dev/dcons/dcons_crom.c b/sys/dev/dcons/dcons_crom.c
index 63732cf8040..d31a69adf03 100644
--- a/sys/dev/dcons/dcons_crom.c
+++ b/sys/dev/dcons/dcons_crom.c
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  * 
  * $Id: dcons_crom.c,v 1.8 2003/10/23 15:47:21 simokawa Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/dcons/dcons_os.h b/sys/dev/dcons/dcons_os.h
index b8fc3afc39e..41fcd510752 100644
--- a/sys/dev/dcons/dcons_os.h
+++ b/sys/dev/dcons/dcons_os.h
@@ -33,7 +33,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 #include <sys/_eventhandler.h>
diff --git a/sys/dev/drm2/drm_pciids.h b/sys/dev/drm2/drm_pciids.h
index d861ac87284..1aec82c7eef 100644
--- a/sys/dev/drm2/drm_pciids.h
+++ b/sys/dev/drm2/drm_pciids.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/et/if_etreg.h b/sys/dev/et/if_etreg.h
index 04e103d5d7f..c99a9fa89d9 100644
--- a/sys/dev/et/if_etreg.h
+++ b/sys/dev/et/if_etreg.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  * $DragonFly: src/sys/dev/netif/et/if_etreg.h,v 1.3 2007/10/23 14:28:42 sephe Exp $
- * $FreeBSD$
  */
 
 #ifndef _IF_ETREG_H
diff --git a/sys/dev/et/if_etvar.h b/sys/dev/et/if_etvar.h
index 485654259c1..0465efa47d5 100644
--- a/sys/dev/et/if_etvar.h
+++ b/sys/dev/et/if_etvar.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  * $DragonFly: src/sys/dev/netif/et/if_etvar.h,v 1.4 2007/10/23 14:28:42 sephe Exp $
- * $FreeBSD$
  */
 
 #ifndef _IF_ETVAR_H
diff --git a/sys/dev/etherswitch/etherswitch.h b/sys/dev/etherswitch/etherswitch.h
index 00a44fa6724..9eec1ea781f 100644
--- a/sys/dev/etherswitch/etherswitch.h
+++ b/sys/dev/etherswitch/etherswitch.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #ifndef __SYS_DEV_ETHERSWITCH_ETHERSWITCH_H
diff --git a/sys/dev/firewire/fwmem.h b/sys/dev/firewire/fwmem.h
index f79dec68ecc..2bbc0c80615 100644
--- a/sys/dev/firewire/fwmem.h
+++ b/sys/dev/firewire/fwmem.h
@@ -33,7 +33,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 struct fw_xfer *fwmem_read_quad(struct fw_device *, caddr_t, uint8_t,
diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h
index 9d462699898..8dd1602f257 100644
--- a/sys/dev/firewire/fwohcireg.h
+++ b/sys/dev/firewire/fwohcireg.h
@@ -33,7 +33,6 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
  *
  */
 #define		PCI_CBMEM		PCIR_BAR(0)
diff --git a/sys/dev/firewire/fwohcivar.h b/sys/dev/firewire/fwohcivar.h
index 84de76aa775..754d61bb351 100644
--- a/sys/dev/firewire/fwohcivar.h
+++ b/sys/dev/firewire/fwohcivar.h
@@ -33,7 +33,6 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/firewire/fwphyreg.h b/sys/dev/firewire/fwphyreg.h
index 6b9c11e8cc6..678db8fdb9b 100644
--- a/sys/dev/firewire/fwphyreg.h
+++ b/sys/dev/firewire/fwphyreg.h
@@ -33,7 +33,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/firewire/iec13213.h b/sys/dev/firewire/iec13213.h
index 6351c5bfc3b..0f6ac5b3522 100644
--- a/sys/dev/firewire/iec13213.h
+++ b/sys/dev/firewire/iec13213.h
@@ -33,7 +33,6 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/firewire/iec68113.h b/sys/dev/firewire/iec68113.h
index 1ecf31cd82f..b4a30a30bdb 100644
--- a/sys/dev/firewire/iec68113.h
+++ b/sys/dev/firewire/iec68113.h
@@ -33,7 +33,6 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/firewire/if_fwevar.h b/sys/dev/firewire/if_fwevar.h
index ff83e8024b3..6728de593cc 100644
--- a/sys/dev/firewire/if_fwevar.h
+++ b/sys/dev/firewire/if_fwevar.h
@@ -33,7 +33,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 #ifndef _NET_IF_FWEVAR_H_
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index 306b7d053ec..5237c555d99 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -35,7 +35,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
diff --git a/sys/dev/firewire/if_fwipvar.h b/sys/dev/firewire/if_fwipvar.h
index c0c8b18a0ff..2adb877d8c3 100644
--- a/sys/dev/firewire/if_fwipvar.h
+++ b/sys/dev/firewire/if_fwipvar.h
@@ -35,7 +35,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 #ifndef _NET_IF_FWIPVAR_H_
diff --git a/sys/dev/firewire/sbp.h b/sys/dev/firewire/sbp.h
index f5072355676..ed275253c1a 100644
--- a/sys/dev/firewire/sbp.h
+++ b/sys/dev/firewire/sbp.h
@@ -33,7 +33,6 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/fxp/rcvbundl.h b/sys/dev/fxp/rcvbundl.h
index e49889f0127..c992e6240d5 100644
--- a/sys/dev/fxp/rcvbundl.h
+++ b/sys/dev/fxp/rcvbundl.h
@@ -31,7 +31,6 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 */
 /*
- * $FreeBSD$
  */
 /*
 rcvbundl.h
diff --git a/sys/dev/hptnr/array.h b/sys/dev/hptnr/array.h
index a66b9489833..2f4c818c2b6 100644
--- a/sys/dev/hptnr/array.h
+++ b/sys/dev/hptnr/array.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 #include <dev/hptnr/hptnr_config.h>
 #ifndef _HPT_ARRAY_H_
diff --git a/sys/dev/ic/i8253reg.h b/sys/dev/ic/i8253reg.h
index 87738906c7e..0ce86363f55 100644
--- a/sys/dev/ic/i8253reg.h
+++ b/sys/dev/ic/i8253reg.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ic/nec765.h b/sys/dev/ic/nec765.h
index e6b4887d512..bbc415d35fb 100644
--- a/sys/dev/ic/nec765.h
+++ b/sys/dev/ic/nec765.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ic/ns16550.h b/sys/dev/ic/ns16550.h
index 8206a8cd95f..76a680a410b 100644
--- a/sys/dev/ic/ns16550.h
+++ b/sys/dev/ic/ns16550.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ida/idaio.h b/sys/dev/ida/idaio.h
index b30f2eae1ac..50034527844 100644
--- a/sys/dev/ida/idaio.h
+++ b/sys/dev/ida/idaio.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #include <sys/ioccom.h>
diff --git a/sys/dev/iwm/if_iwm_config.h b/sys/dev/iwm/if_iwm_config.h
index fabcfaa7518..5d869cffe43 100644
--- a/sys/dev/iwm/if_iwm_config.h
+++ b/sys/dev/iwm/if_iwm_config.h
@@ -68,7 +68,6 @@
  *****************************************************************************/
 
 /*
- * $FreeBSD$
  */
 
 #ifndef __IWM_CONFIG_H__
diff --git a/sys/dev/iwm/if_iwm_fw.h b/sys/dev/iwm/if_iwm_fw.h
index 66b3d840a50..01a104ed4ff 100644
--- a/sys/dev/iwm/if_iwm_fw.h
+++ b/sys/dev/iwm/if_iwm_fw.h
@@ -71,7 +71,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $FreeBSD$
  */
 #ifndef	__IF_IWM_FW_H__
 #define	__IF_IWM_FW_H__
diff --git a/sys/dev/kbdmux/kbdmux.c b/sys/dev/kbdmux/kbdmux.c
index 97ea7ba14a6..6f4334cb5eb 100644
--- a/sys/dev/kbdmux/kbdmux.c
+++ b/sys/dev/kbdmux/kbdmux.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: kbdmux.c,v 1.4 2005/07/14 17:38:35 max Exp $
- * $FreeBSD$
  */
 
 #include "opt_evdev.h"
diff --git a/sys/dev/mii/truephy.c b/sys/dev/mii/truephy.c
index db7f17b80bb..dc7526c6a4e 100644
--- a/sys/dev/mii/truephy.c
+++ b/sys/dev/mii/truephy.c
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  * 
  * $DragonFly: src/sys/dev/netif/mii_layer/truephy.c,v 1.3 2008/02/10 07:29:27 sephe Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/mii/truephyreg.h b/sys/dev/mii/truephyreg.h
index d2ba617ae22..6b7d03b51d1 100644
--- a/sys/dev/mii/truephyreg.h
+++ b/sys/dev/mii/truephyreg.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  * 
  * $DragonFly: src/sys/dev/netif/mii_layer/truephyreg.h,v 1.2 2007/10/23 14:28:42 sephe Exp $
- * $FreeBSD$
  */
 
 #ifndef _MII_TRUEPHYREG_H
diff --git a/sys/dev/netmap/if_re_netmap.h b/sys/dev/netmap/if_re_netmap.h
index 236cd904ff5..3298f253403 100644
--- a/sys/dev/netmap/if_re_netmap.h
+++ b/sys/dev/netmap/if_re_netmap.h
@@ -26,7 +26,6 @@
  */
 
 /*
- * $FreeBSD$
  *
  * netmap support for: re
  *
diff --git a/sys/dev/netmap/if_vtnet_netmap.h b/sys/dev/netmap/if_vtnet_netmap.h
index fc18976ee02..e4951552272 100644
--- a/sys/dev/netmap/if_vtnet_netmap.h
+++ b/sys/dev/netmap/if_vtnet_netmap.h
@@ -24,7 +24,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #include <net/netmap.h>
diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c
index 60f3d3c051c..832d0ecc0c6 100644
--- a/sys/dev/netmap/netmap.c
+++ b/sys/dev/netmap/netmap.c
@@ -31,7 +31,6 @@
 
 
 /*
- * $FreeBSD$
  *
  * This module supports memory mapped access to network devices,
  * see netmap(4).
diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h
index 9251d786d19..24f741084a8 100644
--- a/sys/dev/netmap/netmap_kern.h
+++ b/sys/dev/netmap/netmap_kern.h
@@ -28,7 +28,6 @@
  */
 
 /*
- * $FreeBSD$
  *
  * The header contains the definitions of constants and function
  * prototypes used only in kernelspace.
diff --git a/sys/dev/netmap/netmap_mbq.c b/sys/dev/netmap/netmap_mbq.c
index 0c8ed17c704..6b84d9eaf67 100644
--- a/sys/dev/netmap/netmap_mbq.c
+++ b/sys/dev/netmap/netmap_mbq.c
@@ -27,7 +27,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 
diff --git a/sys/dev/netmap/netmap_mbq.h b/sys/dev/netmap/netmap_mbq.h
index 2db14cc1038..af33cf30db0 100644
--- a/sys/dev/netmap/netmap_mbq.h
+++ b/sys/dev/netmap/netmap_mbq.h
@@ -27,7 +27,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 
diff --git a/sys/dev/netmap/netmap_mem2.h b/sys/dev/netmap/netmap_mem2.h
index 53e7f2b0c44..1681d5c7721 100644
--- a/sys/dev/netmap/netmap_mem2.h
+++ b/sys/dev/netmap/netmap_mem2.h
@@ -29,7 +29,6 @@
  */
 
 /*
- * $FreeBSD$
  *
  * (New) memory allocator for netmap
  */
diff --git a/sys/dev/netmap/netmap_monitor.c b/sys/dev/netmap/netmap_monitor.c
index a8bd2d17be3..88c71421567 100644
--- a/sys/dev/netmap/netmap_monitor.c
+++ b/sys/dev/netmap/netmap_monitor.c
@@ -25,7 +25,6 @@
  */
 
 /*
- * $FreeBSD$
  *
  * Monitors
  *
diff --git a/sys/dev/pms/RefTisa/discovery/api/dm.h b/sys/dev/pms/RefTisa/discovery/api/dm.h
index 18721fda5e1..3974b8391e6 100644
--- a/sys/dev/pms/RefTisa/discovery/api/dm.h
+++ b/sys/dev/pms/RefTisa/discovery/api/dm.h
@@ -19,7 +19,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/sys/dev/pms/RefTisa/discovery/api/dmapi.h b/sys/dev/pms/RefTisa/discovery/api/dmapi.h
index 5e569b8ada4..d6ddcc1a08d 100644
--- a/sys/dev/pms/RefTisa/discovery/api/dmapi.h
+++ b/sys/dev/pms/RefTisa/discovery/api/dmapi.h
@@ -19,7 +19,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/sys/dev/pms/RefTisa/discovery/api/tddmapi.h b/sys/dev/pms/RefTisa/discovery/api/tddmapi.h
index 38ae4d081aa..f116a22bdd4 100644
--- a/sys/dev/pms/RefTisa/discovery/api/tddmapi.h
+++ b/sys/dev/pms/RefTisa/discovery/api/tddmapi.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/discovery/dm/dmdefs.h b/sys/dev/pms/RefTisa/discovery/dm/dmdefs.h
index c6032d0b5ec..9222f972ba8 100644
--- a/sys/dev/pms/RefTisa/discovery/dm/dmdefs.h
+++ b/sys/dev/pms/RefTisa/discovery/dm/dmdefs.h
@@ -19,7 +19,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 __DMDEFS_H__
diff --git a/sys/dev/pms/RefTisa/discovery/dm/dmlist.h b/sys/dev/pms/RefTisa/discovery/dm/dmlist.h
index ffeaa6e78e3..74abf9b963d 100644
--- a/sys/dev/pms/RefTisa/discovery/dm/dmlist.h
+++ b/sys/dev/pms/RefTisa/discovery/dm/dmlist.h
@@ -19,7 +19,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/sys/dev/pms/RefTisa/discovery/dm/dmproto.h b/sys/dev/pms/RefTisa/discovery/dm/dmproto.h
index 7f4252f63db..8de404f7350 100644
--- a/sys/dev/pms/RefTisa/discovery/dm/dmproto.h
+++ b/sys/dev/pms/RefTisa/discovery/dm/dmproto.h
@@ -19,7 +19,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 __DMPROTO_H__
diff --git a/sys/dev/pms/RefTisa/discovery/dm/dmtypes.h b/sys/dev/pms/RefTisa/discovery/dm/dmtypes.h
index 3bcd8f9faa5..aba4f371c52 100644
--- a/sys/dev/pms/RefTisa/discovery/dm/dmtypes.h
+++ b/sys/dev/pms/RefTisa/discovery/dm/dmtypes.h
@@ -18,7 +18,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 __DMTYPES_H__
diff --git a/sys/dev/pms/RefTisa/sallsdk/api/sa.h b/sys/dev/pms/RefTisa/sallsdk/api/sa.h
index e702dd4fb23..aac94f8af47 100644
--- a/sys/dev/pms/RefTisa/sallsdk/api/sa.h
+++ b/sys/dev/pms/RefTisa/sallsdk/api/sa.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/api/sa_err.h b/sys/dev/pms/RefTisa/sallsdk/api/sa_err.h
index 096b0216037..9f45a98153b 100644
--- a/sys/dev/pms/RefTisa/sallsdk/api/sa_err.h
+++ b/sys/dev/pms/RefTisa/sallsdk/api/sa_err.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/api/sa_spec.h b/sys/dev/pms/RefTisa/sallsdk/api/sa_spec.h
index 39a14b956d2..2526bb7bb77 100644
--- a/sys/dev/pms/RefTisa/sallsdk/api/sa_spec.h
+++ b/sys/dev/pms/RefTisa/sallsdk/api/sa_spec.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/api/saapi.h b/sys/dev/pms/RefTisa/sallsdk/api/saapi.h
index 9a4d8e09ad0..3e4e9c04268 100644
--- a/sys/dev/pms/RefTisa/sallsdk/api/saapi.h
+++ b/sys/dev/pms/RefTisa/sallsdk/api/saapi.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/api/saosapi.h b/sys/dev/pms/RefTisa/sallsdk/api/saosapi.h
index 02f874af75b..d90d6ea3377 100644
--- a/sys/dev/pms/RefTisa/sallsdk/api/saosapi.h
+++ b/sys/dev/pms/RefTisa/sallsdk/api/saosapi.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/hda/64k/aap18008.h b/sys/dev/pms/RefTisa/sallsdk/hda/64k/aap18008.h
index f3a6f512277..daeb0fa1ca9 100644
--- a/sys/dev/pms/RefTisa/sallsdk/hda/64k/aap18008.h
+++ b/sys/dev/pms/RefTisa/sallsdk/hda/64k/aap18008.h
@@ -16,7 +16,6 @@
 *WHETHER IN CONTRACT, STRICT 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/sys/dev/pms/RefTisa/sallsdk/hda/64k/aap1img.h b/sys/dev/pms/RefTisa/sallsdk/hda/64k/aap1img.h
index 63b2a060a0e..b4bdab46992 100644
--- a/sys/dev/pms/RefTisa/sallsdk/hda/64k/aap1img.h
+++ b/sys/dev/pms/RefTisa/sallsdk/hda/64k/aap1img.h
@@ -16,7 +16,6 @@
 *WHETHER IN CONTRACT, STRICT 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/sys/dev/pms/RefTisa/sallsdk/hda/64k/ila8008.h b/sys/dev/pms/RefTisa/sallsdk/hda/64k/ila8008.h
index e9e02b75dab..6c5f6c32bb9 100644
--- a/sys/dev/pms/RefTisa/sallsdk/hda/64k/ila8008.h
+++ b/sys/dev/pms/RefTisa/sallsdk/hda/64k/ila8008.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/hda/64k/ila8070.h b/sys/dev/pms/RefTisa/sallsdk/hda/64k/ila8070.h
index 5e64e580693..4ef6eb39b60 100644
--- a/sys/dev/pms/RefTisa/sallsdk/hda/64k/ila8070.h
+++ b/sys/dev/pms/RefTisa/sallsdk/hda/64k/ila8070.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/hda/64k/ilaimg.h b/sys/dev/pms/RefTisa/sallsdk/hda/64k/ilaimg.h
index 74c88d9e95f..d3a140592e4 100644
--- a/sys/dev/pms/RefTisa/sallsdk/hda/64k/ilaimg.h
+++ b/sys/dev/pms/RefTisa/sallsdk/hda/64k/ilaimg.h
@@ -19,7 +19,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/sys/dev/pms/RefTisa/sallsdk/hda/64k/iop8008.h b/sys/dev/pms/RefTisa/sallsdk/hda/64k/iop8008.h
index 56282f1ae15..9adde219b2d 100644
--- a/sys/dev/pms/RefTisa/sallsdk/hda/64k/iop8008.h
+++ b/sys/dev/pms/RefTisa/sallsdk/hda/64k/iop8008.h
@@ -19,7 +19,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/sys/dev/pms/RefTisa/sallsdk/hda/64k/iop8070.h b/sys/dev/pms/RefTisa/sallsdk/hda/64k/iop8070.h
index 0675f25cc1a..a97a41e4360 100644
--- a/sys/dev/pms/RefTisa/sallsdk/hda/64k/iop8070.h
+++ b/sys/dev/pms/RefTisa/sallsdk/hda/64k/iop8070.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/hda/64k/iopimg.h b/sys/dev/pms/RefTisa/sallsdk/hda/64k/iopimg.h
index 21150bc66a0..34de22b8a04 100644
--- a/sys/dev/pms/RefTisa/sallsdk/hda/64k/iopimg.h
+++ b/sys/dev/pms/RefTisa/sallsdk/hda/64k/iopimg.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/hda/64k/istrimg.h b/sys/dev/pms/RefTisa/sallsdk/hda/64k/istrimg.h
index 2f46133f739..d4d557a4c31 100644
--- a/sys/dev/pms/RefTisa/sallsdk/hda/64k/istrimg.h
+++ b/sys/dev/pms/RefTisa/sallsdk/hda/64k/istrimg.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/hda/64k/raae8070.h b/sys/dev/pms/RefTisa/sallsdk/hda/64k/raae8070.h
index 5f3eb61ee6e..01970f240bf 100644
--- a/sys/dev/pms/RefTisa/sallsdk/hda/64k/raae8070.h
+++ b/sys/dev/pms/RefTisa/sallsdk/hda/64k/raae8070.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/spc/mpi.h b/sys/dev/pms/RefTisa/sallsdk/spc/mpi.h
index b727f25f088..67f44073627 100644
--- a/sys/dev/pms/RefTisa/sallsdk/spc/mpi.h
+++ b/sys/dev/pms/RefTisa/sallsdk/spc/mpi.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/spc/mpidebug.h b/sys/dev/pms/RefTisa/sallsdk/spc/mpidebug.h
index e62a80c5771..3a1b97b7357 100644
--- a/sys/dev/pms/RefTisa/sallsdk/spc/mpidebug.h
+++ b/sys/dev/pms/RefTisa/sallsdk/spc/mpidebug.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/spc/sadefs.h b/sys/dev/pms/RefTisa/sallsdk/spc/sadefs.h
index b2388f70ee3..e954e915ebb 100644
--- a/sys/dev/pms/RefTisa/sallsdk/spc/sadefs.h
+++ b/sys/dev/pms/RefTisa/sallsdk/spc/sadefs.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/spc/saglobal.h b/sys/dev/pms/RefTisa/sallsdk/spc/saglobal.h
index d51c604f022..84936f94559 100644
--- a/sys/dev/pms/RefTisa/sallsdk/spc/saglobal.h
+++ b/sys/dev/pms/RefTisa/sallsdk/spc/saglobal.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/spc/sahwreg.h b/sys/dev/pms/RefTisa/sallsdk/spc/sahwreg.h
index ca56f5b7c20..c37ccbd4b01 100644
--- a/sys/dev/pms/RefTisa/sallsdk/spc/sahwreg.h
+++ b/sys/dev/pms/RefTisa/sallsdk/spc/sahwreg.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/spc/sallist.h b/sys/dev/pms/RefTisa/sallsdk/spc/sallist.h
index 8ed9fb32544..32bbc7d3ebd 100644
--- a/sys/dev/pms/RefTisa/sallsdk/spc/sallist.h
+++ b/sys/dev/pms/RefTisa/sallsdk/spc/sallist.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/spc/samacro.h b/sys/dev/pms/RefTisa/sallsdk/spc/samacro.h
index 4af84c75857..341a12a91ef 100644
--- a/sys/dev/pms/RefTisa/sallsdk/spc/samacro.h
+++ b/sys/dev/pms/RefTisa/sallsdk/spc/samacro.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/spc/sampidefs.h b/sys/dev/pms/RefTisa/sallsdk/spc/sampidefs.h
index 4c0931b0e5e..7536758fc8f 100644
--- a/sys/dev/pms/RefTisa/sallsdk/spc/sampidefs.h
+++ b/sys/dev/pms/RefTisa/sallsdk/spc/sampidefs.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/spc/saproto.h b/sys/dev/pms/RefTisa/sallsdk/spc/saproto.h
index a4cae8c9eac..9c3f94bb21d 100644
--- a/sys/dev/pms/RefTisa/sallsdk/spc/saproto.h
+++ b/sys/dev/pms/RefTisa/sallsdk/spc/saproto.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/spc/satypes.h b/sys/dev/pms/RefTisa/sallsdk/spc/satypes.h
index a99571fde99..abddcc13044 100644
--- a/sys/dev/pms/RefTisa/sallsdk/spc/satypes.h
+++ b/sys/dev/pms/RefTisa/sallsdk/spc/satypes.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sallsdk/spc/spcdefs.h b/sys/dev/pms/RefTisa/sallsdk/spc/spcdefs.h
index 510b989fb95..b080d397bf2 100644
--- a/sys/dev/pms/RefTisa/sallsdk/spc/spcdefs.h
+++ b/sys/dev/pms/RefTisa/sallsdk/spc/spcdefs.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sat/api/sm.h b/sys/dev/pms/RefTisa/sat/api/sm.h
index e6f8f21623e..e571f4912e9 100644
--- a/sys/dev/pms/RefTisa/sat/api/sm.h
+++ b/sys/dev/pms/RefTisa/sat/api/sm.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sat/api/smapi.h b/sys/dev/pms/RefTisa/sat/api/smapi.h
index 7e754ffcb75..2600266ae90 100644
--- a/sys/dev/pms/RefTisa/sat/api/smapi.h
+++ b/sys/dev/pms/RefTisa/sat/api/smapi.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sat/api/tdsmapi.h b/sys/dev/pms/RefTisa/sat/api/tdsmapi.h
index 7cead29be05..a0140a158ba 100644
--- a/sys/dev/pms/RefTisa/sat/api/tdsmapi.h
+++ b/sys/dev/pms/RefTisa/sat/api/tdsmapi.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sat/src/smdefs.h b/sys/dev/pms/RefTisa/sat/src/smdefs.h
index 2e69ffcec9f..391ea9e31ee 100644
--- a/sys/dev/pms/RefTisa/sat/src/smdefs.h
+++ b/sys/dev/pms/RefTisa/sat/src/smdefs.h
@@ -18,7 +18,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 __SMDEFS_H__
diff --git a/sys/dev/pms/RefTisa/sat/src/smlist.h b/sys/dev/pms/RefTisa/sat/src/smlist.h
index 1f5608824ff..92d3f131ae2 100644
--- a/sys/dev/pms/RefTisa/sat/src/smlist.h
+++ b/sys/dev/pms/RefTisa/sat/src/smlist.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/sat/src/smproto.h b/sys/dev/pms/RefTisa/sat/src/smproto.h
index 28701ba704b..341ed84f728 100644
--- a/sys/dev/pms/RefTisa/sat/src/smproto.h
+++ b/sys/dev/pms/RefTisa/sat/src/smproto.h
@@ -18,7 +18,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 __SMPROTO_H__
diff --git a/sys/dev/pms/RefTisa/sat/src/smtypes.h b/sys/dev/pms/RefTisa/sat/src/smtypes.h
index ee07b1ce2cf..a69bb188a13 100644
--- a/sys/dev/pms/RefTisa/sat/src/smtypes.h
+++ b/sys/dev/pms/RefTisa/sat/src/smtypes.h
@@ -18,7 +18,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 __SMTYPES_H__
diff --git a/sys/dev/pms/RefTisa/tisa/api/ostiapi.h b/sys/dev/pms/RefTisa/tisa/api/ostiapi.h
index 00c3f4677a0..f0b45da2fe8 100644
--- a/sys/dev/pms/RefTisa/tisa/api/ostiapi.h
+++ b/sys/dev/pms/RefTisa/tisa/api/ostiapi.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/api/tiapi.h b/sys/dev/pms/RefTisa/tisa/api/tiapi.h
index 10550d2cc04..0eeecc80fc8 100644
--- a/sys/dev/pms/RefTisa/tisa/api/tiapi.h
+++ b/sys/dev/pms/RefTisa/tisa/api/tiapi.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/api/tidefs.h b/sys/dev/pms/RefTisa/tisa/api/tidefs.h
index 2e3dad2c98a..99ef88ebffe 100644
--- a/sys/dev/pms/RefTisa/tisa/api/tidefs.h
+++ b/sys/dev/pms/RefTisa/tisa/api/tidefs.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/api/tiglobal.h b/sys/dev/pms/RefTisa/tisa/api/tiglobal.h
index bc07967dd27..5d0dbb30d91 100644
--- a/sys/dev/pms/RefTisa/tisa/api/tiglobal.h
+++ b/sys/dev/pms/RefTisa/tisa/api/tiglobal.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/api/tiscsi.h b/sys/dev/pms/RefTisa/tisa/api/tiscsi.h
index 9963924f233..8bccaa1cd85 100644
--- a/sys/dev/pms/RefTisa/tisa/api/tiscsi.h
+++ b/sys/dev/pms/RefTisa/tisa/api/tiscsi.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/api/titypes.h b/sys/dev/pms/RefTisa/tisa/api/titypes.h
index 01ea864d4b6..f90ff1af9c4 100644
--- a/sys/dev/pms/RefTisa/tisa/api/titypes.h
+++ b/sys/dev/pms/RefTisa/tisa/api/titypes.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/common/ossa.h b/sys/dev/pms/RefTisa/tisa/sassata/common/ossa.h
index 9de1837a2c2..89356951896 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/common/ossa.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/common/ossa.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/common/tddefs.h b/sys/dev/pms/RefTisa/tisa/sassata/common/tddefs.h
index 91aadb32414..14e1eb617f1 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/common/tddefs.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/common/tddefs.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/common/tdioctl.h b/sys/dev/pms/RefTisa/tisa/sassata/common/tdioctl.h
index 8c1b42facf8..766656a4f0a 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/common/tdioctl.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/common/tdioctl.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/common/tdlist.h b/sys/dev/pms/RefTisa/tisa/sassata/common/tdlist.h
index e304dcfeb23..bbed4dec26e 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/common/tdlist.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/common/tdlist.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/common/tdproto.h b/sys/dev/pms/RefTisa/tisa/sassata/common/tdproto.h
index 50c770651d2..e552fd98b5d 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/common/tdproto.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/common/tdproto.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/common/tdsatypes.h b/sys/dev/pms/RefTisa/tisa/sassata/common/tdsatypes.h
index ad62ac40997..3dd750b5ee9 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/common/tdsatypes.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/common/tdsatypes.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/common/tdutil.h b/sys/dev/pms/RefTisa/tisa/sassata/common/tdutil.h
index 6cba0fae6b8..10c7e817139 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/common/tdutil.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/common/tdutil.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/common/wcs.h b/sys/dev/pms/RefTisa/tisa/sassata/common/wcs.h
index 167b1a0688f..4259d53ab29 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/common/wcs.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/common/wcs.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/sas/common/tdtypes.h b/sys/dev/pms/RefTisa/tisa/sassata/sas/common/tdtypes.h
index ce93e4a63f7..ba848ab2dfb 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/sas/common/tdtypes.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/sas/common/tdtypes.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddefs.h b/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddefs.h
index 157903fae9d..6ba45c2b30b 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddefs.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddefs.h
@@ -19,7 +19,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/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itdglobl.h b/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itdglobl.h
index 3253021c64b..811d0afe3fc 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itdglobl.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itdglobl.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itdtypes.h b/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itdtypes.h
index 41c4775f878..6ba5f7080cc 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itdtypes.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itdtypes.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/sata/host/sat.h b/sys/dev/pms/RefTisa/tisa/sassata/sata/host/sat.h
index 12c352ae696..835a5d2904c 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/sata/host/sat.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/sata/host/sat.h
@@ -18,7 +18,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/sys/dev/pms/RefTisa/tisa/sassata/sata/host/satproto.h b/sys/dev/pms/RefTisa/tisa/sassata/sata/host/satproto.h
index 516c6d002c0..e1d9bdf0c96 100644
--- a/sys/dev/pms/RefTisa/tisa/sassata/sata/host/satproto.h
+++ b/sys/dev/pms/RefTisa/tisa/sassata/sata/host/satproto.h
@@ -18,7 +18,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/sys/dev/pms/config.h b/sys/dev/pms/config.h
index 81250882b3b..6ad52297461 100644
--- a/sys/dev/pms/config.h
+++ b/sys/dev/pms/config.h
@@ -18,7 +18,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/sys/dev/pms/freebsd/driver/common/encrypt_ioctl.h b/sys/dev/pms/freebsd/driver/common/encrypt_ioctl.h
index 2fc03530d0b..a5b5a80160b 100644
--- a/sys/dev/pms/freebsd/driver/common/encrypt_ioctl.h
+++ b/sys/dev/pms/freebsd/driver/common/encrypt_ioctl.h
@@ -18,7 +18,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/sys/dev/pms/freebsd/driver/common/lxcommon.h b/sys/dev/pms/freebsd/driver/common/lxcommon.h
index 5968ecba802..be7773c3174 100644
--- a/sys/dev/pms/freebsd/driver/common/lxcommon.h
+++ b/sys/dev/pms/freebsd/driver/common/lxcommon.h
@@ -18,7 +18,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/sys/dev/pms/freebsd/driver/common/lxencrypt.c b/sys/dev/pms/freebsd/driver/common/lxencrypt.c
index 0d469f9fdbf..d6a3298782d 100644
--- a/sys/dev/pms/freebsd/driver/common/lxencrypt.c
+++ b/sys/dev/pms/freebsd/driver/common/lxencrypt.c
@@ -18,7 +18,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/sys/dev/pms/freebsd/driver/common/lxencrypt.h b/sys/dev/pms/freebsd/driver/common/lxencrypt.h
index 448cbca3d51..a5b51c3adee 100644
--- a/sys/dev/pms/freebsd/driver/common/lxencrypt.h
+++ b/sys/dev/pms/freebsd/driver/common/lxencrypt.h
@@ -18,7 +18,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/sys/dev/pms/freebsd/driver/common/lxproto.h b/sys/dev/pms/freebsd/driver/common/lxproto.h
index 3deb44b4b95..f648ad34492 100644
--- a/sys/dev/pms/freebsd/driver/common/lxproto.h
+++ b/sys/dev/pms/freebsd/driver/common/lxproto.h
@@ -18,7 +18,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/sys/dev/pms/freebsd/driver/common/osdebug.h b/sys/dev/pms/freebsd/driver/common/osdebug.h
index bec02846ed8..cbd6e50c337 100644
--- a/sys/dev/pms/freebsd/driver/common/osdebug.h
+++ b/sys/dev/pms/freebsd/driver/common/osdebug.h
@@ -18,7 +18,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/sys/dev/pms/freebsd/driver/common/osenv.h b/sys/dev/pms/freebsd/driver/common/osenv.h
index 491c29e9339..d426967fadb 100644
--- a/sys/dev/pms/freebsd/driver/common/osenv.h
+++ b/sys/dev/pms/freebsd/driver/common/osenv.h
@@ -18,7 +18,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/sys/dev/pms/freebsd/driver/common/osstring.h b/sys/dev/pms/freebsd/driver/common/osstring.h
index 5979ede255d..4d9e732a3e7 100644
--- a/sys/dev/pms/freebsd/driver/common/osstring.h
+++ b/sys/dev/pms/freebsd/driver/common/osstring.h
@@ -18,7 +18,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/sys/dev/pms/freebsd/driver/common/ostypes.h b/sys/dev/pms/freebsd/driver/common/ostypes.h
index 34b77ccf015..b7b954304d0 100644
--- a/sys/dev/pms/freebsd/driver/common/ostypes.h
+++ b/sys/dev/pms/freebsd/driver/common/ostypes.h
@@ -18,7 +18,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/sys/dev/pms/freebsd/driver/ini/src/agdef.h b/sys/dev/pms/freebsd/driver/ini/src/agdef.h
index b58741a434c..a8034144776 100644
--- a/sys/dev/pms/freebsd/driver/ini/src/agdef.h
+++ b/sys/dev/pms/freebsd/driver/ini/src/agdef.h
@@ -18,7 +18,6 @@
 *WHETHER IN CONTRACT, STRICT 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/sys/dev/pms/freebsd/driver/ini/src/agtiapi.h b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.h
index 1098f90cd58..8d0826b59e3 100644
--- a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.h
+++ b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.h
@@ -17,7 +17,6 @@
 *WHETHER IN CONTRACT, STRICT 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/sys/dev/pms/freebsd/driver/ini/src/agtiproto.h b/sys/dev/pms/freebsd/driver/ini/src/agtiproto.h
index c7ed7b7a29f..cb25fe9b67d 100644
--- a/sys/dev/pms/freebsd/driver/ini/src/agtiproto.h
+++ b/sys/dev/pms/freebsd/driver/ini/src/agtiproto.h
@@ -16,7 +16,6 @@
 *WHETHER IN CONTRACT, STRICT 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/sys/dev/pms/freebsd/driver/ini/src/osapi.c b/sys/dev/pms/freebsd/driver/ini/src/osapi.c
index a70ada46f20..4f45429d440 100644
--- a/sys/dev/pms/freebsd/driver/ini/src/osapi.c
+++ b/sys/dev/pms/freebsd/driver/ini/src/osapi.c
@@ -18,7 +18,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/sys/dev/qlnx/qlnxr/qlnxr_verbs.h b/sys/dev/qlnx/qlnxr/qlnxr_verbs.h
index bec336942dc..0075344a787 100644
--- a/sys/dev/qlnx/qlnxr/qlnxr_verbs.h
+++ b/sys/dev/qlnx/qlnxr/qlnxr_verbs.h
@@ -24,7 +24,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 #ifndef __QLNXR_VERBS_H__
diff --git a/sys/dev/ral/rt2860reg.h b/sys/dev/ral/rt2860reg.h
index 52fe14096f9..e6cfd0165fa 100644
--- a/sys/dev/ral/rt2860reg.h
+++ b/sys/dev/ral/rt2860reg.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: rt2860reg.h,v 1.30 2010/05/10 18:17:10 damien Exp $
- * $FreeBSD$
  */
 
 #define RT2860_NOISE_FLOOR		-95
diff --git a/sys/dev/ral/rt2860var.h b/sys/dev/ral/rt2860var.h
index a8c2673cc8a..7d7263f3212 100644
--- a/sys/dev/ral/rt2860var.h
+++ b/sys/dev/ral/rt2860var.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: rt2860var.h,v 1.20 2010/09/07 16:21:42 deraadt Exp $
- * $FreeBSD$
  */
 
 #define RT2860_TX_RING_COUNT	64
diff --git a/sys/dev/rtwn/if_rtwn_fw.h b/sys/dev/rtwn/if_rtwn_fw.h
index 50d2aa31b14..deea152b94c 100644
--- a/sys/dev/rtwn/if_rtwn_fw.h
+++ b/sys/dev/rtwn/if_rtwn_fw.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef IF_RTWN_FW_H
diff --git a/sys/dev/rtwn/if_rtwnreg.h b/sys/dev/rtwn/if_rtwnreg.h
index b1eac291c49..9762f0482b1 100644
--- a/sys/dev/rtwn/if_rtwnreg.h
+++ b/sys/dev/rtwn/if_rtwnreg.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef IF_RTWNREG_H
diff --git a/sys/dev/rtwn/if_rtwnvar.h b/sys/dev/rtwn/if_rtwnvar.h
index b63d4ddf290..6a44b7b7390 100644
--- a/sys/dev/rtwn/if_rtwnvar.h
+++ b/sys/dev/rtwn/if_rtwnvar.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef IF_RTWNVAR_H
diff --git a/sys/dev/rtwn/pci/rtwn_pci_attach.h b/sys/dev/rtwn/pci/rtwn_pci_attach.h
index b37ef672525..0b7fb8813c2 100644
--- a/sys/dev/rtwn/pci/rtwn_pci_attach.h
+++ b/sys/dev/rtwn/pci/rtwn_pci_attach.h
@@ -13,7 +13,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
- * $FreeBSD$
  */
 
 void	r92ce_attach(struct rtwn_pci_softc *);
diff --git a/sys/dev/rtwn/pci/rtwn_pci_var.h b/sys/dev/rtwn/pci/rtwn_pci_var.h
index 82541767eda..95ec55ef3d1 100644
--- a/sys/dev/rtwn/pci/rtwn_pci_var.h
+++ b/sys/dev/rtwn/pci/rtwn_pci_var.h
@@ -17,7 +17,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
- * $FreeBSD$
  */
 
 #ifndef RTWN_PCI_VAR_H
diff --git a/sys/dev/rtwn/rtl8188e/r88e.h b/sys/dev/rtwn/rtl8188e/r88e.h
index cbf1161f707..33c6fa3432f 100644
--- a/sys/dev/rtwn/rtl8188e/r88e.h
+++ b/sys/dev/rtwn/rtl8188e/r88e.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef RTL8188E_H
diff --git a/sys/dev/rtwn/rtl8188e/r88e_fw_cmd.h b/sys/dev/rtwn/rtl8188e/r88e_fw_cmd.h
index c152729c1ee..2a43a07a31f 100644
--- a/sys/dev/rtwn/rtl8188e/r88e_fw_cmd.h
+++ b/sys/dev/rtwn/rtl8188e/r88e_fw_cmd.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R88E_FW_CMD_H
diff --git a/sys/dev/rtwn/rtl8188e/r88e_priv.h b/sys/dev/rtwn/rtl8188e/r88e_priv.h
index 81d82c71d7b..13fd53fcb5b 100644
--- a/sys/dev/rtwn/rtl8188e/r88e_priv.h
+++ b/sys/dev/rtwn/rtl8188e/r88e_priv.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R88E_PRIV_H
diff --git a/sys/dev/rtwn/rtl8188e/r88e_reg.h b/sys/dev/rtwn/rtl8188e/r88e_reg.h
index d578373f755..d9f236cddbb 100644
--- a/sys/dev/rtwn/rtl8188e/r88e_reg.h
+++ b/sys/dev/rtwn/rtl8188e/r88e_reg.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R88E_REG_H
diff --git a/sys/dev/rtwn/rtl8188e/r88e_rx_desc.h b/sys/dev/rtwn/rtl8188e/r88e_rx_desc.h
index 2b72f3dd79b..f3e1a3c1b9b 100644
--- a/sys/dev/rtwn/rtl8188e/r88e_rx_desc.h
+++ b/sys/dev/rtwn/rtl8188e/r88e_rx_desc.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R88E_RX_DESC_H
diff --git a/sys/dev/rtwn/rtl8188e/r88e_tx_desc.h b/sys/dev/rtwn/rtl8188e/r88e_tx_desc.h
index 98338fb732f..7a4e12c3b83 100644
--- a/sys/dev/rtwn/rtl8188e/r88e_tx_desc.h
+++ b/sys/dev/rtwn/rtl8188e/r88e_tx_desc.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R88E_TX_DESC_H
diff --git a/sys/dev/rtwn/rtl8188e/usb/r88eu.h b/sys/dev/rtwn/rtl8188e/usb/r88eu.h
index 9b9198e0a8c..f72825645fd 100644
--- a/sys/dev/rtwn/rtl8188e/usb/r88eu.h
+++ b/sys/dev/rtwn/rtl8188e/usb/r88eu.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef RTL8188EU_H
diff --git a/sys/dev/rtwn/rtl8188e/usb/r88eu_reg.h b/sys/dev/rtwn/rtl8188e/usb/r88eu_reg.h
index fc61eaae585..77959867b33 100644
--- a/sys/dev/rtwn/rtl8188e/usb/r88eu_reg.h
+++ b/sys/dev/rtwn/rtl8188e/usb/r88eu_reg.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R88EU_REG_H
diff --git a/sys/dev/rtwn/rtl8192c/pci/r92ce.h b/sys/dev/rtwn/rtl8192c/pci/r92ce.h
index 39e08b4afb1..c46720326a6 100644
--- a/sys/dev/rtwn/rtl8192c/pci/r92ce.h
+++ b/sys/dev/rtwn/rtl8192c/pci/r92ce.h
@@ -17,7 +17,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
- * $FreeBSD$
  */
 
 #ifndef RTL8192CE_H
diff --git a/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h b/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h
index 08172a607f2..31c51654a81 100644
--- a/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h
+++ b/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h
@@ -17,7 +17,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
- * $FreeBSD$
  */
 
 #ifndef R92CE_PRIV_H
diff --git a/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h b/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h
index d76cc64e2c7..bf4514db0e0 100644
--- a/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h
+++ b/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h
@@ -17,7 +17,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
- * $FreeBSD$
  */
 
 #ifndef R92CE_REG_H
diff --git a/sys/dev/rtwn/rtl8192c/pci/r92ce_rx_desc.h b/sys/dev/rtwn/rtl8192c/pci/r92ce_rx_desc.h
index 476a9e882b6..85fb4b0fda3 100644
--- a/sys/dev/rtwn/rtl8192c/pci/r92ce_rx_desc.h
+++ b/sys/dev/rtwn/rtl8192c/pci/r92ce_rx_desc.h
@@ -17,7 +17,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
- * $FreeBSD$
  */
 
 #ifndef R92CE_RX_DESC_H
diff --git a/sys/dev/rtwn/rtl8192c/pci/r92ce_tx_desc.h b/sys/dev/rtwn/rtl8192c/pci/r92ce_tx_desc.h
index 4153710a842..89d62fcd342 100644
--- a/sys/dev/rtwn/rtl8192c/pci/r92ce_tx_desc.h
+++ b/sys/dev/rtwn/rtl8192c/pci/r92ce_tx_desc.h
@@ -17,7 +17,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
- * $FreeBSD$
  */
 
 #ifndef R92CE_TX_DESC_H
diff --git a/sys/dev/rtwn/rtl8192c/r92c.h b/sys/dev/rtwn/rtl8192c/r92c.h
index 925ce7a0adb..f73e92f7c93 100644
--- a/sys/dev/rtwn/rtl8192c/r92c.h
+++ b/sys/dev/rtwn/rtl8192c/r92c.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef RTL8192C_H
diff --git a/sys/dev/rtwn/rtl8192c/r92c_fw_cmd.h b/sys/dev/rtwn/rtl8192c/r92c_fw_cmd.h
index 998a7805fd2..b16e2819624 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_fw_cmd.h
+++ b/sys/dev/rtwn/rtl8192c/r92c_fw_cmd.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R92C_FW_CMD_H
diff --git a/sys/dev/rtwn/rtl8192c/r92c_priv.h b/sys/dev/rtwn/rtl8192c/r92c_priv.h
index 645f07a5870..2ae3b6b71c0 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_priv.h
+++ b/sys/dev/rtwn/rtl8192c/r92c_priv.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R92C_PRIV_H
diff --git a/sys/dev/rtwn/rtl8192c/r92c_reg.h b/sys/dev/rtwn/rtl8192c/r92c_reg.h
index d01168fe395..e640b6b560b 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_reg.h
+++ b/sys/dev/rtwn/rtl8192c/r92c_reg.h
@@ -16,7 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R92C_REG_H
diff --git a/sys/dev/rtwn/rtl8192c/r92c_rom_defs.h b/sys/dev/rtwn/rtl8192c/r92c_rom_defs.h
index 35fc42df787..048d7ee2463 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_rom_defs.h
+++ b/sys/dev/rtwn/rtl8192c/r92c_rom_defs.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R92C_ROM_DEFS_H
diff --git a/sys/dev/rtwn/rtl8192c/r92c_rom_image.h b/sys/dev/rtwn/rtl8192c/r92c_rom_image.h
index 5c2880bb192..5ec20e591ce 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_rom_image.h
+++ b/sys/dev/rtwn/rtl8192c/r92c_rom_image.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R92C_ROM_IMAGE_H
diff --git a/sys/dev/rtwn/rtl8192c/r92c_rx_desc.h b/sys/dev/rtwn/rtl8192c/r92c_rx_desc.h
index 12dfd6656e4..1cb5cacd330 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_rx_desc.h
+++ b/sys/dev/rtwn/rtl8192c/r92c_rx_desc.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R92C_RX_DESC_H
diff --git a/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h b/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h
index c65ece0e3c0..6e546c3da23 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h
+++ b/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R92C_TX_DESC_H
diff --git a/sys/dev/rtwn/rtl8192c/r92c_var.h b/sys/dev/rtwn/rtl8192c/r92c_var.h
index 2b35cceafe6..3940e2e3f60 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_var.h
+++ b/sys/dev/rtwn/rtl8192c/r92c_var.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R92C_VAR_H
diff --git a/sys/dev/rtwn/rtl8192c/usb/r92cu.h b/sys/dev/rtwn/rtl8192c/usb/r92cu.h
index f9b9861867b..e05570dd359 100644
--- a/sys/dev/rtwn/rtl8192c/usb/r92cu.h
+++ b/sys/dev/rtwn/rtl8192c/usb/r92cu.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef RTL8192CU_H
diff --git a/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h b/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h
index a7f9e8d4959..bdf1889da49 100644
--- a/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h
+++ b/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R92CU_PRIV_H
diff --git a/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h b/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h
index f8ab133f537..8d34be3fd11 100644
--- a/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h
+++ b/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R92CU_REG_H
diff --git a/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h b/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h
index f160f131091..56f84a871c9 100644
--- a/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h
+++ b/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef R92CU_TX_DESC_H
diff --git a/sys/dev/rtwn/usb/rtwn_usb_var.h b/sys/dev/rtwn/usb/rtwn_usb_var.h
index 7ef214632b1..bad697bfa1d 100644
--- a/sys/dev/rtwn/usb/rtwn_usb_var.h
+++ b/sys/dev/rtwn/usb/rtwn_usb_var.h
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $
- * $FreeBSD$
  */
 
 #ifndef RTWN_USBVAR_H
diff --git a/sys/dev/ti/ti_fw2.h b/sys/dev/ti/ti_fw2.h
index e54c920531e..555f0519803 100644
--- a/sys/dev/ti/ti_fw2.h
+++ b/sys/dev/ti/ti_fw2.h
@@ -2,7 +2,6 @@
  * Generated by Ken's special genfw.c
  * Built on Wed Aug  2 17:21:09 MDT 2000 by ken@roadwarrior.plutotech.com
  * OS: FreeBSD 5.0-CURRENT
- * $FreeBSD$
  */
 static int tigon2FwReleaseMajor = 0xc;
 static int tigon2FwReleaseMinor = 0x4;
diff --git a/sys/dev/usb/uftdiio.h b/sys/dev/usb/uftdiio.h
index b6244831de3..033e09437c6 100644
--- a/sys/dev/usb/uftdiio.h
+++ b/sys/dev/usb/uftdiio.h
@@ -23,7 +23,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *  $FreeBSD$ 
  */
 
 /*
diff --git a/sys/dev/usb/wlan/if_rsureg.h b/sys/dev/usb/wlan/if_rsureg.h
index 246b06b7e29..fb706a4d9b1 100644
--- a/sys/dev/usb/wlan/if_rsureg.h
+++ b/sys/dev/usb/wlan/if_rsureg.h
@@ -14,7 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $OpenBSD: if_rsureg.h,v 1.3 2013/04/15 09:23:01 mglocker Exp $
- * $FreeBSD$
  */
 
 /* USB Requests. */
diff --git a/sys/dev/veriexec/veriexec_ioctl.h b/sys/dev/veriexec/veriexec_ioctl.h
index fdb9cbcbe1a..7f41464e495 100644
--- a/sys/dev/veriexec/veriexec_ioctl.h
+++ b/sys/dev/veriexec/veriexec_ioctl.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011-2023, Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/dev/veriexec/verified_exec.c b/sys/dev/veriexec/verified_exec.c
index 908b5413821..c0bb8640cbb 100644
--- a/sys/dev/veriexec/verified_exec.c
+++ b/sys/dev/veriexec/verified_exec.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011-2023, Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/dev/vkbd/vkbd.c b/sys/dev/vkbd/vkbd.c
index bb91c85b271..a8d4583f46c 100644
--- a/sys/dev/vkbd/vkbd.c
+++ b/sys/dev/vkbd/vkbd.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: vkbd.c,v 1.20 2004/11/15 23:53:30 max Exp $
- * $FreeBSD$
  */
 
 #include "opt_kbd.h"
diff --git a/sys/dev/vkbd/vkbd_var.h b/sys/dev/vkbd/vkbd_var.h
index c4457bbe8c5..e93667f4f19 100644
--- a/sys/dev/vkbd/vkbd_var.h
+++ b/sys/dev/vkbd/vkbd_var.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $Id: vkbd_var.h,v 1.4 2004/08/17 17:43:14 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _VKBD_VAR_H_
diff --git a/sys/dev/zlib/zcalloc.c b/sys/dev/zlib/zcalloc.c
index 6f2b1a17c60..3b81b369c60 100644
--- a/sys/dev/zlib/zcalloc.c
+++ b/sys/dev/zlib/zcalloc.c
@@ -1,6 +1,5 @@
 /*
  * This file is in the public domain.
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/zlib/zcalloc.h b/sys/dev/zlib/zcalloc.h
index e415327af68..30bfeb94a60 100644
--- a/sys/dev/zlib/zcalloc.h
+++ b/sys/dev/zlib/zcalloc.h
@@ -1,6 +1,5 @@
 /*
  * This file is in the public domain.
- * $FreeBSD$
  */
 
 #ifndef _DEV_ZLIB_ZCALLOC_
diff --git a/sys/dts/arm/tegra20-paz00.dts b/sys/dts/arm/tegra20-paz00.dts
index 912a8f9c631..44c9d3aae01 100644
--- a/sys/dts/arm/tegra20-paz00.dts
+++ b/sys/dts/arm/tegra20-paz00.dts
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 /dts-v1/;
 
diff --git a/sys/dts/arm/tegra20.dtsi b/sys/dts/arm/tegra20.dtsi
index d7107fdc316..7057f3541ed 100644
--- a/sys/dts/arm/tegra20.dtsi
+++ b/sys/dts/arm/tegra20.dtsi
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 / {
diff --git a/sys/dts/arm/trimslice.dts b/sys/dts/arm/trimslice.dts
index ac7017fc59f..822b9047008 100644
--- a/sys/dts/arm/trimslice.dts
+++ b/sys/dts/arm/trimslice.dts
@@ -25,7 +25,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 /dts-v1/;
diff --git a/sys/dts/arm/ufw.dts b/sys/dts/arm/ufw.dts
index 8b731a1a9d2..9e6a75ec12f 100644
--- a/sys/dts/arm/ufw.dts
+++ b/sys/dts/arm/ufw.dts
@@ -23,7 +23,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 /dts-v1/;
diff --git a/sys/dts/arm/versatilepb.dts b/sys/dts/arm/versatilepb.dts
index ca58e8859c0..332418ef680 100644
--- a/sys/dts/arm/versatilepb.dts
+++ b/sys/dts/arm/versatilepb.dts
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 /dts-v1/;
 
diff --git a/sys/dts/arm/zedboard.dts b/sys/dts/arm/zedboard.dts
index 77ec038532b..7bdd1c1cf77 100644
--- a/sys/dts/arm/zedboard.dts
+++ b/sys/dts/arm/zedboard.dts
@@ -23,7 +23,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 /dts-v1/;
 /include/ "zynq-7000.dtsi"
diff --git a/sys/dts/arm/zybo.dts b/sys/dts/arm/zybo.dts
index 1c401d7c0f6..44fe0f13569 100644
--- a/sys/dts/arm/zybo.dts
+++ b/sys/dts/arm/zybo.dts
@@ -23,7 +23,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 /dts-v1/;
 /include/ "zynq-7000.dtsi"
diff --git a/sys/dts/arm/zynq-7000.dtsi b/sys/dts/arm/zynq-7000.dtsi
index a2a585a3944..b04dc17c765 100644
--- a/sys/dts/arm/zynq-7000.dtsi
+++ b/sys/dts/arm/zynq-7000.dtsi
@@ -23,7 +23,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 / {
diff --git a/sys/fs/cd9660/cd9660_mount.h b/sys/fs/cd9660/cd9660_mount.h
index aca059204d6..99642603cc7 100644
--- a/sys/fs/cd9660/cd9660_mount.h
+++ b/sys/fs/cd9660/cd9660_mount.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_mount.h	8.1 (Berkeley) 5/24/95
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 7d0c55e7450..b1fc187f503 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.6 (Berkeley) 5/14/95
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/cd9660/cd9660_rrip.h b/sys/fs/cd9660/cd9660_rrip.h
index 0c37f204c53..5b4233d885c 100644
--- a/sys/fs/cd9660/cd9660_rrip.h
+++ b/sys/fs/cd9660/cd9660_rrip.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.h	8.2 (Berkeley) 12/5/94
- * $FreeBSD$
  */
 
 #ifndef _ISOFS_CD9660_CD9660_RRIP_H_
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index 325bb97a955..ac3f61e56cc 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.6 (Berkeley) 5/10/95
- * $FreeBSD$
  */
 
 #ifndef _ISOFS_CD9660_ISO_H_
diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h
index 99c34f971ef..09917893df1 100644
--- a/sys/fs/cd9660/iso_rrip.h
+++ b/sys/fs/cd9660/iso_rrip.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_rrip.h	8.2 (Berkeley) 1/23/94
- * $FreeBSD$
  */
 
 #ifndef _ISOFS_CD9660_ISO_RRIP_H_
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index f18242db9fb..0f850cede29 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ext2fs/ext2_alloc.c b/sys/fs/ext2fs/ext2_alloc.c
index 0467e308a7a..5060349ec33 100644
--- a/sys/fs/ext2fs/ext2_alloc.c
+++ b/sys/fs/ext2fs/ext2_alloc.c
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.8 (Berkeley) 2/21/94
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ext2fs/ext2_balloc.c b/sys/fs/ext2fs/ext2_balloc.c
index af480eda1bc..aef4dd33b57 100644
--- a/sys/fs/ext2fs/ext2_balloc.c
+++ b/sys/fs/ext2fs/ext2_balloc.c
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_balloc.c	8.4 (Berkeley) 9/23/93
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ext2fs/ext2_bmap.c b/sys/fs/ext2fs/ext2_bmap.c
index 412f08b871e..807f47a487e 100644
--- a/sys/fs/ext2fs/ext2_bmap.c
+++ b/sys/fs/ext2fs/ext2_bmap.c
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ext2fs/ext2_extern.h b/sys/fs/ext2fs/ext2_extern.h
index dbad77c8e89..14c165795e4 100644
--- a/sys/fs/ext2fs/ext2_extern.h
+++ b/sys/fs/ext2fs/ext2_extern.h
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.3 (Berkeley) 4/16/94
- * $FreeBSD$
  */
 
 #ifndef _FS_EXT2FS_EXT2_EXTERN_H_
diff --git a/sys/fs/ext2fs/ext2_inode.c b/sys/fs/ext2fs/ext2_inode.c
index b27c0b0ec4e..3ab566ee53f 100644
--- a/sys/fs/ext2fs/ext2_inode.c
+++ b/sys/fs/ext2fs/ext2_inode.c
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_inode.c	8.5 (Berkeley) 12/30/93
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ext2fs/ext2_inode_cnv.c b/sys/fs/ext2fs/ext2_inode_cnv.c
index c5f7d0657e3..ea9bc7d72b8 100644
--- a/sys/fs/ext2fs/ext2_inode_cnv.c
+++ b/sys/fs/ext2fs/ext2_inode_cnv.c
@@ -21,7 +21,6 @@
  * improvements that they make and grant CSL redistribution rights.
  *
  *      Utah $Hdr$
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/ext2fs/ext2_lookup.c b/sys/fs/ext2fs/ext2_lookup.c
index 990cfa1260c..061c4d907ac 100644
--- a/sys/fs/ext2fs/ext2_lookup.c
+++ b/sys/fs/ext2fs/ext2_lookup.c
@@ -40,7 +40,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lookup.c	8.6 (Berkeley) 4/1/94
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ext2fs/ext2_mount.h b/sys/fs/ext2fs/ext2_mount.h
index 59478cca10a..5ea1ee01a1b 100644
--- a/sys/fs/ext2fs/ext2_mount.h
+++ b/sys/fs/ext2fs/ext2_mount.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _FS_EXT2FS_EXT2_MOUNT_H_
diff --git a/sys/fs/ext2fs/ext2_subr.c b/sys/fs/ext2fs/ext2_subr.c
index 004bd7a4521..b107fa31847 100644
--- a/sys/fs/ext2fs/ext2_subr.c
+++ b/sys/fs/ext2fs/ext2_subr.c
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.2 (Berkeley) 9/21/93
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ext2fs/ext2_vfsops.c b/sys/fs/ext2fs/ext2_vfsops.c
index 55159718046..583344fdafb 100644
--- a/sys/fs/ext2fs/ext2_vfsops.c
+++ b/sys/fs/ext2fs/ext2_vfsops.c
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.8 (Berkeley) 4/18/94
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c
index 8ec12f9a7f8..1c4b62bb408 100644
--- a/sys/fs/ext2fs/ext2_vnops.c
+++ b/sys/fs/ext2fs/ext2_vnops.c
@@ -41,7 +41,6 @@
  *
  *	@(#)ufs_vnops.c	8.7 (Berkeley) 2/3/94
  *	@(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
- * $FreeBSD$
  */
 
 #include "opt_suiddir.h"
diff --git a/sys/fs/ext2fs/fs.h b/sys/fs/ext2fs/fs.h
index ee7537253a2..3c61e8814c2 100644
--- a/sys/fs/ext2fs/fs.h
+++ b/sys/fs/ext2fs/fs.h
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.7 (Berkeley) 4/19/94
- * $FreeBSD$
  */
 
 #ifndef _FS_EXT2FS_FS_H_
diff --git a/sys/fs/ext2fs/inode.h b/sys/fs/ext2fs/inode.h
index 25e77acc3a9..46e6215aff6 100644
--- a/sys/fs/ext2fs/inode.h
+++ b/sys/fs/ext2fs/inode.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
  */
 
 #ifndef _FS_EXT2FS_INODE_H_
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 8a567205db0..721f71c52ee 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 89500e4025a..6acff89189f 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -34,7 +34,6 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index 6e6d3b0df07..43530c156cf 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -35,7 +35,6 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- * $FreeBSD$
  */
 
 #ifdef _KERNEL
diff --git a/sys/fs/procfs/procfs_dbregs.c b/sys/fs/procfs/procfs_dbregs.c
index f7bf2b79262..7b570a25236 100644
--- a/sys/fs/procfs/procfs_dbregs.c
+++ b/sys/fs/procfs/procfs_dbregs.c
@@ -42,7 +42,6 @@
  *
  * From:
  *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index 2d680fe2621..945cbb20782 100644
--- a/sys/fs/procfs/procfs_fpregs.c
+++ b/sys/fs/procfs/procfs_fpregs.c
@@ -36,7 +36,6 @@
  *
  * From:
  *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_regs.c b/sys/fs/procfs/procfs_regs.c
index fd5d0cb2a20..12a39edb82c 100644
--- a/sys/fs/procfs/procfs_regs.c
+++ b/sys/fs/procfs/procfs_regs.c
@@ -36,7 +36,6 @@
  *
  * From:
  *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index 4592f458058..70131f0547d 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -36,7 +36,6 @@
  *
  * From:
  *	$Id: procfs_status.c,v 3.1 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index 34d323dff51..cbbb00a68c8 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.9 (Berkeley) 12/10/94
- * $FreeBSD$
  */
 
 #ifdef _KERNEL
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index fccc07a1ea7..c841136e42d 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 9ef239aaad1..c6d45962267 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 6c8086a6c7c..ab277c685e4 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -36,7 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $FreeBSD$
  *
  */
 
diff --git a/sys/geom/vinum/geom_vinum_var.h b/sys/geom/vinum/geom_vinum_var.h
index 731362686e3..441f2f771a4 100644
--- a/sys/geom/vinum/geom_vinum_var.h
+++ b/sys/geom/vinum/geom_vinum_var.h
@@ -38,7 +38,6 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *  
- * $FreeBSD$
  */
 
 #ifndef	_GEOM_VINUM_VAR_H_
diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.h b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.h
index 72a9fb92078..89205a522c2 100644
--- a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.h
+++ b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.h
@@ -26,7 +26,6 @@
 */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef	__IF_BWN_PHY_N_CORE_H__
diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.h b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.h
index 48d08e1c176..eb8e39c9f98 100644
--- a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.h
+++ b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.h
@@ -24,7 +24,6 @@
 */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef	__IF_BWN_PHY_PPR_H__
diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_regs.h b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_regs.h
index 50267f7fdd9..90d67828246 100644
--- a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_regs.h
+++ b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_regs.h
@@ -24,7 +24,6 @@
 */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef	__IF_BWN_PHY_N_REGS_H__
diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.h b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.h
index 523cc3c0f86..c6c4f68fb5b 100644
--- a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.h
+++ b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.h
@@ -24,7 +24,6 @@
 */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef	__IF_BWN_TABLES_NPHY_H__
diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2055.h b/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2055.h
index a47e9c8e6ae..785c071991d 100644
--- a/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2055.h
+++ b/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2055.h
@@ -24,7 +24,6 @@
 */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef	__IF_BWN_RADIO_2055_H__
diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2056.h b/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2056.h
index da9363b751f..fbc06aa3000 100644
--- a/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2056.h
+++ b/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2056.h
@@ -24,7 +24,6 @@
 */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef	__IF_BWN_RADIO_2056_H__
diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2057.h b/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2057.h
index 5e54490d0b4..1171981682e 100644
--- a/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2057.h
+++ b/sys/gnu/dev/bwn/phy_n/if_bwn_radio_2057.h
@@ -24,7 +24,6 @@
 */
 
 /*
- * $FreeBSD$
  */
 
 #ifndef	__IF_BWN_RADIO_2057_H__
diff --git a/sys/i386/i386/apic_vector.S b/sys/i386/i386/apic_vector.S
index 270e0d0393a..5d248409718 100644
--- a/sys/i386/i386/apic_vector.S
+++ b/sys/i386/i386/apic_vector.S
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/atpic_vector.S b/sys/i386/i386/atpic_vector.S
index 66708855958..6f3e28920e2 100644
--- a/sys/i386/i386/atpic_vector.S
+++ b/sys/i386/i386/atpic_vector.S
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  *	from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/locore.S b/sys/i386/i386/locore.S
index 6b0e397d05b..4ee5699b2fe 100644
--- a/sys/i386/i386/locore.S
+++ b/sys/i386/i386/locore.S
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- * $FreeBSD$
  *
  *		originally from: locore.s, by William F. Jolitz
  *
diff --git a/sys/i386/i386/sigtramp.S b/sys/i386/i386/sigtramp.S
index c54c51d0a4b..d80f12c9fa0 100644
--- a/sys/i386/i386/sigtramp.S
+++ b/sys/i386/i386/sigtramp.S
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- * $FreeBSD$
  *
  *		originally from: locore.s, by William F. Jolitz
  *
diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h
index e23fe2bec8d..8b5944ece4b 100644
--- a/sys/i386/include/asm.h
+++ b/sys/i386/include/asm.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index 50ff4961b38..ef20fda45d5 100644
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h
index 099ea263e20..f3a8caa5b88 100644
--- a/sys/i386/include/exec.h
+++ b/sys/i386/include/exec.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_EXEC_H_
diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h
index b7c154743d0..392fb1957fa 100644
--- a/sys/i386/include/floatingpoint.h
+++ b/sys/i386/include/floatingpoint.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h
index 133c40cb271..a7969696fe1 100644
--- a/sys/i386/include/ieeefp.h
+++ b/sys/i386/include/ieeefp.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/i386/include/in_cksum.h b/sys/i386/include/in_cksum.h
index ac604971936..1b00c94017e 100644
--- a/sys/i386/include/in_cksum.h
+++ b/sys/i386/include/in_cksum.h
@@ -31,7 +31,6 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index f2a4bf75fe2..c6da8ec92fd 100644
--- a/sys/i386/include/limits.h
+++ b/sys/i386/include/limits.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index 6c7e02232c2..eae109440b3 100644
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 09644ede45d..b1a6d7805b2 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
  */
 
 #ifndef _I386_INCLUDE_PARAM_H_
diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h
index a3f503ae132..5c73ca6947d 100644
--- a/sys/i386/include/pcb.h
+++ b/sys/i386/include/pcb.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- * $FreeBSD$
  */
 
 #ifndef _I386_PCB_H_
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 87570929e0d..daa1012da96 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -40,7 +40,6 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/i386/include/pmap_nopae.h b/sys/i386/include/pmap_nopae.h
index e9d30cf5443..f86c7861168 100644
--- a/sys/i386/include/pmap_nopae.h
+++ b/sys/i386/include/pmap_nopae.h
@@ -47,7 +47,6 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PMAP_NOPAE_H
diff --git a/sys/i386/include/pmap_pae.h b/sys/i386/include/pmap_pae.h
index e9394b444ff..1f3fa57ac96 100644
--- a/sys/i386/include/pmap_pae.h
+++ b/sys/i386/include/pmap_pae.h
@@ -47,7 +47,6 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PMAP_PAE_H
diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h
index d693500f2c3..8a4a2897cd5 100644
--- a/sys/i386/include/proc.h
+++ b/sys/i386/include/proc.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index e834abe33c3..91220ddc910 100644
--- a/sys/i386/include/profile.h
+++ b/sys/i386/include/profile.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h
index ea5ed128ef8..777cafe1d6b 100644
--- a/sys/i386/include/reloc.h
+++ b/sys/i386/include/reloc.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index cf851e75051..09c9ebdecff 100644
--- a/sys/i386/include/segments.h
+++ b/sys/i386/include/segments.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index 5e238a307d7..532046a6634 100644
--- a/sys/i386/include/signal.h
+++ b/sys/i386/include/signal.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h
index 574470a579d..423f62b2893 100644
--- a/sys/i386/include/speaker.h
+++ b/sys/i386/include/speaker.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_SPEAKER_H_
diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h
index cc13379cac4..97047003159 100644
--- a/sys/i386/include/tss.h
+++ b/sys/i386/include/tss.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h
index 3b844fbc8be..32a49fe5d6d 100644
--- a/sys/i386/include/vmparam.h
+++ b/sys/i386/include/vmparam.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_VMPARAM_H_
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index 58c152f4a03..643c240f8e3 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -24,7 +24,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 _I386_LINUX_H_
diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h
index 73ed5e68c33..8cbc0b171c4 100644
--- a/sys/isa/isareg.h
+++ b/sys/isa/isareg.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- * $FreeBSD$
  */
 
 #ifndef _ISA_ISA_H_
diff --git a/sys/isa/rtc.h b/sys/isa/rtc.h
index 6618872d70c..c242ccaa20c 100644
--- a/sys/isa/rtc.h
+++ b/sys/isa/rtc.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)rtc.h	7.1 (Berkeley) 5/12/91
- * $FreeBSD$
  */
 
 #ifndef _I386_ISA_RTC_H_
diff --git a/sys/libkern/jenkins_hash.c b/sys/libkern/jenkins_hash.c
index 250ef458aa6..5202849ae1b 100644
--- a/sys/libkern/jenkins_hash.c
+++ b/sys/libkern/jenkins_hash.c
@@ -1,6 +1,5 @@
 /*
  * Taken from http://burtleburtle.net/bob/c/lookup3.c
- * $FreeBSD$
  */
 
 #include <sys/hash.h>
diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h
index e6be1c7bde1..08ec4126184 100644
--- a/sys/libkern/quad.h
+++ b/sys/libkern/quad.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD$
  */
 
 #ifndef _LIBKERN_QUAD_H_
diff --git a/sys/modules/zfs/static_ccompile.h b/sys/modules/zfs/static_ccompile.h
index 8c3b89a8aa9..7ebf4f6db3c 100644
--- a/sys/modules/zfs/static_ccompile.h
+++ b/sys/modules/zfs/static_ccompile.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 #ifndef	_SPL_NVLIST_H_
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
index d448d8dcc96..bc0ec800535 100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 /* zfs_config.h.  Generated from zfs_config.h.in by configure.  */
diff --git a/sys/net/altq/altq.h b/sys/net/altq/altq.h
index e9109c47822..1b21007cd45 100644
--- a/sys/net/altq/altq.h
+++ b/sys/net/altq/altq.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: altq.h,v 1.10 2003/07/10 12:07:47 kjc Exp $
- * $FreeBSD$
  */
 #ifndef _ALTQ_ALTQ_H_
 #define	_ALTQ_ALTQ_H_
diff --git a/sys/net/altq/altq_cbq.c b/sys/net/altq/altq_cbq.c
index 86102ebcd53..fdf39690160 100644
--- a/sys/net/altq/altq_cbq.c
+++ b/sys/net/altq/altq_cbq.c
@@ -28,7 +28,6 @@
  * These notices must be retained in any copies of any part of this software.
  *
  * $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $
- * $FreeBSD$
  */
 
 #include "opt_altq.h"
diff --git a/sys/net/altq/altq_cbq.h b/sys/net/altq/altq_cbq.h
index 70c07c11d86..5bc05d986fa 100644
--- a/sys/net/altq/altq_cbq.h
+++ b/sys/net/altq/altq_cbq.h
@@ -28,7 +28,6 @@
  * These notices must be retained in any copies of any part of this software.
  *
  * $KAME: altq_cbq.h,v 1.12 2003/10/03 05:05:15 kjc Exp $
- * $FreeBSD$
  */
 
 #ifndef _ALTQ_ALTQ_CBQ_H_
diff --git a/sys/net/altq/altq_cdnr.h b/sys/net/altq/altq_cdnr.h
index 06fa9c98d3d..8d3c9b6e368 100644
--- a/sys/net/altq/altq_cdnr.h
+++ b/sys/net/altq/altq_cdnr.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: altq_cdnr.h,v 1.9 2003/07/10 12:07:48 kjc Exp $
- * $FreeBSD$
  */
 
 #ifndef _ALTQ_ALTQ_CDNR_H_
diff --git a/sys/net/altq/altq_classq.h b/sys/net/altq/altq_classq.h
index dc465a0b778..1c20accc3fd 100644
--- a/sys/net/altq/altq_classq.h
+++ b/sys/net/altq/altq_classq.h
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: altq_classq.h,v 1.6 2003/01/07 07:33:38 kjc Exp $
- * $FreeBSD$
  */
 /*
  * class queue definitions extracted from rm_class.h.
diff --git a/sys/net/altq/altq_fairq.c b/sys/net/altq/altq_fairq.c
index b3354354823..6069865101a 100644
--- a/sys/net/altq/altq_fairq.c
+++ b/sys/net/altq/altq_fairq.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  * 
  * $DragonFly: src/sys/net/altq/altq_fairq.c,v 1.1 2008/04/06 18:58:15 dillon Exp $
- * $FreeBSD$
  */
 /*
  * Matt: I gutted altq_priq.c and used it as a skeleton on which to build
diff --git a/sys/net/altq/altq_fairq.h b/sys/net/altq/altq_fairq.h
index f1e3217ca79..27bea7c20f5 100644
--- a/sys/net/altq/altq_fairq.h
+++ b/sys/net/altq/altq_fairq.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  * 
  * $DragonFly: src/sys/net/altq/altq_fairq.h,v 1.1 2008/04/06 18:58:15 dillon Exp $
- * $FreeBSD$
  */
 
 #ifndef _ALTQ_ALTQ_FAIRQ_H_
diff --git a/sys/net/altq/altq_hfsc.c b/sys/net/altq/altq_hfsc.c
index 16b25d215fe..61d3461eef0 100644
--- a/sys/net/altq/altq_hfsc.c
+++ b/sys/net/altq/altq_hfsc.c
@@ -28,7 +28,6 @@
  * changes without encumbrance.
  *
  * $KAME: altq_hfsc.c,v 1.24 2003/12/05 05:40:46 kjc Exp $
- * $FreeBSD$
  */
 /*
  * H-FSC is described in Proceedings of SIGCOMM'97,
diff --git a/sys/net/altq/altq_hfsc.h b/sys/net/altq/altq_hfsc.h
index 6a3f2205c97..13e10f50a08 100644
--- a/sys/net/altq/altq_hfsc.h
+++ b/sys/net/altq/altq_hfsc.h
@@ -28,7 +28,6 @@
  * changes without encumbrance.
  *
  * $KAME: altq_hfsc.h,v 1.12 2003/12/05 05:40:46 kjc Exp $
- * $FreeBSD$
  */
 #ifndef _ALTQ_ALTQ_HFSC_H_
 #define	_ALTQ_ALTQ_HFSC_H_
diff --git a/sys/net/altq/altq_priq.c b/sys/net/altq/altq_priq.c
index 6d26116a601..026346639b2 100644
--- a/sys/net/altq/altq_priq.c
+++ b/sys/net/altq/altq_priq.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: altq_priq.c,v 1.11 2003/09/17 14:23:25 kjc Exp $
- * $FreeBSD$
  */
 /*
  * priority queue
diff --git a/sys/net/altq/altq_priq.h b/sys/net/altq/altq_priq.h
index 08231f64b75..2b9e879570a 100644
--- a/sys/net/altq/altq_priq.h
+++ b/sys/net/altq/altq_priq.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: altq_priq.h,v 1.7 2003/10/03 05:05:15 kjc Exp $
- * $FreeBSD$
  */
 
 #ifndef _ALTQ_ALTQ_PRIQ_H_
diff --git a/sys/net/altq/altq_red.c b/sys/net/altq/altq_red.c
index e6fc423f48b..d4132fcf6a0 100644
--- a/sys/net/altq/altq_red.c
+++ b/sys/net/altq/altq_red.c
@@ -57,7 +57,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: altq_red.c,v 1.18 2003/09/05 22:40:36 itojun Exp $
- * $FreeBSD$	
  */
 
 #include "opt_altq.h"
diff --git a/sys/net/altq/altq_red.h b/sys/net/altq/altq_red.h
index 39ba43ca2ed..13edb4870a6 100644
--- a/sys/net/altq/altq_red.h
+++ b/sys/net/altq/altq_red.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: altq_red.h,v 1.8 2003/07/10 12:07:49 kjc Exp $
- * $FreeBSD$
  */
 
 #ifndef _ALTQ_ALTQ_RED_H_
diff --git a/sys/net/altq/altq_rio.c b/sys/net/altq/altq_rio.c
index a4256e2881d..300738a9e52 100644
--- a/sys/net/altq/altq_rio.c
+++ b/sys/net/altq/altq_rio.c
@@ -56,7 +56,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: altq_rio.c,v 1.17 2003/07/10 12:07:49 kjc Exp $
- * $FreeBSD$
  */
 
 #include "opt_altq.h"
diff --git a/sys/net/altq/altq_rio.h b/sys/net/altq/altq_rio.h
index 0ac54269bc3..dbd57cbc19a 100644
--- a/sys/net/altq/altq_rio.h
+++ b/sys/net/altq/altq_rio.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: altq_rio.h,v 1.9 2003/07/10 12:07:49 kjc Exp $
- * $FreeBSD$
  */
 
 #ifndef _ALTQ_ALTQ_RIO_H_
diff --git a/sys/net/altq/altq_rmclass.c b/sys/net/altq/altq_rmclass.c
index 886641065d1..cb6ce6f5e31 100644
--- a/sys/net/altq/altq_rmclass.c
+++ b/sys/net/altq/altq_rmclass.c
@@ -35,7 +35,6 @@
  *
  * @(#)rm_class.c  1.48     97/12/05 SMI
  * $KAME: altq_rmclass.c,v 1.19 2005/04/13 03:44:25 suz Exp $
- * $FreeBSD$
  */
 #include "opt_altq.h"
 #include "opt_inet.h"
diff --git a/sys/net/altq/altq_rmclass.h b/sys/net/altq/altq_rmclass.h
index 7e58ec49b94..003dd2990d2 100644
--- a/sys/net/altq/altq_rmclass.h
+++ b/sys/net/altq/altq_rmclass.h
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: altq_rmclass.h,v 1.10 2003/08/20 23:30:23 itojun Exp $
- * $FreeBSD$
  */
 
 #ifndef _ALTQ_ALTQ_RMCLASS_H_
diff --git a/sys/net/altq/altq_rmclass_debug.h b/sys/net/altq/altq_rmclass_debug.h
index 7adbaec429a..e4dd405fe10 100644
--- a/sys/net/altq/altq_rmclass_debug.h
+++ b/sys/net/altq/altq_rmclass_debug.h
@@ -28,7 +28,6 @@
  * These notices must be retained in any copies of any part of this software.
  *
  * $KAME: altq_rmclass_debug.h,v 1.3 2002/11/29 04:36:24 kjc Exp $
- * $FreeBSD$
  */
 
 #ifndef _ALTQ_ALTQ_RMCLASS_DEBUG_H_
diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c
index c8b98beaba0..3ade724818d 100644
--- a/sys/net/altq/altq_subr.c
+++ b/sys/net/altq/altq_subr.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $
- * $FreeBSD$
  */
 
 #include "opt_altq.h"
diff --git a/sys/net/altq/altq_var.h b/sys/net/altq/altq_var.h
index 3be03482b8c..838b33f7cb8 100644
--- a/sys/net/altq/altq_var.h
+++ b/sys/net/altq/altq_var.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: altq_var.h,v 1.16 2003/10/03 05:05:15 kjc Exp $
- * $FreeBSD$
  */
 #ifndef _ALTQ_ALTQ_VAR_H_
 #define	_ALTQ_ALTQ_VAR_H_
diff --git a/sys/net/altq/if_altq.h b/sys/net/altq/if_altq.h
index ad7502c8ed4..6e9d3ba1f67 100644
--- a/sys/net/altq/if_altq.h
+++ b/sys/net/altq/if_altq.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $KAME: if_altq.h,v 1.12 2005/04/13 03:44:25 suz Exp $
- * $FreeBSD$
  */
 #ifndef _ALTQ_IF_ALTQ_H_
 #define	_ALTQ_IF_ALTQ_H_
diff --git a/sys/net/if.c b/sys/net/if.c
index 2d3d85ca5ee..fd4db49a658 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #include "opt_bpf.h"
diff --git a/sys/net/if.h b/sys/net/if.h
index 2b05c14f892..4d5f4789599 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NET_IF_H_
diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index f4c3bec217d..0319807dbfd 100644
--- a/sys/net/if_arp.h
+++ b/sys/net/if_arp.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NET_IF_ARP_H_
diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c
index 15327084e02..1a2cea94ad3 100644
--- a/sys/net/if_clone.c
+++ b/sys/net/if_clone.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #include "opt_netlink.h"
diff --git a/sys/net/if_clone.h b/sys/net/if_clone.h
index 5d5b8a5141a..d44f7021299 100644
--- a/sys/net/if_clone.h
+++ b/sys/net/if_clone.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef	_NET_IF_CLONE_H_
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 62313415de9..02f3bbbfdaf 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index 9c4c03f6d79..e0ceb61741b 100644
--- a/sys/net/if_dl.h
+++ b/sys/net/if_dl.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NET_IF_DL_H_
diff --git a/sys/net/if_edsc.c b/sys/net/if_edsc.c
index 8de58371341..8a66b462d15 100644
--- a/sys/net/if_edsc.c
+++ b/sys/net/if_edsc.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index dd5c07acf63..25f4d151866 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h
index 7d2fc832da1..67e4d88426f 100644
--- a/sys/net/if_gre.h
+++ b/sys/net/if_gre.h
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: if_gre.h,v 1.13 2003/11/10 08:51:52 wiz Exp $
- * $FreeBSD$
  */
 
 #ifndef _NET_IF_GRE_H_
diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h
index b1bd7686303..92dc44d72d3 100644
--- a/sys/net/if_llc.h
+++ b/sys/net/if_llc.h
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NET_IF_LLC_H_
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index a483aea8860..e135acef18b 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_pfsync.h b/sys/net/if_pfsync.h
index ef5c2628578..1efc220aa8e 100644
--- a/sys/net/if_pfsync.h
+++ b/sys/net/if_pfsync.h
@@ -44,7 +44,6 @@
 
 /*
  *	$OpenBSD: if_pfsync.h,v 1.35 2008/06/29 08:42:15 mcbride Exp $
- *	$FreeBSD$
  */
 
 #ifndef _NET_IF_PFSYNC_H_
diff --git a/sys/net/if_tap.h b/sys/net/if_tap.h
index 0c05a5ecaf3..d84cd2eba6f 100644
--- a/sys/net/if_tap.h
+++ b/sys/net/if_tap.h
@@ -33,7 +33,6 @@
  */
 
 /*
- * $FreeBSD$
  * $Id: if_tap.h,v 0.7 2000/07/12 04:12:51 max Exp $
  */
 
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index 6794da87858..17227726a66 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_types.h	8.3 (Berkeley) 4/28/95
- * $FreeBSD$
  * $NetBSD: if_types.h,v 1.16 2000/04/19 06:30:53 itojun Exp $
  */
 
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 89d1c0c039c..48a503df7ff 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef	_NET_IF_VAR_H_
diff --git a/sys/net/ifq.h b/sys/net/ifq.h
index e4dbf8929b1..4ca57d667f7 100644
--- a/sys/net/ifq.h
+++ b/sys/net/ifq.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef	_NET_IFQ_H_
diff --git a/sys/net/netmap.h b/sys/net/netmap.h
index 4a3ede5dba9..be0c2618939 100644
--- a/sys/net/netmap.h
+++ b/sys/net/netmap.h
@@ -27,7 +27,6 @@
  */
 
 /*
- * $FreeBSD$
  *
  * Definitions of constants and the structures used by the netmap
  * framework, for the part visible to both kernel and userspace.
diff --git a/sys/net/netmap_legacy.h b/sys/net/netmap_legacy.h
index e18760726d4..6a927353d5e 100644
--- a/sys/net/netmap_legacy.h
+++ b/sys/net/netmap_legacy.h
@@ -30,7 +30,6 @@
 #define _NET_NETMAP_LEGACY_H_
 
 /*
- * $FreeBSD$
  *
  * ioctl names and related fields
  *
diff --git a/sys/net/netmap_user.h b/sys/net/netmap_user.h
index 52695391621..803033c185e 100644
--- a/sys/net/netmap_user.h
+++ b/sys/net/netmap_user.h
@@ -28,7 +28,6 @@
  */
 
 /*
- * $FreeBSD$
  *
  * Functions and macros to manipulate netmap structures and packets
  * in userspace. See netmap(4) for more information.
diff --git a/sys/net/paravirt.h b/sys/net/paravirt.h
index e2885bc017c..1a269c99c04 100644
--- a/sys/net/paravirt.h
+++ b/sys/net/paravirt.h
@@ -27,7 +27,6 @@
 #define NET_PARAVIRT_H
 
  /*
-  * $FreeBSD$
   *
  Support for virtio-like communication between host (H) and guest (G) NICs.
 
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index f0fe15a5e9e..21ebca755b3 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	$OpenBSD: pfvar.h,v 1.282 2009/01/29 15:12:28 pyr Exp $
- *	$FreeBSD$
  */
 
 #ifndef _NET_PFVAR_H_
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 14e81ebbd41..01a1db9e270 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.c	8.5 (Berkeley) 5/19/95
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/radix.h b/sys/net/radix.h
index f9987934bed..b91227dd611 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- * $FreeBSD$
  */
 
 #ifndef _RADIX_H_
diff --git a/sys/net/route.c b/sys/net/route.c
index e8b2ca60da1..f1295c5455a 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.3.1.1 (Berkeley) 2/23/95
- * $FreeBSD$
  */
 /************************************************************************
  * Note: In this file a 'fib' is a "forwarding information base"	*
diff --git a/sys/net/route.h b/sys/net/route.h
index ad184729350..1a302c4fda1 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef _NET_ROUTE_H_
diff --git a/sys/net/route/route_ifaddrs.c b/sys/net/route/route_ifaddrs.c
index 4393ab63563..d4db9d4259e 100644
--- a/sys/net/route/route_ifaddrs.c
+++ b/sys/net/route/route_ifaddrs.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.3.1.1 (Berkeley) 2/23/95
- * $FreeBSD$
  */
 
 #include "opt_route.h"
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 548caf0ef23..1a83fc2d8ab 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.7 (Berkeley) 10/12/95
- * $FreeBSD$
  */
 #include "opt_ddb.h"
 #include "opt_route.h"
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index 9c342474089..2874198758e 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)slcompress.c	8.2 (Berkeley) 4/16/94
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index 76b61942f9a..c9204f2ebc0 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -33,7 +33,6 @@
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
- * $FreeBSD$
  */
 
 #ifndef _NET_SLCOMPRESS_H_
diff --git a/sys/net80211/ieee80211_mesh.h b/sys/net80211/ieee80211_mesh.h
index e797420bd3e..c87ec2f95eb 100644
--- a/sys/net80211/ieee80211_mesh.h
+++ b/sys/net80211/ieee80211_mesh.h
@@ -27,7 +27,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  * 
- * $FreeBSD$
  */
 #ifndef _NET80211_IEEE80211_MESH_H_
 #define _NET80211_IEEE80211_MESH_H_
diff --git a/sys/netgraph/bluetooth/common/ng_bluetooth.c b/sys/netgraph/bluetooth/common/ng_bluetooth.c
index e105452dd12..e3ad2f4e9d3 100644
--- a/sys/netgraph/bluetooth/common/ng_bluetooth.c
+++ b/sys/netgraph/bluetooth/common/ng_bluetooth.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_bluetooth.c,v 1.3 2003/04/26 22:37:31 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index 61d4ec32384..76a71e2f8d5 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
index 84a4fe424d3..7b97ad245a6 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt_var.h,v 1.2 2003/03/22 23:44:36 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NG_UBT_VAR_H_
diff --git a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
index c0e00b7f6a8..8f924c0e7a0 100644
--- a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
+++ b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/stdint.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
index 7d63ed4fb6c..897a8ed2e91 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_cmds.c,v 1.4 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
index 32abaf476e3..9c3f752965a 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_cmds.h,v 1.1 2002/11/24 19:46:58 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_HCI_CMDS_H_
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
index a06e5ae0b9f..7d7e1688dcb 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_evnt.c,v 1.6 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
index c350696e3f7..faaddf0f94c 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_evnt.h,v 1.1 2002/11/24 19:46:58 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_HCI_EVNT_H_
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_main.c b/sys/netgraph/bluetooth/hci/ng_hci_main.c
index 1d46c7dc98a..13bf970f013 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_main.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_main.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_main.c,v 1.2 2003/03/18 00:09:36 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.c b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
index f05de42ee2f..2ec9601ae69 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_misc.c,v 1.5 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.h b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
index aa1b5174c66..0dd1289b807 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_misc.h,v 1.3 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_HCI_MISC_H_
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_prse.h b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
index 71c775005bb..98150ebb05f 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_prse.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_prse.h,v 1.2 2003/03/18 00:09:36 max Exp $
- * $FreeBSD$
  */
 
 /***************************************************************************
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
index a34c5e1d513..ac1520c07f6 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_ulpi.c,v 1.7 2003/09/08 18:57:51 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
index 24b386154dc..2d855794b25 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_ulpi.h,v 1.2 2003/04/26 22:35:21 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_HCI_ULPI_H_
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_var.h b/sys/netgraph/bluetooth/hci/ng_hci_var.h
index b94502a1b30..a3f18779405 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_var.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_var.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci_var.h,v 1.3 2003/04/26 22:35:21 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_HCI_VAR_H_
diff --git a/sys/netgraph/bluetooth/include/ng_bluetooth.h b/sys/netgraph/bluetooth/include/ng_bluetooth.h
index 11ccc4b002d..59d193f8251 100644
--- a/sys/netgraph/bluetooth/include/ng_bluetooth.h
+++ b/sys/netgraph/bluetooth/include/ng_bluetooth.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_bluetooth.h,v 1.4 2003/04/26 22:32:34 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_BLUETOOTH_H_
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket.h b/sys/netgraph/bluetooth/include/ng_btsocket.h
index 8782ecd8649..1b3b6436944 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket.h,v 1.8 2003/04/26 22:32:10 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_BTSOCKET_H_
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
index 797762179a4..05c109df157 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_hci_raw.h,v 1.3 2003/03/25 23:53:32 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_BTSOCKET_HCI_RAW_H_
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
index a03fc299eb4..baaef9abb73 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_l2cap.h,v 1.4 2003/03/25 23:53:33 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_BTSOCKET_L2CAP_H_
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
index 1d4f3d59743..88c0f898858 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_rfcomm.h,v 1.10 2003/03/29 22:27:42 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_BTSOCKET_RFCOMM_H_
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_sco.h b/sys/netgraph/bluetooth/include/ng_btsocket_sco.h
index 2d97ad75e20..071ddb8d80e 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_sco.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_sco.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_sco.h,v 1.3 2005/10/31 18:08:52 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_BTSOCKET_SCO_H_
diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h
index 9c798f38d51..e4d33d8661b 100644
--- a/sys/netgraph/bluetooth/include/ng_hci.h
+++ b/sys/netgraph/bluetooth/include/ng_hci.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_hci.h,v 1.2 2003/03/18 00:09:37 max Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/netgraph/bluetooth/include/ng_l2cap.h b/sys/netgraph/bluetooth/include/ng_l2cap.h
index d79981295f8..416db51e1aa 100644
--- a/sys/netgraph/bluetooth/include/ng_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_l2cap.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap.h,v 1.2 2003/04/27 00:52:26 max Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/netgraph/bluetooth/include/ng_ubt.h b/sys/netgraph/bluetooth/include/ng_ubt.h
index b91e0bd0a1d..9161cf079aa 100644
--- a/sys/netgraph/bluetooth/include/ng_ubt.h
+++ b/sys/netgraph/bluetooth/include/ng_ubt.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt.h,v 1.6 2003/04/13 21:34:42 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NG_UBT_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
index c63482148dc..4f87692f5ef 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_cmds.c,v 1.2 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
index 5e7375a82b3..fbb754107d7 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_cmds.h,v 1.4 2003/04/01 18:15:26 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_L2CAP_CMDS_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
index 9d2f1f82661..82bfaeb318f 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_evnt.c,v 1.5 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
index 157d56af355..f423ab1d60a 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_evnt.h,v 1.1 2002/11/24 19:47:06 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_L2CAP_EVNT_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
index 1e67961ad37..4647bd2555f 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_llpi.c,v 1.5 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
index ddafac868d6..02d12a18c36 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_llpi.h,v 1.2 2003/04/28 21:44:59 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_L2CAP_LLPI_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
index 3e6c47dbc5d..139be0380e0 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_main.c,v 1.2 2003/04/28 21:44:59 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
index dadb2294980..d8e55cd07ab 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_misc.c,v 1.5 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
index 61718f7750a..16f4664d89c 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_misc.h,v 1.3 2003/09/08 19:11:45 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_L2CAP_MISC_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
index 422308122ec..909e87f187d 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_prse.h,v 1.2 2003/04/28 21:44:59 max Exp $
- * $FreeBSD$
  */
 
 /***************************************************************************
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
index 3232301bb61..02674bf6fa8 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_ulpi.c,v 1.1 2002/11/24 19:47:06 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
index 8a2eb5a1d1c..5dc9bc79f1a 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_ulpi.h,v 1.1 2002/11/24 19:47:06 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_L2CAP_ULPI_H_
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
index bf06aa20c4c..9a782bea46d 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_l2cap_var.h,v 1.2 2003/04/28 21:44:59 max Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_L2CAP_VAR_H_
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket.c b/sys/netgraph/bluetooth/socket/ng_btsocket.c
index a126bf25368..03fa322e777 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket.c,v 1.4 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
index ae360ea96ae..93599169692 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_hci_raw.c,v 1.14 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index b34af8d73c6..8fc64bb7092 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_l2cap.c,v 1.16 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
index 72c5c3373ae..6ddefe4be15 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_l2cap_raw.c,v 1.12 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
index 1ee17491561..00225f8240e 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
index 2f55bc97867..5e198956a82 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_btsocket_sco.c,v 1.2 2005/10/31 18:08:51 max Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netgraph/netflow/netflow.h b/sys/netgraph/netflow/netflow.h
index ebc387a85c0..e4a07e1648a 100644
--- a/sys/netgraph/netflow/netflow.h
+++ b/sys/netgraph/netflow/netflow.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	 $SourceForge: netflow.h,v 1.8 2004/09/16 17:05:11 glebius Exp $
- *	 $FreeBSD$
  */
 
 /* netflow timeouts in seconds */
diff --git a/sys/netgraph/netflow/ng_netflow.h b/sys/netgraph/netflow/ng_netflow.h
index 9fa77beb7cf..ec62ccd3f7b 100644
--- a/sys/netgraph/netflow/ng_netflow.h
+++ b/sys/netgraph/netflow/ng_netflow.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  *	 $SourceForge: ng_netflow.h,v 1.26 2004/09/04 15:44:55 glebius Exp $
- *	 $FreeBSD$
  */
 
 #ifndef	_NG_NETFLOW_H_
diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c
index 35873ee4651..0b46b4b69f4 100644
--- a/sys/netgraph/ng_mppc.c
+++ b/sys/netgraph/ng_mppc.c
@@ -38,7 +38,6 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_mppc.c,v 1.4 1999/11/25 00:10:12 archie Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/netgraph/ng_mppc.h b/sys/netgraph/ng_mppc.h
index 83bbdb8f5ad..c528539e581 100644
--- a/sys/netgraph/ng_mppc.h
+++ b/sys/netgraph/ng_mppc.h
@@ -38,7 +38,6 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_mppc.h,v 1.3 2000/02/12 01:17:22 archie Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_NG_MPPC_H_
diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c
index c3c2126bdef..e1107027448 100644
--- a/sys/netgraph/ng_parse.c
+++ b/sys/netgraph/ng_parse.c
@@ -38,7 +38,6 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_parse.c,v 1.3 1999/11/29 01:43:48 archie Exp $
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/netgraph/ng_parse.h b/sys/netgraph/ng_parse.h
index e1b6c399e8d..a662d38f446 100644
--- a/sys/netgraph/ng_parse.h
+++ b/sys/netgraph/ng_parse.h
@@ -38,7 +38,6 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $Whistle: ng_parse.h,v 1.2 1999/11/29 01:43:48 archie Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETGRAPH_NG_PARSE_H_
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index c1ed83e5404..a53a9d7865c 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_ICMP_VAR_H_
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 2f56e7a91e2..5d5b438987a 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
- * $FreeBSD$
  */
 
 #ifndef _NETINET_IF_ETHER_H_
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index 873d6419bd5..ae2d6670844 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_IGMP_H_
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index cf72c73a1c9..07d05a40a66 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_IGMP_VAR_H_
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 0106f55e1f1..80c872367f9 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_H_
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 44e9cfd3c86..19d281937b5 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_PCB_H_
diff --git a/sys/netinet/in_pcb_var.h b/sys/netinet/in_pcb_var.h
index 51fae58ea6a..f2191cf7338 100644
--- a/sys/netinet/in_pcb_var.h
+++ b/sys/netinet/in_pcb_var.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_PCB_VAR_H_
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index 538a4026359..77c66c479b7 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_SYSTM_H_
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index ded314bcfbc..59d6acc6c13 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_VAR_H_
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index 68aa6a69225..df541ebb7ed 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip.h	8.2 (Berkeley) 6/1/94
- * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_H_
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index fefece665a0..7ff3d59ba8f 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_ICMP_H_
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index aaf87770001..aefc0933485 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_MROUTE_H_
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index cb4e4fbd1f4..06560fb52af 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_VAR_H_
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index dbafc96927b..209be3c9345 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_H_
diff --git a/sys/netinet/tcp_ecn.h b/sys/netinet/tcp_ecn.h
index 3cc7715b956..7005761972a 100644
--- a/sys/netinet/tcp_ecn.h
+++ b/sys/netinet/tcp_ecn.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_ecn.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_ECN_H_
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index b449727836c..5e90240f94d 100644
--- a/sys/netinet/tcp_fsm.h
+++ b/sys/netinet/tcp_fsm.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_FSM_H_
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index c77fd0fa1f6..0dde5067df7 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_seq.h	8.3 (Berkeley) 6/21/95
- * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_SEQ_H_
diff --git a/sys/netinet/tcp_syncache.h b/sys/netinet/tcp_syncache.h
index 1b2d5dd5d22..878b1ddabc7 100644
--- a/sys/netinet/tcp_syncache.h
+++ b/sys/netinet/tcp_syncache.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_SYNCACHE_H_
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 9ee1d5fcdc9..f3aa03e611a 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_TIMER_H_
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index d6d07167608..cd571213252 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_VAR_H_
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index f3ed5be9538..a4b2c81def3 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_TCPIP_H_
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index d7def4e41fc..adf4d5fe644 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_UDP_H_
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 2b91518c0ff..a2e9c338816 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_UDP_VAR_H_
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index c15b2485964..78c9cd56ed6 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -60,7 +60,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $FreeBSD$
  */
 
 #ifndef __KAME_NETINET_IN_H_INCLUDED_
diff --git a/sys/netinet6/in6_ifattach.h b/sys/netinet6/in6_ifattach.h
index 1e038fa8319..b614019091f 100644
--- a/sys/netinet6/in6_ifattach.h
+++ b/sys/netinet6/in6_ifattach.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	$KAME: in6_ifattach.h,v 1.14 2001/02/08 12:48:39 jinmei Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETINET6_IN6_IFATTACH_H_
diff --git a/sys/netinet6/in6_pcb.h b/sys/netinet6/in6_pcb.h
index 92cec00bce3..a11dbdb8c4d 100644
--- a/sys/netinet6/in6_pcb.h
+++ b/sys/netinet6/in6_pcb.h
@@ -60,7 +60,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET6_IN6_PCB_H_
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index f80fd80d98f..3d037bc644d 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -60,7 +60,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET6_IN6_VAR_H_
diff --git a/sys/netinet6/ip6_ecn.h b/sys/netinet6/ip6_ecn.h
index dade6573207..45a28e9f419 100644
--- a/sys/netinet6/ip6_ecn.h
+++ b/sys/netinet6/ip6_ecn.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	$KAME: ip_ecn.h,v 1.5 2000/03/27 04:58:38 sumikawa Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h
index 40a857707de..dd23196c799 100644
--- a/sys/netinet6/ip6_mroute.h
+++ b/sys/netinet6/ip6_mroute.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	$KAME: ip6_mroute.h,v 1.19 2001/06/14 06:12:55 suz Exp $
- * $FreeBSD$
  */
 
 /*	BSDI ip_mroute.h,v 2.5 1996/10/11 16:01:48 pjd Exp	*/
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index e538afd9399..a3b3b0cb358 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -60,7 +60,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET6_IP6_VAR_H_
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index 76e91905bf5..3e7f2d814d4 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	$KAME: nd6.h,v 1.76 2001/12/18 02:10:31 itojun Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETINET6_ND6_H_
diff --git a/sys/netinet6/pim6.h b/sys/netinet6/pim6.h
index 45346e89f4f..d3572593ddb 100644
--- a/sys/netinet6/pim6.h
+++ b/sys/netinet6/pim6.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	$KAME: pim6.h,v 1.3 2000/03/25 07:23:58 sumikawa Exp $
- * $FreeBSD$
  */
 /*
  * Protocol Independent Multicast (PIM) definitions
diff --git a/sys/netinet6/pim6_var.h b/sys/netinet6/pim6_var.h
index 7288c67eee2..02c5153c096 100644
--- a/sys/netinet6/pim6_var.h
+++ b/sys/netinet6/pim6_var.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	$KAME: pim6_var.h,v 1.8 2000/06/06 08:07:43 jinmei Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/netinet6/raw_ip6.h b/sys/netinet6/raw_ip6.h
index e2dcac36da6..18aa03f71e4 100644
--- a/sys/netinet6/raw_ip6.h
+++ b/sys/netinet6/raw_ip6.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	$KAME: raw_ip6.h,v 1.2 2001/05/27 13:28:35 itojun Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETINET6_RAW_IP6_H_
diff --git a/sys/netinet6/scope6_var.h b/sys/netinet6/scope6_var.h
index 181e30afe6f..f914d5981bb 100644
--- a/sys/netinet6/scope6_var.h
+++ b/sys/netinet6/scope6_var.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	$KAME: scope6_var.h,v 1.4 2000/05/18 15:03:27 jinmei Exp $
- * $FreeBSD$
  */
 
 #ifndef _NETINET6_SCOPE6_VAR_H_
diff --git a/sys/netinet6/tcp6_var.h b/sys/netinet6/tcp6_var.h
index 49e1591294d..e4d02a4876a 100644
--- a/sys/netinet6/tcp6_var.h
+++ b/sys/netinet6/tcp6_var.h
@@ -58,7 +58,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP6_VAR_H_
diff --git a/sys/netinet6/udp6_var.h b/sys/netinet6/udp6_var.h
index 5d2c793bee0..4600d53b7b6 100644
--- a/sys/netinet6/udp6_var.h
+++ b/sys/netinet6/udp6_var.h
@@ -59,7 +59,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET6_UDP6_VAR_H_
diff --git a/sys/netpfil/ipfilter/netinet/ip_compat.h b/sys/netpfil/ipfilter/netinet/ip_compat.h
index 8266f22a63a..363f0b59f92 100644
--- a/sys/netpfil/ipfilter/netinet/ip_compat.h
+++ b/sys/netpfil/ipfilter/netinet/ip_compat.h
@@ -4,7 +4,6 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_compat.h	1.8 1/14/96
- * $FreeBSD$
  * Id: ip_compat.h,v 2.142.2.57 2007/10/10 09:51:42 darrenr Exp $
  */
 
diff --git a/sys/netpfil/ipfilter/netinet/ip_fil.h b/sys/netpfil/ipfilter/netinet/ip_fil.h
index 002ddfdc834..3db2b23512e 100644
--- a/sys/netpfil/ipfilter/netinet/ip_fil.h
+++ b/sys/netpfil/ipfilter/netinet/ip_fil.h
@@ -4,7 +4,6 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_fil.h	1.35 6/5/96
- * $FreeBSD$
  * Id: ip_fil.h,v 2.170.2.51 2007/10/10 09:48:03 darrenr Exp $
  */
 
diff --git a/sys/netpfil/ipfilter/netinet/ip_frag.h b/sys/netpfil/ipfilter/netinet/ip_frag.h
index b85e009b215..4718e6586ef 100644
--- a/sys/netpfil/ipfilter/netinet/ip_frag.h
+++ b/sys/netpfil/ipfilter/netinet/ip_frag.h
@@ -6,7 +6,6 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_frag.h	1.5 3/24/96
- * $FreeBSD$
  * Id: ip_frag.h,v 2.23.2.1 2004/03/29 16:21:56 darrenr Exp
  */
 
diff --git a/sys/netpfil/ipfilter/netinet/ip_nat.h b/sys/netpfil/ipfilter/netinet/ip_nat.h
index aac8c326aa0..b299ca47723 100644
--- a/sys/netpfil/ipfilter/netinet/ip_nat.h
+++ b/sys/netpfil/ipfilter/netinet/ip_nat.h
@@ -6,7 +6,6 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_nat.h	1.5 2/4/96
- * $FreeBSD$
  * Id: ip_nat.h,v 2.90.2.20 2007/09/25 08:27:32 darrenr Exp $
  */
 
diff --git a/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c b/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c
index 1589a20a6fe..27f0322f76f 100644
--- a/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c
+++ b/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c
@@ -9,7 +9,6 @@
  *
  * Simple RCMD transparent proxy for in-kernel use.  For use with the NAT
  * code.
- * $FreeBSD$
  */
 
 #define	IPF_RCMD_PROXY
diff --git a/sys/netpfil/ipfilter/netinet/ip_state.h b/sys/netpfil/ipfilter/netinet/ip_state.h
index 26377bc7f5d..775ac00953e 100644
--- a/sys/netpfil/ipfilter/netinet/ip_state.h
+++ b/sys/netpfil/ipfilter/netinet/ip_state.h
@@ -6,7 +6,6 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_state.h	1.3 1/12/96 (C) 1995 Darren Reed
- * $FreeBSD$
  * Id: ip_state.h,v 2.68.2.10 2007/10/16 09:33:24 darrenr Exp $
  */
 #ifndef	__IP_STATE_H__
diff --git a/sys/netpfil/ipfilter/netinet/ipl.h b/sys/netpfil/ipfilter/netinet/ipl.h
index ca3baf2c926..f9a2594c2a3 100644
--- a/sys/netpfil/ipfilter/netinet/ipl.h
+++ b/sys/netpfil/ipfilter/netinet/ipl.h
@@ -6,7 +6,6 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ipl.h	1.21 6/5/96
- * $FreeBSD$
  * Id: ipl.h,v 2.52.2.30 2007/10/16 09:41:00 darrenr Exp $
  */
 
diff --git a/sys/netpfil/ipfw/dn_sched_fifo.c b/sys/netpfil/ipfw/dn_sched_fifo.c
index 454e1f4ea93..93c5959a529 100644
--- a/sys/netpfil/ipfw/dn_sched_fifo.c
+++ b/sys/netpfil/ipfw/dn_sched_fifo.c
@@ -27,7 +27,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifdef _KERNEL
diff --git a/sys/netpfil/ipfw/dn_sched_prio.c b/sys/netpfil/ipfw/dn_sched_prio.c
index 74e07305e9c..07523e8ae03 100644
--- a/sys/netpfil/ipfw/dn_sched_prio.c
+++ b/sys/netpfil/ipfw/dn_sched_prio.c
@@ -27,7 +27,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 #ifdef _KERNEL
 #include <sys/malloc.h>
diff --git a/sys/netpfil/ipfw/dn_sched_qfq.c b/sys/netpfil/ipfw/dn_sched_qfq.c
index 23ea60da830..1f8ef86388e 100644
--- a/sys/netpfil/ipfw/dn_sched_qfq.c
+++ b/sys/netpfil/ipfw/dn_sched_qfq.c
@@ -27,7 +27,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifdef _KERNEL
diff --git a/sys/netpfil/ipfw/dn_sched_rr.c b/sys/netpfil/ipfw/dn_sched_rr.c
index 77db7a6a657..5df61aa67ff 100644
--- a/sys/netpfil/ipfw/dn_sched_rr.c
+++ b/sys/netpfil/ipfw/dn_sched_rr.c
@@ -27,7 +27,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifdef _KERNEL
diff --git a/sys/netpfil/ipfw/dn_sched_wf2q.c b/sys/netpfil/ipfw/dn_sched_wf2q.c
index 5b69eb083d7..72117e473bf 100644
--- a/sys/netpfil/ipfw/dn_sched_wf2q.c
+++ b/sys/netpfil/ipfw/dn_sched_wf2q.c
@@ -28,7 +28,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 #ifdef _KERNEL
diff --git a/sys/netpfil/ipfw/ip_dn_glue.c b/sys/netpfil/ipfw/ip_dn_glue.c
index 29a426b91e4..204b3409178 100644
--- a/sys/netpfil/ipfw/ip_dn_glue.c
+++ b/sys/netpfil/ipfw/ip_dn_glue.c
@@ -27,7 +27,6 @@
  */
 
 /*
- * $FreeBSD$
  *
  * Binary compatibility support for /sbin/ipfw RELENG_7 and RELENG_8
  */
diff --git a/sys/netpfil/ipfw/test/dn_test.h b/sys/netpfil/ipfw/test/dn_test.h
index f2f21a0811d..d7cbebd4252 100644
--- a/sys/netpfil/ipfw/test/dn_test.h
+++ b/sys/netpfil/ipfw/test/dn_test.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * userspace compatibility code for dummynet schedulers
  */
diff --git a/sys/netpfil/ipfw/test/main.c b/sys/netpfil/ipfw/test/main.c
index 999c0fadd07..d5286c7ea7c 100644
--- a/sys/netpfil/ipfw/test/main.c
+++ b/sys/netpfil/ipfw/test/main.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Testing program for schedulers
  *
diff --git a/sys/netpfil/ipfw/test/mylist.h b/sys/netpfil/ipfw/test/mylist.h
index 2a62546e543..f8ef327946d 100644
--- a/sys/netpfil/ipfw/test/mylist.h
+++ b/sys/netpfil/ipfw/test/mylist.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * linux-like bidirectional lists
  */
diff --git a/sys/netpfil/ipfw/test/test_dn_sched.c b/sys/netpfil/ipfw/test/test_dn_sched.c
index e610019630b..b530017c088 100644
--- a/sys/netpfil/ipfw/test/test_dn_sched.c
+++ b/sys/netpfil/ipfw/test/test_dn_sched.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * library functions for userland testing of dummynet schedulers
  */
diff --git a/sys/netpfil/pf/pf.h b/sys/netpfil/pf/pf.h
index fc3ea6c9e1d..d83aa5e579b 100644
--- a/sys/netpfil/pf/pf.h
+++ b/sys/netpfil/pf/pf.h
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	$OpenBSD: pfvar.h,v 1.282 2009/01/29 15:12:28 pyr Exp $
- *	$FreeBSD$
  */
 
 #ifndef	_NET_PF_H_
diff --git a/sys/netpfil/pf/pf_altq.h b/sys/netpfil/pf/pf_altq.h
index 0b913a19c2f..c3ff3eb4a74 100644
--- a/sys/netpfil/pf/pf_altq.h
+++ b/sys/netpfil/pf/pf_altq.h
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	$OpenBSD: pfvar.h,v 1.282 2009/01/29 15:12:28 pyr Exp $
- *	$FreeBSD$
  */
 
 #ifndef	_NET_PF_ALTQ_H_
diff --git a/sys/nfs/nfs_lock.h b/sys/nfs/nfs_lock.h
index 63fdb202d77..587b1846786 100644
--- a/sys/nfs/nfs_lock.h
+++ b/sys/nfs/nfs_lock.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *      from nfs_lock.h,v 2.2 1998/04/28 19:38:41 don Exp
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h
index ff038d0e38a..6cd092611fa 100644
--- a/sys/nfs/nfsdiskless.h
+++ b/sys/nfs/nfsdiskless.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _NFSCLIENT_NFSDISKLESS_H_
diff --git a/sys/nfs/nfsproto.h b/sys/nfs/nfsproto.h
index 4f7f838d01d..cb8a1e6b0c7 100644
--- a/sys/nfs/nfsproto.h
+++ b/sys/nfs/nfsproto.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsproto.h  8.2 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _NFS_NFSPROTO_H_
diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h
index 84155035c1c..44ee55115f9 100644
--- a/sys/nfs/xdr_subs.h
+++ b/sys/nfs/xdr_subs.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)xdr_subs.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _NFS_XDR_SUBS_H_
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index af9e6f856c4..63b77695e43 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
  */
 
 #ifndef _NFSCLIENT_NFS_H_
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 4635694e8a0..060b43d7f42 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
  */
 
 #ifndef _NFSCLIENT_NFSARGS_H_
diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index b048c1044ba..b9bcdd367c4 100644
--- a/sys/nfsclient/nfsmount.h
+++ b/sys/nfsclient/nfsmount.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _NFSCLIENT_NFSMOUNT_H_
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index 903fe1a2131..ad849faa329 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
  */
 
 #ifndef _NFSCLIENT_NFSNODE_H_
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index c65ae6de2c6..2a6a12da52e 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
  */
 
 #ifndef _NFSCLIENT_NFSSTATS_H_
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 1c99c9aa9fb..22b64ac49dd 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
  */
 
 #ifndef _NFSSERVER_NFS_H_
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 1d9b2a88b2e..fb324aeb5dc 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD$
  */
 
 #ifndef _NFSSERVER_NFSRVSTATS_H_
diff --git a/sys/opencrypto/_cryptodev.h b/sys/opencrypto/_cryptodev.h
index d13b41da4be..cc6a247a885 100644
--- a/sys/opencrypto/_cryptodev.h
+++ b/sys/opencrypto/_cryptodev.h
@@ -1,7 +1,6 @@
 /*
  * This trivial work is released to the public domain, or licensed under the
  * terms of the CC0, at your option.
- * $FreeBSD$
  */
 #pragma once
 
diff --git a/sys/powerpc/include/_align.h b/sys/powerpc/include/_align.h
index 9b425b6ee1e..63ead9e7bff 100644
--- a/sys/powerpc/include/_align.h
+++ b/sys/powerpc/include/_align.h
@@ -37,7 +37,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
  */
 
 #ifndef _POWERPC_INCLUDE__ALIGN_H_
diff --git a/sys/powerpc/include/_inttypes.h b/sys/powerpc/include/_inttypes.h
index 8d10a76b3ad..4d1b52da6ce 100644
--- a/sys/powerpc/include/_inttypes.h
+++ b/sys/powerpc/include/_inttypes.h
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h
index b317ce8635e..956a9c1e9f1 100644
--- a/sys/powerpc/include/_limits.h
+++ b/sys/powerpc/include/_limits.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h
index f3163ea6d9d..3cd6e90b79b 100644
--- a/sys/powerpc/include/_types.h
+++ b/sys/powerpc/include/_types.h
@@ -35,7 +35,6 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/powerpc/include/asm.h b/sys/powerpc/include/asm.h
index 2dd24ebf2bb..35a8536776e 100644
--- a/sys/powerpc/include/asm.h
+++ b/sys/powerpc/include/asm.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: asm.h,v 1.6.18.1 2000/07/25 08:37:14 kleink Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/powerpc/include/bat.h b/sys/powerpc/include/bat.h
index 641fe2eebf4..e6f1ab72f51 100644
--- a/sys/powerpc/include/bat.h
+++ b/sys/powerpc/include/bat.h
@@ -60,7 +60,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: bat.h,v 1.2 1999/12/18 01:36:06 thorpej Exp $
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_BAT_H_
diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h
index 6eaa4a48a90..02ff42877f0 100644
--- a/sys/powerpc/include/cpu.h
+++ b/sys/powerpc/include/cpu.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: cpu.h,v 1.11 2000/05/26 21:19:53 thorpej Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/powerpc/include/db_machdep.h b/sys/powerpc/include/db_machdep.h
index c0dd7415bcb..369fd9e9ddd 100644
--- a/sys/powerpc/include/db_machdep.h
+++ b/sys/powerpc/include/db_machdep.h
@@ -25,7 +25,6 @@
  *
  *	$OpenBSD: db_machdep.h,v 1.2 1997/03/21 00:48:48 niklas Exp $
  *	$NetBSD: db_machdep.h,v 1.4.22.1 2000/08/05 11:10:43 wiz Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/powerpc/include/endian.h b/sys/powerpc/include/endian.h
index 0fac5036163..0d8a0145788 100644
--- a/sys/powerpc/include/endian.h
+++ b/sys/powerpc/include/endian.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/powerpc/include/float.h b/sys/powerpc/include/float.h
index 575b50fbbd0..7e327bba4f6 100644
--- a/sys/powerpc/include/float.h
+++ b/sys/powerpc/include/float.h
@@ -30,7 +30,6 @@
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
  *	from: FreeBSD: src/sys/i386/include/float.h,v 1.8 1999/08/28 00:44:11
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/powerpc/include/fpu.h b/sys/powerpc/include/fpu.h
index 19f0cb0c9a6..30df3a470b0 100644
--- a/sys/powerpc/include/fpu.h
+++ b/sys/powerpc/include/fpu.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: fpu.h,v 1.2 1999/12/07 15:14:56 danw Exp $
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_FPU_H_
diff --git a/sys/powerpc/include/frame.h b/sys/powerpc/include/frame.h
index 7a395d7b619..0841477d5fe 100644
--- a/sys/powerpc/include/frame.h
+++ b/sys/powerpc/include/frame.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: frame.h,v 1.2 1999/01/10 10:13:15 tsubai Exp $
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_FRAME_H_
diff --git a/sys/powerpc/include/hid.h b/sys/powerpc/include/hid.h
index 1b038111534..090dd687d63 100644
--- a/sys/powerpc/include/hid.h
+++ b/sys/powerpc/include/hid.h
@@ -26,7 +26,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: hid.h,v 1.2 2001/08/22 21:05:25 matt Exp $
- * $FreeBSD$
  */
 
 #ifndef _POWERPC_HID_H_
diff --git a/sys/powerpc/include/ieee.h b/sys/powerpc/include/ieee.h
index 5610a5a5bc5..aefa3e9b4cf 100644
--- a/sys/powerpc/include/ieee.h
+++ b/sys/powerpc/include/ieee.h
@@ -39,7 +39,6 @@
  *
  *	@(#)ieee.h	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: ieee.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_IEEE_H_
diff --git a/sys/powerpc/include/ieeefp.h b/sys/powerpc/include/ieeefp.h
index 59816da8027..3aa92ff4522 100644
--- a/sys/powerpc/include/ieeefp.h
+++ b/sys/powerpc/include/ieeefp.h
@@ -2,7 +2,6 @@
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
  * $NetBSD: ieeefp.h,v 1.2 1999/07/07 01:52:26 danw Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/powerpc/include/in_cksum.h b/sys/powerpc/include/in_cksum.h
index d9830168f5a..356c7c564f3 100644
--- a/sys/powerpc/include/in_cksum.h
+++ b/sys/powerpc/include/in_cksum.h
@@ -31,7 +31,6 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/powerpc/include/limits.h b/sys/powerpc/include/limits.h
index f2a4bf75fe2..c6da8ec92fd 100644
--- a/sys/powerpc/include/limits.h
+++ b/sys/powerpc/include/limits.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/powerpc/include/minidump.h b/sys/powerpc/include/minidump.h
index 3a80acb7de6..bef38c2cd70 100644
--- a/sys/powerpc/include/minidump.h
+++ b/sys/powerpc/include/minidump.h
@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * From i386: FreeBSD:  157909 2006-04-21 04:28:43Z peter
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_MINIDUMP_H_
diff --git a/sys/powerpc/include/openpicreg.h b/sys/powerpc/include/openpicreg.h
index 70b07447aa3..16f0295469e 100644
--- a/sys/powerpc/include/openpicreg.h
+++ b/sys/powerpc/include/openpicreg.h
@@ -26,7 +26,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * from NetBSD: openpicreg.h,v 1.3 2001/08/30 03:08:52 briggs Exp
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/powerpc/include/param.h b/sys/powerpc/include/param.h
index 600d0d31019..debd158df6b 100644
--- a/sys/powerpc/include/param.h
+++ b/sys/powerpc/include/param.h
@@ -37,7 +37,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
  */
 
 #ifndef _POWERPC_INCLUDE_PARAM_H_
diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h
index bff58cfa7bb..e5e6e322340 100644
--- a/sys/powerpc/include/pcb.h
+++ b/sys/powerpc/include/pcb.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: pcb.h,v 1.4 2000/06/04 11:57:17 tsubai Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PCB_H_
diff --git a/sys/powerpc/include/pio.h b/sys/powerpc/include/pio.h
index 263188c57fb..a7733453fa0 100644
--- a/sys/powerpc/include/pio.h
+++ b/sys/powerpc/include/pio.h
@@ -32,7 +32,6 @@
  *
  *	$NetBSD: pio.h,v 1.1 1998/05/15 10:15:54 tsubai Exp $
  *	$OpenBSD: pio.h,v 1.1 1997/10/13 10:53:47 pefo Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PIO_H_
diff --git a/sys/powerpc/include/platform.h b/sys/powerpc/include/platform.h
index de05801788e..67ec009a1f5 100644
--- a/sys/powerpc/include/platform.h
+++ b/sys/powerpc/include/platform.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: powerpc.h,v 1.3 2000/06/01 00:49:59 matt Exp $
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_PLATFORM_H_
diff --git a/sys/powerpc/include/proc.h b/sys/powerpc/include/proc.h
index 0f8d36bfe85..c8c9b637071 100644
--- a/sys/powerpc/include/proc.h
+++ b/sys/powerpc/include/proc.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: proc.h,v 1.2 1997/04/16 22:57:48 thorpej Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/powerpc/include/profile.h b/sys/powerpc/include/profile.h
index bea1b3e98e6..7588cc6a2ca 100644
--- a/sys/powerpc/include/profile.h
+++ b/sys/powerpc/include/profile.h
@@ -28,7 +28,6 @@
  *
  *	from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp
  *	from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/powerpc/include/psl.h b/sys/powerpc/include/psl.h
index 9d1c746de74..86c0b370798 100644
--- a/sys/powerpc/include/psl.h
+++ b/sys/powerpc/include/psl.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: psl.h,v 1.5 2000/11/19 19:52:37 matt Exp $
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_PSL_H_
diff --git a/sys/powerpc/include/pte.h b/sys/powerpc/include/pte.h
index 9dc2787cf2f..ed926f80c87 100644
--- a/sys/powerpc/include/pte.h
+++ b/sys/powerpc/include/pte.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: pte.h,v 1.2 1998/08/31 14:43:40 tsubai Exp $
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_PTE_H_
diff --git a/sys/powerpc/include/ptrace.h b/sys/powerpc/include/ptrace.h
index 4880b1c05f3..36271c143fe 100644
--- a/sys/powerpc/include/ptrace.h
+++ b/sys/powerpc/include/ptrace.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/powerpc/include/setjmp.h b/sys/powerpc/include/setjmp.h
index b95a1115be9..5dc463619bc 100644
--- a/sys/powerpc/include/setjmp.h
+++ b/sys/powerpc/include/setjmp.h
@@ -1,6 +1,5 @@
 /*-
  *	$NetBSD: setjmp.h,v 1.3 1998/09/16 23:51:27 thorpej Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_SETJMP_H_
diff --git a/sys/powerpc/include/signal.h b/sys/powerpc/include/signal.h
index 4302ad23473..0d5bf48e763 100644
--- a/sys/powerpc/include/signal.h
+++ b/sys/powerpc/include/signal.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: signal.h,v 1.4 1998/09/14 02:48:34 thorpej Exp $
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h
index 04cc9cf3ecc..751a9e8184b 100644
--- a/sys/powerpc/include/spr.h
+++ b/sys/powerpc/include/spr.h
@@ -26,7 +26,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: spr.h,v 1.25 2002/08/14 15:38:40 matt Exp $
- * $FreeBSD$
  */
 #ifndef _POWERPC_SPR_H_
 #define	_POWERPC_SPR_H_
diff --git a/sys/powerpc/include/trap.h b/sys/powerpc/include/trap.h
index 71e41929c63..c7ee8110212 100644
--- a/sys/powerpc/include/trap.h
+++ b/sys/powerpc/include/trap.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: trap.h,v 1.7 2002/02/22 13:51:40 kleink Exp $
- * $FreeBSD$
  */
 
 #ifndef	_POWERPC_TRAP_H_
diff --git a/sys/powerpc/include/ucontext.h b/sys/powerpc/include/ucontext.h
index 89be2b462aa..d35c6c773fe 100644
--- a/sys/powerpc/include/ucontext.h
+++ b/sys/powerpc/include/ucontext.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $NetBSD: signal.h,v 1.4 1998/09/14 02:48:34 thorpej Exp $
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_UCONTEXT_H_
diff --git a/sys/powerpc/include/vmparam.h b/sys/powerpc/include/vmparam.h
index 0f3321379b4..89982a618bc 100644
--- a/sys/powerpc/include/vmparam.h
+++ b/sys/powerpc/include/vmparam.h
@@ -31,7 +31,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: vmparam.h,v 1.11 2000/02/11 19:25:16 thorpej Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_VMPARAM_H_
diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c
index a911545a7e6..518623af9de 100644
--- a/sys/powerpc/powerpc/cpu.c
+++ b/sys/powerpc/powerpc/cpu.c
@@ -57,7 +57,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * from $NetBSD: cpu_subr.c,v 1.1 2003/02/03 17:10:09 matt Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index 0b1032ba350..0ede455155f 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/minidump_machdep.c b/sys/powerpc/powerpc/minidump_machdep.c
index d713e11f2ab..e0b80ecefa2 100644
--- a/sys/powerpc/powerpc/minidump_machdep.c
+++ b/sys/powerpc/powerpc/minidump_machdep.c
@@ -22,7 +22,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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/sys/powerpc/powerpc/support.S b/sys/powerpc/powerpc/support.S
index 49387fa0263..f866da6b6ce 100644
--- a/sys/powerpc/powerpc/support.S
+++ b/sys/powerpc/powerpc/support.S
@@ -24,7 +24,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$	
  */
 
 /*
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index bf39cb2305c..b53da3dd04f 100644
--- a/sys/powerpc/powerpc/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -40,7 +40,6 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $FreeBSD$
  */
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/riscv/include/_align.h b/sys/riscv/include/_align.h
index 3844133ffb6..3fb77aac9a0 100644
--- a/sys/riscv/include/_align.h
+++ b/sys/riscv/include/_align.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE__ALIGN_H_
diff --git a/sys/riscv/include/_inttypes.h b/sys/riscv/include/_inttypes.h
index df1af0b25df..fb2bb14e33a 100644
--- a/sys/riscv/include/_inttypes.h
+++ b/sys/riscv/include/_inttypes.h
@@ -27,7 +27,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.4 2008/04/28 20:23:36 martin Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE__INTTYPES_H_
diff --git a/sys/riscv/include/_limits.h b/sys/riscv/include/_limits.h
index 39f0bcf0f5b..e3d072c3f23 100644
--- a/sys/riscv/include/_limits.h
+++ b/sys/riscv/include/_limits.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/riscv/include/_types.h b/sys/riscv/include/_types.h
index a3a8e97b5e9..a51a5e3c966 100644
--- a/sys/riscv/include/_types.h
+++ b/sys/riscv/include/_types.h
@@ -29,7 +29,6 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/riscv/include/endian.h b/sys/riscv/include/endian.h
index 0f06010b7e4..82337e3a848 100644
--- a/sys/riscv/include/endian.h
+++ b/sys/riscv/include/endian.h
@@ -27,7 +27,6 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/riscv/include/float.h b/sys/riscv/include/float.h
index 0829f6f52aa..f8664f0dbec 100644
--- a/sys/riscv/include/float.h
+++ b/sys/riscv/include/float.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/riscv/include/in_cksum.h b/sys/riscv/include/in_cksum.h
index add7569a9f4..6e1329bb564 100644
--- a/sys/riscv/include/in_cksum.h
+++ b/sys/riscv/include/in_cksum.h
@@ -29,7 +29,6 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/riscv/include/md_var.h b/sys/riscv/include/md_var.h
index 9951c838a2e..467bf99a94f 100644
--- a/sys/riscv/include/md_var.h
+++ b/sys/riscv/include/md_var.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_MD_VAR_H_
diff --git a/sys/riscv/include/minidump.h b/sys/riscv/include/minidump.h
index 377db88b533..9cec85868a2 100644
--- a/sys/riscv/include/minidump.h
+++ b/sys/riscv/include/minidump.h
@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * From i386: FreeBSD:  157909 2006-04-21 04:28:43Z peter
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_MINIDUMP_H_
diff --git a/sys/riscv/include/param.h b/sys/riscv/include/param.h
index 1192865cda2..bedecbd71ea 100644
--- a/sys/riscv/include/param.h
+++ b/sys/riscv/include/param.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PARAM_H_
diff --git a/sys/riscv/include/pcpu.h b/sys/riscv/include/pcpu.h
index 20d948931f4..d00226defc2 100644
--- a/sys/riscv/include/pcpu.h
+++ b/sys/riscv/include/pcpu.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/riscv/include/proc.h b/sys/riscv/include/proc.h
index ce0a6267530..d5bdebecd3d 100644
--- a/sys/riscv/include/proc.h
+++ b/sys/riscv/include/proc.h
@@ -28,7 +28,6 @@
  *
  *      from: @(#)proc.h        7.1 (Berkeley) 5/15/91
  *	from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_PROC_H_
diff --git a/sys/riscv/include/profile.h b/sys/riscv/include/profile.h
index 049c46b43bb..775b0810d12 100644
--- a/sys/riscv/include/profile.h
+++ b/sys/riscv/include/profile.h
@@ -28,7 +28,6 @@
  *
  *	from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp
  *	from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/riscv/include/signal.h b/sys/riscv/include/signal.h
index 6c8ac5cabab..24ea17d9732 100644
--- a/sys/riscv/include/signal.h
+++ b/sys/riscv/include/signal.h
@@ -29,7 +29,6 @@
  *      @(#)signal.h    8.1 (Berkeley) 6/11/93
  *	from: FreeBSD: src/sys/i386/include/signal.h,v 1.13 2000/11/09
  *	from: FreeBSD: src/sys/sparc64/include/signal.h,v 1.6 2001/09/30 18:52:17
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
diff --git a/sys/riscv/include/sysarch.h b/sys/riscv/include/sysarch.h
index e9574974130..ca8232f651e 100644
--- a/sys/riscv/include/sysarch.h
+++ b/sys/riscv/include/sysarch.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	from: FreeBSD: src/sys/i386/include/sysarch.h,v 1.14 2000/09/21
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/riscv/include/vmparam.h b/sys/riscv/include/vmparam.h
index 5f76b312c7f..9a710b667c7 100644
--- a/sys/riscv/include/vmparam.h
+++ b/sys/riscv/include/vmparam.h
@@ -33,7 +33,6 @@
  *
  *	from: @(#)vmparam.h     5.9 (Berkeley) 5/12/91
  *	from: FreeBSD: src/sys/i386/include/vmparam.h,v 1.33 2000/03/30
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE_VMPARAM_H_
diff --git a/sys/rpc/auth.h b/sys/rpc/auth.h
index 0752e72de95..e431be84762 100644
--- a/sys/rpc/auth.h
+++ b/sys/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/sys/rpc/clnt.h b/sys/rpc/clnt.h
index a968c8f930f..bfa4cde3241 100644
--- a/sys/rpc/clnt.h
+++ b/sys/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/sys/rpc/pmap_prot.h b/sys/rpc/pmap_prot.h
index 3e958860104..c2e1efb8ead 100644
--- a/sys/rpc/pmap_prot.h
+++ b/sys/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/sys/rpc/rpc.h b/sys/rpc/rpc.h
index 82cf3c02229..dbc090fc498 100644
--- a/sys/rpc/rpc.h
+++ b/sys/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/sys/rpc/rpc_msg.h b/sys/rpc/rpc_msg.h
index dc0ccbd0e5b..0d88d5e4be5 100644
--- a/sys/rpc/rpc_msg.h
+++ b/sys/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/sys/rpc/svc.h b/sys/rpc/svc.h
index f3f29977f46..9eaf972c097 100644
--- a/sys/rpc/svc.h
+++ b/sys/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/sys/rpc/svc_auth.h b/sys/rpc/svc_auth.h
index 71a39d5e300..56a6dc1d823 100644
--- a/sys/rpc/svc_auth.h
+++ b/sys/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/sys/rpc/types.h b/sys/rpc/types.h
index e5d728d6613..6d06e4eaa6e 100644
--- a/sys/rpc/types.h
+++ b/sys/rpc/types.h
@@ -31,7 +31,6 @@
  *
  *	from: @(#)types.h 1.18 87/07/24 SMI
  *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/rpc/xdr.h b/sys/rpc/xdr.h
index 24113db9c63..cd57b406934 100644
--- a/sys/rpc/xdr.h
+++ b/sys/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/sys/sys/_callout.h b/sys/sys/_callout.h
index 468286ff9fe..7c1c397ff38 100644
--- a/sys/sys/_callout.h
+++ b/sys/sys/_callout.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _SYS__CALLOUT_H
diff --git a/sys/sys/_iovec.h b/sys/sys/_iovec.h
index da9a16a6351..1b51169f542 100644
--- a/sys/sys/_iovec.h
+++ b/sys/sys/_iovec.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $FreeBSD$
  */
 
 #ifndef _SYS__IOVEC_H_
diff --git a/sys/sys/_sigset.h b/sys/sys/_sigset.h
index 662fcc1e216..f0566b9994c 100644
--- a/sys/sys/_sigset.h
+++ b/sys/sys/_sigset.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 #ifndef _SYS__SIGSET_H_
diff --git a/sys/sys/_sockaddr_storage.h b/sys/sys/_sockaddr_storage.h
index 9584b4c7678..d8a5b089e44 100644
--- a/sys/sys/_sockaddr_storage.h
+++ b/sys/sys/_sockaddr_storage.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $FreeBSD$
  */
 
 #ifndef _SYS__SOCKADDR_STORAGE_H_
diff --git a/sys/sys/_termios.h b/sys/sys/_termios.h
index b9fe17881b3..327ffcb2f98 100644
--- a/sys/sys/_termios.h
+++ b/sys/sys/_termios.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)termios.h	8.3 (Berkeley) 3/28/94
- * $FreeBSD$
  */
 
 #ifndef _SYS__TERMIOS_H_
diff --git a/sys/sys/_timespec.h b/sys/sys/_timespec.h
index d12d1f740e6..f94dcd424ef 100644
--- a/sys/sys/_timespec.h
+++ b/sys/sys/_timespec.h
@@ -30,7 +30,6 @@
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
  * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp
- *	$FreeBSD$
  */
 
 #ifndef _SYS__TIMESPEC_H_
diff --git a/sys/sys/_uio.h b/sys/sys/_uio.h
index 18612ed7367..c46ade914c2 100644
--- a/sys/sys/_uio.h
+++ b/sys/sys/_uio.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $FreeBSD$
  */
 
 #ifndef _SYS__UIO_H_
diff --git a/sys/sys/_winsize.h b/sys/sys/_winsize.h
index 78d0b8a6ec3..5030dc401fa 100644
--- a/sys/sys/_winsize.h
+++ b/sys/sys/_winsize.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttycom.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
  */
 
 #ifndef _SYS__WINSIZE_H_
diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index 7f61f3f4fc1..58a68725fd7 100644
--- a/sys/sys/acct.h
+++ b/sys/sys/acct.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)acct.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_ACCT_H_
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index be4f4cd6c07..45a1ae724d7 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_BIO_H_
diff --git a/sys/sys/bitcount.h b/sys/sys/bitcount.h
index 7c792506bce..aaa85c38d2e 100644
--- a/sys/sys/bitcount.h
+++ b/sys/sys/bitcount.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.6 (Berkeley) 2/19/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_BITCOUNT_H_
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 6147f6d26ca..7fffb52f84f 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_BUF_H_
diff --git a/sys/sys/busdma_bufalloc.h b/sys/sys/busdma_bufalloc.h
index e766b3434d5..f06ba51c0d9 100644
--- a/sys/sys/busdma_bufalloc.h
+++ b/sys/sys/busdma_bufalloc.h
@@ -27,7 +27,6 @@
  */
 
 /*
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index 9aa28e29d35..93034f81c05 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_CALLOUT_H_
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 797460c08db..d89227687d1 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef	_SYS_CDEFS_H_
diff --git a/sys/sys/ck.h b/sys/sys/ck.h
index 1dba51daf06..1bb5e6f5be1 100644
--- a/sys/sys/ck.h
+++ b/sys/sys/ck.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 #ifndef _SYS_CK_H_
 #define _SYS_CK_H_
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index f1d4df674e6..f2dfaad5aa1 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -36,7 +36,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_CONF_H_
diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index ad73b258df6..5ad85a516dc 100644
--- a/sys/sys/cons.h
+++ b/sys/sys/cons.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_CONS_H_
diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h
index 9087b01fa59..fd36e3bb941 100644
--- a/sys/sys/dirent.h
+++ b/sys/sys/dirent.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.3 (Berkeley) 8/10/94
- * $FreeBSD$
  */
 
 #ifndef	_SYS_DIRENT_H_
diff --git a/sys/sys/disk/bsd.h b/sys/sys/disk/bsd.h
index 3e627db0909..02284c5d052 100644
--- a/sys/sys/disk/bsd.h
+++ b/sys/sys/disk/bsd.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_DISK_BSD_H_
diff --git a/sys/sys/disk/mbr.h b/sys/sys/disk/mbr.h
index 1241059b02e..6dc5e92b542 100644
--- a/sys/sys/disk/mbr.h
+++ b/sys/sys/disk/mbr.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_DISK_MBR_H_
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 6e24f82793f..da12009ab0e 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index daa54d409e7..a04bea1c4bb 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_DISKMBR_H_
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index 5e2fb39557d..25ddbe53b00 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkstat.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_DKSTAT_H_
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index 4570f25201f..5a06c41eca2 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_DOMAIN_H_
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index e53a8d4c6c7..927ddd338ca 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)errno.h	8.5 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_ERRNO_H_
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index dd7a99475cb..c5daf03f472 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_EXEC_H_
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 491b0172a1e..9cb6fbe2f2a 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_FCNTL_H_
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 51c1741e834..a57af214832 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)file.h	8.3 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_FILE_H_
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index bba12d08287..06e086fba15 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_FILEDESC_H_
diff --git a/sys/sys/filio.h b/sys/sys/filio.h
index 3eea7a7acd6..152f2e63ec2 100644
--- a/sys/sys/filio.h
+++ b/sys/sys/filio.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)filio.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
  */
 
 #ifndef	_SYS_FILIO_H_
diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h
index 47b5c5c1757..96eafe513e0 100644
--- a/sys/sys/gmon.h
+++ b/sys/sys/gmon.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_GMON_H_
diff --git a/sys/sys/hash.h b/sys/sys/hash.h
index c19e7401794..ac4bb35d70e 100644
--- a/sys/sys/hash.h
+++ b/sys/sys/hash.h
@@ -25,7 +25,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $OpenBSD: hash.h,v 1.4 2004/05/25 18:37:23 jmc Exp $
- * $FreeBSD$
  */
 
 #ifndef _SYS_HASH_H_
diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h
index d1af92afd28..6f0f4c63b2a 100644
--- a/sys/sys/imgact_aout.h
+++ b/sys/sys/imgact_aout.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
  */
 
 #ifndef	_IMGACT_AOUT_H_
diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h
index 7eb5c323d88..c8283ead2e3 100644
--- a/sys/sys/ioccom.h
+++ b/sys/sys/ioccom.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioccom.h	8.3 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef	_SYS_IOCCOM_H_
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index e63a64d25ed..413fb8a0cd3 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $FreeBSD$
  */
 
 #ifndef	_SYS_IOCTL_H_
diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h
index 8ec21990345..5fec544b7df 100644
--- a/sys/sys/ioctl_compat.h
+++ b/sys/sys/ioctl_compat.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl_compat.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_IOCTL_COMPAT_H_
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index a0bd61f7f07..95a01be20ee 100644
--- a/sys/sys/ipc.h
+++ b/sys/sys/ipc.h
@@ -39,7 +39,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ipc.h	8.4 (Berkeley) 2/19/95
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/kbio.h b/sys/sys/kbio.h
index 3b632bf9636..9fb63eb1b2b 100644
--- a/sys/sys/kbio.h
+++ b/sys/sys/kbio.h
@@ -1,5 +1,4 @@
 /*-
- * $FreeBSD$
  */
 
 #ifndef	_SYS_KBIO_H_
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 765484df351..b6059858394 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -41,7 +41,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_KERNEL_H_
diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h
index 396ad21cffc..288e4d48e0e 100644
--- a/sys/sys/ktr.h
+++ b/sys/sys/ktr.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/ktr_class.h b/sys/sys/ktr_class.h
index f2c76c73505..b4861bdef54 100644
--- a/sys/sys/ktr_class.h
+++ b/sys/sys/ktr_class.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $
- * $FreeBSD$
  */
 
 #ifndef _SYS_KTR_CLASS_H_
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index d5061837827..110e1469857 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_KTRACE_H_
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 83522ce7ddb..86b4c90333e 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_LIBKERN_H_
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index 29fd464bad6..65064aad5aa 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  *	from BSDI Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp
- * $FreeBSD$
  */
 
 #ifndef _SYS_LOCK_H_
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index cca02501a46..ab3fe8ae622 100644
--- a/sys/sys/lockf.h
+++ b/sys/sys/lockf.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)lockf.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_LOCKF_H_
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index b83d78a1844..1661cd194a1 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_MALLOC_H_
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index c0b660a265b..2183d5b848f 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)mbuf.h	8.5 (Berkeley) 2/19/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_MBUF_H_
diff --git a/sys/sys/md4.h b/sys/sys/md4.h
index 78873d9f7e8..0918d533659 100644
--- a/sys/sys/md4.h
+++ b/sys/sys/md4.h
@@ -1,5 +1,4 @@
 /* MD4.H - header file for MD4C.C
- * $FreeBSD$
  */
 
 /*-
diff --git a/sys/sys/md5.h b/sys/sys/md5.h
index f5ddd9c48cd..ac9a1dbfe4a 100644
--- a/sys/sys/md5.h
+++ b/sys/sys/md5.h
@@ -1,5 +1,4 @@
 /* MD5.H - header file for MD5C.C
- * $FreeBSD$
  */
 
 /*-
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index 29b00107792..7eb38a5f59d 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)mman.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_MMAN_H_
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 8dc28a9e0ed..c4e1f83e968 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.21 (Berkeley) 5/20/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_MOUNT_H_
diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h
index 6768b862faf..e5c482f329e 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_MSGBUF_H_
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index 843b3290922..e52692eb33a 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)mtio.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef	_SYS_MTIO_H_
diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h
index 0d5123da3b3..56c03a1b0be 100644
--- a/sys/sys/mutex.h
+++ b/sys/sys/mutex.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD$
  */
 
 #ifndef _SYS_MUTEX_H_
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 547b337c7e3..8ffa87aa3d7 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)namei.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_NAMEI_H_
diff --git a/sys/sys/param.h b/sys/sys/param.h
index d068780d800..49839e3a359 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_PARAM_H_
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index d79b7a44016..a3544669052 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.15 (Berkeley) 5/19/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_PROC_H_
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index c2da6eded67..66b194ff1b9 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_PROTOSW_H_
diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h
index 94d09eac95b..3cce2c088f0 100644
--- a/sys/sys/ptrace.h
+++ b/sys/sys/ptrace.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef	_SYS_PTRACE_H_
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index 6c7c37308b4..8e91ebf7949 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_QUEUE_H_
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index 20b91f8ed91..c41200022f4 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_REBOOT_H_
diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index 08bb09b4a64..5100501fb2b 100644
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)resource.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_RESOURCE_H_
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index 8b88c9321e7..49119651665 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)resourcevar.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef	_SYS_RESOURCEVAR_H_
diff --git a/sys/sys/selinfo.h b/sys/sys/selinfo.h
index c5f3ad6b80a..f4af278a78e 100644
--- a/sys/sys/selinfo.h
+++ b/sys/sys/selinfo.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_SELINFO_H_
diff --git a/sys/sys/sigio.h b/sys/sys/sigio.h
index 0a4369e0705..eb84a7f676a 100644
--- a/sys/sys/sigio.h
+++ b/sys/sys/sigio.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_SIGIO_H_
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 27014c20973..4007c6968ea 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_SIGNAL_H_
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index 251775c3725..cf83af1db22 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_SIGNALVAR_H_
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 502adac0f15..fc97b4c0a0a 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_SOCKET_H_
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h
index b9ed4a43999..e0f2ab69716 100644
--- a/sys/sys/sockio.h
+++ b/sys/sys/sockio.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_SOCKIO_H_
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 03040f74eba..d083b877e6d 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)stat.h	8.12 (Berkeley) 6/16/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_STAT_H_
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 9cfd759166b..9176d2c3efd 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_SYSCTL_H_
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 08aae5aaae7..c76792f55b4 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index ff2bd145080..1c6921f0064 100644
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_SYSLOG_H_
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 7099c484dce..2367a7880cf 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_SYSTM_H_
diff --git a/sys/sys/time.h b/sys/sys/time.h
index 673de65a688..31020bbdfdd 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_TIME_H_
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index 001ec3b5cfa..952a5e83b8a 100644
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)timeb.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_TIMEB_H_
diff --git a/sys/sys/times.h b/sys/sys/times.h
index 0c690e5635f..f9fdf735879 100644
--- a/sys/sys/times.h
+++ b/sys/sys/times.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)times.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef	_SYS_TIMES_H_
diff --git a/sys/sys/timespec.h b/sys/sys/timespec.h
index fa3812a0838..4de69e3417a 100644
--- a/sys/sys/timespec.h
+++ b/sys/sys/timespec.h
@@ -30,7 +30,6 @@
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
  * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp
- *	$FreeBSD$
  */
 
 #ifndef _SYS_TIMESPEC_H_
diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h
index a7309d4c5d6..9a10c6079de 100644
--- a/sys/sys/ttycom.h
+++ b/sys/sys/ttycom.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttycom.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD$
  */
 
 #ifndef	_SYS_TTYCOM_H_
diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h
index c269c56fd23..7e64babbc7f 100644
--- a/sys/sys/ttydefaults.h
+++ b/sys/sys/ttydefaults.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/types.h b/sys/sys/types.h
index c6f7abe1f52..b97ad9b5ccc 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.6 (Berkeley) 2/19/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_TYPES_H_
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index 73b5fb7ab11..eb92776c158 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_UCRED_H_
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index ae07a074d46..6250b3cfbf0 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_UIO_H_
diff --git a/sys/sys/un.h b/sys/sys/un.h
index e0248415181..366942fe829 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)un.h	8.3 (Berkeley) 2/19/95
- * $FreeBSD$
  */
 
 #ifndef _SYS_UN_H_
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index 449d3567827..77df90cd26b 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.2 (Berkeley) 1/7/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_UNISTD_H_
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index 09c6922dcb4..8549ea279c1 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)unpcb.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_UNPCB_H_
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 42799a70fbf..9c716a199d0 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
- * $FreeBSD$
  */
 
 #ifndef _SYS_USER_H_
diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h
index 27d3c25e42a..ec24b302361 100644
--- a/sys/sys/utsname.h
+++ b/sys/sys/utsname.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)utsname.h	8.1 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef	_SYS_UTSNAME_H
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index 3714a06983b..3442843f4b5 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)vmmeter.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_VMMETER_H_
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index d8fd580facb..07b1a419b91 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_VNODE_H_
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index e34faef3d80..9eb2fed2ebc 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)wait.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD$
  */
 
 #ifndef _SYS_WAIT_H_
diff --git a/sys/teken/libteken/Symbol.map b/sys/teken/libteken/Symbol.map
index 44f7ff87554..24854a8b5e3 100644
--- a/sys/teken/libteken/Symbol.map
+++ b/sys/teken/libteken/Symbol.map
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  */
 
 FBSD_1.2 {
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 97213bc20d7..f0c6eaaa108 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _UFS_FFS_EXTERN_H
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 002b4fd99e3..5769cd7776b 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.13 (Berkeley) 3/21/95
- * $FreeBSD$
  */
 
 #ifndef _UFS_FFS_FS_H_
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h
index 4a6cdd3046e..a2870e5e846 100644
--- a/sys/ufs/ffs/softdep.h
+++ b/sys/ufs/ffs/softdep.h
@@ -38,7 +38,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)softdep.h	9.7 (McKusick) 6/21/00
- * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index a4731cafd59..b429562f115 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -64,7 +64,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_DINODE_H_
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h
index 824ac1e1313..63d0348037d 100644
--- a/sys/ufs/ufs/dir.h
+++ b/sys/ufs/ufs/dir.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_DIR_H_
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index a1e6e93f78c..454dc725386 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index af4f45a82d9..a39406f1388 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)quota.h	8.3 (Berkeley) 8/19/94
- * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_QUOTA_H_
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 3ac631e6ab0..1403c6832cb 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_extern.h	8.10 (Berkeley) 5/14/95
- * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_EXTERN_H_
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 1eee9deee68..d3d025b594b 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index 58fd98c3e45..8811b948111 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- * $FreeBSD$
  */
 
 #ifndef	_VM_SWAP_PAGER_H_
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 107814c1178..4bcd8ac601a 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $FreeBSD$
  */
 
 #ifndef _VM_EXTERN_H_
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index 0e248d87125..44e4019353a 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index 821da2c9890..558d080717b 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode_pager.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
  */
 
 #ifndef	_VNODE_PAGER_
diff --git a/sys/x86/include/_align.h b/sys/x86/include/_align.h
index efb8d59bb70..50b7b8f5bc2 100644
--- a/sys/x86/include/_align.h
+++ b/sys/x86/include/_align.h
@@ -37,7 +37,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD$
  */
 
 #ifndef _X86_INCLUDE__ALIGN_H_
diff --git a/sys/x86/include/_inttypes.h b/sys/x86/include/_inttypes.h
index 8d10a76b3ad..4d1b52da6ce 100644
--- a/sys/x86/include/_inttypes.h
+++ b/sys/x86/include/_inttypes.h
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/x86/include/_limits.h b/sys/x86/include/_limits.h
index 84efd436a08..28536d8d96a 100644
--- a/sys/x86/include/_limits.h
+++ b/sys/x86/include/_limits.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
  */
 
 #ifndef	_MACHINE__LIMITS_H_
diff --git a/sys/x86/include/_types.h b/sys/x86/include/_types.h
index 408f833a121..7bf330243b2 100644
--- a/sys/x86/include/_types.h
+++ b/sys/x86/include/_types.h
@@ -35,7 +35,6 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/x86/include/endian.h b/sys/x86/include/endian.h
index 8fb24881145..79e8be43a6b 100644
--- a/sys/x86/include/endian.h
+++ b/sys/x86/include/endian.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)endian.h	7.8 (Berkeley) 4/3/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/x86/include/float.h b/sys/x86/include/float.h
index 5d8c9737d29..0f11702f9e6 100644
--- a/sys/x86/include/float.h
+++ b/sys/x86/include/float.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/x86/include/fpu.h b/sys/x86/include/fpu.h
index 313a03ea55c..e1ec6a592d2 100644
--- a/sys/x86/include/fpu.h
+++ b/sys/x86/include/fpu.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/x86/include/frame.h b/sys/x86/include/frame.h
index 2ea09dfdc35..80e4a968ed6 100644
--- a/sys/x86/include/frame.h
+++ b/sys/x86/include/frame.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/x86/include/psl.h b/sys/x86/include/psl.h
index c178821cc9a..88d51acba66 100644
--- a/sys/x86/include/psl.h
+++ b/sys/x86/include/psl.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/x86/include/ptrace.h b/sys/x86/include/ptrace.h
index be02dff4daf..36ce8870df3 100644
--- a/sys/x86/include/ptrace.h
+++ b/sys/x86/include/ptrace.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/x86/include/reg.h b/sys/x86/include/reg.h
index e237b080be1..fd0caa27276 100644
--- a/sys/x86/include/reg.h
+++ b/sys/x86/include/reg.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/x86/include/segments.h b/sys/x86/include/segments.h
index 01472b9c72e..237c7fb5a2a 100644
--- a/sys/x86/include/segments.h
+++ b/sys/x86/include/segments.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
  */
 
 #ifndef _X86_SEGMENTS_H_
diff --git a/sys/x86/include/signal.h b/sys/x86/include/signal.h
index 553757c990d..3222c7b765a 100644
--- a/sys/x86/include/signal.h
+++ b/sys/x86/include/signal.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
  */
 
 #ifndef _X86_SIGNAL_H
diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h
index 2d3d2b8080a..548d6010e7b 100644
--- a/sys/x86/include/specialreg.h
+++ b/sys/x86/include/specialreg.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/x86/include/trap.h b/sys/x86/include/trap.h
index c31e454cd05..22547eaf4fe 100644
--- a/sys/x86/include/trap.h
+++ b/sys/x86/include/trap.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/x86/include/x86_ieeefp.h b/sys/x86/include/x86_ieeefp.h
index 9160ac7c2c6..38b2408c52b 100644
--- a/sys/x86/include/x86_ieeefp.h
+++ b/sys/x86/include/x86_ieeefp.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- * $FreeBSD$
  */
 
 #ifndef _X86_X86_IEEEFP_H_
diff --git a/sys/x86/isa/icu.h b/sys/x86/isa/icu.h
index cd3729b374b..e8a8c6e770f 100644
--- a/sys/x86/isa/icu.h
+++ b/sys/x86/isa/icu.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
- * $FreeBSD$
  */
 
 /*