git: 0d349c19beda - stable/13 - Remove $FreeBSD$: two-line .c pattern

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Warner Losh <imp_at_FreeBSD.org>
Date: Wed, 23 Aug 2023 17:49:41 UTC
The branch stable/13 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=0d349c19beda4185496f7a81330e0961a462512d

commit 0d349c19beda4185496f7a81330e0961a462512d
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-08-22 01:31:23 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-08-23 17:43:23 +0000

    Remove $FreeBSD$: two-line .c pattern
    
    Remove /^#include\s+<sys/cdefs.h>.*$\n\s+__FBSDID\("\$FreeBSD\$"\);\n/
    
    Similar commit in main:
    (cherry picked from commit e5d258c9e599)
---
 usr.bin/netstat/netisr.c    | 3 ---
 usr.bin/rup/rup.c           | 3 ---
 usr.bin/rusers/rusers.c     | 3 ---
 usr.bin/systat/cmds.c       | 3 ---
 usr.bin/systat/cmdtab.c     | 3 ---
 usr.bin/systat/devs.c       | 3 ---
 usr.bin/systat/fetch.c      | 3 ---
 usr.bin/systat/icmp.c       | 3 ---
 usr.bin/systat/icmp6.c      | 3 ---
 usr.bin/systat/iostat.c     | 3 ---
 usr.bin/systat/ip.c         | 3 ---
 usr.bin/systat/ip6.c        | 3 ---
 usr.bin/systat/keyboard.c   | 3 ---
 usr.bin/systat/main.c       | 3 ---
 usr.bin/systat/mode.c       | 3 ---
 usr.bin/systat/netcmds.c    | 3 ---
 usr.bin/systat/netstat.c    | 3 ---
 usr.bin/systat/swap.c       | 3 ---
 usr.bin/systat/vmstat.c     | 3 ---
 usr.bin/tail/forward.c      | 3 ---
 usr.bin/tail/misc.c         | 3 ---
 usr.bin/tail/read.c         | 3 ---
 usr.bin/tail/tail.c         | 3 ---
 usr.bin/talk/ctl.c          | 3 ---
 usr.bin/talk/ctl_transact.c | 3 ---
 usr.bin/talk/display.c      | 3 ---
 usr.bin/talk/get_addrs.c    | 3 ---
 usr.bin/talk/get_iface.c    | 3 ---
 usr.bin/talk/get_names.c    | 3 ---
 usr.bin/talk/init_disp.c    | 3 ---
 usr.bin/talk/invite.c       | 3 ---
 usr.bin/talk/io.c           | 3 ---
 usr.bin/talk/look_up.c      | 3 ---
 usr.bin/talk/msgs.c         | 3 ---
 usr.bin/talk/talk.c         | 3 ---
 usr.bin/tcopy/tcopy.c       | 3 ---
 usr.bin/touch/touch.c       | 3 ---
 usr.bin/tput/tput.c         | 3 ---
 usr.bin/tr/str.c            | 3 ---
 usr.bin/tr/tr.c             | 3 ---
 usr.bin/tset/map.c          | 3 ---
 usr.bin/tset/misc.c         | 3 ---
 usr.bin/tset/set.c          | 3 ---
 usr.bin/tset/term.c         | 3 ---
 usr.bin/tset/tset.c         | 3 ---
 usr.bin/tset/wrterm.c       | 3 ---
 usr.bin/uname/uname.c       | 3 ---
 usr.bin/unexpand/unexpand.c | 3 ---
 usr.bin/vgrind/regexp.c     | 3 ---
 usr.bin/vgrind/vfontedpr.c  | 3 ---
 usr.bin/w/pr_time.c         | 3 ---
 usr.bin/w/w.c               | 3 ---
 usr.bin/wall/ttymsg.c       | 3 ---
 usr.bin/wall/wall.c         | 3 ---
 usr.bin/what/what.c         | 3 ---
 usr.bin/which/which.c       | 3 ---
 usr.bin/xstr/xstr.c         | 3 ---
 usr.bin/ypcat/ypcat.c       | 3 ---
 usr.bin/ypmatch/ypmatch.c   | 3 ---
 59 files changed, 177 deletions(-)

diff --git a/usr.bin/netstat/netisr.c b/usr.bin/netstat/netisr.c
index bcb9351353c5..a3eb976d84bf 100644
--- a/usr.bin/netstat/netisr.c
+++ b/usr.bin/netstat/netisr.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index aae3639b64d4..5f605f55b413 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 838e231ca02a..413de53c304b 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -33,9 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index aa16167c96b5..5d20cd4175de 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/29/95";
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index 52329948748b..d14084f60269 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c
index 87d04f989ea3..40a65708fe99 100644
--- a/usr.bin/systat/devs.c
+++ b/usr.bin/systat/devs.c
@@ -57,9 +57,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)disks.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c
index e24d0b8ee6ee..1b7a884159bd 100644
--- a/usr.bin/systat/fetch.c
+++ b/usr.bin/systat/fetch.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)fetch.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index 4b3a56640267..a1c25e37ed2a 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/icmp6.c b/usr.bin/systat/icmp6.c
index 2853b90eff29..d7d612604475 100644
--- a/usr.bin/systat/icmp6.c
+++ b/usr.bin/systat/icmp6.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index 8767a046d81a..c6168b625c4e 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -56,9 +56,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)iostat.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index f177a6cd0ff8..bc90ff557e20 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/ip6.c b/usr.bin/systat/ip6.c
index ac9063f48fce..c7d9d477ada9 100644
--- a/usr.bin/systat/ip6.c
+++ b/usr.bin/systat/ip6.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/keyboard.c b/usr.bin/systat/keyboard.c
index a3401506c5ce..aac7d1a2bb79 100644
--- a/usr.bin/systat/keyboard.c
+++ b/usr.bin/systat/keyboard.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)keyboard.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 7fdab312830e..e6fc79b7ba59 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c
index a3fdf46c3b5d..28bc47a92351 100644
--- a/usr.bin/systat/mode.c
+++ b/usr.bin/systat/mode.c
@@ -56,9 +56,6 @@
  * mode in the command line.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 8d5e48fdeb52..6320dd21562d 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)netcmds.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index a9487c4dcc9d..fc8e05a6b107 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index 19374918ff68..5aa9e3fe0363 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)swap.c	8.3 (Berkeley) 4/29/95";
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index cfc88f83a5bd..9bdb27291529 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifdef lint
 static const char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index 878cb5a4550b..48516a730a50 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)forward.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c
index 537cf00ccfe3..21d0db8b5d40 100644
--- a/usr.bin/tail/misc.c
+++ b/usr.bin/tail/misc.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index 1e757c86195c..ff025b31d64c 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index 8a65683bef7e..9e63353f9b40 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -32,9 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index abfd5e6b30ed..c9bd6f77fb81 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)ctl.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index 650134da6ca6..c51bbed28437 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)ctl_transact.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 9987194fcbb9..5f29cfd600d9 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index 53b841cee2ca..678fabce9aa2 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)get_addrs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c
index 96d3d6edabb5..5c69046c680e 100644
--- a/usr.bin/talk/get_iface.c
+++ b/usr.bin/talk/get_iface.c
@@ -27,9 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 /*
  * From:
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 3ca362ad9bff..78b025144328 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)get_names.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index a3f125792254..936b9799a22c 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)init_disp.c	8.2 (Berkeley) 2/16/94";
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index e000e54b0c35..78f92ed9cdbf 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index 9cf7ad8346eb..c47bf928712b 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index 3c676b9c1ea2..3fb6cbb43037 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)look_up.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index e0886e9477f7..a40df7ff17e9 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)msgs.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index 4b7e748e2f09..04c8572a04b4 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)talk.c	8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 24dcc969a9af..3db554fb1f49 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index 1594eacb67d0..91abcfd447ea 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index 8f678f61b1a0..c6308b4180df 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index 2cd811ce5d6b..bd02eafbdff5 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)str.c	8.2 (Berkeley) 4/28/95";
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index 2d1baad2ac09..4bd52fae1a08 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index 4fa6d859f055..a546267397fa 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/9/93";
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index 737fde9dc130..8e7cde12e798 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/9/93";
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index df204cebeebe..34bdc44431b0 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)set.c	8.2 (Berkeley) 2/28/94";
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index 1c0196b1473c..08715fa268cd 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)term.c	8.1 (Berkeley) 6/9/93";
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index be6fbf3abd2d..56cff3ca741b 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index cd98558f20a9..44fd55dfd989 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)wrterm.c	8.1 (Berkeley) 6/9/93";
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index 109505e4b9da..981d08a7a7c0 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -34,9 +34,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 08ba8ffe1dc4..116c4e02af4c 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index 572f44d2aeed..97e5ef68cb9f 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -30,9 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 235073094296..dab2a3699008 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 20b75704c309..7be11b777e79 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)pr_time.c	8.2 (Berkeley) 4/4/94";
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 5ba9f49cdd35..7c67a851ca99 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index beae788a9ba2..dc149db84885 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char sccsid[] = "@(#)ttymsg.c	8.2 (Berkeley) 11/16/93";
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index a02f103cb80f..992bc9f77b22 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index 6d59f70cb589..5cd6a85f35bf 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c
index abc23c876b2e..f6ee25f60cce 100644
--- a/usr.bin/which/which.c
+++ b/usr.bin/which/which.c
@@ -26,9 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index da96581c3f2b..b1a5bf58ae01 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #ifndef lint
 static const char copyright[] =
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index 3d927ba0e839..0b3b1c9879c8 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -28,9 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index a110abaeafe5..24af4b8c8993 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/types.h>