diff --git a/bgpd/bgp_trace.c b/bgpd/bgp_trace.c
index 02afbeb46fea..af45e7a9b880 100644
--- a/bgpd/bgp_trace.c
+++ b/bgpd/bgp_trace.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #define TRACEPOINT_CREATE_PROBES
 #define TRACEPOINT_DEFINE
 
diff --git a/eigrpd/eigrp_pkt_tlv1.c b/eigrpd/eigrp_pkt_tlv1.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/eigrpd/eigrp_pkt_tlv2.c b/eigrpd/eigrp_pkt_tlv2.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/eigrpd/eigrp_routemap.h b/eigrpd/eigrp_routemap.h
index c471679619d5..c797d10882bb 100644
--- a/eigrpd/eigrp_routemap.h
+++ b/eigrpd/eigrp_routemap.h
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /*
  * eigrp_routemap.h
  *
diff --git a/lib/checksum.c b/lib/checksum.c
index 6c5f06de458a..b1ad813fd90b 100644
--- a/lib/checksum.c
+++ b/lib/checksum.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /*
  * Checksum routine for Internet Protocol family headers (C Version).
  *
diff --git a/lib/checksum.h b/lib/checksum.h
index 508c3f38a60f..2856a0d8095f 100644
--- a/lib/checksum.h
+++ b/lib/checksum.h
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #ifndef _FRR_CHECKSUM_H
 #define _FRR_CHECKSUM_H
 
diff --git a/lib/explicit_bzero.c b/lib/explicit_bzero.c
index fa64ed85bffb..e838f95e657b 100644
--- a/lib/explicit_bzero.c
+++ b/lib/explicit_bzero.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /*
  * Public domain.
  * Written by Matthew Dempsky.
diff --git a/lib/libfrr_trace.c b/lib/libfrr_trace.c
index 59320322ca45..14f4a3cb20ac 100644
--- a/lib/libfrr_trace.c
+++ b/lib/libfrr_trace.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #define TRACEPOINT_CREATE_PROBES
 #define TRACEPOINT_DEFINE
 
diff --git a/lib/routing_nb.h b/lib/routing_nb.h
index e805e1cd0fe5..26b4cf08d821 100644
--- a/lib/routing_nb.h
+++ b/lib/routing_nb.h
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #ifndef _FRR_ROUTING_NB_H_
 #define _FRR_ROUTING_NB_H_
 
diff --git a/nhrpd/debug.h b/nhrpd/debug.h
index f2c7022ad409..d5c00ada8ee6 100644
--- a/nhrpd/debug.h
+++ b/nhrpd/debug.h
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "log.h"
 
 #define NHRP_DEBUG_COMMON	(1 << 0)
diff --git a/nhrpd/os.h b/nhrpd/os.h
index 2b9e07fa6ef5..3f3b0de91230 100644
--- a/nhrpd/os.h
+++ b/nhrpd/os.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 int os_socket(void);
 int os_sendmsg(const uint8_t *buf, size_t len, int ifindex, const uint8_t *addr,
diff --git a/nhrpd/reqid.c b/nhrpd/reqid.c
index 738e935ec24c..c2f5d24b69b8 100644
--- a/nhrpd/reqid.c
+++ b/nhrpd/reqid.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "zebra.h"
 #include "hash.h"
 #include "nhrpd.h"
diff --git a/nhrpd/vici.h b/nhrpd/vici.h
index f2ad3a9fe37d..8a8011f51044 100644
--- a/nhrpd/vici.h
+++ b/nhrpd/vici.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 enum vici_type_t {
 	VICI_START = 0,
diff --git a/tools/cocci.h b/tools/cocci.h
index 7d6bb4cd7f25..99076b5d3fa7 100644
--- a/tools/cocci.h
+++ b/tools/cocci.h
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /* some of this stuff doesn't seem to parse properly in coccinelle
  */
 
diff --git a/zebra/zebra_routemap_nb_config.c b/zebra/zebra_routemap_nb_config.c
index 5bcfb720e17e..ad012da4c2cc 100644
--- a/zebra/zebra_routemap_nb_config.c
+++ b/zebra/zebra_routemap_nb_config.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include <zebra.h>
 
 #include "lib/command.h"
diff --git a/zebra/zebra_trace.c b/zebra/zebra_trace.c
index fef5ad20ac5c..7b0fb3279b22 100644
--- a/zebra/zebra_trace.c
+++ b/zebra/zebra_trace.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #define TRACEPOINT_CREATE_PROBES
 #define TRACEPOINT_DEFINE