sys: Remove $FreeBSD$: one-line .h pattern

Remove /^\s*\*+\s*\$FreeBSD\$.*$\n/

Similar commit in current:
(cherry picked from commit 2ff63af9b88c)

909 files changed, 0 insertions, 909 deletions

diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S
index 4de39283f92f..089886ac88c9 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 d82ffd30e1c9..993bac0eb45b 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 7b66e9446ff3..8809051e84cc 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$
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index f7732435fc39..530ba746e0b2 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 099ea263e202..f3a8caa5b88d 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 b7c154743d0c..392fb1957fa1 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 8f957eede39b..cb46325d70bc 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 b2423eb00ed3..1d28db73763d 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 7407b4ad7104..694a952bbe20 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 5a7b831b3089..13ded39672ac 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 cf1d2bd0a586..73d10e6c6384 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 6ce6d9728366..f98e5f68dd96 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 ebdcbc6ce202..9e77b73b8ea2 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$
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index 507529f6506b..3cc0d1b6b984 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$
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h
index 2e19918cfb76..06d33dea367b 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$
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/amd64/include/reloc.h b/sys/amd64/include/reloc.h
index ea5ed128ef86..777cafe1d6b8 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 a5fd89fbf6ce..1426fe847afb 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$
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h
index 12cb3a22e0e4..585a49704397 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 cddb360090ab..6e298416b1d0 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$
  */
 
 #ifndef _MACHINE_VMPARAM_H_
diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h
index cacaf2b64ac2..158256bbb323 100644
--- a/sys/amd64/linux/linux_proto.h
+++ b/sys/amd64/linux/linux_proto.h
@@ -2,7 +2,6 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #ifndef _LINUX_SYSPROTO_H_
diff --git a/sys/amd64/linux/linux_syscall.h b/sys/amd64/linux/linux_syscall.h
index 9fc5e8ca877f..690f402ef2d0 100644
--- a/sys/amd64/linux/linux_syscall.h
+++ b/sys/amd64/linux/linux_syscall.h
@@ -2,7 +2,6 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #define	LINUX_SYS_read	0
diff --git a/sys/amd64/linux/linux_syscalls.c b/sys/amd64/linux/linux_syscalls.c
index 68d3561e5fa7..04131a05c0db 100644
--- a/sys/amd64/linux/linux_syscalls.c
+++ b/sys/amd64/linux/linux_syscalls.c
@@ -2,7 +2,6 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 const char *linux_syscallnames[] = {
diff --git a/sys/amd64/linux/linux_sysent.c b/sys/amd64/linux/linux_sysent.c
index 23f923402f9d..779bad696da1 100644
--- a/sys/amd64/linux/linux_sysent.c
+++ b/sys/amd64/linux/linux_sysent.c
@@ -2,7 +2,6 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c
index d22d8b55fa43..796f32faf014 100644
--- a/sys/amd64/linux/linux_systrace_args.c
+++ b/sys/amd64/linux/linux_systrace_args.c
@@ -2,7 +2,6 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  * This file is part of the DTrace syscall provider.
  */
 
diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index e575fcebd235..19d2270a03bc 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -2,7 +2,6 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #ifndef _LINUX32_SYSPROTO_H_
diff --git a/sys/amd64/linux32/linux32_syscall.h b/sys/amd64/linux32/linux32_syscall.h
index c8b497710470..6fab4cb61bb3 100644
--- a/sys/amd64/linux32/linux32_syscall.h
+++ b/sys/amd64/linux32/linux32_syscall.h
@@ -2,7 +2,6 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #define	LINUX32_SYS_linux_exit	1
diff --git a/sys/amd64/linux32/linux32_syscalls.c b/sys/amd64/linux32/linux32_syscalls.c
index f44eef1f589a..6706189b7036 100644
--- a/sys/amd64/linux32/linux32_syscalls.c
+++ b/sys/amd64/linux32/linux32_syscalls.c
@@ -2,7 +2,6 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 const char *linux32_syscallnames[] = {
diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c
index 51697f74d360..d74b4665f1db 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@@ -2,7 +2,6 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c
index 9ef4330a27f3..b7c9caa4ddfc 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -2,7 +2,6 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  * This file is part of the DTrace syscall provider.
  */
 
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_wdog.h b/sys/arm/broadcom/bcm2835/bcm2835_wdog.h
index 00a85333d39b..5dba6c0e6e4e 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 a8c6df4304f8..28e24994cd41 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 e3f9b52ed089..ab51edc73ab6 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 fe816e50f9cb..fb42b17a77f6 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 14ab76c5fbde..8260e5915cb6 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 d6d5ade51a86..3b0b5f7e1e56 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 eb3f0d142322..ffaac94c7d00 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 857d76ea57e7..cfb383de761f 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 b1c28e91d79e..8b803ed8d6b4 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 352d46f07e7b..b13a08b235cb 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 5a7b831b3089..13ded39672ac 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 c9669d6556bd..ddc8da69c76c 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 dcfef9cbbb27..cd9d09feb62c 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 807b492324fa..3c94ee08d160 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 48fd6e325295..9c0cd88346f5 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 63e606675810..003f5b360b03 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 9e3cdf142205..fcfec20a0dc2 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 cab8f89ddadf..df4337decde6 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 688475703225..be37f0247992 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 2286bcea2d2d..1c283261268b 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 bc9d572d786a..e314bf3b2d16 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/linux/linux_proto.h b/sys/arm/linux/linux_proto.h
index 07245d6db4f3..a09fefd90d9e 100644
--- a/sys/arm/linux/linux_proto.h
+++ b/sys/arm/linux/linux_proto.h
@@ -2,7 +2,6 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #ifndef _LINUX_SYSPROTO_H_
diff --git a/sys/arm/linux/linux_syscall.h b/sys/arm/linux/linux_syscall.h
index 8f9a7376c9b8..37efb8500680 100644
--- a/sys/arm/linux/linux_syscall.h
+++ b/sys/arm/linux/linux_syscall.h
@@ -2,7 +2,6 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #define	LINUX_SYS_linux_exit	1
diff --git a/sys/arm/linux/linux_syscalls.c b/sys/arm/linux/linux_syscalls.c
index 8a5344c35cc5..5feb561cd3f2 100644
--- a/sys/arm/linux/linux_syscalls.c
+++ b/sys/arm/linux/linux_syscalls.c
@@ -2,7 +2,6 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 const char *linux_syscallnames[] = {
diff --git a/sys/arm/linux/linux_sysent.c b/sys/arm/linux/linux_sysent.c
index d8f58a91eb3f..a9e8864b33ce 100644
--- a/sys/arm/linux/linux_sysent.c
+++ b/sys/arm/linux/linux_sysent.c
@@ -2,7 +2,6 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/arm/linux/linux_systrace_args.c b/sys/arm/linux/linux_systrace_args.c
index 16591890ea9a..bbf240e0d5c5 100644
--- a/sys/arm/linux/linux_systrace_args.c
+++ b/sys/arm/linux/linux_systrace_args.c
@@ -2,7 +2,6 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  * This file is part of the DTrace syscall provider.
  */
 
diff --git a/sys/arm/ti/omap4/omap4_smc.h b/sys/arm/ti/omap4/omap4_smc.h
index e287882e6f6d..fcf68fe4d014 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 83241d0202b2..63cf656aaa1b 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 ab3857e7c56d..9ed6852c9928 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 3844133ffb68..3fb77aac9a01 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$
  */
 
 #ifndef _MACHINE__ALIGN_H_
diff --git a/sys/arm64/include/_inttypes.h b/sys/arm64/include/_inttypes.h
index df1af0b25df0..fb2bb14e33a3 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$
  */
 
 #ifndef _MACHINE__INTTYPES_H_
diff --git a/sys/arm64/include/_limits.h b/sys/arm64/include/_limits.h
index 39f0bcf0f5b2..e3d072c3f23d 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$
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/arm64/include/_types.h b/sys/arm64/include/_types.h
index b54a17d25024..5595441a9e61 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$
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h
index f74944977b47..ceccdf95ee8c 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$
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/arm64/include/endian.h b/sys/arm64/include/endian.h
index 0f06010b7e4b..82337e3a848b 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 0829f6f52aa9..f8664f0dbecc 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$
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/arm64/include/ieeefp.h b/sys/arm64/include/ieeefp.h
index 178721a65b1e..bc0245cc1a5c 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$
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/arm64/include/in_cksum.h b/sys/arm64/include/in_cksum.h
index 522ba005a0e4..365fb832d492 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 24e200b77acd..4ac0f42b9423 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 87aaffc5ec87..6f3133642ecd 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 f331fd19e2c8..3154fb8ab125 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$
  */
 
 #ifndef _MACHINE_PARAM_H_
diff --git a/sys/arm64/include/pcpu.h b/sys/arm64/include/pcpu.h
index d6439b180e3c..29a066bceaeb 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$
  */
 
 #ifndef	_MACHINE_PCPU_H_
diff --git a/sys/arm64/include/proc.h b/sys/arm64/include/proc.h
index 24f967e560f6..59713ed57099 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$
  */
 
 #ifndef	_MACHINE_PROC_H_
diff --git a/sys/arm64/include/profile.h b/sys/arm64/include/profile.h
index 0b117d0ff442..972d4ba42607 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$
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/arm64/include/signal.h b/sys/arm64/include/signal.h
index 6c8ac5cabab5..24ea17d97322 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$
  */
 
 #ifndef	_MACHINE_SIGNAL_H_
diff --git a/sys/arm64/include/sysarch.h b/sys/arm64/include/sysarch.h
index 4d6c547fd3df..a37bfc8725ae 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$
  */
 
 /*
diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h
index 09694f470efb..820552c2ce19 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$
  */
 
 #ifndef	_MACHINE_VMPARAM_H_
diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h
index 700a97045dd1..661431ce4730 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/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h
index 89d5954f0f37..58087493a1e6 100644
--- a/sys/arm64/linux/linux_proto.h
+++ b/sys/arm64/linux/linux_proto.h
@@ -2,7 +2,6 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #ifndef _LINUX_SYSPROTO_H_
diff --git a/sys/arm64/linux/linux_syscall.h b/sys/arm64/linux/linux_syscall.h
index b3d01a89d0a1..fe44c5c87e81 100644
--- a/sys/arm64/linux/linux_syscall.h
+++ b/sys/arm64/linux/linux_syscall.h
@@ -2,7 +2,6 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #define	LINUX_SYS_linux_setxattr	5
diff --git a/sys/arm64/linux/linux_syscalls.c b/sys/arm64/linux/linux_syscalls.c
index 6dbb988814ea..d1762a9166f6 100644
--- a/sys/arm64/linux/linux_syscalls.c
+++ b/sys/arm64/linux/linux_syscalls.c
@@ -2,7 +2,6 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 const char *linux_syscallnames[] = {
diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c
index 5f6124b83c97..443616aac0db 100644
--- a/sys/arm64/linux/linux_sysent.c
+++ b/sys/arm64/linux/linux_sysent.c
@@ -2,7 +2,6 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c
index 2d1cb2286ab1..56f9448966f3 100644
--- a/sys/arm64/linux/linux_systrace_args.c
+++ b/sys/arm64/linux/linux_systrace_args.c
@@ -2,7 +2,6 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  * This file is part of the DTrace syscall provider.
  */
 
diff --git a/sys/cam/ctl/ctl.h b/sys/cam/ctl/ctl.h
index e097ee2d2482..1b7d7ad4ec38 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 bfcb6343c2f2..6ebf104fb0d2 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 0e4be105fd25..353236b1c1b6 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 2c1113bcdb8e..f390ea1c1e44 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 cec434e2cf0a..6628f63db345 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 c0a929bbaea3..f04e0d564888 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 ac182d6e0fc0..5a6f6502da8b 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 d3c97c7e0047..bf9732e1d55b 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 8453acb900de..8f78e3a58dc4 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 0129096d20cc..9a87345015fa 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 72b2b09663e4..9af16168c352 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 77e18466c5c4..9f4e1439dfa8 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 db77da510788..8567c47c81ed 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 45c490f3ef70..229e8db4b55c 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 7e577715d550..0af88fa0558e 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 c6fb7fca4c2e..6ecacc96281e 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 fe4b7a0863b1..3c310ee864c4 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 e6b760e69812..e1cc8f802762 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 f99b48f8354f..83c0379666e2 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 ce9e97ea7a09..f23413881235 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/mips/regset.h b/sys/cddl/dev/dtrace/mips/regset.h
index d83a45e52a6e..8a34bd77d32d 100644
--- a/sys/cddl/dev/dtrace/mips/regset.h
+++ b/sys/cddl/dev/dtrace/mips/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 64973885fc96..b414e7e079a0 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 034781f11238..623e67b937c2 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 ad3b453f8845..1afadc94afc2 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 87b006cf7845..fa0aa5e9430d 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 b480e411e6c2..d7a19143e9f8 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/cloudabi32/cloudabi32_proto.h b/sys/compat/cloudabi32/cloudabi32_proto.h
index 453c6db1fd8b..704a3278cb3f 100644
--- a/sys/compat/cloudabi32/cloudabi32_proto.h
+++ b/sys/compat/cloudabi32/cloudabi32_proto.h
@@ -2,7 +2,6 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #ifndef _CLOUDABI32_SYSPROTO_H_
diff --git a/sys/compat/cloudabi32/cloudabi32_syscall.h b/sys/compat/cloudabi32/cloudabi32_syscall.h
index b7496fa011a9..e509bb4068bb 100644
--- a/sys/compat/cloudabi32/cloudabi32_syscall.h
+++ b/sys/compat/cloudabi32/cloudabi32_syscall.h
@@ -2,7 +2,6 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #define	CLOUDABI32_SYS_cloudabi_sys_clock_res_get	0
diff --git a/sys/compat/cloudabi32/cloudabi32_syscalls.c b/sys/compat/cloudabi32/cloudabi32_syscalls.c
index 3ee4a286b001..973b1eb49e75 100644
--- a/sys/compat/cloudabi32/cloudabi32_syscalls.c
+++ b/sys/compat/cloudabi32/cloudabi32_syscalls.c
@@ -2,7 +2,6 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 const char *cloudabi32_syscallnames[] = {
diff --git a/sys/compat/cloudabi32/cloudabi32_sysent.c b/sys/compat/cloudabi32/cloudabi32_sysent.c
index 7f07ed8e9236..a90d9adeba95 100644
--- a/sys/compat/cloudabi32/cloudabi32_sysent.c
+++ b/sys/compat/cloudabi32/cloudabi32_sysent.c
@@ -2,7 +2,6 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #include <sys/sysent.h>
diff --git a/sys/compat/cloudabi32/cloudabi32_systrace_args.c b/sys/compat/cloudabi32/cloudabi32_systrace_args.c
index d52ddd6e0d9c..2d613852b76a 100644
--- a/sys/compat/cloudabi32/cloudabi32_systrace_args.c
+++ b/sys/compat/cloudabi32/cloudabi32_systrace_args.c
@@ -2,7 +2,6 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  * This file is part of the DTrace syscall provider.
  */
 
diff --git a/sys/compat/cloudabi64/cloudabi64_proto.h b/sys/compat/cloudabi64/cloudabi64_proto.h
index 54bf9965a793..b2702a53d9dc 100644
--- a/sys/compat/cloudabi64/cloudabi64_proto.h
+++ b/sys/compat/cloudabi64/cloudabi64_proto.h
@@ -2,7 +2,6 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #ifndef _CLOUDABI64_SYSPROTO_H_
diff --git a/sys/compat/cloudabi64/cloudabi64_syscall.h b/sys/compat/cloudabi64/cloudabi64_syscall.h
index 9a3ba53797c6..417100588fe3 100644
--- a/sys/compat/cloudabi64/cloudabi64_syscall.h
+++ b/sys/compat/cloudabi64/cloudabi64_syscall.h
@@ -2,7 +2,6 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #define	CLOUDABI64_SYS_cloudabi_sys_clock_res_get	0
diff --git a/sys/compat/cloudabi64/cloudabi64_syscalls.c b/sys/compat/cloudabi64/cloudabi64_syscalls.c
index 5019ad930d52..8bbab92bd739 100644
--- a/sys/compat/cloudabi64/cloudabi64_syscalls.c
+++ b/sys/compat/cloudabi64/cloudabi64_syscalls.c
@@ -2,7 +2,6 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 const char *cloudabi64_syscallnames[] = {
diff --git a/sys/compat/cloudabi64/cloudabi64_sysent.c b/sys/compat/cloudabi64/cloudabi64_sysent.c
index 1edae8bb8281..acd7d5ad9e0d 100644
--- a/sys/compat/cloudabi64/cloudabi64_sysent.c
+++ b/sys/compat/cloudabi64/cloudabi64_sysent.c
@@ -2,7 +2,6 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #include <sys/sysent.h>
diff --git a/sys/compat/cloudabi64/cloudabi64_systrace_args.c b/sys/compat/cloudabi64/cloudabi64_systrace_args.c
index 75ea221e879d..3c374d243def 100644
--- a/sys/compat/cloudabi64/cloudabi64_systrace_args.c
+++ b/sys/compat/cloudabi64/cloudabi64_systrace_args.c
@@ -2,7 +2,6 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  * This file is part of the DTrace syscall provider.
  */
 
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
index d7d4d4fec5ff..cfeb81cbd361 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -2,7 +2,6 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #ifndef _FREEBSD32_SYSPROTO_H_
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h
index b6945902ab31..2e9bd9f419f5 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -2,7 +2,6 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #define	FREEBSD32_SYS_syscall	0
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c
index d7d73e0445ff..d804247bb173 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -2,7 +2,6 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 const char *freebsd32_syscallnames[] = {
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c
index b683e366c864..10b94aa4a899 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -2,7 +2,6 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c
index ff650e90eff3..96f0ee10dbda 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -2,7 +2,6 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  * This file is part of the DTrace syscall provider.
  */
 
diff --git a/sys/compat/linux/linux_persona.h b/sys/compat/linux/linux_persona.h
index 7ae166aeb2cf..c3d669c8ea6b 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 bd364e61e90f..86df8a55f207 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 0d9a3a348b8f..d9c3b3d07373 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 98034bcbb04d..0d612fb6f976 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/conf/ldscript.mips b/sys/conf/ldscript.mips
index 5fb902c601d6..d55ece4ae437 100644
--- a/sys/conf/ldscript.mips
+++ b/sys/conf/ldscript.mips
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	JNPR: ldscript.mips,v 1.3 2006/10/11 06:12:04
- * $FreeBSD$
  */
 
 OUTPUT_ARCH(mips)
diff --git a/sys/conf/ldscript.mips.cfe b/sys/conf/ldscript.mips.cfe
index 48ed30ca68cc..05691f5d048d 100644
--- a/sys/conf/ldscript.mips.cfe
+++ b/sys/conf/ldscript.mips.cfe
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	JNPR: ldscript.mips,v 1.3 2006/10/11 06:12:04
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/conf/ldscript.mips.mips64 b/sys/conf/ldscript.mips.mips64
index fcb03a74933b..b453ff92d19f 100644
--- a/sys/conf/ldscript.mips.mips64
+++ b/sys/conf/ldscript.mips.mips64
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	JNPR: ldscript.mips,v 1.3 2006/10/11 06:12:04
- * $FreeBSD$
  */
 
 OUTPUT_ARCH(mips)
diff --git a/sys/dev/arcmsr/arcmsr.h b/sys/dev/arcmsr/arcmsr.h
index 16b708cc5f39..285cff3f2a1c 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 0c6e3f14ba3b..04613794ff22 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 e687728f56eb..1fa94881ddd3 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 24d9c9652c10..b64305fe9da4 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 8530b1a17305..5a18ee745357 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 e1bde43a0c4f..8758b3b0c8a3 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 5a64ccc93e29..7786d902d514 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 4789757186aa..1a019b62970a 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 502e586074b3..d95d7305aedf 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 96728e740d54..241902b9d7fe 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 5f5dd689e966..6dfbda1b3ac0 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 b7407d52f91e..6bf796e75b34 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 404faac78986..fa6f1aa662ce 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 aef63831194a..5cfa424d18e2 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 59b237e07756..9e9f8162208b 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 7e7fb19d9f7b..6a20b3ee76ac 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 874c540156b3..edfe3fbcdfda 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 5b5af3ac85bf..2b83f216b926 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 315cdd6f1fc4..ed749518ed5e 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 269310ade73e..851cbe82d3a7 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 d56e60e630c0..1a0d5422c88d 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 1033079512da..133e7b1027ca 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 47231e802d79..70c6969d8f5a 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 57310c0ead48..a0fc2b9ce993 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 da0010d32805..f94f3a256771 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 11afa67836b4..0f506f4b942b 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 df63b0e89d32..3c8b56d6557b 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 8bf04e7ed65c..bd50d6f5c702 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 8d3c93ae22a1..b37d16f430f6 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 387a4dab7e04..87ed7030cbb9 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 79cd2246a827..06e5af8a042b 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 ccacd17649fa..14026d1b8b44 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 7ce0d73ac637..6700e7410080 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 55f8a3871035..6930b29cc85d 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 ef3109e6d4d5..5f1aa8eec5f4 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 2523c0ab51f6..ef1cb169d709 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 ac4079c27583..93fc4cf4b684 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 7b7c391c1f1b..d80f3147baf5 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 5bc0655a0a4a..52c66db150d5 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 5176634caa40..c35062a56fd6 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 d168c0faec1e..1f40501c934f 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 0daa745aa565..49e1fd52ceb6 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 42f767d6ad39..00e8ee9b54d3 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 cf86ca8ff023..6f8e3744c391 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 137f505dddb4..84cf9b3c425a 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 e49402a36a03..a5d094949abe 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 b9a0af1af121..e1f614b7b336 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 5034a629b4c7..8513039c2c7c 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 c557d2fabc26..ae06f6a01208 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 31894b4ec73c..dc2994e8101a 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 3720f0468db2..3e7e94d9c81d 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 c73602232aaa..5935e965aaf2 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 f3a9bc3c4dc2..d4f2db494096 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 1ac0e0fc177f..605fae64232e 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 9ae6a4b4cb0d..5436f607c307 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 6d8e23e0fb95..bec1fa7b5e7f 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 88aef2bd1033..7fc1bcf228d9 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 af4f3ea0c3f9..9a5964a847d0 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 3572114fbc81..de1d70dfd6e2 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 e3fb8252f1c2..b21f009b40e2 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 d381563d48bd..31424ceb0278 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 d1d37c491634..a12f9c3503dc 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 9961cfca9193..fb0b229d0591 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 6f9c2fb9af99..cbb64c0ff529 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/ce/ceddk.h b/sys/dev/ce/ceddk.h
index 12742dbbef77..6e47a0403477 100644
--- a/sys/dev/ce/ceddk.h
+++ b/sys/dev/ce/ceddk.h
@@ -13,7 +13,6 @@
  * works or modified versions.
  *
  * $Cronyx: ceddk.h,v 1.2.6.1 2005/11/09 13:01:39 rik Exp $
- * $FreeBSD$
  */
 
 #define TAU32_UserContext_Add	void	*sys;
diff --git a/sys/dev/ce/machdep.h b/sys/dev/ce/machdep.h
index f715122ae490..f4122ab5b3e3 100644
--- a/sys/dev/ce/machdep.h
+++ b/sys/dev/ce/machdep.h
@@ -15,7 +15,6 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: machdep.h,v 1.3.4.3 2003/11/27 14:21:58 rik Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ce/ng_ce.h b/sys/dev/ce/ng_ce.h
index b8e9604c4f5e..a292f0af3f13 100644
--- a/sys/dev/ce/ng_ce.h
+++ b/sys/dev/ce/ng_ce.h
@@ -13,7 +13,6 @@
  * works or modified versions.
  *
  * $Cronyx: ng_ce.h,v 1.2 2005/04/23 20:11:57 rik Exp $
- * $FreeBSD$
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/ce/tau32-ddk.h b/sys/dev/ce/tau32-ddk.h
index 5dbd5a557801..fb2440465673 100644
--- a/sys/dev/ce/tau32-ddk.h
+++ b/sys/dev/ce/tau32-ddk.h
@@ -8,7 +8,6 @@
  *
  * $Cronyx: tau32-ddk.h,v 1.2 2006/02/01 09:14:40 ly Exp $
  * $Rik: tau32-ddk.h,v 1.7 2006/02/28 22:33:29 rik Exp $
- * $FreeBSD$
  */
 
 #if defined(__GNUC__) || defined(__TURBOC__)
diff --git a/sys/dev/cp/cpddk.h b/sys/dev/cp/cpddk.h
index fcdb0d021f3a..ff836facfc8f 100644
--- a/sys/dev/cp/cpddk.h
+++ b/sys/dev/cp/cpddk.h
@@ -16,7 +16,6 @@
  * works or modified versions.
  *
  * $Cronyx: cpddk.h,v 1.8.4.20 2004/12/06 16:21:06 rik Exp $
- * $FreeBSD$
  */
 #define NBRD		6	/* the maximum number of installed boards */
 #define NCHAN		4	/* the number of channels on the board */
diff --git a/sys/dev/cp/machdep.h b/sys/dev/cp/machdep.h
index f715122ae490..f4122ab5b3e3 100644
--- a/sys/dev/cp/machdep.h
+++ b/sys/dev/cp/machdep.h
@@ -15,7 +15,6 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: machdep.h,v 1.3.4.3 2003/11/27 14:21:58 rik Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/cp/ng_cp.h b/sys/dev/cp/ng_cp.h
index f35d81760499..c3ce6c1c345c 100644
--- a/sys/dev/cp/ng_cp.h
+++ b/sys/dev/cp/ng_cp.h
@@ -13,7 +13,6 @@
  * works or modified versions.
  *
  * $Cronyx: ng_cp.h,v 1.1.2.4 2004/01/27 14:39:11 rik Exp $
- * $FreeBSD$
  */
 
 #ifdef NETGRAPH
diff --git a/sys/dev/cxgb/cxgb_include.h b/sys/dev/cxgb/cxgb_include.h
index d98ef5771baa..cf7fcf96ae36 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 07dda2940621..aaacebb53eea 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 c7ade863b6ef..f1d34eb33f64 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 2a320ef65f3d..5a990aa288a0 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 b8fc3afc39ef..41fcd5107520 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 d861ac87284c..1aec82c7eef8 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 04e103d5d7f1..c99a9fa89d9c 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 461324f2f0f1..13613559d85d 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 02bf91cd613c..b28411a8336b 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 f79dec68eccf..2bbc0c80615c 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 9d4626998987..8dd1602f2572 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 84de76aa7758..754d61bb3513 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 6b9c11e8cc60..678db8fdb9ba 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 6351c5bfc3b4..0f6ac5b35224 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 1ecf31cd82f0..b4a30a30bdb5 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 cb043cb35481..4524ec8899c4 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 e45fd67baea7..f7f2db4589d5 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 acf6fb93598b..3ee7e9d2be80 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 f50723556763..ed275253c1aa 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 e49889f01278..c992e6240d58 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 a66b9489833f..2f4c818c2b66 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 87738906c7eb..0ce86363f551 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 e6b4887d5128..bbc415d35fbb 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 8206a8cd95fa..76a680a410b9 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 b30f2eae1ac7..50034527844b 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 fabcfaa75184..5d869cffe432 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 66b3d840a50d..01a104ed4ff1 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 a930c2ee8a26..18368351dcf5 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 960a86baeeed..5db13b6da76a 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 d2ba617ae220..6b7d03b51d1f 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 fe27f7c18be7..8c03d416e2f1 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 a05781255218..81a412941531 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 e630744d67ff..58543e3ac050 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 8fb33d99fc80..6f5e351afd55 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 0c8ed17c7043..6b84d9eaf676 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 2db14cc1038f..af33cf30db00 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 7c17cc428eac..4186038c267d 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 c1988881d264..c618e577d6ad 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/nvram2env/nvram2env.h b/sys/dev/nvram2env/nvram2env.h
index 511a85db1a49..de9ffc4b114c 100644
--- a/sys/dev/nvram2env/nvram2env.h
+++ b/sys/dev/nvram2env/nvram2env.h
@@ -24,7 +24,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $FreeBSD$
  */
 
 #ifndef NVRAM2ENV_NVRAM2ENV_H_
diff --git a/sys/dev/pms/RefTisa/discovery/api/dm.h b/sys/dev/pms/RefTisa/discovery/api/dm.h
index 18721fda5e19..3974b8391e6c 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 5e569b8ada49..d6ddcc1a08d3 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 38ae4d081aa0..f116a22bdd45 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 c6032d0b5ec4..9222f972ba8b 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 ffeaa6e78e3a..74abf9b963d7 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 7f4252f63dbe..8de404f7350e 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 3bcd8f9faa54..aba4f371c527 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 e702dd4fb23a..aac94f8af473 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 096b02160371..9f45a98153b5 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 39a14b956d26..2526bb7bb775 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 9a4d8e09ad08..3e4e9c042686 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 02f874af75ba..d90d6ea33779 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 f3a6f5122771..daeb0fa1ca95 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 63b2a060a0e3..b4bdab469924 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 e9e02b75dabf..6c5f6c32bb98 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 5e64e5806934..4ef6eb39b601 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 74c88d9e95f7..d3a140592e44 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 56282f1ae15c..9adde219b2d6 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 0675f25cc1aa..a97a41e4360c 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 21150bc66a08..34de22b8a045 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 2f46133f7394..d4d557a4c31e 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 5f3eb61ee6e6..01970f240bf3 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 b727f25f0887..67f44073627c 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 e62a80c5771a..3a1b97b73575 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 b2388f70ee3e..e954e915ebb9 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 d51c604f0225..84936f94559e 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 ca56f5b7c20d..c37ccbd4b017 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 8ed9fb325445..32bbc7d3ebde 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 4af84c75857c..341a12a91ef9 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 4c0931b0e5ed..7536758fc8fe 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 a4cae8c9eacf..9c3f94bb21d3 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 a99571fde99b..abddcc13044a 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 510b989fb959..b080d397bf2b 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 e6f8f21623ed..e571f4912e98 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 7e754ffcb754..2600266ae905 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 7cead29be056..a0140a158ba8 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 2e69ffcec9f0..391ea9e31ee5 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 1f5608824fff..92d3f131ae2b 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 28701ba704ba..341ed84f728f 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 ee07b1ce2cf1..a69bb188a138 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 00c3f4677a0b..f0b45da2fe8c 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 10550d2cc047..0eeecc80fc8a 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 2e3dad2c98a9..99ef88ebffe6 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 bc07967dd27a..5d0dbb30d91a 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 9963924f2339..8bccaa1cd85a 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 01ea864d4b67..f90ff1af9c42 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 9de1837a2c25..893569518961 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 91aadb32414f..14e1eb617f13 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 8c1b42facf88..766656a4f0a5 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 e304dcfeb239..bbed4dec26e2 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 50c770651d28..e552fd98b5d2 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 ad62ac40997d..3dd750b5ee99 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 6cba0fae6b8a..10c7e817139c 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 167b1a0688ff..4259d53ab29a 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 ce93e4a63f7e..ba848ab2dfb8 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 157903fae9df..6ba45c2b30b3 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 3253021c64b5..811d0afe3fc6 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 41c4775f8782..6ba5f7080cc3 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 12c352ae696b..835a5d2904c7 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 516c6d002c0a..e1d9bdf0c962 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 81250882b3bb..6ad52297461f 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 2fc03530d0b1..a5b5a80160b8 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 5968ecba8021..be7773c31740 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 0d469f9fdbf7..d6a3298782d9 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 448cbca3d517..a5b51c3adee9 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 3deb44b4b95f..f648ad344920 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 bec02846ed82..cbd6e50c3375 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 491c29e9339e..d426967fadb2 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 5979ede255df..4d9e732a3e7e 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 34b77ccf0159..b7b954304d0e 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 b58741a434c7..a8034144776b 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 1098f90cd58b..8d0826b59e38 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 c7ed7b7a29f6..cb25fe9b67d1 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 a70ada46f20a..4f45429d4403 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 985587dbd9ed..7d0abc9191dc 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 52fe14096f98..e6cfd0165fa5 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 a8c2673cc8a6..7d7263f32123 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 50d2aa31b148..deea152b94c7 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 b1eac291c49d..9762f0482b1c 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 b63d4ddf2902..6a44b7b73902 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 b37ef6725257..0b7fb8813c2b 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 82541767edaf..95ec55ef3d18 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 cbf1161f7078..33c6fa3432f5 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 c152729c1ee4..2a43a07a31f3 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 81d82c71d7b3..13fd53fcb5b5 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 d578373f7551..d9f236cddbb6 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 2b72f3dd79b4..f3e1a3c1b9bc 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 98338fb732f3..7a4e12c3b833 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 9b9198e0a8c0..f72825645fde 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 fc61eaae5851..77959867b335 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 39e08b4afb12..c46720326a68 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 08172a607f27..31c51654a81d 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 d76cc64e2c7f..bf4514db0e09 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 476a9e882b6d..85fb4b0fda34 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 4153710a8428..89d62fcd3426 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 925ce7a0adb4..f73e92f7c932 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 998a7805fd27..b16e2819624f 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 645f07a58704..2ae3b6b71c0f 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 d01168fe395a..e640b6b560b1 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 35fc42df7878..048d7ee24634 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 5c2880bb1921..5ec20e591cec 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 12dfd6656e43..1cb5cacd3307 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 c65ece0e3c02..6e546c3da236 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 2b35cceafe68..3940e2e3f60a 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 f9b9861867bc..e05570dd3591 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 a7f9e8d49596..bdf1889da49f 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 f8ab133f5371..8d34be3fd116 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 f160f1310913..56f84a871c9e 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 7ef214632b12..bad697bfa1db 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/sound/pci/ds1.h b/sys/dev/sound/pci/ds1.h
index 9c01f0e287fa..0f92a5e51fc5 100644
--- a/sys/dev/sound/pci/ds1.h
+++ b/sys/dev/sound/pci/ds1.h
@@ -5,7 +5,6 @@
  *	author		: Taichi Sugiyama
  *	create Data     : 28/Sep/99
  * =======================================================================
- * $FreeBSD$
  */
 
 /* ----- YAMAHA DS-XG Devices -------------------------------------------- */
diff --git a/sys/dev/sound/pci/maestro_reg.h b/sys/dev/sound/pci/maestro_reg.h
index 83aa8ecd5577..145bfd6968bc 100644
--- a/sys/dev/sound/pci/maestro_reg.h
+++ b/sys/dev/sound/pci/maestro_reg.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  *
  *	maestro_reg.h,v 1.13 2001/11/11 18:29:46 taku Exp
- * $FreeBSD$
  */
 
 #ifndef	MAESTRO_REG_H_INCLUDED
diff --git a/sys/dev/ti/ti_fw2.h b/sys/dev/ti/ti_fw2.h
index e54c920531e5..555f0519803e 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 b6244831de32..033e09437c63 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 246b06b7e298..fb706a4d9b1a 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 2fcccbb3c175..9c96a9af4c05 100644
--- a/sys/dev/veriexec/veriexec_ioctl.h
+++ b/sys/dev/veriexec/veriexec_ioctl.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011-2013, 2015, 2019, Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/dev/veriexec/verified_exec.c b/sys/dev/veriexec/verified_exec.c
index 3c72d30155dd..f57bc5291a90 100644
--- a/sys/dev/veriexec/verified_exec.c
+++ b/sys/dev/veriexec/verified_exec.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011-2013, 2015, 2019 Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/dev/vkbd/vkbd.c b/sys/dev/vkbd/vkbd.c
index 4aba14d2fe99..3725e852ecd1 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 c4457bbe8c55..e93667f4f193 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 6f2b1a17c60c..3b81b369c609 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 e415327af680..30bfeb94a606 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 912a8f9c631d..44c9d3aae016 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 d7107fdc3164..7057f3541edb 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 ac7017fc59fa..822b9047008f 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 8b731a1a9d29..9e6a75ec12fb 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 ca58e8859c09..332418ef6804 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 77ec038532bd..7bdd1c1cf777 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 1c401d7c0f61..44fe0f135698 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 a2a585a39446..b04dc17c7658 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 aca059204d6f..99642603cc7a 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 7d0c55e74505..b1fc187f503d 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 0c37f204c530..5b4233d885cc 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 325bb97a9551..ac3f61e56cc1 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 99c34f971efe..09917893df15 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 324bbafd7caf..2136cee92e87 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 79df804aceb8..2f68f86765bd 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 af480eda1bca..aef4dd33b57c 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 412f08b871e0..807f47a487e6 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 dbad77c8e89c..14c165795e4e 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 090caf783a3b..4e8747daedc6 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 bfa505896637..8ff42cecf652 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 7be45a9945f2..75613c66ef47 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 59478cca10a1..5ea1ee01a1b6 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 004bd7a45211..b107fa318473 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 e35b989c285b..de95b6b13da7 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 51119ed8d52f..01b94abf6cd5 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 e07b69b91bce..f283c6e7934e 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 2077b6b276ea..6b8b23ccab14 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 2b57cf68be8c..ab223bfe8a90 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 241e89a60f6f..500352338f6d 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 6e6d3b0df079..43530c156cf6 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 f7bf2b792625..7b570a252367 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 2d680fe2621d..945cbb20782a 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 fd5d0cb2a209..12a39edb82cd 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 4592f458058d..70131f0547dd 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 ba0318bf185c..d89b26120174 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 93e4f50d98c5..22c8ffe88bde 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 ae95bd9c005c..613a73e7a4c9 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 331235ab93d5..cd57a5cae459 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 2bd70875f6cd..71f00d150010 100644
--- a/sys/geom/vinum/geom_vinum_var.h
+++ b/sys/geom/vinum/geom_vinum_var.h
@@ -37,7 +37,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 72a9fb920789..89205a522c25 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 48d08e1c1763..eb8e39c9f988 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 50267f7fdd91..90d67828246a 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 523cc3c0f867..c6c4f68fb5b2 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 a47e9c8e6ae0..785c071991d3 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 da9363b751ff..fbc06aa30004 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 5e54490d0b45..1171981682ec 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 6c5f3667de71..93bb74f11a2b 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 7a1f48fad4d0..482a49f228d5 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 d350c3abaeaa..f116feec4eca 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 ed9588b3b1cd..171e4d8258be 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 e23fe2bec8d2..8b5944ece4b3 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 df35c9e92cc7..94dfb3c60f14 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/cserial.h b/sys/i386/include/cserial.h
index 833976a30a16..1d9961b1e4f5 100644
--- a/sys/i386/include/cserial.h
+++ b/sys/i386/include/cserial.h
@@ -18,7 +18,6 @@
  * all derivative works or modified versions.
  *
  * Cronyx Id: cserial.h,v 1.4.2.2 2005/11/09 13:01:35 rik Exp $
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h
index 099ea263e202..f3a8caa5b88d 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 b7c154743d0c..392fb1957fa1 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 0ab8fe9259dd..1108484bbfc7 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 84e369cf3c81..dce7a9e97012 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 5a7b831b3089..13ded39672ac 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 6c7e02232c24..eae109440b31 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 09644ede45de..b1a6d7805b20 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 a3f503ae1320..5c73ca6947d5 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 228c1520f0a0..eae46e1aea95 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 e9d30cf54439..f86c78611683 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 e9394b444ff6..1f3fa57ac966 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 4be836886b21..53eab090184b 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 3a0a290b97ff..5f0512e0ce5c 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 ea5ed128ef86..777cafe1d6b8 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 cf851e75051d..09c9ebdecffd 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 5e238a307d76..532046a6634a 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 2950b4760feb..293e5598076a 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 cc13379cac45..97047003159c 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 3b844fbc8be1..32a49fe5d6dc 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 dff4ed449943..b538ce6f1e90 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/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 3cf91e19e659..38f89832ba5f 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -2,7 +2,6 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #ifndef _LINUX_SYSPROTO_H_
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index a77c91896fd6..5aca8ed78c6f 100644
--- a/sys/i386/linux/linux_syscall.h
+++ b/sys/i386/linux/linux_syscall.h
@@ -2,7 +2,6 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #define	LINUX_SYS_linux_exit	1
diff --git a/sys/i386/linux/linux_syscalls.c b/sys/i386/linux/linux_syscalls.c
index 1454490c9318..88ebcbd36073 100644
--- a/sys/i386/linux/linux_syscalls.c
+++ b/sys/i386/linux/linux_syscalls.c
@@ -2,7 +2,6 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 const char *linux_syscallnames[] = {
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 3d92ce04eb52..14c7b059ca07 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -2,7 +2,6 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c
index 2ca52683c4e6..7b79b067f4f9 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -2,7 +2,6 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  * This file is part of the DTrace syscall provider.
  */
 
diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h
index 73ed5e68c332..8cbc0b171c4f 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 6618872d70c1..c242ccaa20c8 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/kern/init_sysent.c b/sys/kern/init_sysent.c
index 05e51fdac863..26e2d93e2eb7 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -2,7 +2,6 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 72251162d837..e0f0bd3b4148 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -2,7 +2,6 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 const char *syscallnames[] = {
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
index 78a76358b43b..b24cae6c1207 100644
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -2,7 +2,6 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  * This file is part of the DTrace syscall provider.
  */
 
diff --git a/sys/libkern/jenkins_hash.c b/sys/libkern/jenkins_hash.c
index 250ef458aa67..5202849ae1b0 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 452f331661b3..2601a704ac47 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/mips/broadcom/bcm_bmipsreg.h b/sys/mips/broadcom/bcm_bmipsreg.h
index ff77a20e667e..c8228b3bcfab 100644
--- a/sys/mips/broadcom/bcm_bmipsreg.h
+++ b/sys/mips/broadcom/bcm_bmipsreg.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	_MIPS_BROADCOM_BMIPSREG_H_
diff --git a/sys/mips/broadcom/bcm_machdep.h b/sys/mips/broadcom/bcm_machdep.h
index 7a8b155961b9..8e1228d5bdb5 100644
--- a/sys/mips/broadcom/bcm_machdep.h
+++ b/sys/mips/broadcom/bcm_machdep.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	_MIPS_BROADCOM_BCM_MACHDEP_H_
diff --git a/sys/mips/broadcom/bcm_mips74kreg.h b/sys/mips/broadcom/bcm_mips74kreg.h
index 92e8a8e53ef0..7ab75917163c 100644
--- a/sys/mips/broadcom/bcm_mips74kreg.h
+++ b/sys/mips/broadcom/bcm_mips74kreg.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	_MIPS_BROADCOM_MIPS74KREG_H_
diff --git a/sys/mips/broadcom/bcm_mipsvar.h b/sys/mips/broadcom/bcm_mipsvar.h
index bb530ae6c3ee..a1a22ea06ce2 100644
--- a/sys/mips/broadcom/bcm_mipsvar.h
+++ b/sys/mips/broadcom/bcm_mipsvar.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 _MIPS_BROADCOM_BCM_MIPSVAR_H_
diff --git a/sys/mips/broadcom/bcm_nvram_cfevar.h b/sys/mips/broadcom/bcm_nvram_cfevar.h
index dc082d586cec..590dac4402a2 100644
--- a/sys/mips/broadcom/bcm_nvram_cfevar.h
+++ b/sys/mips/broadcom/bcm_nvram_cfevar.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	_MIPS_BROADCOM_BCM_NVRAM_CFE_H_
diff --git a/sys/mips/broadcom/bcma_nexus.c b/sys/mips/broadcom/bcma_nexus.c
index 4e3eaa7a7c1d..19555ec05016 100644
--- a/sys/mips/broadcom/bcma_nexus.c
+++ b/sys/mips/broadcom/bcma_nexus.c
@@ -27,7 +27,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  * 
- * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/mips/broadcom/bhnd_nexus.c b/sys/mips/broadcom/bhnd_nexus.c
index 6d3e735a2970..4562e2d60cb6 100644
--- a/sys/mips/broadcom/bhnd_nexus.c
+++ b/sys/mips/broadcom/bhnd_nexus.c
@@ -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$
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/mips/broadcom/bhnd_nexusvar.h b/sys/mips/broadcom/bhnd_nexusvar.h
index 410070f7cf34..6bb953bc01bf 100644
--- a/sys/mips/broadcom/bhnd_nexusvar.h
+++ b/sys/mips/broadcom/bhnd_nexusvar.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 _MIPS_BROADCOM_BHND_NEXUSVAR_H_
diff --git a/sys/mips/cavium/octeon_irq.h b/sys/mips/cavium/octeon_irq.h
index 7ffeb8239111..9b2dde4458e9 100644
--- a/sys/mips/cavium/octeon_irq.h
+++ b/sys/mips/cavium/octeon_irq.h
@@ -43,7 +43,6 @@
 #define __OCTEON_IRQ_H__
 
 /*
- * $FreeBSD$
  */
 
 /**
diff --git a/sys/mips/cavium/octopci_bus_space.c b/sys/mips/cavium/octopci_bus_space.c
index aa1ee67be9a8..55caa19a6783 100644
--- a/sys/mips/cavium/octopci_bus_space.c
+++ b/sys/mips/cavium/octopci_bus_space.c
@@ -64,7 +64,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: src/sys/alpha/include/bus.h,v 1.5 1999/08/28 00:38:40 peter
- * $FreeBSD$
  */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/sys/mips/include/_align.h b/sys/mips/include/_align.h
index b263766b4ced..6a93d1d408c2 100644
--- a/sys/mips/include/_align.h
+++ b/sys/mips/include/_align.h
@@ -38,7 +38,6 @@
  *	from: Utah Hdr: machparam.h 1.11 89/08/14
  *	from: @(#)param.h	8.1 (Berkeley) 6/10/93
  *	JNPR: param.h,v 1.6.2.1 2007/09/10 07:49:36 girish
- * $FreeBSD$
  */
 
 #ifndef _MIPS_INCLUDE__ALIGN_H_
diff --git a/sys/mips/include/_bus.h b/sys/mips/include/_bus.h
index 8ab3c86fb027..0ca616af0dfb 100644
--- a/sys/mips/include/_bus.h
+++ b/sys/mips/include/_bus.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * from: src/sys/i386/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp
- * $FreeBSD$
  */
 
 #ifndef MIPS_INCLUDE__BUS_H
diff --git a/sys/mips/include/_inttypes.h b/sys/mips/include/_inttypes.h
index 38054a52e8d5..8a852027978c 100644
--- a/sys/mips/include/_inttypes.h
+++ b/sys/mips/include/_inttypes.h
@@ -30,7 +30,6 @@
  *
  *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
  *	from: src/sys/i386/include/_inttypes.h,v 1.2 2002/06/30 05:48:02 mike
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_INTTYPES_H_
diff --git a/sys/mips/include/_limits.h b/sys/mips/include/_limits.h
index 5f5244878ce5..c241d0eb17f1 100644
--- a/sys/mips/include/_limits.h
+++ b/sys/mips/include/_limits.h
@@ -30,7 +30,6 @@
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
  *	from: src/sys/i386/include/_limits.h,v 1.27 2005/01/06 22:18:15 imp
- * $FreeBSD$
  */
 
 #ifndef _MACHINE__LIMITS_H_
diff --git a/sys/mips/include/_stdint.h b/sys/mips/include/_stdint.h
index 83455b7780d1..801b67b84f10 100644
--- a/sys/mips/include/_stdint.h
+++ b/sys/mips/include/_stdint.h
@@ -37,7 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: src/sys/i386/include/_stdint.h,v 1.2 2004/05/18 16:04:57 stefanf
- * $FreeBSD$
  */
 
 #ifndef _MACHINE__STDINT_H_
diff --git a/sys/mips/include/_types.h b/sys/mips/include/_types.h
index 385280b1ea45..9aea1fc98be6 100644
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
@@ -36,7 +36,6 @@
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
  *	from: src/sys/i386/include/_types.h,v 1.12 2005/07/02 23:13:31 thompsa
- * $FreeBSD$
  */
 
 #ifndef _MACHINE__TYPES_H_
diff --git a/sys/mips/include/abi.h b/sys/mips/include/abi.h
index 762347e3115a..d7b98565dc91 100644
--- a/sys/mips/include/abi.h
+++ b/sys/mips/include/abi.h
@@ -35,7 +35,6 @@
  *
  *	@(#)machAsmDefs.h	8.1 (Berkeley) 6/10/93
  *	JNPR: asm.h,v 1.10 2007/08/09 11:23:32 katta
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/mips/include/asm.h b/sys/mips/include/asm.h
index 78d2c029cf08..7e9e95ef9f14 100644
--- a/sys/mips/include/asm.h
+++ b/sys/mips/include/asm.h
@@ -35,7 +35,6 @@
  *
  *	@(#)machAsmDefs.h	8.1 (Berkeley) 6/10/93
  *	JNPR: asm.h,v 1.10 2007/08/09 11:23:32 katta
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/mips/include/atomic.h b/sys/mips/include/atomic.h
index 5079eca6d93a..f14fa3de65f2 100644
--- a/sys/mips/include/atomic.h
+++ b/sys/mips/include/atomic.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  *
  *	from: src/sys/alpha/include/atomic.h,v 1.21.2.3 2005/10/06 18:12:05 jhb
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_ATOMIC_H_
diff --git a/sys/mips/include/clock.h b/sys/mips/include/clock.h
index 0622efb22690..68296d059036 100644
--- a/sys/mips/include/clock.h
+++ b/sys/mips/include/clock.h
@@ -5,7 +5,6 @@
  *
  *	JNPR: clock.h,v 1.6.2.1 2007/08/29 09:36:05 girish
  *	from: src/sys/alpha/include/clock.h,v 1.5 1999/12/29 04:27:55 peter
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/mips/include/cpu.h b/sys/mips/include/cpu.h
index aaec97aa25f1..264c27982f3f 100644
--- a/sys/mips/include/cpu.h
+++ b/sys/mips/include/cpu.h
@@ -43,7 +43,6 @@
  *
  *	from: @(#)cpu.h	8.4 (Berkeley) 1/4/94
  *	JNPR: cpu.h,v 1.9.2.2 2007/09/10 08:23:46 girish
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/mips/include/cpufunc.h b/sys/mips/include/cpufunc.h
index ace92c6226e1..c7dd402f3338 100644
--- a/sys/mips/include/cpufunc.h
+++ b/sys/mips/include/cpufunc.h
@@ -55,7 +55,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	JNPR: cpufunc.h,v 1.5 2007/08/09 11:23:32 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/mips/include/db_machdep.h b/sys/mips/include/db_machdep.h
index 26e34c5ad12f..2d81635aca04 100644
--- a/sys/mips/include/db_machdep.h
+++ b/sys/mips/include/db_machdep.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	JNPR: db_machdep.h,v 1.7 2006/10/16 12:30:34 katta
- * $FreeBSD$
  */
 
 #ifndef	_MIPS_DB_MACHDEP_H_
diff --git a/sys/mips/include/endian.h b/sys/mips/include/endian.h
index 57f76445a9cd..9e8179913ca6 100644
--- a/sys/mips/include/endian.h
+++ b/sys/mips/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/mips/include/exec.h b/sys/mips/include/exec.h
index b225c6b867d5..4eb6ef0b5249 100644
--- a/sys/mips/include/exec.h
+++ b/sys/mips/include/exec.h
@@ -31,7 +31,6 @@
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
  *	from: src/sys/i386/include/exec.h,v 1.8 1999/08/28 00:44:11 peter
  *	JNPR: exec.h,v 1.3 2006/08/07 05:38:57 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_EXEC_H_
diff --git a/sys/mips/include/float.h b/sys/mips/include/float.h
index b2974196cce4..39d2ffae14c2 100644
--- a/sys/mips/include/float.h
+++ b/sys/mips/include/float.h
@@ -31,7 +31,6 @@
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
  *	from: src/sys/i386/include/float.h,v 1.8 1999/08/28 00:44:11 peter
  *	JNPR: float.h,v 1.4 2006/12/02 09:53:41 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/mips/include/floatingpoint.h b/sys/mips/include/floatingpoint.h
index b7c154743d0c..392fb1957fa1 100644
--- a/sys/mips/include/floatingpoint.h
+++ b/sys/mips/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/mips/include/frame.h b/sys/mips/include/frame.h
index 72cbb8914eaa..7f63e8669d54 100644
--- a/sys/mips/include/frame.h
+++ b/sys/mips/include/frame.h
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	JNPR: frame.h,v 1.6.2.1 2007/09/10 08:14:57 girish
- * $FreeBSD$
  *
  */
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/mips/include/gdb_machdep.h b/sys/mips/include/gdb_machdep.h
index 73a0ea109cf9..7739d2c62ef7 100644
--- a/sys/mips/include/gdb_machdep.h
+++ b/sys/mips/include/gdb_machdep.h
@@ -27,7 +27,6 @@
  *
  *	from: src/sys/alpha/include/gdb_machdep.h,v 1.3 2005/01/05 20:05:50 imp
  *	JNPR: gdb_machdep.h,v 1.1 2007/08/09 12:25:25 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
diff --git a/sys/mips/include/ieeefp.h b/sys/mips/include/ieeefp.h
index fb6c21a47c43..ebc746ef1d93 100644
--- a/sys/mips/include/ieeefp.h
+++ b/sys/mips/include/ieeefp.h
@@ -5,7 +5,6 @@
  * Public domain.
  *
  *	JNPR: ieeefp.h,v 1.1 2006/08/07 05:38:57 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_IEEEFP_H_
diff --git a/sys/mips/include/in_cksum.h b/sys/mips/include/in_cksum.h
index 580fb9c024f8..56dfcb4a8d34 100644
--- a/sys/mips/include/in_cksum.h
+++ b/sys/mips/include/in_cksum.h
@@ -32,7 +32,6 @@
  *	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
  *	from: src/sys/alpha/include/in_cksum.h,v 1.7 2005/03/02 21:33:20 joerg
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/mips/include/kdb.h b/sys/mips/include/kdb.h
index ea2854af4fa7..034dd0dc0294 100644
--- a/sys/mips/include/kdb.h
+++ b/sys/mips/include/kdb.h
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: src/sys/alpha/include/kdb.h,v 1.2 2005/01/05 20:05:50 imp
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_KDB_H_
diff --git a/sys/mips/include/limits.h b/sys/mips/include/limits.h
index 277d107e174d..01d75a29c19e 100644
--- a/sys/mips/include/limits.h
+++ b/sys/mips/include/limits.h
@@ -30,7 +30,6 @@
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
  *	from: src/sys/i386/include/limits.h,v 1.27 2005/03/02 21:33:26 joerg
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/mips/include/md_var.h b/sys/mips/include/md_var.h
index 138047a13b47..ac2b7b692139 100644
--- a/sys/mips/include/md_var.h
+++ b/sys/mips/include/md_var.h
@@ -30,7 +30,6 @@
  *
  *	from: src/sys/i386/include/md_var.h,v 1.35 2000/02/20 20:51:23 bsd
  *	JNPR: md_var.h,v 1.4 2006/10/16 12:30:34 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/mips/include/memdev.h b/sys/mips/include/memdev.h
index c1db8da16a6d..c0fb9b171a8f 100644
--- a/sys/mips/include/memdev.h
+++ b/sys/mips/include/memdev.h
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: src/sys/alpha/include/memdev.h,v 1.2 2004/08/01 18:51:44 markm
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_MEMDEV_H_
diff --git a/sys/mips/include/mips_opcode.h b/sys/mips/include/mips_opcode.h
index 0a1bc7268475..5a98487785cd 100644
--- a/sys/mips/include/mips_opcode.h
+++ b/sys/mips/include/mips_opcode.h
@@ -35,7 +35,6 @@
  *
  *	from: @(#)mips_opcode.h 8.1 (Berkeley) 6/10/93
  *	JNPR: mips_opcode.h,v 1.1 2006/08/07 05:38:57 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_MIPS_OPCODE_H_
diff --git a/sys/mips/include/param.h b/sys/mips/include/param.h
index 69b670274697..d56e7caae073 100644
--- a/sys/mips/include/param.h
+++ b/sys/mips/include/param.h
@@ -38,7 +38,6 @@
  *	from: Utah Hdr: machparam.h 1.11 89/08/14
  *	from: @(#)param.h	8.1 (Berkeley) 6/10/93
  *	JNPR: param.h,v 1.6.2.1 2007/09/10 07:49:36 girish
- * $FreeBSD$
  */
 
 #ifndef _MIPS_INCLUDE_PARAM_H_
diff --git a/sys/mips/include/pcb.h b/sys/mips/include/pcb.h
index 6ae5206e2495..2bea407daaca 100644
--- a/sys/mips/include/pcb.h
+++ b/sys/mips/include/pcb.h
@@ -38,7 +38,6 @@
  *	from: Utah Hdr: pcb.h 1.13 89/04/23
  *	from: @(#)pcb.h 8.1 (Berkeley) 6/10/93
  *	JNPR: pcb.h,v 1.2 2006/08/07 11:51:17 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PCB_H_
diff --git a/sys/mips/include/pcpu.h b/sys/mips/include/pcpu.h
index 6859b5e0ad7c..d9a030b57462 100644
--- a/sys/mips/include/pcpu.h
+++ b/sys/mips/include/pcpu.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	from: src/sys/alpha/include/pcpu.h,v 1.15 2004/11/05 19:16:44 jhb
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PCPU_H_
diff --git a/sys/mips/include/pmap.h b/sys/mips/include/pmap.h
index 0cc098fcf4be..b38895c9c8c2 100644
--- a/sys/mips/include/pmap.h
+++ b/sys/mips/include/pmap.h
@@ -42,7 +42,6 @@
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
  *	from: src/sys/i386/include/pmap.h,v 1.65.2.2 2000/11/30 01:54:42 peter
  *	JNPR: pmap.h,v 1.7.2.1 2007/09/10 07:44:12 girish
- *      $FreeBSD$
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/mips/include/pmc_mdep.h b/sys/mips/include/pmc_mdep.h
index 1386866b30e8..dc858b717ede 100644
--- a/sys/mips/include/pmc_mdep.h
+++ b/sys/mips/include/pmc_mdep.h
@@ -2,7 +2,6 @@
  * This file is in the public domain.
  *
  *	from: src/sys/alpha/include/pmc_mdep.h,v 1.2 2005/06/09 19:45:06 jkoshy
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PMC_MDEP_H_
diff --git a/sys/mips/include/proc.h b/sys/mips/include/proc.h
index 8f6f46b86513..86ed45d8782a 100644
--- a/sys/mips/include/proc.h
+++ b/sys/mips/include/proc.h
@@ -35,7 +35,6 @@
  *
  *	@(#)proc.h	8.1 (Berkeley) 6/10/93
  *	JNPR: proc.h,v 1.7.2.1 2007/09/10 06:25:24 girish
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/mips/include/profile.h b/sys/mips/include/profile.h
index 5968deb60b43..eaa40fc1d8d4 100644
--- a/sys/mips/include/profile.h
+++ b/sys/mips/include/profile.h
@@ -34,7 +34,6 @@
  *
  *	from: @(#)profile.h	8.1 (Berkeley) 6/10/93
  *	JNPR: profile.h,v 1.4 2006/12/02 09:53:41 katta
- * $FreeBSD$
  */
 #ifndef _MACHINE_PROFILE_H_
 #define	_MACHINE_PROFILE_H_
diff --git a/sys/mips/include/ptrace.h b/sys/mips/include/ptrace.h
index 401c171906fb..b3ba3a4ad819 100644
--- a/sys/mips/include/ptrace.h
+++ b/sys/mips/include/ptrace.h
@@ -30,7 +30,6 @@
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
  *	from: src/sys/i386/include/ptrace.h,v 1.14 2005/05/31 09:43:04 dfr
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/mips/include/reg.h b/sys/mips/include/reg.h
index 440b791bffc7..3863b20ca052 100644
--- a/sys/mips/include/reg.h
+++ b/sys/mips/include/reg.h
@@ -38,7 +38,6 @@
  *	from: Utah Hdr: reg.h 1.1 90/07/09
  *	@(#)reg.h	8.2 (Berkeley) 1/11/94
  *	JNPR: reg.h,v 1.6 2006/09/15 12:52:34 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/mips/include/regdef.h b/sys/mips/include/regdef.h
index 5a6b57f30672..cb619b17d21b 100644
--- a/sys/mips/include/regdef.h
+++ b/sys/mips/include/regdef.h
@@ -35,7 +35,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)regdef.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _MIPS_REGDEF_H
diff --git a/sys/mips/include/regnum.h b/sys/mips/include/regnum.h
index e88fe2d061e7..7b7943db965b 100644
--- a/sys/mips/include/regnum.h
+++ b/sys/mips/include/regnum.h
@@ -38,7 +38,6 @@
  *	from: Utah Hdr: reg.h 1.1 90/07/09
  *	@(#)reg.h	8.2 (Berkeley) 1/11/94
  *	JNPR: regnum.h,v 1.6 2007/08/09 11:23:32 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_REGNUM_H_
diff --git a/sys/mips/include/reloc.h b/sys/mips/include/reloc.h
index 7b5610bda2af..4d6f7cd18de3 100644
--- a/sys/mips/include/reloc.h
+++ b/sys/mips/include/reloc.h
@@ -33,5 +33,4 @@
  *
  *	from: src/sys/alpha/include/reloc.h,v 1.1.1.1.6.1 2000/08/03 00:48:04 peter
  *	JNPR: reloc.h,v 1.3 2006/08/07 05:38:57 katta
- * $FreeBSD$
  */
diff --git a/sys/mips/include/resource.h b/sys/mips/include/resource.h
index ec279cd1c513..34a356479d7d 100644
--- a/sys/mips/include/resource.h
+++ b/sys/mips/include/resource.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *	from: src/sys/i386/include/resource.h,v 1.3 1999/10/14 21:38:30 dfr
  *	JNPR: resource.h,v 1.3 2006/08/07 05:38:57 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_RESOURCE_H_
diff --git a/sys/mips/include/runq.h b/sys/mips/include/runq.h
index 0dabbc2b683e..7b37ba6f6a41 100644
--- a/sys/mips/include/runq.h
+++ b/sys/mips/include/runq.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  *
  *	from: src/sys/i386/include/runq.h,v 1.3 2005/01/06 22:18:15 imp
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_RUNQ_H_
diff --git a/sys/mips/include/setjmp.h b/sys/mips/include/setjmp.h
index 8b6ca0478fda..1ae95b7ace1b 100644
--- a/sys/mips/include/setjmp.h
+++ b/sys/mips/include/setjmp.h
@@ -29,7 +29,6 @@
  * rights to redistribute these changes.
  *
  *	JNPR: setjmp.h,v 1.2 2006/12/02 09:53:41 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_SETJMP_H_
diff --git a/sys/mips/include/sigframe.h b/sys/mips/include/sigframe.h
index 3b9314d8b6e2..bacbd60ecce4 100644
--- a/sys/mips/include/sigframe.h
+++ b/sys/mips/include/sigframe.h
@@ -29,7 +29,6 @@
  *
  *	from: src/sys/alpha/include/sigframe.h,v 1.1 1999/09/29 15:06:26 marcel
  *	from: sigframe.h,v 1.1 2006/08/07 05:38:57 katta
- * $FreeBSD$
  */
 #ifndef _MACHINE_SIGFRAME_H_
 #define	_MACHINE_SIGFRAME_H_
diff --git a/sys/mips/include/signal.h b/sys/mips/include/signal.h
index e2cbee77e48c..fa0e21e7c1c6 100644
--- a/sys/mips/include/signal.h
+++ b/sys/mips/include/signal.h
@@ -35,7 +35,6 @@
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/10/93
  *	JNPR: signal.h,v 1.4 2007/01/08 04:58:37 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/mips/include/smp.h b/sys/mips/include/smp.h
index d7a33de1e935..be0dbe22f37f 100644
--- a/sys/mips/include/smp.h
+++ b/sys/mips/include/smp.h
@@ -8,7 +8,6 @@
  *
  *	from: src/sys/alpha/include/smp.h,v 1.8 2005/01/05 20:05:50 imp
  *	JNPR: smp.h,v 1.3 2006/12/02 09:53:41 katta
- * $FreeBSD$
  *
  */
 
diff --git a/sys/mips/include/trap.h b/sys/mips/include/trap.h
index a88784f869c5..fc9d32eb106f 100644
--- a/sys/mips/include/trap.h
+++ b/sys/mips/include/trap.h
@@ -38,7 +38,6 @@
  *	from: Utah Hdr: trap.h 1.1 90/07/09
  *	from: @(#)trap.h	8.1 (Berkeley) 6/10/93
  *	JNPR: trap.h,v 1.3 2006/12/02 09:53:41 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/mips/include/ucontext.h b/sys/mips/include/ucontext.h
index 06d8d0ed9623..28cf9cfb161f 100644
--- a/sys/mips/include/ucontext.h
+++ b/sys/mips/include/ucontext.h
@@ -33,7 +33,6 @@
  *
  *	@(#)ucontext.h	8.1 (Berkeley) 6/10/93
  *	JNPR: ucontext.h,v 1.2 2007/08/09 11:23:32 katta
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_UCONTEXT_H_
diff --git a/sys/mips/include/vmparam.h b/sys/mips/include/vmparam.h
index d6f9e31deaad..2d287e66db88 100644
--- a/sys/mips/include/vmparam.h
+++ b/sys/mips/include/vmparam.h
@@ -39,7 +39,6 @@
  *	from: Utah Hdr: vmparam.h 1.16 91/01/18
  *	@(#)vmparam.h	8.2 (Berkeley) 4/22/94
  *	JNPR: vmparam.h,v 1.3.2.1 2007/09/10 06:01:28 girish
- * $FreeBSD$
  */
 
 #ifndef _MACHINE_VMPARAM_H_
diff --git a/sys/mips/malta/gt_pci_bus_space.c b/sys/mips/malta/gt_pci_bus_space.c
index 861d42a7f5d7..4ebd1160ca92 100644
--- a/sys/mips/malta/gt_pci_bus_space.c
+++ b/sys/mips/malta/gt_pci_bus_space.c
@@ -71,7 +71,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: src/sys/alpha/include/bus.h,v 1.5 1999/08/28 00:38:40 peter
- * $FreeBSD$
  */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/sys/mips/mips/bus_space_generic.c b/sys/mips/mips/bus_space_generic.c
index 4e4ac6596a30..b4322a95c8ae 100644
--- a/sys/mips/mips/bus_space_generic.c
+++ b/sys/mips/mips/bus_space_generic.c
@@ -64,7 +64,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: src/sys/alpha/include/bus.h,v 1.5 1999/08/28 00:38:40 peter
- * $FreeBSD$
  */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/sys/mips/mips/exception.S b/sys/mips/mips/exception.S
index 719904ac83b7..3cb94abe3aad 100644
--- a/sys/mips/mips/exception.S
+++ b/sys/mips/mips/exception.S
@@ -46,7 +46,6 @@
  *	v 1.1 89/07/10 14:27:41 nelson Exp  SPRITE (DECWRL)
  *	from: @(#)locore.s	8.5 (Berkeley) 1/4/94
  *	JNPR: exception.S,v 1.5 2007/01/08 04:58:37 katta
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/mips/mips/fp.S b/sys/mips/mips/fp.S
index b959f86fc631..8fb410f44c1b 100644
--- a/sys/mips/mips/fp.S
+++ b/sys/mips/mips/fp.S
@@ -32,7 +32,6 @@
  *
  *	from: @(#)fp.s	8.1 (Berkeley) 6/10/93
  *	JNPR: fp.S,v 1.1 2006/08/07 05:38:57 katta
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/mips/mips/gdb_machdep.c b/sys/mips/mips/gdb_machdep.c
index 87e8e55e9449..ec7828d7f963 100644
--- a/sys/mips/mips/gdb_machdep.c
+++ b/sys/mips/mips/gdb_machdep.c
@@ -87,7 +87,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	JNPR: gdb_machdep.c,v 1.1 2007/08/09 12:25:25 katta
- * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/mips/mips/locore.S b/sys/mips/mips/locore.S
index e3470b52ce78..ff600f9d2da0 100644
--- a/sys/mips/mips/locore.S
+++ b/sys/mips/mips/locore.S
@@ -47,7 +47,6 @@
  *
  *	from: @(#)locore.s	8.5 (Berkeley) 1/4/94
  *	JNPR: locore.S,v 1.6.2.1 2007/08/29 12:24:49 girish
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/mips/mips/support.S b/sys/mips/mips/support.S
index cfcdc27b1d0e..d86fa955b15b 100644
--- a/sys/mips/mips/support.S
+++ b/sys/mips/mips/support.S
@@ -47,7 +47,6 @@
  *
  *	from: @(#)locore.s	8.5 (Berkeley) 1/4/94
  *	JNPR: support.S,v 1.5.2.2 2007/08/29 10:03:49 girish
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/mips/mips/swtch.S b/sys/mips/mips/swtch.S
index 8d357004c84a..58f228edf4bc 100644
--- a/sys/mips/mips/swtch.S
+++ b/sys/mips/mips/swtch.S
@@ -47,7 +47,6 @@
  *
  *	from: @(#)locore.s	8.5 (Berkeley) 1/4/94
  *	JNPR: swtch.S,v 1.6.2.1 2007/09/10 10:36:50 girish
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/mips/nlm/board.h b/sys/mips/nlm/board.h
index e0815fef0e56..f7a1c1f420a2 100644
--- a/sys/mips/nlm/board.h
+++ b/sys/mips/nlm/board.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __NLM_BOARD_H__
diff --git a/sys/mips/nlm/clock.h b/sys/mips/nlm/clock.h
index b117dfe19cc4..416fe1d22c74 100644
--- a/sys/mips/nlm/clock.h
+++ b/sys/mips/nlm/clock.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef _RMI_CLOCK_H_
diff --git a/sys/mips/nlm/hal/bridge.h b/sys/mips/nlm/hal/bridge.h
index 72f6464c4732..975b0eb41a08 100644
--- a/sys/mips/nlm/hal/bridge.h
+++ b/sys/mips/nlm/hal/bridge.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __NLM_HAL_BRIDGE_H__
diff --git a/sys/mips/nlm/hal/cop2.h b/sys/mips/nlm/hal/cop2.h
index 2b817f70874c..ba8b3769bdd0 100644
--- a/sys/mips/nlm/hal/cop2.h
+++ b/sys/mips/nlm/hal/cop2.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __NLM_HAL_COP2_H__
diff --git a/sys/mips/nlm/hal/cpucontrol.h b/sys/mips/nlm/hal/cpucontrol.h
index 465c71fe923d..d854f0f47168 100644
--- a/sys/mips/nlm/hal/cpucontrol.h
+++ b/sys/mips/nlm/hal/cpucontrol.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __NLM_HAL_CPUCONTROL_H__
diff --git a/sys/mips/nlm/hal/fmn.h b/sys/mips/nlm/hal/fmn.h
index 3e69fb98a535..c4e44e8e2eda 100644
--- a/sys/mips/nlm/hal/fmn.h
+++ b/sys/mips/nlm/hal/fmn.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __NLM_FMNV2_H__
diff --git a/sys/mips/nlm/hal/haldefs.h b/sys/mips/nlm/hal/haldefs.h
index 3628af3c02ca..26898e948081 100644
--- a/sys/mips/nlm/hal/haldefs.h
+++ b/sys/mips/nlm/hal/haldefs.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __NLM_HAL_MMIO_H__
diff --git a/sys/mips/nlm/hal/iomap.h b/sys/mips/nlm/hal/iomap.h
index 0dd02cd39c42..951eba32a741 100644
--- a/sys/mips/nlm/hal/iomap.h
+++ b/sys/mips/nlm/hal/iomap.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __NLM_HAL_IOMAP_H__
diff --git a/sys/mips/nlm/hal/mips-extns.h b/sys/mips/nlm/hal/mips-extns.h
index 5b37465034f3..0af34248fe5c 100644
--- a/sys/mips/nlm/hal/mips-extns.h
+++ b/sys/mips/nlm/hal/mips-extns.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __NLM_MIPS_EXTNS_H__
diff --git a/sys/mips/nlm/hal/mmu.h b/sys/mips/nlm/hal/mmu.h
index cf3969d39214..82d96ba5dd8a 100644
--- a/sys/mips/nlm/hal/mmu.h
+++ b/sys/mips/nlm/hal/mmu.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __XLP_MMU_H__
diff --git a/sys/mips/nlm/hal/pcibus.h b/sys/mips/nlm/hal/pcibus.h
index d22168fb37a4..bef79b16858e 100644
--- a/sys/mips/nlm/hal/pcibus.h
+++ b/sys/mips/nlm/hal/pcibus.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __XLP_PCIBUS_H__
diff --git a/sys/mips/nlm/hal/pic.h b/sys/mips/nlm/hal/pic.h
index 05a267879727..3d1cb0bdadfa 100644
--- a/sys/mips/nlm/hal/pic.h
+++ b/sys/mips/nlm/hal/pic.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef _NLM_HAL_PIC_H
diff --git a/sys/mips/nlm/hal/sys.h b/sys/mips/nlm/hal/sys.h
index 7618b9c48988..9fbf4699861c 100644
--- a/sys/mips/nlm/hal/sys.h
+++ b/sys/mips/nlm/hal/sys.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __NLM_HAL_SYS_H__
diff --git a/sys/mips/nlm/hal/uart.h b/sys/mips/nlm/hal/uart.h
index 3e1d72e71a7f..5a4646a75c5f 100644
--- a/sys/mips/nlm/hal/uart.h
+++ b/sys/mips/nlm/hal/uart.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __XLP_HAL_UART_H__
diff --git a/sys/mips/nlm/hal/usb.h b/sys/mips/nlm/hal/usb.h
index 1e441ab20b09..1b28791f3ede 100644
--- a/sys/mips/nlm/hal/usb.h
+++ b/sys/mips/nlm/hal/usb.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __NLM_USB_H__
diff --git a/sys/mips/nlm/interrupt.h b/sys/mips/nlm/interrupt.h
index c15f878f1732..c19b0f7d7f80 100644
--- a/sys/mips/nlm/interrupt.h
+++ b/sys/mips/nlm/interrupt.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef _RMI_INTERRUPT_H_
diff --git a/sys/mips/nlm/mpreset.S b/sys/mips/nlm/mpreset.S
index 2a31aaf5776b..697bf4538731 100644
--- a/sys/mips/nlm/mpreset.S
+++ b/sys/mips/nlm/mpreset.S
@@ -26,7 +26,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #include <machine/asm.h>
diff --git a/sys/mips/nlm/msgring.h b/sys/mips/nlm/msgring.h
index 3aa6422f92e5..45d978b2431e 100644
--- a/sys/mips/nlm/msgring.h
+++ b/sys/mips/nlm/msgring.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef _NLM_MSGRING_H
diff --git a/sys/mips/nlm/xlp.h b/sys/mips/nlm/xlp.h
index adee4805af0f..020a4962faf4 100644
--- a/sys/mips/nlm/xlp.h
+++ b/sys/mips/nlm/xlp.h
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * NETLOGIC_BSD
- * $FreeBSD$
  */
 
 #ifndef __NLM_XLP_H__
diff --git a/sys/modules/zfs/static_ccompile.h b/sys/modules/zfs/static_ccompile.h
index 8c3b89a8aa90..7ebf4f6db3c4 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 cc4b81a2cb8a..53d6e0d6e52e 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 e9109c478220..1b21007cd457 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 6c6557725354..bcba09267289 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 70c07c11d86d..5bc05d986fa6 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 06fa9c98d3d7..8d3c9b6e3682 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 dc465a0b778e..1c20accc3fd4 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 a8f96daeed36..e20eea91b1a1 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 f1e3217ca79b..27bea7c20f51 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 0d15b903cd64..a06c6700e4ec 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 6a3f2205c972..13e10f50a08c 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 e0c3e0f6ee80..32ebfdefbfbe 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 08231f64b75c..2b9e879570a4 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 cd180f4fca2f..dd08c3e1f3d2 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 39ba43ca2edb..13edb4870a62 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 a4256e2881d1..300738a9e525 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 0ac54269bc30..dbd57cbc19a5 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 a9af314cd48a..52f124975ffa 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 7e58ec49b943..003dd2990d28 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 7adbaec429a1..e4dd405fe10c 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 68ec9cd80418..8000691a7963 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 f711e09334cb..d4c9b11a3278 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 8d0463e09b3e..e0c21058f504 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 f53b98aca923..4de0cbcb985c 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -29,7 +29,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 409289869c27..6916eb6e816f 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 f4c3bec217d4..0319807dbfd2 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 9eddab286c31..9b067976b182 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 <sys/param.h>
diff --git a/sys/net/if_clone.h b/sys/net/if_clone.h
index 1e99f396403a..ad1689c61d3b 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 14d544dfd86a..2cb4b6c83e7a 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 9c4c03f6d79b..e0ceb61741b3 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 85a8e8cca2d3..1d54c64aff06 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 9a614fbe6844..64cca2452871 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 7d2fc832da15..67e4d88426fb 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 b1bd76863032..92dc44d72d34 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 643ef2240fe1..f5780f6b540b 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 d0bd8947e309..08ad391bfb8d 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_spppfr.c b/sys/net/if_spppfr.c
index d84cc46c7cb6..c048ee09ebcc 100644
--- a/sys/net/if_spppfr.c
+++ b/sys/net/if_spppfr.c
@@ -20,7 +20,6 @@
  * works or modified versions.
  *
  * $Cronyx Id: if_spppfr.c,v 1.1.2.10 2004/06/29 09:02:30 rik Exp $
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_tap.h b/sys/net/if_tap.h
index 0c05a5ecaf30..d84cd2eba6f3 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 6794da878587..17227726a663 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 db399d7c7485..9785dac2c265 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 9a8f9a876423..756cd64d0681 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 fe8d465f73be..c5c229bd0f7b 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 e8504812d10f..283515897e3b 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 cc1f8198064b..93c50b854874 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 e2885bc017cd..1a269c99c04a 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 99c504d99368..4043bb8e0e54 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 14e81ebbd414..01a1db9e270e 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 f9987934bed4..b91227dd6111 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/raw_cb.c b/sys/net/raw_cb.c
index 78a117a2c2d8..658efc6e2a5d 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index bd5e08fc3daa..aa0fc6c5e8e3 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NET_RAW_CB_H_
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 5d4e223e5a0a..d29bdd8fe831 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index 80d08d1bc7f0..58796a2c55ac 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 870ebbc0bc75..d781378cb206 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 a456ffa28696..231701897820 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 0c6d856ed7ad..d89d661ca99b 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 9c342474089c..2874198758e5 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 76b61942f9a6..c9204f2ebc09 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 e797420bd3ef..c87ec2f95ebd 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 e105452dd12d..e3ad2f4e9d37 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/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
index cc9ee50cbe03..24d2d518c6c7 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4.c,v 1.10 2005/10/31 17:57:43 max Exp $
- * $FreeBSD$
  * 
  * Based on:
  * ---------
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
index ab39f7f51e1d..8a3171d78dd3 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4_prse.h,v 1.4 2005/10/31 17:57:43 max Exp $
- * $FreeBSD$
  */
 
 /***************************************************************************
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
index 7a9ba0036646..93f08cdb1bab 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4_var.h,v 1.5 2005/10/31 17:57:43 max Exp $
- * $FreeBSD$
  * 
  * Based on:
  * ---------
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index 06f881143885..319ceb6db2bb 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 504b92a2940d..2c58a3323b5f 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 86c553fc8005..3e4e957ab898 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 7d63ed4fb6c9..897a8ed2e917 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 32abaf476e3b..9c3f752965a1 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 a06e5ae0b9f5..7d7e1688dcbf 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 c350696e3f74..faaddf0f94c0 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 1d46c7dc98a3..13bf970f0135 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 1ce845ea215e..79fe712615d3 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 aa1b5174c668..0dd1289b8074 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 71c775005bb8..98150ebb05fa 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 a34c5e1d513e..ac1520c07f6f 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 24b386154dc6..2d855794b25c 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 b94502a1b305..a3f18779405b 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 11ccc4b002d3..59d193f82513 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 8782ecd86494..1b3b6436944e 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 cf2a0ed53c50..ff361f751023 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 630605c7dcf6..18d6bc0339cb 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 cf4839e3cb20..64adaeedfbda 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 783e0fb8ebe8..edf34e0ef86a 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_h4.h b/sys/netgraph/bluetooth/include/ng_h4.h
index cc09c1b5cd64..c63ea4a18463 100644
--- a/sys/netgraph/bluetooth/include/ng_h4.h
+++ b/sys/netgraph/bluetooth/include/ng_h4.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_h4.h,v 1.1 2002/11/24 19:47:05 max Exp $
- * $FreeBSD$
  * 
  * Based on:
  * ---------
diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h
index 9c798f38d513..e4d33d8661ba 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 d79981295f8d..416db51e1aad 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 b91e0bd0a1dd..9161cf079aa4 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 c63482148dca..4f87692f5ef2 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 5e7375a82b3e..fbb754107d7e 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 9d2f1f82661c..82bfaeb318f1 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 157d56af3553..f423ab1d60a7 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 1e67961ad376..4647bd2555ff 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 ddafac868d66..02d12a18c365 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 3e6c47dbc5de..139be0380e08 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 0d18ae6acb82..2c8fa53b0a3d 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 61718f7750ae..16f4664d89cd 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 422308122ec6..909e87f187d0 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 3232301bb614..02674bf6fa8d 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 8a2eb5a1d1c2..5dc9bc79f1a1 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 bf06aa20c4c1..9a782bea46d2 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 26e5987f8239..c380bdd06cff 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 036730d637c7..d4a447f4254f 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 e1baf84a7179..9814d9e0bceb 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 1112d14b80fa..ad6b5ccf2c3c 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 41c01862b520..56848f3055ec 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 b9a84001eccb..39133861bf90 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 ebc387a85c0d..e4a07e1648a5 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 9fa77beb7cf7..ec62ccd3f7b2 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 35873ee46518..0b46b4b69f4e 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 83bbdb8f5add..c528539e5818 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 c3c2126bdef5..e11070274484 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 e1b6c399e8d2..a662d38f4463 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 c1ed83e54048..a53a9d7865c3 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 2f56e7a91e2e..5d5b438987a7 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 873d6419bd58..ae2d66708448 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 16532987f85e..2c93031e1ee1 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 ec7efba32f23..8d9072651cdf 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 1cde1496aeab..a1ec40d21194 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_systm.h b/sys/netinet/in_systm.h
index 538a40263599..77c66c479b75 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 18d78a46d815..3c5a268f20b0 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 934bd812a495..b1d2a203b88e 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 0303a09509c7..b14d15b054a5 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 054eb921d3df..c4d86ecb00b3 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 79a530bca67b..13799ad6bfef 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 8959d15f5a31..febd96d47efe 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_debug.h b/sys/netinet/tcp_debug.h
index c44930724b66..4fee34c99fb2 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_DEBUG_H_
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index 8bd129f613cf..99c9d5d39fcf 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 c77fd0fa1f6f..0dde5067df7a 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 a7354a90e148..693e2bfc6ce0 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 d0bc74669123..5082c2738aca 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 2474f3787903..c3d28f1ad6e1 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 f3ed5be9538b..a4b2c81def35 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 263a64fbe588..f1b8304f60d6 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 37bc0c846d99..39f39c3d77ee 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 5dd7c13e3272..e124a6a2707a 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 1e038fa8319c..b614019091f6 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 06df113c2325..70cbe26ca32f 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 c3c827c57363..06c5e0012132 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 dade65732071..45a28e9f419a 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 40a857707dee..dd23196c799a 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 632c3f9774e7..56de7acc1bc7 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/ip6protosw.h b/sys/netinet6/ip6protosw.h
index d978e33042b9..5a2e88aa7307 100644
--- a/sys/netinet6/ip6protosw.h
+++ b/sys/netinet6/ip6protosw.h
@@ -61,7 +61,6 @@
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
  *	BSDI protosw.h,v 2.3 1996/10/11 16:02:40 pjd Exp
- * $FreeBSD$
  */
 
 #ifndef _NETINET6_IP6PROTOSW_H_
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index d653a432dbe4..9167f0b4192a 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 45346e89f4f2..d3572593ddbf 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 7288c67eee22..02c5153c096c 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 e2dcac36da6c..18aa03f71e4c 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 181e30afe6f8..f914d5981bb0 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 2e411963676e..465797f68944 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 93e226d6a4b3..a5fc19d05170 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 170326dc33f1..fbe8e69dde7a 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 002ddfdc8348..3db2b23512ef 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 b85e009b2155..4718e6586ef7 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 aac8c326aa05..b299ca47723a 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 1589a20a6fed..27f0322f76f2 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 26377bc7f5d2..775ac00953e5 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 ca3baf2c926f..f9a2594c2a3e 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 454e1f4ea93d..93c5959a529f 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 74e07305e9cd..07523e8ae03e 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 23ea60da8305..1f8ef86388e1 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 77db7a6a657f..5df61aa67fff 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 c33fda501feb..5693e3bce620 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 29a426b91e4e..204b34091781 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 f2f21a0811d0..d7cbebd42529 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 999c0fadd073..d5286c7ea7c6 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 2a62546e543f..f8ef327946d4 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 e610019630b1..b530017c088c 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 ace11b8c9456..0b0e9f05251e 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 0b913a19c2ff..c3ff3eb4a74a 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_common.h b/sys/nfs/nfs_common.h
index a821934da0a2..5a760764eda4 100644
--- a/sys/nfs/nfs_common.h
+++ b/sys/nfs/nfs_common.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_COMMON_H_
diff --git a/sys/nfs/nfs_lock.h b/sys/nfs/nfs_lock.h
index 63fdb202d779..587b1846786f 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 ff038d0e38a0..6cd092611fa6 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 4f7f838d01d6..cb8a1e6b0c77 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 84155035c1cd..44ee55115f9d 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 af9e6f856c46..63b77695e439 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 4635694e8a02..060b43d7f42b 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/nfsm_subs.h b/sys/nfsclient/nfsm_subs.h
index b918e78ae728..d59287254ee2 100644
--- a/sys/nfsclient/nfsm_subs.h
+++ b/sys/nfsclient/nfsm_subs.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _NFSCLIENT_NFSM_SUBS_H_
diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index b048c1044ba7..b9bcdd367c4b 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 903fe1a21314..ad849faa3299 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 c65ae6de2c6f..2a6a12da52e4 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/nfsclient/nlminfo.h b/sys/nfsclient/nlminfo.h
index 340bdbe5faa2..b4418ac9cee2 100644
--- a/sys/nfsclient/nlminfo.h
+++ b/sys/nfsclient/nlminfo.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *      from BSDI nlminfo.h,v 2.1 1998/03/18 01:30:38 don Exp
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 1c99c9aa9fbd..22b64ac49ddf 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/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index 10c34ba634ed..8a4cdec12d14 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _NFSSERVER_NFSM_SUBS_H_
diff --git a/sys/nfsserver/nfsrvcache.h b/sys/nfsserver/nfsrvcache.h
index 10dff78538cd..a5cba3c91034 100644
--- a/sys/nfsserver/nfsrvcache.h
+++ b/sys/nfsserver/nfsrvcache.h
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
  */
 
 #ifndef _NFSSERVER_NFSRVCACHE_H_
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 1d9b2a88b2e2..fb324aeb5dc9 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 d13b41da4be2..cc6a247a8854 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 9b425b6ee1e1..63ead9e7bffc 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 8d10a76b3ad3..4d1b52da6cea 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 b317ce8635e3..956a9c1e9f1d 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 7915f5627579..6b1208cf3e1b 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 2dd24ebf2bb1..35a8536776ea 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 641fe2eebf42..e6f1ab72f51e 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 6eaa4a48a900..02ff42877f0e 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 c0dd7415bcbf..369fd9e9ddd6 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 0fac50361632..0d8a01457884 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 575b50fbbd05..7e327bba4f6d 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 19f0cb0c9a65..30df3a470b09 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 7a395d7b6196..0841477d5fee 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 1b0381115343..090dd687d635 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 5610a5a5bc5f..aefa3e9b4cf6 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 59816da80276..3aa92ff4522b 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 7407b4ad7104..694a952bbe20 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 5a7b831b3089..13ded39672ac 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 3a80acb7de64..bef38c2cd700 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 70b07447aa36..16f0295469e2 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 600d0d310191..debd158df6b3 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 bff58cfa7bb3..e5e6e3223406 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 263188c57fb6..a7733453fa0d 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 de05801788e8..67ec009a1f58 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 097891253009..415848bd4139 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 bea1b3e98e66..7588cc6a2ca3 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 9d1c746de741..86c0b3707983 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 9dc2787cf2ff..ed926f80c879 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 4880b1c05f34..36271c143fec 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 b95a1115be9a..5dc463619bca 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 4302ad234730..0d5bf48e7635 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 31342210aca1..054b83a590c4 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 71e41929c632..c7ee81102121 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 89be2b462aaf..d35c6c773fe0 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 77457717a3fd..5518d3053e51 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 1af8b4992951..bf676b8e08e1 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 d66070323ef4..1f42eb7ae435 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 d713e11f2ab2..e0b80ecefa2a 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 49387fa02638..f866da6b6ced 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 e22f36f0b8be..47a4dd0d4c4a 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 3844133ffb68..3fb77aac9a01 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 df1af0b25df0..fb2bb14e33a3 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 39f0bcf0f5b2..e3d072c3f23d 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 50b80af4c636..76f48c117e7e 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 0f06010b7e4b..82337e3a848b 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 0829f6f52aa9..f8664f0dbecc 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 522ba005a0e4..365fb832d492 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 9951c838a2e6..467bf99a94fa 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 377db88b5338..9cec85868a27 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 70f8ecde971b..2a95ab028eb0 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 7a186504a7bd..3446665c63eb 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 b0497a4523f2..3a3630a2308c 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 edfcbd31b73a..04bd42b1b5db 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 6c8ac5cabab5..24ea17d97322 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 e95749741308..ca8232f651e4 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 5f76b312c7fd..9a710b667c78 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 0752e72de95e..e431be847628 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 a968c8f930fc..bfa4cde32415 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 3e958860104b..c2e1efb8ead4 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 82cf3c022292..dbc090fc498e 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 dc0ccbd0e5bc..0d88d5e4be5e 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 9a6efdef78a9..8071deb0730b 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 71a39d5e300d..56a6dc1d8238 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 e5d728d6613b..6d06e4eaa6ef 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 24113db9c630..cd57b4069342 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/security/mac_veriexec/mac_veriexec.c b/sys/security/mac_veriexec/mac_veriexec.c
index ecaa8cc35e09..caba5dfe9d51 100644
--- a/sys/security/mac_veriexec/mac_veriexec.c
+++ b/sys/security/mac_veriexec/mac_veriexec.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011, 2012, 2013, 2015, 2016, 2019 Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/security/mac_veriexec/mac_veriexec.h b/sys/security/mac_veriexec/mac_veriexec.h
index e3d4edff1a8b..5e33551b110b 100644
--- a/sys/security/mac_veriexec/mac_veriexec.h
+++ b/sys/security/mac_veriexec/mac_veriexec.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011, 2012, 2013, 2015, 2016, 2019, Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/security/mac_veriexec/mac_veriexec_internal.h b/sys/security/mac_veriexec/mac_veriexec_internal.h
index 8af9639004cb..b8bec23f40a2 100644
--- a/sys/security/mac_veriexec/mac_veriexec_internal.h
+++ b/sys/security/mac_veriexec/mac_veriexec_internal.h
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011, 2012, 2013, 2015, 2016, 2019, Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/security/mac_veriexec/mac_veriexec_sha1.c b/sys/security/mac_veriexec/mac_veriexec_sha1.c
index a4e7484b7b70..ae9b5c777a82 100644
--- a/sys/security/mac_veriexec/mac_veriexec_sha1.c
+++ b/sys/security/mac_veriexec/mac_veriexec_sha1.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011, 2012, 2013, 2015, 2016, Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/security/mac_veriexec/mac_veriexec_sha256.c b/sys/security/mac_veriexec/mac_veriexec_sha256.c
index 730c39f91915..91844174ccc1 100644
--- a/sys/security/mac_veriexec/mac_veriexec_sha256.c
+++ b/sys/security/mac_veriexec/mac_veriexec_sha256.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011, 2012, 2013, 2015, 2016, Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/security/mac_veriexec/mac_veriexec_sha384.c b/sys/security/mac_veriexec/mac_veriexec_sha384.c
index 7456348e3693..12d99eb187c6 100644
--- a/sys/security/mac_veriexec/mac_veriexec_sha384.c
+++ b/sys/security/mac_veriexec/mac_veriexec_sha384.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011, 2012, 2013, 2015, 2016, Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/security/mac_veriexec/mac_veriexec_sha512.c b/sys/security/mac_veriexec/mac_veriexec_sha512.c
index 2e30b1234fbf..9f1492fa9610 100644
--- a/sys/security/mac_veriexec/mac_veriexec_sha512.c
+++ b/sys/security/mac_veriexec/mac_veriexec_sha512.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011, 2012, 2013, 2015, 2016, Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/security/mac_veriexec/veriexec_fingerprint.c b/sys/security/mac_veriexec/veriexec_fingerprint.c
index 29b5c19eed1e..67fa93cba824 100644
--- a/sys/security/mac_veriexec/veriexec_fingerprint.c
+++ b/sys/security/mac_veriexec/veriexec_fingerprint.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011, 2012, 2013, 2015, 2016, Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/security/mac_veriexec/veriexec_metadata.c b/sys/security/mac_veriexec/veriexec_metadata.c
index 91232747c19d..d6d1dfbc484a 100644
--- a/sys/security/mac_veriexec/veriexec_metadata.c
+++ b/sys/security/mac_veriexec/veriexec_metadata.c
@@ -1,5 +1,4 @@
 /*
- * $FreeBSD$
  *
  * Copyright (c) 2011, 2012, 2013, 2015, 2016, 2019, Juniper Networks, Inc.
  * All rights reserved.
diff --git a/sys/sys/_callout.h b/sys/sys/_callout.h
index 1108d8ad74fd..a9d116090289 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 da9a16a6351e..1b51169f5427 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 662fcc1e216c..f0566b9994c8 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 9584b4c76788..d8a5b089e442 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 b9fe17881b3a..327ffcb2f98b 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 d12d1f740e61..f94dcd424ef2 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 18612ed7367b..c46ade914c25 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 78d0b8a6ec38..5030dc401fa9 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 7f61f3f4fc10..58a68725fd7a 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 f70083b1d56f..92e840eaf141 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/buf.h b/sys/sys/buf.h
index fcc4a4689130..73b68a51dce7 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 e766b3434d5c..f06ba51c0d97 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 9aa28e29d35c..93034f81c052 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 3fde24f0b9e9..007ac33265cb 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 1dba51daf063..1bb5e6f5be17 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 b75af5a7705f..ac2af96e5ad1 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 ad73b258df6d..5ad85a516dc5 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 9087b01fa597..fd36e3bb941b 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 3e627db09099..02284c5d052b 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 1241059b02ea..6dc5e92b542d 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 6e24f82793fe..da12009ab0eb 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 daa54d409e73..a04bea1c4bba 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 5e2fb39557d5..25ddbe53b00a 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 8e4ff20b3cf9..f00ba0ab6940 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 e53a8d4c6c7f..927ddd338cac 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 82ee16befe28..169087eb48b0 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 65b546abb8ab..ef3e2fbe3ca1 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 66b50c418953..e5532b37572f 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 5a4b3de33104..9055f0a785e7 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 3eea7a7acd60..152f2e63ec21 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 47b5c5c17573..96eafe513e04 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 c19e7401794a..ac4bb35d70e9 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 d1af92afd281..6f0f4c63b2a2 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 7eb5c323d886..c8283ead2e3d 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 e63a64d25ed0..413fb8a0cd33 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 8ec21990345e..5fec544b7df0 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 a0bd61f7f07d..95a01be20eec 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 a129556d1ada..353c571e85d7 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 38e4ac5847b5..fccf96f3febf 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 d9bd2bf6e089..34e53a80741f 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 f2c76c73505b..b4861bdef54d 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 4f0b3c8dd892..43b8bc826aea 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 147eba9bd1bd..570caac448cf 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 161d11b2bc57..45d4895e81da 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 cca02501a462..ab3fe8ae6225 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 3d88460a751e..32a250db68d0 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 72495a925827..d44ff5e2afb7 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 78873d9f7e8e..0918d533659b 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 f5ddd9c48cd1..ac9a1dbfe4ae 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 0413249dee2c..4d97c8711427 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 7049dc5f1d05..2d9ee8d78bdd 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 6768b862faf7..e5c482f329e7 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 843b32909224..e52692eb33ab 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 f35cdd7413a6..2e5906ae6751 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 d22864a3c2c8..e8369867c6b8 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 3feedc5c5ca8..376d1aaa2187 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 d3daa0c6879a..0e8156e308b6 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 5c876a2052d5..31790a93092d 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 0eecb64bf769..4174e062dd56 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 6c7c37308b4d..8e91ebf7949d 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 20b91f8ed91d..c41200022f4c 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 08bb09b4a645..5100501fb2b8 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 d1c9e6d4985f..fa9e3cc72d36 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 c5f3ad6b80a4..f4af278a78e5 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 0a4369e07056..eb84a7f676ac 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 5985ec9e94ee..fe195d24fc5b 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 55e38fbc0c17..ba22a43116cd 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 3ec0d3b1d06d..339fcc6da35c 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 93b8af28e171..0c825aea499f 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 03040f74eba4..d083b877e6dd 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/syscall.h b/sys/sys/syscall.h
index d80bf9b5930e..7f65d6eb994e 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -2,7 +2,6 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #define	SYS_syscall	0
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index ecf40cc1bfb5..3a61f1153c5a 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 b330ae7f0e27..c798fbdb8aae 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 071b68427105..0eca2e053b6d 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/sysproto.h b/sys/sys/sysproto.h
index 57d264798c71..ab327d43a0fb 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -2,7 +2,6 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically @generated.
- * $FreeBSD$
  */
 
 #ifndef _SYS_SYSPROTO_H_
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 4b479e95aa2f..bffa4c93c8f2 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 20375b9a82af..5a7602355dbd 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 001ec3b5cfaf..952a5e83b8a7 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 0c690e5635fc..f9fdf735879b 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 fa3812a08388..4de69e3417a7 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 a7309d4c5d6b..9a10c6079de0 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 c269c56fd23f..7e64babbc7f1 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 4117ed60660d..d2337cd32c45 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 6a9becb54c75..b17dccada4d8 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 ae07a074d46a..6250b3cfbf03 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 e02484151814..366942fe8294 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 007abbdfbba5..6adca008f955 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 5944e83e96a0..f9b489324e42 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 6309c708be95..c6894c527143 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 27d3c25e42a3..ec24b3023618 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 3714a06983bf..3442843f4b5d 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 fdf3b8f0e5fd..fb7c446d7ee0 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 e34faef3d803..9eb2fed2ebc0 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 44f7ff875548..24854a8b5e32 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 68253781863c..89ef325b87e3 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 ddee0d4704cf..cc89df9aca66 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 8aa62204f4ff..43bc182490e1 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 a4731cafd59d..b429562f1159 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 824ac1e13130..63d0348037d0 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 fa62d1095b01..eb66aaae1f10 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 9f7921e16fa7..cb398ba946e5 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 3ac631e6ab0b..1403c6832cb0 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 ca9c394bc91a..81dd43e70c4d 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 616f6c46164a..071390b2bdcb 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 93c7118353ba..a1aba0ba5b26 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 0e248d871250..44e4019353a8 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 821da2c98906..558d080717b7 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 efb8d59bb70f..50b7b8f5bc20 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 8d10a76b3ad3..4d1b52da6cea 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 84efd436a089..28536d8d96a3 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 68dd7eba6ce1..bd3169f9f379 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 8fb24881145b..79e8be43a6b0 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 5d8c9737d298..0f11702f9e60 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 313a03ea55c9..e1ec6a592d21 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 2ea09dfdc35f..80e4a968ed60 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 c178821cc9a0..88d51acba66d 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 be02dff4daf5..36ce8870df35 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 3e39ffe3e263..9d29bef1f648 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 01472b9c72ef..237c7fb5a2a1 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 553757c990df..3222c7b765a2 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 2d3d2b8080ae..548d6010e7b8 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 c31e454cd05f..22547eaf4fe5 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/isa/icu.h b/sys/x86/isa/icu.h
index cd3729b374b2..e8a8c6e770f6 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$
  */
 
 /*