aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2023-08-22 01:31:41 +0000
committerWarner Losh <imp@FreeBSD.org>2023-08-23 17:43:26 +0000
commit3d497e17ebd33fe0f58d773e35ab994d750258d6 (patch)
treeeb78e480f145df82b587a21d05299b496d5e15ad /tools
parent3bc80996974a61a4223eae4c1ccd47b6ee32a48a (diff)
Diffstat (limited to 'tools')
-rw-r--r--tools/build/cross-build/capsicum_stubs.c2
-rw-r--r--tools/build/cross-build/fake_sysctl.c2
-rw-r--r--tools/build/cross-build/progname.c2
-rw-r--r--tools/build/futimens.c2
-rw-r--r--tools/build/utimensat.c2
-rw-r--r--tools/bus_space/C/lang.c2
-rw-r--r--tools/bus_space/Python/lang.c2
-rw-r--r--tools/bus_space/bus.c2
-rw-r--r--tools/bus_space/busdma.c2
-rw-r--r--tools/regression/aio/aiop/aiop.c2
-rw-r--r--tools/regression/bpf/bpf_filter/bpf_test.c2
-rw-r--r--tools/regression/capsicum/syscalls/cap_fcntls_limit.c2
-rw-r--r--tools/regression/capsicum/syscalls/cap_getmode.c2
-rw-r--r--tools/regression/capsicum/syscalls/cap_ioctls_limit.c2
-rw-r--r--tools/regression/capsicum/syscalls/misc.c2
-rw-r--r--tools/regression/environ/envctl.c3
-rw-r--r--tools/regression/environ/retention.c3
-rw-r--r--tools/regression/environ/timings.c3
-rw-r--r--tools/regression/ethernet/ethermulti/ethermulti.c2
-rw-r--r--tools/regression/geom_gpt/gctl_test_helper.c2
-rw-r--r--tools/regression/include/stdatomic/logic.c2
-rw-r--r--tools/regression/kthread/kld/kthrdlk.c2
-rw-r--r--tools/regression/netinet/ipbroadcast/ipbroadcast.c2
-rw-r--r--tools/regression/netinet/ipmulticast/ipmulticast.c2
-rw-r--r--tools/regression/netinet6/inet6_rth/inet6_rth-segments.c2
-rw-r--r--tools/regression/netinet6/inet6_rth/test_subr.c2
-rw-r--r--tools/regression/posixsem/posixsem.c2
-rw-r--r--tools/regression/posixsem/test.c2
-rw-r--r--tools/regression/redzone9/redzone.c2
-rw-r--r--tools/regression/security/cap_test/cap_test.c2
-rw-r--r--tools/regression/security/cap_test/cap_test_capabilities.c2
-rw-r--r--tools/regression/security/cap_test/cap_test_capmode.c2
-rw-r--r--tools/regression/security/cap_test/cap_test_fcntl.c2
-rw-r--r--tools/regression/security/cap_test/cap_test_pdfork.c2
-rw-r--r--tools/regression/security/cap_test/cap_test_pdkill.c2
-rw-r--r--tools/regression/security/cap_test/cap_test_relative.c2
-rw-r--r--tools/regression/security/cap_test/cap_test_sysctl.c2
-rw-r--r--tools/regression/security/open_to_operation/open_to_operation.c2
-rw-r--r--tools/regression/sockets/udp_pingpong/udp_pingpong.c2
-rw-r--r--tools/regression/sockets/unix_cmsg/t_cmsg_len.c2
-rw-r--r--tools/regression/sockets/unix_cmsg/t_cmsgcred.c2
-rw-r--r--tools/regression/sockets/unix_cmsg/t_cmsgcred_sockcred.c2
-rw-r--r--tools/regression/sockets/unix_cmsg/t_generic.c2
-rw-r--r--tools/regression/sockets/unix_cmsg/t_peercred.c2
-rw-r--r--tools/regression/sockets/unix_cmsg/t_sockcred.c2
-rw-r--r--tools/regression/sockets/unix_cmsg/t_xxxtime.c.in2
-rw-r--r--tools/regression/sockets/unix_cmsg/uc_check_time.c2
-rw-r--r--tools/regression/sockets/unix_cmsg/uc_common.c2
-rw-r--r--tools/regression/sockets/unix_cmsg/unix_cmsg.c2
-rw-r--r--tools/regression/sockets/unix_sorflush/unix_sorflush.c2
-rw-r--r--tools/regression/usr.bin/cc/float.c2
-rw-r--r--tools/test/iconv/const-gnuism.c2
-rw-r--r--tools/test/iconv/gnu/gnu.c2
-rw-r--r--tools/test/iconv/posix/posix.c2
-rw-r--r--tools/test/iconv/tablegen/tablegen.c2
-rw-r--r--tools/test/ppsapi/ppsapitest.c2
-rw-r--r--tools/test/pthread_vfork/pthread_vfork_test.c2
-rw-r--r--tools/test/ptrace/scescx.c2
-rw-r--r--tools/test/vm86/vm86_test.c1
-rw-r--r--tools/tools/aac/aac_checkq.c2
-rw-r--r--tools/tools/ath/athalq/ar5210_ds.c2
-rw-r--r--tools/tools/ath/athalq/ar5211_ds.c2
-rw-r--r--tools/tools/ath/athalq/ar5212_ds.c2
-rw-r--r--tools/tools/ath/athalq/ar5416_ds.c2
-rw-r--r--tools/tools/ath/athalq/ar5416_ds_tdma.c2
-rw-r--r--tools/tools/ath/athalq/ar9300_ds.c2
-rw-r--r--tools/tools/ath/athalq/main.c2
-rw-r--r--tools/tools/ath/athalq/tdma.c2
-rw-r--r--tools/tools/bootparttest/bootparttest.c2
-rw-r--r--tools/tools/bootparttest/stub.c2
-rw-r--r--tools/tools/cxgbtool/cxgbtool.c2
-rw-r--r--tools/tools/decioctl/decioctl.c2
-rw-r--r--tools/tools/dmardump/dmardump.c2
-rw-r--r--tools/tools/drm/radeon/mkregtable/mkregtable.c2
-rw-r--r--tools/tools/ether_reflect/ether_reflect.c2
-rw-r--r--tools/tools/fixwhite/fixwhite.c2
-rw-r--r--tools/tools/ifpifa/ifpifa.c3
-rw-r--r--tools/tools/ioat/ioatcontrol.c2
-rw-r--r--tools/tools/ipw/ipwstats.c2
-rw-r--r--tools/tools/iwi/iwistats.c2
-rw-r--r--tools/tools/mcgrab/mcgrab.cc2
-rw-r--r--tools/tools/mctest/mctest.cc2
-rw-r--r--tools/tools/mfi/mfi_checkq.c2
-rw-r--r--tools/tools/ncpus/biosmptable.c2
-rw-r--r--tools/tools/net80211/wlantxtime/wlantxtime.c2
-rw-r--r--tools/tools/pciroms/pciroms.c2
-rw-r--r--tools/tools/pirtool/pirtool.c2
-rw-r--r--tools/tools/switch_tls/switch_tls.c2
-rw-r--r--tools/tools/tscdrift/tscdrift.c2
-rw-r--r--tools/tools/vt/mkkfont/mkkfont.c2
90 files changed, 0 insertions, 183 deletions
diff --git a/tools/build/cross-build/capsicum_stubs.c b/tools/build/cross-build/capsicum_stubs.c
index 227ef3496b09..5c7d0e617adf 100644
--- a/tools/build/cross-build/capsicum_stubs.c
+++ b/tools/build/cross-build/capsicum_stubs.c
@@ -34,8 +34,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
diff --git a/tools/build/cross-build/fake_sysctl.c b/tools/build/cross-build/fake_sysctl.c
index 289fb83652f6..4f1b271f3858 100644
--- a/tools/build/cross-build/fake_sysctl.c
+++ b/tools/build/cross-build/fake_sysctl.c
@@ -35,8 +35,6 @@
*/
/* This file contains wrappers for sysctls used during build/install */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/sysctl.h>
#include <err.h>
diff --git a/tools/build/cross-build/progname.c b/tools/build/cross-build/progname.c
index 645227df48d7..81467627f164 100644
--- a/tools/build/cross-build/progname.c
+++ b/tools/build/cross-build/progname.c
@@ -34,8 +34,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#ifdef __GLIBC__
diff --git a/tools/build/futimens.c b/tools/build/futimens.c
index 7d1cae701e97..d00f94d342ae 100644
--- a/tools/build/futimens.c
+++ b/tools/build/futimens.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <errno.h>
diff --git a/tools/build/utimensat.c b/tools/build/utimensat.c
index 210599303cb6..49c389d13fb1 100644
--- a/tools/build/utimensat.c
+++ b/tools/build/utimensat.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <errno.h>
diff --git a/tools/bus_space/C/lang.c b/tools/bus_space/C/lang.c
index 3ef454466f9d..a96a45f212e2 100644
--- a/tools/bus_space/C/lang.c
+++ b/tools/bus_space/C/lang.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/tools/bus_space/Python/lang.c b/tools/bus_space/Python/lang.c
index 4fe3e6ee3d13..4af26da373bf 100644
--- a/tools/bus_space/Python/lang.c
+++ b/tools/bus_space/Python/lang.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <Python.h>
#include "bus.h"
diff --git a/tools/bus_space/bus.c b/tools/bus_space/bus.c
index 1b0d2ca59c3d..d562f5c04374 100644
--- a/tools/bus_space/bus.c
+++ b/tools/bus_space/bus.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <errno.h>
diff --git a/tools/bus_space/busdma.c b/tools/bus_space/busdma.c
index 04a9da8b2ef4..eec9a1e05ffd 100644
--- a/tools/bus_space/busdma.c
+++ b/tools/bus_space/busdma.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <assert.h>
diff --git a/tools/regression/aio/aiop/aiop.c b/tools/regression/aio/aiop/aiop.c
index 36fe3463d465..e83e9047cb86 100644
--- a/tools/regression/aio/aiop/aiop.c
+++ b/tools/regression/aio/aiop/aiop.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/disk.h>
#include <sys/ioctl.h>
diff --git a/tools/regression/bpf/bpf_filter/bpf_test.c b/tools/regression/bpf/bpf_filter/bpf_test.c
index b62ca774d21d..b3fd88befdb4 100644
--- a/tools/regression/bpf/bpf_filter/bpf_test.c
+++ b/tools/regression/bpf/bpf_filter/bpf_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/tools/regression/capsicum/syscalls/cap_fcntls_limit.c b/tools/regression/capsicum/syscalls/cap_fcntls_limit.c
index e3a05bf66149..55627579963b 100644
--- a/tools/regression/capsicum/syscalls/cap_fcntls_limit.c
+++ b/tools/regression/capsicum/syscalls/cap_fcntls_limit.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/procdesc.h>
diff --git a/tools/regression/capsicum/syscalls/cap_getmode.c b/tools/regression/capsicum/syscalls/cap_getmode.c
index 32037c3c13de..a2584895b179 100644
--- a/tools/regression/capsicum/syscalls/cap_getmode.c
+++ b/tools/regression/capsicum/syscalls/cap_getmode.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/procdesc.h>
diff --git a/tools/regression/capsicum/syscalls/cap_ioctls_limit.c b/tools/regression/capsicum/syscalls/cap_ioctls_limit.c
index 2ed00f175469..b0d392c8f0c0 100644
--- a/tools/regression/capsicum/syscalls/cap_ioctls_limit.c
+++ b/tools/regression/capsicum/syscalls/cap_ioctls_limit.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/ioctl.h>
diff --git a/tools/regression/capsicum/syscalls/misc.c b/tools/regression/capsicum/syscalls/misc.c
index 303a9117910c..914c606ac904 100644
--- a/tools/regression/capsicum/syscalls/misc.c
+++ b/tools/regression/capsicum/syscalls/misc.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/select.h>
#include <sys/socket.h>
diff --git a/tools/regression/environ/envctl.c b/tools/regression/environ/envctl.c
index 586314bc0855..06071f642cc1 100644
--- a/tools/regression/environ/envctl.c
+++ b/tools/regression/environ/envctl.c
@@ -33,9 +33,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-
extern char **environ;
diff --git a/tools/regression/environ/retention.c b/tools/regression/environ/retention.c
index 7f75cd100e15..3edaf8ca1d0a 100644
--- a/tools/regression/environ/retention.c
+++ b/tools/regression/environ/retention.c
@@ -29,9 +29,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-
extern char **environ;
const char *envName = "FOOBAR";
const char *envValSmall = "Hi";
diff --git a/tools/regression/environ/timings.c b/tools/regression/environ/timings.c
index 7999fa156d7e..ac7dfcaa658f 100644
--- a/tools/regression/environ/timings.c
+++ b/tools/regression/environ/timings.c
@@ -34,9 +34,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-
const char value1[] = "Large ------------------ value";
const char value2[] = "Small -- value";
char nameValuePair[] = "less=more";
diff --git a/tools/regression/ethernet/ethermulti/ethermulti.c b/tools/regression/ethernet/ethermulti/ethermulti.c
index 61f0cddb4a10..b278a106b946 100644
--- a/tools/regression/ethernet/ethermulti/ethermulti.c
+++ b/tools/regression/ethernet/ethermulti/ethermulti.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/tools/regression/geom_gpt/gctl_test_helper.c b/tools/regression/geom_gpt/gctl_test_helper.c
index 870266e1e1b3..700ce0aeb169 100644
--- a/tools/regression/geom_gpt/gctl_test_helper.c
+++ b/tools/regression/geom_gpt/gctl_test_helper.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <assert.h>
#include <err.h>
diff --git a/tools/regression/include/stdatomic/logic.c b/tools/regression/include/stdatomic/logic.c
index 96599833afad..e5534851417d 100644
--- a/tools/regression/include/stdatomic/logic.c
+++ b/tools/regression/include/stdatomic/logic.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdatomic.h>
#include <stdint.h>
diff --git a/tools/regression/kthread/kld/kthrdlk.c b/tools/regression/kthread/kld/kthrdlk.c
index 67825b6daf19..8e4ed1a35853 100644
--- a/tools/regression/kthread/kld/kthrdlk.c
+++ b/tools/regression/kthread/kld/kthrdlk.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
diff --git a/tools/regression/netinet/ipbroadcast/ipbroadcast.c b/tools/regression/netinet/ipbroadcast/ipbroadcast.c
index 8d6f2479aabf..43957e9fd108 100644
--- a/tools/regression/netinet/ipbroadcast/ipbroadcast.c
+++ b/tools/regression/netinet/ipbroadcast/ipbroadcast.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/tools/regression/netinet/ipmulticast/ipmulticast.c b/tools/regression/netinet/ipmulticast/ipmulticast.c
index af67fcfb150a..7bd97dfc002a 100644
--- a/tools/regression/netinet/ipmulticast/ipmulticast.c
+++ b/tools/regression/netinet/ipmulticast/ipmulticast.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c b/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c
index 5ac1d9768565..c3de967cc5b5 100644
--- a/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c
+++ b/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/tools/regression/netinet6/inet6_rth/test_subr.c b/tools/regression/netinet6/inet6_rth/test_subr.c
index ab09ec803851..2beedd837027 100644
--- a/tools/regression/netinet6/inet6_rth/test_subr.c
+++ b/tools/regression/netinet6/inet6_rth/test_subr.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/tools/regression/posixsem/posixsem.c b/tools/regression/posixsem/posixsem.c
index 9d0465682951..d03a64c04b9b 100644
--- a/tools/regression/posixsem/posixsem.c
+++ b/tools/regression/posixsem/posixsem.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/_semaphore.h>
diff --git a/tools/regression/posixsem/test.c b/tools/regression/posixsem/test.c
index bd309733c568..3d8fd0532baa 100644
--- a/tools/regression/posixsem/test.c
+++ b/tools/regression/posixsem/test.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdarg.h>
#include <stdio.h>
diff --git a/tools/regression/redzone9/redzone.c b/tools/regression/redzone9/redzone.c
index 101373892188..d4d5c3e3e785 100644
--- a/tools/regression/redzone9/redzone.c
+++ b/tools/regression/redzone9/redzone.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/tools/regression/security/cap_test/cap_test.c b/tools/regression/security/cap_test/cap_test.c
index 0ea8a9d234fa..3544bf690214 100644
--- a/tools/regression/security/cap_test/cap_test.c
+++ b/tools/regression/security/cap_test/cap_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/wait.h>
#include <err.h>
diff --git a/tools/regression/security/cap_test/cap_test_capabilities.c b/tools/regression/security/cap_test/cap_test_capabilities.c
index 1ffac9a519cf..9fa60a2f8dd2 100644
--- a/tools/regression/security/cap_test/cap_test_capabilities.c
+++ b/tools/regression/security/cap_test/cap_test_capabilities.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/errno.h>
diff --git a/tools/regression/security/cap_test/cap_test_capmode.c b/tools/regression/security/cap_test/cap_test_capmode.c
index 5aca66789977..81dce2e758e2 100644
--- a/tools/regression/security/cap_test/cap_test_capmode.c
+++ b/tools/regression/security/cap_test/cap_test_capmode.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/errno.h>
diff --git a/tools/regression/security/cap_test/cap_test_fcntl.c b/tools/regression/security/cap_test/cap_test_fcntl.c
index 626abe7a95b6..b08bc3f88288 100644
--- a/tools/regression/security/cap_test/cap_test_fcntl.c
+++ b/tools/regression/security/cap_test/cap_test_fcntl.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/errno.h>
diff --git a/tools/regression/security/cap_test/cap_test_pdfork.c b/tools/regression/security/cap_test/cap_test_pdfork.c
index b9525613e631..791c83855647 100644
--- a/tools/regression/security/cap_test/cap_test_pdfork.c
+++ b/tools/regression/security/cap_test/cap_test_pdfork.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsium.h>
diff --git a/tools/regression/security/cap_test/cap_test_pdkill.c b/tools/regression/security/cap_test/cap_test_pdkill.c
index e4bd4b4d7279..be4cae793d5b 100644
--- a/tools/regression/security/cap_test/cap_test_pdkill.c
+++ b/tools/regression/security/cap_test/cap_test_pdkill.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
diff --git a/tools/regression/security/cap_test/cap_test_relative.c b/tools/regression/security/cap_test/cap_test_relative.c
index 2b123f6406e3..517ff0bf5733 100644
--- a/tools/regression/security/cap_test/cap_test_relative.c
+++ b/tools/regression/security/cap_test/cap_test_relative.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/errno.h>
diff --git a/tools/regression/security/cap_test/cap_test_sysctl.c b/tools/regression/security/cap_test/cap_test_sysctl.c
index 423abfdbbc15..04982c1e9fc0 100644
--- a/tools/regression/security/cap_test/cap_test_sysctl.c
+++ b/tools/regression/security/cap_test/cap_test_sysctl.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/errno.h>
diff --git a/tools/regression/security/open_to_operation/open_to_operation.c b/tools/regression/security/open_to_operation/open_to_operation.c
index c8c816becab9..444c574aa078 100644
--- a/tools/regression/security/open_to_operation/open_to_operation.c
+++ b/tools/regression/security/open_to_operation/open_to_operation.c
@@ -90,8 +90,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/mount.h>
diff --git a/tools/regression/sockets/udp_pingpong/udp_pingpong.c b/tools/regression/sockets/udp_pingpong/udp_pingpong.c
index fc585d275db4..9babe144adcb 100644
--- a/tools/regression/sockets/udp_pingpong/udp_pingpong.c
+++ b/tools/regression/sockets/udp_pingpong/udp_pingpong.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h>
diff --git a/tools/regression/sockets/unix_cmsg/t_cmsg_len.c b/tools/regression/sockets/unix_cmsg/t_cmsg_len.c
index 3a88cebf1645..c0064f15fd2e 100644
--- a/tools/regression/sockets/unix_cmsg/t_cmsg_len.c
+++ b/tools/regression/sockets/unix_cmsg/t_cmsg_len.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/tools/regression/sockets/unix_cmsg/t_cmsgcred.c b/tools/regression/sockets/unix_cmsg/t_cmsgcred.c
index 3e3653c15179..de87f1d62b2a 100644
--- a/tools/regression/sockets/unix_cmsg/t_cmsgcred.c
+++ b/tools/regression/sockets/unix_cmsg/t_cmsgcred.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/tools/regression/sockets/unix_cmsg/t_cmsgcred_sockcred.c b/tools/regression/sockets/unix_cmsg/t_cmsgcred_sockcred.c
index 72110b32af64..323458f9748e 100644
--- a/tools/regression/sockets/unix_cmsg/t_cmsgcred_sockcred.c
+++ b/tools/regression/sockets/unix_cmsg/t_cmsgcred_sockcred.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/tools/regression/sockets/unix_cmsg/t_generic.c b/tools/regression/sockets/unix_cmsg/t_generic.c
index 02a65255011d..7add752433d8 100644
--- a/tools/regression/sockets/unix_cmsg/t_generic.c
+++ b/tools/regression/sockets/unix_cmsg/t_generic.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/tools/regression/sockets/unix_cmsg/t_peercred.c b/tools/regression/sockets/unix_cmsg/t_peercred.c
index 9b6e14868fcb..f10ee2833df4 100644
--- a/tools/regression/sockets/unix_cmsg/t_peercred.c
+++ b/tools/regression/sockets/unix_cmsg/t_peercred.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ucred.h>
diff --git a/tools/regression/sockets/unix_cmsg/t_sockcred.c b/tools/regression/sockets/unix_cmsg/t_sockcred.c
index 45ac5bfe823c..d6156dc74c39 100644
--- a/tools/regression/sockets/unix_cmsg/t_sockcred.c
+++ b/tools/regression/sockets/unix_cmsg/t_sockcred.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/tools/regression/sockets/unix_cmsg/t_xxxtime.c.in b/tools/regression/sockets/unix_cmsg/t_xxxtime.c.in
index 8bed032a5e23..332bab621fbf 100644
--- a/tools/regression/sockets/unix_cmsg/t_xxxtime.c.in
+++ b/tools/regression/sockets/unix_cmsg/t_xxxtime.c.in
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/tools/regression/sockets/unix_cmsg/uc_check_time.c b/tools/regression/sockets/unix_cmsg/uc_check_time.c
index 682cd442077d..abc20e84ade9 100644
--- a/tools/regression/sockets/unix_cmsg/uc_check_time.c
+++ b/tools/regression/sockets/unix_cmsg/uc_check_time.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <time.h>
diff --git a/tools/regression/sockets/unix_cmsg/uc_common.c b/tools/regression/sockets/unix_cmsg/uc_common.c
index 0799df2e0d73..bcb18a808d99 100644
--- a/tools/regression/sockets/unix_cmsg/uc_common.c
+++ b/tools/regression/sockets/unix_cmsg/uc_common.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/socket.h>
#include <sys/un.h>
#include <err.h>
diff --git a/tools/regression/sockets/unix_cmsg/unix_cmsg.c b/tools/regression/sockets/unix_cmsg/unix_cmsg.c
index 1d1dfbfc4b07..45a2fd021791 100644
--- a/tools/regression/sockets/unix_cmsg/unix_cmsg.c
+++ b/tools/regression/sockets/unix_cmsg/unix_cmsg.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/limits.h>
#include <sys/socket.h>
diff --git a/tools/regression/sockets/unix_sorflush/unix_sorflush.c b/tools/regression/sockets/unix_sorflush/unix_sorflush.c
index e0deb00a389d..082db5a02d17 100644
--- a/tools/regression/sockets/unix_sorflush/unix_sorflush.c
+++ b/tools/regression/sockets/unix_sorflush/unix_sorflush.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/socket.h>
#include <err.h>
diff --git a/tools/regression/usr.bin/cc/float.c b/tools/regression/usr.bin/cc/float.c
index 9bdd7d959c16..e08e0f5a6174 100644
--- a/tools/regression/usr.bin/cc/float.c
+++ b/tools/regression/usr.bin/cc/float.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <float.h>
#include <math.h>
diff --git a/tools/test/iconv/const-gnuism.c b/tools/test/iconv/const-gnuism.c
index fdf130fc215a..e30a23cc68ac 100644
--- a/tools/test/iconv/const-gnuism.c
+++ b/tools/test/iconv/const-gnuism.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/tools/test/iconv/gnu/gnu.c b/tools/test/iconv/gnu/gnu.c
index 47e83ec3ae3d..975c9d210965 100644
--- a/tools/test/iconv/gnu/gnu.c
+++ b/tools/test/iconv/gnu/gnu.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/types.h>
diff --git a/tools/test/iconv/posix/posix.c b/tools/test/iconv/posix/posix.c
index a95e8863fa30..11262f618bd0 100644
--- a/tools/test/iconv/posix/posix.c
+++ b/tools/test/iconv/posix/posix.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/tools/test/iconv/tablegen/tablegen.c b/tools/test/iconv/tablegen/tablegen.c
index ee8cecad70d8..6cb7ff1a4095 100644
--- a/tools/test/iconv/tablegen/tablegen.c
+++ b/tools/test/iconv/tablegen/tablegen.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/types.h>
diff --git a/tools/test/ppsapi/ppsapitest.c b/tools/test/ppsapi/ppsapitest.c
index ef655e96d6df..598411d7af6a 100644
--- a/tools/test/ppsapi/ppsapitest.c
+++ b/tools/test/ppsapi/ppsapitest.c
@@ -6,8 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/tools/test/pthread_vfork/pthread_vfork_test.c b/tools/test/pthread_vfork/pthread_vfork_test.c
index 925c86255738..1f65f70a1c3c 100644
--- a/tools/test/pthread_vfork/pthread_vfork_test.c
+++ b/tools/test/pthread_vfork/pthread_vfork_test.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
#include <err.h>
diff --git a/tools/test/ptrace/scescx.c b/tools/test/ptrace/scescx.c
index 8f19f9a55889..fc6aed86da4b 100644
--- a/tools/test/ptrace/scescx.c
+++ b/tools/test/ptrace/scescx.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/syscall.h>
diff --git a/tools/test/vm86/vm86_test.c b/tools/test/vm86/vm86_test.c
index 4c980b073c85..1057fc5c83d6 100644
--- a/tools/test/vm86/vm86_test.c
+++ b/tools/test/vm86/vm86_test.c
@@ -30,7 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
/* $Id: vm86_test.c,v 1.10 2018/05/12 11:35:58 kostik Exp kostik $ */
#include <sys/param.h>
diff --git a/tools/tools/aac/aac_checkq.c b/tools/tools/aac/aac_checkq.c
index 62eedb20aa51..220d2eb7b793 100644
--- a/tools/tools/aac/aac_checkq.c
+++ b/tools/tools/aac/aac_checkq.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/fcntl.h>
#include <sys/ioctl.h>
diff --git a/tools/tools/ath/athalq/ar5210_ds.c b/tools/tools/ath/athalq/ar5210_ds.c
index 624092ec45e3..5db5dcaf9bcf 100644
--- a/tools/tools/ath/athalq/ar5210_ds.c
+++ b/tools/tools/ath/athalq/ar5210_ds.c
@@ -16,8 +16,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/tools/tools/ath/athalq/ar5211_ds.c b/tools/tools/ath/athalq/ar5211_ds.c
index d389b5a55ca8..844da8f1cf8b 100644
--- a/tools/tools/ath/athalq/ar5211_ds.c
+++ b/tools/tools/ath/athalq/ar5211_ds.c
@@ -16,8 +16,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/tools/tools/ath/athalq/ar5212_ds.c b/tools/tools/ath/athalq/ar5212_ds.c
index f752f151d416..b8eb978a2d0e 100644
--- a/tools/tools/ath/athalq/ar5212_ds.c
+++ b/tools/tools/ath/athalq/ar5212_ds.c
@@ -16,8 +16,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/tools/tools/ath/athalq/ar5416_ds.c b/tools/tools/ath/athalq/ar5416_ds.c
index c7d1bb42ec59..bb1d7e9e56d7 100644
--- a/tools/tools/ath/athalq/ar5416_ds.c
+++ b/tools/tools/ath/athalq/ar5416_ds.c
@@ -16,8 +16,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/tools/tools/ath/athalq/ar5416_ds_tdma.c b/tools/tools/ath/athalq/ar5416_ds_tdma.c
index 42a61cb58642..febea0f8ef3d 100644
--- a/tools/tools/ath/athalq/ar5416_ds_tdma.c
+++ b/tools/tools/ath/athalq/ar5416_ds_tdma.c
@@ -16,8 +16,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/tools/tools/ath/athalq/ar9300_ds.c b/tools/tools/ath/athalq/ar9300_ds.c
index 541ee39eaf7c..18a077e8594e 100644
--- a/tools/tools/ath/athalq/ar9300_ds.c
+++ b/tools/tools/ath/athalq/ar9300_ds.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/tools/tools/ath/athalq/main.c b/tools/tools/ath/athalq/main.c
index c8c2c335f561..5319942e0026 100644
--- a/tools/tools/ath/athalq/main.c
+++ b/tools/tools/ath/athalq/main.c
@@ -15,8 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/tools/tools/ath/athalq/tdma.c b/tools/tools/ath/athalq/tdma.c
index 55772de33f9d..8f18fa1b0628 100644
--- a/tools/tools/ath/athalq/tdma.c
+++ b/tools/tools/ath/athalq/tdma.c
@@ -16,8 +16,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/tools/tools/bootparttest/bootparttest.c b/tools/tools/bootparttest/bootparttest.c
index 82e991c6776e..af784027f95e 100644
--- a/tools/tools/bootparttest/bootparttest.c
+++ b/tools/tools/bootparttest/bootparttest.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/tools/tools/bootparttest/stub.c b/tools/tools/bootparttest/stub.c
index 88e31d48ae51..660b1d39c9b3 100644
--- a/tools/tools/bootparttest/stub.c
+++ b/tools/tools/bootparttest/stub.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <stdio.h>
diff --git a/tools/tools/cxgbtool/cxgbtool.c b/tools/tools/cxgbtool/cxgbtool.c
index a78c7931eebd..b871d67700f3 100644
--- a/tools/tools/cxgbtool/cxgbtool.c
+++ b/tools/tools/cxgbtool/cxgbtool.c
@@ -33,8 +33,6 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
diff --git a/tools/tools/decioctl/decioctl.c b/tools/tools/decioctl/decioctl.c
index f9af0f5a3a92..2be99e9f9f4e 100644
--- a/tools/tools/decioctl/decioctl.c
+++ b/tools/tools/decioctl/decioctl.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioccom.h>
#include <ctype.h>
#include <errno.h>
diff --git a/tools/tools/dmardump/dmardump.c b/tools/tools/dmardump/dmardump.c
index 43a2779dd6b8..08b2570ba6e5 100644
--- a/tools/tools/dmardump/dmardump.c
+++ b/tools/tools/dmardump/dmardump.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/pciio.h>
diff --git a/tools/tools/drm/radeon/mkregtable/mkregtable.c b/tools/tools/drm/radeon/mkregtable/mkregtable.c
index 51b8f909cd2a..e0b94561f5cd 100644
--- a/tools/tools/drm/radeon/mkregtable/mkregtable.c
+++ b/tools/tools/drm/radeon/mkregtable/mkregtable.c
@@ -10,8 +10,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
diff --git a/tools/tools/ether_reflect/ether_reflect.c b/tools/tools/ether_reflect/ether_reflect.c
index bb6d865ec2d2..ade6ea132a6a 100644
--- a/tools/tools/ether_reflect/ether_reflect.c
+++ b/tools/tools/ether_reflect/ether_reflect.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <unistd.h>
#include <stdlib.h>
#include <strings.h>
diff --git a/tools/tools/fixwhite/fixwhite.c b/tools/tools/fixwhite/fixwhite.c
index 2b1763060e06..4cfe49e4ed35 100644
--- a/tools/tools/fixwhite/fixwhite.c
+++ b/tools/tools/fixwhite/fixwhite.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/tools/tools/ifpifa/ifpifa.c b/tools/tools/ifpifa/ifpifa.c
index 3f2a8190fdef..493be768f048 100644
--- a/tools/tools/ifpifa/ifpifa.c
+++ b/tools/tools/ifpifa/ifpifa.c
@@ -52,9 +52,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-
-__FBSDID("$FreeBSD$");
-
static struct nlist nl[] = {
#define N_IFNET 0
{ .n_name = "_ifnet", },
diff --git a/tools/tools/ioat/ioatcontrol.c b/tools/tools/ioat/ioatcontrol.c
index f76af5b0e766..4c4358539420 100644
--- a/tools/tools/ioat/ioatcontrol.c
+++ b/tools/tools/ioat/ioatcontrol.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/queue.h>
diff --git a/tools/tools/ipw/ipwstats.c b/tools/tools/ipw/ipwstats.c
index fe8c5a83ab1a..1da6efeeaea5 100644
--- a/tools/tools/ipw/ipwstats.c
+++ b/tools/tools/ipw/ipwstats.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/tools/tools/iwi/iwistats.c b/tools/tools/iwi/iwistats.c
index 31ccf13e8d46..16044f1a7ba7 100644
--- a/tools/tools/iwi/iwistats.c
+++ b/tools/tools/iwi/iwistats.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/tools/tools/mcgrab/mcgrab.cc b/tools/tools/mcgrab/mcgrab.cc
index 35687b8d42ce..4b34103869ab 100644
--- a/tools/tools/mcgrab/mcgrab.cc
+++ b/tools/tools/mcgrab/mcgrab.cc
@@ -30,8 +30,6 @@
//
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
// C++ STL and other related includes
#include <stdlib.h>
#include <limits.h>
diff --git a/tools/tools/mctest/mctest.cc b/tools/tools/mctest/mctest.cc
index 6d723ba137f2..b6fdf62ed7bf 100644
--- a/tools/tools/mctest/mctest.cc
+++ b/tools/tools/mctest/mctest.cc
@@ -33,8 +33,6 @@
//
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
// C++ STL and other related includes
#include <iostream>
#include <string>
diff --git a/tools/tools/mfi/mfi_checkq.c b/tools/tools/mfi/mfi_checkq.c
index 9f860ad92d22..ca3fc0c7fa8c 100644
--- a/tools/tools/mfi/mfi_checkq.c
+++ b/tools/tools/mfi/mfi_checkq.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/fcntl.h>
#include <sys/ioctl.h>
diff --git a/tools/tools/ncpus/biosmptable.c b/tools/tools/ncpus/biosmptable.c
index ee39e3669775..0289409939be 100644
--- a/tools/tools/ncpus/biosmptable.c
+++ b/tools/tools/ncpus/biosmptable.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <x86/mptable.h>
diff --git a/tools/tools/net80211/wlantxtime/wlantxtime.c b/tools/tools/net80211/wlantxtime/wlantxtime.c
index 90c5c8f60769..edcb4403cf88 100644
--- a/tools/tools/net80211/wlantxtime/wlantxtime.c
+++ b/tools/tools/net80211/wlantxtime/wlantxtime.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* IEEE 802.11 PHY-related support.
*/
diff --git a/tools/tools/pciroms/pciroms.c b/tools/tools/pciroms/pciroms.c
index 9919c2087961..0e5e3236c96f 100644
--- a/tools/tools/pciroms/pciroms.c
+++ b/tools/tools/pciroms/pciroms.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/pciio.h>
diff --git a/tools/tools/pirtool/pirtool.c b/tools/tools/pirtool/pirtool.c
index 3484eb5663cc..024810109a72 100644
--- a/tools/tools/pirtool/pirtool.c
+++ b/tools/tools/pirtool/pirtool.c
@@ -30,8 +30,6 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
diff --git a/tools/tools/switch_tls/switch_tls.c b/tools/tools/switch_tls/switch_tls.c
index 788926bfb92a..5adcd49cb6a7 100644
--- a/tools/tools/switch_tls/switch_tls.c
+++ b/tools/tools/switch_tls/switch_tls.c
@@ -18,8 +18,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/tools/tools/tscdrift/tscdrift.c b/tools/tools/tscdrift/tscdrift.c
index 13e754ef6776..7d8940e9f3a1 100644
--- a/tools/tools/tscdrift/tscdrift.c
+++ b/tools/tools/tscdrift/tscdrift.c
@@ -27,8 +27,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <machine/atomic.h>
diff --git a/tools/tools/vt/mkkfont/mkkfont.c b/tools/tools/vt/mkkfont/mkkfont.c
index ebfead14e342..3f92f926c029 100644
--- a/tools/tools/vt/mkkfont/mkkfont.c
+++ b/tools/tools/vt/mkkfont/mkkfont.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/param.h>
#include <sys/font.h>