1236 files changed, 0 insertions, 1236 deletions

diff --git a/sys/amd64/include/_align.h b/sys/amd64/include/_align.h
index 28c4669ad258..506bc3c9e7f3 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 40107cd74a71..2d0d28c29fe7 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 3c7365bb4ed1..aa71de42e795 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 db1affc0770c..033e31af2ccd 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 26803672ff6f..8d6d2dfa0d72 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 1ae3d5865dba..21f797929cec 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 9cc0eeeaf6fd..9d31da47c3aa 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 f1af2cf6168c..a53fadb1995a 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 31c8e41a3159..088692e9ad95 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 815942d0d967..4dc14c6c3415 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 f9323775dc24..3b0807772920 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 2ad27a9069b9..a8e10b0a36f2 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 1a0351442890..a7c73c541997 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 4759963566ab..2cde8b6d60e4 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 3737d51fdcef..ee9a3ac29847 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 98d0272fd4cc..cd8c069c5bb0 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 ec70f1c368a1..431cc00314f7 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 4457f85908c2..81fe027ceb41 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 717d5cc39fba..651c71045353 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 4a6bcc712046..a3875dad78b7 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 4d945a1ebbaf..fd047b0ea72d 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 bf86754d8f45..7506c43f5168 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 f01fac695ae5..91cb7604b171 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 f6fb2bc6578f..37ddd32142b6 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 dfcc902a7316..368a13b88d3a 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 c4101a77fd64..306fb8424274 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 d5cdb56289af..1bf3f9913ad0 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 db9fe6ad597e..8fb36cb1c94c 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 aace4bfd62e9..39528555d328 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 ff21ee28b5a3..848f35aad1a1 100644
--- a/sys/amd64/include/stack.h
+++ b/sys/amd64/include/stack.h
@@ -1,7 +1,6 @@
 /*
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #ifndef _MACHINE_STACK_H_
 #define	_MACHINE_STACK_H_
diff --git a/sys/amd64/include/stdarg.h b/sys/amd64/include/stdarg.h
index 1f80090356a9..1739bbeb9ea0 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 cd380d43b074..47cecf1d27c3 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 4d950771dcc1..20f898d15b94 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 aea80e3845ac..aa3a439bcdad 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 b81c455a92a5..77fc7655d55e 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 1490e59c2f9d..ac9f66b2b300 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 bf1158185a1f..4b77bd32600e 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/ieeefp.h b/sys/arm/include/ieeefp.h
index 0b61744b450b..57dd058b8a95 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 3efad39753d3..f999cce12b47 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 5221cfcd7be1..b340002b45ee 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 44085a3b7079..d930ab80f179 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 e5ed27921184..b9d1af584b3a 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 490df1036e2b..41a342334d84 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 9787f579d563..aa24726c4e34 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 fbb769151de6..4d8546835681 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/sysarch.h b/sys/arm/include/sysarch.h
index 603d8c5a852c..907a84f39e58 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 ae1c571255f5..df5db1e85c44 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 1b2d36086e4f..9e5a7124dcf5 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 da23dbe43a4f..e69de29bb2d1 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 00b6fc25f3a2..462b9ac6bfa4 100644
--- a/sys/arm64/include/exec.h
+++ b/sys/arm64/include/exec.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #ifdef __arm__
 #include <arm/exec.h>
diff --git a/sys/arm64/include/floatingpoint.h b/sys/arm64/include/floatingpoint.h
index da2e005915fc..7569ce3f7f27 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 95b5c274ff1e..80500a083044 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 5221cfcd7be1..b340002b45ee 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 da23dbe43a4f..e69de29bb2d1 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 0705ee6daab0..a83188d8d47b 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 b6e2eb6f775c..4f9f327af86f 100644
--- a/sys/arm64/include/reloc.h
+++ b/sys/arm64/include/reloc.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #ifdef __arm__
 #include <arm/reloc.h>
diff --git a/sys/arm64/include/sigframe.h b/sys/arm64/include/sigframe.h
index 9787f579d563..aa24726c4e34 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 da23dbe43a4f..e69de29bb2d1 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 707862b6a598..4ebb2dba7b61 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 db8666ea99db..18e7aad5dc4f 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 e984009f710d..ad9f01f76585 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 58c40e61fb34..73dc272da218 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 ac8571810b07..c9f3b893e60b 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 3f8997382c75..f69489a657f7 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 a8a259fda15a..c81456a4bfca 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 3b7c8a2cde78..d9649dcb5471 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 ed46acc4020f..cdd3d9a01f35 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 68085ff7435c..9c6e603a5753 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 822b3c0775bf..a9c39977a6fc 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 e73f8ed8e65e..185b4485e07a 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 edff3e6d6d83..6563ed2cd623 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.powerpc b/sys/conf/ldscript.powerpc
index b6279b730d56..2bfc02768a22 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 5dd84c65c09f..f436a3bc0f64 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 72f993cb9fb9..bd883853711a 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 b8c89fe7d1d6..38209f6516c8 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 b8ebf047f996..9a2764a23789 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 0e025c6d76e0..3f6ab8c69abf 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 cc59aee757c9..014ce3a508b3 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 da06cc28ae41..77c180962b76 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 da06cc28ae41..77c180962b76 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 da06cc28ae41..77c180962b76 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 da06cc28ae41..77c180962b76 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 da06cc28ae41..77c180962b76 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 f012efb229c7..94aa2b3640fc 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 f012efb229c7..94aa2b3640fc 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 f012efb229c7..94aa2b3640fc 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 f012efb229c7..94aa2b3640fc 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 f012efb229c7..94aa2b3640fc 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 0471a1fedc20..c482b07c8f36 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 6542eef1c225..064f9b84773d 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 6542eef1c225..064f9b84773d 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 6542eef1c225..064f9b84773d 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 6542eef1c225..064f9b84773d 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 6542eef1c225..064f9b84773d 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 20f8bb9a7948..2a9ea9fd489b 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 de1278b5ae93..fff2fd807db2 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 111b231ddd44..5549337b0064 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 2c3cacc1b499..2fdf60b8bf2a 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 0528b9cecafc..fee6e1a278d8 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 d4aa375024d7..553241f52a9b 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 129b8277be3f..c72f0553497b 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 854356796321..19c371261881 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 3f5dd97fecd8..49c6433b0c31 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 98a50290f0f2..d33eb0b4c104 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 69f4ed52d7e0..dd64f05da9f9 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 8a53b2b0456f..54af391bab13 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 69f4ed52d7e0..dd64f05da9f9 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 42478451e9f8..ebed28fe4715 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 32c08ad6f25b..95139b40c1ad 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 55c1f76ecd69..99f3a3d07ff9 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 123c78b18387..24db5ad30731 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 f7fcce4365fa..fc74b7095cb8 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 4243755458c5..387d3c1f27b8 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 500c8ea36902..d52a88d8d0fd 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 4fc458d568f8..8ea86cb222fa 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 f72c9c8b18bf..847de3818ea6 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 e1a08d98912f..e3be48716e07 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 8fdd14f254cb..2103672a35ff 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 390125ff0521..7ec5b5a83538 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/aes-gcm-avx512.S b/sys/crypto/openssl/amd64/aes-gcm-avx512.S
index 6ddd1f994704..aaebc32f962f 100644
--- a/sys/crypto/openssl/amd64/aes-gcm-avx512.S
+++ b/sys/crypto/openssl/amd64/aes-gcm-avx512.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /* Do not modify. This file is auto-generated from aes-gcm-avx512.pl. */
 .globl	ossl_vaes_vpclmulqdq_capable
 .type	ossl_vaes_vpclmulqdq_capable,@function
diff --git a/sys/crypto/openssl/amd64/aesni-gcm-x86_64.S b/sys/crypto/openssl/amd64/aesni-gcm-x86_64.S
index 26e49f9b2979..2fa549472419 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 706c5c59d38d..acffb8be04df 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 38f306142c82..76edda128a1b 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 cb9e150db553..9bdf39ffde7b 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 ce3ba1266de1..484b06c5eac2 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 b01c1b87d47b..0b3c67120146 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 d1d284b5a32b..97a1d4310688 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 b19cf1d0b2d3..ab4cc09852f2 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 df18fa496de4..542c4d80ec8a 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 078353528d5f..ce241dff4e05 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 d36758807990..8fc2a57e4509 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 0427fe299e75..289c60b49aaa 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 c5a1f45fc5de..4d43b3d142f4 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 1f6b90fe645d..90ae0b0e7e18 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 a084e9b9c993..923025d0431c 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 3075a52d2eec..c9d02d5eb179 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 3ba29ea52dd9..2b1df8270a0c 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 0090e020c573..cba8dd5a2073 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 342db5203d16..1274bb72716d 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 1c77e3d13a8b..70e6e51b41e2 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 13d497c4f8e0..c7f77043beaf 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 ae11a36e4821..280a35a25546 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 b9c6f7e98a69..bb5953568a6d 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 3edf02d0fc08..89636e0bd70d 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 7448e866aaf6..fbc83f9a2429 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 4c6f4ff4fbf2..8e0511f39bd4 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 015a87c446b7..4fd5d3d0ab42 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 acd8b6025fd8..4fa952f2b3b0 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 4686723d6970..f8fee4d9d65a 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 3da60f935ad0..c0c01485aaf9 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 f46d50c57337..569f1c6ba400 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 1863e0ff4f61..5ee07d4bf9a3 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 d05c71457ecd..69ca04f89119 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 f7b60e0ca530..f1f59a2de10e 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 b9ef9881e3e5..2414da194a22 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 d38938049048..077500d3c188 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 25ee8d5464f3..150b83583dea 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 ab5203527db1..413ab2ffed1d 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 8160d0e53a60..f617d9981430 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 b50f34e1591e..ae0cd9cd4b8b 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 02d745f510b7..64d0ef9b5a38 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 d97f995206eb..2492c049a2a0 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 fc7d2c499da5..5b541faf07f7 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 2e230fc40748..f1522a8cbff7 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 acc05d448de1..ea2058f2bad8 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 881ae678e3e5..fd533bb99315 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 36f3a376b61c..512bcf3a82db 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 88665fc8e1cf..fea8b021a95f 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 d6b2936a5381..a45c3e3a37e1 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 3611a9e23b55..3a49ea43c230 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 f749223a585d..e3f734245def 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 bc393f06e5e7..fd5e72fd8abe 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 72bdc2e6b455..fd9506d92c4c 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 58085b33679b..66a152488e90 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 eb413d9f1a73..b72eda775c9d 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 02b5a036f08a..2d031cdd47e5 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 8913b8831960..1b1a07ec96d1 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 100deee40bf2..f8a678b3dc31 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 cf0712c9b403..1d076f3d6b10 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 ce3274d0d732..5ab6bea14b3a 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 947af68e3d35..5b6be50568b5 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 7e90e2d9b1d2..1b6b1a420f52 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 7b4205352bdf..454030c18cc6 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 77a0cd78b150..c5f6b718d56b 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 f78a8f9b32c6..1c9cef1456a0 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 8da4ba60d5b9..fc5df6274a9c 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 9a137085bffe..9c0e25178104 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 dbb8531aefaf..049c9e626e06 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 6029b2df04fe..d232734b64ba 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 75eef3eb51f3..ff971cbe937f 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 e29b45aa3d2a..21067ff2521c 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 fe791fd10c46..2893962f9ce8 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 0faf60451c71..6b662b8727ae 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 54aff7b38172..5b458a6ec4e5 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 403526444f2c..d983a0b479c8 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 e530f694458d..3edbeb636de4 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 23c1c684ef4a..166e2de1dddb 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 a810519d3ff9..77c67739f983 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 e576ad1f73e8..f9866f180b8b 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 8f39584266ad..9b56899af0dc 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 092f2090f02f..a55e926c1c70 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 b6c3109c997c..073caa074f29 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 846e3e8eb781..182884860f46 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 bafb4de1f786..fd11edc79389 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 6532b46191a7..4b1074819d86 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 091144251352..5fdbf0552b26 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 a749e02c0174..ef0577628312 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 034be7001305..bd280724515b 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 91877d0c1492..719d6b7e736a 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 4eadcde21a8d..bac074cdcf6f 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 dbd291ea14f5..d8b106602293 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 bb5bf9423865..0cc88e83b6b8 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 ba25869389bb..2bf6aa9b2227 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 c6d69006c9a3..50805d3d52bc 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 1ed506ee382f..d352a41008b3 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 26623f9a4ef9..a111ba427cee 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 9cfe73e7381d..a1bb3092fee0 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 cc1586b1ef78..f13adffb034b 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 26040484841c..5172aa901807 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 1576f5bd123f..ab9642de0a21 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 f44b162d87c7..bf0e1b3b8999 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 0e321f28c03e..17762f84c239 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 3b1074f6d707..cfbe7579524c 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 163009d849fe..922f45cc0e46 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 91d52da4baa1..2685a6388418 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 034be7001305..bd280724515b 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 e11f67a0e002..8fcd5da109f0 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 8847ff915ee5..1fb70dd39b25 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 a98434c9df9b..7ffdb4a3d39b 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 a635adba4158..b55fd07fea76 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 ba25869389bb..2bf6aa9b2227 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 c6d69006c9a3..50805d3d52bc 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 1ed506ee382f..d352a41008b3 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 778b17b6fcdb..35d3141a6edb 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 40c0b98706ba..ffde833812ef 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 2b7971dacf41..008313c9df83 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 3975b0552478..c58a070bc8ee 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 a85750d12dd8..55b5d83ce2a5 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 f6e1b361c290..718232627e6d 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 0e321f28c03e..17762f84c239 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 0bbc8cb8b72b..66aef30ecfb6 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 6a52bbceb822..a7b20e4fe3a9 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 1954fec65c6a..1d71a34af668 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 ca80a54868bd..82d7552a5b27 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 ca919aca1d05..f8038bd59363 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 6e6616664bf6..a8f54a41d345 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 6f36c35a3753..93ccaf728744 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 6db741ee5714..5b52193b3ddd 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 3cdf2775e5f0..c81af89c7624 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 f45b015a7c5e..4467f3a0a4ff 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 4b16ebd6d608..7b61c2b22769 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 c4aefab92fe2..513496ce4d50 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 68b0ebaa6e9b..211027d94db4 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 6d4545760f97..a7ea2151b290 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 53263c6a20eb..148599229086 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 b1ce2bcb9afc..22e5646650a8 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 8a286f1f5e80..d363a71b3581 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 0824e2d31a52..591d8bd37562 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 20e1b4c02d40..c84ff153a564 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 ac35b4eabf28..5a764bf130b8 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 9e6de14757d7..80579f8be269 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 e60fc8ebf08e..cc984c951a8f 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 7bb2e8ea9449..0e3c2281c9f5 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 d31065d9a182..c0f6a45a195f 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 2fdf7066865b..e8de9086d05d 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 9a93090c2d33..259695a8701d 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 27f8507fb63c..6754fd9f666f 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 ce9ae8791654..e8970adf996f 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 77303adb162f..0e56af14c133 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 a0c057e5f07f..fded5dc2b04e 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 d6665bfe64dd..91ac3fe9fcbf 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 adb6e4d08b8a..cace8e563331 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 48cf33213043..5942a9d672f5 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 e12a5fbecf25..ff810821d9e9 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 dca16cd3cfcc..591712f9f25d 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 44281a0fadf6..92f676932636 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 463bd6bd8a5b..f17877f3e463 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 da2e786130c8..c7ca56914dba 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 77414b851a76..6f82462246e0 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 86b3d1194edd..3102505faa15 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 dfa7684f27b7..c6af34cade54 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 b8b8a4919517..13e25f9944fb 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 370f7f9d8a1a..a0d609e311d9 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 08edf1b65606..96a7a3dde8a9 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 4e4e07070830..8ce94f14b2b0 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 970b9ae0e01a..97097fd777a1 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 c038001abe08..61f8d5cbe265 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 8911204f0b91..576f9047f5b5 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 86fd5d1e892f..b57aec8d0524 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 0536a975a516..8016ee352068 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 82a8a6514ce3..bddb97afd8b9 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 0c74d4229a34..0aaf32125bbe 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 3a5b231b8bce..147e542dfe0b 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 b3fb854f8adc..5af1142a1ff0 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 12c89a089735..9bcd2798e486 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 abf62f676a6f..aace8e78ed6a 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 765458d621f9..eec198df7466 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 ca6bf59b5dd1..aabd1242b74c 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 d3c3bc0da097..ebf0be7426a0 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 1c1500e78d19..2819150acba6 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/exca/excareg.h b/sys/dev/exca/excareg.h
index a339ee781ad9..82a5cb7f9a37 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 ad7dab535eea..b301ab5ab26b 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 6ed72dbe5a00..4b5d4a81b51e 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 a267207e49db..09fad96c9559 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 0b5da9479bfd..3e746cab22ca 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 2cdfccedfbb7..4f8b8acbe201 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 e2a8cc3080a9..9660e306a643 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 ec0d96ec20a4..3ba3022c3caf 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 75b9c508cc63..3eeaa6f68ef4 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 3dbff532ba30..839c23a43d76 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 a4d1d4df8676..f7113a832bf8 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 8ef01a520bf0..376619fd24f1 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 b6ca90752ddc..50d0e31b87e5 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 2653d535c019..37b42ae4b071 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 abb670030537..5b2df94b34f7 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 a9bad9ce8b1d..ed8e05fe9727 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 f670cb901ba4..927c89fceeed 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 a7363c7e873a..883a722b3a03 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 3238219775d8..d560d971b0f6 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 aea5b6f0eae2..b58e776c828c 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 fca724801e38..1c3aefe253a1 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 b2a302cb4210..81636664110f 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 1d995459b887..05e4e9bc24a0 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 9da4ed38e10c..62112d3b42c4 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 c1045d79db16..519116981090 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 d0b9cb26ed86..62e88090da30 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 92253a1a3a5a..9e6cceb5b50e 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 110c53fcba07..3d1907439180 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 5f24b9c18452..4707421748bc 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 4e56b25b0e17..905f15268d89 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 f1cd498e17ff..4577757090f5 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 62799de935c0..6acc3effcb3d 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 d4960c5fef65..98237daeb476 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 71d14ca7b701..d53e59e29b51 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 7f92b4250cbd..bfaa33ccea24 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 56bfbf27cda2..710830e95a16 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 d84be78b4bc2..4970fae3bcf7 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 e7b8b19cfe8a..9c20106b994a 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 e4c112d3a3c2..a3f50f251533 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 01ed55c192a1..6c6103da47c9 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 98a1bd6f8df6..3ff004152784 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 4797fe86b835..4a4d2fc948ed 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 aeb651b45fa8..99fc520ac66a 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 c556fcd20255..99e66cff4b83 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 244566bca308..e8c1f9872dbd 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 d3f371deed4f..10c8c3cda9e9 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 91dde8666153..545895a0db08 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 f59c0a614888..d1fcd7615a23 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 5205a3d9b492..330c62ecddd9 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 1048da7ac5de..b5cbbfda6a3b 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 407b6d555130..f258650760bc 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 24404434d162..d7404b05ba20 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 5a6a77a65c43..fc31afab9e79 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 a20be014763b..16f9334daa83 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 56587e890a0f..5baa694ebda7 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 954ca84175db..5a25880ea834 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 c394d8d14976..00f4b9d3f20f 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 59bd7c389521..15e6ae7140c7 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 7bc377bc334a..2699dd5eb7b3 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 7f60e194e775..0aa7db9a8339 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 5a56bf349f57..36d13eb22f52 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 47e52431200c..d89d04985429 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 6e42cd22da86..69ee98b46d35 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 738766e97621..1eac7249447e 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 7596a474535b..b74ab610327e 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 982f09671744..4f1b87f2666a 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 44ef6b7b6f24..fe6506f470e3 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 eaff506f751c..a8c4ff38df08 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 f421b5a1cc2b..42a60e0df1c8 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 768fce907c42..d359a9ea4e4e 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 f3a4caabd38e..4b11f277debe 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 66bf15299caf..c9ac8e9f97c9 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 e72418a267b0..c6774588bdaa 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 e5ef1ee85935..0793eb005eca 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 53a45da9b059..decf9ea490d8 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 97ce6bf541e3..f83c30b33f6c 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 a436308de7d0..c80d4540194a 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 d931ea8e5970..547d6035e2bb 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 6d060a019921..eef028df4700 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 3c4fb7130364..0b79bea6f30b 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 9d3a0f6d5730..6de67becfbce 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 8b7f28bafe18..20abc3b67646 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 cfd614905814..af2109611128 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 f7a721206a84..48c8264c4bc5 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 14f7139dd0a3..46e1aa6f7080 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 2476ee7ad44e..3e6ebf28cfce 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 c83d72056cb7..e6572de88398 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 ffd3981c631d..04e816ad713c 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 9f9fee6fce73..9b298a6ad71a 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 41ddaa764db9..1cf4ebb68798 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 6ed7fca97049..cb4931c4d54e 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 7b3e30ad4a6c..f2e30ad48fc9 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 906889abc83e..ad8cfc1dcebb 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/ipw/if_ipwreg.h b/sys/dev/ipw/if_ipwreg.h
index 5403b2e726b9..05f5939ac597 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 f620b47ed974..5f7c51801bc2 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 001b73342bc9..325429cdd993 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 0b264b763f7e..b4d7e59bdc53 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 57f26bc33260..57a7f2f7c2af 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 fa87086e2f4d..8dd16eb7f589 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 7013f06ca8c3..7f593a6bf1b3 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 bbaf13bde63c..8ed50fe6aa48 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 176c838fce95..c9da13ad7831 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 fd72036397f9..d30bf5f20955 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 09f6e6482d8a..b4a26090ce92 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 873f30e7ba41..96c4f4c6e29d 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 c61bcaa37d0d..6bd0520e9bb8 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 52fefb0205d2..37e664ba69b3 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 040e11162e19..1da0c9da9746 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 25341ee49759..7babecfcaf59 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 ba4b5233d9d5..fa34e4297527 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 b2897b30817c..c1b39060a09b 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 91265f2445bb..6a56050bc808 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 a483e81b98ef..4ab998bb3e90 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 9524f7478194..6f6ac2341e1c 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 9401385c6339..6f248c9da5e9 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 56f4c9bee24f..45f37f4a750c 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 d5176890b8ae..20fb9df9a25e 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 aa00b46e9be9..ac9860c956d4 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 68d8870b2735..85850a726e74 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 b67b70bfca22..fcf6c875ea45 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 ef8751d21c22..bbf66bd8680d 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 19824b2d961d..76648af33488 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 66cbb8e0de3b..5fe9d5cfdfbe 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 539059a9ce14..83c0dfcdbce4 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 8aac819cf892..f0792696b490 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 a5822fabbe48..fd96d6950b34 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 7c9197f64be8..a9a0bd38e1b2 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 5376ad0123b0..cbb1bddf96c1 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 e527305a7602..d5566c5d4883 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 d43c1dc3b885..f5e75849d470 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 fa899cb0dd53..e1ef38802e8f 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 4e426240c882..3da77b433bf3 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 9cf48248741c..56a5d16fe238 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 c613764bd952..f5f057b961ef 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 b1ced6b3d066..4af292d068f6 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 75f01bf7dd36..cc07e109cc57 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 1ee0eb69e1c2..0c0df2899acb 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 31745d5565e0..2c91ce6ba899 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 e009ae4524df..3c9518867c28 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 55f33f672436..3f14b2f49730 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 8c09a54cb04c..4169abb7ac7f 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 1e229f5c4653..42a45e9c7ea6 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 78af1a4476cb..322b2db35fef 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 d1aba2ffa915..810850ef9b79 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 ec9a0b449dde..ecaeccf40727 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 e73dd6549372..9ae4284e26ff 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 09c10c0c273d..dd6bb91bfecd 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 8ba31242e966..ba1e49ef54c0 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 c3e20ed53d59..fe990797820e 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 b686fc58fd40..a7194fd6d77d 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 e23f91e99f9e..2674077abee5 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 aa77023c4578..2391134bb328 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 bdbd85476af3..8b00a3fd6a69 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 f3cf28239f8f..dcf07d1620a8 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 7cab8a3d1dca..2e2653777b10 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 0e7eeaaae565..b6541659d74c 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 7859a75ec6d6..984139cee73b 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 51b697e3709b..3eed9c596cac 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 aae3baf07b50..6b28a03f2600 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 1ac304c0d91e..4154efad7992 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_iwmvar.h b/sys/dev/iwm/if_iwmvar.h
index ad5e5cc36348..63201e5b3120 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 54945f63df16..bdea9dd96181 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 deb932fb0ce2..66cbd4cb0ace 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 7e8848512e05..e9ea77dfb49c 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 dd84cfe0a447..6c52cc452987 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 e76bed13e607..ea705d427b86 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 e4da1f32cd0e..1e902df0510a 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 6711c281c35e..7cdd287b85bf 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 589f4c72c9ce..a593cb136760 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 a704a6ebbc8c..3dae3aeebaa1 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 26b56c5bc38e..e32fdb8f039c 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 09b8c6054109..9f83684d9f84 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 7afb440b556d..8c3df0fd4f59 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 2e9a0407a610..ff593f8ab391 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 12fc7d9cfd4e..eded950e2881 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 7fd300bfe4ee..9134971d9c98 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 941037793e59..b97306a0a28a 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 923879acae4b..6c1396ad964f 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 e5a186f73ea9..a55003b4cfe4 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 54102f312dbb..0ebc5456eda5 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 7dfe8547112f..b31dfae0cdfa 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 eb39bfb38b57..4275ec305135 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 74cf2760cc6d..4d076b35a390 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 591c705aba08..7e84a24e42b4 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 892a384b4c19..362fa146a04a 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 8631a675c7b7..09d6ec657ef7 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 a9b3c8e41e6b..ed35a6ed458c 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 443ebb478993..d12aadea7097 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 c5940b0823b0..47b9327bb896 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 a35ff0ef7889..2fa651df8936 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 48210e448c68..eca15f0f3816 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 1ab4f057f810..f4bee6c34f53 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 09d7ea4afbc0..1fa2acb77354 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 7eda43ec1609..c00273587aaa 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 28d936729882..e5a78a7220cc 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 7d39e391855a..b8aeaf51f86c 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 75612a7f83ca..91df9b7dd1c3 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 49f3a173d561..2e8921a21fed 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 ea45cd31a4c3..c06a19555a8b 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 e48ef52f576c..3f1ca5e4623d 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 84db02a11c98..ad7e7abd7a12 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 7a24e50e1b5a..245e128266aa 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 efca7f1e61ff..014c817195ca 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 f52d2cd3b958..c61ef163bcbd 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 679e191412cd..ae3ee836bc7e 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 a8f67001cbf1..51d7bf1c7f33 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 c8d97f395efd..fef5b5477ab6 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 a02cbc80d361..6f470e956c5a 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 2453d3a0f27d..e59d84805627 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 60fe881e4712..c95ee67ce601 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 811dc92ee059..a3f93b79f597 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 8f70bba09fa5..f0145508e6c2 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 eb2c44c92067..afb5ad3e228d 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 a495f346cfbb..1a0b0f5bfd6e 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 58e5c1a0cdd9..d2807fa217bb 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 b3fd53af9e23..460e4fecc674 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 1146ece279b5..82418aca9aa2 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 2febf9d6662d..4be60b9f0992 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 85bcb454b3e6..22a0f779db09 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 abba820ff8bb..954e186ffc4f 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 f34002d7dc35..9c2809a3e41a 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 6e1a3e3e2229..a1dfe523893e 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 03a1fa46fa65..f45354d29300 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 818ba8a1df83..cdeacc9e2a91 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 0b84ab3bddec..237217da2a90 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 f0abb281b12d..7302d5125c39 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 11a1fc614950..f5c2e300e9a9 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 9a786845be13..96303c43d4e8 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 c69e2f8ac836..36a9565de148 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 a0b450dc038b..d3dcedcdb635 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 bcfe5e8d5290..ca2759557066 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 e412df86ae6b..95a8117b8ca1 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 13ba4c5f5d17..4f384e7191af 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 92ce8d61bd13..904832d3883f 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 670a277ff6a5..4213ae8745c3 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 20050e73c09b..f971a3073265 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 444b6399b815..f1b5777fd07b 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 e46d3b894c20..d1d40b94098d 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 82f0414bc937..5090237155c5 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 b53132231dbb..d6ba9a7e5344 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 32c7b9b922cf..274a69c6616d 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 ef93db01e5ed..246a7fba74a7 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 79eb940de78e..6232f5a776b0 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 0df5f7767232..41bc72c32ddd 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 3c7d698b4e5a..0f0cd3a9b026 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 d0ff22838b1b..7c34b352c24c 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 e8736e59ae62..d9c48e8d37a9 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 801759230609..98db66545fb0 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 397c2f963800..acf8bdd1075a 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 5b2a7eb141ec..1b78aa9388cf 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 475e51e7ed15..845e933bdc6e 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 a673a9bf414a..85a18f33ee0d 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 de07f604fd9c..d34b4c3e243b 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 6124768a582e..87e8bf96813d 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 c9bf6d982745..564b266d5893 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 6aea7dba6252..2176bf2a1484 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 62c31dbff43e..1da8b0478934 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 64526438e333..1aa865d49d10 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 1bf93a086339..e47c0191ffc6 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 e07d65a6c33b..f4eae0c8bf31 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 e2d28b3cb32f..12a3ad60521e 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 76806906af9f..b0454638a21c 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 1c8e8e50b189..a732716cb170 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 ea6949f0354d..e6f5e17d0edb 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 614c3cd1f868..10c88b209051 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 1c8db95e0c0b..5119ebbdf810 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 7f4fe01ffaca..bec510af0c65 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 4be961d10240..9993bdc3ec0c 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 b29fc200a510..856cc8f7ab09 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 41a408cb7a09..df10cbbe3a05 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 b313c2761cea..8a5020d47f7e 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 456fcc3449d6..4f95711c670a 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 b4059b35b1ea..6debb5782c06 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 c7a9bc5cda0e..729f4d432274 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 04c396e5767b..4c286fd84dbf 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 76336632366a..cd80b163a578 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 20a467853e31..4ce4ceaf146f 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 5c0c45ac14f6..1f1e92b7cf79 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 681f87653235..18822512810e 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 6dcf1e44b8fb..6e632c84c681 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 ed2c99f0192d..d9c431f44244 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 c1e60b69aba7..49c8a9305584 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 5d9289c65123..a90b0fc0b4b5 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 7d414eb38b4d..78fa9d44cb8a 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 68de0381439e..50196103933f 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 6ed3ec6794a0..c7bb2f30ea5e 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 8399c39daefa..9b8daf2ad5eb 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 4560627d0baa..9f1a9e7131f0 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 95845c4b9207..6ea23531f668 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 3009314efdbf..10648bad0cdf 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 0682609cad85..8c699d0910a2 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 23a8d9e95769..fd433aeac819 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 8bb96b516156..9fadc4712bb1 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 65ffd6eef635..6ddc49d23b49 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 2e8114aa5771..dc390ff206a7 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 f13336c32ac7..a4a0124471c0 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 658a1c223354..f5b9ef4108b2 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 c91afdb55e1d..8066c136320f 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 745f5f401f31..1cfba145de8e 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 ab2d591df0d4..cc556bda528f 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 5159b7b64fce..b25bd2851cd5 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 82023f3dfc70..c9b9c0950f85 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 2f0727871ba1..d7ec58ec1f5e 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 6c24bc7d0134..d4a9813c26d9 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 210683be87c0..3717eb91d36b 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 b4bb608844fe..b6d882b7fc36 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 2b46936f5212..1b903d8d027a 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 46d68bb1b64e..38716b41d671 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 464f441d0e04..6a8e690cb8cf 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.h b/sys/dev/pccard/pccard_cis.h
index 915f555924ad..1b4db29f9c8a 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 7d567dd6d52b..567ac314cf37 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 87f41850ec5c..546d69939699 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 ceafe98084e3..f008dc3f7d44 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/include/adf_cfg_dev_dbg.h b/sys/dev/qat/include/adf_cfg_dev_dbg.h
index 2fc7884c10b2..ab8be1f56537 100644
--- a/sys/dev/qat/include/adf_cfg_dev_dbg.h
+++ b/sys/dev/qat/include/adf_cfg_dev_dbg.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_CFG_DEV_DBG_H_
 #define ADF_CFG_DEV_DBG_H_
 
diff --git a/sys/dev/qat/include/adf_cfg_device.h b/sys/dev/qat/include/adf_cfg_device.h
index 267905dd0c4f..f2891e4eb805 100644
--- a/sys/dev/qat/include/adf_cfg_device.h
+++ b/sys/dev/qat/include/adf_cfg_device.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_CFG_DEVICE_H_
 #define ADF_CFG_DEVICE_H_
 
diff --git a/sys/dev/qat/include/adf_cnvnr_freq_counters.h b/sys/dev/qat/include/adf_cnvnr_freq_counters.h
index c9b38679aa4d..9e12de3e714e 100644
--- a/sys/dev/qat/include/adf_cnvnr_freq_counters.h
+++ b/sys/dev/qat/include/adf_cnvnr_freq_counters.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_CNVNR_CTRS_DBG_H_
 #define ADF_CNVNR_CTRS_DBG_H_
 
diff --git a/sys/dev/qat/include/adf_dev_err.h b/sys/dev/qat/include/adf_dev_err.h
index b82f91eafc87..2eb3cdb36d2a 100644
--- a/sys/dev/qat/include/adf_dev_err.h
+++ b/sys/dev/qat/include/adf_dev_err.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_DEV_ERR_H_
 #define ADF_DEV_ERR_H_
 
diff --git a/sys/dev/qat/include/adf_freebsd_pfvf_ctrs_dbg.h b/sys/dev/qat/include/adf_freebsd_pfvf_ctrs_dbg.h
index d413279fc000..c4374e78e6f4 100644
--- a/sys/dev/qat/include/adf_freebsd_pfvf_ctrs_dbg.h
+++ b/sys/dev/qat/include/adf_freebsd_pfvf_ctrs_dbg.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_PFVF_CTRS_DBG_H_
 #define ADF_PFVF_CTRS_DBG_H_
 
diff --git a/sys/dev/qat/include/adf_fw_counters.h b/sys/dev/qat/include/adf_fw_counters.h
index 5fddb72eec33..08a254485f48 100644
--- a/sys/dev/qat/include/adf_fw_counters.h
+++ b/sys/dev/qat/include/adf_fw_counters.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_FW_COUNTERS_H_
 #define ADF_FW_COUNTERS_H_
 
diff --git a/sys/dev/qat/include/adf_gen2_pfvf.h b/sys/dev/qat/include/adf_gen2_pfvf.h
index f5c565a9679b..eb67a948ef96 100644
--- a/sys/dev/qat/include/adf_gen2_pfvf.h
+++ b/sys/dev/qat/include/adf_gen2_pfvf.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_GEN2_PFVF_H
 #define ADF_GEN2_PFVF_H
 
diff --git a/sys/dev/qat/include/adf_gen4_pfvf.h b/sys/dev/qat/include/adf_gen4_pfvf.h
index 45fa171ae364..1cd00c4766fa 100644
--- a/sys/dev/qat/include/adf_gen4_pfvf.h
+++ b/sys/dev/qat/include/adf_gen4_pfvf.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_GEN4_PFVF_H
 #define ADF_GEN4_PFVF_H
 
diff --git a/sys/dev/qat/include/adf_gen4_timer.h b/sys/dev/qat/include/adf_gen4_timer.h
index e91591772e5e..49266c9c3016 100644
--- a/sys/dev/qat/include/adf_gen4_timer.h
+++ b/sys/dev/qat/include/adf_gen4_timer.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_GEN4_TIMER_H_
 #define ADF_GEN4_TIMER_H_
 
diff --git a/sys/dev/qat/include/adf_gen4vf_hw_csr_data.h b/sys/dev/qat/include/adf_gen4vf_hw_csr_data.h
index 27f10ae729db..ed78ab54ec4e 100644
--- a/sys/dev/qat/include/adf_gen4vf_hw_csr_data.h
+++ b/sys/dev/qat/include/adf_gen4vf_hw_csr_data.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_GEN4VF_HW_CSR_DATA_H_
 #define ADF_GEN4VF_HW_CSR_DATA_H_
 
diff --git a/sys/dev/qat/include/adf_heartbeat.h b/sys/dev/qat/include/adf_heartbeat.h
index 55ca58152017..b2eab7139c1f 100644
--- a/sys/dev/qat/include/adf_heartbeat.h
+++ b/sys/dev/qat/include/adf_heartbeat.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_HEARTBEAT_H_
 #define ADF_HEARTBEAT_H_
 
diff --git a/sys/dev/qat/include/adf_heartbeat_dbg.h b/sys/dev/qat/include/adf_heartbeat_dbg.h
index 2d63e62398c2..31f7508791e8 100644
--- a/sys/dev/qat/include/adf_heartbeat_dbg.h
+++ b/sys/dev/qat/include/adf_heartbeat_dbg.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_HEARTBEAT_DBG_H_
 #define ADF_HEARTBEAT_DBG_H_
 
diff --git a/sys/dev/qat/include/adf_pfvf_vf_msg.h b/sys/dev/qat/include/adf_pfvf_vf_msg.h
index 89ed5a740b29..3cf6d5ed0815 100644
--- a/sys/dev/qat/include/adf_pfvf_vf_msg.h
+++ b/sys/dev/qat/include/adf_pfvf_vf_msg.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_PFVF_VF_MSG_H
 #define ADF_PFVF_VF_MSG_H
 
diff --git a/sys/dev/qat/include/adf_ver_dbg.h b/sys/dev/qat/include/adf_ver_dbg.h
index be4ed24df751..778365564ebb 100644
--- a/sys/dev/qat/include/adf_ver_dbg.h
+++ b/sys/dev/qat/include/adf_ver_dbg.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_VER_DBG_H_
 #define ADF_VER_DBG_H_
 
diff --git a/sys/dev/qat/include/common/adf_accel_devices.h b/sys/dev/qat/include/common/adf_accel_devices.h
index 225b86a2a7e1..0a1248b9a68e 100644
--- a/sys/dev/qat/include/common/adf_accel_devices.h
+++ b/sys/dev/qat/include/common/adf_accel_devices.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_ACCEL_DEVICES_H_
 #define ADF_ACCEL_DEVICES_H_
 
diff --git a/sys/dev/qat/include/common/adf_cfg.h b/sys/dev/qat/include/common/adf_cfg.h
index a3ac7678a7a8..52d2029c7c46 100644
--- a/sys/dev/qat/include/common/adf_cfg.h
+++ b/sys/dev/qat/include/common/adf_cfg.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_CFG_H_
 #define ADF_CFG_H_
 
diff --git a/sys/dev/qat/include/common/adf_cfg_common.h b/sys/dev/qat/include/common/adf_cfg_common.h
index d8b1efe3dbe6..4a85e021aeb7 100644
--- a/sys/dev/qat/include/common/adf_cfg_common.h
+++ b/sys/dev/qat/include/common/adf_cfg_common.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_CFG_COMMON_H_
 #define ADF_CFG_COMMON_H_
 
diff --git a/sys/dev/qat/include/common/adf_cfg_strings.h b/sys/dev/qat/include/common/adf_cfg_strings.h
index 5d39fd6cdc3f..ceac62796588 100644
--- a/sys/dev/qat/include/common/adf_cfg_strings.h
+++ b/sys/dev/qat/include/common/adf_cfg_strings.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_CFG_STRINGS_H_
 #define ADF_CFG_STRINGS_H_
 
diff --git a/sys/dev/qat/include/common/adf_cfg_sysctl.h b/sys/dev/qat/include/common/adf_cfg_sysctl.h
index d6a7183c039a..254aa3f6c441 100644
--- a/sys/dev/qat/include/common/adf_cfg_sysctl.h
+++ b/sys/dev/qat/include/common/adf_cfg_sysctl.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2023 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_CFG_SYSCTL_H_
 #define ADF_CFG_SYSCTL_H_
 
diff --git a/sys/dev/qat/include/common/adf_cfg_user.h b/sys/dev/qat/include/common/adf_cfg_user.h
index 910b0ea51465..4c16c882b1ee 100644
--- a/sys/dev/qat/include/common/adf_cfg_user.h
+++ b/sys/dev/qat/include/common/adf_cfg_user.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_CFG_USER_H_
 #define ADF_CFG_USER_H_
 
diff --git a/sys/dev/qat/include/common/adf_common_drv.h b/sys/dev/qat/include/common/adf_common_drv.h
index 0c8bb565f748..b6bc2511bfba 100644
--- a/sys/dev/qat/include/common/adf_common_drv.h
+++ b/sys/dev/qat/include/common/adf_common_drv.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_DRV_H
 #define ADF_DRV_H
 
diff --git a/sys/dev/qat/include/common/adf_gen2_hw_data.h b/sys/dev/qat/include/common/adf_gen2_hw_data.h
index cabfa6c9e5ff..3e62431931d0 100644
--- a/sys/dev/qat/include/common/adf_gen2_hw_data.h
+++ b/sys/dev/qat/include/common/adf_gen2_hw_data.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause  */
 /* Copyright(c) 2021 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_GEN2_HW_DATA_H_
 #define ADF_GEN2_HW_DATA_H_
 
diff --git a/sys/dev/qat/include/common/adf_gen4_hw_data.h b/sys/dev/qat/include/common/adf_gen4_hw_data.h
index c2c375f8a401..d0423eaa17cf 100644
--- a/sys/dev/qat/include/common/adf_gen4_hw_data.h
+++ b/sys/dev/qat/include/common/adf_gen4_hw_data.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause  */
 /* Copyright(c) 2021 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_GEN4_HW_CSR_DATA_H_
 #define ADF_GEN4_HW_CSR_DATA_H_
 
diff --git a/sys/dev/qat/include/common/adf_pfvf_msg.h b/sys/dev/qat/include/common/adf_pfvf_msg.h
index b0f3feb7d398..349db9a13b22 100644
--- a/sys/dev/qat/include/common/adf_pfvf_msg.h
+++ b/sys/dev/qat/include/common/adf_pfvf_msg.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_PFVF_MSG_H
 #define ADF_PFVF_MSG_H
 
diff --git a/sys/dev/qat/include/common/adf_pfvf_utils.h b/sys/dev/qat/include/common/adf_pfvf_utils.h
index 43eb7b52ef6b..a5d339443099 100644
--- a/sys/dev/qat/include/common/adf_pfvf_utils.h
+++ b/sys/dev/qat/include/common/adf_pfvf_utils.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_PFVF_UTILS_H
 #define ADF_PFVF_UTILS_H
 
diff --git a/sys/dev/qat/include/common/adf_pfvf_vf_proto.h b/sys/dev/qat/include/common/adf_pfvf_vf_proto.h
index f2623c1730bb..f0ae5458d8eb 100644
--- a/sys/dev/qat/include/common/adf_pfvf_vf_proto.h
+++ b/sys/dev/qat/include/common/adf_pfvf_vf_proto.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_PFVF_VF_PROTO_H
 #define ADF_PFVF_VF_PROTO_H
 
diff --git a/sys/dev/qat/include/common/adf_transport.h b/sys/dev/qat/include/common/adf_transport.h
index def448cc4ab1..da6c8f0e40bc 100644
--- a/sys/dev/qat/include/common/adf_transport.h
+++ b/sys/dev/qat/include/common/adf_transport.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_TRANSPORT_H
 #define ADF_TRANSPORT_H
 
diff --git a/sys/dev/qat/include/common/adf_transport_access_macros.h b/sys/dev/qat/include/common/adf_transport_access_macros.h
index ad9f0348b5a3..96834a269a20 100644
--- a/sys/dev/qat/include/common/adf_transport_access_macros.h
+++ b/sys/dev/qat/include/common/adf_transport_access_macros.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_TRANSPORT_ACCESS_MACROS_H
 #define ADF_TRANSPORT_ACCESS_MACROS_H
 
diff --git a/sys/dev/qat/include/common/adf_transport_internal.h b/sys/dev/qat/include/common/adf_transport_internal.h
index 88b99ea44cc4..0dacd0ea7074 100644
--- a/sys/dev/qat/include/common/adf_transport_internal.h
+++ b/sys/dev/qat/include/common/adf_transport_internal.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_TRANSPORT_INTRN_H
 #define ADF_TRANSPORT_INTRN_H
 
diff --git a/sys/dev/qat/include/common/adf_uio.h b/sys/dev/qat/include/common/adf_uio.h
index 07d33054c74b..9e32787ce128 100644
--- a/sys/dev/qat/include/common/adf_uio.h
+++ b/sys/dev/qat/include/common/adf_uio.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2023 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_UIO_H
 #define ADF_UIO_H
 #include "adf_accel_devices.h"
diff --git a/sys/dev/qat/include/common/adf_uio_cleanup.h b/sys/dev/qat/include/common/adf_uio_cleanup.h
index d8c59f74935b..8f1132181355 100644
--- a/sys/dev/qat/include/common/adf_uio_cleanup.h
+++ b/sys/dev/qat/include/common/adf_uio_cleanup.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2023 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_UIO_CLEANUP_H
 #define ADF_UIO_CLEANUP_H
 
diff --git a/sys/dev/qat/include/common/adf_uio_control.h b/sys/dev/qat/include/common/adf_uio_control.h
index 0572a12764b6..4662c02233b6 100644
--- a/sys/dev/qat/include/common/adf_uio_control.h
+++ b/sys/dev/qat/include/common/adf_uio_control.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2023 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef QAT_UIO_CONTROL_H
 #define QAT_UIO_CONTROL_H
 #include <sys/condvar.h>
diff --git a/sys/dev/qat/include/common/icp_qat_fw_loader_handle.h b/sys/dev/qat/include/common/icp_qat_fw_loader_handle.h
index 7f6e80eeb431..e74b2c80bdbb 100644
--- a/sys/dev/qat/include/common/icp_qat_fw_loader_handle.h
+++ b/sys/dev/qat/include/common/icp_qat_fw_loader_handle.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef __ICP_QAT_FW_LOADER_HANDLE_H__
 #define __ICP_QAT_FW_LOADER_HANDLE_H__
 #include "icp_qat_uclo.h"
diff --git a/sys/dev/qat/include/common/icp_qat_hal.h b/sys/dev/qat/include/common/icp_qat_hal.h
index 68e12826a7e8..397edd50d28a 100644
--- a/sys/dev/qat/include/common/icp_qat_hal.h
+++ b/sys/dev/qat/include/common/icp_qat_hal.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef __ICP_QAT_HAL_H
 #define __ICP_QAT_HAL_H
 #include "adf_accel_devices.h"
diff --git a/sys/dev/qat/include/common/icp_qat_uclo.h b/sys/dev/qat/include/common/icp_qat_uclo.h
index 1bdddce1d85e..1491a00f3c57 100644
--- a/sys/dev/qat/include/common/icp_qat_uclo.h
+++ b/sys/dev/qat/include/common/icp_qat_uclo.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef __ICP_QAT_UCLO_H__
 #define __ICP_QAT_UCLO_H__
 
diff --git a/sys/dev/qat/include/common/qat_freebsd.h b/sys/dev/qat/include/common/qat_freebsd.h
index 0a9cfc0188ef..179d6bbfc228 100644
--- a/sys/dev/qat/include/common/qat_freebsd.h
+++ b/sys/dev/qat/include/common/qat_freebsd.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef QAT_FREEBSD_H_
 #define QAT_FREEBSD_H_
 
diff --git a/sys/dev/qat/include/common/sal_statistics_strings.h b/sys/dev/qat/include/common/sal_statistics_strings.h
index aab88a0b374d..1f5d6e229447 100644
--- a/sys/dev/qat/include/common/sal_statistics_strings.h
+++ b/sys/dev/qat/include/common/sal_statistics_strings.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef SAL_STATISTICS_STRINGS_H
 #define SAL_STATISTICS_STRINGS_H
 
diff --git a/sys/dev/qat/include/icp_qat_fw.h b/sys/dev/qat/include/icp_qat_fw.h
index fe470b45c286..53b2f6810b2d 100644
--- a/sys/dev/qat/include/icp_qat_fw.h
+++ b/sys/dev/qat/include/icp_qat_fw.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef _ICP_QAT_FW_H_
 #define _ICP_QAT_FW_H_
 #include <sys/types.h>
diff --git a/sys/dev/qat/include/icp_qat_fw_init_admin.h b/sys/dev/qat/include/icp_qat_fw_init_admin.h
index 9c1482158443..3537fb3f8cfd 100644
--- a/sys/dev/qat/include/icp_qat_fw_init_admin.h
+++ b/sys/dev/qat/include/icp_qat_fw_init_admin.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef _ICP_QAT_FW_INIT_ADMIN_H_
 #define _ICP_QAT_FW_INIT_ADMIN_H_
 
diff --git a/sys/dev/qat/include/icp_qat_hw.h b/sys/dev/qat/include/icp_qat_hw.h
index e98c8db06f61..25455dab1ca6 100644
--- a/sys/dev/qat/include/icp_qat_hw.h
+++ b/sys/dev/qat/include/icp_qat_hw.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef _ICP_QAT_HW_H_
 #define _ICP_QAT_HW_H_
 
diff --git a/sys/dev/qat/include/qat_ocf_mem_pool.h b/sys/dev/qat/include/qat_ocf_mem_pool.h
index d1a59835f4fe..eb273026f16f 100644
--- a/sys/dev/qat/include/qat_ocf_mem_pool.h
+++ b/sys/dev/qat/include/qat_ocf_mem_pool.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef _QAT_OCF_MEM_POOL_H_
 #define _QAT_OCF_MEM_POOL_H_
 
diff --git a/sys/dev/qat/include/qat_ocf_utils.h b/sys/dev/qat/include/qat_ocf_utils.h
index 30a7e9b7f8ec..8ad04a827099 100644
--- a/sys/dev/qat/include/qat_ocf_utils.h
+++ b/sys/dev/qat/include/qat_ocf_utils.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef _QAT_OCF_UTILS_H_
 #define _QAT_OCF_UTILS_H_
 /* System headers */
diff --git a/sys/dev/qat/qat/qat_ocf.c b/sys/dev/qat/qat/qat_ocf.c
index 4960a5248c0c..8958c7b82e49 100644
--- a/sys/dev/qat/qat/qat_ocf.c
+++ b/sys/dev/qat/qat/qat_ocf.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /* System headers */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/qat/qat/qat_ocf_mem_pool.c b/sys/dev/qat/qat/qat_ocf_mem_pool.c
index 5548b57c0471..2a160e239d2d 100644
--- a/sys/dev/qat/qat/qat_ocf_mem_pool.c
+++ b/sys/dev/qat/qat/qat_ocf_mem_pool.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /* System headers */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/qat/qat/qat_ocf_utils.c b/sys/dev/qat/qat/qat_ocf_utils.c
index 64a10128b985..391fa61a36d3 100644
--- a/sys/dev/qat/qat/qat_ocf_utils.c
+++ b/sys/dev/qat/qat/qat_ocf_utils.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /* System headers */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/qat/qat_api/common/compression/dc_buffers.c b/sys/dev/qat/qat_api/common/compression/dc_buffers.c
index efdc2de54197..89873b61f820 100644
--- a/sys/dev/qat/qat_api/common/compression/dc_buffers.c
+++ b/sys/dev/qat/qat_api/common/compression/dc_buffers.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file dc_buffers.c
diff --git a/sys/dev/qat/qat_api/common/compression/dc_chain.c b/sys/dev/qat/qat_api/common/compression/dc_chain.c
index 6d7322720320..7478915859fa 100644
--- a/sys/dev/qat/qat_api/common/compression/dc_chain.c
+++ b/sys/dev/qat/qat_api/common/compression/dc_chain.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/compression/dc_datapath.c b/sys/dev/qat/qat_api/common/compression/dc_datapath.c
index 880931e30ebb..de14be2fdb0d 100644
--- a/sys/dev/qat/qat_api/common/compression/dc_datapath.c
+++ b/sys/dev/qat/qat_api/common/compression/dc_datapath.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file dc_datapath.c
diff --git a/sys/dev/qat/qat_api/common/compression/dc_dp.c b/sys/dev/qat/qat_api/common/compression/dc_dp.c
index b9d3d17a8548..1bc50d89365d 100644
--- a/sys/dev/qat/qat_api/common/compression/dc_dp.c
+++ b/sys/dev/qat/qat_api/common/compression/dc_dp.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file dc_dp.c
diff --git a/sys/dev/qat/qat_api/common/compression/dc_header_footer.c b/sys/dev/qat/qat_api/common/compression/dc_header_footer.c
index 4a92e20ba0f4..518beb66926d 100644
--- a/sys/dev/qat/qat_api/common/compression/dc_header_footer.c
+++ b/sys/dev/qat/qat_api/common/compression/dc_header_footer.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file dc_header_footer.c
diff --git a/sys/dev/qat/qat_api/common/compression/dc_ns_datapath.c b/sys/dev/qat/qat_api/common/compression/dc_ns_datapath.c
index 24602282dc5e..c736c06d4172 100644
--- a/sys/dev/qat/qat_api/common/compression/dc_ns_datapath.c
+++ b/sys/dev/qat/qat_api/common/compression/dc_ns_datapath.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/compression/dc_ns_header_footer.c b/sys/dev/qat/qat_api/common/compression/dc_ns_header_footer.c
index a4031c0bd513..bc1ff372a749 100644
--- a/sys/dev/qat/qat_api/common/compression/dc_ns_header_footer.c
+++ b/sys/dev/qat/qat_api/common/compression/dc_ns_header_footer.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/compression/dc_session.c b/sys/dev/qat/qat_api/common/compression/dc_session.c
index ab433adc18fd..c92d6eebdc47 100644
--- a/sys/dev/qat/qat_api/common/compression/dc_session.c
+++ b/sys/dev/qat/qat_api/common/compression/dc_session.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file dc_session.c
diff --git a/sys/dev/qat/qat_api/common/compression/dc_stats.c b/sys/dev/qat/qat_api/common/compression/dc_stats.c
index bcd3d61cb3c6..a3e8ef5553a9 100644
--- a/sys/dev/qat/qat_api/common/compression/dc_stats.c
+++ b/sys/dev/qat/qat_api/common/compression/dc_stats.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file dc_stats.c
diff --git a/sys/dev/qat/qat_api/common/compression/icp_sal_dc_err.c b/sys/dev/qat/qat_api/common/compression/icp_sal_dc_err.c
index 6b3735b4051b..1aadaa495641 100644
--- a/sys/dev/qat/qat_api/common/compression/icp_sal_dc_err.c
+++ b/sys/dev/qat/qat_api/common/compression/icp_sal_dc_err.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file icp_sal_dc_err.c
diff --git a/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h b/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h
index 72cb08e4e128..5bcff65c4fb3 100644
--- a/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h
+++ b/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file dc_datapath.h
diff --git a/sys/dev/qat/qat_api/common/compression/include/dc_error_counter.h b/sys/dev/qat/qat_api/common/compression/include/dc_error_counter.h
index dd1189fd970a..55f21b7cbd12 100644
--- a/sys/dev/qat/qat_api/common/compression/include/dc_error_counter.h
+++ b/sys/dev/qat/qat_api/common/compression/include/dc_error_counter.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file dc_error_counter.h
diff --git a/sys/dev/qat/qat_api/common/compression/include/dc_header_footer.h b/sys/dev/qat/qat_api/common/compression/include/dc_header_footer.h
index 0ec2cc6f3f16..cef2589a5caa 100644
--- a/sys/dev/qat/qat_api/common/compression/include/dc_header_footer.h
+++ b/sys/dev/qat/qat_api/common/compression/include/dc_header_footer.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file dc_header_footer.h
diff --git a/sys/dev/qat/qat_api/common/compression/include/dc_session.h b/sys/dev/qat/qat_api/common/compression/include/dc_session.h
index 108159f1190c..6a7c24ee6ccd 100644
--- a/sys/dev/qat/qat_api/common/compression/include/dc_session.h
+++ b/sys/dev/qat/qat_api/common/compression/include/dc_session.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file dc_session.h
diff --git a/sys/dev/qat/qat_api/common/compression/include/dc_stats.h b/sys/dev/qat/qat_api/common/compression/include/dc_stats.h
index 357be30107b1..b00f52a95973 100644
--- a/sys/dev/qat/qat_api/common/compression/include/dc_stats.h
+++ b/sys/dev/qat/qat_api/common/compression/include/dc_stats.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file dc_stats.h
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_session.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_session.h
index 76d0f4f08bb5..afb3994daad7 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_session.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_session.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym.h
index 402fe85378a1..3eb41432aced 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_auth_enc.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_auth_enc.h
index 76e5e53c38a8..d467992b43bb 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_auth_enc.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_auth_enc.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cb.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cb.h
index 5332f8aab510..58caa321c410 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cb.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cb.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cipher.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cipher.h
index 0ae34333ec08..3ae237939b2c 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cipher.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cipher.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cipher_defs.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cipher_defs.h
index a7dc286f5d35..0873e56031db 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cipher_defs.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cipher_defs.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_hash_defs.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_hash_defs.h
index ef035a930fb8..6ebdcf659360 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_hash_defs.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_hash_defs.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_hash_precomputes.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_hash_precomputes.h
index 6fd93cc28175..cdb252fb5b46 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_hash_precomputes.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_hash_precomputes.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_partial.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_partial.h
index b3088784a273..3f6c75ca7fb7 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_partial.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_partial.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat.h
index e0dbb0574d31..986e230dc1ff 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_cipher.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_cipher.h
index e292c3d6b587..2f1d36dcd669 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_cipher.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_cipher.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_constants_table.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_constants_table.h
index 7adf660ab9c4..5d07b7caede6 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_constants_table.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_constants_table.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_hash.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_hash.h
index 0dfb16c8338f..38c5892b0cc4 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_hash.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_hash.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_hash_defs_lookup.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_hash_defs_lookup.h
index 23db82a3b180..decc5d8c491b 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_hash_defs_lookup.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_hash_defs_lookup.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_key.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_key.h
index a6a5d5169e11..d7dd21525a8f 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_key.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_key.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_queue.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_queue.h
index d7a5cd3c9e92..fd2f217dd38f 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_queue.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_queue.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ******************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_stats.h b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_stats.h
index b5d823420163..96f579b26c4c 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_stats.h
+++ b/sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_stats.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_api.c b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_api.c
index 050a237208e9..a0891278cb52 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_api.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_api.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_auth_enc.c b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_auth_enc.c
index fe46b7eee3df..dd018a25a88c 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_auth_enc.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_auth_enc.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_cb.c b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_cb.c
index 2b95dd8cf6fe..4e47de384a1a 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_cb.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_cb.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_cipher.c b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_cipher.c
index 2a6cdd7aa748..1c24c13a5ebe 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_cipher.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_cipher.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_dp.c b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_dp.c
index 82add3a5dc08..1957126e0f1c 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_dp.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_dp.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_hash.c b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_hash.c
index a502c7318844..a2d313c956ba 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_hash.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_hash.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_hash_sw_precomputes.c b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_hash_sw_precomputes.c
index be3a39755b4a..05bbd3a52d6e 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_hash_sw_precomputes.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_hash_sw_precomputes.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_partial.c b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_partial.c
index 4a937c7d093a..65d41339e32b 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_partial.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_partial.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_queue.c b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_queue.c
index 43d2f44474ee..a840882acaf9 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_queue.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_queue.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_stats.c b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_stats.c
index ca1bbb99d3a4..e78690069412 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_stats.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/lac_sym_stats.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat.c b/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat.c
index 61cb7044ada6..6b436edf16cd 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_cipher.c b/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_cipher.c
index 5c554efd61a1..4900cf7996aa 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_cipher.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_cipher.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_constants_table.c b/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_constants_table.c
index 00b54ac8842b..e98897cdfb7e 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_constants_table.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_constants_table.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_hash.c b/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_hash.c
index b62ecf271d80..d268963ce705 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_hash.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_hash.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_hash_defs_lookup.c b/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_hash_defs_lookup.c
index 5a13241eaf01..40ae7b1d1de7 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_hash_defs_lookup.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_hash_defs_lookup.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_key.c b/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_key.c
index abc7710aa96d..17120a52083f 100644
--- a/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_key.c
+++ b/sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_key.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/ctrl/sal_compression.c b/sys/dev/qat/qat_api/common/ctrl/sal_compression.c
index 1a59d81da53b..f0e8d28949ff 100644
--- a/sys/dev/qat/qat_api/common/ctrl/sal_compression.c
+++ b/sys/dev/qat/qat_api/common/ctrl/sal_compression.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file sal_compression.c
diff --git a/sys/dev/qat/qat_api/common/ctrl/sal_create_services.c b/sys/dev/qat/qat_api/common/ctrl/sal_create_services.c
index a512028ab9fe..ada84e1b588c 100644
--- a/sys/dev/qat/qat_api/common/ctrl/sal_create_services.c
+++ b/sys/dev/qat/qat_api/common/ctrl/sal_create_services.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file sal_create_services.c
diff --git a/sys/dev/qat/qat_api/common/ctrl/sal_crypto.c b/sys/dev/qat/qat_api/common/ctrl/sal_crypto.c
index 78a559eba891..cba75eb41c17 100644
--- a/sys/dev/qat/qat_api/common/ctrl/sal_crypto.c
+++ b/sys/dev/qat/qat_api/common/ctrl/sal_crypto.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/ctrl/sal_ctrl_services.c b/sys/dev/qat/qat_api/common/ctrl/sal_ctrl_services.c
index d0a92081b532..7dd2213eb6cb 100644
--- a/sys/dev/qat/qat_api/common/ctrl/sal_ctrl_services.c
+++ b/sys/dev/qat/qat_api/common/ctrl/sal_ctrl_services.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file sal_ctrl_services.c
diff --git a/sys/dev/qat/qat_api/common/ctrl/sal_get_instances.c b/sys/dev/qat/qat_api/common/ctrl/sal_get_instances.c
index 1857d58c6907..27037e99d1ac 100644
--- a/sys/dev/qat/qat_api/common/ctrl/sal_get_instances.c
+++ b/sys/dev/qat/qat_api/common/ctrl/sal_get_instances.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  *****************************************************************************
diff --git a/sys/dev/qat/qat_api/common/ctrl/sal_list.c b/sys/dev/qat/qat_api/common/ctrl/sal_list.c
index 022e271c1639..997cf6ac9e00 100644
--- a/sys/dev/qat/qat_api/common/ctrl/sal_list.c
+++ b/sys/dev/qat/qat_api/common/ctrl/sal_list.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file sal_list.c
diff --git a/sys/dev/qat/qat_api/common/include/lac_buffer_desc.h b/sys/dev/qat/qat_api/common/include/lac_buffer_desc.h
index 079d537d7824..3e08ed2e9fdc 100644
--- a/sys/dev/qat/qat_api/common/include/lac_buffer_desc.h
+++ b/sys/dev/qat/qat_api/common/include/lac_buffer_desc.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file lac_buffer_desc.h
diff --git a/sys/dev/qat/qat_api/common/include/lac_common.h b/sys/dev/qat/qat_api/common/include/lac_common.h
index dacf43c3a072..18ab5d049a47 100644
--- a/sys/dev/qat/qat_api/common/include/lac_common.h
+++ b/sys/dev/qat/qat_api/common/include/lac_common.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file lac_common.h Common macros
diff --git a/sys/dev/qat/qat_api/common/include/lac_hooks.h b/sys/dev/qat/qat_api/common/include/lac_hooks.h
index 7018b77a480e..37ea65396086 100644
--- a/sys/dev/qat/qat_api/common/include/lac_hooks.h
+++ b/sys/dev/qat/qat_api/common/include/lac_hooks.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *******************************************************************************
  * @file lac_hooks.h
diff --git a/sys/dev/qat/qat_api/common/include/lac_list.h b/sys/dev/qat/qat_api/common/include/lac_list.h
index 2af91df155c6..527890b37fcc 100644
--- a/sys/dev/qat/qat_api/common/include/lac_list.h
+++ b/sys/dev/qat/qat_api/common/include/lac_list.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file lac_list.h
diff --git a/sys/dev/qat/qat_api/common/include/lac_log.h b/sys/dev/qat/qat_api/common/include/lac_log.h
index 2593c7b54963..cbfffb7822a2 100644
--- a/sys/dev/qat/qat_api/common/include/lac_log.h
+++ b/sys/dev/qat/qat_api/common/include/lac_log.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/include/lac_mem.h b/sys/dev/qat/qat_api/common/include/lac_mem.h
index 39be4d9ba651..ce4c8045a27c 100644
--- a/sys/dev/qat/qat_api/common/include/lac_mem.h
+++ b/sys/dev/qat/qat_api/common/include/lac_mem.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file lac_mem.h
diff --git a/sys/dev/qat/qat_api/common/include/lac_mem_pools.h b/sys/dev/qat/qat_api/common/include/lac_mem_pools.h
index e66769e3a265..cbc3c787637a 100644
--- a/sys/dev/qat/qat_api/common/include/lac_mem_pools.h
+++ b/sys/dev/qat/qat_api/common/include/lac_mem_pools.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file lac_mem_pools.h
diff --git a/sys/dev/qat/qat_api/common/include/lac_module.h b/sys/dev/qat/qat_api/common/include/lac_module.h
index 8fe95c2e4cf5..f8fb33f3f2ce 100644
--- a/sys/dev/qat/qat_api/common/include/lac_module.h
+++ b/sys/dev/qat/qat_api/common/include/lac_module.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef __LAC_MODULE_H__
 #define __LAC_MODULE_H__
 
diff --git a/sys/dev/qat/qat_api/common/include/lac_sal.h b/sys/dev/qat/qat_api/common/include/lac_sal.h
index 69d47628496e..4c2e4347a16c 100644
--- a/sys/dev/qat/qat_api/common/include/lac_sal.h
+++ b/sys/dev/qat/qat_api/common/include/lac_sal.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file lac_sal.h
diff --git a/sys/dev/qat/qat_api/common/include/lac_sal_ctrl.h b/sys/dev/qat/qat_api/common/include/lac_sal_ctrl.h
index f6c53928edf1..6eb60cfb2d9b 100644
--- a/sys/dev/qat/qat_api/common/include/lac_sal_ctrl.h
+++ b/sys/dev/qat/qat_api/common/include/lac_sal_ctrl.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file lac_sal_ctrl.h
diff --git a/sys/dev/qat/qat_api/common/include/lac_sal_types.h b/sys/dev/qat/qat_api/common/include/lac_sal_types.h
index eb2edf586438..8eff818d93cc 100644
--- a/sys/dev/qat/qat_api/common/include/lac_sal_types.h
+++ b/sys/dev/qat/qat_api/common/include/lac_sal_types.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file lac_sal_types.h
diff --git a/sys/dev/qat/qat_api/common/include/lac_sal_types_crypto.h b/sys/dev/qat/qat_api/common/include/lac_sal_types_crypto.h
index 68213278672e..c26603e4b582 100644
--- a/sys/dev/qat/qat_api/common/include/lac_sal_types_crypto.h
+++ b/sys/dev/qat/qat_api/common/include/lac_sal_types_crypto.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /**
  ***************************************************************************
diff --git a/sys/dev/qat/qat_api/common/include/lac_sync.h b/sys/dev/qat/qat_api/common/include/lac_sync.h
index 7052c656396a..3f498518535a 100644
--- a/sys/dev/qat/qat_api/common/include/lac_sync.h
+++ b/sys/dev/qat/qat_api/common/include/lac_sync.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file lac_sync.h
diff --git a/sys/dev/qat/qat_api/common/include/sal_hw_gen.h b/sys/dev/qat/qat_api/common/include/sal_hw_gen.h
index 38deb3cbc013..d536a5b1da1a 100644
--- a/sys/dev/qat/qat_api/common/include/sal_hw_gen.h
+++ b/sys/dev/qat/qat_api/common/include/sal_hw_gen.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file sal_hw_gen.h
diff --git a/sys/dev/qat/qat_api/common/include/sal_qat_cmn_msg.h b/sys/dev/qat/qat_api/common/include/sal_qat_cmn_msg.h
index 8cd7b08e84ea..127ef6039197 100644
--- a/sys/dev/qat/qat_api/common/include/sal_qat_cmn_msg.h
+++ b/sys/dev/qat/qat_api/common/include/sal_qat_cmn_msg.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file sal_qat_cmn_msg.c
diff --git a/sys/dev/qat/qat_api/common/include/sal_service_state.h b/sys/dev/qat/qat_api/common/include/sal_service_state.h
index 3712d38cc3ac..bfe833dc3c7c 100644
--- a/sys/dev/qat/qat_api/common/include/sal_service_state.h
+++ b/sys/dev/qat/qat_api/common/include/sal_service_state.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file sal_service_state.h
diff --git a/sys/dev/qat/qat_api/common/include/sal_statistics.h b/sys/dev/qat/qat_api/common/include/sal_statistics.h
index 47c08bc6eae5..98ea5049c22c 100644
--- a/sys/dev/qat/qat_api/common/include/sal_statistics.h
+++ b/sys/dev/qat/qat_api/common/include/sal_statistics.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file sal_statistics.h
diff --git a/sys/dev/qat/qat_api/common/include/sal_string_parse.h b/sys/dev/qat/qat_api/common/include/sal_string_parse.h
index 8654f2c09445..c961d1a64126 100644
--- a/sys/dev/qat/qat_api/common/include/sal_string_parse.h
+++ b/sys/dev/qat/qat_api/common/include/sal_string_parse.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file sal_string_parse.h
diff --git a/sys/dev/qat/qat_api/common/include/sal_types_compression.h b/sys/dev/qat/qat_api/common/include/sal_types_compression.h
index 2851a82b730b..d7bfe33cab08 100644
--- a/sys/dev/qat/qat_api/common/include/sal_types_compression.h
+++ b/sys/dev/qat/qat_api/common/include/sal_types_compression.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file sal_types_compression.h
diff --git a/sys/dev/qat/qat_api/common/qat_comms/sal_qat_cmn_msg.c b/sys/dev/qat/qat_api/common/qat_comms/sal_qat_cmn_msg.c
index 4331f875aa67..8b7c5160f712 100644
--- a/sys/dev/qat/qat_api/common/qat_comms/sal_qat_cmn_msg.c
+++ b/sys/dev/qat/qat_api/common/qat_comms/sal_qat_cmn_msg.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file sal_qat_cmn_msg.h
diff --git a/sys/dev/qat/qat_api/common/stubs/lac_stubs.c b/sys/dev/qat/qat_api/common/stubs/lac_stubs.c
index f6c90e5e79d6..5825639e978f 100644
--- a/sys/dev/qat/qat_api/common/stubs/lac_stubs.c
+++ b/sys/dev/qat/qat_api/common/stubs/lac_stubs.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  *
diff --git a/sys/dev/qat/qat_api/common/utils/lac_buffer_desc.c b/sys/dev/qat/qat_api/common/utils/lac_buffer_desc.c
index 06a6d9bd768e..4867e4ea0f15 100644
--- a/sys/dev/qat/qat_api/common/utils/lac_buffer_desc.c
+++ b/sys/dev/qat/qat_api/common/utils/lac_buffer_desc.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file lac_buffer_desc.c  Utility functions for setting buffer descriptors
diff --git a/sys/dev/qat/qat_api/common/utils/lac_lock_free_stack.h b/sys/dev/qat/qat_api/common/utils/lac_lock_free_stack.h
index fda9b0691e03..49e2329c25a7 100644
--- a/sys/dev/qat/qat_api/common/utils/lac_lock_free_stack.h
+++ b/sys/dev/qat/qat_api/common/utils/lac_lock_free_stack.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef LAC_LOCK_FREE_STACK_H_1
 #define LAC_LOCK_FREE_STACK_H_1
 #include "lac_mem_pools.h"
diff --git a/sys/dev/qat/qat_api/common/utils/lac_mem.c b/sys/dev/qat/qat_api/common/utils/lac_mem.c
index 66bd59815e6d..f86b49327d74 100644
--- a/sys/dev/qat/qat_api/common/utils/lac_mem.c
+++ b/sys/dev/qat/qat_api/common/utils/lac_mem.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file lac_mem.c  Implementation of Memory Functions
diff --git a/sys/dev/qat/qat_api/common/utils/lac_mem_pools.c b/sys/dev/qat/qat_api/common/utils/lac_mem_pools.c
index 7bd584bc775f..bf04b0efa073 100644
--- a/sys/dev/qat/qat_api/common/utils/lac_mem_pools.c
+++ b/sys/dev/qat/qat_api/common/utils/lac_mem_pools.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file lac_mem_pools.c
diff --git a/sys/dev/qat/qat_api/common/utils/lac_sync.c b/sys/dev/qat/qat_api/common/utils/lac_sync.c
index 25a2f9764bee..dadef4884cd0 100644
--- a/sys/dev/qat/qat_api/common/utils/lac_sync.c
+++ b/sys/dev/qat/qat_api/common/utils/lac_sync.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file lac_sync.c Utility functions containing synchronous callback support
diff --git a/sys/dev/qat/qat_api/common/utils/sal_service_state.c b/sys/dev/qat/qat_api/common/utils/sal_service_state.c
index c2fa491e7b73..0fda6b1c69c7 100644
--- a/sys/dev/qat/qat_api/common/utils/sal_service_state.c
+++ b/sys/dev/qat/qat_api/common/utils/sal_service_state.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file sal_service_state.c     Service state checks
diff --git a/sys/dev/qat/qat_api/common/utils/sal_statistics.c b/sys/dev/qat/qat_api/common/utils/sal_statistics.c
index e311f22283be..77e94d6561ae 100644
--- a/sys/dev/qat/qat_api/common/utils/sal_statistics.c
+++ b/sys/dev/qat/qat_api/common/utils/sal_statistics.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file sal_statistics.c
diff --git a/sys/dev/qat/qat_api/common/utils/sal_string_parse.c b/sys/dev/qat/qat_api/common/utils/sal_string_parse.c
index b6161aa8d88c..4e795bcf9f7a 100644
--- a/sys/dev/qat/qat_api/common/utils/sal_string_parse.c
+++ b/sys/dev/qat/qat_api/common/utils/sal_string_parse.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file sal_string_parse.c
diff --git a/sys/dev/qat/qat_api/common/utils/sal_user_process.c b/sys/dev/qat/qat_api/common/utils/sal_user_process.c
index 09728f346c13..c3d66a78f567 100644
--- a/sys/dev/qat/qat_api/common/utils/sal_user_process.c
+++ b/sys/dev/qat/qat_api/common/utils/sal_user_process.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file sal_user_process.c
diff --git a/sys/dev/qat/qat_api/common/utils/sal_versions.c b/sys/dev/qat/qat_api/common/utils/sal_versions.c
index 8e274eb8705d..0bb452b169d7 100644
--- a/sys/dev/qat/qat_api/common/utils/sal_versions.c
+++ b/sys/dev/qat/qat_api/common/utils/sal_versions.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file sal_versions.c
diff --git a/sys/dev/qat/qat_api/device/dev_info.c b/sys/dev/qat/qat_api/device/dev_info.c
index f8716b751a63..d4eb9c3b6e0c 100644
--- a/sys/dev/qat/qat_api/device/dev_info.c
+++ b/sys/dev/qat/qat_api/device/dev_info.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file dev_info.c
diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h
index 1280f3c1c8a9..28dfeff6579e 100644
--- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h
+++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file icp_qat_fw.h
diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h
index c4bb5632b318..5edf7022ee1d 100644
--- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h
+++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file icp_qat_fw_comp.h
diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_la.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_la.h
index 8a59b314c74b..b0942d206aa1 100644
--- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_la.h
+++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_la.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file icp_qat_fw_la.h
diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_mmp.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_mmp.h
index 6893cbedb594..f9471acadba2 100644
--- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_mmp.h
+++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_mmp.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 /* --- (Automatically generated (build v. 2.7), do not modify manually) --- */
 
diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_mmp_ids.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_mmp_ids.h
index dfda374e326c..a57de52a9f10 100644
--- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_mmp_ids.h
+++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_mmp_ids.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 
 /* --- (Automatically generated (relocation v. 1.3), do not modify manually) --- */
diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_pke.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_pke.h
index 0f71bd154391..1ba7e81c52a9 100644
--- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_pke.h
+++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_pke.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  * @file icp_qat_fw_pke.h
  * @defgroup icp_qat_fw_pke ICP QAT FW PKE Processing Definitions
diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_hw.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_hw.h
index 629b6a3d675c..2af0684206ab 100644
--- a/sys/dev/qat/qat_api/firmware/include/icp_qat_hw.h
+++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_hw.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file icp_qat_hw.h
diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_hw_20_comp.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_hw_20_comp.h
index 6e3ee4ce0446..e38db9a5b64d 100644
--- a/sys/dev/qat/qat_api/firmware/include/icp_qat_hw_20_comp.h
+++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_hw_20_comp.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file icp_qat_hw_2x_comp.h
diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_hw_20_comp_defs.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_hw_20_comp_defs.h
index 496f2e5c8de5..ccdeb471f88b 100644
--- a/sys/dev/qat/qat_api/firmware/include/icp_qat_hw_20_comp_defs.h
+++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_hw_20_comp_defs.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /*
  ****************************************************************************
  * @file icp_qat_hw_20_comp_defs.h, (autogenerated at 04-19-18 16:06)
diff --git a/sys/dev/qat/qat_api/freebsd_module.c b/sys/dev/qat/qat_api/freebsd_module.c
index 9e5e9b931f43..aab78b7c717e 100644
--- a/sys/dev/qat/qat_api/freebsd_module.c
+++ b/sys/dev/qat/qat_api/freebsd_module.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_cfg.h"
 #include "cpa.h"
 #include "icp_accel_devices.h"
diff --git a/sys/dev/qat/qat_api/include/icp_buffer_desc.h b/sys/dev/qat/qat_api/include/icp_buffer_desc.h
index c7f9ea542c68..18ec7042c7e9 100644
--- a/sys/dev/qat/qat_api/include/icp_buffer_desc.h
+++ b/sys/dev/qat/qat_api/include/icp_buffer_desc.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file icp_buffer_desc.h
diff --git a/sys/dev/qat/qat_api/include/icp_sal.h b/sys/dev/qat/qat_api/include/icp_sal.h
index 9c8689fb238a..3282ef9ab0ed 100644
--- a/sys/dev/qat/qat_api/include/icp_sal.h
+++ b/sys/dev/qat/qat_api/include/icp_sal.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file icp_sal.h
diff --git a/sys/dev/qat/qat_api/include/icp_sal_iommu.h b/sys/dev/qat/qat_api/include/icp_sal_iommu.h
index 214a30ac2d44..bf0b3b914f14 100644
--- a/sys/dev/qat/qat_api/include/icp_sal_iommu.h
+++ b/sys/dev/qat/qat_api/include/icp_sal_iommu.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file icp_sal_iommu.h
diff --git a/sys/dev/qat/qat_api/include/icp_sal_nrbg_ht.h b/sys/dev/qat/qat_api/include/icp_sal_nrbg_ht.h
index ea4006b0b528..f37b1e331e66 100644
--- a/sys/dev/qat/qat_api/include/icp_sal_nrbg_ht.h
+++ b/sys/dev/qat/qat_api/include/icp_sal_nrbg_ht.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  *****************************************************************************
  * @file icp_sal_nrbg_ht.h
diff --git a/sys/dev/qat/qat_api/include/icp_sal_poll.h b/sys/dev/qat/qat_api/include/icp_sal_poll.h
index d6d37d49a086..db4eb4c6cd95 100644
--- a/sys/dev/qat/qat_api/include/icp_sal_poll.h
+++ b/sys/dev/qat/qat_api/include/icp_sal_poll.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file icp_sal_poll.h
diff --git a/sys/dev/qat/qat_api/include/icp_sal_user.h b/sys/dev/qat/qat_api/include/icp_sal_user.h
index 6c46210f6a1f..fd01fa97d344 100644
--- a/sys/dev/qat/qat_api/include/icp_sal_user.h
+++ b/sys/dev/qat/qat_api/include/icp_sal_user.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file icp_sal_user.h
diff --git a/sys/dev/qat/qat_api/include/icp_sal_versions.h b/sys/dev/qat/qat_api/include/icp_sal_versions.h
index da44c030f4d4..5e46f86e3a54 100644
--- a/sys/dev/qat/qat_api/include/icp_sal_versions.h
+++ b/sys/dev/qat/qat_api/include/icp_sal_versions.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /**
  ***************************************************************************
  * @file icp_sal_versions.h
diff --git a/sys/dev/qat/qat_api/qat_direct/include/adf_kernel_types.h b/sys/dev/qat/qat_api/qat_direct/include/adf_kernel_types.h
index 4dde7de8b3e2..129112449e54 100644
--- a/sys/dev/qat/qat_api/qat_direct/include/adf_kernel_types.h
+++ b/sys/dev/qat/qat_api/qat_direct/include/adf_kernel_types.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_KERNEL_TYPES_H
 #define ADF_KERNEL_TYPES_H
 
diff --git a/sys/dev/qat/qat_api/qat_direct/include/icp_accel_devices.h b/sys/dev/qat/qat_api/qat_direct/include/icp_accel_devices.h
index bfc273c7328f..abfab512193c 100644
--- a/sys/dev/qat/qat_api/qat_direct/include/icp_accel_devices.h
+++ b/sys/dev/qat/qat_api/qat_direct/include/icp_accel_devices.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /*****************************************************************************
  * @file icp_accel_devices.h
  *
diff --git a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_accel_mgr.h b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_accel_mgr.h
index 9fcc07a1ffd8..a7523d21e3a2 100644
--- a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_accel_mgr.h
+++ b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_accel_mgr.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /*****************************************************************************
  * @file icp_adf_accel_mgr.h
  *
diff --git a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_cfg.h b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_cfg.h
index 0c20333b7f67..a00a7dd63001 100644
--- a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_cfg.h
+++ b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_cfg.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /******************************************************************************
  * @file icp_adf_cfg.h
  *
diff --git a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_debug.h b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_debug.h
index d0a6346dfa47..ad2592a3b74e 100644
--- a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_debug.h
+++ b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_debug.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /******************************************************************************
  * @file icp_adf_debug.h
  *
diff --git a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_esram.h b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_esram.h
index c8bd7f5d0575..8e9966b8db99 100644
--- a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_esram.h
+++ b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_esram.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /******************************************************************************
  * @file icp_adf_esram.h
  *
diff --git a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_init.h b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_init.h
index 40381a7689a1..8c494d9445e0 100644
--- a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_init.h
+++ b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_init.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /*****************************************************************************
  * @file icp_adf_init.h
  *
diff --git a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_poll.h b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_poll.h
index d5a9cac4f4cc..38a63b73a446 100644
--- a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_poll.h
+++ b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_poll.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /*****************************************************************************
  * @file icp_adf_poll.h
  *
diff --git a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_transport.h b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_transport.h
index d39e017c37c8..b26e1cbc79e3 100644
--- a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_transport.h
+++ b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_transport.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /*****************************************************************************
  * @file icp_adf_transport.h
  *
diff --git a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_transport_dp.h b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_transport_dp.h
index 63d5862c635b..3021ece9368f 100644
--- a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_transport_dp.h
+++ b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_transport_dp.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /*****************************************************************************
  * @file icp_adf_transport_dp.h
  *
diff --git a/sys/dev/qat/qat_api/qat_kernel/src/lac_adf_interface_freebsd.c b/sys/dev/qat/qat_api/qat_kernel/src/lac_adf_interface_freebsd.c
index fc75178946c4..b869a8eb934b 100644
--- a/sys/dev/qat/qat_api/qat_kernel/src/lac_adf_interface_freebsd.c
+++ b/sys/dev/qat/qat_api/qat_kernel/src/lac_adf_interface_freebsd.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_cfg.h"
 #include "cpa.h"
 #include "icp_accel_devices.h"
diff --git a/sys/dev/qat/qat_api/qat_kernel/src/lac_symbols.c b/sys/dev/qat/qat_api/qat_kernel/src/lac_symbols.c
index 182bc1b3ffb0..d89ac14d0731 100644
--- a/sys/dev/qat/qat_api/qat_kernel/src/lac_symbols.c
+++ b/sys/dev/qat/qat_api/qat_kernel/src/lac_symbols.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 /******************************************************************************
  * @file lac_symbols.c
  *
diff --git a/sys/dev/qat/qat_api/qat_kernel/src/qat_transport.c b/sys/dev/qat/qat_api/qat_kernel/src/qat_transport.c
index 910854446442..332a43de40ae 100644
--- a/sys/dev/qat/qat_api/qat_kernel/src/qat_transport.c
+++ b/sys/dev/qat/qat_api/qat_kernel/src/qat_transport.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_transport_access_macros.h"
 #include "adf_transport_internal.h"
 
diff --git a/sys/dev/qat/qat_api/qat_utils/include/qat_utils.h b/sys/dev/qat/qat_api/qat_utils/include/qat_utils.h
index a9874eb89215..778be17e841a 100644
--- a/sys/dev/qat/qat_api/qat_utils/include/qat_utils.h
+++ b/sys/dev/qat/qat_api/qat_utils/include/qat_utils.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef QAT_UTILS_H
 #define QAT_UTILS_H
 
diff --git a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsAtomic.c b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsAtomic.c
index 5bee0e6543f3..44de46efb840 100644
--- a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsAtomic.c
+++ b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsAtomic.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_utils.h"
 
 #ifdef __x86_64__
diff --git a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsCrypto.c b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsCrypto.c
index 6026faa52fa5..1d7904722f1d 100644
--- a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsCrypto.c
+++ b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsCrypto.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_utils.h"
 
 #define AES_128_KEY_LEN_BYTES 16
diff --git a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsSemaphore.c b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsSemaphore.c
index 5de928c2f052..bc7da3b2bd70 100644
--- a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsSemaphore.c
+++ b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsSemaphore.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_utils.h"
 
 #include <sys/types.h>
diff --git a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c
index bc2806e57dff..3134c2d375eb 100644
--- a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c
+++ b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_utils.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsSpinLock.c b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsSpinLock.c
index 575415a74e3c..85c09f038f32 100644
--- a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsSpinLock.c
+++ b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsSpinLock.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_utils.h"
 #include <sys/sx.h>
 
diff --git a/sys/dev/qat/qat_common/adf_accel_engine.c b/sys/dev/qat/qat_common/adf_accel_engine.c
index d430605be522..e712f750501c 100644
--- a/sys/dev/qat/qat_common/adf_accel_engine.c
+++ b/sys/dev/qat/qat_common/adf_accel_engine.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_aer.c b/sys/dev/qat/qat_common/adf_aer.c
index a2307e690790..7fdeba873420 100644
--- a/sys/dev/qat/qat_common/adf_aer.c
+++ b/sys/dev/qat/qat_common/adf_aer.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_cfg.c b/sys/dev/qat/qat_common/adf_cfg.c
index 397414a02ddd..736ede860840 100644
--- a/sys/dev/qat/qat_common/adf_cfg.c
+++ b/sys/dev/qat/qat_common/adf_cfg.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_accel_devices.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_cfg_bundle.c b/sys/dev/qat/qat_common/adf_cfg_bundle.c
index a7faf6c05730..61c3114d55ee 100644
--- a/sys/dev/qat/qat_common/adf_cfg_bundle.c
+++ b/sys/dev/qat/qat_common/adf_cfg_bundle.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_cfg_bundle.h"
 #include "adf_cfg_strings.h"
 #include "adf_cfg_instance.h"
diff --git a/sys/dev/qat/qat_common/adf_cfg_bundle.h b/sys/dev/qat/qat_common/adf_cfg_bundle.h
index b9ec5e7a0af5..e514d153f342 100644
--- a/sys/dev/qat/qat_common/adf_cfg_bundle.h
+++ b/sys/dev/qat/qat_common/adf_cfg_bundle.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_CFG_BUNDLE_H_
 #define ADF_CFG_BUNDLE_H_
 
diff --git a/sys/dev/qat/qat_common/adf_cfg_device.c b/sys/dev/qat/qat_common/adf_cfg_device.c
index a5fce6905473..a26d2fdfd32e 100644
--- a/sys/dev/qat/qat_common/adf_cfg_device.c
+++ b/sys/dev/qat/qat_common/adf_cfg_device.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_cfg_instance.h"
 #include "adf_cfg_section.h"
 #include "adf_cfg_device.h"
diff --git a/sys/dev/qat/qat_common/adf_cfg_instance.c b/sys/dev/qat/qat_common/adf_cfg_instance.c
index bf8a7d239d6b..11a8b1770b95 100644
--- a/sys/dev/qat/qat_common/adf_cfg_instance.c
+++ b/sys/dev/qat/qat_common/adf_cfg_instance.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_cfg_instance.h"
 
 void
diff --git a/sys/dev/qat/qat_common/adf_cfg_instance.h b/sys/dev/qat/qat_common/adf_cfg_instance.h
index 29427343d021..d5554af76597 100644
--- a/sys/dev/qat/qat_common/adf_cfg_instance.h
+++ b/sys/dev/qat/qat_common/adf_cfg_instance.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_CFG_INSTANCE_H_
 #define ADF_CFG_INSTANCE_H_
 
diff --git a/sys/dev/qat/qat_common/adf_cfg_section.c b/sys/dev/qat/qat_common/adf_cfg_section.c
index 7cadd32bfc9c..003cab5177ab 100644
--- a/sys/dev/qat/qat_common/adf_cfg_section.c
+++ b/sys/dev/qat/qat_common/adf_cfg_section.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_cfg_instance.h"
 #include "adf_cfg_device.h"
 #include "adf_cfg_section.h"
diff --git a/sys/dev/qat/qat_common/adf_cfg_section.h b/sys/dev/qat/qat_common/adf_cfg_section.h
index 20432cb2fc29..6c21e399024f 100644
--- a/sys/dev/qat/qat_common/adf_cfg_section.h
+++ b/sys/dev/qat/qat_common/adf_cfg_section.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_CFG_SECTION_H_
 #define ADF_CFG_SECTION_H_
 
diff --git a/sys/dev/qat/qat_common/adf_cfg_sysctl.c b/sys/dev/qat/qat_common/adf_cfg_sysctl.c
index a0d45300d505..621c3cc5b6c6 100644
--- a/sys/dev/qat/qat_common/adf_cfg_sysctl.c
+++ b/sys/dev/qat/qat_common/adf_cfg_sysctl.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
diff --git a/sys/dev/qat/qat_common/adf_clock.c b/sys/dev/qat/qat_common/adf_clock.c
index 1a44b87cab50..36204c9939ac 100644
--- a/sys/dev/qat/qat_common/adf_clock.c
+++ b/sys/dev/qat/qat_common/adf_clock.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_accel_devices.h"
 #include "adf_common_drv.h"
 
diff --git a/sys/dev/qat/qat_common/adf_ctl_drv.c b/sys/dev/qat/qat_common/adf_ctl_drv.c
index 8fcc3f389eee..aecc98332e72 100644
--- a/sys/dev/qat/qat_common/adf_ctl_drv.c
+++ b/sys/dev/qat/qat_common/adf_ctl_drv.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_dev_err.c b/sys/dev/qat/qat_common/adf_dev_err.c
index a315a7cd99df..ffd335b298c1 100644
--- a/sys/dev/qat/qat_common/adf_dev_err.c
+++ b/sys/dev/qat/qat_common/adf_dev_err.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_dev_err.h"
 
 struct reg_info {
diff --git a/sys/dev/qat/qat_common/adf_dev_mgr.c b/sys/dev/qat/qat_common/adf_dev_mgr.c
index 87a0744fa856..8e57574da229 100644
--- a/sys/dev/qat/qat_common/adf_dev_mgr.c
+++ b/sys/dev/qat/qat_common/adf_dev_mgr.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_freebsd_admin.c b/sys/dev/qat/qat_common/adf_freebsd_admin.c
index 403fbcec3835..8a8c890908c5 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_admin.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_admin.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_freebsd_cfg_dev_dbg.c b/sys/dev/qat/qat_common/adf_freebsd_cfg_dev_dbg.c
index 98c6206a1b0e..7585dd9b29d4 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_cfg_dev_dbg.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_cfg_dev_dbg.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_common_drv.h"
 #include "adf_cfg_device.h"
diff --git a/sys/dev/qat/qat_common/adf_freebsd_cnvnr_ctrs_dbg.c b/sys/dev/qat/qat_common/adf_freebsd_cnvnr_ctrs_dbg.c
index 51fc40ecab2f..960c71472bc8 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_cnvnr_ctrs_dbg.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_cnvnr_ctrs_dbg.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
diff --git a/sys/dev/qat/qat_common/adf_freebsd_dev_processes.c b/sys/dev/qat/qat_common/adf_freebsd_dev_processes.c
index e66abaa28ad1..6bb91c8d3c46 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_dev_processes.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_dev_processes.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
diff --git a/sys/dev/qat/qat_common/adf_freebsd_heartbeat_dbg.c b/sys/dev/qat/qat_common/adf_freebsd_heartbeat_dbg.c
index 47f43218f4d4..c22640045fda 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_heartbeat_dbg.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_heartbeat_dbg.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
diff --git a/sys/dev/qat/qat_common/adf_freebsd_pfvf_ctrs_dbg.c b/sys/dev/qat/qat_common/adf_freebsd_pfvf_ctrs_dbg.c
index 3dc6a10f50d6..76830e2920c3 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_pfvf_ctrs_dbg.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_pfvf_ctrs_dbg.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_accel_devices.h"
 #include "adf_common_drv.h"
 #include "adf_dev_err.h"
diff --git a/sys/dev/qat/qat_common/adf_freebsd_transport_debug.c b/sys/dev/qat/qat_common/adf_freebsd_transport_debug.c
index 2a597601ffb6..35375bb20014 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_transport_debug.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_transport_debug.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_freebsd_uio.c b/sys/dev/qat/qat_common/adf_freebsd_uio.c
index 5c74b7e8b9b0..c109fc79b0f4 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_uio.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_uio.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c b/sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c
index d299fde6cc0d..e5628bed371e 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_freebsd_ver_dbg.c b/sys/dev/qat/qat_common/adf_freebsd_ver_dbg.c
index 697686ce3af3..31805d5fb91e 100644
--- a/sys/dev/qat/qat_common/adf_freebsd_ver_dbg.c
+++ b/sys/dev/qat/qat_common/adf_freebsd_ver_dbg.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_fw_counters.c b/sys/dev/qat/qat_common/adf_fw_counters.c
index 7c483168b715..ea674b27bd0f 100644
--- a/sys/dev/qat/qat_common/adf_fw_counters.c
+++ b/sys/dev/qat/qat_common/adf_fw_counters.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
diff --git a/sys/dev/qat/qat_common/adf_gen2_hw_data.c b/sys/dev/qat/qat_common/adf_gen2_hw_data.c
index c440102e32a2..10e86f8cd218 100644
--- a/sys/dev/qat/qat_common/adf_gen2_hw_data.c
+++ b/sys/dev/qat/qat_common/adf_gen2_hw_data.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause  */
 /* Copyright(c) 2021 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_gen2_hw_data.h"
 #include "icp_qat_hw.h"
 
diff --git a/sys/dev/qat/qat_common/adf_gen4_hw_data.c b/sys/dev/qat/qat_common/adf_gen4_hw_data.c
index 9a2668412819..00e149d17695 100644
--- a/sys/dev/qat/qat_common/adf_gen4_hw_data.c
+++ b/sys/dev/qat/qat_common/adf_gen4_hw_data.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2021 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_accel_devices.h"
 #include "adf_common_drv.h"
 #include "adf_gen4_hw_data.h"
diff --git a/sys/dev/qat/qat_common/adf_gen4_pfvf.c b/sys/dev/qat/qat_common/adf_gen4_pfvf.c
index 0cbf19dc07a8..03bb90938e85 100644
--- a/sys/dev/qat/qat_common/adf_gen4_pfvf.c
+++ b/sys/dev/qat/qat_common/adf_gen4_pfvf.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <linux/iopoll.h>
 #include <linux/mutex.h>
 #include <linux/types.h>
diff --git a/sys/dev/qat/qat_common/adf_gen4_timer.c b/sys/dev/qat/qat_common/adf_gen4_timer.c
index cb929586dab8..96b65cdff181 100644
--- a/sys/dev/qat/qat_common/adf_gen4_timer.c
+++ b/sys/dev/qat/qat_common/adf_gen4_timer.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_accel_devices.h"
 #include "adf_heartbeat.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_gen4vf_hw_csr_data.c b/sys/dev/qat/qat_common/adf_gen4vf_hw_csr_data.c
index 78a6fea7a827..5c06b413b528 100644
--- a/sys/dev/qat/qat_common/adf_gen4vf_hw_csr_data.c
+++ b/sys/dev/qat/qat_common/adf_gen4vf_hw_csr_data.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_accel_devices.h"
 #include "adf_gen4vf_hw_csr_data.h"
 
diff --git a/sys/dev/qat/qat_common/adf_heartbeat.c b/sys/dev/qat/qat_common/adf_heartbeat.c
index 1feaa37d48bf..2cfc7ac3b603 100644
--- a/sys/dev/qat/qat_common/adf_heartbeat.c
+++ b/sys/dev/qat/qat_common/adf_heartbeat.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <sys/types.h>
 #include <linux/random.h>
 #include "qat_freebsd.h"
diff --git a/sys/dev/qat/qat_common/adf_hw_arbiter.c b/sys/dev/qat/qat_common/adf_hw_arbiter.c
index 5dfa8c6a7bf5..e105b23f4178 100644
--- a/sys/dev/qat/qat_common/adf_hw_arbiter.c
+++ b/sys/dev/qat/qat_common/adf_hw_arbiter.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_init.c b/sys/dev/qat/qat_common/adf_init.c
index 3f9f1382d11f..f0b75db3f6ed 100644
--- a/sys/dev/qat/qat_common/adf_init.c
+++ b/sys/dev/qat/qat_common/adf_init.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_isr.c b/sys/dev/qat/qat_common/adf_isr.c
index 1b6f232f2c4d..18c98c9448ca 100644
--- a/sys/dev/qat/qat_common/adf_isr.c
+++ b/sys/dev/qat/qat_common/adf_isr.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_pfvf_utils.c b/sys/dev/qat/qat_common/adf_pfvf_utils.c
index 3c8c729e4569..3cac58d8dbd0 100644
--- a/sys/dev/qat/qat_common/adf_pfvf_utils.c
+++ b/sys/dev/qat/qat_common/adf_pfvf_utils.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <linux/types.h>
 #include "adf_accel_devices.h"
 #include "adf_pfvf_msg.h"
diff --git a/sys/dev/qat/qat_common/adf_pfvf_vf_msg.c b/sys/dev/qat/qat_common/adf_pfvf_vf_msg.c
index 5d4d9044362d..dc0cb0110ec3 100644
--- a/sys/dev/qat/qat_common/adf_pfvf_vf_msg.c
+++ b/sys/dev/qat/qat_common/adf_pfvf_vf_msg.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <linux/bitfield.h>
 #include "adf_accel_devices.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_pfvf_vf_proto.c b/sys/dev/qat/qat_common/adf_pfvf_vf_proto.c
index 04a5133dd90d..044e5040f5b6 100644
--- a/sys/dev/qat/qat_common/adf_pfvf_vf_proto.c
+++ b/sys/dev/qat/qat_common/adf_pfvf_vf_proto.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <linux/kernel.h>
 #include "adf_accel_devices.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_transport.c b/sys/dev/qat/qat_common/adf_transport.c
index 5806f511db07..e75e2e3b594a 100644
--- a/sys/dev/qat/qat_common/adf_transport.c
+++ b/sys/dev/qat/qat_common/adf_transport.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/adf_vf_isr.c b/sys/dev/qat/qat_common/adf_vf_isr.c
index 58142c8c965d..10eaf9d8da1b 100644
--- a/sys/dev/qat/qat_common/adf_vf_isr.c
+++ b/sys/dev/qat/qat_common/adf_vf_isr.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/sys/dev/qat/qat_common/qat_common_module.c b/sys/dev/qat/qat_common/qat_common_module.c
index 722575192c51..1a6bc7cf8766 100644
--- a/sys/dev/qat/qat_common/qat_common_module.c
+++ b/sys/dev/qat/qat_common/qat_common_module.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_common_drv.h"
 
diff --git a/sys/dev/qat/qat_common/qat_freebsd.c b/sys/dev/qat/qat_common/qat_freebsd.c
index b5deb7cc22d3..939a3e0b4b97 100644
--- a/sys/dev/qat/qat_common/qat_freebsd.c
+++ b/sys/dev/qat/qat_common/qat_freebsd.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/qat_hal.c b/sys/dev/qat/qat_common/qat_hal.c
index 2da0e1141d79..b1e35e77272a 100644
--- a/sys/dev/qat/qat_common/qat_hal.c
+++ b/sys/dev/qat/qat_common/qat_hal.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_common/qat_uclo.c b/sys/dev/qat/qat_common/qat_uclo.c
index 12b5dafbf73f..faf3154e80b8 100644
--- a/sys/dev/qat/qat_common/qat_uclo.c
+++ b/sys/dev/qat/qat_common/qat_uclo.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.c b/sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.c
index 74ba6cdbc2ec..68eb54d457b3 100644
--- a/sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.c
+++ b/sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <adf_accel_devices.h>
 #include <adf_common_drv.h>
 #include <adf_cfg.h>
diff --git a/sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.h b/sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.h
index 069f59b5e24b..67560a7a7d1c 100644
--- a/sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.h
+++ b/sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_200XX_HW_DATA_H_
 #define ADF_200XX_HW_DATA_H_
 
diff --git a/sys/dev/qat/qat_hw/qat_200xx/adf_drv.c b/sys/dev/qat/qat_hw/qat_200xx/adf_drv.c
index 75b9778ab84f..f9b8c742d339 100644
--- a/sys/dev/qat/qat_hw/qat_200xx/adf_drv.c
+++ b/sys/dev/qat/qat_hw/qat_200xx/adf_drv.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.c b/sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.c
index 20b38394263b..3326d7cb4ffb 100644
--- a/sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.c
+++ b/sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <linux/iopoll.h>
 #include <adf_accel_devices.h>
 #include <adf_cfg.h>
diff --git a/sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.h b/sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.h
index 0d1f8d8c833d..b6a5da92fdb5 100644
--- a/sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.h
+++ b/sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007 - 2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_4XXX_HW_DATA_H_
 #define ADF_4XXX_HW_DATA_H_
 
diff --git a/sys/dev/qat/qat_hw/qat_4xxx/adf_drv.c b/sys/dev/qat/qat_hw/qat_4xxx/adf_drv.c
index f131f6359296..75100126ffa0 100644
--- a/sys/dev/qat/qat_hw/qat_4xxx/adf_drv.c
+++ b/sys/dev/qat/qat_hw/qat_4xxx/adf_drv.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007 - 2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_hw/qat_4xxxvf/adf_4xxxvf_hw_data.c b/sys/dev/qat/qat_hw/qat_4xxxvf/adf_4xxxvf_hw_data.c
index add271accb7d..27e5ef8162ab 100644
--- a/sys/dev/qat/qat_hw/qat_4xxxvf/adf_4xxxvf_hw_data.c
+++ b/sys/dev/qat/qat_hw/qat_4xxxvf/adf_4xxxvf_hw_data.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <adf_accel_devices.h>
 #include <adf_cfg.h>
 #include <adf_common_drv.h>
diff --git a/sys/dev/qat/qat_hw/qat_4xxxvf/adf_4xxxvf_hw_data.h b/sys/dev/qat/qat_hw/qat_4xxxvf/adf_4xxxvf_hw_data.h
index 30877e6e6856..83c034f543c9 100644
--- a/sys/dev/qat/qat_hw/qat_4xxxvf/adf_4xxxvf_hw_data.h
+++ b/sys/dev/qat/qat_hw/qat_4xxxvf/adf_4xxxvf_hw_data.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_4XXXVF_HW_DATA_H_
 #define ADF_4XXXVF_HW_DATA_H_
 
diff --git a/sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c b/sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c
index f325ff4d75a4..edc6c754d350 100644
--- a/sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c
+++ b/sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include <adf_accel_devices.h>
 #include <adf_common_drv.h>
diff --git a/sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.c b/sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.c
index 5a2a8575ab3e..40309cbf65ca 100644
--- a/sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.c
+++ b/sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <adf_accel_devices.h>
 #include <adf_common_drv.h>
 #include <adf_cfg.h>
diff --git a/sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.h b/sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.h
index 1082bd61fafa..bfc5db1f5e5c 100644
--- a/sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.h
+++ b/sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_C3XXX_HW_DATA_H_
 #define ADF_C3XXX_HW_DATA_H_
 
diff --git a/sys/dev/qat/qat_hw/qat_c3xxx/adf_drv.c b/sys/dev/qat/qat_hw/qat_c3xxx/adf_drv.c
index 6d17b3216a29..74e9e2292623 100644
--- a/sys/dev/qat/qat_hw/qat_c3xxx/adf_drv.c
+++ b/sys/dev/qat/qat_hw/qat_c3xxx/adf_drv.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ae_config.c b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ae_config.c
index 3dec7d072433..e68d0bca80fc 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ae_config.c
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ae_config.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_c4xxx_hw_data.h"
 #include <linux/kernel.h>
 #include <linux/types.h>
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_hw_data.c b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_hw_data.c
index 13fc41cb3454..36bdbe82d5a9 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_hw_data.c
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_hw_data.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <linux/atomic.h>
 #include <linux/compiler.h>
 #include <adf_accel_devices.h>
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_hw_data.h b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_hw_data.h
index 8edc9d7f1a0f..492330158623 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_hw_data.h
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_hw_data.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_C4XXX_HW_DATA_H_
 #define ADF_C4XXX_HW_DATA_H_
 
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_inline.h b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_inline.h
index aace6081c537..db0c2c27cbb1 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_inline.h
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_inline.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_C4XXX_INLINE_H_
 #define ADF_C4XXX_INLINE_H_
 
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_misc_error_stats.c b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_misc_error_stats.c
index 444c8753abd3..3821e60df746 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_misc_error_stats.c
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_misc_error_stats.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_c4xxx_hw_data.h"
 #include "adf_c4xxx_misc_error_stats.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_misc_error_stats.h b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_misc_error_stats.h
index e52c0c815ef5..123bb7004faa 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_misc_error_stats.h
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_misc_error_stats.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_C4XXX_MISC_ERROR_STATS_H_
 #define ADF_C4XXX_MISC_ERROR_STATS_H_
 
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_pke_replay_stats.c b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_pke_replay_stats.c
index 96cead96acc4..61a879900f9c 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_pke_replay_stats.c
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_pke_replay_stats.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_c4xxx_hw_data.h"
 #include "adf_c4xxx_pke_replay_stats.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_pke_replay_stats.h b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_pke_replay_stats.h
index 5fe4e747d87f..986d8d68f7ed 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_pke_replay_stats.h
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_pke_replay_stats.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_C4XXX_PKE_REPLAY_STATS_H_
 #define ADF_C4XXX_PKE_REPLAY_STATS_H_
 
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ras.c b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ras.c
index c68641003905..d7cf8e350fa4 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ras.c
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ras.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_c4xxx_ras.h"
 #include "adf_accel_devices.h"
 #include "adf_c4xxx_hw_data.h"
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ras.h b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ras.h
index 0c8119c6d872..69ff81afbde2 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ras.h
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ras.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_RAS_H
 #define ADF_RAS_H
 
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_res_part.c b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_res_part.c
index dcbc89b1d158..164c5e44ff36 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_res_part.c
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_res_part.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "adf_accel_devices.h"
 #include "adf_common_drv.h"
 #include "adf_cfg_common.h"
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_reset.c b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_reset.c
index 391851b2113b..c288c2cd01ed 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_reset.c
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_reset.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <dev/pci/pcireg.h>
 #include "adf_c4xxx_reset.h"
 
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_reset.h b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_reset.h
index 07406f06397b..3193d3ffce35 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_reset.h
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_reset.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_C4XXX_RESET_H_
 #define ADF_C4XXX_RESET_H_
 
diff --git a/sys/dev/qat/qat_hw/qat_c4xxx/adf_drv.c b/sys/dev/qat/qat_hw/qat_c4xxx/adf_drv.c
index 1a116ef4acb0..0e206e960a6c 100644
--- a/sys/dev/qat/qat_hw/qat_c4xxx/adf_drv.c
+++ b/sys/dev/qat/qat_hw/qat_c4xxx/adf_drv.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_hw/qat_c62x/adf_c62x_hw_data.c b/sys/dev/qat/qat_hw/qat_c62x/adf_c62x_hw_data.c
index cfddc71dd371..4e668b918b07 100644
--- a/sys/dev/qat/qat_hw/qat_c62x/adf_c62x_hw_data.c
+++ b/sys/dev/qat/qat_hw/qat_c62x/adf_c62x_hw_data.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include <adf_accel_devices.h>
 #include <adf_common_drv.h>
 #include <adf_cfg.h>
diff --git a/sys/dev/qat/qat_hw/qat_c62x/adf_c62x_hw_data.h b/sys/dev/qat/qat_hw/qat_c62x/adf_c62x_hw_data.h
index e379067c00b3..900a1a1fabe2 100644
--- a/sys/dev/qat/qat_hw/qat_c62x/adf_c62x_hw_data.h
+++ b/sys/dev/qat/qat_hw/qat_c62x/adf_c62x_hw_data.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_C62X_HW_DATA_H_
 #define ADF_C62X_HW_DATA_H_
 
diff --git a/sys/dev/qat/qat_hw/qat_c62x/adf_drv.c b/sys/dev/qat/qat_hw/qat_c62x/adf_drv.c
index 198bd1e0a78d..4035a8385bd5 100644
--- a/sys/dev/qat/qat_hw/qat_c62x/adf_drv.c
+++ b/sys/dev/qat/qat_hw/qat_c62x/adf_drv.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat/qat_hw/qat_dh895xcc/adf_dh895xcc_hw_data.c b/sys/dev/qat/qat_hw/qat_dh895xcc/adf_dh895xcc_hw_data.c
index 419de4f98bef..7985d07a403b 100644
--- a/sys/dev/qat/qat_hw/qat_dh895xcc/adf_dh895xcc_hw_data.c
+++ b/sys/dev/qat/qat_hw/qat_dh895xcc/adf_dh895xcc_hw_data.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include <adf_accel_devices.h>
diff --git a/sys/dev/qat/qat_hw/qat_dh895xcc/adf_dh895xcc_hw_data.h b/sys/dev/qat/qat_hw/qat_dh895xcc/adf_dh895xcc_hw_data.h
index e193c044c04a..ad174c14f4a5 100644
--- a/sys/dev/qat/qat_hw/qat_dh895xcc/adf_dh895xcc_hw_data.h
+++ b/sys/dev/qat/qat_hw/qat_dh895xcc/adf_dh895xcc_hw_data.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #ifndef ADF_DH895x_HW_DATA_H_
 #define ADF_DH895x_HW_DATA_H_
 
diff --git a/sys/dev/qat/qat_hw/qat_dh895xcc/adf_drv.c b/sys/dev/qat/qat_hw/qat_dh895xcc/adf_drv.c
index 0ab733bab18f..f7a31da23ba9 100644
--- a/sys/dev/qat/qat_hw/qat_dh895xcc/adf_drv.c
+++ b/sys/dev/qat/qat_hw/qat_dh895xcc/adf_drv.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
-/* $FreeBSD$ */
 #include "qat_freebsd.h"
 #include "adf_cfg.h"
 #include "adf_common_drv.h"
diff --git a/sys/dev/qat_c2xxx/qat_aevar.h b/sys/dev/qat_c2xxx/qat_aevar.h
index 005275a75b32..b33fdb420360 100644
--- a/sys/dev/qat_c2xxx/qat_aevar.h
+++ b/sys/dev/qat_c2xxx/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_c2xxx/qat_c2xxxreg.h b/sys/dev/qat_c2xxx/qat_c2xxxreg.h
index 90fd6e18503f..daaa7db12e24 100644
--- a/sys/dev/qat_c2xxx/qat_c2xxxreg.h
+++ b/sys/dev/qat_c2xxx/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_c2xxx/qat_hw15reg.h b/sys/dev/qat_c2xxx/qat_hw15reg.h
index a32e4ae606d6..ac80ec242ea7 100644
--- a/sys/dev/qat_c2xxx/qat_hw15reg.h
+++ b/sys/dev/qat_c2xxx/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_c2xxx/qat_hw15var.h b/sys/dev/qat_c2xxx/qat_hw15var.h
index 0606b29b0f75..a9bfc02ba5fc 100644
--- a/sys/dev/qat_c2xxx/qat_hw15var.h
+++ b/sys/dev/qat_c2xxx/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_c2xxx/qatreg.h b/sys/dev/qat_c2xxx/qatreg.h
index 64d4b34aed60..692b15485b81 100644
--- a/sys/dev/qat_c2xxx/qatreg.h
+++ b/sys/dev/qat_c2xxx/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_c2xxx/qatvar.h b/sys/dev/qat_c2xxx/qatvar.h
index ef50b655e652..7999d6723454 100644
--- a/sys/dev/qat_c2xxx/qatvar.h
+++ b/sys/dev/qat_c2xxx/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 0b127c79d640..e63f65dc3e0e 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 c41149c99146..af95a7626b62 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 51c5372aa662..e040a6b808b1 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 9587497e8c60..8125f868ef88 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 53f9bcde6d7b..1aeffd7d2fdb 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 9871bd9454aa..0f6a6c16c5fa 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 4858f415e277..ce50ace7e2c1 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 1ba83f4918bb..96e1dc10729e 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 3c7c6311c6ab..f5820647fed4 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 10a1a78d4599..20a9fc841140 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 cb08e5a09823..48243d8fc882 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 9cdf388a1260..cec8bbad3cbb 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 bdc5f6572d89..7161a3fc49b9 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 6c91133cb15d..a783580c2e8d 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 0b7ea1273e42..d28d76f14815 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 e22bbbb1f18c..0126ef414f73 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 9f43f2e1faa2..4e259fcb08af 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 42b091bcb491..cd67135cc821 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 88f1906060c9..fe75b2ae14ce 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 e377473c19e8..f3fc8dc01d9d 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 632b398f1019..5072982363ae 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 1aa68cf889b9..e66d6e337e0a 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 da75a8f975d9..b5c962752d71 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 81f9e106bd8a..9b1ef29a2b37 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 e89b65db01e2..3e53506889d8 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 07bde7b54128..cbfc4658a3f3 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 2a71cc1d88da..ea9df8eab885 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 2346df89102a..624eaf576da1 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 29f2f603ab23..4f3e67ed7e82 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 60b0c812e78d..4a800eebbd54 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 defa18e29f4d..5d601bb3ce67 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 a1cf896db53d..9ddfae251795 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 840a24cfe7ce..fe2799b4faf9 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 792bbe017c9d..08144701efe5 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 f821e80288e5..3236e1bd2e5c 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 1cba7343d8ac..aba07cf3c773 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 f803300637d2..ee13a1d8989e 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 2f3b9537b74c..dd5df1165326 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 c5ce93864a6a..b8e0d746add7 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 e3c4fde9d411..61aec202bbe6 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 ce97c9252c29..ebecd7d3c064 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 cab8c979cd05..5037e24ca341 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 ed6f96c3d221..2b23285d60bf 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 ea3f46e5c3a7..cbf6445ac4f2 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 1c5aa228e3fc..039854273cb4 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 ed81160e9091..8e9bc029dc10 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 b81a6b2602ee..55db69e123f4 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 e12f3925573f..e968d799e37f 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 e623d2b548d7..bade769c65a5 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 9e142f6fefb3..c888d4c48be5 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 195765fb72cb..fe0aef6d6b75 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 8b4d0df866c1..e012de28c548 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 bd8cfdeff95c..c75ebd1b2e46 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 68f68b207bee..4576457712a3 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 b7597ac7d197..90c006103987 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 40b6c35d0861..6753140e111f 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 00dd8b6ac6e5..caede049593b 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 dbd91b587d6f..a41f7da94837 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 1e1d6c7fca4d..6f1ec725e9bc 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 515c5059119c..e8f7ae39ba8d 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 5f74a0bdbcca..2a904840bc1a 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/uhci.c b/sys/dev/usb/controller/uhci.c
index 68094315182e..c9143d438ac8 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 3d19ee223a06..e30685715803 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 a65087cfd81b..b8749ddf2bc0 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 324cbd698884..163ee14bd097 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 3ccbf7618797..12cf4e0abb8e 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 d3ccfcda4591..2fc43c0e60d7 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 b3010b02aa2b..17800dc11d0c 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 a2f4e571916a..0be0d185a869 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 8fd321b5508a..9d0b6e2f4b4b 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 d389385ae045..30a12d82b88d 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 7a05c6813b08..d2999e76d262 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 bd1e7878f78e..f6ea3420ebe1 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 d2361ce276a8..4ddef8a47296 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 22c4865a7361..203bb96b6f22 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 993526b8d502..5fea82587308 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 d63c5d2b5848..785cb5fd388b 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 d892700620bf..5e24dddf71fc 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 660624cf7e37..ba147928eb5d 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 f99392e0ad96..a843bc21e6ac 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 d793dd0d77df..2d8777f82762 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 4060ff24daa6..1f0e121af7a3 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 47f4cbb6e0ef..38016e6abc1b 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 ea2eac81b737..8e8bfd152eb8 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 a1ea325b89a2..80936f80b6fa 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 f27a208fb55c..4df8876abffa 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 df3b8b6b1c2f..c8c6135710cf 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 4997ecc92ff7..2ee98efd83cb 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 b2ec25141800..01b032ac394c 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
diff --git a/sys/dev/usb/serial/uvisor.c b/sys/dev/usb/serial/uvisor.c
index 5286aa472136..35640624093e 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 4f9a520c1b5e..0adef69cf1d4 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 e0316a07aa5a..e8883a183587 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 617f70096cde..6e9de2a6dcce 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 8ca4ad15bfe4..e99507b4cc7a 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 e0c3c9a52fa1..17d59f05a50d 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 9860ca6355e8..11fd9a64b87e 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 b610f552c51d..2412f8728b78 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 246936007a0a..6a88da623c92 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 f70bdaf59612..92374bb7af3a 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 67c5ab161fb0..7c4418e633ce 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 94f26c404547..a6cda143a6ea 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 2fb63deacc66..705077b6e890 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 88f311396245..ef1112e3ff37 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 259feaee2a62..4e77bd86ef76 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 b9e4f82afe80..a95741b71e2c 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 da7ad7142255..3d00cda27d18 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 05365f57ad1e..b9197d3cd84a 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 26e3bd06310a..c653fcad5394 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 737a566d220e..c2b3b6872eec 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 a09fd4730344..9dd976da588b 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 8f7b734cfad3..be0a468e5ad0 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 3a28c6554170..04b428a9b656 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 69dabe34c2ce..ef1ad08527c7 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 21d067ac4066..2cc0fe5102b3 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 1d20944a0e0b..46b5382e9f4a 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 3bd07c31f499..c58c3b5f64d5 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 8e9ada99e0fc..08ceb2555942 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 e6731f832c5e..a4355de237c5 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 b98ee90290a4..3fc5efb049fc 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 e08822da9710..b9ec83dc78e9 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 a6f40265674f..15327f59af79 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 650a3e721964..a9fcf06c3b40 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 044994f1304f..7d961c58b9f7 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 8f11549c7769..d67e230e72dd 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 91041ce0f4e8..404456f76152 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 9555dc6fbc92..d8bc3a828282 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 41d76914a69e..9b93b22f4254 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 f727dd189cdf..7b50400d7eb9 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 f2644ce08d7d..9cf180c985bb 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 5fc8f7ac27f9..e3509862ef54 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 d7ecc3fdbfa2..ffeabc7c0f05 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 5ff2cc814ca5..a89f48fda630 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 84b312571888..5ca4d1ca0a2a 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 f80d951ffba7..6d9184723816 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 14ae73a6b09d..2db1abe0eb52 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 5aed5324d287..6e94bcc65aed 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 d3e08d27f3b7..16fbe87ce50b 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 8beb0bfbfeb3..d31baabcf875 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 5cb083167710..5a52b6f4bec6 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 9a45ada63d9f..bb592f1a4c03 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 758ff31c461f..ab293eefb31b 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 4617a041ac55..43e819684857 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 62e2356baf0c..d88de92336f2 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 d0cad1778be3..6a8ac0acda33 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 79d70c6337f2..55e5f04194d9 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 00d77a6c11f3..56a4003e8bae 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 2e697a3a02e2..67745cf49397 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 de439d2a649a..4b075a107c37 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 e315e094b9f1..f9d50bdefdea 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 fbc3ecad4beb..711a6b8824cb 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 c15b83490f49..35c7da8ae789 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 5d4c3f87e5ec..354aa3f876a5 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 a7d50699bdf9..9f859659da55 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 5c1e9ef0505e..04ae18bf78de 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 0f0867445131..80895214d823 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 70354c49285e..348a57582859 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 e19a7088cfbe..40981f6aa46d 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 1e7929bc7e8f..47ec13267e17 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 a0ef4eab725d..ce380667c8ee 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 5d3f742381d2..8be29b7cfcdf 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 9d4c85e6fcbd..a751737674ff 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 25048b9823cf..f5b353c60af0 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 22d763d0dc33..ece13de17192 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 6f6d01ed75e4..c2b9074fc9b5 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 5021e5ac352b..0e7c0f6f1ba8 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 4a66965243a3..3881bc73cf76 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 3a94886b59ff..6cf5b22b1167 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 f18442e924bf..92b80744b361 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 d964405d9b77..eeb81fe0d5f3 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 bacf5da7a2ab..aad0e52231d7 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 b383c8ae1c6d..a0dc4e2b181c 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 e0ad80ab4f9f..a953bcbf9981 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 001a031023e9..94e2b802eb4c 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 da1211b4c062..047361e6b48b 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 147f6a50ca36..78ef52dea185 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 533a0ce6032b..e9c016242fdc 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 d51ffddcc77f..21c7e4884123 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 9398e61b17a3..c02c421c14ac 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 ea9dae407077..142941705024 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 aa576d21b623..a22b7edb60b9 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 3e64444821d0..dfe1405ebe4c 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 04ef481fe08b..84d25bbeb953 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 81fdeced248a..efdcf17fea71 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 e237fcb680a4..edff894b9714 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 6d3862d1406b..0a51e2049de9 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 a708699c73d5..552e4b1a870e 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 7b5ed66edb36..3e2bffabaf0b 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/powerpc/p1020rdb.dts b/sys/dts/powerpc/p1020rdb.dts
index ec5118ce0f3f..80bc575db16e 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 7823429dc9d1..53aa5243a65a 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 3ce2e60096cc..434dd3fa38d4 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 41eb1dd74523..40ce67f50018 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 bcc9ff3112b5..188cd2bee6d6 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 368cd6272bfb..ef09283f5317 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 3e0d92fbd83e..73e2cdf1e97f 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 afed942a2b96..e47b985d4f45 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 566f463da22a..9ef234c35427 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 4f962fc95ddb..b467ceeeb66f 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 c2dc312beee8..967b1eca7927 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 5a3ff56b8508..170d94cb9512 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 682974fb780c..23e6ec31c55a 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 c8e2dd09e697..ad52a736592c 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 ae8f0d627d72..fe66ca3612fb 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 b28a9bed1356..a88bfb94e91d 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 2637bf98278f..da4848169173 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 ce7058b3ae60..612b318ce6e8 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 2d50d30f33b3..4a7faa9e1f05 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 0a6f141903c1..eb4cbaa21ab7 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 87e150e0e18a..df96bcbfe9c6 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 bc47f9dde574..c17d9f785dc2 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 5afbfc44dc0a..8f15bc2eaf42 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 f5b1e78c1e1d..a567b73fdbf8 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 28c4669ad258..506bc3c9e7f3 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 40107cd74a71..2d0d28c29fe7 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 3c7365bb4ed1..aa71de42e795 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 db1affc0770c..033e31af2ccd 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 26803672ff6f..8d6d2dfa0d72 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 1ae3d5865dba..21f797929cec 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 9cc0eeeaf6fd..9d31da47c3aa 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 f1af2cf6168c..a53fadb1995a 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 0355db5cf8ee..e06670042f5b 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 815942d0d967..4dc14c6c3415 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 f9323775dc24..3b0807772920 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 2ad27a9069b9..a8e10b0a36f2 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 1a0351442890..a7c73c541997 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 4759963566ab..2cde8b6d60e4 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 a0b28387d450..dc9ab793cee5 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 025e818c2393..4116179c7caa 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 98d0272fd4cc..cd8c069c5bb0 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 4457f85908c2..81fe027ceb41 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 717d5cc39fba..651c71045353 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 4a6bcc712046..a3875dad78b7 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 4d945a1ebbaf..fd047b0ea72d 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 bf86754d8f45..7506c43f5168 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 f01fac695ae5..91cb7604b171 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 f6fb2bc6578f..37ddd32142b6 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 dfcc902a7316..368a13b88d3a 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 c4101a77fd64..306fb8424274 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 aace4bfd62e9..39528555d328 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 3bc1e1a3997f..9b48563fa1f6 100644
--- a/sys/i386/include/stack.h
+++ b/sys/i386/include/stack.h
@@ -1,7 +1,6 @@
 /*
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
 
 #ifndef _MACHINE_STACK_H_
 #define	_MACHINE_STACK_H_
diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h
index 1f80090356a9..1739bbeb9ea0 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 cd380d43b074..47cecf1d27c3 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 4d950771dcc1..20f898d15b94 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 b81c455a92a5..77fc7655d55e 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 1490e59c2f9d..ac9f66b2b300 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 bebd05686149..dbd0757c44bc 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 f5682a01ccdc..29503ac8599f 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/net/if_gif.h b/sys/net/if_gif.h
index f8fda6ddf801..3c1846b8f82a 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 1506a8fe38a1..c03a4c87b355 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 5cb9a9d5c6dc..9f9e57b84f35 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 71b126558b44..4b4eeca362c1 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 96a43d05fbac..af465ea492bb 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 cd9acda40e92..912607a11582 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 56350dbb7824..4f8056e355a6 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 ec67bdfb8751..795cbf673e56 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 4b05a8a2854b..dba454a8fa42 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 4ca0b29fa569..6c77727d7526 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 74b64beabfd5..a4c1975b4205 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 45a8b8ec0ce8..e93317c66a11 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 30482c6985cf..8c3459339bbc 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 f60085af9d61..0c22e9434797 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 eb49b5f14215..7390d812606f 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 898114c2db58..1c2488cbfab7 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 4a9fb0214e2a..6781c33f5edb 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 f88d1d4bf753..827ba63a52b6 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 a6414efccb7e..72a9e75554c3 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 9eec13fb25ec..56e32b85a7ef 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 8c76dbc4479a..833617f082e0 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 9b992c07c811..7f784a7ddeb3 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 2e7c0c9cffa3..50a79384a6b1 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 482404189036..bbcea005fcf3 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 f1ffdc9b7204..b5e915c1fee8 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 34bfb767943a..396af64b57a2 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 08a226b1123a..0ca33424bca8 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 e29fdbe29fa0..eea0a39af5ea 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 3654466a2889..3adb332aeb73 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 d6221280f0e7..772602eeea90 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 81e30ecdc010..5c46c00feb39 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 a6e76ef358dd..dcb542b22ad8 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 a2dd57edd6fd..49be9556c7ed 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 bd68645e0985..02e1a9ffc597 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 4e55a9abc34b..041a5ce1293c 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 e2fca3b881dc..18bbdae316f0 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 8f5f0148c595..913c02caf697 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 ff59971cf133..6347912f1acc 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 a504225ab929..4619ecaf8197 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 4ae081ae7f2a..16f7b24375fa 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 cb91db86e129..9a8d132d564d 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 6fcfd3cea301..7dee98d0c1ad 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 ab6b08048833..5ce89c93c199 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 04ae50996d52..8d3d374431b4 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 1822d19fbb4c..95f9fa1dd278 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 145e451279c6..111b8cc1dc29 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 4718e6586ef7..96db820be890 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 fb10729c7774..8f1ee3d8d05f 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 3e67242f3624..d405df99558e 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 136929cbb389..314f0ef19430 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 19ee77faf41b..470bdac76283 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 0bdf7396213f..6163c9fa8191 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 b299ca47723a..2d560538c116 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 3ee88af26886..7cb4604f3e87 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 45bc7eb2485f..bfa4f28a4105 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 6e09fa18a492..2cfaaa58200f 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 27f0322f76f2..13c989cba660 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 0792459b2070..81e8ae34ee92 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 73ba0cf72b8c..79f9a68cbc70 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 67023d6de634..afa8b416c07a 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 775ac00953e5..200f7d73fba4 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 b6172342656f..b7afe45c8f7e 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 f9a2594c2a3e..ae892065f061 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 40ad4c3e2df3..35daad4715bf 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 ca68866c7704..63caa41c1430 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 0bf72ccc01ee..5c6fb1c386f1 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 44b84e019fb1..e89c82417a58 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/nlm/nlm_prot.h b/sys/nlm/nlm_prot.h
index 95e0e112dd73..0d7c6c8b5849 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 0cc240b8a191..b7612a08cd9f 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 3a0022996a3c..1e0024407246 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 a6797d4fd6c8..a2ee23804840 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 2fa81e0fa846..fe1311148eae 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 22130726042b..de66540313c6 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 321b97c6c47b..30dae98243fa 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 90705fac7270..bac00f8d0ca6 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 870de7118dd6..e04087fe423d 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 861536447be1..085719547fa1 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 9f84bbf34777..3fba703794b0 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 3b62c779ad77..9e49b605b8b4 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 1193b52dc3b3..95e1d53360e2 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 7d86316515f6..56291337dd5b 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 c39862217fac..8aeb1732919d 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 18e318ade49a..6adb431480cb 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 d1c0b7dbe67b..311a849be0d1 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 10893d5964c7..c417928a2526 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 0ddda1831dcf..09bc7b15e94e 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 5221cfcd7be1..b340002b45ee 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 a5e2f601eaca..1fe67ac3967d 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 97ea986715f5..9477572176e0 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 bc085c2c086e..158578d7a27d 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 3103399f06b4..ab4315a135ec 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 f58c4aa0cf7a..b6388ce62f49 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 615e2237fabc..6ac2f5837c7c 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 7b1a902ff481..4c903367c5b6 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 76bdd0b9af87..547e1c5a201b 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 49d50ad70f7a..5f80751c8a10 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 49c808a26504..99e503e2dcff 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 c4ed711ed1a9..a29a3cd26195 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 da23dbe43a4f..e69de29bb2d1 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 0f8ffdc611a8..c9ef8a985dfd 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 da23dbe43a4f..e69de29bb2d1 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 da2e005915fc..7569ce3f7f27 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 72a48f4f9b74..03a96e8a000f 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 5221cfcd7be1..b340002b45ee 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 da23dbe43a4f..e69de29bb2d1 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 da23dbe43a4f..e69de29bb2d1 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 da23dbe43a4f..e69de29bb2d1 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 9787f579d563..aa24726c4e34 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 da23dbe43a4f..e69de29bb2d1 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 6148b4eb94a5..7b367132f2d4 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 d49b925749ae..f492a1326a8d 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 0f63ac9530bc..a91e5c365820 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 6233952c484a..f4dc6d388c5c 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 0fe500ab521f..506613a609ab 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 f0ea906a102c..3d643af8c498 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 1ae53d7b8d17..9a7fb46181c5 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 25256879d60b..922583284b11 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 718559e8b893..c0278b98da61 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 ef076ea594b4..307f6ac529d9 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 ce9d1adf0902..530816f0532c 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 c98e0749ad53..29fb8c2106b5 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 bf1e31e4aca1..05b69f64cd05 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 07eff28b7a50..0b5cba0120e5 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 e5bacf46550f..2ae131150386 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 ec2df5d135c9..c11bccfb387c 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 c1f18a03fa6f..20eee9f6ccd3 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 3396f6b838f3..82931d9b9490 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 2757f1554258..a95480b53acc 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_