diff --git a/sbin/ipfw/altq.c b/sbin/ipfw/altq.c
index a78852cfd633..85f6d7191978 100644
--- a/sbin/ipfw/altq.c
+++ b/sbin/ipfw/altq.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause
- * 
  * Copyright (c) 2002-2003 Luigi Rizzo
  * Copyright (c) 1996 Alex Nash, Paul Traina, Poul-Henning Kamp
  * Copyright (c) 1994 Ugen J.S.Antsilevich
diff --git a/sbin/ipfw/dummynet.c b/sbin/ipfw/dummynet.c
index e3a04b389eb2..6be21cfb230f 100644
--- a/sbin/ipfw/dummynet.c
+++ b/sbin/ipfw/dummynet.c
@@ -1,6 +1,4 @@
-/*.
- * SPDX-License-Identifier: BSD-2-Clause
- * 
+/*-
  * Codel/FQ_Codel and PIE/FQ_PIE Code:
  * Copyright (C) 2016 Centre for Advanced Internet Architectures,
  *  Swinburne University of Technology, Melbourne, Australia.
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index 455669763bf5..82cb23a9a5cd 100644
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause
- * 
  * Copyright (c) 2002-2003 Luigi Rizzo
  * Copyright (c) 1996 Alex Nash, Paul Traina, Poul-Henning Kamp
  * Copyright (c) 1994 Ugen J.S.Antsilevich
diff --git a/sbin/ipfw/ipfw2.h b/sbin/ipfw/ipfw2.h
index 274c0008a95f..3fe15e93431b 100644
--- a/sbin/ipfw/ipfw2.h
+++ b/sbin/ipfw/ipfw2.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause
- * 
  * Copyright (c) 2002-2003 Luigi Rizzo
  * Copyright (c) 1996 Alex Nash, Paul Traina, Poul-Henning Kamp
  * Copyright (c) 1994 Ugen J.S.Antsilevich
diff --git a/sbin/ipfw/ipv6.c b/sbin/ipfw/ipv6.c
index 5c643ca911e2..103e7438c8cd 100644
--- a/sbin/ipfw/ipv6.c
+++ b/sbin/ipfw/ipv6.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause
- * 
  * Copyright (c) 2002-2003 Luigi Rizzo
  * Copyright (c) 1996 Alex Nash, Paul Traina, Poul-Henning Kamp
  * Copyright (c) 1994 Ugen J.S.Antsilevich
diff --git a/sbin/ipfw/main.c b/sbin/ipfw/main.c
index 0ea0bb7cb634..a012c4de822d 100644
--- a/sbin/ipfw/main.c
+++ b/sbin/ipfw/main.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause
- * 
  * Copyright (c) 2002-2003,2010 Luigi Rizzo
  * Copyright (c) 1996 Alex Nash, Paul Traina, Poul-Henning Kamp
  * Copyright (c) 1994 Ugen J.S.Antsilevich
diff --git a/sbin/ipfw/nat.c b/sbin/ipfw/nat.c
index 70a50de947c6..aced8ea10ecb 100644
--- a/sbin/ipfw/nat.c
+++ b/sbin/ipfw/nat.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause
- * 
  * Copyright (c) 2002-2003 Luigi Rizzo
  * Copyright (c) 1996 Alex Nash, Paul Traina, Poul-Henning Kamp
  * Copyright (c) 1994 Ugen J.S.Antsilevich
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index d2e9f756d5dc..c2bb2d254408 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -6,8 +6,6 @@
  *
  * Author:  Daniel Boulet
  *
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright 1993 Daniel Boulet and RTMX Inc.
  *
  * This system call was implemented by Daniel Boulet under contract from RTMX.
diff --git a/sys/sys/snoop.h b/sys/sys/snoop.h
index 1a5e117976f1..b25aa494ff8e 100644
--- a/sys/sys/snoop.h
+++ b/sys/sys/snoop.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (c) 1995 Ugen J.S.Antsilevich
  *
  * Redistribution and use in source forms, with and without modification,
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 3585d4555b18..85583882ea4e 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (c) 1995 Ugen J.S.Antsilevich
  *
  * Redistribution and use in source forms, with and without modification,