diff --git a/sys/amd64/include/_align.h b/sys/amd64/include/_align.h
index 28c4669ad25..506bc3c9e7f 100644
--- a/sys/amd64/include/_align.h
+++ b/sys/amd64/include/_align.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/_align.h>
diff --git a/sys/amd64/include/_inttypes.h b/sys/amd64/include/_inttypes.h
index 40107cd74a7..2d0d28c29fe 100644
--- a/sys/amd64/include/_inttypes.h
+++ b/sys/amd64/include/_inttypes.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/_inttypes.h>
diff --git a/sys/amd64/include/_limits.h b/sys/amd64/include/_limits.h
index 3c7365bb4ed..aa71de42e79 100644
--- a/sys/amd64/include/_limits.h
+++ b/sys/amd64/include/_limits.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/_limits.h>
diff --git a/sys/amd64/include/_stdint.h b/sys/amd64/include/_stdint.h
index db1affc0770..033e31af2cc 100644
--- a/sys/amd64/include/_stdint.h
+++ b/sys/amd64/include/_stdint.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/_stdint.h>
diff --git a/sys/amd64/include/_types.h b/sys/amd64/include/_types.h
index 26803672ff6..8d6d2dfa0d7 100644
--- a/sys/amd64/include/_types.h
+++ b/sys/amd64/include/_types.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/_types.h>
diff --git a/sys/amd64/include/acpica_machdep.h b/sys/amd64/include/acpica_machdep.h
index 1ae3d5865db..21f797929ce 100644
--- a/sys/amd64/include/acpica_machdep.h
+++ b/sys/amd64/include/acpica_machdep.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/acpica_machdep.h>
diff --git a/sys/amd64/include/apm_bios.h b/sys/amd64/include/apm_bios.h
index 9cc0eeeaf6f..9d31da47c3a 100644
--- a/sys/amd64/include/apm_bios.h
+++ b/sys/amd64/include/apm_bios.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/apm_bios.h>
diff --git a/sys/amd64/include/bus.h b/sys/amd64/include/bus.h
index f1af2cf6168..a53fadb1995 100644
--- a/sys/amd64/include/bus.h
+++ b/sys/amd64/include/bus.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/bus.h>
diff --git a/sys/amd64/include/cputypes.h b/sys/amd64/include/cputypes.h
index 31c8e41a315..088692e9ad9 100644
--- a/sys/amd64/include/cputypes.h
+++ b/sys/amd64/include/cputypes.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/cputypes.h>
diff --git a/sys/amd64/include/dump.h b/sys/amd64/include/dump.h
index 815942d0d96..4dc14c6c341 100644
--- a/sys/amd64/include/dump.h
+++ b/sys/amd64/include/dump.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/dump.h>
diff --git a/sys/amd64/include/elf.h b/sys/amd64/include/elf.h
index f9323775dc2..3b080777292 100644
--- a/sys/amd64/include/elf.h
+++ b/sys/amd64/include/elf.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/elf.h>
diff --git a/sys/amd64/include/endian.h b/sys/amd64/include/endian.h
index 2ad27a9069b..a8e10b0a36f 100644
--- a/sys/amd64/include/endian.h
+++ b/sys/amd64/include/endian.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/endian.h>
diff --git a/sys/amd64/include/fdt.h b/sys/amd64/include/fdt.h
index 1a035144289..a7c73c54199 100644
--- a/sys/amd64/include/fdt.h
+++ b/sys/amd64/include/fdt.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/fdt.h>
diff --git a/sys/amd64/include/float.h b/sys/amd64/include/float.h
index 4759963566a..2cde8b6d60e 100644
--- a/sys/amd64/include/float.h
+++ b/sys/amd64/include/float.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/float.h>
diff --git a/sys/amd64/include/iommu.h b/sys/amd64/include/iommu.h
index 3737d51fdce..ee9a3ac2984 100644
--- a/sys/amd64/include/iommu.h
+++ b/sys/amd64/include/iommu.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/iommu.h>
diff --git a/sys/amd64/include/metadata.h b/sys/amd64/include/metadata.h
index 98d0272fd4c..cd8c069c5bb 100644
--- a/sys/amd64/include/metadata.h
+++ b/sys/amd64/include/metadata.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/metadata.h>
diff --git a/sys/amd64/include/npx.h b/sys/amd64/include/npx.h
index ec70f1c368a..431cc00314f 100644
--- a/sys/amd64/include/npx.h
+++ b/sys/amd64/include/npx.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/fpu.h>
diff --git a/sys/amd64/include/ofw_machdep.h b/sys/amd64/include/ofw_machdep.h
index 4457f85908c..81fe027ceb4 100644
--- a/sys/amd64/include/ofw_machdep.h
+++ b/sys/amd64/include/ofw_machdep.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/ofw_machdep.h>
diff --git a/sys/amd64/include/pci_cfgreg.h b/sys/amd64/include/pci_cfgreg.h
index 717d5cc39fb..651c7104535 100644
--- a/sys/amd64/include/pci_cfgreg.h
+++ b/sys/amd64/include/pci_cfgreg.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/pci_cfgreg.h>
diff --git a/sys/amd64/include/procctl.h b/sys/amd64/include/procctl.h
index 4a6bcc71204..a3875dad78b 100644
--- a/sys/amd64/include/procctl.h
+++ b/sys/amd64/include/procctl.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/procctl.h>
diff --git a/sys/amd64/include/psl.h b/sys/amd64/include/psl.h
index 4d945a1ebba..fd047b0ea72 100644
--- a/sys/amd64/include/psl.h
+++ b/sys/amd64/include/psl.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/psl.h>
diff --git a/sys/amd64/include/ptrace.h b/sys/amd64/include/ptrace.h
index bf86754d8f4..7506c43f516 100644
--- a/sys/amd64/include/ptrace.h
+++ b/sys/amd64/include/ptrace.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/ptrace.h>
diff --git a/sys/amd64/include/pvclock.h b/sys/amd64/include/pvclock.h
index f01fac695ae..91cb7604b17 100644
--- a/sys/amd64/include/pvclock.h
+++ b/sys/amd64/include/pvclock.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/pvclock.h>
diff --git a/sys/amd64/include/reg.h b/sys/amd64/include/reg.h
index f6fb2bc6578..37ddd32142b 100644
--- a/sys/amd64/include/reg.h
+++ b/sys/amd64/include/reg.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/reg.h>
diff --git a/sys/amd64/include/resource.h b/sys/amd64/include/resource.h
index dfcc902a731..368a13b88d3 100644
--- a/sys/amd64/include/resource.h
+++ b/sys/amd64/include/resource.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/amd64/include/setjmp.h b/sys/amd64/include/setjmp.h
index c4101a77fd6..306fb842427 100644
--- a/sys/amd64/include/setjmp.h
+++ b/sys/amd64/include/setjmp.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/setjmp.h>
diff --git a/sys/amd64/include/sigframe.h b/sys/amd64/include/sigframe.h
index d5cdb56289a..1bf3f9913ad 100644
--- a/sys/amd64/include/sigframe.h
+++ b/sys/amd64/include/sigframe.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/sigframe.h>
diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index db9fe6ad597..8fb36cb1c94 100644
--- a/sys/amd64/include/signal.h
+++ b/sys/amd64/include/signal.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/signal.h>
diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h
index aace4bfd62e..39528555d32 100644
--- a/sys/amd64/include/specialreg.h
+++ b/sys/amd64/include/specialreg.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/specialreg.h>
diff --git a/sys/amd64/include/stack.h b/sys/amd64/include/stack.h
index 091ae33893d..0ff271239f2 100644
--- a/sys/amd64/include/stack.h
+++ b/sys/amd64/include/stack.h
@@ -1,6 +1,5 @@
 /*
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/stack.h>
diff --git a/sys/amd64/include/stdarg.h b/sys/amd64/include/stdarg.h
index 1f80090356a..1739bbeb9ea 100644
--- a/sys/amd64/include/stdarg.h
+++ b/sys/amd64/include/stdarg.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/stdarg.h>
diff --git a/sys/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h
index cd380d43b07..47cecf1d27c 100644
--- a/sys/amd64/include/sysarch.h
+++ b/sys/amd64/include/sysarch.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/sysarch.h>
diff --git a/sys/amd64/include/trap.h b/sys/amd64/include/trap.h
index 4d950771dcc..20f898d15b9 100644
--- a/sys/amd64/include/trap.h
+++ b/sys/amd64/include/trap.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/trap.h>
diff --git a/sys/amd64/include/ucontext.h b/sys/amd64/include/ucontext.h
index aea80e3845a..aa3a439bcda 100644
--- a/sys/amd64/include/ucontext.h
+++ b/sys/amd64/include/ucontext.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/ucontext.h>
diff --git a/sys/amd64/include/vdso.h b/sys/amd64/include/vdso.h
index b81c455a92a..77fc7655d55 100644
--- a/sys/amd64/include/vdso.h
+++ b/sys/amd64/include/vdso.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/vdso.h>
diff --git a/sys/amd64/include/xen/xen-os.h b/sys/amd64/include/xen/xen-os.h
index 1490e59c2f9..ac9f66b2b30 100644
--- a/sys/amd64/include/xen/xen-os.h
+++ b/sys/amd64/include/xen/xen-os.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/xen/xen-os.h>
diff --git a/sys/amd64/linux32/linux32_locore.asm b/sys/amd64/linux32/linux32_locore.asm
index bf1158185a1..4b77bd32600 100644
--- a/sys/amd64/linux32/linux32_locore.asm
+++ b/sys/amd64/linux32/linux32_locore.asm
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #include "linux32_assym.h"			/* system definitions */
 #include <machine/asmacros.h>			/* miscellaneous asm macros */
diff --git a/sys/arm/include/cpu.h b/sys/arm/include/cpu.h
index 14e19581b81..a064da69252 100644
--- a/sys/arm/include/cpu.h
+++ b/sys/arm/include/cpu.h
@@ -1,5 +1,4 @@
 /* $NetBSD: cpu.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $ */
-/* $FreeBSD$ */
 
 #ifndef MACHINE_CPU_H
 #define MACHINE_CPU_H
diff --git a/sys/arm/include/ieeefp.h b/sys/arm/include/ieeefp.h
index 0b61744b450..57dd058b8a9 100644
--- a/sys/arm/include/ieeefp.h
+++ b/sys/arm/include/ieeefp.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: ieeefp.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $	*/
-/* $FreeBSD$ */
 /*-
  * Based on ieeefp.h written by J.T. Conklin, Apr 28, 1995
  * Public domain.
diff --git a/sys/arm/include/machdep.h b/sys/arm/include/machdep.h
index 3efad39753d..f999cce12b4 100644
--- a/sys/arm/include/machdep.h
+++ b/sys/arm/include/machdep.h
@@ -1,5 +1,4 @@
 /* $NetBSD: machdep.h,v 1.7 2002/02/21 02:52:21 thorpej Exp $ */
-/* $FreeBSD$ */
 
 #ifndef _MACHDEP_BOOT_MACHDEP_H_
 #define _MACHDEP_BOOT_MACHDEP_H_
diff --git a/sys/arm/include/procctl.h b/sys/arm/include/procctl.h
index 5221cfcd7be..b340002b45e 100644
--- a/sys/arm/include/procctl.h
+++ b/sys/arm/include/procctl.h
@@ -1,4 +1,3 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
diff --git a/sys/arm/include/ptrace.h b/sys/arm/include/ptrace.h
index 44085a3b707..d930ab80f17 100644
--- a/sys/arm/include/ptrace.h
+++ b/sys/arm/include/ptrace.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: ptrace.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $	*/
-/* $FreeBSD$ */
 
 #ifndef _MACHINE_PTRACE_H_
 #define _MACHINE_PTRACE_H_
diff --git a/sys/arm/include/reg.h b/sys/arm/include/reg.h
index 4dc95481688..d3de03b6ff2 100644
--- a/sys/arm/include/reg.h
+++ b/sys/arm/include/reg.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: reg.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $	*/
-/* $FreeBSD$ */
 #ifndef MACHINE_REG_H
 #define MACHINE_REG_H
 
diff --git a/sys/arm/include/setjmp.h b/sys/arm/include/setjmp.h
index 2090c5d15f4..f0a4abc1b04 100644
--- a/sys/arm/include/setjmp.h
+++ b/sys/arm/include/setjmp.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: setjmp.h,v 1.5 2013/01/11 13:56:32 matt Exp $	*/
-/* $FreeBSD$ */
 
 /*
  * machine/setjmp.h: machine dependent setjmp-related information.
diff --git a/sys/arm/include/sigframe.h b/sys/arm/include/sigframe.h
index 9787f579d56..aa24726c4e3 100644
--- a/sys/arm/include/sigframe.h
+++ b/sys/arm/include/sigframe.h
@@ -1,2 +1 @@
-/* $FreeBSD$ */
 #include <machine/frame.h>
diff --git a/sys/arm/include/smp.h b/sys/arm/include/smp.h
index 4f1545872a4..4f552ad939f 100644
--- a/sys/arm/include/smp.h
+++ b/sys/arm/include/smp.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #ifndef _MACHINE_SMP_H_
 #define _MACHINE_SMP_H_
diff --git a/sys/arm/include/swi.h b/sys/arm/include/swi.h
index b2caf5ee1c3..8bc9803f829 100644
--- a/sys/arm/include/swi.h
+++ b/sys/arm/include/swi.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: swi.h,v 1.1 2002/01/13 15:03:06 bjh21 Exp $	*/
-/* $FreeBSD$ */
 
 /*-
  * This file is in the Public Domain.
diff --git a/sys/arm/include/sysarch.h b/sys/arm/include/sysarch.h
index 603d8c5a852..907a84f39e5 100644
--- a/sys/arm/include/sysarch.h
+++ b/sys/arm/include/sysarch.h
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _ARM_SYSARCH_H_
 #define _ARM_SYSARCH_H_
diff --git a/sys/arm/include/trap.h b/sys/arm/include/trap.h
index ae1c571255f..df5db1e85c4 100644
--- a/sys/arm/include/trap.h
+++ b/sys/arm/include/trap.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: trap.h,v 1.1 2001/02/23 03:48:19 ichiro Exp $	*/
-/* $FreeBSD$ */
 
 #ifndef _MACHINE_TRAP_H_
 #define _MACHINE_TRAP_H_
diff --git a/sys/arm64/include/bus_dma.h b/sys/arm64/include/bus_dma.h
index 1b2d36086e4..9e5a7124dcf 100644
--- a/sys/arm64/include/bus_dma.h
+++ b/sys/arm64/include/bus_dma.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #ifndef _MACHINE_BUS_DMA_H_
 #define	_MACHINE_BUS_DMA_H_
diff --git a/sys/arm64/include/clock.h b/sys/arm64/include/clock.h
index da23dbe43a4..e69de29bb2d 100644
--- a/sys/arm64/include/clock.h
+++ b/sys/arm64/include/clock.h
@@ -1 +0,0 @@
-/* $FreeBSD$ */
diff --git a/sys/arm64/include/exec.h b/sys/arm64/include/exec.h
index da23dbe43a4..e69de29bb2d 100644
--- a/sys/arm64/include/exec.h
+++ b/sys/arm64/include/exec.h
@@ -1 +0,0 @@
-/* $FreeBSD$ */
diff --git a/sys/arm64/include/floatingpoint.h b/sys/arm64/include/floatingpoint.h
index da2e005915f..7569ce3f7f2 100644
--- a/sys/arm64/include/floatingpoint.h
+++ b/sys/arm64/include/floatingpoint.h
@@ -1,3 +1,2 @@
-/* $FreeBSD$ */
 
 #include <machine/ieeefp.h>
diff --git a/sys/arm64/include/iommu.h b/sys/arm64/include/iommu.h
index 95b5c274ff1..80500a08304 100644
--- a/sys/arm64/include/iommu.h
+++ b/sys/arm64/include/iommu.h
@@ -1,7 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #ifndef	_MACHINE_IOMMU_H_
 #define	_MACHINE_IOMMU_H_
diff --git a/sys/arm64/include/procctl.h b/sys/arm64/include/procctl.h
index 5221cfcd7be..b340002b45e 100644
--- a/sys/arm64/include/procctl.h
+++ b/sys/arm64/include/procctl.h
@@ -1,4 +1,3 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
diff --git a/sys/arm64/include/psl.h b/sys/arm64/include/psl.h
index da23dbe43a4..e69de29bb2d 100644
--- a/sys/arm64/include/psl.h
+++ b/sys/arm64/include/psl.h
@@ -1 +0,0 @@
-/* $FreeBSD$ */
diff --git a/sys/arm64/include/ptrace.h b/sys/arm64/include/ptrace.h
index 0705ee6daab..a83188d8d47 100644
--- a/sys/arm64/include/ptrace.h
+++ b/sys/arm64/include/ptrace.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #ifndef _MACHINE_PTRACE_H_
 #define _MACHINE_PTRACE_H_
diff --git a/sys/arm64/include/reloc.h b/sys/arm64/include/reloc.h
index da23dbe43a4..e69de29bb2d 100644
--- a/sys/arm64/include/reloc.h
+++ b/sys/arm64/include/reloc.h
@@ -1 +0,0 @@
-/* $FreeBSD$ */
diff --git a/sys/arm64/include/sigframe.h b/sys/arm64/include/sigframe.h
index 9787f579d56..aa24726c4e3 100644
--- a/sys/arm64/include/sigframe.h
+++ b/sys/arm64/include/sigframe.h
@@ -1,2 +1 @@
-/* $FreeBSD$ */
 #include <machine/frame.h>
diff --git a/sys/arm64/include/trap.h b/sys/arm64/include/trap.h
index da23dbe43a4..e69de29bb2d 100644
--- a/sys/arm64/include/trap.h
+++ b/sys/arm64/include/trap.h
@@ -1 +0,0 @@
-/* $FreeBSD$ */
diff --git a/sys/cam/README.quirks b/sys/cam/README.quirks
index 707862b6a59..4ebb2dba7b6 100644
--- a/sys/cam/README.quirks
+++ b/sys/cam/README.quirks
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
                      FreeBSD Quirk Guidelines
 
diff --git a/sys/cam/ctl/README.ctl.txt b/sys/cam/ctl/README.ctl.txt
index db8666ea99d..18e7aad5dc4 100644
--- a/sys/cam/ctl/README.ctl.txt
+++ b/sys/cam/ctl/README.ctl.txt
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 CTL - CAM Target Layer Description
 
diff --git a/sys/cam/scsi/scsi_ch.h b/sys/cam/scsi/scsi_ch.h
index efab7a05d9f..08de75ac489 100644
--- a/sys/cam/scsi/scsi_ch.h
+++ b/sys/cam/scsi/scsi_ch.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: scsi_changer.h,v 1.11 1998/02/13 08:28:32 enami Exp $	*/
 
 /*-
diff --git a/sys/cam/scsi/scsi_enc.h b/sys/cam/scsi/scsi_enc.h
index 58c40e61fb3..73dc272da21 100644
--- a/sys/cam/scsi/scsi_enc.h
+++ b/sys/cam/scsi/scsi_enc.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
  *
diff --git a/sys/cam/scsi/scsi_ses.h b/sys/cam/scsi/scsi_ses.h
index ac8571810b0..c9f3b893e60 100644
--- a/sys/cam/scsi/scsi_ses.h
+++ b/sys/cam/scsi/scsi_ses.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
  *
diff --git a/sys/cddl/dev/dtrace/dtrace_hacks.c b/sys/cddl/dev/dtrace/dtrace_hacks.c
index 3f8997382c7..f69489a657f 100644
--- a/sys/cddl/dev/dtrace/dtrace_hacks.c
+++ b/sys/cddl/dev/dtrace/dtrace_hacks.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* XXX Hacks.... */
 
 dtrace_cacheid_t dtrace_predcache_id;
diff --git a/sys/compat/linux/linux_errno.c b/sys/compat/linux/linux_errno.c
index 69880db8631..eac2bd883d9 100644
--- a/sys/compat/linux/linux_errno.c
+++ b/sys/compat/linux/linux_errno.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/sys/compat/linuxkpi/common/include/linux/usb.h b/sys/compat/linuxkpi/common/include/linux/usb.h
index 3b7c8a2cde7..d9649dcb547 100644
--- a/sys/compat/linuxkpi/common/include/linux/usb.h
+++ b/sys/compat/linuxkpi/common/include/linux/usb.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved.
  * Copyright (c) 2007 Hans Petter Selasky. All rights reserved.
diff --git a/sys/compat/linuxkpi/common/src/linux_usb.c b/sys/compat/linuxkpi/common/src/linux_usb.c
index 39a9f29e51e..f1aa204b462 100644
--- a/sys/compat/linuxkpi/common/src/linux_usb.c
+++ b/sys/compat/linuxkpi/common/src/linux_usb.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved.
  * Copyright (c) 2007 Hans Petter Selasky. All rights reserved.
diff --git a/sys/conf/ldscript.amd64 b/sys/conf/ldscript.amd64
index 68085ff7435..9c6e603a575 100644
--- a/sys/conf/ldscript.amd64
+++ b/sys/conf/ldscript.amd64
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
 OUTPUT_ARCH(i386:x86-64)
 ENTRY(btext)
diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm
index 822b3c0775b..a9c39977a6f 100644
--- a/sys/conf/ldscript.arm
+++ b/sys/conf/ldscript.arm
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 OUTPUT_ARCH(arm)
 ENTRY(_start)
 
diff --git a/sys/conf/ldscript.arm64 b/sys/conf/ldscript.arm64
index 3c4b7703472..5f3f67d9705 100644
--- a/sys/conf/ldscript.arm64
+++ b/sys/conf/ldscript.arm64
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 OUTPUT_ARCH(aarch64)
 ENTRY(_start)
 
diff --git a/sys/conf/ldscript.i386 b/sys/conf/ldscript.i386
index edff3e6d6d8..6563ed2cd62 100644
--- a/sys/conf/ldscript.i386
+++ b/sys/conf/ldscript.i386
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd")
 OUTPUT_ARCH(i386)
 ENTRY(btext)
diff --git a/sys/conf/ldscript.mips.octeon1 b/sys/conf/ldscript.mips.octeon1
index 598afc2da5b..6e85d4982a3 100644
--- a/sys/conf/ldscript.mips.octeon1
+++ b/sys/conf/ldscript.mips.octeon1
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 ENTRY(_start)
 
diff --git a/sys/conf/ldscript.powerpc b/sys/conf/ldscript.powerpc
index b6279b730d5..2bfc02768a2 100644
--- a/sys/conf/ldscript.powerpc
+++ b/sys/conf/ldscript.powerpc
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd",
 	      "elf32-powerpc-freebsd")
diff --git a/sys/conf/ldscript.powerpc64 b/sys/conf/ldscript.powerpc64
index 5dd84c65c09..f436a3bc0f6 100644
--- a/sys/conf/ldscript.powerpc64
+++ b/sys/conf/ldscript.powerpc64
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 OUTPUT_FORMAT("elf64-powerpc-freebsd", "elf64-powerpc-freebsd",
 	      "elf64-powerpc-freebsd")
diff --git a/sys/conf/ldscript.powerpc64le b/sys/conf/ldscript.powerpc64le
index 72f993cb9fb..bd883853711 100644
--- a/sys/conf/ldscript.powerpc64le
+++ b/sys/conf/ldscript.powerpc64le
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 OUTPUT_FORMAT("elf64-powerpcle-freebsd", "elf64-powerpcle-freebsd",
 	      "elf64-powerpcle-freebsd")
diff --git a/sys/conf/ldscript.powerpcspe b/sys/conf/ldscript.powerpcspe
index b8c89fe7d1d..38209f6516c 100644
--- a/sys/conf/ldscript.powerpcspe
+++ b/sys/conf/ldscript.powerpcspe
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd",
 	      "elf32-powerpc-freebsd")
diff --git a/sys/conf/ldscript.riscv b/sys/conf/ldscript.riscv
index b8ebf047f99..9a2764a2378 100644
--- a/sys/conf/ldscript.riscv
+++ b/sys/conf/ldscript.riscv
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 OUTPUT_ARCH(riscv)
 ENTRY(_start)
 
diff --git a/sys/crypto/armv8/stdint.h b/sys/crypto/armv8/stdint.h
index 0e025c6d76e..3f6ab8c69ab 100644
--- a/sys/crypto/armv8/stdint.h
+++ b/sys/crypto/armv8/stdint.h
@@ -2,4 +2,3 @@
  * This is here as arm_neon.h includes <stdint.h>. It can be empty as
  * we already include the needed headers.
  */
-/* $FreeBSD$ */
diff --git a/sys/crypto/blake2/blake2_kfreebsd.h b/sys/crypto/blake2/blake2_kfreebsd.h
index cc59aee757c..014ce3a508b 100644
--- a/sys/crypto/blake2/blake2_kfreebsd.h
+++ b/sys/crypto/blake2/blake2_kfreebsd.h
@@ -1,5 +1,4 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
 
 #pragma once
 
diff --git a/sys/crypto/blake2/blake2b-avx.c b/sys/crypto/blake2/blake2b-avx.c
index da06cc28ae4..77c180962b7 100644
--- a/sys/crypto/blake2/blake2b-avx.c
+++ b/sys/crypto/blake2/blake2b-avx.c
@@ -1,3 +1,2 @@
 /* This file is in the public domain. */
-/* $FreeBSD$ */
 #include "blake2b.c"
diff --git a/sys/crypto/blake2/blake2b-sse2.c b/sys/crypto/blake2/blake2b-sse2.c
index da06cc28ae4..77c180962b7 100644
--- a/sys/crypto/blake2/blake2b-sse2.c
+++ b/sys/crypto/blake2/blake2b-sse2.c
@@ -1,3 +1,2 @@
 /* This file is in the public domain. */
-/* $FreeBSD$ */
 #include "blake2b.c"
diff --git a/sys/crypto/blake2/blake2b-sse41.c b/sys/crypto/blake2/blake2b-sse41.c
index da06cc28ae4..77c180962b7 100644
--- a/sys/crypto/blake2/blake2b-sse41.c
+++ b/sys/crypto/blake2/blake2b-sse41.c
@@ -1,3 +1,2 @@
 /* This file is in the public domain. */
-/* $FreeBSD$ */
 #include "blake2b.c"
diff --git a/sys/crypto/blake2/blake2b-ssse3.c b/sys/crypto/blake2/blake2b-ssse3.c
index da06cc28ae4..77c180962b7 100644
--- a/sys/crypto/blake2/blake2b-ssse3.c
+++ b/sys/crypto/blake2/blake2b-ssse3.c
@@ -1,3 +1,2 @@
 /* This file is in the public domain. */
-/* $FreeBSD$ */
 #include "blake2b.c"
diff --git a/sys/crypto/blake2/blake2b-xop.c b/sys/crypto/blake2/blake2b-xop.c
index da06cc28ae4..77c180962b7 100644
--- a/sys/crypto/blake2/blake2b-xop.c
+++ b/sys/crypto/blake2/blake2b-xop.c
@@ -1,3 +1,2 @@
 /* This file is in the public domain. */
-/* $FreeBSD$ */
 #include "blake2b.c"
diff --git a/sys/crypto/blake2/blake2s-avx.c b/sys/crypto/blake2/blake2s-avx.c
index f012efb229c..94aa2b3640f 100644
--- a/sys/crypto/blake2/blake2s-avx.c
+++ b/sys/crypto/blake2/blake2s-avx.c
@@ -1,3 +1,2 @@
 /* This file is in the public domain. */
-/* $FreeBSD$ */
 #include "blake2s.c"
diff --git a/sys/crypto/blake2/blake2s-sse2.c b/sys/crypto/blake2/blake2s-sse2.c
index f012efb229c..94aa2b3640f 100644
--- a/sys/crypto/blake2/blake2s-sse2.c
+++ b/sys/crypto/blake2/blake2s-sse2.c
@@ -1,3 +1,2 @@
 /* This file is in the public domain. */
-/* $FreeBSD$ */
 #include "blake2s.c"
diff --git a/sys/crypto/blake2/blake2s-sse41.c b/sys/crypto/blake2/blake2s-sse41.c
index f012efb229c..94aa2b3640f 100644
--- a/sys/crypto/blake2/blake2s-sse41.c
+++ b/sys/crypto/blake2/blake2s-sse41.c
@@ -1,3 +1,2 @@
 /* This file is in the public domain. */
-/* $FreeBSD$ */
 #include "blake2s.c"
diff --git a/sys/crypto/blake2/blake2s-ssse3.c b/sys/crypto/blake2/blake2s-ssse3.c
index f012efb229c..94aa2b3640f 100644
--- a/sys/crypto/blake2/blake2s-ssse3.c
+++ b/sys/crypto/blake2/blake2s-ssse3.c
@@ -1,3 +1,2 @@
 /* This file is in the public domain. */
-/* $FreeBSD$ */
 #include "blake2s.c"
diff --git a/sys/crypto/blake2/blake2s-xop.c b/sys/crypto/blake2/blake2s-xop.c
index f012efb229c..94aa2b3640f 100644
--- a/sys/crypto/blake2/blake2s-xop.c
+++ b/sys/crypto/blake2/blake2s-xop.c
@@ -1,3 +1,2 @@
 /* This file is in the public domain. */
-/* $FreeBSD$ */
 #include "blake2s.c"
diff --git a/sys/crypto/blake2/config.h b/sys/crypto/blake2/config.h
index 0471a1fedc2..c482b07c8f3 100644
--- a/sys/crypto/blake2/config.h
+++ b/sys/crypto/blake2/config.h
@@ -1,5 +1,4 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
 #pragma once
 
 #include <sys/endian.h>
diff --git a/sys/crypto/blake2/stddef.h b/sys/crypto/blake2/stddef.h
index 6542eef1c22..064f9b84773 100644
--- a/sys/crypto/blake2/stddef.h
+++ b/sys/crypto/blake2/stddef.h
@@ -1,3 +1,2 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
 #include "blake2_kfreebsd.h"
diff --git a/sys/crypto/blake2/stdint.h b/sys/crypto/blake2/stdint.h
index 6542eef1c22..064f9b84773 100644
--- a/sys/crypto/blake2/stdint.h
+++ b/sys/crypto/blake2/stdint.h
@@ -1,3 +1,2 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
 #include "blake2_kfreebsd.h"
diff --git a/sys/crypto/blake2/stdio.h b/sys/crypto/blake2/stdio.h
index 6542eef1c22..064f9b84773 100644
--- a/sys/crypto/blake2/stdio.h
+++ b/sys/crypto/blake2/stdio.h
@@ -1,3 +1,2 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
 #include "blake2_kfreebsd.h"
diff --git a/sys/crypto/blake2/stdlib.h b/sys/crypto/blake2/stdlib.h
index 6542eef1c22..064f9b84773 100644
--- a/sys/crypto/blake2/stdlib.h
+++ b/sys/crypto/blake2/stdlib.h
@@ -1,3 +1,2 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
 #include "blake2_kfreebsd.h"
diff --git a/sys/crypto/blake2/string.h b/sys/crypto/blake2/string.h
index 6542eef1c22..064f9b84773 100644
--- a/sys/crypto/blake2/string.h
+++ b/sys/crypto/blake2/string.h
@@ -1,3 +1,2 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
 #include "blake2_kfreebsd.h"
diff --git a/sys/crypto/chacha20/_chacha.h b/sys/crypto/chacha20/_chacha.h
index 20f8bb9a794..2a9ea9fd489 100644
--- a/sys/crypto/chacha20/_chacha.h
+++ b/sys/crypto/chacha20/_chacha.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*
  * Public domain.
  */
diff --git a/sys/crypto/des/arch/i386/des_enc.S b/sys/crypto/des/arch/i386/des_enc.S
index de1278b5ae9..fff2fd807db 100644
--- a/sys/crypto/des/arch/i386/des_enc.S
+++ b/sys/crypto/des/arch/i386/des_enc.S
@@ -1,5 +1,4 @@
 /* $NetBSD: des_enc.S,v 1.1 2001/09/09 11:01:02 tls Exp $ */
-/* $FreeBSD$ */
 
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
diff --git a/sys/crypto/des/des.h b/sys/crypto/des/des.h
index 111b231ddd4..5549337b006 100644
--- a/sys/crypto/des/des.h
+++ b/sys/crypto/des/des.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: des.h,v 1.8 2001/09/10 04:03:57 itojun Exp $	*/
 
 /* lib/des/des.h */
diff --git a/sys/crypto/des/des_locl.h b/sys/crypto/des/des_locl.h
index 2c3cacc1b49..2fdf60b8bf2 100644
--- a/sys/crypto/des/des_locl.h
+++ b/sys/crypto/des/des_locl.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: des_locl.h,v 1.7 2001/09/10 04:03:58 itojun Exp $	*/
 
 /* crypto/des/des_locl.h */
diff --git a/sys/crypto/des/podd.h b/sys/crypto/des/podd.h
index 0528b9cecaf..fee6e1a278d 100644
--- a/sys/crypto/des/podd.h
+++ b/sys/crypto/des/podd.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: podd.h,v 1.4 2001/09/10 04:03:58 itojun Exp $	*/
 
 /* crypto/des/podd.h */
diff --git a/sys/crypto/des/sk.h b/sys/crypto/des/sk.h
index d4aa375024d..553241f52a9 100644
--- a/sys/crypto/des/sk.h
+++ b/sys/crypto/des/sk.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: sk.h,v 1.4 2001/09/10 04:03:58 itojun Exp $	*/
 
 /* crypto/des/sk.h */
diff --git a/sys/crypto/des/spr.h b/sys/crypto/des/spr.h
index 129b8277be3..c72f0553497 100644
--- a/sys/crypto/des/spr.h
+++ b/sys/crypto/des/spr.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: spr.h,v 1.4 2001/09/10 04:03:58 itojun Exp $	*/
 
 /* crypto/des/spr.h */
diff --git a/sys/crypto/libsodium/limits.h b/sys/crypto/libsodium/limits.h
index 85435679632..19c37126188 100644
--- a/sys/crypto/libsodium/limits.h
+++ b/sys/crypto/libsodium/limits.h
@@ -1,3 +1,2 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
 #include <sys/limits.h>
diff --git a/sys/crypto/libsodium/stddef.h b/sys/crypto/libsodium/stddef.h
index 3f5dd97fecd..49c6433b0c3 100644
--- a/sys/crypto/libsodium/stddef.h
+++ b/sys/crypto/libsodium/stddef.h
@@ -1,3 +1,2 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
 #include <sys/types.h>
diff --git a/sys/crypto/libsodium/stdint.h b/sys/crypto/libsodium/stdint.h
index 98a50290f0f..d33eb0b4c10 100644
--- a/sys/crypto/libsodium/stdint.h
+++ b/sys/crypto/libsodium/stdint.h
@@ -1,3 +1,2 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
 #include <sys/stdint.h>
diff --git a/sys/crypto/libsodium/stdio.h b/sys/crypto/libsodium/stdio.h
index 69f4ed52d7e..dd64f05da9f 100644
--- a/sys/crypto/libsodium/stdio.h
+++ b/sys/crypto/libsodium/stdio.h
@@ -1,2 +1 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
diff --git a/sys/crypto/libsodium/stdlib.h b/sys/crypto/libsodium/stdlib.h
index 8a53b2b0456..54af391bab1 100644
--- a/sys/crypto/libsodium/stdlib.h
+++ b/sys/crypto/libsodium/stdlib.h
@@ -1,5 +1,4 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
 
 #define	abort()								\
 	panic("libsodium error at %s:%d", __FILE__, __LINE__)
diff --git a/sys/crypto/libsodium/string.h b/sys/crypto/libsodium/string.h
index 69f4ed52d7e..dd64f05da9f 100644
--- a/sys/crypto/libsodium/string.h
+++ b/sys/crypto/libsodium/string.h
@@ -1,2 +1 @@
 /* This file is in the public domain */
-/* $FreeBSD$ */
diff --git a/sys/crypto/openssl/aarch64/aesv8-armx.S b/sys/crypto/openssl/aarch64/aesv8-armx.S
index 42478451e9f..ebed28fe471 100644
--- a/sys/crypto/openssl/aarch64/aesv8-armx.S
+++ b/sys/crypto/openssl/aarch64/aesv8-armx.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aesv8-armx.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/aarch64/arm64cpuid.S b/sys/crypto/openssl/aarch64/arm64cpuid.S
index 32c08ad6f25..95139b40c1a 100644
--- a/sys/crypto/openssl/aarch64/arm64cpuid.S
+++ b/sys/crypto/openssl/aarch64/arm64cpuid.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from arm64cpuid.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/aarch64/armv8-mont.S b/sys/crypto/openssl/aarch64/armv8-mont.S
index 55c1f76ecd6..99f3a3d07ff 100644
--- a/sys/crypto/openssl/aarch64/armv8-mont.S
+++ b/sys/crypto/openssl/aarch64/armv8-mont.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from armv8-mont.pl. */
 .text
 
diff --git a/sys/crypto/openssl/aarch64/chacha-armv8.S b/sys/crypto/openssl/aarch64/chacha-armv8.S
index 123c78b1838..24db5ad3073 100644
--- a/sys/crypto/openssl/aarch64/chacha-armv8.S
+++ b/sys/crypto/openssl/aarch64/chacha-armv8.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from chacha-armv8.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S b/sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S
index f7fcce4365f..fc74b7095cb 100644
--- a/sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S
+++ b/sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ecp_nistz256-armv8.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/aarch64/ghashv8-armx.S b/sys/crypto/openssl/aarch64/ghashv8-armx.S
index 4243755458c..387d3c1f27b 100644
--- a/sys/crypto/openssl/aarch64/ghashv8-armx.S
+++ b/sys/crypto/openssl/aarch64/ghashv8-armx.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ghashv8-armx.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/aarch64/keccak1600-armv8.S b/sys/crypto/openssl/aarch64/keccak1600-armv8.S
index 500c8ea3690..d52a88d8d0f 100644
--- a/sys/crypto/openssl/aarch64/keccak1600-armv8.S
+++ b/sys/crypto/openssl/aarch64/keccak1600-armv8.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from keccak1600-armv8.pl. */
 .text
 
diff --git a/sys/crypto/openssl/aarch64/poly1305-armv8.S b/sys/crypto/openssl/aarch64/poly1305-armv8.S
index 4fc458d568f..8ea86cb222f 100644
--- a/sys/crypto/openssl/aarch64/poly1305-armv8.S
+++ b/sys/crypto/openssl/aarch64/poly1305-armv8.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from poly1305-armv8.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/aarch64/sha1-armv8.S b/sys/crypto/openssl/aarch64/sha1-armv8.S
index f72c9c8b18b..847de3818ea 100644
--- a/sys/crypto/openssl/aarch64/sha1-armv8.S
+++ b/sys/crypto/openssl/aarch64/sha1-armv8.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha1-armv8.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/aarch64/sha256-armv8.S b/sys/crypto/openssl/aarch64/sha256-armv8.S
index e1a08d98912..e3be48716e0 100644
--- a/sys/crypto/openssl/aarch64/sha256-armv8.S
+++ b/sys/crypto/openssl/aarch64/sha256-armv8.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512-armv8.pl. */
 // Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved.
 //
diff --git a/sys/crypto/openssl/aarch64/sha512-armv8.S b/sys/crypto/openssl/aarch64/sha512-armv8.S
index 8fdd14f254c..2103672a35f 100644
--- a/sys/crypto/openssl/aarch64/sha512-armv8.S
+++ b/sys/crypto/openssl/aarch64/sha512-armv8.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512-armv8.pl. */
 // Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved.
 //
diff --git a/sys/crypto/openssl/aarch64/vpaes-armv8.S b/sys/crypto/openssl/aarch64/vpaes-armv8.S
index 390125ff052..7ec5b5a8353 100644
--- a/sys/crypto/openssl/aarch64/vpaes-armv8.S
+++ b/sys/crypto/openssl/aarch64/vpaes-armv8.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from vpaes-armv8.pl. */
 .text
 
diff --git a/sys/crypto/openssl/amd64/aesni-gcm-x86_64.S b/sys/crypto/openssl/amd64/aesni-gcm-x86_64.S
index 26e49f9b297..2fa54947241 100644
--- a/sys/crypto/openssl/amd64/aesni-gcm-x86_64.S
+++ b/sys/crypto/openssl/amd64/aesni-gcm-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aesni-gcm-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/aesni-mb-x86_64.S b/sys/crypto/openssl/amd64/aesni-mb-x86_64.S
index 706c5c59d38..acffb8be04d 100644
--- a/sys/crypto/openssl/amd64/aesni-mb-x86_64.S
+++ b/sys/crypto/openssl/amd64/aesni-mb-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aesni-mb-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/aesni-sha1-x86_64.S b/sys/crypto/openssl/amd64/aesni-sha1-x86_64.S
index 38f306142c8..76edda128a1 100644
--- a/sys/crypto/openssl/amd64/aesni-sha1-x86_64.S
+++ b/sys/crypto/openssl/amd64/aesni-sha1-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aesni-sha1-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/aesni-sha256-x86_64.S b/sys/crypto/openssl/amd64/aesni-sha256-x86_64.S
index cb9e150db55..9bdf39ffde7 100644
--- a/sys/crypto/openssl/amd64/aesni-sha256-x86_64.S
+++ b/sys/crypto/openssl/amd64/aesni-sha256-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aesni-sha256-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/aesni-x86_64.S b/sys/crypto/openssl/amd64/aesni-x86_64.S
index ce3ba1266de..484b06c5eac 100644
--- a/sys/crypto/openssl/amd64/aesni-x86_64.S
+++ b/sys/crypto/openssl/amd64/aesni-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aesni-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/chacha-x86_64.S b/sys/crypto/openssl/amd64/chacha-x86_64.S
index b01c1b87d47..0b3c6712014 100644
--- a/sys/crypto/openssl/amd64/chacha-x86_64.S
+++ b/sys/crypto/openssl/amd64/chacha-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from chacha-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/cmll-x86_64.S b/sys/crypto/openssl/amd64/cmll-x86_64.S
index d1d284b5a32..97a1d431068 100644
--- a/sys/crypto/openssl/amd64/cmll-x86_64.S
+++ b/sys/crypto/openssl/amd64/cmll-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from cmll-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/e_padlock-x86_64.S b/sys/crypto/openssl/amd64/e_padlock-x86_64.S
index b19cf1d0b2d..ab4cc09852f 100644
--- a/sys/crypto/openssl/amd64/e_padlock-x86_64.S
+++ b/sys/crypto/openssl/amd64/e_padlock-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from e_padlock-x86_64.pl. */
 .text	
 .globl	padlock_capability
diff --git a/sys/crypto/openssl/amd64/ecp_nistz256-x86_64.S b/sys/crypto/openssl/amd64/ecp_nistz256-x86_64.S
index df18fa496de..542c4d80ec8 100644
--- a/sys/crypto/openssl/amd64/ecp_nistz256-x86_64.S
+++ b/sys/crypto/openssl/amd64/ecp_nistz256-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ecp_nistz256-x86_64.pl. */
 .text	
 .globl	ecp_nistz256_precomputed
diff --git a/sys/crypto/openssl/amd64/ghash-x86_64.S b/sys/crypto/openssl/amd64/ghash-x86_64.S
index 078353528d5..ce241dff4e0 100644
--- a/sys/crypto/openssl/amd64/ghash-x86_64.S
+++ b/sys/crypto/openssl/amd64/ghash-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ghash-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/keccak1600-x86_64.S b/sys/crypto/openssl/amd64/keccak1600-x86_64.S
index d3675880799..8fc2a57e450 100644
--- a/sys/crypto/openssl/amd64/keccak1600-x86_64.S
+++ b/sys/crypto/openssl/amd64/keccak1600-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from keccak1600-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/md5-x86_64.S b/sys/crypto/openssl/amd64/md5-x86_64.S
index 0427fe299e7..289c60b49aa 100644
--- a/sys/crypto/openssl/amd64/md5-x86_64.S
+++ b/sys/crypto/openssl/amd64/md5-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from md5-x86_64.pl. */
 .text	
 .align	16
diff --git a/sys/crypto/openssl/amd64/poly1305-x86_64.S b/sys/crypto/openssl/amd64/poly1305-x86_64.S
index c5a1f45fc5d..4d43b3d142f 100644
--- a/sys/crypto/openssl/amd64/poly1305-x86_64.S
+++ b/sys/crypto/openssl/amd64/poly1305-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from poly1305-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/rc4-md5-x86_64.S b/sys/crypto/openssl/amd64/rc4-md5-x86_64.S
index 1f6b90fe645..90ae0b0e7e1 100644
--- a/sys/crypto/openssl/amd64/rc4-md5-x86_64.S
+++ b/sys/crypto/openssl/amd64/rc4-md5-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from rc4-md5-x86_64.pl. */
 .text	
 .align	16
diff --git a/sys/crypto/openssl/amd64/rc4-x86_64.S b/sys/crypto/openssl/amd64/rc4-x86_64.S
index a084e9b9c99..923025d0431 100644
--- a/sys/crypto/openssl/amd64/rc4-x86_64.S
+++ b/sys/crypto/openssl/amd64/rc4-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from rc4-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/rsaz-avx2.S b/sys/crypto/openssl/amd64/rsaz-avx2.S
index 3075a52d2ee..c9d02d5eb17 100644
--- a/sys/crypto/openssl/amd64/rsaz-avx2.S
+++ b/sys/crypto/openssl/amd64/rsaz-avx2.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from rsaz-avx2.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/rsaz-x86_64.S b/sys/crypto/openssl/amd64/rsaz-x86_64.S
index 3ba29ea52dd..2b1df8270a0 100644
--- a/sys/crypto/openssl/amd64/rsaz-x86_64.S
+++ b/sys/crypto/openssl/amd64/rsaz-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from rsaz-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/sha1-mb-x86_64.S b/sys/crypto/openssl/amd64/sha1-mb-x86_64.S
index 0090e020c57..cba8dd5a207 100644
--- a/sys/crypto/openssl/amd64/sha1-mb-x86_64.S
+++ b/sys/crypto/openssl/amd64/sha1-mb-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha1-mb-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/sha1-x86_64.S b/sys/crypto/openssl/amd64/sha1-x86_64.S
index 342db5203d1..1274bb72716 100644
--- a/sys/crypto/openssl/amd64/sha1-x86_64.S
+++ b/sys/crypto/openssl/amd64/sha1-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha1-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/sha256-mb-x86_64.S b/sys/crypto/openssl/amd64/sha256-mb-x86_64.S
index 1c77e3d13a8..70e6e51b41e 100644
--- a/sys/crypto/openssl/amd64/sha256-mb-x86_64.S
+++ b/sys/crypto/openssl/amd64/sha256-mb-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha256-mb-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/sha256-x86_64.S b/sys/crypto/openssl/amd64/sha256-x86_64.S
index 13d497c4f8e..c7f77043bea 100644
--- a/sys/crypto/openssl/amd64/sha256-x86_64.S
+++ b/sys/crypto/openssl/amd64/sha256-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/sha512-x86_64.S b/sys/crypto/openssl/amd64/sha512-x86_64.S
index ae11a36e482..280a35a2554 100644
--- a/sys/crypto/openssl/amd64/sha512-x86_64.S
+++ b/sys/crypto/openssl/amd64/sha512-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/vpaes-x86_64.S b/sys/crypto/openssl/amd64/vpaes-x86_64.S
index b9c6f7e98a6..bb5953568a6 100644
--- a/sys/crypto/openssl/amd64/vpaes-x86_64.S
+++ b/sys/crypto/openssl/amd64/vpaes-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from vpaes-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/wp-x86_64.S b/sys/crypto/openssl/amd64/wp-x86_64.S
index 3edf02d0fc0..89636e0bd70 100644
--- a/sys/crypto/openssl/amd64/wp-x86_64.S
+++ b/sys/crypto/openssl/amd64/wp-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from wp-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/x25519-x86_64.S b/sys/crypto/openssl/amd64/x25519-x86_64.S
index 7448e866aaf..fbc83f9a242 100644
--- a/sys/crypto/openssl/amd64/x25519-x86_64.S
+++ b/sys/crypto/openssl/amd64/x25519-x86_64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from x25519-x86_64.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/x86_64-gf2m.S b/sys/crypto/openssl/amd64/x86_64-gf2m.S
index 4c6f4ff4fbf..8e0511f39bd 100644
--- a/sys/crypto/openssl/amd64/x86_64-gf2m.S
+++ b/sys/crypto/openssl/amd64/x86_64-gf2m.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from x86_64-gf2m.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/x86_64-mont.S b/sys/crypto/openssl/amd64/x86_64-mont.S
index 015a87c446b..4fd5d3d0ab4 100644
--- a/sys/crypto/openssl/amd64/x86_64-mont.S
+++ b/sys/crypto/openssl/amd64/x86_64-mont.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from x86_64-mont.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/x86_64-mont5.S b/sys/crypto/openssl/amd64/x86_64-mont5.S
index acd8b6025fd..4fa952f2b3b 100644
--- a/sys/crypto/openssl/amd64/x86_64-mont5.S
+++ b/sys/crypto/openssl/amd64/x86_64-mont5.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from x86_64-mont5.pl. */
 .text	
 
diff --git a/sys/crypto/openssl/amd64/x86_64cpuid.S b/sys/crypto/openssl/amd64/x86_64cpuid.S
index 4686723d697..f8fee4d9d65 100644
--- a/sys/crypto/openssl/amd64/x86_64cpuid.S
+++ b/sys/crypto/openssl/amd64/x86_64cpuid.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from x86_64cpuid.pl. */
 
 .hidden	OPENSSL_cpuid_setup
diff --git a/sys/crypto/openssl/arm/aes-armv4.S b/sys/crypto/openssl/arm/aes-armv4.S
index 3da60f935ad..c0c01485aaf 100644
--- a/sys/crypto/openssl/arm/aes-armv4.S
+++ b/sys/crypto/openssl/arm/aes-armv4.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aes-armv4.pl. */
 @ Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
 @
diff --git a/sys/crypto/openssl/arm/aesv8-armx.S b/sys/crypto/openssl/arm/aesv8-armx.S
index f46d50c5733..569f1c6ba40 100644
--- a/sys/crypto/openssl/arm/aesv8-armx.S
+++ b/sys/crypto/openssl/arm/aesv8-armx.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aesv8-armx.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/arm/armv4-gf2m.S b/sys/crypto/openssl/arm/armv4-gf2m.S
index 1863e0ff4f6..5ee07d4bf9a 100644
--- a/sys/crypto/openssl/arm/armv4-gf2m.S
+++ b/sys/crypto/openssl/arm/armv4-gf2m.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from armv4-gf2m.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/arm/armv4-mont.S b/sys/crypto/openssl/arm/armv4-mont.S
index d05c71457ec..69ca04f8911 100644
--- a/sys/crypto/openssl/arm/armv4-mont.S
+++ b/sys/crypto/openssl/arm/armv4-mont.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from armv4-mont.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/arm/armv4cpuid.S b/sys/crypto/openssl/arm/armv4cpuid.S
index f7b60e0ca53..f1f59a2de10 100644
--- a/sys/crypto/openssl/arm/armv4cpuid.S
+++ b/sys/crypto/openssl/arm/armv4cpuid.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from armv4cpuid.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/arm/bsaes-armv7.S b/sys/crypto/openssl/arm/bsaes-armv7.S
index 8fe75aaf81c..55223764a03 100644
--- a/sys/crypto/openssl/arm/bsaes-armv7.S
+++ b/sys/crypto/openssl/arm/bsaes-armv7.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from bsaes-armv7.pl. */
 @ Copyright 2012-2020 The OpenSSL Project Authors. All Rights Reserved.
 @
diff --git a/sys/crypto/openssl/arm/chacha-armv4.S b/sys/crypto/openssl/arm/chacha-armv4.S
index d3893804904..077500d3c18 100644
--- a/sys/crypto/openssl/arm/chacha-armv4.S
+++ b/sys/crypto/openssl/arm/chacha-armv4.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from chacha-armv4.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/arm/ecp_nistz256-armv4.S b/sys/crypto/openssl/arm/ecp_nistz256-armv4.S
index 25ee8d5464f..150b83583de 100644
--- a/sys/crypto/openssl/arm/ecp_nistz256-armv4.S
+++ b/sys/crypto/openssl/arm/ecp_nistz256-armv4.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ecp_nistz256-armv4.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/arm/ghash-armv4.S b/sys/crypto/openssl/arm/ghash-armv4.S
index ab5203527db..413ab2ffed1 100644
--- a/sys/crypto/openssl/arm/ghash-armv4.S
+++ b/sys/crypto/openssl/arm/ghash-armv4.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ghash-armv4.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/arm/ghashv8-armx.S b/sys/crypto/openssl/arm/ghashv8-armx.S
index 8160d0e53a6..f617d998143 100644
--- a/sys/crypto/openssl/arm/ghashv8-armx.S
+++ b/sys/crypto/openssl/arm/ghashv8-armx.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ghashv8-armx.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/arm/keccak1600-armv4.S b/sys/crypto/openssl/arm/keccak1600-armv4.S
index b50f34e1591..ae0cd9cd4b8 100644
--- a/sys/crypto/openssl/arm/keccak1600-armv4.S
+++ b/sys/crypto/openssl/arm/keccak1600-armv4.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from keccak1600-armv4.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/arm/poly1305-armv4.S b/sys/crypto/openssl/arm/poly1305-armv4.S
index 02d745f510b..64d0ef9b5a3 100644
--- a/sys/crypto/openssl/arm/poly1305-armv4.S
+++ b/sys/crypto/openssl/arm/poly1305-armv4.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from poly1305-armv4.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/arm/sha1-armv4-large.S b/sys/crypto/openssl/arm/sha1-armv4-large.S
index d97f995206e..2492c049a2a 100644
--- a/sys/crypto/openssl/arm/sha1-armv4-large.S
+++ b/sys/crypto/openssl/arm/sha1-armv4-large.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha1-armv4-large.pl. */
 #include "arm_arch.h"
 
diff --git a/sys/crypto/openssl/arm/sha256-armv4.S b/sys/crypto/openssl/arm/sha256-armv4.S
index fc7d2c499da..5b541faf07f 100644
--- a/sys/crypto/openssl/arm/sha256-armv4.S
+++ b/sys/crypto/openssl/arm/sha256-armv4.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha256-armv4.pl. */
 @ Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
 @
diff --git a/sys/crypto/openssl/arm/sha512-armv4.S b/sys/crypto/openssl/arm/sha512-armv4.S
index 2e230fc4074..f1522a8cbff 100644
--- a/sys/crypto/openssl/arm/sha512-armv4.S
+++ b/sys/crypto/openssl/arm/sha512-armv4.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512-armv4.pl. */
 @ Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
 @
diff --git a/sys/crypto/openssl/i386/aesni-x86.S b/sys/crypto/openssl/i386/aesni-x86.S
index acc05d448de..ea2058f2bad 100644
--- a/sys/crypto/openssl/i386/aesni-x86.S
+++ b/sys/crypto/openssl/i386/aesni-x86.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aesni-x86.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/bf-586.S b/sys/crypto/openssl/i386/bf-586.S
index 881ae678e3e..fd533bb9931 100644
--- a/sys/crypto/openssl/i386/bf-586.S
+++ b/sys/crypto/openssl/i386/bf-586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from bf-586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/bn-586.S b/sys/crypto/openssl/i386/bn-586.S
index 36f3a376b61..512bcf3a82d 100644
--- a/sys/crypto/openssl/i386/bn-586.S
+++ b/sys/crypto/openssl/i386/bn-586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from bn-586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/cast-586.S b/sys/crypto/openssl/i386/cast-586.S
index 88665fc8e1c..fea8b021a95 100644
--- a/sys/crypto/openssl/i386/cast-586.S
+++ b/sys/crypto/openssl/i386/cast-586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from cast-586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/chacha-x86.S b/sys/crypto/openssl/i386/chacha-x86.S
index d6b2936a538..a45c3e3a37e 100644
--- a/sys/crypto/openssl/i386/chacha-x86.S
+++ b/sys/crypto/openssl/i386/chacha-x86.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from chacha-x86.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/cmll-x86.S b/sys/crypto/openssl/i386/cmll-x86.S
index 3611a9e23b5..3a49ea43c23 100644
--- a/sys/crypto/openssl/i386/cmll-x86.S
+++ b/sys/crypto/openssl/i386/cmll-x86.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from cmll-x86.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/co-586.S b/sys/crypto/openssl/i386/co-586.S
index f749223a585..e3f734245de 100644
--- a/sys/crypto/openssl/i386/co-586.S
+++ b/sys/crypto/openssl/i386/co-586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from co-586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/crypt586.S b/sys/crypto/openssl/i386/crypt586.S
index bc393f06e5e..fd5e72fd8ab 100644
--- a/sys/crypto/openssl/i386/crypt586.S
+++ b/sys/crypto/openssl/i386/crypt586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from crypt586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/des-586.S b/sys/crypto/openssl/i386/des-586.S
index 72bdc2e6b45..fd9506d92c4 100644
--- a/sys/crypto/openssl/i386/des-586.S
+++ b/sys/crypto/openssl/i386/des-586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from des-586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/e_padlock-x86.S b/sys/crypto/openssl/i386/e_padlock-x86.S
index 58085b33679..66a152488e9 100644
--- a/sys/crypto/openssl/i386/e_padlock-x86.S
+++ b/sys/crypto/openssl/i386/e_padlock-x86.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from e_padlock-x86.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/ecp_nistz256-x86.S b/sys/crypto/openssl/i386/ecp_nistz256-x86.S
index eb413d9f1a7..b72eda775c9 100644
--- a/sys/crypto/openssl/i386/ecp_nistz256-x86.S
+++ b/sys/crypto/openssl/i386/ecp_nistz256-x86.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ecp_nistz256-x86.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/ghash-x86.S b/sys/crypto/openssl/i386/ghash-x86.S
index 02b5a036f08..2d031cdd47e 100644
--- a/sys/crypto/openssl/i386/ghash-x86.S
+++ b/sys/crypto/openssl/i386/ghash-x86.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ghash-x86.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/md5-586.S b/sys/crypto/openssl/i386/md5-586.S
index 8913b883196..1b1a07ec96d 100644
--- a/sys/crypto/openssl/i386/md5-586.S
+++ b/sys/crypto/openssl/i386/md5-586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from md5-586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/poly1305-x86.S b/sys/crypto/openssl/i386/poly1305-x86.S
index 100deee40bf..f8a678b3dc3 100644
--- a/sys/crypto/openssl/i386/poly1305-x86.S
+++ b/sys/crypto/openssl/i386/poly1305-x86.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from poly1305-x86.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/rc4-586.S b/sys/crypto/openssl/i386/rc4-586.S
index cf0712c9b40..1d076f3d6b1 100644
--- a/sys/crypto/openssl/i386/rc4-586.S
+++ b/sys/crypto/openssl/i386/rc4-586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from rc4-586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/rc5-586.S b/sys/crypto/openssl/i386/rc5-586.S
index ce3274d0d73..5ab6bea14b3 100644
--- a/sys/crypto/openssl/i386/rc5-586.S
+++ b/sys/crypto/openssl/i386/rc5-586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from rc5-586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/rmd-586.S b/sys/crypto/openssl/i386/rmd-586.S
index 947af68e3d3..5b6be50568b 100644
--- a/sys/crypto/openssl/i386/rmd-586.S
+++ b/sys/crypto/openssl/i386/rmd-586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from rmd-586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/sha1-586.S b/sys/crypto/openssl/i386/sha1-586.S
index 7e90e2d9b1d..1b6b1a420f5 100644
--- a/sys/crypto/openssl/i386/sha1-586.S
+++ b/sys/crypto/openssl/i386/sha1-586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha1-586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/sha256-586.S b/sys/crypto/openssl/i386/sha256-586.S
index 7b4205352bd..454030c18cc 100644
--- a/sys/crypto/openssl/i386/sha256-586.S
+++ b/sys/crypto/openssl/i386/sha256-586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha256-586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/sha512-586.S b/sys/crypto/openssl/i386/sha512-586.S
index 77a0cd78b15..c5f6b718d56 100644
--- a/sys/crypto/openssl/i386/sha512-586.S
+++ b/sys/crypto/openssl/i386/sha512-586.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512-586.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/vpaes-x86.S b/sys/crypto/openssl/i386/vpaes-x86.S
index f78a8f9b32c..1c9cef1456a 100644
--- a/sys/crypto/openssl/i386/vpaes-x86.S
+++ b/sys/crypto/openssl/i386/vpaes-x86.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from vpaes-x86.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/wp-mmx.S b/sys/crypto/openssl/i386/wp-mmx.S
index 8da4ba60d5b..fc5df6274a9 100644
--- a/sys/crypto/openssl/i386/wp-mmx.S
+++ b/sys/crypto/openssl/i386/wp-mmx.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from wp-mmx.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/x86-gf2m.S b/sys/crypto/openssl/i386/x86-gf2m.S
index 9a137085bff..9c0e2517810 100644
--- a/sys/crypto/openssl/i386/x86-gf2m.S
+++ b/sys/crypto/openssl/i386/x86-gf2m.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from x86-gf2m.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/x86-mont.S b/sys/crypto/openssl/i386/x86-mont.S
index dbb8531aefa..049c9e626e0 100644
--- a/sys/crypto/openssl/i386/x86-mont.S
+++ b/sys/crypto/openssl/i386/x86-mont.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from x86-mont.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/i386/x86cpuid.S b/sys/crypto/openssl/i386/x86cpuid.S
index 6029b2df04f..d232734b64b 100644
--- a/sys/crypto/openssl/i386/x86cpuid.S
+++ b/sys/crypto/openssl/i386/x86cpuid.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from x86cpuid.pl. */
 #ifdef PIC
 .text
diff --git a/sys/crypto/openssl/powerpc/aes-ppc.S b/sys/crypto/openssl/powerpc/aes-ppc.S
index 75eef3eb51f..ff971cbe937 100644
--- a/sys/crypto/openssl/powerpc/aes-ppc.S
+++ b/sys/crypto/openssl/powerpc/aes-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aes-ppc.pl. */
 .machine	"any"
 .text
diff --git a/sys/crypto/openssl/powerpc/aesp8-ppc.S b/sys/crypto/openssl/powerpc/aesp8-ppc.S
index e29b45aa3d2..21067ff2521 100644
--- a/sys/crypto/openssl/powerpc/aesp8-ppc.S
+++ b/sys/crypto/openssl/powerpc/aesp8-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aesp8-ppc.pl. */
 .machine	"any"
 
diff --git a/sys/crypto/openssl/powerpc/chacha-ppc.S b/sys/crypto/openssl/powerpc/chacha-ppc.S
index fe791fd10c4..2893962f9ce 100644
--- a/sys/crypto/openssl/powerpc/chacha-ppc.S
+++ b/sys/crypto/openssl/powerpc/chacha-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from chacha-ppc.pl. */
 .machine	"any"
 .text
diff --git a/sys/crypto/openssl/powerpc/ghashp8-ppc.S b/sys/crypto/openssl/powerpc/ghashp8-ppc.S
index 0faf60451c7..6b662b8727a 100644
--- a/sys/crypto/openssl/powerpc/ghashp8-ppc.S
+++ b/sys/crypto/openssl/powerpc/ghashp8-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ghashp8-ppc.pl. */
 .machine	"any"
 
diff --git a/sys/crypto/openssl/powerpc/poly1305-ppc.S b/sys/crypto/openssl/powerpc/poly1305-ppc.S
index 54aff7b3817..5b458a6ec4e 100644
--- a/sys/crypto/openssl/powerpc/poly1305-ppc.S
+++ b/sys/crypto/openssl/powerpc/poly1305-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from poly1305-ppc.pl. */
 .machine	"any"
 .text
diff --git a/sys/crypto/openssl/powerpc/poly1305-ppcfp.S b/sys/crypto/openssl/powerpc/poly1305-ppcfp.S
index 403526444f2..d983a0b479c 100644
--- a/sys/crypto/openssl/powerpc/poly1305-ppcfp.S
+++ b/sys/crypto/openssl/powerpc/poly1305-ppcfp.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from poly1305-ppcfp.pl. */
 .machine	"any"
 .text
diff --git a/sys/crypto/openssl/powerpc/ppc-mont.S b/sys/crypto/openssl/powerpc/ppc-mont.S
index e530f694458..3edbeb636de 100644
--- a/sys/crypto/openssl/powerpc/ppc-mont.S
+++ b/sys/crypto/openssl/powerpc/ppc-mont.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ppc-mont.pl. */
 .machine	"any"
 .text
diff --git a/sys/crypto/openssl/powerpc/ppc.S b/sys/crypto/openssl/powerpc/ppc.S
index 23c1c684ef4..166e2de1ddd 100644
--- a/sys/crypto/openssl/powerpc/ppc.S
+++ b/sys/crypto/openssl/powerpc/ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ppc.pl. */
 
 
diff --git a/sys/crypto/openssl/powerpc/ppccpuid.S b/sys/crypto/openssl/powerpc/ppccpuid.S
index a810519d3ff..77c67739f98 100644
--- a/sys/crypto/openssl/powerpc/ppccpuid.S
+++ b/sys/crypto/openssl/powerpc/ppccpuid.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ppccpuid.pl. */
 .machine	"any"
 .text
diff --git a/sys/crypto/openssl/powerpc/sha1-ppc.S b/sys/crypto/openssl/powerpc/sha1-ppc.S
index e576ad1f73e..f9866f180b8 100644
--- a/sys/crypto/openssl/powerpc/sha1-ppc.S
+++ b/sys/crypto/openssl/powerpc/sha1-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha1-ppc.pl. */
 .machine	"any"
 .text
diff --git a/sys/crypto/openssl/powerpc/sha256-ppc.S b/sys/crypto/openssl/powerpc/sha256-ppc.S
index 8f39584266a..9b56899af0d 100644
--- a/sys/crypto/openssl/powerpc/sha256-ppc.S
+++ b/sys/crypto/openssl/powerpc/sha256-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512-ppc.pl. */
 .machine	"any"
 .text
diff --git a/sys/crypto/openssl/powerpc/sha256p8-ppc.S b/sys/crypto/openssl/powerpc/sha256p8-ppc.S
index 092f2090f02..a55e926c1c7 100644
--- a/sys/crypto/openssl/powerpc/sha256p8-ppc.S
+++ b/sys/crypto/openssl/powerpc/sha256p8-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512p8-ppc.pl. */
 .machine	"any"
 .text
diff --git a/sys/crypto/openssl/powerpc/sha512-ppc.S b/sys/crypto/openssl/powerpc/sha512-ppc.S
index b6c3109c997..073caa074f2 100644
--- a/sys/crypto/openssl/powerpc/sha512-ppc.S
+++ b/sys/crypto/openssl/powerpc/sha512-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512-ppc.pl. */
 .machine	"any"
 .text
diff --git a/sys/crypto/openssl/powerpc/sha512p8-ppc.S b/sys/crypto/openssl/powerpc/sha512p8-ppc.S
index 846e3e8eb78..182884860f4 100644
--- a/sys/crypto/openssl/powerpc/sha512p8-ppc.S
+++ b/sys/crypto/openssl/powerpc/sha512p8-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512p8-ppc.pl. */
 .machine	"any"
 .text
diff --git a/sys/crypto/openssl/powerpc/vpaes-ppc.S b/sys/crypto/openssl/powerpc/vpaes-ppc.S
index bafb4de1f78..fd11edc7938 100644
--- a/sys/crypto/openssl/powerpc/vpaes-ppc.S
+++ b/sys/crypto/openssl/powerpc/vpaes-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from vpaes-ppc.pl. */
 .machine	"any"
 
diff --git a/sys/crypto/openssl/powerpc64/aes-ppc.S b/sys/crypto/openssl/powerpc64/aes-ppc.S
index 6532b46191a..4b1074819d8 100644
--- a/sys/crypto/openssl/powerpc64/aes-ppc.S
+++ b/sys/crypto/openssl/powerpc64/aes-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aes-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64/aesp8-ppc.S b/sys/crypto/openssl/powerpc64/aesp8-ppc.S
index 09114425135..5fdbf0552b2 100644
--- a/sys/crypto/openssl/powerpc64/aesp8-ppc.S
+++ b/sys/crypto/openssl/powerpc64/aesp8-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aesp8-ppc.pl. */
 .machine	"any"
 
diff --git a/sys/crypto/openssl/powerpc64/chacha-ppc.S b/sys/crypto/openssl/powerpc64/chacha-ppc.S
index a749e02c017..ef057762831 100644
--- a/sys/crypto/openssl/powerpc64/chacha-ppc.S
+++ b/sys/crypto/openssl/powerpc64/chacha-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from chacha-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64/ecp_nistz256-ppc64.S b/sys/crypto/openssl/powerpc64/ecp_nistz256-ppc64.S
index 034be700130..bd280724515 100644
--- a/sys/crypto/openssl/powerpc64/ecp_nistz256-ppc64.S
+++ b/sys/crypto/openssl/powerpc64/ecp_nistz256-ppc64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ecp_nistz256-ppc64.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64/ghashp8-ppc.S b/sys/crypto/openssl/powerpc64/ghashp8-ppc.S
index 91877d0c149..719d6b7e736 100644
--- a/sys/crypto/openssl/powerpc64/ghashp8-ppc.S
+++ b/sys/crypto/openssl/powerpc64/ghashp8-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ghashp8-ppc.pl. */
 .machine	"any"
 
diff --git a/sys/crypto/openssl/powerpc64/keccak1600-ppc64.S b/sys/crypto/openssl/powerpc64/keccak1600-ppc64.S
index 4eadcde21a8..bac074cdcf6 100644
--- a/sys/crypto/openssl/powerpc64/keccak1600-ppc64.S
+++ b/sys/crypto/openssl/powerpc64/keccak1600-ppc64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from keccak1600-ppc64.pl. */
 .abiversion	2
 .text
diff --git a/sys/crypto/openssl/powerpc64/poly1305-ppc.S b/sys/crypto/openssl/powerpc64/poly1305-ppc.S
index dbd291ea14f..d8b10660229 100644
--- a/sys/crypto/openssl/powerpc64/poly1305-ppc.S
+++ b/sys/crypto/openssl/powerpc64/poly1305-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from poly1305-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64/poly1305-ppcfp.S b/sys/crypto/openssl/powerpc64/poly1305-ppcfp.S
index bb5bf942386..0cc88e83b6b 100644
--- a/sys/crypto/openssl/powerpc64/poly1305-ppcfp.S
+++ b/sys/crypto/openssl/powerpc64/poly1305-ppcfp.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from poly1305-ppcfp.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64/ppc-mont.S b/sys/crypto/openssl/powerpc64/ppc-mont.S
index ba25869389b..2bf6aa9b222 100644
--- a/sys/crypto/openssl/powerpc64/ppc-mont.S
+++ b/sys/crypto/openssl/powerpc64/ppc-mont.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ppc-mont.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64/ppc.S b/sys/crypto/openssl/powerpc64/ppc.S
index c6d69006c9a..50805d3d52b 100644
--- a/sys/crypto/openssl/powerpc64/ppc.S
+++ b/sys/crypto/openssl/powerpc64/ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ppc.pl. */
 
 
diff --git a/sys/crypto/openssl/powerpc64/ppccpuid.S b/sys/crypto/openssl/powerpc64/ppccpuid.S
index 1ed506ee382..d352a41008b 100644
--- a/sys/crypto/openssl/powerpc64/ppccpuid.S
+++ b/sys/crypto/openssl/powerpc64/ppccpuid.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ppccpuid.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64/sha1-ppc.S b/sys/crypto/openssl/powerpc64/sha1-ppc.S
index 26623f9a4ef..a111ba427ce 100644
--- a/sys/crypto/openssl/powerpc64/sha1-ppc.S
+++ b/sys/crypto/openssl/powerpc64/sha1-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha1-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64/sha256-ppc.S b/sys/crypto/openssl/powerpc64/sha256-ppc.S
index 9cfe73e7381..a1bb3092fee 100644
--- a/sys/crypto/openssl/powerpc64/sha256-ppc.S
+++ b/sys/crypto/openssl/powerpc64/sha256-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64/sha256p8-ppc.S b/sys/crypto/openssl/powerpc64/sha256p8-ppc.S
index cc1586b1ef7..f13adffb034 100644
--- a/sys/crypto/openssl/powerpc64/sha256p8-ppc.S
+++ b/sys/crypto/openssl/powerpc64/sha256p8-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512p8-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64/sha512-ppc.S b/sys/crypto/openssl/powerpc64/sha512-ppc.S
index 26040484841..5172aa90180 100644
--- a/sys/crypto/openssl/powerpc64/sha512-ppc.S
+++ b/sys/crypto/openssl/powerpc64/sha512-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64/sha512p8-ppc.S b/sys/crypto/openssl/powerpc64/sha512p8-ppc.S
index 1576f5bd123..ab9642de0a2 100644
--- a/sys/crypto/openssl/powerpc64/sha512p8-ppc.S
+++ b/sys/crypto/openssl/powerpc64/sha512p8-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512p8-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64/vpaes-ppc.S b/sys/crypto/openssl/powerpc64/vpaes-ppc.S
index f44b162d87c..bf0e1b3b899 100644
--- a/sys/crypto/openssl/powerpc64/vpaes-ppc.S
+++ b/sys/crypto/openssl/powerpc64/vpaes-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from vpaes-ppc.pl. */
 .machine	"any"
 
diff --git a/sys/crypto/openssl/powerpc64/x25519-ppc64.S b/sys/crypto/openssl/powerpc64/x25519-ppc64.S
index 0e321f28c03..17762f84c23 100644
--- a/sys/crypto/openssl/powerpc64/x25519-ppc64.S
+++ b/sys/crypto/openssl/powerpc64/x25519-ppc64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from x25519-ppc64.pl. */
 .abiversion	2
 .text
diff --git a/sys/crypto/openssl/powerpc64le/aes-ppc.S b/sys/crypto/openssl/powerpc64le/aes-ppc.S
index 3b1074f6d70..cfbe7579524 100644
--- a/sys/crypto/openssl/powerpc64le/aes-ppc.S
+++ b/sys/crypto/openssl/powerpc64le/aes-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aes-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64le/aesp8-ppc.S b/sys/crypto/openssl/powerpc64le/aesp8-ppc.S
index 163009d849f..922f45cc0e4 100644
--- a/sys/crypto/openssl/powerpc64le/aesp8-ppc.S
+++ b/sys/crypto/openssl/powerpc64le/aesp8-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aesp8-ppc.pl. */
 .machine	"any"
 
diff --git a/sys/crypto/openssl/powerpc64le/chacha-ppc.S b/sys/crypto/openssl/powerpc64le/chacha-ppc.S
index 91d52da4baa..2685a638841 100644
--- a/sys/crypto/openssl/powerpc64le/chacha-ppc.S
+++ b/sys/crypto/openssl/powerpc64le/chacha-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from chacha-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64le/ecp_nistz256-ppc64.S b/sys/crypto/openssl/powerpc64le/ecp_nistz256-ppc64.S
index 034be700130..bd280724515 100644
--- a/sys/crypto/openssl/powerpc64le/ecp_nistz256-ppc64.S
+++ b/sys/crypto/openssl/powerpc64le/ecp_nistz256-ppc64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ecp_nistz256-ppc64.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64le/ghashp8-ppc.S b/sys/crypto/openssl/powerpc64le/ghashp8-ppc.S
index e11f67a0e00..8fcd5da109f 100644
--- a/sys/crypto/openssl/powerpc64le/ghashp8-ppc.S
+++ b/sys/crypto/openssl/powerpc64le/ghashp8-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ghashp8-ppc.pl. */
 .machine	"any"
 
diff --git a/sys/crypto/openssl/powerpc64le/keccak1600-ppc64.S b/sys/crypto/openssl/powerpc64le/keccak1600-ppc64.S
index 8847ff915ee..1fb70dd39b2 100644
--- a/sys/crypto/openssl/powerpc64le/keccak1600-ppc64.S
+++ b/sys/crypto/openssl/powerpc64le/keccak1600-ppc64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from keccak1600-ppc64.pl. */
 .abiversion	2
 .text
diff --git a/sys/crypto/openssl/powerpc64le/poly1305-ppc.S b/sys/crypto/openssl/powerpc64le/poly1305-ppc.S
index a98434c9df9..7ffdb4a3d39 100644
--- a/sys/crypto/openssl/powerpc64le/poly1305-ppc.S
+++ b/sys/crypto/openssl/powerpc64le/poly1305-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from poly1305-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64le/poly1305-ppcfp.S b/sys/crypto/openssl/powerpc64le/poly1305-ppcfp.S
index a635adba415..b55fd07fea7 100644
--- a/sys/crypto/openssl/powerpc64le/poly1305-ppcfp.S
+++ b/sys/crypto/openssl/powerpc64le/poly1305-ppcfp.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from poly1305-ppcfp.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64le/ppc-mont.S b/sys/crypto/openssl/powerpc64le/ppc-mont.S
index ba25869389b..2bf6aa9b222 100644
--- a/sys/crypto/openssl/powerpc64le/ppc-mont.S
+++ b/sys/crypto/openssl/powerpc64le/ppc-mont.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ppc-mont.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64le/ppc.S b/sys/crypto/openssl/powerpc64le/ppc.S
index c6d69006c9a..50805d3d52b 100644
--- a/sys/crypto/openssl/powerpc64le/ppc.S
+++ b/sys/crypto/openssl/powerpc64le/ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ppc.pl. */
 
 
diff --git a/sys/crypto/openssl/powerpc64le/ppccpuid.S b/sys/crypto/openssl/powerpc64le/ppccpuid.S
index 1ed506ee382..d352a41008b 100644
--- a/sys/crypto/openssl/powerpc64le/ppccpuid.S
+++ b/sys/crypto/openssl/powerpc64le/ppccpuid.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from ppccpuid.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64le/sha1-ppc.S b/sys/crypto/openssl/powerpc64le/sha1-ppc.S
index 778b17b6fcd..35d3141a6ed 100644
--- a/sys/crypto/openssl/powerpc64le/sha1-ppc.S
+++ b/sys/crypto/openssl/powerpc64le/sha1-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha1-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64le/sha256-ppc.S b/sys/crypto/openssl/powerpc64le/sha256-ppc.S
index 40c0b98706b..ffde833812e 100644
--- a/sys/crypto/openssl/powerpc64le/sha256-ppc.S
+++ b/sys/crypto/openssl/powerpc64le/sha256-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64le/sha256p8-ppc.S b/sys/crypto/openssl/powerpc64le/sha256p8-ppc.S
index 2b7971dacf4..008313c9df8 100644
--- a/sys/crypto/openssl/powerpc64le/sha256p8-ppc.S
+++ b/sys/crypto/openssl/powerpc64le/sha256p8-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512p8-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64le/sha512-ppc.S b/sys/crypto/openssl/powerpc64le/sha512-ppc.S
index 3975b055247..c58a070bc8e 100644
--- a/sys/crypto/openssl/powerpc64le/sha512-ppc.S
+++ b/sys/crypto/openssl/powerpc64le/sha512-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64le/sha512p8-ppc.S b/sys/crypto/openssl/powerpc64le/sha512p8-ppc.S
index a85750d12dd..55b5d83ce2a 100644
--- a/sys/crypto/openssl/powerpc64le/sha512p8-ppc.S
+++ b/sys/crypto/openssl/powerpc64le/sha512p8-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from sha512p8-ppc.pl. */
 .machine	"any"
 .abiversion	2
diff --git a/sys/crypto/openssl/powerpc64le/vpaes-ppc.S b/sys/crypto/openssl/powerpc64le/vpaes-ppc.S
index f6e1b361c29..718232627e6 100644
--- a/sys/crypto/openssl/powerpc64le/vpaes-ppc.S
+++ b/sys/crypto/openssl/powerpc64le/vpaes-ppc.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from vpaes-ppc.pl. */
 .machine	"any"
 
diff --git a/sys/crypto/openssl/powerpc64le/x25519-ppc64.S b/sys/crypto/openssl/powerpc64le/x25519-ppc64.S
index 0e321f28c03..17762f84c23 100644
--- a/sys/crypto/openssl/powerpc64le/x25519-ppc64.S
+++ b/sys/crypto/openssl/powerpc64le/x25519-ppc64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from x25519-ppc64.pl. */
 .abiversion	2
 .text
diff --git a/sys/crypto/rijndael/rijndael-api-fst.h b/sys/crypto/rijndael/rijndael-api-fst.h
index e5f596ac75f..71a2d71bcb6 100644
--- a/sys/crypto/rijndael/rijndael-api-fst.h
+++ b/sys/crypto/rijndael/rijndael-api-fst.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: rijndael-api-fst.h,v 1.6 2001/05/27 00:23:23 itojun Exp $	*/
 
 /*
diff --git a/sys/crypto/rijndael/rijndael.h b/sys/crypto/rijndael/rijndael.h
index 6a52bbceb82..a7b20e4fe3a 100644
--- a/sys/crypto/rijndael/rijndael.h
+++ b/sys/crypto/rijndael/rijndael.h
@@ -1,5 +1,4 @@
 /*	$KAME: rijndael.h,v 1.6 2003/08/28 08:36:32 itojun Exp $	*/
-/*	$FreeBSD$	*/
 
 /**
  * rijndael-alg-fst.h
diff --git a/sys/crypto/rijndael/rijndael_local.h b/sys/crypto/rijndael/rijndael_local.h
index 1954fec65c6..1d71a34af66 100644
--- a/sys/crypto/rijndael/rijndael_local.h
+++ b/sys/crypto/rijndael/rijndael_local.h
@@ -1,5 +1,4 @@
 /*	$KAME: rijndael_local.h,v 1.5 2003/08/28 08:37:24 itojun Exp $	*/
-/*	$FreeBSD$	*/
 
 /* the file should not be used from outside */
 typedef uint8_t			u8;
diff --git a/sys/crypto/sha1.h b/sys/crypto/sha1.h
index ca80a54868b..82d7552a5b2 100644
--- a/sys/crypto/sha1.h
+++ b/sys/crypto/sha1.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: sha1.h,v 1.5 2000/03/27 04:36:23 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/crypto/skein/skein.h b/sys/crypto/skein/skein.h
index ca919aca1d0..f8038bd5936 100644
--- a/sys/crypto/skein/skein.h
+++ b/sys/crypto/skein/skein.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 #ifndef _SKEIN_H_
 #define _SKEIN_H_     1
 /**************************************************************************
diff --git a/sys/crypto/skein/skein_iv.h b/sys/crypto/skein/skein_iv.h
index 6e6616664bf..a8f54a41d34 100644
--- a/sys/crypto/skein/skein_iv.h
+++ b/sys/crypto/skein/skein_iv.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 #ifndef _SKEIN_IV_H_
 #define _SKEIN_IV_H_
 
diff --git a/sys/crypto/skein/skein_port.h b/sys/crypto/skein/skein_port.h
index a284ad9f2b3..4c455eddbb2 100644
--- a/sys/crypto/skein/skein_port.h
+++ b/sys/crypto/skein/skein_port.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 #ifndef _SKEIN_PORT_H_
 #define _SKEIN_PORT_H_
 /*******************************************************************
diff --git a/sys/dev/bfe/if_bfereg.h b/sys/dev/bfe/if_bfereg.h
index e6ed3b3c8b2..1599967569e 100644
--- a/sys/dev/bfe/if_bfereg.h
+++ b/sys/dev/bfe/if_bfereg.h
@@ -24,7 +24,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
 
 #ifndef _BFE_H
 #define _BFE_H
diff --git a/sys/dev/bhnd/bhnd_debug.h b/sys/dev/bhnd/bhnd_debug.h
index 3cdf2775e5f..c81af89c762 100644
--- a/sys/dev/bhnd/bhnd_debug.h
+++ b/sys/dev/bhnd/bhnd_debug.h
@@ -29,7 +29,6 @@
  * THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-/* $FreeBSD$ */
 
 /*
  * This file provides set of macros for logging:
diff --git a/sys/dev/drm2/drm_global.h b/sys/dev/drm2/drm_global.h
index f45b015a7c5..4467f3a0a4f 100644
--- a/sys/dev/drm2/drm_global.h
+++ b/sys/dev/drm2/drm_global.h
@@ -27,7 +27,6 @@
 /*
  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
-/* $FreeBSD$ */
 
 #ifndef _DRM_GLOBAL_H_
 #define _DRM_GLOBAL_H_
diff --git a/sys/dev/drm2/ttm/ttm_bo_api.h b/sys/dev/drm2/ttm/ttm_bo_api.h
index 4b16ebd6d60..7b61c2b2276 100644
--- a/sys/dev/drm2/ttm/ttm_bo_api.h
+++ b/sys/dev/drm2/ttm/ttm_bo_api.h
@@ -27,7 +27,6 @@
 /*
  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
-/* $FreeBSD$ */
 
 #ifndef _TTM_BO_API_H_
 #define _TTM_BO_API_H_
diff --git a/sys/dev/drm2/ttm/ttm_bo_driver.h b/sys/dev/drm2/ttm/ttm_bo_driver.h
index c4aefab92fe..513496ce4d5 100644
--- a/sys/dev/drm2/ttm/ttm_bo_driver.h
+++ b/sys/dev/drm2/ttm/ttm_bo_driver.h
@@ -27,7 +27,6 @@
 /*
  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
-/* $FreeBSD$ */
 
 #ifndef _TTM_BO_DRIVER_H_
 #define _TTM_BO_DRIVER_H_
diff --git a/sys/dev/drm2/ttm/ttm_execbuf_util.h b/sys/dev/drm2/ttm/ttm_execbuf_util.h
index 68b0ebaa6e9..211027d94db 100644
--- a/sys/dev/drm2/ttm/ttm_execbuf_util.h
+++ b/sys/dev/drm2/ttm/ttm_execbuf_util.h
@@ -27,7 +27,6 @@
 /*
  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
-/* $FreeBSD$ */
 
 #ifndef _TTM_EXECBUF_UTIL_H_
 #define _TTM_EXECBUF_UTIL_H_
diff --git a/sys/dev/drm2/ttm/ttm_lock.h b/sys/dev/drm2/ttm/ttm_lock.h
index 6d4545760f9..a7ea2151b29 100644
--- a/sys/dev/drm2/ttm/ttm_lock.h
+++ b/sys/dev/drm2/ttm/ttm_lock.h
@@ -27,7 +27,6 @@
 /*
  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
-/* $FreeBSD$ */
 
 /** @file ttm_lock.h
  * This file implements a simple replacement for the buffer manager use
diff --git a/sys/dev/drm2/ttm/ttm_memory.h b/sys/dev/drm2/ttm/ttm_memory.h
index 53263c6a20e..14859922908 100644
--- a/sys/dev/drm2/ttm/ttm_memory.h
+++ b/sys/dev/drm2/ttm/ttm_memory.h
@@ -24,7 +24,6 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  **************************************************************************/
-/* $FreeBSD$ */
 
 #ifndef TTM_MEMORY_H
 #define TTM_MEMORY_H
diff --git a/sys/dev/drm2/ttm/ttm_module.h b/sys/dev/drm2/ttm/ttm_module.h
index b1ce2bcb9af..22e5646650a 100644
--- a/sys/dev/drm2/ttm/ttm_module.h
+++ b/sys/dev/drm2/ttm/ttm_module.h
@@ -27,7 +27,6 @@
 /*
  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
-/* $FreeBSD$ */
 
 #ifndef _TTM_MODULE_H_
 #define _TTM_MODULE_H_
diff --git a/sys/dev/drm2/ttm/ttm_object.h b/sys/dev/drm2/ttm/ttm_object.h
index 8a286f1f5e8..d363a71b358 100644
--- a/sys/dev/drm2/ttm/ttm_object.h
+++ b/sys/dev/drm2/ttm/ttm_object.h
@@ -27,7 +27,6 @@
 /*
  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
-/* $FreeBSD$ */
 /** @file ttm_object.h
  *
  * Base- and reference object implementation for the various
diff --git a/sys/dev/drm2/ttm/ttm_page_alloc.h b/sys/dev/drm2/ttm/ttm_page_alloc.h
index 0824e2d31a5..591d8bd3756 100644
--- a/sys/dev/drm2/ttm/ttm_page_alloc.h
+++ b/sys/dev/drm2/ttm/ttm_page_alloc.h
@@ -23,7 +23,6 @@
  * Authors: Dave Airlie <airlied@redhat.com>
  *          Jerome Glisse <jglisse@redhat.com>
  */
-/* $FreeBSD$ */
 #ifndef TTM_PAGE_ALLOC
 #define TTM_PAGE_ALLOC
 
diff --git a/sys/dev/drm2/ttm/ttm_placement.h b/sys/dev/drm2/ttm/ttm_placement.h
index 20e1b4c02d4..c84ff153a56 100644
--- a/sys/dev/drm2/ttm/ttm_placement.h
+++ b/sys/dev/drm2/ttm/ttm_placement.h
@@ -27,7 +27,6 @@
 /*
  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
-/* $FreeBSD$ */
 
 #ifndef _TTM_PLACEMENT_H_
 #define _TTM_PLACEMENT_H_
diff --git a/sys/dev/e1000/e1000_80003es2lan.c b/sys/dev/e1000/e1000_80003es2lan.c
index ac35b4eabf2..5a764bf130b 100644
--- a/sys/dev/e1000/e1000_80003es2lan.c
+++ b/sys/dev/e1000/e1000_80003es2lan.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 /* 80003ES2LAN Gigabit Ethernet Controller (Copper)
  * 80003ES2LAN Gigabit Ethernet Controller (Serdes)
diff --git a/sys/dev/e1000/e1000_80003es2lan.h b/sys/dev/e1000/e1000_80003es2lan.h
index 9e6de14757d..80579f8be26 100644
--- a/sys/dev/e1000/e1000_80003es2lan.h
+++ b/sys/dev/e1000/e1000_80003es2lan.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_80003ES2LAN_H_
 #define _E1000_80003ES2LAN_H_
diff --git a/sys/dev/e1000/e1000_82540.c b/sys/dev/e1000/e1000_82540.c
index e60fc8ebf08..cc984c951a8 100644
--- a/sys/dev/e1000/e1000_82540.c
+++ b/sys/dev/e1000/e1000_82540.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 /*
  * 82540EM Gigabit Ethernet Controller
diff --git a/sys/dev/e1000/e1000_82541.c b/sys/dev/e1000/e1000_82541.c
index 7bb2e8ea944..0e3c2281c9f 100644
--- a/sys/dev/e1000/e1000_82541.c
+++ b/sys/dev/e1000/e1000_82541.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 /*
  * 82541EI Gigabit Ethernet Controller
diff --git a/sys/dev/e1000/e1000_82541.h b/sys/dev/e1000/e1000_82541.h
index d31065d9a18..c0f6a45a195 100644
--- a/sys/dev/e1000/e1000_82541.h
+++ b/sys/dev/e1000/e1000_82541.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_82541_H_
 #define _E1000_82541_H_
diff --git a/sys/dev/e1000/e1000_82542.c b/sys/dev/e1000/e1000_82542.c
index 2fdf7066865..e8de9086d05 100644
--- a/sys/dev/e1000/e1000_82542.c
+++ b/sys/dev/e1000/e1000_82542.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 /*
  * 82542 Gigabit Ethernet Controller
diff --git a/sys/dev/e1000/e1000_82543.c b/sys/dev/e1000/e1000_82543.c
index 9a93090c2d3..259695a8701 100644
--- a/sys/dev/e1000/e1000_82543.c
+++ b/sys/dev/e1000/e1000_82543.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 /*
  * 82543GC Gigabit Ethernet Controller (Fiber)
diff --git a/sys/dev/e1000/e1000_82543.h b/sys/dev/e1000/e1000_82543.h
index 27f8507fb63..6754fd9f666 100644
--- a/sys/dev/e1000/e1000_82543.h
+++ b/sys/dev/e1000/e1000_82543.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_82543_H_
 #define _E1000_82543_H_
diff --git a/sys/dev/e1000/e1000_82571.c b/sys/dev/e1000/e1000_82571.c
index ce9ae879165..e8970adf996 100644
--- a/sys/dev/e1000/e1000_82571.c
+++ b/sys/dev/e1000/e1000_82571.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 /* 82571EB Gigabit Ethernet Controller
  * 82571EB Gigabit Ethernet Controller (Copper)
diff --git a/sys/dev/e1000/e1000_82571.h b/sys/dev/e1000/e1000_82571.h
index 77303adb162..0e56af14c13 100644
--- a/sys/dev/e1000/e1000_82571.h
+++ b/sys/dev/e1000/e1000_82571.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_82571_H_
 #define _E1000_82571_H_
diff --git a/sys/dev/e1000/e1000_82575.c b/sys/dev/e1000/e1000_82575.c
index a0c057e5f07..fded5dc2b04 100644
--- a/sys/dev/e1000/e1000_82575.c
+++ b/sys/dev/e1000/e1000_82575.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 /*
  * 82575EB Gigabit Network Connection
diff --git a/sys/dev/e1000/e1000_82575.h b/sys/dev/e1000/e1000_82575.h
index d6665bfe64d..91ac3fe9fcb 100644
--- a/sys/dev/e1000/e1000_82575.h
+++ b/sys/dev/e1000/e1000_82575.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_82575_H_
 #define _E1000_82575_H_
diff --git a/sys/dev/e1000/e1000_api.c b/sys/dev/e1000/e1000_api.c
index 19ba4f1cf37..b83ae0313c3 100644
--- a/sys/dev/e1000/e1000_api.c
+++ b/sys/dev/e1000/e1000_api.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "e1000_api.h"
 
diff --git a/sys/dev/e1000/e1000_api.h b/sys/dev/e1000/e1000_api.h
index 48cf3321304..5942a9d672f 100644
--- a/sys/dev/e1000/e1000_api.h
+++ b/sys/dev/e1000/e1000_api.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_API_H_
 #define _E1000_API_H_
diff --git a/sys/dev/e1000/e1000_base.c b/sys/dev/e1000/e1000_base.c
index e12a5fbecf2..ff810821d9e 100644
--- a/sys/dev/e1000/e1000_base.c
+++ b/sys/dev/e1000/e1000_base.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "e1000_hw.h"
 #include "e1000_82575.h"
diff --git a/sys/dev/e1000/e1000_base.h b/sys/dev/e1000/e1000_base.h
index dca16cd3cfc..591712f9f25 100644
--- a/sys/dev/e1000/e1000_base.h
+++ b/sys/dev/e1000/e1000_base.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_BASE_H_
 #define _E1000_BASE_H_
diff --git a/sys/dev/e1000/e1000_defines.h b/sys/dev/e1000/e1000_defines.h
index 44281a0fadf..92f67693263 100644
--- a/sys/dev/e1000/e1000_defines.h
+++ b/sys/dev/e1000/e1000_defines.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_DEFINES_H_
 #define _E1000_DEFINES_H_
diff --git a/sys/dev/e1000/e1000_hw.h b/sys/dev/e1000/e1000_hw.h
index 463bd6bd8a5..f17877f3e46 100644
--- a/sys/dev/e1000/e1000_hw.h
+++ b/sys/dev/e1000/e1000_hw.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_HW_H_
 #define _E1000_HW_H_
diff --git a/sys/dev/e1000/e1000_i210.c b/sys/dev/e1000/e1000_i210.c
index da2e786130c..c7ca56914db 100644
--- a/sys/dev/e1000/e1000_i210.c
+++ b/sys/dev/e1000/e1000_i210.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "e1000_api.h"
 
diff --git a/sys/dev/e1000/e1000_i210.h b/sys/dev/e1000/e1000_i210.h
index 77414b851a7..6f82462246e 100644
--- a/sys/dev/e1000/e1000_i210.h
+++ b/sys/dev/e1000/e1000_i210.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_I210_H_
 #define _E1000_I210_H_
diff --git a/sys/dev/e1000/e1000_ich8lan.c b/sys/dev/e1000/e1000_ich8lan.c
index 86b3d1194ed..3102505faa1 100644
--- a/sys/dev/e1000/e1000_ich8lan.c
+++ b/sys/dev/e1000/e1000_ich8lan.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 /* 82562G 10/100 Network Connection
  * 82562G-2 10/100 Network Connection
diff --git a/sys/dev/e1000/e1000_ich8lan.h b/sys/dev/e1000/e1000_ich8lan.h
index dfa7684f27b..c6af34cade5 100644
--- a/sys/dev/e1000/e1000_ich8lan.h
+++ b/sys/dev/e1000/e1000_ich8lan.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_ICH8LAN_H_
 #define _E1000_ICH8LAN_H_
diff --git a/sys/dev/e1000/e1000_mac.c b/sys/dev/e1000/e1000_mac.c
index b8b8a491951..13e25f9944f 100644
--- a/sys/dev/e1000/e1000_mac.c
+++ b/sys/dev/e1000/e1000_mac.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "e1000_api.h"
 
diff --git a/sys/dev/e1000/e1000_mac.h b/sys/dev/e1000/e1000_mac.h
index 370f7f9d8a1..a0d609e311d 100644
--- a/sys/dev/e1000/e1000_mac.h
+++ b/sys/dev/e1000/e1000_mac.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_MAC_H_
 #define _E1000_MAC_H_
diff --git a/sys/dev/e1000/e1000_manage.c b/sys/dev/e1000/e1000_manage.c
index 08edf1b6560..96a7a3dde8a 100644
--- a/sys/dev/e1000/e1000_manage.c
+++ b/sys/dev/e1000/e1000_manage.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "e1000_api.h"
 #include "e1000_manage.h"
diff --git a/sys/dev/e1000/e1000_manage.h b/sys/dev/e1000/e1000_manage.h
index 4e4e0707083..8ce94f14b2b 100644
--- a/sys/dev/e1000/e1000_manage.h
+++ b/sys/dev/e1000/e1000_manage.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_MANAGE_H_
 #define _E1000_MANAGE_H_
diff --git a/sys/dev/e1000/e1000_mbx.c b/sys/dev/e1000/e1000_mbx.c
index 970b9ae0e01..97097fd777a 100644
--- a/sys/dev/e1000/e1000_mbx.c
+++ b/sys/dev/e1000/e1000_mbx.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "e1000_mbx.h"
 
diff --git a/sys/dev/e1000/e1000_mbx.h b/sys/dev/e1000/e1000_mbx.h
index c038001abe0..61f8d5cbe26 100644
--- a/sys/dev/e1000/e1000_mbx.h
+++ b/sys/dev/e1000/e1000_mbx.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_MBX_H_
 #define _E1000_MBX_H_
diff --git a/sys/dev/e1000/e1000_nvm.c b/sys/dev/e1000/e1000_nvm.c
index 8911204f0b9..576f9047f5b 100644
--- a/sys/dev/e1000/e1000_nvm.c
+++ b/sys/dev/e1000/e1000_nvm.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "e1000_api.h"
 
diff --git a/sys/dev/e1000/e1000_nvm.h b/sys/dev/e1000/e1000_nvm.h
index 86fd5d1e892..b57aec8d052 100644
--- a/sys/dev/e1000/e1000_nvm.h
+++ b/sys/dev/e1000/e1000_nvm.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_NVM_H_
 #define _E1000_NVM_H_
diff --git a/sys/dev/e1000/e1000_osdep.c b/sys/dev/e1000/e1000_osdep.c
index 0536a975a51..8016ee35206 100644
--- a/sys/dev/e1000/e1000_osdep.c
+++ b/sys/dev/e1000/e1000_osdep.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "e1000_api.h"
 
diff --git a/sys/dev/e1000/e1000_osdep.h b/sys/dev/e1000/e1000_osdep.h
index 5e19ebb0aee..2af2746dfad 100644
--- a/sys/dev/e1000/e1000_osdep.h
+++ b/sys/dev/e1000/e1000_osdep.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #ifndef _FREEBSD_OS_H_
diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c
index 5c346b2163d..dcce60fc50d 100644
--- a/sys/dev/e1000/e1000_phy.c
+++ b/sys/dev/e1000/e1000_phy.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "e1000_api.h"
 
diff --git a/sys/dev/e1000/e1000_phy.h b/sys/dev/e1000/e1000_phy.h
index 3a5b231b8bc..147e542dfe0 100644
--- a/sys/dev/e1000/e1000_phy.h
+++ b/sys/dev/e1000/e1000_phy.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_PHY_H_
 #define _E1000_PHY_H_
diff --git a/sys/dev/e1000/e1000_regs.h b/sys/dev/e1000/e1000_regs.h
index b3fb854f8ad..5af1142a1ff 100644
--- a/sys/dev/e1000/e1000_regs.h
+++ b/sys/dev/e1000/e1000_regs.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_REGS_H_
 #define _E1000_REGS_H_
diff --git a/sys/dev/e1000/e1000_vf.c b/sys/dev/e1000/e1000_vf.c
index 12c89a08973..9bcd2798e48 100644
--- a/sys/dev/e1000/e1000_vf.c
+++ b/sys/dev/e1000/e1000_vf.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #include "e1000_api.h"
diff --git a/sys/dev/e1000/e1000_vf.h b/sys/dev/e1000/e1000_vf.h
index abf62f676a6..aace8e78ed6 100644
--- a/sys/dev/e1000/e1000_vf.h
+++ b/sys/dev/e1000/e1000_vf.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _E1000_VF_H_
 #define _E1000_VF_H_
diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c
index 255aea6347d..ddf6fbbb20a 100644
--- a/sys/dev/e1000/em_txrx.c
+++ b/sys/dev/e1000/em_txrx.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 #include "if_em.h"
 
 #ifdef RSS
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 09a06319110..b19fd098e6b 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 #include "if_em.h"
 #include <sys/sbuf.h>
 #include <machine/_inttypes.h>
diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h
index a46ce2fdb6a..a7758506d37 100644
--- a/sys/dev/e1000/if_em.h
+++ b/sys/dev/e1000/if_em.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/*$FreeBSD$*/
 
 #ifndef _EM_H_DEFINED_
 #define _EM_H_DEFINED_
diff --git a/sys/dev/e1000/igb_txrx.c b/sys/dev/e1000/igb_txrx.c
index 1c1500e78d1..2819150acba 100644
--- a/sys/dev/e1000/igb_txrx.c
+++ b/sys/dev/e1000/igb_txrx.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 #include "if_em.h"
 
 #ifdef RSS
diff --git a/sys/dev/esp/am53c974reg.h b/sys/dev/esp/am53c974reg.h
index 23e404640b6..e676062c6e1 100644
--- a/sys/dev/esp/am53c974reg.h
+++ b/sys/dev/esp/am53c974reg.h
@@ -31,7 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _AM53C974_H_
 #define	_AM53C974_H_
diff --git a/sys/dev/esp/ncr53c9xreg.h b/sys/dev/esp/ncr53c9xreg.h
index 557ae59ae72..3ecd8211366 100644
--- a/sys/dev/esp/ncr53c9xreg.h
+++ b/sys/dev/esp/ncr53c9xreg.h
@@ -31,7 +31,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _NCR53C9XREG_H_
 #define	_NCR53C9XREG_H_
diff --git a/sys/dev/esp/ncr53c9xvar.h b/sys/dev/esp/ncr53c9xvar.h
index c0575151827..de553995e67 100644
--- a/sys/dev/esp/ncr53c9xvar.h
+++ b/sys/dev/esp/ncr53c9xvar.h
@@ -61,7 +61,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _NCR53C9XVAR_H_
 #define	_NCR53C9XVAR_H_
diff --git a/sys/dev/exca/excareg.h b/sys/dev/exca/excareg.h
index a339ee781ad..82a5cb7f9a3 100644
--- a/sys/dev/exca/excareg.h
+++ b/sys/dev/exca/excareg.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: i82365reg.h,v 1.3 1998/12/20 17:53:28 nathanw Exp $	*/
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause
diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h
index ad7dab535ee..b301ab5ab26 100644
--- a/sys/dev/exca/excavar.h
+++ b/sys/dev/exca/excavar.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause
diff --git a/sys/dev/hid/hid.c b/sys/dev/hid/hid.c
index 6f01ab9d7f2..5e6ad5bb7ae 100644
--- a/sys/dev/hid/hid.c
+++ b/sys/dev/hid/hid.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: hid.c,v 1.17 2001/11/13 06:24:53 lukem Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/hid/hid.h b/sys/dev/hid/hid.h
index 400ad3cad25..5840c189352 100644
--- a/sys/dev/hid/hid.h
+++ b/sys/dev/hid/hid.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/hid/hidquirk.c b/sys/dev/hid/hidquirk.c
index 0b5da9479bf..3e746cab22c 100644
--- a/sys/dev/hid/hidquirk.c
+++ b/sys/dev/hid/hidquirk.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/hid/hidquirk.h b/sys/dev/hid/hidquirk.h
index 2cdfccedfbb..4f8b8acbe20 100644
--- a/sys/dev/hid/hidquirk.h
+++ b/sys/dev/hid/hidquirk.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/hifn/hifn7751reg.h b/sys/dev/hifn/hifn7751reg.h
index e2a8cc3080a..9660e306a64 100644
--- a/sys/dev/hifn/hifn7751reg.h
+++ b/sys/dev/hifn/hifn7751reg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$OpenBSD: hifn7751reg.h,v 1.35 2002/04/08 17:49:42 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/hifn/hifn7751var.h b/sys/dev/hifn/hifn7751var.h
index ec0d96ec20a..3ba3022c3ca 100644
--- a/sys/dev/hifn/hifn7751var.h
+++ b/sys/dev/hifn/hifn7751var.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$OpenBSD: hifn7751var.h,v 1.42 2002/04/08 17:49:42 jason Exp $	*/
 
 /*-
diff --git a/sys/dev/iavf/iavf_adminq.c b/sys/dev/iavf/iavf_adminq.c
index 75b9c508cc6..3eeaa6f68ef 100644
--- a/sys/dev/iavf/iavf_adminq.c
+++ b/sys/dev/iavf/iavf_adminq.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "iavf_status.h"
 #include "iavf_type.h"
diff --git a/sys/dev/iavf/iavf_adminq.h b/sys/dev/iavf/iavf_adminq.h
index 3dbff532ba3..839c23a43d7 100644
--- a/sys/dev/iavf/iavf_adminq.h
+++ b/sys/dev/iavf/iavf_adminq.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _IAVF_ADMINQ_H_
 #define _IAVF_ADMINQ_H_
diff --git a/sys/dev/iavf/iavf_adminq_cmd.h b/sys/dev/iavf/iavf_adminq_cmd.h
index a4d1d4df867..f7113a832bf 100644
--- a/sys/dev/iavf/iavf_adminq_cmd.h
+++ b/sys/dev/iavf/iavf_adminq_cmd.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _IAVF_ADMINQ_CMD_H_
 #define _IAVF_ADMINQ_CMD_H_
diff --git a/sys/dev/iavf/iavf_alloc.h b/sys/dev/iavf/iavf_alloc.h
index 8ef01a520bf..376619fd24f 100644
--- a/sys/dev/iavf/iavf_alloc.h
+++ b/sys/dev/iavf/iavf_alloc.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _IAVF_ALLOC_H_
 #define _IAVF_ALLOC_H_
diff --git a/sys/dev/iavf/iavf_common.c b/sys/dev/iavf/iavf_common.c
index b6ca90752dd..50d0e31b87e 100644
--- a/sys/dev/iavf/iavf_common.c
+++ b/sys/dev/iavf/iavf_common.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "iavf_type.h"
 #include "iavf_adminq.h"
diff --git a/sys/dev/iavf/iavf_debug.h b/sys/dev/iavf/iavf_debug.h
index 2653d535c01..37b42ae4b07 100644
--- a/sys/dev/iavf/iavf_debug.h
+++ b/sys/dev/iavf/iavf_debug.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_debug.h
diff --git a/sys/dev/iavf/iavf_devids.h b/sys/dev/iavf/iavf_devids.h
index abb67003053..5b2df94b34f 100644
--- a/sys/dev/iavf/iavf_devids.h
+++ b/sys/dev/iavf/iavf_devids.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _IAVF_DEVIDS_H_
 #define _IAVF_DEVIDS_H_
diff --git a/sys/dev/iavf/iavf_drv_info.h b/sys/dev/iavf/iavf_drv_info.h
index a9bad9ce8b1..ed8e05fe972 100644
--- a/sys/dev/iavf/iavf_drv_info.h
+++ b/sys/dev/iavf/iavf_drv_info.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_drv_info.h
diff --git a/sys/dev/iavf/iavf_iflib.h b/sys/dev/iavf/iavf_iflib.h
index 33d5243496c..15cc902f2cc 100644
--- a/sys/dev/iavf/iavf_iflib.h
+++ b/sys/dev/iavf/iavf_iflib.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_iflib.h
diff --git a/sys/dev/iavf/iavf_lib.c b/sys/dev/iavf/iavf_lib.c
index 9b4ec425f1a..15e9a334c7f 100644
--- a/sys/dev/iavf/iavf_lib.c
+++ b/sys/dev/iavf/iavf_lib.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_lib.c
diff --git a/sys/dev/iavf/iavf_lib.h b/sys/dev/iavf/iavf_lib.h
index b57299a4eaa..3fb6b743e5f 100644
--- a/sys/dev/iavf/iavf_lib.h
+++ b/sys/dev/iavf/iavf_lib.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_lib.h
diff --git a/sys/dev/iavf/iavf_opts.h b/sys/dev/iavf/iavf_opts.h
index aea5b6f0eae..b58e776c828 100644
--- a/sys/dev/iavf/iavf_opts.h
+++ b/sys/dev/iavf/iavf_opts.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_opts.h
diff --git a/sys/dev/iavf/iavf_osdep.c b/sys/dev/iavf/iavf_osdep.c
index fca724801e3..1c3aefe253a 100644
--- a/sys/dev/iavf/iavf_osdep.c
+++ b/sys/dev/iavf/iavf_osdep.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_osdep.c
diff --git a/sys/dev/iavf/iavf_osdep.h b/sys/dev/iavf/iavf_osdep.h
index b2a302cb421..81636664110 100644
--- a/sys/dev/iavf/iavf_osdep.h
+++ b/sys/dev/iavf/iavf_osdep.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_osdep.h
diff --git a/sys/dev/iavf/iavf_prototype.h b/sys/dev/iavf/iavf_prototype.h
index 1d995459b88..05e4e9bc24a 100644
--- a/sys/dev/iavf/iavf_prototype.h
+++ b/sys/dev/iavf/iavf_prototype.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _IAVF_PROTOTYPE_H_
 #define _IAVF_PROTOTYPE_H_
diff --git a/sys/dev/iavf/iavf_register.h b/sys/dev/iavf/iavf_register.h
index 9da4ed38e10..62112d3b42c 100644
--- a/sys/dev/iavf/iavf_register.h
+++ b/sys/dev/iavf/iavf_register.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _IAVF_REGISTER_H_
 #define _IAVF_REGISTER_H_
diff --git a/sys/dev/iavf/iavf_status.h b/sys/dev/iavf/iavf_status.h
index c1045d79db1..51911698109 100644
--- a/sys/dev/iavf/iavf_status.h
+++ b/sys/dev/iavf/iavf_status.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _IAVF_STATUS_H_
 #define _IAVF_STATUS_H_
diff --git a/sys/dev/iavf/iavf_sysctls_common.h b/sys/dev/iavf/iavf_sysctls_common.h
index d0b9cb26ed8..62e88090da3 100644
--- a/sys/dev/iavf/iavf_sysctls_common.h
+++ b/sys/dev/iavf/iavf_sysctls_common.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_sysctls_common.h
diff --git a/sys/dev/iavf/iavf_sysctls_iflib.h b/sys/dev/iavf/iavf_sysctls_iflib.h
index 92253a1a3a5..9e6cceb5b50 100644
--- a/sys/dev/iavf/iavf_sysctls_iflib.h
+++ b/sys/dev/iavf/iavf_sysctls_iflib.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_sysctls_iflib.h
diff --git a/sys/dev/iavf/iavf_txrx_common.h b/sys/dev/iavf/iavf_txrx_common.h
index 110c53fcba0..3d190743918 100644
--- a/sys/dev/iavf/iavf_txrx_common.h
+++ b/sys/dev/iavf/iavf_txrx_common.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_txrx_common.h
diff --git a/sys/dev/iavf/iavf_txrx_iflib.c b/sys/dev/iavf/iavf_txrx_iflib.c
index 29507360c25..6a291c765f7 100644
--- a/sys/dev/iavf/iavf_txrx_iflib.c
+++ b/sys/dev/iavf/iavf_txrx_iflib.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_txrx_iflib.c
diff --git a/sys/dev/iavf/iavf_type.h b/sys/dev/iavf/iavf_type.h
index 4e56b25b0e1..905f15268d8 100644
--- a/sys/dev/iavf/iavf_type.h
+++ b/sys/dev/iavf/iavf_type.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _IAVF_TYPE_H_
 #define _IAVF_TYPE_H_
diff --git a/sys/dev/iavf/iavf_vc_common.c b/sys/dev/iavf/iavf_vc_common.c
index f1cd498e17f..4577757090f 100644
--- a/sys/dev/iavf/iavf_vc_common.c
+++ b/sys/dev/iavf/iavf_vc_common.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_vc_common.c
diff --git a/sys/dev/iavf/iavf_vc_common.h b/sys/dev/iavf/iavf_vc_common.h
index 62799de935c..6acc3effcb3 100644
--- a/sys/dev/iavf/iavf_vc_common.h
+++ b/sys/dev/iavf/iavf_vc_common.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_vc_common.h
diff --git a/sys/dev/iavf/iavf_vc_iflib.c b/sys/dev/iavf/iavf_vc_iflib.c
index d4960c5fef6..98237daeb47 100644
--- a/sys/dev/iavf/iavf_vc_iflib.c
+++ b/sys/dev/iavf/iavf_vc_iflib.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file iavf_vc_iflib.c
diff --git a/sys/dev/iavf/if_iavf_iflib.c b/sys/dev/iavf/if_iavf_iflib.c
index 7ee43e50a48..5ae1b9308c1 100644
--- a/sys/dev/iavf/if_iavf_iflib.c
+++ b/sys/dev/iavf/if_iavf_iflib.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file if_iavf_iflib.c
diff --git a/sys/dev/iavf/virtchnl.h b/sys/dev/iavf/virtchnl.h
index 7f92b4250cb..bfaa33ccea2 100644
--- a/sys/dev/iavf/virtchnl.h
+++ b/sys/dev/iavf/virtchnl.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _VIRTCHNL_H_
 #define _VIRTCHNL_H_
diff --git a/sys/dev/ice/ice_adminq_cmd.h b/sys/dev/ice/ice_adminq_cmd.h
index 56bfbf27cda..710830e95a1 100644
--- a/sys/dev/ice/ice_adminq_cmd.h
+++ b/sys/dev/ice/ice_adminq_cmd.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_ADMINQ_CMD_H_
 #define _ICE_ADMINQ_CMD_H_
diff --git a/sys/dev/ice/ice_alloc.h b/sys/dev/ice/ice_alloc.h
index d84be78b4bc..4970fae3bcf 100644
--- a/sys/dev/ice/ice_alloc.h
+++ b/sys/dev/ice/ice_alloc.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_ALLOC_H_
 #define _ICE_ALLOC_H_
diff --git a/sys/dev/ice/ice_bitops.h b/sys/dev/ice/ice_bitops.h
index e7b8b19cfe8..9c20106b994 100644
--- a/sys/dev/ice/ice_bitops.h
+++ b/sys/dev/ice/ice_bitops.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_BITOPS_H_
 #define _ICE_BITOPS_H_
diff --git a/sys/dev/ice/ice_common.c b/sys/dev/ice/ice_common.c
index e4c112d3a3c..a3f50f25153 100644
--- a/sys/dev/ice/ice_common.c
+++ b/sys/dev/ice/ice_common.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "ice_common.h"
 #include "ice_sched.h"
diff --git a/sys/dev/ice/ice_common.h b/sys/dev/ice/ice_common.h
index 01ed55c192a..6c6103da47c 100644
--- a/sys/dev/ice/ice_common.h
+++ b/sys/dev/ice/ice_common.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_COMMON_H_
 #define _ICE_COMMON_H_
diff --git a/sys/dev/ice/ice_common_sysctls.h b/sys/dev/ice/ice_common_sysctls.h
index 98a1bd6f8df..3ff00415278 100644
--- a/sys/dev/ice/ice_common_sysctls.h
+++ b/sys/dev/ice/ice_common_sysctls.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_common_sysctls.h
diff --git a/sys/dev/ice/ice_common_txrx.h b/sys/dev/ice/ice_common_txrx.h
index 4797fe86b83..4a4d2fc948e 100644
--- a/sys/dev/ice/ice_common_txrx.h
+++ b/sys/dev/ice/ice_common_txrx.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_common_txrx.h
diff --git a/sys/dev/ice/ice_controlq.c b/sys/dev/ice/ice_controlq.c
index aeb651b45fa..99fc520ac66 100644
--- a/sys/dev/ice/ice_controlq.c
+++ b/sys/dev/ice/ice_controlq.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "ice_common.h"
 
diff --git a/sys/dev/ice/ice_controlq.h b/sys/dev/ice/ice_controlq.h
index c556fcd2025..99e66cff4b8 100644
--- a/sys/dev/ice/ice_controlq.h
+++ b/sys/dev/ice/ice_controlq.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_CONTROLQ_H_
 #define _ICE_CONTROLQ_H_
diff --git a/sys/dev/ice/ice_dcb.c b/sys/dev/ice/ice_dcb.c
index 244566bca30..e8c1f9872db 100644
--- a/sys/dev/ice/ice_dcb.c
+++ b/sys/dev/ice/ice_dcb.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "ice_common.h"
 #include "ice_sched.h"
diff --git a/sys/dev/ice/ice_dcb.h b/sys/dev/ice/ice_dcb.h
index d3f371deed4..10c8c3cda9e 100644
--- a/sys/dev/ice/ice_dcb.h
+++ b/sys/dev/ice/ice_dcb.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_DCB_H_
 #define _ICE_DCB_H_
diff --git a/sys/dev/ice/ice_ddp_common.c b/sys/dev/ice/ice_ddp_common.c
index 91dde866615..545895a0db0 100644
--- a/sys/dev/ice/ice_ddp_common.c
+++ b/sys/dev/ice/ice_ddp_common.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "ice_ddp_common.h"
 #include "ice_type.h"
diff --git a/sys/dev/ice/ice_ddp_common.h b/sys/dev/ice/ice_ddp_common.h
index f59c0a61488..d1fcd7615a2 100644
--- a/sys/dev/ice/ice_ddp_common.h
+++ b/sys/dev/ice/ice_ddp_common.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_DDP_COMMON_H_
 #define _ICE_DDP_COMMON_H_
diff --git a/sys/dev/ice/ice_defs.h b/sys/dev/ice/ice_defs.h
index 5205a3d9b49..330c62ecddd 100644
--- a/sys/dev/ice/ice_defs.h
+++ b/sys/dev/ice/ice_defs.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_DEFS_H_
 #define _ICE_DEFS_H_
diff --git a/sys/dev/ice/ice_devids.h b/sys/dev/ice/ice_devids.h
index 1048da7ac5d..b5cbbfda6a3 100644
--- a/sys/dev/ice/ice_devids.h
+++ b/sys/dev/ice/ice_devids.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_DEVIDS_H_
 #define _ICE_DEVIDS_H_
diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h
index 407b6d55513..f258650760b 100644
--- a/sys/dev/ice/ice_drv_info.h
+++ b/sys/dev/ice/ice_drv_info.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_drv_info.h
diff --git a/sys/dev/ice/ice_features.h b/sys/dev/ice/ice_features.h
index 24404434d16..d7404b05ba2 100644
--- a/sys/dev/ice/ice_features.h
+++ b/sys/dev/ice/ice_features.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_features.h
diff --git a/sys/dev/ice/ice_flex_pipe.c b/sys/dev/ice/ice_flex_pipe.c
index 5a6a77a65c4..fc31afab9e7 100644
--- a/sys/dev/ice/ice_flex_pipe.c
+++ b/sys/dev/ice/ice_flex_pipe.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "ice_common.h"
 #include "ice_ddp_common.h"
diff --git a/sys/dev/ice/ice_flex_pipe.h b/sys/dev/ice/ice_flex_pipe.h
index a20be014763..16f9334daa8 100644
--- a/sys/dev/ice/ice_flex_pipe.h
+++ b/sys/dev/ice/ice_flex_pipe.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_FLEX_PIPE_H_
 #define _ICE_FLEX_PIPE_H_
diff --git a/sys/dev/ice/ice_flex_type.h b/sys/dev/ice/ice_flex_type.h
index 56587e890a0..5baa694ebda 100644
--- a/sys/dev/ice/ice_flex_type.h
+++ b/sys/dev/ice/ice_flex_type.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_FLEX_TYPE_H_
 #define _ICE_FLEX_TYPE_H_
diff --git a/sys/dev/ice/ice_flow.c b/sys/dev/ice/ice_flow.c
index 954ca84175d..5a25880ea83 100644
--- a/sys/dev/ice/ice_flow.c
+++ b/sys/dev/ice/ice_flow.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "ice_common.h"
 #include "ice_flow.h"
diff --git a/sys/dev/ice/ice_flow.h b/sys/dev/ice/ice_flow.h
index c394d8d1497..00f4b9d3f20 100644
--- a/sys/dev/ice/ice_flow.h
+++ b/sys/dev/ice/ice_flow.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_FLOW_H_
 #define _ICE_FLOW_H_
diff --git a/sys/dev/ice/ice_fw_logging.c b/sys/dev/ice/ice_fw_logging.c
index 59bd7c38952..15e6ae7140c 100644
--- a/sys/dev/ice/ice_fw_logging.c
+++ b/sys/dev/ice/ice_fw_logging.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_fw_logging.c
diff --git a/sys/dev/ice/ice_fwlog.c b/sys/dev/ice/ice_fwlog.c
index 7bc377bc334..2699dd5eb7b 100644
--- a/sys/dev/ice/ice_fwlog.c
+++ b/sys/dev/ice/ice_fwlog.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "ice_common.h"
 #include "ice_fwlog.h"
diff --git a/sys/dev/ice/ice_fwlog.h b/sys/dev/ice/ice_fwlog.h
index 7f60e194e77..0aa7db9a833 100644
--- a/sys/dev/ice/ice_fwlog.h
+++ b/sys/dev/ice/ice_fwlog.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_FWLOG_H_
 #define _ICE_FWLOG_H_
diff --git a/sys/dev/ice/ice_hw_autogen.h b/sys/dev/ice/ice_hw_autogen.h
index 5a56bf349f5..36d13eb22f5 100644
--- a/sys/dev/ice/ice_hw_autogen.h
+++ b/sys/dev/ice/ice_hw_autogen.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /* Machine generated file. Do not edit. */
 
diff --git a/sys/dev/ice/ice_iflib.h b/sys/dev/ice/ice_iflib.h
index 47e52431200..d89d0498542 100644
--- a/sys/dev/ice/ice_iflib.h
+++ b/sys/dev/ice/ice_iflib.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_iflib.h
diff --git a/sys/dev/ice/ice_iflib_recovery_txrx.c b/sys/dev/ice/ice_iflib_recovery_txrx.c
index 6e42cd22da8..69ee98b46d3 100644
--- a/sys/dev/ice/ice_iflib_recovery_txrx.c
+++ b/sys/dev/ice/ice_iflib_recovery_txrx.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_iflib_recovery_txrx.c
diff --git a/sys/dev/ice/ice_iflib_sysctls.h b/sys/dev/ice/ice_iflib_sysctls.h
index 738766e9762..1eac7249447 100644
--- a/sys/dev/ice/ice_iflib_sysctls.h
+++ b/sys/dev/ice/ice_iflib_sysctls.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_iflib_sysctls.h
diff --git a/sys/dev/ice/ice_iflib_txrx.c b/sys/dev/ice/ice_iflib_txrx.c
index d6b7666d34f..8afca4832d8 100644
--- a/sys/dev/ice/ice_iflib_txrx.c
+++ b/sys/dev/ice/ice_iflib_txrx.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_iflib_txrx.c
diff --git a/sys/dev/ice/ice_lan_tx_rx.h b/sys/dev/ice/ice_lan_tx_rx.h
index 982f0967174..4f1b87f2666 100644
--- a/sys/dev/ice/ice_lan_tx_rx.h
+++ b/sys/dev/ice/ice_lan_tx_rx.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_LAN_TX_RX_H_
 #define _ICE_LAN_TX_RX_H_
diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c
index df292f665f3..c35d1f640b0 100644
--- a/sys/dev/ice/ice_lib.c
+++ b/sys/dev/ice/ice_lib.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_lib.c
diff --git a/sys/dev/ice/ice_lib.h b/sys/dev/ice/ice_lib.h
index eaff506f751..a8c4ff38df0 100644
--- a/sys/dev/ice/ice_lib.h
+++ b/sys/dev/ice/ice_lib.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_lib.h
diff --git a/sys/dev/ice/ice_nvm.c b/sys/dev/ice/ice_nvm.c
index f421b5a1cc2..42a60e0df1c 100644
--- a/sys/dev/ice/ice_nvm.c
+++ b/sys/dev/ice/ice_nvm.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "ice_common.h"
 
diff --git a/sys/dev/ice/ice_nvm.h b/sys/dev/ice/ice_nvm.h
index 768fce907c4..d359a9ea4e4 100644
--- a/sys/dev/ice/ice_nvm.h
+++ b/sys/dev/ice/ice_nvm.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_NVM_H_
 #define _ICE_NVM_H_
diff --git a/sys/dev/ice/ice_opts.h b/sys/dev/ice/ice_opts.h
index f3a4caabd38..4b11f277deb 100644
--- a/sys/dev/ice/ice_opts.h
+++ b/sys/dev/ice/ice_opts.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_opts.h
diff --git a/sys/dev/ice/ice_osdep.c b/sys/dev/ice/ice_osdep.c
index 66bf15299ca..c9ac8e9f97c 100644
--- a/sys/dev/ice/ice_osdep.c
+++ b/sys/dev/ice/ice_osdep.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_osdep.c
diff --git a/sys/dev/ice/ice_osdep.h b/sys/dev/ice/ice_osdep.h
index e72418a267b..c6774588bda 100644
--- a/sys/dev/ice/ice_osdep.h
+++ b/sys/dev/ice/ice_osdep.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_osdep.h
diff --git a/sys/dev/ice/ice_protocol_type.h b/sys/dev/ice/ice_protocol_type.h
index e5ef1ee8593..0793eb005ec 100644
--- a/sys/dev/ice/ice_protocol_type.h
+++ b/sys/dev/ice/ice_protocol_type.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_PROTOCOL_TYPE_H_
 #define _ICE_PROTOCOL_TYPE_H_
diff --git a/sys/dev/ice/ice_rdma.c b/sys/dev/ice/ice_rdma.c
index f173c063ff9..8443cab1e98 100644
--- a/sys/dev/ice/ice_rdma.c
+++ b/sys/dev/ice/ice_rdma.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_rdma.c
diff --git a/sys/dev/ice/ice_rdma.h b/sys/dev/ice/ice_rdma.h
index 97ce6bf541e..f83c30b33f6 100644
--- a/sys/dev/ice/ice_rdma.h
+++ b/sys/dev/ice/ice_rdma.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_rdma.h
diff --git a/sys/dev/ice/ice_rdma_internal.h b/sys/dev/ice/ice_rdma_internal.h
index a436308de7d..c80d4540194 100644
--- a/sys/dev/ice/ice_rdma_internal.h
+++ b/sys/dev/ice/ice_rdma_internal.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_rdma_internal.h
diff --git a/sys/dev/ice/ice_resmgr.c b/sys/dev/ice/ice_resmgr.c
index d931ea8e597..547d6035e2b 100644
--- a/sys/dev/ice/ice_resmgr.c
+++ b/sys/dev/ice/ice_resmgr.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_resmgr.c
diff --git a/sys/dev/ice/ice_resmgr.h b/sys/dev/ice/ice_resmgr.h
index 6d060a01992..eef028df470 100644
--- a/sys/dev/ice/ice_resmgr.h
+++ b/sys/dev/ice/ice_resmgr.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_resmgr.h
diff --git a/sys/dev/ice/ice_rss.h b/sys/dev/ice/ice_rss.h
index 3c4fb713036..0b79bea6f30 100644
--- a/sys/dev/ice/ice_rss.h
+++ b/sys/dev/ice/ice_rss.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_rss.h
diff --git a/sys/dev/ice/ice_sbq_cmd.h b/sys/dev/ice/ice_sbq_cmd.h
index 9d3a0f6d573..6de67becfbc 100644
--- a/sys/dev/ice/ice_sbq_cmd.h
+++ b/sys/dev/ice/ice_sbq_cmd.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_SBQ_CMD_H_
 #define _ICE_SBQ_CMD_H_
diff --git a/sys/dev/ice/ice_sched.c b/sys/dev/ice/ice_sched.c
index 8b7f28bafe1..20abc3b6764 100644
--- a/sys/dev/ice/ice_sched.c
+++ b/sys/dev/ice/ice_sched.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "ice_sched.h"
 
diff --git a/sys/dev/ice/ice_sched.h b/sys/dev/ice/ice_sched.h
index cfd61490581..af210961112 100644
--- a/sys/dev/ice/ice_sched.h
+++ b/sys/dev/ice/ice_sched.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_SCHED_H_
 #define _ICE_SCHED_H_
diff --git a/sys/dev/ice/ice_status.h b/sys/dev/ice/ice_status.h
index f7a721206a8..48c8264c4bc 100644
--- a/sys/dev/ice/ice_status.h
+++ b/sys/dev/ice/ice_status.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_STATUS_H_
 #define _ICE_STATUS_H_
diff --git a/sys/dev/ice/ice_strings.c b/sys/dev/ice/ice_strings.c
index 14f7139dd0a..46e1aa6f708 100644
--- a/sys/dev/ice/ice_strings.c
+++ b/sys/dev/ice/ice_strings.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file ice_strings.c
diff --git a/sys/dev/ice/ice_switch.c b/sys/dev/ice/ice_switch.c
index 2476ee7ad44..3e6ebf28cfc 100644
--- a/sys/dev/ice/ice_switch.c
+++ b/sys/dev/ice/ice_switch.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "ice_common.h"
 #include "ice_switch.h"
diff --git a/sys/dev/ice/ice_switch.h b/sys/dev/ice/ice_switch.h
index c83d72056cb..e6572de8839 100644
--- a/sys/dev/ice/ice_switch.h
+++ b/sys/dev/ice/ice_switch.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_SWITCH_H_
 #define _ICE_SWITCH_H_
diff --git a/sys/dev/ice/ice_type.h b/sys/dev/ice/ice_type.h
index ffd3981c631..04e816ad713 100644
--- a/sys/dev/ice/ice_type.h
+++ b/sys/dev/ice/ice_type.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_TYPE_H_
 #define _ICE_TYPE_H_
diff --git a/sys/dev/ice/ice_vlan_mode.c b/sys/dev/ice/ice_vlan_mode.c
index 9f9fee6fce7..9b298a6ad71 100644
--- a/sys/dev/ice/ice_vlan_mode.c
+++ b/sys/dev/ice/ice_vlan_mode.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #include "ice_common.h"
 
diff --git a/sys/dev/ice/ice_vlan_mode.h b/sys/dev/ice/ice_vlan_mode.h
index 41ddaa764db..1cf4ebb6879 100644
--- a/sys/dev/ice/ice_vlan_mode.h
+++ b/sys/dev/ice/ice_vlan_mode.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICE_VLAN_MODE_H_
 #define _ICE_VLAN_MODE_H_
diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c
index 5387300f342..58e4b77585e 100644
--- a/sys/dev/ice/if_ice_iflib.c
+++ b/sys/dev/ice/if_ice_iflib.c
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 /**
  * @file if_ice_iflib.c
diff --git a/sys/dev/ice/virtchnl.h b/sys/dev/ice/virtchnl.h
index 7b3e30ad4a6..f2e30ad48fc 100644
--- a/sys/dev/ice/virtchnl.h
+++ b/sys/dev/ice/virtchnl.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _VIRTCHNL_H_
 #define _VIRTCHNL_H_
diff --git a/sys/dev/ice/virtchnl_inline_ipsec.h b/sys/dev/ice/virtchnl_inline_ipsec.h
index 906889abc83..ad8cfc1dceb 100644
--- a/sys/dev/ice/virtchnl_inline_ipsec.h
+++ b/sys/dev/ice/virtchnl_inline_ipsec.h
@@ -28,7 +28,6 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-/*$FreeBSD$*/
 
 #ifndef _VIRTCHNL_INLINE_IPSEC_H_
 #define _VIRTCHNL_INLINE_IPSEC_H_
diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h
index 48134146780..7d17a65ece2 100644
--- a/sys/dev/iir/iir.h
+++ b/sys/dev/iir/iir.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/ipw/if_ipwreg.h b/sys/dev/ipw/if_ipwreg.h
index 5403b2e726b..05f5939ac59 100644
--- a/sys/dev/ipw/if_ipwreg.h
+++ b/sys/dev/ipw/if_ipwreg.h
@@ -1,4 +1,3 @@
-/*      $FreeBSD$	*/
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/ipw/if_ipwvar.h b/sys/dev/ipw/if_ipwvar.h
index f620b47ed97..5f7c51801bc 100644
--- a/sys/dev/ipw/if_ipwvar.h
+++ b/sys/dev/ipw/if_ipwvar.h
@@ -1,4 +1,3 @@
-/*      $FreeBSD$	*/
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/irdma/fbsd_kcompat.c b/sys/dev/irdma/fbsd_kcompat.c
index e0b3bce5ec4..88d56c0846c 100644
--- a/sys/dev/irdma/fbsd_kcompat.c
+++ b/sys/dev/irdma/fbsd_kcompat.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "osdep.h"
 #include "ice_rdma.h"
diff --git a/sys/dev/irdma/fbsd_kcompat.h b/sys/dev/irdma/fbsd_kcompat.h
index 7184818399c..ea693c511e7 100644
--- a/sys/dev/irdma/fbsd_kcompat.h
+++ b/sys/dev/irdma/fbsd_kcompat.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef FBSD_KCOMPAT_H
 #define FBSD_KCOMPAT_H
diff --git a/sys/dev/irdma/ice_devids.h b/sys/dev/irdma/ice_devids.h
index 57f26bc3326..57a7f2f7c2a 100644
--- a/sys/dev/irdma/ice_devids.h
+++ b/sys/dev/irdma/ice_devids.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef ICE_DEVIDS_H
 #define ICE_DEVIDS_H
diff --git a/sys/dev/irdma/icrdma.c b/sys/dev/irdma/icrdma.c
index ed67dfdb884..a4048352234 100644
--- a/sys/dev/irdma/icrdma.c
+++ b/sys/dev/irdma/icrdma.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/irdma/icrdma_hw.c b/sys/dev/irdma/icrdma_hw.c
index 7013f06ca8c..7f593a6bf1b 100644
--- a/sys/dev/irdma/icrdma_hw.c
+++ b/sys/dev/irdma/icrdma_hw.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "osdep.h"
 #include "irdma_type.h"
diff --git a/sys/dev/irdma/icrdma_hw.h b/sys/dev/irdma/icrdma_hw.h
index 0b0b46c0d56..4f34a8f3e7a 100644
--- a/sys/dev/irdma/icrdma_hw.h
+++ b/sys/dev/irdma/icrdma_hw.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef ICRDMA_HW_H
 #define ICRDMA_HW_H
diff --git a/sys/dev/irdma/irdma-abi.h b/sys/dev/irdma/irdma-abi.h
index 4e4d8e63a9d..8d6cd05531f 100644
--- a/sys/dev/irdma/irdma-abi.h
+++ b/sys/dev/irdma/irdma-abi.h
@@ -35,7 +35,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_ABI_H
 #define IRDMA_ABI_H
diff --git a/sys/dev/irdma/irdma.h b/sys/dev/irdma/irdma.h
index fd72036397f..d30bf5f2095 100644
--- a/sys/dev/irdma/irdma.h
+++ b/sys/dev/irdma/irdma.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_H
 #define IRDMA_H
diff --git a/sys/dev/irdma/irdma_cm.c b/sys/dev/irdma/irdma_cm.c
index 8cfd62a790a..313c2a0e36f 100644
--- a/sys/dev/irdma/irdma_cm.c
+++ b/sys/dev/irdma/irdma_cm.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "irdma_main.h"
 
diff --git a/sys/dev/irdma/irdma_cm.h b/sys/dev/irdma/irdma_cm.h
index 52f3e267a9b..aa391a78942 100644
--- a/sys/dev/irdma/irdma_cm.h
+++ b/sys/dev/irdma/irdma_cm.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_CM_H
 #define IRDMA_CM_H
diff --git a/sys/dev/irdma/irdma_ctrl.c b/sys/dev/irdma/irdma_ctrl.c
index 4b45da1a886..3b5cefc6fae 100644
--- a/sys/dev/irdma/irdma_ctrl.c
+++ b/sys/dev/irdma/irdma_ctrl.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "osdep.h"
 #include "irdma_hmc.h"
diff --git a/sys/dev/irdma/irdma_defs.h b/sys/dev/irdma/irdma_defs.h
index 9150ae5cc47..35b2c68aaf9 100644
--- a/sys/dev/irdma/irdma_defs.h
+++ b/sys/dev/irdma/irdma_defs.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_DEFS_H
 #define IRDMA_DEFS_H
diff --git a/sys/dev/irdma/irdma_hmc.c b/sys/dev/irdma/irdma_hmc.c
index 040e11162e1..1da0c9da974 100644
--- a/sys/dev/irdma/irdma_hmc.c
+++ b/sys/dev/irdma/irdma_hmc.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "osdep.h"
 #include "irdma_hmc.h"
diff --git a/sys/dev/irdma/irdma_hmc.h b/sys/dev/irdma/irdma_hmc.h
index 25341ee4975..7babecfcaf5 100644
--- a/sys/dev/irdma/irdma_hmc.h
+++ b/sys/dev/irdma/irdma_hmc.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_HMC_H
 #define IRDMA_HMC_H
diff --git a/sys/dev/irdma/irdma_hw.c b/sys/dev/irdma/irdma_hw.c
index ff073625ebe..dbc3a4e146e 100644
--- a/sys/dev/irdma/irdma_hw.c
+++ b/sys/dev/irdma/irdma_hw.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "irdma_main.h"
 
diff --git a/sys/dev/irdma/irdma_kcompat.c b/sys/dev/irdma/irdma_kcompat.c
index 3b219eff190..71165d0b815 100644
--- a/sys/dev/irdma/irdma_kcompat.c
+++ b/sys/dev/irdma/irdma_kcompat.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "irdma_main.h"
 
diff --git a/sys/dev/irdma/irdma_main.h b/sys/dev/irdma/irdma_main.h
index 8ce4aaab455..0756fb42de5 100644
--- a/sys/dev/irdma/irdma_main.h
+++ b/sys/dev/irdma/irdma_main.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_MAIN_H
 #define IRDMA_MAIN_H
diff --git a/sys/dev/irdma/irdma_pble.c b/sys/dev/irdma/irdma_pble.c
index c32619b117f..031516a9b32 100644
--- a/sys/dev/irdma/irdma_pble.c
+++ b/sys/dev/irdma/irdma_pble.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "osdep.h"
 #include "irdma_hmc.h"
diff --git a/sys/dev/irdma/irdma_pble.h b/sys/dev/irdma/irdma_pble.h
index d06fac7c363..5af38af80d8 100644
--- a/sys/dev/irdma/irdma_pble.h
+++ b/sys/dev/irdma/irdma_pble.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_PBLE_H
 #define IRDMA_PBLE_H
diff --git a/sys/dev/irdma/irdma_protos.h b/sys/dev/irdma/irdma_protos.h
index 24e5d42a26e..c15f2522fd5 100644
--- a/sys/dev/irdma/irdma_protos.h
+++ b/sys/dev/irdma/irdma_protos.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_PROTOS_H
 #define IRDMA_PROTOS_H
diff --git a/sys/dev/irdma/irdma_puda.c b/sys/dev/irdma/irdma_puda.c
index ea1ae8e2863..1f84a3967a6 100644
--- a/sys/dev/irdma/irdma_puda.c
+++ b/sys/dev/irdma/irdma_puda.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "osdep.h"
 #include "irdma_hmc.h"
diff --git a/sys/dev/irdma/irdma_puda.h b/sys/dev/irdma/irdma_puda.h
index 68f8960c197..22e03f137aa 100644
--- a/sys/dev/irdma/irdma_puda.h
+++ b/sys/dev/irdma/irdma_puda.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_PUDA_H
 #define IRDMA_PUDA_H
diff --git a/sys/dev/irdma/irdma_type.h b/sys/dev/irdma/irdma_type.h
index e3079c1f93f..470b9aeaf65 100644
--- a/sys/dev/irdma/irdma_type.h
+++ b/sys/dev/irdma/irdma_type.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_TYPE_H
 #define IRDMA_TYPE_H
diff --git a/sys/dev/irdma/irdma_uda.c b/sys/dev/irdma/irdma_uda.c
index a71b84d1a4c..3267a9db5a8 100644
--- a/sys/dev/irdma/irdma_uda.c
+++ b/sys/dev/irdma/irdma_uda.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "osdep.h"
 #include "irdma_hmc.h"
diff --git a/sys/dev/irdma/irdma_uda.h b/sys/dev/irdma/irdma_uda.h
index b67b70bfca2..fcf6c875ea4 100644
--- a/sys/dev/irdma/irdma_uda.h
+++ b/sys/dev/irdma/irdma_uda.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_UDA_H
 #define IRDMA_UDA_H
diff --git a/sys/dev/irdma/irdma_uda_d.h b/sys/dev/irdma/irdma_uda_d.h
index ef8751d21c2..bbf66bd8680 100644
--- a/sys/dev/irdma/irdma_uda_d.h
+++ b/sys/dev/irdma/irdma_uda_d.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_UDA_D_H
 #define IRDMA_UDA_D_H
diff --git a/sys/dev/irdma/irdma_uk.c b/sys/dev/irdma/irdma_uk.c
index e8bab2e6ffc..0fed2012db6 100644
--- a/sys/dev/irdma/irdma_uk.c
+++ b/sys/dev/irdma/irdma_uk.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "osdep.h"
 #include "irdma_defs.h"
diff --git a/sys/dev/irdma/irdma_user.h b/sys/dev/irdma/irdma_user.h
index b83f431e552..c271643f889 100644
--- a/sys/dev/irdma/irdma_user.h
+++ b/sys/dev/irdma/irdma_user.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_USER_H
 #define IRDMA_USER_H
diff --git a/sys/dev/irdma/irdma_utils.c b/sys/dev/irdma/irdma_utils.c
index 29ca1dd3b54..2f8f60521a4 100644
--- a/sys/dev/irdma/irdma_utils.c
+++ b/sys/dev/irdma/irdma_utils.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "irdma_main.h"
 
diff --git a/sys/dev/irdma/irdma_verbs.c b/sys/dev/irdma/irdma_verbs.c
index 9daadf0706e..3a3e96de6ab 100644
--- a/sys/dev/irdma/irdma_verbs.c
+++ b/sys/dev/irdma/irdma_verbs.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "irdma_main.h"
 
diff --git a/sys/dev/irdma/irdma_verbs.h b/sys/dev/irdma/irdma_verbs.h
index dd0024617ab..fc6fd646544 100644
--- a/sys/dev/irdma/irdma_verbs.h
+++ b/sys/dev/irdma/irdma_verbs.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_VERBS_H
 #define IRDMA_VERBS_H
diff --git a/sys/dev/irdma/irdma_ws.c b/sys/dev/irdma/irdma_ws.c
index a7920ec6dcd..f1918ea90fc 100644
--- a/sys/dev/irdma/irdma_ws.c
+++ b/sys/dev/irdma/irdma_ws.c
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #include "osdep.h"
 #include "irdma_hmc.h"
diff --git a/sys/dev/irdma/irdma_ws.h b/sys/dev/irdma/irdma_ws.h
index 1a4e1c811bb..afab5663a0e 100644
--- a/sys/dev/irdma/irdma_ws.h
+++ b/sys/dev/irdma/irdma_ws.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef IRDMA_WS_H
 #define IRDMA_WS_H
diff --git a/sys/dev/irdma/osdep.h b/sys/dev/irdma/osdep.h
index 5cae2b9fdc3..b56814ccb8c 100644
--- a/sys/dev/irdma/osdep.h
+++ b/sys/dev/irdma/osdep.h
@@ -31,7 +31,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/*$FreeBSD$*/
 
 #ifndef _ICRDMA_OSDEP_H_
 #define _ICRDMA_OSDEP_H_
diff --git a/sys/dev/iser/icl_iser.c b/sys/dev/iser/icl_iser.c
index d43c1dc3b88..f5e75849d47 100644
--- a/sys/dev/iser/icl_iser.c
+++ b/sys/dev/iser/icl_iser.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2015, Mellanox Technologies, Inc. All rights reserved.
  *
diff --git a/sys/dev/iser/icl_iser.h b/sys/dev/iser/icl_iser.h
index fa899cb0dd5..e1ef38802e8 100644
--- a/sys/dev/iser/icl_iser.h
+++ b/sys/dev/iser/icl_iser.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2015, Mellanox Technologies, Inc. All rights reserved.
  *
diff --git a/sys/dev/iser/iser_initiator.c b/sys/dev/iser/iser_initiator.c
index 49960c29a61..a859c5cedb0 100644
--- a/sys/dev/iser/iser_initiator.c
+++ b/sys/dev/iser/iser_initiator.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2015, Mellanox Technologies, Inc. All rights reserved.
  *
diff --git a/sys/dev/iser/iser_memory.c b/sys/dev/iser/iser_memory.c
index 9cf48248741..56a5d16fe23 100644
--- a/sys/dev/iser/iser_memory.c
+++ b/sys/dev/iser/iser_memory.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2015, Mellanox Technologies, Inc. All rights reserved.
  *
diff --git a/sys/dev/iser/iser_verbs.c b/sys/dev/iser/iser_verbs.c
index c613764bd95..f5f057b961e 100644
--- a/sys/dev/iser/iser_verbs.c
+++ b/sys/dev/iser/iser_verbs.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2015, Mellanox Technologies, Inc. All rights reserved.
  *
diff --git a/sys/dev/isp/DriverManual.txt b/sys/dev/isp/DriverManual.txt
index b1ced6b3d06..4af292d068f 100644
--- a/sys/dev/isp/DriverManual.txt
+++ b/sys/dev/isp/DriverManual.txt
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 		Driver Theory of Operation Manual
 
diff --git a/sys/dev/isp/Hardware.txt b/sys/dev/isp/Hardware.txt
index 75f01bf7dd3..cc07e109cc5 100644
--- a/sys/dev/isp/Hardware.txt
+++ b/sys/dev/isp/Hardware.txt
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 	Hardware that is Known To or Should Work with This Driver
 
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 1ee0eb69e1c..0c0df2899ac 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h
index 31745d5565e..2c91ce6ba89 100644
--- a/sys/dev/isp/isp_ioctl.h
+++ b/sys/dev/isp/isp_ioctl.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/isp/isp_library.h b/sys/dev/isp/isp_library.h
index e009ae4524d..3c9518867c2 100644
--- a/sys/dev/isp/isp_library.h
+++ b/sys/dev/isp/isp_library.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/isp/isp_stds.h b/sys/dev/isp/isp_stds.h
index 55f33f67243..3f14b2f4973 100644
--- a/sys/dev/isp/isp_stds.h
+++ b/sys/dev/isp/isp_stds.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/isp/isp_target.h b/sys/dev/isp/isp_target.h
index 1650c4f4dd5..abf2f98e23f 100644
--- a/sys/dev/isp/isp_target.h
+++ b/sys/dev/isp/isp_target.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h
index 3d0cbcffaa6..6523dc6e6ba 100644
--- a/sys/dev/isp/ispmbox.h
+++ b/sys/dev/isp/ispmbox.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/isp/ispreg.h b/sys/dev/isp/ispreg.h
index 4f7bc9cb37c..c4e379e881b 100644
--- a/sys/dev/isp/ispreg.h
+++ b/sys/dev/isp/ispreg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 66faf939a1d..8ab25c9913d 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/ispfw/asm_2400.h b/sys/dev/ispfw/asm_2400.h
index ec9a0b449dd..ecaeccf4072 100644
--- a/sys/dev/ispfw/asm_2400.h
+++ b/sys/dev/ispfw/asm_2400.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/ispfw/asm_2500.h b/sys/dev/ispfw/asm_2500.h
index e73dd654937..9ae4284e26f 100644
--- a/sys/dev/ispfw/asm_2500.h
+++ b/sys/dev/ispfw/asm_2500.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/iwi/if_iwireg.h b/sys/dev/iwi/if_iwireg.h
index 09c10c0c273..dd6bb91bfec 100644
--- a/sys/dev/iwi/if_iwireg.h
+++ b/sys/dev/iwi/if_iwireg.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/iwi/if_iwivar.h b/sys/dev/iwi/if_iwivar.h
index 8ba31242e96..ba1e49ef54c 100644
--- a/sys/dev/iwi/if_iwivar.h
+++ b/sys/dev/iwi/if_iwivar.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/iwm/if_iwm_binding.h b/sys/dev/iwm/if_iwm_binding.h
index c3e20ed53d5..fe990797820 100644
--- a/sys/dev/iwm/if_iwm_binding.h
+++ b/sys/dev/iwm/if_iwm_binding.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp $	*/
-/*	$FreeBSD$ */
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
  * Copyright (c) 2014 Fixup Software Ltd.
diff --git a/sys/dev/iwm/if_iwm_constants.h b/sys/dev/iwm/if_iwm_constants.h
index b686fc58fd4..a7194fd6d77 100644
--- a/sys/dev/iwm/if_iwm_constants.h
+++ b/sys/dev/iwm/if_iwm_constants.h
@@ -69,7 +69,6 @@
  *
  *****************************************************************************/
 
-/* $FreeBSD$ */
 
 #ifndef __IF_IWM_CONSTANTS_H
 #define __IF_IWM_CONSTANTS_H
diff --git a/sys/dev/iwm/if_iwm_mac_ctxt.h b/sys/dev/iwm/if_iwm_mac_ctxt.h
index e23f91e99f9..2674077abee 100644
--- a/sys/dev/iwm/if_iwm_mac_ctxt.h
+++ b/sys/dev/iwm/if_iwm_mac_ctxt.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp $	*/
-/*	$FreeBSD$ */
 
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
diff --git a/sys/dev/iwm/if_iwm_notif_wait.h b/sys/dev/iwm/if_iwm_notif_wait.h
index aa77023c457..2391134bb32 100644
--- a/sys/dev/iwm/if_iwm_notif_wait.h
+++ b/sys/dev/iwm/if_iwm_notif_wait.h
@@ -66,7 +66,6 @@
  *
  *****************************************************************************/
 
-/* $FreeBSD$ */
 
 #ifndef __IF_IWN_NOTIF_WAIT_H__
 #define __IF_IWN_NOTIF_WAIT_H__
diff --git a/sys/dev/iwm/if_iwm_pcie_trans.h b/sys/dev/iwm/if_iwm_pcie_trans.h
index bdbd85476af..8b00a3fd6a6 100644
--- a/sys/dev/iwm/if_iwm_pcie_trans.h
+++ b/sys/dev/iwm/if_iwm_pcie_trans.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$ */
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
  * Copyright (c) 2014 Fixup Software Ltd.
diff --git a/sys/dev/iwm/if_iwm_phy_ctxt.h b/sys/dev/iwm/if_iwm_phy_ctxt.h
index f3cf28239f8..dcf07d1620a 100644
--- a/sys/dev/iwm/if_iwm_phy_ctxt.h
+++ b/sys/dev/iwm/if_iwm_phy_ctxt.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp $	*/
-/*	$FreeBSD$ */
 
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
diff --git a/sys/dev/iwm/if_iwm_phy_db.h b/sys/dev/iwm/if_iwm_phy_db.h
index 7cab8a3d1dc..2e2653777b1 100644
--- a/sys/dev/iwm/if_iwm_phy_db.h
+++ b/sys/dev/iwm/if_iwm_phy_db.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp $	*/
-/*	$FreeBSD$ */
 
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
diff --git a/sys/dev/iwm/if_iwm_power.h b/sys/dev/iwm/if_iwm_power.h
index 0e7eeaaae56..b6541659d74 100644
--- a/sys/dev/iwm/if_iwm_power.h
+++ b/sys/dev/iwm/if_iwm_power.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp $	*/
-/*	$FreeBSD$ */
 
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
diff --git a/sys/dev/iwm/if_iwm_scan.h b/sys/dev/iwm/if_iwm_scan.h
index 7859a75ec6d..984139cee73 100644
--- a/sys/dev/iwm/if_iwm_scan.h
+++ b/sys/dev/iwm/if_iwm_scan.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp $	*/
-/*	$FreeBSD$ */
 
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
diff --git a/sys/dev/iwm/if_iwm_sta.h b/sys/dev/iwm/if_iwm_sta.h
index 51b697e3709..3eed9c596ca 100644
--- a/sys/dev/iwm/if_iwm_sta.h
+++ b/sys/dev/iwm/if_iwm_sta.h
@@ -73,7 +73,6 @@
  *
  *****************************************************************************/
 
-/* $FreeBSD$ */
 
 #ifndef __IF_IWM_STA_H__
 #define __IF_IWM_STA_H__
diff --git a/sys/dev/iwm/if_iwm_time_event.h b/sys/dev/iwm/if_iwm_time_event.h
index aae3baf07b5..6b28a03f260 100644
--- a/sys/dev/iwm/if_iwm_time_event.h
+++ b/sys/dev/iwm/if_iwm_time_event.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp $	*/
-/*	$FreeBSD$ */
 
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
diff --git a/sys/dev/iwm/if_iwm_util.h b/sys/dev/iwm/if_iwm_util.h
index 1ac304c0d91..4154efad799 100644
--- a/sys/dev/iwm/if_iwm_util.h
+++ b/sys/dev/iwm/if_iwm_util.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp $	*/
-/*	$FreeBSD$ */
 
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
diff --git a/sys/dev/iwm/if_iwmreg.h b/sys/dev/iwm/if_iwmreg.h
index 14b79587a4d..8a58a3914c7 100644
--- a/sys/dev/iwm/if_iwmreg.h
+++ b/sys/dev/iwm/if_iwmreg.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_iwmreg.h,v 1.4 2015/06/15 08:06:11 stsp Exp $	*/
-/*	$FreeBSD$ */
 
 /******************************************************************************
  *
diff --git a/sys/dev/iwm/if_iwmvar.h b/sys/dev/iwm/if_iwmvar.h
index ea15f90064a..a18e0db7e82 100644
--- a/sys/dev/iwm/if_iwmvar.h
+++ b/sys/dev/iwm/if_iwmvar.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_iwmvar.h,v 1.7 2015/03/02 13:51:10 jsg Exp $	*/
-/*	$FreeBSD$ */
 
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
diff --git a/sys/dev/iwn/if_iwnreg.h b/sys/dev/iwn/if_iwnreg.h
index 54945f63df1..bdea9dd9618 100644
--- a/sys/dev/iwn/if_iwnreg.h
+++ b/sys/dev/iwn/if_iwnreg.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: if_iwnreg.h,v 1.40 2010/05/05 19:41:57 damien Exp $	*/
 
 /*-
diff --git a/sys/dev/iwn/if_iwnvar.h b/sys/dev/iwn/if_iwnvar.h
index deb932fb0ce..66cbd4cb0ac 100644
--- a/sys/dev/iwn/if_iwnvar.h
+++ b/sys/dev/iwn/if_iwnvar.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: if_iwnvar.h,v 1.18 2010/04/30 16:06:46 damien Exp $	*/
 
 /*-
diff --git a/sys/dev/ixgbe/if_bypass.c b/sys/dev/ixgbe/if_bypass.c
index 7e8848512e0..e9ea77dfb49 100644
--- a/sys/dev/ixgbe/if_bypass.c
+++ b/sys/dev/ixgbe/if_bypass.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #include "ixgbe.h"
diff --git a/sys/dev/ixgbe/if_fdir.c b/sys/dev/ixgbe/if_fdir.c
index 22b71f2bdf0..e5abd7795fc 100644
--- a/sys/dev/ixgbe/if_fdir.c
+++ b/sys/dev/ixgbe/if_fdir.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixgbe.h"
 
diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c
index f2daa206b65..15c6f27f0f9 100644
--- a/sys/dev/ixgbe/if_ix.c
+++ b/sys/dev/ixgbe/if_ix.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c
index 813a8d5fc3e..45fd5c69d34 100644
--- a/sys/dev/ixgbe/if_ixv.c
+++ b/sys/dev/ixgbe/if_ixv.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #include "opt_inet.h"
diff --git a/sys/dev/ixgbe/if_sriov.c b/sys/dev/ixgbe/if_sriov.c
index 5462aac56ac..cc6243848f6 100644
--- a/sys/dev/ixgbe/if_sriov.c
+++ b/sys/dev/ixgbe/if_sriov.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixgbe.h"
 #include "ixgbe_sriov.h"
diff --git a/sys/dev/ixgbe/ix_txrx.c b/sys/dev/ixgbe/ix_txrx.c
index 589f4c72c9c..a593cb13676 100644
--- a/sys/dev/ixgbe/ix_txrx.c
+++ b/sys/dev/ixgbe/ix_txrx.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef IXGBE_STANDALONE_BUILD
 #include "opt_inet.h"
diff --git a/sys/dev/ixgbe/ixgbe.h b/sys/dev/ixgbe/ixgbe.h
index 0f81a0a2c2d..fb0dba24270 100644
--- a/sys/dev/ixgbe/ixgbe.h
+++ b/sys/dev/ixgbe/ixgbe.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_H_
 #define _IXGBE_H_
diff --git a/sys/dev/ixgbe/ixgbe_82598.c b/sys/dev/ixgbe/ixgbe_82598.c
index 26b56c5bc38..e32fdb8f039 100644
--- a/sys/dev/ixgbe/ixgbe_82598.c
+++ b/sys/dev/ixgbe/ixgbe_82598.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixgbe_type.h"
 #include "ixgbe_82598.h"
diff --git a/sys/dev/ixgbe/ixgbe_82598.h b/sys/dev/ixgbe/ixgbe_82598.h
index 09b8c605410..9f83684d9f8 100644
--- a/sys/dev/ixgbe/ixgbe_82598.h
+++ b/sys/dev/ixgbe/ixgbe_82598.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_82598_H_
 #define _IXGBE_82598_H_
diff --git a/sys/dev/ixgbe/ixgbe_82599.c b/sys/dev/ixgbe/ixgbe_82599.c
index 7afb440b556..8c3df0fd4f5 100644
--- a/sys/dev/ixgbe/ixgbe_82599.c
+++ b/sys/dev/ixgbe/ixgbe_82599.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixgbe_type.h"
 #include "ixgbe_82599.h"
diff --git a/sys/dev/ixgbe/ixgbe_82599.h b/sys/dev/ixgbe/ixgbe_82599.h
index 2e9a0407a61..ff593f8ab39 100644
--- a/sys/dev/ixgbe/ixgbe_82599.h
+++ b/sys/dev/ixgbe/ixgbe_82599.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_82599_H_
 #define _IXGBE_82599_H_
diff --git a/sys/dev/ixgbe/ixgbe_api.c b/sys/dev/ixgbe/ixgbe_api.c
index 12fc7d9cfd4..eded950e288 100644
--- a/sys/dev/ixgbe/ixgbe_api.c
+++ b/sys/dev/ixgbe/ixgbe_api.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixgbe_api.h"
 #include "ixgbe_common.h"
diff --git a/sys/dev/ixgbe/ixgbe_api.h b/sys/dev/ixgbe/ixgbe_api.h
index 7fd300bfe4e..9134971d9c9 100644
--- a/sys/dev/ixgbe/ixgbe_api.h
+++ b/sys/dev/ixgbe/ixgbe_api.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_API_H_
 #define _IXGBE_API_H_
diff --git a/sys/dev/ixgbe/ixgbe_bypass.h b/sys/dev/ixgbe/ixgbe_bypass.h
index 941037793e5..b97306a0a28 100644
--- a/sys/dev/ixgbe/ixgbe_bypass.h
+++ b/sys/dev/ixgbe/ixgbe_bypass.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_BYPASS_H_
 #define _IXGBE_BYPASS_H_
diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c
index 9c13b1b2663..91c12eadd1e 100644
--- a/sys/dev/ixgbe/ixgbe_common.c
+++ b/sys/dev/ixgbe/ixgbe_common.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixgbe_common.h"
 #include "ixgbe_phy.h"
diff --git a/sys/dev/ixgbe/ixgbe_common.h b/sys/dev/ixgbe/ixgbe_common.h
index e5a186f73ea..a55003b4cfe 100644
--- a/sys/dev/ixgbe/ixgbe_common.h
+++ b/sys/dev/ixgbe/ixgbe_common.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_COMMON_H_
 #define _IXGBE_COMMON_H_
diff --git a/sys/dev/ixgbe/ixgbe_dcb.c b/sys/dev/ixgbe/ixgbe_dcb.c
index 54102f312db..0ebc5456eda 100644
--- a/sys/dev/ixgbe/ixgbe_dcb.c
+++ b/sys/dev/ixgbe/ixgbe_dcb.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #include "ixgbe_type.h"
diff --git a/sys/dev/ixgbe/ixgbe_dcb.h b/sys/dev/ixgbe/ixgbe_dcb.h
index 7dfe8547112..b31dfae0cdf 100644
--- a/sys/dev/ixgbe/ixgbe_dcb.h
+++ b/sys/dev/ixgbe/ixgbe_dcb.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_DCB_H_
 #define _IXGBE_DCB_H_
diff --git a/sys/dev/ixgbe/ixgbe_dcb_82598.c b/sys/dev/ixgbe/ixgbe_dcb_82598.c
index eb39bfb38b5..4275ec30513 100644
--- a/sys/dev/ixgbe/ixgbe_dcb_82598.c
+++ b/sys/dev/ixgbe/ixgbe_dcb_82598.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #include "ixgbe_type.h"
diff --git a/sys/dev/ixgbe/ixgbe_dcb_82598.h b/sys/dev/ixgbe/ixgbe_dcb_82598.h
index 74cf2760cc6..4d076b35a39 100644
--- a/sys/dev/ixgbe/ixgbe_dcb_82598.h
+++ b/sys/dev/ixgbe/ixgbe_dcb_82598.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_DCB_82598_H_
 #define _IXGBE_DCB_82598_H_
diff --git a/sys/dev/ixgbe/ixgbe_dcb_82599.c b/sys/dev/ixgbe/ixgbe_dcb_82599.c
index 591c705aba0..7e84a24e42b 100644
--- a/sys/dev/ixgbe/ixgbe_dcb_82599.c
+++ b/sys/dev/ixgbe/ixgbe_dcb_82599.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #include "ixgbe_type.h"
diff --git a/sys/dev/ixgbe/ixgbe_dcb_82599.h b/sys/dev/ixgbe/ixgbe_dcb_82599.h
index 892a384b4c1..362fa146a04 100644
--- a/sys/dev/ixgbe/ixgbe_dcb_82599.h
+++ b/sys/dev/ixgbe/ixgbe_dcb_82599.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_DCB_82599_H_
 #define _IXGBE_DCB_82599_H_
diff --git a/sys/dev/ixgbe/ixgbe_fdir.h b/sys/dev/ixgbe/ixgbe_fdir.h
index 8631a675c7b..09d6ec657ef 100644
--- a/sys/dev/ixgbe/ixgbe_fdir.h
+++ b/sys/dev/ixgbe/ixgbe_fdir.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_FDIR_H_
 #define _IXGBE_FDIR_H_
diff --git a/sys/dev/ixgbe/ixgbe_features.h b/sys/dev/ixgbe/ixgbe_features.h
index a9b3c8e41e6..ed35a6ed458 100644
--- a/sys/dev/ixgbe/ixgbe_features.h
+++ b/sys/dev/ixgbe/ixgbe_features.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #ifndef _IXGBE_FEATURES_H_
diff --git a/sys/dev/ixgbe/ixgbe_mbx.c b/sys/dev/ixgbe/ixgbe_mbx.c
index 443ebb47899..d12aadea709 100644
--- a/sys/dev/ixgbe/ixgbe_mbx.c
+++ b/sys/dev/ixgbe/ixgbe_mbx.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixgbe_type.h"
 #include "ixgbe_mbx.h"
diff --git a/sys/dev/ixgbe/ixgbe_mbx.h b/sys/dev/ixgbe/ixgbe_mbx.h
index c5940b0823b..47b9327bb89 100644
--- a/sys/dev/ixgbe/ixgbe_mbx.h
+++ b/sys/dev/ixgbe/ixgbe_mbx.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_MBX_H_
 #define _IXGBE_MBX_H_
diff --git a/sys/dev/ixgbe/ixgbe_osdep.c b/sys/dev/ixgbe/ixgbe_osdep.c
index 49ae5e27f46..57403b0b2f6 100644
--- a/sys/dev/ixgbe/ixgbe_osdep.c
+++ b/sys/dev/ixgbe/ixgbe_osdep.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixgbe.h"
 
diff --git a/sys/dev/ixgbe/ixgbe_osdep.h b/sys/dev/ixgbe/ixgbe_osdep.h
index b7eaa788c99..92942cbab10 100644
--- a/sys/dev/ixgbe/ixgbe_osdep.h
+++ b/sys/dev/ixgbe/ixgbe_osdep.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_OSDEP_H_
 #define _IXGBE_OSDEP_H_
diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c
index 98f82083db1..e1555cc2987 100644
--- a/sys/dev/ixgbe/ixgbe_phy.c
+++ b/sys/dev/ixgbe/ixgbe_phy.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixgbe_api.h"
 #include "ixgbe_common.h"
diff --git a/sys/dev/ixgbe/ixgbe_phy.h b/sys/dev/ixgbe/ixgbe_phy.h
index 09d7ea4afbc..1fa2acb7735 100644
--- a/sys/dev/ixgbe/ixgbe_phy.h
+++ b/sys/dev/ixgbe/ixgbe_phy.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_PHY_H_
 #define _IXGBE_PHY_H_
diff --git a/sys/dev/ixgbe/ixgbe_rss.h b/sys/dev/ixgbe/ixgbe_rss.h
index 7eda43ec160..c00273587aa 100644
--- a/sys/dev/ixgbe/ixgbe_rss.h
+++ b/sys/dev/ixgbe/ixgbe_rss.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_RSS_H_
 #define _IXGBE_RSS_H_
diff --git a/sys/dev/ixgbe/ixgbe_sriov.h b/sys/dev/ixgbe/ixgbe_sriov.h
index 28d93672988..e5a78a7220c 100644
--- a/sys/dev/ixgbe/ixgbe_sriov.h
+++ b/sys/dev/ixgbe/ixgbe_sriov.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #ifndef _IXGBE_SRIOV_H_
diff --git a/sys/dev/ixgbe/ixgbe_type.h b/sys/dev/ixgbe/ixgbe_type.h
index 2dfd64f9809..d97314c4f6c 100644
--- a/sys/dev/ixgbe/ixgbe_type.h
+++ b/sys/dev/ixgbe/ixgbe_type.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_TYPE_H_
 #define _IXGBE_TYPE_H_
diff --git a/sys/dev/ixgbe/ixgbe_vf.c b/sys/dev/ixgbe/ixgbe_vf.c
index 75612a7f83c..91df9b7dd1c 100644
--- a/sys/dev/ixgbe/ixgbe_vf.c
+++ b/sys/dev/ixgbe/ixgbe_vf.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #include "ixgbe.h"
diff --git a/sys/dev/ixgbe/ixgbe_vf.h b/sys/dev/ixgbe/ixgbe_vf.h
index 49f3a173d56..2e8921a21fe 100644
--- a/sys/dev/ixgbe/ixgbe_vf.h
+++ b/sys/dev/ixgbe/ixgbe_vf.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_VF_H_
 #define _IXGBE_VF_H_
diff --git a/sys/dev/ixgbe/ixgbe_x540.c b/sys/dev/ixgbe/ixgbe_x540.c
index ea45cd31a4c..c06a19555a8 100644
--- a/sys/dev/ixgbe/ixgbe_x540.c
+++ b/sys/dev/ixgbe/ixgbe_x540.c
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixgbe_x540.h"
 #include "ixgbe_type.h"
diff --git a/sys/dev/ixgbe/ixgbe_x540.h b/sys/dev/ixgbe/ixgbe_x540.h
index e48ef52f576..3f1ca5e4623 100644
--- a/sys/dev/ixgbe/ixgbe_x540.h
+++ b/sys/dev/ixgbe/ixgbe_x540.h
@@ -31,7 +31,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_X540_H_
 #define _IXGBE_X540_H_
diff --git a/sys/dev/ixgbe/ixgbe_x550.c b/sys/dev/ixgbe/ixgbe_x550.c
index 3353d91e228..710c3324793 100644
--- a/sys/dev/ixgbe/ixgbe_x550.c
+++ b/sys/dev/ixgbe/ixgbe_x550.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixgbe_x550.h"
 #include "ixgbe_x540.h"
diff --git a/sys/dev/ixgbe/ixgbe_x550.h b/sys/dev/ixgbe/ixgbe_x550.h
index 7a24e50e1b5..245e128266a 100644
--- a/sys/dev/ixgbe/ixgbe_x550.h
+++ b/sys/dev/ixgbe/ixgbe_x550.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXGBE_X550_H_
 #define _IXGBE_X550_H_
diff --git a/sys/dev/ixl/i40e_adminq.c b/sys/dev/ixl/i40e_adminq.c
index efca7f1e61f..014c817195c 100644
--- a/sys/dev/ixl/i40e_adminq.c
+++ b/sys/dev/ixl/i40e_adminq.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "i40e_status.h"
 #include "i40e_type.h"
diff --git a/sys/dev/ixl/i40e_adminq.h b/sys/dev/ixl/i40e_adminq.h
index f52d2cd3b95..c61ef163bcb 100644
--- a/sys/dev/ixl/i40e_adminq.h
+++ b/sys/dev/ixl/i40e_adminq.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _I40E_ADMINQ_H_
 #define _I40E_ADMINQ_H_
diff --git a/sys/dev/ixl/i40e_adminq_cmd.h b/sys/dev/ixl/i40e_adminq_cmd.h
index 679e191412c..ae3ee836bc7 100644
--- a/sys/dev/ixl/i40e_adminq_cmd.h
+++ b/sys/dev/ixl/i40e_adminq_cmd.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _I40E_ADMINQ_CMD_H_
 #define _I40E_ADMINQ_CMD_H_
diff --git a/sys/dev/ixl/i40e_alloc.h b/sys/dev/ixl/i40e_alloc.h
index a8f67001cbf..51d7bf1c7f3 100644
--- a/sys/dev/ixl/i40e_alloc.h
+++ b/sys/dev/ixl/i40e_alloc.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _I40E_ALLOC_H_
 #define _I40E_ALLOC_H_
diff --git a/sys/dev/ixl/i40e_common.c b/sys/dev/ixl/i40e_common.c
index 8d12da942db..777a7bcd6f2 100644
--- a/sys/dev/ixl/i40e_common.c
+++ b/sys/dev/ixl/i40e_common.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "i40e_type.h"
 #include "i40e_adminq.h"
diff --git a/sys/dev/ixl/i40e_dcb.c b/sys/dev/ixl/i40e_dcb.c
index a02cbc80d36..6f470e956c5 100644
--- a/sys/dev/ixl/i40e_dcb.c
+++ b/sys/dev/ixl/i40e_dcb.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "i40e_adminq.h"
 #include "i40e_prototype.h"
diff --git a/sys/dev/ixl/i40e_dcb.h b/sys/dev/ixl/i40e_dcb.h
index 2453d3a0f27..e59d8480562 100644
--- a/sys/dev/ixl/i40e_dcb.h
+++ b/sys/dev/ixl/i40e_dcb.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _I40E_DCB_H_
 #define _I40E_DCB_H_
diff --git a/sys/dev/ixl/i40e_devids.h b/sys/dev/ixl/i40e_devids.h
index 60fe881e471..c95ee67ce60 100644
--- a/sys/dev/ixl/i40e_devids.h
+++ b/sys/dev/ixl/i40e_devids.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _I40E_DEVIDS_H_
 #define _I40E_DEVIDS_H_
diff --git a/sys/dev/ixl/i40e_hmc.c b/sys/dev/ixl/i40e_hmc.c
index 811dc92ee05..a3f93b79f59 100644
--- a/sys/dev/ixl/i40e_hmc.c
+++ b/sys/dev/ixl/i40e_hmc.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "i40e_osdep.h"
 #include "i40e_register.h"
diff --git a/sys/dev/ixl/i40e_hmc.h b/sys/dev/ixl/i40e_hmc.h
index 8f70bba09fa..f0145508e6c 100644
--- a/sys/dev/ixl/i40e_hmc.h
+++ b/sys/dev/ixl/i40e_hmc.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _I40E_HMC_H_
 #define _I40E_HMC_H_
diff --git a/sys/dev/ixl/i40e_lan_hmc.c b/sys/dev/ixl/i40e_lan_hmc.c
index eb2c44c9206..afb5ad3e228 100644
--- a/sys/dev/ixl/i40e_lan_hmc.c
+++ b/sys/dev/ixl/i40e_lan_hmc.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "i40e_osdep.h"
 #include "i40e_register.h"
diff --git a/sys/dev/ixl/i40e_lan_hmc.h b/sys/dev/ixl/i40e_lan_hmc.h
index a495f346cfb..1a0b0f5bfd6 100644
--- a/sys/dev/ixl/i40e_lan_hmc.h
+++ b/sys/dev/ixl/i40e_lan_hmc.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _I40E_LAN_HMC_H_
 #define _I40E_LAN_HMC_H_
diff --git a/sys/dev/ixl/i40e_nvm.c b/sys/dev/ixl/i40e_nvm.c
index 58e5c1a0cdd..d2807fa217b 100644
--- a/sys/dev/ixl/i40e_nvm.c
+++ b/sys/dev/ixl/i40e_nvm.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "i40e_prototype.h"
 
diff --git a/sys/dev/ixl/i40e_osdep.c b/sys/dev/ixl/i40e_osdep.c
index b3fd53af9e2..460e4fecc67 100644
--- a/sys/dev/ixl/i40e_osdep.c
+++ b/sys/dev/ixl/i40e_osdep.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include <sys/limits.h>
 #include <sys/time.h>
diff --git a/sys/dev/ixl/i40e_osdep.h b/sys/dev/ixl/i40e_osdep.h
index 1146ece279b..82418aca9aa 100644
--- a/sys/dev/ixl/i40e_osdep.h
+++ b/sys/dev/ixl/i40e_osdep.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _I40E_OSDEP_H_
 #define _I40E_OSDEP_H_
diff --git a/sys/dev/ixl/i40e_prototype.h b/sys/dev/ixl/i40e_prototype.h
index 2febf9d6662..4be60b9f099 100644
--- a/sys/dev/ixl/i40e_prototype.h
+++ b/sys/dev/ixl/i40e_prototype.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _I40E_PROTOTYPE_H_
 #define _I40E_PROTOTYPE_H_
diff --git a/sys/dev/ixl/i40e_register.h b/sys/dev/ixl/i40e_register.h
index ffc6a7e506a..cc37e1f5189 100644
--- a/sys/dev/ixl/i40e_register.h
+++ b/sys/dev/ixl/i40e_register.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _I40E_REGISTER_H_
 #define _I40E_REGISTER_H_
diff --git a/sys/dev/ixl/i40e_status.h b/sys/dev/ixl/i40e_status.h
index abba820ff8b..954e186ffc4 100644
--- a/sys/dev/ixl/i40e_status.h
+++ b/sys/dev/ixl/i40e_status.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _I40E_STATUS_H_
 #define _I40E_STATUS_H_
diff --git a/sys/dev/ixl/i40e_type.h b/sys/dev/ixl/i40e_type.h
index f34002d7dc3..9c2809a3e41 100644
--- a/sys/dev/ixl/i40e_type.h
+++ b/sys/dev/ixl/i40e_type.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _I40E_TYPE_H_
 #define _I40E_TYPE_H_
diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c
index a18dd4361ba..23d8fc1c6cb 100644
--- a/sys/dev/ixl/if_ixl.c
+++ b/sys/dev/ixl/if_ixl.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixl.h"
 #include "ixl_pf.h"
diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h
index 2f6fe6c959d..3611ce149d5 100644
--- a/sys/dev/ixl/ixl.h
+++ b/sys/dev/ixl/ixl.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXL_H_
 #define _IXL_H_
diff --git a/sys/dev/ixl/ixl_debug.h b/sys/dev/ixl/ixl_debug.h
index 818ba8a1df8..cdeacc9e2a9 100644
--- a/sys/dev/ixl/ixl_debug.h
+++ b/sys/dev/ixl/ixl_debug.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXL_DEBUG_H_
 #define _IXL_DEBUG_H_
diff --git a/sys/dev/ixl/ixl_iw.c b/sys/dev/ixl/ixl_iw.c
index 5e2d7cfcb30..81bc3bde9d1 100644
--- a/sys/dev/ixl/ixl_iw.c
+++ b/sys/dev/ixl/ixl_iw.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixl.h"
 #include "ixl_pf.h"
diff --git a/sys/dev/ixl/ixl_iw.h b/sys/dev/ixl/ixl_iw.h
index 2ef7198a602..813230839f4 100644
--- a/sys/dev/ixl/ixl_iw.h
+++ b/sys/dev/ixl/ixl_iw.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXL_IW_H_
 #define _IXL_IW_H_
diff --git a/sys/dev/ixl/ixl_iw_int.h b/sys/dev/ixl/ixl_iw_int.h
index 11a1fc61495..f5c2e300e9a 100644
--- a/sys/dev/ixl/ixl_iw_int.h
+++ b/sys/dev/ixl/ixl_iw_int.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _IXL_IW_INT_H_
 #define _IXL_IW_INT_H_
diff --git a/sys/dev/ixl/ixl_pf.h b/sys/dev/ixl/ixl_pf.h
index 90236ac144c..bf7b5b9289f 100644
--- a/sys/dev/ixl/ixl_pf.h
+++ b/sys/dev/ixl/ixl_pf.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #ifndef _IXL_PF_H_
diff --git a/sys/dev/ixl/ixl_pf_i2c.c b/sys/dev/ixl/ixl_pf_i2c.c
index 9aea32bbe5c..775fe27ddd6 100644
--- a/sys/dev/ixl/ixl_pf_i2c.c
+++ b/sys/dev/ixl/ixl_pf_i2c.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixl_pf.h"
 
diff --git a/sys/dev/ixl/ixl_pf_iflib.c b/sys/dev/ixl/ixl_pf_iflib.c
index 326c10ca8bf..2766c163e3b 100644
--- a/sys/dev/ixl/ixl_pf_iflib.c
+++ b/sys/dev/ixl/ixl_pf_iflib.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixl_pf.h"
 
diff --git a/sys/dev/ixl/ixl_pf_iov.c b/sys/dev/ixl/ixl_pf_iov.c
index c3cf90d1c4b..dd4da887858 100644
--- a/sys/dev/ixl/ixl_pf_iov.c
+++ b/sys/dev/ixl/ixl_pf_iov.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #include "ixl_pf_iov.h"
 
diff --git a/sys/dev/ixl/ixl_pf_iov.h b/sys/dev/ixl/ixl_pf_iov.h
index e412df86ae6..95a8117b8ca 100644
--- a/sys/dev/ixl/ixl_pf_iov.h
+++ b/sys/dev/ixl/ixl_pf_iov.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #ifndef _IXL_PF_IOV_H_
diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c
index 23da241315e..4bd651588d1 100644
--- a/sys/dev/ixl/ixl_pf_main.c
+++ b/sys/dev/ixl/ixl_pf_main.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #include "ixl_pf.h"
diff --git a/sys/dev/ixl/ixl_pf_qmgr.c b/sys/dev/ixl/ixl_pf_qmgr.c
index 92ce8d61bd1..904832d3883 100644
--- a/sys/dev/ixl/ixl_pf_qmgr.c
+++ b/sys/dev/ixl/ixl_pf_qmgr.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #include "ixl_pf_qmgr.h"
diff --git a/sys/dev/ixl/ixl_pf_qmgr.h b/sys/dev/ixl/ixl_pf_qmgr.h
index 670a277ff6a..4213ae8745c 100644
--- a/sys/dev/ixl/ixl_pf_qmgr.h
+++ b/sys/dev/ixl/ixl_pf_qmgr.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 
 #include "ixl_pf.h"
diff --git a/sys/dev/ixl/ixl_txrx.c b/sys/dev/ixl/ixl_txrx.c
index 20050e73c09..f971a307326 100644
--- a/sys/dev/ixl/ixl_txrx.c
+++ b/sys/dev/ixl/ixl_txrx.c
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 /*
 **	IXL driver TX/RX Routines:
diff --git a/sys/dev/ixl/virtchnl.h b/sys/dev/ixl/virtchnl.h
index 444b6399b81..f1b5777fd07 100644
--- a/sys/dev/ixl/virtchnl.h
+++ b/sys/dev/ixl/virtchnl.h
@@ -30,7 +30,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD$*/
 
 #ifndef _VIRTCHNL_H_
 #define _VIRTCHNL_H_
diff --git a/sys/dev/le/am79900reg.h b/sys/dev/le/am79900reg.h
index e46d3b894c2..d1d40b94098 100644
--- a/sys/dev/le/am79900reg.h
+++ b/sys/dev/le/am79900reg.h
@@ -65,7 +65,6 @@
  *	@(#)if_lereg.h	8.1 (Berkeley) 6/10/93
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_LE_AM79900REG_H_
 #define	_DEV_LE_AM79900REG_H_
diff --git a/sys/dev/le/am79900var.h b/sys/dev/le/am79900var.h
index 82f0414bc93..5090237155c 100644
--- a/sys/dev/le/am79900var.h
+++ b/sys/dev/le/am79900var.h
@@ -32,7 +32,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_LE_AM79900VAR_H_
 #define	_DEV_LE_AM79900VAR_H_
diff --git a/sys/dev/le/am7990reg.h b/sys/dev/le/am7990reg.h
index b53132231db..d6ba9a7e534 100644
--- a/sys/dev/le/am7990reg.h
+++ b/sys/dev/le/am7990reg.h
@@ -65,7 +65,6 @@
  *	@(#)if_lereg.h	8.1 (Berkeley) 6/10/93
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_LE_AM7990REG_H_
 #define	_DEV_LE_AM7990REG_H_
diff --git a/sys/dev/le/am7990var.h b/sys/dev/le/am7990var.h
index 32c7b9b922c..274a69c6616 100644
--- a/sys/dev/le/am7990var.h
+++ b/sys/dev/le/am7990var.h
@@ -32,7 +32,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_LE_AM7990VAR_H_
 #define	_DEV_LE_AM7990VAR_H_
diff --git a/sys/dev/le/lancereg.h b/sys/dev/le/lancereg.h
index ef93db01e5e..246a7fba74a 100644
--- a/sys/dev/le/lancereg.h
+++ b/sys/dev/le/lancereg.h
@@ -115,7 +115,6 @@
  * valid on the LANCE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_LE_LANCEREG_H_
 #define	_DEV_LE_LANCEREG_H_
diff --git a/sys/dev/le/lancevar.h b/sys/dev/le/lancevar.h
index f3946b0929f..2bdaf3f25bd 100644
--- a/sys/dev/le/lancevar.h
+++ b/sys/dev/le/lancevar.h
@@ -32,7 +32,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_LE_LANCEVAR_H_
 #define	_DEV_LE_LANCEVAR_H_
diff --git a/sys/dev/liquidio/base/cn23xx_pf_device.c b/sys/dev/liquidio/base/cn23xx_pf_device.c
index 0df5f776723..41bc72c32dd 100644
--- a/sys/dev/liquidio/base/cn23xx_pf_device.c
+++ b/sys/dev/liquidio/base/cn23xx_pf_device.c
@@ -30,7 +30,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$*/
 
 #include "lio_bsd.h"
 #include "lio_common.h"
diff --git a/sys/dev/liquidio/base/cn23xx_pf_device.h b/sys/dev/liquidio/base/cn23xx_pf_device.h
index 3c7d698b4e5..0f0cd3a9b02 100644
--- a/sys/dev/liquidio/base/cn23xx_pf_device.h
+++ b/sys/dev/liquidio/base/cn23xx_pf_device.h
@@ -30,7 +30,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$*/
 
 /* \file  cn23xx_device.h
  * \brief Host Driver: Routines that perform CN23XX specific operations.
diff --git a/sys/dev/liquidio/base/cn23xx_pf_regs.h b/sys/dev/liquidio/base/cn23xx_pf_regs.h
index d0ff22838b1..7c34b352c24 100644
--- a/sys/dev/liquidio/base/cn23xx_pf_regs.h
+++ b/sys/dev/liquidio/base/cn23xx_pf_regs.h
@@ -30,7 +30,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$*/
 
 /* \file cn23xx_pf_regs.h
  * \brief Host Driver: Register Address and Register Mask values for
diff --git a/sys/dev/liquidio/base/lio_common.h b/sys/dev/liquidio/base/lio_common.h
index e8736e59ae6..d9c48e8d37a 100644
--- a/sys/dev/liquidio/base/lio_common.h
+++ b/sys/dev/liquidio/base/lio_common.h
@@ -30,7 +30,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$*/
 
 /*   \file  lio_common.h
  *   \brief Common: Structures and macros used in PCI-NIC package by core and
diff --git a/sys/dev/liquidio/base/lio_config.h b/sys/dev/liquidio/base/lio_config.h
index 80175923060..98db66545fb 100644
--- a/sys/dev/liquidio/base/lio_config.h
+++ b/sys/dev/liquidio/base/lio_config.h
@@ -30,7 +30,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$*/
 
 /*  \file  lio_config.h
  *  \brief Host Driver: Configuration data structures for the host driver.
diff --git a/sys/dev/liquidio/base/lio_console.c b/sys/dev/liquidio/base/lio_console.c
index c36fb5bf224..91305724f08 100644
--- a/sys/dev/liquidio/base/lio_console.c
+++ b/sys/dev/liquidio/base/lio_console.c
@@ -30,7 +30,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$*/
 
 /*
  * @file lio_console.c
diff --git a/sys/dev/liquidio/base/lio_ctrl.c b/sys/dev/liquidio/base/lio_ctrl.c
index 5b2a7eb141e..1b78aa9388c 100644
--- a/sys/dev/liquidio/base/lio_ctrl.c
+++ b/sys/dev/liquidio/base/lio_ctrl.c
@@ -30,7 +30,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$*/
 
 #include "lio_bsd.h"
 #include "lio_common.h"
diff --git a/sys/dev/liquidio/base/lio_ctrl.h b/sys/dev/liquidio/base/lio_ctrl.h
index 475e51e7ed1..845e933bdc6 100644
--- a/sys/dev/liquidio/base/lio_ctrl.h
+++ b/sys/dev/liquidio/base/lio_ctrl.h
@@ -30,7 +30,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$*/
 
 /*   \file lio_ctrl.h
  *   \brief Host NIC Driver: Routine to send network data &
diff --git a/sys/dev/liquidio/base/lio_device.c b/sys/dev/liquidio/base/lio_device.c
index 8bcf4f32984..fe1d037677c 100644
--- a/sys/dev/liquidio/base/lio_device.c
+++ b/sys/dev/liquidio/base/lio_device.c
@@ -30,7 +30,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$*/
 
 #include "lio_bsd.h"
 #include "lio_common.h"
diff --git a/sys/dev/liquidio/base/lio_device.h b/sys/dev/liquidio/base/lio_device.h
index de07f604fd9..d34b4c3e243 100644
--- a/sys/dev/liquidio/base/lio_device.h
+++ b/sys/dev/liquidio/base/lio_device.h
@@ -30,7 +30,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$*/
 
 /*
  *  \brief Host Driver: This file defines the octeon device structure.
diff --git a/sys/dev/liquidio/base/lio_droq.c b/sys/dev/liquidio/base/lio_droq.c
index 6124768a582..87e8bf96813 100644
--- a/sys/dev/liquidio/base/lio_droq.c
+++ b/sys/dev/liquidio/base/lio_droq.c
@@ -30,7 +30,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$*/
 
 #include "lio_bsd.h"
 #include "lio_common.h"
diff --git a/sys/dev/liquidio/base/lio_droq.h b/sys/dev/liquidio/base/lio_droq.h
index c9bf6d98274..564b266d589 100644
--- a/sys/dev/liquidio/base/lio_droq.h
+++ b/sys/dev/liquidio/base/lio_droq.h
@@ -30,7 +30,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$*/
 
 /*   \file  lio_droq.h
  *   \brief Implementation of Octeon Output queues. "Output" is with
diff --git a/sys/dev/liquidio/base/lio_image.h b/sys/dev/liquidio/base/lio_image.h
index 6aea7dba625..2176bf2a148 100644
--- a/sys/dev/liquidio/base/lio_image.h
+++ b/sys/dev/liquidio/base/lio_image.h
@@ -30,7 +30,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$*/
 
 #ifndef _LIO_IMAGE_H_
 #define _LIO_IMAGE_H_
diff --git a/sys/dev/liquidio/base/lio_iq.h b/sys/dev/liquidio/base/lio_iq.h
index 62c31dbff43..1da8b047893 100644
--- a/sys/dev/liquidio/base/lio_iq.h
+++ b/sys/dev/liquidio/base/lio_iq.h
@@ -30,7 +30,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$*/
 
 /*   \file  lio_iq.h
  *   \brief Host Driver: Implementation of Octeon input queues. "Input" is
diff --git a/sys/dev/liquidio/base/lio_mem_ops.c b/sys/dev/liquidio/base/lio_mem_ops.c
index 64526438e33..1aa865d49d1 100644
--- a/sys/dev/liquidio/base/lio_mem_ops.c
+++ b/sys/dev/liquidio/base/lio_mem_ops.c
@@ -30,7 +30,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$*/
 
 #include "lio_bsd.h"
 #include "lio_common.h"
diff --git a/sys/dev/liquidio/base/lio_mem_ops.h b/sys/dev/liquidio/base/lio_mem_ops.h
index 1bf93a08633..e47c0191ffc 100644
--- a/sys/dev/liquidio/base/lio_mem_ops.h
+++ b/sys/dev/liquidio/base/lio_mem_ops.h
@@ -30,7 +30,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$*/
 
 /*
  *   \file lio_mem_ops.h
diff --git a/sys/dev/liquidio/base/lio_request_manager.c b/sys/dev/liquidio/base/lio_request_manager.c
index db7548e7ddf..75dabf4839a 100644
--- a/sys/dev/liquidio/base/lio_request_manager.c
+++ b/sys/dev/liquidio/base/lio_request_manager.c
@@ -30,7 +30,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$*/
 
 #include "lio_bsd.h"
 #include "lio_common.h"
diff --git a/sys/dev/liquidio/base/lio_response_manager.c b/sys/dev/liquidio/base/lio_response_manager.c
index e2d28b3cb32..12a3ad60521 100644
--- a/sys/dev/liquidio/base/lio_response_manager.c
+++ b/sys/dev/liquidio/base/lio_response_manager.c
@@ -30,7 +30,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$*/
 
 #include "lio_bsd.h"
 #include "lio_common.h"
diff --git a/sys/dev/liquidio/base/lio_response_manager.h b/sys/dev/liquidio/base/lio_response_manager.h
index 76806906af9..b0454638a21 100644
--- a/sys/dev/liquidio/base/lio_response_manager.h
+++ b/sys/dev/liquidio/base/lio_response_manager.h
@@ -30,7 +30,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$*/
 
 /*
  * ! \file lio_response_manager.h
diff --git a/sys/dev/liquidio/lio_bsd.h b/sys/dev/liquidio/lio_bsd.h
index 1c8e8e50b18..a732716cb17 100644
--- a/sys/dev/liquidio/lio_bsd.h
+++ b/sys/dev/liquidio/lio_bsd.h
@@ -30,7 +30,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$*/
 
 #ifndef __LIO_BSD_H__
 #define __LIO_BSD_H__
diff --git a/sys/dev/liquidio/lio_core.c b/sys/dev/liquidio/lio_core.c
index dcbe4e44988..947c37fc056 100644
--- a/sys/dev/liquidio/lio_core.c
+++ b/sys/dev/liquidio/lio_core.c
@@ -30,7 +30,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$*/
 
 #include "lio_bsd.h"
 #include "lio_common.h"
diff --git a/sys/dev/liquidio/lio_ioctl.c b/sys/dev/liquidio/lio_ioctl.c
index f2cf0eae6f8..80ee9ed2dcf 100644
--- a/sys/dev/liquidio/lio_ioctl.c
+++ b/sys/dev/liquidio/lio_ioctl.c
@@ -30,7 +30,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$*/
 
 #include "lio_bsd.h"
 #include "lio_common.h"
diff --git a/sys/dev/liquidio/lio_ioctl.h b/sys/dev/liquidio/lio_ioctl.h
index d62948bafc7..3e6fd4f18db 100644
--- a/sys/dev/liquidio/lio_ioctl.h
+++ b/sys/dev/liquidio/lio_ioctl.h
@@ -30,7 +30,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$*/
 
 #ifndef _LIO_IOCTL_H_
 #define _LIO_IOCTL_H_
diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c
index a7c1308c10d..54878bc6a12 100644
--- a/sys/dev/liquidio/lio_main.c
+++ b/sys/dev/liquidio/lio_main.c
@@ -30,7 +30,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$*/
 
 #include "lio_bsd.h"
 #include "lio_common.h"
diff --git a/sys/dev/liquidio/lio_main.h b/sys/dev/liquidio/lio_main.h
index 4be961d1024..9993bdc3ec0 100644
--- a/sys/dev/liquidio/lio_main.h
+++ b/sys/dev/liquidio/lio_main.h
@@ -30,7 +30,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$*/
 
 /*
  *  \file lio_main.h
diff --git a/sys/dev/liquidio/lio_network.h b/sys/dev/liquidio/lio_network.h
index b1f4e1448fe..c364e023650 100644
--- a/sys/dev/liquidio/lio_network.h
+++ b/sys/dev/liquidio/lio_network.h
@@ -30,7 +30,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$*/
 
 /* \file  lio_network.h
  * \brief Host NIC Driver: Structure and Macro definitions used by NIC Module.
diff --git a/sys/dev/liquidio/lio_rss.c b/sys/dev/liquidio/lio_rss.c
index 41a408cb7a0..df10cbbe3a0 100644
--- a/sys/dev/liquidio/lio_rss.c
+++ b/sys/dev/liquidio/lio_rss.c
@@ -30,7 +30,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$*/
 
 #ifdef RSS
 
diff --git a/sys/dev/liquidio/lio_rss.h b/sys/dev/liquidio/lio_rss.h
index b313c2761ce..8a5020d47f7 100644
--- a/sys/dev/liquidio/lio_rss.h
+++ b/sys/dev/liquidio/lio_rss.h
@@ -30,7 +30,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$*/
 
 #ifndef __LIO_RSS_H__
 #define __LIO_RSS_H__
diff --git a/sys/dev/liquidio/lio_rxtx.c b/sys/dev/liquidio/lio_rxtx.c
index c966797c5e3..aafbafae020 100644
--- a/sys/dev/liquidio/lio_rxtx.c
+++ b/sys/dev/liquidio/lio_rxtx.c
@@ -30,7 +30,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$*/
 
 #include "lio_bsd.h"
 #include "lio_common.h"
diff --git a/sys/dev/liquidio/lio_rxtx.h b/sys/dev/liquidio/lio_rxtx.h
index cff25af147f..dc305ab34f1 100644
--- a/sys/dev/liquidio/lio_rxtx.h
+++ b/sys/dev/liquidio/lio_rxtx.h
@@ -30,7 +30,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$*/
 
 #ifndef _LIO_RXTX_H_
 #define _LIO_RXTX_H_
diff --git a/sys/dev/liquidio/lio_sysctl.c b/sys/dev/liquidio/lio_sysctl.c
index cee520e63b6..e9ad9577216 100644
--- a/sys/dev/liquidio/lio_sysctl.c
+++ b/sys/dev/liquidio/lio_sysctl.c
@@ -30,7 +30,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$*/
 
 #include <sys/types.h>
 
diff --git a/sys/dev/mii/e1000phyreg.h b/sys/dev/mii/e1000phyreg.h
index 04c396e5767..4c286fd84db 100644
--- a/sys/dev/mii/e1000phyreg.h
+++ b/sys/dev/mii/e1000phyreg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Principal Author: Parag Patel
  * Copyright (c) 2001
diff --git a/sys/dev/mii/lxtphyreg.h b/sys/dev/mii/lxtphyreg.h
index 76336632366..cd80b163a57 100644
--- a/sys/dev/mii/lxtphyreg.h
+++ b/sys/dev/mii/lxtphyreg.h
@@ -1,6 +1,5 @@
 /*	OpenBSD: lxtphyreg.h,v 1.1 1998/11/11 19:34:47 jason Exp 	*/
 /*	NetBSD: lxtphyreg.h,v 1.1 1998/10/24 00:33:17 thorpej Exp 	*/
-/*	$FreeBSD$	*/
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/mii/qsphyreg.h b/sys/dev/mii/qsphyreg.h
index 20a467853e3..4ce4ceaf146 100644
--- a/sys/dev/mii/qsphyreg.h
+++ b/sys/dev/mii/qsphyreg.h
@@ -1,6 +1,5 @@
 /*	OpenBSD: qsphyreg.h,v 1.2 1999/03/09 00:02:45 jason Exp 	*/
 /*	NetBSD: qsphyreg.h,v 1.1 1998/08/11 00:01:03 thorpej Exp 	*/
-/*	$FreeBSD$	*/
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/mpt/mpilib/mpi.h b/sys/dev/mpt/mpilib/mpi.h
index 5c0c45ac14f..1f1e92b7cf7 100644
--- a/sys/dev/mpt/mpilib/mpi.h
+++ b/sys/dev/mpt/mpilib/mpi.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpilib/mpi_cnfg.h b/sys/dev/mpt/mpilib/mpi_cnfg.h
index 681f8765323..18822512810 100644
--- a/sys/dev/mpt/mpilib/mpi_cnfg.h
+++ b/sys/dev/mpt/mpilib/mpi_cnfg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpilib/mpi_fc.h b/sys/dev/mpt/mpilib/mpi_fc.h
index 6dcf1e44b8f..6e632c84c68 100644
--- a/sys/dev/mpt/mpilib/mpi_fc.h
+++ b/sys/dev/mpt/mpilib/mpi_fc.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpilib/mpi_init.h b/sys/dev/mpt/mpilib/mpi_init.h
index ed2c99f0192..d9c431f4424 100644
--- a/sys/dev/mpt/mpilib/mpi_init.h
+++ b/sys/dev/mpt/mpilib/mpi_init.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpilib/mpi_ioc.h b/sys/dev/mpt/mpilib/mpi_ioc.h
index c1e60b69aba..49c8a930558 100644
--- a/sys/dev/mpt/mpilib/mpi_ioc.h
+++ b/sys/dev/mpt/mpilib/mpi_ioc.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpilib/mpi_lan.h b/sys/dev/mpt/mpilib/mpi_lan.h
index 5d9289c6512..a90b0fc0b4b 100644
--- a/sys/dev/mpt/mpilib/mpi_lan.h
+++ b/sys/dev/mpt/mpilib/mpi_lan.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpilib/mpi_log_fc.h b/sys/dev/mpt/mpilib/mpi_log_fc.h
index 7d414eb38b4..78fa9d44cb8 100644
--- a/sys/dev/mpt/mpilib/mpi_log_fc.h
+++ b/sys/dev/mpt/mpilib/mpi_log_fc.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpilib/mpi_log_sas.h b/sys/dev/mpt/mpilib/mpi_log_sas.h
index 68de0381439..50196103933 100644
--- a/sys/dev/mpt/mpilib/mpi_log_sas.h
+++ b/sys/dev/mpt/mpilib/mpi_log_sas.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpilib/mpi_raid.h b/sys/dev/mpt/mpilib/mpi_raid.h
index 6ed3ec6794a..c7bb2f30ea5 100644
--- a/sys/dev/mpt/mpilib/mpi_raid.h
+++ b/sys/dev/mpt/mpilib/mpi_raid.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpilib/mpi_sas.h b/sys/dev/mpt/mpilib/mpi_sas.h
index 8399c39daef..9b8daf2ad5e 100644
--- a/sys/dev/mpt/mpilib/mpi_sas.h
+++ b/sys/dev/mpt/mpilib/mpi_sas.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpilib/mpi_targ.h b/sys/dev/mpt/mpilib/mpi_targ.h
index 4560627d0ba..9f1a9e7131f 100644
--- a/sys/dev/mpt/mpilib/mpi_targ.h
+++ b/sys/dev/mpt/mpilib/mpi_targ.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpilib/mpi_tool.h b/sys/dev/mpt/mpilib/mpi_tool.h
index 95845c4b920..6ea23531f66 100644
--- a/sys/dev/mpt/mpilib/mpi_tool.h
+++ b/sys/dev/mpt/mpilib/mpi_tool.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpilib/mpi_type.h b/sys/dev/mpt/mpilib/mpi_type.h
index 3009314efdb..10648bad0cd 100644
--- a/sys/dev/mpt/mpilib/mpi_type.h
+++ b/sys/dev/mpt/mpilib/mpi_type.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpt.h b/sys/dev/mpt/mpt.h
index 0682609cad8..8c699d0910a 100644
--- a/sys/dev/mpt/mpt.h
+++ b/sys/dev/mpt/mpt.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Generic defines for LSI '909 FC  adapters.
  * FreeBSD Version.
diff --git a/sys/dev/mpt/mpt_cam.h b/sys/dev/mpt/mpt_cam.h
index de333b11678..3e227a9ef5b 100644
--- a/sys/dev/mpt/mpt_cam.h
+++ b/sys/dev/mpt/mpt_cam.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * LSI MPT Host Adapter FreeBSD Wrapper Definitions (CAM version)
  *
diff --git a/sys/dev/mpt/mpt_raid.h b/sys/dev/mpt/mpt_raid.h
index 8bb96b51615..9fadc4712bb 100644
--- a/sys/dev/mpt/mpt_raid.h
+++ b/sys/dev/mpt/mpt_raid.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/mpt/mpt_reg.h b/sys/dev/mpt/mpt_reg.h
index 65ffd6eef63..6ddc49d23b4 100644
--- a/sys/dev/mpt/mpt_reg.h
+++ b/sys/dev/mpt/mpt_reg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
  *
diff --git a/sys/dev/msk/if_mskreg.h b/sys/dev/msk/if_mskreg.h
index 7bd0b53a49a..6cfdc990fe1 100644
--- a/sys/dev/msk/if_mskreg.h
+++ b/sys/dev/msk/if_mskreg.h
@@ -95,7 +95,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*$FreeBSD$*/
 
 /*
  * SysKonnect PCI vendor ID
diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c
index 7406c5f24f2..95450a5a74d 100644
--- a/sys/dev/netmap/netmap_freebsd.c
+++ b/sys/dev/netmap/netmap_freebsd.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 #include "opt_inet.h"
 #include "opt_inet6.h"
 
diff --git a/sys/dev/netmap/netmap_legacy.c b/sys/dev/netmap/netmap_legacy.c
index b619b1d78b7..152ce959098 100644
--- a/sys/dev/netmap/netmap_legacy.c
+++ b/sys/dev/netmap/netmap_legacy.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #if defined(__FreeBSD__)
 #include <sys/cdefs.h> /* prerequisite */
diff --git a/sys/dev/netmap/netmap_null.c b/sys/dev/netmap/netmap_null.c
index e880304e737..eefc10c2241 100644
--- a/sys/dev/netmap/netmap_null.c
+++ b/sys/dev/netmap/netmap_null.c
@@ -23,7 +23,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
 
 #if defined(__FreeBSD__)
 #include <sys/cdefs.h> /* prerequisite */
diff --git a/sys/dev/netmap/netmap_offloadings.c b/sys/dev/netmap/netmap_offloadings.c
index 745f5f401f3..1cfba145de8 100644
--- a/sys/dev/netmap/netmap_offloadings.c
+++ b/sys/dev/netmap/netmap_offloadings.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #if defined(__FreeBSD__)
 #include <sys/cdefs.h> /* prerequisite */
diff --git a/sys/dev/netmap/netmap_pipe.c b/sys/dev/netmap/netmap_pipe.c
index 21ddab565d4..02f7f25365b 100644
--- a/sys/dev/netmap/netmap_pipe.c
+++ b/sys/dev/netmap/netmap_pipe.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #if defined(__FreeBSD__)
 #include <sys/cdefs.h> /* prerequisite */
diff --git a/sys/dev/oce/oce_hw.c b/sys/dev/oce/oce_hw.c
index aa187e76e86..5cc63fbca29 100644
--- a/sys/dev/oce/oce_hw.c
+++ b/sys/dev/oce/oce_hw.c
@@ -38,7 +38,6 @@
  * Costa Mesa, CA 92626
  */
 
-/* $FreeBSD$ */
 
 #include "oce_if.h"
 
diff --git a/sys/dev/oce/oce_hw.h b/sys/dev/oce/oce_hw.h
index 82023f3dfc7..c9b9c0950f8 100644
--- a/sys/dev/oce/oce_hw.h
+++ b/sys/dev/oce/oce_hw.h
@@ -38,7 +38,6 @@
  * Costa Mesa, CA 92626
  */
 
-/* $FreeBSD$ */
 
 #include <sys/types.h>
 
diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c
index 1127565282c..f3ffe97071a 100644
--- a/sys/dev/oce/oce_if.c
+++ b/sys/dev/oce/oce_if.c
@@ -38,7 +38,6 @@
  * Costa Mesa, CA 92626
  */
 
-/* $FreeBSD$ */
 
 #include "opt_inet6.h"
 #include "opt_inet.h"
diff --git a/sys/dev/oce/oce_if.h b/sys/dev/oce/oce_if.h
index c7386aab68f..631a955c441 100644
--- a/sys/dev/oce/oce_if.h
+++ b/sys/dev/oce/oce_if.h
@@ -38,7 +38,6 @@
  * Costa Mesa, CA 92626
  */
 
-/* $FreeBSD$ */
 
 #include <sys/param.h>
 #include <sys/endian.h>
diff --git a/sys/dev/oce/oce_mbox.c b/sys/dev/oce/oce_mbox.c
index 321775c13d1..867330a1c55 100644
--- a/sys/dev/oce/oce_mbox.c
+++ b/sys/dev/oce/oce_mbox.c
@@ -38,7 +38,6 @@
  * Costa Mesa, CA 92626
  */
 
-/* $FreeBSD$ */
 
 #include "oce_if.h"
 
diff --git a/sys/dev/oce/oce_queue.c b/sys/dev/oce/oce_queue.c
index da4d33065d4..5aa98eb257d 100644
--- a/sys/dev/oce/oce_queue.c
+++ b/sys/dev/oce/oce_queue.c
@@ -38,7 +38,6 @@
  * Costa Mesa, CA 92626
  */
 
-/* $FreeBSD$ */
 
 #include "oce_if.h"
 
diff --git a/sys/dev/oce/oce_sysctl.c b/sys/dev/oce/oce_sysctl.c
index 2b46936f521..1b903d8d027 100644
--- a/sys/dev/oce/oce_sysctl.c
+++ b/sys/dev/oce/oce_sysctl.c
@@ -38,7 +38,6 @@
  * Costa Mesa, CA 92626
  */
 
-/* $FreeBSD$ */
 
 #include "oce_if.h"
 
diff --git a/sys/dev/oce/oce_user.h b/sys/dev/oce/oce_user.h
index b3866589827..e6b359ac278 100644
--- a/sys/dev/oce/oce_user.h
+++ b/sys/dev/oce/oce_user.h
@@ -36,7 +36,6 @@
  * Costa Mesa, CA 92626
  */
 
-/* $FreeBSD$ */
 
 struct oce_mbx;
 struct oce_softc;
diff --git a/sys/dev/oce/oce_util.c b/sys/dev/oce/oce_util.c
index 464f441d0e0..6a8e690cb8c 100644
--- a/sys/dev/oce/oce_util.c
+++ b/sys/dev/oce/oce_util.c
@@ -38,7 +38,6 @@
  * Costa Mesa, CA 92626
  */
 
-/* $FreeBSD$ */
 
 #include "oce_if.h"
 
diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c
index a221d9377ba..a542e472151 100644
--- a/sys/dev/pccard/pccard_cis.c
+++ b/sys/dev/pccard/pccard_cis.c
@@ -1,5 +1,4 @@
 /* $NetBSD: pcmcia_cis.c,v 1.17 2000/02/10 09:01:52 chopps Exp $ */
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
diff --git a/sys/dev/pccard/pccard_cis.h b/sys/dev/pccard/pccard_cis.h
index 915f555924a..1b4db29f9c8 100644
--- a/sys/dev/pccard/pccard_cis.h
+++ b/sys/dev/pccard/pccard_cis.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
diff --git a/sys/dev/pccard/pccardreg.h b/sys/dev/pccard/pccardreg.h
index 7d567dd6d52..567ac314cf3 100644
--- a/sys/dev/pccard/pccardreg.h
+++ b/sys/dev/pccard/pccardreg.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: pcmciareg.h,v 1.7 1998/10/29 09:45:52 enami Exp $	*/
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index 87f41850ec5..546d6993969 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: pcmciavar.h,v 1.12 2000/02/08 12:51:31 enami Exp $	*/
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
diff --git a/sys/dev/pms/freebsd/driver/common/lxutil.c b/sys/dev/pms/freebsd/driver/common/lxutil.c
index ceafe98084e..f008dc3f7d4 100644
--- a/sys/dev/pms/freebsd/driver/common/lxutil.c
+++ b/sys/dev/pms/freebsd/driver/common/lxutil.c
@@ -19,7 +19,6 @@
 *SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 
 ******************************************************************************/
-/* $FreeBSD$ */
 /******************************************************************************
 This program is part of PMC-Sierra initiator/target device driver. 
 The functions here are commonly used by different type of drivers that support
diff --git a/sys/dev/qat/qat_aevar.h b/sys/dev/qat/qat_aevar.h
index 005275a75b3..b33fdb42036 100644
--- a/sys/dev/qat/qat_aevar.h
+++ b/sys/dev/qat/qat_aevar.h
@@ -57,7 +57,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_PCI_QAT_AEVAR_H_
 #define _DEV_PCI_QAT_AEVAR_H_
diff --git a/sys/dev/qat/qat_c2xxxreg.h b/sys/dev/qat/qat_c2xxxreg.h
index 90fd6e18503..daaa7db12e2 100644
--- a/sys/dev/qat/qat_c2xxxreg.h
+++ b/sys/dev/qat/qat_c2xxxreg.h
@@ -57,7 +57,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_PCI_QAT_C2XXXREG_H_
 #define _DEV_PCI_QAT_C2XXXREG_H_
diff --git a/sys/dev/qat/qat_c3xxxreg.h b/sys/dev/qat/qat_c3xxxreg.h
index a003bb9eeb3..3f5b371aa9f 100644
--- a/sys/dev/qat/qat_c3xxxreg.h
+++ b/sys/dev/qat/qat_c3xxxreg.h
@@ -56,7 +56,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_PCI_QAT_C3XXXREG_H_
 #define _DEV_PCI_QAT_C3XXXREG_H_
diff --git a/sys/dev/qat/qat_c62xreg.h b/sys/dev/qat/qat_c62xreg.h
index 5c92774748c..01019c0f371 100644
--- a/sys/dev/qat/qat_c62xreg.h
+++ b/sys/dev/qat/qat_c62xreg.h
@@ -56,7 +56,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_PCI_QAT_C62XREG_H_
 #define _DEV_PCI_QAT_C62XREG_H_
diff --git a/sys/dev/qat/qat_d15xxreg.h b/sys/dev/qat/qat_d15xxreg.h
index 7956f1b0689..536c647d0a2 100644
--- a/sys/dev/qat/qat_d15xxreg.h
+++ b/sys/dev/qat/qat_d15xxreg.h
@@ -56,7 +56,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_PCI_QAT_D15XXREG_H_
 #define _DEV_PCI_QAT_D15XXREG_H_
diff --git a/sys/dev/qat/qat_dh895xccreg.h b/sys/dev/qat/qat_dh895xccreg.h
index 740eb9f78e2..b6429220387 100644
--- a/sys/dev/qat/qat_dh895xccreg.h
+++ b/sys/dev/qat/qat_dh895xccreg.h
@@ -55,7 +55,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_PCI_QAT_DH895XCCREG_H_
 #define _DEV_PCI_QAT_DH895XCCREG_H_
diff --git a/sys/dev/qat/qat_hw15reg.h b/sys/dev/qat/qat_hw15reg.h
index a32e4ae606d..ac80ec242ea 100644
--- a/sys/dev/qat/qat_hw15reg.h
+++ b/sys/dev/qat/qat_hw15reg.h
@@ -57,7 +57,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_PCI_QAT_HW15REG_H_
 #define _DEV_PCI_QAT_HW15REG_H_
diff --git a/sys/dev/qat/qat_hw15var.h b/sys/dev/qat/qat_hw15var.h
index 0606b29b0f7..a9bfc02ba5f 100644
--- a/sys/dev/qat/qat_hw15var.h
+++ b/sys/dev/qat/qat_hw15var.h
@@ -57,7 +57,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_PCI_QAT_HW15VAR_H_
 #define _DEV_PCI_QAT_HW15VAR_H_
diff --git a/sys/dev/qat/qat_hw17reg.h b/sys/dev/qat/qat_hw17reg.h
index 053b4ed5a56..56fcef04c3e 100644
--- a/sys/dev/qat/qat_hw17reg.h
+++ b/sys/dev/qat/qat_hw17reg.h
@@ -56,7 +56,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_PCI_QAT_HW17REG_H_
 #define _DEV_PCI_QAT_HW17REG_H_
diff --git a/sys/dev/qat/qat_hw17var.h b/sys/dev/qat/qat_hw17var.h
index ca4b3696f1f..ed651c848e7 100644
--- a/sys/dev/qat/qat_hw17var.h
+++ b/sys/dev/qat/qat_hw17var.h
@@ -56,7 +56,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_PCI_QAT_HW17VAR_H_
 #define _DEV_PCI_QAT_HW17VAR_H_
diff --git a/sys/dev/qat/qatreg.h b/sys/dev/qat/qatreg.h
index 64d4b34aed6..692b15485b8 100644
--- a/sys/dev/qat/qatreg.h
+++ b/sys/dev/qat/qatreg.h
@@ -57,7 +57,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_PCI_QATREG_H_
 #define _DEV_PCI_QATREG_H_
diff --git a/sys/dev/qat/qatvar.h b/sys/dev/qat/qatvar.h
index ef50b655e65..7999d672345 100644
--- a/sys/dev/qat/qatvar.h
+++ b/sys/dev/qat/qatvar.h
@@ -57,7 +57,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _DEV_PCI_QATVAR_H_
 #define _DEV_PCI_QATVAR_H_
diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c
index 0b127c79d64..e63f65dc3e0 100644
--- a/sys/dev/ral/rt2560.c
+++ b/sys/dev/ral/rt2560.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2005, 2006
diff --git a/sys/dev/ral/rt2560reg.h b/sys/dev/ral/rt2560reg.h
index c41149c9914..af95a7626b6 100644
--- a/sys/dev/ral/rt2560reg.h
+++ b/sys/dev/ral/rt2560reg.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2005, 2006
diff --git a/sys/dev/ral/rt2560var.h b/sys/dev/ral/rt2560var.h
index 51c5372aa66..e040a6b808b 100644
--- a/sys/dev/ral/rt2560var.h
+++ b/sys/dev/ral/rt2560var.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2005, 2006
diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c
index 9587497e8c6..8125f868ef8 100644
--- a/sys/dev/ral/rt2661.c
+++ b/sys/dev/ral/rt2661.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2006
diff --git a/sys/dev/ral/rt2661reg.h b/sys/dev/ral/rt2661reg.h
index 53f9bcde6d7..1aeffd7d2fd 100644
--- a/sys/dev/ral/rt2661reg.h
+++ b/sys/dev/ral/rt2661reg.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2006
diff --git a/sys/dev/ral/rt2661var.h b/sys/dev/ral/rt2661var.h
index 9871bd9454a..0f6a6c16c5f 100644
--- a/sys/dev/ral/rt2661var.h
+++ b/sys/dev/ral/rt2661var.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2005
diff --git a/sys/dev/rndtest/rndtest.h b/sys/dev/rndtest/rndtest.h
index 4858f415e27..ce50ace7e2c 100644
--- a/sys/dev/rndtest/rndtest.h
+++ b/sys/dev/rndtest/rndtest.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD$	*/
 
 /*-
diff --git a/sys/dev/smartpqi/smartpqi_cam.c b/sys/dev/smartpqi/smartpqi_cam.c
index 785a8323d6f..5c324981362 100644
--- a/sys/dev/smartpqi/smartpqi_cam.c
+++ b/sys/dev/smartpqi/smartpqi_cam.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 /*
  * CAM interface for smartpqi driver
  */
diff --git a/sys/dev/smartpqi/smartpqi_cmd.c b/sys/dev/smartpqi/smartpqi_cmd.c
index 3c7c6311c6a..f5820647fed 100644
--- a/sys/dev/smartpqi/smartpqi_cmd.c
+++ b/sys/dev/smartpqi/smartpqi_cmd.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include "smartpqi_includes.h"
 
diff --git a/sys/dev/smartpqi/smartpqi_defines.h b/sys/dev/smartpqi/smartpqi_defines.h
index 10a1a78d459..20a9fc84114 100644
--- a/sys/dev/smartpqi/smartpqi_defines.h
+++ b/sys/dev/smartpqi/smartpqi_defines.h
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _PQI_DEFINES_H
 #define _PQI_DEFINES_H
diff --git a/sys/dev/smartpqi/smartpqi_discovery.c b/sys/dev/smartpqi/smartpqi_discovery.c
index cb08e5a0982..48243d8fc88 100644
--- a/sys/dev/smartpqi/smartpqi_discovery.c
+++ b/sys/dev/smartpqi/smartpqi_discovery.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include "smartpqi_includes.h"
 
diff --git a/sys/dev/smartpqi/smartpqi_event.c b/sys/dev/smartpqi/smartpqi_event.c
index 9cdf388a126..cec8bbad3cb 100644
--- a/sys/dev/smartpqi/smartpqi_event.c
+++ b/sys/dev/smartpqi/smartpqi_event.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include"smartpqi_includes.h"
 
diff --git a/sys/dev/smartpqi/smartpqi_helper.c b/sys/dev/smartpqi/smartpqi_helper.c
index bdc5f6572d8..7161a3fc49b 100644
--- a/sys/dev/smartpqi/smartpqi_helper.c
+++ b/sys/dev/smartpqi/smartpqi_helper.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include "smartpqi_includes.h"
 
diff --git a/sys/dev/smartpqi/smartpqi_includes.h b/sys/dev/smartpqi/smartpqi_includes.h
index 6c91133cb15..a783580c2e8 100644
--- a/sys/dev/smartpqi/smartpqi_includes.h
+++ b/sys/dev/smartpqi/smartpqi_includes.h
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _PQI_INCLUDES_H
 #define _PQI_INCLUDES_H
diff --git a/sys/dev/smartpqi/smartpqi_init.c b/sys/dev/smartpqi/smartpqi_init.c
index 0b7ea1273e4..d28d76f1481 100644
--- a/sys/dev/smartpqi/smartpqi_init.c
+++ b/sys/dev/smartpqi/smartpqi_init.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include "smartpqi_includes.h"
 
diff --git a/sys/dev/smartpqi/smartpqi_intr.c b/sys/dev/smartpqi/smartpqi_intr.c
index e22bbbb1f18..0126ef414f7 100644
--- a/sys/dev/smartpqi/smartpqi_intr.c
+++ b/sys/dev/smartpqi/smartpqi_intr.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include "smartpqi_includes.h"
 
diff --git a/sys/dev/smartpqi/smartpqi_ioctl.c b/sys/dev/smartpqi/smartpqi_ioctl.c
index 9f43f2e1faa..4e259fcb08a 100644
--- a/sys/dev/smartpqi/smartpqi_ioctl.c
+++ b/sys/dev/smartpqi/smartpqi_ioctl.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 /*
  * Management interface for smartpqi driver
diff --git a/sys/dev/smartpqi/smartpqi_ioctl.h b/sys/dev/smartpqi/smartpqi_ioctl.h
index 42b091bcb49..cd67135cc82 100644
--- a/sys/dev/smartpqi/smartpqi_ioctl.h
+++ b/sys/dev/smartpqi/smartpqi_ioctl.h
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	_PQI_IOCTL_H_
 #define	_PQI_IOCTL_H_
diff --git a/sys/dev/smartpqi/smartpqi_main.c b/sys/dev/smartpqi/smartpqi_main.c
index 97747be50d2..b7c3c47ffd1 100644
--- a/sys/dev/smartpqi/smartpqi_main.c
+++ b/sys/dev/smartpqi/smartpqi_main.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 /*
  * Driver for the Microsemi Smart storage controllers
diff --git a/sys/dev/smartpqi/smartpqi_mem.c b/sys/dev/smartpqi/smartpqi_mem.c
index 1ed2a582e57..2dd856c4046 100644
--- a/sys/dev/smartpqi/smartpqi_mem.c
+++ b/sys/dev/smartpqi/smartpqi_mem.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include "smartpqi_includes.h"
 
diff --git a/sys/dev/smartpqi/smartpqi_misc.c b/sys/dev/smartpqi/smartpqi_misc.c
index 632b398f101..5072982363a 100644
--- a/sys/dev/smartpqi/smartpqi_misc.c
+++ b/sys/dev/smartpqi/smartpqi_misc.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include "smartpqi_includes.h"
 
diff --git a/sys/dev/smartpqi/smartpqi_prototypes.h b/sys/dev/smartpqi/smartpqi_prototypes.h
index 1aa68cf889b..e66d6e337e0 100644
--- a/sys/dev/smartpqi/smartpqi_prototypes.h
+++ b/sys/dev/smartpqi/smartpqi_prototypes.h
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _PQI_PROTOTYPES_H
 #define _PQI_PROTOTYPES_H
diff --git a/sys/dev/smartpqi/smartpqi_queue.c b/sys/dev/smartpqi/smartpqi_queue.c
index da75a8f975d..b5c962752d7 100644
--- a/sys/dev/smartpqi/smartpqi_queue.c
+++ b/sys/dev/smartpqi/smartpqi_queue.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include "smartpqi_includes.h"
 
diff --git a/sys/dev/smartpqi/smartpqi_request.c b/sys/dev/smartpqi/smartpqi_request.c
index 81f9e106bd8..9b1ef29a2b3 100644
--- a/sys/dev/smartpqi/smartpqi_request.c
+++ b/sys/dev/smartpqi/smartpqi_request.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include "smartpqi_includes.h"
 
diff --git a/sys/dev/smartpqi/smartpqi_response.c b/sys/dev/smartpqi/smartpqi_response.c
index e89b65db01e..3e53506889d 100644
--- a/sys/dev/smartpqi/smartpqi_response.c
+++ b/sys/dev/smartpqi/smartpqi_response.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include "smartpqi_includes.h"
 
diff --git a/sys/dev/smartpqi/smartpqi_sis.c b/sys/dev/smartpqi/smartpqi_sis.c
index 07bde7b5412..cbfc4658a3f 100644
--- a/sys/dev/smartpqi/smartpqi_sis.c
+++ b/sys/dev/smartpqi/smartpqi_sis.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include "smartpqi_includes.h"
 
diff --git a/sys/dev/smartpqi/smartpqi_structures.h b/sys/dev/smartpqi/smartpqi_structures.h
index 2a71cc1d88d..ea9df8eab88 100644
--- a/sys/dev/smartpqi/smartpqi_structures.h
+++ b/sys/dev/smartpqi/smartpqi_structures.h
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _PQI_STRUCTURES_H
 #define _PQI_STRUCTURES_H
diff --git a/sys/dev/smartpqi/smartpqi_tag.c b/sys/dev/smartpqi/smartpqi_tag.c
index 2346df89102..624eaf576da 100644
--- a/sys/dev/smartpqi/smartpqi_tag.c
+++ b/sys/dev/smartpqi/smartpqi_tag.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #include "smartpqi_includes.h"
 
diff --git a/sys/dev/sound/pci/allegro_code.h b/sys/dev/sound/pci/allegro_code.h
index 29f2f603ab2..4f3e67ed7e8 100644
--- a/sys/dev/sound/pci/allegro_code.h
+++ b/sys/dev/sound/pci/allegro_code.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/sound/pci/allegro_reg.h b/sys/dev/sound/pci/allegro_reg.h
index 60b0c812e78..4a800eebbd5 100644
--- a/sys/dev/sound/pci/allegro_reg.h
+++ b/sys/dev/sound/pci/allegro_reg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/sound/pci/cs461x_dsp.h b/sys/dev/sound/pci/cs461x_dsp.h
index defa18e29f4..5d601bb3ce6 100644
--- a/sys/dev/sound/pci/cs461x_dsp.h
+++ b/sys/dev/sound/pci/cs461x_dsp.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/sound/pci/emuxkireg.h b/sys/dev/sound/pci/emuxkireg.h
index a1cf896db53..9ddfae25179 100644
--- a/sys/dev/sound/pci/emuxkireg.h
+++ b/sys/dev/sound/pci/emuxkireg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: emuxkireg.h,v 1.8 2008/04/28 20:23:54 martin Exp $	*/
 
 /*-
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index a45e4da143c..1ab49c6b2e8 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -1,5 +1,4 @@
 /*	$NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $	*/
-/*	$FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/sound/usb/uaudio.h b/sys/dev/sound/usb/uaudio.h
index 792bbe017c9..08144701efe 100644
--- a/sys/dev/sound/usb/uaudio.h
+++ b/sys/dev/sound/usb/uaudio.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c
index 864081740c3..b6ae6c1731a 100644
--- a/sys/dev/sound/usb/uaudio_pcm.c
+++ b/sys/dev/sound/usb/uaudio_pcm.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/sound/usb/uaudioreg.h b/sys/dev/sound/usb/uaudioreg.h
index 1cba7343d8a..aba07cf3c77 100644
--- a/sys/dev/sound/usb/uaudioreg.h
+++ b/sys/dev/sound/usb/uaudioreg.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: uaudioreg.h,v 1.12 2004/11/05 19:08:29 kent Exp $	*/
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/stge/if_stgereg.h b/sys/dev/stge/if_stgereg.h
index f724824ad5c..3c7806af835 100644
--- a/sys/dev/stge/if_stgereg.h
+++ b/sys/dev/stge/if_stgereg.h
@@ -31,7 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 /*
  * Sundance Technology PCI vendor ID
diff --git a/sys/dev/sume/adapter.h b/sys/dev/sume/adapter.h
index 6780f4a4343..36f3a8153cf 100644
--- a/sys/dev/sume/adapter.h
+++ b/sys/dev/sume/adapter.h
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #define	DEFAULT_ETHER_ADDRESS		"\02SUME\00"
 #define	SUME_ETH_DEVICE_NAME		"sume"
diff --git a/sys/dev/sym/sym_conf.h b/sys/dev/sym/sym_conf.h
index c5ce93864a6..b8e0d746add 100644
--- a/sys/dev/sym/sym_conf.h
+++ b/sys/dev/sym/sym_conf.h
@@ -57,7 +57,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef SYM_CONF_H
 #define SYM_CONF_H
diff --git a/sys/dev/sym/sym_defs.h b/sys/dev/sym/sym_defs.h
index e3c4fde9d41..61aec202bbe 100644
--- a/sys/dev/sym/sym_defs.h
+++ b/sys/dev/sym/sym_defs.h
@@ -57,7 +57,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef SYM_DEFS_H
 #define SYM_DEFS_H
diff --git a/sys/dev/sym/sym_fw.h b/sys/dev/sym/sym_fw.h
index ce97c9252c2..ebecd7d3c06 100644
--- a/sys/dev/sym/sym_fw.h
+++ b/sys/dev/sym/sym_fw.h
@@ -57,7 +57,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	SYM_FW_H
 #define	SYM_FW_H
diff --git a/sys/dev/sym/sym_fw1.h b/sys/dev/sym/sym_fw1.h
index cab8c979cd0..5037e24ca34 100644
--- a/sys/dev/sym/sym_fw1.h
+++ b/sys/dev/sym/sym_fw1.h
@@ -57,7 +57,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 /*
  *  Scripts for SYMBIOS-Processor
diff --git a/sys/dev/sym/sym_fw2.h b/sys/dev/sym/sym_fw2.h
index ed6f96c3d22..2b23285d60b 100644
--- a/sys/dev/sym/sym_fw2.h
+++ b/sys/dev/sym/sym_fw2.h
@@ -57,7 +57,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 /*
  *  Scripts for SYMBIOS-Processor
diff --git a/sys/dev/syscons/logo/beastie.c b/sys/dev/syscons/logo/beastie.c
index ea3f46e5c3a..cbf6445ac4f 100644
--- a/sys/dev/syscons/logo/beastie.c
+++ b/sys/dev/syscons/logo/beastie.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #define logo_width 88
 #define logo_height 88
diff --git a/sys/dev/syscons/logo/logo.c b/sys/dev/syscons/logo/logo.c
index 1c5aa228e3f..039854273cb 100644
--- a/sys/dev/syscons/logo/logo.c
+++ b/sys/dev/syscons/logo/logo.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #define	LOGO_WIDTH	66
 #define	LOGO_HEIGHT	69
diff --git a/sys/dev/usb/controller/atmegadci.c b/sys/dev/usb/controller/atmegadci.c
index ed81160e909..8e9bc029dc1 100644
--- a/sys/dev/usb/controller/atmegadci.c
+++ b/sys/dev/usb/controller/atmegadci.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/atmegadci.h b/sys/dev/usb/controller/atmegadci.h
index b81a6b2602e..55db69e123f 100644
--- a/sys/dev/usb/controller/atmegadci.h
+++ b/sys/dev/usb/controller/atmegadci.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/avr32dci.c b/sys/dev/usb/controller/avr32dci.c
index e12f3925573..e968d799e37 100644
--- a/sys/dev/usb/controller/avr32dci.c
+++ b/sys/dev/usb/controller/avr32dci.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/avr32dci.h b/sys/dev/usb/controller/avr32dci.h
index e623d2b548d..bade769c65a 100644
--- a/sys/dev/usb/controller/avr32dci.h
+++ b/sys/dev/usb/controller/avr32dci.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/dwc_otg.c b/sys/dev/usb/controller/dwc_otg.c
index 9e142f6fefb..c888d4c48be 100644
--- a/sys/dev/usb/controller/dwc_otg.c
+++ b/sys/dev/usb/controller/dwc_otg.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/dwc_otg.h b/sys/dev/usb/controller/dwc_otg.h
index 195765fb72c..fe0aef6d6b7 100644
--- a/sys/dev/usb/controller/dwc_otg.h
+++ b/sys/dev/usb/controller/dwc_otg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/dwc_otgreg.h b/sys/dev/usb/controller/dwc_otgreg.h
index 8b4d0df866c..e012de28c54 100644
--- a/sys/dev/usb/controller/dwc_otgreg.h
+++ b/sys/dev/usb/controller/dwc_otgreg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/usb/controller/ehci.c b/sys/dev/usb/controller/ehci.c
index bd8cfdeff95..c75ebd1b2e4 100644
--- a/sys/dev/usb/controller/ehci.c
+++ b/sys/dev/usb/controller/ehci.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/ehci.h b/sys/dev/usb/controller/ehci.h
index 68f68b207be..4576457712a 100644
--- a/sys/dev/usb/controller/ehci.h
+++ b/sys/dev/usb/controller/ehci.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/ehcireg.h b/sys/dev/usb/controller/ehcireg.h
index b7597ac7d19..90c00610398 100644
--- a/sys/dev/usb/controller/ehcireg.h
+++ b/sys/dev/usb/controller/ehcireg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/generic_xhci.h b/sys/dev/usb/controller/generic_xhci.h
index 40b6c35d086..6753140e111 100644
--- a/sys/dev/usb/controller/generic_xhci.h
+++ b/sys/dev/usb/controller/generic_xhci.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/usb/controller/musb_otg.c b/sys/dev/usb/controller/musb_otg.c
index 00dd8b6ac6e..caede049593 100644
--- a/sys/dev/usb/controller/musb_otg.c
+++ b/sys/dev/usb/controller/musb_otg.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/musb_otg.h b/sys/dev/usb/controller/musb_otg.h
index dbd91b587d6..a41f7da9483 100644
--- a/sys/dev/usb/controller/musb_otg.h
+++ b/sys/dev/usb/controller/musb_otg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/ohci.c b/sys/dev/usb/controller/ohci.c
index 102fbbe97a8..eb4b394d7a4 100644
--- a/sys/dev/usb/controller/ohci.c
+++ b/sys/dev/usb/controller/ohci.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/ohci.h b/sys/dev/usb/controller/ohci.h
index 515c5059119..e8f7ae39ba8 100644
--- a/sys/dev/usb/controller/ohci.h
+++ b/sys/dev/usb/controller/ohci.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/ohcireg.h b/sys/dev/usb/controller/ohcireg.h
index 5f74a0bdbcc..2a904840bc1 100644
--- a/sys/dev/usb/controller/ohcireg.h
+++ b/sys/dev/usb/controller/ohcireg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/saf1761_otg.c b/sys/dev/usb/controller/saf1761_otg.c
index f5725a3cb48..63b2e837159 100644
--- a/sys/dev/usb/controller/saf1761_otg.c
+++ b/sys/dev/usb/controller/saf1761_otg.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2014 Hans Petter Selasky <hselasky@FreeBSD.org>
  * All rights reserved.
diff --git a/sys/dev/usb/controller/saf1761_otg.h b/sys/dev/usb/controller/saf1761_otg.h
index 4ab9b629927..d611d5c1433 100644
--- a/sys/dev/usb/controller/saf1761_otg.h
+++ b/sys/dev/usb/controller/saf1761_otg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2014 Hans Petter Selasky <hselasky@FreeBSD.org>
  * All rights reserved.
diff --git a/sys/dev/usb/controller/saf1761_otg_boot.c b/sys/dev/usb/controller/saf1761_otg_boot.c
index cc9e9a16ef9..fc16060ed1a 100644
--- a/sys/dev/usb/controller/saf1761_otg_boot.c
+++ b/sys/dev/usb/controller/saf1761_otg_boot.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2014 Hans Petter Selasky <hselasky@FreeBSD.org>
  * All rights reserved.
diff --git a/sys/dev/usb/controller/saf1761_otg_fdt.c b/sys/dev/usb/controller/saf1761_otg_fdt.c
index 0d7f2933a84..e9795055bed 100644
--- a/sys/dev/usb/controller/saf1761_otg_fdt.c
+++ b/sys/dev/usb/controller/saf1761_otg_fdt.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2014 Hans Petter Selasky <hselasky@FreeBSD.org>
  * All rights reserved.
diff --git a/sys/dev/usb/controller/saf1761_otg_reg.h b/sys/dev/usb/controller/saf1761_otg_reg.h
index 5410cb45ecf..d0eb3567941 100644
--- a/sys/dev/usb/controller/saf1761_otg_reg.h
+++ b/sys/dev/usb/controller/saf1761_otg_reg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2014 Hans Petter Selasky <hselasky@FreeBSD.org>
  * All rights reserved.
diff --git a/sys/dev/usb/controller/uhci.c b/sys/dev/usb/controller/uhci.c
index a374bcde21b..a5af863f2e0 100644
--- a/sys/dev/usb/controller/uhci.c
+++ b/sys/dev/usb/controller/uhci.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/uhci.h b/sys/dev/usb/controller/uhci.h
index 3d19ee223a0..e3068571580 100644
--- a/sys/dev/usb/controller/uhci.h
+++ b/sys/dev/usb/controller/uhci.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/uhcireg.h b/sys/dev/usb/controller/uhcireg.h
index a65087cfd81..b8749ddf2bc 100644
--- a/sys/dev/usb/controller/uhcireg.h
+++ b/sys/dev/usb/controller/uhcireg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c
index fd18d93e344..26dec849697 100644
--- a/sys/dev/usb/controller/usb_controller.c
+++ b/sys/dev/usb/controller/usb_controller.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/uss820dci.c b/sys/dev/usb/controller/uss820dci.c
index 3ccbf761879..12cf4e0abb8 100644
--- a/sys/dev/usb/controller/uss820dci.c
+++ b/sys/dev/usb/controller/uss820dci.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/uss820dci.h b/sys/dev/usb/controller/uss820dci.h
index d3ccfcda459..2fc43c0e60d 100644
--- a/sys/dev/usb/controller/uss820dci.h
+++ b/sys/dev/usb/controller/uss820dci.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c
index bfce0f60a59..987a7e8d94d 100644
--- a/sys/dev/usb/controller/xhci.c
+++ b/sys/dev/usb/controller/xhci.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h
index 175a5951db1..49f620e62ef 100644
--- a/sys/dev/usb/controller/xhci.h
+++ b/sys/dev/usb/controller/xhci.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/usb/controller/xhcireg.h b/sys/dev/usb/controller/xhcireg.h
index 8fd321b5508..9d0b6e2f4b4 100644
--- a/sys/dev/usb/controller/xhcireg.h
+++ b/sys/dev/usb/controller/xhcireg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/usb/gadget/g_audio.h b/sys/dev/usb/gadget/g_audio.h
index d389385ae04..30a12d82b88 100644
--- a/sys/dev/usb/gadget/g_audio.h
+++ b/sys/dev/usb/gadget/g_audio.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/gadget/g_keyboard.h b/sys/dev/usb/gadget/g_keyboard.h
index 7a05c6813b0..d2999e76d26 100644
--- a/sys/dev/usb/gadget/g_keyboard.h
+++ b/sys/dev/usb/gadget/g_keyboard.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/gadget/g_modem.h b/sys/dev/usb/gadget/g_modem.h
index bd1e7878f78..f6ea3420ebe 100644
--- a/sys/dev/usb/gadget/g_modem.h
+++ b/sys/dev/usb/gadget/g_modem.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/gadget/g_mouse.h b/sys/dev/usb/gadget/g_mouse.h
index d2361ce276a..4ddef8a4729 100644
--- a/sys/dev/usb/gadget/g_mouse.h
+++ b/sys/dev/usb/gadget/g_mouse.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/net/if_iphethvar.h b/sys/dev/usb/net/if_iphethvar.h
index 22c4865a736..203bb96b6f2 100644
--- a/sys/dev/usb/net/if_iphethvar.h
+++ b/sys/dev/usb/net/if_iphethvar.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/net/if_mosreg.h b/sys/dev/usb/net/if_mosreg.h
index b8034feb8e4..9f7a3a35aea 100644
--- a/sys/dev/usb/net/if_mosreg.h
+++ b/sys/dev/usb/net/if_mosreg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2010, 2011 Rick van der Zwet <info@rickvanderzwet.nl>
  *
diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c
index 6d6d020ac87..774b2b7fa80 100644
--- a/sys/dev/usb/net/if_udav.c
+++ b/sys/dev/usb/net/if_udav.c
@@ -1,6 +1,5 @@
 /*	$NetBSD: if_udav.c,v 1.2 2003/09/04 15:17:38 tsutsui Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
-/*	$FreeBSD$	*/
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/usb/net/if_udavreg.h b/sys/dev/usb/net/if_udavreg.h
index d892700620b..5e24dddf71f 100644
--- a/sys/dev/usb/net/if_udavreg.h
+++ b/sys/dev/usb/net/if_udavreg.h
@@ -1,6 +1,5 @@
 /*	$NetBSD: if_udavreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $	*/
 /*	$nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $	*/
-/*	$FreeBSD$	*/
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/usb/net/if_urndisreg.h b/sys/dev/usb/net/if_urndisreg.h
index 660624cf7e3..ba147928eb5 100644
--- a/sys/dev/usb/net/if_urndisreg.h
+++ b/sys/dev/usb/net/if_urndisreg.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$ */
 /*	$OpenBSD: if_urndisreg.h,v 1.19 2013/11/21 14:08:05 mpi Exp $ */
 
 /*
diff --git a/sys/dev/usb/net/if_usievar.h b/sys/dev/usb/net/if_usievar.h
index 28b89a1db83..5d0321f02f6 100644
--- a/sys/dev/usb/net/if_usievar.h
+++ b/sys/dev/usb/net/if_usievar.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 2011 Anybots Inc
diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c
index 8d5a5d7e64e..4dad902cdc6 100644
--- a/sys/dev/usb/net/usb_ethernet.c
+++ b/sys/dev/usb/net/usb_ethernet.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/net/usb_ethernet.h b/sys/dev/usb/net/usb_ethernet.h
index cffdfaf92d5..5260d69201a 100644
--- a/sys/dev/usb/net/usb_ethernet.h
+++ b/sys/dev/usb/net/usb_ethernet.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c
index 0e8db66f522..45254c62873 100644
--- a/sys/dev/usb/quirk/usb_quirk.c
+++ b/sys/dev/usb/quirk/usb_quirk.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/quirk/usb_quirk.h b/sys/dev/usb/quirk/usb_quirk.h
index ea2eac81b73..8e8bfd152eb 100644
--- a/sys/dev/usb/quirk/usb_quirk.h
+++ b/sys/dev/usb/quirk/usb_quirk.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/serial/uftdi_reg.h b/sys/dev/usb/serial/uftdi_reg.h
index a1ea325b89a..80936f80b6f 100644
--- a/sys/dev/usb/serial/uftdi_reg.h
+++ b/sys/dev/usb/serial/uftdi_reg.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: uftdireg.h,v 1.6 2002/07/11 21:14:28 augustss Exp $ */
-/*	$FreeBSD$	*/
 
 /*
  * Definitions for the FTDI USB Single Port Serial Converter -
diff --git a/sys/dev/usb/serial/ugensa.c b/sys/dev/usb/serial/ugensa.c
index ddcd9a93ed7..b4de468e58a 100644
--- a/sys/dev/usb/serial/ugensa.c
+++ b/sys/dev/usb/serial/ugensa.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: ugensa.c,v 1.9.2.1 2007/03/24 14:55:50 yamt Exp $	*/
 
 /*-
diff --git a/sys/dev/usb/serial/umcs.h b/sys/dev/usb/serial/umcs.h
index df3b8b6b1c2..c8c6135710c 100644
--- a/sys/dev/usb/serial/umcs.h
+++ b/sys/dev/usb/serial/umcs.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/serial/umoscom.c b/sys/dev/usb/serial/umoscom.c
index 724ab7f9409..74fc4eb2348 100644
--- a/sys/dev/usb/serial/umoscom.c
+++ b/sys/dev/usb/serial/umoscom.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$OpenBSD: umoscom.c,v 1.2 2006/10/26 06:02:43 jsg Exp $	*/
 
 /*
diff --git a/sys/dev/usb/serial/usb_serial.h b/sys/dev/usb/serial/usb_serial.h
index 306eb035c8c..bdbdc3e6051 100644
--- a/sys/dev/usb/serial/usb_serial.h
+++ b/sys/dev/usb/serial/usb_serial.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: ucomvar.h,v 1.9 2001/01/23 21:56:17 augustss Exp $	*/
-/*	$FreeBSD$	*/
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
diff --git a/sys/dev/usb/serial/uvisor.c b/sys/dev/usb/serial/uvisor.c
index a0bdb300110..bc73f1f3a43 100644
--- a/sys/dev/usb/serial/uvisor.c
+++ b/sys/dev/usb/serial/uvisor.c
@@ -1,5 +1,4 @@
 /*	$NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $	*/
-/*      $FreeBSD$ */
 
 /* Also already merged from NetBSD:
  *	$NetBSD: uvisor.c,v 1.12 2001/11/13 06:24:57 lukem Exp $
diff --git a/sys/dev/usb/storage/rio500_usb.h b/sys/dev/usb/storage/rio500_usb.h
index 4f9a520c1b5..0adef69cf1d 100644
--- a/sys/dev/usb/storage/rio500_usb.h
+++ b/sys/dev/usb/storage/rio500_usb.h
@@ -20,7 +20,6 @@
 
     ---------------------------------------------------------------------- */
 
-/*  $FreeBSD$ */
 
 #include <sys/ioccom.h>
 #ifndef USB_VENDOR_DIAMOND
diff --git a/sys/dev/usb/storage/ustorage_fs.c b/sys/dev/usb/storage/ustorage_fs.c
index adcb632bc93..f806952c6ec 100644
--- a/sys/dev/usb/storage/ustorage_fs.c
+++ b/sys/dev/usb/storage/ustorage_fs.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/usb/template/usb_template.c b/sys/dev/usb/template/usb_template.c
index 617f70096cd..6e9de2a6dcc 100644
--- a/sys/dev/usb/template/usb_template.c
+++ b/sys/dev/usb/template/usb_template.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/template/usb_template.h b/sys/dev/usb/template/usb_template.h
index 8ca4ad15bfe..e99507b4cc7 100644
--- a/sys/dev/usb/template/usb_template.h
+++ b/sys/dev/usb/template/usb_template.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/template/usb_template_audio.c b/sys/dev/usb/template/usb_template_audio.c
index e0c3c9a52fa..17d59f05a50 100644
--- a/sys/dev/usb/template/usb_template_audio.c
+++ b/sys/dev/usb/template/usb_template_audio.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/template/usb_template_cdce.c b/sys/dev/usb/template/usb_template_cdce.c
index 9860ca6355e..11fd9a64b87 100644
--- a/sys/dev/usb/template/usb_template_cdce.c
+++ b/sys/dev/usb/template/usb_template_cdce.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/template/usb_template_cdceem.c b/sys/dev/usb/template/usb_template_cdceem.c
index b610f552c51..2412f8728b7 100644
--- a/sys/dev/usb/template/usb_template_cdceem.c
+++ b/sys/dev/usb/template/usb_template_cdceem.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/template/usb_template_kbd.c b/sys/dev/usb/template/usb_template_kbd.c
index 246936007a0..6a88da623c9 100644
--- a/sys/dev/usb/template/usb_template_kbd.c
+++ b/sys/dev/usb/template/usb_template_kbd.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/template/usb_template_midi.c b/sys/dev/usb/template/usb_template_midi.c
index f70bdaf5961..92374bb7af3 100644
--- a/sys/dev/usb/template/usb_template_midi.c
+++ b/sys/dev/usb/template/usb_template_midi.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/template/usb_template_modem.c b/sys/dev/usb/template/usb_template_modem.c
index 67c5ab161fb..7c4418e633c 100644
--- a/sys/dev/usb/template/usb_template_modem.c
+++ b/sys/dev/usb/template/usb_template_modem.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/template/usb_template_mouse.c b/sys/dev/usb/template/usb_template_mouse.c
index 94f26c40454..a6cda143a6e 100644
--- a/sys/dev/usb/template/usb_template_mouse.c
+++ b/sys/dev/usb/template/usb_template_mouse.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/template/usb_template_msc.c b/sys/dev/usb/template/usb_template_msc.c
index 2fb63deacc6..705077b6e89 100644
--- a/sys/dev/usb/template/usb_template_msc.c
+++ b/sys/dev/usb/template/usb_template_msc.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/template/usb_template_mtp.c b/sys/dev/usb/template/usb_template_mtp.c
index 88f31139624..ef1112e3ff3 100644
--- a/sys/dev/usb/template/usb_template_mtp.c
+++ b/sys/dev/usb/template/usb_template_mtp.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/template/usb_template_phone.c b/sys/dev/usb/template/usb_template_phone.c
index 259feaee2a6..4e77bd86ef7 100644
--- a/sys/dev/usb/template/usb_template_phone.c
+++ b/sys/dev/usb/template/usb_template_phone.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/ufm_ioctl.h b/sys/dev/usb/ufm_ioctl.h
index b9e4f82afe8..a95741b71e2 100644
--- a/sys/dev/usb/ufm_ioctl.h
+++ b/sys/dev/usb/ufm_ioctl.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index da7ad714225..3d00cda27d1 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_bus.h b/sys/dev/usb/usb_bus.h
index 05365f57ad1..b9197d3cd84 100644
--- a/sys/dev/usb/usb_bus.h
+++ b/sys/dev/usb/usb_bus.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_busdma.c b/sys/dev/usb/usb_busdma.c
index 26e3bd06310..c653fcad539 100644
--- a/sys/dev/usb/usb_busdma.c
+++ b/sys/dev/usb/usb_busdma.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_busdma.h b/sys/dev/usb/usb_busdma.h
index 2401b766011..124febdec95 100644
--- a/sys/dev/usb/usb_busdma.h
+++ b/sys/dev/usb/usb_busdma.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_cdc.h b/sys/dev/usb/usb_cdc.h
index a09fd473034..9dd976da588 100644
--- a/sys/dev/usb/usb_cdc.h
+++ b/sys/dev/usb/usb_cdc.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: usbcdc.h,v 1.9 2004/10/23 13:24:24 augustss Exp $	*/
-/*	$FreeBSD$	*/
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/usb/usb_controller.h b/sys/dev/usb/usb_controller.h
index 8f7b734cfad..be0a468e5ad 100644
--- a/sys/dev/usb/usb_controller.h
+++ b/sys/dev/usb/usb_controller.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_core.c b/sys/dev/usb/usb_core.c
index 3a28c655417..04b428a9b65 100644
--- a/sys/dev/usb/usb_core.c
+++ b/sys/dev/usb/usb_core.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_core.h b/sys/dev/usb/usb_core.h
index 69dabe34c2c..ef1ad08527c 100644
--- a/sys/dev/usb/usb_core.h
+++ b/sys/dev/usb/usb_core.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_debug.c b/sys/dev/usb/usb_debug.c
index 8b8a16818b2..1d855007391 100644
--- a/sys/dev/usb/usb_debug.c
+++ b/sys/dev/usb/usb_debug.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_debug.h b/sys/dev/usb/usb_debug.h
index cbbc667de45..736504dc753 100644
--- a/sys/dev/usb/usb_debug.h
+++ b/sys/dev/usb/usb_debug.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c
index 37ceebaf947..2ed07409f00 100644
--- a/sys/dev/usb/usb_dev.c
+++ b/sys/dev/usb/usb_dev.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_dev.h b/sys/dev/usb/usb_dev.h
index b1ac3f637cb..5b63e36037d 100644
--- a/sys/dev/usb/usb_dev.h
+++ b/sys/dev/usb/usb_dev.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c
index 8d44991e416..fb28db86953 100644
--- a/sys/dev/usb/usb_device.c
+++ b/sys/dev/usb/usb_device.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_device.h b/sys/dev/usb/usb_device.h
index b98ee90290a..3fc5efb049f 100644
--- a/sys/dev/usb/usb_device.h
+++ b/sys/dev/usb/usb_device.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_dynamic.c b/sys/dev/usb/usb_dynamic.c
index e08822da971..b9ec83dc78e 100644
--- a/sys/dev/usb/usb_dynamic.c
+++ b/sys/dev/usb/usb_dynamic.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_dynamic.h b/sys/dev/usb/usb_dynamic.h
index a6f40265674..15327f59af7 100644
--- a/sys/dev/usb/usb_dynamic.h
+++ b/sys/dev/usb/usb_dynamic.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_endian.h b/sys/dev/usb/usb_endian.h
index 650a3e72196..a9fcf06c3b4 100644
--- a/sys/dev/usb/usb_endian.h
+++ b/sys/dev/usb/usb_endian.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_error.c b/sys/dev/usb/usb_error.c
index 044994f1304..7d961c58b9f 100644
--- a/sys/dev/usb/usb_error.c
+++ b/sys/dev/usb/usb_error.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_freebsd.h b/sys/dev/usb/usb_freebsd.h
index dec0e12816c..98498c6cd2b 100644
--- a/sys/dev/usb/usb_freebsd.h
+++ b/sys/dev/usb/usb_freebsd.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_freebsd_loader.h b/sys/dev/usb/usb_freebsd_loader.h
index 91041ce0f4e..404456f7615 100644
--- a/sys/dev/usb/usb_freebsd_loader.h
+++ b/sys/dev/usb/usb_freebsd_loader.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_generic.c b/sys/dev/usb/usb_generic.c
index a735065c072..df2945381c1 100644
--- a/sys/dev/usb/usb_generic.c
+++ b/sys/dev/usb/usb_generic.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_generic.h b/sys/dev/usb/usb_generic.h
index 41d76914a69..9b93b22f425 100644
--- a/sys/dev/usb/usb_generic.h
+++ b/sys/dev/usb/usb_generic.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_handle_request.c b/sys/dev/usb/usb_handle_request.c
index f727dd189cd..7b50400d7eb 100644
--- a/sys/dev/usb/usb_handle_request.c
+++ b/sys/dev/usb/usb_handle_request.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_hid.c b/sys/dev/usb/usb_hid.c
index f2644ce08d7..9cf180c985b 100644
--- a/sys/dev/usb/usb_hid.c
+++ b/sys/dev/usb/usb_hid.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: hid.c,v 1.17 2001/11/13 06:24:53 lukem Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/usb/usb_hub.c b/sys/dev/usb/usb_hub.c
index 458e85beb9d..2b8354880f4 100644
--- a/sys/dev/usb/usb_hub.c
+++ b/sys/dev/usb/usb_hub.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_hub.h b/sys/dev/usb/usb_hub.h
index d7ecc3fdbfa..ffeabc7c0f0 100644
--- a/sys/dev/usb/usb_hub.h
+++ b/sys/dev/usb/usb_hub.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_hub_acpi.c b/sys/dev/usb/usb_hub_acpi.c
index 0581d1b4a57..e195f832a4b 100644
--- a/sys/dev/usb/usb_hub_acpi.c
+++ b/sys/dev/usb/usb_hub_acpi.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_hub_private.h b/sys/dev/usb/usb_hub_private.h
index f84bc7196e4..d853269136d 100644
--- a/sys/dev/usb/usb_hub_private.h
+++ b/sys/dev/usb/usb_hub_private.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_ioctl.h b/sys/dev/usb/usb_ioctl.h
index 0e68798d6f0..9a75a93d157 100644
--- a/sys/dev/usb/usb_ioctl.h
+++ b/sys/dev/usb/usb_ioctl.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_lookup.c b/sys/dev/usb/usb_lookup.c
index 14ae73a6b09..2db1abe0eb5 100644
--- a/sys/dev/usb/usb_lookup.c
+++ b/sys/dev/usb/usb_lookup.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_mbuf.c b/sys/dev/usb/usb_mbuf.c
index 5aed5324d28..6e94bcc65ae 100644
--- a/sys/dev/usb/usb_mbuf.c
+++ b/sys/dev/usb/usb_mbuf.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_mbuf.h b/sys/dev/usb/usb_mbuf.h
index d3e08d27f3b..16fbe87ce50 100644
--- a/sys/dev/usb/usb_mbuf.h
+++ b/sys/dev/usb/usb_mbuf.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_msctest.c b/sys/dev/usb/usb_msctest.c
index 54862235677..586eead176a 100644
--- a/sys/dev/usb/usb_msctest.c
+++ b/sys/dev/usb/usb_msctest.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_msctest.h b/sys/dev/usb/usb_msctest.h
index 5cb08316771..5a52b6f4bec 100644
--- a/sys/dev/usb/usb_msctest.h
+++ b/sys/dev/usb/usb_msctest.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_parse.c b/sys/dev/usb/usb_parse.c
index 9a45ada63d9..bb592f1a4c0 100644
--- a/sys/dev/usb/usb_parse.c
+++ b/sys/dev/usb/usb_parse.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_pci.h b/sys/dev/usb/usb_pci.h
index 758ff31c461..ab293eefb31 100644
--- a/sys/dev/usb/usb_pci.h
+++ b/sys/dev/usb/usb_pci.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_pf.c b/sys/dev/usb/usb_pf.c
index 0b7d1f9a02a..919f17c798f 100644
--- a/sys/dev/usb/usb_pf.c
+++ b/sys/dev/usb/usb_pf.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
diff --git a/sys/dev/usb/usb_process.c b/sys/dev/usb/usb_process.c
index 5baee162811..e41e725b875 100644
--- a/sys/dev/usb/usb_process.c
+++ b/sys/dev/usb/usb_process.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_process.h b/sys/dev/usb/usb_process.h
index 9a3d296fc23..dfa7e9a31e6 100644
--- a/sys/dev/usb/usb_process.h
+++ b/sys/dev/usb/usb_process.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_request.c b/sys/dev/usb/usb_request.c
index 79d70c6337f..55e5f04194d 100644
--- a/sys/dev/usb/usb_request.c
+++ b/sys/dev/usb/usb_request.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_request.h b/sys/dev/usb/usb_request.h
index 00d77a6c11f..56a4003e8ba 100644
--- a/sys/dev/usb/usb_request.h
+++ b/sys/dev/usb/usb_request.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_transfer.c b/sys/dev/usb/usb_transfer.c
index 74fdbd9217e..1d68a99f8f3 100644
--- a/sys/dev/usb/usb_transfer.c
+++ b/sys/dev/usb/usb_transfer.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_transfer.h b/sys/dev/usb/usb_transfer.h
index de439d2a649..4b075a107c3 100644
--- a/sys/dev/usb/usb_transfer.h
+++ b/sys/dev/usb/usb_transfer.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_util.c b/sys/dev/usb/usb_util.c
index e315e094b9f..f9d50bdefde 100644
--- a/sys/dev/usb/usb_util.c
+++ b/sys/dev/usb/usb_util.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usb_util.h b/sys/dev/usb/usb_util.h
index fbc3ecad4be..711a6b8824c 100644
--- a/sys/dev/usb/usb_util.h
+++ b/sys/dev/usb/usb_util.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h
index 110613452dc..9962250ced2 100644
--- a/sys/dev/usb/usbhid.h
+++ b/sys/dev/usb/usbhid.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/video/udl.c b/sys/dev/usb/video/udl.c
index 892e61ae2da..e750f64ee45 100644
--- a/sys/dev/usb/video/udl.c
+++ b/sys/dev/usb/video/udl.c
@@ -1,5 +1,4 @@
 /*	$OpenBSD: udl.c,v 1.81 2014/12/09 07:05:06 doug Exp $ */
-/*	$FreeBSD$ */
 
 /*-
  * Copyright (c) 2015 Hans Petter Selasky <hselasky@freebsd.org>
diff --git a/sys/dev/usb/video/udl.h b/sys/dev/usb/video/udl.h
index a7d50699bdf..9f859659da5 100644
--- a/sys/dev/usb/video/udl.h
+++ b/sys/dev/usb/video/udl.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: udl.h,v 1.21 2013/04/15 09:23:02 mglocker Exp $ */
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org>
diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c
index 4d97dfb3ec8..1bb06025e47 100644
--- a/sys/dev/usb/wlan/if_rum.c
+++ b/sys/dev/usb/wlan/if_rum.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
diff --git a/sys/dev/usb/wlan/if_rumfw.h b/sys/dev/usb/wlan/if_rumfw.h
index 0f086744513..80895214d82 100644
--- a/sys/dev/usb/wlan/if_rumfw.h
+++ b/sys/dev/usb/wlan/if_rumfw.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2005-2006, Ralink Technology, Corp.
diff --git a/sys/dev/usb/wlan/if_rumreg.h b/sys/dev/usb/wlan/if_rumreg.h
index 70354c49285..348a5758285 100644
--- a/sys/dev/usb/wlan/if_rumreg.h
+++ b/sys/dev/usb/wlan/if_rumreg.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr>
diff --git a/sys/dev/usb/wlan/if_rumvar.h b/sys/dev/usb/wlan/if_rumvar.h
index e19a7088cfb..40981f6aa46 100644
--- a/sys/dev/usb/wlan/if_rumvar.h
+++ b/sys/dev/usb/wlan/if_rumvar.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr>
diff --git a/sys/dev/usb/wlan/if_uathreg.h b/sys/dev/usb/wlan/if_uathreg.h
index 1e7929bc7e8..47ec13267e1 100644
--- a/sys/dev/usb/wlan/if_uathreg.h
+++ b/sys/dev/usb/wlan/if_uathreg.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_uathreg.h,v 1.2 2006/09/18 16:34:23 damien Exp $	*/
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2006
diff --git a/sys/dev/usb/wlan/if_uathvar.h b/sys/dev/usb/wlan/if_uathvar.h
index a0ef4eab725..ce380667c8e 100644
--- a/sys/dev/usb/wlan/if_uathvar.h
+++ b/sys/dev/usb/wlan/if_uathvar.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_uathvar.h,v 1.3 2006/09/20 19:47:17 damien Exp $	*/
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2006
diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c
index b8ae4141869..9d3a11e961c 100644
--- a/sys/dev/usb/wlan/if_upgt.c
+++ b/sys/dev/usb/wlan/if_upgt.c
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_upgt.c,v 1.35 2008/04/16 18:32:15 damien Exp $ */
-/*	$FreeBSD$ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
diff --git a/sys/dev/usb/wlan/if_upgtvar.h b/sys/dev/usb/wlan/if_upgtvar.h
index 9d4c85e6fcb..a751737674f 100644
--- a/sys/dev/usb/wlan/if_upgtvar.h
+++ b/sys/dev/usb/wlan/if_upgtvar.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: if_upgtvar.h,v 1.14 2008/02/02 13:48:44 mglocker Exp $ */
-/*	$FreeBSD$ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c
index 4a2ed51928a..c0fdb7d8309 100644
--- a/sys/dev/usb/wlan/if_ural.c
+++ b/sys/dev/usb/wlan/if_ural.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2005, 2006
diff --git a/sys/dev/usb/wlan/if_uralreg.h b/sys/dev/usb/wlan/if_uralreg.h
index 22d763d0dc3..ece13de1719 100644
--- a/sys/dev/usb/wlan/if_uralreg.h
+++ b/sys/dev/usb/wlan/if_uralreg.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2005, 2006
diff --git a/sys/dev/usb/wlan/if_uralvar.h b/sys/dev/usb/wlan/if_uralvar.h
index 6f6d01ed75e..c2b9074fc9b 100644
--- a/sys/dev/usb/wlan/if_uralvar.h
+++ b/sys/dev/usb/wlan/if_uralvar.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2005
diff --git a/sys/dev/usb/wlan/if_urtwreg.h b/sys/dev/usb/wlan/if_urtwreg.h
index 5021e5ac352..0e7c0f6f1ba 100644
--- a/sys/dev/usb/wlan/if_urtwreg.h
+++ b/sys/dev/usb/wlan/if_urtwreg.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2008 Weongyo Jeong <weongyo@FreeBSD.org>
diff --git a/sys/dev/usb/wlan/if_urtwvar.h b/sys/dev/usb/wlan/if_urtwvar.h
index 87c24d648d4..5d4ea539ab9 100644
--- a/sys/dev/usb/wlan/if_urtwvar.h
+++ b/sys/dev/usb/wlan/if_urtwvar.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2008 Weongyo Jeong <weongyo@FreeBSD.org>
diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c
index 8a6e41bcd27..21cc032fe94 100644
--- a/sys/dev/usb/wlan/if_zyd.c
+++ b/sys/dev/usb/wlan/if_zyd.c
@@ -1,6 +1,5 @@
 /*	$OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $	*/
 /*	$NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $	*/
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
diff --git a/sys/dev/usb/wlan/if_zydfw.h b/sys/dev/usb/wlan/if_zydfw.h
index f18442e924b..92b80744b36 100644
--- a/sys/dev/usb/wlan/if_zydfw.h
+++ b/sys/dev/usb/wlan/if_zydfw.h
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*	$FreeBSD$	*/
 
 uint8_t zd1211_firmware[] = {
 	0x08, 0x91, 0xFF, 0xED, 0x09, 0x93, 0x1E, 0xEE,
diff --git a/sys/dev/usb/wlan/if_zydreg.h b/sys/dev/usb/wlan/if_zydreg.h
index d964405d9b7..eeb81fe0d5f 100644
--- a/sys/dev/usb/wlan/if_zydreg.h
+++ b/sys/dev/usb/wlan/if_zydreg.h
@@ -1,6 +1,5 @@
 /*	$OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $	*/
 /*	$NetBSD: if_zydreg.h,v 1.2 2007/06/16 11:18:45 kiyohara Exp $	*/
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
diff --git a/sys/dev/videomode/edid.c b/sys/dev/videomode/edid.c
index bacf5da7a2a..aad0e52231d 100644
--- a/sys/dev/videomode/edid.c
+++ b/sys/dev/videomode/edid.c
@@ -1,5 +1,4 @@
 /* $NetBSD: edid.c,v 1.12 2013/02/08 16:35:10 skrll Exp $ */
-/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
diff --git a/sys/dev/videomode/ediddevs.h b/sys/dev/videomode/ediddevs.h
index b383c8ae1c6..a0dc4e2b181 100644
--- a/sys/dev/videomode/ediddevs.h
+++ b/sys/dev/videomode/ediddevs.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/videomode/ediddevs_data.h b/sys/dev/videomode/ediddevs_data.h
index e0ad80ab4f9..a953bcbf998 100644
--- a/sys/dev/videomode/ediddevs_data.h
+++ b/sys/dev/videomode/ediddevs_data.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/videomode/edidreg.h b/sys/dev/videomode/edidreg.h
index 001a031023e..94e2b802eb4 100644
--- a/sys/dev/videomode/edidreg.h
+++ b/sys/dev/videomode/edidreg.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: edidreg.h,v 1.3 2011/03/30 18:49:56 jdc Exp $	*/
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
diff --git a/sys/dev/videomode/edidvar.h b/sys/dev/videomode/edidvar.h
index da1211b4c06..047361e6b48 100644
--- a/sys/dev/videomode/edidvar.h
+++ b/sys/dev/videomode/edidvar.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: edidvar.h,v 1.2 2006/05/11 19:05:41 gdamore Exp $	*/
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
diff --git a/sys/dev/videomode/modelines b/sys/dev/videomode/modelines
index 147f6a50ca3..78ef52dea18 100644
--- a/sys/dev/videomode/modelines
+++ b/sys/dev/videomode/modelines
@@ -1,5 +1,4 @@
 // $NetBSD: modelines,v 1.8 2011/03/21 19:28:37 jdc Exp $
-// $FreeBSD$
 //
 // This file was imported from XFree86, and is made of the contents of both
 // the vesamodes and extramodes files.  As a result these should correspond
diff --git a/sys/dev/videomode/pickmode.c b/sys/dev/videomode/pickmode.c
index 533a0ce6032..e9c016242fd 100644
--- a/sys/dev/videomode/pickmode.c
+++ b/sys/dev/videomode/pickmode.c
@@ -1,5 +1,4 @@
 /* $NetBSD: pickmode.c,v 1.3 2011/04/09 18:22:31 jdc Exp $ */
-/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation
diff --git a/sys/dev/videomode/test.c b/sys/dev/videomode/test.c
index d51ffddcc77..21c7e488412 100644
--- a/sys/dev/videomode/test.c
+++ b/sys/dev/videomode/test.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sys/dev/videomode/vesagtf.c b/sys/dev/videomode/vesagtf.c
index 9398e61b17a..c02c421c14a 100644
--- a/sys/dev/videomode/vesagtf.c
+++ b/sys/dev/videomode/vesagtf.c
@@ -1,5 +1,4 @@
 /* $NetBSD: vesagtf.c,v 1.2 2013/09/15 15:56:07 martin Exp $ */
-/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
diff --git a/sys/dev/videomode/vesagtf.h b/sys/dev/videomode/vesagtf.h
index ea9dae40707..14294170502 100644
--- a/sys/dev/videomode/vesagtf.h
+++ b/sys/dev/videomode/vesagtf.h
@@ -1,5 +1,4 @@
 /*	$NetBSD$	*/
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
diff --git a/sys/dev/videomode/videomode.c b/sys/dev/videomode/videomode.c
index aa576d21b62..a22b7edb60b 100644
--- a/sys/dev/videomode/videomode.c
+++ b/sys/dev/videomode/videomode.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/videomode/videomode.h b/sys/dev/videomode/videomode.h
index 3e64444821d..dfe1405ebe4 100644
--- a/sys/dev/videomode/videomode.h
+++ b/sys/dev/videomode/videomode.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: videomode.h,v 1.2 2010/05/04 21:17:10 macallan Exp $	*/
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (c) 2001, 2002 Bang Jun-Young
diff --git a/sys/dev/wpi/if_wpireg.h b/sys/dev/wpi/if_wpireg.h
index 04ef481fe08..84d25bbeb95 100644
--- a/sys/dev/wpi/if_wpireg.h
+++ b/sys/dev/wpi/if_wpireg.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2006,2007
diff --git a/sys/dev/wpi/if_wpivar.h b/sys/dev/wpi/if_wpivar.h
index 422dc34d65b..eb4708fba7b 100644
--- a/sys/dev/wpi/if_wpivar.h
+++ b/sys/dev/wpi/if_wpivar.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*-
  * Copyright (c) 2006,2007
diff --git a/sys/dts/arm/overlays/spigen-rpi-b.dtso b/sys/dts/arm/overlays/spigen-rpi-b.dtso
index e237fcb680a..edff894b971 100644
--- a/sys/dts/arm/overlays/spigen-rpi-b.dtso
+++ b/sys/dts/arm/overlays/spigen-rpi-b.dtso
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /dts-v1/;
 /plugin/;
diff --git a/sys/dts/arm/overlays/spigen-rpi2.dtso b/sys/dts/arm/overlays/spigen-rpi2.dtso
index 6d3862d1406..0a51e2049de 100644
--- a/sys/dts/arm/overlays/spigen-rpi2.dtso
+++ b/sys/dts/arm/overlays/spigen-rpi2.dtso
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /dts-v1/;
 /plugin/;
diff --git a/sys/dts/arm64/overlays/spigen-rpi3.dtso b/sys/dts/arm64/overlays/spigen-rpi3.dtso
index a708699c73d..552e4b1a870 100644
--- a/sys/dts/arm64/overlays/spigen-rpi3.dtso
+++ b/sys/dts/arm64/overlays/spigen-rpi3.dtso
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /dts-v1/;
 /plugin/;
diff --git a/sys/dts/arm64/overlays/spigen-rpi4.dtso b/sys/dts/arm64/overlays/spigen-rpi4.dtso
index 7b5ed66edb3..3e2bffabaf0 100644
--- a/sys/dts/arm64/overlays/spigen-rpi4.dtso
+++ b/sys/dts/arm64/overlays/spigen-rpi4.dtso
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /dts-v1/;
 /plugin/;
diff --git a/sys/dts/mips/fbsd-mt7620a.dtsi b/sys/dts/mips/fbsd-mt7620a.dtsi
index e88117b9e1f..6ef95d11a66 100644
--- a/sys/dts/mips/fbsd-mt7620a.dtsi
+++ b/sys/dts/mips/fbsd-mt7620a.dtsi
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 &pcie {
 	/*
diff --git a/sys/dts/mips/fbsd-mt7621.dtsi b/sys/dts/mips/fbsd-mt7621.dtsi
index eee36b2a0e3..eb51442650c 100644
--- a/sys/dts/mips/fbsd-mt7621.dtsi
+++ b/sys/dts/mips/fbsd-mt7621.dtsi
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 &palmbus {
 	gpio@600 {
diff --git a/sys/dts/mips/fbsd-mt7628an.dtsi b/sys/dts/mips/fbsd-mt7628an.dtsi
index e64887976cf..a8ecc9f1720 100644
--- a/sys/dts/mips/fbsd-mt7628an.dtsi
+++ b/sys/dts/mips/fbsd-mt7628an.dtsi
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 &palmbus {
 	gpio@600 {
diff --git a/sys/dts/mips/fbsd-rt3883.dtsi b/sys/dts/mips/fbsd-rt3883.dtsi
index f71c29eb824..8572a9f7fa1 100644
--- a/sys/dts/mips/fbsd-rt3883.dtsi
+++ b/sys/dts/mips/fbsd-rt3883.dtsi
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 &pci {
 	#address-cells = <3>;
diff --git a/sys/dts/powerpc/p1020rdb.dts b/sys/dts/powerpc/p1020rdb.dts
index ec5118ce0f3..80bc575db16 100644
--- a/sys/dts/powerpc/p1020rdb.dts
+++ b/sys/dts/powerpc/p1020rdb.dts
@@ -31,7 +31,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$ */
 
 /dts-v1/;
 
diff --git a/sys/dts/powerpc/p2020ds.dts b/sys/dts/powerpc/p2020ds.dts
index 7823429dc9d..53aa5243a65 100644
--- a/sys/dts/powerpc/p2020ds.dts
+++ b/sys/dts/powerpc/p2020ds.dts
@@ -57,7 +57,6 @@
  * You may select the license of your choice.
  *------------------------------------------------------------------
  */
-/* $FreeBSD$ */
 
 /dts-v1/;
 / {
diff --git a/sys/dts/powerpc/p2041rdb.dts b/sys/dts/powerpc/p2041rdb.dts
index 3ce2e60096c..434dd3fa38d 100644
--- a/sys/dts/powerpc/p2041rdb.dts
+++ b/sys/dts/powerpc/p2041rdb.dts
@@ -31,7 +31,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$ */
 
 /include/ "p2041si.dtsi"
 
diff --git a/sys/dts/powerpc/p2041si.dtsi b/sys/dts/powerpc/p2041si.dtsi
index 41eb1dd7452..40ce67f5001 100644
--- a/sys/dts/powerpc/p2041si.dtsi
+++ b/sys/dts/powerpc/p2041si.dtsi
@@ -31,7 +31,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$ */
 
 /dts-v1/;
 
diff --git a/sys/dts/powerpc/p3041ds.dts b/sys/dts/powerpc/p3041ds.dts
index bcc9ff3112b..188cd2bee6d 100644
--- a/sys/dts/powerpc/p3041ds.dts
+++ b/sys/dts/powerpc/p3041ds.dts
@@ -31,7 +31,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$ */
 
 /include/ "p3041si.dtsi"
 
diff --git a/sys/dts/powerpc/p3041si.dtsi b/sys/dts/powerpc/p3041si.dtsi
index 368cd6272bf..ef09283f531 100644
--- a/sys/dts/powerpc/p3041si.dtsi
+++ b/sys/dts/powerpc/p3041si.dtsi
@@ -31,7 +31,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$ */
 
 /dts-v1/;
 
diff --git a/sys/dts/powerpc/p5020ds.dts b/sys/dts/powerpc/p5020ds.dts
index 3e0d92fbd83..73e2cdf1e97 100644
--- a/sys/dts/powerpc/p5020ds.dts
+++ b/sys/dts/powerpc/p5020ds.dts
@@ -31,7 +31,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$ */
 
 /include/ "p5020si.dtsi"
 
diff --git a/sys/dts/powerpc/p5020si.dtsi b/sys/dts/powerpc/p5020si.dtsi
index afed942a2b9..e47b985d4f4 100644
--- a/sys/dts/powerpc/p5020si.dtsi
+++ b/sys/dts/powerpc/p5020si.dtsi
@@ -31,7 +31,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$ */
 
 /dts-v1/;
 
diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c
index 566f463da22..9ef234c3542 100644
--- a/sys/fs/cuse/cuse.c
+++ b/sys/fs/cuse/cuse.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2010-2022 Hans Petter Selasky
  *
diff --git a/sys/fs/cuse/cuse_defs.h b/sys/fs/cuse/cuse_defs.h
index 4f962fc95dd..b467ceeeb66 100644
--- a/sys/fs/cuse/cuse_defs.h
+++ b/sys/fs/cuse/cuse_defs.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2010-2012 Hans Petter Selasky. All rights reserved.
  *
diff --git a/sys/fs/cuse/cuse_ioctl.h b/sys/fs/cuse/cuse_ioctl.h
index c2dc312beee..967b1eca792 100644
--- a/sys/fs/cuse/cuse_ioctl.h
+++ b/sys/fs/cuse/cuse_ioctl.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2014-2022 Hans Petter Selasky. All rights reserved.
  *
diff --git a/sys/fs/msdosfs/bootsect.h b/sys/fs/msdosfs/bootsect.h
index 5a3ff56b850..170d94cb951 100644
--- a/sys/fs/msdosfs/bootsect.h
+++ b/sys/fs/msdosfs/bootsect.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: bootsect.h,v 1.9 1997/11/17 15:36:17 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/bpb.h b/sys/fs/msdosfs/bpb.h
index 682974fb780..23e6ec31c55 100644
--- a/sys/fs/msdosfs/bpb.h
+++ b/sys/fs/msdosfs/bpb.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: bpb.h,v 1.7 1997/11/17 15:36:24 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index 93712e44c52..9ac5c2a2f5e 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/direntry.h b/sys/fs/msdosfs/direntry.h
index ae8f0d627d7..fe66ca3612f 100644
--- a/sys/fs/msdosfs/direntry.h
+++ b/sys/fs/msdosfs/direntry.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/fat.h b/sys/fs/msdosfs/fat.h
index b28a9bed135..a88bfb94e91 100644
--- a/sys/fs/msdosfs/fat.h
+++ b/sys/fs/msdosfs/fat.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_conv.c b/sys/fs/msdosfs/msdosfs_conv.c
index 2637bf98278..da484816917 100644
--- a/sys/fs/msdosfs/msdosfs_conv.c
+++ b/sys/fs/msdosfs/msdosfs_conv.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index 030c96d6d35..73070f3dc93 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index e6d9b671e7d..6387c8cc059 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index 291f923d79f..37d40432ec7 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index d7efa103581..30eeeb661b3 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 94af83b5a0a..d7b3ade2a46 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 5caa40f2b64..a2691053bd0 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/nfsserver/nfs_fha_new.h b/sys/fs/nfsserver/nfs_fha_new.h
index 6c309e352c5..95b0acd8778 100644
--- a/sys/fs/nfsserver/nfs_fha_new.h
+++ b/sys/fs/nfsserver/nfs_fha_new.h
@@ -26,7 +26,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
 
 #ifndef	_NFS_FHA_NEW_H
 #define	_NFS_FHA_NEW_H 1
diff --git a/sys/i386/include/_align.h b/sys/i386/include/_align.h
index 28c4669ad25..506bc3c9e7f 100644
--- a/sys/i386/include/_align.h
+++ b/sys/i386/include/_align.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/_align.h>
diff --git a/sys/i386/include/_inttypes.h b/sys/i386/include/_inttypes.h
index 40107cd74a7..2d0d28c29fe 100644
--- a/sys/i386/include/_inttypes.h
+++ b/sys/i386/include/_inttypes.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/_inttypes.h>
diff --git a/sys/i386/include/_limits.h b/sys/i386/include/_limits.h
index 3c7365bb4ed..aa71de42e79 100644
--- a/sys/i386/include/_limits.h
+++ b/sys/i386/include/_limits.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/_limits.h>
diff --git a/sys/i386/include/_stdint.h b/sys/i386/include/_stdint.h
index db1affc0770..033e31af2cc 100644
--- a/sys/i386/include/_stdint.h
+++ b/sys/i386/include/_stdint.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/_stdint.h>
diff --git a/sys/i386/include/_types.h b/sys/i386/include/_types.h
index 26803672ff6..8d6d2dfa0d7 100644
--- a/sys/i386/include/_types.h
+++ b/sys/i386/include/_types.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/_types.h>
diff --git a/sys/i386/include/acpica_machdep.h b/sys/i386/include/acpica_machdep.h
index 1ae3d5865db..21f797929ce 100644
--- a/sys/i386/include/acpica_machdep.h
+++ b/sys/i386/include/acpica_machdep.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/acpica_machdep.h>
diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h
index 9cc0eeeaf6f..9d31da47c3a 100644
--- a/sys/i386/include/apm_bios.h
+++ b/sys/i386/include/apm_bios.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/apm_bios.h>
diff --git a/sys/i386/include/bus.h b/sys/i386/include/bus.h
index f1af2cf6168..a53fadb1995 100644
--- a/sys/i386/include/bus.h
+++ b/sys/i386/include/bus.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/bus.h>
diff --git a/sys/i386/include/bus_dma.h b/sys/i386/include/bus_dma.h
index 0355db5cf8e..e06670042f5 100644
--- a/sys/i386/include/bus_dma.h
+++ b/sys/i386/include/bus_dma.h
@@ -26,7 +26,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _I386_BUS_DMA_H_
 #define _I386_BUS_DMA_H_
diff --git a/sys/i386/include/dump.h b/sys/i386/include/dump.h
index 815942d0d96..4dc14c6c341 100644
--- a/sys/i386/include/dump.h
+++ b/sys/i386/include/dump.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/dump.h>
diff --git a/sys/i386/include/elf.h b/sys/i386/include/elf.h
index f9323775dc2..3b080777292 100644
--- a/sys/i386/include/elf.h
+++ b/sys/i386/include/elf.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/elf.h>
diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h
index 2ad27a9069b..a8e10b0a36f 100644
--- a/sys/i386/include/endian.h
+++ b/sys/i386/include/endian.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/endian.h>
diff --git a/sys/i386/include/fdt.h b/sys/i386/include/fdt.h
index 1a035144289..a7c73c54199 100644
--- a/sys/i386/include/fdt.h
+++ b/sys/i386/include/fdt.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/fdt.h>
diff --git a/sys/i386/include/float.h b/sys/i386/include/float.h
index 4759963566a..2cde8b6d60e 100644
--- a/sys/i386/include/float.h
+++ b/sys/i386/include/float.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/float.h>
diff --git a/sys/i386/include/intr_machdep.h b/sys/i386/include/intr_machdep.h
index a0b28387d45..dc9ab793cee 100644
--- a/sys/i386/include/intr_machdep.h
+++ b/sys/i386/include/intr_machdep.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/intr_machdep.h>
diff --git a/sys/i386/include/iommu.h b/sys/i386/include/iommu.h
index 025e818c239..4116179c7ca 100644
--- a/sys/i386/include/iommu.h
+++ b/sys/i386/include/iommu.h
@@ -1,7 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/iommu.h>
 
diff --git a/sys/i386/include/metadata.h b/sys/i386/include/metadata.h
index 98d0272fd4c..cd8c069c5bb 100644
--- a/sys/i386/include/metadata.h
+++ b/sys/i386/include/metadata.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/metadata.h>
diff --git a/sys/i386/include/ofw_machdep.h b/sys/i386/include/ofw_machdep.h
index 4457f85908c..81fe027ceb4 100644
--- a/sys/i386/include/ofw_machdep.h
+++ b/sys/i386/include/ofw_machdep.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/ofw_machdep.h>
diff --git a/sys/i386/include/pci_cfgreg.h b/sys/i386/include/pci_cfgreg.h
index 717d5cc39fb..651c7104535 100644
--- a/sys/i386/include/pci_cfgreg.h
+++ b/sys/i386/include/pci_cfgreg.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/pci_cfgreg.h>
diff --git a/sys/i386/include/procctl.h b/sys/i386/include/procctl.h
index 4a6bcc71204..a3875dad78b 100644
--- a/sys/i386/include/procctl.h
+++ b/sys/i386/include/procctl.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/procctl.h>
diff --git a/sys/i386/include/psl.h b/sys/i386/include/psl.h
index 4d945a1ebba..fd047b0ea72 100644
--- a/sys/i386/include/psl.h
+++ b/sys/i386/include/psl.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/psl.h>
diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h
index bf86754d8f4..7506c43f516 100644
--- a/sys/i386/include/ptrace.h
+++ b/sys/i386/include/ptrace.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/ptrace.h>
diff --git a/sys/i386/include/pvclock.h b/sys/i386/include/pvclock.h
index f01fac695ae..91cb7604b17 100644
--- a/sys/i386/include/pvclock.h
+++ b/sys/i386/include/pvclock.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/pvclock.h>
diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h
index f6fb2bc6578..37ddd32142b 100644
--- a/sys/i386/include/reg.h
+++ b/sys/i386/include/reg.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/reg.h>
diff --git a/sys/i386/include/resource.h b/sys/i386/include/resource.h
index dfcc902a731..368a13b88d3 100644
--- a/sys/i386/include/resource.h
+++ b/sys/i386/include/resource.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/i386/include/setjmp.h b/sys/i386/include/setjmp.h
index c4101a77fd6..306fb842427 100644
--- a/sys/i386/include/setjmp.h
+++ b/sys/i386/include/setjmp.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/setjmp.h>
diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h
index aace4bfd62e..39528555d32 100644
--- a/sys/i386/include/specialreg.h
+++ b/sys/i386/include/specialreg.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/specialreg.h>
diff --git a/sys/i386/include/stack.h b/sys/i386/include/stack.h
index 091ae33893d..0ff271239f2 100644
--- a/sys/i386/include/stack.h
+++ b/sys/i386/include/stack.h
@@ -1,6 +1,5 @@
 /*
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/stack.h>
diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h
index 1f80090356a..1739bbeb9ea 100644
--- a/sys/i386/include/stdarg.h
+++ b/sys/i386/include/stdarg.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/stdarg.h>
diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h
index cd380d43b07..47cecf1d27c 100644
--- a/sys/i386/include/sysarch.h
+++ b/sys/i386/include/sysarch.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/sysarch.h>
diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h
index 4d950771dcc..20f898d15b9 100644
--- a/sys/i386/include/trap.h
+++ b/sys/i386/include/trap.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/trap.h>
diff --git a/sys/i386/include/vdso.h b/sys/i386/include/vdso.h
index b81c455a92a..77fc7655d55 100644
--- a/sys/i386/include/vdso.h
+++ b/sys/i386/include/vdso.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/vdso.h>
diff --git a/sys/i386/include/xen/xen-os.h b/sys/i386/include/xen/xen-os.h
index 1490e59c2f9..ac9f66b2b30 100644
--- a/sys/i386/include/xen/xen-os.h
+++ b/sys/i386/include/xen/xen-os.h
@@ -1,6 +1,5 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #include <x86/xen/xen-os.h>
diff --git a/sys/i386/linux/linux_locore.asm b/sys/i386/linux/linux_locore.asm
index 9aef5ad21d2..b6158683b15 100644
--- a/sys/i386/linux/linux_locore.asm
+++ b/sys/i386/linux/linux_locore.asm
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #include "linux_assym.h"			/* system definitions */
 #include <machine/asmacros.h>			/* miscellaneous asm macros */
diff --git a/sys/kgssapi/gssd.x b/sys/kgssapi/gssd.x
index f5682a01ccd..29503ac8599 100644
--- a/sys/kgssapi/gssd.x
+++ b/sys/kgssapi/gssd.x
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifdef RPC_HDR
 
diff --git a/sys/mips/atheros/ar531x/ar5312_chip.h b/sys/mips/atheros/ar531x/ar5312_chip.h
index a2135de03ed..354f8f4e4e9 100644
--- a/sys/mips/atheros/ar531x/ar5312_chip.h
+++ b/sys/mips/atheros/ar531x/ar5312_chip.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR5312_CHIP_H__
 #define	__AR5312_CHIP_H__
diff --git a/sys/mips/atheros/ar531x/ar5315_chip.h b/sys/mips/atheros/ar531x/ar5315_chip.h
index dc20004e8f9..4b7acc2a2db 100644
--- a/sys/mips/atheros/ar531x/ar5315_chip.h
+++ b/sys/mips/atheros/ar531x/ar5315_chip.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR5315_CHIP_H__
 #define	__AR5315_CHIP_H__
diff --git a/sys/mips/atheros/ar531x/ar5315_cpudef.h b/sys/mips/atheros/ar531x/ar5315_cpudef.h
index 370b10e9b53..0f3f9fde58d 100644
--- a/sys/mips/atheros/ar531x/ar5315_cpudef.h
+++ b/sys/mips/atheros/ar531x/ar5315_cpudef.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR5315_CPUDEF_H__
 #define	__AR5315_CPUDEF_H__
diff --git a/sys/mips/atheros/ar531x/ar5315_setup.h b/sys/mips/atheros/ar531x/ar5315_setup.h
index 1cd17817976..b06edbf186d 100644
--- a/sys/mips/atheros/ar531x/ar5315_setup.h
+++ b/sys/mips/atheros/ar531x/ar5315_setup.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR5315_SETUP_H__
 #define	__AR5315_SETUP_H__
diff --git a/sys/mips/atheros/ar71xx_chip.h b/sys/mips/atheros/ar71xx_chip.h
index d6e57ffa747..a10fc859c0b 100644
--- a/sys/mips/atheros/ar71xx_chip.h
+++ b/sys/mips/atheros/ar71xx_chip.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR71XX_CHIP_H__
 #define	__AR71XX_CHIP_H__
diff --git a/sys/mips/atheros/ar71xx_cpudef.h b/sys/mips/atheros/ar71xx_cpudef.h
index 8e7549222c5..88616b69b32 100644
--- a/sys/mips/atheros/ar71xx_cpudef.h
+++ b/sys/mips/atheros/ar71xx_cpudef.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR71XX_CPUDEF_H__
 #define	__AR71XX_CPUDEF_H__
diff --git a/sys/mips/atheros/ar71xx_setup.h b/sys/mips/atheros/ar71xx_setup.h
index 177b8ca7f44..51a58dbf058 100644
--- a/sys/mips/atheros/ar71xx_setup.h
+++ b/sys/mips/atheros/ar71xx_setup.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR71XX_SETUP_H__
 #define	__AR71XX_SETUP_H__
diff --git a/sys/mips/atheros/ar71xxreg.h b/sys/mips/atheros/ar71xxreg.h
index 950071386a0..27246771de7 100644
--- a/sys/mips/atheros/ar71xxreg.h
+++ b/sys/mips/atheros/ar71xxreg.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _AR71XX_REG_H_
 #define _AR71XX_REG_H_
diff --git a/sys/mips/atheros/ar724x_chip.h b/sys/mips/atheros/ar724x_chip.h
index ab934d9fb38..d6b34511ecb 100644
--- a/sys/mips/atheros/ar724x_chip.h
+++ b/sys/mips/atheros/ar724x_chip.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR724X_CHIP_H__
 #define	__AR724X_CHIP_H__
diff --git a/sys/mips/atheros/ar724xreg.h b/sys/mips/atheros/ar724xreg.h
index 3bbd70ad0af..ff871b2c553 100644
--- a/sys/mips/atheros/ar724xreg.h
+++ b/sys/mips/atheros/ar724xreg.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR72XX_REG_H__
 #define	__AR72XX_REG_H__
diff --git a/sys/mips/atheros/ar91xx_chip.h b/sys/mips/atheros/ar91xx_chip.h
index e168dec157b..424fc2df366 100644
--- a/sys/mips/atheros/ar91xx_chip.h
+++ b/sys/mips/atheros/ar91xx_chip.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR91XX_CHIP_H__
 #define	__AR91XX_CHIP_H__
diff --git a/sys/mips/atheros/ar91xxreg.h b/sys/mips/atheros/ar91xxreg.h
index 22bbabc0e93..2f9ad2cd47f 100644
--- a/sys/mips/atheros/ar91xxreg.h
+++ b/sys/mips/atheros/ar91xxreg.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR91XX_REG_H__
 #define	__AR91XX_REG_H__
diff --git a/sys/mips/atheros/ar933x_chip.h b/sys/mips/atheros/ar933x_chip.h
index 89128750230..e78b8406160 100644
--- a/sys/mips/atheros/ar933x_chip.h
+++ b/sys/mips/atheros/ar933x_chip.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR933X_CHIP_H__
 #define	__AR933X_CHIP_H__
diff --git a/sys/mips/atheros/ar934x_chip.h b/sys/mips/atheros/ar934x_chip.h
index 524f5b069ca..47cc81d534f 100644
--- a/sys/mips/atheros/ar934x_chip.h
+++ b/sys/mips/atheros/ar934x_chip.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__AR934X_CHIP_H__
 #define	__AR934X_CHIP_H__
diff --git a/sys/mips/atheros/pcf2123reg.h b/sys/mips/atheros/pcf2123reg.h
index d59c73d0152..7939b15ddee 100644
--- a/sys/mips/atheros/pcf2123reg.h
+++ b/sys/mips/atheros/pcf2123reg.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef __PCF2123REG_H__
 #define	__PCF2123REG_H__
diff --git a/sys/mips/atheros/qca953x_chip.h b/sys/mips/atheros/qca953x_chip.h
index 6ad433f63d7..10e693dc343 100644
--- a/sys/mips/atheros/qca953x_chip.h
+++ b/sys/mips/atheros/qca953x_chip.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__QCA953X_CHIP_H__
 #define	__QCA953X_CHIP_H__
diff --git a/sys/mips/atheros/qca955x_chip.h b/sys/mips/atheros/qca955x_chip.h
index b36d73f895a..046b61256ce 100644
--- a/sys/mips/atheros/qca955x_chip.h
+++ b/sys/mips/atheros/qca955x_chip.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef	__QCA955X_CHIP_H__
 #define	__QCA955X_CHIP_H__
diff --git a/sys/mips/cavium/cvmx_config.h b/sys/mips/cavium/cvmx_config.h
index 33720c772ba..d6273c3b848 100644
--- a/sys/mips/cavium/cvmx_config.h
+++ b/sys/mips/cavium/cvmx_config.h
@@ -37,7 +37,6 @@
  * For any questions regarding licensing please contact marketing@caviumnetworks.com
  *
  ***********************license end**************************************/
-/* $FreeBSD$ */
 
 #ifndef	_CVMX_CONFIG_H
 #define	_CVMX_CONFIG_H
diff --git a/sys/mips/cavium/octe/cavium-ethernet.h b/sys/mips/cavium/octe/cavium-ethernet.h
index 7d9fe3f1084..8d5555736f6 100644
--- a/sys/mips/cavium/octe/cavium-ethernet.h
+++ b/sys/mips/cavium/octe/cavium-ethernet.h
@@ -27,7 +27,6 @@ TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
 AND WITH ALL FAULTS AND CAVIUM  NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE  RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 
 *************************************************************************/
-/* $FreeBSD$ */
 
 /**
  * @file
diff --git a/sys/mips/cavium/octe/ethernet-common.h b/sys/mips/cavium/octe/ethernet-common.h
index d7a8d298a6d..3c0826ee9b8 100644
--- a/sys/mips/cavium/octe/ethernet-common.h
+++ b/sys/mips/cavium/octe/ethernet-common.h
@@ -27,7 +27,6 @@ TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
 AND WITH ALL FAULTS AND CAVIUM  NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE  RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 
 *************************************************************************/
-/* $FreeBSD$ */
 
 int cvm_oct_common_open(struct ifnet *ifp);
 int cvm_oct_common_stop(struct ifnet *ifp);
diff --git a/sys/mips/cavium/octe/ethernet-defines.h b/sys/mips/cavium/octe/ethernet-defines.h
index ba3140661f3..9a325942f33 100644
--- a/sys/mips/cavium/octe/ethernet-defines.h
+++ b/sys/mips/cavium/octe/ethernet-defines.h
@@ -27,7 +27,6 @@ TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
 AND WITH ALL FAULTS AND CAVIUM  NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE  RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 
 *************************************************************************/
-/* $FreeBSD$ */
 
 /*
  * A few defines are used to control the operation of this driver:
diff --git a/sys/mips/cavium/octe/ethernet-headers.h b/sys/mips/cavium/octe/ethernet-headers.h
index 51386209b5a..b8dc2aad760 100644
--- a/sys/mips/cavium/octe/ethernet-headers.h
+++ b/sys/mips/cavium/octe/ethernet-headers.h
@@ -27,7 +27,6 @@ TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
 AND WITH ALL FAULTS AND CAVIUM  NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE  RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 
 *************************************************************************/
-/* $FreeBSD$ */
 
 #ifndef __ETHERNET_HEADERS_H__
 #define __ETHERNET_HEADERS_H__
diff --git a/sys/mips/cavium/octe/ethernet-mdio.h b/sys/mips/cavium/octe/ethernet-mdio.h
index bd0e5c58eb3..7252d4da872 100644
--- a/sys/mips/cavium/octe/ethernet-mdio.h
+++ b/sys/mips/cavium/octe/ethernet-mdio.h
@@ -27,7 +27,6 @@ TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
 AND WITH ALL FAULTS AND CAVIUM  NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE  RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 
 *************************************************************************/
-/* $FreeBSD$ */
 
 extern struct mtx cvm_oct_mdio_mtx;
 
diff --git a/sys/mips/cavium/octe/ethernet-mem.h b/sys/mips/cavium/octe/ethernet-mem.h
index f5fbbe22df9..cd9b1e5532b 100644
--- a/sys/mips/cavium/octe/ethernet-mem.h
+++ b/sys/mips/cavium/octe/ethernet-mem.h
@@ -27,7 +27,6 @@ TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
 AND WITH ALL FAULTS AND CAVIUM  NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE  RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 
 *************************************************************************/
-/* $FreeBSD$ */
 
 int cvm_oct_mem_fill_fpa(int pool, int size, int elements);
 void cvm_oct_mem_empty_fpa(int pool, int size, int elements);
diff --git a/sys/mips/cavium/octe/ethernet-rx.h b/sys/mips/cavium/octe/ethernet-rx.h
index 79d5c4a61fd..b32db70111f 100644
--- a/sys/mips/cavium/octe/ethernet-rx.h
+++ b/sys/mips/cavium/octe/ethernet-rx.h
@@ -27,7 +27,6 @@ TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
 AND WITH ALL FAULTS AND CAVIUM  NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE  RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 
 *************************************************************************/
-/* $FreeBSD$ */
 
 int cvm_oct_do_interrupt(void *dev_id);
 void cvm_oct_poll_controller(struct ifnet *ifp);
diff --git a/sys/mips/cavium/octe/ethernet-tx.h b/sys/mips/cavium/octe/ethernet-tx.h
index 4a8ad9064b2..500df4d8185 100644
--- a/sys/mips/cavium/octe/ethernet-tx.h
+++ b/sys/mips/cavium/octe/ethernet-tx.h
@@ -27,7 +27,6 @@ TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
 AND WITH ALL FAULTS AND CAVIUM  NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE  RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 
 *************************************************************************/
-/* $FreeBSD$ */
 
 int cvm_oct_xmit(struct mbuf *m, struct ifnet *ifp);
 void cvm_oct_tx_shutdown(struct ifnet *ifp);
diff --git a/sys/mips/cavium/octe/ethernet-util.h b/sys/mips/cavium/octe/ethernet-util.h
index 1a4144233c7..35fdf92f383 100644
--- a/sys/mips/cavium/octe/ethernet-util.h
+++ b/sys/mips/cavium/octe/ethernet-util.h
@@ -27,7 +27,6 @@ TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
 AND WITH ALL FAULTS AND CAVIUM  NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE  RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 
 *************************************************************************/
-/* $FreeBSD$ */
 
 #define DEBUGPRINT(format, ...) printf(format, ##__VA_ARGS__)
 
diff --git a/sys/mips/cavium/octe/wrapper-cvmx-includes.h b/sys/mips/cavium/octe/wrapper-cvmx-includes.h
index a103f885446..844c4970839 100644
--- a/sys/mips/cavium/octe/wrapper-cvmx-includes.h
+++ b/sys/mips/cavium/octe/wrapper-cvmx-includes.h
@@ -27,7 +27,6 @@ TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
 AND WITH ALL FAULTS AND CAVIUM  NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE  RISK ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 
 *************************************************************************/
-/* $FreeBSD$ */
 
 #ifndef __WRAPPER_CVMX_INCLUDES_H__
 #define __WRAPPER_CVMX_INCLUDES_H__
diff --git a/sys/mips/cavium/octeon_pcmap_regs.h b/sys/mips/cavium/octeon_pcmap_regs.h
index 6aad9127551..c3887a81b6c 100644
--- a/sys/mips/cavium/octeon_pcmap_regs.h
+++ b/sys/mips/cavium/octeon_pcmap_regs.h
@@ -43,7 +43,6 @@
  *    California, Berkeley and its contributors."
  */
 
-/* $FreeBSD$ */
 
 #ifndef __OCTEON_PCMAP_REGS_H__
 #define __OCTEON_PCMAP_REGS_H__
diff --git a/sys/mips/cavium/octopcireg.h b/sys/mips/cavium/octopcireg.h
index 5cfe2e4a27f..28efbb36b92 100644
--- a/sys/mips/cavium/octopcireg.h
+++ b/sys/mips/cavium/octopcireg.h
@@ -37,7 +37,6 @@
  * For any questions regarding licensing please contact marketing@caviumnetworks.com
  *
  ***********************license end**************************************/
-/* $FreeBSD$ */
 
 #ifndef	_CAVIUM_OCTOPCIREG_H_
 #define	_CAVIUM_OCTOPCIREG_H_
diff --git a/sys/mips/cavium/usb/octusb.h b/sys/mips/cavium/usb/octusb.h
index 1eeae8d55c1..208fa7f64cf 100644
--- a/sys/mips/cavium/usb/octusb.h
+++ b/sys/mips/cavium/usb/octusb.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/mips/include/procctl.h b/sys/mips/include/procctl.h
index 5221cfcd7be..b340002b45e 100644
--- a/sys/mips/include/procctl.h
+++ b/sys/mips/include/procctl.h
@@ -1,4 +1,3 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
diff --git a/sys/mips/malta/gtvar.h b/sys/mips/malta/gtvar.h
index 4b9137e226a..11988407c81 100644
--- a/sys/mips/malta/gtvar.h
+++ b/sys/mips/malta/gtvar.h
@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 
 #ifndef _GTVAR_H_
 #define _GTVAR_H_
diff --git a/sys/net/if_gif.h b/sys/net/if_gif.h
index f8fda6ddf80..3c1846b8f82 100644
--- a/sys/net/if_gif.h
+++ b/sys/net/if_gif.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: if_gif.h,v 1.17 2000/09/11 11:36:41 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index 1506a8fe38a..c03a4c87b35 100644
--- a/sys/net/if_media.h
+++ b/sys/net/if_media.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $	*/
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index 17346055bad..143dcb44ff7 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $	*/
 
 /*-
diff --git a/sys/net/pfil.c b/sys/net/pfil.c
index 4968bb8cc4d..33b6be9fdad 100644
--- a/sys/net/pfil.c
+++ b/sys/net/pfil.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$ */
 /*	$NetBSD: pfil.c,v 1.20 2001/11/12 23:49:46 lukem Exp $	*/
 
 /*-
diff --git a/sys/net/pfil.h b/sys/net/pfil.h
index da045b30c6e..f411392a14e 100644
--- a/sys/net/pfil.h
+++ b/sys/net/pfil.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$ */
 /*	$NetBSD: pfil.h,v 1.22 2003/06/23 12:57:08 martin Exp $	*/
 
 /*-
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h
index cd9acda40e9..912607a1158 100644
--- a/sys/net/pfkeyv2.h
+++ b/sys/net/pfkeyv2.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: pfkeyv2.h,v 1.37 2003/09/06 05:15:43 itojun Exp $	*/
 
 /*-
diff --git a/sys/net/rndis.h b/sys/net/rndis.h
index 5d45469a4b5..2912fc46950 100644
--- a/sys/net/rndis.h
+++ b/sys/net/rndis.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$ */
 /*	$OpenBSD: if_urndisreg.h,v 1.19 2013/11/21 14:08:05 mpi Exp $ */
 
 /*
diff --git a/sys/net80211/ieee80211_amrr.h b/sys/net80211/ieee80211_amrr.h
index ec67bdfb875..795cbf673e5 100644
--- a/sys/net80211/ieee80211_amrr.h
+++ b/sys/net80211/ieee80211_amrr.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$OpenBSD: ieee80211_amrr.h,v 1.3 2006/06/17 19:34:31 damien Exp $	*/
 
 /*-
diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h
index 35800325f12..07c44726004 100644
--- a/sys/net80211/ieee80211_radiotap.h
+++ b/sys/net80211/ieee80211_radiotap.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* $NetBSD: ieee80211_radiotap.h,v 1.16 2007/01/06 05:51:15 dyoung Exp $ */
 
 /*-
diff --git a/sys/net80211/ieee80211_rssadapt.c b/sys/net80211/ieee80211_rssadapt.c
index 4ca0b29fa56..6c77727d752 100644
--- a/sys/net80211/ieee80211_rssadapt.c
+++ b/sys/net80211/ieee80211_rssadapt.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /* $NetBSD: ieee80211_rssadapt.c,v 1.9 2005/02/26 22:45:09 perry Exp $ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
diff --git a/sys/net80211/ieee80211_rssadapt.h b/sys/net80211/ieee80211_rssadapt.h
index 74b64beabfd..a4c1975b420 100644
--- a/sys/net80211/ieee80211_rssadapt.h
+++ b/sys/net80211/ieee80211_rssadapt.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /* $NetBSD: ieee80211_rssadapt.h,v 1.4 2005/02/26 22:45:09 perry Exp $ */
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index d4a103d04f0..bed52a24096 100644
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h
index 1bc79a98e68..faa6fc290ca 100644
--- a/sys/netinet/ip6.h
+++ b/sys/netinet/ip6.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: ip6.h,v 1.18 2001/03/29 05:34:30 itojun Exp $	*/
 
 /*-
diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h
index f8ee38ddd82..3fb1de33d54 100644
--- a/sys/netinet/ip_carp.h
+++ b/sys/netinet/ip_carp.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: ip_carp.h,v 1.8 2004/07/29 22:12:15 mcbride Exp $	*/
 
 /*-
diff --git a/sys/netinet/ip_ecn.h b/sys/netinet/ip_ecn.h
index eb49b5f1421..7390d812606 100644
--- a/sys/netinet/ip_ecn.h
+++ b/sys/netinet/ip_ecn.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: ip_ecn.h,v 1.8 2002/01/07 11:34:47 kjc Exp $	*/
 
 /*-
diff --git a/sys/netinet/ip_encap.h b/sys/netinet/ip_encap.h
index 898114c2db5..1c2488cbfab 100644
--- a/sys/netinet/ip_encap.h
+++ b/sys/netinet/ip_encap.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netinet/libalias/alias_sctp.c b/sys/netinet/libalias/alias_sctp.c
index b0bda8cba79..b34c3777d86 100644
--- a/sys/netinet/libalias/alias_sctp.c
+++ b/sys/netinet/libalias/alias_sctp.c
@@ -70,7 +70,6 @@
  * - Dynamic control of hash-table size
  */
 
-/* $FreeBSD$ */
 
 #ifdef _KERNEL
 #include <machine/stdarg.h>
diff --git a/sys/netinet/libalias/alias_sctp.h b/sys/netinet/libalias/alias_sctp.h
index f88d1d4bf75..827ba63a52b 100644
--- a/sys/netinet/libalias/alias_sctp.h
+++ b/sys/netinet/libalias/alias_sctp.h
@@ -47,7 +47,6 @@
  *
  */
 
-/* $FreeBSD$ */
 
 #ifndef _ALIAS_SCTP_H_
 #define _ALIAS_SCTP_H_
diff --git a/sys/netinet6/icmp6.h b/sys/netinet6/icmp6.h
index a6414efccb7..72a9e75554c 100644
--- a/sys/netinet6/icmp6.h
+++ b/sys/netinet6/icmp6.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: icmp6.h,v 1.17 2000/06/11 17:23:40 jinmei Exp $	*/
 
 #error "netinet6/icmp6.h is obsolete.  use netinet/icmp6.h"
diff --git a/sys/netinet6/ip6.h b/sys/netinet6/ip6.h
index 9eec13fb25e..56e32b85a7e 100644
--- a/sys/netinet6/ip6.h
+++ b/sys/netinet6/ip6.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: ip6.h,v 1.7 2000/03/25 07:23:36 sumikawa Exp $	*/
 
 #error "netinet6/ip6.h is obsolete.  use netinet/ip6.h"
diff --git a/sys/netipsec/ah.h b/sys/netipsec/ah.h
index 8c76dbc4479..833617f082e 100644
--- a/sys/netipsec/ah.h
+++ b/sys/netipsec/ah.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: ah.h,v 1.13 2000/10/18 21:28:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ah_var.h b/sys/netipsec/ah_var.h
index 9b992c07c81..7f784a7ddeb 100644
--- a/sys/netipsec/ah_var.h
+++ b/sys/netipsec/ah_var.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: ip_ah.h,v 1.29 2002/06/09 16:26:10 itojun Exp $	*/
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/esp.h b/sys/netipsec/esp.h
index 2e7c0c9cffa..50a79384a6b 100644
--- a/sys/netipsec/esp.h
+++ b/sys/netipsec/esp.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: esp.h,v 1.16 2000/10/18 21:28:00 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/esp_var.h b/sys/netipsec/esp_var.h
index 48240418903..bbcea005fcf 100644
--- a/sys/netipsec/esp_var.h
+++ b/sys/netipsec/esp_var.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: ip_esp.h,v 1.37 2002/06/09 16:26:10 itojun Exp $	*/
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/ipcomp.h b/sys/netipsec/ipcomp.h
index f1ffdc9b720..b5e915c1fee 100644
--- a/sys/netipsec/ipcomp.h
+++ b/sys/netipsec/ipcomp.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipcomp_var.h b/sys/netipsec/ipcomp_var.h
index 34bfb767943..396af64b57a 100644
--- a/sys/netipsec/ipcomp_var.h
+++ b/sys/netipsec/ipcomp_var.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c
index a66a4e9a171..0084207feb5 100644
--- a/sys/netipsec/ipsec.c
+++ b/sys/netipsec/ipsec.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h
index 85360f9b737..c0bcb4c1ba8 100644
--- a/sys/netipsec/ipsec.h
+++ b/sys/netipsec/ipsec.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/ipsec6.h b/sys/netipsec/ipsec6.h
index f690102fae2..ea37b0b6c53 100644
--- a/sys/netipsec/ipsec6.h
+++ b/sys/netipsec/ipsec6.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index cdc87d6b4e8..697ca500906 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key.h b/sys/netipsec/key.h
index 2ee7c208f19..41528067f2c 100644
--- a/sys/netipsec/key.h
+++ b/sys/netipsec/key.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key_debug.c b/sys/netipsec/key_debug.c
index a6e76ef358d..dcb542b22ad 100644
--- a/sys/netipsec/key_debug.c
+++ b/sys/netipsec/key_debug.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key_debug.h b/sys/netipsec/key_debug.h
index a2dd57edd6f..49be9556c7e 100644
--- a/sys/netipsec/key_debug.h
+++ b/sys/netipsec/key_debug.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: key_debug.h,v 1.10 2001/08/05 08:37:52 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/key_var.h b/sys/netipsec/key_var.h
index bd68645e098..02e1a9ffc59 100644
--- a/sys/netipsec/key_var.h
+++ b/sys/netipsec/key_var.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: key_var.h,v 1.11 2001/09/12 23:05:07 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/keydb.h b/sys/netipsec/keydb.h
index 4e55a9abc34..041a5ce1293 100644
--- a/sys/netipsec/keydb.h
+++ b/sys/netipsec/keydb.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: keydb.h,v 1.14 2000/08/02 17:58:26 sakane Exp $	*/
 
 /*-
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c
index aa893b131a5..3d69d81ba84 100644
--- a/sys/netipsec/keysock.c
+++ b/sys/netipsec/keysock.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $	*/
 
 /*-
diff --git a/sys/netipsec/keysock.h b/sys/netipsec/keysock.h
index 484c65361e5..01c574c1ad3 100644
--- a/sys/netipsec/keysock.h
+++ b/sys/netipsec/keysock.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $	*/
 
 /*-
diff --git a/sys/netipsec/xform.h b/sys/netipsec/xform.h
index ff59971cf13..6347912f1ac 100644
--- a/sys/netipsec/xform.h
+++ b/sys/netipsec/xform.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: ip_ipsp.h,v 1.119 2002/03/14 01:27:11 millert Exp $	*/
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c
index e4b9a27f9c4..de70b3a0715 100644
--- a/sys/netipsec/xform_ah.c
+++ b/sys/netipsec/xform_ah.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c
index da513cf7184..83752a88a65 100644
--- a/sys/netipsec/xform_esp.c
+++ b/sys/netipsec/xform_esp.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
 /*-
  * The authors of this code are John Ioannidis (ji@tla.org),
diff --git a/sys/netipsec/xform_ipcomp.c b/sys/netipsec/xform_ipcomp.c
index cb91db86e12..9a8d132d564 100644
--- a/sys/netipsec/xform_ipcomp.c
+++ b/sys/netipsec/xform_ipcomp.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
 
 /*-
diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c
index 6fcfd3cea30..7dee98d0c1a 100644
--- a/sys/netpfil/ipfilter/netinet/fil.c
+++ b/sys/netpfil/ipfilter/netinet/fil.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_auth.c b/sys/netpfil/ipfilter/netinet/ip_auth.c
index ab6b0804883..5ce89c93c19 100644
--- a/sys/netpfil/ipfilter/netinet/ip_auth.c
+++ b/sys/netpfil/ipfilter/netinet/ip_auth.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_auth.h b/sys/netpfil/ipfilter/netinet/ip_auth.h
index 04ae50996d5..8d3d374431b 100644
--- a/sys/netpfil/ipfilter/netinet/ip_auth.h
+++ b/sys/netpfil/ipfilter/netinet/ip_auth.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c
index fa0cdbab0ab..a0931616361 100644
--- a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c
+++ b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_frag.c b/sys/netpfil/ipfilter/netinet/ip_frag.c
index 145e451279c..111b8cc1dc2 100644
--- a/sys/netpfil/ipfilter/netinet/ip_frag.c
+++ b/sys/netpfil/ipfilter/netinet/ip_frag.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_frag.h b/sys/netpfil/ipfilter/netinet/ip_frag.h
index 4718e6586ef..96db820be89 100644
--- a/sys/netpfil/ipfilter/netinet/ip_frag.h
+++ b/sys/netpfil/ipfilter/netinet/ip_frag.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c
index 8039f761350..863201e2fef 100644
--- a/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c
+++ b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c
index acdd441e047..1119deb031a 100644
--- a/sys/netpfil/ipfilter/netinet/ip_htable.c
+++ b/sys/netpfil/ipfilter/netinet/ip_htable.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_log.c b/sys/netpfil/ipfilter/netinet/ip_log.c
index f98d10a164c..2d067759758 100644
--- a/sys/netpfil/ipfilter/netinet/ip_log.c
+++ b/sys/netpfil/ipfilter/netinet/ip_log.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_lookup.c b/sys/netpfil/ipfilter/netinet/ip_lookup.c
index 19ee77faf41..470bdac7628 100644
--- a/sys/netpfil/ipfilter/netinet/ip_lookup.c
+++ b/sys/netpfil/ipfilter/netinet/ip_lookup.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*
  * Copyright (C) 2012 by Darren Reed.
  *
diff --git a/sys/netpfil/ipfilter/netinet/ip_nat.c b/sys/netpfil/ipfilter/netinet/ip_nat.c
index 9ee3082aa86..73cfd4c581b 100644
--- a/sys/netpfil/ipfilter/netinet/ip_nat.c
+++ b/sys/netpfil/ipfilter/netinet/ip_nat.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_nat.h b/sys/netpfil/ipfilter/netinet/ip_nat.h
index b299ca47723..2d560538c11 100644
--- a/sys/netpfil/ipfilter/netinet/ip_nat.h
+++ b/sys/netpfil/ipfilter/netinet/ip_nat.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_proxy.c b/sys/netpfil/ipfilter/netinet/ip_proxy.c
index 3ee88af2688..7cb4604f3e8 100644
--- a/sys/netpfil/ipfilter/netinet/ip_proxy.c
+++ b/sys/netpfil/ipfilter/netinet/ip_proxy.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_proxy.h b/sys/netpfil/ipfilter/netinet/ip_proxy.h
index 45bc7eb2485..bfa4f28a410 100644
--- a/sys/netpfil/ipfilter/netinet/ip_proxy.h
+++ b/sys/netpfil/ipfilter/netinet/ip_proxy.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_raudio_pxy.c b/sys/netpfil/ipfilter/netinet/ip_raudio_pxy.c
index 6e09fa18a49..2cfaaa58200 100644
--- a/sys/netpfil/ipfilter/netinet/ip_raudio_pxy.c
+++ b/sys/netpfil/ipfilter/netinet/ip_raudio_pxy.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c b/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c
index 27f0322f76f..13c989cba66 100644
--- a/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c
+++ b/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_rules.c b/sys/netpfil/ipfilter/netinet/ip_rules.c
index 0792459b207..81e8ae34ee9 100644
--- a/sys/netpfil/ipfilter/netinet/ip_rules.c
+++ b/sys/netpfil/ipfilter/netinet/ip_rules.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
 * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_rules.h b/sys/netpfil/ipfilter/netinet/ip_rules.h
index 73ba0cf72b8..79f9a68cbc7 100644
--- a/sys/netpfil/ipfilter/netinet/ip_rules.h
+++ b/sys/netpfil/ipfilter/netinet/ip_rules.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 extern int ipfrule_add(void);
 extern int ipfrule_remove(void);
diff --git a/sys/netpfil/ipfilter/netinet/ip_state.c b/sys/netpfil/ipfilter/netinet/ip_state.c
index 463416f454a..f067e488e4f 100644
--- a/sys/netpfil/ipfilter/netinet/ip_state.c
+++ b/sys/netpfil/ipfilter/netinet/ip_state.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$ */
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_state.h b/sys/netpfil/ipfilter/netinet/ip_state.h
index 775ac00953e..200f7d73fba 100644
--- a/sys/netpfil/ipfilter/netinet/ip_state.h
+++ b/sys/netpfil/ipfilter/netinet/ip_state.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ip_sync.c b/sys/netpfil/ipfilter/netinet/ip_sync.c
index b6172342656..b7afe45c8f7 100644
--- a/sys/netpfil/ipfilter/netinet/ip_sync.c
+++ b/sys/netpfil/ipfilter/netinet/ip_sync.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/ipl.h b/sys/netpfil/ipfilter/netinet/ipl.h
index f9a2594c2a3..ae892065f06 100644
--- a/sys/netpfil/ipfilter/netinet/ipl.h
+++ b/sys/netpfil/ipfilter/netinet/ipl.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c
index a8412a1b08e..fcd7a94575e 100644
--- a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c
+++ b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
diff --git a/sys/netpfil/pf/in4_cksum.c b/sys/netpfil/pf/in4_cksum.c
index ca68866c770..63caa41c143 100644
--- a/sys/netpfil/pf/in4_cksum.c
+++ b/sys/netpfil/pf/in4_cksum.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: in4_cksum.c,v 1.7 2003/06/02 23:28:13 millert Exp $	*/
 /*	$KAME: in4_cksum.c,v 1.10 2001/11/30 10:06:15 itojun Exp $	*/
 /*	$NetBSD: in_cksum.c,v 1.13 1996/10/13 02:03:03 christos Exp $	*/
diff --git a/sys/netpfil/pf/pf_mtag.h b/sys/netpfil/pf/pf_mtag.h
index 855955a87df..e0ca555b83c 100644
--- a/sys/netpfil/pf/pf_mtag.h
+++ b/sys/netpfil/pf/pf_mtag.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/nfs/krpc.h b/sys/nfs/krpc.h
index 44b84e019fb..e89c82417a5 100644
--- a/sys/nfs/krpc.h
+++ b/sys/nfs/krpc.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
-/* $FreeBSD$	*/
 
 #include <sys/cdefs.h>
 
diff --git a/sys/nfsserver/nfs_fha_old.h b/sys/nfsserver/nfs_fha_old.h
index 157452f3126..d0c65608d46 100644
--- a/sys/nfsserver/nfs_fha_old.h
+++ b/sys/nfsserver/nfs_fha_old.h
@@ -25,7 +25,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
 
 #ifndef	_NFS_FHA_OLD_H
 #define	_NFS_FHA_OLD_H 1
diff --git a/sys/nlm/nlm_prot.h b/sys/nlm/nlm_prot.h
index 98c5688e49f..3c7dfdff07e 100644
--- a/sys/nlm/nlm_prot.h
+++ b/sys/nlm/nlm_prot.h
@@ -2,7 +2,6 @@
  * Please do not edit this file.
  * It was generated using rpcgen.
  */
-/* $FreeBSD$ */
 
 #ifndef _NLM_PROT_H_RPCGEN
 #define	_NLM_PROT_H_RPCGEN
diff --git a/sys/nlm/sm_inter.h b/sys/nlm/sm_inter.h
index 0cc240b8a19..b7612a08cd9 100644
--- a/sys/nlm/sm_inter.h
+++ b/sys/nlm/sm_inter.h
@@ -2,7 +2,6 @@
  * Please do not edit this file.
  * It was generated using rpcgen.
  */
-/* $FreeBSD$ */
 
 #ifndef _SM_INTER_H_RPCGEN
 #define	_SM_INTER_H_RPCGEN
diff --git a/sys/opencrypto/cryptodev.h b/sys/opencrypto/cryptodev.h
index 90ed5f46077..7881e9987bf 100644
--- a/sys/opencrypto/cryptodev.h
+++ b/sys/opencrypto/cryptodev.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: cryptodev.h,v 1.31 2002/06/11 11:14:29 beck Exp $	*/
 
 /*-
diff --git a/sys/opencrypto/deflate.h b/sys/opencrypto/deflate.h
index a6797d4fd6c..a2ee2380484 100644
--- a/sys/opencrypto/deflate.h
+++ b/sys/opencrypto/deflate.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /* $OpenBSD: deflate.h,v 1.3 2002/03/14 01:26:51 millert Exp $ */
 
 /*-
diff --git a/sys/opencrypto/rmd160.h b/sys/opencrypto/rmd160.h
index 2fa81e0fa84..fe1311148ea 100644
--- a/sys/opencrypto/rmd160.h
+++ b/sys/opencrypto/rmd160.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: rmd160.h,v 1.3 2002/03/14 01:26:51 millert Exp $	*/
 /*-
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
diff --git a/sys/opencrypto/xform.h b/sys/opencrypto/xform.h
index cad7e5272d4..61bf29fddf5 100644
--- a/sys/opencrypto/xform.h
+++ b/sys/opencrypto/xform.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: xform.h,v 1.8 2001/08/28 12:20:43 ben Exp $	*/
 
 /*-
diff --git a/sys/opencrypto/xform_auth.h b/sys/opencrypto/xform_auth.h
index 6427965671d..9e089025cfb 100644
--- a/sys/opencrypto/xform_auth.h
+++ b/sys/opencrypto/xform_auth.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: xform.h,v 1.8 2001/08/28 12:20:43 ben Exp $	*/
 
 /*-
diff --git a/sys/opencrypto/xform_comp.h b/sys/opencrypto/xform_comp.h
index 1d0ba7a505b..8029705c177 100644
--- a/sys/opencrypto/xform_comp.h
+++ b/sys/opencrypto/xform_comp.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: xform.h,v 1.8 2001/08/28 12:20:43 ben Exp $	*/
 
 /*-
diff --git a/sys/opencrypto/xform_enc.h b/sys/opencrypto/xform_enc.h
index 1c800ed428f..fd3e86c9a57 100644
--- a/sys/opencrypto/xform_enc.h
+++ b/sys/opencrypto/xform_enc.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$OpenBSD: xform.h,v 1.8 2001/08/28 12:20:43 ben Exp $	*/
 
 /*-
diff --git a/sys/powerpc/aim/locore.S b/sys/powerpc/aim/locore.S
index 861536447be..085719547fa 100644
--- a/sys/powerpc/aim/locore.S
+++ b/sys/powerpc/aim/locore.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #ifdef __powerpc64__
 #include <powerpc/aim/locore64.S>
diff --git a/sys/powerpc/aim/locore32.S b/sys/powerpc/aim/locore32.S
index 9f84bbf3477..3fba703794b 100644
--- a/sys/powerpc/aim/locore32.S
+++ b/sys/powerpc/aim/locore32.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /*-
  * Copyright (C) 2010-2016 Nathan Whitehorn
diff --git a/sys/powerpc/aim/locore64.S b/sys/powerpc/aim/locore64.S
index 3b62c779ad7..9e49b605b8b 100644
--- a/sys/powerpc/aim/locore64.S
+++ b/sys/powerpc/aim/locore64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 /*-
  * Copyright (C) 2010-2016 Nathan Whitehorn
diff --git a/sys/powerpc/aim/trap_subr32.S b/sys/powerpc/aim/trap_subr32.S
index 710a222fd84..0796271959f 100644
--- a/sys/powerpc/aim/trap_subr32.S
+++ b/sys/powerpc/aim/trap_subr32.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* $NetBSD: trap_subr.S,v 1.20 2002/04/22 23:20:08 kleink Exp $	*/
 
 /*-
diff --git a/sys/powerpc/aim/trap_subr64.S b/sys/powerpc/aim/trap_subr64.S
index 8e0f43ed0ee..4cc509b9d88 100644
--- a/sys/powerpc/aim/trap_subr64.S
+++ b/sys/powerpc/aim/trap_subr64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* $NetBSD: trap_subr.S,v 1.20 2002/04/22 23:20:08 kleink Exp $	*/
 
 /*-
diff --git a/sys/powerpc/fpu/fpu_arith.h b/sys/powerpc/fpu/fpu_arith.h
index c39862217fa..8aeb1732919 100644
--- a/sys/powerpc/fpu/fpu_arith.h
+++ b/sys/powerpc/fpu/fpu_arith.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: fpu_arith.h,v 1.4 2005/12/24 20:07:28 perry Exp $ */
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
diff --git a/sys/powerpc/fpu/fpu_emu.h b/sys/powerpc/fpu/fpu_emu.h
index 18e318ade49..6adb431480c 100644
--- a/sys/powerpc/fpu/fpu_emu.h
+++ b/sys/powerpc/fpu/fpu_emu.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: fpu_emu.h,v 1.3 2005/12/11 12:18:42 christos Exp $ */
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
diff --git a/sys/powerpc/fpu/fpu_extern.h b/sys/powerpc/fpu/fpu_extern.h
index d1c0b7dbe67..311a849be0d 100644
--- a/sys/powerpc/fpu/fpu_extern.h
+++ b/sys/powerpc/fpu/fpu_extern.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: fpu_extern.h,v 1.3 2005/12/11 12:18:42 christos Exp $	*/
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/powerpc/fpu/fpu_instr.h b/sys/powerpc/fpu/fpu_instr.h
index 10893d5964c..c417928a252 100644
--- a/sys/powerpc/fpu/fpu_instr.h
+++ b/sys/powerpc/fpu/fpu_instr.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: instr.h,v 1.4 2005/12/11 12:18:43 christos Exp $ */
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
diff --git a/sys/powerpc/include/bus_dma.h b/sys/powerpc/include/bus_dma.h
index 0ddda1831dc..09bc7b15e94 100644
--- a/sys/powerpc/include/bus_dma.h
+++ b/sys/powerpc/include/bus_dma.h
@@ -25,7 +25,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
 
 #ifndef _POWERPC_BUS_DMA_H_
 #define _POWERPC_BUS_DMA_H_
diff --git a/sys/powerpc/include/procctl.h b/sys/powerpc/include/procctl.h
index 5221cfcd7be..b340002b45e 100644
--- a/sys/powerpc/include/procctl.h
+++ b/sys/powerpc/include/procctl.h
@@ -1,4 +1,3 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
diff --git a/sys/powerpc/include/reg.h b/sys/powerpc/include/reg.h
index 2fc0636e1c9..781ee3b0228 100644
--- a/sys/powerpc/include/reg.h
+++ b/sys/powerpc/include/reg.h
@@ -1,5 +1,4 @@
 /* $NetBSD: reg.h,v 1.4 2000/06/04 09:30:44 tsubai Exp $	*/
-/* $FreeBSD$	*/
 
 #ifndef _POWERPC_REG_H_
 #define	_POWERPC_REG_H_
diff --git a/sys/powerpc/include/resource.h b/sys/powerpc/include/resource.h
index 97ea986715f..9477572176e 100644
--- a/sys/powerpc/include/resource.h
+++ b/sys/powerpc/include/resource.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/powerpc/powerpc/db_interface.c b/sys/powerpc/powerpc/db_interface.c
index bc085c2c086..158578d7a27 100644
--- a/sys/powerpc/powerpc/db_interface.c
+++ b/sys/powerpc/powerpc/db_interface.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$ */
 /*	$NetBSD: db_interface.c,v 1.20 2002/05/13 20:30:09 matt Exp $ */
 /*	$OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $	*/
 
diff --git a/sys/powerpc/powerpc/db_trace.c b/sys/powerpc/powerpc/db_trace.c
index 3103399f06b..ab4315a135e 100644
--- a/sys/powerpc/powerpc/db_trace.c
+++ b/sys/powerpc/powerpc/db_trace.c
@@ -1,4 +1,3 @@
-/*	$FreeBSD$ */
 /*	$NetBSD: db_trace.c,v 1.20 2002/05/13 20:30:09 matt Exp $	*/
 /*	$OpenBSD: db_trace.c,v 1.3 1997/03/21 02:10:48 niklas Exp $	*/
 
diff --git a/sys/powerpc/powerpc/setjmp.S b/sys/powerpc/powerpc/setjmp.S
index f58c4aa0cf7..b6388ce62f4 100644
--- a/sys/powerpc/powerpc/setjmp.S
+++ b/sys/powerpc/powerpc/setjmp.S
@@ -1,4 +1,3 @@
-/*	$FreeBSD$  */
 /*	from:	NetBSD: setjmp.S,v 1.1 1998/01/27 15:13:12 sakamoto Exp $  */
 /*	from:	OpenBSD: setjmp.S,v 1.2 1996/12/28 06:22:18 rahnds Exp 	*/
 /* kernel version of this file, does not have signal goop */
diff --git a/sys/powerpc/powerpc/sigcode32.S b/sys/powerpc/powerpc/sigcode32.S
index 615e2237fab..6ac2f5837c7 100644
--- a/sys/powerpc/powerpc/sigcode32.S
+++ b/sys/powerpc/powerpc/sigcode32.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* $NetBSD: sigcode.S,v 1.1 1999/11/17 14:56:11 kleink Exp $	*/
 
 /*-
diff --git a/sys/powerpc/powerpc/sigcode64.S b/sys/powerpc/powerpc/sigcode64.S
index 7b1a902ff48..4c903367c5b 100644
--- a/sys/powerpc/powerpc/sigcode64.S
+++ b/sys/powerpc/powerpc/sigcode64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* $NetBSD: sigcode.S,v 1.1 1999/11/17 14:56:11 kleink Exp $	*/
 
 /*-
diff --git a/sys/powerpc/powerpc/swtch32.S b/sys/powerpc/powerpc/swtch32.S
index 6ad781895dc..245d78935d9 100644
--- a/sys/powerpc/powerpc/swtch32.S
+++ b/sys/powerpc/powerpc/swtch32.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */
 
 /*-
diff --git a/sys/powerpc/powerpc/swtch64.S b/sys/powerpc/powerpc/swtch64.S
index fe59a166f3c..4557e5150f1 100644
--- a/sys/powerpc/powerpc/swtch64.S
+++ b/sys/powerpc/powerpc/swtch64.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */
 
 /*-
diff --git a/sys/powerpc/ps3/ps3-hvcall.S b/sys/powerpc/ps3/ps3-hvcall.S
index 49c808a2650..99e503e2dcf 100644
--- a/sys/powerpc/ps3/ps3-hvcall.S
+++ b/sys/powerpc/ps3/ps3-hvcall.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #include <machine/asm.h>
 
diff --git a/sys/riscv/include/bus_dma.h b/sys/riscv/include/bus_dma.h
index c4ed711ed1a..a29a3cd2619 100644
--- a/sys/riscv/include/bus_dma.h
+++ b/sys/riscv/include/bus_dma.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #ifndef _MACHINE_BUS_DMA_H_
 #define	_MACHINE_BUS_DMA_H_
diff --git a/sys/riscv/include/clock.h b/sys/riscv/include/clock.h
index da23dbe43a4..e69de29bb2d 100644
--- a/sys/riscv/include/clock.h
+++ b/sys/riscv/include/clock.h
@@ -1 +0,0 @@
-/* $FreeBSD$ */
diff --git a/sys/riscv/include/encoding.h b/sys/riscv/include/encoding.h
index 0f8ffdc611a..c9ef8a985df 100644
--- a/sys/riscv/include/encoding.h
+++ b/sys/riscv/include/encoding.h
@@ -1,7 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 /* Automatically generated by parse-opcodes.  */
 #ifndef RISCV_ENCODING_H
diff --git a/sys/riscv/include/exec.h b/sys/riscv/include/exec.h
index da23dbe43a4..e69de29bb2d 100644
--- a/sys/riscv/include/exec.h
+++ b/sys/riscv/include/exec.h
@@ -1 +0,0 @@
-/* $FreeBSD$ */
diff --git a/sys/riscv/include/floatingpoint.h b/sys/riscv/include/floatingpoint.h
index da2e005915f..7569ce3f7f2 100644
--- a/sys/riscv/include/floatingpoint.h
+++ b/sys/riscv/include/floatingpoint.h
@@ -1,3 +1,2 @@
-/* $FreeBSD$ */
 
 #include <machine/ieeefp.h>
diff --git a/sys/riscv/include/ieeefp.h b/sys/riscv/include/ieeefp.h
index 72a48f4f9b7..03a96e8a000 100644
--- a/sys/riscv/include/ieeefp.h
+++ b/sys/riscv/include/ieeefp.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #ifndef _MACHINE_IEEEFP_H_
 #define	_MACHINE_IEEEFP_H_
diff --git a/sys/riscv/include/procctl.h b/sys/riscv/include/procctl.h
index 5221cfcd7be..b340002b45e 100644
--- a/sys/riscv/include/procctl.h
+++ b/sys/riscv/include/procctl.h
@@ -1,4 +1,3 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
diff --git a/sys/riscv/include/psl.h b/sys/riscv/include/psl.h
index da23dbe43a4..e69de29bb2d 100644
--- a/sys/riscv/include/psl.h
+++ b/sys/riscv/include/psl.h
@@ -1 +0,0 @@
-/* $FreeBSD$ */
diff --git a/sys/riscv/include/ptrace.h b/sys/riscv/include/ptrace.h
index da23dbe43a4..e69de29bb2d 100644
--- a/sys/riscv/include/ptrace.h
+++ b/sys/riscv/include/ptrace.h
@@ -1 +0,0 @@
-/* $FreeBSD$ */
diff --git a/sys/riscv/include/reloc.h b/sys/riscv/include/reloc.h
index da23dbe43a4..e69de29bb2d 100644
--- a/sys/riscv/include/reloc.h
+++ b/sys/riscv/include/reloc.h
@@ -1 +0,0 @@
-/* $FreeBSD$ */
diff --git a/sys/riscv/include/sigframe.h b/sys/riscv/include/sigframe.h
index 9787f579d56..aa24726c4e3 100644
--- a/sys/riscv/include/sigframe.h
+++ b/sys/riscv/include/sigframe.h
@@ -1,2 +1 @@
-/* $FreeBSD$ */
 #include <machine/frame.h>
diff --git a/sys/riscv/include/trap.h b/sys/riscv/include/trap.h
index da23dbe43a4..e69de29bb2d 100644
--- a/sys/riscv/include/trap.h
+++ b/sys/riscv/include/trap.h
@@ -1 +0,0 @@
-/* $FreeBSD$ */
diff --git a/sys/rpc/clnt_stat.h b/sys/rpc/clnt_stat.h
index 6148b4eb94a..7b367132f2d 100644
--- a/sys/rpc/clnt_stat.h
+++ b/sys/rpc/clnt_stat.h
@@ -1,4 +1,3 @@
-/*	$FreeBSD$ */
 /*
  * Copyright (c) 1986 - 1991, 1994, 1996, 1997 by Sun Microsystems, Inc.
  * All rights reserved.
diff --git a/sys/rpc/netconfig.h b/sys/rpc/netconfig.h
index d49b925749a..f492a1326a8 100644
--- a/sys/rpc/netconfig.h
+++ b/sys/rpc/netconfig.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: netconfig.h,v 1.1 2000/06/02 22:57:54 fvdl Exp $	*/
-/*	$FreeBSD$ */
 
 
 #ifndef _NETCONFIG_H_
diff --git a/sys/rpc/nettype.h b/sys/rpc/nettype.h
index 0f63ac9530b..a91e5c36582 100644
--- a/sys/rpc/nettype.h
+++ b/sys/rpc/nettype.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: nettype.h,v 1.2 2000/07/06 03:17:19 christos Exp $	*/
-/*	$FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
diff --git a/sys/rpc/rpcb_clnt.h b/sys/rpc/rpcb_clnt.h
index 6233952c484..f4dc6d388c5 100644
--- a/sys/rpc/rpcb_clnt.h
+++ b/sys/rpc/rpcb_clnt.h
@@ -1,5 +1,4 @@
 /*	$NetBSD: rpcb_clnt.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
diff --git a/sys/rpc/rpcm_subs.h b/sys/rpc/rpcm_subs.h
index 0fe500ab521..506613a609a 100644
--- a/sys/rpc/rpcm_subs.h
+++ b/sys/rpc/rpcm_subs.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$OpenBSD: nfsm_subs.h,v 1.11 2000/01/05 20:50:52 millert Exp $	*/
 /*	$NetBSD: nfsm_subs.h,v 1.10 1996/03/20 21:59:56 fvdl Exp $	*/
 
diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss_int.h b/sys/rpc/rpcsec_gss/rpcsec_gss_int.h
index f0ea906a102..3d643af8c49 100644
--- a/sys/rpc/rpcsec_gss/rpcsec_gss_int.h
+++ b/sys/rpc/rpcsec_gss/rpcsec_gss_int.h
@@ -36,7 +36,6 @@
 
   $Id: auth_gss.h,v 1.12 2001/04/30 19:44:47 andros Exp $
 */
-/* $FreeBSD$ */
 
 #ifndef _RPCSEC_GSS_INT_H
 #define _RPCSEC_GSS_INT_H
diff --git a/sys/rpc/rpcsec_tls/rpctlscd.x b/sys/rpc/rpcsec_tls/rpctlscd.x
index 1ae53d7b8d1..9a7fb46181c 100644
--- a/sys/rpc/rpcsec_tls/rpctlscd.x
+++ b/sys/rpc/rpcsec_tls/rpctlscd.x
@@ -27,7 +27,6 @@
 
 /* Modified from gssd.x for the client side of RPC-over-TLS. */
 
-/* $FreeBSD$ */
 
 struct rpctlscd_connect_arg {
 	char certname<>;
diff --git a/sys/rpc/rpcsec_tls/rpctlssd.x b/sys/rpc/rpcsec_tls/rpctlssd.x
index 25256879d60..922583284b1 100644
--- a/sys/rpc/rpcsec_tls/rpctlssd.x
+++ b/sys/rpc/rpcsec_tls/rpctlssd.x
@@ -27,7 +27,6 @@
 
 /* Modified from gssd.x for the server side of RPC-over-TLS. */
 
-/* $FreeBSD$ */
 
 struct rpctlssd_connect_res {
 	uint32_t flags;
diff --git a/sys/sys/_seqc.h b/sys/sys/_seqc.h
index 718559e8b89..c0278b98da6 100644
--- a/sys/sys/_seqc.h
+++ b/sys/sys/_seqc.h
@@ -1,7 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #ifndef _SYS__SEQC_H_
 #define _SYS__SEQC_H_
diff --git a/sys/sys/apm.h b/sys/sys/apm.h
index ef076ea594b..307f6ac529d 100644
--- a/sys/sys/apm.h
+++ b/sys/sys/apm.h
@@ -1,5 +1,4 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 #include <sys/disk/apm.h>
diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h
index 2a8c367f480..595897bc5fa 100644
--- a/sys/sys/bus_dma.h
+++ b/sys/sys/bus_dma.h
@@ -62,7 +62,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$ */
 
 #ifndef _BUS_DMA_H_
 #define _BUS_DMA_H_
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index c98e0749ad5..29fb8c2106b 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $	*/
 
 /*-
diff --git a/sys/sys/sem.h b/sys/sys/sem.h
index bf1e31e4aca..05b69f64cd0 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 07eff28b7a5..0b5cba0120e 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $	*/
 
 /*-
diff --git a/sys/sys/termios.h b/sys/sys/termios.h
index e5bacf46550..2ae13115038 100644
--- a/sys/sys/termios.h
+++ b/sys/sys/termios.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 #ifdef __GNUC__
 #warning "this file includes <sys/termios.h> which is deprecated, use <termios.h> instead"
 #endif
diff --git a/sys/sys/tree.h b/sys/sys/tree.h
index 83326b31041..7a235730b16 100644
--- a/sys/sys/tree.h
+++ b/sys/sys/tree.h
@@ -1,6 +1,5 @@
 /*	$NetBSD: tree.h,v 1.8 2004/03/28 19:38:30 provos Exp $	*/
 /*	$OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $	*/
-/* $FreeBSD$ */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/sys/vmem.h b/sys/sys/vmem.h
index c1f18a03fa6..20eee9f6ccd 100644
--- a/sys/sys/vmem.h
+++ b/sys/sys/vmem.h
@@ -27,7 +27,6 @@
  */
 /* From	$NetBSD: vmem.h,v 1.20 2013/01/29 21:26:24 para Exp $	*/
 
-/* $FreeBSD$ */
 
 #ifndef _SYS_VMEM_H_
 #define	_SYS_VMEM_H_
diff --git a/sys/tests/runtest/runtest.c b/sys/tests/runtest/runtest.c
index 3396f6b838f..82931d9b949 100644
--- a/sys/tests/runtest/runtest.c
+++ b/sys/tests/runtest/runtest.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/x86/include/iommu.h b/sys/x86/include/iommu.h
index 2757f155425..a95480b53ac 100644
--- a/sys/x86/include/iommu.h
+++ b/sys/x86/include/iommu.h
@@ -1,7 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #ifndef	_MACHINE_IOMMU_H_
 #define	_MACHINE_IOMMU_H_