diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master
index 929c42fc405..178ae18836e 100644
--- a/sys/amd64/linux/syscalls.master
+++ b/sys/amd64/linux/syscalls.master
@@ -1,4 +1,3 @@
- $FreeBSD$
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).
diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master
index d1eb57a8295..a282ff00345 100644
--- a/sys/amd64/linux32/syscalls.master
+++ b/sys/amd64/linux32/syscalls.master
@@ -1,4 +1,3 @@
- $FreeBSD$
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).
diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master
index da2ad24997c..2bf8d4fad8a 100644
--- a/sys/arm64/linux/syscalls.master
+++ b/sys/arm64/linux/syscalls.master
@@ -1,4 +1,3 @@
- $FreeBSD$
 
 ; Linux ABI system call generic name/number map, based on Linux file
 ; include/uapi/asm-generic/unistd.h
diff --git a/sys/cddl/boot/zfs/README b/sys/cddl/boot/zfs/README
index 0c2006096c9..c6d0105d3d0 100644
--- a/sys/cddl/boot/zfs/README
+++ b/sys/cddl/boot/zfs/README
@@ -1,4 +1,3 @@
-$FreeBSD$
 
 This directory contains various files derived from CDDL sources that
 are used by the ZFS bootstrap:
diff --git a/sys/crypto/chacha20/chacha.h b/sys/crypto/chacha20/chacha.h
index 32262b04d56..f6d409db099 100644
--- a/sys/crypto/chacha20/chacha.h
+++ b/sys/crypto/chacha20/chacha.h
@@ -4,8 +4,6 @@
 chacha-merged.c version 20080118
 D. J. Bernstein
 Public domain.
-
- $FreeBSD$
 */
 
 #ifndef CHACHA_H
diff --git a/sys/dev/cxgb/common/cxgb_common.h b/sys/dev/cxgb/common/cxgb_common.h
index 4b08553f587..4603794099c 100644
--- a/sys/dev/cxgb/common/cxgb_common.h
+++ b/sys/dev/cxgb/common/cxgb_common.h
@@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
-
 ***************************************************************************/
 #ifndef __CHELSIO_COMMON_H
 #define __CHELSIO_COMMON_H
diff --git a/sys/dev/cxgb/common/cxgb_firmware_exports.h b/sys/dev/cxgb/common/cxgb_firmware_exports.h
index 207787d5918..47c75ff586c 100644
--- a/sys/dev/cxgb/common/cxgb_firmware_exports.h
+++ b/sys/dev/cxgb/common/cxgb_firmware_exports.h
@@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
-
 ***************************************************************************/
 #ifndef _FIRMWARE_EXPORTS_H_
 #define _FIRMWARE_EXPORTS_H_
diff --git a/sys/dev/cxgb/common/cxgb_regs.h b/sys/dev/cxgb/common/cxgb_regs.h
index 1941efbaa08..6e242f11277 100644
--- a/sys/dev/cxgb/common/cxgb_regs.h
+++ b/sys/dev/cxgb/common/cxgb_regs.h
@@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
-
 ***************************************************************************/
 /* This file is automatically generated --- do not edit */
 
diff --git a/sys/dev/cxgb/common/cxgb_sge_defs.h b/sys/dev/cxgb/common/cxgb_sge_defs.h
index 6b8781586f1..1ff63bf9b43 100644
--- a/sys/dev/cxgb/common/cxgb_sge_defs.h
+++ b/sys/dev/cxgb/common/cxgb_sge_defs.h
@@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
-
 ***************************************************************************/
 /*
  * This file is automatically generated --- any changes will be lost.
diff --git a/sys/dev/cxgb/common/cxgb_t3_cpl.h b/sys/dev/cxgb/common/cxgb_t3_cpl.h
index 4e2f4452efd..c30d7d2d57b 100644
--- a/sys/dev/cxgb/common/cxgb_t3_cpl.h
+++ b/sys/dev/cxgb/common/cxgb_t3_cpl.h
@@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
-
 ***************************************************************************/
 #ifndef T3_CPL_H
 #define T3_CPL_H
diff --git a/sys/dev/cxgb/common/cxgb_tcb.h b/sys/dev/cxgb/common/cxgb_tcb.h
index 196708b0ea6..28f96dd8cd0 100644
--- a/sys/dev/cxgb/common/cxgb_tcb.h
+++ b/sys/dev/cxgb/common/cxgb_tcb.h
@@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
-
 ***************************************************************************/
 
 /* This file is automatically generated --- do not edit */
diff --git a/sys/dev/cxgb/cxgb_adapter.h b/sys/dev/cxgb/cxgb_adapter.h
index ab5a41e4708..b003b0a05d9 100644
--- a/sys/dev/cxgb/cxgb_adapter.h
+++ b/sys/dev/cxgb/cxgb_adapter.h
@@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
-
 ***************************************************************************/
 
 
diff --git a/sys/dev/cxgb/cxgb_ioctl.h b/sys/dev/cxgb/cxgb_ioctl.h
index 68b936f6991..608eb77d2a8 100644
--- a/sys/dev/cxgb/cxgb_ioctl.h
+++ b/sys/dev/cxgb/cxgb_ioctl.h
@@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
-
 ***************************************************************************/
 #ifndef __CHIOCTL_H__
 #define __CHIOCTL_H__
diff --git a/sys/dev/cxgb/cxgb_offload.h b/sys/dev/cxgb/cxgb_offload.h
index 548065b56d6..fe9b31ab710 100644
--- a/sys/dev/cxgb/cxgb_offload.h
+++ b/sys/dev/cxgb/cxgb_offload.h
@@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
-
 ***************************************************************************/
 
 #ifndef _CXGB_OFFLOAD_H
diff --git a/sys/dev/cxgb/cxgb_osdep.h b/sys/dev/cxgb/cxgb_osdep.h
index 6179da8ec92..d14f6008a6c 100644
--- a/sys/dev/cxgb/cxgb_osdep.h
+++ b/sys/dev/cxgb/cxgb_osdep.h
@@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-
-$FreeBSD$
-
 ***************************************************************************/
 
 #include <sys/param.h>
diff --git a/sys/dev/cxgb/cxgb_t3fw.h b/sys/dev/cxgb/cxgb_t3fw.h
index 5a4c036605d..100e67c0f19 100644
--- a/sys/dev/cxgb/cxgb_t3fw.h
+++ b/sys/dev/cxgb/cxgb_t3fw.h
@@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-
-$FreeBSD$
-
 ***************************************************************************/
 
 #define U (unsigned char)
diff --git a/sys/dev/cxgb/t3b_protocol_sram.h b/sys/dev/cxgb/t3b_protocol_sram.h
index 1db209e0137..18f9ec4aff1 100644
--- a/sys/dev/cxgb/t3b_protocol_sram.h
+++ b/sys/dev/cxgb/t3b_protocol_sram.h
@@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-
-$FreeBSD$
-
 ***************************************************************************/
 
 #define U (unsigned char)
diff --git a/sys/dev/cxgb/t3b_tp_eeprom.h b/sys/dev/cxgb/t3b_tp_eeprom.h
index 8b68c80f4d9..e6c4045da6f 100644
--- a/sys/dev/cxgb/t3b_tp_eeprom.h
+++ b/sys/dev/cxgb/t3b_tp_eeprom.h
@@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-
-$FreeBSD$
-
 ***************************************************************************/
 
 #define U (unsigned char)
diff --git a/sys/dev/cxgb/t3c_protocol_sram.h b/sys/dev/cxgb/t3c_protocol_sram.h
index 542fc22b3e5..afb2d1b5482 100644
--- a/sys/dev/cxgb/t3c_protocol_sram.h
+++ b/sys/dev/cxgb/t3c_protocol_sram.h
@@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-
-$FreeBSD$
-
 ***************************************************************************/
 
 #define U (unsigned char)
diff --git a/sys/dev/cxgb/t3c_tp_eeprom.h b/sys/dev/cxgb/t3c_tp_eeprom.h
index c0224f850c7..d6daead7acf 100644
--- a/sys/dev/cxgb/t3c_tp_eeprom.h
+++ b/sys/dev/cxgb/t3c_tp_eeprom.h
@@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-
-$FreeBSD$
-
 ***************************************************************************/
 
 #define U (unsigned char)
diff --git a/sys/dev/cxgbe/cudbg/fastlz.h b/sys/dev/cxgbe/cudbg/fastlz.h
index 5aa474fa5a8..5a3d73e3735 100644
--- a/sys/dev/cxgbe/cudbg/fastlz.h
+++ b/sys/dev/cxgbe/cudbg/fastlz.h
@@ -22,8 +22,6 @@
    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    THE SOFTWARE.
-
-   $FreeBSD$
    */
 #ifndef FASTLZ_H
 #define FASTLZ_H
diff --git a/sys/dev/e1000/LICENSE b/sys/dev/e1000/LICENSE
index 51a32a81963..9deb4b1db9e 100644
--- a/sys/dev/e1000/LICENSE
+++ b/sys/dev/e1000/LICENSE
@@ -1,4 +1,3 @@
-$FreeBSD$
 
   Copyright (c) 2001-2020, Intel Corporation
   All rights reserved.
diff --git a/sys/dev/e1000/README b/sys/dev/e1000/README
index d734be75e75..4a61e066912 100644
--- a/sys/dev/e1000/README
+++ b/sys/dev/e1000/README
@@ -1,4 +1,3 @@
-$FreeBSD$
 FreeBSD* Driver for Intel(R) Ethernet
 =====================================
 
diff --git a/sys/dev/firewire/00README b/sys/dev/firewire/00README
index 17f5c5d119d..d7879c505f8 100644
--- a/sys/dev/firewire/00README
+++ b/sys/dev/firewire/00README
@@ -1,4 +1,3 @@
-$FreeBSD$
 
 IEEE 1394 support for FreeBSD-5.X and 4.X.
 
diff --git a/sys/dev/hpt27xx/README b/sys/dev/hpt27xx/README
index aad14945d2d..244016ea391 100644
--- a/sys/dev/hpt27xx/README
+++ b/sys/dev/hpt27xx/README
@@ -216,5 +216,3 @@ Technical support and service
   NOTE: Before you send an e-mail, please visit our Web Site
         (http://www.highpoint-tech.com) to check if there is a new or 
         updated device driver for your system.
-
-$FreeBSD$
diff --git a/sys/dev/hptmv/readme.txt b/sys/dev/hptmv/readme.txt
index 177f9f94e16..ce2b9f5884f 100644
--- a/sys/dev/hptmv/readme.txt
+++ b/sys/dev/hptmv/readme.txt
@@ -1,6 +1,5 @@
 RocketRAID 18xx Driver for FreeBSD
 Copyright (C) 2007-2008 HighPoint Technologies, Inc. All rights reserved.
-$FreeBSD$
 
 #############################################################################
 Revision History:
diff --git a/sys/dev/hptnr/README b/sys/dev/hptnr/README
index f48071c2532..afa67700fe5 100644
--- a/sys/dev/hptnr/README
+++ b/sys/dev/hptnr/README
@@ -219,5 +219,3 @@ Technical support and service
   NOTE: Before you send an e-mail, please visit our Web Site
         (http://www.highpoint-tech.com) to check if there is a new or 
         updated device driver for your system.
-
-$FreeBSD$
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index 6e2f83263e4..900fa80546b 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,3 @@
-$FreeBSD$
 /*$NetBSD: miidevs,v 1.105 2011/11/25 23:28:14 jakllsch Exp $*/
 
 /*-
diff --git a/sys/dev/mxge/eth_z8e.h b/sys/dev/mxge/eth_z8e.h
index c553aaf59f4..9905923c736 100644
--- a/sys/dev/mxge/eth_z8e.h
+++ b/sys/dev/mxge/eth_z8e.h
@@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-$FreeBSD$
 ***************************************************************************/
 
 static unsigned int eth_z8e_uncompressed_length = 377284 ;
diff --git a/sys/dev/mxge/ethp_z8e.h b/sys/dev/mxge/ethp_z8e.h
index 355854520a0..6fda4ae978f 100644
--- a/sys/dev/mxge/ethp_z8e.h
+++ b/sys/dev/mxge/ethp_z8e.h
@@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-$FreeBSD$
 ***************************************************************************/
 
 static unsigned int ethp_z8e_uncompressed_length = 387604 ;
diff --git a/sys/dev/mxge/if_mxge_var.h b/sys/dev/mxge/if_mxge_var.h
index 885e4e2fc21..504f2de038b 100644
--- a/sys/dev/mxge/if_mxge_var.h
+++ b/sys/dev/mxge/if_mxge_var.h
@@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
-$FreeBSD$
-
 ***************************************************************************/
 
 #define MXGE_ETH_STOPPED 0
diff --git a/sys/dev/mxge/mcp_gen_header.h b/sys/dev/mxge/mcp_gen_header.h
index 07c3f83bf2d..59fb111bd47 100644
--- a/sys/dev/mxge/mcp_gen_header.h
+++ b/sys/dev/mxge/mcp_gen_header.h
@@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-$FreeBSD$
 ***************************************************************************/
 
 #ifndef _mcp_gen_header_h
diff --git a/sys/dev/mxge/mxge_mcp.h b/sys/dev/mxge/mxge_mcp.h
index 9f7ae28f2af..09e8e7ace4c 100644
--- a/sys/dev/mxge/mxge_mcp.h
+++ b/sys/dev/mxge/mxge_mcp.h
@@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-$FreeBSD$
 ***************************************************************************/
 
 #ifndef _myri10ge_mcp_h
diff --git a/sys/dev/mxge/rss_eth_z8e.h b/sys/dev/mxge/rss_eth_z8e.h
index c04e9f6dbbf..9c3a791b0f7 100644
--- a/sys/dev/mxge/rss_eth_z8e.h
+++ b/sys/dev/mxge/rss_eth_z8e.h
@@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-$FreeBSD$
 ***************************************************************************/
 
 static unsigned int rss_eth_z8e_uncompressed_length = 534724 ;
diff --git a/sys/dev/mxge/rss_ethp_z8e.h b/sys/dev/mxge/rss_ethp_z8e.h
index 4c5d86270c9..459dd165fe3 100644
--- a/sys/dev/mxge/rss_ethp_z8e.h
+++ b/sys/dev/mxge/rss_ethp_z8e.h
@@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-$FreeBSD$
 ***************************************************************************/
 
 static unsigned int rss_ethp_z8e_uncompressed_length = 544468 ;
diff --git a/sys/dev/ow/README.txt b/sys/dev/ow/README.txt
index 5263710964a..d40ec3545dc 100644
--- a/sys/dev/ow/README.txt
+++ b/sys/dev/ow/README.txt
@@ -15,5 +15,3 @@ responsibility of the client device drivers to implement.
 
 Client drivers may only call the own(9) interface. The ow(4) driver
 calls the owll(9) interface and implements the own(9).
-
-$FreeBSD$
diff --git a/sys/dev/sdio/sdiodevs b/sys/dev/sdio/sdiodevs
index 2fe01f111ff..194ef8e5d90 100644
--- a/sys/dev/sdio/sdiodevs
+++ b/sys/dev/sdio/sdiodevs
@@ -1,4 +1,3 @@
-$FreeBSD$
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 84b5c8f9b9c..da712c5a595 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,3 @@
-$FreeBSD$
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
 /*-
diff --git a/sys/dev/videomode/ediddevs b/sys/dev/videomode/ediddevs
index 0029704edf4..fc60fe3a0c8 100644
--- a/sys/dev/videomode/ediddevs
+++ b/sys/dev/videomode/ediddevs
@@ -1,5 +1,4 @@
 $NetBSD: ediddevs,v 1.2 2007/03/07 18:47:13 macallan Exp $
-$FreeBSD$
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
diff --git a/sys/dev/vmware/pvscsi/LICENSE b/sys/dev/vmware/pvscsi/LICENSE
index a736cc1324a..f22d3b36cff 100644
--- a/sys/dev/vmware/pvscsi/LICENSE
+++ b/sys/dev/vmware/pvscsi/LICENSE
@@ -1,4 +1,3 @@
-$FreeBSD$
 
 These files are provided under a dual BSD-2 Clause/GPLv2 license. When
 using or redistributing this file, you may do so under either license.
diff --git a/sys/dev/vmware/vmci/LICENSE b/sys/dev/vmware/vmci/LICENSE
index a736cc1324a..f22d3b36cff 100644
--- a/sys/dev/vmware/vmci/LICENSE
+++ b/sys/dev/vmware/vmci/LICENSE
@@ -1,4 +1,3 @@
-$FreeBSD$
 
 These files are provided under a dual BSD-2 Clause/GPLv2 license. When
 using or redistributing this file, you may do so under either license.
diff --git a/sys/dts/bindings-gpio.txt b/sys/dts/bindings-gpio.txt
index 89e6fc0b931..5057167405c 100644
--- a/sys/dts/bindings-gpio.txt
+++ b/sys/dts/bindings-gpio.txt
@@ -1,4 +1,3 @@
-$FreeBSD$
 
 GPIO configuration.
 ===================
diff --git a/sys/dts/bindings-localbus.txt b/sys/dts/bindings-localbus.txt
index d960fefcf75..a4d800dc8a1 100644
--- a/sys/dts/bindings-localbus.txt
+++ b/sys/dts/bindings-localbus.txt
@@ -1,4 +1,3 @@
-$FreeBSD$
 
 Marvell Device bus (localbus) configuration.
 ============================================
diff --git a/sys/dts/bindings-mpp.txt b/sys/dts/bindings-mpp.txt
index 5da776e43cf..6feefd4360e 100644
--- a/sys/dts/bindings-mpp.txt
+++ b/sys/dts/bindings-mpp.txt
@@ -1,4 +1,3 @@
-$FreeBSD$
 
 * Multi purpose pin (MPP) configuration.
 
diff --git a/sys/fs/cd9660/TODO.hibler b/sys/fs/cd9660/TODO.hibler
index e0842da82d5..ac04c266345 100644
--- a/sys/fs/cd9660/TODO.hibler
+++ b/sys/fs/cd9660/TODO.hibler
@@ -1,4 +1,3 @@
-$FreeBSD$
 
 1. Investiate making ISOFS another UFS shared filesystem (ala FFS/MFS/LFS).
    Since it was modelled after the inode code, we might be able to merge
diff --git a/sys/geom/notes b/sys/geom/notes
index 4fcacaefbc4..016614f7dce 100644
--- a/sys/geom/notes
+++ b/sys/geom/notes
@@ -1,4 +1,3 @@
-$FreeBSD$
 
 For the lack of a better place to put them, this file will contain
 notes on some of the more intricate details of geom.
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index 1fd02302ae3..65a5aa69fce 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -1,4 +1,3 @@
- $FreeBSD$
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index c3e2a0343fd..209c3c2fd6d 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,3 @@
- $FreeBSD$
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
diff --git a/sys/netgraph/NOTES b/sys/netgraph/NOTES
index eb3a54c5614..8a1a2ff2804 100644
--- a/sys/netgraph/NOTES
+++ b/sys/netgraph/NOTES
@@ -1,4 +1,3 @@
-$FreeBSD$
 Development ideas..
 
 Archie's suggestions... :-)
diff --git a/sys/netgraph/bluetooth/hci/TODO b/sys/netgraph/bluetooth/hci/TODO
index 6f66d7b84d0..4fb50a956b3 100644
--- a/sys/netgraph/bluetooth/hci/TODO
+++ b/sys/netgraph/bluetooth/hci/TODO
@@ -1,5 +1,4 @@
 $Id: TODO,v 1.2 2003/04/26 22:36:29 max Exp $
-$FreeBSD$
 
 FIXME/TODO list
 
diff --git a/sys/netgraph/bluetooth/l2cap/TODO b/sys/netgraph/bluetooth/l2cap/TODO
index 7c7bb27c59a..8a5c6d1f343 100644
--- a/sys/netgraph/bluetooth/l2cap/TODO
+++ b/sys/netgraph/bluetooth/l2cap/TODO
@@ -1,5 +1,4 @@
 $Id: TODO,v 1.1 2002/11/24 19:47:06 max Exp $
-$FreeBSD$
 
 FIXME/TODO list
 
diff --git a/sys/netgraph/bluetooth/socket/TODO b/sys/netgraph/bluetooth/socket/TODO
index c1aa3b2d476..a0135e141a1 100644
--- a/sys/netgraph/bluetooth/socket/TODO
+++ b/sys/netgraph/bluetooth/socket/TODO
@@ -1,5 +1,4 @@
 $Id: TODO,v 1.1 2002/11/24 19:47:07 max Exp $
-$FreeBSD$
 
 FIXME/TODO list
 
diff --git a/sys/netinet/libalias/HISTORY b/sys/netinet/libalias/HISTORY
index 87d5b6f8ed7..34feba25edc 100644
--- a/sys/netinet/libalias/HISTORY
+++ b/sys/netinet/libalias/HISTORY
@@ -1,4 +1,3 @@
-$FreeBSD$
 
 Version 1.0: August 11, 1996 (cjm)
 
diff --git a/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE b/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE
index 1ee473da33f..628a24ad8ba 100644
--- a/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE
+++ b/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE
@@ -1,4 +1,3 @@
-$FreeBSD$
 
 Copyright (C) 1993-2002 by Darren Reed.
 
diff --git a/sys/ufs/ufs/README.acls b/sys/ufs/ufs/README.acls
index 28a9d4f59d8..ad3bb951bf4 100644
--- a/sys/ufs/ufs/README.acls
+++ b/sys/ufs/ufs/README.acls
@@ -1,4 +1,3 @@
-$FreeBSD$
 
   UFS Access Control Lists Copyright
 
diff --git a/sys/ufs/ufs/README.extattr b/sys/ufs/ufs/README.extattr
index a3be6e6a45d..368fdd704ce 100644
--- a/sys/ufs/ufs/README.extattr
+++ b/sys/ufs/ufs/README.extattr
@@ -1,4 +1,3 @@
-$FreeBSD$
 
   UFS Extended Attributes Copyright