diff --git a/LINUX/i40e_netmap_linux.h b/LINUX/i40e_netmap_linux.h
index 9ccd7d53c..76ec22187 100644
--- a/LINUX/i40e_netmap_linux.h
+++ b/LINUX/i40e_netmap_linux.h
@@ -24,8 +24,6 @@
  */
 
 /*
- * $FreeBSD$
- *
  * netmap support for: i40e (LINUX version)
  *
  * derived from ixgbe
diff --git a/LINUX/ixgbe_netmap_linux.h b/LINUX/ixgbe_netmap_linux.h
index 64a4b70ef..7d0f86b15 100644
--- a/LINUX/ixgbe_netmap_linux.h
+++ b/LINUX/ixgbe_netmap_linux.h
@@ -24,8 +24,6 @@
  */
 
 /*
- * $FreeBSD: head/sys/dev/netmap/ixgbe_netmap.h 230572 2012-01-26 09:55:16Z luigi $
- *
  * netmap support for: ixgbe (LINUX version)
  *
  * This file is meant to be a reference on how to implement
diff --git a/WINDOWS/includes/net/ethernet.h b/WINDOWS/includes/net/ethernet.h
index dc0f635c2..a677a8a17 100644
--- a/WINDOWS/includes/net/ethernet.h
+++ b/WINDOWS/includes/net/ethernet.h
@@ -1,8 +1,5 @@
 /*
  * Fundamental constants relating to ethernet.
- *
- * $FreeBSD: head/sys/net/ethernet.h 249925 2013-04-26 12:50:32Z glebius $
- *
  */
 
 #ifndef _NET_ETHERNET_H_
diff --git a/WINDOWS/includes/net/if_dl.h b/WINDOWS/includes/net/if_dl.h
index 4d2b4f743..cfad7acb5 100644
--- a/WINDOWS/includes/net/if_dl.h
+++ b/WINDOWS/includes/net/if_dl.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/if_dl.h,v 1.14 2005/01/07 01:45:34 imp Exp $
  */
 
 #ifndef _NET_IF_DL_H_
diff --git a/apps/bridge/bridge.8 b/apps/bridge/bridge.8
index b6314ece6..d3720ff45 100644
--- a/apps/bridge/bridge.8
+++ b/apps/bridge/bridge.8
@@ -21,8 +21,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd November 21, 2020
 .Dt BRIDGE 8
 .Os
diff --git a/apps/bridge/bridge.c b/apps/bridge/bridge.c
index 6bd8809b8..b8c6e786a 100644
--- a/apps/bridge/bridge.c
+++ b/apps/bridge/bridge.c
@@ -5,8 +5,6 @@
  *
  * A netmap application to bridge two network interfaces,
  * or one interface and the host stack.
- *
- * $FreeBSD$
  */
 
 #include <libnetmap.h>
diff --git a/apps/include/ctrs.h b/apps/include/ctrs.h
index 7e0265b48..49fb6a652 100644
--- a/apps/include/ctrs.h
+++ b/apps/include/ctrs.h
@@ -1,8 +1,6 @@
 #ifndef CTRS_H_
 #define CTRS_H_
 
-/* $FreeBSD$ */
-
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/time.h>
diff --git a/apps/lb/lb.8 b/apps/lb/lb.8
index 91694cb9b..b0d674e8c 100644
--- a/apps/lb/lb.8
+++ b/apps/lb/lb.8
@@ -22,8 +22,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd October 28, 2018
 .Dt LB 8
 .Os
diff --git a/apps/lb/lb.c b/apps/lb/lb.c
index 778360d9e..91affce58 100644
--- a/apps/lb/lb.c
+++ b/apps/lb/lb.c
@@ -22,7 +22,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD$ */
 #include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
diff --git a/apps/lb/pkt_hash.c b/apps/lb/pkt_hash.c
index a5b2e7102..643f6398a 100644
--- a/apps/lb/pkt_hash.c
+++ b/apps/lb/pkt_hash.c
@@ -25,7 +25,6 @@
  ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  ** POSSIBILITY OF SUCH DAMAGE.
  **/
-/* $FreeBSD$ */
 
 /* for func prototypes */
 #include "pkt_hash.h"
diff --git a/apps/lb/pkt_hash.h b/apps/lb/pkt_hash.h
index 7371f0740..1f73ff97e 100644
--- a/apps/lb/pkt_hash.h
+++ b/apps/lb/pkt_hash.h
@@ -25,7 +25,6 @@
  ** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  ** POSSIBILITY OF SUCH DAMAGE.
  **/
-/* $FreeBSD$ */
 #ifndef LB_PKT_HASH_H
 #define LB_PKT_HASH_H
 /*---------------------------------------------------------------------*/
diff --git a/apps/nmreplay/nmreplay.8 b/apps/nmreplay/nmreplay.8
index 8b7ffae5a..5307ec6f7 100644
--- a/apps/nmreplay/nmreplay.8
+++ b/apps/nmreplay/nmreplay.8
@@ -22,8 +22,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd December 21, 2018
 .Dt NMREPLAY 8
 .Os
diff --git a/apps/nmreplay/nmreplay.c b/apps/nmreplay/nmreplay.c
index 1ccfb6e31..54e5dae1f 100644
--- a/apps/nmreplay/nmreplay.c
+++ b/apps/nmreplay/nmreplay.c
@@ -21,8 +21,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 
diff --git a/apps/pkt-gen/pkt-gen.8 b/apps/pkt-gen/pkt-gen.8
index 2a80f160b..83643d749 100644
--- a/apps/pkt-gen/pkt-gen.8
+++ b/apps/pkt-gen/pkt-gen.8
@@ -23,8 +23,6 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd April 21, 2023
 .Dt PKT-GEN 8
 .Os
diff --git a/apps/pkt-gen/pkt-gen.c b/apps/pkt-gen/pkt-gen.c
index 621e3e215..c17579a14 100644
--- a/apps/pkt-gen/pkt-gen.c
+++ b/apps/pkt-gen/pkt-gen.c
@@ -25,7 +25,6 @@
  */
 
 /*
- * $FreeBSD$
  * $Id: pkt-gen.c 12346 2013-06-12 17:36:25Z luigi $
  *
  * Example program to show how to build a multithreaded packet
diff --git a/apps/tlem/tlem.8 b/apps/tlem/tlem.8
index f5b600a3f..fa8c9841c 100644
--- a/apps/tlem/tlem.8
+++ b/apps/tlem/tlem.8
@@ -22,8 +22,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd February 13, 2020
 .Dt TLEM 1
 .Os
diff --git a/apps/vale-ctl/vale-ctl.4 b/apps/vale-ctl/vale-ctl.4
index a2ea6d693..0bfaea955 100644
--- a/apps/vale-ctl/vale-ctl.4
+++ b/apps/vale-ctl/vale-ctl.4
@@ -22,8 +22,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd March 31, 2020
 .Dt VALE-CTL 4
 .Os
diff --git a/apps/vale-ctl/vale-ctl.c b/apps/vale-ctl/vale-ctl.c
index bf1bc6229..1b8d74e61 100644
--- a/apps/vale-ctl/vale-ctl.c
+++ b/apps/vale-ctl/vale-ctl.c
@@ -23,8 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
-
 #define LIBNETMAP_NOTHREADSAFE
 #include <libnetmap.h>
 
diff --git a/libnetmap/libnetmap.h b/libnetmap/libnetmap.h
index 62fa36996..280132035 100644
--- a/libnetmap/libnetmap.h
+++ b/libnetmap/libnetmap.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2018 Universita` di Pisa
  * All rights reserved.
diff --git a/libnetmap/nmctx-pthreads.c b/libnetmap/nmctx-pthreads.c
index 2943b7ccc..fdad20c7c 100644
--- a/libnetmap/nmctx-pthreads.c
+++ b/libnetmap/nmctx-pthreads.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2018 Universita` di Pisa
  * All rights reserved.
diff --git a/libnetmap/nmctx.c b/libnetmap/nmctx.c
index 489988f33..fe83b8864 100644
--- a/libnetmap/nmctx.c
+++ b/libnetmap/nmctx.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2018 Universita` di Pisa
  * All rights reserved.
diff --git a/libnetmap/nmport.c b/libnetmap/nmport.c
index 80690a7f8..c892c94db 100644
--- a/libnetmap/nmport.c
+++ b/libnetmap/nmport.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2018 Universita` di Pisa
  * All rights reserved.
diff --git a/libnetmap/nmreq.c b/libnetmap/nmreq.c
index f5d4605ed..a083099f0 100644
--- a/libnetmap/nmreq.c
+++ b/libnetmap/nmreq.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2018 Universita` di Pisa
  * All rights reserved.
diff --git a/share/man/man4/netmap.4 b/share/man/man4/netmap.4
index 9ea100f02..3efa34c29 100644
--- a/share/man/man4/netmap.4
+++ b/share/man/man4/netmap.4
@@ -25,8 +25,6 @@
 .\" This document is derived in part from the enet man page (enet.4)
 .\" distributed with 4.3BSD Unix.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd October 3, 2020
 .Dt NETMAP 4
 .Os
diff --git a/share/man/man4/ptnet.4 b/share/man/man4/ptnet.4
index b4a1a5379..71efb3cdd 100644
--- a/share/man/man4/ptnet.4
+++ b/share/man/man4/ptnet.4
@@ -22,8 +22,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd December 11, 2018
 .Dt PTNET 4
 .Os
diff --git a/share/man/man4/vale.4 b/share/man/man4/vale.4
index d506ff114..85204de68 100644
--- a/share/man/man4/vale.4
+++ b/share/man/man4/vale.4
@@ -25,7 +25,6 @@
 .\" This document is derived in part from the enet man page (enet.4)
 .\" distributed with 4.3BSD Unix.
 .\"
-.\" $FreeBSD$
 .\" $Id: $
 .\"
 .Dd February 6, 2020
diff --git a/sys/dev/netmap/if_em_netmap.h b/sys/dev/netmap/if_em_netmap.h
index a3987b92b..cda0ee38f 100644
--- a/sys/dev/netmap/if_em_netmap.h
+++ b/sys/dev/netmap/if_em_netmap.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
  *
@@ -26,8 +26,6 @@
  */
 
 /*
- * $FreeBSD: head/sys/dev/netmap/if_em_netmap.h 238985 2012-08-02 11:59:43Z luigi $
- *
  * netmap support for: em.
  *
  * For more details on netmap support please see ixgbe_netmap.h
diff --git a/sys/dev/netmap/if_igb_netmap.h b/sys/dev/netmap/if_igb_netmap.h
index 8ae54e54a..b10348e7d 100644
--- a/sys/dev/netmap/if_igb_netmap.h
+++ b/sys/dev/netmap/if_igb_netmap.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2011-2014 Universita` di Pisa. All rights reserved.
  *
@@ -26,8 +26,6 @@
  */
 
 /*
- * $FreeBSD: head/sys/dev/netmap/if_igb_netmap.h 256200 2013-10-09 17:32:52Z jfv $
- *
  * Netmap support for igb, partly contributed by Ahmed Kooli
  * For details on netmap support please see ixgbe_netmap.h
  */
diff --git a/sys/dev/netmap/if_ixl_netmap.h b/sys/dev/netmap/if_ixl_netmap.h
index 547ed3d8a..43ea9fb48 100644
--- a/sys/dev/netmap/if_ixl_netmap.h
+++ b/sys/dev/netmap/if_ixl_netmap.h
@@ -24,8 +24,6 @@
  */
 
 /*
- * $FreeBSD$
- *
  * netmap support for: ixl
  *
  * derived from ixgbe
diff --git a/sys/dev/netmap/if_lem_netmap.h b/sys/dev/netmap/if_lem_netmap.h
index 46b168c40..9842f9714 100644
--- a/sys/dev/netmap/if_lem_netmap.h
+++ b/sys/dev/netmap/if_lem_netmap.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
  *
@@ -27,8 +27,6 @@
 
 
 /*
- * $FreeBSD: head/sys/dev/netmap/if_lem_netmap.h 271849 2014-09-19 03:51:26Z glebius $
- *
  * netmap support for: lem
  *
  * For details on netmap support please see ixgbe_netmap.h
diff --git a/sys/dev/netmap/if_ptnet.c b/sys/dev/netmap/if_ptnet.c
index 5b3332ee5..56d853eb7 100644
--- a/sys/dev/netmap/if_ptnet.c
+++ b/sys/dev/netmap/if_ptnet.c
@@ -22,8 +22,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 /* Driver for ptnet paravirtualized network device. */
diff --git a/sys/dev/netmap/if_re_netmap.h b/sys/dev/netmap/if_re_netmap.h
index d658a3e5c..4864f3b50 100644
--- a/sys/dev/netmap/if_re_netmap.h
+++ b/sys/dev/netmap/if_re_netmap.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2011-2014 Luigi Rizzo. All rights reserved.
  *
@@ -26,8 +26,6 @@
  */
 
 /*
- * $FreeBSD$
- *
  * netmap support for: re
  *
  * For more details on netmap support please see ixgbe_netmap.h
diff --git a/sys/dev/netmap/if_vtnet_netmap.h b/sys/dev/netmap/if_vtnet_netmap.h
index fc18976ee..4eafff5ed 100644
--- a/sys/dev/netmap/if_vtnet_netmap.h
+++ b/sys/dev/netmap/if_vtnet_netmap.h
@@ -23,10 +23,6 @@
  * SUCH DAMAGE.
  */
 
-/*
- * $FreeBSD$
- */
-
 #include <net/netmap.h>
 #include <sys/selinfo.h>
 #include <vm/vm.h>
diff --git a/sys/dev/netmap/ixgbe_netmap.h b/sys/dev/netmap/ixgbe_netmap.h
index feac9da1b..c7ff503ed 100644
--- a/sys/dev/netmap/ixgbe_netmap.h
+++ b/sys/dev/netmap/ixgbe_netmap.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
  *
@@ -26,8 +26,6 @@
  */
 
 /*
- * $FreeBSD: head/sys/dev/netmap/ixgbe_netmap.h 244514 2012-12-20 22:26:03Z luigi $
- *
  * netmap support for: ixgbe (both ix and ixv)
  *
  * This file is meant to be a reference on how to implement
diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c
index 53e288a1d..2c4e8ce28 100644
--- a/sys/dev/netmap/netmap.c
+++ b/sys/dev/netmap/netmap.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2011-2014 Matteo Landi
  * Copyright (C) 2011-2016 Luigi Rizzo
@@ -31,8 +31,6 @@
 
 
 /*
- * $FreeBSD$
- *
  * This module supports memory mapped access to network devices,
  * see netmap(4).
  *
diff --git a/sys/dev/netmap/netmap_bdg.c b/sys/dev/netmap/netmap_bdg.c
index ef8cb8104..4c19874d9 100644
--- a/sys/dev/netmap/netmap_bdg.c
+++ b/sys/dev/netmap/netmap_bdg.c
@@ -58,8 +58,6 @@ ports attached to the switch)
 
 #if defined(__FreeBSD__)
 #include <sys/cdefs.h> /* prerequisite */
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/param.h>	/* defines used in kernel.h */
diff --git a/sys/dev/netmap/netmap_bdg.h b/sys/dev/netmap/netmap_bdg.h
index f5148c740..ca00e3ce3 100644
--- a/sys/dev/netmap/netmap_bdg.h
+++ b/sys/dev/netmap/netmap_bdg.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2013-2018 Universita` di Pisa
  * All rights reserved.
@@ -24,8 +24,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 #ifndef _NET_NETMAP_BDG_H_
 #define _NET_NETMAP_BDG_H_
diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c
index 4b3b1a6ed..6eb707a28 100644
--- a/sys/dev/netmap/netmap_freebsd.c
+++ b/sys/dev/netmap/netmap_freebsd.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2013-2014 Universita` di Pisa. All rights reserved.
  *
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
 #include "opt_inet.h"
 #include "opt_inet6.h"
 
diff --git a/sys/dev/netmap/netmap_generic.c b/sys/dev/netmap/netmap_generic.c
index eb98f0053..41e89b893 100644
--- a/sys/dev/netmap/netmap_generic.c
+++ b/sys/dev/netmap/netmap_generic.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2013-2016 Vincenzo Maffione
  * Copyright (C) 2013-2016 Luigi Rizzo
@@ -67,8 +67,6 @@
 #ifdef __FreeBSD__
 
 #include <sys/cdefs.h> /* prerequisite */
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h
index 7bab5e2bb..4f66efb31 100644
--- a/sys/dev/netmap/netmap_kern.h
+++ b/sys/dev/netmap/netmap_kern.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo
  * Copyright (C) 2013-2016 Universita` di Pisa
@@ -28,8 +28,6 @@
  */
 
 /*
- * $FreeBSD$
- *
  * The header contains the definitions of constants and function
  * prototypes used only in kernelspace.
  */
diff --git a/sys/dev/netmap/netmap_kloop.c b/sys/dev/netmap/netmap_kloop.c
index eb25db972..e9027249b 100644
--- a/sys/dev/netmap/netmap_kloop.c
+++ b/sys/dev/netmap/netmap_kloop.c
@@ -23,8 +23,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/netmap/netmap_legacy.c b/sys/dev/netmap/netmap_legacy.c
index 3f676fccf..b52bf24e1 100644
--- a/sys/dev/netmap/netmap_legacy.c
+++ b/sys/dev/netmap/netmap_legacy.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2018 Vincenzo Maffione
  * All rights reserved.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
-
 #if defined(__FreeBSD__)
 #include <sys/cdefs.h> /* prerequisite */
 #include <sys/types.h>
diff --git a/sys/dev/netmap/netmap_mbq.c b/sys/dev/netmap/netmap_mbq.c
index 3ce73f0e0..6b1e0da07 100644
--- a/sys/dev/netmap/netmap_mbq.c
+++ b/sys/dev/netmap/netmap_mbq.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2013-2014 Vincenzo Maffione
  * All rights reserved.
@@ -26,11 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/*
- * $FreeBSD$
- */
-
-
 #ifdef linux
 #include "bsd_glue.h"
 #elif defined (_WIN32)
diff --git a/sys/dev/netmap/netmap_mbq.h b/sys/dev/netmap/netmap_mbq.h
index 044cb54bb..b8b811c64 100644
--- a/sys/dev/netmap/netmap_mbq.h
+++ b/sys/dev/netmap/netmap_mbq.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2013-2014 Vincenzo Maffione
  * All rights reserved.
@@ -26,11 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/*
- * $FreeBSD$
- */
-
-
 #ifndef _NET_NETMAP_MBQ_H__
 #define _NET_NETMAP_MBQ_H__
 
diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c
index 1b290c966..9a3e5a7b0 100644
--- a/sys/dev/netmap/netmap_mem2.c
+++ b/sys/dev/netmap/netmap_mem2.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2012-2014 Matteo Landi
  * Copyright (C) 2012-2016 Luigi Rizzo
@@ -38,8 +38,6 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h> /* prerequisite */
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>		/* MALLOC_DEFINE */
diff --git a/sys/dev/netmap/netmap_mem2.h b/sys/dev/netmap/netmap_mem2.h
index 036e44d1b..b1ccc0138 100644
--- a/sys/dev/netmap/netmap_mem2.h
+++ b/sys/dev/netmap/netmap_mem2.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2012-2014 Matteo Landi
  * Copyright (C) 2012-2016 Luigi Rizzo
@@ -29,8 +29,6 @@
  */
 
 /*
- * $FreeBSD$
- *
  * (New) memory allocator for netmap
  */
 
diff --git a/sys/dev/netmap/netmap_monitor.c b/sys/dev/netmap/netmap_monitor.c
index a8bd2d17b..2e04f4e7a 100644
--- a/sys/dev/netmap/netmap_monitor.c
+++ b/sys/dev/netmap/netmap_monitor.c
@@ -25,8 +25,6 @@
  */
 
 /*
- * $FreeBSD$
- *
  * Monitors
  *
  * netmap monitors can be used to do monitoring of network traffic
diff --git a/sys/dev/netmap/netmap_null.c b/sys/dev/netmap/netmap_null.c
index c91afdb55..8066c1363 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 a6ff8b00a..96dad21a6 100644
--- a/sys/dev/netmap/netmap_offloadings.c
+++ b/sys/dev/netmap/netmap_offloadings.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2014-2015 Vincenzo Maffione
  * All rights reserved.
@@ -26,8 +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 91cad5201..cfaa6554b 100644
--- a/sys/dev/netmap/netmap_pipe.c
+++ b/sys/dev/netmap/netmap_pipe.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2014-2018 Giuseppe Lettieri
  * All rights reserved.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
-
 #if defined(__FreeBSD__)
 #include <sys/cdefs.h> /* prerequisite */
 
diff --git a/sys/dev/netmap/netmap_vale.c b/sys/dev/netmap/netmap_vale.c
index bfb624728..0ada47922 100644
--- a/sys/dev/netmap/netmap_vale.c
+++ b/sys/dev/netmap/netmap_vale.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2013-2016 Universita` di Pisa
  * All rights reserved.
@@ -29,8 +29,6 @@
 
 #if defined(__FreeBSD__)
 #include <sys/cdefs.h> /* prerequisite */
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/param.h>	/* defines used in kernel.h */
diff --git a/sys/modules/netmap/Makefile b/sys/modules/netmap/Makefile
index 8d0b35811..06212aa5f 100644
--- a/sys/modules/netmap/Makefile
+++ b/sys/modules/netmap/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-#
 # Compile netmap as a module, useful if you want a netmap bridge
 # or loadable drivers.
 
diff --git a/sys/net/netmap.h b/sys/net/netmap.h
index 241cd7bde..998e3153c 100644
--- a/sys/net/netmap.h
+++ b/sys/net/netmap.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
  *
@@ -27,8 +27,6 @@
  */
 
 /*
- * $FreeBSD: head/sys/net/netmap.h 251139 2013-05-30 14:07:14Z luigi $
- *
  * Definitions of constants and the structures used by the netmap
  * framework, for the part visible to both kernel and userspace.
  * Detailed info on netmap is available with "man netmap" or at
diff --git a/sys/net/netmap_legacy.h b/sys/net/netmap_legacy.h
index f1dd7d625..ccf9c5b3d 100644
--- a/sys/net/netmap_legacy.h
+++ b/sys/net/netmap_legacy.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
  *
@@ -30,8 +30,6 @@
 #define _NET_NETMAP_LEGACY_H_
 
 /*
- * $FreeBSD$
- *
  * ioctl names and related fields
  *
  * NIOCTXSYNC, NIOCRXSYNC synchronize tx or rx queues,
diff --git a/sys/net/netmap_user.h b/sys/net/netmap_user.h
index e8983565d..0a9cbac05 100644
--- a/sys/net/netmap_user.h
+++ b/sys/net/netmap_user.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2011-2016 Universita` di Pisa
  * All rights reserved.
@@ -28,8 +28,6 @@
  */
 
 /*
- * $FreeBSD$
- *
  * Functions and macros to manipulate netmap structures and packets
  * in userspace. See netmap(4) for more information.
  *
diff --git a/sys/net/netmap_virt.h b/sys/net/netmap_virt.h
index 07e551aff..c9921d2c5 100644
--- a/sys/net/netmap_virt.h
+++ b/sys/net/netmap_virt.h
@@ -25,8 +25,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef NETMAP_VIRT_H
diff --git a/utils/README b/utils/README
index 002fa9e56..08ab2d4ed 100644
--- a/utils/README
+++ b/utils/README
@@ -1,5 +1,3 @@
-$FreeBSD$
-
 This directory contains miscellaneous programs related to netmap
 
 	ctrl-api-test.c		suite of unit tests for the netmap control ABI
diff --git a/utils/click-test.cfg b/utils/click-test.cfg
index d95ab4a6d..927ba10ba 100644
--- a/utils/click-test.cfg
+++ b/utils/click-test.cfg
@@ -1,6 +1,4 @@
 //
-// $FreeBSD: head/tools/tools/netmap/click-test.cfg 227614 2011-11-17 12:17:39Z luigi $
-//
 // A sample test configuration for click
 //
 //
diff --git a/utils/ctrl-api-test.c b/utils/ctrl-api-test.c
index 2ae418876..64c980e01 100644
--- a/utils/ctrl-api-test.c
+++ b/utils/ctrl-api-test.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2018 Vincenzo Maffione
  *
@@ -23,8 +23,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 /*