aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/cat/cat.c2
-rw-r--r--bin/chflags/chflags.c2
-rw-r--r--bin/chio/chio.c2
-rw-r--r--bin/chmod/chmod.c2
-rw-r--r--bin/cp/cp.c2
-rw-r--r--bin/cp/utils.c2
-rw-r--r--bin/cpuset/cpuset.c2
-rw-r--r--bin/date/date.c2
-rw-r--r--bin/date/vary.c2
-rw-r--r--bin/dd/args.c2
-rw-r--r--bin/dd/conv.c2
-rw-r--r--bin/dd/conv_tab.c2
-rw-r--r--bin/dd/dd.c2
-rw-r--r--bin/dd/misc.c2
-rw-r--r--bin/dd/position.c2
-rw-r--r--bin/df/df.c2
-rw-r--r--bin/domainname/domainname.c2
-rw-r--r--bin/echo/echo.c2
-rw-r--r--bin/ed/buf.c2
-rw-r--r--bin/ed/glbl.c2
-rw-r--r--bin/ed/io.c2
-rw-r--r--bin/ed/main.c2
-rw-r--r--bin/ed/re.c2
-rw-r--r--bin/ed/sub.c2
-rw-r--r--bin/ed/undo.c2
-rw-r--r--bin/getfacl/getfacl.c2
-rw-r--r--bin/hostname/hostname.c2
-rw-r--r--bin/kenv/kenv.c2
-rw-r--r--bin/kill/kill.c2
-rw-r--r--bin/ln/ln.c2
-rw-r--r--bin/ls/cmp.c3
-rw-r--r--bin/ls/ls.c2
-rw-r--r--bin/ls/print.c2
-rw-r--r--bin/ls/util.c2
-rw-r--r--bin/mkdir/mkdir.c2
-rw-r--r--bin/mv/mv.c2
-rw-r--r--bin/pax/ar_io.c2
-rw-r--r--bin/pax/ar_subs.c2
-rw-r--r--bin/pax/buf_subs.c2
-rw-r--r--bin/pax/cache.c2
-rw-r--r--bin/pax/cpio.c2
-rw-r--r--bin/pax/file_subs.c2
-rw-r--r--bin/pax/ftree.c2
-rw-r--r--bin/pax/gen_subs.c2
-rw-r--r--bin/pax/getoldopt.c2
-rw-r--r--bin/pax/options.c2
-rw-r--r--bin/pax/pat_rep.c2
-rw-r--r--bin/pax/pax.c2
-rw-r--r--bin/pax/sel_subs.c2
-rw-r--r--bin/pax/tables.c2
-rw-r--r--bin/pax/tar.c2
-rw-r--r--bin/pax/tty_subs.c2
-rw-r--r--bin/pkill/pkill.c2
-rw-r--r--bin/ps/fmt.c2
-rw-r--r--bin/ps/keyword.c2
-rw-r--r--bin/ps/nlist.c2
-rw-r--r--bin/ps/print.c2
-rw-r--r--bin/ps/ps.c2
-rw-r--r--bin/pwait/pwait.c2
-rw-r--r--bin/pwd/pwd.c2
-rw-r--r--bin/realpath/realpath.c2
-rw-r--r--bin/rm/rm.c2
-rw-r--r--bin/rmdir/rmdir.c2
-rw-r--r--bin/setfacl/file.c2
-rw-r--r--bin/setfacl/mask.c2
-rw-r--r--bin/setfacl/merge.c2
-rw-r--r--bin/setfacl/remove.c2
-rw-r--r--bin/setfacl/setfacl.c2
-rw-r--r--bin/setfacl/util.c2
-rw-r--r--bin/sh/alias.c2
-rw-r--r--bin/sh/arith_yacc.c2
-rw-r--r--bin/sh/arith_yylex.c2
-rw-r--r--bin/sh/bltin/echo.c2
-rw-r--r--bin/sh/cd.c2
-rw-r--r--bin/sh/error.c2
-rw-r--r--bin/sh/eval.c2
-rw-r--r--bin/sh/exec.c2
-rw-r--r--bin/sh/expand.c2
-rw-r--r--bin/sh/histedit.c2
-rw-r--r--bin/sh/input.c2
-rw-r--r--bin/sh/jobs.c2
-rw-r--r--bin/sh/mail.c2
-rw-r--r--bin/sh/main.c2
-rw-r--r--bin/sh/memalloc.c2
-rw-r--r--bin/sh/miscbltin.c2
-rw-r--r--bin/sh/mknodes.c2
-rw-r--r--bin/sh/mksyntax.c2
-rw-r--r--bin/sh/mystring.c2
-rw-r--r--bin/sh/options.c2
-rw-r--r--bin/sh/output.c2
-rw-r--r--bin/sh/parser.c2
-rw-r--r--bin/sh/redir.c2
-rw-r--r--bin/sh/show.c2
-rw-r--r--bin/sh/trap.c2
-rw-r--r--bin/sh/var.c2
-rw-r--r--bin/sleep/sleep.c2
-rw-r--r--bin/stty/cchar.c2
-rw-r--r--bin/stty/gfmt.c2
-rw-r--r--bin/stty/key.c2
-rw-r--r--bin/stty/modes.c2
-rw-r--r--bin/stty/print.c2
-rw-r--r--bin/stty/stty.c2
-rw-r--r--bin/stty/util.c2
-rw-r--r--bin/sync/sync.c2
-rw-r--r--bin/test/test.c2
-rw-r--r--bin/timeout/timeout.c2
-rw-r--r--bin/uuidgen/uuidgen.c2
-rw-r--r--cddl/usr.sbin/zfsd/case_file.cc3
-rw-r--r--cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc3
-rw-r--r--cddl/usr.sbin/zfsd/vdev.cc2
-rw-r--r--cddl/usr.sbin/zfsd/zfsd.cc3
-rw-r--r--cddl/usr.sbin/zfsd/zfsd_event.cc2
-rw-r--r--cddl/usr.sbin/zfsd/zfsd_exception.cc2
-rw-r--r--cddl/usr.sbin/zfsd/zfsd_main.cc3
-rw-r--r--lib/csu/aarch64/crt1_c.c2
-rw-r--r--lib/csu/aarch64/crt1_s.S2
-rw-r--r--lib/csu/aarch64/crti.S2
-rw-r--r--lib/csu/aarch64/crtn.S2
-rw-r--r--lib/csu/amd64/crt1_c.c2
-rw-r--r--lib/csu/amd64/crti.S2
-rw-r--r--lib/csu/amd64/crtn.S2
-rw-r--r--lib/csu/arm/crt1_c.c2
-rw-r--r--lib/csu/arm/crt1_s.S2
-rw-r--r--lib/csu/arm/crti.S2
-rw-r--r--lib/csu/arm/crtn.S2
-rw-r--r--lib/csu/common/crtbegin.c2
-rw-r--r--lib/csu/common/crtbrand.S2
-rw-r--r--lib/csu/common/crtend.c2
-rw-r--r--lib/csu/common/feature_note.S2
-rw-r--r--lib/csu/common/ignore_init_note.S2
-rw-r--r--lib/csu/i386/crt1_c.c2
-rw-r--r--lib/csu/i386/crt1_s.S2
-rw-r--r--lib/csu/i386/crti.S2
-rw-r--r--lib/csu/i386/crtn.S2
-rw-r--r--lib/csu/powerpc/crt1_c.c2
-rw-r--r--lib/csu/powerpc/crti.S2
-rw-r--r--lib/csu/powerpc/crtn.S2
-rw-r--r--lib/csu/powerpc/crtsavres.S2
-rw-r--r--lib/csu/powerpc64/crt1_c.c2
-rw-r--r--lib/csu/powerpc64/crti.S2
-rw-r--r--lib/csu/powerpc64/crtn.S2
-rw-r--r--lib/csu/riscv/crt1_c.c2
-rw-r--r--lib/csu/riscv/crt1_s.S2
-rw-r--r--lib/csu/riscv/crti.S2
-rw-r--r--lib/csu/riscv/crtn.S2
-rw-r--r--lib/csu/tests/cxx_constructors.cc2
-rw-r--r--lib/csu/tests/fini_test.c2
-rw-r--r--lib/csu/tests/init_test.c2
-rw-r--r--lib/flua/libjail/lua_jail.c2
-rw-r--r--lib/geom/cache/geom_cache.c2
-rw-r--r--lib/geom/concat/geom_concat.c2
-rw-r--r--lib/geom/eli/geom_eli.c2
-rw-r--r--lib/geom/journal/geom_journal.c2
-rw-r--r--lib/geom/journal/geom_journal_ufs.c2
-rw-r--r--lib/geom/label/geom_label.c2
-rw-r--r--lib/geom/mirror/geom_mirror.c2
-rw-r--r--lib/geom/mountver/geom_mountver.c2
-rw-r--r--lib/geom/multipath/geom_multipath.c1
-rw-r--r--lib/geom/nop/geom_nop.c2
-rw-r--r--lib/geom/part/geom_part.c2
-rw-r--r--lib/geom/raid/geom_raid.c2
-rw-r--r--lib/geom/raid3/geom_raid3.c2
-rw-r--r--lib/geom/shsec/geom_shsec.c2
-rw-r--r--lib/geom/stripe/geom_stripe.c2
-rw-r--r--lib/geom/virstor/geom_virstor.c2
-rw-r--r--lib/libbe/be.c2
-rw-r--r--lib/libbe/be_access.c2
-rw-r--r--lib/libbe/be_error.c2
-rw-r--r--lib/libbe/be_info.c2
-rw-r--r--lib/libbe/tests/target_prog.c2
-rw-r--r--lib/libc/aarch64/gen/_ctx_start.S2
-rw-r--r--lib/libc/aarch64/gen/_setjmp.S2
-rw-r--r--lib/libc/aarch64/gen/fabs.S2
-rw-r--r--lib/libc/aarch64/gen/flt_rounds.c2
-rw-r--r--lib/libc/aarch64/gen/fpgetmask.c2
-rw-r--r--lib/libc/aarch64/gen/fpsetmask.c2
-rw-r--r--lib/libc/aarch64/gen/infinity.c2
-rw-r--r--lib/libc/aarch64/gen/makecontext.c2
-rw-r--r--lib/libc/aarch64/gen/setjmp.S2
-rw-r--r--lib/libc/aarch64/gen/sigsetjmp.S2
-rw-r--r--lib/libc/aarch64/sys/__vdso_gettc.c2
-rw-r--r--lib/libc/aarch64/sys/cerror.S2
-rw-r--r--lib/libc/aarch64/sys/syscall.S2
-rw-r--r--lib/libc/aarch64/sys/vfork.S1
-rw-r--r--lib/libc/amd64/gen/_setjmp.S2
-rw-r--r--lib/libc/amd64/gen/fabs.S2
-rw-r--r--lib/libc/amd64/gen/flt_rounds.c2
-rw-r--r--lib/libc/amd64/gen/infinity.c2
-rw-r--r--lib/libc/amd64/gen/makecontext.c2
-rw-r--r--lib/libc/amd64/gen/rfork_thread.S2
-rw-r--r--lib/libc/amd64/gen/setjmp.S2
-rw-r--r--lib/libc/amd64/gen/signalcontext.c2
-rw-r--r--lib/libc/amd64/gen/sigsetjmp.S2
-rw-r--r--lib/libc/amd64/stdlib/div.S2
-rw-r--r--lib/libc/amd64/stdlib/ldiv.S2
-rw-r--r--lib/libc/amd64/stdlib/lldiv.S2
-rw-r--r--lib/libc/amd64/string/bcopy.c2
-rw-r--r--lib/libc/amd64/string/bzero.c2
-rw-r--r--lib/libc/amd64/string/memcmp.S2
-rw-r--r--lib/libc/amd64/string/memmove.S2
-rw-r--r--lib/libc/amd64/string/memset.S2
-rw-r--r--lib/libc/amd64/string/stpcpy.S2
-rw-r--r--lib/libc/amd64/string/strcat.S2
-rw-r--r--lib/libc/amd64/string/strcmp.S2
-rw-r--r--lib/libc/amd64/string/strcpy.c2
-rw-r--r--lib/libc/amd64/string/strlen.S2
-rw-r--r--lib/libc/amd64/sys/amd64_get_fsbase.c2
-rw-r--r--lib/libc/amd64/sys/amd64_get_gsbase.c2
-rw-r--r--lib/libc/amd64/sys/amd64_set_fsbase.c2
-rw-r--r--lib/libc/amd64/sys/amd64_set_gsbase.c2
-rw-r--r--lib/libc/amd64/sys/cerror.S2
-rw-r--r--lib/libc/amd64/sys/getcontext.S2
-rw-r--r--lib/libc/amd64/sys/vfork.S2
-rw-r--r--lib/libc/arm/aeabi/aeabi_asm_double.S2
-rw-r--r--lib/libc/arm/aeabi/aeabi_asm_float.S2
-rw-r--r--lib/libc/arm/aeabi/aeabi_atexit.c2
-rw-r--r--lib/libc/arm/aeabi/aeabi_double.c2
-rw-r--r--lib/libc/arm/aeabi/aeabi_float.c2
-rw-r--r--lib/libc/arm/aeabi/aeabi_int_div.S2
-rw-r--r--lib/libc/arm/aeabi/aeabi_unwind_cpp.c2
-rw-r--r--lib/libc/arm/aeabi/aeabi_unwind_exidx.c2
-rw-r--r--lib/libc/arm/aeabi/aeabi_vfp_double.S2
-rw-r--r--lib/libc/arm/aeabi/aeabi_vfp_float.S2
-rw-r--r--lib/libc/arm/gen/__aeabi_read_tp.S2
-rw-r--r--lib/libc/arm/gen/_setjmp.S3
-rw-r--r--lib/libc/arm/gen/alloca.S2
-rw-r--r--lib/libc/arm/gen/arm_drain_writebuf.c2
-rw-r--r--lib/libc/arm/gen/arm_initfini.c2
-rw-r--r--lib/libc/arm/gen/arm_sync_icache.c2
-rw-r--r--lib/libc/arm/gen/divsi3.S2
-rw-r--r--lib/libc/arm/gen/fabs.c2
-rw-r--r--lib/libc/arm/gen/flt_rounds.c2
-rw-r--r--lib/libc/arm/gen/fpgetmask_vfp.c2
-rw-r--r--lib/libc/arm/gen/fpgetround_vfp.c2
-rw-r--r--lib/libc/arm/gen/fpgetsticky_vfp.c2
-rw-r--r--lib/libc/arm/gen/fpsetmask_vfp.c2
-rw-r--r--lib/libc/arm/gen/fpsetround_vfp.c2
-rw-r--r--lib/libc/arm/gen/fpsetsticky_vfp.c2
-rw-r--r--lib/libc/arm/gen/getcontextx.c2
-rw-r--r--lib/libc/arm/gen/infinity.c2
-rw-r--r--lib/libc/arm/gen/makecontext.c2
-rw-r--r--lib/libc/arm/gen/setjmp.S3
-rw-r--r--lib/libc/arm/gen/signalcontext.c2
-rw-r--r--lib/libc/arm/gen/sigsetjmp.S2
-rw-r--r--lib/libc/arm/string/bcopy.S1
-rw-r--r--lib/libc/arm/string/bzero.S3
-rw-r--r--lib/libc/arm/string/memcmp.S3
-rw-r--r--lib/libc/arm/string/memcpy.S2
-rw-r--r--lib/libc/arm/string/memmove.S2
-rw-r--r--lib/libc/arm/string/memset.S2
-rw-r--r--lib/libc/arm/string/strcmp.S3
-rw-r--r--lib/libc/arm/string/strlen.S2
-rw-r--r--lib/libc/arm/string/strncmp.S3
-rw-r--r--lib/libc/arm/sys/Ovfork.S1
-rw-r--r--lib/libc/arm/sys/__vdso_gettc.c2
-rw-r--r--lib/libc/arm/sys/cerror.S1
-rw-r--r--lib/libc/arm/sys/syscall.S1
-rw-r--r--lib/libc/compat-43/creat.c2
-rw-r--r--lib/libc/compat-43/gethostid.c2
-rw-r--r--lib/libc/compat-43/getwd.c2
-rw-r--r--lib/libc/compat-43/killpg.c2
-rw-r--r--lib/libc/compat-43/sethostid.c2
-rw-r--r--lib/libc/compat-43/setpgrp.c2
-rw-r--r--lib/libc/compat-43/setrgid.c2
-rw-r--r--lib/libc/compat-43/setruid.c2
-rw-r--r--lib/libc/compat-43/sigcompat.c2
-rw-r--r--lib/libc/csu/aarch64/reloc.c2
-rw-r--r--lib/libc/csu/amd64/reloc.c2
-rw-r--r--lib/libc/csu/i386/reloc.c2
-rw-r--r--lib/libc/csu/powerpc64/reloc.c2
-rw-r--r--lib/libc/db/btree/bt_close.c2
-rw-r--r--lib/libc/db/btree/bt_conv.c2
-rw-r--r--lib/libc/db/btree/bt_debug.c2
-rw-r--r--lib/libc/db/btree/bt_delete.c2
-rw-r--r--lib/libc/db/btree/bt_get.c2
-rw-r--r--lib/libc/db/btree/bt_open.c2
-rw-r--r--lib/libc/db/btree/bt_overflow.c2
-rw-r--r--lib/libc/db/btree/bt_page.c2
-rw-r--r--lib/libc/db/btree/bt_put.c2
-rw-r--r--lib/libc/db/btree/bt_search.c2
-rw-r--r--lib/libc/db/btree/bt_seq.c2
-rw-r--r--lib/libc/db/btree/bt_split.c2
-rw-r--r--lib/libc/db/btree/bt_utils.c2
-rw-r--r--lib/libc/db/db/db.c2
-rw-r--r--lib/libc/db/hash/hash.c2
-rw-r--r--lib/libc/db/hash/hash_bigkey.c2
-rw-r--r--lib/libc/db/hash/hash_buf.c2
-rw-r--r--lib/libc/db/hash/hash_func.c2
-rw-r--r--lib/libc/db/hash/hash_log2.c2
-rw-r--r--lib/libc/db/hash/hash_page.c2
-rw-r--r--lib/libc/db/hash/ndbm.c2
-rw-r--r--lib/libc/db/mpool/mpool-compat.c2
-rw-r--r--lib/libc/db/mpool/mpool.c2
-rw-r--r--lib/libc/db/recno/rec_close.c2
-rw-r--r--lib/libc/db/recno/rec_delete.c2
-rw-r--r--lib/libc/db/recno/rec_get.c2
-rw-r--r--lib/libc/db/recno/rec_open.c2
-rw-r--r--lib/libc/db/recno/rec_put.c2
-rw-r--r--lib/libc/db/recno/rec_search.c2
-rw-r--r--lib/libc/db/recno/rec_seq.c2
-rw-r--r--lib/libc/db/recno/rec_utils.c2
-rw-r--r--lib/libc/db/test/btree.tests/main.c2
-rw-r--r--lib/libc/db/test/dbtest.c2
-rw-r--r--lib/libc/db/test/hash.tests/driver2.c2
-rw-r--r--lib/libc/db/test/hash.tests/tcreat3.c2
-rw-r--r--lib/libc/db/test/hash.tests/tdel.c2
-rw-r--r--lib/libc/db/test/hash.tests/thash4.c2
-rw-r--r--lib/libc/db/test/hash.tests/tread2.c2
-rw-r--r--lib/libc/db/test/hash.tests/tseq.c2
-rw-r--r--lib/libc/db/test/hash.tests/tverify.c2
-rw-r--r--lib/libc/gdtoa/_hdtoa.c2
-rw-r--r--lib/libc/gdtoa/_hldtoa.c2
-rw-r--r--lib/libc/gdtoa/_ldtoa.c2
-rw-r--r--lib/libc/gdtoa/machdep_ldisQ.c2
-rw-r--r--lib/libc/gdtoa/machdep_ldisd.c2
-rw-r--r--lib/libc/gdtoa/machdep_ldisx.c2
-rw-r--r--lib/libc/gen/__getosreldate.c2
-rw-r--r--lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c2
-rw-r--r--lib/libc/gen/__xuname.c2
-rw-r--r--lib/libc/gen/_once_stub.c2
-rw-r--r--lib/libc/gen/_pthread_stubs.c2
-rw-r--r--lib/libc/gen/_rand48.c2
-rw-r--r--lib/libc/gen/_spinlock_stub.c2
-rw-r--r--lib/libc/gen/_thread_init.c2
-rw-r--r--lib/libc/gen/alarm.c2
-rw-r--r--lib/libc/gen/arc4random-compat.c2
-rw-r--r--lib/libc/gen/arc4random.c2
-rw-r--r--lib/libc/gen/assert.c2
-rw-r--r--lib/libc/gen/auxv.c2
-rw-r--r--lib/libc/gen/basename.c2
-rw-r--r--lib/libc/gen/basename_compat.c2
-rw-r--r--lib/libc/gen/cap_sandboxed.c2
-rw-r--r--lib/libc/gen/check_utility_compat.c2
-rw-r--r--lib/libc/gen/clock.c2
-rw-r--r--lib/libc/gen/clock_getcpuclockid.c2
-rw-r--r--lib/libc/gen/closedir.c2
-rw-r--r--lib/libc/gen/confstr.c2
-rw-r--r--lib/libc/gen/crypt.c2
-rw-r--r--lib/libc/gen/ctermid.c2
-rw-r--r--lib/libc/gen/daemon.c2
-rw-r--r--lib/libc/gen/devname-compat11.c2
-rw-r--r--lib/libc/gen/devname.c2
-rw-r--r--lib/libc/gen/dirfd.c2
-rw-r--r--lib/libc/gen/dirname.c2
-rw-r--r--lib/libc/gen/dirname_compat.c2
-rw-r--r--lib/libc/gen/disklabel.c2
-rw-r--r--lib/libc/gen/dlfcn.c2
-rw-r--r--lib/libc/gen/drand48.c2
-rw-r--r--lib/libc/gen/dup3.c2
-rw-r--r--lib/libc/gen/erand48.c2
-rw-r--r--lib/libc/gen/err.c2
-rw-r--r--lib/libc/gen/errlst.c2
-rw-r--r--lib/libc/gen/errno.c2
-rw-r--r--lib/libc/gen/eventfd.c2
-rw-r--r--lib/libc/gen/exec.c2
-rw-r--r--lib/libc/gen/exect.c2
-rw-r--r--lib/libc/gen/fdevname.c2
-rw-r--r--lib/libc/gen/feature_present.c2
-rw-r--r--lib/libc/gen/fmtcheck.c2
-rw-r--r--lib/libc/gen/fmtmsg.c2
-rw-r--r--lib/libc/gen/fnmatch.c2
-rw-r--r--lib/libc/gen/fstab.c2
-rw-r--r--lib/libc/gen/ftok.c2
-rw-r--r--lib/libc/gen/fts-compat.c2
-rw-r--r--lib/libc/gen/fts-compat11.c2
-rw-r--r--lib/libc/gen/fts.c2
-rw-r--r--lib/libc/gen/ftw-compat11.c2
-rw-r--r--lib/libc/gen/ftw.c2
-rw-r--r--lib/libc/gen/getbootfile.c2
-rw-r--r--lib/libc/gen/getbsize.c2
-rw-r--r--lib/libc/gen/getcap.c2
-rw-r--r--lib/libc/gen/getcwd.c2
-rw-r--r--lib/libc/gen/getdomainname.c2
-rw-r--r--lib/libc/gen/getentropy.c2
-rw-r--r--lib/libc/gen/getgrent.c2
-rw-r--r--lib/libc/gen/getgrouplist.c2
-rw-r--r--lib/libc/gen/gethostname.c2
-rw-r--r--lib/libc/gen/getloadavg.c2
-rw-r--r--lib/libc/gen/getlogin.c2
-rw-r--r--lib/libc/gen/getmntinfo-compat11.c2
-rw-r--r--lib/libc/gen/getmntinfo.c2
-rw-r--r--lib/libc/gen/getnetgrent.c2
-rw-r--r--lib/libc/gen/getosreldate.c2
-rw-r--r--lib/libc/gen/getpagesize.c2
-rw-r--r--lib/libc/gen/getpagesizes.c2
-rw-r--r--lib/libc/gen/getpeereid.c2
-rw-r--r--lib/libc/gen/getprogname.c2
-rw-r--r--lib/libc/gen/getpwent.c2
-rw-r--r--lib/libc/gen/getttyent.c2
-rw-r--r--lib/libc/gen/getusershell.c2
-rw-r--r--lib/libc/gen/getutxent.c2
-rw-r--r--lib/libc/gen/getvfsbyname.c2
-rw-r--r--lib/libc/gen/glob-compat11.c2
-rw-r--r--lib/libc/gen/glob.c2
-rw-r--r--lib/libc/gen/initgroups.c2
-rw-r--r--lib/libc/gen/isatty.c2
-rw-r--r--lib/libc/gen/jrand48.c2
-rw-r--r--lib/libc/gen/lcong48.c2
-rw-r--r--lib/libc/gen/ldexp.c2
-rw-r--r--lib/libc/gen/libc_dlopen.c2
-rw-r--r--lib/libc/gen/lockf.c2
-rw-r--r--lib/libc/gen/lrand48.c2
-rw-r--r--lib/libc/gen/memalign.c2
-rw-r--r--lib/libc/gen/modf.c2
-rw-r--r--lib/libc/gen/mrand48.c2
-rw-r--r--lib/libc/gen/nftw-compat11.c2
-rw-r--r--lib/libc/gen/nftw.c2
-rw-r--r--lib/libc/gen/nice.c2
-rw-r--r--lib/libc/gen/nlist.c2
-rw-r--r--lib/libc/gen/nrand48.c2
-rw-r--r--lib/libc/gen/opendir.c2
-rw-r--r--lib/libc/gen/pause.c2
-rw-r--r--lib/libc/gen/pmadvise.c2
-rw-r--r--lib/libc/gen/popen.c2
-rw-r--r--lib/libc/gen/posix_spawn.c2
-rw-r--r--lib/libc/gen/psignal.c2
-rw-r--r--lib/libc/gen/pututxline.c2
-rw-r--r--lib/libc/gen/pw_scan.c2
-rw-r--r--lib/libc/gen/raise.c2
-rw-r--r--lib/libc/gen/readdir-compat11.c2
-rw-r--r--lib/libc/gen/readdir.c2
-rw-r--r--lib/libc/gen/readpassphrase.c2
-rw-r--r--lib/libc/gen/recvmmsg.c2
-rw-r--r--lib/libc/gen/rewinddir.c2
-rw-r--r--lib/libc/gen/scandir-compat11.c2
-rw-r--r--lib/libc/gen/scandir.c2
-rw-r--r--lib/libc/gen/seed48.c2
-rw-r--r--lib/libc/gen/seekdir.c2
-rw-r--r--lib/libc/gen/semctl.c2
-rw-r--r--lib/libc/gen/sendmmsg.c2
-rw-r--r--lib/libc/gen/setdomainname.c2
-rw-r--r--lib/libc/gen/sethostname.c2
-rw-r--r--lib/libc/gen/setjmperr.c2
-rw-r--r--lib/libc/gen/setmode.c2
-rw-r--r--lib/libc/gen/setproctitle.c2
-rw-r--r--lib/libc/gen/setprogname.c2
-rw-r--r--lib/libc/gen/siginterrupt.c2
-rw-r--r--lib/libc/gen/siglist.c2
-rw-r--r--lib/libc/gen/signal.c2
-rw-r--r--lib/libc/gen/sigsetops.c2
-rw-r--r--lib/libc/gen/sleep.c2
-rw-r--r--lib/libc/gen/statvfs.c2
-rw-r--r--lib/libc/gen/stringlist.c2
-rw-r--r--lib/libc/gen/strtofflags.c2
-rw-r--r--lib/libc/gen/sysconf.c2
-rw-r--r--lib/libc/gen/sysctl.c2
-rw-r--r--lib/libc/gen/sysctlbyname.c2
-rw-r--r--lib/libc/gen/sysctlnametomib.c2
-rw-r--r--lib/libc/gen/syslog.c2
-rw-r--r--lib/libc/gen/telldir.c2
-rw-r--r--lib/libc/gen/termios.c2
-rw-r--r--lib/libc/gen/time.c2
-rw-r--r--lib/libc/gen/times.c2
-rw-r--r--lib/libc/gen/timespec_get.c2
-rw-r--r--lib/libc/gen/timezone.c2
-rw-r--r--lib/libc/gen/trivial-getcontextx.c2
-rw-r--r--lib/libc/gen/ttyname.c2
-rw-r--r--lib/libc/gen/ttyslot.c2
-rw-r--r--lib/libc/gen/ualarm.c2
-rw-r--r--lib/libc/gen/uname.c2
-rw-r--r--lib/libc/gen/usleep.c2
-rw-r--r--lib/libc/gen/utime.c2
-rw-r--r--lib/libc/gen/utxdb.c2
-rw-r--r--lib/libc/gen/valloc.c2
-rw-r--r--lib/libc/gen/wait.c2
-rw-r--r--lib/libc/gen/wait3.c2
-rw-r--r--lib/libc/gen/waitid.c2
-rw-r--r--lib/libc/gen/waitpid.c2
-rw-r--r--lib/libc/gen/wordexp.c3
-rw-r--r--lib/libc/gmon/gmon.c2
-rw-r--r--lib/libc/gmon/mcount.c2
-rw-r--r--lib/libc/i386/gen/_ctx_start.S2
-rw-r--r--lib/libc/i386/gen/_setjmp.S2
-rw-r--r--lib/libc/i386/gen/fabs.S2
-rw-r--r--lib/libc/i386/gen/flt_rounds.c2
-rw-r--r--lib/libc/i386/gen/infinity.c2
-rw-r--r--lib/libc/i386/gen/makecontext.c2
-rw-r--r--lib/libc/i386/gen/rfork_thread.S2
-rw-r--r--lib/libc/i386/gen/setjmp.S2
-rw-r--r--lib/libc/i386/gen/signalcontext.c2
-rw-r--r--lib/libc/i386/gen/sigsetjmp.S2
-rw-r--r--lib/libc/i386/stdlib/div.S2
-rw-r--r--lib/libc/i386/stdlib/ldiv.S2
-rw-r--r--lib/libc/i386/string/bcmp.S2
-rw-r--r--lib/libc/i386/string/bcopy.S2
-rw-r--r--lib/libc/i386/string/bzero.S2
-rw-r--r--lib/libc/i386/string/memcmp.S2
-rw-r--r--lib/libc/i386/string/memcpy.S2
-rw-r--r--lib/libc/i386/string/memmove.S2
-rw-r--r--lib/libc/i386/string/memset.S2
-rw-r--r--lib/libc/i386/string/strcat.S2
-rw-r--r--lib/libc/i386/string/strchr.S2
-rw-r--r--lib/libc/i386/string/strcmp.S2
-rw-r--r--lib/libc/i386/string/strcpy.S2
-rw-r--r--lib/libc/i386/string/strncmp.S2
-rw-r--r--lib/libc/i386/string/strrchr.S2
-rw-r--r--lib/libc/i386/string/swab.S2
-rw-r--r--lib/libc/i386/string/wcschr.S2
-rw-r--r--lib/libc/i386/string/wcscmp.S2
-rw-r--r--lib/libc/i386/string/wcslen.S2
-rw-r--r--lib/libc/i386/string/wmemchr.S2
-rw-r--r--lib/libc/i386/sys/Ovfork.S2
-rw-r--r--lib/libc/i386/sys/cerror.S2
-rw-r--r--lib/libc/i386/sys/getcontext.S2
-rw-r--r--lib/libc/i386/sys/i386_clr_watch.c2
-rw-r--r--lib/libc/i386/sys/i386_get_fsbase.c2
-rw-r--r--lib/libc/i386/sys/i386_get_gsbase.c2
-rw-r--r--lib/libc/i386/sys/i386_get_ioperm.c2
-rw-r--r--lib/libc/i386/sys/i386_get_ldt.c2
-rw-r--r--lib/libc/i386/sys/i386_set_fsbase.c2
-rw-r--r--lib/libc/i386/sys/i386_set_gsbase.c2
-rw-r--r--lib/libc/i386/sys/i386_set_ioperm.c2
-rw-r--r--lib/libc/i386/sys/i386_set_ldt.c2
-rw-r--r--lib/libc/i386/sys/i386_set_watch.c2
-rw-r--r--lib/libc/i386/sys/i386_vm86.c2
-rw-r--r--lib/libc/i386/sys/syscall.S2
-rw-r--r--lib/libc/inet/inet_addr.c2
-rw-r--r--lib/libc/inet/inet_cidr_ntop.c2
-rw-r--r--lib/libc/inet/inet_cidr_pton.c2
-rw-r--r--lib/libc/inet/inet_lnaof.c2
-rw-r--r--lib/libc/inet/inet_makeaddr.c2
-rw-r--r--lib/libc/inet/inet_net_ntop.c2
-rw-r--r--lib/libc/inet/inet_net_pton.c2
-rw-r--r--lib/libc/inet/inet_neta.c2
-rw-r--r--lib/libc/inet/inet_netof.c2
-rw-r--r--lib/libc/inet/inet_network.c2
-rw-r--r--lib/libc/inet/inet_ntoa.c2
-rw-r--r--lib/libc/inet/inet_ntop.c2
-rw-r--r--lib/libc/inet/inet_pton.c2
-rw-r--r--lib/libc/inet/nsap_addr.c2
-rw-r--r--lib/libc/isc/ev_streams.c2
-rw-r--r--lib/libc/isc/ev_timers.c2
-rw-r--r--lib/libc/locale/ascii.c2
-rw-r--r--lib/libc/locale/big5.c2
-rw-r--r--lib/libc/locale/btowc.c2
-rw-r--r--lib/libc/locale/c16rtomb.c2
-rw-r--r--lib/libc/locale/c32rtomb.c2
-rw-r--r--lib/libc/locale/cXXrtomb_iconv.h2
-rw-r--r--lib/libc/locale/collate.c2
-rw-r--r--lib/libc/locale/collcmp.c2
-rw-r--r--lib/libc/locale/euc.c2
-rw-r--r--lib/libc/locale/fix_grouping.c2
-rw-r--r--lib/libc/locale/gb18030.c2
-rw-r--r--lib/libc/locale/gb2312.c2
-rw-r--r--lib/libc/locale/gbk.c2
-rw-r--r--lib/libc/locale/isctype.c2
-rw-r--r--lib/libc/locale/iswctype.c2
-rw-r--r--lib/libc/locale/ldpart.c2
-rw-r--r--lib/libc/locale/lmessages.c2
-rw-r--r--lib/libc/locale/lmonetary.c2
-rw-r--r--lib/libc/locale/lnumeric.c2
-rw-r--r--lib/libc/locale/localeconv.c2
-rw-r--r--lib/libc/locale/mblen.c2
-rw-r--r--lib/libc/locale/mbrlen.c2
-rw-r--r--lib/libc/locale/mbrtoc16.c2
-rw-r--r--lib/libc/locale/mbrtoc32.c2
-rw-r--r--lib/libc/locale/mbrtocXX_iconv.h2
-rw-r--r--lib/libc/locale/mbrtowc.c2
-rw-r--r--lib/libc/locale/mbsinit.c2
-rw-r--r--lib/libc/locale/mbsnrtowcs.c2
-rw-r--r--lib/libc/locale/mbsrtowcs.c2
-rw-r--r--lib/libc/locale/mbstowcs.c2
-rw-r--r--lib/libc/locale/mbtowc.c2
-rw-r--r--lib/libc/locale/mskanji.c2
-rw-r--r--lib/libc/locale/nextwctype.c2
-rw-r--r--lib/libc/locale/nl_langinfo.c2
-rw-r--r--lib/libc/locale/nomacros.c2
-rw-r--r--lib/libc/locale/none.c2
-rw-r--r--lib/libc/locale/rpmatch.c2
-rw-r--r--lib/libc/locale/rune.c2
-rw-r--r--lib/libc/locale/runetype.c2
-rw-r--r--lib/libc/locale/setlocale.c2
-rw-r--r--lib/libc/locale/setrunelocale.c2
-rw-r--r--lib/libc/locale/table.c2
-rw-r--r--lib/libc/locale/tolower.c2
-rw-r--r--lib/libc/locale/toupper.c2
-rw-r--r--lib/libc/locale/utf8.c2
-rw-r--r--lib/libc/locale/wcrtomb.c2
-rw-r--r--lib/libc/locale/wcsftime.c2
-rw-r--r--lib/libc/locale/wcsnrtombs.c2
-rw-r--r--lib/libc/locale/wcsrtombs.c2
-rw-r--r--lib/libc/locale/wcstod.c2
-rw-r--r--lib/libc/locale/wcstof.c2
-rw-r--r--lib/libc/locale/wcstoimax.c2
-rw-r--r--lib/libc/locale/wcstol.c2
-rw-r--r--lib/libc/locale/wcstold.c2
-rw-r--r--lib/libc/locale/wcstoll.c2
-rw-r--r--lib/libc/locale/wcstombs.c2
-rw-r--r--lib/libc/locale/wcstoul.c2
-rw-r--r--lib/libc/locale/wcstoull.c2
-rw-r--r--lib/libc/locale/wcstoumax.c2
-rw-r--r--lib/libc/locale/wctob.c2
-rw-r--r--lib/libc/locale/wctomb.c2
-rw-r--r--lib/libc/locale/wctrans.c2
-rw-r--r--lib/libc/locale/wctype.c2
-rw-r--r--lib/libc/locale/wcwidth.c2
-rw-r--r--lib/libc/nameser/ns_name.c2
-rw-r--r--lib/libc/nameser/ns_netint.c2
-rw-r--r--lib/libc/nameser/ns_parse.c2
-rw-r--r--lib/libc/nameser/ns_print.c2
-rw-r--r--lib/libc/nameser/ns_samedomain.c2
-rw-r--r--lib/libc/nameser/ns_ttl.c2
-rw-r--r--lib/libc/net/base64.c2
-rw-r--r--lib/libc/net/ether_addr.c2
-rw-r--r--lib/libc/net/eui64.c2
-rw-r--r--lib/libc/net/gai_strerror.c2
-rw-r--r--lib/libc/net/getaddrinfo.c2
-rw-r--r--lib/libc/net/gethostbydns.c2
-rw-r--r--lib/libc/net/gethostbyht.c2
-rw-r--r--lib/libc/net/gethostbynis.c2
-rw-r--r--lib/libc/net/gethostnamadr.c2
-rw-r--r--lib/libc/net/getifaddrs.c2
-rw-r--r--lib/libc/net/getifmaddrs.c2
-rw-r--r--lib/libc/net/getnameinfo.c2
-rw-r--r--lib/libc/net/getnetbydns.c2
-rw-r--r--lib/libc/net/getnetbyht.c2
-rw-r--r--lib/libc/net/getnetbynis.c2
-rw-r--r--lib/libc/net/getnetnamadr.c2
-rw-r--r--lib/libc/net/getproto.c2
-rw-r--r--lib/libc/net/getprotoent.c2
-rw-r--r--lib/libc/net/getprotoname.c2
-rw-r--r--lib/libc/net/getservent.c2
-rw-r--r--lib/libc/net/hesiod.c2
-rw-r--r--lib/libc/net/if_indextoname.c2
-rw-r--r--lib/libc/net/if_nameindex.c2
-rw-r--r--lib/libc/net/if_nametoindex.c2
-rw-r--r--lib/libc/net/ip6opt.c2
-rw-r--r--lib/libc/net/linkaddr.c2
-rw-r--r--lib/libc/net/map_v4v6.c2
-rw-r--r--lib/libc/net/name6.c2
-rw-r--r--lib/libc/net/nscache.c2
-rw-r--r--lib/libc/net/nscachedcli.c2
-rw-r--r--lib/libc/net/nsdispatch.c2
-rw-r--r--lib/libc/net/nsparser.y2
-rw-r--r--lib/libc/net/nss_compat.c2
-rw-r--r--lib/libc/net/ntoh.c2
-rw-r--r--lib/libc/net/rcmd.c2
-rw-r--r--lib/libc/net/rcmdsh.c2
-rw-r--r--lib/libc/net/recv.c2
-rw-r--r--lib/libc/net/rthdr.c2
-rw-r--r--lib/libc/net/sctp_sys_calls.c2
-rw-r--r--lib/libc/net/send.c2
-rw-r--r--lib/libc/net/sourcefilter.c2
-rw-r--r--lib/libc/net/vars.c2
-rw-r--r--lib/libc/nls/msgcat.c2
-rw-r--r--lib/libc/posix1e/acl_branding.c2
-rw-r--r--lib/libc/posix1e/acl_calc_mask.c2
-rw-r--r--lib/libc/posix1e/acl_cmp_np.c2
-rw-r--r--lib/libc/posix1e/acl_compat.c2
-rw-r--r--lib/libc/posix1e/acl_copy.c2
-rw-r--r--lib/libc/posix1e/acl_delete.c2
-rw-r--r--lib/libc/posix1e/acl_delete_entry.c2
-rw-r--r--lib/libc/posix1e/acl_entry.c2
-rw-r--r--lib/libc/posix1e/acl_equiv_mode_np.c2
-rw-r--r--lib/libc/posix1e/acl_extended_file_np.c2
-rw-r--r--lib/libc/posix1e/acl_flag.c2
-rw-r--r--lib/libc/posix1e/acl_free.c2
-rw-r--r--lib/libc/posix1e/acl_from_mode_np.c2
-rw-r--r--lib/libc/posix1e/acl_from_text.c2
-rw-r--r--lib/libc/posix1e/acl_from_text_nfs4.c2
-rw-r--r--lib/libc/posix1e/acl_get.c2
-rw-r--r--lib/libc/posix1e/acl_id_to_name.c2
-rw-r--r--lib/libc/posix1e/acl_init.c2
-rw-r--r--lib/libc/posix1e/acl_perm.c2
-rw-r--r--lib/libc/posix1e/acl_set.c2
-rw-r--r--lib/libc/posix1e/acl_strip.c2
-rw-r--r--lib/libc/posix1e/acl_support.c2
-rw-r--r--lib/libc/posix1e/acl_support_nfs4.c2
-rw-r--r--lib/libc/posix1e/acl_to_text.c2
-rw-r--r--lib/libc/posix1e/acl_to_text_nfs4.c2
-rw-r--r--lib/libc/posix1e/acl_valid.c2
-rw-r--r--lib/libc/posix1e/extattr.c2
-rw-r--r--lib/libc/posix1e/mac.c2
-rw-r--r--lib/libc/posix1e/mac_exec.c2
-rw-r--r--lib/libc/posix1e/mac_get.c2
-rw-r--r--lib/libc/posix1e/mac_set.c2
-rw-r--r--lib/libc/powerpc/gen/_ctx_start.S3
-rw-r--r--lib/libc/powerpc/gen/_setjmp.S2
-rw-r--r--lib/libc/powerpc/gen/eabi.S2
-rw-r--r--lib/libc/powerpc/gen/fabs.S2
-rw-r--r--lib/libc/powerpc/gen/flt_rounds.c2
-rw-r--r--lib/libc/powerpc/gen/fpgetmask.c2
-rw-r--r--lib/libc/powerpc/gen/fpgetround.c2
-rw-r--r--lib/libc/powerpc/gen/fpsetmask.c2
-rw-r--r--lib/libc/powerpc/gen/fpsetround.c2
-rw-r--r--lib/libc/powerpc/gen/infinity.c2
-rw-r--r--lib/libc/powerpc/gen/makecontext.c2
-rw-r--r--lib/libc/powerpc/gen/setjmp.S2
-rw-r--r--lib/libc/powerpc/gen/signalcontext.c2
-rw-r--r--lib/libc/powerpc/gen/sigsetjmp.S2
-rw-r--r--lib/libc/powerpc/sys/__vdso_gettc.c2
-rw-r--r--lib/libc/powerpc/sys/cerror.S2
-rw-r--r--lib/libc/powerpc64/gen/_ctx_start.S3
-rw-r--r--lib/libc/powerpc64/gen/_setjmp.S2
-rw-r--r--lib/libc/powerpc64/gen/fabs.S2
-rw-r--r--lib/libc/powerpc64/gen/flt_rounds.c2
-rw-r--r--lib/libc/powerpc64/gen/fpgetmask.c2
-rw-r--r--lib/libc/powerpc64/gen/fpgetround.c2
-rw-r--r--lib/libc/powerpc64/gen/fpsetmask.c2
-rw-r--r--lib/libc/powerpc64/gen/fpsetround.c2
-rw-r--r--lib/libc/powerpc64/gen/infinity.c2
-rw-r--r--lib/libc/powerpc64/gen/makecontext.c2
-rw-r--r--lib/libc/powerpc64/gen/setjmp.S2
-rw-r--r--lib/libc/powerpc64/gen/signalcontext.c2
-rw-r--r--lib/libc/powerpc64/gen/sigsetjmp.S2
-rw-r--r--lib/libc/powerpc64/string/bcopy.S2
-rw-r--r--lib/libc/powerpc64/string/bcopy_resolver.c2
-rw-r--r--lib/libc/powerpc64/string/memcpy.S2
-rw-r--r--lib/libc/powerpc64/string/strcpy.c2
-rw-r--r--lib/libc/powerpc64/string/strcpy_arch_2_05.S2
-rw-r--r--lib/libc/powerpc64/string/strcpy_resolver.c2
-rw-r--r--lib/libc/powerpc64/string/strncpy.c2
-rw-r--r--lib/libc/powerpc64/string/strncpy_arch_2_05.S2
-rw-r--r--lib/libc/powerpc64/string/strncpy_resolver.c2
-rw-r--r--lib/libc/powerpc64/sys/__vdso_gettc.c2
-rw-r--r--lib/libc/powerpc64/sys/cerror.S2
-rw-r--r--lib/libc/powerpcspe/gen/_setjmp.S2
-rw-r--r--lib/libc/powerpcspe/gen/fabs.S2
-rw-r--r--lib/libc/powerpcspe/gen/flt_rounds.c2
-rw-r--r--lib/libc/powerpcspe/gen/fpgetmask.c2
-rw-r--r--lib/libc/powerpcspe/gen/fpgetround.c2
-rw-r--r--lib/libc/powerpcspe/gen/fpsetmask.c2
-rw-r--r--lib/libc/powerpcspe/gen/fpsetround.c2
-rw-r--r--lib/libc/powerpcspe/gen/setjmp.S2
-rw-r--r--lib/libc/powerpcspe/gen/sigsetjmp.S2
-rw-r--r--lib/libc/quad/TESTS/divrem.c2
-rw-r--r--lib/libc/quad/TESTS/mul.c2
-rw-r--r--lib/libc/quad/adddi3.c2
-rw-r--r--lib/libc/quad/anddi3.c2
-rw-r--r--lib/libc/quad/ashldi3.c2
-rw-r--r--lib/libc/quad/ashrdi3.c2
-rw-r--r--lib/libc/quad/cmpdi2.c2
-rw-r--r--lib/libc/quad/divdi3.c2
-rw-r--r--lib/libc/quad/fixdfdi.c2
-rw-r--r--lib/libc/quad/fixsfdi.c2
-rw-r--r--lib/libc/quad/fixunsdfdi.c2
-rw-r--r--lib/libc/quad/fixunssfdi.c2
-rw-r--r--lib/libc/quad/floatdidf.c2
-rw-r--r--lib/libc/quad/floatdisf.c2
-rw-r--r--lib/libc/quad/floatunsdidf.c2
-rw-r--r--lib/libc/quad/iordi3.c2
-rw-r--r--lib/libc/quad/lshldi3.c2
-rw-r--r--lib/libc/quad/lshrdi3.c2
-rw-r--r--lib/libc/quad/moddi3.c2
-rw-r--r--lib/libc/quad/muldi3.c2
-rw-r--r--lib/libc/quad/negdi2.c2
-rw-r--r--lib/libc/quad/notdi2.c2
-rw-r--r--lib/libc/quad/qdivrem.c2
-rw-r--r--lib/libc/quad/subdi3.c2
-rw-r--r--lib/libc/quad/ucmpdi2.c2
-rw-r--r--lib/libc/quad/udivdi3.c2
-rw-r--r--lib/libc/quad/umoddi3.c2
-rw-r--r--lib/libc/quad/xordi3.c2
-rw-r--r--lib/libc/regex/engine.c2
-rw-r--r--lib/libc/regex/grot/debug.c2
-rw-r--r--lib/libc/regex/grot/main.c2
-rw-r--r--lib/libc/regex/grot/split.c2
-rw-r--r--lib/libc/regex/regcomp.c2
-rw-r--r--lib/libc/regex/regerror.c2
-rw-r--r--lib/libc/regex/regexec.c2
-rw-r--r--lib/libc/regex/regfree.c2
-rw-r--r--lib/libc/resolv/herror.c2
-rw-r--r--lib/libc/resolv/mtctxres.c2
-rw-r--r--lib/libc/resolv/res_comp.c2
-rw-r--r--lib/libc/resolv/res_data.c2
-rw-r--r--lib/libc/resolv/res_debug.c2
-rw-r--r--lib/libc/resolv/res_findzonecut.c2
-rw-r--r--lib/libc/resolv/res_init.c2
-rw-r--r--lib/libc/resolv/res_mkquery.c2
-rw-r--r--lib/libc/resolv/res_mkupdate.c2
-rw-r--r--lib/libc/resolv/res_query.c2
-rw-r--r--lib/libc/resolv/res_send.c2
-rw-r--r--lib/libc/resolv/res_update.c2
-rw-r--r--lib/libc/riscv/gen/_ctx_start.S2
-rw-r--r--lib/libc/riscv/gen/_setjmp.S2
-rw-r--r--lib/libc/riscv/gen/fabs.S2
-rw-r--r--lib/libc/riscv/gen/flt_rounds.c2
-rw-r--r--lib/libc/riscv/gen/fpgetmask.c2
-rw-r--r--lib/libc/riscv/gen/fpsetmask.c2
-rw-r--r--lib/libc/riscv/gen/infinity.c2
-rw-r--r--lib/libc/riscv/gen/makecontext.c2
-rw-r--r--lib/libc/riscv/gen/setjmp.S2
-rw-r--r--lib/libc/riscv/gen/sigsetjmp.S2
-rw-r--r--lib/libc/riscv/sys/__vdso_gettc.c2
-rw-r--r--lib/libc/riscv/sys/cerror.S2
-rw-r--r--lib/libc/riscv/sys/syscall.S2
-rw-r--r--lib/libc/riscv/sys/vfork.S1
-rw-r--r--lib/libc/rpc/auth_des.c2
-rw-r--r--lib/libc/rpc/auth_none.c2
-rw-r--r--lib/libc/rpc/auth_time.c2
-rw-r--r--lib/libc/rpc/auth_unix.c2
-rw-r--r--lib/libc/rpc/authdes_prot.c2
-rw-r--r--lib/libc/rpc/authunix_prot.c2
-rw-r--r--lib/libc/rpc/bindresvport.c2
-rw-r--r--lib/libc/rpc/clnt_bcast.c3
-rw-r--r--lib/libc/rpc/clnt_dg.c2
-rw-r--r--lib/libc/rpc/clnt_generic.c2
-rw-r--r--lib/libc/rpc/clnt_perror.c2
-rw-r--r--lib/libc/rpc/clnt_raw.c2
-rw-r--r--lib/libc/rpc/clnt_simple.c2
-rw-r--r--lib/libc/rpc/clnt_vc.c2
-rw-r--r--lib/libc/rpc/crypt_client.c2
-rw-r--r--lib/libc/rpc/des_crypt.c2
-rw-r--r--lib/libc/rpc/des_soft.c2
-rw-r--r--lib/libc/rpc/getnetconfig.c2
-rw-r--r--lib/libc/rpc/getnetpath.c2
-rw-r--r--lib/libc/rpc/getpublickey.c2
-rw-r--r--lib/libc/rpc/getrpcent.c2
-rw-r--r--lib/libc/rpc/getrpcport.c2
-rw-r--r--lib/libc/rpc/key_call.c2
-rw-r--r--lib/libc/rpc/key_prot_xdr.c2
-rw-r--r--lib/libc/rpc/mt_misc.c2
-rw-r--r--lib/libc/rpc/netname.c2
-rw-r--r--lib/libc/rpc/netnamer.c2
-rw-r--r--lib/libc/rpc/pmap_clnt.c2
-rw-r--r--lib/libc/rpc/pmap_getmaps.c2
-rw-r--r--lib/libc/rpc/pmap_getport.c2
-rw-r--r--lib/libc/rpc/pmap_prot.c2
-rw-r--r--lib/libc/rpc/pmap_prot2.c2
-rw-r--r--lib/libc/rpc/pmap_rmt.c2
-rw-r--r--lib/libc/rpc/rpc_callmsg.c2
-rw-r--r--lib/libc/rpc/rpc_commondata.c2
-rw-r--r--lib/libc/rpc/rpc_dtablesize.c2
-rw-r--r--lib/libc/rpc/rpc_generic.c2
-rw-r--r--lib/libc/rpc/rpc_prot.c2
-rw-r--r--lib/libc/rpc/rpc_soc.c2
-rw-r--r--lib/libc/rpc/rpcb_clnt.c2
-rw-r--r--lib/libc/rpc/rpcb_prot.c2
-rw-r--r--lib/libc/rpc/rpcb_st_xdr.c2
-rw-r--r--lib/libc/rpc/rpcdname.c2
-rw-r--r--lib/libc/rpc/rtime.c2
-rw-r--r--lib/libc/rpc/svc.c2
-rw-r--r--lib/libc/rpc/svc_auth.c2
-rw-r--r--lib/libc/rpc/svc_auth_des.c2
-rw-r--r--lib/libc/rpc/svc_auth_unix.c2
-rw-r--r--lib/libc/rpc/svc_dg.c2
-rw-r--r--lib/libc/rpc/svc_generic.c2
-rw-r--r--lib/libc/rpc/svc_raw.c2
-rw-r--r--lib/libc/rpc/svc_run.c2
-rw-r--r--lib/libc/rpc/svc_simple.c2
-rw-r--r--lib/libc/rpc/svc_vc.c2
-rw-r--r--lib/libc/secure/stack_protector.c2
-rw-r--r--lib/libc/secure/stack_protector_compat.c2
-rw-r--r--lib/libc/softfloat/bits32/softfloat.c2
-rw-r--r--lib/libc/softfloat/bits64/softfloat.c2
-rw-r--r--lib/libc/softfloat/eqdf2.c2
-rw-r--r--lib/libc/softfloat/eqsf2.c2
-rw-r--r--lib/libc/softfloat/eqtf2.c2
-rw-r--r--lib/libc/softfloat/fpgetmask.c2
-rw-r--r--lib/libc/softfloat/fpgetround.c2
-rw-r--r--lib/libc/softfloat/fpgetsticky.c2
-rw-r--r--lib/libc/softfloat/fpsetmask.c2
-rw-r--r--lib/libc/softfloat/fpsetround.c2
-rw-r--r--lib/libc/softfloat/fpsetsticky.c2
-rw-r--r--lib/libc/softfloat/gedf2.c2
-rw-r--r--lib/libc/softfloat/gesf2.c2
-rw-r--r--lib/libc/softfloat/getf2.c2
-rw-r--r--lib/libc/softfloat/gexf2.c2
-rw-r--r--lib/libc/softfloat/gtdf2.c2
-rw-r--r--lib/libc/softfloat/gtsf2.c2
-rw-r--r--lib/libc/softfloat/gttf2.c2
-rw-r--r--lib/libc/softfloat/gtxf2.c2
-rw-r--r--lib/libc/softfloat/ledf2.c2
-rw-r--r--lib/libc/softfloat/lesf2.c2
-rw-r--r--lib/libc/softfloat/letf2.c2
-rw-r--r--lib/libc/softfloat/ltdf2.c2
-rw-r--r--lib/libc/softfloat/ltsf2.c2
-rw-r--r--lib/libc/softfloat/lttf2.c2
-rw-r--r--lib/libc/softfloat/nedf2.c2
-rw-r--r--lib/libc/softfloat/negdf2.c2
-rw-r--r--lib/libc/softfloat/negsf2.c2
-rw-r--r--lib/libc/softfloat/negtf2.c2
-rw-r--r--lib/libc/softfloat/negxf2.c2
-rw-r--r--lib/libc/softfloat/nesf2.c2
-rw-r--r--lib/libc/softfloat/netf2.c2
-rw-r--r--lib/libc/softfloat/nexf2.c2
-rw-r--r--lib/libc/softfloat/timesoftfloat.c2
-rw-r--r--lib/libc/softfloat/unorddf2.c2
-rw-r--r--lib/libc/softfloat/unordsf2.c2
-rw-r--r--lib/libc/stdio/_flock_stub.c2
-rw-r--r--lib/libc/stdio/asprintf.c2
-rw-r--r--lib/libc/stdio/clrerr.c2
-rw-r--r--lib/libc/stdio/dprintf.c2
-rw-r--r--lib/libc/stdio/fclose.c2
-rw-r--r--lib/libc/stdio/fcloseall.c2
-rw-r--r--lib/libc/stdio/fdopen.c2
-rw-r--r--lib/libc/stdio/feof.c2
-rw-r--r--lib/libc/stdio/ferror.c2
-rw-r--r--lib/libc/stdio/fflush.c2
-rw-r--r--lib/libc/stdio/fgetc.c2
-rw-r--r--lib/libc/stdio/fgetln.c2
-rw-r--r--lib/libc/stdio/fgetpos.c2
-rw-r--r--lib/libc/stdio/fgets.c2
-rw-r--r--lib/libc/stdio/fgetwc.c2
-rw-r--r--lib/libc/stdio/fgetwln.c2
-rw-r--r--lib/libc/stdio/fgetws.c2
-rw-r--r--lib/libc/stdio/fileno.c2
-rw-r--r--lib/libc/stdio/findfp.c2
-rw-r--r--lib/libc/stdio/flags.c2
-rw-r--r--lib/libc/stdio/fmemopen.c2
-rw-r--r--lib/libc/stdio/fopen.c2
-rw-r--r--lib/libc/stdio/fopencookie.c2
-rw-r--r--lib/libc/stdio/fprintf.c2
-rw-r--r--lib/libc/stdio/fpurge.c2
-rw-r--r--lib/libc/stdio/fputc.c2
-rw-r--r--lib/libc/stdio/fputs.c2
-rw-r--r--lib/libc/stdio/fputwc.c2
-rw-r--r--lib/libc/stdio/fputws.c2
-rw-r--r--lib/libc/stdio/fread.c2
-rw-r--r--lib/libc/stdio/freopen.c2
-rw-r--r--lib/libc/stdio/fscanf.c2
-rw-r--r--lib/libc/stdio/fseek.c2
-rw-r--r--lib/libc/stdio/fsetpos.c2
-rw-r--r--lib/libc/stdio/ftell.c2
-rw-r--r--lib/libc/stdio/funopen.c2
-rw-r--r--lib/libc/stdio/fvwrite.c2
-rw-r--r--lib/libc/stdio/fwalk.c2
-rw-r--r--lib/libc/stdio/fwide.c2
-rw-r--r--lib/libc/stdio/fwprintf.c2
-rw-r--r--lib/libc/stdio/fwrite.c2
-rw-r--r--lib/libc/stdio/fwscanf.c2
-rw-r--r--lib/libc/stdio/getc.c2
-rw-r--r--lib/libc/stdio/getchar.c2
-rw-r--r--lib/libc/stdio/getdelim.c2
-rw-r--r--lib/libc/stdio/getline.c2
-rw-r--r--lib/libc/stdio/gets.c2
-rw-r--r--lib/libc/stdio/gets_s.c2
-rw-r--r--lib/libc/stdio/getw.c2
-rw-r--r--lib/libc/stdio/getwc.c2
-rw-r--r--lib/libc/stdio/getwchar.c2
-rw-r--r--lib/libc/stdio/makebuf.c2
-rw-r--r--lib/libc/stdio/mktemp.c2
-rw-r--r--lib/libc/stdio/open_memstream.c2
-rw-r--r--lib/libc/stdio/open_wmemstream.c2
-rw-r--r--lib/libc/stdio/perror.c2
-rw-r--r--lib/libc/stdio/printf-pos.c2
-rw-r--r--lib/libc/stdio/printf.c2
-rw-r--r--lib/libc/stdio/putc.c2
-rw-r--r--lib/libc/stdio/putchar.c2
-rw-r--r--lib/libc/stdio/puts.c2
-rw-r--r--lib/libc/stdio/putw.c2
-rw-r--r--lib/libc/stdio/putwc.c2
-rw-r--r--lib/libc/stdio/putwchar.c2
-rw-r--r--lib/libc/stdio/refill.c2
-rw-r--r--lib/libc/stdio/remove.c2
-rw-r--r--lib/libc/stdio/rewind.c2
-rw-r--r--lib/libc/stdio/rget.c2
-rw-r--r--lib/libc/stdio/scanf.c2
-rw-r--r--lib/libc/stdio/setbuf.c2
-rw-r--r--lib/libc/stdio/setbuffer.c2
-rw-r--r--lib/libc/stdio/setvbuf.c2
-rw-r--r--lib/libc/stdio/snprintf.c2
-rw-r--r--lib/libc/stdio/sprintf.c2
-rw-r--r--lib/libc/stdio/sscanf.c2
-rw-r--r--lib/libc/stdio/stdio.c2
-rw-r--r--lib/libc/stdio/swprintf.c2
-rw-r--r--lib/libc/stdio/swscanf.c2
-rw-r--r--lib/libc/stdio/tempnam.c2
-rw-r--r--lib/libc/stdio/tmpfile.c2
-rw-r--r--lib/libc/stdio/tmpnam.c2
-rw-r--r--lib/libc/stdio/ungetc.c2
-rw-r--r--lib/libc/stdio/ungetwc.c2
-rw-r--r--lib/libc/stdio/vasprintf.c2
-rw-r--r--lib/libc/stdio/vdprintf.c2
-rw-r--r--lib/libc/stdio/vfprintf.c2
-rw-r--r--lib/libc/stdio/vfscanf.c2
-rw-r--r--lib/libc/stdio/vfwprintf.c2
-rw-r--r--lib/libc/stdio/vfwscanf.c2
-rw-r--r--lib/libc/stdio/vprintf.c2
-rw-r--r--lib/libc/stdio/vscanf.c2
-rw-r--r--lib/libc/stdio/vsnprintf.c2
-rw-r--r--lib/libc/stdio/vsprintf.c2
-rw-r--r--lib/libc/stdio/vsscanf.c2
-rw-r--r--lib/libc/stdio/vswprintf.c2
-rw-r--r--lib/libc/stdio/vswscanf.c2
-rw-r--r--lib/libc/stdio/vwprintf.c2
-rw-r--r--lib/libc/stdio/vwscanf.c2
-rw-r--r--lib/libc/stdio/wbuf.c2
-rw-r--r--lib/libc/stdio/wprintf.c2
-rw-r--r--lib/libc/stdio/wscanf.c2
-rw-r--r--lib/libc/stdio/wsetup.c2
-rw-r--r--lib/libc/stdlib/a64l.c2
-rw-r--r--lib/libc/stdlib/abort.c2
-rw-r--r--lib/libc/stdlib/abs.c2
-rw-r--r--lib/libc/stdlib/atexit.c2
-rw-r--r--lib/libc/stdlib/atof.c2
-rw-r--r--lib/libc/stdlib/atoi.c2
-rw-r--r--lib/libc/stdlib/atol.c2
-rw-r--r--lib/libc/stdlib/atoll.c2
-rw-r--r--lib/libc/stdlib/bsearch.c2
-rw-r--r--lib/libc/stdlib/cxa_thread_atexit.c2
-rw-r--r--lib/libc/stdlib/cxa_thread_atexit_impl.c2
-rw-r--r--lib/libc/stdlib/div.c2
-rw-r--r--lib/libc/stdlib/exit.c2
-rw-r--r--lib/libc/stdlib/getenv.c3
-rw-r--r--lib/libc/stdlib/getopt.c2
-rw-r--r--lib/libc/stdlib/getopt_long.c2
-rw-r--r--lib/libc/stdlib/getsubopt.c2
-rw-r--r--lib/libc/stdlib/hcreate.c2
-rw-r--r--lib/libc/stdlib/hcreate_r.c2
-rw-r--r--lib/libc/stdlib/hdestroy_r.c2
-rw-r--r--lib/libc/stdlib/heapsort.c2
-rw-r--r--lib/libc/stdlib/hsearch_r.c2
-rw-r--r--lib/libc/stdlib/imaxabs.c2
-rw-r--r--lib/libc/stdlib/imaxdiv.c2
-rw-r--r--lib/libc/stdlib/insque.c2
-rw-r--r--lib/libc/stdlib/l64a.c2
-rw-r--r--lib/libc/stdlib/labs.c2
-rw-r--r--lib/libc/stdlib/ldiv.c2
-rw-r--r--lib/libc/stdlib/llabs.c2
-rw-r--r--lib/libc/stdlib/lldiv.c2
-rw-r--r--lib/libc/stdlib/lsearch.c2
-rw-r--r--lib/libc/stdlib/merge.c2
-rw-r--r--lib/libc/stdlib/ptsname.c1
-rw-r--r--lib/libc/stdlib/qsort.c2
-rw-r--r--lib/libc/stdlib/radixsort.c2
-rw-r--r--lib/libc/stdlib/rand.c2
-rw-r--r--lib/libc/stdlib/random.c2
-rw-r--r--lib/libc/stdlib/reallocarray.c2
-rw-r--r--lib/libc/stdlib/reallocf.c2
-rw-r--r--lib/libc/stdlib/realpath.c2
-rw-r--r--lib/libc/stdlib/remque.c2
-rw-r--r--lib/libc/stdlib/set_constraint_handler_s.c2
-rw-r--r--lib/libc/stdlib/strfmon.c2
-rw-r--r--lib/libc/stdlib/strtoimax.c2
-rw-r--r--lib/libc/stdlib/strtol.c2
-rw-r--r--lib/libc/stdlib/strtold.c2
-rw-r--r--lib/libc/stdlib/strtoll.c2
-rw-r--r--lib/libc/stdlib/strtonum.c2
-rw-r--r--lib/libc/stdlib/strtoq.c2
-rw-r--r--lib/libc/stdlib/strtoul.c2
-rw-r--r--lib/libc/stdlib/strtoull.c2
-rw-r--r--lib/libc/stdlib/strtoumax.c2
-rw-r--r--lib/libc/stdlib/strtouq.c2
-rw-r--r--lib/libc/stdlib/system.c2
-rw-r--r--lib/libc/stdlib/tdelete.c2
-rw-r--r--lib/libc/stdlib/tfind.c2
-rw-r--r--lib/libc/stdlib/tsearch.c2
-rw-r--r--lib/libc/stdlib/twalk.c2
-rw-r--r--lib/libc/stdtime/strftime.c2
-rw-r--r--lib/libc/stdtime/strptime.c2
-rw-r--r--lib/libc/stdtime/time32.c2
-rw-r--r--lib/libc/stdtime/timelocal.c2
-rw-r--r--lib/libc/string/bcmp.c2
-rw-r--r--lib/libc/string/bcopy.c2
-rw-r--r--lib/libc/string/bzero.c2
-rw-r--r--lib/libc/string/ffs.c2
-rw-r--r--lib/libc/string/ffsl.c2
-rw-r--r--lib/libc/string/ffsll.c2
-rw-r--r--lib/libc/string/fls.c2
-rw-r--r--lib/libc/string/flsl.c2
-rw-r--r--lib/libc/string/flsll.c2
-rw-r--r--lib/libc/string/memccpy.c2
-rw-r--r--lib/libc/string/memchr.c2
-rw-r--r--lib/libc/string/memcmp.c2
-rw-r--r--lib/libc/string/memcpy.c2
-rw-r--r--lib/libc/string/memmem.c2
-rw-r--r--lib/libc/string/memmove.c2
-rw-r--r--lib/libc/string/mempcpy.c2
-rw-r--r--lib/libc/string/memset.c2
-rw-r--r--lib/libc/string/memset_s.c2
-rw-r--r--lib/libc/string/stpcpy.c2
-rw-r--r--lib/libc/string/stpncpy.c2
-rw-r--r--lib/libc/string/strcasecmp.c2
-rw-r--r--lib/libc/string/strcasestr.c2
-rw-r--r--lib/libc/string/strcat.c2
-rw-r--r--lib/libc/string/strchr.c2
-rw-r--r--lib/libc/string/strchrnul.c2
-rw-r--r--lib/libc/string/strcmp.c2
-rw-r--r--lib/libc/string/strcoll.c2
-rw-r--r--lib/libc/string/strcpy.c2
-rw-r--r--lib/libc/string/strcspn.c2
-rw-r--r--lib/libc/string/strdup.c2
-rw-r--r--lib/libc/string/strerror.c2
-rw-r--r--lib/libc/string/strlcat.c2
-rw-r--r--lib/libc/string/strlcpy.c2
-rw-r--r--lib/libc/string/strlen.c2
-rw-r--r--lib/libc/string/strmode.c2
-rw-r--r--lib/libc/string/strncat.c2
-rw-r--r--lib/libc/string/strncmp.c2
-rw-r--r--lib/libc/string/strncpy.c2
-rw-r--r--lib/libc/string/strndup.c2
-rw-r--r--lib/libc/string/strnlen.c2
-rw-r--r--lib/libc/string/strnstr.c2
-rw-r--r--lib/libc/string/strpbrk.c2
-rw-r--r--lib/libc/string/strrchr.c2
-rw-r--r--lib/libc/string/strsep.c2
-rw-r--r--lib/libc/string/strsignal.c2
-rw-r--r--lib/libc/string/strspn.c2
-rw-r--r--lib/libc/string/strstr.c2
-rw-r--r--lib/libc/string/strtok.c2
-rw-r--r--lib/libc/string/strxfrm.c2
-rw-r--r--lib/libc/string/swab.c2
-rw-r--r--lib/libc/string/timingsafe_bcmp.c2
-rw-r--r--lib/libc/string/timingsafe_memcmp.c2
-rw-r--r--lib/libc/string/wcpcpy.c2
-rw-r--r--lib/libc/string/wcpncpy.c2
-rw-r--r--lib/libc/string/wcscasecmp.c2
-rw-r--r--lib/libc/string/wcscat.c2
-rw-r--r--lib/libc/string/wcschr.c2
-rw-r--r--lib/libc/string/wcscmp.c2
-rw-r--r--lib/libc/string/wcscoll.c2
-rw-r--r--lib/libc/string/wcscpy.c2
-rw-r--r--lib/libc/string/wcscspn.c2
-rw-r--r--lib/libc/string/wcsdup.c2
-rw-r--r--lib/libc/string/wcslcat.c2
-rw-r--r--lib/libc/string/wcslcpy.c2
-rw-r--r--lib/libc/string/wcslen.c2
-rw-r--r--lib/libc/string/wcsncasecmp.c2
-rw-r--r--lib/libc/string/wcsncat.c2
-rw-r--r--lib/libc/string/wcsncmp.c2
-rw-r--r--lib/libc/string/wcsncpy.c2
-rw-r--r--lib/libc/string/wcsnlen.c2
-rw-r--r--lib/libc/string/wcspbrk.c2
-rw-r--r--lib/libc/string/wcsrchr.c2
-rw-r--r--lib/libc/string/wcsspn.c2
-rw-r--r--lib/libc/string/wcsstr.c2
-rw-r--r--lib/libc/string/wcstok.c2
-rw-r--r--lib/libc/string/wcswidth.c2
-rw-r--r--lib/libc/string/wcsxfrm.c2
-rw-r--r--lib/libc/string/wmemchr.c2
-rw-r--r--lib/libc/string/wmemcmp.c2
-rw-r--r--lib/libc/string/wmemcpy.c2
-rw-r--r--lib/libc/string/wmemmove.c2
-rw-r--r--lib/libc/string/wmempcpy.c2
-rw-r--r--lib/libc/string/wmemset.c2
-rw-r--r--lib/libc/sys/POSIX2x_Fork.c2
-rw-r--r--lib/libc/sys/__error.c2
-rw-r--r--lib/libc/sys/__vdso_gettimeofday.c2
-rw-r--r--lib/libc/sys/accept.c2
-rw-r--r--lib/libc/sys/accept4.c2
-rw-r--r--lib/libc/sys/aio_suspend.c2
-rw-r--r--lib/libc/sys/brk.c2
-rw-r--r--lib/libc/sys/clock_gettime.c2
-rw-r--r--lib/libc/sys/clock_nanosleep.c2
-rw-r--r--lib/libc/sys/close.c2
-rw-r--r--lib/libc/sys/closefrom.c2
-rw-r--r--lib/libc/sys/connect.c2
-rw-r--r--lib/libc/sys/fcntl.c2
-rw-r--r--lib/libc/sys/fdatasync.c2
-rw-r--r--lib/libc/sys/fork.c2
-rw-r--r--lib/libc/sys/fstat.c2
-rw-r--r--lib/libc/sys/fstatat.c2
-rw-r--r--lib/libc/sys/fstatfs.c2
-rw-r--r--lib/libc/sys/fsync.c2
-rw-r--r--lib/libc/sys/getdents.c2
-rw-r--r--lib/libc/sys/getdirentries.c2
-rw-r--r--lib/libc/sys/getfsstat.c2
-rw-r--r--lib/libc/sys/gettimeofday.c2
-rw-r--r--lib/libc/sys/interposing_table.c2
-rw-r--r--lib/libc/sys/kevent.c2
-rw-r--r--lib/libc/sys/lstat.c2
-rw-r--r--lib/libc/sys/mknod.c2
-rw-r--r--lib/libc/sys/msync.c2
-rw-r--r--lib/libc/sys/nanosleep.c2
-rw-r--r--lib/libc/sys/open.c2
-rw-r--r--lib/libc/sys/openat.c2
-rw-r--r--lib/libc/sys/pdfork.c2
-rw-r--r--lib/libc/sys/poll.c2
-rw-r--r--lib/libc/sys/ppoll.c2
-rw-r--r--lib/libc/sys/pselect.c2
-rw-r--r--lib/libc/sys/ptrace.c2
-rw-r--r--lib/libc/sys/read.c2
-rw-r--r--lib/libc/sys/readv.c2
-rw-r--r--lib/libc/sys/recvfrom.c2
-rw-r--r--lib/libc/sys/recvmsg.c2
-rw-r--r--lib/libc/sys/select.c2
-rw-r--r--lib/libc/sys/sendmsg.c2
-rw-r--r--lib/libc/sys/sendto.c2
-rw-r--r--lib/libc/sys/setcontext.c2
-rw-r--r--lib/libc/sys/shm_open.c2
-rw-r--r--lib/libc/sys/sigaction.c2
-rw-r--r--lib/libc/sys/sigprocmask.c2
-rw-r--r--lib/libc/sys/sigsuspend.c2
-rw-r--r--lib/libc/sys/sigtimedwait.c2
-rw-r--r--lib/libc/sys/sigwait.c2
-rw-r--r--lib/libc/sys/sigwaitinfo.c2
-rw-r--r--lib/libc/sys/stat.c2
-rw-r--r--lib/libc/sys/statfs.c2
-rw-r--r--lib/libc/sys/swapcontext.c2
-rw-r--r--lib/libc/sys/trivial-vdso_tc.c2
-rw-r--r--lib/libc/sys/wait4.c2
-rw-r--r--lib/libc/sys/wait6.c2
-rw-r--r--lib/libc/sys/write.c2
-rw-r--r--lib/libc/sys/writev.c2
-rw-r--r--lib/libc/tests/gen/arc4random_test.c2
-rw-r--r--lib/libc/tests/gen/dir2_test.c2
-rw-r--r--lib/libc/tests/gen/dlopen_empty_test.c2
-rw-r--r--lib/libc/tests/gen/fmtcheck_test.c2
-rw-r--r--lib/libc/tests/gen/fmtmsg_test.c2
-rw-r--r--lib/libc/tests/gen/fnmatch_test.c2
-rw-r--r--lib/libc/tests/gen/fnmatch_testcases.h2
-rw-r--r--lib/libc/tests/gen/ftw_test.c2
-rw-r--r--lib/libc/tests/gen/getentropy_test.c2
-rw-r--r--lib/libc/tests/gen/getmntinfo_test.c2
-rw-r--r--lib/libc/tests/gen/glob2_test.c2
-rw-r--r--lib/libc/tests/gen/makecontext_test.c2
-rw-r--r--lib/libc/tests/gen/popen_test.c2
-rw-r--r--lib/libc/tests/gen/posix_spawn_test.c2
-rw-r--r--lib/libc/tests/gen/realpath2_test.c2
-rw-r--r--lib/libc/tests/gen/sigsetops_test.c2
-rw-r--r--lib/libc/tests/gen/test-fnmatch.c2
-rw-r--r--lib/libc/tests/gen/wordexp_test.c2
-rw-r--r--lib/libc/tests/iconv/iconvctl_test.c2
-rw-r--r--lib/libc/tests/locale/btowc_test.c2
-rw-r--r--lib/libc/tests/locale/c16rtomb_test.c2
-rw-r--r--lib/libc/tests/locale/iswctype_test.c2
-rw-r--r--lib/libc/tests/locale/mblen_test.c2
-rw-r--r--lib/libc/tests/locale/mbrlen_test.c2
-rw-r--r--lib/libc/tests/locale/mbrtoc16_test.c2
-rw-r--r--lib/libc/tests/locale/mbrtowc_test.c2
-rw-r--r--lib/libc/tests/locale/mbsnrtowcs_test.c2
-rw-r--r--lib/libc/tests/locale/mbsrtowcs_test.c2
-rw-r--r--lib/libc/tests/locale/mbstowcs_test.c2
-rw-r--r--lib/libc/tests/locale/mbtowc_test.c2
-rw-r--r--lib/libc/tests/locale/towctrans_test.c2
-rw-r--r--lib/libc/tests/locale/wcrtomb_test.c2
-rw-r--r--lib/libc/tests/locale/wcsnrtombs_test.c2
-rw-r--r--lib/libc/tests/locale/wcsrtombs_test.c2
-rw-r--r--lib/libc/tests/locale/wcstombs_test.c2
-rw-r--r--lib/libc/tests/locale/wctomb_test.c2
-rw-r--r--lib/libc/tests/nss/getaddrinfo_test.c2
-rw-r--r--lib/libc/tests/nss/getgr_test.c2
-rw-r--r--lib/libc/tests/nss/gethostby_test.c2
-rw-r--r--lib/libc/tests/nss/getproto_test.c2
-rw-r--r--lib/libc/tests/nss/getpw_test.c2
-rw-r--r--lib/libc/tests/nss/getrpc_test.c2
-rw-r--r--lib/libc/tests/nss/getserv_test.c2
-rw-r--r--lib/libc/tests/nss/getusershell_test.c2
-rw-r--r--lib/libc/tests/stdio/fdopen_test.c2
-rw-r--r--lib/libc/tests/stdio/fmemopen2_test.c2
-rw-r--r--lib/libc/tests/stdio/fopen_test.c2
-rw-r--r--lib/libc/tests/stdio/freopen_test.c2
-rw-r--r--lib/libc/tests/stdio/getdelim_test.c2
-rw-r--r--lib/libc/tests/stdio/gets_s_test.c2
-rw-r--r--lib/libc/tests/stdio/mkostemp_test.c2
-rw-r--r--lib/libc/tests/stdio/open_memstream2_test.c2
-rw-r--r--lib/libc/tests/stdio/open_wmemstream_test.c2
-rw-r--r--lib/libc/tests/stdio/perror_test.c2
-rw-r--r--lib/libc/tests/stdio/print_positional_test.c2
-rw-r--r--lib/libc/tests/stdio/printbasic_test.c2
-rw-r--r--lib/libc/tests/stdio/printfloat_test.c2
-rw-r--r--lib/libc/tests/stdio/scanfloat_test.c2
-rw-r--r--lib/libc/tests/stdlib/clearenv_test.c2
-rw-r--r--lib/libc/tests/stdlib/cxa_thread_atexit_nothr_test.cc2
-rw-r--r--lib/libc/tests/stdlib/cxa_thread_atexit_test.cc2
-rw-r--r--lib/libc/tests/stdlib/dynthr_mod/dynthr_mod.c2
-rw-r--r--lib/libc/tests/stdlib/dynthr_test.c2
-rw-r--r--lib/libc/tests/stdlib/heapsort_test.c2
-rw-r--r--lib/libc/tests/stdlib/mergesort_test.c2
-rw-r--r--lib/libc/tests/stdlib/qsort_r_compat_test.c2
-rw-r--r--lib/libc/tests/stdlib/qsort_r_test.c2
-rw-r--r--lib/libc/tests/stdlib/qsort_s_test.c2
-rw-r--r--lib/libc/tests/stdlib/qsort_test.c2
-rw-r--r--lib/libc/tests/stdlib/set_constraint_handler_s_test.c2
-rw-r--r--lib/libc/tests/stdlib/strfmon_test.c2
-rw-r--r--lib/libc/tests/stdlib/tsearch_test.c2
-rw-r--r--lib/libc/tests/string/memcmp_test.c2
-rw-r--r--lib/libc/tests/string/memset_s_test.c2
-rw-r--r--lib/libc/tests/string/stpncpy_test.c2
-rw-r--r--lib/libc/tests/string/strxfrm_test.c2
-rw-r--r--lib/libc/tests/string/wcscasecmp_test.c2
-rw-r--r--lib/libc/tests/string/wcscoll_test.c2
-rw-r--r--lib/libc/tests/string/wcsnlen_test.c2
-rw-r--r--lib/libc/tests/sys/brk_test.c2
-rw-r--r--lib/libc/tests/sys/mlock_helper.c2
-rw-r--r--lib/libc/tests/sys/queue_test.c2
-rw-r--r--lib/libc/tests/sys/sendfile_test.c2
-rw-r--r--lib/libc/uuid/uuid_stream.c2
-rw-r--r--lib/libc/x86/gen/getcontextx.c2
-rw-r--r--lib/libc/x86/sys/__vdso_gettc.c2
-rw-r--r--lib/libc/x86/sys/pkru.c2
-rw-r--r--lib/libc/xdr/xdr.c2
-rw-r--r--lib/libc/xdr/xdr_array.c2
-rw-r--r--lib/libc/xdr/xdr_float.c2
-rw-r--r--lib/libc/xdr/xdr_mem.c2
-rw-r--r--lib/libc/xdr/xdr_rec.c2
-rw-r--r--lib/libc/xdr/xdr_reference.c2
-rw-r--r--lib/libc/xdr/xdr_sizeof.c2
-rw-r--r--lib/libc/xdr/xdr_stdio.c2
-rw-r--r--lib/libc/yp/xdryp.c2
-rw-r--r--lib/libc/yp/yplib.c2
-rw-r--r--lib/libcalendar/calendar.c2
-rw-r--r--lib/libcalendar/easter.c2
-rw-r--r--lib/libcam/camlib.c2
-rw-r--r--lib/libcam/scsi_cmdparse.c2
-rw-r--r--lib/libcam/scsi_wrap.c2
-rw-r--r--lib/libcam/tests/cam_test.c2
-rw-r--r--lib/libcam/tests/libcam_test.c2
-rw-r--r--lib/libcasper/libcasper/libcasper.c2
-rw-r--r--lib/libcasper/libcasper/libcasper_service.c2
-rw-r--r--lib/libcasper/libcasper/service.c2
-rw-r--r--lib/libcasper/libcasper/zygote.c2
-rw-r--r--lib/libcasper/services/cap_dns/cap_dns.c2
-rw-r--r--lib/libcasper/services/cap_dns/tests/dns_test.c2
-rw-r--r--lib/libcasper/services/cap_fileargs/cap_fileargs.c2
-rw-r--r--lib/libcasper/services/cap_fileargs/tests/fileargs_test.c2
-rw-r--r--lib/libcasper/services/cap_grp/cap_grp.c2
-rw-r--r--lib/libcasper/services/cap_grp/tests/grp_test.c2
-rw-r--r--lib/libcasper/services/cap_net/cap_net.c2
-rw-r--r--lib/libcasper/services/cap_net/tests/net_test.c2
-rw-r--r--lib/libcasper/services/cap_netdb/cap_netdb.c2
-rw-r--r--lib/libcasper/services/cap_netdb/tests/netdb_test.c2
-rw-r--r--lib/libcasper/services/cap_pwd/cap_pwd.c2
-rw-r--r--lib/libcasper/services/cap_pwd/tests/pwd_test.c2
-rw-r--r--lib/libcasper/services/cap_sysctl/cap_sysctl.c2
-rw-r--r--lib/libcasper/services/cap_sysctl/tests/sysctl_test.c2
-rw-r--r--lib/libcasper/services/cap_syslog/cap_syslog.c2
-rw-r--r--lib/libcompat/4.1/ftime.c2
-rw-r--r--lib/libcompat/4.3/re_comp.c1
-rw-r--r--lib/libcompat/4.3/rexec.c1
-rw-r--r--lib/libcompat/4.4/cuserid.c1
-rw-r--r--lib/libcrypt/crypt-md5.c2
-rw-r--r--lib/libcrypt/crypt-nthash.c2
-rw-r--r--lib/libcrypt/crypt-sha256.c2
-rw-r--r--lib/libcrypt/crypt-sha512.c2
-rw-r--r--lib/libcrypt/crypt.c2
-rw-r--r--lib/libcrypt/misc.c2
-rw-r--r--lib/libcrypt/tests/crypt_tests.c2
-rw-r--r--lib/libdevctl/devctl.c2
-rw-r--r--lib/libdevdctl/consumer.cc3
-rw-r--r--lib/libdevdctl/event.cc3
-rw-r--r--lib/libdevdctl/event_factory.cc3
-rw-r--r--lib/libdevdctl/exception.cc3
-rw-r--r--lib/libdevdctl/guid.cc2
-rw-r--r--lib/libdevinfo/devinfo.c2
-rw-r--r--lib/libdevstat/devstat.c2
-rw-r--r--lib/libdpv/dialog_util.c2
-rw-r--r--lib/libdpv/dialogrc.c2
-rw-r--r--lib/libdpv/dprompt.c2
-rw-r--r--lib/libdpv/dpv.c2
-rw-r--r--lib/libdpv/status.c2
-rw-r--r--lib/libdpv/util.c2
-rw-r--r--lib/libefivar/efivar-dp-format.c2
-rw-r--r--lib/libefivar/efivar-dp-parse.c2
-rw-r--r--lib/libefivar/efivar-dp-xlate.c2
-rw-r--r--lib/libefivar/efivar.c2
-rw-r--r--lib/libefivar/uefi-dputil.c2
-rw-r--r--lib/libexecinfo/tests/sigtramp_test.c2
-rw-r--r--lib/libfetch/common.c2
-rw-r--r--lib/libfetch/fetch.c2
-rw-r--r--lib/libfetch/file.c2
-rw-r--r--lib/libfetch/ftp.c2
-rw-r--r--lib/libfetch/http.c2
-rw-r--r--lib/libfigpar/figpar.c2
-rw-r--r--lib/libfigpar/string_m.c2
-rw-r--r--lib/libgeom/geom_util.c2
-rw-r--r--lib/libipsec/ipsec_dump_policy.c2
-rw-r--r--lib/libipsec/ipsec_get_policylen.c2
-rw-r--r--lib/libipsec/ipsec_strerror.c2
-rw-r--r--lib/libipsec/pfkey.c2
-rw-r--r--lib/libipsec/pfkey_dump.c2
-rw-r--r--lib/libipsec/policy_parse.y2
-rw-r--r--lib/libipsec/test-policy.c2
-rw-r--r--lib/libiscsiutil/pdu.c2
-rw-r--r--lib/libjail/jail.c2
-rw-r--r--lib/libjail/jail_getid.c2
-rw-r--r--lib/libkvm/kvm.c1
-rw-r--r--lib/libkvm/kvm_amd64.c1
-rw-r--r--lib/libkvm/kvm_arm.c2
-rw-r--r--lib/libkvm/kvm_cptime.c2
-rw-r--r--lib/libkvm/kvm_getloadavg.c1
-rw-r--r--lib/libkvm/kvm_getswapinfo.c2
-rw-r--r--lib/libkvm/kvm_i386.c1
-rw-r--r--lib/libkvm/kvm_minidump_aarch64.c2
-rw-r--r--lib/libkvm/kvm_minidump_amd64.c2
-rw-r--r--lib/libkvm/kvm_minidump_arm.c2
-rw-r--r--lib/libkvm/kvm_minidump_i386.c2
-rw-r--r--lib/libkvm/kvm_minidump_powerpc64.c2
-rw-r--r--lib/libkvm/kvm_minidump_powerpc64_hpt.c2
-rw-r--r--lib/libkvm/kvm_minidump_riscv.c2
-rw-r--r--lib/libkvm/kvm_pcpu.c2
-rw-r--r--lib/libkvm/kvm_powerpc.c2
-rw-r--r--lib/libkvm/kvm_powerpc64.c2
-rw-r--r--lib/libkvm/kvm_private.c2
-rw-r--r--lib/libkvm/kvm_proc.c1
-rw-r--r--lib/libkvm/kvm_vnet.c2
-rw-r--r--lib/libkvm/tests/kvm_close_test.c2
-rw-r--r--lib/libkvm/tests/kvm_geterr_test.c2
-rw-r--r--lib/libkvm/tests/kvm_open2_test.c2
-rw-r--r--lib/libkvm/tests/kvm_open_test.c2
-rw-r--r--lib/libkvm/tests/kvm_read_test.c2
-rw-r--r--lib/libkvm/tests/kvm_test_common.c2
-rw-r--r--lib/libmd/md4c.c2
-rw-r--r--lib/libmd/md5c.c2
-rw-r--r--lib/libmd/mdXhl.c2
-rw-r--r--lib/libmd/mddriver.c2
-rw-r--r--lib/libmd/rmd160c.c2
-rw-r--r--lib/libmd/rmddriver.c2
-rw-r--r--lib/libmd/sha0c.c2
-rw-r--r--lib/libmd/sha1c.c2
-rw-r--r--lib/libmd/shadriver.c2
-rw-r--r--lib/libmd/skeindriver.c2
-rw-r--r--lib/libmp/mpasbn.c2
-rw-r--r--lib/libmp/tests/legacy_test.c2
-rw-r--r--lib/libmt/mtlib.c2
-rw-r--r--lib/libnetbsd/sockaddr_snprintf.c2
-rw-r--r--lib/libnetbsd/strsuftoll.c2
-rw-r--r--lib/libnetgraph/debug.c2
-rw-r--r--lib/libnetgraph/msg.c2
-rw-r--r--lib/libnetgraph/sock.c2
-rw-r--r--lib/libnv/msgio.c2
-rw-r--r--lib/libnv/tests/cnv_tests.cc2
-rw-r--r--lib/libnv/tests/dnv_tests.cc2
-rw-r--r--lib/libnv/tests/nv_array_tests.cc2
-rw-r--r--lib/libnv/tests/nv_tests.cc2
-rw-r--r--lib/libnv/tests/nvlist_send_recv_test.c2
-rw-r--r--lib/libopenbsd/getdtablecount.c2
-rw-r--r--lib/libopenbsd/ohash.c2
-rw-r--r--lib/libpam/modules/pam_chroot/pam_chroot.c2
-rw-r--r--lib/libpam/modules/pam_deny/pam_deny.c2
-rw-r--r--lib/libpam/modules/pam_echo/pam_echo.c2
-rw-r--r--lib/libpam/modules/pam_exec/pam_exec.c2
-rw-r--r--lib/libpam/modules/pam_ftpusers/pam_ftpusers.c2
-rw-r--r--lib/libpam/modules/pam_group/pam_group.c2
-rw-r--r--lib/libpam/modules/pam_guest/pam_guest.c2
-rw-r--r--lib/libpam/modules/pam_krb5/pam_krb5.c2
-rw-r--r--lib/libpam/modules/pam_ksu/pam_ksu.c2
-rw-r--r--lib/libpam/modules/pam_lastlog/pam_lastlog.c2
-rw-r--r--lib/libpam/modules/pam_login_access/login_access.c2
-rw-r--r--lib/libpam/modules/pam_login_access/pam_login_access.c2
-rw-r--r--lib/libpam/modules/pam_nologin/pam_nologin.c2
-rw-r--r--lib/libpam/modules/pam_permit/pam_permit.c2
-rw-r--r--lib/libpam/modules/pam_radius/pam_radius.c2
-rw-r--r--lib/libpam/modules/pam_rhosts/pam_rhosts.c2
-rw-r--r--lib/libpam/modules/pam_rootok/pam_rootok.c2
-rw-r--r--lib/libpam/modules/pam_securetty/pam_securetty.c2
-rw-r--r--lib/libpam/modules/pam_self/pam_self.c2
-rw-r--r--lib/libpam/modules/pam_ssh/pam_ssh.c2
-rw-r--r--lib/libpam/modules/pam_tacplus/pam_tacplus.c2
-rw-r--r--lib/libpam/modules/pam_unix/pam_unix.c2
-rw-r--r--lib/libpjdlog/pjdlog.c2
-rw-r--r--lib/libpmc/libpmc.c2
-rw-r--r--lib/libpmc/pmclog.c2
-rw-r--r--lib/libpmcstat/libpmcstat_event.c2
-rw-r--r--lib/libpmcstat/libpmcstat_image.c2
-rw-r--r--lib/libpmcstat/libpmcstat_logging.c2
-rw-r--r--lib/libpmcstat/libpmcstat_process.c2
-rw-r--r--lib/libpmcstat/libpmcstat_string.c2
-rw-r--r--lib/libpmcstat/libpmcstat_symbol.c2
-rw-r--r--lib/libproc/proc_bkpt.c2
-rw-r--r--lib/libproc/proc_create.c2
-rw-r--r--lib/libproc/proc_regs.c2
-rw-r--r--lib/libproc/proc_rtld.c2
-rw-r--r--lib/libproc/proc_sym.c2
-rw-r--r--lib/libproc/proc_util.c2
-rw-r--r--lib/libproc/tests/proc_test.c2
-rw-r--r--lib/libproc/tests/target_prog.c2
-rw-r--r--lib/libprocstat/cd9660.c2
-rw-r--r--lib/libprocstat/common_kvm.c2
-rw-r--r--lib/libprocstat/core.c2
-rw-r--r--lib/libprocstat/libprocstat.c2
-rw-r--r--lib/libprocstat/libprocstat_compat.c2
-rw-r--r--lib/libprocstat/msdosfs.c2
-rw-r--r--lib/libprocstat/smbfs.c2
-rw-r--r--lib/libprocstat/udf.c2
-rw-r--r--lib/libprocstat/zfs_defs.c3
-rw-r--r--lib/libradius/radlib.c2
-rw-r--r--lib/librpcsvc/rnusers.c2
-rw-r--r--lib/librpcsvc/rstat.c2
-rw-r--r--lib/librpcsvc/rwall.c2
-rw-r--r--lib/librpcsvc/secretkey.c2
-rw-r--r--lib/librpcsvc/xcrypt.c2
-rw-r--r--lib/librpcsvc/yp_passwd.c2
-rw-r--r--lib/librpcsvc/yp_update.c2
-rw-r--r--lib/librss/librss.c2
-rw-r--r--lib/librtld_db/rtld_db.c2
-rw-r--r--lib/libsbuf/tests/sbuf_core_test.c2
-rw-r--r--lib/libsbuf/tests/sbuf_stdio_test.c2
-rw-r--r--lib/libsbuf/tests/sbuf_string_test.c2
-rw-r--r--lib/libsecureboot/brf.c2
-rw-r--r--lib/libsecureboot/efi/efi_init.c2
-rw-r--r--lib/libsecureboot/efi/efi_variables.c2
-rw-r--r--lib/libsecureboot/efi/include/Guid/GlobalVariable.h2
-rw-r--r--lib/libsecureboot/efi/include/Guid/ImageAuthentication.h2
-rw-r--r--lib/libsecureboot/efi/include/Protocol/Hash.h2
-rw-r--r--lib/libsecureboot/openpgp/dearmor.c2
-rw-r--r--lib/libsecureboot/openpgp/decode.c2
-rw-r--r--lib/libsecureboot/openpgp/opgp_key.c2
-rw-r--r--lib/libsecureboot/openpgp/opgp_sig.c2
-rw-r--r--lib/libsecureboot/pass_manifest.c2
-rw-r--r--lib/libsecureboot/readfile.c2
-rw-r--r--lib/libsecureboot/tests/tvo.c2
-rw-r--r--lib/libsecureboot/vectx.c2
-rw-r--r--lib/libsecureboot/veopen.c1
-rw-r--r--lib/libsecureboot/vepcr.c2
-rw-r--r--lib/libsecureboot/verify_file.c2
-rw-r--r--lib/libsecureboot/vesigned.c2
-rw-r--r--lib/libsecureboot/veta.c2
-rw-r--r--lib/libsecureboot/vets.c2
-rw-r--r--lib/libssp/fortify_stubs.c2
-rw-r--r--lib/libssp_nonshared/libssp_nonshared.c2
-rw-r--r--lib/libstdthreads/call_once.c2
-rw-r--r--lib/libstdthreads/cnd.c2
-rw-r--r--lib/libstdthreads/mtx.c2
-rw-r--r--lib/libstdthreads/thrd.c2
-rw-r--r--lib/libstdthreads/tss.c2
-rw-r--r--lib/libsysdecode/errno.c2
-rw-r--r--lib/libsysdecode/flags.c2
-rw-r--r--lib/libsysdecode/linux.c2
-rw-r--r--lib/libsysdecode/signal.c2
-rw-r--r--lib/libsysdecode/support.c2
-rw-r--r--lib/libsysdecode/syscallnames.c2
-rw-r--r--lib/libsysdecode/utrace.c2
-rw-r--r--lib/libtacplus/taclib.c2
-rw-r--r--lib/libthr/tests/umtx_op_test.c2
-rw-r--r--lib/libthr/thread/thr_affinity.c2
-rw-r--r--lib/libthr/thread/thr_attr.c2
-rw-r--r--lib/libthr/thread/thr_autoinit.c2
-rw-r--r--lib/libthr/thread/thr_barrier.c2
-rw-r--r--lib/libthr/thread/thr_barrierattr.c2
-rw-r--r--lib/libthr/thread/thr_cancel.c2
-rw-r--r--lib/libthr/thread/thr_clean.c2
-rw-r--r--lib/libthr/thread/thr_concurrency.c2
-rw-r--r--lib/libthr/thread/thr_cond.c2
-rw-r--r--lib/libthr/thread/thr_condattr.c2
-rw-r--r--lib/libthr/thread/thr_create.c2
-rw-r--r--lib/libthr/thread/thr_ctrdtr.c2
-rw-r--r--lib/libthr/thread/thr_detach.c2
-rw-r--r--lib/libthr/thread/thr_equal.c2
-rw-r--r--lib/libthr/thread/thr_event.c2
-rw-r--r--lib/libthr/thread/thr_exit.c2
-rw-r--r--lib/libthr/thread/thr_fork.c2
-rw-r--r--lib/libthr/thread/thr_getcpuclockid.c2
-rw-r--r--lib/libthr/thread/thr_getprio.c2
-rw-r--r--lib/libthr/thread/thr_getschedparam.c2
-rw-r--r--lib/libthr/thread/thr_getthreadid_np.c2
-rw-r--r--lib/libthr/thread/thr_info.c2
-rw-r--r--lib/libthr/thread/thr_init.c2
-rw-r--r--lib/libthr/thread/thr_join.c2
-rw-r--r--lib/libthr/thread/thr_kern.c2
-rw-r--r--lib/libthr/thread/thr_kill.c2
-rw-r--r--lib/libthr/thread/thr_list.c2
-rw-r--r--lib/libthr/thread/thr_main_np.c2
-rw-r--r--lib/libthr/thread/thr_malloc.c2
-rw-r--r--lib/libthr/thread/thr_multi_np.c2
-rw-r--r--lib/libthr/thread/thr_mutex.c2
-rw-r--r--lib/libthr/thread/thr_mutexattr.c2
-rw-r--r--lib/libthr/thread/thr_once.c2
-rw-r--r--lib/libthr/thread/thr_printf.c2
-rw-r--r--lib/libthr/thread/thr_pshared.c2
-rw-r--r--lib/libthr/thread/thr_pspinlock.c2
-rw-r--r--lib/libthr/thread/thr_resume_np.c2
-rw-r--r--lib/libthr/thread/thr_rtld.c2
-rw-r--r--lib/libthr/thread/thr_rwlock.c2
-rw-r--r--lib/libthr/thread/thr_rwlockattr.c2
-rw-r--r--lib/libthr/thread/thr_self.c2
-rw-r--r--lib/libthr/thread/thr_sem.c2
-rw-r--r--lib/libthr/thread/thr_setprio.c2
-rw-r--r--lib/libthr/thread/thr_setschedparam.c2
-rw-r--r--lib/libthr/thread/thr_sig.c2
-rw-r--r--lib/libthr/thread/thr_single_np.c2
-rw-r--r--lib/libthr/thread/thr_sleepq.c2
-rw-r--r--lib/libthr/thread/thr_spec.c2
-rw-r--r--lib/libthr/thread/thr_spinlock.c2
-rw-r--r--lib/libthr/thread/thr_stack.c2
-rw-r--r--lib/libthr/thread/thr_suspend_np.c2
-rw-r--r--lib/libthr/thread/thr_switch_np.c2
-rw-r--r--lib/libthr/thread/thr_symbols.c2
-rw-r--r--lib/libthr/thread/thr_syscalls.c2
-rw-r--r--lib/libthr/thread/thr_umtx.c2
-rw-r--r--lib/libthr/thread/thr_yield.c2
-rw-r--r--lib/libthread_db/arch/aarch64/libpthread_md.c2
-rw-r--r--lib/libthread_db/arch/amd64/libpthread_md.c2
-rw-r--r--lib/libthread_db/arch/arm/libpthread_md.c2
-rw-r--r--lib/libthread_db/arch/i386/libpthread_md.c2
-rw-r--r--lib/libthread_db/arch/powerpc/libpthread_md.c2
-rw-r--r--lib/libthread_db/arch/riscv/libpthread_md.c2
-rw-r--r--lib/libthread_db/libpthread_db.c2
-rw-r--r--lib/libthread_db/libthr_db.c2
-rw-r--r--lib/libthread_db/thread_db.c2
-rw-r--r--lib/libufs/block.c2
-rw-r--r--lib/libufs/cgroup.c2
-rw-r--r--lib/libufs/inode.c2
-rw-r--r--lib/libufs/sblock.c2
-rw-r--r--lib/libufs/type.c2
-rw-r--r--lib/libulog/ulog_login.c2
-rw-r--r--lib/libulog/ulog_login_pseudo.c2
-rw-r--r--lib/libulog/utempter.c2
-rw-r--r--lib/libusbhid/data.c2
-rw-r--r--lib/libusbhid/descr.c2
-rw-r--r--lib/libusbhid/descr_compat.c2
-rw-r--r--lib/libusbhid/parse.c2
-rw-r--r--lib/libusbhid/usage.c2
-rw-r--r--lib/libutil/_secure_path.c2
-rw-r--r--lib/libutil/auth.c2
-rw-r--r--lib/libutil/expand_number.c2
-rw-r--r--lib/libutil/flopen.c2
-rw-r--r--lib/libutil/fparseln.c2
-rw-r--r--lib/libutil/getlocalbase.c2
-rw-r--r--lib/libutil/gr_util.c2
-rw-r--r--lib/libutil/hexdump.c2
-rw-r--r--lib/libutil/humanize_number.c2
-rw-r--r--lib/libutil/kinfo_getallproc.c2
-rw-r--r--lib/libutil/kinfo_getfile.c2
-rw-r--r--lib/libutil/kinfo_getproc.c2
-rw-r--r--lib/libutil/kinfo_getvmmap.c2
-rw-r--r--lib/libutil/kinfo_getvmobject.c2
-rw-r--r--lib/libutil/login_auth.c2
-rw-r--r--lib/libutil/login_cap.c2
-rw-r--r--lib/libutil/login_class.c2
-rw-r--r--lib/libutil/login_crypt.c2
-rw-r--r--lib/libutil/login_ok.c2
-rw-r--r--lib/libutil/login_times.c2
-rw-r--r--lib/libutil/login_tty.c1
-rw-r--r--lib/libutil/pidfile.c2
-rw-r--r--lib/libutil/property.c2
-rw-r--r--lib/libutil/pty.c1
-rw-r--r--lib/libutil/pw_util.c1
-rw-r--r--lib/libutil/realhostname.c2
-rw-r--r--lib/libutil/stub.c2
-rw-r--r--lib/libutil/tests/cpuset_test.c2
-rw-r--r--lib/libutil/tests/expand_number_test.c2
-rw-r--r--lib/libutil/tests/flopen_test.c2
-rw-r--r--lib/libutil/tests/grp_test.c2
-rw-r--r--lib/libutil/tests/pidfile_test.c2
-rw-r--r--lib/libutil/tests/trimdomain-nodomain_test.c2
-rw-r--r--lib/libutil/tests/trimdomain_test.c2
-rw-r--r--lib/libutil/trimdomain.c2
-rw-r--r--lib/libutil/uucplock.c1
-rw-r--r--lib/libveriexec/veriexec_get.c1
-rw-r--r--lib/libvgl/bitmap.c2
-rw-r--r--lib/libvgl/keyboard.c2
-rw-r--r--lib/libvgl/main.c2
-rw-r--r--lib/libvgl/mouse.c2
-rw-r--r--lib/libvgl/simple.c2
-rw-r--r--lib/libvgl/text.c2
-rw-r--r--lib/libvmmapi/vmmapi.c2
-rw-r--r--lib/libvmmapi/vmmapi_freebsd.c2
-rw-r--r--lib/liby/main.c2
-rw-r--r--lib/liby/yyerror.c2
-rw-r--r--lib/libz/zopen.c2
-rw-r--r--lib/msun/amd64/e_fmod.S2
-rw-r--r--lib/msun/amd64/e_fmodf.S2
-rw-r--r--lib/msun/amd64/e_fmodl.S2
-rw-r--r--lib/msun/amd64/e_remainder.S2
-rw-r--r--lib/msun/amd64/e_remainderf.S2
-rw-r--r--lib/msun/amd64/e_remainderl.S3
-rw-r--r--lib/msun/amd64/e_sqrt.S2
-rw-r--r--lib/msun/amd64/e_sqrtf.S2
-rw-r--r--lib/msun/amd64/e_sqrtl.S2
-rw-r--r--lib/msun/amd64/s_llrint.S2
-rw-r--r--lib/msun/amd64/s_llrintf.S2
-rw-r--r--lib/msun/amd64/s_llrintl.S2
-rw-r--r--lib/msun/amd64/s_logbl.S2
-rw-r--r--lib/msun/amd64/s_lrint.S1
-rw-r--r--lib/msun/amd64/s_lrintf.S1
-rw-r--r--lib/msun/amd64/s_lrintl.S2
-rw-r--r--lib/msun/amd64/s_remquo.S2
-rw-r--r--lib/msun/amd64/s_remquof.S2
-rw-r--r--lib/msun/amd64/s_remquol.S2
-rw-r--r--lib/msun/amd64/s_scalbn.S2
-rw-r--r--lib/msun/amd64/s_scalbnf.S2
-rw-r--r--lib/msun/amd64/s_scalbnl.S1
-rw-r--r--lib/msun/bsdsrc/b_exp.c2
-rw-r--r--lib/msun/bsdsrc/b_log.c2
-rw-r--r--lib/msun/bsdsrc/b_tgamma.c2
-rw-r--r--lib/msun/i387/e_exp.S2
-rw-r--r--lib/msun/i387/e_fmod.S2
-rw-r--r--lib/msun/i387/e_fmodf.S2
-rw-r--r--lib/msun/i387/e_fmodl.S2
-rw-r--r--lib/msun/i387/e_log.S2
-rw-r--r--lib/msun/i387/e_log10.S2
-rw-r--r--lib/msun/i387/e_log10f.S2
-rw-r--r--lib/msun/i387/e_logf.S2
-rw-r--r--lib/msun/i387/e_remainder.S2
-rw-r--r--lib/msun/i387/e_remainderf.S2
-rw-r--r--lib/msun/i387/e_remainderl.S3
-rw-r--r--lib/msun/i387/e_sqrt.S2
-rw-r--r--lib/msun/i387/e_sqrtf.S2
-rw-r--r--lib/msun/i387/e_sqrtl.S2
-rw-r--r--lib/msun/i387/invtrig.c2
-rw-r--r--lib/msun/i387/s_ceil.S2
-rw-r--r--lib/msun/i387/s_ceilf.S2
-rw-r--r--lib/msun/i387/s_ceill.S2
-rw-r--r--lib/msun/i387/s_copysign.S2
-rw-r--r--lib/msun/i387/s_copysignf.S2
-rw-r--r--lib/msun/i387/s_copysignl.S2
-rw-r--r--lib/msun/i387/s_cos.S2
-rw-r--r--lib/msun/i387/s_finite.S2
-rw-r--r--lib/msun/i387/s_floor.S2
-rw-r--r--lib/msun/i387/s_floorf.S2
-rw-r--r--lib/msun/i387/s_floorl.S2
-rw-r--r--lib/msun/i387/s_llrint.S2
-rw-r--r--lib/msun/i387/s_llrintf.S2
-rw-r--r--lib/msun/i387/s_llrintl.S2
-rw-r--r--lib/msun/i387/s_logb.S2
-rw-r--r--lib/msun/i387/s_logbf.S2
-rw-r--r--lib/msun/i387/s_logbl.S2
-rw-r--r--lib/msun/i387/s_lrint.S2
-rw-r--r--lib/msun/i387/s_lrintf.S2
-rw-r--r--lib/msun/i387/s_lrintl.S2
-rw-r--r--lib/msun/i387/s_remquo.S2
-rw-r--r--lib/msun/i387/s_remquof.S2
-rw-r--r--lib/msun/i387/s_remquol.S2
-rw-r--r--lib/msun/i387/s_rint.S2
-rw-r--r--lib/msun/i387/s_rintf.S2
-rw-r--r--lib/msun/i387/s_rintl.S2
-rw-r--r--lib/msun/i387/s_scalbn.S2
-rw-r--r--lib/msun/i387/s_scalbnf.S2
-rw-r--r--lib/msun/i387/s_scalbnl.S2
-rw-r--r--lib/msun/i387/s_significand.S2
-rw-r--r--lib/msun/i387/s_significandf.S2
-rw-r--r--lib/msun/i387/s_sin.S2
-rw-r--r--lib/msun/i387/s_tan.S2
-rw-r--r--lib/msun/i387/s_trunc.S2
-rw-r--r--lib/msun/i387/s_truncf.S2
-rw-r--r--lib/msun/i387/s_truncl.S2
-rw-r--r--lib/msun/ld128/e_lgammal_r.c2
-rw-r--r--lib/msun/ld128/e_powl.c2
-rw-r--r--lib/msun/ld128/e_rem_pio2l.h2
-rw-r--r--lib/msun/ld128/invtrig.c2
-rw-r--r--lib/msun/ld128/k_cosl.c2
-rw-r--r--lib/msun/ld128/k_expl.h2
-rw-r--r--lib/msun/ld128/k_sinl.c2
-rw-r--r--lib/msun/ld128/k_tanl.c2
-rw-r--r--lib/msun/ld128/s_cexpl.c2
-rw-r--r--lib/msun/ld128/s_erfl.c2
-rw-r--r--lib/msun/ld128/s_exp2l.c2
-rw-r--r--lib/msun/ld128/s_expl.c2
-rw-r--r--lib/msun/ld128/s_logl.c2
-rw-r--r--lib/msun/ld80/e_lgammal_r.c2
-rw-r--r--lib/msun/ld80/e_powl.c4
-rw-r--r--lib/msun/ld80/e_rem_pio2l.h2
-rw-r--r--lib/msun/ld80/invtrig.c2
-rw-r--r--lib/msun/ld80/k_cosl.c2
-rw-r--r--lib/msun/ld80/k_expl.h2
-rw-r--r--lib/msun/ld80/k_sinl.c2
-rw-r--r--lib/msun/ld80/k_tanl.c2
-rw-r--r--lib/msun/ld80/s_cexpl.c2
-rw-r--r--lib/msun/ld80/s_erfl.c2
-rw-r--r--lib/msun/ld80/s_exp2l.c2
-rw-r--r--lib/msun/ld80/s_expl.c2
-rw-r--r--lib/msun/ld80/s_logl.c2
-rw-r--r--lib/msun/src/catrig.c2
-rw-r--r--lib/msun/src/catrigf.c2
-rw-r--r--lib/msun/src/catrigl.c2
-rw-r--r--lib/msun/src/e_acos.c2
-rw-r--r--lib/msun/src/e_acosf.c2
-rw-r--r--lib/msun/src/e_acosh.c2
-rw-r--r--lib/msun/src/e_acoshf.c2
-rw-r--r--lib/msun/src/e_acoshl.c2
-rw-r--r--lib/msun/src/e_acosl.c2
-rw-r--r--lib/msun/src/e_asin.c2
-rw-r--r--lib/msun/src/e_asinf.c2
-rw-r--r--lib/msun/src/e_asinl.c2
-rw-r--r--lib/msun/src/e_atan2.c2
-rw-r--r--lib/msun/src/e_atan2f.c2
-rw-r--r--lib/msun/src/e_atan2l.c2
-rw-r--r--lib/msun/src/e_atanh.c2
-rw-r--r--lib/msun/src/e_atanhf.c2
-rw-r--r--lib/msun/src/e_atanhl.c2
-rw-r--r--lib/msun/src/e_cosh.c2
-rw-r--r--lib/msun/src/e_coshf.c2
-rw-r--r--lib/msun/src/e_coshl.c2
-rw-r--r--lib/msun/src/e_exp.c2
-rw-r--r--lib/msun/src/e_expf.c2
-rw-r--r--lib/msun/src/e_fmod.c2
-rw-r--r--lib/msun/src/e_fmodf.c2
-rw-r--r--lib/msun/src/e_fmodl.c2
-rw-r--r--lib/msun/src/e_gamma.c2
-rw-r--r--lib/msun/src/e_gamma_r.c2
-rw-r--r--lib/msun/src/e_gammaf.c2
-rw-r--r--lib/msun/src/e_gammaf_r.c2
-rw-r--r--lib/msun/src/e_hypot.c2
-rw-r--r--lib/msun/src/e_hypotf.c2
-rw-r--r--lib/msun/src/e_hypotl.c2
-rw-r--r--lib/msun/src/e_j0.c2
-rw-r--r--lib/msun/src/e_j0f.c2
-rw-r--r--lib/msun/src/e_j1.c2
-rw-r--r--lib/msun/src/e_j1f.c2
-rw-r--r--lib/msun/src/e_jn.c2
-rw-r--r--lib/msun/src/e_jnf.c2
-rw-r--r--lib/msun/src/e_lgamma.c2
-rw-r--r--lib/msun/src/e_lgamma_r.c2
-rw-r--r--lib/msun/src/e_lgammaf.c2
-rw-r--r--lib/msun/src/e_lgammaf_r.c2
-rw-r--r--lib/msun/src/e_lgammal.c2
-rw-r--r--lib/msun/src/e_log.c2
-rw-r--r--lib/msun/src/e_log10.c2
-rw-r--r--lib/msun/src/e_log10f.c2
-rw-r--r--lib/msun/src/e_log2.c2
-rw-r--r--lib/msun/src/e_log2f.c2
-rw-r--r--lib/msun/src/e_logf.c2
-rw-r--r--lib/msun/src/e_pow.c2
-rw-r--r--lib/msun/src/e_powf.c2
-rw-r--r--lib/msun/src/e_rem_pio2.c2
-rw-r--r--lib/msun/src/e_rem_pio2f.c2
-rw-r--r--lib/msun/src/e_remainder.c2
-rw-r--r--lib/msun/src/e_remainderf.c2
-rw-r--r--lib/msun/src/e_remainderl.c2
-rw-r--r--lib/msun/src/e_scalb.c2
-rw-r--r--lib/msun/src/e_scalbf.c2
-rw-r--r--lib/msun/src/e_sinh.c2
-rw-r--r--lib/msun/src/e_sinhf.c2
-rw-r--r--lib/msun/src/e_sinhl.c2
-rw-r--r--lib/msun/src/e_sqrt.c2
-rw-r--r--lib/msun/src/e_sqrtl.c2
-rw-r--r--lib/msun/src/k_cos.c2
-rw-r--r--lib/msun/src/k_cosf.c1
-rw-r--r--lib/msun/src/k_exp.c2
-rw-r--r--lib/msun/src/k_expf.c2
-rw-r--r--lib/msun/src/k_log.h2
-rw-r--r--lib/msun/src/k_logf.h2
-rw-r--r--lib/msun/src/k_rem_pio2.c2
-rw-r--r--lib/msun/src/k_sin.c2
-rw-r--r--lib/msun/src/k_sincos.h2
-rw-r--r--lib/msun/src/k_sincosf.h2
-rw-r--r--lib/msun/src/k_sincosl.h2
-rw-r--r--lib/msun/src/k_sinf.c1
-rw-r--r--lib/msun/src/k_tan.c2
-rw-r--r--lib/msun/src/k_tanf.c1
-rw-r--r--lib/msun/src/s_asinh.c2
-rw-r--r--lib/msun/src/s_asinhf.c2
-rw-r--r--lib/msun/src/s_asinhl.c2
-rw-r--r--lib/msun/src/s_atan.c2
-rw-r--r--lib/msun/src/s_atanf.c2
-rw-r--r--lib/msun/src/s_atanl.c2
-rw-r--r--lib/msun/src/s_carg.c2
-rw-r--r--lib/msun/src/s_cargf.c2
-rw-r--r--lib/msun/src/s_cargl.c2
-rw-r--r--lib/msun/src/s_cbrt.c2
-rw-r--r--lib/msun/src/s_cbrtf.c2
-rw-r--r--lib/msun/src/s_cbrtl.c2
-rw-r--r--lib/msun/src/s_ccosh.c2
-rw-r--r--lib/msun/src/s_ccoshf.c2
-rw-r--r--lib/msun/src/s_ceil.c2
-rw-r--r--lib/msun/src/s_ceilf.c2
-rw-r--r--lib/msun/src/s_ceill.c2
-rw-r--r--lib/msun/src/s_cexp.c2
-rw-r--r--lib/msun/src/s_cexpf.c2
-rw-r--r--lib/msun/src/s_clog.c2
-rw-r--r--lib/msun/src/s_clogf.c2
-rw-r--r--lib/msun/src/s_clogl.c2
-rw-r--r--lib/msun/src/s_copysign.c2
-rw-r--r--lib/msun/src/s_copysignf.c2
-rw-r--r--lib/msun/src/s_cos.c2
-rw-r--r--lib/msun/src/s_cosf.c2
-rw-r--r--lib/msun/src/s_cosl.c2
-rw-r--r--lib/msun/src/s_cpow.c2
-rw-r--r--lib/msun/src/s_cpowf.c2
-rw-r--r--lib/msun/src/s_cpowl.c2
-rw-r--r--lib/msun/src/s_cproj.c2
-rw-r--r--lib/msun/src/s_cprojf.c2
-rw-r--r--lib/msun/src/s_cprojl.c2
-rw-r--r--lib/msun/src/s_csinh.c2
-rw-r--r--lib/msun/src/s_csinhf.c2
-rw-r--r--lib/msun/src/s_csqrt.c2
-rw-r--r--lib/msun/src/s_csqrtf.c2
-rw-r--r--lib/msun/src/s_csqrtl.c2
-rw-r--r--lib/msun/src/s_ctanh.c2
-rw-r--r--lib/msun/src/s_ctanhf.c2
-rw-r--r--lib/msun/src/s_erf.c2
-rw-r--r--lib/msun/src/s_erff.c2
-rw-r--r--lib/msun/src/s_exp2.c2
-rw-r--r--lib/msun/src/s_exp2f.c2
-rw-r--r--lib/msun/src/s_expm1.c2
-rw-r--r--lib/msun/src/s_expm1f.c2
-rw-r--r--lib/msun/src/s_fabs.c2
-rw-r--r--lib/msun/src/s_fabsf.c2
-rw-r--r--lib/msun/src/s_fdim.c2
-rw-r--r--lib/msun/src/s_finite.c2
-rw-r--r--lib/msun/src/s_finitef.c2
-rw-r--r--lib/msun/src/s_floor.c2
-rw-r--r--lib/msun/src/s_floorf.c2
-rw-r--r--lib/msun/src/s_floorl.c2
-rw-r--r--lib/msun/src/s_fma.c2
-rw-r--r--lib/msun/src/s_fmaf.c2
-rw-r--r--lib/msun/src/s_fmal.c2
-rw-r--r--lib/msun/src/s_fmax.c2
-rw-r--r--lib/msun/src/s_fmaxf.c2
-rw-r--r--lib/msun/src/s_fmaxl.c2
-rw-r--r--lib/msun/src/s_fmin.c2
-rw-r--r--lib/msun/src/s_fminf.c2
-rw-r--r--lib/msun/src/s_fminl.c2
-rw-r--r--lib/msun/src/s_frexp.c2
-rw-r--r--lib/msun/src/s_frexpf.c2
-rw-r--r--lib/msun/src/s_ilogb.c2
-rw-r--r--lib/msun/src/s_ilogbf.c2
-rw-r--r--lib/msun/src/s_ilogbl.c2
-rw-r--r--lib/msun/src/s_llrint.c2
-rw-r--r--lib/msun/src/s_llrintf.c2
-rw-r--r--lib/msun/src/s_llrintl.c2
-rw-r--r--lib/msun/src/s_llround.c2
-rw-r--r--lib/msun/src/s_llroundf.c2
-rw-r--r--lib/msun/src/s_llroundl.c2
-rw-r--r--lib/msun/src/s_log1p.c2
-rw-r--r--lib/msun/src/s_log1pf.c2
-rw-r--r--lib/msun/src/s_logb.c2
-rw-r--r--lib/msun/src/s_logbf.c2
-rw-r--r--lib/msun/src/s_logbl.c2
-rw-r--r--lib/msun/src/s_lrint.c1
-rw-r--r--lib/msun/src/s_lrintf.c2
-rw-r--r--lib/msun/src/s_lrintl.c2
-rw-r--r--lib/msun/src/s_lround.c1
-rw-r--r--lib/msun/src/s_lroundf.c2
-rw-r--r--lib/msun/src/s_lroundl.c2
-rw-r--r--lib/msun/src/s_modff.c2
-rw-r--r--lib/msun/src/s_nearbyint.c2
-rw-r--r--lib/msun/src/s_nextafter.c2
-rw-r--r--lib/msun/src/s_nextafterf.c2
-rw-r--r--lib/msun/src/s_nextafterl.c2
-rw-r--r--lib/msun/src/s_nexttoward.c2
-rw-r--r--lib/msun/src/s_nexttowardf.c2
-rw-r--r--lib/msun/src/s_remquo.c2
-rw-r--r--lib/msun/src/s_remquof.c2
-rw-r--r--lib/msun/src/s_remquol.c2
-rw-r--r--lib/msun/src/s_rint.c2
-rw-r--r--lib/msun/src/s_rintf.c2
-rw-r--r--lib/msun/src/s_rintl.c2
-rw-r--r--lib/msun/src/s_round.c2
-rw-r--r--lib/msun/src/s_roundf.c2
-rw-r--r--lib/msun/src/s_roundl.c2
-rw-r--r--lib/msun/src/s_scalbln.c2
-rw-r--r--lib/msun/src/s_significand.c2
-rw-r--r--lib/msun/src/s_significandf.c2
-rw-r--r--lib/msun/src/s_sin.c2
-rw-r--r--lib/msun/src/s_sincos.c2
-rw-r--r--lib/msun/src/s_sincosf.c2
-rw-r--r--lib/msun/src/s_sincosl.c2
-rw-r--r--lib/msun/src/s_sinf.c2
-rw-r--r--lib/msun/src/s_sinl.c2
-rw-r--r--lib/msun/src/s_tan.c2
-rw-r--r--lib/msun/src/s_tanf.c2
-rw-r--r--lib/msun/src/s_tanh.c2
-rw-r--r--lib/msun/src/s_tanhf.c2
-rw-r--r--lib/msun/src/s_tanhl.c2
-rw-r--r--lib/msun/src/s_tanl.c2
-rw-r--r--lib/msun/src/s_tgammaf.c2
-rw-r--r--lib/msun/src/s_trunc.c2
-rw-r--r--lib/msun/src/s_truncf.c2
-rw-r--r--lib/msun/src/s_truncl.c2
-rw-r--r--lib/msun/src/w_cabs.c2
-rw-r--r--lib/msun/src/w_cabsl.c2
-rw-r--r--lib/msun/tests/cexp_test.c2
-rw-r--r--lib/msun/tests/conj_test.c2
-rw-r--r--lib/msun/tests/csqrt_test.c2
-rw-r--r--lib/msun/tests/ctrig_test.c2
-rw-r--r--lib/msun/tests/exponential_test.c2
-rw-r--r--lib/msun/tests/fenv_test.c2
-rw-r--r--lib/msun/tests/fma_test.c2
-rw-r--r--lib/msun/tests/fmaxmin_test.c2
-rw-r--r--lib/msun/tests/invctrig_test.c2
-rw-r--r--lib/msun/tests/invtrig_test.c2
-rw-r--r--lib/msun/tests/logarithm_test.c2
-rw-r--r--lib/msun/tests/lrint_test.c2
-rw-r--r--lib/msun/tests/lround_test.c2
-rw-r--r--lib/msun/tests/nan_test.c2
-rw-r--r--lib/msun/tests/nearbyint_test.c2
-rw-r--r--lib/msun/tests/next_test.c2
-rw-r--r--lib/msun/tests/rem_test.c2
-rw-r--r--lib/msun/tests/trig_test.c2
-rw-r--r--libexec/bootpd/bootpd.c2
-rw-r--r--libexec/bootpd/bootpgw/bootpgw.c2
-rw-r--r--libexec/bootpd/rtmsg.c2
-rw-r--r--libexec/bootpd/tools/bootptest/bootptest.c2
-rw-r--r--libexec/flua/modules/lfs.c2
-rw-r--r--libexec/flua/modules/lposix.c2
-rw-r--r--libexec/ftpd/ftpcmd.y2
-rw-r--r--libexec/ftpd/ftpd.c2
-rw-r--r--libexec/ftpd/logwtmp.c2
-rw-r--r--libexec/ftpd/popen.c2
-rw-r--r--libexec/getty/chat.c2
-rw-r--r--libexec/getty/main.c2
-rw-r--r--libexec/phttpget/phttpget.c2
-rw-r--r--libexec/rbootd/rbootd.c2
-rw-r--r--libexec/rpc.rquotad/rquotad.c2
-rw-r--r--libexec/rpc.rwalld/rwalld.c2
-rw-r--r--libexec/rtld-elf/aarch64/reloc.c2
-rw-r--r--libexec/rtld-elf/aarch64/rtld_start.S2
-rw-r--r--libexec/rtld-elf/arm/reloc.c1
-rw-r--r--libexec/rtld-elf/arm/rtld_start.S2
-rw-r--r--libexec/rtld-elf/riscv/reloc.c2
-rw-r--r--libexec/rtld-elf/riscv/rtld_start.S2
-rw-r--r--libexec/rtld-elf/rtld.c2
-rw-r--r--libexec/tftpd/tests/functional.c2
-rw-r--r--libexec/tftpd/tftp-file.c2
-rw-r--r--libexec/tftpd/tftp-file.h2
-rw-r--r--libexec/tftpd/tftp-io.c2
-rw-r--r--libexec/tftpd/tftp-io.h2
-rw-r--r--libexec/tftpd/tftp-options.c2
-rw-r--r--libexec/tftpd/tftp-options.h2
-rw-r--r--libexec/tftpd/tftp-transfer.c2
-rw-r--r--libexec/tftpd/tftp-transfer.h2
-rw-r--r--libexec/tftpd/tftp-utils.c2
-rw-r--r--libexec/tftpd/tftp-utils.h2
-rw-r--r--libexec/tftpd/tftpd.c2
-rw-r--r--libexec/ulog-helper/ulog-helper.c2
-rw-r--r--libexec/ypxfr/yp_dbwrite.c2
-rw-r--r--libexec/ypxfr/ypxfr_getmap.c2
-rw-r--r--libexec/ypxfr/ypxfr_main.c2
-rw-r--r--libexec/ypxfr/ypxfr_misc.c2
-rw-r--r--libexec/ypxfr/ypxfrd_getmap.c2
-rw-r--r--sbin/adjkerntz/adjkerntz.c2
-rw-r--r--sbin/bectl/bectl.c2
-rw-r--r--sbin/bectl/bectl_jail.c2
-rw-r--r--sbin/bectl/bectl_list.c2
-rw-r--r--sbin/bsdlabel/bsdlabel.c2
-rw-r--r--sbin/camcontrol/attrib.c2
-rw-r--r--sbin/camcontrol/camcontrol.c2
-rw-r--r--sbin/camcontrol/depop.c2
-rw-r--r--sbin/camcontrol/epc.c2
-rw-r--r--sbin/camcontrol/fwdownload.c2
-rw-r--r--sbin/camcontrol/modeedit.c2
-rw-r--r--sbin/camcontrol/persist.c2
-rw-r--r--sbin/camcontrol/progress.c2
-rw-r--r--sbin/camcontrol/timestamp.c2
-rw-r--r--sbin/camcontrol/util.c2
-rw-r--r--sbin/camcontrol/zone.c2
-rw-r--r--sbin/ccdconfig/ccdconfig.c2
-rw-r--r--sbin/clri/clri.c2
-rw-r--r--sbin/comcontrol/comcontrol.c2
-rw-r--r--sbin/conscontrol/conscontrol.c2
-rw-r--r--sbin/ddb/ddb.c2
-rw-r--r--sbin/ddb/ddb_capture.c2
-rw-r--r--sbin/ddb/ddb_script.c2
-rw-r--r--sbin/decryptcore/decryptcore.c2
-rw-r--r--sbin/devd/devd.cc2
-rw-r--r--sbin/devd/tests/client_test.c2
-rw-r--r--sbin/devfs/devfs.c2
-rw-r--r--sbin/devfs/rule.c2
-rw-r--r--sbin/devmatch/devmatch.c2
-rw-r--r--sbin/dhclient/alloc.c2
-rw-r--r--sbin/dhclient/bpf.c2
-rw-r--r--sbin/dhclient/clparse.c2
-rw-r--r--sbin/dhclient/conflex.c2
-rw-r--r--sbin/dhclient/convert.c2
-rw-r--r--sbin/dhclient/dhclient.c2
-rw-r--r--sbin/dhclient/dispatch.c2
-rw-r--r--sbin/dhclient/errwarn.c2
-rw-r--r--sbin/dhclient/hash.c2
-rw-r--r--sbin/dhclient/inet.c2
-rw-r--r--sbin/dhclient/options.c2
-rw-r--r--sbin/dhclient/packet.c2
-rw-r--r--sbin/dhclient/parse.c2
-rw-r--r--sbin/dhclient/privsep.c2
-rw-r--r--sbin/dhclient/tables.c2
-rw-r--r--sbin/dhclient/tree.c2
-rw-r--r--sbin/dmesg/dmesg.c2
-rw-r--r--sbin/dumpon/dumpon.c2
-rw-r--r--sbin/etherswitchcfg/etherswitchcfg.c2
-rw-r--r--sbin/fdisk/fdisk.c2
-rw-r--r--sbin/fdisk/fdisk_mbr_enc.c2
-rw-r--r--sbin/fsck/fsck.c2
-rw-r--r--sbin/fsck/fsutil.c2
-rw-r--r--sbin/fsck_ffs/dir.c2
-rw-r--r--sbin/fsck_ffs/ea.c2
-rw-r--r--sbin/fsck_ffs/fsutil.c2
-rw-r--r--sbin/fsck_ffs/gjournal.c2
-rw-r--r--sbin/fsck_ffs/globs.c2
-rw-r--r--sbin/fsck_ffs/inode.c2
-rw-r--r--sbin/fsck_ffs/main.c2
-rw-r--r--sbin/fsck_ffs/pass1.c2
-rw-r--r--sbin/fsck_ffs/pass1b.c2
-rw-r--r--sbin/fsck_ffs/pass2.c2
-rw-r--r--sbin/fsck_ffs/pass3.c2
-rw-r--r--sbin/fsck_ffs/pass4.c2
-rw-r--r--sbin/fsck_ffs/pass5.c2
-rw-r--r--sbin/fsck_ffs/setup.c2
-rw-r--r--sbin/fsck_ffs/suj.c2
-rw-r--r--sbin/fsck_ffs/utilities.c2
-rw-r--r--sbin/geom/core/geom.c2
-rw-r--r--sbin/geom/misc/subr.c2
-rw-r--r--sbin/growfs/growfs.c2
-rw-r--r--sbin/hastctl/hastctl.c2
-rw-r--r--sbin/hastd/activemap.c2
-rw-r--r--sbin/hastd/control.c2
-rw-r--r--sbin/hastd/ebuf.c2
-rw-r--r--sbin/hastd/event.c2
-rw-r--r--sbin/hastd/hast_checksum.c2
-rw-r--r--sbin/hastd/hast_compression.c2
-rw-r--r--sbin/hastd/hast_proto.c2
-rw-r--r--sbin/hastd/hastd.c2
-rw-r--r--sbin/hastd/hooks.c2
-rw-r--r--sbin/hastd/metadata.c2
-rw-r--r--sbin/hastd/nv.c2
-rw-r--r--sbin/hastd/pjdlog.c2
-rw-r--r--sbin/hastd/primary.c2
-rw-r--r--sbin/hastd/proto.c2
-rw-r--r--sbin/hastd/proto_common.c2
-rw-r--r--sbin/hastd/proto_socketpair.c2
-rw-r--r--sbin/hastd/proto_tcp.c2
-rw-r--r--sbin/hastd/proto_uds.c2
-rw-r--r--sbin/hastd/rangelock.c2
-rw-r--r--sbin/hastd/secondary.c2
-rw-r--r--sbin/hastd/subr.c2
-rw-r--r--sbin/ifconfig/ifgre.c2
-rw-r--r--sbin/ifconfig/ifipsec.c2
-rw-r--r--sbin/ifconfig/ifvxlan.c2
-rw-r--r--sbin/ipfw/nat64clat.c2
-rw-r--r--sbin/ipfw/nat64lsn.c2
-rw-r--r--sbin/ipfw/nat64stl.c2
-rw-r--r--sbin/ipfw/nptv6.c2
-rw-r--r--sbin/kldconfig/kldconfig.c2
-rw-r--r--sbin/kldload/kldload.c2
-rw-r--r--sbin/kldstat/kldstat.c2
-rw-r--r--sbin/kldunload/kldunload.c2
-rw-r--r--sbin/md5/md5.c2
-rw-r--r--sbin/mdmfs/mdmfs.c2
-rw-r--r--sbin/mount/getmntopts.c2
-rw-r--r--sbin/mount/mount.c2
-rw-r--r--sbin/mount/vfslist.c2
-rw-r--r--sbin/mount_fusefs/mount_fusefs.c2
-rw-r--r--sbin/mount_nfs/mount_nfs.c2
-rw-r--r--sbin/natd/natd.c2
-rw-r--r--sbin/newfs/mkfs.c2
-rw-r--r--sbin/newfs/newfs.c2
-rw-r--r--sbin/nfsiod/nfsiod.c2
-rw-r--r--sbin/nvmecontrol/comnd.c2
-rw-r--r--sbin/nvmecontrol/devlist.c2
-rw-r--r--sbin/nvmecontrol/firmware.c2
-rw-r--r--sbin/nvmecontrol/format.c2
-rw-r--r--sbin/nvmecontrol/identify.c2
-rw-r--r--sbin/nvmecontrol/identify_ext.c2
-rw-r--r--sbin/nvmecontrol/logpage.c2
-rw-r--r--sbin/nvmecontrol/modules/intel/intel.c2
-rw-r--r--sbin/nvmecontrol/modules/samsung/samsung.c2
-rw-r--r--sbin/nvmecontrol/modules/wdc/wdc.c2
-rw-r--r--sbin/nvmecontrol/nc_util.c2
-rw-r--r--sbin/nvmecontrol/ns.c2
-rw-r--r--sbin/nvmecontrol/nsid.c2
-rw-r--r--sbin/nvmecontrol/nvmecontrol.c2
-rw-r--r--sbin/nvmecontrol/passthru.c2
-rw-r--r--sbin/nvmecontrol/perftest.c2
-rw-r--r--sbin/nvmecontrol/power.c2
-rw-r--r--sbin/nvmecontrol/reset.c2
-rw-r--r--sbin/nvmecontrol/resv.c2
-rw-r--r--sbin/nvmecontrol/sanitize.c2
-rw-r--r--sbin/nvmecontrol/selftest.c2
-rw-r--r--sbin/pfctl/parse.y2
-rw-r--r--sbin/pfctl/pf_print_state.c2
-rw-r--r--sbin/pfctl/pf_ruleset.c2
-rw-r--r--sbin/pfctl/pfctl.c2
-rw-r--r--sbin/pfctl/pfctl_altq.c2
-rw-r--r--sbin/pfctl/pfctl_optimize.c2
-rw-r--r--sbin/pfctl/pfctl_osfp.c2
-rw-r--r--sbin/pfctl/pfctl_parser.c2
-rw-r--r--sbin/pfctl/pfctl_qstats.c2
-rw-r--r--sbin/pfctl/pfctl_radix.c2
-rw-r--r--sbin/pfctl/pfctl_table.c2
-rw-r--r--sbin/pfctl/tests/pfctl_test.c2
-rw-r--r--sbin/pfilctl/pfilctl.c2
-rw-r--r--sbin/ping/main.c2
-rw-r--r--sbin/ping/ping.c2
-rw-r--r--sbin/ping/ping6.c2
-rw-r--r--sbin/ping/tests/in_cksum_test.c2
-rw-r--r--sbin/ping/utils.c2
-rw-r--r--sbin/quotacheck/quotacheck.c2
-rw-r--r--sbin/rcorder/rcorder.c2
-rw-r--r--sbin/reboot/reboot.c2
-rw-r--r--sbin/restore/interactive.c2
-rw-r--r--sbin/restore/main.c2
-rw-r--r--sbin/restore/restore.c2
-rw-r--r--sbin/restore/tape.c2
-rw-r--r--sbin/route/route.c2
-rw-r--r--sbin/savecore/savecore.c2
-rw-r--r--sbin/shutdown/shutdown.c2
-rw-r--r--sbin/swapon/swapon.c2
-rw-r--r--sbin/sysctl/sysctl.c2
-rw-r--r--sbin/tunefs/tunefs.c2
-rw-r--r--sbin/veriexec/veriexec.c2
-rw-r--r--sbin/zfsbootcfg/zfsbootcfg.c2
-rw-r--r--secure/lib/libcrypt/blowfish.c2
-rw-r--r--secure/lib/libcrypt/crypt-blowfish.c2
-rw-r--r--secure/lib/libcrypt/crypt-des.c2
-rw-r--r--share/examples/kld/firmware/fwconsumer/fw_consumer.c2
-rw-r--r--share/examples/kld/khelp/h_example.c2
-rw-r--r--share/examples/kld/random_adaptor/random_adaptor_example.c2
-rw-r--r--stand/arm64/libarm64/cache.c2
-rw-r--r--stand/common/bcache.c2
-rw-r--r--stand/common/boot.c2
-rw-r--r--stand/common/commands.c2
-rw-r--r--stand/common/console.c2
-rw-r--r--stand/common/dev_net.c2
-rw-r--r--stand/common/devopen.c2
-rw-r--r--stand/common/disk.c2
-rw-r--r--stand/common/gfx_fb_stub.c2
-rw-r--r--stand/common/install.c2
-rw-r--r--stand/common/interp.c2
-rw-r--r--stand/common/interp_backslash.c2
-rw-r--r--stand/common/interp_forth.c2
-rw-r--r--stand/common/interp_lua.c2
-rw-r--r--stand/common/interp_parse.c2
-rw-r--r--stand/common/interp_simple.c2
-rw-r--r--stand/common/isapnp.c2
-rw-r--r--stand/common/load_elf.c2
-rw-r--r--stand/common/load_elf32.c2
-rw-r--r--stand/common/load_elf32_obj.c2
-rw-r--r--stand/common/load_elf64.c2
-rw-r--r--stand/common/load_elf64_obj.c2
-rw-r--r--stand/common/load_elf_obj.c2
-rw-r--r--stand/common/ls.c2
-rw-r--r--stand/common/md.c2
-rw-r--r--stand/common/metadata.c2
-rw-r--r--stand/common/misc.c2
-rw-r--r--stand/common/module.c2
-rw-r--r--stand/common/part.c2
-rw-r--r--stand/common/pnp.c2
-rw-r--r--stand/common/reloc_elf.c2
-rw-r--r--stand/common/reloc_elf32.c2
-rw-r--r--stand/common/reloc_elf64.c2
-rw-r--r--stand/common/self_reloc.c2
-rw-r--r--stand/common/tslog.c2
-rw-r--r--stand/common/vdisk.c2
-rw-r--r--stand/common/zfs_cmd.c2
-rw-r--r--stand/efi/boot1/boot1.c2
-rw-r--r--stand/efi/boot1/proto.c2
-rw-r--r--stand/efi/fdt/efi_fdt.c2
-rw-r--r--stand/efi/gptboot/proto.c2
-rw-r--r--stand/efi/libefi/delay.c2
-rw-r--r--stand/efi/libefi/devicename.c2
-rw-r--r--stand/efi/libefi/devpath.c2
-rw-r--r--stand/efi/libefi/efi_console.c2
-rw-r--r--stand/efi/libefi/efichar.c2
-rw-r--r--stand/efi/libefi/eficom.c2
-rw-r--r--stand/efi/libefi/efienv.c2
-rw-r--r--stand/efi/libefi/efihttp.c2
-rw-r--r--stand/efi/libefi/efinet.c2
-rw-r--r--stand/efi/libefi/efipart.c2
-rw-r--r--stand/efi/libefi/efizfs.c2
-rw-r--r--stand/efi/libefi/env.c2
-rw-r--r--stand/efi/libefi/errno.c2
-rw-r--r--stand/efi/libefi/handles.c2
-rw-r--r--stand/efi/libefi/libefi.c2
-rw-r--r--stand/efi/libefi/time.c2
-rw-r--r--stand/efi/libefi/time_arm64.c2
-rw-r--r--stand/efi/libefi/time_event.c2
-rw-r--r--stand/efi/libefi/wchar.c2
-rw-r--r--stand/efi/loader/arch/amd64/elf64_freebsd.c2
-rw-r--r--stand/efi/loader/arch/amd64/trap.c2
-rw-r--r--stand/efi/loader/arch/arm/exec.c2
-rw-r--r--stand/efi/loader/arch/arm64/exec.c2
-rw-r--r--stand/efi/loader/arch/riscv/exec.c2
-rw-r--r--stand/efi/loader/autoload.c2
-rw-r--r--stand/efi/loader/bootinfo.c2
-rw-r--r--stand/efi/loader/conf.c2
-rw-r--r--stand/efi/loader/copy.c2
-rw-r--r--stand/efi/loader/efi_main.c2
-rw-r--r--stand/efi/loader/framebuffer.c2
-rw-r--r--stand/efi/loader/main.c2
-rw-r--r--stand/fdt/fdt_loader_cmd.c2
-rw-r--r--stand/i386/boot2/boot2.c2
-rw-r--r--stand/i386/common/cons.c2
-rw-r--r--stand/i386/common/drv.c2
-rw-r--r--stand/i386/gptboot/gptboot.c2
-rw-r--r--stand/i386/isoboot/isoboot.c2
-rw-r--r--stand/i386/libi386/bio.c2
-rw-r--r--stand/i386/libi386/biosacpi.c2
-rw-r--r--stand/i386/libi386/biosdisk.c2
-rw-r--r--stand/i386/libi386/biosmem.c2
-rw-r--r--stand/i386/libi386/biospci.c2
-rw-r--r--stand/i386/libi386/biospnp.c2
-rw-r--r--stand/i386/libi386/biossmap.c2
-rw-r--r--stand/i386/libi386/bootinfo.c2
-rw-r--r--stand/i386/libi386/bootinfo32.c2
-rw-r--r--stand/i386/libi386/bootinfo64.c2
-rw-r--r--stand/i386/libi386/comconsole.c2
-rw-r--r--stand/i386/libi386/devicename.c2
-rw-r--r--stand/i386/libi386/elf32_freebsd.c2
-rw-r--r--stand/i386/libi386/elf64_freebsd.c2
-rw-r--r--stand/i386/libi386/i386_copy.c2
-rw-r--r--stand/i386/libi386/i386_module.c2
-rw-r--r--stand/i386/libi386/multiboot.c2
-rw-r--r--stand/i386/libi386/nullconsole.c2
-rw-r--r--stand/i386/libi386/pread.c2
-rw-r--r--stand/i386/libi386/pxe.c2
-rw-r--r--stand/i386/libi386/spinconsole.c2
-rw-r--r--stand/i386/libi386/time.c2
-rw-r--r--stand/i386/libi386/vidconsole.c2
-rw-r--r--stand/i386/loader/chain.c2
-rw-r--r--stand/i386/loader/conf.c2
-rw-r--r--stand/i386/loader/main.c2
-rw-r--r--stand/i386/zfsboot/zfsboot.c2
-rw-r--r--stand/kboot/arch/aarch64/exec.c2
-rw-r--r--stand/kboot/arch/amd64/elf64_freebsd.c2
-rw-r--r--stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c2
-rw-r--r--stand/kboot/conf.c2
-rw-r--r--stand/kboot/hostcons.c2
-rw-r--r--stand/kboot/hostdisk.c2
-rw-r--r--stand/kboot/kbootfdt.c2
-rw-r--r--stand/kboot/main.c2
-rw-r--r--stand/liblua/lerrno.c2
-rw-r--r--stand/liblua/lpager.c2
-rw-r--r--stand/liblua/lstd.c2
-rw-r--r--stand/liblua/lutils.c2
-rw-r--r--stand/libofw/devicename.c2
-rw-r--r--stand/libofw/ofw_console.c2
-rw-r--r--stand/libofw/ofw_copy.c2
-rw-r--r--stand/libofw/ofw_disk.c2
-rw-r--r--stand/libofw/ofw_memory.c2
-rw-r--r--stand/libofw/ofw_module.c2
-rw-r--r--stand/libofw/ofw_net.c2
-rw-r--r--stand/libofw/ofw_reboot.c2
-rw-r--r--stand/libofw/ofw_time.c2
-rw-r--r--stand/libofw/openfirm.c2
-rw-r--r--stand/libsa/__main.c2
-rw-r--r--stand/libsa/abort.c2
-rw-r--r--stand/libsa/amd64/_setjmp.S2
-rw-r--r--stand/libsa/arp.c2
-rw-r--r--stand/libsa/assert.c2
-rw-r--r--stand/libsa/bcd.c2
-rw-r--r--stand/libsa/bootp.c2
-rw-r--r--stand/libsa/bootparam.c2
-rw-r--r--stand/libsa/bzipfs.c2
-rw-r--r--stand/libsa/cd9660.c2
-rw-r--r--stand/libsa/cd9660read.c2
-rw-r--r--stand/libsa/close.c2
-rw-r--r--stand/libsa/closeall.c2
-rw-r--r--stand/libsa/dev.c2
-rw-r--r--stand/libsa/dosfs.c2
-rw-r--r--stand/libsa/environment.c2
-rw-r--r--stand/libsa/ether.c2
-rw-r--r--stand/libsa/ext2fs.c2
-rw-r--r--stand/libsa/fstat.c2
-rw-r--r--stand/libsa/geli/pwgets.c2
-rw-r--r--stand/libsa/getopt.c2
-rw-r--r--stand/libsa/gets.c2
-rw-r--r--stand/libsa/globals.c2
-rw-r--r--stand/libsa/gpt.c2
-rw-r--r--stand/libsa/gzipfs.c2
-rw-r--r--stand/libsa/hexdump.c2
-rw-r--r--stand/libsa/in_cksum.c2
-rw-r--r--stand/libsa/inet_ntoa.c2
-rw-r--r--stand/libsa/ioctl.c2
-rw-r--r--stand/libsa/ip.c2
-rw-r--r--stand/libsa/lseek.c2
-rw-r--r--stand/libsa/mount.c2
-rw-r--r--stand/libsa/net.c2
-rw-r--r--stand/libsa/netif.c2
-rw-r--r--stand/libsa/nfs.c2
-rw-r--r--stand/libsa/nullfs.c2
-rw-r--r--stand/libsa/nvstore.c2
-rw-r--r--stand/libsa/open.c2
-rw-r--r--stand/libsa/pager.c2
-rw-r--r--stand/libsa/panic.c2
-rw-r--r--stand/libsa/pkgfs.c2
-rw-r--r--stand/libsa/preload.c2
-rw-r--r--stand/libsa/printf.c2
-rw-r--r--stand/libsa/random.c2
-rw-r--r--stand/libsa/rarp.c2
-rw-r--r--stand/libsa/read.c2
-rw-r--r--stand/libsa/readdir.c2
-rw-r--r--stand/libsa/rpc.c2
-rw-r--r--stand/libsa/sbrk.c2
-rw-r--r--stand/libsa/smbios.c2
-rw-r--r--stand/libsa/splitfs.c2
-rw-r--r--stand/libsa/stat.c2
-rw-r--r--stand/libsa/strcasecmp.c2
-rw-r--r--stand/libsa/strdup.c2
-rw-r--r--stand/libsa/strerror.c2
-rw-r--r--stand/libsa/tftp.c2
-rw-r--r--stand/libsa/time.c2
-rw-r--r--stand/libsa/tslog.c2
-rw-r--r--stand/libsa/twiddle.c2
-rw-r--r--stand/libsa/udp.c2
-rw-r--r--stand/libsa/ufs.c2
-rw-r--r--stand/libsa/ufsread.c2
-rw-r--r--stand/libsa/write.c2
-rw-r--r--stand/libsa/x86/hypervisor.c2
-rw-r--r--stand/libsa/zalloc.c2
-rw-r--r--stand/libsa/zalloc_malloc.c2
-rw-r--r--stand/libsa/zfs/nvlist.c2
-rw-r--r--stand/libsa/zfs/zfs.c2
-rw-r--r--stand/libsa/zfs/zfsimpl.c2
-rw-r--r--stand/powerpc/boot1.chrp/boot1.c2
-rw-r--r--stand/powerpc/ofw/cas.c2
-rw-r--r--stand/powerpc/ofw/conf.c2
-rw-r--r--stand/powerpc/ofw/elf_freebsd.c2
-rw-r--r--stand/powerpc/ofw/main.c2
-rw-r--r--stand/powerpc/ofw/ofwfdt.c2
-rw-r--r--stand/powerpc/ofw/ppc64_elf_freebsd.c2
-rw-r--r--stand/powerpc/ofw/start.c2
-rw-r--r--stand/uboot/arch/arm/conf.c2
-rw-r--r--stand/uboot/arch/powerpc/conf.c2
-rw-r--r--stand/uboot/arch/powerpc/ppc64_elf_freebsd.c2
-rw-r--r--stand/uboot/copy.c1
-rw-r--r--stand/uboot/devicename.c2
-rw-r--r--stand/uboot/elf_freebsd.c2
-rw-r--r--stand/uboot/glue.c2
-rw-r--r--stand/uboot/main.c1
-rw-r--r--stand/uboot/net.c2
-rw-r--r--stand/uboot/reboot.c2
-rw-r--r--stand/uboot/time.c2
-rw-r--r--stand/uboot/uboot_console.c2
-rw-r--r--stand/uboot/uboot_disk.c2
-rw-r--r--stand/uboot/uboot_fdt.c2
-rw-r--r--stand/uboot/uboot_module.c2
-rw-r--r--stand/userboot/userboot/autoload.c2
-rw-r--r--stand/userboot/userboot/biossmap.c2
-rw-r--r--stand/userboot/userboot/bootinfo.c2
-rw-r--r--stand/userboot/userboot/bootinfo32.c2
-rw-r--r--stand/userboot/userboot/bootinfo64.c2
-rw-r--r--stand/userboot/userboot/conf.c2
-rw-r--r--stand/userboot/userboot/copy.c2
-rw-r--r--stand/userboot/userboot/devicename.c2
-rw-r--r--stand/userboot/userboot/elf32_freebsd.c2
-rw-r--r--stand/userboot/userboot/elf64_freebsd.c2
-rw-r--r--stand/userboot/userboot/host.c2
-rw-r--r--stand/userboot/userboot/main.c2
-rw-r--r--stand/userboot/userboot/userboot_cons.c2
-rw-r--r--stand/userboot/userboot/userboot_disk.c2
-rw-r--r--tests/sys/capsicum/bindat_connectat.c2
-rw-r--r--tests/sys/capsicum/ioctls_test.c2
-rw-r--r--tests/sys/devrandom/uint128_test.c2
-rw-r--r--tests/sys/fifo/fifo_kqueue.c2
-rw-r--r--tests/sys/file/closefrom_test.c2
-rw-r--r--tests/sys/kern/acct/acct_test.c2
-rw-r--r--tests/sys/kern/fdgrowtable_test.c2
-rw-r--r--tests/sys/kern/kcov.c2
-rw-r--r--tests/sys/kern/kern_copyin.c2
-rw-r--r--tests/sys/kern/kern_descrip_test.c2
-rw-r--r--tests/sys/kern/kill_zombie.c2
-rw-r--r--tests/sys/kern/pdeathsig.c2
-rw-r--r--tests/sys/kern/pdeathsig_helper.c2
-rw-r--r--tests/sys/kern/pipe/pipe_kqueue_test.c2
-rw-r--r--tests/sys/kern/ptrace_test.c2
-rw-r--r--tests/sys/kern/reaper.c2
-rw-r--r--tests/sys/kern/sched_affinity.c2
-rw-r--r--tests/sys/kern/sigaltstack.c2
-rw-r--r--tests/sys/kern/sigwait.c2
-rw-r--r--tests/sys/kern/socket_msg_trunc.c2
-rw-r--r--tests/sys/kern/subr_physmem_test.c2
-rw-r--r--tests/sys/kern/sys_getrandom.c2
-rw-r--r--tests/sys/kern/unix_passfd_test.c2
-rw-r--r--tests/sys/kern/unix_seqpacket_test.c2
-rw-r--r--tests/sys/kern/unix_socketpair_test.c2
-rw-r--r--tests/sys/kern/waitpid_nohang.c2
-rw-r--r--tests/sys/net/routing/test_rtsock_ops.c2
-rw-r--r--tests/sys/netinet/ip_reass_test.c2
-rw-r--r--tests/sys/netinet/so_reuseport_lb_test.c2
-rw-r--r--tests/sys/netinet/socket_afinet.c2
-rw-r--r--tests/sys/netinet/tcp6_v4mapped_bind_test.c2
-rw-r--r--tests/sys/netinet/tcp_connect_port_test.c2
-rw-r--r--tests/sys/posixshm/memfd_test.c2
-rw-r--r--tests/sys/posixshm/posixshm_test.c2
-rw-r--r--tests/sys/vfs/lookup_cap_dotdot.c2
-rw-r--r--tests/sys/vm/mlock_test.c2
-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/fspacectl.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
-rw-r--r--usr.bin/apply/apply.c2
-rw-r--r--usr.bin/ar/acplex.l2
-rw-r--r--usr.bin/ar/acpyacc.y2
-rw-r--r--usr.bin/ar/ar.c2
-rw-r--r--usr.bin/ar/read.c2
-rw-r--r--usr.bin/ar/util.c2
-rw-r--r--usr.bin/ar/write.c2
-rw-r--r--usr.bin/asa/asa.c2
-rw-r--r--usr.bin/at/at.c2
-rw-r--r--usr.bin/at/panic.c2
-rw-r--r--usr.bin/at/parsetime.c2
-rw-r--r--usr.bin/at/perm.c2
-rw-r--r--usr.bin/banner/banner.c2
-rw-r--r--usr.bin/basename/basename.c2
-rw-r--r--usr.bin/bc/bc.y2
-rw-r--r--usr.bin/bc/scan.l2
-rw-r--r--usr.bin/biff/biff.c2
-rw-r--r--usr.bin/bintrans/uudecode.c2
-rw-r--r--usr.bin/bintrans/uuencode.c2
-rw-r--r--usr.bin/brandelf/brandelf.c2
-rw-r--r--usr.bin/bsdiff/bsdiff/bsdiff.c2
-rw-r--r--usr.bin/bsdiff/bspatch/bspatch.c2
-rw-r--r--usr.bin/c89/c89.c2
-rw-r--r--usr.bin/c99/c99.c2
-rw-r--r--usr.bin/caesar/caesar.c2
-rw-r--r--usr.bin/calendar/calendar.c2
-rw-r--r--usr.bin/calendar/dates.c2
-rw-r--r--usr.bin/calendar/day.c2
-rw-r--r--usr.bin/calendar/events.c2
-rw-r--r--usr.bin/calendar/io.c2
-rw-r--r--usr.bin/calendar/locale.c2
-rw-r--r--usr.bin/calendar/ostern.c2
-rw-r--r--usr.bin/calendar/parsedata.c2
-rw-r--r--usr.bin/calendar/paskha.c2
-rw-r--r--usr.bin/calendar/pom.c2
-rw-r--r--usr.bin/calendar/sunpos.c2
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.c2
-rw-r--r--usr.bin/chat/chat.c2
-rw-r--r--usr.bin/chkey/chkey.c2
-rw-r--r--usr.bin/chpass/chpass.c2
-rw-r--r--usr.bin/chpass/edit.c2
-rw-r--r--usr.bin/chpass/field.c2
-rw-r--r--usr.bin/chpass/table.c2
-rw-r--r--usr.bin/chpass/util.c2
-rw-r--r--usr.bin/cksum/cksum.c2
-rw-r--r--usr.bin/cksum/crc.c2
-rw-r--r--usr.bin/cksum/crc32.c2
-rw-r--r--usr.bin/cksum/print.c2
-rw-r--r--usr.bin/cksum/sum1.c2
-rw-r--r--usr.bin/cksum/sum2.c2
-rw-r--r--usr.bin/cmp/cmp.c2
-rw-r--r--usr.bin/cmp/link.c2
-rw-r--r--usr.bin/cmp/misc.c2
-rw-r--r--usr.bin/cmp/regular.c2
-rw-r--r--usr.bin/cmp/special.c2
-rw-r--r--usr.bin/col/col.c2
-rw-r--r--usr.bin/colrm/colrm.c2
-rw-r--r--usr.bin/column/column.c2
-rw-r--r--usr.bin/comm/comm.c2
-rw-r--r--usr.bin/compress/compress.c2
-rw-r--r--usr.bin/compress/zopen.c2
-rw-r--r--usr.bin/csplit/csplit.c2
-rw-r--r--usr.bin/ctags/C.c2
-rw-r--r--usr.bin/ctags/ctags.c2
-rw-r--r--usr.bin/ctags/fortran.c2
-rw-r--r--usr.bin/ctags/lisp.c2
-rw-r--r--usr.bin/ctags/print.c2
-rw-r--r--usr.bin/ctags/tree.c2
-rw-r--r--usr.bin/ctags/yacc.c2
-rw-r--r--usr.bin/ctlstat/ctlstat.c2
-rw-r--r--usr.bin/cut/cut.c2
-rw-r--r--usr.bin/dc/bcode.c2
-rw-r--r--usr.bin/dc/dc.c2
-rw-r--r--usr.bin/dc/inout.c2
-rw-r--r--usr.bin/dc/mem.c2
-rw-r--r--usr.bin/dc/stack.c2
-rw-r--r--usr.bin/diff/diff.c2
-rw-r--r--usr.bin/diff/diffdir.c2
-rw-r--r--usr.bin/diff/diffreg.c2
-rw-r--r--usr.bin/diff/pr.c2
-rw-r--r--usr.bin/diff/xmalloc.c2
-rw-r--r--usr.bin/diff3/diff3.c2
-rw-r--r--usr.bin/dirname/dirname.c2
-rw-r--r--usr.bin/dpv/dpv.c2
-rw-r--r--usr.bin/du/du.c2
-rw-r--r--usr.bin/elfctl/elfctl.c3
-rw-r--r--usr.bin/elfdump/elfdump.c2
-rw-r--r--usr.bin/enigma/enigma.c2
-rw-r--r--usr.bin/env/env.c2
-rw-r--r--usr.bin/env/envopts.c2
-rw-r--r--usr.bin/etdump/etdump.c2
-rw-r--r--usr.bin/etdump/output_shell.c2
-rw-r--r--usr.bin/etdump/output_text.c2
-rw-r--r--usr.bin/expand/expand.c2
-rw-r--r--usr.bin/factor/factor.c1
-rw-r--r--usr.bin/false/false.c2
-rw-r--r--usr.bin/fetch/fetch.c2
-rw-r--r--usr.bin/file2c/file2c.c2
-rw-r--r--usr.bin/find/find.c2
-rw-r--r--usr.bin/find/function.c2
-rw-r--r--usr.bin/find/getdate.y2
-rw-r--r--usr.bin/find/ls.c2
-rw-r--r--usr.bin/find/main.c2
-rw-r--r--usr.bin/find/misc.c2
-rw-r--r--usr.bin/find/operator.c2
-rw-r--r--usr.bin/find/option.c2
-rw-r--r--usr.bin/finger/finger.c2
-rw-r--r--usr.bin/finger/lprint.c2
-rw-r--r--usr.bin/finger/net.c2
-rw-r--r--usr.bin/finger/sprint.c2
-rw-r--r--usr.bin/finger/util.c2
-rw-r--r--usr.bin/fmt/fmt.c2
-rw-r--r--usr.bin/fold/fold.c2
-rw-r--r--usr.bin/fortune/fortune/fortune.c2
-rw-r--r--usr.bin/fortune/strfile/strfile.c2
-rw-r--r--usr.bin/fortune/unstr/unstr.c2
-rw-r--r--usr.bin/from/from.c2
-rw-r--r--usr.bin/fstat/fstat.c2
-rw-r--r--usr.bin/fstat/fuser.c2
-rw-r--r--usr.bin/fstat/main.c2
-rw-r--r--usr.bin/fsync/fsync.c2
-rw-r--r--usr.bin/gcore/elfcore.c2
-rw-r--r--usr.bin/gcore/gcore.c2
-rw-r--r--usr.bin/gencat/gencat.c2
-rw-r--r--usr.bin/getaddrinfo/getaddrinfo.c2
-rw-r--r--usr.bin/getconf/getconf.c2
-rw-r--r--usr.bin/getent/getent.c2
-rw-r--r--usr.bin/getopt/getopt.c2
-rw-r--r--usr.bin/gprof/arcs.c2
-rw-r--r--usr.bin/gprof/dfn.c2
-rw-r--r--usr.bin/gprof/elf.c2
-rw-r--r--usr.bin/gprof/gprof.c2
-rw-r--r--usr.bin/gprof/hertz.c2
-rw-r--r--usr.bin/gprof/kernel.c2
-rw-r--r--usr.bin/gprof/lookup.c2
-rw-r--r--usr.bin/gprof/printgprof.c2
-rw-r--r--usr.bin/gprof/printlist.c2
-rw-r--r--usr.bin/grep/file.c2
-rw-r--r--usr.bin/grep/grep.c2
-rw-r--r--usr.bin/grep/queue.c2
-rw-r--r--usr.bin/grep/util.c2
-rw-r--r--usr.bin/gzip/gzip.c1
-rw-r--r--usr.bin/gzip/unxz.c2
-rw-r--r--usr.bin/head/head.c2
-rw-r--r--usr.bin/hesinfo/hesinfo.c2
-rw-r--r--usr.bin/hexdump/conv.c2
-rw-r--r--usr.bin/hexdump/display.c2
-rw-r--r--usr.bin/hexdump/hexdump.c2
-rw-r--r--usr.bin/hexdump/hexsyntax.c2
-rw-r--r--usr.bin/hexdump/odsyntax.c2
-rw-r--r--usr.bin/hexdump/parse.c2
-rw-r--r--usr.bin/id/id.c2
-rw-r--r--usr.bin/ident/ident.c2
-rw-r--r--usr.bin/indent/args.c2
-rw-r--r--usr.bin/indent/indent.c2
-rw-r--r--usr.bin/indent/indent.h1
-rw-r--r--usr.bin/indent/io.c2
-rw-r--r--usr.bin/indent/lexi.c2
-rw-r--r--usr.bin/indent/parse.c2
-rw-r--r--usr.bin/indent/pr_comment.c2
-rw-r--r--usr.bin/ipcrm/ipcrm.c2
-rw-r--r--usr.bin/ipcs/ipc.c2
-rw-r--r--usr.bin/ipcs/ipcs.c2
-rw-r--r--usr.bin/iscsictl/iscsictl.c2
-rw-r--r--usr.bin/iscsictl/periphs.c2
-rw-r--r--usr.bin/join/join.c2
-rw-r--r--usr.bin/jot/jot.c2
-rw-r--r--usr.bin/kdump/kdump.c2
-rw-r--r--usr.bin/kdump/linux.c2
-rw-r--r--usr.bin/keylogin/keylogin.c2
-rw-r--r--usr.bin/keylogout/keylogout.c2
-rw-r--r--usr.bin/killall/killall.c2
-rw-r--r--usr.bin/ktrace/ktrace.c2
-rw-r--r--usr.bin/ktrace/subr.c2
-rw-r--r--usr.bin/ktrdump/ktrdump.c2
-rw-r--r--usr.bin/lam/lam.c2
-rw-r--r--usr.bin/last/last.c2
-rw-r--r--usr.bin/lastcomm/lastcomm.c2
-rw-r--r--usr.bin/lastcomm/readrec.c2
-rw-r--r--usr.bin/ldd/ldd.c2
-rw-r--r--usr.bin/leave/leave.c2
-rw-r--r--usr.bin/limits/limits.c2
-rw-r--r--usr.bin/localedef/charmap.c2
-rw-r--r--usr.bin/localedef/collate.c2
-rw-r--r--usr.bin/localedef/ctype.c2
-rw-r--r--usr.bin/localedef/localedef.c2
-rw-r--r--usr.bin/localedef/messages.c2
-rw-r--r--usr.bin/localedef/monetary.c2
-rw-r--r--usr.bin/localedef/numeric.c2
-rw-r--r--usr.bin/localedef/scanner.c2
-rw-r--r--usr.bin/localedef/time.c2
-rw-r--r--usr.bin/localedef/wide.c2
-rw-r--r--usr.bin/lock/lock.c2
-rw-r--r--usr.bin/lockf/lockf.c2
-rw-r--r--usr.bin/logger/logger.c2
-rw-r--r--usr.bin/login/login.c2
-rw-r--r--usr.bin/login/login_audit.c2
-rw-r--r--usr.bin/login/login_fbtab.c2
-rw-r--r--usr.bin/logins/logins.c2
-rw-r--r--usr.bin/logname/logname.c2
-rw-r--r--usr.bin/look/look.c2
-rw-r--r--usr.bin/lsvfs/lsvfs.c2
-rw-r--r--usr.bin/m4/eval.c3
-rw-r--r--usr.bin/m4/expr.c2
-rw-r--r--usr.bin/m4/gnum4.c2
-rw-r--r--usr.bin/m4/look.c2
-rw-r--r--usr.bin/m4/main.c2
-rw-r--r--usr.bin/m4/misc.c2
-rw-r--r--usr.bin/m4/trace.c2
-rw-r--r--usr.bin/mail/cmd1.c2
-rw-r--r--usr.bin/mail/cmd2.c2
-rw-r--r--usr.bin/mail/cmd3.c2
-rw-r--r--usr.bin/mail/cmdtab.c2
-rw-r--r--usr.bin/mail/collect.c2
-rw-r--r--usr.bin/mail/edit.c2
-rw-r--r--usr.bin/mail/fio.c2
-rw-r--r--usr.bin/mail/getname.c2
-rw-r--r--usr.bin/mail/head.c2
-rw-r--r--usr.bin/mail/lex.c2
-rw-r--r--usr.bin/mail/list.c2
-rw-r--r--usr.bin/mail/main.c2
-rw-r--r--usr.bin/mail/names.c2
-rw-r--r--usr.bin/mail/popen.c2
-rw-r--r--usr.bin/mail/quit.c2
-rw-r--r--usr.bin/mail/send.c2
-rw-r--r--usr.bin/mail/strings.c2
-rw-r--r--usr.bin/mail/temp.c2
-rw-r--r--usr.bin/mail/tty.c2
-rw-r--r--usr.bin/mail/util.c2
-rw-r--r--usr.bin/mail/v7.local.c2
-rw-r--r--usr.bin/mail/vars.c2
-rw-r--r--usr.bin/mail/version.c2
-rw-r--r--usr.bin/mesg/mesg.c2
-rw-r--r--usr.bin/ministat/ministat.c2
-rw-r--r--usr.bin/mkfifo/mkfifo.c2
-rw-r--r--usr.bin/mkimg/apm.c2
-rw-r--r--usr.bin/mkimg/bsd.c2
-rw-r--r--usr.bin/mkimg/ebr.c2
-rw-r--r--usr.bin/mkimg/format.c2
-rw-r--r--usr.bin/mkimg/gpt.c2
-rw-r--r--usr.bin/mkimg/image.c2
-rw-r--r--usr.bin/mkimg/mbr.c2
-rw-r--r--usr.bin/mkimg/mkimg.c2
-rw-r--r--usr.bin/mkimg/qcow.c2
-rw-r--r--usr.bin/mkimg/raw.c2
-rw-r--r--usr.bin/mkimg/scheme.c2
-rw-r--r--usr.bin/mkimg/uuid.c2
-rw-r--r--usr.bin/mkimg/vhd.c2
-rw-r--r--usr.bin/mkimg/vhdx.c2
-rw-r--r--usr.bin/mkimg/vmdk.c2
-rw-r--r--usr.bin/mkstr/mkstr.c2
-rw-r--r--usr.bin/mkuzip/mkuz_blk.c2
-rw-r--r--usr.bin/mkuzip/mkuz_blockcache.c2
-rw-r--r--usr.bin/mkuzip/mkuz_conveyor.c2
-rw-r--r--usr.bin/mkuzip/mkuz_fqueue.c2
-rw-r--r--usr.bin/mkuzip/mkuz_insize.c2
-rw-r--r--usr.bin/mkuzip/mkuz_lzma.c2
-rw-r--r--usr.bin/mkuzip/mkuz_time.c2
-rw-r--r--usr.bin/mkuzip/mkuz_zlib.c2
-rw-r--r--usr.bin/mkuzip/mkuz_zstd.c2
-rw-r--r--usr.bin/mkuzip/mkuzip.c2
-rw-r--r--usr.bin/msgs/msgs.c2
-rw-r--r--usr.bin/mt/mt.c2
-rw-r--r--usr.bin/ncal/ncal.c2
-rw-r--r--usr.bin/netstat/bpf.c2
-rw-r--r--usr.bin/netstat/common.c2
-rw-r--r--usr.bin/netstat/if.c2
-rw-r--r--usr.bin/netstat/inet.c2
-rw-r--r--usr.bin/netstat/inet6.c2
-rw-r--r--usr.bin/netstat/ipsec.c2
-rw-r--r--usr.bin/netstat/main.c2
-rw-r--r--usr.bin/netstat/mbuf.c2
-rw-r--r--usr.bin/netstat/mroute.c2
-rw-r--r--usr.bin/netstat/mroute6.c2
-rw-r--r--usr.bin/netstat/netgraph.c2
-rw-r--r--usr.bin/netstat/nhgrp.c1
-rw-r--r--usr.bin/netstat/pfkey.c2
-rw-r--r--usr.bin/netstat/route.c2
-rw-r--r--usr.bin/netstat/route_netlink.c2
-rw-r--r--usr.bin/netstat/sctp.c2
-rw-r--r--usr.bin/netstat/unix.c2
-rw-r--r--usr.bin/newgrp/newgrp.c2
-rw-r--r--usr.bin/newkey/generic.c2
-rw-r--r--usr.bin/newkey/newkey.c2
-rw-r--r--usr.bin/newkey/update.c2
-rw-r--r--usr.bin/nice/nice.c2
-rw-r--r--usr.bin/nohup/nohup.c2
-rw-r--r--usr.bin/passwd/passwd.c2
-rw-r--r--usr.bin/paste/paste.c2
-rw-r--r--usr.bin/pathchk/pathchk.c2
-rw-r--r--usr.bin/perror/perror.c2
-rw-r--r--usr.bin/pom/pom.c2
-rw-r--r--usr.bin/posixshmcontrol/posixshmcontrol.c2
-rw-r--r--usr.bin/pr/egetopt.c2
-rw-r--r--usr.bin/pr/pr.c2
-rw-r--r--usr.bin/primes/spsp.c2
-rw-r--r--usr.bin/printenv/printenv.c2
-rw-r--r--usr.bin/proccontrol/proccontrol.c2
-rw-r--r--usr.bin/procstat/procstat.c2
-rw-r--r--usr.bin/procstat/procstat_args.c2
-rw-r--r--usr.bin/procstat/procstat_auxv.c2
-rw-r--r--usr.bin/procstat/procstat_basic.c2
-rw-r--r--usr.bin/procstat/procstat_bin.c2
-rw-r--r--usr.bin/procstat/procstat_cred.c2
-rw-r--r--usr.bin/procstat/procstat_cs.c2
-rw-r--r--usr.bin/procstat/procstat_files.c2
-rw-r--r--usr.bin/procstat/procstat_kstack.c2
-rw-r--r--usr.bin/procstat/procstat_penv.c2
-rw-r--r--usr.bin/procstat/procstat_ptlwpinfo.c2
-rw-r--r--usr.bin/procstat/procstat_pwdx.c2
-rw-r--r--usr.bin/procstat/procstat_rlimit.c2
-rw-r--r--usr.bin/procstat/procstat_rusage.c2
-rw-r--r--usr.bin/procstat/procstat_sigs.c2
-rw-r--r--usr.bin/procstat/procstat_threads.c2
-rw-r--r--usr.bin/procstat/procstat_vm.c2
-rw-r--r--usr.bin/protect/protect.c2
-rw-r--r--usr.bin/quota/quota.c2
-rw-r--r--usr.bin/random/random.c2
-rw-r--r--usr.bin/random/randomize_fd.c2
-rw-r--r--usr.bin/rctl/rctl.c2
-rw-r--r--usr.bin/renice/renice.c2
-rw-r--r--usr.bin/resizewin/resizewin.c1
-rw-r--r--usr.bin/rev/rev.c2
-rw-r--r--usr.bin/revoke/revoke.c2
-rw-r--r--usr.bin/rpcgen/rpc_clntout.c2
-rw-r--r--usr.bin/rpcgen/rpc_cout.c2
-rw-r--r--usr.bin/rpcgen/rpc_hout.c2
-rw-r--r--usr.bin/rpcgen/rpc_main.c2
-rw-r--r--usr.bin/rpcgen/rpc_parse.c2
-rw-r--r--usr.bin/rpcgen/rpc_sample.c2
-rw-r--r--usr.bin/rpcgen/rpc_scan.c2
-rw-r--r--usr.bin/rpcgen/rpc_svcout.c2
-rw-r--r--usr.bin/rpcgen/rpc_tblout.c2
-rw-r--r--usr.bin/rpcgen/rpc_util.c2
-rw-r--r--usr.bin/rpcinfo/rpcinfo.c2
-rw-r--r--usr.bin/ruptime/ruptime.c2
-rw-r--r--usr.bin/rwall/rwall.c2
-rw-r--r--usr.bin/rwho/rwho.c2
-rw-r--r--usr.bin/script/script.c1
-rw-r--r--usr.bin/sdiff/edit.c2
-rw-r--r--usr.bin/sdiff/sdiff.c2
-rw-r--r--usr.bin/sdiotool/cam_sdio.c2
-rw-r--r--usr.bin/sdiotool/cam_sdio.h2
-rw-r--r--usr.bin/sdiotool/linux_compat.h2
-rw-r--r--usr.bin/sdiotool/linux_sdio_compat.c2
-rw-r--r--usr.bin/sdiotool/linux_sdio_compat.h2
-rw-r--r--usr.bin/sdiotool/sdiotool.c2
-rw-r--r--usr.bin/sed/compile.c2
-rw-r--r--usr.bin/sed/main.c2
-rw-r--r--usr.bin/sed/misc.c2
-rw-r--r--usr.bin/sed/process.c2
-rw-r--r--usr.bin/seq/seq.c2
-rw-r--r--usr.bin/sockstat/sockstat.c2
-rw-r--r--usr.bin/soelim/soelim.c2
-rw-r--r--usr.bin/sort/bwstring.c2
-rw-r--r--usr.bin/sort/coll.c2
-rw-r--r--usr.bin/sort/file.c2
-rw-r--r--usr.bin/sort/mem.c2
-rw-r--r--usr.bin/sort/radixsort.c2
-rw-r--r--usr.bin/sort/sort.c2
-rw-r--r--usr.bin/sort/vsort.c2
-rw-r--r--usr.bin/split/split.c2
-rw-r--r--usr.bin/stat/stat.c3
-rw-r--r--usr.bin/su/su.c2
-rw-r--r--usr.bin/systat/pigs.c2
-rw-r--r--usr.bin/systat/sctp.c2
-rw-r--r--usr.bin/systat/sysput.c2
-rw-r--r--usr.bin/systat/tcp.c2
-rw-r--r--usr.bin/systat/zarc.c2
-rw-r--r--usr.bin/tabs/tabs.c2
-rw-r--r--usr.bin/tail/reverse.c2
-rw-r--r--usr.bin/tftp/main.c2
-rw-r--r--usr.bin/tftp/tftp.c2
-rw-r--r--usr.bin/tip/libacu/biz22.c2
-rw-r--r--usr.bin/tip/libacu/biz31.c2
-rw-r--r--usr.bin/tip/libacu/courier.c2
-rw-r--r--usr.bin/tip/libacu/df.c2
-rw-r--r--usr.bin/tip/libacu/dn11.c2
-rw-r--r--usr.bin/tip/libacu/hayes.c2
-rw-r--r--usr.bin/tip/libacu/t3000.c2
-rw-r--r--usr.bin/tip/libacu/v3451.c2
-rw-r--r--usr.bin/tip/libacu/v831.c2
-rw-r--r--usr.bin/tip/libacu/ventel.c2
-rw-r--r--usr.bin/tip/tip/acu.c2
-rw-r--r--usr.bin/tip/tip/acutab.c2
-rw-r--r--usr.bin/tip/tip/cmds.c2
-rw-r--r--usr.bin/tip/tip/cmdtab.c2
-rw-r--r--usr.bin/tip/tip/cu.c2
-rw-r--r--usr.bin/tip/tip/hunt.c2
-rw-r--r--usr.bin/tip/tip/log.c2
-rw-r--r--usr.bin/tip/tip/partab.c2
-rw-r--r--usr.bin/tip/tip/remote.c2
-rw-r--r--usr.bin/tip/tip/tip.c2
-rw-r--r--usr.bin/tip/tip/tipout.c2
-rw-r--r--usr.bin/tip/tip/uucplock.c2
-rw-r--r--usr.bin/tip/tip/value.c2
-rw-r--r--usr.bin/tip/tip/vars.c2
-rw-r--r--usr.bin/tr/cmap.c2
-rw-r--r--usr.bin/tr/cset.c2
-rw-r--r--usr.bin/truss/main.c2
-rw-r--r--usr.bin/truss/setup.c2
-rw-r--r--usr.bin/truss/syscalls.c2
-rw-r--r--usr.bin/tsort/tsort.c2
-rw-r--r--usr.bin/tty/tty.c2
-rw-r--r--usr.bin/users/users.cc2
-rw-r--r--usr.bin/vmstat/vmstat.c2
-rw-r--r--usr.bin/vtfontcvt/vtfontcvt.c2
-rw-r--r--usr.bin/w/proc_compare.c2
-rw-r--r--usr.bin/wc/wc.c2
-rw-r--r--usr.bin/whereis/whereis.c3
-rw-r--r--usr.bin/who/who.c2
-rw-r--r--usr.bin/whois/whois.c2
-rw-r--r--usr.bin/write/write.c2
-rw-r--r--usr.bin/xargs/strnsubst.c2
-rw-r--r--usr.bin/xargs/xargs.c2
-rw-r--r--usr.bin/xinstall/xinstall.c2
-rw-r--r--usr.bin/ypwhich/ypwhich.c2
-rw-r--r--usr.sbin/ac/ac.c2
-rw-r--r--usr.sbin/accton/accton.c2
-rw-r--r--usr.sbin/apm/apm.c2
-rw-r--r--usr.sbin/arp/arp.c2
-rw-r--r--usr.sbin/autofs/automount.c2
-rw-r--r--usr.sbin/autofs/automountd.c2
-rw-r--r--usr.sbin/autofs/autounmountd.c2
-rw-r--r--usr.sbin/autofs/common.c2
-rw-r--r--usr.sbin/autofs/defined.c2
-rw-r--r--usr.sbin/autofs/log.c2
-rw-r--r--usr.sbin/autofs/popen.c2
-rw-r--r--usr.sbin/bhyve/acpi.c2
-rw-r--r--usr.sbin/bhyve/atkbdc.c2
-rw-r--r--usr.sbin/bhyve/audio.c2
-rw-r--r--usr.sbin/bhyve/bhyvegc.c2
-rw-r--r--usr.sbin/bhyve/bhyverun.c2
-rw-r--r--usr.sbin/bhyve/block_if.c2
-rw-r--r--usr.sbin/bhyve/bootrom.c2
-rw-r--r--usr.sbin/bhyve/config.c2
-rw-r--r--usr.sbin/bhyve/console.c2
-rw-r--r--usr.sbin/bhyve/fwctl.c2
-rw-r--r--usr.sbin/bhyve/gdb.c2
-rw-r--r--usr.sbin/bhyve/hda_codec.c2
-rw-r--r--usr.sbin/bhyve/inout.c2
-rw-r--r--usr.sbin/bhyve/ioapic.c2
-rw-r--r--usr.sbin/bhyve/iov.c2
-rw-r--r--usr.sbin/bhyve/kernemu_dev.c2
-rw-r--r--usr.sbin/bhyve/mem.c2
-rw-r--r--usr.sbin/bhyve/mevent.c2
-rw-r--r--usr.sbin/bhyve/mptbl.c2
-rw-r--r--usr.sbin/bhyve/net_backends.c2
-rw-r--r--usr.sbin/bhyve/net_utils.c2
-rw-r--r--usr.sbin/bhyve/pci_ahci.c2
-rw-r--r--usr.sbin/bhyve/pci_e82545.c2
-rw-r--r--usr.sbin/bhyve/pci_emul.c2
-rw-r--r--usr.sbin/bhyve/pci_fbuf.c2
-rw-r--r--usr.sbin/bhyve/pci_hda.c2
-rw-r--r--usr.sbin/bhyve/pci_hostbridge.c2
-rw-r--r--usr.sbin/bhyve/pci_irq.c2
-rw-r--r--usr.sbin/bhyve/pci_lpc.c2
-rw-r--r--usr.sbin/bhyve/pci_nvme.c2
-rw-r--r--usr.sbin/bhyve/pci_passthru.c2
-rw-r--r--usr.sbin/bhyve/pci_uart.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_9p.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_block.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_console.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_input.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_net.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_rnd.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_scsi.c2
-rw-r--r--usr.sbin/bhyve/pci_xhci.c2
-rw-r--r--usr.sbin/bhyve/pctestdev.c2
-rw-r--r--usr.sbin/bhyve/pm.c2
-rw-r--r--usr.sbin/bhyve/post.c2
-rw-r--r--usr.sbin/bhyve/ps2kbd.c2
-rw-r--r--usr.sbin/bhyve/ps2mouse.c2
-rw-r--r--usr.sbin/bhyve/rfb.c2
-rw-r--r--usr.sbin/bhyve/rtc.c2
-rw-r--r--usr.sbin/bhyve/smbiostbl.c2
-rw-r--r--usr.sbin/bhyve/snapshot.c2
-rw-r--r--usr.sbin/bhyve/sockstream.c2
-rw-r--r--usr.sbin/bhyve/spinup_ap.c2
-rw-r--r--usr.sbin/bhyve/task_switch.c2
-rw-r--r--usr.sbin/bhyve/uart_emul.c2
-rw-r--r--usr.sbin/bhyve/usb_emul.c2
-rw-r--r--usr.sbin/bhyve/usb_mouse.c2
-rw-r--r--usr.sbin/bhyve/vga.c2
-rw-r--r--usr.sbin/bhyve/virtio.c2
-rw-r--r--usr.sbin/bhyve/vmgenc.c2
-rw-r--r--usr.sbin/bhyve/xmsr.c2
-rw-r--r--usr.sbin/bhyvectl/bhyvectl.c2
-rw-r--r--usr.sbin/bhyveload/bhyveload.c2
-rw-r--r--usr.sbin/binmiscctl/binmiscctl.c2
-rw-r--r--usr.sbin/boot0cfg/boot0cfg.c2
-rw-r--r--usr.sbin/bootparamd/bootparamd/bootparamd.c2
-rw-r--r--usr.sbin/bootparamd/bootparamd/main.c2
-rw-r--r--usr.sbin/bootparamd/callbootd/callbootd.c2
-rw-r--r--usr.sbin/bsdinstall/distextract/distextract.c2
-rw-r--r--usr.sbin/bsdinstall/distfetch/distfetch.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c2
-rw-r--r--usr.sbin/camdd/camdd.c2
-rw-r--r--usr.sbin/cdcontrol/cdcontrol.c2
-rw-r--r--usr.sbin/chkgrp/chkgrp.c2
-rw-r--r--usr.sbin/chown/chown.c2
-rw-r--r--usr.sbin/chroot/chroot.c2
-rw-r--r--usr.sbin/clear_locks/clear_locks.c2
-rw-r--r--usr.sbin/cpucontrol/amd.c2
-rw-r--r--usr.sbin/cpucontrol/amd10h.c2
-rw-r--r--usr.sbin/cpucontrol/cpucontrol.c2
-rw-r--r--usr.sbin/cpucontrol/intel.c2
-rw-r--r--usr.sbin/cpucontrol/via.c2
-rw-r--r--usr.sbin/crunch/crunchgen/crunched_main.c2
-rw-r--r--usr.sbin/crunch/crunchgen/crunchgen.c2
-rw-r--r--usr.sbin/crunch/crunchide/crunchide.c2
-rw-r--r--usr.sbin/crunch/crunchide/exec_elf32.c2
-rw-r--r--usr.sbin/crunch/crunchide/exec_elf64.c2
-rw-r--r--usr.sbin/ctladm/ctladm.c2
-rw-r--r--usr.sbin/ctladm/util.c2
-rw-r--r--usr.sbin/ctld/ctld.c2
-rw-r--r--usr.sbin/ctld/discovery.c2
-rw-r--r--usr.sbin/ctld/isns.c2
-rw-r--r--usr.sbin/ctld/kernel.c2
-rw-r--r--usr.sbin/ctld/login.c2
-rw-r--r--usr.sbin/cxgbetool/cxgbetool.c2
-rw-r--r--usr.sbin/cxgbetool/reg_defs_t4.c2
-rw-r--r--usr.sbin/cxgbetool/reg_defs_t4vf.c2
-rw-r--r--usr.sbin/cxgbetool/reg_defs_t5.c2
-rw-r--r--usr.sbin/cxgbetool/reg_defs_t6.c2
-rw-r--r--usr.sbin/cxgbetool/tcb_common.c2
-rw-r--r--usr.sbin/cxgbetool/tcbinfot4.c2
-rw-r--r--usr.sbin/cxgbetool/tcbinfot5.c2
-rw-r--r--usr.sbin/cxgbetool/tcbinfot6.c2
-rw-r--r--usr.sbin/cxgbetool/tcbshowt4.c2
-rw-r--r--usr.sbin/cxgbetool/tcbshowt5.c2
-rw-r--r--usr.sbin/cxgbetool/tcbshowt6.c2
-rw-r--r--usr.sbin/daemon/daemon.c2
-rw-r--r--usr.sbin/devctl/devctl.c2
-rw-r--r--usr.sbin/devinfo/devinfo.c2
-rw-r--r--usr.sbin/dumpcis/main.c2
-rw-r--r--usr.sbin/dumpcis/printcis.c2
-rw-r--r--usr.sbin/dumpcis/readcis.c2
-rw-r--r--usr.sbin/edquota/edquota.c2
-rw-r--r--usr.sbin/efibootmgr/efibootmgr.c2
-rw-r--r--usr.sbin/efidp/efidp.c2
-rw-r--r--usr.sbin/efitable/efitable.c2
-rw-r--r--usr.sbin/efivar/efiutil.c2
-rw-r--r--usr.sbin/efivar/efivar.c2
-rw-r--r--usr.sbin/fdcontrol/fdcontrol.c2
-rw-r--r--usr.sbin/fstyp/apfs.c2
-rw-r--r--usr.sbin/fstyp/befs.c2
-rw-r--r--usr.sbin/fstyp/cd9660.c2
-rw-r--r--usr.sbin/fstyp/exfat.c2
-rw-r--r--usr.sbin/fstyp/ext2fs.c2
-rw-r--r--usr.sbin/fstyp/fstyp.c2
-rw-r--r--usr.sbin/fstyp/geli.c2
-rw-r--r--usr.sbin/fstyp/hammer.c2
-rw-r--r--usr.sbin/fstyp/hammer2.c2
-rw-r--r--usr.sbin/fstyp/hfsplus.c2
-rw-r--r--usr.sbin/fstyp/msdosfs.c2
-rw-r--r--usr.sbin/fstyp/ntfs.c2
-rw-r--r--usr.sbin/fstyp/ufs.c2
-rw-r--r--usr.sbin/fstyp/zfs.c2
-rw-r--r--usr.sbin/fwcontrol/fwcontrol.c1
-rw-r--r--usr.sbin/gpioctl/gpioctl.c2
-rw-r--r--usr.sbin/gssd/gssd.c2
-rw-r--r--usr.sbin/i2c/i2c.c2
-rw-r--r--usr.sbin/ifmcstat/ifmcstat.c2
-rw-r--r--usr.sbin/ifmcstat/printb.c2
-rw-r--r--usr.sbin/inetd/builtins.c2
-rw-r--r--usr.sbin/inetd/inetd.c2
-rw-r--r--usr.sbin/iovctl/iovctl.c2
-rw-r--r--usr.sbin/iovctl/parse.c2
-rw-r--r--usr.sbin/iovctl/validate.c2
-rw-r--r--usr.sbin/iscsid/discovery.c2
-rw-r--r--usr.sbin/iscsid/iscsid.c2
-rw-r--r--usr.sbin/iscsid/login.c2
-rw-r--r--usr.sbin/jail/command.c2
-rw-r--r--usr.sbin/jail/config.c2
-rw-r--r--usr.sbin/jail/jail.c2
-rw-r--r--usr.sbin/jail/jaillex.l2
-rw-r--r--usr.sbin/jail/jailparse.y2
-rw-r--r--usr.sbin/jail/state.c2
-rw-r--r--usr.sbin/jls/jls.c2
-rw-r--r--usr.sbin/kbdcontrol/kbdcontrol.c2
-rw-r--r--usr.sbin/kbdmap/kbdmap.c2
-rw-r--r--usr.sbin/kldxref/ef_riscv.c2
-rw-r--r--usr.sbin/lpr/chkprintcap/chkprintcap.c2
-rw-r--r--usr.sbin/lpr/chkprintcap/skimprintcap.c2
-rw-r--r--usr.sbin/lpr/common_source/common.c2
-rw-r--r--usr.sbin/lpr/common_source/ctlinfo.c2
-rw-r--r--usr.sbin/lpr/common_source/displayq.c2
-rw-r--r--usr.sbin/lpr/common_source/matchjobs.c2
-rw-r--r--usr.sbin/lpr/common_source/net.c2
-rw-r--r--usr.sbin/lpr/common_source/printcap.c2
-rw-r--r--usr.sbin/lpr/common_source/request.c2
-rw-r--r--usr.sbin/lpr/common_source/rmjob.c2
-rw-r--r--usr.sbin/lpr/common_source/startdaemon.c2
-rw-r--r--usr.sbin/lpr/filters.ru/koi2855/koi2855.c2
-rw-r--r--usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c2
-rw-r--r--usr.sbin/lpr/filters/lpf.c2
-rw-r--r--usr.sbin/lpr/lpc/cmds.c2
-rw-r--r--usr.sbin/lpr/lpc/cmdtab.c2
-rw-r--r--usr.sbin/lpr/lpc/lpc.c2
-rw-r--r--usr.sbin/lpr/lpc/movejobs.c2
-rw-r--r--usr.sbin/lpr/lpd/lpd.c2
-rw-r--r--usr.sbin/lpr/lpd/lpdchar.c2
-rw-r--r--usr.sbin/lpr/lpd/modes.c2
-rw-r--r--usr.sbin/lpr/lpd/printjob.c2
-rw-r--r--usr.sbin/lpr/lpd/recvjob.c2
-rw-r--r--usr.sbin/lpr/lpq/lpq.c2
-rw-r--r--usr.sbin/lpr/lpr/lpr.c2
-rw-r--r--usr.sbin/lpr/lprm/lprm.c2
-rw-r--r--usr.sbin/lpr/lptest/lptest.c2
-rw-r--r--usr.sbin/lpr/pac/pac.c2
-rw-r--r--usr.sbin/lptcontrol/lptcontrol.c2
-rw-r--r--usr.sbin/mailwrapper/mailwrapper.c2
-rw-r--r--usr.sbin/makefs/cd9660.c2
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_archimedes.c2
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_conversion.c2
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_debug.c1
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_eltorito.c2
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_strings.c1
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_write.c2
-rw-r--r--usr.sbin/makefs/cd9660/iso9660_rrip.c2
-rw-r--r--usr.sbin/makefs/ffs.c2
-rw-r--r--usr.sbin/makefs/ffs/buf.c2
-rw-r--r--usr.sbin/makefs/ffs/ffs_alloc.c2
-rw-r--r--usr.sbin/makefs/ffs/ffs_balloc.c2
-rw-r--r--usr.sbin/makefs/ffs/ffs_bswap.c2
-rw-r--r--usr.sbin/makefs/ffs/ffs_subr.c2
-rw-r--r--usr.sbin/makefs/ffs/mkfs.c2
-rw-r--r--usr.sbin/makefs/ffs/ufs_bmap.c2
-rw-r--r--usr.sbin/makefs/makefs.c2
-rw-r--r--usr.sbin/makefs/msdos.c1
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_conv.c2
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_denode.c2
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_vfsops.c2
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_vnops.c2
-rw-r--r--usr.sbin/makefs/mtree.c2
-rw-r--r--usr.sbin/makefs/walk.c2
-rw-r--r--usr.sbin/mld6query/mld6.c2
-rw-r--r--usr.sbin/mlx5tool/mlx5tool.c2
-rw-r--r--usr.sbin/mountd/mountd.c2
-rw-r--r--usr.sbin/moused/moused.c2
-rw-r--r--usr.sbin/mtest/mtest.c2
-rw-r--r--usr.sbin/newsyslog/newsyslog.c2
-rw-r--r--usr.sbin/newsyslog/ptimes.c2
-rw-r--r--usr.sbin/nfscbd/nfscbd.c2
-rw-r--r--usr.sbin/nfsdumpstate/nfsdumpstate.c2
-rw-r--r--usr.sbin/nfsrevoke/nfsrevoke.c2
-rw-r--r--usr.sbin/nfsuserd/nfsuserd.c2
-rw-r--r--usr.sbin/ngctl/main.c2
-rw-r--r--usr.sbin/ngctl/msg.c2
-rw-r--r--usr.sbin/nghook/main.c2
-rw-r--r--usr.sbin/nologin/nologin.c2
-rw-r--r--usr.sbin/nscd/agent.c2
-rw-r--r--usr.sbin/nscd/agents/group.c2
-rw-r--r--usr.sbin/nscd/agents/passwd.c2
-rw-r--r--usr.sbin/nscd/agents/services.c2
-rw-r--r--usr.sbin/nscd/cachelib.c2
-rw-r--r--usr.sbin/nscd/cacheplcs.c2
-rw-r--r--usr.sbin/nscd/config.c2
-rw-r--r--usr.sbin/nscd/debug.c2
-rw-r--r--usr.sbin/nscd/log.c2
-rw-r--r--usr.sbin/nscd/mp_rs_query.c2
-rw-r--r--usr.sbin/nscd/mp_ws_query.c2
-rw-r--r--usr.sbin/nscd/nscd.c2
-rw-r--r--usr.sbin/nscd/nscdcli.c2
-rw-r--r--usr.sbin/nscd/parser.c2
-rw-r--r--usr.sbin/nscd/protocol.c2
-rw-r--r--usr.sbin/nscd/query.c2
-rw-r--r--usr.sbin/nscd/singletons.c2
-rw-r--r--usr.sbin/ofwdump/ofw_util.c2
-rw-r--r--usr.sbin/ofwdump/ofwdump.c2
-rw-r--r--usr.sbin/pkg/config.c2
-rw-r--r--usr.sbin/pkg/dns_utils.c2
-rw-r--r--usr.sbin/pkg/pkg.c2
-rw-r--r--usr.sbin/pmc/cmd_pmc_filter.cc2
-rw-r--r--usr.sbin/pmc/cmd_pmc_list.c2
-rw-r--r--usr.sbin/pmc/cmd_pmc_stat.c2
-rw-r--r--usr.sbin/pmc/cmd_pmc_summary.cc2
-rw-r--r--usr.sbin/pmc/pmc_util.c2
-rw-r--r--usr.sbin/pmcannotate/pmcannotate.c2
-rw-r--r--usr.sbin/pmccontrol/pmccontrol.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate_cg.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_callgraph.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_calltree.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_gprof.c2
-rw-r--r--usr.sbin/pmcstat/pmcstat.c2
-rw-r--r--usr.sbin/pmcstat/pmcstat_log.c2
-rw-r--r--usr.sbin/pmcstudy/eval_expr.c2
-rw-r--r--usr.sbin/pmcstudy/eval_expr.h2
-rw-r--r--usr.sbin/pmcstudy/pmcstudy.c2
-rw-r--r--usr.sbin/pnfsdscopymr/pnfsdscopymr.c2
-rw-r--r--usr.sbin/pnfsdsfile/pnfsdsfile.c2
-rw-r--r--usr.sbin/pnfsdskill/pnfsdskill.c2
-rw-r--r--usr.sbin/powerd/powerd.c2
-rw-r--r--usr.sbin/ppp/async.c2
-rw-r--r--usr.sbin/pppctl/pppctl.c2
-rw-r--r--usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c2
-rw-r--r--usr.sbin/pstat/pstat.c2
-rw-r--r--usr.sbin/pw/pw_utils.c2
-rw-r--r--usr.sbin/pw/strtounum.c2
-rw-r--r--usr.sbin/pwd_mkdb/pwd_mkdb.c2
-rw-r--r--usr.sbin/quot/quot.c2
-rw-r--r--usr.sbin/quotaon/quotaon.c2
-rw-r--r--usr.sbin/rarpd/rarpd.c2
-rw-r--r--usr.sbin/repquota/repquota.c2
-rw-r--r--usr.sbin/rmt/rmt.c2
-rw-r--r--usr.sbin/rpc.lockd/kern.c2
-rw-r--r--usr.sbin/rpc.lockd/lockd_lock.c2
-rw-r--r--usr.sbin/rpc.statd/procs.c2
-rw-r--r--usr.sbin/rpc.statd/statd.c2
-rw-r--r--usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c2
-rw-r--r--usr.sbin/rpc.tlsservd/rpc.tlscommon.c2
-rw-r--r--usr.sbin/rpc.tlsservd/rpc.tlsservd.c2
-rw-r--r--usr.sbin/rpc.umntall/mounttab.c2
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_main.c2
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_server.c2
-rw-r--r--usr.sbin/rpc.ypupdated/yp_dbdelete.c2
-rw-r--r--usr.sbin/rpc.ypupdated/yp_dbupdate.c2
-rw-r--r--usr.sbin/rpc.ypupdated/ypupdated_main.c2
-rw-r--r--usr.sbin/rpc.ypupdated/ypupdated_server.c2
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_main.c2
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_server.c2
-rw-r--r--usr.sbin/rtprio/rtprio.c2
-rw-r--r--usr.sbin/rtsold/cap_llflags.c2
-rw-r--r--usr.sbin/rtsold/cap_script.c2
-rw-r--r--usr.sbin/rwhod/rwhod.c2
-rw-r--r--usr.sbin/sa/db.c2
-rw-r--r--usr.sbin/sa/main.c2
-rw-r--r--usr.sbin/sa/pdb.c2
-rw-r--r--usr.sbin/sa/usrdb.c2
-rw-r--r--usr.sbin/services_mkdb/services_mkdb.c2
-rw-r--r--usr.sbin/services_mkdb/uniq.c2
-rw-r--r--usr.sbin/sesutil/sesutil.c2
-rw-r--r--usr.sbin/setfib/setfib.c2
-rw-r--r--usr.sbin/spi/spi.c2
-rw-r--r--usr.sbin/syslogd/syslogd.c2
-rw-r--r--usr.sbin/tcpdrop/tcpdrop.c2
-rw-r--r--usr.sbin/trim/trim.c2
-rw-r--r--usr.sbin/tzsetup/tzsetup.c2
-rw-r--r--usr.sbin/uefisign/child.c2
-rw-r--r--usr.sbin/uefisign/pe.c2
-rw-r--r--usr.sbin/uefisign/uefisign.c2
-rw-r--r--usr.sbin/ugidfw/ugidfw.c2
-rw-r--r--usr.sbin/utx/utx.c2
-rw-r--r--usr.sbin/vipw/vipw.c2
-rw-r--r--usr.sbin/wake/wake.c2
-rw-r--r--usr.sbin/watch/watch.c2
-rw-r--r--usr.sbin/watchdogd/watchdogd.c2
-rw-r--r--usr.sbin/yp_mkdb/yp_mkdb.c2
-rw-r--r--usr.sbin/ypbind/yp_ping.c2
-rw-r--r--usr.sbin/ypbind/ypbind.c2
-rw-r--r--usr.sbin/yppoll/yppoll.c2
-rw-r--r--usr.sbin/yppush/yppush_main.c2
-rw-r--r--usr.sbin/ypserv/common/yplib_host.c2
-rw-r--r--usr.sbin/ypserv/yp_access.c2
-rw-r--r--usr.sbin/ypserv/yp_dblookup.c2
-rw-r--r--usr.sbin/ypserv/yp_dnslookup.c2
-rw-r--r--usr.sbin/ypserv/yp_error.c2
-rw-r--r--usr.sbin/ypserv/yp_main.c2
-rw-r--r--usr.sbin/ypserv/yp_server.c2
-rw-r--r--usr.sbin/ypserv/yp_svc_udp.c2
-rw-r--r--usr.sbin/ypset/ypset.c2
-rw-r--r--usr.sbin/zonectl/zonectl.c2
3293 files changed, 0 insertions, 6575 deletions
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 44a406dd037b..ec14451acd0c 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -46,8 +46,6 @@ static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c
index 5c45085624a1..a08ac88ab3cd 100644
--- a/bin/chflags/chflags.c
+++ b/bin/chflags/chflags.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)chflags.c 8.5 (Berkeley) 4/1/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index 2a7ce706afd7..eaa46775edac 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -43,8 +43,6 @@ static const char copyright[] =
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/chio.h>
#include <err.h>
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index cd02c4fa810d..23239d647643 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index e38cd97f4369..24156e4b4a0b 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Cp copies source files to target files.
*
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 8c1c350ff6f1..02d78350067c 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/acl.h>
#include <sys/stat.h>
diff --git a/bin/cpuset/cpuset.c b/bin/cpuset/cpuset.c
index 43aadb33f1e0..82ffcaeec252 100644
--- a/bin/cpuset/cpuset.c
+++ b/bin/cpuset/cpuset.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _WANT_FREEBSD_BITSET
#include <sys/param.h>
diff --git a/bin/date/date.c b/bin/date/date.c
index b7841030864c..74e8c82c5304 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/date/vary.c b/bin/date/vary.c
index a067489bb728..ec556139c201 100644
--- a/bin/date/vary.c
+++ b/bin/date/vary.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <time.h>
#include <stdint.h>
diff --git a/bin/dd/args.c b/bin/dd/args.c
index 35a076175a93..0e4edb6e2ca5 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <ctype.h>
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index ef5194ee1e08..b7cc1e5b5383 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)conv.c 8.3 (Berkeley) 4/2/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index 36e23531bbbb..e6cc873bf9b1 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)conv_tab.c 8.1 (Berkeley) 5/31/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <signal.h>
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 84d955b235f8..c1e8a4efdc5f 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/capsicum.h>
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index c814d926d884..2cb0cad8bcc2 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/bin/dd/position.c b/bin/dd/position.c
index 6cb6643982dc..c8ec531e6000 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)position.c 8.3 (Berkeley) 4/2/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mtio.h>
diff --git a/bin/df/df.c b/bin/df/df.c
index 9f7588a68d4f..51e1e17de4a6 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -46,8 +46,6 @@ static char sccsid[] = "@(#)df.c 8.9 (Berkeley) 5/8/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/mount.h>
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index cb42990315b6..4607ce543084 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -41,8 +41,6 @@ static char const sccsid[] = "From: @(#)hostname.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index 46796ad1a27d..168ff6299728 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)echo.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index 68594a8ebb2d..1f111e7d513d 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index d3677989235e..94967f8389aa 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/wait.h>
diff --git a/bin/ed/io.c b/bin/ed/io.c
index 697e0a4c7ab5..fda3f5d55fd6 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "ed.h"
/* read_file: read a named file/pipe into the buffer; return line count */
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 82ab6d195038..bddf6c1e9c2c 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -35,8 +35,6 @@ static const char copyright[] =
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* CREDITS
*
diff --git a/bin/ed/re.c b/bin/ed/re.c
index 03a343657bbf..3dacb619a2bc 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "ed.h"
const char *errmsg = "";
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index d12a5c9e1402..2bf70b8ac4bf 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "ed.h"
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index 603e39f1ca53..d5f56833ec66 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "ed.h"
diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c
index a077cb8780b8..25d0731559c6 100644
--- a/bin/getfacl/getfacl.c
+++ b/bin/getfacl/getfacl.c
@@ -32,8 +32,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/acl.h>
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 3dbafa9d3566..83959348bc76 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/bin/kenv/kenv.c b/bin/kenv/kenv.c
index ecf30ee6b617..6d414ec892d1 100644
--- a/bin/kenv/kenv.c
+++ b/bin/kenv/kenv.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
#include <err.h>
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index 4ff7a8b19f9f..dba32981c050 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)kill.c 8.4 (Berkeley) 4/28/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index e37dee361b19..546bfba1c7c3 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index 4f2c8bcfc846..590a848e512f 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -38,9 +38,6 @@ static char sccsid[] = "@(#)cmp.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index b027e34afc2c..842364b67f1f 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)ls.c 8.5 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/bin/ls/print.c b/bin/ls/print.c
index b01b2e1e61db..16c4f48624d0 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)print.c 8.4 (Berkeley) 4/17/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/acl.h>
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 0b1cba848239..6930633fb744 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index cc699d3893dc..4d5f151ba214 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 01d88ff625b7..1320f603b3c4 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/acl.h>
#include <sys/param.h>
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 4128a91e3dc2..1b191a69fd65 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/mtio.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 68dbced6917d..b2d24e401f5b 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 54c65150b467..e202374e08a3 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 5e55e70be851..8719664d2c47 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 4aea03b47e34..76edca3c6f91 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 8976d055e238..1a019280ae7a 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index da0d72998975..866bb9699a29 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index b8cb437405a7..0bbd93173ea8 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c
index 838ff54d4a88..98e03aef7e60 100644
--- a/bin/pax/getoldopt.c
+++ b/bin/pax/getoldopt.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 1366bb75eef6..587641294e7b 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -40,8 +40,6 @@ static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mtio.h>
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index ee683341d099..1b394ec85508 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 3c3ba345e3cb..932cd5910629 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 7ef5bec523a5..0df241f76122 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 06694727858a..17279f185b1d 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index 36e4e9920f80..cbe2dbab64f8 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index ea524c451007..cd1477188629 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)tty_subs.c 8.2 (Berkeley) 4/18/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c
index 93349ecdafee..3be7bccd14cc 100644
--- a/bin/pkill/pkill.c
+++ b/bin/pkill/pkill.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index c89ea78d7373..c79ef4450afb 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)fmt.c 8.4 (Berkeley) 4/15/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index e78cf984e455..7996bc000e03 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index 5ef56c9dfabc..99cc3b8ad725 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)nlist.c 8.4 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/bin/ps/print.c b/bin/ps/print.c
index d4dbd9624011..30fbf8ed12de 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 6f0cc76cd0b7..e7781d1d9310 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -49,8 +49,6 @@ static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/proc.h>
diff --git a/bin/pwait/pwait.c b/bin/pwait/pwait.c
index 66919ffa1c42..c3adb2a8b741 100644
--- a/bin/pwait/pwait.c
+++ b/bin/pwait/pwait.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index cfa6c0b909b2..47e2bc1ffdd5 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/bin/realpath/realpath.c b/bin/realpath/realpath.c
index bc060bf1453c..61263e508f5b 100644
--- a/bin/realpath/realpath.c
+++ b/bin/realpath/realpath.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 111f4a1326c4..a3bbe1e1a9a2 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)rm.c 8.5 (Berkeley) 4/18/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index 6f1545e40217..776b2297a8c0 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)rmdir.c 8.3 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/setfacl/file.c b/bin/setfacl/file.c
index f7e9672c3ce8..aee3c76b6c33 100644
--- a/bin/setfacl/file.c
+++ b/bin/setfacl/file.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/acl.h>
diff --git a/bin/setfacl/mask.c b/bin/setfacl/mask.c
index 4dd85f039d0f..09a97fdc466c 100644
--- a/bin/setfacl/mask.c
+++ b/bin/setfacl/mask.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/acl.h>
#include <sys/stat.h>
diff --git a/bin/setfacl/merge.c b/bin/setfacl/merge.c
index 604e6fb693c2..981997c51ddd 100644
--- a/bin/setfacl/merge.c
+++ b/bin/setfacl/merge.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/acl.h>
#include <sys/stat.h>
diff --git a/bin/setfacl/remove.c b/bin/setfacl/remove.c
index 9c86096da41d..78b3d09e4404 100644
--- a/bin/setfacl/remove.c
+++ b/bin/setfacl/remove.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/acl.h>
#include <sys/stat.h>
diff --git a/bin/setfacl/setfacl.c b/bin/setfacl/setfacl.c
index 033f9d2572ca..2cb27b5796d0 100644
--- a/bin/setfacl/setfacl.c
+++ b/bin/setfacl/setfacl.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/acl.h>
#include <sys/queue.h>
diff --git a/bin/setfacl/util.c b/bin/setfacl/util.c
index 8a78259c1ae7..ee28b9d5503e 100644
--- a/bin/setfacl/util.c
+++ b/bin/setfacl/util.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdlib.h>
diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index bbcf5fbe17e3..4bac525e2678 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)alias.c 8.3 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include "shell.h"
#include "output.h"
diff --git a/bin/sh/arith_yacc.c b/bin/sh/arith_yacc.c
index a08163bdc29b..cb88cdb4cbea 100644
--- a/bin/sh/arith_yacc.c
+++ b/bin/sh/arith_yacc.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <errno.h>
#include <inttypes.h>
diff --git a/bin/sh/arith_yylex.c b/bin/sh/arith_yylex.c
index 9f320dbcb585..68a641d807af 100644
--- a/bin/sh/arith_yylex.c
+++ b/bin/sh/arith_yylex.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <errno.h>
#include <inttypes.h>
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index e8046c7615ec..1e5b719b4eaf 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Echo command.
*/
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index 66eee00b2c24..a10299b12365 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)cd.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
diff --git a/bin/sh/error.c b/bin/sh/error.c
index a6b407907e20..ae87807b7527 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)error.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Errors and exceptions.
*/
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 58cfc522bb14..778aa60c52f1 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <paths.h>
#include <signal.h>
#include <stdlib.h>
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 43095a252a35..07ed6d4173ae 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)exec.c 8.4 (Berkeley) 6/8/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 922bf5c3c4e8..444f35cdb72d 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -40,8 +40,6 @@ static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index e13f38548a40..3ca8a0bcefa7 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <dirent.h>
diff --git a/bin/sh/input.c b/bin/sh/input.c
index 12faa33d0f1b..2ba4c7dd9e00 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)input.c 8.3 (Berkeley) 6/9/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h> /* defines BUFSIZ */
#include <fcntl.h>
#include <errno.h>
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index ff36bfa6d999..47835cb1b5b2 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/param.h>
#include <sys/resource.h>
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index 194f654484db..e69d8b193eb0 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)mail.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Routines to check for mail. (Perhaps make part of main.c?)
*/
diff --git a/bin/sh/main.c b/bin/sh/main.c
index 3dd2b0d83738..7a4dbc254f81 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/28/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <signal.h>
#include <sys/stat.h>
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index 7ea31af050e5..9bd37488d040 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)memalloc.c 8.3 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include "shell.h"
#include "output.h"
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index 79d7dc097b5c..5d5c137a7d11 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)miscbltin.c 8.4 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Miscellaneous builtins.
*/
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index 5b923b7fe0c5..c6fc0e6d9a73 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)mknodes.c 8.2 (Berkeley) 5/4/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This program reads the nodetypes file and nodes.c.pat file. It generates
* the files nodes.h and nodes.c.
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index 24b118f64cbf..7abef048bdb0 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)mksyntax.c 8.2 (Berkeley) 5/4/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This program creates syntax.h and syntax.c.
*/
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 716f00345961..760b8bba76ce 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)mystring.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* String functions.
*
diff --git a/bin/sh/options.c b/bin/sh/options.c
index 55bfd9d483b7..87ee4ab5c658 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <signal.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/bin/sh/output.c b/bin/sh/output.c
index c01ddd5acb83..c5f9d758dd92 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)output.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Shell output routines. We use our own output routines because:
* When a builtin command is interrupted we have to discard
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index 7f8283ca4dff..044233da5d73 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <pwd.h>
#include <stdlib.h>
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index e820fd2c05f7..7e17156105e5 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)redir.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <signal.h>
diff --git a/bin/sh/show.c b/bin/sh/show.c
index 01035d76093d..70b71875c774 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)show.c 8.3 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index 7a6ed2f4368a..02fce4215f0b 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)trap.c 8.5 (Berkeley) 6/5/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <signal.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 0758289151ba..56be5c9d513d 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <unistd.h>
#include <stdlib.h>
#include <paths.h>
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index 5c9e7b17b9d9..49efe904f93e 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <capsicum_helpers.h>
#include <err.h>
#include <errno.h>
diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index ecefbb2bc8f3..78ac820883ae 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -33,8 +33,6 @@ static char sccsid[] = "@(#)cchar.c 8.5 (Berkeley) 4/2/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index 12ed2a2d3500..6b05a10aee52 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -33,8 +33,6 @@ static char sccsid[] = "@(#)gfmt.c 8.6 (Berkeley) 4/2/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/bin/stty/key.c b/bin/stty/key.c
index 4514a0ea1c04..19263f2b0268 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -33,8 +33,6 @@ static char sccsid[] = "@(#)key.c 8.3 (Berkeley) 4/2/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index 5cd3061aa449..ce39083d7d63 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -33,8 +33,6 @@ static char sccsid[] = "@(#)modes.c 8.3 (Berkeley) 4/2/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
#include "stty.h"
diff --git a/bin/stty/print.c b/bin/stty/print.c
index a76cd46b765e..07a3c2058474 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -33,8 +33,6 @@ static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stddef.h>
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index 9aa2f51aa81f..f149491296dd 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)stty.c 8.3 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/bin/stty/util.c b/bin/stty/util.c
index 19898ba9805f..c040d56966d3 100644
--- a/bin/stty/util.c
+++ b/bin/stty/util.c
@@ -33,8 +33,6 @@ static char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/2/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index 6855193a0476..bc4541556825 100644
--- a/bin/sync/sync.c
+++ b/bin/sync/sync.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)sync.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <unistd.h>
diff --git a/bin/test/test.c b/bin/test/test.c
index 1570238300e9..1cb3eca8fe13 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c
index d6b82373c0a1..7de255f30150 100644
--- a/bin/timeout/timeout.c
+++ b/bin/timeout/timeout.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/procctl.h>
#include <sys/time.h>
#include <sys/wait.h>
diff --git a/bin/uuidgen/uuidgen.c b/bin/uuidgen/uuidgen.c
index 6dcfdde92a5f..853c491da465 100644
--- a/bin/uuidgen/uuidgen.c
+++ b/bin/uuidgen/uuidgen.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/cddl/usr.sbin/zfsd/case_file.cc b/cddl/usr.sbin/zfsd/case_file.cc
index ef4d592b9602..3728913b646b 100644
--- a/cddl/usr.sbin/zfsd/case_file.cc
+++ b/cddl/usr.sbin/zfsd/case_file.cc
@@ -73,9 +73,6 @@
#include "zfsd.h"
#include "zfsd_exception.h"
#include "zpool_list.h"
-
-__FBSDID("$FreeBSD$");
-
/*============================ Namespace Control =============================*/
using std::hex;
using std::ifstream;
diff --git a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc
index 882524c83efd..f3fea2ca83f4 100644
--- a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc
+++ b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc
@@ -62,9 +62,6 @@
#include <zfsd/zpool_list.h>
#include "libmocks.h"
-
-__FBSDID("$FreeBSD$");
-
/*================================== Macros ==================================*/
#define NUM_ELEMENTS(x) (sizeof(x) / sizeof(*x))
diff --git a/cddl/usr.sbin/zfsd/vdev.cc b/cddl/usr.sbin/zfsd/vdev.cc
index 8c510c233cfb..1a37340fb76e 100644
--- a/cddl/usr.sbin/zfsd/vdev.cc
+++ b/cddl/usr.sbin/zfsd/vdev.cc
@@ -63,8 +63,6 @@
#include "zfsd.h"
#include "zfsd_exception.h"
#include "zpool_list.h"
-
-__FBSDID("$FreeBSD$");
/*============================ Namespace Control =============================*/
using std::string;
using std::stringstream;
diff --git a/cddl/usr.sbin/zfsd/zfsd.cc b/cddl/usr.sbin/zfsd/zfsd.cc
index 16c02203b66b..210cc4b85a44 100644
--- a/cddl/usr.sbin/zfsd/zfsd.cc
+++ b/cddl/usr.sbin/zfsd/zfsd.cc
@@ -74,9 +74,6 @@
#include "zfsd.h"
#include "zfsd_exception.h"
#include "zpool_list.h"
-
-__FBSDID("$FreeBSD$");
-
/*================================== Macros ==================================*/
#define NUM_ELEMENTS(x) (sizeof(x) / sizeof(*x))
diff --git a/cddl/usr.sbin/zfsd/zfsd_event.cc b/cddl/usr.sbin/zfsd/zfsd_event.cc
index 5391aeb2997f..7a19b95abeed 100644
--- a/cddl/usr.sbin/zfsd/zfsd_event.cc
+++ b/cddl/usr.sbin/zfsd/zfsd_event.cc
@@ -68,8 +68,6 @@
#include "zfsd.h"
#include "zfsd_exception.h"
#include "zpool_list.h"
-
-__FBSDID("$FreeBSD$");
/*============================ Namespace Control =============================*/
using DevdCtl::Event;
using DevdCtl::Guid;
diff --git a/cddl/usr.sbin/zfsd/zfsd_exception.cc b/cddl/usr.sbin/zfsd/zfsd_exception.cc
index e83dd0f6e506..d5b3cab24f02 100644
--- a/cddl/usr.sbin/zfsd/zfsd_exception.cc
+++ b/cddl/usr.sbin/zfsd/zfsd_exception.cc
@@ -52,8 +52,6 @@
#include "vdev.h"
#include "zfsd_exception.h"
-
-__FBSDID("$FreeBSD$");
/*============================ Namespace Control =============================*/
using std::endl;
using std::string;
diff --git a/cddl/usr.sbin/zfsd/zfsd_main.cc b/cddl/usr.sbin/zfsd/zfsd_main.cc
index f090631e21f2..cc9ce6044384 100644
--- a/cddl/usr.sbin/zfsd/zfsd_main.cc
+++ b/cddl/usr.sbin/zfsd/zfsd_main.cc
@@ -55,9 +55,6 @@
#include "vdev_iterator.h"
#include "zfsd.h"
-
-__FBSDID("$FreeBSD$");
-
/*=============================== Program Main ===============================*/
static void
usage()
diff --git a/lib/csu/aarch64/crt1_c.c b/lib/csu/aarch64/crt1_c.c
index 095c798046b4..22158aaa42e2 100644
--- a/lib/csu/aarch64/crt1_c.c
+++ b/lib/csu/aarch64/crt1_c.c
@@ -30,6 +30,4 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "csu_common.h"
diff --git a/lib/csu/aarch64/crt1_s.S b/lib/csu/aarch64/crt1_s.S
index 17ed74531675..97b4bff35a0b 100644
--- a/lib/csu/aarch64/crt1_s.S
+++ b/lib/csu/aarch64/crt1_s.S
@@ -30,8 +30,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* The program entry point
* void _start(char **ap, void (*cleanup)(void)) __dead2
diff --git a/lib/csu/aarch64/crti.S b/lib/csu/aarch64/crti.S
index af10c0f00d7d..0a20f4c5e314 100644
--- a/lib/csu/aarch64/crti.S
+++ b/lib/csu/aarch64/crti.S
@@ -28,8 +28,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.section .init,"ax",@progbits
.align 4
.globl _init
diff --git a/lib/csu/aarch64/crtn.S b/lib/csu/aarch64/crtn.S
index c62433537f36..924aa36aa045 100644
--- a/lib/csu/aarch64/crtn.S
+++ b/lib/csu/aarch64/crtn.S
@@ -28,8 +28,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.section .init,"ax",@progbits
ldp x29, x30, [sp], #16
ret
diff --git a/lib/csu/amd64/crt1_c.c b/lib/csu/amd64/crt1_c.c
index 8c57e36becfd..85fe0309600c 100644
--- a/lib/csu/amd64/crt1_c.c
+++ b/lib/csu/amd64/crt1_c.c
@@ -27,6 +27,4 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "csu_common.h"
diff --git a/lib/csu/amd64/crti.S b/lib/csu/amd64/crti.S
index 05b8ad8a431a..9fc507e5fff5 100644
--- a/lib/csu/amd64/crti.S
+++ b/lib/csu/amd64/crti.S
@@ -24,8 +24,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.section .init,"ax",@progbits
.align 4
.globl _init
diff --git a/lib/csu/amd64/crtn.S b/lib/csu/amd64/crtn.S
index 50b5003b9f7c..d6336688d4ce 100644
--- a/lib/csu/amd64/crtn.S
+++ b/lib/csu/amd64/crtn.S
@@ -24,8 +24,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.section .init,"ax",@progbits
popq %rbp
ret
diff --git a/lib/csu/arm/crt1_c.c b/lib/csu/arm/crt1_c.c
index 8a4abf491bb3..7de2d333a598 100644
--- a/lib/csu/arm/crt1_c.c
+++ b/lib/csu/arm/crt1_c.c
@@ -42,8 +42,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/elf_common.h>
diff --git a/lib/csu/arm/crt1_s.S b/lib/csu/arm/crt1_s.S
index eeeab3588ce2..1f864f217f0b 100644
--- a/lib/csu/arm/crt1_s.S
+++ b/lib/csu/arm/crt1_s.S
@@ -42,8 +42,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/elf_common.h>
#include "notes.h"
diff --git a/lib/csu/arm/crti.S b/lib/csu/arm/crti.S
index c6c37eba1b4f..ce2058d3fa65 100644
--- a/lib/csu/arm/crti.S
+++ b/lib/csu/arm/crti.S
@@ -1,6 +1,4 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.section .init,"ax",%progbits
.align 4
.globl _init
diff --git a/lib/csu/arm/crtn.S b/lib/csu/arm/crtn.S
index 25bbd5730ae9..9be6d6cef76c 100644
--- a/lib/csu/arm/crtn.S
+++ b/lib/csu/arm/crtn.S
@@ -1,6 +1,4 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.section .init,"ax",%progbits
ldmea fp, {fp, sp, pc}
mov pc, lr
diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c
index 859582c37305..ddeec986a431 100644
--- a/lib/csu/common/crtbegin.c
+++ b/lib/csu/common/crtbegin.c
@@ -22,8 +22,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include "crt.h"
diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S
index 9ee16fbf66ed..0ed86bfba2b2 100644
--- a/lib/csu/common/crtbrand.S
+++ b/lib/csu/common/crtbrand.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/elf_common.h>
#include "notes.h"
diff --git a/lib/csu/common/crtend.c b/lib/csu/common/crtend.c
index 072f7b7a82f2..d9259729bb0e 100644
--- a/lib/csu/common/crtend.c
+++ b/lib/csu/common/crtend.c
@@ -22,8 +22,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "crt.h"
typedef void (*crt_func)(void);
diff --git a/lib/csu/common/feature_note.S b/lib/csu/common/feature_note.S
index 7f95f32e5f9f..343d2a9262e2 100644
--- a/lib/csu/common/feature_note.S
+++ b/lib/csu/common/feature_note.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/elf_common.h>
#include "notes.h"
diff --git a/lib/csu/common/ignore_init_note.S b/lib/csu/common/ignore_init_note.S
index 9026ba925891..fa37a8990538 100644
--- a/lib/csu/common/ignore_init_note.S
+++ b/lib/csu/common/ignore_init_note.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/elf_common.h>
#include "notes.h"
diff --git a/lib/csu/i386/crt1_c.c b/lib/csu/i386/crt1_c.c
index 9fae1cfa69b4..5755a66afbb2 100644
--- a/lib/csu/i386/crt1_c.c
+++ b/lib/csu/i386/crt1_c.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "csu_common.h"
void _start(char *, ...) __dead2;
diff --git a/lib/csu/i386/crt1_s.S b/lib/csu/i386/crt1_s.S
index 3e22efd2ce17..c29e97320ac8 100644
--- a/lib/csu/i386/crt1_s.S
+++ b/lib/csu/i386/crt1_s.S
@@ -21,8 +21,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.text
.align 4
.globl _start
diff --git a/lib/csu/i386/crti.S b/lib/csu/i386/crti.S
index f5883db0ba0f..c006ed02ee64 100644
--- a/lib/csu/i386/crti.S
+++ b/lib/csu/i386/crti.S
@@ -24,8 +24,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.section .init,"ax",@progbits
.align 4
.globl _init
diff --git a/lib/csu/i386/crtn.S b/lib/csu/i386/crtn.S
index f223062bb787..3e720a2137ff 100644
--- a/lib/csu/i386/crtn.S
+++ b/lib/csu/i386/crtn.S
@@ -24,8 +24,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.section .init,"ax",@progbits
addl $8,%esp
popl %ebp
diff --git a/lib/csu/powerpc/crt1_c.c b/lib/csu/powerpc/crt1_c.c
index 72fc7040e237..656ca9cde9ea 100644
--- a/lib/csu/powerpc/crt1_c.c
+++ b/lib/csu/powerpc/crt1_c.c
@@ -42,8 +42,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include "libc_private.h"
diff --git a/lib/csu/powerpc/crti.S b/lib/csu/powerpc/crti.S
index da83d1d97182..25d0df585bb9 100644
--- a/lib/csu/powerpc/crti.S
+++ b/lib/csu/powerpc/crti.S
@@ -24,8 +24,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.section .init,"ax",@progbits
.align 2
.globl _init
diff --git a/lib/csu/powerpc/crtn.S b/lib/csu/powerpc/crtn.S
index 74301181ffa1..026cf4fe3e55 100644
--- a/lib/csu/powerpc/crtn.S
+++ b/lib/csu/powerpc/crtn.S
@@ -24,8 +24,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.section .init,"ax",@progbits
lwz 11,0(1)
lwz 0,4(11)
diff --git a/lib/csu/powerpc/crtsavres.S b/lib/csu/powerpc/crtsavres.S
index 582b69f2fe37..95ac7171213f 100644
--- a/lib/csu/powerpc/crtsavres.S
+++ b/lib/csu/powerpc/crtsavres.S
@@ -22,8 +22,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.text
/*
diff --git a/lib/csu/powerpc64/crt1_c.c b/lib/csu/powerpc64/crt1_c.c
index c7b9e89a23a8..8d389b87a2a5 100644
--- a/lib/csu/powerpc64/crt1_c.c
+++ b/lib/csu/powerpc64/crt1_c.c
@@ -42,8 +42,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <sys/elf.h>
diff --git a/lib/csu/powerpc64/crti.S b/lib/csu/powerpc64/crti.S
index 00a12426cf60..33e9ca4f42ae 100644
--- a/lib/csu/powerpc64/crti.S
+++ b/lib/csu/powerpc64/crti.S
@@ -24,8 +24,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#ifdef _CALL_ELF
.abiversion _CALL_ELF
#endif
diff --git a/lib/csu/powerpc64/crtn.S b/lib/csu/powerpc64/crtn.S
index 39f21aee40d9..a7619f3fbf62 100644
--- a/lib/csu/powerpc64/crtn.S
+++ b/lib/csu/powerpc64/crtn.S
@@ -24,8 +24,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.section .init,"ax",@progbits
ld %r1,0(%r1)
ld 0,16(%r1)
diff --git a/lib/csu/riscv/crt1_c.c b/lib/csu/riscv/crt1_c.c
index e08359e388f8..df97fb50bff1 100644
--- a/lib/csu/riscv/crt1_c.c
+++ b/lib/csu/riscv/crt1_c.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "libc_private.h"
#include "csu_common.h"
diff --git a/lib/csu/riscv/crt1_s.S b/lib/csu/riscv/crt1_s.S
index e6b23008a4d0..8f77d2358ae7 100644
--- a/lib/csu/riscv/crt1_s.S
+++ b/lib/csu/riscv/crt1_s.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(_start)
mv a3, a2 # cleanup
addi a1, a0, 8 # get argv
diff --git a/lib/csu/riscv/crti.S b/lib/csu/riscv/crti.S
index 4aad1486c5c6..92f6814a9c42 100644
--- a/lib/csu/riscv/crti.S
+++ b/lib/csu/riscv/crti.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
# this puts __global_pointer$ into .dynsym, so symlook_obj can now find that
# (see reloc.c)
.weak __global_pointer$
diff --git a/lib/csu/riscv/crtn.S b/lib/csu/riscv/crtn.S
index b58247161589..50f6e3f9ece5 100644
--- a/lib/csu/riscv/crtn.S
+++ b/lib/csu/riscv/crtn.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.section .init,"ax",@progbits
ld ra, 0(sp)
addi sp, sp, 16
diff --git a/lib/csu/tests/cxx_constructors.cc b/lib/csu/tests/cxx_constructors.cc
index 7cae887e3f56..3568c4528c36 100644
--- a/lib/csu/tests/cxx_constructors.cc
+++ b/lib/csu/tests/cxx_constructors.cc
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/lib/csu/tests/fini_test.c b/lib/csu/tests/fini_test.c
index c06e62e093f8..9475b40f4271 100644
--- a/lib/csu/tests/fini_test.c
+++ b/lib/csu/tests/fini_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/lib/csu/tests/init_test.c b/lib/csu/tests/init_test.c
index 4be45cdf963c..47bd9b7e64d7 100644
--- a/lib/csu/tests/init_test.c
+++ b/lib/csu/tests/init_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef DSO_LIB
#include <atf-c.h>
#endif
diff --git a/lib/flua/libjail/lua_jail.c b/lib/flua/libjail/lua_jail.c
index 53c9bd0b5471..b463f5c894ee 100644
--- a/lib/flua/libjail/lua_jail.c
+++ b/lib/flua/libjail/lua_jail.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/jail.h>
#include <errno.h>
diff --git a/lib/geom/cache/geom_cache.c b/lib/geom/cache/geom_cache.c
index dc40c89f1b02..7be54004f196 100644
--- a/lib/geom/cache/geom_cache.c
+++ b/lib/geom/cache/geom_cache.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include <stdint.h>
diff --git a/lib/geom/concat/geom_concat.c b/lib/geom/concat/geom_concat.c
index 64327772e6df..df05b0994d79 100644
--- a/lib/geom/concat/geom_concat.c
+++ b/lib/geom/concat/geom_concat.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <paths.h>
diff --git a/lib/geom/eli/geom_eli.c b/lib/geom/eli/geom_eli.c
index 21ae110b074e..6cbb23230fa5 100644
--- a/lib/geom/eli/geom_eli.c
+++ b/lib/geom/eli/geom_eli.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/sysctl.h>
diff --git a/lib/geom/journal/geom_journal.c b/lib/geom/journal/geom_journal.c
index d362e482290e..0f252a3aa26e 100644
--- a/lib/geom/journal/geom_journal.c
+++ b/lib/geom/journal/geom_journal.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
#include <paths.h>
diff --git a/lib/geom/journal/geom_journal_ufs.c b/lib/geom/journal/geom_journal_ufs.c
index abafde716ad7..c01bf71da126 100644
--- a/lib/geom/journal/geom_journal_ufs.c
+++ b/lib/geom/journal/geom_journal_ufs.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disklabel.h>
#include <sys/mount.h>
diff --git a/lib/geom/label/geom_label.c b/lib/geom/label/geom_label.c
index a8eb68de3bc0..a8ec9b45628a 100644
--- a/lib/geom/label/geom_label.c
+++ b/lib/geom/label/geom_label.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <stdio.h>
diff --git a/lib/geom/mirror/geom_mirror.c b/lib/geom/mirror/geom_mirror.c
index 4f91857b41a2..bdd9391e3315 100644
--- a/lib/geom/mirror/geom_mirror.c
+++ b/lib/geom/mirror/geom_mirror.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
#include <errno.h>
diff --git a/lib/geom/mountver/geom_mountver.c b/lib/geom/mountver/geom_mountver.c
index 12f3a9ec3cde..79e245377664 100644
--- a/lib/geom/mountver/geom_mountver.c
+++ b/lib/geom/mountver/geom_mountver.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdint.h>
#include <libgeom.h>
diff --git a/lib/geom/multipath/geom_multipath.c b/lib/geom/multipath/geom_multipath.c
index 6db46ba5a277..4a9ddfc2cd1c 100644
--- a/lib/geom/multipath/geom_multipath.c
+++ b/lib/geom/multipath/geom_multipath.c
@@ -27,7 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <errno.h>
#include <paths.h>
diff --git a/lib/geom/nop/geom_nop.c b/lib/geom/nop/geom_nop.c
index 5ed1219be8b1..ee0cf4808f42 100644
--- a/lib/geom/nop/geom_nop.c
+++ b/lib/geom/nop/geom_nop.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdint.h>
#include <libgeom.h>
diff --git a/lib/geom/part/geom_part.c b/lib/geom/part/geom_part.c
index 04e730c7719e..cbbc81d3cc60 100644
--- a/lib/geom/part/geom_part.c
+++ b/lib/geom/part/geom_part.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <assert.h>
diff --git a/lib/geom/raid/geom_raid.c b/lib/geom/raid/geom_raid.c
index b761d13d1e9b..cec3506f5757 100644
--- a/lib/geom/raid/geom_raid.c
+++ b/lib/geom/raid/geom_raid.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <paths.h>
diff --git a/lib/geom/raid3/geom_raid3.c b/lib/geom/raid3/geom_raid3.c
index b14ba16092aa..c4b0d0227c67 100644
--- a/lib/geom/raid3/geom_raid3.c
+++ b/lib/geom/raid3/geom_raid3.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <paths.h>
diff --git a/lib/geom/shsec/geom_shsec.c b/lib/geom/shsec/geom_shsec.c
index 29b78ec9af18..8a41b18def20 100644
--- a/lib/geom/shsec/geom_shsec.c
+++ b/lib/geom/shsec/geom_shsec.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <paths.h>
diff --git a/lib/geom/stripe/geom_stripe.c b/lib/geom/stripe/geom_stripe.c
index cbabcb9e77fa..f0acd5fa45e3 100644
--- a/lib/geom/stripe/geom_stripe.c
+++ b/lib/geom/stripe/geom_stripe.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <paths.h>
diff --git a/lib/geom/virstor/geom_virstor.c b/lib/geom/virstor/geom_virstor.c
index 754379f44b64..5b81c43c0acc 100644
--- a/lib/geom/virstor/geom_virstor.c
+++ b/lib/geom/virstor/geom_virstor.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <paths.h>
diff --git a/lib/libbe/be.c b/lib/libbe/be.c
index e607ab12215b..38e5e44abb53 100644
--- a/lib/libbe/be.c
+++ b/lib/libbe/be.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/module.h>
#include <sys/mount.h>
diff --git a/lib/libbe/be_access.c b/lib/libbe/be_access.c
index 9f9010527b95..67b30d3fb4fb 100644
--- a/lib/libbe/be_access.c
+++ b/lib/libbe/be_access.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/mntent.h>
#include "be.h"
diff --git a/lib/libbe/be_error.c b/lib/libbe/be_error.c
index 9093e8847dc4..f515fe136f12 100644
--- a/lib/libbe/be_error.c
+++ b/lib/libbe/be_error.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "be.h"
#include "be_impl.h"
diff --git a/lib/libbe/be_info.c b/lib/libbe/be_info.c
index 64a5e7de2956..88a9b17bf421 100644
--- a/lib/libbe/be_info.c
+++ b/lib/libbe/be_info.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/zfs_context.h>
#include <libzfsbootenv.h>
diff --git a/lib/libbe/tests/target_prog.c b/lib/libbe/tests/target_prog.c
index c49cd0067605..4c79d1a30714 100644
--- a/lib/libbe/tests/target_prog.c
+++ b/lib/libbe/tests/target_prog.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <be.h>
/*
diff --git a/lib/libc/aarch64/gen/_ctx_start.S b/lib/libc/aarch64/gen/_ctx_start.S
index 6f3634c052a7..15edcf21d463 100644
--- a/lib/libc/aarch64/gen/_ctx_start.S
+++ b/lib/libc/aarch64/gen/_ctx_start.S
@@ -27,8 +27,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(_ctx_start)
blr x19 /* Call func from makecontext */
mov x0, x20 /* Load ucp saved in makecontext */
diff --git a/lib/libc/aarch64/gen/_setjmp.S b/lib/libc/aarch64/gen/_setjmp.S
index 94a58d774f2b..4fc9ce304893 100644
--- a/lib/libc/aarch64/gen/_setjmp.S
+++ b/lib/libc/aarch64/gen/_setjmp.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/setjmp.h>
ENTRY(_setjmp)
diff --git a/lib/libc/aarch64/gen/fabs.S b/lib/libc/aarch64/gen/fabs.S
index a6a1873c82fa..29e4b89d5ee1 100644
--- a/lib/libc/aarch64/gen/fabs.S
+++ b/lib/libc/aarch64/gen/fabs.S
@@ -24,8 +24,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(fabs)
fabs d0, d0
ret
diff --git a/lib/libc/aarch64/gen/flt_rounds.c b/lib/libc/aarch64/gen/flt_rounds.c
index 6f8eeebbad80..7d5259a1a3bc 100644
--- a/lib/libc/aarch64/gen/flt_rounds.c
+++ b/lib/libc/aarch64/gen/flt_rounds.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <fenv.h>
diff --git a/lib/libc/aarch64/gen/fpgetmask.c b/lib/libc/aarch64/gen/fpgetmask.c
index aa0d88e99238..7bc56a9d75be 100644
--- a/lib/libc/aarch64/gen/fpgetmask.c
+++ b/lib/libc/aarch64/gen/fpgetmask.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/aarch64/gen/fpsetmask.c b/lib/libc/aarch64/gen/fpsetmask.c
index 15f59d377653..1ad3f49d603d 100644
--- a/lib/libc/aarch64/gen/fpsetmask.c
+++ b/lib/libc/aarch64/gen/fpsetmask.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/aarch64/gen/infinity.c b/lib/libc/aarch64/gen/infinity.c
index c96045e581b6..fca66838fa63 100644
--- a/lib/libc/aarch64/gen/infinity.c
+++ b/lib/libc/aarch64/gen/infinity.c
@@ -3,8 +3,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
/* bytes for +Infinity on aarch64 */
diff --git a/lib/libc/aarch64/gen/makecontext.c b/lib/libc/aarch64/gen/makecontext.c
index a87541d57608..ae23ad87d3a2 100644
--- a/lib/libc/aarch64/gen/makecontext.c
+++ b/lib/libc/aarch64/gen/makecontext.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <machine/armreg.h>
diff --git a/lib/libc/aarch64/gen/setjmp.S b/lib/libc/aarch64/gen/setjmp.S
index e6cdba801e19..ecc677de2620 100644
--- a/lib/libc/aarch64/gen/setjmp.S
+++ b/lib/libc/aarch64/gen/setjmp.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/setjmp.h>
ENTRY(setjmp)
diff --git a/lib/libc/aarch64/gen/sigsetjmp.S b/lib/libc/aarch64/gen/sigsetjmp.S
index e0d0cd1aba20..cdff7a46c85b 100644
--- a/lib/libc/aarch64/gen/sigsetjmp.S
+++ b/lib/libc/aarch64/gen/sigsetjmp.S
@@ -27,8 +27,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/setjmp.h>
ENTRY(sigsetjmp)
diff --git a/lib/libc/aarch64/sys/__vdso_gettc.c b/lib/libc/aarch64/sys/__vdso_gettc.c
index 85e1b2e23cd3..52fba0e08566 100644
--- a/lib/libc/aarch64/sys/__vdso_gettc.c
+++ b/lib/libc/aarch64/sys/__vdso_gettc.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/elf.h>
#include <sys/time.h>
diff --git a/lib/libc/aarch64/sys/cerror.S b/lib/libc/aarch64/sys/cerror.S
index a85b6b242a41..a83514bc2511 100644
--- a/lib/libc/aarch64/sys/cerror.S
+++ b/lib/libc/aarch64/sys/cerror.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(cerror)
.hidden cerror
sub sp, sp, #16
diff --git a/lib/libc/aarch64/sys/syscall.S b/lib/libc/aarch64/sys/syscall.S
index bd460279e4a0..2c7e207f82f7 100644
--- a/lib/libc/aarch64/sys/syscall.S
+++ b/lib/libc/aarch64/sys/syscall.S
@@ -27,8 +27,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "SYS.h"
RSYSCALL(syscall)
diff --git a/lib/libc/aarch64/sys/vfork.S b/lib/libc/aarch64/sys/vfork.S
index 77c1e0cfb0e2..f9489738a3c7 100644
--- a/lib/libc/aarch64/sys/vfork.S
+++ b/lib/libc/aarch64/sys/vfork.S
@@ -25,7 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
#include "SYS.h"
ENTRY(__sys_vfork)
diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S
index 034900305e9a..43af2b68b3f2 100644
--- a/lib/libc/amd64/gen/_setjmp.S
+++ b/lib/libc/amd64/gen/_setjmp.S
@@ -34,8 +34,6 @@
.asciz "@(#)_setjmp.s 5.1 (Berkeley) 4/23/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* C library -- _setjmp, _longjmp
*
diff --git a/lib/libc/amd64/gen/fabs.S b/lib/libc/amd64/gen/fabs.S
index 38e67ab03873..8c7e4464d1f5 100644
--- a/lib/libc/amd64/gen/fabs.S
+++ b/lib/libc/amd64/gen/fabs.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* Return floating point absolute value of a double.
*/
diff --git a/lib/libc/amd64/gen/flt_rounds.c b/lib/libc/amd64/gen/flt_rounds.c
index c0ce81f6dfa9..018ea029ee3f 100644
--- a/lib/libc/amd64/gen/flt_rounds.c
+++ b/lib/libc/amd64/gen/flt_rounds.c
@@ -4,8 +4,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
static const int map[] = {
diff --git a/lib/libc/amd64/gen/infinity.c b/lib/libc/amd64/gen/infinity.c
index 464b4029b35a..b9db2fc84efa 100644
--- a/lib/libc/amd64/gen/infinity.c
+++ b/lib/libc/amd64/gen/infinity.c
@@ -3,8 +3,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
/* bytes for +Infinity on a 387 */
diff --git a/lib/libc/amd64/gen/makecontext.c b/lib/libc/amd64/gen/makecontext.c
index 05ceba7d9af9..dcc3b8ab9b45 100644
--- a/lib/libc/amd64/gen/makecontext.c
+++ b/lib/libc/amd64/gen/makecontext.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ucontext.h>
#include <stdarg.h>
diff --git a/lib/libc/amd64/gen/rfork_thread.S b/lib/libc/amd64/gen/rfork_thread.S
index d08700fb4fe4..a3c64fad7994 100644
--- a/lib/libc/amd64/gen/rfork_thread.S
+++ b/lib/libc/amd64/gen/rfork_thread.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* With thanks to John Dyson for the original version of this.
*/
diff --git a/lib/libc/amd64/gen/setjmp.S b/lib/libc/amd64/gen/setjmp.S
index 173a2d29953a..6f469c4c08e8 100644
--- a/lib/libc/amd64/gen/setjmp.S
+++ b/lib/libc/amd64/gen/setjmp.S
@@ -34,8 +34,6 @@
.asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* C library -- _setjmp, _longjmp
*
diff --git a/lib/libc/amd64/gen/signalcontext.c b/lib/libc/amd64/gen/signalcontext.c
index 283a9715e768..cc1c2523c754 100644
--- a/lib/libc/amd64/gen/signalcontext.c
+++ b/lib/libc/amd64/gen/signalcontext.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ucontext.h>
#include <signal.h>
diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/amd64/gen/sigsetjmp.S
index 743b8a631d3b..757280159d82 100644
--- a/lib/libc/amd64/gen/sigsetjmp.S
+++ b/lib/libc/amd64/gen/sigsetjmp.S
@@ -37,8 +37,6 @@
.asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "SYS.h"
/*-
diff --git a/lib/libc/amd64/stdlib/div.S b/lib/libc/amd64/stdlib/div.S
index 366010c3d208..f15ef2ffc5bb 100644
--- a/lib/libc/amd64/stdlib/div.S
+++ b/lib/libc/amd64/stdlib/div.S
@@ -6,8 +6,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(div)
movl %edi,%eax
cltd
diff --git a/lib/libc/amd64/stdlib/ldiv.S b/lib/libc/amd64/stdlib/ldiv.S
index f11472c671dc..6c1e2292d7f2 100644
--- a/lib/libc/amd64/stdlib/ldiv.S
+++ b/lib/libc/amd64/stdlib/ldiv.S
@@ -6,8 +6,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(ldiv)
movq %rdi,%rax
cqto
diff --git a/lib/libc/amd64/stdlib/lldiv.S b/lib/libc/amd64/stdlib/lldiv.S
index 4dab0fdd5278..744cfefd064b 100644
--- a/lib/libc/amd64/stdlib/lldiv.S
+++ b/lib/libc/amd64/stdlib/lldiv.S
@@ -6,8 +6,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(lldiv)
movq %rdi,%rax
cqto
diff --git a/lib/libc/amd64/string/bcopy.c b/lib/libc/amd64/string/bcopy.c
index 9e0c4187e439..406b28f0b97a 100644
--- a/lib/libc/amd64/string/bcopy.c
+++ b/lib/libc/amd64/string/bcopy.c
@@ -3,8 +3,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
void
diff --git a/lib/libc/amd64/string/bzero.c b/lib/libc/amd64/string/bzero.c
index 1ab391076b0d..a4fdb74d6bb4 100644
--- a/lib/libc/amd64/string/bzero.c
+++ b/lib/libc/amd64/string/bzero.c
@@ -3,8 +3,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
void
diff --git a/lib/libc/amd64/string/memcmp.S b/lib/libc/amd64/string/memcmp.S
index d954b11308e1..fea5cebc65f2 100644
--- a/lib/libc/amd64/string/memcmp.S
+++ b/lib/libc/amd64/string/memcmp.S
@@ -27,8 +27,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* Note: this routine was written with kernel use in mind (read: no simd),
* it is only present in userspace as a temporary measure until something
diff --git a/lib/libc/amd64/string/memmove.S b/lib/libc/amd64/string/memmove.S
index bd074e233511..7878e6e9bee6 100644
--- a/lib/libc/amd64/string/memmove.S
+++ b/lib/libc/amd64/string/memmove.S
@@ -27,8 +27,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* Note: this routine was written with kernel use in mind (read: no simd),
* it is only present in userspace as a temporary measure until something
diff --git a/lib/libc/amd64/string/memset.S b/lib/libc/amd64/string/memset.S
index 43d6e36ea6f4..bfab34eeaeb9 100644
--- a/lib/libc/amd64/string/memset.S
+++ b/lib/libc/amd64/string/memset.S
@@ -27,8 +27,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* Note: this routine was written with kernel use in mind (read: no simd),
* it is only present in userspace as a temporary measure until something
diff --git a/lib/libc/amd64/string/stpcpy.S b/lib/libc/amd64/string/stpcpy.S
index 52ac69c5f7e2..73c765556dc1 100644
--- a/lib/libc/amd64/string/stpcpy.S
+++ b/lib/libc/amd64/string/stpcpy.S
@@ -5,8 +5,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* This stpcpy implementation copies a byte at a time until the
* source pointer is aligned to a word boundary, it then copies by
diff --git a/lib/libc/amd64/string/strcat.S b/lib/libc/amd64/string/strcat.S
index 7b5a1dd39cd3..0834408acfb7 100644
--- a/lib/libc/amd64/string/strcat.S
+++ b/lib/libc/amd64/string/strcat.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if 0
RCSID("$NetBSD: strcat.S,v 1.4 2004/07/26 18:51:21 drochner Exp $")
#endif
diff --git a/lib/libc/amd64/string/strcmp.S b/lib/libc/amd64/string/strcmp.S
index 787e1e07b1b0..437db7eca43a 100644
--- a/lib/libc/amd64/string/strcmp.S
+++ b/lib/libc/amd64/string/strcmp.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if 0
RCSID("$NetBSD: strcmp.S,v 1.3 2004/07/19 20:04:41 drochner Exp $")
#endif
diff --git a/lib/libc/amd64/string/strcpy.c b/lib/libc/amd64/string/strcpy.c
index 24161292de7f..fbc661462ff2 100644
--- a/lib/libc/amd64/string/strcpy.c
+++ b/lib/libc/amd64/string/strcpy.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
char *__stpcpy(char * __restrict, const char * __restrict);
char *
diff --git a/lib/libc/amd64/string/strlen.S b/lib/libc/amd64/string/strlen.S
index 7e2514de44b0..cc248af001ac 100644
--- a/lib/libc/amd64/string/strlen.S
+++ b/lib/libc/amd64/string/strlen.S
@@ -9,8 +9,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "amd64_archlevel.h"
/*
diff --git a/lib/libc/amd64/sys/amd64_get_fsbase.c b/lib/libc/amd64/sys/amd64_get_fsbase.c
index 751955a0cda4..4784bb0baf42 100644
--- a/lib/libc/amd64/sys/amd64_get_fsbase.c
+++ b/lib/libc/amd64/sys/amd64_get_fsbase.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _WANT_P_OSREL
#include <sys/param.h>
#include <machine/cpufunc.h>
diff --git a/lib/libc/amd64/sys/amd64_get_gsbase.c b/lib/libc/amd64/sys/amd64_get_gsbase.c
index 85ebebb8ffae..c81773c4b78c 100644
--- a/lib/libc/amd64/sys/amd64_get_gsbase.c
+++ b/lib/libc/amd64/sys/amd64_get_gsbase.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _WANT_P_OSREL
#include <sys/param.h>
#include <machine/cpufunc.h>
diff --git a/lib/libc/amd64/sys/amd64_set_fsbase.c b/lib/libc/amd64/sys/amd64_set_fsbase.c
index dae6fc4fdfea..24dddcad48f8 100644
--- a/lib/libc/amd64/sys/amd64_set_fsbase.c
+++ b/lib/libc/amd64/sys/amd64_set_fsbase.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _WANT_P_OSREL
#include <sys/param.h>
#include <machine/cpufunc.h>
diff --git a/lib/libc/amd64/sys/amd64_set_gsbase.c b/lib/libc/amd64/sys/amd64_set_gsbase.c
index 6a7152c62a0a..10004afe8234 100644
--- a/lib/libc/amd64/sys/amd64_set_gsbase.c
+++ b/lib/libc/amd64/sys/amd64_set_gsbase.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _WANT_P_OSREL
#include <sys/param.h>
#include <machine/cpufunc.h>
diff --git a/lib/libc/amd64/sys/cerror.S b/lib/libc/amd64/sys/cerror.S
index 1928acd0b7a9..d0b11888562e 100644
--- a/lib/libc/amd64/sys/cerror.S
+++ b/lib/libc/amd64/sys/cerror.S
@@ -34,8 +34,6 @@
.asciz "@(#)cerror.s 5.1 (Berkeley) 4/23/90"
#endif /* SYSLIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "SYS.h"
.globl HIDENAME(cerror)
diff --git a/lib/libc/amd64/sys/getcontext.S b/lib/libc/amd64/sys/getcontext.S
index b11e65caf580..6860a3cf9bef 100644
--- a/lib/libc/amd64/sys/getcontext.S
+++ b/lib/libc/amd64/sys/getcontext.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <SYS.h>
/*
diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libc/amd64/sys/vfork.S
index 550f14c3b60b..11faadc6b310 100644
--- a/lib/libc/amd64/sys/vfork.S
+++ b/lib/libc/amd64/sys/vfork.S
@@ -34,8 +34,6 @@
.asciz "@(#)Ovfork.s 5.1 (Berkeley) 4/23/90"
#endif /* SYSLIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "SYS.h"
WEAK_REFERENCE(__sys_vfork, _vfork)
diff --git a/lib/libc/arm/aeabi/aeabi_asm_double.S b/lib/libc/arm/aeabi/aeabi_asm_double.S
index ced4d78b6cbf..767c62a7edf8 100644
--- a/lib/libc/arm/aeabi/aeabi_asm_double.S
+++ b/lib/libc/arm/aeabi/aeabi_asm_double.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#define PCR_Z (1 << 30)
#define PCR_C (1 << 29)
diff --git a/lib/libc/arm/aeabi/aeabi_asm_float.S b/lib/libc/arm/aeabi/aeabi_asm_float.S
index de6b1c88f4f2..f9dff9e0aec6 100644
--- a/lib/libc/arm/aeabi/aeabi_asm_float.S
+++ b/lib/libc/arm/aeabi/aeabi_asm_float.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#define PCR_Z (1 << 30)
#define PCR_C (1 << 29)
diff --git a/lib/libc/arm/aeabi/aeabi_atexit.c b/lib/libc/arm/aeabi/aeabi_atexit.c
index d3639ed17c11..267ddfb223de 100644
--- a/lib/libc/arm/aeabi/aeabi_atexit.c
+++ b/lib/libc/arm/aeabi/aeabi_atexit.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
int __cxa_atexit(void (*)(void *), void *, void *);
int
diff --git a/lib/libc/arm/aeabi/aeabi_double.c b/lib/libc/arm/aeabi/aeabi_double.c
index e3eb9e539d73..9fb0c61a3467 100644
--- a/lib/libc/arm/aeabi/aeabi_double.c
+++ b/lib/libc/arm/aeabi/aeabi_double.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "softfloat-for-gcc.h"
#include "milieu.h"
#include "softfloat.h"
diff --git a/lib/libc/arm/aeabi/aeabi_float.c b/lib/libc/arm/aeabi/aeabi_float.c
index de25334e590b..71b46af836ed 100644
--- a/lib/libc/arm/aeabi/aeabi_float.c
+++ b/lib/libc/arm/aeabi/aeabi_float.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "softfloat-for-gcc.h"
#include "milieu.h"
#include "softfloat.h"
diff --git a/lib/libc/arm/aeabi/aeabi_int_div.S b/lib/libc/arm/aeabi/aeabi_int_div.S
index 41f5c123b1e4..708b478b3881 100644
--- a/lib/libc/arm/aeabi/aeabi_int_div.S
+++ b/lib/libc/arm/aeabi/aeabi_int_div.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* Due to bug in libcompiler_rt, all symbols declared by
* DEFINE_AEABI_FUNCTION_ALIAS() are not hidden. All these but
diff --git a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
index 74d81903f976..f3bee222d529 100644
--- a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
+++ b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
void __aeabi_unwind_cpp_pr0(void) __hidden;
diff --git a/lib/libc/arm/aeabi/aeabi_unwind_exidx.c b/lib/libc/arm/aeabi/aeabi_unwind_exidx.c
index d5af8b3fc6e0..e7bff3816ff5 100644
--- a/lib/libc/arm/aeabi/aeabi_unwind_exidx.c
+++ b/lib/libc/arm/aeabi/aeabi_unwind_exidx.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/elf.h>
#include <link.h>
diff --git a/lib/libc/arm/aeabi/aeabi_vfp_double.S b/lib/libc/arm/aeabi/aeabi_vfp_double.S
index be4309dd6efc..89287d922f78 100644
--- a/lib/libc/arm/aeabi/aeabi_vfp_double.S
+++ b/lib/libc/arm/aeabi/aeabi_vfp_double.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "aeabi_vfp.h"
.fpu vfp
diff --git a/lib/libc/arm/aeabi/aeabi_vfp_float.S b/lib/libc/arm/aeabi/aeabi_vfp_float.S
index c9df41cf4b2e..389e58935f89 100644
--- a/lib/libc/arm/aeabi/aeabi_vfp_float.S
+++ b/lib/libc/arm/aeabi/aeabi_vfp_float.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "aeabi_vfp.h"
.fpu vfp
diff --git a/lib/libc/arm/gen/__aeabi_read_tp.S b/lib/libc/arm/gen/__aeabi_read_tp.S
index 6229c951b344..066d92e2e956 100644
--- a/lib/libc/arm/gen/__aeabi_read_tp.S
+++ b/lib/libc/arm/gen/__aeabi_read_tp.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/sysarch.h>
ENTRY(__aeabi_read_tp)
diff --git a/lib/libc/arm/gen/_setjmp.S b/lib/libc/arm/gen/_setjmp.S
index d79697ace307..19b8b6b07059 100644
--- a/lib/libc/arm/gen/_setjmp.S
+++ b/lib/libc/arm/gen/_setjmp.S
@@ -42,9 +42,6 @@
#include <machine/asm.h>
#include <machine/setjmp.h>
-
-__FBSDID("$FreeBSD$");
-
/*
* C library -- _setjmp, _longjmp
*
diff --git a/lib/libc/arm/gen/alloca.S b/lib/libc/arm/gen/alloca.S
index 2539b7a80c97..3545cc642aad 100644
--- a/lib/libc/arm/gen/alloca.S
+++ b/lib/libc/arm/gen/alloca.S
@@ -35,8 +35,6 @@
/* like alloc, but automatic automatic free in return */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(alloca)
add r0, r0, #0x00000007 /* round up to next 8 byte alignment */
bic r0, r0, #0x00000007
diff --git a/lib/libc/arm/gen/arm_drain_writebuf.c b/lib/libc/arm/gen/arm_drain_writebuf.c
index e20c8bc7a833..d8e4063f27cb 100644
--- a/lib/libc/arm/gen/arm_drain_writebuf.c
+++ b/lib/libc/arm/gen/arm_drain_writebuf.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/sysarch.h>
#include <stddef.h>
diff --git a/lib/libc/arm/gen/arm_initfini.c b/lib/libc/arm/gen/arm_initfini.c
index a54646eb7907..00ca41165c29 100644
--- a/lib/libc/arm/gen/arm_initfini.c
+++ b/lib/libc/arm/gen/arm_initfini.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* To properly implement setjmp/longjmp for the ARM AAPCS ABI, it has to be
* aware of whether there is a FPU is present or not. Regardless of whether
diff --git a/lib/libc/arm/gen/arm_sync_icache.c b/lib/libc/arm/gen/arm_sync_icache.c
index 5a029b45c47d..d89f57cbae18 100644
--- a/lib/libc/arm/gen/arm_sync_icache.c
+++ b/lib/libc/arm/gen/arm_sync_icache.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/sysarch.h>
#include <stddef.h>
diff --git a/lib/libc/arm/gen/divsi3.S b/lib/libc/arm/gen/divsi3.S
index fac0663cdb2a..9fddebaf96f3 100644
--- a/lib/libc/arm/gen/divsi3.S
+++ b/lib/libc/arm/gen/divsi3.S
@@ -15,8 +15,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* stack is aligned as there's a possibility of branching to L_overflow
* which makes a C call
diff --git a/lib/libc/arm/gen/fabs.c b/lib/libc/arm/gen/fabs.c
index 6730a6746289..b3020b88062d 100644
--- a/lib/libc/arm/gen/fabs.c
+++ b/lib/libc/arm/gen/fabs.c
@@ -37,8 +37,6 @@
* fabs(x) returns the absolute value of x.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
double
fabs(double x)
{
diff --git a/lib/libc/arm/gen/flt_rounds.c b/lib/libc/arm/gen/flt_rounds.c
index 1947d4748ce9..a592dbff38c0 100644
--- a/lib/libc/arm/gen/flt_rounds.c
+++ b/lib/libc/arm/gen/flt_rounds.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <float.h>
diff --git a/lib/libc/arm/gen/fpgetmask_vfp.c b/lib/libc/arm/gen/fpgetmask_vfp.c
index 7c4d76fc403d..d70f5caf845b 100644
--- a/lib/libc/arm/gen/fpgetmask_vfp.c
+++ b/lib/libc/arm/gen/fpgetmask_vfp.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/arm/gen/fpgetround_vfp.c b/lib/libc/arm/gen/fpgetround_vfp.c
index ed9438865649..830193b65e65 100644
--- a/lib/libc/arm/gen/fpgetround_vfp.c
+++ b/lib/libc/arm/gen/fpgetround_vfp.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/arm/gen/fpgetsticky_vfp.c b/lib/libc/arm/gen/fpgetsticky_vfp.c
index f1e0ba5bfdb2..34ed2f0dd5e0 100644
--- a/lib/libc/arm/gen/fpgetsticky_vfp.c
+++ b/lib/libc/arm/gen/fpgetsticky_vfp.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/arm/gen/fpsetmask_vfp.c b/lib/libc/arm/gen/fpsetmask_vfp.c
index 170e06d74fa9..bf9c1c622094 100644
--- a/lib/libc/arm/gen/fpsetmask_vfp.c
+++ b/lib/libc/arm/gen/fpsetmask_vfp.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/arm/gen/fpsetround_vfp.c b/lib/libc/arm/gen/fpsetround_vfp.c
index dc65a2e10057..76b8a9e92269 100644
--- a/lib/libc/arm/gen/fpsetround_vfp.c
+++ b/lib/libc/arm/gen/fpsetround_vfp.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/arm/gen/fpsetsticky_vfp.c b/lib/libc/arm/gen/fpsetsticky_vfp.c
index ddc15938417c..e98681e2372c 100644
--- a/lib/libc/arm/gen/fpsetsticky_vfp.c
+++ b/lib/libc/arm/gen/fpsetsticky_vfp.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/arm/gen/getcontextx.c b/lib/libc/arm/gen/getcontextx.c
index d857420c776a..78db8c077152 100644
--- a/lib/libc/arm/gen/getcontextx.c
+++ b/lib/libc/arm/gen/getcontextx.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ucontext.h>
#include <errno.h>
diff --git a/lib/libc/arm/gen/infinity.c b/lib/libc/arm/gen/infinity.c
index 60faf42a7ea3..fe6c147980ec 100644
--- a/lib/libc/arm/gen/infinity.c
+++ b/lib/libc/arm/gen/infinity.c
@@ -3,8 +3,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
/* bytes for +Infinity on a 387 */
diff --git a/lib/libc/arm/gen/makecontext.c b/lib/libc/arm/gen/makecontext.c
index ad3f97184fd0..bf24e1f741c9 100644
--- a/lib/libc/arm/gen/makecontext.c
+++ b/lib/libc/arm/gen/makecontext.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <stddef.h>
#include <inttypes.h>
diff --git a/lib/libc/arm/gen/setjmp.S b/lib/libc/arm/gen/setjmp.S
index 58353ca9a5fc..5a6c899e2b23 100644
--- a/lib/libc/arm/gen/setjmp.S
+++ b/lib/libc/arm/gen/setjmp.S
@@ -40,9 +40,6 @@
#include <machine/asm.h>
#include <machine/setjmp.h>
-
-__FBSDID("$FreeBSD$");
-
/*
* C library -- setjmp, longjmp
*
diff --git a/lib/libc/arm/gen/signalcontext.c b/lib/libc/arm/gen/signalcontext.c
index 2a6d76a1ccf2..95fdc1579f84 100644
--- a/lib/libc/arm/gen/signalcontext.c
+++ b/lib/libc/arm/gen/signalcontext.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/signal.h>
#include <sys/ucontext.h>
diff --git a/lib/libc/arm/gen/sigsetjmp.S b/lib/libc/arm/gen/sigsetjmp.S
index 236f5310a7f3..a4e2e974c945 100644
--- a/lib/libc/arm/gen/sigsetjmp.S
+++ b/lib/libc/arm/gen/sigsetjmp.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/setjmp.h>
/*
diff --git a/lib/libc/arm/string/bcopy.S b/lib/libc/arm/string/bcopy.S
index f2583fc7ffc8..dbe9efc06194 100644
--- a/lib/libc/arm/string/bcopy.S
+++ b/lib/libc/arm/string/bcopy.S
@@ -1,6 +1,5 @@
/* $NetBSD: bcopy.S,v 1.3 2003/10/14 07:51:45 scw Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
#define _BCOPY
#include "memmove.S"
diff --git a/lib/libc/arm/string/bzero.S b/lib/libc/arm/string/bzero.S
index b31358d6d928..db524c3529ad 100644
--- a/lib/libc/arm/string/bzero.S
+++ b/lib/libc/arm/string/bzero.S
@@ -30,8 +30,5 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
-
#define _BZERO
#include "memset.S"
diff --git a/lib/libc/arm/string/memcmp.S b/lib/libc/arm/string/memcmp.S
index 33a11b7c4c49..2dbb1831c724 100644
--- a/lib/libc/arm/string/memcmp.S
+++ b/lib/libc/arm/string/memcmp.S
@@ -63,9 +63,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
-
.syntax unified
ENTRY(memcmp)
diff --git a/lib/libc/arm/string/memcpy.S b/lib/libc/arm/string/memcpy.S
index 63390edeaa95..6ea7bec7e9cc 100644
--- a/lib/libc/arm/string/memcpy.S
+++ b/lib/libc/arm/string/memcpy.S
@@ -36,8 +36,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.syntax unified
/* LINTSTUB: Func: void *memcpy(void *dst, const void *src, size_t len) */
diff --git a/lib/libc/arm/string/memmove.S b/lib/libc/arm/string/memmove.S
index 27ec743bb44a..fa871d9274e9 100644
--- a/lib/libc/arm/string/memmove.S
+++ b/lib/libc/arm/string/memmove.S
@@ -30,8 +30,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.syntax unified
#ifndef _BCOPY
diff --git a/lib/libc/arm/string/memset.S b/lib/libc/arm/string/memset.S
index 6ac64274db95..40e0e567668b 100644
--- a/lib/libc/arm/string/memset.S
+++ b/lib/libc/arm/string/memset.S
@@ -67,8 +67,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.syntax unified
/*
diff --git a/lib/libc/arm/string/strcmp.S b/lib/libc/arm/string/strcmp.S
index 1cdce8bcbab9..19145c61ebd8 100644
--- a/lib/libc/arm/string/strcmp.S
+++ b/lib/libc/arm/string/strcmp.S
@@ -29,9 +29,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
-
ENTRY(strcmp)
1:
ldrb r2, [r0], #1
diff --git a/lib/libc/arm/string/strlen.S b/lib/libc/arm/string/strlen.S
index fdfd8643ae16..5b68e51b8a25 100644
--- a/lib/libc/arm/string/strlen.S
+++ b/lib/libc/arm/string/strlen.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.syntax unified
ENTRY(strlen)
diff --git a/lib/libc/arm/string/strncmp.S b/lib/libc/arm/string/strncmp.S
index affcaa0537b2..d3d6ce08e0c3 100644
--- a/lib/libc/arm/string/strncmp.S
+++ b/lib/libc/arm/string/strncmp.S
@@ -29,9 +29,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
-
ENTRY(strncmp)
/* if (len == 0) return 0 */
cmp r2, #0
diff --git a/lib/libc/arm/sys/Ovfork.S b/lib/libc/arm/sys/Ovfork.S
index 73c619e3609d..0913f0361c4d 100644
--- a/lib/libc/arm/sys/Ovfork.S
+++ b/lib/libc/arm/sys/Ovfork.S
@@ -32,7 +32,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
#include "SYS.h"
/*
diff --git a/lib/libc/arm/sys/__vdso_gettc.c b/lib/libc/arm/sys/__vdso_gettc.c
index 6e373c0a81ab..e5987eea2fe4 100644
--- a/lib/libc/arm/sys/__vdso_gettc.c
+++ b/lib/libc/arm/sys/__vdso_gettc.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/elf.h>
#include <sys/time.h>
diff --git a/lib/libc/arm/sys/cerror.S b/lib/libc/arm/sys/cerror.S
index 5fad698caf11..06e51bc649f0 100644
--- a/lib/libc/arm/sys/cerror.S
+++ b/lib/libc/arm/sys/cerror.S
@@ -32,7 +32,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
#include "SYS.h"
.globl _C_LABEL(__error)
diff --git a/lib/libc/arm/sys/syscall.S b/lib/libc/arm/sys/syscall.S
index c88d1aeb4b65..3199b8fb2f51 100644
--- a/lib/libc/arm/sys/syscall.S
+++ b/lib/libc/arm/sys/syscall.S
@@ -32,7 +32,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
#include "SYS.h"
RSYSCALL(syscall)
diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c
index 5546fb1014a6..f38c673967bd 100644
--- a/lib/libc/compat-43/creat.c
+++ b/lib/libc/compat-43/creat.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)creat.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <fcntl.h>
#include "un-namespace.h"
diff --git a/lib/libc/compat-43/gethostid.c b/lib/libc/compat-43/gethostid.c
index d58f11bbb972..2314b9f6df64 100644
--- a/lib/libc/compat-43/gethostid.c
+++ b/lib/libc/compat-43/gethostid.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)gethostid.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/compat-43/getwd.c b/lib/libc/compat-43/getwd.c
index ba5b095ec178..c5f10440516d 100644
--- a/lib/libc/compat-43/getwd.c
+++ b/lib/libc/compat-43/getwd.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)getwd.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <unistd.h>
#include <errno.h>
diff --git a/lib/libc/compat-43/killpg.c b/lib/libc/compat-43/killpg.c
index fa8893b050fb..69340598262b 100644
--- a/lib/libc/compat-43/killpg.c
+++ b/lib/libc/compat-43/killpg.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)killpg.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <signal.h>
#include <errno.h>
diff --git a/lib/libc/compat-43/sethostid.c b/lib/libc/compat-43/sethostid.c
index 00f4d89f82f7..cc53400a598b 100644
--- a/lib/libc/compat-43/sethostid.c
+++ b/lib/libc/compat-43/sethostid.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)sethostid.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/compat-43/setpgrp.c b/lib/libc/compat-43/setpgrp.c
index 12766ce4d20d..4bf0d23ba73d 100644
--- a/lib/libc/compat-43/setpgrp.c
+++ b/lib/libc/compat-43/setpgrp.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)setpgrp.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <unistd.h>
diff --git a/lib/libc/compat-43/setrgid.c b/lib/libc/compat-43/setrgid.c
index 4d83651a85b1..30a7c24cea4d 100644
--- a/lib/libc/compat-43/setrgid.c
+++ b/lib/libc/compat-43/setrgid.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)setrgid.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <unistd.h>
int
diff --git a/lib/libc/compat-43/setruid.c b/lib/libc/compat-43/setruid.c
index 9d581303fcdb..4dd738a6e68d 100644
--- a/lib/libc/compat-43/setruid.c
+++ b/lib/libc/compat-43/setruid.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)setruid.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <unistd.h>
int
diff --git a/lib/libc/compat-43/sigcompat.c b/lib/libc/compat-43/sigcompat.c
index 0a04adae019f..350f8e77971c 100644
--- a/lib/libc/compat-43/sigcompat.c
+++ b/lib/libc/compat-43/sigcompat.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)sigcompat.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <errno.h>
diff --git a/lib/libc/csu/aarch64/reloc.c b/lib/libc/csu/aarch64/reloc.c
index f3dbf3e3b570..7f5dff497fe2 100644
--- a/lib/libc/csu/aarch64/reloc.c
+++ b/lib/libc/csu/aarch64/reloc.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
static void
crt1_handle_rela(const Elf_Rela *r)
{
diff --git a/lib/libc/csu/amd64/reloc.c b/lib/libc/csu/amd64/reloc.c
index 0a5a24929954..654958819271 100644
--- a/lib/libc/csu/amd64/reloc.c
+++ b/lib/libc/csu/amd64/reloc.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/specialreg.h>
#include <machine/cpufunc.h>
diff --git a/lib/libc/csu/i386/reloc.c b/lib/libc/csu/i386/reloc.c
index f99b1089cf47..d617f35dc665 100644
--- a/lib/libc/csu/i386/reloc.c
+++ b/lib/libc/csu/i386/reloc.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/specialreg.h>
#include <machine/cpufunc.h>
diff --git a/lib/libc/csu/powerpc64/reloc.c b/lib/libc/csu/powerpc64/reloc.c
index 5ba191d07cd9..6201ba0f1fb5 100644
--- a/lib/libc/csu/powerpc64/reloc.c
+++ b/lib/libc/csu/powerpc64/reloc.c
@@ -21,8 +21,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
static uint32_t cpu_features;
static uint32_t cpu_features2;
diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c
index c09557377af9..1378e45a77e4 100644
--- a/lib/libc/db/btree/bt_close.c
+++ b/lib/libc/db/btree/bt_close.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bt_close.c 8.7 (Berkeley) 8/17/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
diff --git a/lib/libc/db/btree/bt_conv.c b/lib/libc/db/btree/bt_conv.c
index a929d51de948..5b3f166dff9a 100644
--- a/lib/libc/db/btree/bt_conv.c
+++ b/lib/libc/db/btree/bt_conv.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bt_conv.c 8.5 (Berkeley) 8/17/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdio.h>
diff --git a/lib/libc/db/btree/bt_debug.c b/lib/libc/db/btree/bt_debug.c
index b4af2fbda2ec..50f1294a9603 100644
--- a/lib/libc/db/btree/bt_debug.c
+++ b/lib/libc/db/btree/bt_debug.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdio.h>
diff --git a/lib/libc/db/btree/bt_delete.c b/lib/libc/db/btree/bt_delete.c
index 46afeeef00b6..fc122165a335 100644
--- a/lib/libc/db/btree/bt_delete.c
+++ b/lib/libc/db/btree/bt_delete.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bt_delete.c 8.13 (Berkeley) 7/28/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libc/db/btree/bt_get.c b/lib/libc/db/btree/bt_get.c
index f9998a719764..3a0f9f72d92c 100644
--- a/lib/libc/db/btree/bt_get.c
+++ b/lib/libc/db/btree/bt_get.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bt_get.c 8.6 (Berkeley) 7/20/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c
index 06bbd39f1842..fcc3a9a9abb4 100644
--- a/lib/libc/db/btree/bt_open.c
+++ b/lib/libc/db/btree/bt_open.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bt_open.c 8.10 (Berkeley) 8/17/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Implementation of btree access method for 4.4BSD.
*
diff --git a/lib/libc/db/btree/bt_overflow.c b/lib/libc/db/btree/bt_overflow.c
index e116c359578c..f2c565789311 100644
--- a/lib/libc/db/btree/bt_overflow.c
+++ b/lib/libc/db/btree/bt_overflow.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bt_overflow.c 8.5 (Berkeley) 7/16/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdio.h>
diff --git a/lib/libc/db/btree/bt_page.c b/lib/libc/db/btree/bt_page.c
index 725df366a3ec..aaec36ecfac9 100644
--- a/lib/libc/db/btree/bt_page.c
+++ b/lib/libc/db/btree/bt_page.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)bt_page.c 8.3 (Berkeley) 7/14/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c
index 31ad28b155dc..9b4ea51f184d 100644
--- a/lib/libc/db/btree/bt_put.c
+++ b/lib/libc/db/btree/bt_put.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libc/db/btree/bt_search.c b/lib/libc/db/btree/bt_search.c
index e5e50bfb01ca..bf5245fe1fd0 100644
--- a/lib/libc/db/btree/bt_search.c
+++ b/lib/libc/db/btree/bt_search.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bt_search.c 8.8 (Berkeley) 7/31/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/lib/libc/db/btree/bt_seq.c b/lib/libc/db/btree/bt_seq.c
index 0ba3155a7642..c68c7d3717de 100644
--- a/lib/libc/db/btree/bt_seq.c
+++ b/lib/libc/db/btree/bt_seq.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bt_seq.c 8.7 (Berkeley) 7/20/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
index ec51a10dec12..cae6ebd81c33 100644
--- a/lib/libc/db/btree/bt_split.c
+++ b/lib/libc/db/btree/bt_split.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bt_split.c 8.10 (Berkeley) 1/9/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <limits.h>
diff --git a/lib/libc/db/btree/bt_utils.c b/lib/libc/db/btree/bt_utils.c
index 6cd32cd3a5ac..bc78ef871ff0 100644
--- a/lib/libc/db/btree/bt_utils.c
+++ b/lib/libc/db/btree/bt_utils.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bt_utils.c 8.8 (Berkeley) 7/20/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdio.h>
diff --git a/lib/libc/db/db/db.c b/lib/libc/db/db/db.c
index 7158cc80e44e..0f061ab5b41c 100644
--- a/lib/libc/db/db/db.c
+++ b/lib/libc/db/db/db.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)db.c 8.4 (Berkeley) 2/21/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
index ebb8790b3f23..b707ee5ff3ac 100644
--- a/lib/libc/db/hash/hash.c
+++ b/lib/libc/db/hash/hash.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)hash.c 8.9 (Berkeley) 6/16/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c
index 24596cf780ea..301fc98a1a4a 100644
--- a/lib/libc/db/hash/hash_bigkey.c
+++ b/lib/libc/db/hash/hash_bigkey.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)hash_bigkey.c 8.3 (Berkeley) 5/31/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* PACKAGE: hash
* DESCRIPTION:
diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c
index 63cc9eb4d9ad..72c74d38f1b2 100644
--- a/lib/libc/db/hash/hash_buf.c
+++ b/lib/libc/db/hash/hash_buf.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)hash_buf.c 8.5 (Berkeley) 7/15/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* PACKAGE: hash
*
diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c
index 988e0eed2a30..dc7e276b03a9 100644
--- a/lib/libc/db/hash/hash_func.c
+++ b/lib/libc/db/hash/hash_func.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)hash_func.c 8.2 (Berkeley) 2/21/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <db.h>
diff --git a/lib/libc/db/hash/hash_log2.c b/lib/libc/db/hash/hash_log2.c
index d89351cb415f..62c57b3ef1c7 100644
--- a/lib/libc/db/hash/hash_log2.c
+++ b/lib/libc/db/hash/hash_log2.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)hash_log2.c 8.2 (Berkeley) 5/31/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <db.h>
#include "hash.h"
#include "page.h"
diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c
index afcda6321133..2f86db8106c1 100644
--- a/lib/libc/db/hash/hash_page.c
+++ b/lib/libc/db/hash/hash_page.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)hash_page.c 8.7 (Berkeley) 8/16/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* PACKAGE: hashing
*
diff --git a/lib/libc/db/hash/ndbm.c b/lib/libc/db/hash/ndbm.c
index ace1fb8b9fa7..08e2dc7d3eea 100644
--- a/lib/libc/db/hash/ndbm.c
+++ b/lib/libc/db/hash/ndbm.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)ndbm.c 8.4 (Berkeley) 7/21/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This package provides a dbm compatible interface to the new hashing
* package described in db(3).
diff --git a/lib/libc/db/mpool/mpool-compat.c b/lib/libc/db/mpool/mpool-compat.c
index be53ddc858e2..ef0e340f641e 100644
--- a/lib/libc/db/mpool/mpool-compat.c
+++ b/lib/libc/db/mpool/mpool-compat.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <db.h>
#include <mpool.h>
diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c
index df08299f0990..24dd1b68aaac 100644
--- a/lib/libc/db/mpool/mpool.c
+++ b/lib/libc/db/mpool/mpool.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)mpool.c 8.7 (Berkeley) 11/2/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/lib/libc/db/recno/rec_close.c b/lib/libc/db/recno/rec_close.c
index d481da5f15ea..7264f6dabd1f 100644
--- a/lib/libc/db/recno/rec_close.c
+++ b/lib/libc/db/recno/rec_close.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)rec_close.c 8.6 (Berkeley) 8/18/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/lib/libc/db/recno/rec_delete.c b/lib/libc/db/recno/rec_delete.c
index 6d7b91b187bb..2e3caac31f0d 100644
--- a/lib/libc/db/recno/rec_delete.c
+++ b/lib/libc/db/recno/rec_delete.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)rec_delete.c 8.7 (Berkeley) 7/14/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libc/db/recno/rec_get.c b/lib/libc/db/recno/rec_get.c
index 2524318c4b86..5a47871af78c 100644
--- a/lib/libc/db/recno/rec_get.c
+++ b/lib/libc/db/recno/rec_get.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)rec_get.c 8.9 (Berkeley) 8/18/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libc/db/recno/rec_open.c b/lib/libc/db/recno/rec_open.c
index 19acac61864f..ca1d58f1526a 100644
--- a/lib/libc/db/recno/rec_open.c
+++ b/lib/libc/db/recno/rec_open.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)rec_open.c 8.10 (Berkeley) 9/1/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/mman.h>
diff --git a/lib/libc/db/recno/rec_put.c b/lib/libc/db/recno/rec_put.c
index dd0b5b8b504b..e3b307e3450b 100644
--- a/lib/libc/db/recno/rec_put.c
+++ b/lib/libc/db/recno/rec_put.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)rec_put.c 8.7 (Berkeley) 8/18/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libc/db/recno/rec_search.c b/lib/libc/db/recno/rec_search.c
index f18c66675ac1..c384b9429420 100644
--- a/lib/libc/db/recno/rec_search.c
+++ b/lib/libc/db/recno/rec_search.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)rec_search.c 8.4 (Berkeley) 7/14/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libc/db/recno/rec_seq.c b/lib/libc/db/recno/rec_seq.c
index c2d21d27b147..bcbf309f6c94 100644
--- a/lib/libc/db/recno/rec_seq.c
+++ b/lib/libc/db/recno/rec_seq.c
@@ -34,8 +34,6 @@
/* XXX use __SCCSID */
static char sccsid[] __unused = "@(#)rec_seq.c 8.3 (Berkeley) 7/14/94";
#endif /* not lint */
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libc/db/recno/rec_utils.c b/lib/libc/db/recno/rec_utils.c
index 7d930195c0bd..48631fd84429 100644
--- a/lib/libc/db/recno/rec_utils.c
+++ b/lib/libc/db/recno/rec_utils.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)rec_utils.c 8.6 (Berkeley) 7/16/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdio.h>
diff --git a/lib/libc/db/test/btree.tests/main.c b/lib/libc/db/test/btree.tests/main.c
index a125402cdfb7..50a769fa9441 100644
--- a/lib/libc/db/test/btree.tests/main.c
+++ b/lib/libc/db/test/btree.tests/main.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <fcntl.h>
#include <db.h>
diff --git a/lib/libc/db/test/dbtest.c b/lib/libc/db/test/dbtest.c
index fbc20f0e6918..8b47827db996 100644
--- a/lib/libc/db/test/dbtest.c
+++ b/lib/libc/db/test/dbtest.c
@@ -39,8 +39,6 @@ static char copyright[] =
static char sccsid[] = "@(#)dbtest.c 8.17 (Berkeley) 9/1/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libc/db/test/hash.tests/driver2.c b/lib/libc/db/test/hash.tests/driver2.c
index 9123fa82fc40..05f2d57a7533 100644
--- a/lib/libc/db/test/hash.tests/driver2.c
+++ b/lib/libc/db/test/hash.tests/driver2.c
@@ -42,8 +42,6 @@ static char copyright[] =
static char sccsid[] = "@(#)driver2.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Test driver, to try to tackle the large ugly-split problem.
*/
diff --git a/lib/libc/db/test/hash.tests/tcreat3.c b/lib/libc/db/test/hash.tests/tcreat3.c
index 508585871e1e..68be11143c55 100644
--- a/lib/libc/db/test/hash.tests/tcreat3.c
+++ b/lib/libc/db/test/hash.tests/tcreat3.c
@@ -42,8 +42,6 @@ static char copyright[] =
static char sccsid[] = "@(#)tcreat3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
diff --git a/lib/libc/db/test/hash.tests/tdel.c b/lib/libc/db/test/hash.tests/tdel.c
index 5b066756af7b..9760e271808c 100644
--- a/lib/libc/db/test/hash.tests/tdel.c
+++ b/lib/libc/db/test/hash.tests/tdel.c
@@ -42,8 +42,6 @@ static char copyright[] =
static char sccsid[] = "@(#)tdel.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/file.h>
#include <db.h>
diff --git a/lib/libc/db/test/hash.tests/thash4.c b/lib/libc/db/test/hash.tests/thash4.c
index daeaa03fe7ae..641534a92730 100644
--- a/lib/libc/db/test/hash.tests/thash4.c
+++ b/lib/libc/db/test/hash.tests/thash4.c
@@ -42,8 +42,6 @@ static char copyright[] =
static char sccsid[] = "@(#)thash4.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/file.h>
#include <sys/timeb.h>
diff --git a/lib/libc/db/test/hash.tests/tread2.c b/lib/libc/db/test/hash.tests/tread2.c
index 359667b87f79..4962d163a24c 100644
--- a/lib/libc/db/test/hash.tests/tread2.c
+++ b/lib/libc/db/test/hash.tests/tread2.c
@@ -42,8 +42,6 @@ static char copyright[] =
static char sccsid[] = "@(#)tread2.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
diff --git a/lib/libc/db/test/hash.tests/tseq.c b/lib/libc/db/test/hash.tests/tseq.c
index 0b1f7a9a0867..c9569cbbe6d4 100644
--- a/lib/libc/db/test/hash.tests/tseq.c
+++ b/lib/libc/db/test/hash.tests/tseq.c
@@ -42,8 +42,6 @@ static char copyright[] =
static char sccsid[] = "@(#)tseq.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
diff --git a/lib/libc/db/test/hash.tests/tverify.c b/lib/libc/db/test/hash.tests/tverify.c
index d72c2466533c..2e8209e42117 100644
--- a/lib/libc/db/test/hash.tests/tverify.c
+++ b/lib/libc/db/test/hash.tests/tverify.c
@@ -42,8 +42,6 @@ static char copyright[] =
static char sccsid[] = "@(#)tverify.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
diff --git a/lib/libc/gdtoa/_hdtoa.c b/lib/libc/gdtoa/_hdtoa.c
index 4a13a95a1ee7..c5f2238d7a7b 100644
--- a/lib/libc/gdtoa/_hdtoa.c
+++ b/lib/libc/gdtoa/_hdtoa.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <limits.h>
#include <math.h>
diff --git a/lib/libc/gdtoa/_hldtoa.c b/lib/libc/gdtoa/_hldtoa.c
index 0483609a7594..698038fd8de4 100644
--- a/lib/libc/gdtoa/_hldtoa.c
+++ b/lib/libc/gdtoa/_hldtoa.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <limits.h>
#include <math.h>
diff --git a/lib/libc/gdtoa/_ldtoa.c b/lib/libc/gdtoa/_ldtoa.c
index 059b1a4ba8aa..3787b7dd653d 100644
--- a/lib/libc/gdtoa/_ldtoa.c
+++ b/lib/libc/gdtoa/_ldtoa.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <inttypes.h>
#include <limits.h>
diff --git a/lib/libc/gdtoa/machdep_ldisQ.c b/lib/libc/gdtoa/machdep_ldisQ.c
index 1752906b53a1..d39d57e9d292 100644
--- a/lib/libc/gdtoa/machdep_ldisQ.c
+++ b/lib/libc/gdtoa/machdep_ldisQ.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "gdtoaimp.h"
diff --git a/lib/libc/gdtoa/machdep_ldisd.c b/lib/libc/gdtoa/machdep_ldisd.c
index d149c3e90fbe..79370e05c604 100644
--- a/lib/libc/gdtoa/machdep_ldisd.c
+++ b/lib/libc/gdtoa/machdep_ldisd.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "gdtoaimp.h"
#undef strtold_l
diff --git a/lib/libc/gdtoa/machdep_ldisx.c b/lib/libc/gdtoa/machdep_ldisx.c
index 8a9d11ef2f13..7c7c0d9e5d28 100644
--- a/lib/libc/gdtoa/machdep_ldisx.c
+++ b/lib/libc/gdtoa/machdep_ldisx.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "gdtoaimp.h"
diff --git a/lib/libc/gen/__getosreldate.c b/lib/libc/gen/__getosreldate.c
index 685382f76977..81e7382caac6 100644
--- a/lib/libc/gen/__getosreldate.c
+++ b/lib/libc/gen/__getosreldate.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <errno.h>
diff --git a/lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c b/lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c
index 197d77c69541..1f0a8f7a944d 100644
--- a/lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c
+++ b/lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <pthread.h>
#include "libc_private.h"
diff --git a/lib/libc/gen/__xuname.c b/lib/libc/gen/__xuname.c
index fba5eaeebc88..f6e1372dc76a 100644
--- a/lib/libc/gen/__xuname.c
+++ b/lib/libc/gen/__xuname.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/utsname.h>
diff --git a/lib/libc/gen/_once_stub.c b/lib/libc/gen/_once_stub.c
index 45ea4373299a..27de031108af 100644
--- a/lib/libc/gen/_once_stub.c
+++ b/lib/libc/gen/_once_stub.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <pthread.h>
#include "un-namespace.h"
diff --git a/lib/libc/gen/_pthread_stubs.c b/lib/libc/gen/_pthread_stubs.c
index c0098aeeedd0..6741c6a5ec51 100644
--- a/lib/libc/gen/_pthread_stubs.c
+++ b/lib/libc/gen/_pthread_stubs.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <signal.h>
#include <pthread.h>
#include <stdlib.h>
diff --git a/lib/libc/gen/_rand48.c b/lib/libc/gen/_rand48.c
index 279bbc362394..e422781e44d3 100644
--- a/lib/libc/gen/_rand48.c
+++ b/lib/libc/gen/_rand48.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rand48.h"
unsigned short _rand48_seed[3] = {
diff --git a/lib/libc/gen/_spinlock_stub.c b/lib/libc/gen/_spinlock_stub.c
index 5d7ee3b2d2be..b220d90ea193 100644
--- a/lib/libc/gen/_spinlock_stub.c
+++ b/lib/libc/gen/_spinlock_stub.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include "spinlock.h"
diff --git a/lib/libc/gen/_thread_init.c b/lib/libc/gen/_thread_init.c
index 5b5ab82f3cdd..b285654cc863 100644
--- a/lib/libc/gen/_thread_init.c
+++ b/lib/libc/gen/_thread_init.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
void _thread_init_stub(void);
diff --git a/lib/libc/gen/alarm.c b/lib/libc/gen/alarm.c
index 64bc7a86ebb5..58b9835608d8 100644
--- a/lib/libc/gen/alarm.c
+++ b/lib/libc/gen/alarm.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)alarm.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
/*
* Backwards compatible alarm.
*/
diff --git a/lib/libc/gen/arc4random-compat.c b/lib/libc/gen/arc4random-compat.c
index 5ac3b93cf9aa..014273b1a76d 100644
--- a/lib/libc/gen/arc4random-compat.c
+++ b/lib/libc/gen/arc4random-compat.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdbool.h>
#include <syslog.h>
diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c
index 07e31e64e758..621af03a57a7 100644
--- a/lib/libc/gen/arc4random.c
+++ b/lib/libc/gen/arc4random.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#if defined(__FreeBSD__)
#include <assert.h>
diff --git a/lib/libc/gen/assert.c b/lib/libc/gen/assert.c
index 1a6ef1a8404b..06b4261437f3 100644
--- a/lib/libc/gen/assert.c
+++ b/lib/libc/gen/assert.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)assert.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/gen/auxv.c b/lib/libc/gen/auxv.c
index d781948d4537..1b0d886030b2 100644
--- a/lib/libc/gen/auxv.c
+++ b/lib/libc/gen/auxv.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <elf.h>
#include <errno.h>
diff --git a/lib/libc/gen/basename.c b/lib/libc/gen/basename.c
index 7569ab9c3029..46fea9a630cf 100644
--- a/lib/libc/gen/basename.c
+++ b/lib/libc/gen/basename.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <libgen.h>
#include <string.h>
diff --git a/lib/libc/gen/basename_compat.c b/lib/libc/gen/basename_compat.c
index c7488f2dcb67..217c4582e857 100644
--- a/lib/libc/gen/basename_compat.c
+++ b/lib/libc/gen/basename_compat.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <libgen.h>
#include <stdlib.h>
diff --git a/lib/libc/gen/cap_sandboxed.c b/lib/libc/gen/cap_sandboxed.c
index 97677b5b176b..d01d94735bec 100644
--- a/lib/libc/gen/cap_sandboxed.c
+++ b/lib/libc/gen/cap_sandboxed.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <assert.h>
diff --git a/lib/libc/gen/check_utility_compat.c b/lib/libc/gen/check_utility_compat.c
index 04c594b52665..6b1b487945f2 100644
--- a/lib/libc/gen/check_utility_compat.c
+++ b/lib/libc/gen/check_utility_compat.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* I din't use "namespace.h" here because none of the relevant utilities
* are threaded, so I'm not concerned about cancellation points or other
diff --git a/lib/libc/gen/clock.c b/lib/libc/gen/clock.c
index d20bbf878f50..59a85d393ceb 100644
--- a/lib/libc/gen/clock.c
+++ b/lib/libc/gen/clock.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)clock.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/lib/libc/gen/clock_getcpuclockid.c b/lib/libc/gen/clock_getcpuclockid.c
index 1c2370c5973f..fdfe3b614d69 100644
--- a/lib/libc/gen/clock_getcpuclockid.c
+++ b/lib/libc/gen/clock_getcpuclockid.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <time.h>
#include <unistd.h>
diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c
index b83ef273895b..16f9bff452e4 100644
--- a/lib/libc/gen/closedir.c
+++ b/lib/libc/gen/closedir.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)closedir.c 8.1 (Berkeley) 6/10/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <dirent.h>
diff --git a/lib/libc/gen/confstr.c b/lib/libc/gen/confstr.c
index dc8ffff0d68f..c348d4ce1587 100644
--- a/lib/libc/gen/confstr.c
+++ b/lib/libc/gen/confstr.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)confstr.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
diff --git a/lib/libc/gen/crypt.c b/lib/libc/gen/crypt.c
index 7995196ef234..a2deb670f148 100644
--- a/lib/libc/gen/crypt.c
+++ b/lib/libc/gen/crypt.c
@@ -34,8 +34,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)crypt.c 5.11 (Berkeley) 6/25/91");
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <string.h>
#include <unistd.h>
diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c
index 5a3f61fa921a..35be197742a7 100644
--- a/lib/libc/gen/ctermid.c
+++ b/lib/libc/gen/ctermid.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/daemon.c b/lib/libc/gen/daemon.c
index f6753a84c44a..0ea1e0809d08 100644
--- a/lib/libc/gen/daemon.c
+++ b/lib/libc/gen/daemon.c
@@ -32,8 +32,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)daemon.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/lib/libc/gen/devname-compat11.c b/lib/libc/gen/devname-compat11.c
index 70cb6f0d641e..37886b6c8aaa 100644
--- a/lib/libc/gen/devname-compat11.c
+++ b/lib/libc/gen/devname-compat11.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c
index 55e6279a25ce..bee5a78060e0 100644
--- a/lib/libc/gen/devname.c
+++ b/lib/libc/gen/devname.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)devname.c 8.2 (Berkeley) 4/29/95");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/dirfd.c b/lib/libc/gen/dirfd.c
index 1695fd9dd4ec..123d856eba47 100644
--- a/lib/libc/gen/dirfd.c
+++ b/lib/libc/gen/dirfd.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
diff --git a/lib/libc/gen/dirname.c b/lib/libc/gen/dirname.c
index ae7b928d54eb..ab36ac66dea1 100644
--- a/lib/libc/gen/dirname.c
+++ b/lib/libc/gen/dirname.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <libgen.h>
#include <string.h>
diff --git a/lib/libc/gen/dirname_compat.c b/lib/libc/gen/dirname_compat.c
index f85d40993a91..6423984b1877 100644
--- a/lib/libc/gen/dirname_compat.c
+++ b/lib/libc/gen/dirname_compat.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <libgen.h>
#include <stdlib.h>
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index d02644e1e1ce..8155202b7828 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)disklabel.c 8.2 (Berkeley) 5/3/95");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#define DKTYPENAMES
#define FSTYPENAMES
diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c
index f1ee86ec1934..b6dab041bac3 100644
--- a/lib/libc/gen/dlfcn.c
+++ b/lib/libc/gen/dlfcn.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if !defined(IN_LIBDL) || defined(PIC)
/*
diff --git a/lib/libc/gen/drand48.c b/lib/libc/gen/drand48.c
index 672b5eef6b19..e24b974ae84f 100644
--- a/lib/libc/gen/drand48.c
+++ b/lib/libc/gen/drand48.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rand48.h"
extern unsigned short _rand48_seed[3];
diff --git a/lib/libc/gen/dup3.c b/lib/libc/gen/dup3.c
index b259d4402ce3..e0298c821148 100644
--- a/lib/libc/gen/dup3.c
+++ b/lib/libc/gen/dup3.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <unistd.h>
#include <fcntl.h>
diff --git a/lib/libc/gen/erand48.c b/lib/libc/gen/erand48.c
index cdb3ec85052b..fb0b1aef8cf1 100644
--- a/lib/libc/gen/erand48.c
+++ b/lib/libc/gen/erand48.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rand48.h"
double
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index e72fac99ee61..9636ef5b93b5 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)err.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <err.h>
#include <errno.h>
diff --git a/lib/libc/gen/errlst.c b/lib/libc/gen/errlst.c
index bc673e8c9c66..837af5b0c6ae 100644
--- a/lib/libc/gen/errlst.c
+++ b/lib/libc/gen/errlst.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)errlst.c 8.2 (Berkeley) 11/16/93");
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include "errlst.h"
diff --git a/lib/libc/gen/errno.c b/lib/libc/gen/errno.c
index 82c40a86bb8e..aae8300a34b2 100644
--- a/lib/libc/gen/errno.c
+++ b/lib/libc/gen/errno.c
@@ -27,6 +27,4 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
int errno;
diff --git a/lib/libc/gen/eventfd.c b/lib/libc/gen/eventfd.c
index a9748fa54468..e05218cf90e4 100644
--- a/lib/libc/gen/eventfd.c
+++ b/lib/libc/gen/eventfd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/eventfd.h>
#include <sys/specialfd.h>
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index f1d69e147719..15dc7f0200ac 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)exec.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/exect.c b/lib/libc/gen/exect.c
index b878d8cac085..b40c95c93fe3 100644
--- a/lib/libc/gen/exect.c
+++ b/lib/libc/gen/exect.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ptrace.h>
#include <errno.h>
diff --git a/lib/libc/gen/fdevname.c b/lib/libc/gen/fdevname.c
index d145c55718fa..585724e53fc9 100644
--- a/lib/libc/gen/fdevname.c
+++ b/lib/libc/gen/fdevname.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/ioctl.h>
diff --git a/lib/libc/gen/feature_present.c b/lib/libc/gen/feature_present.c
index 3615d50f2349..bbf8fcc2eb47 100644
--- a/lib/libc/gen/feature_present.c
+++ b/lib/libc/gen/feature_present.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
#include <stdio.h>
diff --git a/lib/libc/gen/fmtcheck.c b/lib/libc/gen/fmtcheck.c
index 42809bb04c58..8a3ea16b88cf 100644
--- a/lib/libc/gen/fmtcheck.c
+++ b/lib/libc/gen/fmtcheck.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <string.h>
#include <ctype.h>
diff --git a/lib/libc/gen/fmtmsg.c b/lib/libc/gen/fmtmsg.c
index 0770aa7e5361..9a62c90f4d96 100644
--- a/lib/libc/gen/fmtmsg.c
+++ b/lib/libc/gen/fmtmsg.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fmtmsg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
index 406705459938..e211f3d535ad 100644
--- a/lib/libc/gen/fnmatch.c
+++ b/lib/libc/gen/fnmatch.c
@@ -39,8 +39,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)fnmatch.c 8.2 (Berkeley) 4/16/94");
-__FBSDID("$FreeBSD$");
-
/*
* Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
* Compares a filename or pathname to a pattern.
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index 718373931757..06aae12ff86a 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)fstab.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c
index 18499f16f641..1465fe5c7e47 100644
--- a/lib/libc/gen/ftok.c
+++ b/lib/libc/gen/ftok.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ipc.h>
diff --git a/lib/libc/gen/fts-compat.c b/lib/libc/gen/fts-compat.c
index 9f295110f1c7..e692e1f9e271 100644
--- a/lib/libc/gen/fts-compat.c
+++ b/lib/libc/gen/fts-compat.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#define _WANT_FREEBSD11_STATFS
diff --git a/lib/libc/gen/fts-compat11.c b/lib/libc/gen/fts-compat11.c
index a18ce3f00a6a..2739e10a77de 100644
--- a/lib/libc/gen/fts-compat11.c
+++ b/lib/libc/gen/fts-compat11.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#define _WANT_FREEBSD11_STATFS
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 5186ae047a3b..ff51d2b224c2 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -33,8 +33,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)fts.c 8.6 (Berkeley) 8/14/94");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/lib/libc/gen/ftw-compat11.c b/lib/libc/gen/ftw-compat11.c
index 92ce058726a7..aa9d9358aa15 100644
--- a/lib/libc/gen/ftw-compat11.c
+++ b/lib/libc/gen/ftw-compat11.c
@@ -23,8 +23,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/lib/libc/gen/ftw.c b/lib/libc/gen/ftw.c
index 253a29583f36..80b45ff32f5c 100644
--- a/lib/libc/gen/ftw.c
+++ b/lib/libc/gen/ftw.c
@@ -21,8 +21,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/lib/libc/gen/getbootfile.c b/lib/libc/gen/getbootfile.c
index 983199471792..e2c36a96378d 100644
--- a/lib/libc/gen/getbootfile.c
+++ b/lib/libc/gen/getbootfile.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/getbsize.c b/lib/libc/gen/getbsize.c
index e91c12282ddf..2fbcaf7b6dbd 100644
--- a/lib/libc/gen/getbsize.c
+++ b/lib/libc/gen/getbsize.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)getbsize.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
index 364423fff0e0..9ba6cda5c280 100644
--- a/lib/libc/gen/getcap.c
+++ b/lib/libc/gen/getcap.c
@@ -34,8 +34,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)getcap.c 8.3 (Berkeley) 3/25/94");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
index 42a6c204ba06..c0cabacb96ba 100644
--- a/lib/libc/gen/getcwd.c
+++ b/lib/libc/gen/getcwd.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)getcwd.c 8.5 (Berkeley) 2/7/95");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c
index 3df611b7e4c7..70b1e460028f 100644
--- a/lib/libc/gen/getdomainname.c
+++ b/lib/libc/gen/getdomainname.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)gethostname.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/getentropy.c b/lib/libc/gen/getentropy.c
index 7085e7c609f8..44cb190f0237 100644
--- a/lib/libc/gen/getentropy.c
+++ b/lib/libc/gen/getentropy.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/random.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index 746a69a3424b..b7fe6021f9fd 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -33,8 +33,6 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#ifdef YP
diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c
index c3c4af5f7cdb..6dddea5c3847 100644
--- a/lib/libc/gen/getgrouplist.c
+++ b/lib/libc/gen/getgrouplist.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94");
-__FBSDID("$FreeBSD$");
-
/*
* get credential
*/
diff --git a/lib/libc/gen/gethostname.c b/lib/libc/gen/gethostname.c
index 8af10d6d0624..9b0400d744e6 100644
--- a/lib/libc/gen/gethostname.c
+++ b/lib/libc/gen/gethostname.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)gethostname.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/getloadavg.c b/lib/libc/gen/getloadavg.c
index a0a707b6db9d..8b4844096015 100644
--- a/lib/libc/gen/getloadavg.c
+++ b/lib/libc/gen/getloadavg.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)getloadavg.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c
index a8bc2fd0688f..c2c8e24b070e 100644
--- a/lib/libc/gen/getlogin.c
+++ b/lib/libc/gen/getlogin.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)getlogin.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <pwd.h>
diff --git a/lib/libc/gen/getmntinfo-compat11.c b/lib/libc/gen/getmntinfo-compat11.c
index b18da03133fd..317be508eda2 100644
--- a/lib/libc/gen/getmntinfo-compat11.c
+++ b/lib/libc/gen/getmntinfo-compat11.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ucred.h>
#define _WANT_FREEBSD11_STATFS
diff --git a/lib/libc/gen/getmntinfo.c b/lib/libc/gen/getmntinfo.c
index 250be99c27c5..8b374887f358 100644
--- a/lib/libc/gen/getmntinfo.c
+++ b/lib/libc/gen/getmntinfo.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)getmntinfo.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ucred.h>
#include <sys/mount.h>
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index 733fe024ee28..baa852076c12 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -34,8 +34,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <ctype.h>
diff --git a/lib/libc/gen/getosreldate.c b/lib/libc/gen/getosreldate.c
index 6a54df907546..ce80c099f581 100644
--- a/lib/libc/gen/getosreldate.c
+++ b/lib/libc/gen/getosreldate.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)gethostid.c 8.1 (Berkeley) 6/2/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/getpagesize.c b/lib/libc/gen/getpagesize.c
index b722bd27c0a3..94e579c987c9 100644
--- a/lib/libc/gen/getpagesize.c
+++ b/lib/libc/gen/getpagesize.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)getpagesize.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/getpagesizes.c b/lib/libc/gen/getpagesizes.c
index 40d4e67c02ae..2cb4ebee0d0e 100644
--- a/lib/libc/gen/getpagesizes.c
+++ b/lib/libc/gen/getpagesizes.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/getpeereid.c b/lib/libc/gen/getpeereid.c
index 3690ae8fc50d..b1934a6c471b 100644
--- a/lib/libc/gen/getpeereid.c
+++ b/lib/libc/gen/getpeereid.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libc/gen/getprogname.c b/lib/libc/gen/getprogname.c
index fd51d1322517..5b563534616b 100644
--- a/lib/libc/gen/getprogname.c
+++ b/lib/libc/gen/getprogname.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdlib.h>
#include "un-namespace.h"
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index 34afd76729e5..e3c8098fad0d 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -33,8 +33,6 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#ifdef YP
diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c
index 4b152095a946..df19fb18ee81 100644
--- a/lib/libc/gen/getttyent.c
+++ b/lib/libc/gen/getttyent.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)getttyent.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
index 7ea09df4d847..c460cf4d4bd2 100644
--- a/lib/libc/gen/getusershell.c
+++ b/lib/libc/gen/getusershell.c
@@ -32,8 +32,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)getusershell.c 8.1 (Berkeley) 6/4/93");
__RCSID("$NetBSD: getusershell.c,v 1.17 1999/01/25 01:09:34 lukem Exp $");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/file.h>
diff --git a/lib/libc/gen/getutxent.c b/lib/libc/gen/getutxent.c
index b474009c48b5..94a20592c1bb 100644
--- a/lib/libc/gen/getutxent.c
+++ b/lib/libc/gen/getutxent.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/endian.h>
#include <sys/param.h>
diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c
index 91f4490bf504..05efe8f8cd5e 100644
--- a/lib/libc/gen/getvfsbyname.c
+++ b/lib/libc/gen/getvfsbyname.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)kvm_getvfsbyname.c 8.1 (Berkeley) 4/3/95");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/glob-compat11.c b/lib/libc/gen/glob-compat11.c
index 26dc9db9ff29..8fb45210b775 100644
--- a/lib/libc/gen/glob-compat11.c
+++ b/lib/libc/gen/glob-compat11.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#define _WANT_FREEBSD11_STAT
#include <sys/stat.h>
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 43dd77df8119..dbb6389d707e 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -39,8 +39,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)glob.c 8.3 (Berkeley) 10/13/93");
-__FBSDID("$FreeBSD$");
-
/*
* glob(3) -- a superset of the one defined in POSIX 1003.2.
*
diff --git a/lib/libc/gen/initgroups.c b/lib/libc/gen/initgroups.c
index 882dadbeb9ab..6e417d6a62ed 100644
--- a/lib/libc/gen/initgroups.c
+++ b/lib/libc/gen/initgroups.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)initgroups.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include "namespace.h"
diff --git a/lib/libc/gen/isatty.c b/lib/libc/gen/isatty.c
index de55b67ac0d0..60e94e0ba524 100644
--- a/lib/libc/gen/isatty.c
+++ b/lib/libc/gen/isatty.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)isatty.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <termios.h>
#include <unistd.h>
diff --git a/lib/libc/gen/jrand48.c b/lib/libc/gen/jrand48.c
index 5aab1e1bec9e..5fdd1778c340 100644
--- a/lib/libc/gen/jrand48.c
+++ b/lib/libc/gen/jrand48.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include "rand48.h"
diff --git a/lib/libc/gen/lcong48.c b/lib/libc/gen/lcong48.c
index ab0d1f762d80..b77278db1750 100644
--- a/lib/libc/gen/lcong48.c
+++ b/lib/libc/gen/lcong48.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rand48.h"
extern unsigned short _rand48_seed[3];
diff --git a/lib/libc/gen/ldexp.c b/lib/libc/gen/ldexp.c
index cbbcf0782387..5055add84ff3 100644
--- a/lib/libc/gen/ldexp.c
+++ b/lib/libc/gen/ldexp.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ldexp() and scalbn() are defined to be identical, but ldexp() lives in libc
* for backwards compatibility.
diff --git a/lib/libc/gen/libc_dlopen.c b/lib/libc/gen/libc_dlopen.c
index 960060bdf636..bc7e13ca0043 100644
--- a/lib/libc/gen/libc_dlopen.c
+++ b/lib/libc/gen/libc_dlopen.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <dlfcn.h>
#include <stddef.h>
#include <unistd.h>
diff --git a/lib/libc/gen/lockf.c b/lib/libc/gen/lockf.c
index 85110387fbe3..247066706a2b 100644
--- a/lib/libc/gen/lockf.c
+++ b/lib/libc/gen/lockf.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/lib/libc/gen/lrand48.c b/lib/libc/gen/lrand48.c
index 44a7f5d0e924..d7257febe717 100644
--- a/lib/libc/gen/lrand48.c
+++ b/lib/libc/gen/lrand48.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rand48.h"
extern unsigned short _rand48_seed[3];
diff --git a/lib/libc/gen/memalign.c b/lib/libc/gen/memalign.c
index dc0ad34a117b..af64c998dbd4 100644
--- a/lib/libc/gen/memalign.c
+++ b/lib/libc/gen/memalign.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdlib.h>
diff --git a/lib/libc/gen/modf.c b/lib/libc/gen/modf.c
index d67b44121aaa..6853a56d051d 100644
--- a/lib/libc/gen/modf.c
+++ b/lib/libc/gen/modf.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* modf(double x, double *iptr)
* return fraction part of x, and return x's integral part in *iptr.
diff --git a/lib/libc/gen/mrand48.c b/lib/libc/gen/mrand48.c
index 795a8585802d..6ee078e95c81 100644
--- a/lib/libc/gen/mrand48.c
+++ b/lib/libc/gen/mrand48.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include "rand48.h"
diff --git a/lib/libc/gen/nftw-compat11.c b/lib/libc/gen/nftw-compat11.c
index 1cf9ba8cb9b6..fdd5c9a707a4 100644
--- a/lib/libc/gen/nftw-compat11.c
+++ b/lib/libc/gen/nftw-compat11.c
@@ -22,8 +22,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/lib/libc/gen/nftw.c b/lib/libc/gen/nftw.c
index a338e5a34c84..9b5c33e1057c 100644
--- a/lib/libc/gen/nftw.c
+++ b/lib/libc/gen/nftw.c
@@ -21,8 +21,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/lib/libc/gen/nice.c b/lib/libc/gen/nice.c
index 7f217059fb11..b71076efdcde 100644
--- a/lib/libc/gen/nice.c
+++ b/lib/libc/gen/nice.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)nice.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index c30fa4dbaca2..0e00d8d23f99 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)nlist.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/mman.h>
diff --git a/lib/libc/gen/nrand48.c b/lib/libc/gen/nrand48.c
index 16c8ca111b5e..12016ed76ec9 100644
--- a/lib/libc/gen/nrand48.c
+++ b/lib/libc/gen/nrand48.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rand48.h"
long
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index c294081847e2..a3864b0939fc 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)opendir.c 8.8 (Berkeley) 5/1/95");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
diff --git a/lib/libc/gen/pause.c b/lib/libc/gen/pause.c
index f6650a73a710..ce255dbba6b2 100644
--- a/lib/libc/gen/pause.c
+++ b/lib/libc/gen/pause.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)pause.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <signal.h>
#include <unistd.h>
diff --git a/lib/libc/gen/pmadvise.c b/lib/libc/gen/pmadvise.c
index 0dc77e3e992b..ac4f858d09c9 100644
--- a/lib/libc/gen/pmadvise.c
+++ b/lib/libc/gen/pmadvise.c
@@ -5,8 +5,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/mman.h>
#include <errno.h>
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
index f0b1a61c2803..1531ca462c24 100644
--- a/lib/libc/gen/popen.c
+++ b/lib/libc/gen/popen.c
@@ -34,8 +34,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)popen.c 8.3 (Berkeley) 5/3/95");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c
index 1115741114dc..77f7dd9955cd 100644
--- a/lib/libc/gen/posix_spawn.c
+++ b/lib/libc/gen/posix_spawn.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
index f4cb1079a493..f8caf7621e83 100644
--- a/lib/libc/gen/psignal.c
+++ b/lib/libc/gen/psignal.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)psignal.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
/*
* Print the name of the signal indicated
* along with the supplied message.
diff --git a/lib/libc/gen/pututxline.c b/lib/libc/gen/pututxline.c
index f01c086950c1..36f987ee7ae7 100644
--- a/lib/libc/gen/pututxline.c
+++ b/lib/libc/gen/pututxline.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/endian.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/pw_scan.c b/lib/libc/gen/pw_scan.c
index 619092d3d4bc..01ddc57a0d8c 100644
--- a/lib/libc/gen/pw_scan.c
+++ b/lib/libc/gen/pw_scan.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)pw_scan.c 8.3 (Berkeley) 4/2/94");
-__FBSDID("$FreeBSD$");
-
/*
* This module is used to "verify" password entries by chpass(1) and
* pwd_mkdb(8).
diff --git a/lib/libc/gen/raise.c b/lib/libc/gen/raise.c
index 1b987c5fdadf..4cb596d49bc9 100644
--- a/lib/libc/gen/raise.c
+++ b/lib/libc/gen/raise.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)raise.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <signal.h>
#include <unistd.h>
diff --git a/lib/libc/gen/readdir-compat11.c b/lib/libc/gen/readdir-compat11.c
index ecdaf824cb78..30cec5acd0e6 100644
--- a/lib/libc/gen/readdir-compat11.c
+++ b/lib/libc/gen/readdir-compat11.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#define _WANT_FREEBSD11_DIRENT
diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c
index 9a2fae2784af..d2c8636651ff 100644
--- a/lib/libc/gen/readdir.c
+++ b/lib/libc/gen/readdir.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)readdir.c 8.3 (Berkeley) 9/29/94");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <dirent.h>
diff --git a/lib/libc/gen/readpassphrase.c b/lib/libc/gen/readpassphrase.c
index 0961fbb35a8b..c6eb63f1469c 100644
--- a/lib/libc/gen/readpassphrase.c
+++ b/lib/libc/gen/readpassphrase.c
@@ -22,8 +22,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <ctype.h>
#include <errno.h>
diff --git a/lib/libc/gen/recvmmsg.c b/lib/libc/gen/recvmmsg.c
index 7c5c289569ee..6fa400f00c22 100644
--- a/lib/libc/gen/recvmmsg.c
+++ b/lib/libc/gen/recvmmsg.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <errno.h>
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
index 973e3e147cc7..bc072d2826ea 100644
--- a/lib/libc/gen/rewinddir.c
+++ b/lib/libc/gen/rewinddir.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)rewinddir.c 8.1 (Berkeley) 6/8/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <dirent.h>
diff --git a/lib/libc/gen/scandir-compat11.c b/lib/libc/gen/scandir-compat11.c
index fe8d34d4b7d6..b5c9846c2798 100644
--- a/lib/libc/gen/scandir-compat11.c
+++ b/lib/libc/gen/scandir-compat11.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Scan the directory dirname calling select to make a list of selected
* directory entries then sort using qsort and compare routine dcomp.
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
index 4f40678513dd..28565150a035 100644
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)scandir.c 8.3 (Berkeley) 1/2/94");
-__FBSDID("$FreeBSD$");
-
/*
* Scan the directory dirname calling select to make a list of selected
* directory entries then sort using qsort and compare routine dcomp.
diff --git a/lib/libc/gen/seed48.c b/lib/libc/gen/seed48.c
index 5339b8c0c4e9..230348ff0fa8 100644
--- a/lib/libc/gen/seed48.c
+++ b/lib/libc/gen/seed48.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rand48.h"
extern unsigned short _rand48_seed[3];
diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c
index 3974af7d73ee..8c88bdbf4ab5 100644
--- a/lib/libc/gen/seekdir.c
+++ b/lib/libc/gen/seekdir.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)seekdir.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <dirent.h>
diff --git a/lib/libc/gen/semctl.c b/lib/libc/gen/semctl.c
index e7985b29dd1e..84df40e4c9af 100644
--- a/lib/libc/gen/semctl.c
+++ b/lib/libc/gen/semctl.c
@@ -29,8 +29,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef NO_COMPAT7
#define _WANT_SEMUN_OLD
#endif
diff --git a/lib/libc/gen/sendmmsg.c b/lib/libc/gen/sendmmsg.c
index 7b3e8f357613..72b551792741 100644
--- a/lib/libc/gen/sendmmsg.c
+++ b/lib/libc/gen/sendmmsg.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include "libc_private.h"
diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c
index 2a001b9ffa98..b7d96ed8cdef 100644
--- a/lib/libc/gen/setdomainname.c
+++ b/lib/libc/gen/setdomainname.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)sethostname.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/sethostname.c b/lib/libc/gen/sethostname.c
index 0e120775afb9..b1ba640d3348 100644
--- a/lib/libc/gen/sethostname.c
+++ b/lib/libc/gen/sethostname.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)sethostname.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/setjmperr.c b/lib/libc/gen/setjmperr.c
index abc13c0339f1..7532070c9f53 100644
--- a/lib/libc/gen/setjmperr.c
+++ b/lib/libc/gen/setjmperr.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)setjmperr.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
/*
* This routine is called from longjmp() when an error occurs.
* Programs that wish to exit gracefully from this error may
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index 66976cdd7bcf..823fcbd182bb 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -34,8 +34,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)setmode.c 8.2 (Berkeley) 3/25/94");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/setproctitle.c b/lib/libc/gen/setproctitle.c
index 743f27d15b50..9c73fd77ca42 100644
--- a/lib/libc/gen/setproctitle.c
+++ b/lib/libc/gen/setproctitle.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/elf_common.h>
diff --git a/lib/libc/gen/setprogname.c b/lib/libc/gen/setprogname.c
index 29a6cd025ec8..849ff9188d47 100644
--- a/lib/libc/gen/setprogname.c
+++ b/lib/libc/gen/setprogname.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/gen/siginterrupt.c b/lib/libc/gen/siginterrupt.c
index 2d7f9950776e..da010ca923fe 100644
--- a/lib/libc/gen/siginterrupt.c
+++ b/lib/libc/gen/siginterrupt.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)siginterrupt.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <signal.h>
#include "un-namespace.h"
diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c
index 796a0b702136..7af7e0ef5652 100644
--- a/lib/libc/gen/siglist.c
+++ b/lib/libc/gen/siglist.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)siglist.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <signal.h>
const char *const sys_signame[NSIG] = {
diff --git a/lib/libc/gen/signal.c b/lib/libc/gen/signal.c
index 62af2e95bc79..17fb057b2ced 100644
--- a/lib/libc/gen/signal.c
+++ b/lib/libc/gen/signal.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)signal.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
/*
* Almost backwards compatible signal.
*/
diff --git a/lib/libc/gen/sigsetops.c b/lib/libc/gen/sigsetops.c
index 53a450c0e5f6..7050fa1607c1 100644
--- a/lib/libc/gen/sigsetops.c
+++ b/lib/libc/gen/sigsetops.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)sigsetops.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <signal.h>
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
index 620fda36ac10..e73496854736 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)sleep.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/gen/statvfs.c b/lib/libc/gen/statvfs.c
index fe9462bd307b..a7190f9a707d 100644
--- a/lib/libc/gen/statvfs.c
+++ b/lib/libc/gen/statvfs.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/lib/libc/gen/stringlist.c b/lib/libc/gen/stringlist.c
index 158f3d20705d..5f333f3807aa 100644
--- a/lib/libc/gen/stringlist.c
+++ b/lib/libc/gen/stringlist.c
@@ -28,8 +28,6 @@
#include <sys/cdefs.h>
__RCSID("$NetBSD: stringlist.c,v 1.2 1997/01/17 07:26:20 lukem Exp $");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <string.h>
diff --git a/lib/libc/gen/strtofflags.c b/lib/libc/gen/strtofflags.c
index 174c6742e232..09a811c37a80 100644
--- a/lib/libc/gen/strtofflags.c
+++ b/lib/libc/gen/strtofflags.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)stat_flags.c 8.1 (Berkeley) 5/31/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c
index 26bb9043ed3c..54f9526d3955 100644
--- a/lib/libc/gen/sysconf.c
+++ b/lib/libc/gen/sysconf.c
@@ -34,8 +34,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)sysconf.c 8.2 (Berkeley) 3/20/94");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/time.h>
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
index 59242b50bbed..5586b78b26b9 100644
--- a/lib/libc/gen/sysctl.c
+++ b/lib/libc/gen/sysctl.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)sysctl.c 8.2 (Berkeley) 1/4/94");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/sysctlbyname.c b/lib/libc/gen/sysctlbyname.c
index 5086cc4b7d81..017dba86c11a 100644
--- a/lib/libc/gen/sysctlbyname.c
+++ b/lib/libc/gen/sysctlbyname.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <string.h>
diff --git a/lib/libc/gen/sysctlnametomib.c b/lib/libc/gen/sysctlnametomib.c
index 4d66214a3b20..d2e33f5690ff 100644
--- a/lib/libc/gen/sysctlnametomib.c
+++ b/lib/libc/gen/sysctlnametomib.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
#include <string.h>
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index 08bdfdbeb1e7..a9a87943da8b 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)syslog.c 8.5 (Berkeley) 4/29/95");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c
index d801345fc24c..9b60093ac472 100644
--- a/lib/libc/gen/telldir.c
+++ b/lib/libc/gen/telldir.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)telldir.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/lib/libc/gen/termios.c b/lib/libc/gen/termios.c
index f072b2f045d9..8f3a89188fb0 100644
--- a/lib/libc/gen/termios.c
+++ b/lib/libc/gen/termios.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)termios.c 8.2 (Berkeley) 2/21/94");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/fcntl.h>
diff --git a/lib/libc/gen/time.c b/lib/libc/gen/time.c
index c08d58ed9a66..b46d90a11999 100644
--- a/lib/libc/gen/time.c
+++ b/lib/libc/gen/time.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)time.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/lib/libc/gen/times.c b/lib/libc/gen/times.c
index 985c8266a0f8..e357162dcb30 100644
--- a/lib/libc/gen/times.c
+++ b/lib/libc/gen/times.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)times.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/times.h>
diff --git a/lib/libc/gen/timespec_get.c b/lib/libc/gen/timespec_get.c
index 1dd0147e933d..bcf392cbfa44 100644
--- a/lib/libc/gen/timespec_get.c
+++ b/lib/libc/gen/timespec_get.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__RCSID("$NetBSD: timespec_get.c,v 1.2 2016/10/04 12:48:15 christos Exp $");
-__FBSDID("$FreeBSD$");
-
#include <time.h>
/* ISO/IEC 9899:201x 7.27.2.5 The timespec_get function */
diff --git a/lib/libc/gen/timezone.c b/lib/libc/gen/timezone.c
index f99a6f919262..e0f7d4a4ae0b 100644
--- a/lib/libc/gen/timezone.c
+++ b/lib/libc/gen/timezone.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)timezone.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <stdio.h>
diff --git a/lib/libc/gen/trivial-getcontextx.c b/lib/libc/gen/trivial-getcontextx.c
index 54f851384811..512e8d17e1c4 100644
--- a/lib/libc/gen/trivial-getcontextx.c
+++ b/lib/libc/gen/trivial-getcontextx.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ucontext.h>
#include <errno.h>
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
index 0984538eaf76..95a713c6a0a5 100644
--- a/lib/libc/gen/ttyname.c
+++ b/lib/libc/gen/ttyname.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)ttyname.c 8.2 (Berkeley) 1/27/94");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/lib/libc/gen/ttyslot.c b/lib/libc/gen/ttyslot.c
index fc1b0565afee..6a1b5960ab86 100644
--- a/lib/libc/gen/ttyslot.c
+++ b/lib/libc/gen/ttyslot.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)ttyslot.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
int __ttyslot(void);
int
diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c
index e1353176845f..389e88d73bd1 100644
--- a/lib/libc/gen/ualarm.c
+++ b/lib/libc/gen/ualarm.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)ualarm.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <unistd.h>
diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c
index bc72ff9d3c39..b70b3942813e 100644
--- a/lib/libc/gen/uname.c
+++ b/lib/libc/gen/uname.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)uname.c 8.1 (Berkeley) 1/4/94");
-__FBSDID("$FreeBSD$");
-
#define uname wrapped_uname
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c
index e800f6275617..7a59c584d417 100644
--- a/lib/libc/gen/usleep.c
+++ b/lib/libc/gen/usleep.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)usleep.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <time.h>
#include <unistd.h>
diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c
index 3474849571b7..95897b7af8f4 100644
--- a/lib/libc/gen/utime.c
+++ b/lib/libc/gen/utime.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)utime.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <utime.h>
diff --git a/lib/libc/gen/utxdb.c b/lib/libc/gen/utxdb.c
index 130d5e718e3f..e831f6970295 100644
--- a/lib/libc/gen/utxdb.c
+++ b/lib/libc/gen/utxdb.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/endian.h>
#include <sys/param.h>
diff --git a/lib/libc/gen/valloc.c b/lib/libc/gen/valloc.c
index b058543f54ac..a68c1fc0eaf9 100644
--- a/lib/libc/gen/valloc.c
+++ b/lib/libc/gen/valloc.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)valloc.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <unistd.h>
diff --git a/lib/libc/gen/wait.c b/lib/libc/gen/wait.c
index b4fc17ee8113..ddb2e5725c11 100644
--- a/lib/libc/gen/wait.c
+++ b/lib/libc/gen/wait.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)wait.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/time.h>
diff --git a/lib/libc/gen/wait3.c b/lib/libc/gen/wait3.c
index 104ab8e5652e..2fdeb720296d 100644
--- a/lib/libc/gen/wait3.c
+++ b/lib/libc/gen/wait3.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)wait3.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/time.h>
diff --git a/lib/libc/gen/waitid.c b/lib/libc/gen/waitid.c
index 0210be75eeab..018f2a2c8f94 100644
--- a/lib/libc/gen/waitid.c
+++ b/lib/libc/gen/waitid.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
index c17cefa09ab3..196c842c3fa1 100644
--- a/lib/libc/gen/waitpid.c
+++ b/lib/libc/gen/waitpid.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__SCCSID("@(#)waitpid.c 8.1 (Berkeley) 6/4/93");
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/time.h>
diff --git a/lib/libc/gen/wordexp.c b/lib/libc/gen/wordexp.c
index e22535502860..0902814eb04f 100644
--- a/lib/libc/gen/wordexp.c
+++ b/lib/libc/gen/wordexp.c
@@ -42,9 +42,6 @@
#include <wordexp.h>
#include "un-namespace.h"
#include "libc_private.h"
-
-__FBSDID("$FreeBSD$");
-
static int we_askshell(const char *, wordexp_t *, int);
static int we_check(const char *);
diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c
index 0d06f3888030..b165ec394bbe 100644
--- a/lib/libc/gmon/gmon.c
+++ b/lib/libc/gmon/gmon.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/time.h>
diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c
index 0d816a734350..df87973e27f9 100644
--- a/lib/libc/gmon/mcount.c
+++ b/lib/libc/gmon/mcount.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)mcount.c 8.1 (Berkeley) 6/4/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/gmon.h>
#ifdef _KERNEL
diff --git a/lib/libc/i386/gen/_ctx_start.S b/lib/libc/i386/gen/_ctx_start.S
index fdea3719815b..0fdb3140804c 100644
--- a/lib/libc/i386/gen/_ctx_start.S
+++ b/lib/libc/i386/gen/_ctx_start.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* _ctx_start((void *func)(int arg1, ..., argn),
* int arg1, ..., argn, ucontext_t *ucp)
diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S
index 9199a46d2fb1..f61183dffbac 100644
--- a/lib/libc/i386/gen/_setjmp.S
+++ b/lib/libc/i386/gen/_setjmp.S
@@ -34,8 +34,6 @@
.asciz "@(#)_setjmp.s 5.1 (Berkeley) 4/23/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* C library -- _setjmp, _longjmp
*
diff --git a/lib/libc/i386/gen/fabs.S b/lib/libc/i386/gen/fabs.S
index 2dc89af9506c..15558a0ebede 100644
--- a/lib/libc/i386/gen/fabs.S
+++ b/lib/libc/i386/gen/fabs.S
@@ -34,8 +34,6 @@
.asciz "@(#)fabs.s 5.2 (Berkeley) 12/17/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(fabs)
fldl 4(%esp)
fabs
diff --git a/lib/libc/i386/gen/flt_rounds.c b/lib/libc/i386/gen/flt_rounds.c
index 16417ffd46e2..6212dbf20918 100644
--- a/lib/libc/i386/gen/flt_rounds.c
+++ b/lib/libc/i386/gen/flt_rounds.c
@@ -4,8 +4,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
static const int map[] = {
diff --git a/lib/libc/i386/gen/infinity.c b/lib/libc/i386/gen/infinity.c
index 464b4029b35a..b9db2fc84efa 100644
--- a/lib/libc/i386/gen/infinity.c
+++ b/lib/libc/i386/gen/infinity.c
@@ -3,8 +3,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
/* bytes for +Infinity on a 387 */
diff --git a/lib/libc/i386/gen/makecontext.c b/lib/libc/i386/gen/makecontext.c
index 4a27116f3c04..b710a7136788 100644
--- a/lib/libc/i386/gen/makecontext.c
+++ b/lib/libc/i386/gen/makecontext.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/signal.h>
#include <sys/ucontext.h>
diff --git a/lib/libc/i386/gen/rfork_thread.S b/lib/libc/i386/gen/rfork_thread.S
index fb23ed041d09..e4d3b904d523 100644
--- a/lib/libc/i386/gen/rfork_thread.S
+++ b/lib/libc/i386/gen/rfork_thread.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* With thanks to John Dyson for the original version of this.
*/
diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S
index 454ae1e59c88..070bc7e88bcf 100644
--- a/lib/libc/i386/gen/setjmp.S
+++ b/lib/libc/i386/gen/setjmp.S
@@ -34,8 +34,6 @@
.asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* C library -- _setjmp, _longjmp
*
diff --git a/lib/libc/i386/gen/signalcontext.c b/lib/libc/i386/gen/signalcontext.c
index 24390a35e4b4..1e77ffe1a1a2 100644
--- a/lib/libc/i386/gen/signalcontext.c
+++ b/lib/libc/i386/gen/signalcontext.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ucontext.h>
#include <machine/psl.h>
diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S
index 5bf6d8e1750a..8aef3d1d90ee 100644
--- a/lib/libc/i386/gen/sigsetjmp.S
+++ b/lib/libc/i386/gen/sigsetjmp.S
@@ -37,8 +37,6 @@
.asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "SYS.h"
/*-
diff --git a/lib/libc/i386/stdlib/div.S b/lib/libc/i386/stdlib/div.S
index 81d6e6e4aa52..463dbabceb68 100644
--- a/lib/libc/i386/stdlib/div.S
+++ b/lib/libc/i386/stdlib/div.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(div)
movl 4(%esp),%eax
movl 8(%esp),%ecx
diff --git a/lib/libc/i386/stdlib/ldiv.S b/lib/libc/i386/stdlib/ldiv.S
index c40c6314fc03..386d9c5e0c91 100644
--- a/lib/libc/i386/stdlib/ldiv.S
+++ b/lib/libc/i386/stdlib/ldiv.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(ldiv)
movl 4(%esp),%eax
movl 8(%esp),%ecx
diff --git a/lib/libc/i386/string/bcmp.S b/lib/libc/i386/string/bcmp.S
index b25ee6ef8dc1..44425ca6aa70 100644
--- a/lib/libc/i386/string/bcmp.S
+++ b/lib/libc/i386/string/bcmp.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* bcmp (void *b1, void *b2, size_t len)
*
diff --git a/lib/libc/i386/string/bcopy.S b/lib/libc/i386/string/bcopy.S
index 4c653d744f15..9d1aa3d3608d 100644
--- a/lib/libc/i386/string/bcopy.S
+++ b/lib/libc/i386/string/bcopy.S
@@ -30,8 +30,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if 0
RCSID("$NetBSD: bcopy.S,v 1.6 1996/11/12 00:50:06 jtc Exp $")
#endif
diff --git a/lib/libc/i386/string/bzero.S b/lib/libc/i386/string/bzero.S
index c8d3776cf83f..3689b6a58b09 100644
--- a/lib/libc/i386/string/bzero.S
+++ b/lib/libc/i386/string/bzero.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* bzero (void *b, size_t len)
* write len zero bytes to the string b.
diff --git a/lib/libc/i386/string/memcmp.S b/lib/libc/i386/string/memcmp.S
index cbb3b8a468a3..acabd2f6842f 100644
--- a/lib/libc/i386/string/memcmp.S
+++ b/lib/libc/i386/string/memcmp.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* memcmp (void *b1, void *b2, size_t len)
*
diff --git a/lib/libc/i386/string/memcpy.S b/lib/libc/i386/string/memcpy.S
index f85a1a5b8021..1e753728aa56 100644
--- a/lib/libc/i386/string/memcpy.S
+++ b/lib/libc/i386/string/memcpy.S
@@ -1,5 +1,3 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#define MEMCOPY
#include "bcopy.S"
diff --git a/lib/libc/i386/string/memmove.S b/lib/libc/i386/string/memmove.S
index 02330c44414b..3447a68a16cf 100644
--- a/lib/libc/i386/string/memmove.S
+++ b/lib/libc/i386/string/memmove.S
@@ -1,5 +1,3 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#define MEMMOVE
#include "bcopy.S"
diff --git a/lib/libc/i386/string/memset.S b/lib/libc/i386/string/memset.S
index f5da603bae21..35079a9594d3 100644
--- a/lib/libc/i386/string/memset.S
+++ b/lib/libc/i386/string/memset.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* memset(void *b, int c, size_t len)
* write len bytes of value c (converted to an unsigned char) to
diff --git a/lib/libc/i386/string/strcat.S b/lib/libc/i386/string/strcat.S
index 835a7e9ccf48..951aebadd724 100644
--- a/lib/libc/i386/string/strcat.S
+++ b/lib/libc/i386/string/strcat.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* strcat(s, append)
* append a copy of the null-terminated string "append" to the end
diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S
index 83aa87f1919e..25cf679fec7e 100644
--- a/lib/libc/i386/string/strchr.S
+++ b/lib/libc/i386/string/strchr.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* strchr(s, c)
* return a pointer to the first occurrence of the character c in
diff --git a/lib/libc/i386/string/strcmp.S b/lib/libc/i386/string/strcmp.S
index 6599577b9e96..7d6fcaf563f1 100644
--- a/lib/libc/i386/string/strcmp.S
+++ b/lib/libc/i386/string/strcmp.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* strcmp(s1, s2)
* return an integer greater than, equal to, or less than 0,
diff --git a/lib/libc/i386/string/strcpy.S b/lib/libc/i386/string/strcpy.S
index c5113f6a1959..9b393a739de0 100644
--- a/lib/libc/i386/string/strcpy.S
+++ b/lib/libc/i386/string/strcpy.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* strcpy (dst, src)
* copy the string src to dst.
diff --git a/lib/libc/i386/string/strncmp.S b/lib/libc/i386/string/strncmp.S
index ec9b5311c6ab..865294eb9711 100644
--- a/lib/libc/i386/string/strncmp.S
+++ b/lib/libc/i386/string/strncmp.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* strncmp(s1, s2, n)
* return an integer greater than, equal to, or less than 0,
diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S
index 5e250b0c91aa..6549d4038ccf 100644
--- a/lib/libc/i386/string/strrchr.S
+++ b/lib/libc/i386/string/strrchr.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* strrchr(s, c)
* return a pointer to the last occurrence of the character c in
diff --git a/lib/libc/i386/string/swab.S b/lib/libc/i386/string/swab.S
index 3d21e6496576..9f63c9518e34 100644
--- a/lib/libc/i386/string/swab.S
+++ b/lib/libc/i386/string/swab.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* void
* swab (const void *src, void *dst, size_t len)
diff --git a/lib/libc/i386/string/wcschr.S b/lib/libc/i386/string/wcschr.S
index 37862a96f53e..a63bcf153284 100644
--- a/lib/libc/i386/string/wcschr.S
+++ b/lib/libc/i386/string/wcschr.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* wchar_t *
* wcschr(const wchar_t *s, wchar_t c) --
diff --git a/lib/libc/i386/string/wcscmp.S b/lib/libc/i386/string/wcscmp.S
index 6fbcb8cc35ba..ce15c1dfc955 100644
--- a/lib/libc/i386/string/wcscmp.S
+++ b/lib/libc/i386/string/wcscmp.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* int
* wcscmp(const wchar_t *s1, const wchar_t *s2) --
diff --git a/lib/libc/i386/string/wcslen.S b/lib/libc/i386/string/wcslen.S
index 691e17f98410..f6199b9ef726 100644
--- a/lib/libc/i386/string/wcslen.S
+++ b/lib/libc/i386/string/wcslen.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* size_t
* wcslen(const wchar_t *s) --
diff --git a/lib/libc/i386/string/wmemchr.S b/lib/libc/i386/string/wmemchr.S
index 2e81c09bdca1..e945c12d2efd 100644
--- a/lib/libc/i386/string/wmemchr.S
+++ b/lib/libc/i386/string/wmemchr.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* wchar_t *
* wmemchr(const wchar_t *buf, wchar_t c, size_t n) --
diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S
index dfbe46ab6b25..96232222e121 100644
--- a/lib/libc/i386/sys/Ovfork.S
+++ b/lib/libc/i386/sys/Ovfork.S
@@ -34,8 +34,6 @@
.asciz "@(#)Ovfork.s 5.1 (Berkeley) 4/23/90"
#endif /* SYSLIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "SYS.h"
WEAK_REFERENCE(__sys_vfork, _vfork)
diff --git a/lib/libc/i386/sys/cerror.S b/lib/libc/i386/sys/cerror.S
index 47bd0fade000..6570fb3c7c3f 100644
--- a/lib/libc/i386/sys/cerror.S
+++ b/lib/libc/i386/sys/cerror.S
@@ -34,8 +34,6 @@
.asciz "@(#)cerror.s 5.1 (Berkeley) 4/23/90"
#endif /* SYSLIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "SYS.h"
.globl HIDENAME(cerror)
diff --git a/lib/libc/i386/sys/getcontext.S b/lib/libc/i386/sys/getcontext.S
index 4923382e7368..8baf0caf18fd 100644
--- a/lib/libc/i386/sys/getcontext.S
+++ b/lib/libc/i386/sys/getcontext.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <SYS.h>
/*
diff --git a/lib/libc/i386/sys/i386_clr_watch.c b/lib/libc/i386/sys/i386_clr_watch.c
index 9dc1f5a1e0b4..07b85795fba4 100644
--- a/lib/libc/i386/sys/i386_clr_watch.c
+++ b/lib/libc/i386/sys/i386_clr_watch.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/reg.h>
#include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/i386_get_fsbase.c b/lib/libc/i386/sys/i386_get_fsbase.c
index 6adf7e2b1828..f12a2383cc3e 100644
--- a/lib/libc/i386/sys/i386_get_fsbase.c
+++ b/lib/libc/i386/sys/i386_get_fsbase.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/sysarch.h>
int
diff --git a/lib/libc/i386/sys/i386_get_gsbase.c b/lib/libc/i386/sys/i386_get_gsbase.c
index 1e8f3c8008eb..efe43d383b4f 100644
--- a/lib/libc/i386/sys/i386_get_gsbase.c
+++ b/lib/libc/i386/sys/i386_get_gsbase.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/sysarch.h>
int
diff --git a/lib/libc/i386/sys/i386_get_ioperm.c b/lib/libc/i386/sys/i386_get_ioperm.c
index 98aef11aa9d2..9d8e8d31862b 100644
--- a/lib/libc/i386/sys/i386_get_ioperm.c
+++ b/lib/libc/i386/sys/i386_get_ioperm.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/sysarch.h>
int
diff --git a/lib/libc/i386/sys/i386_get_ldt.c b/lib/libc/i386/sys/i386_get_ldt.c
index 78dd16cb77b3..52daefd85de5 100644
--- a/lib/libc/i386/sys/i386_get_ldt.c
+++ b/lib/libc/i386/sys/i386_get_ldt.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/cdefs.h>
#include <machine/segments.h>
#include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/i386_set_fsbase.c b/lib/libc/i386/sys/i386_set_fsbase.c
index 9ddfe9249fd7..81a4ed761a7e 100644
--- a/lib/libc/i386/sys/i386_set_fsbase.c
+++ b/lib/libc/i386/sys/i386_set_fsbase.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/sysarch.h>
int
diff --git a/lib/libc/i386/sys/i386_set_gsbase.c b/lib/libc/i386/sys/i386_set_gsbase.c
index c4542bc4a9b0..8a584435e4c7 100644
--- a/lib/libc/i386/sys/i386_set_gsbase.c
+++ b/lib/libc/i386/sys/i386_set_gsbase.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/sysarch.h>
int
diff --git a/lib/libc/i386/sys/i386_set_ioperm.c b/lib/libc/i386/sys/i386_set_ioperm.c
index a5f912780406..dead1cae262a 100644
--- a/lib/libc/i386/sys/i386_set_ioperm.c
+++ b/lib/libc/i386/sys/i386_set_ioperm.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/sysarch.h>
int
diff --git a/lib/libc/i386/sys/i386_set_ldt.c b/lib/libc/i386/sys/i386_set_ldt.c
index 7abcc33deb6c..578b7f4d2f06 100644
--- a/lib/libc/i386/sys/i386_set_ldt.c
+++ b/lib/libc/i386/sys/i386_set_ldt.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/cdefs.h>
#include <machine/segments.h>
#include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/i386_set_watch.c b/lib/libc/i386/sys/i386_set_watch.c
index e1ccc80eab2e..7b341e099c6b 100644
--- a/lib/libc/i386/sys/i386_set_watch.c
+++ b/lib/libc/i386/sys/i386_set_watch.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/reg.h>
#include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/i386_vm86.c b/lib/libc/i386/sys/i386_vm86.c
index fac3f49aa69f..e5d942d37131 100644
--- a/lib/libc/i386/sys/i386_vm86.c
+++ b/lib/libc/i386/sys/i386_vm86.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/sysarch.h>
int
diff --git a/lib/libc/i386/sys/syscall.S b/lib/libc/i386/sys/syscall.S
index 4a9d2717a75d..c6b1d38960a8 100644
--- a/lib/libc/i386/sys/syscall.S
+++ b/lib/libc/i386/sys/syscall.S
@@ -34,8 +34,6 @@
.asciz "@(#)syscall.s 5.1 (Berkeley) 4/23/90"
#endif /* SYSLIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "SYS.h"
ENTRY(syscall)
diff --git a/lib/libc/inet/inet_addr.c b/lib/libc/inet/inet_addr.c
index ac45b104e2bc..69199a3adf61 100644
--- a/lib/libc/inet/inet_addr.c
+++ b/lib/libc/inet/inet_addr.c
@@ -71,8 +71,6 @@ static const char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93";
static const char rcsid[] = "$Id: inet_addr.c,v 1.5 2005/04/27 04:56:19 sra Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
diff --git a/lib/libc/inet/inet_cidr_ntop.c b/lib/libc/inet/inet_cidr_ntop.c
index 8be860a72700..45f441a163ab 100644
--- a/lib/libc/inet/inet_cidr_ntop.c
+++ b/lib/libc/inet/inet_cidr_ntop.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.7 2006/10/11 02:18:18 marka Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/types.h>
diff --git a/lib/libc/inet/inet_cidr_pton.c b/lib/libc/inet/inet_cidr_pton.c
index 413db6c979e2..62fada390fed 100644
--- a/lib/libc/inet/inet_cidr_pton.c
+++ b/lib/libc/inet/inet_cidr_pton.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: inet_cidr_pton.c,v 1.6 2005/04/27 04:56:19 sra Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/types.h>
diff --git a/lib/libc/inet/inet_lnaof.c b/lib/libc/inet/inet_lnaof.c
index c09692efeb8b..b9cc926327fb 100644
--- a/lib/libc/inet/inet_lnaof.c
+++ b/lib/libc/inet/inet_lnaof.c
@@ -33,8 +33,6 @@
static const char sccsid[] = "@(#)inet_lnaof.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
diff --git a/lib/libc/inet/inet_makeaddr.c b/lib/libc/inet/inet_makeaddr.c
index acdc4edbbc2f..95bb7c6d4628 100644
--- a/lib/libc/inet/inet_makeaddr.c
+++ b/lib/libc/inet/inet_makeaddr.c
@@ -33,8 +33,6 @@
static const char sccsid[] = "@(#)inet_makeaddr.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
diff --git a/lib/libc/inet/inet_net_ntop.c b/lib/libc/inet/inet_net_ntop.c
index 53b284577cdb..f523e460e8bb 100644
--- a/lib/libc/inet/inet_net_ntop.c
+++ b/lib/libc/inet/inet_net_ntop.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.5 2006/06/20 02:50:14 marka Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/types.h>
diff --git a/lib/libc/inet/inet_net_pton.c b/lib/libc/inet/inet_net_pton.c
index 6d21087cdce9..9fe41702738d 100644
--- a/lib/libc/inet/inet_net_pton.c
+++ b/lib/libc/inet/inet_net_pton.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: inet_net_pton.c,v 1.10 2008/11/14 02:36:51 marka Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/types.h>
diff --git a/lib/libc/inet/inet_neta.c b/lib/libc/inet/inet_neta.c
index ab2a97ad2a7d..19facd2047de 100644
--- a/lib/libc/inet/inet_neta.c
+++ b/lib/libc/inet/inet_neta.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: inet_neta.c,v 1.3 2005/04/27 04:56:20 sra Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/types.h>
diff --git a/lib/libc/inet/inet_netof.c b/lib/libc/inet/inet_netof.c
index 5e3bd95d46ad..0322c6427f3b 100644
--- a/lib/libc/inet/inet_netof.c
+++ b/lib/libc/inet/inet_netof.c
@@ -33,8 +33,6 @@
static const char sccsid[] = "@(#)inet_netof.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
diff --git a/lib/libc/inet/inet_network.c b/lib/libc/inet/inet_network.c
index b776f7e8e406..98f7e379a82c 100644
--- a/lib/libc/inet/inet_network.c
+++ b/lib/libc/inet/inet_network.c
@@ -33,8 +33,6 @@
static const char sccsid[] = "@(#)inet_network.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/types.h>
diff --git a/lib/libc/inet/inet_ntoa.c b/lib/libc/inet/inet_ntoa.c
index e7a585267b33..abe160ca3ab8 100644
--- a/lib/libc/inet/inet_ntoa.c
+++ b/lib/libc/inet/inet_ntoa.c
@@ -34,8 +34,6 @@ static const char sccsid[] = "@(#)inet_ntoa.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "$Id: inet_ntoa.c,v 1.2 2005/04/27 04:56:21 sra Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/types.h>
diff --git a/lib/libc/inet/inet_ntop.c b/lib/libc/inet/inet_ntop.c
index 650ffaf178d6..bc73761d6728 100644
--- a/lib/libc/inet/inet_ntop.c
+++ b/lib/libc/inet/inet_ntop.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: inet_ntop.c,v 1.5 2005/11/03 22:59:52 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
diff --git a/lib/libc/inet/inet_pton.c b/lib/libc/inet/inet_pton.c
index 19b119764e97..53776f15e92e 100644
--- a/lib/libc/inet/inet_pton.c
+++ b/lib/libc/inet/inet_pton.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: inet_pton.c,v 1.5 2005/07/28 06:51:47 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libc/inet/nsap_addr.c b/lib/libc/inet/nsap_addr.c
index 0bf190d7c12a..c3f0a4362277 100644
--- a/lib/libc/inet/nsap_addr.c
+++ b/lib/libc/inet/nsap_addr.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: nsap_addr.c,v 1.5 2005/07/28 06:51:48 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
diff --git a/lib/libc/isc/ev_streams.c b/lib/libc/isc/ev_streams.c
index 59f01eda6a3f..254005738226 100644
--- a/lib/libc/isc/ev_streams.c
+++ b/lib/libc/isc/ev_streams.c
@@ -25,8 +25,6 @@
static const char rcsid[] = "$Id: ev_streams.c,v 1.5 2005/04/27 04:56:36 sra Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#ifndef _LIBC
#include "fd_setsize.h"
diff --git a/lib/libc/isc/ev_timers.c b/lib/libc/isc/ev_timers.c
index 94a7b003f529..4dcc8f05bc3a 100644
--- a/lib/libc/isc/ev_timers.c
+++ b/lib/libc/isc/ev_timers.c
@@ -25,8 +25,6 @@
static const char rcsid[] = "$Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Import. */
#include "port_before.h"
diff --git a/lib/libc/locale/ascii.c b/lib/libc/locale/ascii.c
index 01ca53c512f0..55761626d67b 100644
--- a/lib/libc/locale/ascii.c
+++ b/lib/libc/locale/ascii.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <runetype.h>
diff --git a/lib/libc/locale/big5.c b/lib/libc/locale/big5.c
index 7ff3c024dd32..77c19e9d7c0e 100644
--- a/lib/libc/locale/big5.c
+++ b/lib/libc/locale/big5.c
@@ -42,8 +42,6 @@
static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
#include <runetype.h>
diff --git a/lib/libc/locale/btowc.c b/lib/libc/locale/btowc.c
index ecc184570b1e..e5e4951fedd8 100644
--- a/lib/libc/locale/btowc.c
+++ b/lib/libc/locale/btowc.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <wchar.h>
#include "mblocal.h"
diff --git a/lib/libc/locale/c16rtomb.c b/lib/libc/locale/c16rtomb.c
index ea94cbaed1b8..de6ada6521c6 100644
--- a/lib/libc/locale/c16rtomb.c
+++ b/lib/libc/locale/c16rtomb.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <uchar.h>
#include "mblocal.h"
diff --git a/lib/libc/locale/c32rtomb.c b/lib/libc/locale/c32rtomb.c
index 677c79fa1cd8..f60d137556b2 100644
--- a/lib/libc/locale/c32rtomb.c
+++ b/lib/libc/locale/c32rtomb.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <uchar.h>
#include <wchar.h>
diff --git a/lib/libc/locale/cXXrtomb_iconv.h b/lib/libc/locale/cXXrtomb_iconv.h
index 6ed32e1042d1..cf171a49d439 100644
--- a/lib/libc/locale/cXXrtomb_iconv.h
+++ b/lib/libc/locale/cXXrtomb_iconv.h
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <assert.h>
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
index c4e7d1cddba1..60c14a7de552 100644
--- a/lib/libc/locale/collate.c
+++ b/lib/libc/locale/collate.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
diff --git a/lib/libc/locale/collcmp.c b/lib/libc/locale/collcmp.c
index d811ab48ca0e..7b2d6723411b 100644
--- a/lib/libc/locale/collcmp.c
+++ b/lib/libc/locale/collcmp.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <wchar.h>
#include "collate.h"
diff --git a/lib/libc/locale/euc.c b/lib/libc/locale/euc.c
index 0b3118f83ebb..823928ff745b 100644
--- a/lib/libc/locale/euc.c
+++ b/lib/libc/locale/euc.c
@@ -44,8 +44,6 @@
static char sccsid[] = "@(#)euc.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <runetype.h>
diff --git a/lib/libc/locale/fix_grouping.c b/lib/libc/locale/fix_grouping.c
index cf1fa6104008..19b32a378b95 100644
--- a/lib/libc/locale/fix_grouping.c
+++ b/lib/libc/locale/fix_grouping.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <limits.h>
#include <stddef.h>
diff --git a/lib/libc/locale/gb18030.c b/lib/libc/locale/gb18030.c
index eeb0e61363dd..1ddb3e463872 100644
--- a/lib/libc/locale/gb18030.c
+++ b/lib/libc/locale/gb18030.c
@@ -40,8 +40,6 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <runetype.h>
#include <stdlib.h>
diff --git a/lib/libc/locale/gb2312.c b/lib/libc/locale/gb2312.c
index ef035ccb400f..dbcb56435ab6 100644
--- a/lib/libc/locale/gb2312.c
+++ b/lib/libc/locale/gb2312.c
@@ -35,8 +35,6 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <runetype.h>
#include <stdlib.h>
diff --git a/lib/libc/locale/gbk.c b/lib/libc/locale/gbk.c
index 22095b6e5128..045e0645b1b5 100644
--- a/lib/libc/locale/gbk.c
+++ b/lib/libc/locale/gbk.c
@@ -41,8 +41,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
#include <runetype.h>
diff --git a/lib/libc/locale/isctype.c b/lib/libc/locale/isctype.c
index 3731508ba15a..45dc86c260f6 100644
--- a/lib/libc/locale/isctype.c
+++ b/lib/libc/locale/isctype.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)isctype.c 8.3 (Berkeley) 2/24/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#undef digittoint
diff --git a/lib/libc/locale/iswctype.c b/lib/libc/locale/iswctype.c
index 251e98c2b9c7..8e5879b0b72c 100644
--- a/lib/libc/locale/iswctype.c
+++ b/lib/libc/locale/iswctype.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wctype.h>
#undef iswalnum
diff --git a/lib/libc/locale/ldpart.c b/lib/libc/locale/ldpart.c
index 2a7d39aa8429..e77f3e2e2a72 100644
--- a/lib/libc/locale/ldpart.c
+++ b/lib/libc/locale/ldpart.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libc/locale/lmessages.c b/lib/libc/locale/lmessages.c
index e548557d4b32..90757b131fbb 100644
--- a/lib/libc/locale/lmessages.c
+++ b/lib/libc/locale/lmessages.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include "ldpart.h"
diff --git a/lib/libc/locale/lmonetary.c b/lib/libc/locale/lmonetary.c
index e269c784498d..f12d4d258403 100644
--- a/lib/libc/locale/lmonetary.c
+++ b/lib/libc/locale/lmonetary.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stddef.h>
#include <stdlib.h>
diff --git a/lib/libc/locale/lnumeric.c b/lib/libc/locale/lnumeric.c
index 6558645ee1f1..109761a62b1d 100644
--- a/lib/libc/locale/lnumeric.c
+++ b/lib/libc/locale/lnumeric.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include "ldpart.h"
diff --git a/lib/libc/locale/localeconv.c b/lib/libc/locale/localeconv.c
index ced3f52f0a73..d87bd03cad61 100644
--- a/lib/libc/locale/localeconv.c
+++ b/lib/libc/locale/localeconv.c
@@ -39,8 +39,6 @@
static char sccsid[] = "@(#)localeconv.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <locale.h>
#include "lmonetary.h"
diff --git a/lib/libc/locale/mblen.c b/lib/libc/locale/mblen.c
index 280e0a49b919..a0ff1660ce5d 100644
--- a/lib/libc/locale/mblen.c
+++ b/lib/libc/locale/mblen.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <wchar.h>
#include "mblocal.h"
diff --git a/lib/libc/locale/mbrlen.c b/lib/libc/locale/mbrlen.c
index bcef3e49a903..57237c86141e 100644
--- a/lib/libc/locale/mbrlen.c
+++ b/lib/libc/locale/mbrlen.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
#include "mblocal.h"
diff --git a/lib/libc/locale/mbrtoc16.c b/lib/libc/locale/mbrtoc16.c
index 105e6e867c23..54c3beb16f66 100644
--- a/lib/libc/locale/mbrtoc16.c
+++ b/lib/libc/locale/mbrtoc16.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <uchar.h>
#include "mblocal.h"
diff --git a/lib/libc/locale/mbrtoc32.c b/lib/libc/locale/mbrtoc32.c
index 0a030bba1c81..33227adb70b8 100644
--- a/lib/libc/locale/mbrtoc32.c
+++ b/lib/libc/locale/mbrtoc32.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <uchar.h>
#include <wchar.h>
#include "mblocal.h"
diff --git a/lib/libc/locale/mbrtocXX_iconv.h b/lib/libc/locale/mbrtocXX_iconv.h
index 4ebb56832660..148ba55e548a 100644
--- a/lib/libc/locale/mbrtocXX_iconv.h
+++ b/lib/libc/locale/mbrtocXX_iconv.h
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <assert.h>
diff --git a/lib/libc/locale/mbrtowc.c b/lib/libc/locale/mbrtowc.c
index f9ccae6e8e6d..b92968156e0e 100644
--- a/lib/libc/locale/mbrtowc.c
+++ b/lib/libc/locale/mbrtowc.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
#include "mblocal.h"
diff --git a/lib/libc/locale/mbsinit.c b/lib/libc/locale/mbsinit.c
index d3272796540f..c9aece68fe6f 100644
--- a/lib/libc/locale/mbsinit.c
+++ b/lib/libc/locale/mbsinit.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
#include "mblocal.h"
diff --git a/lib/libc/locale/mbsnrtowcs.c b/lib/libc/locale/mbsnrtowcs.c
index 76788b5e60e5..b667ee710757 100644
--- a/lib/libc/locale/mbsnrtowcs.c
+++ b/lib/libc/locale/mbsnrtowcs.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
diff --git a/lib/libc/locale/mbsrtowcs.c b/lib/libc/locale/mbsrtowcs.c
index ad723ced2af4..718d61c77ea4 100644
--- a/lib/libc/locale/mbsrtowcs.c
+++ b/lib/libc/locale/mbsrtowcs.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
diff --git a/lib/libc/locale/mbstowcs.c b/lib/libc/locale/mbstowcs.c
index 0c4358241b44..805a49b3563f 100644
--- a/lib/libc/locale/mbstowcs.c
+++ b/lib/libc/locale/mbstowcs.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stdlib.h>
#include <wchar.h>
diff --git a/lib/libc/locale/mbtowc.c b/lib/libc/locale/mbtowc.c
index 61e2557a8f81..56b9b2ba8afd 100644
--- a/lib/libc/locale/mbtowc.c
+++ b/lib/libc/locale/mbtowc.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdlib.h>
#include <wchar.h>
diff --git a/lib/libc/locale/mskanji.c b/lib/libc/locale/mskanji.c
index 9b27b579d031..3b30ed0c6027 100644
--- a/lib/libc/locale/mskanji.c
+++ b/lib/libc/locale/mskanji.c
@@ -46,8 +46,6 @@
static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
#include <runetype.h>
diff --git a/lib/libc/locale/nextwctype.c b/lib/libc/locale/nextwctype.c
index fea175f13b23..dd81cd82940e 100644
--- a/lib/libc/locale/nextwctype.c
+++ b/lib/libc/locale/nextwctype.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <runetype.h>
#include <wchar.h>
#include <wctype.h>
diff --git a/lib/libc/locale/nl_langinfo.c b/lib/libc/locale/nl_langinfo.c
index 49944d3bd6c8..b7055f3eaa62 100644
--- a/lib/libc/locale/nl_langinfo.c
+++ b/lib/libc/locale/nl_langinfo.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <langinfo.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/locale/nomacros.c b/lib/libc/locale/nomacros.c
index 66cf40e61ec9..2dfdd772cfc9 100644
--- a/lib/libc/locale/nomacros.c
+++ b/lib/libc/locale/nomacros.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Tell <ctype.h> to generate extern versions of all its inline
* functions. The extern versions get called if the system doesn't
diff --git a/lib/libc/locale/none.c b/lib/libc/locale/none.c
index b2d1d24ac3fc..a0110f8590ec 100644
--- a/lib/libc/locale/none.c
+++ b/lib/libc/locale/none.c
@@ -44,8 +44,6 @@
static char sccsid[] = "@(#)none.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <runetype.h>
diff --git a/lib/libc/locale/rpmatch.c b/lib/libc/locale/rpmatch.c
index 1189f97e58ba..4826c302b827 100644
--- a/lib/libc/locale/rpmatch.c
+++ b/lib/libc/locale/rpmatch.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <langinfo.h>
#include <regex.h>
#include <stdlib.h>
diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c
index ce2095763eba..79dc4de18e25 100644
--- a/lib/libc/locale/rune.c
+++ b/lib/libc/locale/rune.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)rune.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <arpa/inet.h>
#include <errno.h>
diff --git a/lib/libc/locale/runetype.c b/lib/libc/locale/runetype.c
index 8a070d4c4dc1..1442c3a77fd5 100644
--- a/lib/libc/locale/runetype.c
+++ b/lib/libc/locale/runetype.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <stdio.h>
#include <runetype.h>
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index bb60418f3583..53b6e635ecb7 100644
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)setlocale.c 8.1 (Berkeley) 7/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c
index 9b4b65f166e8..8c8ef82a1193 100644
--- a/lib/libc/locale/setrunelocale.c
+++ b/lib/libc/locale/setrunelocale.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __RUNETYPE_INTERNAL 1
#include <runetype.h>
diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c
index 4f1b7d51d414..1c6ecacbbbfa 100644
--- a/lib/libc/locale/table.c
+++ b/lib/libc/locale/table.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/27/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <runetype.h>
#include <wchar.h>
diff --git a/lib/libc/locale/tolower.c b/lib/libc/locale/tolower.c
index 021e5c10b5b9..59cd24393a22 100644
--- a/lib/libc/locale/tolower.c
+++ b/lib/libc/locale/tolower.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <stdio.h>
#include <runetype.h>
diff --git a/lib/libc/locale/toupper.c b/lib/libc/locale/toupper.c
index 2441cc2c595e..6de0c76860bd 100644
--- a/lib/libc/locale/toupper.c
+++ b/lib/libc/locale/toupper.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <stdio.h>
#include <runetype.h>
diff --git a/lib/libc/locale/utf8.c b/lib/libc/locale/utf8.c
index 3213ed75a6f2..3eb5f21bc3b3 100644
--- a/lib/libc/locale/utf8.c
+++ b/lib/libc/locale/utf8.c
@@ -34,8 +34,6 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <runetype.h>
diff --git a/lib/libc/locale/wcrtomb.c b/lib/libc/locale/wcrtomb.c
index 3106f904a404..83321e4a41c9 100644
--- a/lib/libc/locale/wcrtomb.c
+++ b/lib/libc/locale/wcrtomb.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
#include "mblocal.h"
diff --git a/lib/libc/locale/wcsftime.c b/lib/libc/locale/wcsftime.c
index 4fe6ad568166..ce67d35846e8 100644
--- a/lib/libc/locale/wcsftime.c
+++ b/lib/libc/locale/wcsftime.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
diff --git a/lib/libc/locale/wcsnrtombs.c b/lib/libc/locale/wcsnrtombs.c
index 5bed52be19c8..fc47c1c7cce2 100644
--- a/lib/libc/locale/wcsnrtombs.c
+++ b/lib/libc/locale/wcsnrtombs.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/locale/wcsrtombs.c b/lib/libc/locale/wcsrtombs.c
index 0ff39904454d..2e472f1a0ff9 100644
--- a/lib/libc/locale/wcsrtombs.c
+++ b/lib/libc/locale/wcsrtombs.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/locale/wcstod.c b/lib/libc/locale/wcstod.c
index 114f68410122..570bf4474ff4 100644
--- a/lib/libc/locale/wcstod.c
+++ b/lib/libc/locale/wcstod.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <wchar.h>
#include <wctype.h>
diff --git a/lib/libc/locale/wcstof.c b/lib/libc/locale/wcstof.c
index 888801b870af..2d35f0b82f25 100644
--- a/lib/libc/locale/wcstof.c
+++ b/lib/libc/locale/wcstof.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <wchar.h>
#include <wctype.h>
diff --git a/lib/libc/locale/wcstoimax.c b/lib/libc/locale/wcstoimax.c
index 5fa406784f15..6447fe6dccfd 100644
--- a/lib/libc/locale/wcstoimax.c
+++ b/lib/libc/locale/wcstoimax.c
@@ -41,8 +41,6 @@ static char sccsid[] = "from @(#)strtol.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoimax.c,v 1.8 2002/09/06 11:23:59 tjr Exp ");
#endif
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <inttypes.h>
#include <stdlib.h>
diff --git a/lib/libc/locale/wcstol.c b/lib/libc/locale/wcstol.c
index 0921782e49ff..183fb00bc507 100644
--- a/lib/libc/locale/wcstol.c
+++ b/lib/libc/locale/wcstol.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/locale/wcstold.c b/lib/libc/locale/wcstold.c
index db7ee5e9f137..dc15631a22f0 100644
--- a/lib/libc/locale/wcstold.c
+++ b/lib/libc/locale/wcstold.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <wchar.h>
#include <wctype.h>
diff --git a/lib/libc/locale/wcstoll.c b/lib/libc/locale/wcstoll.c
index f28a0015485a..5e42d878e1c8 100644
--- a/lib/libc/locale/wcstoll.c
+++ b/lib/libc/locale/wcstoll.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)strtoq.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.19 2002/09/06 11:23:59 tjr Exp ");
#endif
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
diff --git a/lib/libc/locale/wcstombs.c b/lib/libc/locale/wcstombs.c
index 34b82cab2ffd..0b9303cd79e1 100644
--- a/lib/libc/locale/wcstombs.c
+++ b/lib/libc/locale/wcstombs.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stdlib.h>
#include <wchar.h>
diff --git a/lib/libc/locale/wcstoul.c b/lib/libc/locale/wcstoul.c
index 12f65c577605..d097c20db40a 100644
--- a/lib/libc/locale/wcstoul.c
+++ b/lib/libc/locale/wcstoul.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/locale/wcstoull.c b/lib/libc/locale/wcstoull.c
index bf968e272bfb..5f8e8367308b 100644
--- a/lib/libc/locale/wcstoull.c
+++ b/lib/libc/locale/wcstoull.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)strtouq.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.18 2002/09/06 11:23:59 tjr Exp ");
#endif
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
diff --git a/lib/libc/locale/wcstoumax.c b/lib/libc/locale/wcstoumax.c
index 9d5b220797a4..ad9e9c334186 100644
--- a/lib/libc/locale/wcstoumax.c
+++ b/lib/libc/locale/wcstoumax.c
@@ -41,8 +41,6 @@ static char sccsid[] = "from @(#)strtoul.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.8 2002/09/06 11:23:59 tjr Exp ");
#endif
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <inttypes.h>
#include <stdlib.h>
diff --git a/lib/libc/locale/wctob.c b/lib/libc/locale/wctob.c
index 1bb72b99ebcc..d3c9318cc70d 100644
--- a/lib/libc/locale/wctob.c
+++ b/lib/libc/locale/wctob.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/locale/wctomb.c b/lib/libc/locale/wctomb.c
index ebd2cd2e4620..72bce6567b76 100644
--- a/lib/libc/locale/wctomb.c
+++ b/lib/libc/locale/wctomb.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <wchar.h>
#include "mblocal.h"
diff --git a/lib/libc/locale/wctrans.c b/lib/libc/locale/wctrans.c
index fd9006740836..947629a8bad8 100644
--- a/lib/libc/locale/wctrans.c
+++ b/lib/libc/locale/wctrans.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <string.h>
#include <wctype.h>
diff --git a/lib/libc/locale/wctype.c b/lib/libc/locale/wctype.c
index 3ff4b4d37868..a738a075f982 100644
--- a/lib/libc/locale/wctype.c
+++ b/lib/libc/locale/wctype.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <string.h>
#include <wctype.h>
diff --git a/lib/libc/locale/wcwidth.c b/lib/libc/locale/wcwidth.c
index 957681fcb0e6..4c256033ac47 100644
--- a/lib/libc/locale/wcwidth.c
+++ b/lib/libc/locale/wcwidth.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
#include <wctype.h>
#include <xlocale.h>
diff --git a/lib/libc/nameser/ns_name.c b/lib/libc/nameser/ns_name.c
index 9ff3d3f9da7b..ffe3b9716ab3 100644
--- a/lib/libc/nameser/ns_name.c
+++ b/lib/libc/nameser/ns_name.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: ns_name.c,v 1.11 2009/01/23 19:59:16 each Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/types.h>
diff --git a/lib/libc/nameser/ns_netint.c b/lib/libc/nameser/ns_netint.c
index fc179e225288..02e2d485f3f7 100644
--- a/lib/libc/nameser/ns_netint.c
+++ b/lib/libc/nameser/ns_netint.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: ns_netint.c,v 1.3 2005/04/27 04:56:40 sra Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Import. */
#include "port_before.h"
diff --git a/lib/libc/nameser/ns_parse.c b/lib/libc/nameser/ns_parse.c
index 7a3382ed7703..d475b92cd5fc 100644
--- a/lib/libc/nameser/ns_parse.c
+++ b/lib/libc/nameser/ns_parse.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: ns_parse.c,v 1.10 2009/01/23 19:59:16 each Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Import. */
#include "port_before.h"
diff --git a/lib/libc/nameser/ns_print.c b/lib/libc/nameser/ns_print.c
index 52f13e2673c7..84e8873bb62e 100644
--- a/lib/libc/nameser/ns_print.c
+++ b/lib/libc/nameser/ns_print.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: ns_print.c,v 1.12 2009/03/03 05:29:58 each Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Import. */
#include "port_before.h"
diff --git a/lib/libc/nameser/ns_samedomain.c b/lib/libc/nameser/ns_samedomain.c
index 858d0d1436a5..1b7f562d66b5 100644
--- a/lib/libc/nameser/ns_samedomain.c
+++ b/lib/libc/nameser/ns_samedomain.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: ns_samedomain.c,v 1.6 2005/04/27 04:56:40 sra Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/types.h>
diff --git a/lib/libc/nameser/ns_ttl.c b/lib/libc/nameser/ns_ttl.c
index 2ebbcc4f8c17..e6d66379fa3e 100644
--- a/lib/libc/nameser/ns_ttl.c
+++ b/lib/libc/nameser/ns_ttl.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: ns_ttl.c,v 1.4 2005/07/28 06:51:49 marka Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Import. */
#include "port_before.h"
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c
index fe70f2c71f08..44b2e9bd42f6 100644
--- a/lib/libc/net/base64.c
+++ b/lib/libc/net/base64.c
@@ -41,8 +41,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libc/net/ether_addr.c b/lib/libc/net/ether_addr.c
index 98e5398096ff..3a2e565a7b34 100644
--- a/lib/libc/net/ether_addr.c
+++ b/lib/libc/net/ether_addr.c
@@ -40,8 +40,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libc/net/eui64.c b/lib/libc/net/eui64.c
index 2c2c4ea57b21..349f907b9d0b 100644
--- a/lib/libc/net/eui64.c
+++ b/lib/libc/net/eui64.c
@@ -68,8 +68,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <paths.h>
#include <sys/param.h>
diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c
index 276ba91b95fd..4964ca23ae4b 100644
--- a/lib/libc/net/gai_strerror.c
+++ b/lib/libc/net/gai_strerror.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <netdb.h>
#if defined(NLS)
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index 14729087b82a..60d2444026a0 100644
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -54,8 +54,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
index 142b67f7ace9..4fa86acef139 100644
--- a/lib/libc/net/gethostbydns.c
+++ b/lib/libc/net/gethostbydns.c
@@ -56,8 +56,6 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c
index 3251f407f439..ee51b4056d00 100644
--- a/lib/libc/net/gethostbyht.c
+++ b/lib/libc/net/gethostbyht.c
@@ -53,8 +53,6 @@
static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c
index dcf2844aa843..ea503c9dd4c8 100644
--- a/lib/libc/net/gethostbynis.c
+++ b/lib/libc/net/gethostbynis.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index bfad0d22c935..1b60ab0fa00f 100644
--- a/lib/libc/net/gethostnamadr.c
+++ b/lib/libc/net/gethostnamadr.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include "reentrant.h"
#include <sys/param.h>
diff --git a/lib/libc/net/getifaddrs.c b/lib/libc/net/getifaddrs.c
index 2de869ca6f9e..f42093b76ca6 100644
--- a/lib/libc/net/getifaddrs.c
+++ b/lib/libc/net/getifaddrs.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/lib/libc/net/getifmaddrs.c b/lib/libc/net/getifmaddrs.c
index 1c54c554882c..d2f41e341568 100644
--- a/lib/libc/net/getifmaddrs.c
+++ b/lib/libc/net/getifmaddrs.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
index b72734e56ed3..b299b596e343 100644
--- a/lib/libc/net/getnameinfo.c
+++ b/lib/libc/net/getnameinfo.c
@@ -47,8 +47,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/lib/libc/net/getnetbydns.c b/lib/libc/net/getnetbydns.c
index ac35ae4a96c4..c2a8310e4172 100644
--- a/lib/libc/net/getnetbydns.c
+++ b/lib/libc/net/getnetbydns.c
@@ -60,8 +60,6 @@
static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/lib/libc/net/getnetbyht.c b/lib/libc/net/getnetbyht.c
index 9db1a37ebd36..8fb4ccff9cfb 100644
--- a/lib/libc/net/getnetbyht.c
+++ b/lib/libc/net/getnetbyht.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)getnetent.c 8.1 (Berkeley) 6/4/93";
static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c
index f6a2714ba986..266cce2bdac2 100644
--- a/lib/libc/net/getnetbynis.c
+++ b/lib/libc/net/getnetbynis.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index 0d9ec0885582..d3c44050a1ac 100644
--- a/lib/libc/net/getnetnamadr.c
+++ b/lib/libc/net/getnetnamadr.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include "reentrant.h"
#include <sys/param.h>
diff --git a/lib/libc/net/getproto.c b/lib/libc/net/getproto.c
index ec7ee39447a5..407acf635c7e 100644
--- a/lib/libc/net/getproto.c
+++ b/lib/libc/net/getproto.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)getproto.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <netdb.h>
#include <nsswitch.h>
diff --git a/lib/libc/net/getprotoent.c b/lib/libc/net/getprotoent.c
index b3bb52195dfc..1fb719219c10 100644
--- a/lib/libc/net/getprotoent.c
+++ b/lib/libc/net/getprotoent.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)getprotoent.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <errno.h>
diff --git a/lib/libc/net/getprotoname.c b/lib/libc/net/getprotoname.c
index 22c2938dd53e..0ae48e96d3f3 100644
--- a/lib/libc/net/getprotoname.c
+++ b/lib/libc/net/getprotoname.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)getprotoname.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <netdb.h>
#include <nsswitch.h>
diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c
index bcb9f8ff8b84..d4241d49d05a 100644
--- a/lib/libc/net/getservent.c
+++ b/lib/libc/net/getservent.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)getservent.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <arpa/inet.h>
diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c
index f456e76316a1..634f109e616b 100644
--- a/lib/libc/net/hesiod.c
+++ b/lib/libc/net/hesiod.c
@@ -49,8 +49,6 @@
static char *orig_rcsid = "$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
diff --git a/lib/libc/net/if_indextoname.c b/lib/libc/net/if_indextoname.c
index e7ccb422dc6a..ba4bd7ab3794 100644
--- a/lib/libc/net/if_indextoname.c
+++ b/lib/libc/net/if_indextoname.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if_dl.h>
diff --git a/lib/libc/net/if_nameindex.c b/lib/libc/net/if_nameindex.c
index 4b6b15ecefb1..ca052e91f7a5 100644
--- a/lib/libc/net/if_nameindex.c
+++ b/lib/libc/net/if_nameindex.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if_dl.h>
diff --git a/lib/libc/net/if_nametoindex.c b/lib/libc/net/if_nametoindex.c
index c38fce76b037..0042bc8c0f4f 100644
--- a/lib/libc/net/if_nametoindex.c
+++ b/lib/libc/net/if_nametoindex.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c
index 5e2f9df8d008..54bd24939d3c 100644
--- a/lib/libc/net/ip6opt.c
+++ b/lib/libc/net/ip6opt.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libc/net/linkaddr.c b/lib/libc/net/linkaddr.c
index f50197ec32a8..df1b7b94276e 100644
--- a/lib/libc/net/linkaddr.c
+++ b/lib/libc/net/linkaddr.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)linkaddr.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>
diff --git a/lib/libc/net/map_v4v6.c b/lib/libc/net/map_v4v6.c
index addc5194786c..7a624df5d552 100644
--- a/lib/libc/net/map_v4v6.c
+++ b/lib/libc/net/map_v4v6.c
@@ -55,8 +55,6 @@
static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c
index 9b7aaf66ae21..75a663ab1ca7 100644
--- a/lib/libc/net/name6.c
+++ b/lib/libc/net/name6.c
@@ -86,8 +86,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libc/net/nscache.c b/lib/libc/net/nscache.c
index 2fd0857548d7..0814818aa210 100644
--- a/lib/libc/net/nscache.c
+++ b/lib/libc/net/nscache.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#define _NS_PRIVATE
#include <nsswitch.h>
diff --git a/lib/libc/net/nscachedcli.c b/lib/libc/net/nscachedcli.c
index c9518214f5c5..55b0b97129f5 100644
--- a/lib/libc/net/nscachedcli.c
+++ b/lib/libc/net/nscachedcli.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c
index d2d9f08b6efa..958bd2ed69b0 100644
--- a/lib/libc/net/nsdispatch.c
+++ b/lib/libc/net/nsdispatch.c
@@ -63,8 +63,6 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libc/net/nsparser.y b/lib/libc/net/nsparser.y
index b05b30d26bd0..636ac19ffbc0 100644
--- a/lib/libc/net/nsparser.y
+++ b/lib/libc/net/nsparser.y
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#define _NS_PRIVATE
#include <nsswitch.h>
diff --git a/lib/libc/net/nss_compat.c b/lib/libc/net/nss_compat.c
index a471fbd2f5db..131e7c398589 100644
--- a/lib/libc/net/nss_compat.c
+++ b/lib/libc/net/nss_compat.c
@@ -34,8 +34,6 @@
* Compatibility shims for the GNU C Library-style nsswitch interface.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <errno.h>
diff --git a/lib/libc/net/ntoh.c b/lib/libc/net/ntoh.c
index 41432f8e88a8..1c309ded5cb8 100644
--- a/lib/libc/net/ntoh.c
+++ b/lib/libc/net/ntoh.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#define _BYTEORDER_FUNC_DEFINED
#include <arpa/inet.h>
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index 2a6edd66440c..1a0dd5c48d01 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libc/net/rcmdsh.c b/lib/libc/net/rcmdsh.c
index b321b5a51a2f..ceedc51731a3 100644
--- a/lib/libc/net/rcmdsh.c
+++ b/lib/libc/net/rcmdsh.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/lib/libc/net/recv.c b/lib/libc/net/recv.c
index 5304745848a7..bf321f3d522d 100644
--- a/lib/libc/net/recv.c
+++ b/lib/libc/net/recv.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)recv.c 8.2 (Berkeley) 2/21/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include "libc_private.h"
diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c
index 81f07c0e77dd..0a2e70cf4914 100644
--- a/lib/libc/net/rthdr.c
+++ b/lib/libc/net/rthdr.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libc/net/sctp_sys_calls.c b/lib/libc/net/sctp_sys_calls.c
index 7c3652ff5d3c..ee0de3b95691 100644
--- a/lib/libc/net/sctp_sys_calls.c
+++ b/lib/libc/net/sctp_sys_calls.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdbool.h>
#include <stddef.h>
#include <stdio.h>
diff --git a/lib/libc/net/send.c b/lib/libc/net/send.c
index b0c179c2e6b4..cb2f72ae8b9f 100644
--- a/lib/libc/net/send.c
+++ b/lib/libc/net/send.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)send.c 8.2 (Berkeley) 2/21/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include "libc_private.h"
diff --git a/lib/libc/net/sourcefilter.c b/lib/libc/net/sourcefilter.c
index 6cd623249d13..34dbde6a2577 100644
--- a/lib/libc/net/sourcefilter.c
+++ b/lib/libc/net/sourcefilter.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
diff --git a/lib/libc/net/vars.c b/lib/libc/net/vars.c
index 5bcfb9f9263e..7df32ca69ed6 100644
--- a/lib/libc/net/vars.c
+++ b/lib/libc/net/vars.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <netinet/in.h>
diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
index 7f687258e5c3..80750dc8cfa1 100644
--- a/lib/libc/nls/msgcat.c
+++ b/lib/libc/nls/msgcat.c
@@ -32,8 +32,6 @@ up-to-date. Many thanks.
******************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _NLS_PRIVATE
#include "namespace.h"
diff --git a/lib/libc/posix1e/acl_branding.c b/lib/libc/posix1e/acl_branding.c
index fad59f4cd211..4cb9feb1d281 100644
--- a/lib/libc/posix1e/acl_branding.c
+++ b/lib/libc/posix1e/acl_branding.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <errno.h>
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_calc_mask.c b/lib/libc/posix1e/acl_calc_mask.c
index d48c0acdffeb..74a432839c17 100644
--- a/lib/libc/posix1e/acl_calc_mask.c
+++ b/lib/libc/posix1e/acl_calc_mask.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_cmp_np.c b/lib/libc/posix1e/acl_cmp_np.c
index 7b25a14464b1..f1ec108629a5 100644
--- a/lib/libc/posix1e/acl_cmp_np.c
+++ b/lib/libc/posix1e/acl_cmp_np.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/acl.h>
#include <sys/errno.h>
diff --git a/lib/libc/posix1e/acl_compat.c b/lib/libc/posix1e/acl_compat.c
index 7980d1b9236b..f8eb55116d84 100644
--- a/lib/libc/posix1e/acl_compat.c
+++ b/lib/libc/posix1e/acl_compat.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/acl.h>
int __oldacl_get_perm_np(acl_permset_t, oldacl_perm_t);
diff --git a/lib/libc/posix1e/acl_copy.c b/lib/libc/posix1e/acl_copy.c
index c38cc7d268f4..96a5ed479641 100644
--- a/lib/libc/posix1e/acl_copy.c
+++ b/lib/libc/posix1e/acl_copy.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_delete.c b/lib/libc/posix1e/acl_delete.c
index 92d22d641e3b..b0fb59391ec5 100644
--- a/lib/libc/posix1e/acl_delete.c
+++ b/lib/libc/posix1e/acl_delete.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_delete_entry.c b/lib/libc/posix1e/acl_delete_entry.c
index 26504bce7a02..5faa52065fe9 100644
--- a/lib/libc/posix1e/acl_delete_entry.c
+++ b/lib/libc/posix1e/acl_delete_entry.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_entry.c b/lib/libc/posix1e/acl_entry.c
index 44eb8291f09e..eb9103439efe 100644
--- a/lib/libc/posix1e/acl_entry.c
+++ b/lib/libc/posix1e/acl_entry.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_equiv_mode_np.c b/lib/libc/posix1e/acl_equiv_mode_np.c
index 879506bf0777..06bd3a3deda3 100644
--- a/lib/libc/posix1e/acl_equiv_mode_np.c
+++ b/lib/libc/posix1e/acl_equiv_mode_np.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/lib/libc/posix1e/acl_extended_file_np.c b/lib/libc/posix1e/acl_extended_file_np.c
index b4270c605953..27b5c9b20776 100644
--- a/lib/libc/posix1e/acl_extended_file_np.c
+++ b/lib/libc/posix1e/acl_extended_file_np.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_flag.c b/lib/libc/posix1e/acl_flag.c
index 470aff18417f..82772bf261f1 100644
--- a/lib/libc/posix1e/acl_flag.c
+++ b/lib/libc/posix1e/acl_flag.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <errno.h>
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_free.c b/lib/libc/posix1e/acl_free.c
index 869734acd2f2..1de6d3105047 100644
--- a/lib/libc/posix1e/acl_free.c
+++ b/lib/libc/posix1e/acl_free.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_from_mode_np.c b/lib/libc/posix1e/acl_from_mode_np.c
index 6c96d445e9f1..b08cc5b5e6a0 100644
--- a/lib/libc/posix1e/acl_from_mode_np.c
+++ b/lib/libc/posix1e/acl_from_mode_np.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_from_text.c b/lib/libc/posix1e/acl_from_text.c
index 5a1bcfc4a1f6..2a1c21fa7859 100644
--- a/lib/libc/posix1e/acl_from_text.c
+++ b/lib/libc/posix1e/acl_from_text.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_from_text_nfs4.c b/lib/libc/posix1e/acl_from_text_nfs4.c
index a8b8b49e1c12..41fb96973d91 100644
--- a/lib/libc/posix1e/acl_from_text_nfs4.c
+++ b/lib/libc/posix1e/acl_from_text_nfs4.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c
index 73796f762ecf..f5191d739dcc 100644
--- a/lib/libc/posix1e/acl_get.c
+++ b/lib/libc/posix1e/acl_get.c
@@ -41,8 +41,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_id_to_name.c b/lib/libc/posix1e/acl_id_to_name.c
index 8e7d9e99054f..b5afe7d16613 100644
--- a/lib/libc/posix1e/acl_id_to_name.c
+++ b/lib/libc/posix1e/acl_id_to_name.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c
index 2b08d5efa7f8..eaa554df4fe8 100644
--- a/lib/libc/posix1e/acl_init.c
+++ b/lib/libc/posix1e/acl_init.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_perm.c b/lib/libc/posix1e/acl_perm.c
index 606fe7823f24..f6abf404c4f8 100644
--- a/lib/libc/posix1e/acl_perm.c
+++ b/lib/libc/posix1e/acl_perm.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_set.c b/lib/libc/posix1e/acl_set.c
index 1186cbb8ec17..5edc291b5171 100644
--- a/lib/libc/posix1e/acl_set.c
+++ b/lib/libc/posix1e/acl_set.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_strip.c b/lib/libc/posix1e/acl_strip.c
index b5085692028e..ac6c94e66f86 100644
--- a/lib/libc/posix1e/acl_strip.c
+++ b/lib/libc/posix1e/acl_strip.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include <assert.h>
diff --git a/lib/libc/posix1e/acl_support.c b/lib/libc/posix1e/acl_support.c
index cb8bbd7b5b95..c4552d9799a2 100644
--- a/lib/libc/posix1e/acl_support.c
+++ b/lib/libc/posix1e/acl_support.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_support_nfs4.c b/lib/libc/posix1e/acl_support_nfs4.c
index 9b55d78d82ec..9062ec31cd43 100644
--- a/lib/libc/posix1e/acl_support_nfs4.c
+++ b/lib/libc/posix1e/acl_support_nfs4.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/posix1e/acl_to_text.c b/lib/libc/posix1e/acl_to_text.c
index ce18702b0911..3b2156c61560 100644
--- a/lib/libc/posix1e/acl_to_text.c
+++ b/lib/libc/posix1e/acl_to_text.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_to_text_nfs4.c b/lib/libc/posix1e/acl_to_text_nfs4.c
index 74876c3c7463..522ebe3d4373 100644
--- a/lib/libc/posix1e/acl_to_text_nfs4.c
+++ b/lib/libc/posix1e/acl_to_text_nfs4.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/lib/libc/posix1e/acl_valid.c b/lib/libc/posix1e/acl_valid.c
index 24b3292a0970..b0468d5a57d8 100644
--- a/lib/libc/posix1e/acl_valid.c
+++ b/lib/libc/posix1e/acl_valid.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c
index 973530e809b8..816b3a6952ad 100644
--- a/lib/libc/posix1e/extattr.c
+++ b/lib/libc/posix1e/extattr.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/extattr.h>
diff --git a/lib/libc/posix1e/mac.c b/lib/libc/posix1e/mac.c
index f8f315a0d8d7..c1bfcf15969a 100644
--- a/lib/libc/posix1e/mac.c
+++ b/lib/libc/posix1e/mac.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/posix1e/mac_exec.c b/lib/libc/posix1e/mac_exec.c
index a3dc62c16f01..acd7c1d6e828 100644
--- a/lib/libc/posix1e/mac_exec.c
+++ b/lib/libc/posix1e/mac_exec.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mac.h>
diff --git a/lib/libc/posix1e/mac_get.c b/lib/libc/posix1e/mac_get.c
index d391ba5561d7..5bf829e9a160 100644
--- a/lib/libc/posix1e/mac_get.c
+++ b/lib/libc/posix1e/mac_get.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mac.h>
#include <sys/socket.h>
diff --git a/lib/libc/posix1e/mac_set.c b/lib/libc/posix1e/mac_set.c
index fee9208b915c..cded5a7cca70 100644
--- a/lib/libc/posix1e/mac_set.c
+++ b/lib/libc/posix1e/mac_set.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mac.h>
diff --git a/lib/libc/powerpc/gen/_ctx_start.S b/lib/libc/powerpc/gen/_ctx_start.S
index d6445941168d..e82bd1dcdb8d 100644
--- a/lib/libc/powerpc/gen/_ctx_start.S
+++ b/lib/libc/powerpc/gen/_ctx_start.S
@@ -25,9 +25,6 @@
*/
#include <machine/asm.h>
-
- __FBSDID("$FreeBSD$");
-
.globl CNAME(_ctx_done)
.globl CNAME(abort)
diff --git a/lib/libc/powerpc/gen/_setjmp.S b/lib/libc/powerpc/gen/_setjmp.S
index 663a8b6ed32a..8bbe259cf33b 100644
--- a/lib/libc/powerpc/gen/_setjmp.S
+++ b/lib/libc/powerpc/gen/_setjmp.S
@@ -26,8 +26,6 @@
/* $NetBSD: _setjmp.S,v 1.1 1997/03/29 20:55:53 thorpej Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* C library -- _setjmp, _longjmp
*
diff --git a/lib/libc/powerpc/gen/eabi.S b/lib/libc/powerpc/gen/eabi.S
index 3296af88a4d1..49ea63c82637 100644
--- a/lib/libc/powerpc/gen/eabi.S
+++ b/lib/libc/powerpc/gen/eabi.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(__eabi)
blr
END(__eabi)
diff --git a/lib/libc/powerpc/gen/fabs.S b/lib/libc/powerpc/gen/fabs.S
index ac083ae636ac..d9dbf9d86fe0 100644
--- a/lib/libc/powerpc/gen/fabs.S
+++ b/lib/libc/powerpc/gen/fabs.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* double fabs(double)
*/
diff --git a/lib/libc/powerpc/gen/flt_rounds.c b/lib/libc/powerpc/gen/flt_rounds.c
index c6b6178bc07d..601a42321a16 100644
--- a/lib/libc/powerpc/gen/flt_rounds.c
+++ b/lib/libc/powerpc/gen/flt_rounds.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/float.h>
diff --git a/lib/libc/powerpc/gen/fpgetmask.c b/lib/libc/powerpc/gen/fpgetmask.c
index 76820e6807d7..b4399f23cf72 100644
--- a/lib/libc/powerpc/gen/fpgetmask.c
+++ b/lib/libc/powerpc/gen/fpgetmask.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/powerpc/gen/fpgetround.c b/lib/libc/powerpc/gen/fpgetround.c
index b40016447246..f6a98d3ffe1f 100644
--- a/lib/libc/powerpc/gen/fpgetround.c
+++ b/lib/libc/powerpc/gen/fpgetround.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/powerpc/gen/fpsetmask.c b/lib/libc/powerpc/gen/fpsetmask.c
index 36c46f12dcd9..eb5884aa080c 100644
--- a/lib/libc/powerpc/gen/fpsetmask.c
+++ b/lib/libc/powerpc/gen/fpsetmask.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/powerpc/gen/fpsetround.c b/lib/libc/powerpc/gen/fpsetround.c
index 9a1956113c85..82ec0ea354c2 100644
--- a/lib/libc/powerpc/gen/fpsetround.c
+++ b/lib/libc/powerpc/gen/fpsetround.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/powerpc/gen/infinity.c b/lib/libc/powerpc/gen/infinity.c
index f5324389d5b6..6e11371e6eb3 100644
--- a/lib/libc/powerpc/gen/infinity.c
+++ b/lib/libc/powerpc/gen/infinity.c
@@ -4,8 +4,6 @@
__RCSID("$NetBSD: infinity.c,v 1.2 1998/11/14 19:31:02 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
/* infinity.c */
#include <math.h>
diff --git a/lib/libc/powerpc/gen/makecontext.c b/lib/libc/powerpc/gen/makecontext.c
index 5ab0309adcc9..eb3cf2bb3d3b 100644
--- a/lib/libc/powerpc/gen/makecontext.c
+++ b/lib/libc/powerpc/gen/makecontext.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdarg.h>
diff --git a/lib/libc/powerpc/gen/setjmp.S b/lib/libc/powerpc/gen/setjmp.S
index ef7cb7e7be6e..0db3c4de6641 100644
--- a/lib/libc/powerpc/gen/setjmp.S
+++ b/lib/libc/powerpc/gen/setjmp.S
@@ -26,8 +26,6 @@
/* $NetBSD: setjmp.S,v 1.3 1998/10/03 12:30:38 tsubai Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/syscall.h>
/*
diff --git a/lib/libc/powerpc/gen/signalcontext.c b/lib/libc/powerpc/gen/signalcontext.c
index 1839b7505df7..253f1c8a7626 100644
--- a/lib/libc/powerpc/gen/signalcontext.c
+++ b/lib/libc/powerpc/gen/signalcontext.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ucontext.h>
#include <signal.h>
diff --git a/lib/libc/powerpc/gen/sigsetjmp.S b/lib/libc/powerpc/gen/sigsetjmp.S
index 9c75f4f86dd7..b86387204fb9 100644
--- a/lib/libc/powerpc/gen/sigsetjmp.S
+++ b/lib/libc/powerpc/gen/sigsetjmp.S
@@ -26,8 +26,6 @@
/* $NetBSD: sigsetjmp.S,v 1.4 1998/10/03 12:30:38 tsubai Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* C library -- sigsetjmp, siglongjmp
*
diff --git a/lib/libc/powerpc/sys/__vdso_gettc.c b/lib/libc/powerpc/sys/__vdso_gettc.c
index 1d26baa32461..21f0f2dd87ec 100644
--- a/lib/libc/powerpc/sys/__vdso_gettc.c
+++ b/lib/libc/powerpc/sys/__vdso_gettc.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/elf.h>
#include <sys/time.h>
diff --git a/lib/libc/powerpc/sys/cerror.S b/lib/libc/powerpc/sys/cerror.S
index 9ec3cbaf63a2..64204c5a1ddf 100644
--- a/lib/libc/powerpc/sys/cerror.S
+++ b/lib/libc/powerpc/sys/cerror.S
@@ -26,8 +26,6 @@
/* $NetBSD: cerror.S,v 1.5 2000/01/27 14:58:48 kleink Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "SYS.h"
.globl HIDENAME(cerror)
diff --git a/lib/libc/powerpc64/gen/_ctx_start.S b/lib/libc/powerpc64/gen/_ctx_start.S
index 4d5f106c96cb..c2f8abfd6486 100644
--- a/lib/libc/powerpc64/gen/_ctx_start.S
+++ b/lib/libc/powerpc64/gen/_ctx_start.S
@@ -25,9 +25,6 @@
*/
#include <machine/asm.h>
-
- __FBSDID("$FreeBSD$");
-
.globl CNAME(_ctx_done)
.globl CNAME(abort)
diff --git a/lib/libc/powerpc64/gen/_setjmp.S b/lib/libc/powerpc64/gen/_setjmp.S
index f7689aeba350..94a744b4fa28 100644
--- a/lib/libc/powerpc64/gen/_setjmp.S
+++ b/lib/libc/powerpc64/gen/_setjmp.S
@@ -26,8 +26,6 @@
/* $NetBSD: _setjmp.S,v 1.1 1997/03/29 20:55:53 thorpej Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* C library -- _setjmp, _longjmp
*
diff --git a/lib/libc/powerpc64/gen/fabs.S b/lib/libc/powerpc64/gen/fabs.S
index ac083ae636ac..d9dbf9d86fe0 100644
--- a/lib/libc/powerpc64/gen/fabs.S
+++ b/lib/libc/powerpc64/gen/fabs.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* double fabs(double)
*/
diff --git a/lib/libc/powerpc64/gen/flt_rounds.c b/lib/libc/powerpc64/gen/flt_rounds.c
index 885942a1389a..16ec162fc14b 100644
--- a/lib/libc/powerpc64/gen/flt_rounds.c
+++ b/lib/libc/powerpc64/gen/flt_rounds.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/float.h>
diff --git a/lib/libc/powerpc64/gen/fpgetmask.c b/lib/libc/powerpc64/gen/fpgetmask.c
index 76820e6807d7..b4399f23cf72 100644
--- a/lib/libc/powerpc64/gen/fpgetmask.c
+++ b/lib/libc/powerpc64/gen/fpgetmask.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/powerpc64/gen/fpgetround.c b/lib/libc/powerpc64/gen/fpgetround.c
index b40016447246..f6a98d3ffe1f 100644
--- a/lib/libc/powerpc64/gen/fpgetround.c
+++ b/lib/libc/powerpc64/gen/fpgetround.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/powerpc64/gen/fpsetmask.c b/lib/libc/powerpc64/gen/fpsetmask.c
index 36c46f12dcd9..eb5884aa080c 100644
--- a/lib/libc/powerpc64/gen/fpsetmask.c
+++ b/lib/libc/powerpc64/gen/fpsetmask.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/powerpc64/gen/fpsetround.c b/lib/libc/powerpc64/gen/fpsetround.c
index 9a1956113c85..82ec0ea354c2 100644
--- a/lib/libc/powerpc64/gen/fpsetround.c
+++ b/lib/libc/powerpc64/gen/fpsetround.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/powerpc64/gen/infinity.c b/lib/libc/powerpc64/gen/infinity.c
index f5324389d5b6..6e11371e6eb3 100644
--- a/lib/libc/powerpc64/gen/infinity.c
+++ b/lib/libc/powerpc64/gen/infinity.c
@@ -4,8 +4,6 @@
__RCSID("$NetBSD: infinity.c,v 1.2 1998/11/14 19:31:02 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
/* infinity.c */
#include <math.h>
diff --git a/lib/libc/powerpc64/gen/makecontext.c b/lib/libc/powerpc64/gen/makecontext.c
index 3d47c981e97f..34d16fc673a8 100644
--- a/lib/libc/powerpc64/gen/makecontext.c
+++ b/lib/libc/powerpc64/gen/makecontext.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdarg.h>
diff --git a/lib/libc/powerpc64/gen/setjmp.S b/lib/libc/powerpc64/gen/setjmp.S
index 5eb395e7c30d..7cf48d63ec82 100644
--- a/lib/libc/powerpc64/gen/setjmp.S
+++ b/lib/libc/powerpc64/gen/setjmp.S
@@ -26,8 +26,6 @@
/* $NetBSD: setjmp.S,v 1.3 1998/10/03 12:30:38 tsubai Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/syscall.h>
/*
diff --git a/lib/libc/powerpc64/gen/signalcontext.c b/lib/libc/powerpc64/gen/signalcontext.c
index 3821a7cf1b42..5fac663fb15b 100644
--- a/lib/libc/powerpc64/gen/signalcontext.c
+++ b/lib/libc/powerpc64/gen/signalcontext.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ucontext.h>
#include <signal.h>
diff --git a/lib/libc/powerpc64/gen/sigsetjmp.S b/lib/libc/powerpc64/gen/sigsetjmp.S
index c0648a632f1e..58fa188daaa4 100644
--- a/lib/libc/powerpc64/gen/sigsetjmp.S
+++ b/lib/libc/powerpc64/gen/sigsetjmp.S
@@ -26,8 +26,6 @@
/* $NetBSD: sigsetjmp.S,v 1.4 1998/10/03 12:30:38 tsubai Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* C library -- sigsetjmp, siglongjmp
*
diff --git a/lib/libc/powerpc64/string/bcopy.S b/lib/libc/powerpc64/string/bcopy.S
index 4dc80c264362..6f6223214e26 100644
--- a/lib/libc/powerpc64/string/bcopy.S
+++ b/lib/libc/powerpc64/string/bcopy.S
@@ -28,8 +28,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#define BLOCK_SIZE_BITS 6
#define BLOCK_SIZE (1 << BLOCK_SIZE_BITS)
#define BLOCK_SIZE_MASK (BLOCK_SIZE - 1)
diff --git a/lib/libc/powerpc64/string/bcopy_resolver.c b/lib/libc/powerpc64/string/bcopy_resolver.c
index 1991a2998a4d..a551d5d3ca5e 100644
--- a/lib/libc/powerpc64/string/bcopy_resolver.c
+++ b/lib/libc/powerpc64/string/bcopy_resolver.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/cpu.h>
#include <machine/ifunc.h>
diff --git a/lib/libc/powerpc64/string/memcpy.S b/lib/libc/powerpc64/string/memcpy.S
index 0163ea1be2cd..28f3f2bb0ab4 100644
--- a/lib/libc/powerpc64/string/memcpy.S
+++ b/lib/libc/powerpc64/string/memcpy.S
@@ -28,8 +28,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#ifndef FN_NAME
#define FN_NAME __memcpy
WEAK_REFERENCE(__memcpy, memcpy);
diff --git a/lib/libc/powerpc64/string/strcpy.c b/lib/libc/powerpc64/string/strcpy.c
index 0d01748d865a..23531264d8f4 100644
--- a/lib/libc/powerpc64/string/strcpy.c
+++ b/lib/libc/powerpc64/string/strcpy.c
@@ -27,7 +27,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define WEAK_STRCPY
#include "../../string/strcpy.c"
diff --git a/lib/libc/powerpc64/string/strcpy_arch_2_05.S b/lib/libc/powerpc64/string/strcpy_arch_2_05.S
index 7f42fd813395..36728fa0b40f 100644
--- a/lib/libc/powerpc64/string/strcpy_arch_2_05.S
+++ b/lib/libc/powerpc64/string/strcpy_arch_2_05.S
@@ -28,8 +28,6 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if 0
RCSID("$NetBSD: strcpy.S,v 1.0 2018/05/08 13:00:49 lbianc Exp $")
#endif
diff --git a/lib/libc/powerpc64/string/strcpy_resolver.c b/lib/libc/powerpc64/string/strcpy_resolver.c
index f44161b33331..513d33e96e28 100644
--- a/lib/libc/powerpc64/string/strcpy_resolver.c
+++ b/lib/libc/powerpc64/string/strcpy_resolver.c
@@ -27,8 +27,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/cpu.h>
#include <machine/ifunc.h>
diff --git a/lib/libc/powerpc64/string/strncpy.c b/lib/libc/powerpc64/string/strncpy.c
index 6d53615962b1..6879834c5818 100644
--- a/lib/libc/powerpc64/string/strncpy.c
+++ b/lib/libc/powerpc64/string/strncpy.c
@@ -27,7 +27,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define WEAK_STRNCPY
#include "../../string/strncpy.c"
diff --git a/lib/libc/powerpc64/string/strncpy_arch_2_05.S b/lib/libc/powerpc64/string/strncpy_arch_2_05.S
index 98139c35af8c..f78d1c49c62a 100644
--- a/lib/libc/powerpc64/string/strncpy_arch_2_05.S
+++ b/lib/libc/powerpc64/string/strncpy_arch_2_05.S
@@ -27,8 +27,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(__strncpy_arch_2_05)
stdu %r1,-40(%r1)
mflr %r0
diff --git a/lib/libc/powerpc64/string/strncpy_resolver.c b/lib/libc/powerpc64/string/strncpy_resolver.c
index ee4a95b6418b..b3b5511c74b5 100644
--- a/lib/libc/powerpc64/string/strncpy_resolver.c
+++ b/lib/libc/powerpc64/string/strncpy_resolver.c
@@ -27,8 +27,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/cpu.h>
#include <machine/ifunc.h>
diff --git a/lib/libc/powerpc64/sys/__vdso_gettc.c b/lib/libc/powerpc64/sys/__vdso_gettc.c
index 57cdf3722399..b9c924e0e542 100644
--- a/lib/libc/powerpc64/sys/__vdso_gettc.c
+++ b/lib/libc/powerpc64/sys/__vdso_gettc.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/elf.h>
#include <sys/time.h>
diff --git a/lib/libc/powerpc64/sys/cerror.S b/lib/libc/powerpc64/sys/cerror.S
index 93172fdb822e..2be58cf8a84b 100644
--- a/lib/libc/powerpc64/sys/cerror.S
+++ b/lib/libc/powerpc64/sys/cerror.S
@@ -26,8 +26,6 @@
/* $NetBSD: cerror.S,v 1.5 2000/01/27 14:58:48 kleink Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "SYS.h"
.globl HIDENAME(cerror)
diff --git a/lib/libc/powerpcspe/gen/_setjmp.S b/lib/libc/powerpcspe/gen/_setjmp.S
index 0dd28fa2deb4..f282e0013f97 100644
--- a/lib/libc/powerpcspe/gen/_setjmp.S
+++ b/lib/libc/powerpcspe/gen/_setjmp.S
@@ -26,8 +26,6 @@
/* $NetBSD: _setjmp.S,v 1.1 1997/03/29 20:55:53 thorpej Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* C library -- _setjmp, _longjmp
*
diff --git a/lib/libc/powerpcspe/gen/fabs.S b/lib/libc/powerpcspe/gen/fabs.S
index 4fb08d63b6f1..df9196c3273d 100644
--- a/lib/libc/powerpcspe/gen/fabs.S
+++ b/lib/libc/powerpcspe/gen/fabs.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* double fabs(double)
*/
diff --git a/lib/libc/powerpcspe/gen/flt_rounds.c b/lib/libc/powerpcspe/gen/flt_rounds.c
index 1334021fb7fa..eec1d3a05693 100644
--- a/lib/libc/powerpcspe/gen/flt_rounds.c
+++ b/lib/libc/powerpcspe/gen/flt_rounds.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/float.h>
#include <machine/spr.h>
diff --git a/lib/libc/powerpcspe/gen/fpgetmask.c b/lib/libc/powerpcspe/gen/fpgetmask.c
index d2314c652588..b46a52fae220 100644
--- a/lib/libc/powerpcspe/gen/fpgetmask.c
+++ b/lib/libc/powerpcspe/gen/fpgetmask.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/spr.h>
#include <ieeefp.h>
diff --git a/lib/libc/powerpcspe/gen/fpgetround.c b/lib/libc/powerpcspe/gen/fpgetround.c
index 7815559f7b5a..1021a1ad4cc6 100644
--- a/lib/libc/powerpcspe/gen/fpgetround.c
+++ b/lib/libc/powerpcspe/gen/fpgetround.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/spr.h>
#include <ieeefp.h>
diff --git a/lib/libc/powerpcspe/gen/fpsetmask.c b/lib/libc/powerpcspe/gen/fpsetmask.c
index 2f48802d9ca3..0563da982c2e 100644
--- a/lib/libc/powerpcspe/gen/fpsetmask.c
+++ b/lib/libc/powerpcspe/gen/fpsetmask.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/spr.h>
#include <ieeefp.h>
diff --git a/lib/libc/powerpcspe/gen/fpsetround.c b/lib/libc/powerpcspe/gen/fpsetround.c
index 2e2469cdae5e..85b55087935a 100644
--- a/lib/libc/powerpcspe/gen/fpsetround.c
+++ b/lib/libc/powerpcspe/gen/fpsetround.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/spr.h>
#include <ieeefp.h>
diff --git a/lib/libc/powerpcspe/gen/setjmp.S b/lib/libc/powerpcspe/gen/setjmp.S
index 7a93b2f883e8..1bd3edcf5239 100644
--- a/lib/libc/powerpcspe/gen/setjmp.S
+++ b/lib/libc/powerpcspe/gen/setjmp.S
@@ -26,8 +26,6 @@
/* $NetBSD: setjmp.S,v 1.3 1998/10/03 12:30:38 tsubai Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/syscall.h>
/*
diff --git a/lib/libc/powerpcspe/gen/sigsetjmp.S b/lib/libc/powerpcspe/gen/sigsetjmp.S
index 0c12cc3f582b..45c85c3fce23 100644
--- a/lib/libc/powerpcspe/gen/sigsetjmp.S
+++ b/lib/libc/powerpcspe/gen/sigsetjmp.S
@@ -26,8 +26,6 @@
/* $NetBSD: sigsetjmp.S,v 1.4 1998/10/03 12:30:38 tsubai Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* C library -- sigsetjmp, siglongjmp
*
diff --git a/lib/libc/quad/TESTS/divrem.c b/lib/libc/quad/TESTS/divrem.c
index 74011bf55b5e..1fd83e52d13b 100644
--- a/lib/libc/quad/TESTS/divrem.c
+++ b/lib/libc/quad/TESTS/divrem.c
@@ -43,8 +43,6 @@ static char copyright[] =
static char sccsid[] = "@(#)divrem.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
main()
diff --git a/lib/libc/quad/TESTS/mul.c b/lib/libc/quad/TESTS/mul.c
index 408764f89885..f347e4f1e026 100644
--- a/lib/libc/quad/TESTS/mul.c
+++ b/lib/libc/quad/TESTS/mul.c
@@ -43,8 +43,6 @@ static char copyright[] =
static char sccsid[] = "@(#)mul.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
main()
diff --git a/lib/libc/quad/adddi3.c b/lib/libc/quad/adddi3.c
index 6aaaf828ccb6..0f3a41ff4e2c 100644
--- a/lib/libc/quad/adddi3.c
+++ b/lib/libc/quad/adddi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)adddi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/anddi3.c b/lib/libc/quad/anddi3.c
index c0934571f2d3..ad9ec24c1651 100644
--- a/lib/libc/quad/anddi3.c
+++ b/lib/libc/quad/anddi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)anddi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/ashldi3.c b/lib/libc/quad/ashldi3.c
index cec1ce7ca136..b18267c723c1 100644
--- a/lib/libc/quad/ashldi3.c
+++ b/lib/libc/quad/ashldi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)ashldi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/ashrdi3.c b/lib/libc/quad/ashrdi3.c
index db471e413cd9..a5157c0dc958 100644
--- a/lib/libc/quad/ashrdi3.c
+++ b/lib/libc/quad/ashrdi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)ashrdi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/cmpdi2.c b/lib/libc/quad/cmpdi2.c
index 08916702e1eb..f8aae7f018c6 100644
--- a/lib/libc/quad/cmpdi2.c
+++ b/lib/libc/quad/cmpdi2.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)cmpdi2.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/divdi3.c b/lib/libc/quad/divdi3.c
index c5b4a376477e..c913faf4c31c 100644
--- a/lib/libc/quad/divdi3.c
+++ b/lib/libc/quad/divdi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)divdi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/fixdfdi.c b/lib/libc/quad/fixdfdi.c
index ddb3b23834c1..5237a5decfaf 100644
--- a/lib/libc/quad/fixdfdi.c
+++ b/lib/libc/quad/fixdfdi.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)fixdfdi.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/fixsfdi.c b/lib/libc/quad/fixsfdi.c
index 48cd5a1a6003..2cbb41767890 100644
--- a/lib/libc/quad/fixsfdi.c
+++ b/lib/libc/quad/fixsfdi.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)fixsfdi.c 5.1 (Berkeley) 7/7/92";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/fixunsdfdi.c b/lib/libc/quad/fixunsdfdi.c
index 5d63d6cb6cbd..8fb23d60d363 100644
--- a/lib/libc/quad/fixunsdfdi.c
+++ b/lib/libc/quad/fixunsdfdi.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)fixunsdfdi.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
#define ONE_FOURTH (1L << (LONG_BITS - 2))
diff --git a/lib/libc/quad/fixunssfdi.c b/lib/libc/quad/fixunssfdi.c
index de560dd84cb3..a1f03f075d9f 100644
--- a/lib/libc/quad/fixunssfdi.c
+++ b/lib/libc/quad/fixunssfdi.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)fixunssfdi.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
#define ONE_FOURTH (1L << (LONG_BITS - 2))
diff --git a/lib/libc/quad/floatdidf.c b/lib/libc/quad/floatdidf.c
index 6c71ee1889d7..2c4f79da4e45 100644
--- a/lib/libc/quad/floatdidf.c
+++ b/lib/libc/quad/floatdidf.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)floatdidf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/floatdisf.c b/lib/libc/quad/floatdisf.c
index 411e106ec4f0..9b0251eaff2e 100644
--- a/lib/libc/quad/floatdisf.c
+++ b/lib/libc/quad/floatdisf.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)floatdisf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/floatunsdidf.c b/lib/libc/quad/floatunsdidf.c
index b391b3a759e5..143b0f7da5a4 100644
--- a/lib/libc/quad/floatunsdidf.c
+++ b/lib/libc/quad/floatunsdidf.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)floatunsdidf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/iordi3.c b/lib/libc/quad/iordi3.c
index 7d3232645326..295c075ed18c 100644
--- a/lib/libc/quad/iordi3.c
+++ b/lib/libc/quad/iordi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)iordi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/lshldi3.c b/lib/libc/quad/lshldi3.c
index d8c7593d49ec..1f86398cb54c 100644
--- a/lib/libc/quad/lshldi3.c
+++ b/lib/libc/quad/lshldi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)lshldi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/lshrdi3.c b/lib/libc/quad/lshrdi3.c
index 05a2aa0540b0..1af382b16da6 100644
--- a/lib/libc/quad/lshrdi3.c
+++ b/lib/libc/quad/lshrdi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)lshrdi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/moddi3.c b/lib/libc/quad/moddi3.c
index fc13b4da4067..dacd7f849118 100644
--- a/lib/libc/quad/moddi3.c
+++ b/lib/libc/quad/moddi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)moddi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/muldi3.c b/lib/libc/quad/muldi3.c
index bb11ef798fb0..194b7d9dd75c 100644
--- a/lib/libc/quad/muldi3.c
+++ b/lib/libc/quad/muldi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)muldi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/negdi2.c b/lib/libc/quad/negdi2.c
index 476c32afb55e..6f05db6e966a 100644
--- a/lib/libc/quad/negdi2.c
+++ b/lib/libc/quad/negdi2.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)negdi2.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/notdi2.c b/lib/libc/quad/notdi2.c
index 18489f91b91f..072eed6e4234 100644
--- a/lib/libc/quad/notdi2.c
+++ b/lib/libc/quad/notdi2.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)notdi2.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/qdivrem.c b/lib/libc/quad/qdivrem.c
index 7dd7632d39ed..d89d02c2bcd9 100644
--- a/lib/libc/quad/qdivrem.c
+++ b/lib/libc/quad/qdivrem.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)qdivrem.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Multiprecision divide. This algorithm is from Knuth vol. 2 (2nd ed),
* section 4.3.1, pp. 257--259.
diff --git a/lib/libc/quad/subdi3.c b/lib/libc/quad/subdi3.c
index 3622c323568c..149c0d07259a 100644
--- a/lib/libc/quad/subdi3.c
+++ b/lib/libc/quad/subdi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)subdi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/ucmpdi2.c b/lib/libc/quad/ucmpdi2.c
index 458f8ed00814..796ec7b089db 100644
--- a/lib/libc/quad/ucmpdi2.c
+++ b/lib/libc/quad/ucmpdi2.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)ucmpdi2.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/udivdi3.c b/lib/libc/quad/udivdi3.c
index 0e6f27edeb61..b36e1ca6558f 100644
--- a/lib/libc/quad/udivdi3.c
+++ b/lib/libc/quad/udivdi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)udivdi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/umoddi3.c b/lib/libc/quad/umoddi3.c
index 7f45134213ae..719b6fa49243 100644
--- a/lib/libc/quad/umoddi3.c
+++ b/lib/libc/quad/umoddi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)umoddi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/quad/xordi3.c b/lib/libc/quad/xordi3.c
index e956ade4607f..ce958f799137 100644
--- a/lib/libc/quad/xordi3.c
+++ b/lib/libc/quad/xordi3.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)xordi3.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "quad.h"
/*
diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c
index bb40018c07e1..1efaf9a62f67 100644
--- a/lib/libc/regex/engine.c
+++ b/lib/libc/regex/engine.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdbool.h>
/*
diff --git a/lib/libc/regex/grot/debug.c b/lib/libc/regex/grot/debug.c
index af8e4f5a1d72..24e34138007e 100644
--- a/lib/libc/regex/grot/debug.c
+++ b/lib/libc/regex/grot/debug.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <string.h>
#include <ctype.h>
diff --git a/lib/libc/regex/grot/main.c b/lib/libc/regex/grot/main.c
index eee541bac171..248fe0ca438a 100644
--- a/lib/libc/regex/grot/main.c
+++ b/lib/libc/regex/grot/main.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
#include <regex.h>
diff --git a/lib/libc/regex/grot/split.c b/lib/libc/regex/grot/split.c
index c5d5264ab711..89afef0f7cee 100644
--- a/lib/libc/regex/grot/split.c
+++ b/lib/libc/regex/grot/split.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <string.h>
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index 6b7ddf5d0b88..791755ceb14d 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -44,8 +44,6 @@
static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
index 0e555784f0dc..7e9631796a9f 100644
--- a/lib/libc/regex/regerror.c
+++ b/lib/libc/regex/regerror.c
@@ -39,8 +39,6 @@
static char sccsid[] = "@(#)regerror.c 8.4 (Berkeley) 3/20/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/libc/regex/regexec.c b/lib/libc/regex/regexec.c
index d7aa46f45b2b..7c50bcad444a 100644
--- a/lib/libc/regex/regexec.c
+++ b/lib/libc/regex/regexec.c
@@ -39,8 +39,6 @@
static char sccsid[] = "@(#)regexec.c 8.3 (Berkeley) 3/20/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* the outer shell of regexec()
*
diff --git a/lib/libc/regex/regfree.c b/lib/libc/regex/regfree.c
index 859c2a4b37b2..dc73c4b8ef21 100644
--- a/lib/libc/regex/regfree.c
+++ b/lib/libc/regex/regfree.c
@@ -39,8 +39,6 @@
static char sccsid[] = "@(#)regfree.c 8.3 (Berkeley) 3/20/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/resolv/herror.c b/lib/libc/resolv/herror.c
index aa6d61496621..f222497db0ee 100644
--- a/lib/libc/resolv/herror.c
+++ b/lib/libc/resolv/herror.c
@@ -51,8 +51,6 @@ static const char sccsid[] = "@(#)herror.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "$Id: herror.c,v 1.4 2005/04/27 04:56:41 sra Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include "namespace.h"
diff --git a/lib/libc/resolv/mtctxres.c b/lib/libc/resolv/mtctxres.c
index c2aea381761d..e754ab0c5209 100644
--- a/lib/libc/resolv/mtctxres.c
+++ b/lib/libc/resolv/mtctxres.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <port_before.h>
#ifdef DO_PTHREADS
#include <pthread.h>
diff --git a/lib/libc/resolv/res_comp.c b/lib/libc/resolv/res_comp.c
index 1048ef453fe0..0709b7f2eaab 100644
--- a/lib/libc/resolv/res_comp.c
+++ b/lib/libc/resolv/res_comp.c
@@ -71,8 +71,6 @@ static const char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "$Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
#include <netinet/in.h>
diff --git a/lib/libc/resolv/res_data.c b/lib/libc/resolv/res_data.c
index a04749b9a3f5..71b4b9279b4c 100644
--- a/lib/libc/resolv/res_data.c
+++ b/lib/libc/resolv/res_data.c
@@ -21,8 +21,6 @@
static const char rcsid[] = "$Id: res_data.c,v 1.7 2008/12/11 09:59:00 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
diff --git a/lib/libc/resolv/res_debug.c b/lib/libc/resolv/res_debug.c
index 218056d51f81..7dd902af1b69 100644
--- a/lib/libc/resolv/res_debug.c
+++ b/lib/libc/resolv/res_debug.c
@@ -96,8 +96,6 @@ static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "$Id: res_debug.c,v 1.19 2009/02/26 11:20:20 tbox Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
diff --git a/lib/libc/resolv/res_findzonecut.c b/lib/libc/resolv/res_findzonecut.c
index d08f6dbe7dbd..f1caaa76505f 100644
--- a/lib/libc/resolv/res_findzonecut.c
+++ b/lib/libc/resolv/res_findzonecut.c
@@ -22,8 +22,6 @@ static const char rcsid[] = "$Id: res_findzonecut.c,v 1.10 2005/10/11 00:10:16 m
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Import. */
#include "port_before.h"
diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c
index 40d3373e813d..aede91e889c1 100644
--- a/lib/libc/resolv/res_init.c
+++ b/lib/libc/resolv/res_init.c
@@ -71,8 +71,6 @@ static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93";
static const char rcsid[] = "$Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include "namespace.h"
diff --git a/lib/libc/resolv/res_mkquery.c b/lib/libc/resolv/res_mkquery.c
index 6cf6e0864390..40874e8d904b 100644
--- a/lib/libc/resolv/res_mkquery.c
+++ b/lib/libc/resolv/res_mkquery.c
@@ -71,8 +71,6 @@ static const char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "$Id: res_mkquery.c,v 1.10 2008/12/11 09:59:00 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
#include <netinet/in.h>
diff --git a/lib/libc/resolv/res_mkupdate.c b/lib/libc/resolv/res_mkupdate.c
index 80e8ab2b0e0f..41447f60def6 100644
--- a/lib/libc/resolv/res_mkupdate.c
+++ b/lib/libc/resolv/res_mkupdate.c
@@ -27,8 +27,6 @@
static const char rcsid[] = "$Id: res_mkupdate.c,v 1.10 2008/12/11 09:59:00 marka Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
diff --git a/lib/libc/resolv/res_query.c b/lib/libc/resolv/res_query.c
index 10ac46ced8af..8a134dd86395 100644
--- a/lib/libc/resolv/res_query.c
+++ b/lib/libc/resolv/res_query.c
@@ -71,8 +71,6 @@ static const char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "$Id: res_query.c,v 1.11 2008/11/14 02:36:51 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
#include <netinet/in.h>
diff --git a/lib/libc/resolv/res_send.c b/lib/libc/resolv/res_send.c
index 366ec394a59e..4c228a4dbd5e 100644
--- a/lib/libc/resolv/res_send.c
+++ b/lib/libc/resolv/res_send.c
@@ -71,8 +71,6 @@ static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "$Id: res_send.c,v 1.22 2009/01/22 23:49:23 tbox Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*! \file
* \brief
* Send query to name server and wait for reply.
diff --git a/lib/libc/resolv/res_update.c b/lib/libc/resolv/res_update.c
index 388f643996dc..05e9969008b0 100644
--- a/lib/libc/resolv/res_update.c
+++ b/lib/libc/resolv/res_update.c
@@ -28,8 +28,6 @@ static const char rcsid[] = "$Id: res_update.c,v 1.13 2005/04/27 04:56:43 sra Ex
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "port_before.h"
#include <sys/param.h>
diff --git a/lib/libc/riscv/gen/_ctx_start.S b/lib/libc/riscv/gen/_ctx_start.S
index cda5397ac22d..69d19fc9403b 100644
--- a/lib/libc/riscv/gen/_ctx_start.S
+++ b/lib/libc/riscv/gen/_ctx_start.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(_ctx_start)
jalr s0 /* Call func from makecontext */
mv a0, s1 /* Load ucp saved in makecontext */
diff --git a/lib/libc/riscv/gen/_setjmp.S b/lib/libc/riscv/gen/_setjmp.S
index 94b4e90b6f42..4554f736f72a 100644
--- a/lib/libc/riscv/gen/_setjmp.S
+++ b/lib/libc/riscv/gen/_setjmp.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/setjmp.h>
ENTRY(_setjmp)
diff --git a/lib/libc/riscv/gen/fabs.S b/lib/libc/riscv/gen/fabs.S
index 036d50eddf90..21304036fc0f 100644
--- a/lib/libc/riscv/gen/fabs.S
+++ b/lib/libc/riscv/gen/fabs.S
@@ -37,8 +37,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(fabs)
#ifdef __riscv_float_abi_double
fabs.d fa0, fa0
diff --git a/lib/libc/riscv/gen/flt_rounds.c b/lib/libc/riscv/gen/flt_rounds.c
index 5dec6e45f400..46e2ab9ca63c 100644
--- a/lib/libc/riscv/gen/flt_rounds.c
+++ b/lib/libc/riscv/gen/flt_rounds.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <fenv.h>
diff --git a/lib/libc/riscv/gen/fpgetmask.c b/lib/libc/riscv/gen/fpgetmask.c
index f461cc2ba10e..781709b8bf22 100644
--- a/lib/libc/riscv/gen/fpgetmask.c
+++ b/lib/libc/riscv/gen/fpgetmask.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/riscv/gen/fpsetmask.c b/lib/libc/riscv/gen/fpsetmask.c
index 6eeac9de8bef..bcb42845065c 100644
--- a/lib/libc/riscv/gen/fpsetmask.c
+++ b/lib/libc/riscv/gen/fpsetmask.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/riscv/gen/infinity.c b/lib/libc/riscv/gen/infinity.c
index 115c4702d895..1639ac09d410 100644
--- a/lib/libc/riscv/gen/infinity.c
+++ b/lib/libc/riscv/gen/infinity.c
@@ -3,8 +3,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
/* bytes for +Infinity on riscv */
diff --git a/lib/libc/riscv/gen/makecontext.c b/lib/libc/riscv/gen/makecontext.c
index 3633a5dd66e1..aea855544f4d 100644
--- a/lib/libc/riscv/gen/makecontext.c
+++ b/lib/libc/riscv/gen/makecontext.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <machine/riscvreg.h>
diff --git a/lib/libc/riscv/gen/setjmp.S b/lib/libc/riscv/gen/setjmp.S
index 1d5b4d5fc0ca..efac05ecc611 100644
--- a/lib/libc/riscv/gen/setjmp.S
+++ b/lib/libc/riscv/gen/setjmp.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/setjmp.h>
ENTRY(setjmp)
diff --git a/lib/libc/riscv/gen/sigsetjmp.S b/lib/libc/riscv/gen/sigsetjmp.S
index 6eca3c1cdd23..4f32d9fb4daf 100644
--- a/lib/libc/riscv/gen/sigsetjmp.S
+++ b/lib/libc/riscv/gen/sigsetjmp.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include <machine/setjmp.h>
ENTRY(sigsetjmp)
diff --git a/lib/libc/riscv/sys/__vdso_gettc.c b/lib/libc/riscv/sys/__vdso_gettc.c
index 20e69a791bb5..919351511983 100644
--- a/lib/libc/riscv/sys/__vdso_gettc.c
+++ b/lib/libc/riscv/sys/__vdso_gettc.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/elf.h>
#include <sys/time.h>
diff --git a/lib/libc/riscv/sys/cerror.S b/lib/libc/riscv/sys/cerror.S
index 117080e0b3d9..34129b1ac8be 100644
--- a/lib/libc/riscv/sys/cerror.S
+++ b/lib/libc/riscv/sys/cerror.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(cerror)
addi sp, sp, -16
sd a0, 0(sp)
diff --git a/lib/libc/riscv/sys/syscall.S b/lib/libc/riscv/sys/syscall.S
index 8a007f8c7f17..54dbff768f93 100644
--- a/lib/libc/riscv/sys/syscall.S
+++ b/lib/libc/riscv/sys/syscall.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "SYS.h"
RSYSCALL(syscall)
diff --git a/lib/libc/riscv/sys/vfork.S b/lib/libc/riscv/sys/vfork.S
index e7a0b82dc21f..62c890badbb8 100644
--- a/lib/libc/riscv/sys/vfork.S
+++ b/lib/libc/riscv/sys/vfork.S
@@ -33,7 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
#include "SYS.h"
ENTRY(__sys_vfork)
diff --git a/lib/libc/rpc/auth_des.c b/lib/libc/rpc/auth_des.c
index f2ad0349a6a8..1ceabaf8d672 100644
--- a/lib/libc/rpc/auth_des.c
+++ b/lib/libc/rpc/auth_des.c
@@ -59,8 +59,6 @@
static char sccsid[] = "@(#)auth_des.c 2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define USEC_PER_SEC 1000000
#define RTIME_TIMEOUT 5 /* seconds to wait for sync */
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
index 4422802c4c5c..5a702976cf14 100644
--- a/lib/libc/rpc/auth_none.c
+++ b/lib/libc/rpc/auth_none.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)auth_none.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* auth_none.c
* Creates a client authentication handle for passing "null"
diff --git a/lib/libc/rpc/auth_time.c b/lib/libc/rpc/auth_time.c
index 4b714468b92e..8709dea3cfe6 100644
--- a/lib/libc/rpc/auth_time.c
+++ b/lib/libc/rpc/auth_time.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <syslog.h>
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index 08df14b54491..36b6a5b49e3b 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)auth_unix.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* auth_unix.c, Implements UNIX style authentication parameters.
*
diff --git a/lib/libc/rpc/authdes_prot.c b/lib/libc/rpc/authdes_prot.c
index 663261d631a9..94168a0dbcd0 100644
--- a/lib/libc/rpc/authdes_prot.c
+++ b/lib/libc/rpc/authdes_prot.c
@@ -2,8 +2,6 @@
static char sccsid[] = "@(#)authdes_prot.c 2.1 88/07/29 4.0 RPCSRC; from 1.6 88/02/08 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*-
* SPDX-License-Identifier: BSD-3-Clause
*
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
index bb590c350429..0f2fc8a22f45 100644
--- a/lib/libc/rpc/authunix_prot.c
+++ b/lib/libc/rpc/authunix_prot.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)authunix_prot.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* authunix_prot.c
* XDR for UNIX style authentication parameters for RPC
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
index 44d3b0c1eacd..53abc2b2b64c 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -36,8 +36,6 @@ static char *sccsid = "from: @(#)bindresvport.c 2.2 88/07/29 4.0 RPCSRC";
#endif
/* from: $OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Copyright (c) 1987 by Sun Microsystems, Inc.
*
diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c
index 649cab05a474..6d39bca2f83f 100644
--- a/lib/libc/rpc/clnt_bcast.c
+++ b/lib/libc/rpc/clnt_bcast.c
@@ -38,9 +38,6 @@
static char sccsid[] = "@(#)clnt_bcast.c 1.15 89/04/21 Copyr 1988 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-
/*
* clnt_bcast.c
* Client interface to broadcast service.
diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c
index 26bf34633623..d6b9698bf4db 100644
--- a/lib/libc/rpc/clnt_dg.c
+++ b/lib/libc/rpc/clnt_dg.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Implements a connectionless client side RPC.
*/
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index d3cdf1f08fb8..0233de9a4b59 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -37,8 +37,6 @@ static char *sccsid2 = "from: @(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";
static char *sccsid = "from: @(#)clnt_generic.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Copyright (c) 1986-1996,1998 by Sun Microsystems, Inc.
* All rights reserved.
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
index b9243ff4d558..878439a11109 100644
--- a/lib/libc/rpc/clnt_perror.c
+++ b/lib/libc/rpc/clnt_perror.c
@@ -36,8 +36,6 @@ static char *sccsid2 = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)clnt_perror.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* clnt_perror.c
*
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index f6a488be7e8d..d09494c9206f 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)clnt_raw.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* clnt_raw.c
*
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index de9ec6543d15..657d0ac399d5 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -38,8 +38,6 @@ static char *sccsid2 = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Mic
static char *sccsid = "from: @(#)clnt_simple.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* clnt_simple.c
* Simplified front end to client rpc.
diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
index ebd4e303916f..d3c96945d25a 100644
--- a/lib/libc/rpc/clnt_vc.c
+++ b/lib/libc/rpc/clnt_vc.c
@@ -36,8 +36,6 @@ static char *sccsid = "@(#)clnt_tcp.c 2.2 88/08/01 4.0 RPCSRC";
static char sccsid3[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* clnt_tcp.c, Implements a TCP/IP based, client side RPC.
*
diff --git a/lib/libc/rpc/crypt_client.c b/lib/libc/rpc/crypt_client.c
index c2ed109e10bb..2fe0facd6505 100644
--- a/lib/libc/rpc/crypt_client.c
+++ b/lib/libc/rpc/crypt_client.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <err.h>
#include <sys/types.h>
diff --git a/lib/libc/rpc/des_crypt.c b/lib/libc/rpc/des_crypt.c
index 589ff7b3b88b..3202aeef3604 100644
--- a/lib/libc/rpc/des_crypt.c
+++ b/lib/libc/rpc/des_crypt.c
@@ -40,8 +40,6 @@
static char sccsid[] = "@(#)des_crypt.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
int (*__des_crypt_LOCAL)(char *, unsigned, struct desparams *) = 0;
extern int _des_crypt_call(char *, int, struct desparams *);
diff --git a/lib/libc/rpc/des_soft.c b/lib/libc/rpc/des_soft.c
index 4992c1650b46..c97a4686b70d 100644
--- a/lib/libc/rpc/des_soft.c
+++ b/lib/libc/rpc/des_soft.c
@@ -32,8 +32,6 @@
static char sccsid[] = "@(#)des_soft.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Table giving odd parity in the low bit for ASCII characters
*/
diff --git a/lib/libc/rpc/getnetconfig.c b/lib/libc/rpc/getnetconfig.c
index abd5eadf3917..100aef435512 100644
--- a/lib/libc/rpc/getnetconfig.c
+++ b/lib/libc/rpc/getnetconfig.c
@@ -34,8 +34,6 @@
static char sccsid[] = "@(#)getnetconfig.c 1.12 91/12/19 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Copyright (c) 1989 by Sun Microsystems, Inc.
*/
diff --git a/lib/libc/rpc/getnetpath.c b/lib/libc/rpc/getnetpath.c
index 37e30ad019aa..4ae32a8783e2 100644
--- a/lib/libc/rpc/getnetpath.c
+++ b/lib/libc/rpc/getnetpath.c
@@ -34,8 +34,6 @@
static char sccsid[] = "@(#)getnetpath.c 1.11 91/12/19 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Copyright (c) 1989 by Sun Microsystems, Inc.
*/
diff --git a/lib/libc/rpc/getpublickey.c b/lib/libc/rpc/getpublickey.c
index a0604836d973..76f8258d45c1 100644
--- a/lib/libc/rpc/getpublickey.c
+++ b/lib/libc/rpc/getpublickey.c
@@ -32,8 +32,6 @@
static char sccsid[] = "@(#)publickey.c 1.10 91/03/11 Copyr 1986 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* publickey.c
* Copyright (C) 1986, Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index e4770e4e88c5..c980aaee5d83 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -34,8 +34,6 @@
static char *sccsid = "@(#)getrpcent.c 1.14 91/03/11 Copyr 1984 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Copyright (c) 1984 by Sun Microsystems, Inc.
*/
diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c
index 4abc9a0c16af..a6143ef0a8ba 100644
--- a/lib/libc/rpc/getrpcport.c
+++ b/lib/libc/rpc/getrpcport.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)getrpcport.c 1.3 87/08/11 SMI";
static char *sccsid = "@(#)getrpcport.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Copyright (c) 1985 by Sun Microsystems, Inc.
*/
diff --git a/lib/libc/rpc/key_call.c b/lib/libc/rpc/key_call.c
index 66bd3b4eaaf3..4af7ca9609ce 100644
--- a/lib/libc/rpc/key_call.c
+++ b/lib/libc/rpc/key_call.c
@@ -33,8 +33,6 @@
#ident "@(#)key_call.c 1.25 94/04/24 SMI"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* key_call.c, Interface to keyserver
*
diff --git a/lib/libc/rpc/key_prot_xdr.c b/lib/libc/rpc/key_prot_xdr.c
index 5a69bb437e3e..b98d1c432e3f 100644
--- a/lib/libc/rpc/key_prot_xdr.c
+++ b/lib/libc/rpc/key_prot_xdr.c
@@ -39,8 +39,6 @@
/* #pragma ident "@(#)key_prot.x 1.7 94/04/29 SMI" */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Compiled from key_prot.x using rpcgen.
* DO NOT EDIT THIS FILE!
diff --git a/lib/libc/rpc/mt_misc.c b/lib/libc/rpc/mt_misc.c
index a1b8057bef80..93c242953d1b 100644
--- a/lib/libc/rpc/mt_misc.c
+++ b/lib/libc/rpc/mt_misc.c
@@ -2,8 +2,6 @@
/* #pragma ident "@(#)mt_misc.c 1.24 93/04/29 SMI" */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include "reentrant.h"
#include <rpc/rpc.h>
diff --git a/lib/libc/rpc/netname.c b/lib/libc/rpc/netname.c
index a9ccf1d2ef99..bfb925f25335 100644
--- a/lib/libc/rpc/netname.c
+++ b/lib/libc/rpc/netname.c
@@ -32,8 +32,6 @@
static char sccsid[] = "@(#)netname.c 1.8 91/03/11 Copyr 1986 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* netname utility routines
* convert from unix names to network names and vice-versa
diff --git a/lib/libc/rpc/netnamer.c b/lib/libc/rpc/netnamer.c
index 8062c446dffe..94b386bcdf63 100644
--- a/lib/libc/rpc/netnamer.c
+++ b/lib/libc/rpc/netnamer.c
@@ -32,8 +32,6 @@
static char sccsid[] = "@(#)netnamer.c 1.13 91/03/11 Copyr 1986 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* netname utility routines convert from unix names to network names and
* vice-versa This module is operating system dependent! What we define here
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
index f91d33abae23..4e33ed21bd2d 100644
--- a/lib/libc/rpc/pmap_clnt.c
+++ b/lib/libc/rpc/pmap_clnt.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)pmap_clnt.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* pmap_clnt.c
* Client interface to pmap rpc service.
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
index 598de6baf8c2..3ecd51044797 100644
--- a/lib/libc/rpc/pmap_getmaps.c
+++ b/lib/libc/rpc/pmap_getmaps.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)pmap_getmaps.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* pmap_getmap.c
* Client interface to pmap rpc service.
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
index 03feff190813..9610f7625001 100644
--- a/lib/libc/rpc/pmap_getport.c
+++ b/lib/libc/rpc/pmap_getport.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Mic
static char *sccsid = "from: @(#)pmap_getport.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* pmap_getport.c
* Client interface to pmap rpc service.
diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c
index cfb69d795bea..596b3699ba86 100644
--- a/lib/libc/rpc/pmap_prot.c
+++ b/lib/libc/rpc/pmap_prot.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)pmap_prot.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* pmap_prot.c
* Protocol for the local binder service, or pmap.
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
index 20d92250ed9d..20614c44987d 100644
--- a/lib/libc/rpc/pmap_prot2.c
+++ b/lib/libc/rpc/pmap_prot2.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)pmap_prot2.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* pmap_prot2.c
* Protocol for the local binder service, or pmap.
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
index 95efae582e57..ae5e2483c351 100644
--- a/lib/libc/rpc/pmap_rmt.c
+++ b/lib/libc/rpc/pmap_rmt.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)pmap_rmt.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* pmap_rmt.c
* Client interface to pmap rpc service.
diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c
index 05294965c091..d4ad098e7cea 100644
--- a/lib/libc/rpc/rpc_callmsg.c
+++ b/lib/libc/rpc/rpc_callmsg.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)rpc_callmsg.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_callmsg.c
*
diff --git a/lib/libc/rpc/rpc_commondata.c b/lib/libc/rpc/rpc_commondata.c
index 4506f3068e95..7d7a537a396d 100644
--- a/lib/libc/rpc/rpc_commondata.c
+++ b/lib/libc/rpc/rpc_commondata.c
@@ -34,8 +34,6 @@
static char *sccsid = "@(#)rpc_commondata.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <rpc/rpc.h>
#include "un-namespace.h"
diff --git a/lib/libc/rpc/rpc_dtablesize.c b/lib/libc/rpc/rpc_dtablesize.c
index 59036dd23abf..e476914cefcd 100644
--- a/lib/libc/rpc/rpc_dtablesize.c
+++ b/lib/libc/rpc/rpc_dtablesize.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
static char *sccsid = "@(#)rpc_dtablesize.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <unistd.h>
#include "un-namespace.h"
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c
index 6fbeaf77a7e7..967fb6e0932c 100644
--- a/lib/libc/rpc/rpc_generic.c
+++ b/lib/libc/rpc/rpc_generic.c
@@ -35,8 +35,6 @@
/* #pragma ident "@(#)rpc_generic.c 1.17 94/04/24 SMI" */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_generic.c, Miscl routines for RPC.
*
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
index a865d43fc185..6cd854efa943 100644
--- a/lib/libc/rpc/rpc_prot.c
+++ b/lib/libc/rpc/rpc_prot.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)rpc_prot.c 2.3 88/08/07 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_prot.c
*
diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c
index ae23442e9a16..1350da14d42b 100644
--- a/lib/libc/rpc/rpc_soc.c
+++ b/lib/libc/rpc/rpc_soc.c
@@ -43,8 +43,6 @@
static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef PORTMAP
/*
* rpc_soc.c
diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
index b44fd1c5e77b..10e7b0cce046 100644
--- a/lib/libc/rpc/rpcb_clnt.c
+++ b/lib/libc/rpc/rpcb_clnt.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpcb_clnt.c
* interface to rpcbind rpc service.
diff --git a/lib/libc/rpc/rpcb_prot.c b/lib/libc/rpc/rpcb_prot.c
index 6cb7204f1a66..088d2493bd80 100644
--- a/lib/libc/rpc/rpcb_prot.c
+++ b/lib/libc/rpc/rpcb_prot.c
@@ -39,8 +39,6 @@
static char sccsid[] = "@(#)rpcb_prot.c 1.9 89/04/21 Copyr 1984 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpcb_prot.c
* XDR routines for the rpcbinder version 3.
diff --git a/lib/libc/rpc/rpcb_st_xdr.c b/lib/libc/rpc/rpcb_st_xdr.c
index 5b0462715aec..5791681b812c 100644
--- a/lib/libc/rpc/rpcb_st_xdr.c
+++ b/lib/libc/rpc/rpcb_st_xdr.c
@@ -40,8 +40,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <rpc/rpc.h>
#include <rpc/rpc_com.h>
diff --git a/lib/libc/rpc/rpcdname.c b/lib/libc/rpc/rpcdname.c
index 3e7c4a7c2f1a..970588d01430 100644
--- a/lib/libc/rpc/rpcdname.c
+++ b/lib/libc/rpc/rpcdname.c
@@ -32,8 +32,6 @@
static char sccsid[] = "@(#)rpcdname.c 1.7 91/03/11 Copyr 1989 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpcdname.c
* Gets the default domain name
diff --git a/lib/libc/rpc/rtime.c b/lib/libc/rpc/rtime.c
index 4adca5c5f13d..673751c8a03b 100644
--- a/lib/libc/rpc/rtime.c
+++ b/lib/libc/rpc/rtime.c
@@ -59,8 +59,6 @@
static char sccsid[] = "@(#)rtime.c 2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
extern int _rpc_dtablesize( void );
#define NYEARS (unsigned long)(1970 - 1900)
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index 801b32081a26..4fb69dda9c7a 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)svc.c 2.4 88/08/11 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* svc.c, Server-side remote procedure call interface.
*
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
index 48560a3bc872..1bfffcc4786f 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* svc_auth.c, Server-side rpc authenticator interface.
*
diff --git a/lib/libc/rpc/svc_auth_des.c b/lib/libc/rpc/svc_auth_des.c
index 8f742c39718a..a2dd0c92e541 100644
--- a/lib/libc/rpc/svc_auth_des.c
+++ b/lib/libc/rpc/svc_auth_des.c
@@ -69,8 +69,6 @@
static char sccsid[] = "@(#)svcauth_des.c 2.3 89/07/11 4.0 RPCSRC; from 1.15 88/02/08 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
extern int key_decryptsession_pk(const char *, netobj *, des_block *);
#define debug(msg) printf("svcauth_des: %s\n", msg)
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
index de146b821600..b5f783240ad4 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -33,8 +33,6 @@ static char *sccsid2 = "@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)svc_auth_unix.c 2.3 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* svc_auth_unix.c
* Handles UNIX flavor authentication parameters on the service side of rpc.
diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c
index c7e0726270b7..544b80a65d95 100644
--- a/lib/libc/rpc/svc_dg.c
+++ b/lib/libc/rpc/svc_dg.c
@@ -38,8 +38,6 @@
#ident "@(#)svc_dg.c 1.17 94/04/24 SMI"
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* svc_dg.c, Server side for connectionless RPC.
*
diff --git a/lib/libc/rpc/svc_generic.c b/lib/libc/rpc/svc_generic.c
index 37ad3513c716..b0913b42d045 100644
--- a/lib/libc/rpc/svc_generic.c
+++ b/lib/libc/rpc/svc_generic.c
@@ -39,8 +39,6 @@
static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* svc_generic.c, Server side for RPC.
*
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index 05da6231af37..d734e2c45894 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -39,8 +39,6 @@
static char sccsid[] = "@(#)svc_raw.c 1.25 89/01/31 Copyr 1984 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* svc_raw.c, This a toy for simple testing and timing.
* Interface to create an rpc client and server in the same UNIX process.
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index a4723c42144f..104be0b5078d 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "from: @(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";
static char *sccsid = "from: @(#)svc_run.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This is the rpc server side idle loop
* Wait for input, call server program.
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
index fcf4199e611e..8a99fce0d7d5 100644
--- a/lib/libc/rpc/svc_simple.c
+++ b/lib/libc/rpc/svc_simple.c
@@ -35,8 +35,6 @@
/* #pragma ident "@(#)svc_simple.c 1.18 94/04/24 SMI" */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* svc_simple.c
* Simplified front end to rpc.
diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
index a045903c8285..1f377b41e41b 100644
--- a/lib/libc/rpc/svc_vc.c
+++ b/lib/libc/rpc/svc_vc.c
@@ -35,8 +35,6 @@ static char *sccsid2 = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)svc_tcp.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* svc_vc.c, Server side for Connection Oriented based RPC.
*
diff --git a/lib/libc/secure/stack_protector.c b/lib/libc/secure/stack_protector.c
index 909debecf26e..15c9e7fcc029 100644
--- a/lib/libc/secure/stack_protector.c
+++ b/lib/libc/secure/stack_protector.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <errno.h>
diff --git a/lib/libc/secure/stack_protector_compat.c b/lib/libc/secure/stack_protector_compat.c
index cacb863e75e6..1ca459222abe 100644
--- a/lib/libc/secure/stack_protector_compat.c
+++ b/lib/libc/secure/stack_protector_compat.c
@@ -4,8 +4,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
void __stack_chk_fail(void);
#ifdef PIC
diff --git a/lib/libc/softfloat/bits32/softfloat.c b/lib/libc/softfloat/bits32/softfloat.c
index ad7c016bf043..2968786133cd 100644
--- a/lib/libc/softfloat/bits32/softfloat.c
+++ b/lib/libc/softfloat/bits32/softfloat.c
@@ -52,8 +52,6 @@ this code that are retained.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef SOFTFLOAT_FOR_GCC
#include "softfloat-for-gcc.h"
#endif
diff --git a/lib/libc/softfloat/bits64/softfloat.c b/lib/libc/softfloat/bits64/softfloat.c
index 79993fb207f5..6295a787cb6b 100644
--- a/lib/libc/softfloat/bits64/softfloat.c
+++ b/lib/libc/softfloat/bits64/softfloat.c
@@ -45,8 +45,6 @@ this code that are retained.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef SOFTFLOAT_FOR_GCC
#include "softfloat-for-gcc.h"
#endif
diff --git a/lib/libc/softfloat/eqdf2.c b/lib/libc/softfloat/eqdf2.c
index 68bb55c30e2c..dc4b2d24f285 100644
--- a/lib/libc/softfloat/eqdf2.c
+++ b/lib/libc/softfloat/eqdf2.c
@@ -5,8 +5,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "softfloat-for-gcc.h"
#include "milieu.h"
#include "softfloat.h"
diff --git a/lib/libc/softfloat/eqsf2.c b/lib/libc/softfloat/eqsf2.c
index d45b806cc9f3..bebb4d1f76a6 100644
--- a/lib/libc/softfloat/eqsf2.c
+++ b/lib/libc/softfloat/eqsf2.c
@@ -5,8 +5,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "softfloat-for-gcc.h"
#include "milieu.h"
#include "softfloat.h"
diff --git a/lib/libc/softfloat/eqtf2.c b/lib/libc/softfloat/eqtf2.c
index 1839404e1b1a..8852adafa2ff 100644
--- a/lib/libc/softfloat/eqtf2.c
+++ b/lib/libc/softfloat/eqtf2.c
@@ -5,8 +5,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "softfloat-for-gcc.h"
#include "milieu.h"
#include "softfloat.h"
diff --git a/lib/libc/softfloat/fpgetmask.c b/lib/libc/softfloat/fpgetmask.c
index 71ea2ac99621..78177544538e 100644
--- a/lib/libc/softfloat/fpgetmask.c
+++ b/lib/libc/softfloat/fpgetmask.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <ieeefp.h>
diff --git a/lib/libc/softfloat/fpgetround.c b/lib/libc/softfloat/fpgetround.c
index c5bc6f9b6735..e098ef46c122 100644
--- a/lib/libc/softfloat/fpgetround.c
+++ b/lib/libc/softfloat/fpgetround.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <ieeefp.h>
diff --git a/lib/libc/softfloat/fpgetsticky.c b/lib/libc/softfloat/fpgetsticky.c
index 349657e25eb3..0caff5b0578f 100644
--- a/lib/libc/softfloat/fpgetsticky.c
+++ b/lib/libc/softfloat/fpgetsticky.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <ieeefp.h>
diff --git a/lib/libc/softfloat/fpsetmask.c b/lib/libc/softfloat/fpsetmask.c
index 42025e1de3c3..90f457563513 100644
--- a/lib/libc/softfloat/fpsetmask.c
+++ b/lib/libc/softfloat/fpsetmask.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <ieeefp.h>
diff --git a/lib/libc/softfloat/fpsetround.c b/lib/libc/softfloat/fpsetround.c
index 8305e4302e2d..37fa7064ce84 100644
--- a/lib/libc/softfloat/fpsetround.c
+++ b/lib/libc/softfloat/fpsetround.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <ieeefp.h>
diff --git a/lib/libc/softfloat/fpsetsticky.c b/lib/libc/softfloat/fpsetsticky.c
index b71475096d10..3916161c8e23 100644
--- a/lib/libc/softfloat/fpsetsticky.c
+++ b/lib/libc/softfloat/fpsetsticky.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <ieeefp.h>
diff --git a/lib/libc/softfloat/gedf2.c b/lib/libc/softfloat/gedf2.c
index 76e25de58a64..75769823991b 100644
--- a/lib/libc/softfloat/gedf2.c
+++ b/lib/libc/softfloat/gedf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
flag __gedf2(float64, float64);
flag
diff --git a/lib/libc/softfloat/gesf2.c b/lib/libc/softfloat/gesf2.c
index b22e13afb63d..1ec47ae32ea6 100644
--- a/lib/libc/softfloat/gesf2.c
+++ b/lib/libc/softfloat/gesf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
flag __gesf2(float32, float32);
flag
diff --git a/lib/libc/softfloat/getf2.c b/lib/libc/softfloat/getf2.c
index 8639c4d3916a..ac4665eedb29 100644
--- a/lib/libc/softfloat/getf2.c
+++ b/lib/libc/softfloat/getf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef FLOAT128
flag __getf2(float128, float128);
diff --git a/lib/libc/softfloat/gexf2.c b/lib/libc/softfloat/gexf2.c
index 70cf1c32d7ec..51f98f2ae03a 100644
--- a/lib/libc/softfloat/gexf2.c
+++ b/lib/libc/softfloat/gexf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef FLOATX80
flag __gexf2(floatx80, floatx80);
diff --git a/lib/libc/softfloat/gtdf2.c b/lib/libc/softfloat/gtdf2.c
index ff5764a519c6..fc6d2fd06a34 100644
--- a/lib/libc/softfloat/gtdf2.c
+++ b/lib/libc/softfloat/gtdf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
flag __gtdf2(float64, float64);
flag
diff --git a/lib/libc/softfloat/gtsf2.c b/lib/libc/softfloat/gtsf2.c
index 8e7e7a9371c1..ae8d7c209106 100644
--- a/lib/libc/softfloat/gtsf2.c
+++ b/lib/libc/softfloat/gtsf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
flag __gtsf2(float32, float32);
flag
diff --git a/lib/libc/softfloat/gttf2.c b/lib/libc/softfloat/gttf2.c
index 519ea845f00c..76684e013e35 100644
--- a/lib/libc/softfloat/gttf2.c
+++ b/lib/libc/softfloat/gttf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef FLOAT128
flag __gttf2(float128, float128);
diff --git a/lib/libc/softfloat/gtxf2.c b/lib/libc/softfloat/gtxf2.c
index fe8be52e7e2d..284526f0c410 100644
--- a/lib/libc/softfloat/gtxf2.c
+++ b/lib/libc/softfloat/gtxf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef FLOATX80
flag __gtxf2(floatx80, floatx80);
diff --git a/lib/libc/softfloat/ledf2.c b/lib/libc/softfloat/ledf2.c
index 7d3e8fb54855..689c7d70c1ca 100644
--- a/lib/libc/softfloat/ledf2.c
+++ b/lib/libc/softfloat/ledf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
flag __ledf2(float64, float64);
flag
diff --git a/lib/libc/softfloat/lesf2.c b/lib/libc/softfloat/lesf2.c
index 6fa13e5e2467..98ba0722525a 100644
--- a/lib/libc/softfloat/lesf2.c
+++ b/lib/libc/softfloat/lesf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
flag __lesf2(float32, float32);
flag
diff --git a/lib/libc/softfloat/letf2.c b/lib/libc/softfloat/letf2.c
index e9a18f8d5e5d..d5dbd45a106b 100644
--- a/lib/libc/softfloat/letf2.c
+++ b/lib/libc/softfloat/letf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef FLOAT128
flag __letf2(float128, float128);
diff --git a/lib/libc/softfloat/ltdf2.c b/lib/libc/softfloat/ltdf2.c
index b8c668ccc01d..8c5342a3c6ff 100644
--- a/lib/libc/softfloat/ltdf2.c
+++ b/lib/libc/softfloat/ltdf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
flag __ltdf2(float64, float64);
flag
diff --git a/lib/libc/softfloat/ltsf2.c b/lib/libc/softfloat/ltsf2.c
index 8a1e8fa9e50b..9eb9e990bc63 100644
--- a/lib/libc/softfloat/ltsf2.c
+++ b/lib/libc/softfloat/ltsf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
flag __ltsf2(float32, float32);
flag
diff --git a/lib/libc/softfloat/lttf2.c b/lib/libc/softfloat/lttf2.c
index 13c01b19528d..ad8e4830d904 100644
--- a/lib/libc/softfloat/lttf2.c
+++ b/lib/libc/softfloat/lttf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef FLOAT128
flag __lttf2(float128, float128);
diff --git a/lib/libc/softfloat/nedf2.c b/lib/libc/softfloat/nedf2.c
index 61f50443c9c5..7c1e49643d72 100644
--- a/lib/libc/softfloat/nedf2.c
+++ b/lib/libc/softfloat/nedf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
flag __nedf2(float64, float64);
flag
diff --git a/lib/libc/softfloat/negdf2.c b/lib/libc/softfloat/negdf2.c
index 2485d586c475..27dfdd5ee688 100644
--- a/lib/libc/softfloat/negdf2.c
+++ b/lib/libc/softfloat/negdf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
float64 __negdf2(float64);
float64
diff --git a/lib/libc/softfloat/negsf2.c b/lib/libc/softfloat/negsf2.c
index 78f6c6bd5f1f..9b4a269132e1 100644
--- a/lib/libc/softfloat/negsf2.c
+++ b/lib/libc/softfloat/negsf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
float32 __negsf2(float32);
float32
diff --git a/lib/libc/softfloat/negtf2.c b/lib/libc/softfloat/negtf2.c
index 5be582dd8937..d8cb6a0dc4bc 100644
--- a/lib/libc/softfloat/negtf2.c
+++ b/lib/libc/softfloat/negtf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef FLOAT128
float128 __negtf2(float128);
diff --git a/lib/libc/softfloat/negxf2.c b/lib/libc/softfloat/negxf2.c
index 0e2d08b25a67..fd906c830e28 100644
--- a/lib/libc/softfloat/negxf2.c
+++ b/lib/libc/softfloat/negxf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef FLOATX80
floatx80 __negxf2(floatx80);
diff --git a/lib/libc/softfloat/nesf2.c b/lib/libc/softfloat/nesf2.c
index b8317cbf8dd8..d7c580c2ff8c 100644
--- a/lib/libc/softfloat/nesf2.c
+++ b/lib/libc/softfloat/nesf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
flag __nesf2(float32, float32);
flag
diff --git a/lib/libc/softfloat/netf2.c b/lib/libc/softfloat/netf2.c
index 26e17cd1f52d..c54b22b8bf22 100644
--- a/lib/libc/softfloat/netf2.c
+++ b/lib/libc/softfloat/netf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef FLOAT128
flag __netf2(float128, float128);
diff --git a/lib/libc/softfloat/nexf2.c b/lib/libc/softfloat/nexf2.c
index 153a70392d16..6d75d164d9e2 100644
--- a/lib/libc/softfloat/nexf2.c
+++ b/lib/libc/softfloat/nexf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef FLOATX80
flag __nexf2(floatx80, floatx80);
diff --git a/lib/libc/softfloat/timesoftfloat.c b/lib/libc/softfloat/timesoftfloat.c
index b97c8b0f0d00..4abff11e13e6 100644
--- a/lib/libc/softfloat/timesoftfloat.c
+++ b/lib/libc/softfloat/timesoftfloat.c
@@ -31,8 +31,6 @@ this code that are retained.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
diff --git a/lib/libc/softfloat/unorddf2.c b/lib/libc/softfloat/unorddf2.c
index 2986c8281475..44e03792b3f9 100644
--- a/lib/libc/softfloat/unorddf2.c
+++ b/lib/libc/softfloat/unorddf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
flag __unorddf2(float64, float64);
flag
diff --git a/lib/libc/softfloat/unordsf2.c b/lib/libc/softfloat/unordsf2.c
index e2f4c8f0947c..3b73ac20ca80 100644
--- a/lib/libc/softfloat/unordsf2.c
+++ b/lib/libc/softfloat/unordsf2.c
@@ -9,8 +9,6 @@
#include "softfloat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
flag __unordsf2(float32, float32);
flag
diff --git a/lib/libc/stdio/_flock_stub.c b/lib/libc/stdio/_flock_stub.c
index 069ed64c4e99..674e88c512bd 100644
--- a/lib/libc/stdio/_flock_stub.c
+++ b/lib/libc/stdio/_flock_stub.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c
index 8e77aae6f64b..123345490c43 100644
--- a/lib/libc/stdio/asprintf.c
+++ b/lib/libc/stdio/asprintf.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdarg.h>
#include <xlocale.h>
diff --git a/lib/libc/stdio/clrerr.c b/lib/libc/stdio/clrerr.c
index c9208c0c1c46..780172ef3f6d 100644
--- a/lib/libc/stdio/clrerr.c
+++ b/lib/libc/stdio/clrerr.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)clrerr.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include "un-namespace.h"
diff --git a/lib/libc/stdio/dprintf.c b/lib/libc/stdio/dprintf.c
index 4467a1f1f020..07e20f0709ef 100644
--- a/lib/libc/stdio/dprintf.c
+++ b/lib/libc/stdio/dprintf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdarg.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c
index 84f890e3c38a..7a925f1a1661 100644
--- a/lib/libc/stdio/fclose.c
+++ b/lib/libc/stdio/fclose.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)fclose.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdbool.h>
diff --git a/lib/libc/stdio/fcloseall.c b/lib/libc/stdio/fcloseall.c
index bd3e8c38ea41..83dc8d697bf1 100644
--- a/lib/libc/stdio/fcloseall.c
+++ b/lib/libc/stdio/fcloseall.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include "local.h"
diff --git a/lib/libc/stdio/fdopen.c b/lib/libc/stdio/fdopen.c
index 64d619963e14..7512e2d4dbba 100644
--- a/lib/libc/stdio/fdopen.c
+++ b/lib/libc/stdio/fdopen.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fdopen.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <fcntl.h>
diff --git a/lib/libc/stdio/feof.c b/lib/libc/stdio/feof.c
index ef6767fb2b1b..f224e1d6d6ba 100644
--- a/lib/libc/stdio/feof.c
+++ b/lib/libc/stdio/feof.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)feof.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include "un-namespace.h"
diff --git a/lib/libc/stdio/ferror.c b/lib/libc/stdio/ferror.c
index bb29c27e1419..bf3b2deaf299 100644
--- a/lib/libc/stdio/ferror.c
+++ b/lib/libc/stdio/ferror.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)ferror.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include "un-namespace.h"
diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c
index f59565abd369..a7f9348def50 100644
--- a/lib/libc/stdio/fflush.c
+++ b/lib/libc/stdio/fflush.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fflush.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/fgetc.c b/lib/libc/stdio/fgetc.c
index bb94f2ed5559..2919fe31b826 100644
--- a/lib/libc/stdio/fgetc.c
+++ b/lib/libc/stdio/fgetc.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fgetc.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include "un-namespace.h"
diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c
index f3e4a6874a4b..a66919711050 100644
--- a/lib/libc/stdio/fgetln.c
+++ b/lib/libc/stdio/fgetln.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fgetln.c 8.2 (Berkeley) 1/2/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/stdio/fgetpos.c b/lib/libc/stdio/fgetpos.c
index c592ef0fc224..4cbd5e1f6e76 100644
--- a/lib/libc/stdio/fgetpos.c
+++ b/lib/libc/stdio/fgetpos.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fgetpos.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
int
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c
index ceb48562fe30..adac5dc3d6a0 100644
--- a/lib/libc/stdio/fgets.c
+++ b/lib/libc/stdio/fgets.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fgets.c 8.2 (Berkeley) 12/22/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/fgetwc.c b/lib/libc/stdio/fgetwc.c
index 4d989bfec1c9..949d93f67007 100644
--- a/lib/libc/stdio/fgetwc.c
+++ b/lib/libc/stdio/fgetwc.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/fgetwln.c b/lib/libc/stdio/fgetwln.c
index 22bb838b0104..8d74f9d8f3da 100644
--- a/lib/libc/stdio/fgetwln.c
+++ b/lib/libc/stdio/fgetwln.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/fgetws.c b/lib/libc/stdio/fgetws.c
index 78c8422fe689..1eaeed708ef1 100644
--- a/lib/libc/stdio/fgetws.c
+++ b/lib/libc/stdio/fgetws.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c
index 81673cd89034..272a46abb74a 100644
--- a/lib/libc/stdio/fileno.c
+++ b/lib/libc/stdio/fileno.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fileno.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include "un-namespace.h"
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
index b30a06ffd9e5..cf4eccf8807e 100644
--- a/lib/libc/stdio/findfp.c
+++ b/lib/libc/stdio/findfp.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)findfp.c 8.2 (Berkeley) 1/4/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <machine/atomic.h>
#include <unistd.h>
diff --git a/lib/libc/stdio/flags.c b/lib/libc/stdio/flags.c
index a034c1674c98..04b67f127986 100644
--- a/lib/libc/stdio/flags.c
+++ b/lib/libc/stdio/flags.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)flags.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/fmemopen.c b/lib/libc/stdio/fmemopen.c
index 63a0b4246ef4..295592ac896f 100644
--- a/lib/libc/stdio/fmemopen.c
+++ b/lib/libc/stdio/fmemopen.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fcntl.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/fopen.c b/lib/libc/stdio/fopen.c
index cb71387e0f38..2f2de15345c4 100644
--- a/lib/libc/stdio/fopen.c
+++ b/lib/libc/stdio/fopen.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fopen.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libc/stdio/fopencookie.c b/lib/libc/stdio/fopencookie.c
index 6dc39538df86..9c295ff7bfed 100644
--- a/lib/libc/stdio/fopencookie.c
+++ b/lib/libc/stdio/fopencookie.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/fcntl.h>
#include <errno.h>
diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c
index c03db17c8bb9..c1df55872aa3 100644
--- a/lib/libc/stdio/fprintf.c
+++ b/lib/libc/stdio/fprintf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)fprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdarg.h>
#include "xlocale_private.h"
diff --git a/lib/libc/stdio/fpurge.c b/lib/libc/stdio/fpurge.c
index aa5daf2ca078..4ca6a5373050 100644
--- a/lib/libc/stdio/fpurge.c
+++ b/lib/libc/stdio/fpurge.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fpurge.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c
index a2d2d14655bc..54476b8f2bea 100644
--- a/lib/libc/stdio/fputc.c
+++ b/lib/libc/stdio/fputc.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fputc.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include "un-namespace.h"
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
index 1fbae3593223..1b611d50017b 100644
--- a/lib/libc/stdio/fputs.c
+++ b/lib/libc/stdio/fputs.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fputs.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <limits.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/fputwc.c b/lib/libc/stdio/fputwc.c
index 2ad305dfc179..197c57cc374a 100644
--- a/lib/libc/stdio/fputwc.c
+++ b/lib/libc/stdio/fputwc.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c
index f319a6428abd..c77393886e72 100644
--- a/lib/libc/stdio/fputws.c
+++ b/lib/libc/stdio/fputws.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c
index cafe86fe7961..13776382fbb7 100644
--- a/lib/libc/stdio/fread.c
+++ b/lib/libc/stdio/fread.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fread.c 8.2 (Berkeley) 12/11/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdint.h>
diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c
index fce965089a54..2f3f96c1d92a 100644
--- a/lib/libc/stdio/freopen.c
+++ b/lib/libc/stdio/freopen.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)freopen.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
index 8946b5b84184..f274cb98ef3c 100644
--- a/lib/libc/stdio/fscanf.c
+++ b/lib/libc/stdio/fscanf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)fscanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <stdarg.h>
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c
index 5fcd49f23c5f..21f1079b6458 100644
--- a/lib/libc/stdio/fseek.c
+++ b/lib/libc/stdio/fseek.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fseek.c 8.3 (Berkeley) 1/2/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libc/stdio/fsetpos.c b/lib/libc/stdio/fsetpos.c
index 4bb7c112fb06..4f985e249a32 100644
--- a/lib/libc/stdio/fsetpos.c
+++ b/lib/libc/stdio/fsetpos.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fsetpos.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c
index df73823c58ce..4cb038df1d76 100644
--- a/lib/libc/stdio/ftell.c
+++ b/lib/libc/stdio/ftell.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)ftell.c 8.2 (Berkeley) 5/4/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libc/stdio/funopen.c b/lib/libc/stdio/funopen.c
index 4b1a31e2a962..376721d33eb3 100644
--- a/lib/libc/stdio/funopen.c
+++ b/lib/libc/stdio/funopen.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)funopen.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <errno.h>
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
index b1b363e6f80d..81e7ba89a644 100644
--- a/lib/libc/stdio/fvwrite.c
+++ b/lib/libc/stdio/fvwrite.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/stdio/fwalk.c b/lib/libc/stdio/fwalk.c
index 37691a715c53..0e2c48234a75 100644
--- a/lib/libc/stdio/fwalk.c
+++ b/lib/libc/stdio/fwalk.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fwalk.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
#include "local.h"
diff --git a/lib/libc/stdio/fwide.c b/lib/libc/stdio/fwide.c
index a785e2effbc1..d413d4518d2a 100644
--- a/lib/libc/stdio/fwide.c
+++ b/lib/libc/stdio/fwide.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/fwprintf.c b/lib/libc/stdio/fwprintf.c
index 1168eab8cb91..7550bb8eb69b 100644
--- a/lib/libc/stdio/fwprintf.c
+++ b/lib/libc/stdio/fwprintf.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdarg.h>
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c
index cb20931f5838..d0663c93a2a2 100644
--- a/lib/libc/stdio/fwrite.c
+++ b/lib/libc/stdio/fwrite.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)fwrite.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdint.h>
diff --git a/lib/libc/stdio/fwscanf.c b/lib/libc/stdio/fwscanf.c
index 96523ebedd6e..b0f2d02e748d 100644
--- a/lib/libc/stdio/fwscanf.c
+++ b/lib/libc/stdio/fwscanf.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdarg.h>
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c
index 5329810ca14c..61fb4fe88c88 100644
--- a/lib/libc/stdio/getc.c
+++ b/lib/libc/stdio/getc.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)getc.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include "un-namespace.h"
diff --git a/lib/libc/stdio/getchar.c b/lib/libc/stdio/getchar.c
index e29dd7136a4c..197e135f8cbf 100644
--- a/lib/libc/stdio/getchar.c
+++ b/lib/libc/stdio/getchar.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)getchar.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* A subroutine version of the macro getchar.
*/
diff --git a/lib/libc/stdio/getdelim.c b/lib/libc/stdio/getdelim.c
index 2cde34c3a0f0..5a1a3cd3dfb8 100644
--- a/lib/libc/stdio/getdelim.c
+++ b/lib/libc/stdio/getdelim.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <errno.h>
diff --git a/lib/libc/stdio/getline.c b/lib/libc/stdio/getline.c
index c8fa63f45188..7e62829ecf4c 100644
--- a/lib/libc/stdio/getline.c
+++ b/lib/libc/stdio/getline.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
ssize_t
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
index c8822e3b8d86..7f3e165f0bff 100644
--- a/lib/libc/stdio/gets.c
+++ b/lib/libc/stdio/gets.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)gets.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <unistd.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/gets_s.c b/lib/libc/stdio/gets_s.c
index fc5774937821..cf839f8abed9 100644
--- a/lib/libc/stdio/gets_s.c
+++ b/lib/libc/stdio/gets_s.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <unistd.h>
diff --git a/lib/libc/stdio/getw.c b/lib/libc/stdio/getw.c
index fa18f0183fb5..f48395d7dc7c 100644
--- a/lib/libc/stdio/getw.c
+++ b/lib/libc/stdio/getw.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)getw.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
int
diff --git a/lib/libc/stdio/getwc.c b/lib/libc/stdio/getwc.c
index 38fd5655c37d..ccac10db228f 100644
--- a/lib/libc/stdio/getwc.c
+++ b/lib/libc/stdio/getwc.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/getwchar.c b/lib/libc/stdio/getwchar.c
index d2aad53da81b..9294a952357e 100644
--- a/lib/libc/stdio/getwchar.c
+++ b/lib/libc/stdio/getwchar.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/makebuf.c b/lib/libc/stdio/makebuf.c
index 9bddf89a65b2..f499651880ca 100644
--- a/lib/libc/stdio/makebuf.c
+++ b/lib/libc/stdio/makebuf.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)makebuf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index 0ede3058a3d5..bbefc2b28cfd 100644
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libc/stdio/open_memstream.c b/lib/libc/stdio/open_memstream.c
index 256ec785ca3d..7dabc737db8c 100644
--- a/lib/libc/stdio/open_memstream.c
+++ b/lib/libc/stdio/open_memstream.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <assert.h>
#include <errno.h>
diff --git a/lib/libc/stdio/open_wmemstream.c b/lib/libc/stdio/open_wmemstream.c
index 8e385be22719..bc746ebf8073 100644
--- a/lib/libc/stdio/open_wmemstream.c
+++ b/lib/libc/stdio/open_wmemstream.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <assert.h>
#include <errno.h>
diff --git a/lib/libc/stdio/perror.c b/lib/libc/stdio/perror.c
index 6eeb14893b8c..a16820f83b26 100644
--- a/lib/libc/stdio/perror.c
+++ b/lib/libc/stdio/perror.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)perror.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/lib/libc/stdio/printf-pos.c b/lib/libc/stdio/printf-pos.c
index 40f91e8af712..534ac9cd4b78 100644
--- a/lib/libc/stdio/printf-pos.c
+++ b/lib/libc/stdio/printf-pos.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This is the code responsible for handling positional arguments
* (%m$ and %m$.n$) for vfprintf() and vfwprintf().
diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c
index 53a31ca23346..20e5b7b0e3cd 100644
--- a/lib/libc/stdio/printf.c
+++ b/lib/libc/stdio/printf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)printf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdarg.h>
#include <xlocale.h>
diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c
index 1713792e1909..54735da59527 100644
--- a/lib/libc/stdio/putc.c
+++ b/lib/libc/stdio/putc.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)putc.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include "un-namespace.h"
diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c
index 12adf86f3c34..dd8ea0271b94 100644
--- a/lib/libc/stdio/putchar.c
+++ b/lib/libc/stdio/putchar.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)putchar.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include "un-namespace.h"
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
index fe80ddbba792..b97807fe1255 100644
--- a/lib/libc/stdio/puts.c
+++ b/lib/libc/stdio/puts.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)puts.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <string.h>
diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c
index ba9853db9c8a..7e7c87c99ba2 100644
--- a/lib/libc/stdio/putw.c
+++ b/lib/libc/stdio/putw.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)putw.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include "un-namespace.h"
diff --git a/lib/libc/stdio/putwc.c b/lib/libc/stdio/putwc.c
index 4c5345d1f272..386023924440 100644
--- a/lib/libc/stdio/putwc.c
+++ b/lib/libc/stdio/putwc.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/putwchar.c b/lib/libc/stdio/putwchar.c
index 6a237c81dfb4..1c5ab256125a 100644
--- a/lib/libc/stdio/putwchar.c
+++ b/lib/libc/stdio/putwchar.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c
index dbbcb4912aa2..afc0526441aa 100644
--- a/lib/libc/stdio/refill.c
+++ b/lib/libc/stdio/refill.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)refill.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/remove.c b/lib/libc/stdio/remove.c
index b92e14ad6c16..1e9dd98e1841 100644
--- a/lib/libc/stdio/remove.c
+++ b/lib/libc/stdio/remove.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)remove.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/lib/libc/stdio/rewind.c b/lib/libc/stdio/rewind.c
index 2449de397160..8e6fc877c401 100644
--- a/lib/libc/stdio/rewind.c
+++ b/lib/libc/stdio/rewind.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)rewind.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/rget.c b/lib/libc/stdio/rget.c
index 530fb67b0ff1..a25ae3bdcea1 100644
--- a/lib/libc/stdio/rget.c
+++ b/lib/libc/stdio/rget.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)rget.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include "local.h"
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c
index 775bf3b1bb64..1f84f9ab6542 100644
--- a/lib/libc/stdio/scanf.c
+++ b/lib/libc/stdio/scanf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)scanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <stdarg.h>
diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c
index 7c60c77dce9c..71f0ee4ae7dc 100644
--- a/lib/libc/stdio/setbuf.c
+++ b/lib/libc/stdio/setbuf.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)setbuf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include "local.h"
diff --git a/lib/libc/stdio/setbuffer.c b/lib/libc/stdio/setbuffer.c
index b760e1a510f2..96c498f95e73 100644
--- a/lib/libc/stdio/setbuffer.c
+++ b/lib/libc/stdio/setbuffer.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)setbuffer.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
void
diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c
index 8947e61e7c29..9714818bc57f 100644
--- a/lib/libc/stdio/setvbuf.c
+++ b/lib/libc/stdio/setvbuf.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)setvbuf.c 8.2 (Berkeley) 11/16/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <limits.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c
index bfa43ef4e17e..45a9e3d7d622 100644
--- a/lib/libc/stdio/snprintf.c
+++ b/lib/libc/stdio/snprintf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index 5601b96a3853..c83efdb3f357 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)sprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdarg.h>
#include <limits.h>
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index 4272328d1f38..a06aac85a676 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)sscanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
index 4f093f12dc80..40677118bea2 100644
--- a/lib/libc/stdio/stdio.c
+++ b/lib/libc/stdio/stdio.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)stdio.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/lib/libc/stdio/swprintf.c b/lib/libc/stdio/swprintf.c
index 15724f36829c..4c4db2accb76 100644
--- a/lib/libc/stdio/swprintf.c
+++ b/lib/libc/stdio/swprintf.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdarg.h>
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/swscanf.c b/lib/libc/stdio/swscanf.c
index ad2159e81302..20bf266dc772 100644
--- a/lib/libc/stdio/swscanf.c
+++ b/lib/libc/stdio/swscanf.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdarg.h>
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
index 4a720fd4c1cb..06dceec153bf 100644
--- a/lib/libc/stdio/tempnam.c
+++ b/lib/libc/stdio/tempnam.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)tempnam.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/tmpfile.c b/lib/libc/stdio/tmpfile.c
index aedaab6e1262..afe45595eac8 100644
--- a/lib/libc/stdio/tmpfile.c
+++ b/lib/libc/stdio/tmpfile.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)tmpfile.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <signal.h>
diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c
index c4d56778027d..8fc057dea868 100644
--- a/lib/libc/stdio/tmpnam.c
+++ b/lib/libc/stdio/tmpnam.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)tmpnam.c 8.3 (Berkeley) 3/28/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
index 2e140c965a02..d5c91626dfa1 100644
--- a/lib/libc/stdio/ungetc.c
+++ b/lib/libc/stdio/ungetc.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)ungetc.c 8.2 (Berkeley) 11/3/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/stdio/ungetwc.c b/lib/libc/stdio/ungetwc.c
index ccbb53625bb4..a4c71d012be0 100644
--- a/lib/libc/stdio/ungetwc.c
+++ b/lib/libc/stdio/ungetwc.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
index 1260349afe97..2e5f8dd4107a 100644
--- a/lib/libc/stdio/vasprintf.c
+++ b/lib/libc/stdio/vasprintf.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/lib/libc/stdio/vdprintf.c b/lib/libc/stdio/vdprintf.c
index 3d9e93357ca1..a84efaa14b4d 100644
--- a/lib/libc/stdio/vdprintf.c
+++ b/lib/libc/stdio/vdprintf.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index d7848a9a7078..ad655c5d78d4 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Actual printf innards.
*
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index dde22cb5b235..cc2e1e428321 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <ctype.h>
#include <inttypes.h>
diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c
index 0561dc06164c..fc681e8d0575 100644
--- a/lib/libc/stdio/vfwprintf.c
+++ b/lib/libc/stdio/vfwprintf.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Actual wprintf innards.
*
diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c
index ab9bce4c295a..1a28ff665247 100644
--- a/lib/libc/stdio/vfwscanf.c
+++ b/lib/libc/stdio/vfwscanf.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <ctype.h>
#include <inttypes.h>
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index 31b52bcf31cd..604870b93b1e 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)vprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <xlocale.h>
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
index 84419dd054c5..58fd2a455389 100644
--- a/lib/libc/stdio/vscanf.c
+++ b/lib/libc/stdio/vscanf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)vscanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include "un-namespace.h"
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index bc8ec287ee84..8fc7f9fdf725 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index 6992f9610e91..68a2f70469f4 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)vsprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <limits.h>
#include "local.h"
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index 5b0be5429cdf..0751f0e95b0b 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -41,8 +41,6 @@
static char sccsid[] = "@(#)vsscanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <string.h>
#include "local.h"
diff --git a/lib/libc/stdio/vswprintf.c b/lib/libc/stdio/vswprintf.c
index 4807fd20d67c..db1b5d30d09d 100644
--- a/lib/libc/stdio/vswprintf.c
+++ b/lib/libc/stdio/vswprintf.c
@@ -38,8 +38,6 @@
#if 0
__FBSDID("FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.16 2002/08/21 16:19:57 mike Exp ");
#endif
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/vswscanf.c b/lib/libc/stdio/vswscanf.c
index d320da82101b..ecdafbefdc75 100644
--- a/lib/libc/stdio/vswscanf.c
+++ b/lib/libc/stdio/vswscanf.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)vsscanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
__FBSDID("FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.11 2002/08/21 16:19:57 mike Exp ");
#endif
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stdarg.h>
#include <stdio.h>
diff --git a/lib/libc/stdio/vwprintf.c b/lib/libc/stdio/vwprintf.c
index 18f76638becc..b0e9ac26d3c6 100644
--- a/lib/libc/stdio/vwprintf.c
+++ b/lib/libc/stdio/vwprintf.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdarg.h>
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/vwscanf.c b/lib/libc/stdio/vwscanf.c
index 88371cb35b86..e2e16ac91e53 100644
--- a/lib/libc/stdio/vwscanf.c
+++ b/lib/libc/stdio/vwscanf.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdarg.h>
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
index 666bbf87aadd..acbe379ad90e 100644
--- a/lib/libc/stdio/wbuf.c
+++ b/lib/libc/stdio/wbuf.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)wbuf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include "local.h"
diff --git a/lib/libc/stdio/wprintf.c b/lib/libc/stdio/wprintf.c
index bb1ddacf1121..c45640021927 100644
--- a/lib/libc/stdio/wprintf.c
+++ b/lib/libc/stdio/wprintf.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdarg.h>
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/wscanf.c b/lib/libc/stdio/wscanf.c
index b544ca03ffe1..9527fcd27767 100644
--- a/lib/libc/stdio/wscanf.c
+++ b/lib/libc/stdio/wscanf.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdarg.h>
#include <stdio.h>
#include <wchar.h>
diff --git a/lib/libc/stdio/wsetup.c b/lib/libc/stdio/wsetup.c
index 1733d69ee44d..b0dd89637b75 100644
--- a/lib/libc/stdio/wsetup.c
+++ b/lib/libc/stdio/wsetup.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)wsetup.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/a64l.c b/lib/libc/stdlib/a64l.c
index a130dcb24bf5..71514c502d69 100644
--- a/lib/libc/stdlib/a64l.c
+++ b/lib/libc/stdlib/a64l.c
@@ -10,8 +10,6 @@ __RCSID("$NetBSD: a64l.c,v 1.8 2000/01/22 22:19:19 mycroft Exp $");
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <inttypes.h>
diff --git a/lib/libc/stdlib/abort.c b/lib/libc/stdlib/abort.c
index 72c93a115ec0..5d8c39987b14 100644
--- a/lib/libc/stdlib/abort.c
+++ b/lib/libc/stdlib/abort.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)abort.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <signal.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/abs.c b/lib/libc/stdlib/abs.c
index 0e4c94c68286..c0f402381c02 100644
--- a/lib/libc/stdlib/abs.c
+++ b/lib/libc/stdlib/abs.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)abs.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
int
diff --git a/lib/libc/stdlib/atexit.c b/lib/libc/stdlib/atexit.c
index 682464407c7f..6b63d9e728c4 100644
--- a/lib/libc/stdlib/atexit.c
+++ b/lib/libc/stdlib/atexit.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)atexit.c 8.2 (Berkeley) 7/3/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <link.h>
diff --git a/lib/libc/stdlib/atof.c b/lib/libc/stdlib/atof.c
index 5e0a0ddd050d..b058f10deb87 100644
--- a/lib/libc/stdlib/atof.c
+++ b/lib/libc/stdlib/atof.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)atof.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <xlocale.h>
diff --git a/lib/libc/stdlib/atoi.c b/lib/libc/stdlib/atoi.c
index 2d6fe88ef74a..dfaf659458f5 100644
--- a/lib/libc/stdlib/atoi.c
+++ b/lib/libc/stdlib/atoi.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)atoi.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <xlocale.h>
diff --git a/lib/libc/stdlib/atol.c b/lib/libc/stdlib/atol.c
index 88aa9a990ae7..a36633f04d8c 100644
--- a/lib/libc/stdlib/atol.c
+++ b/lib/libc/stdlib/atol.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)atol.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <xlocale.h>
diff --git a/lib/libc/stdlib/atoll.c b/lib/libc/stdlib/atoll.c
index fb3b76524be1..95efac77eb82 100644
--- a/lib/libc/stdlib/atoll.c
+++ b/lib/libc/stdlib/atoll.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <xlocale.h>
diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c
index b5c342635c01..9934716fd196 100644
--- a/lib/libc/stdlib/bsearch.c
+++ b/lib/libc/stdlib/bsearch.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)bsearch.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/cxa_thread_atexit.c b/lib/libc/stdlib/cxa_thread_atexit.c
index 06fcc3c87c26..c6eb1278fcd2 100644
--- a/lib/libc/stdlib/cxa_thread_atexit.c
+++ b/lib/libc/stdlib/cxa_thread_atexit.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "libc_private.h"
int
diff --git a/lib/libc/stdlib/cxa_thread_atexit_impl.c b/lib/libc/stdlib/cxa_thread_atexit_impl.c
index cdd918e2c496..6883f5290829 100644
--- a/lib/libc/stdlib/cxa_thread_atexit_impl.c
+++ b/lib/libc/stdlib/cxa_thread_atexit_impl.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include "namespace.h"
#include <errno.h>
diff --git a/lib/libc/stdlib/div.c b/lib/libc/stdlib/div.c
index 82a3b02b6df1..c7bb8c44aa79 100644
--- a/lib/libc/stdlib/div.c
+++ b/lib/libc/stdlib/div.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)div.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h> /* div_t */
div_t
diff --git a/lib/libc/stdlib/exit.c b/lib/libc/stdlib/exit.c
index efd7f55f68c6..111b735be0a0 100644
--- a/lib/libc/stdlib/exit.c
+++ b/lib/libc/stdlib/exit.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)exit.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdlib.h>
#include <unistd.h>
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index 161b7da33020..f7206f3af29b 100644
--- a/lib/libc/stdlib/getenv.c
+++ b/lib/libc/stdlib/getenv.c
@@ -27,9 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-
#include "namespace.h"
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libc/stdlib/getopt.c b/lib/libc/stdlib/getopt.c
index b7f2229a2f54..5b50d587c92e 100644
--- a/lib/libc/stdlib/getopt.c
+++ b/lib/libc/stdlib/getopt.c
@@ -35,8 +35,6 @@
static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
index 1f3548bef9ad..3e6e3fd431bb 100644
--- a/lib/libc/stdlib/getopt_long.c
+++ b/lib/libc/stdlib/getopt_long.c
@@ -55,8 +55,6 @@ static char *rcsid = "$OpenBSD: getopt_long.c,v 1.16 2004/02/04 18:17:25 millert
#endif /* LIBC_SCCS and not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <getopt.h>
diff --git a/lib/libc/stdlib/getsubopt.c b/lib/libc/stdlib/getsubopt.c
index 7ad9ae994444..dfcca7a7209d 100644
--- a/lib/libc/stdlib/getsubopt.c
+++ b/lib/libc/stdlib/getsubopt.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)getsubopt.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c
index c9a08472f3e1..969e31bfc461 100644
--- a/lib/libc/stdlib/hcreate.c
+++ b/lib/libc/stdlib/hcreate.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <search.h>
#include <stdbool.h>
#include <stddef.h>
diff --git a/lib/libc/stdlib/hcreate_r.c b/lib/libc/stdlib/hcreate_r.c
index 83e322a5621b..82204b7982be 100644
--- a/lib/libc/stdlib/hcreate_r.c
+++ b/lib/libc/stdlib/hcreate_r.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <search.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/hdestroy_r.c b/lib/libc/stdlib/hdestroy_r.c
index 890bd0858e1d..42ad8b1b4e0d 100644
--- a/lib/libc/stdlib/hdestroy_r.c
+++ b/lib/libc/stdlib/hdestroy_r.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <search.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c
index c39f67533b9a..3a795db70448 100644
--- a/lib/libc/stdlib/heapsort.c
+++ b/lib/libc/stdlib/heapsort.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)heapsort.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stddef.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/hsearch_r.c b/lib/libc/stdlib/hsearch_r.c
index 2fb599186d75..e398a1d5b913 100644
--- a/lib/libc/stdlib/hsearch_r.c
+++ b/lib/libc/stdlib/hsearch_r.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <search.h>
diff --git a/lib/libc/stdlib/imaxabs.c b/lib/libc/stdlib/imaxabs.c
index aab3897cdbbf..ad7c3fd26e47 100644
--- a/lib/libc/stdlib/imaxabs.c
+++ b/lib/libc/stdlib/imaxabs.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <inttypes.h>
intmax_t
diff --git a/lib/libc/stdlib/imaxdiv.c b/lib/libc/stdlib/imaxdiv.c
index 97814a281586..a2ed360fa868 100644
--- a/lib/libc/stdlib/imaxdiv.c
+++ b/lib/libc/stdlib/imaxdiv.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <inttypes.h>
/* See comments in div.c for implementation details. */
diff --git a/lib/libc/stdlib/insque.c b/lib/libc/stdlib/insque.c
index 388e4d592617..46b250893264 100644
--- a/lib/libc/stdlib/insque.c
+++ b/lib/libc/stdlib/insque.c
@@ -7,8 +7,6 @@
* unchanged, you can do what ever you want with this file.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _SEARCH_PRIVATE
#include <search.h>
#ifdef DEBUG
diff --git a/lib/libc/stdlib/l64a.c b/lib/libc/stdlib/l64a.c
index c281d7d823c3..5be50118d274 100644
--- a/lib/libc/stdlib/l64a.c
+++ b/lib/libc/stdlib/l64a.c
@@ -10,8 +10,6 @@ __RCSID("$NetBSD: l64a.c,v 1.13 2003/07/26 19:24:54 salo Exp $");
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/labs.c b/lib/libc/stdlib/labs.c
index a770b2cf4357..8eb58252dd83 100644
--- a/lib/libc/stdlib/labs.c
+++ b/lib/libc/stdlib/labs.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)labs.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
long
diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c
index 954626a0c835..0d1835a03d0c 100644
--- a/lib/libc/stdlib/ldiv.c
+++ b/lib/libc/stdlib/ldiv.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)ldiv.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h> /* ldiv_t */
ldiv_t
diff --git a/lib/libc/stdlib/llabs.c b/lib/libc/stdlib/llabs.c
index b78478030179..ad7fbdda1660 100644
--- a/lib/libc/stdlib/llabs.c
+++ b/lib/libc/stdlib/llabs.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
long long
diff --git a/lib/libc/stdlib/lldiv.c b/lib/libc/stdlib/lldiv.c
index 27a471c6ca7a..91dc062e9e15 100644
--- a/lib/libc/stdlib/lldiv.c
+++ b/lib/libc/stdlib/lldiv.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
/* See comments in div.c for implementation details. */
diff --git a/lib/libc/stdlib/lsearch.c b/lib/libc/stdlib/lsearch.c
index 9e9cdbaf619d..1ca55cc9002e 100644
--- a/lib/libc/stdlib/lsearch.c
+++ b/lib/libc/stdlib/lsearch.c
@@ -8,8 +8,6 @@
*/
#include <sys/types.h>
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _SEARCH_PRIVATE
#include <search.h>
#include <stdint.h> /* for uint8_t */
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index 7d8484ed10b9..42f061be17a8 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)merge.c 8.2 (Berkeley) 2/14/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Hybrid exponential search/linear search merge sort with hybrid
* natural/pairwise first pass. Requires about .3% more comparisons
diff --git a/lib/libc/stdlib/ptsname.c b/lib/libc/stdlib/ptsname.c
index 449329d74cf4..13fe1479cb0d 100644
--- a/lib/libc/stdlib/ptsname.c
+++ b/lib/libc/stdlib/ptsname.c
@@ -31,7 +31,6 @@
#include <sys/cdefs.h>
#ifndef lint
-__FBSDID("$FreeBSD$");
#endif /* not lint */
#include "namespace.h"
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index 0d65cd119ea6..d6b6005333f5 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)qsort.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
index 4a0a764c81da..2f5b959cd549 100644
--- a/lib/libc/stdlib/radixsort.c
+++ b/lib/libc/stdlib/radixsort.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)radixsort.c 8.2 (Berkeley) 4/28/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Radixsort routines.
*
diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c
index e448d1b1fd14..f02839e06fc9 100644
--- a/lib/libc/stdlib/rand.c
+++ b/lib/libc/stdlib/rand.c
@@ -35,8 +35,6 @@
static char sccsid[] = "@(#)rand.c 8.1 (Berkeley) 6/14/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index bd533671cc50..8e0832754b3b 100644
--- a/lib/libc/stdlib/random.c
+++ b/lib/libc/stdlib/random.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)random.c 8.2 (Berkeley) 5/19/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/stdlib/reallocarray.c b/lib/libc/stdlib/reallocarray.c
index e1e9b7c16fff..76e4d331c4ce 100644
--- a/lib/libc/stdlib/reallocarray.c
+++ b/lib/libc/stdlib/reallocarray.c
@@ -16,8 +16,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
#include <stdint.h>
diff --git a/lib/libc/stdlib/reallocf.c b/lib/libc/stdlib/reallocf.c
index 888878053f36..63c42383a8bf 100644
--- a/lib/libc/stdlib/reallocf.c
+++ b/lib/libc/stdlib/reallocf.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
void *
diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c
index 220910a3c610..302e3c1a8c8c 100644
--- a/lib/libc/stdlib/realpath.c
+++ b/lib/libc/stdlib/realpath.c
@@ -32,8 +32,6 @@
static char sccsid[] = "@(#)realpath.c 8.1 (Berkeley) 2/16/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libc/stdlib/remque.c b/lib/libc/stdlib/remque.c
index 0a2f28f77c7c..783ffc3a9934 100644
--- a/lib/libc/stdlib/remque.c
+++ b/lib/libc/stdlib/remque.c
@@ -7,8 +7,6 @@
* unchanged, you can do what ever you want with this file.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _SEARCH_PRIVATE
#include <search.h>
#include <stdlib.h> /* for NULL */
diff --git a/lib/libc/stdlib/set_constraint_handler_s.c b/lib/libc/stdlib/set_constraint_handler_s.c
index d2d06b809388..76f9ecfe5a52 100644
--- a/lib/libc/stdlib/set_constraint_handler_s.c
+++ b/lib/libc/stdlib/set_constraint_handler_s.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <machine/atomic.h>
diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c
index 5d60d6ef3273..0e36eb0babe5 100644
--- a/lib/libc/stdlib/strfmon.c
+++ b/lib/libc/stdlib/strfmon.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
#include <errno.h>
diff --git a/lib/libc/stdlib/strtoimax.c b/lib/libc/stdlib/strtoimax.c
index 425ce6d921f3..894d801940fd 100644
--- a/lib/libc/stdlib/strtoimax.c
+++ b/lib/libc/stdlib/strtoimax.c
@@ -38,8 +38,6 @@
static char sccsid[] = "from @(#)strtol.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c
index bdbd38ab861f..360bb7efc8be 100644
--- a/lib/libc/stdlib/strtol.c
+++ b/lib/libc/stdlib/strtol.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)strtol.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <ctype.h>
#include <errno.h>
diff --git a/lib/libc/stdlib/strtold.c b/lib/libc/stdlib/strtold.c
index 814e6fcc056c..2f7cabbdd88b 100644
--- a/lib/libc/stdlib/strtold.c
+++ b/lib/libc/stdlib/strtold.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include "xlocale_private.h"
diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c
index fe316420516c..51a523e51fb8 100644
--- a/lib/libc/stdlib/strtoll.c
+++ b/lib/libc/stdlib/strtoll.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)strtoq.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <errno.h>
#include <ctype.h>
diff --git a/lib/libc/stdlib/strtonum.c b/lib/libc/stdlib/strtonum.c
index aa433d835b36..a25c43f6a330 100644
--- a/lib/libc/stdlib/strtonum.c
+++ b/lib/libc/stdlib/strtonum.c
@@ -18,8 +18,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/strtoq.c b/lib/libc/stdlib/strtoq.c
index b3fd56186206..e83af1c7652a 100644
--- a/lib/libc/stdlib/strtoq.c
+++ b/lib/libc/stdlib/strtoq.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)strtoq.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c
index 89571962f8fc..133d4c9b4695 100644
--- a/lib/libc/stdlib/strtoul.c
+++ b/lib/libc/stdlib/strtoul.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <ctype.h>
#include <errno.h>
diff --git a/lib/libc/stdlib/strtoull.c b/lib/libc/stdlib/strtoull.c
index 03bd9f8ab7f9..464c37d49ef3 100644
--- a/lib/libc/stdlib/strtoull.c
+++ b/lib/libc/stdlib/strtoull.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)strtouq.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <errno.h>
#include <ctype.h>
diff --git a/lib/libc/stdlib/strtoumax.c b/lib/libc/stdlib/strtoumax.c
index 8243451d0ce6..af02b30254d6 100644
--- a/lib/libc/stdlib/strtoumax.c
+++ b/lib/libc/stdlib/strtoumax.c
@@ -38,8 +38,6 @@
static char sccsid[] = "from @(#)strtoul.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/strtouq.c b/lib/libc/stdlib/strtouq.c
index 77a74995afbd..18e917b19b67 100644
--- a/lib/libc/stdlib/strtouq.c
+++ b/lib/libc/stdlib/strtouq.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)strtouq.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c
index 343183256718..4ad5d605865b 100644
--- a/lib/libc/stdlib/system.c
+++ b/lib/libc/stdlib/system.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)system.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/lib/libc/stdlib/tdelete.c b/lib/libc/stdlib/tdelete.c
index 38b2bd739170..8b3f34848db0 100644
--- a/lib/libc/stdlib/tdelete.c
+++ b/lib/libc/stdlib/tdelete.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _SEARCH_PRIVATE
#include <search.h>
#include <stdbool.h>
diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c
index afcbc16cd2d4..5fa35f1bd85f 100644
--- a/lib/libc/stdlib/tfind.c
+++ b/lib/libc/stdlib/tfind.c
@@ -15,8 +15,6 @@
__RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#define _SEARCH_PRIVATE
#include <stdlib.h>
#include <search.h>
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c
index a15c2c20517b..09d6e4d26a87 100644
--- a/lib/libc/stdlib/tsearch.c
+++ b/lib/libc/stdlib/tsearch.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _SEARCH_PRIVATE
#include <search.h>
#include <stdlib.h>
diff --git a/lib/libc/stdlib/twalk.c b/lib/libc/stdlib/twalk.c
index 4f999b4c0a48..28529ea00adf 100644
--- a/lib/libc/stdlib/twalk.c
+++ b/lib/libc/stdlib/twalk.c
@@ -15,8 +15,6 @@
__RCSID("$NetBSD: twalk.c,v 1.4 2012/03/20 16:38:45 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#define _SEARCH_PRIVATE
#include <search.h>
#include <stdlib.h>
diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c
index 722f2a36992b..674aaa0bb302 100644
--- a/lib/libc/stdtime/strftime.c
+++ b/lib/libc/stdtime/strftime.c
@@ -37,8 +37,6 @@ static const char elsieid[] = "@(#)strftime.3 8.3";
static const char sccsid[] = "@(#)strftime.c 5.4 (Berkeley) 3/14/89";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "tzfile.h"
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index 1a8826246664..848b94545dd2 100644
--- a/lib/libc/stdtime/strptime.c
+++ b/lib/libc/stdtime/strptime.c
@@ -45,8 +45,6 @@ static char copyright[] __unused =
static char sccsid[] __unused = "@(#)strptime.c 0.1 (Powerdog) 94/03/27";
#endif /* !defined NOID */
#endif /* not lint */
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <time.h>
#include <ctype.h>
diff --git a/lib/libc/stdtime/time32.c b/lib/libc/stdtime/time32.c
index e852a4f279e4..1be9e9dec74c 100644
--- a/lib/libc/stdtime/time32.c
+++ b/lib/libc/stdtime/time32.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <timeconv.h>
diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c
index 5c876ff3b4cb..93b9868d0319 100644
--- a/lib/libc/stdtime/timelocal.c
+++ b/lib/libc/stdtime/timelocal.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include "ldpart.h"
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index c42fe79ddb2f..0a7c6f0948a6 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)bcmp.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <strings.h>
/*
diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c
index 84715d0432e3..4328542d2d54 100644
--- a/lib/libc/string/bcopy.c
+++ b/lib/libc/string/bcopy.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)bcopy.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
typedef intptr_t word; /* "word" used for optimal copy speed */
diff --git a/lib/libc/string/bzero.c b/lib/libc/string/bzero.c
index 201bd64f808d..fe149def7930 100644
--- a/lib/libc/string/bzero.c
+++ b/lib/libc/string/bzero.c
@@ -1,5 +1,3 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define BZERO
#include "memset.c"
diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c
index 34140e3e4d85..b318c33f641b 100644
--- a/lib/libc/string/ffs.c
+++ b/lib/libc/string/ffs.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)ffs.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <strings.h>
/*
diff --git a/lib/libc/string/ffsl.c b/lib/libc/string/ffsl.c
index 701e23cdf8f4..237e62617315 100644
--- a/lib/libc/string/ffsl.c
+++ b/lib/libc/string/ffsl.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <strings.h>
/*
diff --git a/lib/libc/string/ffsll.c b/lib/libc/string/ffsll.c
index e94fb518eb03..4fb5ccc4ef7c 100644
--- a/lib/libc/string/ffsll.c
+++ b/lib/libc/string/ffsll.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <strings.h>
/*
diff --git a/lib/libc/string/fls.c b/lib/libc/string/fls.c
index 3c4719776778..554b8dc4b413 100644
--- a/lib/libc/string/fls.c
+++ b/lib/libc/string/fls.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <strings.h>
diff --git a/lib/libc/string/flsl.c b/lib/libc/string/flsl.c
index f5280b77a4e2..6b881bc39b9e 100644
--- a/lib/libc/string/flsl.c
+++ b/lib/libc/string/flsl.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <strings.h>
diff --git a/lib/libc/string/flsll.c b/lib/libc/string/flsll.c
index ab504b8e592f..68d6d52bee4b 100644
--- a/lib/libc/string/flsll.c
+++ b/lib/libc/string/flsll.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <strings.h>
diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c
index e4c9d0e17edd..a81e8936e46a 100644
--- a/lib/libc/string/memccpy.c
+++ b/lib/libc/string/memccpy.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)memccpy.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
void *
diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c
index 4b5d6f6a4c8a..10df015c5b64 100644
--- a/lib/libc/string/memchr.c
+++ b/lib/libc/string/memchr.c
@@ -23,8 +23,6 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stdint.h>
#include <string.h>
diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c
index c8d5d92985e2..1a72e376c37a 100644
--- a/lib/libc/string/memcmp.c
+++ b/lib/libc/string/memcmp.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)memcmp.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
/*
diff --git a/lib/libc/string/memcpy.c b/lib/libc/string/memcpy.c
index ed03856e54b4..886b7cb2c654 100644
--- a/lib/libc/string/memcpy.c
+++ b/lib/libc/string/memcpy.c
@@ -1,5 +1,3 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define MEMCOPY
#include "bcopy.c"
diff --git a/lib/libc/string/memmem.c b/lib/libc/string/memmem.c
index be52763e2652..11e1540bf1fc 100644
--- a/lib/libc/string/memmem.c
+++ b/lib/libc/string/memmem.c
@@ -23,8 +23,6 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <string.h>
diff --git a/lib/libc/string/memmove.c b/lib/libc/string/memmove.c
index 05cf75a2ce6a..089a77a892a0 100644
--- a/lib/libc/string/memmove.c
+++ b/lib/libc/string/memmove.c
@@ -1,5 +1,3 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define MEMMOVE
#include "bcopy.c"
diff --git a/lib/libc/string/mempcpy.c b/lib/libc/string/mempcpy.c
index 98d367ccdc52..2c645da97627 100644
--- a/lib/libc/string/mempcpy.c
+++ b/lib/libc/string/mempcpy.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
void *
diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c
index e2d4027eea0c..eed47014356f 100644
--- a/lib/libc/string/memset.c
+++ b/lib/libc/string/memset.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)memset.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <limits.h>
diff --git a/lib/libc/string/memset_s.c b/lib/libc/string/memset_s.c
index 7dcef678ca00..3c7f76d19d7b 100644
--- a/lib/libc/string/memset_s.c
+++ b/lib/libc/string/memset_s.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/lib/libc/string/stpcpy.c b/lib/libc/string/stpcpy.c
index f31cce131777..02640a68b0ae 100644
--- a/lib/libc/string/stpcpy.c
+++ b/lib/libc/string/stpcpy.c
@@ -35,8 +35,6 @@
static char sccsid[] = "@(#)strcpy.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
char *
diff --git a/lib/libc/string/stpncpy.c b/lib/libc/string/stpncpy.c
index 3e7f1b69f08a..46e61c468d99 100644
--- a/lib/libc/string/stpncpy.c
+++ b/lib/libc/string/stpncpy.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
char *
diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c
index efe36f8c012d..c959869ad9f0 100644
--- a/lib/libc/string/strcasecmp.c
+++ b/lib/libc/string/strcasecmp.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <strings.h>
#include <ctype.h>
#include "xlocale_private.h"
diff --git a/lib/libc/string/strcasestr.c b/lib/libc/string/strcasestr.c
index be6c55df2f5f..591a2d95304b 100644
--- a/lib/libc/string/strcasestr.c
+++ b/lib/libc/string/strcasestr.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <string.h>
#include "xlocale_private.h"
diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
index adaad598ec22..94f851d4a257 100644
--- a/lib/libc/string/strcat.c
+++ b/lib/libc/string/strcat.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)strcat.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
char *
diff --git a/lib/libc/string/strchr.c b/lib/libc/string/strchr.c
index 4a20ea658252..d4e35b07c8c1 100644
--- a/lib/libc/string/strchr.c
+++ b/lib/libc/string/strchr.c
@@ -23,8 +23,6 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
char *__strchrnul(const char *, int);
diff --git a/lib/libc/string/strchrnul.c b/lib/libc/string/strchrnul.c
index e1fb83886042..1841185dc9b6 100644
--- a/lib/libc/string/strchrnul.c
+++ b/lib/libc/string/strchrnul.c
@@ -23,8 +23,6 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stdint.h>
#include <string.h>
diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c
index 63cb4468415b..9d590cc5a4f0 100644
--- a/lib/libc/string/strcmp.c
+++ b/lib/libc/string/strcmp.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
/*
diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c
index 5c7a11ec5060..a682f352320f 100644
--- a/lib/libc/string/strcoll.c
+++ b/lib/libc/string/strcoll.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <string.h>
#include <errno.h>
diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
index f58cbd9784a2..5b0ca98fb8b5 100644
--- a/lib/libc/string/strcpy.c
+++ b/lib/libc/string/strcpy.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)strcpy.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#ifdef WEAK_STRCPY
diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c
index 33ccdfdd557f..687a309d01d9 100644
--- a/lib/libc/string/strcspn.c
+++ b/lib/libc/string/strcspn.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <limits.h>
#include <string.h>
diff --git a/lib/libc/string/strdup.c b/lib/libc/string/strdup.c
index 45ed95c2ea9d..3e6849abe12c 100644
--- a/lib/libc/string/strdup.c
+++ b/lib/libc/string/strdup.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)strdup.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c
index bb685e4f7dc9..673ccbf37ef7 100644
--- a/lib/libc/string/strerror.c
+++ b/lib/libc/string/strerror.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)strerror.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if defined(NLS)
#include <nl_types.h>
#endif
diff --git a/lib/libc/string/strlcat.c b/lib/libc/string/strlcat.c
index f5ed6c6cf70c..e5040019b29b 100644
--- a/lib/libc/string/strlcat.c
+++ b/lib/libc/string/strlcat.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c
index 019d2316a046..8c7daa858960 100644
--- a/lib/libc/string/strlcpy.c
+++ b/lib/libc/string/strlcpy.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
index 17c30cd4cfc5..d7c744d6aa60 100644
--- a/lib/libc/string/strlen.c
+++ b/lib/libc/string/strlen.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/limits.h>
#include <sys/types.h>
#include <string.h>
diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
index d601bd0430e1..58b9490bb163 100644
--- a/lib/libc/string/strmode.c
+++ b/lib/libc/string/strmode.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)strmode.c 8.3 (Berkeley) 8/15/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c
index 116fc53f92f4..3220f036c458 100644
--- a/lib/libc/string/strncat.c
+++ b/lib/libc/string/strncat.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)strncat.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
/*
diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c
index c68fe005fcbc..111d77b592c2 100644
--- a/lib/libc/string/strncmp.c
+++ b/lib/libc/string/strncmp.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
int
diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c
index 2ffce161c5c5..6a00e1ba5135 100644
--- a/lib/libc/string/strncpy.c
+++ b/lib/libc/string/strncpy.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)strncpy.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
/*
diff --git a/lib/libc/string/strndup.c b/lib/libc/string/strndup.c
index bee944db167a..a2351bf40722 100644
--- a/lib/libc/string/strndup.c
+++ b/lib/libc/string/strndup.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/string/strnlen.c b/lib/libc/string/strnlen.c
index ef0cd86e5278..8fa984551b8e 100644
--- a/lib/libc/string/strnlen.c
+++ b/lib/libc/string/strnlen.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
size_t
diff --git a/lib/libc/string/strnstr.c b/lib/libc/string/strnstr.c
index 756399fea902..023b167e9c36 100644
--- a/lib/libc/string/strnstr.c
+++ b/lib/libc/string/strnstr.c
@@ -37,8 +37,6 @@
static char sccsid[] = "@(#)strstr.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
/*
diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c
index 964379e19074..80ac5ebc4bde 100644
--- a/lib/libc/string/strpbrk.c
+++ b/lib/libc/string/strpbrk.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)strpbrk.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
/*
diff --git a/lib/libc/string/strrchr.c b/lib/libc/string/strrchr.c
index 6afb8c1a497f..cfe6f9270bce 100644
--- a/lib/libc/string/strrchr.c
+++ b/lib/libc/string/strrchr.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)rindex.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include <string.h>
diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c
index 5de452109df7..a3d64c92ff53 100644
--- a/lib/libc/string/strsep.c
+++ b/lib/libc/string/strsep.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)strsep.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <stdio.h>
diff --git a/lib/libc/string/strsignal.c b/lib/libc/string/strsignal.c
index 5f3292d10255..5abe7b37ed99 100644
--- a/lib/libc/string/strsignal.c
+++ b/lib/libc/string/strsignal.c
@@ -33,8 +33,6 @@
static char sccsid[] = "@(#)strerror.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#if defined(NLS)
#include <nl_types.h>
diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c
index 93ddbcf0ca75..a9df4da92cbe 100644
--- a/lib/libc/string/strspn.c
+++ b/lib/libc/string/strspn.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <limits.h>
#include <string.h>
diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c
index 2ca0d4fd03c1..f3658805996b 100644
--- a/lib/libc/string/strstr.c
+++ b/lib/libc/string/strstr.c
@@ -23,8 +23,6 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <string.h>
diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c
index 46e40bfa4a61..1ff7a3aa45fc 100644
--- a/lib/libc/string/strtok.c
+++ b/lib/libc/string/strtok.c
@@ -38,8 +38,6 @@
static char sccsid[] = "@(#)strtok.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#ifdef DEBUG_STRTOK
#include <stdio.h>
diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
index a6b8018b2a8e..d9f3d0a7b6d5 100644
--- a/lib/libc/string/strxfrm.c
+++ b/lib/libc/string/strxfrm.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <string.h>
#include <errno.h>
diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c
index 724ee48ea0c7..c239808291f0 100644
--- a/lib/libc/string/swab.c
+++ b/lib/libc/string/swab.c
@@ -36,8 +36,6 @@
static char sccsid[] = "@(#)swab.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <unistd.h>
void
diff --git a/lib/libc/string/timingsafe_bcmp.c b/lib/libc/string/timingsafe_bcmp.c
index d098158059f3..145b02b74b09 100644
--- a/lib/libc/string/timingsafe_bcmp.c
+++ b/lib/libc/string/timingsafe_bcmp.c
@@ -16,8 +16,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
int __timingsafe_bcmp(const void *, const void *, size_t);
diff --git a/lib/libc/string/timingsafe_memcmp.c b/lib/libc/string/timingsafe_memcmp.c
index 7abfb48045f8..446a8a6cb2c3 100644
--- a/lib/libc/string/timingsafe_memcmp.c
+++ b/lib/libc/string/timingsafe_memcmp.c
@@ -16,8 +16,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <string.h>
diff --git a/lib/libc/string/wcpcpy.c b/lib/libc/string/wcpcpy.c
index 41b7c5178269..22c623bef320 100644
--- a/lib/libc/string/wcpcpy.c
+++ b/lib/libc/string/wcpcpy.c
@@ -35,8 +35,6 @@
static char sccsid[] = "@(#)strcpy.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcpncpy.c b/lib/libc/string/wcpncpy.c
index ccc64cd49d61..4249f8bd24aa 100644
--- a/lib/libc/string/wcpncpy.c
+++ b/lib/libc/string/wcpncpy.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcscasecmp.c b/lib/libc/string/wcscasecmp.c
index 03a61f8656b6..50949ff38744 100644
--- a/lib/libc/string/wcscasecmp.c
+++ b/lib/libc/string/wcscasecmp.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
#include <wctype.h>
diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c
index 777a576bb557..3599e562e9b4 100644
--- a/lib/libc/string/wcscat.c
+++ b/lib/libc/string/wcscat.c
@@ -34,8 +34,6 @@
__RCSID("$NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c
index a7f1de04fe28..24c150ad17b4 100644
--- a/lib/libc/string/wcschr.c
+++ b/lib/libc/string/wcschr.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c
index 7205238d5637..ed02db771704 100644
--- a/lib/libc/string/wcscmp.c
+++ b/lib/libc/string/wcscmp.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93";
__RCSID("$NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
/*
diff --git a/lib/libc/string/wcscoll.c b/lib/libc/string/wcscoll.c
index 2f1cf204bc81..b7720c4069d1 100644
--- a/lib/libc/string/wcscoll.c
+++ b/lib/libc/string/wcscoll.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c
index b400fae1cb5c..622e4201f84b 100644
--- a/lib/libc/string/wcscpy.c
+++ b/lib/libc/string/wcscpy.c
@@ -34,8 +34,6 @@
__RCSID("$NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c
index a0db7157e9e0..2bfd5e9f8604 100644
--- a/lib/libc/string/wcscspn.c
+++ b/lib/libc/string/wcscspn.c
@@ -34,8 +34,6 @@
__RCSID("$NetBSD: wcscspn.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
size_t
diff --git a/lib/libc/string/wcsdup.c b/lib/libc/string/wcsdup.c
index 327574bad763..9aa088d3315f 100644
--- a/lib/libc/string/wcsdup.c
+++ b/lib/libc/string/wcsdup.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <wchar.h>
diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c
index f954b7351fe5..336947e3cd23 100644
--- a/lib/libc/string/wcslcat.c
+++ b/lib/libc/string/wcslcat.c
@@ -35,8 +35,6 @@
__RCSID("$NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <wchar.h>
diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c
index ca60d587004f..920425bb5efc 100644
--- a/lib/libc/string/wcslcpy.c
+++ b/lib/libc/string/wcslcpy.c
@@ -35,8 +35,6 @@
__RCSID("$NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <wchar.h>
diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c
index cfd3aa23cc99..e81d981c799b 100644
--- a/lib/libc/string/wcslen.c
+++ b/lib/libc/string/wcslen.c
@@ -34,8 +34,6 @@
__RCSID("$NetBSD: wcslen.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
size_t
diff --git a/lib/libc/string/wcsncasecmp.c b/lib/libc/string/wcsncasecmp.c
index 39f58be0bff8..1b6772152f4a 100644
--- a/lib/libc/string/wcsncasecmp.c
+++ b/lib/libc/string/wcsncasecmp.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
#include <wctype.h>
diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c
index eb13fab8de34..004391423f53 100644
--- a/lib/libc/string/wcsncat.c
+++ b/lib/libc/string/wcsncat.c
@@ -34,8 +34,6 @@
__RCSID("$NetBSD: wcsncat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c
index 55c88f60e6fa..a7b2189d5fb9 100644
--- a/lib/libc/string/wcsncmp.c
+++ b/lib/libc/string/wcsncmp.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93";
__RCSID("$NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
int
diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c
index f86e40fe9536..16e3eb899b84 100644
--- a/lib/libc/string/wcsncpy.c
+++ b/lib/libc/string/wcsncpy.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)strncpy.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
/*
diff --git a/lib/libc/string/wcsnlen.c b/lib/libc/string/wcsnlen.c
index 15fd520101a1..3c500855eb1f 100644
--- a/lib/libc/string/wcsnlen.c
+++ b/lib/libc/string/wcsnlen.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
size_t
diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c
index 0e9ccf66e312..62ad9a8130a2 100644
--- a/lib/libc/string/wcspbrk.c
+++ b/lib/libc/string/wcspbrk.c
@@ -34,8 +34,6 @@
__RCSID("$NetBSD: wcspbrk.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c
index cc5e7f2ff6e1..60f56551aaac 100644
--- a/lib/libc/string/wcsrchr.c
+++ b/lib/libc/string/wcsrchr.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c
index 2b08acbd94f6..487ef6bdf3b4 100644
--- a/lib/libc/string/wcsspn.c
+++ b/lib/libc/string/wcsspn.c
@@ -34,8 +34,6 @@
__RCSID("$NetBSD: wcsspn.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
size_t
diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c
index 74921fecf047..ff8739f1c75a 100644
--- a/lib/libc/string/wcsstr.c
+++ b/lib/libc/string/wcsstr.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)strstr.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
/*
diff --git a/lib/libc/string/wcstok.c b/lib/libc/string/wcstok.c
index b4bdc869a2e1..65312db85b56 100644
--- a/lib/libc/string/wcstok.c
+++ b/lib/libc/string/wcstok.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c
index d5bf7ce5fe41..84e9af602801 100644
--- a/lib/libc/string/wcswidth.c
+++ b/lib/libc/string/wcswidth.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
#include "xlocale_private.h"
diff --git a/lib/libc/string/wcsxfrm.c b/lib/libc/string/wcsxfrm.c
index e28d0d66b1e3..6e4d7534828b 100644
--- a/lib/libc/string/wcsxfrm.c
+++ b/lib/libc/string/wcsxfrm.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c
index 42ae286aaec7..8724187ffd63 100644
--- a/lib/libc/string/wmemchr.c
+++ b/lib/libc/string/wmemchr.c
@@ -34,8 +34,6 @@
__RCSID("$NetBSD: wmemchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c
index f1b1b00eb5da..1abebfd8da95 100644
--- a/lib/libc/string/wmemcmp.c
+++ b/lib/libc/string/wmemcmp.c
@@ -34,8 +34,6 @@
__RCSID("$NetBSD: wmemcmp.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
int
diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c
index 30956eb4f483..f692a25fc95b 100644
--- a/lib/libc/string/wmemcpy.c
+++ b/lib/libc/string/wmemcpy.c
@@ -34,8 +34,6 @@
__RCSID("$NetBSD: wmemcpy.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <wchar.h>
diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c
index 5e8da9f4004c..cbbdb4afdd6c 100644
--- a/lib/libc/string/wmemmove.c
+++ b/lib/libc/string/wmemmove.c
@@ -34,8 +34,6 @@
__RCSID("$NetBSD: wmemmove.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <wchar.h>
diff --git a/lib/libc/string/wmempcpy.c b/lib/libc/string/wmempcpy.c
index 12e88a417c54..a21621de3977 100644
--- a/lib/libc/string/wmempcpy.c
+++ b/lib/libc/string/wmempcpy.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <wchar.h>
diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c
index fcf40efb8e32..4276373399f9 100644
--- a/lib/libc/string/wmemset.c
+++ b/lib/libc/string/wmemset.c
@@ -34,8 +34,6 @@
__RCSID("$NetBSD: wmemset.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
wchar_t *
diff --git a/lib/libc/sys/POSIX2x_Fork.c b/lib/libc/sys/POSIX2x_Fork.c
index 62ea5c90fe9b..4745f1be42b5 100644
--- a/lib/libc/sys/POSIX2x_Fork.c
+++ b/lib/libc/sys/POSIX2x_Fork.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <unistd.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/__error.c b/lib/libc/sys/__error.c
index ff73a6a16fb5..d37527052585 100644
--- a/lib/libc/sys/__error.c
+++ b/lib/libc/sys/__error.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "libc_private.h"
extern int errno;
diff --git a/lib/libc/sys/__vdso_gettimeofday.c b/lib/libc/sys/__vdso_gettimeofday.c
index 0bf9f0782d19..f256849562dd 100644
--- a/lib/libc/sys/__vdso_gettimeofday.c
+++ b/lib/libc/sys/__vdso_gettimeofday.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/elf.h>
#include <sys/time.h>
#include <sys/vdso.h>
diff --git a/lib/libc/sys/accept.c b/lib/libc/sys/accept.c
index 10007ec61a69..417fb344a91e 100644
--- a/lib/libc/sys/accept.c
+++ b/lib/libc/sys/accept.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/socket.h>
diff --git a/lib/libc/sys/accept4.c b/lib/libc/sys/accept4.c
index 0440c79a034b..56cc06efdfe6 100644
--- a/lib/libc/sys/accept4.c
+++ b/lib/libc/sys/accept4.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/socket.h>
diff --git a/lib/libc/sys/aio_suspend.c b/lib/libc/sys/aio_suspend.c
index 35a050e1fd0d..fc9a0d906c92 100644
--- a/lib/libc/sys/aio_suspend.c
+++ b/lib/libc/sys/aio_suspend.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/aio.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/brk.c b/lib/libc/sys/brk.c
index 66e04656a8f7..51bbcbdfcaef 100644
--- a/lib/libc/sys/brk.c
+++ b/lib/libc/sys/brk.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <errno.h>
diff --git a/lib/libc/sys/clock_gettime.c b/lib/libc/sys/clock_gettime.c
index b2a414455245..7894dbf4ef5a 100644
--- a/lib/libc/sys/clock_gettime.c
+++ b/lib/libc/sys/clock_gettime.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/syscall.h>
#include <sys/time.h>
#include <sys/vdso.h>
diff --git a/lib/libc/sys/clock_nanosleep.c b/lib/libc/sys/clock_nanosleep.c
index e6afea809943..9989f1a995f5 100644
--- a/lib/libc/sys/clock_nanosleep.c
+++ b/lib/libc/sys/clock_nanosleep.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <time.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/close.c b/lib/libc/sys/close.c
index fa1a6f01f0ae..0fb319b77102 100644
--- a/lib/libc/sys/close.c
+++ b/lib/libc/sys/close.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/fcntl.h>
#include <unistd.h>
diff --git a/lib/libc/sys/closefrom.c b/lib/libc/sys/closefrom.c
index 56982bba5b8a..2eb8536e6968 100644
--- a/lib/libc/sys/closefrom.c
+++ b/lib/libc/sys/closefrom.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/syscall.h>
#include <unistd.h>
diff --git a/lib/libc/sys/connect.c b/lib/libc/sys/connect.c
index d2863857ac8a..10277dfadc64 100644
--- a/lib/libc/sys/connect.c
+++ b/lib/libc/sys/connect.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/socket.h>
diff --git a/lib/libc/sys/fcntl.c b/lib/libc/sys/fcntl.c
index 340721f6a5cf..ff231981d079 100644
--- a/lib/libc/sys/fcntl.c
+++ b/lib/libc/sys/fcntl.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fcntl.h>
#include <stdarg.h>
#include <sys/types.h>
diff --git a/lib/libc/sys/fdatasync.c b/lib/libc/sys/fdatasync.c
index 504f39a14df2..b56d5aa533d4 100644
--- a/lib/libc/sys/fdatasync.c
+++ b/lib/libc/sys/fdatasync.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/fcntl.h>
#include <unistd.h>
diff --git a/lib/libc/sys/fork.c b/lib/libc/sys/fork.c
index 04ff1edd4857..c45e5c93f226 100644
--- a/lib/libc/sys/fork.c
+++ b/lib/libc/sys/fork.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <unistd.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/fstat.c b/lib/libc/sys/fstat.c
index d31b1f54bb11..4efeecfd0978 100644
--- a/lib/libc/sys/fstat.c
+++ b/lib/libc/sys/fstat.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/syscall.h>
diff --git a/lib/libc/sys/fstatat.c b/lib/libc/sys/fstatat.c
index 104f22ee16bd..d83647f98da1 100644
--- a/lib/libc/sys/fstatat.c
+++ b/lib/libc/sys/fstatat.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/syscall.h>
diff --git a/lib/libc/sys/fstatfs.c b/lib/libc/sys/fstatfs.c
index 836127842c4a..517ba2a420b6 100644
--- a/lib/libc/sys/fstatfs.c
+++ b/lib/libc/sys/fstatfs.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/syscall.h>
diff --git a/lib/libc/sys/fsync.c b/lib/libc/sys/fsync.c
index 2e2d10e91df9..ae9554f468f6 100644
--- a/lib/libc/sys/fsync.c
+++ b/lib/libc/sys/fsync.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/fcntl.h>
#include <unistd.h>
diff --git a/lib/libc/sys/getdents.c b/lib/libc/sys/getdents.c
index 480fbf265fb9..b34b7003a729 100644
--- a/lib/libc/sys/getdents.c
+++ b/lib/libc/sys/getdents.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/syscall.h>
diff --git a/lib/libc/sys/getdirentries.c b/lib/libc/sys/getdirentries.c
index 5a94c6096d59..92f43e74cab7 100644
--- a/lib/libc/sys/getdirentries.c
+++ b/lib/libc/sys/getdirentries.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _WANT_FREEBSD11_DIRENT
#include "namespace.h"
diff --git a/lib/libc/sys/getfsstat.c b/lib/libc/sys/getfsstat.c
index edbfaa989b5a..60cd433c9d40 100644
--- a/lib/libc/sys/getfsstat.c
+++ b/lib/libc/sys/getfsstat.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include "compat-ino64.h"
diff --git a/lib/libc/sys/gettimeofday.c b/lib/libc/sys/gettimeofday.c
index d955aaa907e2..8a09098d0ef5 100644
--- a/lib/libc/sys/gettimeofday.c
+++ b/lib/libc/sys/gettimeofday.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/syscall.h>
#include <sys/time.h>
#include <sys/vdso.h>
diff --git a/lib/libc/sys/interposing_table.c b/lib/libc/sys/interposing_table.c
index adbfe9daa05b..d5517a83b14a 100644
--- a/lib/libc/sys/interposing_table.c
+++ b/lib/libc/sys/interposing_table.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/kevent.c b/lib/libc/sys/kevent.c
index b3bf2b6f6592..ef2440721bb4 100644
--- a/lib/libc/sys/kevent.c
+++ b/lib/libc/sys/kevent.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>
diff --git a/lib/libc/sys/lstat.c b/lib/libc/sys/lstat.c
index 4b7e0b1bf2b8..c9c3351e79fc 100644
--- a/lib/libc/sys/lstat.c
+++ b/lib/libc/sys/lstat.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/syscall.h>
diff --git a/lib/libc/sys/mknod.c b/lib/libc/sys/mknod.c
index 3bb3853b5849..8e8fa9faaebf 100644
--- a/lib/libc/sys/mknod.c
+++ b/lib/libc/sys/mknod.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/fcntl.h>
diff --git a/lib/libc/sys/msync.c b/lib/libc/sys/msync.c
index e7a1a4a9629a..96b0e778d115 100644
--- a/lib/libc/sys/msync.c
+++ b/lib/libc/sys/msync.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/fcntl.h>
#include <sys/mman.h>
diff --git a/lib/libc/sys/nanosleep.c b/lib/libc/sys/nanosleep.c
index 89cbd5e06e36..076ee33e44ea 100644
--- a/lib/libc/sys/nanosleep.c
+++ b/lib/libc/sys/nanosleep.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <time.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/open.c b/lib/libc/sys/open.c
index 740d1da53598..020134d5693b 100644
--- a/lib/libc/sys/open.c
+++ b/lib/libc/sys/open.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/fcntl.h>
#include <stdarg.h>
diff --git a/lib/libc/sys/openat.c b/lib/libc/sys/openat.c
index 62188fbc3e48..9edf7d493bfd 100644
--- a/lib/libc/sys/openat.c
+++ b/lib/libc/sys/openat.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/fcntl.h>
#include <stdarg.h>
diff --git a/lib/libc/sys/pdfork.c b/lib/libc/sys/pdfork.c
index f58d36736d7c..14867a2f20a5 100644
--- a/lib/libc/sys/pdfork.c
+++ b/lib/libc/sys/pdfork.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/procdesc.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/poll.c b/lib/libc/sys/poll.c
index 5b48e4b1bcab..f03320dc9319 100644
--- a/lib/libc/sys/poll.c
+++ b/lib/libc/sys/poll.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/poll.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/ppoll.c b/lib/libc/sys/ppoll.c
index 4f346fb19b39..8f886b8c5108 100644
--- a/lib/libc/sys/ppoll.c
+++ b/lib/libc/sys/ppoll.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/poll.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/pselect.c b/lib/libc/sys/pselect.c
index 0839f48dfd37..2ea717ef1d65 100644
--- a/lib/libc/sys/pselect.c
+++ b/lib/libc/sys/pselect.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/select.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/ptrace.c b/lib/libc/sys/ptrace.c
index 69160762c6c8..55ad50e025aa 100644
--- a/lib/libc/sys/ptrace.c
+++ b/lib/libc/sys/ptrace.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ptrace.h>
#include <errno.h>
diff --git a/lib/libc/sys/read.c b/lib/libc/sys/read.c
index fd9ee37bf1e5..abc37431194d 100644
--- a/lib/libc/sys/read.c
+++ b/lib/libc/sys/read.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <unistd.h>
diff --git a/lib/libc/sys/readv.c b/lib/libc/sys/readv.c
index b02274cb00a0..21bfc25c5d84 100644
--- a/lib/libc/sys/readv.c
+++ b/lib/libc/sys/readv.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/uio.h>
diff --git a/lib/libc/sys/recvfrom.c b/lib/libc/sys/recvfrom.c
index c7b815a53d8b..5f5f95640932 100644
--- a/lib/libc/sys/recvfrom.c
+++ b/lib/libc/sys/recvfrom.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/socket.h>
diff --git a/lib/libc/sys/recvmsg.c b/lib/libc/sys/recvmsg.c
index afb15fa673ea..44b38aeab2d4 100644
--- a/lib/libc/sys/recvmsg.c
+++ b/lib/libc/sys/recvmsg.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/socket.h>
diff --git a/lib/libc/sys/select.c b/lib/libc/sys/select.c
index e607921da72c..a43e04bd5009 100644
--- a/lib/libc/sys/select.c
+++ b/lib/libc/sys/select.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/select.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/sendmsg.c b/lib/libc/sys/sendmsg.c
index 8b1505a796ac..f78fbaa258a5 100644
--- a/lib/libc/sys/sendmsg.c
+++ b/lib/libc/sys/sendmsg.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/socket.h>
diff --git a/lib/libc/sys/sendto.c b/lib/libc/sys/sendto.c
index d3914c7472a0..d27d8638e750 100644
--- a/lib/libc/sys/sendto.c
+++ b/lib/libc/sys/sendto.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/socket.h>
diff --git a/lib/libc/sys/setcontext.c b/lib/libc/sys/setcontext.c
index 2b1d5aba0e63..ffdd7ebbf890 100644
--- a/lib/libc/sys/setcontext.c
+++ b/lib/libc/sys/setcontext.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ucontext.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/shm_open.c b/lib/libc/sys/shm_open.c
index 16dfb051b77f..200103442d04 100644
--- a/lib/libc/sys/shm_open.c
+++ b/lib/libc/sys/shm_open.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/filio.h>
#include <sys/mman.h>
diff --git a/lib/libc/sys/sigaction.c b/lib/libc/sys/sigaction.c
index e050832f4705..7352f0a84989 100644
--- a/lib/libc/sys/sigaction.c
+++ b/lib/libc/sys/sigaction.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <signal.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/sigprocmask.c b/lib/libc/sys/sigprocmask.c
index 76ecd9fd98ac..c807d42fb2de 100644
--- a/lib/libc/sys/sigprocmask.c
+++ b/lib/libc/sys/sigprocmask.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <signal.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/sigsuspend.c b/lib/libc/sys/sigsuspend.c
index 5b20b743114e..46d5dc0edf49 100644
--- a/lib/libc/sys/sigsuspend.c
+++ b/lib/libc/sys/sigsuspend.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <signal.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/sigtimedwait.c b/lib/libc/sys/sigtimedwait.c
index 5c81927a526d..898f723987e2 100644
--- a/lib/libc/sys/sigtimedwait.c
+++ b/lib/libc/sys/sigtimedwait.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <signal.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/sigwait.c b/lib/libc/sys/sigwait.c
index 76bd9f1ae40a..2e1551b972ca 100644
--- a/lib/libc/sys/sigwait.c
+++ b/lib/libc/sys/sigwait.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <signal.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/sigwaitinfo.c b/lib/libc/sys/sigwaitinfo.c
index 6849a1d7c1b9..4caa52f3398d 100644
--- a/lib/libc/sys/sigwaitinfo.c
+++ b/lib/libc/sys/sigwaitinfo.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <signal.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/stat.c b/lib/libc/sys/stat.c
index f4f0289b2bd6..dc9ef16c79e7 100644
--- a/lib/libc/sys/stat.c
+++ b/lib/libc/sys/stat.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/syscall.h>
diff --git a/lib/libc/sys/statfs.c b/lib/libc/sys/statfs.c
index f7d4d7752c4a..b8ac38b131ca 100644
--- a/lib/libc/sys/statfs.c
+++ b/lib/libc/sys/statfs.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/syscall.h>
diff --git a/lib/libc/sys/swapcontext.c b/lib/libc/sys/swapcontext.c
index 0a8125eeabb5..1427468e50df 100644
--- a/lib/libc/sys/swapcontext.c
+++ b/lib/libc/sys/swapcontext.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/signal.h>
#include <sys/ucontext.h>
diff --git a/lib/libc/sys/trivial-vdso_tc.c b/lib/libc/sys/trivial-vdso_tc.c
index ce0c1444f318..0a9d9fa46173 100644
--- a/lib/libc/sys/trivial-vdso_tc.c
+++ b/lib/libc/sys/trivial-vdso_tc.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/vdso.h>
diff --git a/lib/libc/sys/wait4.c b/lib/libc/sys/wait4.c
index 0b14c363ed32..9efabec529d7 100644
--- a/lib/libc/sys/wait4.c
+++ b/lib/libc/sys/wait4.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/wait6.c b/lib/libc/sys/wait6.c
index af6a1b219a54..1bba04200e69 100644
--- a/lib/libc/sys/wait6.c
+++ b/lib/libc/sys/wait6.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
diff --git a/lib/libc/sys/write.c b/lib/libc/sys/write.c
index d38f7dfa9294..461975cd72fb 100644
--- a/lib/libc/sys/write.c
+++ b/lib/libc/sys/write.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <unistd.h>
diff --git a/lib/libc/sys/writev.c b/lib/libc/sys/writev.c
index 0ea5576b5b04..4d91d4dec95a 100644
--- a/lib/libc/sys/writev.c
+++ b/lib/libc/sys/writev.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/uio.h>
diff --git a/lib/libc/tests/gen/arc4random_test.c b/lib/libc/tests/gen/arc4random_test.c
index a28db303e88c..c3ec207077d3 100644
--- a/lib/libc/tests/gen/arc4random_test.c
+++ b/lib/libc/tests/gen/arc4random_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/wait.h>
diff --git a/lib/libc/tests/gen/dir2_test.c b/lib/libc/tests/gen/dir2_test.c
index 3322a5e5086c..5c9604856f11 100644
--- a/lib/libc/tests/gen/dir2_test.c
+++ b/lib/libc/tests/gen/dir2_test.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <dirent.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/lib/libc/tests/gen/dlopen_empty_test.c b/lib/libc/tests/gen/dlopen_empty_test.c
index 42f9269a10b2..1b48fd9d8d33 100644
--- a/lib/libc/tests/gen/dlopen_empty_test.c
+++ b/lib/libc/tests/gen/dlopen_empty_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <dlfcn.h>
#include <errno.h>
diff --git a/lib/libc/tests/gen/fmtcheck_test.c b/lib/libc/tests/gen/fmtcheck_test.c
index 3e180c9ca2e6..0df30cee96f0 100644
--- a/lib/libc/tests/gen/fmtcheck_test.c
+++ b/lib/libc/tests/gen/fmtcheck_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
#include <stdio.h>
diff --git a/lib/libc/tests/gen/fmtmsg_test.c b/lib/libc/tests/gen/fmtmsg_test.c
index aa3ca19425fe..7ab6a335c8e2 100644
--- a/lib/libc/tests/gen/fmtmsg_test.c
+++ b/lib/libc/tests/gen/fmtmsg_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/wait.h>
#include <err.h>
diff --git a/lib/libc/tests/gen/fnmatch_test.c b/lib/libc/tests/gen/fnmatch_test.c
index 8d9ead2eff91..abb7308f021b 100644
--- a/lib/libc/tests/gen/fnmatch_test.c
+++ b/lib/libc/tests/gen/fnmatch_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/tests/gen/fnmatch_testcases.h b/lib/libc/tests/gen/fnmatch_testcases.h
index 996e13c7756b..d205605826cf 100644
--- a/lib/libc/tests/gen/fnmatch_testcases.h
+++ b/lib/libc/tests/gen/fnmatch_testcases.h
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fnmatch.h>
struct testcase {
diff --git a/lib/libc/tests/gen/ftw_test.c b/lib/libc/tests/gen/ftw_test.c
index b120f01ff4f1..d6fe56f6499d 100644
--- a/lib/libc/tests/gen/ftw_test.c
+++ b/lib/libc/tests/gen/ftw_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/wait.h>
#include <err.h>
#include <errno.h>
diff --git a/lib/libc/tests/gen/getentropy_test.c b/lib/libc/tests/gen/getentropy_test.c
index 90954cc092aa..a79ef0628f97 100644
--- a/lib/libc/tests/gen/getentropy_test.c
+++ b/lib/libc/tests/gen/getentropy_test.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <signal.h>
diff --git a/lib/libc/tests/gen/getmntinfo_test.c b/lib/libc/tests/gen/getmntinfo_test.c
index 183fa84ed0e6..2284a6146556 100644
--- a/lib/libc/tests/gen/getmntinfo_test.c
+++ b/lib/libc/tests/gen/getmntinfo_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/ucred.h>
diff --git a/lib/libc/tests/gen/glob2_test.c b/lib/libc/tests/gen/glob2_test.c
index dfcce0eed3da..c18e03cc1025 100644
--- a/lib/libc/tests/gen/glob2_test.c
+++ b/lib/libc/tests/gen/glob2_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/lib/libc/tests/gen/makecontext_test.c b/lib/libc/tests/gen/makecontext_test.c
index 16bf4bbe10eb..7c5c5c48ede0 100644
--- a/lib/libc/tests/gen/makecontext_test.c
+++ b/lib/libc/tests/gen/makecontext_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <atf-c.h>
#include <ucontext.h>
diff --git a/lib/libc/tests/gen/popen_test.c b/lib/libc/tests/gen/popen_test.c
index 5c615b7146e9..89be6d257c34 100644
--- a/lib/libc/tests/gen/popen_test.c
+++ b/lib/libc/tests/gen/popen_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/wait.h>
#include <errno.h>
diff --git a/lib/libc/tests/gen/posix_spawn_test.c b/lib/libc/tests/gen/posix_spawn_test.c
index 46259cbf8cde..dc1381813098 100644
--- a/lib/libc/tests/gen/posix_spawn_test.c
+++ b/lib/libc/tests/gen/posix_spawn_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/wait.h>
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/tests/gen/realpath2_test.c b/lib/libc/tests/gen/realpath2_test.c
index 82ad7f870697..e3bd83448942 100644
--- a/lib/libc/tests/gen/realpath2_test.c
+++ b/lib/libc/tests/gen/realpath2_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/lib/libc/tests/gen/sigsetops_test.c b/lib/libc/tests/gen/sigsetops_test.c
index e4aa53e9b1c0..498d34bb23a4 100644
--- a/lib/libc/tests/gen/sigsetops_test.c
+++ b/lib/libc/tests/gen/sigsetops_test.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <signal.h>
#include <stdbool.h>
diff --git a/lib/libc/tests/gen/test-fnmatch.c b/lib/libc/tests/gen/test-fnmatch.c
index 7771ab37f0a0..e7c63b329439 100644
--- a/lib/libc/tests/gen/test-fnmatch.c
+++ b/lib/libc/tests/gen/test-fnmatch.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/gen/wordexp_test.c b/lib/libc/tests/gen/wordexp_test.c
index 3ccc67774c7f..ea8dc3d37828 100644
--- a/lib/libc/tests/gen/wordexp_test.c
+++ b/lib/libc/tests/gen/wordexp_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/wait.h>
#include <errno.h>
#include <signal.h>
diff --git a/lib/libc/tests/iconv/iconvctl_test.c b/lib/libc/tests/iconv/iconvctl_test.c
index 993629e6b4bd..06c882a6eee6 100644
--- a/lib/libc/tests/iconv/iconvctl_test.c
+++ b/lib/libc/tests/iconv/iconvctl_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <iconv.h>
#include <atf-c.h>
diff --git a/lib/libc/tests/locale/btowc_test.c b/lib/libc/tests/locale/btowc_test.c
index 01a1133e89d5..85be466eac7e 100644
--- a/lib/libc/tests/locale/btowc_test.c
+++ b/lib/libc/tests/locale/btowc_test.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <locale.h>
#include <stdio.h>
diff --git a/lib/libc/tests/locale/c16rtomb_test.c b/lib/libc/tests/locale/c16rtomb_test.c
index 7356e69f82f6..85c7c3584962 100644
--- a/lib/libc/tests/locale/c16rtomb_test.c
+++ b/lib/libc/tests/locale/c16rtomb_test.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/locale/iswctype_test.c b/lib/libc/tests/locale/iswctype_test.c
index 14e57b4e29a3..1780ade0bd4d 100644
--- a/lib/libc/tests/locale/iswctype_test.c
+++ b/lib/libc/tests/locale/iswctype_test.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <locale.h>
diff --git a/lib/libc/tests/locale/mblen_test.c b/lib/libc/tests/locale/mblen_test.c
index fbb938d3e5a6..91d01958e79a 100644
--- a/lib/libc/tests/locale/mblen_test.c
+++ b/lib/libc/tests/locale/mblen_test.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <locale.h>
#include <stdio.h>
diff --git a/lib/libc/tests/locale/mbrlen_test.c b/lib/libc/tests/locale/mbrlen_test.c
index c2bc54832156..33fa156bd2f0 100644
--- a/lib/libc/tests/locale/mbrlen_test.c
+++ b/lib/libc/tests/locale/mbrlen_test.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/locale/mbrtoc16_test.c b/lib/libc/tests/locale/mbrtoc16_test.c
index a6289e1004ca..09e0379ca021 100644
--- a/lib/libc/tests/locale/mbrtoc16_test.c
+++ b/lib/libc/tests/locale/mbrtoc16_test.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/locale/mbrtowc_test.c b/lib/libc/tests/locale/mbrtowc_test.c
index 37e0bfd6fbaa..a7b7f9ae08a6 100644
--- a/lib/libc/tests/locale/mbrtowc_test.c
+++ b/lib/libc/tests/locale/mbrtowc_test.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/locale/mbsnrtowcs_test.c b/lib/libc/tests/locale/mbsnrtowcs_test.c
index 4012b7e99720..3295379eee0d 100644
--- a/lib/libc/tests/locale/mbsnrtowcs_test.c
+++ b/lib/libc/tests/locale/mbsnrtowcs_test.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/locale/mbsrtowcs_test.c b/lib/libc/tests/locale/mbsrtowcs_test.c
index 1b9d5c933af1..8c67023b134d 100644
--- a/lib/libc/tests/locale/mbsrtowcs_test.c
+++ b/lib/libc/tests/locale/mbsrtowcs_test.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/locale/mbstowcs_test.c b/lib/libc/tests/locale/mbstowcs_test.c
index 77b0e9e52f35..ad5ac183ba5f 100644
--- a/lib/libc/tests/locale/mbstowcs_test.c
+++ b/lib/libc/tests/locale/mbstowcs_test.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/locale/mbtowc_test.c b/lib/libc/tests/locale/mbtowc_test.c
index 7c7f80eb5cc4..2a58b60df908 100644
--- a/lib/libc/tests/locale/mbtowc_test.c
+++ b/lib/libc/tests/locale/mbtowc_test.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <locale.h>
#include <stdio.h>
diff --git a/lib/libc/tests/locale/towctrans_test.c b/lib/libc/tests/locale/towctrans_test.c
index bb9d97ca2e54..734c7557252d 100644
--- a/lib/libc/tests/locale/towctrans_test.c
+++ b/lib/libc/tests/locale/towctrans_test.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <locale.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/libc/tests/locale/wcrtomb_test.c b/lib/libc/tests/locale/wcrtomb_test.c
index 09199ba97c99..58713faf625d 100644
--- a/lib/libc/tests/locale/wcrtomb_test.c
+++ b/lib/libc/tests/locale/wcrtomb_test.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/locale/wcsnrtombs_test.c b/lib/libc/tests/locale/wcsnrtombs_test.c
index 2e330a10ad83..d6b8be0dbdbe 100644
--- a/lib/libc/tests/locale/wcsnrtombs_test.c
+++ b/lib/libc/tests/locale/wcsnrtombs_test.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/locale/wcsrtombs_test.c b/lib/libc/tests/locale/wcsrtombs_test.c
index 4c3455a87769..10f4a4d46e1a 100644
--- a/lib/libc/tests/locale/wcsrtombs_test.c
+++ b/lib/libc/tests/locale/wcsrtombs_test.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/locale/wcstombs_test.c b/lib/libc/tests/locale/wcstombs_test.c
index f3fcd81001f1..90f893b2fb31 100644
--- a/lib/libc/tests/locale/wcstombs_test.c
+++ b/lib/libc/tests/locale/wcstombs_test.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/locale/wctomb_test.c b/lib/libc/tests/locale/wctomb_test.c
index 255cda432d7d..a1f19a44be4b 100644
--- a/lib/libc/tests/locale/wctomb_test.c
+++ b/lib/libc/tests/locale/wctomb_test.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/nss/getaddrinfo_test.c b/lib/libc/tests/nss/getaddrinfo_test.c
index aeac04110510..b7c4eec99779 100644
--- a/lib/libc/tests/nss/getaddrinfo_test.c
+++ b/lib/libc/tests/nss/getaddrinfo_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <arpa/inet.h>
diff --git a/lib/libc/tests/nss/getgr_test.c b/lib/libc/tests/nss/getgr_test.c
index 63dfea085095..28c5e2e98028 100644
--- a/lib/libc/tests/nss/getgr_test.c
+++ b/lib/libc/tests/nss/getgr_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <arpa/inet.h>
#include <errno.h>
#include <grp.h>
diff --git a/lib/libc/tests/nss/gethostby_test.c b/lib/libc/tests/nss/gethostby_test.c
index 39dbb9d9d55a..e13ffce15dac 100644
--- a/lib/libc/tests/nss/gethostby_test.c
+++ b/lib/libc/tests/nss/gethostby_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <arpa/inet.h>
diff --git a/lib/libc/tests/nss/getproto_test.c b/lib/libc/tests/nss/getproto_test.c
index 8de4ee60fdac..18a8f8b667af 100644
--- a/lib/libc/tests/nss/getproto_test.c
+++ b/lib/libc/tests/nss/getproto_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <arpa/inet.h>
#include <assert.h>
#include <errno.h>
diff --git a/lib/libc/tests/nss/getpw_test.c b/lib/libc/tests/nss/getpw_test.c
index 1d9ae6c1a5db..7525cd28b962 100644
--- a/lib/libc/tests/nss/getpw_test.c
+++ b/lib/libc/tests/nss/getpw_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <pwd.h>
#include <stdio.h>
diff --git a/lib/libc/tests/nss/getrpc_test.c b/lib/libc/tests/nss/getrpc_test.c
index 9be2349f2f90..5b7098962cf3 100644
--- a/lib/libc/tests/nss/getrpc_test.c
+++ b/lib/libc/tests/nss/getrpc_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <arpa/inet.h>
#include <rpc/rpc.h>
#include <errno.h>
diff --git a/lib/libc/tests/nss/getserv_test.c b/lib/libc/tests/nss/getserv_test.c
index 56dc6611f1ba..d74feb113a69 100644
--- a/lib/libc/tests/nss/getserv_test.c
+++ b/lib/libc/tests/nss/getserv_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <arpa/inet.h>
#include <errno.h>
#include <netdb.h>
diff --git a/lib/libc/tests/nss/getusershell_test.c b/lib/libc/tests/nss/getusershell_test.c
index e5c4b6755263..e130f36351fb 100644
--- a/lib/libc/tests/nss/getusershell_test.c
+++ b/lib/libc/tests/nss/getusershell_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libc/tests/stdio/fdopen_test.c b/lib/libc/tests/stdio/fdopen_test.c
index 060635af498b..211e16279a3c 100644
--- a/lib/libc/tests/stdio/fdopen_test.c
+++ b/lib/libc/tests/stdio/fdopen_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <fcntl.h>
#include <paths.h>
diff --git a/lib/libc/tests/stdio/fmemopen2_test.c b/lib/libc/tests/stdio/fmemopen2_test.c
index a2ca3257fe4e..d68150d19594 100644
--- a/lib/libc/tests/stdio/fmemopen2_test.c
+++ b/lib/libc/tests/stdio/fmemopen2_test.c
@@ -29,8 +29,6 @@ SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/libc/tests/stdio/fopen_test.c b/lib/libc/tests/stdio/fopen_test.c
index 962e7fdb1a34..fdc460716ff2 100644
--- a/lib/libc/tests/stdio/fopen_test.c
+++ b/lib/libc/tests/stdio/fopen_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fcntl.h>
#include <paths.h>
#include <stdio.h>
diff --git a/lib/libc/tests/stdio/freopen_test.c b/lib/libc/tests/stdio/freopen_test.c
index 8ca4719e8603..7318a95df089 100644
--- a/lib/libc/tests/stdio/freopen_test.c
+++ b/lib/libc/tests/stdio/freopen_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <paths.h>
#include <stdbool.h>
diff --git a/lib/libc/tests/stdio/getdelim_test.c b/lib/libc/tests/stdio/getdelim_test.c
index 7b20b02a36f1..8cb1763d9e01 100644
--- a/lib/libc/tests/stdio/getdelim_test.c
+++ b/lib/libc/tests/stdio/getdelim_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libc/tests/stdio/gets_s_test.c b/lib/libc/tests/stdio/gets_s_test.c
index 7d02990f82d4..c6eda57c03ea 100644
--- a/lib/libc/tests/stdio/gets_s_test.c
+++ b/lib/libc/tests/stdio/gets_s_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/lib/libc/tests/stdio/mkostemp_test.c b/lib/libc/tests/stdio/mkostemp_test.c
index 0dd475b4ec61..1e3f6dc03768 100644
--- a/lib/libc/tests/stdio/mkostemp_test.c
+++ b/lib/libc/tests/stdio/mkostemp_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <errno.h>
diff --git a/lib/libc/tests/stdio/open_memstream2_test.c b/lib/libc/tests/stdio/open_memstream2_test.c
index 21ea64c7c669..513192965c93 100644
--- a/lib/libc/tests/stdio/open_memstream2_test.c
+++ b/lib/libc/tests/stdio/open_memstream2_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/tests/stdio/open_wmemstream_test.c b/lib/libc/tests/stdio/open_wmemstream_test.c
index 324bcf3d3482..cbe7e4776737 100644
--- a/lib/libc/tests/stdio/open_wmemstream_test.c
+++ b/lib/libc/tests/stdio/open_wmemstream_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/tests/stdio/perror_test.c b/lib/libc/tests/stdio/perror_test.c
index 989f1ff6ea59..e6d2c0c130a6 100644
--- a/lib/libc/tests/stdio/perror_test.c
+++ b/lib/libc/tests/stdio/perror_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <limits.h>
diff --git a/lib/libc/tests/stdio/print_positional_test.c b/lib/libc/tests/stdio/print_positional_test.c
index 9c9ec314d62d..ba5a7b13135c 100644
--- a/lib/libc/tests/stdio/print_positional_test.c
+++ b/lib/libc/tests/stdio/print_positional_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/stdio/printbasic_test.c b/lib/libc/tests/stdio/printbasic_test.c
index 322e7477da25..5f47979c0ff0 100644
--- a/lib/libc/tests/stdio/printbasic_test.c
+++ b/lib/libc/tests/stdio/printbasic_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <locale.h>
diff --git a/lib/libc/tests/stdio/printfloat_test.c b/lib/libc/tests/stdio/printfloat_test.c
index 736ba1b493ef..aeb4ed43b772 100644
--- a/lib/libc/tests/stdio/printfloat_test.c
+++ b/lib/libc/tests/stdio/printfloat_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <fenv.h>
#include <float.h>
diff --git a/lib/libc/tests/stdio/scanfloat_test.c b/lib/libc/tests/stdio/scanfloat_test.c
index 7e27e69542e7..473565b25747 100644
--- a/lib/libc/tests/stdio/scanfloat_test.c
+++ b/lib/libc/tests/stdio/scanfloat_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <float.h>
#include <locale.h>
diff --git a/lib/libc/tests/stdlib/clearenv_test.c b/lib/libc/tests/stdlib/clearenv_test.c
index efe4b676cd4e..369d64b2e3b4 100644
--- a/lib/libc/tests/stdlib/clearenv_test.c
+++ b/lib/libc/tests/stdlib/clearenv_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <atf-c.h>
#include <stdio.h>
diff --git a/lib/libc/tests/stdlib/cxa_thread_atexit_nothr_test.cc b/lib/libc/tests/stdlib/cxa_thread_atexit_nothr_test.cc
index 3ac360279e8a..8f9c6348e0b0 100644
--- a/lib/libc/tests/stdlib/cxa_thread_atexit_nothr_test.cc
+++ b/lib/libc/tests/stdlib/cxa_thread_atexit_nothr_test.cc
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <dlfcn.h>
#include <atf-c++.hpp>
#include <cstdio>
diff --git a/lib/libc/tests/stdlib/cxa_thread_atexit_test.cc b/lib/libc/tests/stdlib/cxa_thread_atexit_test.cc
index ded91c943c8a..d2e1369c91dd 100644
--- a/lib/libc/tests/stdlib/cxa_thread_atexit_test.cc
+++ b/lib/libc/tests/stdlib/cxa_thread_atexit_test.cc
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <dlfcn.h>
#include <atf-c++.hpp>
#include <cstdio>
diff --git a/lib/libc/tests/stdlib/dynthr_mod/dynthr_mod.c b/lib/libc/tests/stdlib/dynthr_mod/dynthr_mod.c
index c19a1a54a8b6..21c9e19d4468 100644
--- a/lib/libc/tests/stdlib/dynthr_mod/dynthr_mod.c
+++ b/lib/libc/tests/stdlib/dynthr_mod/dynthr_mod.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
diff --git a/lib/libc/tests/stdlib/dynthr_test.c b/lib/libc/tests/stdlib/dynthr_test.c
index d72ee280ccb2..7c22499c7567 100644
--- a/lib/libc/tests/stdlib/dynthr_test.c
+++ b/lib/libc/tests/stdlib/dynthr_test.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
diff --git a/lib/libc/tests/stdlib/heapsort_test.c b/lib/libc/tests/stdlib/heapsort_test.c
index a83786d1cc5f..875326354e0f 100644
--- a/lib/libc/tests/stdlib/heapsort_test.c
+++ b/lib/libc/tests/stdlib/heapsort_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/stdlib/mergesort_test.c b/lib/libc/tests/stdlib/mergesort_test.c
index 4334b924f6bb..e57def84e3ab 100644
--- a/lib/libc/tests/stdlib/mergesort_test.c
+++ b/lib/libc/tests/stdlib/mergesort_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/stdlib/qsort_r_compat_test.c b/lib/libc/tests/stdlib/qsort_r_compat_test.c
index 84fd1b116b82..d2734c8678de 100644
--- a/lib/libc/tests/stdlib/qsort_r_compat_test.c
+++ b/lib/libc/tests/stdlib/qsort_r_compat_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/stdlib/qsort_r_test.c b/lib/libc/tests/stdlib/qsort_r_test.c
index c55563eaea8a..962a3792beb4 100644
--- a/lib/libc/tests/stdlib/qsort_r_test.c
+++ b/lib/libc/tests/stdlib/qsort_r_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/stdlib/qsort_s_test.c b/lib/libc/tests/stdlib/qsort_s_test.c
index e3ed7ae3b208..9682d447edb7 100644
--- a/lib/libc/tests/stdlib/qsort_s_test.c
+++ b/lib/libc/tests/stdlib/qsort_s_test.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/stdlib/qsort_test.c b/lib/libc/tests/stdlib/qsort_test.c
index 14e02925dfa5..1a0587a94ade 100644
--- a/lib/libc/tests/stdlib/qsort_test.c
+++ b/lib/libc/tests/stdlib/qsort_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/stdlib/set_constraint_handler_s_test.c b/lib/libc/tests/stdlib/set_constraint_handler_s_test.c
index 6a33c98c9279..b718b4fc11fd 100644
--- a/lib/libc/tests/stdlib/set_constraint_handler_s_test.c
+++ b/lib/libc/tests/stdlib/set_constraint_handler_s_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/stdlib/strfmon_test.c b/lib/libc/tests/stdlib/strfmon_test.c
index 224b3f44911e..f092c071724a 100644
--- a/lib/libc/tests/stdlib/strfmon_test.c
+++ b/lib/libc/tests/stdlib/strfmon_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <locale.h>
diff --git a/lib/libc/tests/stdlib/tsearch_test.c b/lib/libc/tests/stdlib/tsearch_test.c
index ee25743f10b0..6dc53b3f6f81 100644
--- a/lib/libc/tests/stdlib/tsearch_test.c
+++ b/lib/libc/tests/stdlib/tsearch_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <atf-c.h>
#define _SEARCH_PRIVATE
#include <search.h>
diff --git a/lib/libc/tests/string/memcmp_test.c b/lib/libc/tests/string/memcmp_test.c
index d7fbd8c342bd..ab782c92f255 100644
--- a/lib/libc/tests/string/memcmp_test.c
+++ b/lib/libc/tests/string/memcmp_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/string/memset_s_test.c b/lib/libc/tests/string/memset_s_test.c
index e0cfd867ff2a..90a6958cb369 100644
--- a/lib/libc/tests/string/memset_s_test.c
+++ b/lib/libc/tests/string/memset_s_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/string/stpncpy_test.c b/lib/libc/tests/string/stpncpy_test.c
index 618fa7d0a2ce..6602bda0c2a9 100644
--- a/lib/libc/tests/string/stpncpy_test.c
+++ b/lib/libc/tests/string/stpncpy_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <assert.h>
diff --git a/lib/libc/tests/string/strxfrm_test.c b/lib/libc/tests/string/strxfrm_test.c
index 98f3b3bddee7..3c2ab58cb72b 100644
--- a/lib/libc/tests/string/strxfrm_test.c
+++ b/lib/libc/tests/string/strxfrm_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <locale.h>
#include <stdio.h>
diff --git a/lib/libc/tests/string/wcscasecmp_test.c b/lib/libc/tests/string/wcscasecmp_test.c
index 4385f3a8f0d2..5927345e7f4a 100644
--- a/lib/libc/tests/string/wcscasecmp_test.c
+++ b/lib/libc/tests/string/wcscasecmp_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <locale.h>
#include <stdio.h>
diff --git a/lib/libc/tests/string/wcscoll_test.c b/lib/libc/tests/string/wcscoll_test.c
index 022ad8e98297..d64e03f0605a 100644
--- a/lib/libc/tests/string/wcscoll_test.c
+++ b/lib/libc/tests/string/wcscoll_test.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <wchar.h>
#include <locale.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/string/wcsnlen_test.c b/lib/libc/tests/string/wcsnlen_test.c
index 7bcd046de5af..56a2ef1e3623 100644
--- a/lib/libc/tests/string/wcsnlen_test.c
+++ b/lib/libc/tests/string/wcsnlen_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <assert.h>
diff --git a/lib/libc/tests/sys/brk_test.c b/lib/libc/tests/sys/brk_test.c
index 6b8796b89b04..38093b4cbd29 100644
--- a/lib/libc/tests/sys/brk_test.c
+++ b/lib/libc/tests/sys/brk_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
diff --git a/lib/libc/tests/sys/mlock_helper.c b/lib/libc/tests/sys/mlock_helper.c
index a483207aa5d6..31471b2b281c 100644
--- a/lib/libc/tests/sys/mlock_helper.c
+++ b/lib/libc/tests/sys/mlock_helper.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/tests/sys/queue_test.c b/lib/libc/tests/sys/queue_test.c
index 2405e3a69f5c..8db5b5cae7b6 100644
--- a/lib/libc/tests/sys/queue_test.c
+++ b/lib/libc/tests/sys/queue_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libc/tests/sys/sendfile_test.c b/lib/libc/tests/sys/sendfile_test.c
index c8df110c2a96..cfa885d1e8e3 100644
--- a/lib/libc/tests/sys/sendfile_test.c
+++ b/lib/libc/tests/sys/sendfile_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/socket.h>
diff --git a/lib/libc/uuid/uuid_stream.c b/lib/libc/uuid/uuid_stream.c
index e8a8e5afc67f..996b74de3250 100644
--- a/lib/libc/uuid/uuid_stream.c
+++ b/lib/libc/uuid/uuid_stream.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <uuid.h>
diff --git a/lib/libc/x86/gen/getcontextx.c b/lib/libc/x86/gen/getcontextx.c
index e0190ca982d9..d50180a8ac6c 100644
--- a/lib/libc/x86/gen/getcontextx.c
+++ b/lib/libc/x86/gen/getcontextx.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ucontext.h>
#include <errno.h>
diff --git a/lib/libc/x86/sys/__vdso_gettc.c b/lib/libc/x86/sys/__vdso_gettc.c
index 7159d46c0113..11632677e577 100644
--- a/lib/libc/x86/sys/__vdso_gettc.c
+++ b/lib/libc/x86/sys/__vdso_gettc.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include "namespace.h"
#include <sys/capsicum.h>
diff --git a/lib/libc/x86/sys/pkru.c b/lib/libc/x86/sys/pkru.c
index a5fc16ca4a47..a03becb3e101 100644
--- a/lib/libc/x86/sys/pkru.c
+++ b/lib/libc/x86/sys/pkru.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <machine/cpufunc.h>
#include <machine/specialreg.h>
diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c
index 48b4cdbecd02..6d44a012443b 100644
--- a/lib/libc/xdr/xdr.c
+++ b/lib/libc/xdr/xdr.c
@@ -38,8 +38,6 @@ static char *sccsid2 = "@(#)xdr.c 1.35 87/08/12";
static char *sccsid = "@(#)xdr.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* xdr.c, Generic XDR routines implementation.
*
diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c
index 591c8b816f75..6e910557c702 100644
--- a/lib/libc/xdr/xdr_array.c
+++ b/lib/libc/xdr/xdr_array.c
@@ -38,8 +38,6 @@ static char *sccsid2 = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)xdr_array.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* xdr_array.c, Generic XDR routines implementation.
*
diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c
index d77a2e666d0e..4366a04586a1 100644
--- a/lib/libc/xdr/xdr_float.c
+++ b/lib/libc/xdr/xdr_float.c
@@ -38,8 +38,6 @@ static char *sccsid2 = "@(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)xdr_float.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* xdr_float.c, Generic XDR routines implementation.
*
diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c
index 423b647e4bed..b08606e54fa3 100644
--- a/lib/libc/xdr/xdr_mem.c
+++ b/lib/libc/xdr/xdr_mem.c
@@ -38,8 +38,6 @@ static char *sccsid2 = "@(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)xdr_mem.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* xdr_mem.h, XDR implementation using memory buffers.
*
diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c
index 30980c378f51..cd99eecf6108 100644
--- a/lib/libc/xdr/xdr_rec.c
+++ b/lib/libc/xdr/xdr_rec.c
@@ -38,8 +38,6 @@ static char *sccsid2 = "@(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)xdr_rec.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
* layer above tcp (for rpc's use).
diff --git a/lib/libc/xdr/xdr_reference.c b/lib/libc/xdr/xdr_reference.c
index d18670f28ea6..321aa1d9f6ad 100644
--- a/lib/libc/xdr/xdr_reference.c
+++ b/lib/libc/xdr/xdr_reference.c
@@ -38,8 +38,6 @@ static char *sccsid2 = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
static char *sccsid = "@(#)xdr_reference.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* xdr_reference.c, Generic XDR routines implementation.
*
diff --git a/lib/libc/xdr/xdr_sizeof.c b/lib/libc/xdr/xdr_sizeof.c
index 71a6f4e8279b..b0889c233c10 100644
--- a/lib/libc/xdr/xdr_sizeof.c
+++ b/lib/libc/xdr/xdr_sizeof.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <rpc/types.h>
#include <rpc/xdr.h>
diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c
index 0d179f9802f9..26335372d544 100644
--- a/lib/libc/xdr/xdr_stdio.c
+++ b/lib/libc/xdr/xdr_stdio.c
@@ -38,8 +38,6 @@ static char *sccsid2 = "@(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)xdr_stdio.c 2.1 88/07/29 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* xdr_stdio.c, XDR implementation on standard i/o file.
*
diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c
index da996276aaf8..ebd76cb48050 100644
--- a/lib/libc/yp/xdryp.c
+++ b/lib/libc/yp/xdryp.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <rpc/rpc.h>
#include <rpcsvc/yp.h>
#include <stdlib.h>
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
index c6a30bee1d72..cddaaa697ab6 100644
--- a/lib/libc/yp/yplib.c
+++ b/lib/libc/yp/yplib.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include "reentrant.h"
#include <sys/param.h>
diff --git a/lib/libcalendar/calendar.c b/lib/libcalendar/calendar.c
index ec8ab0405269..5f65223cdfd9 100644
--- a/lib/libcalendar/calendar.c
+++ b/lib/libcalendar/calendar.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "calendar.h"
#ifndef NULL
diff --git a/lib/libcalendar/easter.c b/lib/libcalendar/easter.c
index b6533c61de05..46a30ed8d3cd 100644
--- a/lib/libcalendar/easter.c
+++ b/lib/libcalendar/easter.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "calendar.h"
typedef struct date date;
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c
index 63c347663c42..6074cdebeb63 100644
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <assert.h>
diff --git a/lib/libcam/scsi_cmdparse.c b/lib/libcam/scsi_cmdparse.c
index 7da553d14397..81c8708c8d68 100644
--- a/lib/libcam/scsi_cmdparse.c
+++ b/lib/libcam/scsi_cmdparse.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdlib.h>
diff --git a/lib/libcam/scsi_wrap.c b/lib/libcam/scsi_wrap.c
index 069dfa7320b1..e5bd76e6e9be 100644
--- a/lib/libcam/scsi_wrap.c
+++ b/lib/libcam/scsi_wrap.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/lib/libcam/tests/cam_test.c b/lib/libcam/tests/cam_test.c
index 0c62f0fd6038..6c9fda40d43c 100644
--- a/lib/libcam/tests/cam_test.c
+++ b/lib/libcam/tests/cam_test.c
@@ -27,8 +27,6 @@
/* Tests functions in sys/cam/cam.c */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/lib/libcam/tests/libcam_test.c b/lib/libcam/tests/libcam_test.c
index 5fdfbf199376..912f62c42c6c 100644
--- a/lib/libcam/tests/libcam_test.c
+++ b/lib/libcam/tests/libcam_test.c
@@ -26,8 +26,6 @@
/* Tests functions in lib/libcam/camlib.c */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/lib/libcasper/libcasper/libcasper.c b/lib/libcasper/libcasper/libcasper.c
index 884c2ffe51f7..095bbb9161e4 100644
--- a/lib/libcasper/libcasper/libcasper.c
+++ b/lib/libcasper/libcasper/libcasper.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/nv.h>
diff --git a/lib/libcasper/libcasper/libcasper_service.c b/lib/libcasper/libcasper/libcasper_service.c
index c52c86c79e5b..3468b520e275 100644
--- a/lib/libcasper/libcasper/libcasper_service.c
+++ b/lib/libcasper/libcasper/libcasper_service.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/lib/libcasper/libcasper/service.c b/lib/libcasper/libcasper/service.c
index a29732667ad7..478221a681da 100644
--- a/lib/libcasper/libcasper/service.c
+++ b/lib/libcasper/libcasper/service.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/lib/libcasper/libcasper/zygote.c b/lib/libcasper/libcasper/zygote.c
index d51b276cd50e..e0dcc665ee9e 100644
--- a/lib/libcasper/libcasper/zygote.c
+++ b/lib/libcasper/libcasper/zygote.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/procdesc.h>
diff --git a/lib/libcasper/services/cap_dns/cap_dns.c b/lib/libcasper/services/cap_dns/cap_dns.c
index 1f24cfd2667a..8548715a6978 100644
--- a/lib/libcasper/services/cap_dns/cap_dns.c
+++ b/lib/libcasper/services/cap_dns/cap_dns.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/dnv.h>
#include <sys/nv.h>
#include <netinet/in.h>
diff --git a/lib/libcasper/services/cap_dns/tests/dns_test.c b/lib/libcasper/services/cap_dns/tests/dns_test.c
index d9660fdb345e..3786414053ad 100644
--- a/lib/libcasper/services/cap_dns/tests/dns_test.c
+++ b/lib/libcasper/services/cap_dns/tests/dns_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/nv.h>
diff --git a/lib/libcasper/services/cap_fileargs/cap_fileargs.c b/lib/libcasper/services/cap_fileargs/cap_fileargs.c
index 98fccd282773..859c862ef9e5 100644
--- a/lib/libcasper/services/cap_fileargs/cap_fileargs.c
+++ b/lib/libcasper/services/cap_fileargs/cap_fileargs.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/sysctl.h>
diff --git a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c
index a12afd734998..4df43f183735 100644
--- a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c
+++ b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/stat.h>
diff --git a/lib/libcasper/services/cap_grp/cap_grp.c b/lib/libcasper/services/cap_grp/cap_grp.c
index 491abbfed6b4..6a5ad84fcd22 100644
--- a/lib/libcasper/services/cap_grp/cap_grp.c
+++ b/lib/libcasper/services/cap_grp/cap_grp.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/dnv.h>
#include <sys/nv.h>
#include <sys/param.h>
diff --git a/lib/libcasper/services/cap_grp/tests/grp_test.c b/lib/libcasper/services/cap_grp/tests/grp_test.c
index dffd5b9d859c..c120c61e0cf1 100644
--- a/lib/libcasper/services/cap_grp/tests/grp_test.c
+++ b/lib/libcasper/services/cap_grp/tests/grp_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/nv.h>
diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c
index b62ac3a8c88d..bbb2a666440f 100644
--- a/lib/libcasper/services/cap_net/cap_net.c
+++ b/lib/libcasper/services/cap_net/cap_net.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/cnv.h>
#include <sys/dnv.h>
#include <sys/nv.h>
diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c
index e5a5e938a124..5522f92516eb 100644
--- a/lib/libcasper/services/cap_net/tests/net_test.c
+++ b/lib/libcasper/services/cap_net/tests/net_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/lib/libcasper/services/cap_netdb/cap_netdb.c b/lib/libcasper/services/cap_netdb/cap_netdb.c
index 1770f9bbaefd..7f46f9b4ff40 100644
--- a/lib/libcasper/services/cap_netdb/cap_netdb.c
+++ b/lib/libcasper/services/cap_netdb/cap_netdb.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/dnv.h>
#include <sys/nv.h>
#include <netinet/in.h>
diff --git a/lib/libcasper/services/cap_netdb/tests/netdb_test.c b/lib/libcasper/services/cap_netdb/tests/netdb_test.c
index 28e7dd42b01e..d4498e68ace0 100644
--- a/lib/libcasper/services/cap_netdb/tests/netdb_test.c
+++ b/lib/libcasper/services/cap_netdb/tests/netdb_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/nv.h>
diff --git a/lib/libcasper/services/cap_pwd/cap_pwd.c b/lib/libcasper/services/cap_pwd/cap_pwd.c
index 0bad653d4f91..263bc4cfd582 100644
--- a/lib/libcasper/services/cap_pwd/cap_pwd.c
+++ b/lib/libcasper/services/cap_pwd/cap_pwd.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/nv.h>
diff --git a/lib/libcasper/services/cap_pwd/tests/pwd_test.c b/lib/libcasper/services/cap_pwd/tests/pwd_test.c
index 3c7c8bb057a8..e56c037536e2 100644
--- a/lib/libcasper/services/cap_pwd/tests/pwd_test.c
+++ b/lib/libcasper/services/cap_pwd/tests/pwd_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/nv.h>
diff --git a/lib/libcasper/services/cap_sysctl/cap_sysctl.c b/lib/libcasper/services/cap_sysctl/cap_sysctl.c
index f743016a15bb..7d7f280fd00b 100644
--- a/lib/libcasper/services/cap_sysctl/cap_sysctl.c
+++ b/lib/libcasper/services/cap_sysctl/cap_sysctl.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cnv.h>
#include <sys/dnv.h>
diff --git a/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c b/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c
index 6a32679fc999..2e5ec83e1c82 100644
--- a/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c
+++ b/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/sysctl.h>
diff --git a/lib/libcasper/services/cap_syslog/cap_syslog.c b/lib/libcasper/services/cap_syslog/cap_syslog.c
index 2895cfcdd2f5..5434b7bb6bab 100644
--- a/lib/libcasper/services/cap_syslog/cap_syslog.c
+++ b/lib/libcasper/services/cap_syslog/cap_syslog.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/dnv.h>
#include <sys/nv.h>
diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c
index 87860df00abd..5ea57bca40fd 100644
--- a/lib/libcompat/4.1/ftime.c
+++ b/lib/libcompat/4.1/ftime.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/timeb.h>
diff --git a/lib/libcompat/4.3/re_comp.c b/lib/libcompat/4.3/re_comp.c
index 93fbc3c603a4..dfbfb82f0889 100644
--- a/lib/libcompat/4.3/re_comp.c
+++ b/lib/libcompat/4.3/re_comp.c
@@ -33,7 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
__SCCSID("@(#)regex.c 5.1 (Berkeley) 3/29/92");
/*
diff --git a/lib/libcompat/4.3/rexec.c b/lib/libcompat/4.3/rexec.c
index 5a9690396621..3dac5ff18da3 100644
--- a/lib/libcompat/4.3/rexec.c
+++ b/lib/libcompat/4.3/rexec.c
@@ -30,7 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
__SCCSID("@(#)rexec.c 8.1 (Berkeley) 6/4/93");
#include <sys/types.h>
diff --git a/lib/libcompat/4.4/cuserid.c b/lib/libcompat/4.4/cuserid.c
index 0b993136f5cc..a27b009878eb 100644
--- a/lib/libcompat/4.4/cuserid.c
+++ b/lib/libcompat/4.4/cuserid.c
@@ -30,7 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
__SCCSID("@(#)cuserid.c 8.1 (Berkeley) 6/4/93");
#include <pwd.h>
diff --git a/lib/libcrypt/crypt-md5.c b/lib/libcrypt/crypt-md5.c
index c691ff35fcb1..3fb80c1ba540 100644
--- a/lib/libcrypt/crypt-md5.c
+++ b/lib/libcrypt/crypt-md5.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/lib/libcrypt/crypt-nthash.c b/lib/libcrypt/crypt-nthash.c
index b66aa72e10bc..28c832dd6f9f 100644
--- a/lib/libcrypt/crypt-nthash.c
+++ b/lib/libcrypt/crypt-nthash.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <netinet/in.h>
diff --git a/lib/libcrypt/crypt-sha256.c b/lib/libcrypt/crypt-sha256.c
index df0785abaef0..35c36bf93f3d 100644
--- a/lib/libcrypt/crypt-sha256.c
+++ b/lib/libcrypt/crypt-sha256.c
@@ -30,8 +30,6 @@
* Ulrich Drepper <drepper@redhat.com>. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/param.h>
diff --git a/lib/libcrypt/crypt-sha512.c b/lib/libcrypt/crypt-sha512.c
index 034c41cc148b..640398afadc4 100644
--- a/lib/libcrypt/crypt-sha512.c
+++ b/lib/libcrypt/crypt-sha512.c
@@ -30,8 +30,6 @@
* Ulrich Drepper <drepper@redhat.com>. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/param.h>
diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c
index 0f912d146f96..b4d0743df6cf 100644
--- a/lib/libcrypt/crypt.c
+++ b/lib/libcrypt/crypt.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
diff --git a/lib/libcrypt/misc.c b/lib/libcrypt/misc.c
index a50c743796c1..ce55f5234fa7 100644
--- a/lib/libcrypt/misc.c
+++ b/lib/libcrypt/misc.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "crypt.h"
diff --git a/lib/libcrypt/tests/crypt_tests.c b/lib/libcrypt/tests/crypt_tests.c
index 426d10e271a3..2ab0b65db83b 100644
--- a/lib/libcrypt/tests/crypt_tests.c
+++ b/lib/libcrypt/tests/crypt_tests.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <crypt.h>
#include <unistd.h>
diff --git a/lib/libdevctl/devctl.c b/lib/libdevctl/devctl.c
index 8a1f6bbc9d39..20483e08da64 100644
--- a/lib/libdevctl/devctl.c
+++ b/lib/libdevctl/devctl.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/bus.h>
#include <errno.h>
diff --git a/lib/libdevdctl/consumer.cc b/lib/libdevdctl/consumer.cc
index a9949a6f269a..2d5e7ebf549b 100644
--- a/lib/libdevdctl/consumer.cc
+++ b/lib/libdevdctl/consumer.cc
@@ -57,9 +57,6 @@
#include "exception.h"
#include "consumer.h"
-
-__FBSDID("$FreeBSD$");
-
/*================================== Macros ==================================*/
#define NUM_ELEMENTS(x) (sizeof(x) / sizeof(*x))
diff --git a/lib/libdevdctl/event.cc b/lib/libdevdctl/event.cc
index 76ef1896975a..648c7205b121 100644
--- a/lib/libdevdctl/event.cc
+++ b/lib/libdevdctl/event.cc
@@ -62,9 +62,6 @@
#include "event.h"
#include "event_factory.h"
#include "exception.h"
-
-__FBSDID("$FreeBSD$");
-
/*================================== Macros ==================================*/
#define NUM_ELEMENTS(x) (sizeof(x) / sizeof(*x))
diff --git a/lib/libdevdctl/event_factory.cc b/lib/libdevdctl/event_factory.cc
index 3901fd5837b3..d0431c9516f4 100644
--- a/lib/libdevdctl/event_factory.cc
+++ b/lib/libdevdctl/event_factory.cc
@@ -43,9 +43,6 @@
#include "guid.h"
#include "event.h"
#include "event_factory.h"
-
-__FBSDID("$FreeBSD$");
-
/*================================== Macros ==================================*/
#define NUM_ELEMENTS(x) (sizeof(x) / sizeof(*x))
diff --git a/lib/libdevdctl/exception.cc b/lib/libdevdctl/exception.cc
index 4dc8cf5cd21e..5918fb3b3cdd 100644
--- a/lib/libdevdctl/exception.cc
+++ b/lib/libdevdctl/exception.cc
@@ -43,9 +43,6 @@
#include <string>
#include "exception.h"
-
-__FBSDID("$FreeBSD$");
-
/*============================ Namespace Control =============================*/
using std::string;
using std::stringstream;
diff --git a/lib/libdevdctl/guid.cc b/lib/libdevdctl/guid.cc
index 722eaf73d16f..decdc6482397 100644
--- a/lib/libdevdctl/guid.cc
+++ b/lib/libdevdctl/guid.cc
@@ -45,8 +45,6 @@
#include <string>
#include "guid.h"
-
-__FBSDID("$FreeBSD$");
/*============================ Namespace Control =============================*/
using std::string;
namespace DevdCtl
diff --git a/lib/libdevinfo/devinfo.c b/lib/libdevinfo/devinfo.c
index daef8ad0d7bf..115e7ea76602 100644
--- a/lib/libdevinfo/devinfo.c
+++ b/lib/libdevinfo/devinfo.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* An interface to the FreeBSD kernel's bus/device information interface.
*
diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c
index 047a2a79204d..7465613da4f1 100644
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/errno.h>
diff --git a/lib/libdpv/dialog_util.c b/lib/libdpv/dialog_util.c
index f4d24150b6e1..149df8b50302 100644
--- a/lib/libdpv/dialog_util.c
+++ b/lib/libdpv/dialog_util.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <ctype.h>
diff --git a/lib/libdpv/dialogrc.c b/lib/libdpv/dialogrc.c
index e199d415c539..fb4552e2db80 100644
--- a/lib/libdpv/dialogrc.c
+++ b/lib/libdpv/dialogrc.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/lib/libdpv/dprompt.c b/lib/libdpv/dprompt.c
index b4fdd9959e02..b891d4c779fa 100644
--- a/lib/libdpv/dprompt.c
+++ b/lib/libdpv/dprompt.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#define _BSD_SOURCE /* to get dprintf() prototype in stdio.h below */
diff --git a/lib/libdpv/dpv.c b/lib/libdpv/dpv.c
index 8ac39b10f86c..0c3ea68faf59 100644
--- a/lib/libdpv/dpv.c
+++ b/lib/libdpv/dpv.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
diff --git a/lib/libdpv/status.c b/lib/libdpv/status.c
index 4bf47735653e..de2bdc45fdd2 100644
--- a/lib/libdpv/status.c
+++ b/lib/libdpv/status.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <curses.h>
#include <dialog.h>
#include <stdarg.h>
diff --git a/lib/libdpv/util.c b/lib/libdpv/util.c
index 5750f810c4ae..4b2393b45821 100644
--- a/lib/libdpv/util.c
+++ b/lib/libdpv/util.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <spawn.h>
diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c
index 186f1cd5f103..d97603c41dcb 100644
--- a/lib/libefivar/efivar-dp-format.c
+++ b/lib/libefivar/efivar-dp-format.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <efivar.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/libefivar/efivar-dp-parse.c b/lib/libefivar/efivar-dp-parse.c
index b9a2a138d18b..f68c9798fb2e 100644
--- a/lib/libefivar/efivar-dp-parse.c
+++ b/lib/libefivar/efivar-dp-parse.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <efivar.h>
#include <stdio.h>
diff --git a/lib/libefivar/efivar-dp-xlate.c b/lib/libefivar/efivar-dp-xlate.c
index 3d63868dacef..6723cf707f50 100644
--- a/lib/libefivar/efivar-dp-xlate.c
+++ b/lib/libefivar/efivar-dp-xlate.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ucred.h>
#include <sys/mount.h>
diff --git a/lib/libefivar/efivar.c b/lib/libefivar/efivar.c
index 76b83d3bbdbe..fdcffc5403d6 100644
--- a/lib/libefivar/efivar.c
+++ b/lib/libefivar/efivar.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <efivar.h>
#include <sys/efiio.h>
#include <sys/param.h>
diff --git a/lib/libefivar/uefi-dputil.c b/lib/libefivar/uefi-dputil.c
index 9f1f86a25ebe..7969054e2ce2 100644
--- a/lib/libefivar/uefi-dputil.c
+++ b/lib/libefivar/uefi-dputil.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <efivar.h>
#include <limits.h>
#include <stdio.h>
diff --git a/lib/libexecinfo/tests/sigtramp_test.c b/lib/libexecinfo/tests/sigtramp_test.c
index cd3b3cc418de..b8eecfddf43d 100644
--- a/lib/libexecinfo/tests/sigtramp_test.c
+++ b/lib/libexecinfo/tests/sigtramp_test.c
@@ -4,8 +4,6 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/wait.h>
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index 8f3f1c5db30f..fd2091791620 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c
index 82a3c5e451a9..135ee8dad151 100644
--- a/lib/libfetch/fetch.c
+++ b/lib/libfetch/fetch.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <netinet/in.h>
diff --git a/lib/libfetch/file.c b/lib/libfetch/file.c
index a7e41bab3289..3cb8893f9d46 100644
--- a/lib/libfetch/file.c
+++ b/lib/libfetch/file.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index dfde6edce734..864eacc5d7ff 100644
--- a/lib/libfetch/ftp.c
+++ b/lib/libfetch/ftp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Portions of this code were taken from or based on ftpio.c:
*
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index d4605aeccd9f..adcc75fcb83a 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* The following copyright applies to the base64 code:
*
diff --git a/lib/libfigpar/figpar.c b/lib/libfigpar/figpar.c
index 0a727ff6f041..642291ca7c6b 100644
--- a/lib/libfigpar/figpar.c
+++ b/lib/libfigpar/figpar.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <ctype.h>
diff --git a/lib/libfigpar/string_m.c b/lib/libfigpar/string_m.c
index 158774143ec3..ce7948466543 100644
--- a/lib/libfigpar/string_m.c
+++ b/lib/libfigpar/string_m.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/lib/libgeom/geom_util.c b/lib/libgeom/geom_util.c
index 6ad7ca6ea911..48b54bcef9ed 100644
--- a/lib/libgeom/geom_util.c
+++ b/lib/libgeom/geom_util.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/stat.h>
diff --git a/lib/libipsec/ipsec_dump_policy.c b/lib/libipsec/ipsec_dump_policy.c
index 46c370f4f158..c53aef5e5310 100644
--- a/lib/libipsec/ipsec_dump_policy.c
+++ b/lib/libipsec/ipsec_dump_policy.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libipsec/ipsec_get_policylen.c b/lib/libipsec/ipsec_get_policylen.c
index 04f6e3abba94..611ef7b2ac61 100644
--- a/lib/libipsec/ipsec_get_policylen.c
+++ b/lib/libipsec/ipsec_get_policylen.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
diff --git a/lib/libipsec/ipsec_strerror.c b/lib/libipsec/ipsec_strerror.c
index 402faac3f375..580ef80d2c25 100644
--- a/lib/libipsec/ipsec_strerror.c
+++ b/lib/libipsec/ipsec_strerror.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
diff --git a/lib/libipsec/pfkey.c b/lib/libipsec/pfkey.c
index 6c7649c5844f..16d86aca2ef8 100644
--- a/lib/libipsec/pfkey.c
+++ b/lib/libipsec/pfkey.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libipsec/pfkey_dump.c b/lib/libipsec/pfkey_dump.c
index f91d00126cbc..11b99c54f288 100644
--- a/lib/libipsec/pfkey_dump.c
+++ b/lib/libipsec/pfkey_dump.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libipsec/policy_parse.y b/lib/libipsec/policy_parse.y
index ca9c8d0431d2..f29db2a85d63 100644
--- a/lib/libipsec/policy_parse.y
+++ b/lib/libipsec/policy_parse.y
@@ -52,8 +52,6 @@
%{
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libipsec/test-policy.c b/lib/libipsec/test-policy.c
index 579937396b0b..c55d2b3f63b7 100644
--- a/lib/libipsec/test-policy.c
+++ b/lib/libipsec/test-policy.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libiscsiutil/pdu.c b/lib/libiscsiutil/pdu.c
index 4787ead2198c..276eef68457c 100644
--- a/lib/libiscsiutil/pdu.c
+++ b/lib/libiscsiutil/pdu.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/uio.h>
#include <assert.h>
diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c
index 5c81d6a2087d..04fd6d3c4250 100644
--- a/lib/libjail/jail.c
+++ b/lib/libjail/jail.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/linker.h>
diff --git a/lib/libjail/jail_getid.c b/lib/libjail/jail_getid.c
index d4281af42940..3db11aae84ce 100644
--- a/lib/libjail/jail_getid.c
+++ b/lib/libjail/jail_getid.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/jail.h>
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 4b886171a7d6..e70e94efaee8 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -34,7 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
__SCCSID("@(#)kvm.c 8.2 (Berkeley) 2/13/94");
#include <sys/param.h>
diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c
index 6b3ac28debc7..cc41d3c8c5c8 100644
--- a/lib/libkvm/kvm_amd64.c
+++ b/lib/libkvm/kvm_amd64.c
@@ -34,7 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
__SCCSID("@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93");
/*
diff --git a/lib/libkvm/kvm_arm.c b/lib/libkvm/kvm_arm.c
index dc855f167d7c..81d49793591a 100644
--- a/lib/libkvm/kvm_arm.c
+++ b/lib/libkvm/kvm_arm.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <kvm.h>
diff --git a/lib/libkvm/kvm_cptime.c b/lib/libkvm/kvm_cptime.c
index 9d303943f551..5e92b565486c 100644
--- a/lib/libkvm/kvm_cptime.c
+++ b/lib/libkvm/kvm_cptime.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/pcpu.h>
#include <sys/resource.h>
diff --git a/lib/libkvm/kvm_getloadavg.c b/lib/libkvm/kvm_getloadavg.c
index f94b1d844663..b3b810752979 100644
--- a/lib/libkvm/kvm_getloadavg.c
+++ b/lib/libkvm/kvm_getloadavg.c
@@ -30,7 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
__SCCSID("@(#)kvm_getloadavg.c 8.1 (Berkeley) 6/4/93");
#include <sys/param.h>
diff --git a/lib/libkvm/kvm_getswapinfo.c b/lib/libkvm/kvm_getswapinfo.c
index 686084bd31f4..3c5019977d50 100644
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index 2f4c5287e965..f63d6888b686 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -34,7 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
__SCCSID("@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93");
/*
diff --git a/lib/libkvm/kvm_minidump_aarch64.c b/lib/libkvm/kvm_minidump_aarch64.c
index 5e9ac739406f..0836f5b2b1db 100644
--- a/lib/libkvm/kvm_minidump_aarch64.c
+++ b/lib/libkvm/kvm_minidump_aarch64.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ARM64 (AArch64) machine dependent routines for kvm and minidumps.
*/
diff --git a/lib/libkvm/kvm_minidump_amd64.c b/lib/libkvm/kvm_minidump_amd64.c
index 4bb4a9e24725..e121208a628a 100644
--- a/lib/libkvm/kvm_minidump_amd64.c
+++ b/lib/libkvm/kvm_minidump_amd64.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* AMD64 machine dependent routines for kvm and minidumps.
*/
diff --git a/lib/libkvm/kvm_minidump_arm.c b/lib/libkvm/kvm_minidump_arm.c
index a7dc5ea23203..9054e4d1f45f 100644
--- a/lib/libkvm/kvm_minidump_arm.c
+++ b/lib/libkvm/kvm_minidump_arm.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ARM machine dependent routines for kvm and minidumps.
*/
diff --git a/lib/libkvm/kvm_minidump_i386.c b/lib/libkvm/kvm_minidump_i386.c
index 21821f8a528a..65fd1f43e21e 100644
--- a/lib/libkvm/kvm_minidump_i386.c
+++ b/lib/libkvm/kvm_minidump_i386.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* i386 machine dependent routines for kvm and minidumps.
*/
diff --git a/lib/libkvm/kvm_minidump_powerpc64.c b/lib/libkvm/kvm_minidump_powerpc64.c
index 24def29a7c83..a75e139929d3 100644
--- a/lib/libkvm/kvm_minidump_powerpc64.c
+++ b/lib/libkvm/kvm_minidump_powerpc64.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <kvm.h>
diff --git a/lib/libkvm/kvm_minidump_powerpc64_hpt.c b/lib/libkvm/kvm_minidump_powerpc64_hpt.c
index d13f8021a731..a1471684c88f 100644
--- a/lib/libkvm/kvm_minidump_powerpc64_hpt.c
+++ b/lib/libkvm/kvm_minidump_powerpc64_hpt.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <vm/vm.h>
diff --git a/lib/libkvm/kvm_minidump_riscv.c b/lib/libkvm/kvm_minidump_riscv.c
index 4b825afe27d9..b90c255d4822 100644
--- a/lib/libkvm/kvm_minidump_riscv.c
+++ b/lib/libkvm/kvm_minidump_riscv.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* RISC-V machine dependent routines for kvm and minidumps.
*/
diff --git a/lib/libkvm/kvm_pcpu.c b/lib/libkvm/kvm_pcpu.c
index 008a3d20129a..613fadffe435 100644
--- a/lib/libkvm/kvm_pcpu.c
+++ b/lib/libkvm/kvm_pcpu.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/pcpu.h>
#include <sys/sysctl.h>
diff --git a/lib/libkvm/kvm_powerpc.c b/lib/libkvm/kvm_powerpc.c
index 9e596b6000aa..35312cda3525 100644
--- a/lib/libkvm/kvm_powerpc.c
+++ b/lib/libkvm/kvm_powerpc.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/kerneldump.h>
diff --git a/lib/libkvm/kvm_powerpc64.c b/lib/libkvm/kvm_powerpc64.c
index 22e118598bea..6bf350121143 100644
--- a/lib/libkvm/kvm_powerpc64.c
+++ b/lib/libkvm/kvm_powerpc64.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/kerneldump.h>
diff --git a/lib/libkvm/kvm_private.c b/lib/libkvm/kvm_private.c
index a45f66caf2fe..dbbe68437b4b 100644
--- a/lib/libkvm/kvm_private.c
+++ b/lib/libkvm/kvm_private.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/fnv_hash.h>
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 1af4ce38615f..0cd8d754eb04 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -34,7 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
__SCCSID("@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93");
/*
diff --git a/lib/libkvm/kvm_vnet.c b/lib/libkvm/kvm_vnet.c
index 68a60808e9f0..03e80d0458f3 100644
--- a/lib/libkvm/kvm_vnet.c
+++ b/lib/libkvm/kvm_vnet.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#define _WANT_PRISON
diff --git a/lib/libkvm/tests/kvm_close_test.c b/lib/libkvm/tests/kvm_close_test.c
index 4be08feefbbe..ed8e4f34c868 100644
--- a/lib/libkvm/tests/kvm_close_test.c
+++ b/lib/libkvm/tests/kvm_close_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <fcntl.h>
#include <kvm.h>
diff --git a/lib/libkvm/tests/kvm_geterr_test.c b/lib/libkvm/tests/kvm_geterr_test.c
index c172f5edb6bd..9e70a482656c 100644
--- a/lib/libkvm/tests/kvm_geterr_test.c
+++ b/lib/libkvm/tests/kvm_geterr_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/lib/libkvm/tests/kvm_open2_test.c b/lib/libkvm/tests/kvm_open2_test.c
index 8e369a152c67..cfa6e214a031 100644
--- a/lib/libkvm/tests/kvm_open2_test.c
+++ b/lib/libkvm/tests/kvm_open2_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/lib/libkvm/tests/kvm_open_test.c b/lib/libkvm/tests/kvm_open_test.c
index 295a6e6fce78..e3090dc43cfc 100644
--- a/lib/libkvm/tests/kvm_open_test.c
+++ b/lib/libkvm/tests/kvm_open_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/lib/libkvm/tests/kvm_read_test.c b/lib/libkvm/tests/kvm_read_test.c
index 30b7caa49d1f..2945ec96d0b7 100644
--- a/lib/libkvm/tests/kvm_read_test.c
+++ b/lib/libkvm/tests/kvm_read_test.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <errno.h>
diff --git a/lib/libkvm/tests/kvm_test_common.c b/lib/libkvm/tests/kvm_test_common.c
index 5fcbb11f352a..36b109aed94f 100644
--- a/lib/libkvm/tests/kvm_test_common.c
+++ b/lib/libkvm/tests/kvm_test_common.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
diff --git a/lib/libmd/md4c.c b/lib/libmd/md4c.c
index 66d3652465a9..d98221d264fc 100644
--- a/lib/libmd/md4c.c
+++ b/lib/libmd/md4c.c
@@ -2,8 +2,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*-
SPDX-License-Identifier: RSA-MD
diff --git a/lib/libmd/md5c.c b/lib/libmd/md5c.c
index fc852b913464..5fc904cdc3ac 100644
--- a/lib/libmd/md5c.c
+++ b/lib/libmd/md5c.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#ifdef _KERNEL
diff --git a/lib/libmd/mdXhl.c b/lib/libmd/mdXhl.c
index 983ea8add989..fab5cc325534 100644
--- a/lib/libmd/mdXhl.c
+++ b/lib/libmd/mdXhl.c
@@ -10,8 +10,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/lib/libmd/mddriver.c b/lib/libmd/mddriver.c
index 6c543974668d..8427655e80e8 100644
--- a/lib/libmd/mddriver.c
+++ b/lib/libmd/mddriver.c
@@ -12,8 +12,6 @@
* documentation and/or software. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/lib/libmd/rmd160c.c b/lib/libmd/rmd160c.c
index d48f2677142f..1384880aacdf 100644
--- a/lib/libmd/rmd160c.c
+++ b/lib/libmd/rmd160c.c
@@ -57,8 +57,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/lib/libmd/rmddriver.c b/lib/libmd/rmddriver.c
index 1c03b79b76be..ea6e79eb5581 100644
--- a/lib/libmd/rmddriver.c
+++ b/lib/libmd/rmddriver.c
@@ -12,8 +12,6 @@
* documentation and/or software. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/lib/libmd/sha0c.c b/lib/libmd/sha0c.c
index e9f83fbd4e19..dc31389b6858 100644
--- a/lib/libmd/sha0c.c
+++ b/lib/libmd/sha0c.c
@@ -57,8 +57,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/lib/libmd/sha1c.c b/lib/libmd/sha1c.c
index 871b7a8012dc..7626473c6f3c 100644
--- a/lib/libmd/sha1c.c
+++ b/lib/libmd/sha1c.c
@@ -57,8 +57,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/lib/libmd/shadriver.c b/lib/libmd/shadriver.c
index 3664eab9dbaa..9b0c47e3e753 100644
--- a/lib/libmd/shadriver.c
+++ b/lib/libmd/shadriver.c
@@ -15,8 +15,6 @@
* documentation and/or software. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/lib/libmd/skeindriver.c b/lib/libmd/skeindriver.c
index ee70ef7cd7dc..9433fdac8c25 100644
--- a/lib/libmd/skeindriver.c
+++ b/lib/libmd/skeindriver.c
@@ -15,8 +15,6 @@
* documentation and/or software. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/lib/libmp/mpasbn.c b/lib/libmp/mpasbn.c
index f6501d725cb2..7ccbeccd15eb 100644
--- a/lib/libmp/mpasbn.c
+++ b/lib/libmp/mpasbn.c
@@ -72,8 +72,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/lib/libmp/tests/legacy_test.c b/lib/libmp/tests/legacy_test.c
index 6f3f7b60e8d0..8e3a4d10a0b9 100644
--- a/lib/libmp/tests/legacy_test.c
+++ b/lib/libmp/tests/legacy_test.c
@@ -25,8 +25,6 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <mp.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c
index 4150825acc18..edcf747bd808 100644
--- a/lib/libmt/mtlib.c
+++ b/lib/libmt/mtlib.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/mtio.h>
diff --git a/lib/libnetbsd/sockaddr_snprintf.c b/lib/libnetbsd/sockaddr_snprintf.c
index 96ed1b1d8892..4f70e6a8df2c 100644
--- a/lib/libnetbsd/sockaddr_snprintf.c
+++ b/lib/libnetbsd/sockaddr_snprintf.c
@@ -33,8 +33,6 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/lib/libnetbsd/strsuftoll.c b/lib/libnetbsd/strsuftoll.c
index 5b2d0978c083..8acd4216d3b6 100644
--- a/lib/libnetbsd/strsuftoll.c
+++ b/lib/libnetbsd/strsuftoll.c
@@ -63,8 +63,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/lib/libnetgraph/debug.c b/lib/libnetgraph/debug.c
index d5c58ca73e6e..cf8600bea8e5 100644
--- a/lib/libnetgraph/debug.c
+++ b/lib/libnetgraph/debug.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/lib/libnetgraph/msg.c b/lib/libnetgraph/msg.c
index 061bdc233ff5..fb62b84ed4ef 100644
--- a/lib/libnetgraph/msg.c
+++ b/lib/libnetgraph/msg.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <stdarg.h>
diff --git a/lib/libnetgraph/sock.c b/lib/libnetgraph/sock.c
index 12603d3b10ab..94bcd730b963 100644
--- a/lib/libnetgraph/sock.c
+++ b/lib/libnetgraph/sock.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <stdarg.h>
diff --git a/lib/libnv/msgio.c b/lib/libnv/msgio.c
index c76e61d433b3..002c626647d9 100644
--- a/lib/libnv/msgio.c
+++ b/lib/libnv/msgio.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/select.h>
diff --git a/lib/libnv/tests/cnv_tests.cc b/lib/libnv/tests/cnv_tests.cc
index d2688394a495..ecd8ba3e98ac 100644
--- a/lib/libnv/tests/cnv_tests.cc
+++ b/lib/libnv/tests/cnv_tests.cc
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/cnv.h>
#include <sys/nv.h>
#include <sys/types.h>
diff --git a/lib/libnv/tests/dnv_tests.cc b/lib/libnv/tests/dnv_tests.cc
index 64750b2a6bc2..b66315713bca 100644
--- a/lib/libnv/tests/dnv_tests.cc
+++ b/lib/libnv/tests/dnv_tests.cc
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/dnv.h>
#include <sys/nv.h>
diff --git a/lib/libnv/tests/nv_array_tests.cc b/lib/libnv/tests/nv_array_tests.cc
index ba404c709bf7..f5c448598b22 100644
--- a/lib/libnv/tests/nv_array_tests.cc
+++ b/lib/libnv/tests/nv_array_tests.cc
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/nv.h>
diff --git a/lib/libnv/tests/nv_tests.cc b/lib/libnv/tests/nv_tests.cc
index 3464d20f2ec0..c784f6caa232 100644
--- a/lib/libnv/tests/nv_tests.cc
+++ b/lib/libnv/tests/nv_tests.cc
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/nv.h>
#include <atf-c++.hpp>
diff --git a/lib/libnv/tests/nvlist_send_recv_test.c b/lib/libnv/tests/nvlist_send_recv_test.c
index 133a487b8a7c..25edaa5c3c10 100644
--- a/lib/libnv/tests/nvlist_send_recv_test.c
+++ b/lib/libnv/tests/nvlist_send_recv_test.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/sysctl.h>
diff --git a/lib/libopenbsd/getdtablecount.c b/lib/libopenbsd/getdtablecount.c
index 9d2ba2575074..53ed49342062 100644
--- a/lib/libopenbsd/getdtablecount.c
+++ b/lib/libopenbsd/getdtablecount.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
#include <stddef.h>
diff --git a/lib/libopenbsd/ohash.c b/lib/libopenbsd/ohash.c
index 3a0f5dde449c..de5d47563c5b 100644
--- a/lib/libopenbsd/ohash.c
+++ b/lib/libopenbsd/ohash.c
@@ -16,8 +16,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/lib/libpam/modules/pam_chroot/pam_chroot.c b/lib/libpam/modules/pam_chroot/pam_chroot.c
index d468c3390819..5cb38e2570b0 100644
--- a/lib/libpam/modules/pam_chroot/pam_chroot.c
+++ b/lib/libpam/modules/pam_chroot/pam_chroot.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <pwd.h>
diff --git a/lib/libpam/modules/pam_deny/pam_deny.c b/lib/libpam/modules/pam_deny/pam_deny.c
index 372e7e364c08..a3edb213141a 100644
--- a/lib/libpam/modules/pam_deny/pam_deny.c
+++ b/lib/libpam/modules/pam_deny/pam_deny.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#define PAM_SM_AUTH
diff --git a/lib/libpam/modules/pam_echo/pam_echo.c b/lib/libpam/modules/pam_echo/pam_echo.c
index 4217118f3011..73f1c11eca61 100644
--- a/lib/libpam/modules/pam_echo/pam_echo.c
+++ b/lib/libpam/modules/pam_echo/pam_echo.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libpam/modules/pam_exec/pam_exec.c b/lib/libpam/modules/pam_exec/pam_exec.c
index ef2680d80525..c249a654c8be 100644
--- a/lib/libpam/modules/pam_exec/pam_exec.c
+++ b/lib/libpam/modules/pam_exec/pam_exec.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/poll.h>
#include <sys/procdesc.h>
diff --git a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
index ea800cbb17dd..d33c0e85e0cb 100644
--- a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
+++ b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <grp.h>
#include <paths.h>
diff --git a/lib/libpam/modules/pam_group/pam_group.c b/lib/libpam/modules/pam_group/pam_group.c
index bd6912a02d1a..7c9538b73978 100644
--- a/lib/libpam/modules/pam_group/pam_group.c
+++ b/lib/libpam/modules/pam_group/pam_group.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <grp.h>
diff --git a/lib/libpam/modules/pam_guest/pam_guest.c b/lib/libpam/modules/pam_guest/pam_guest.c
index 51e9181679c7..c3ef07fc189a 100644
--- a/lib/libpam/modules/pam_guest/pam_guest.c
+++ b/lib/libpam/modules/pam_guest/pam_guest.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#define PAM_SM_AUTH
diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c
index ef39fe8acb22..34f457d07a40 100644
--- a/lib/libpam/modules/pam_krb5/pam_krb5.c
+++ b/lib/libpam/modules/pam_krb5/pam_krb5.c
@@ -48,8 +48,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pam_ksu/pam_ksu.c
index ddf25438a437..9a203f694e61 100644
--- a/lib/libpam/modules/pam_ksu/pam_ksu.c
+++ b/lib/libpam/modules/pam_ksu/pam_ksu.c
@@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
#include <stdio.h>
diff --git a/lib/libpam/modules/pam_lastlog/pam_lastlog.c b/lib/libpam/modules/pam_lastlog/pam_lastlog.c
index 00b07bc19142..e631723f6e76 100644
--- a/lib/libpam/modules/pam_lastlog/pam_lastlog.c
+++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.c
@@ -44,8 +44,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _BSD_SOURCE
#include <sys/time.h>
diff --git a/lib/libpam/modules/pam_login_access/login_access.c b/lib/libpam/modules/pam_login_access/login_access.c
index 719808858dac..c6550a5a9a9d 100644
--- a/lib/libpam/modules/pam_login_access/login_access.c
+++ b/lib/libpam/modules/pam_login_access/login_access.c
@@ -14,8 +14,6 @@ static char sccsid[] = "%Z% %M% %I% %E% %U%";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <ctype.h>
diff --git a/lib/libpam/modules/pam_login_access/pam_login_access.c b/lib/libpam/modules/pam_login_access/pam_login_access.c
index e0c385a48b8d..8b4e7d8f0880 100644
--- a/lib/libpam/modules/pam_login_access/pam_login_access.c
+++ b/lib/libpam/modules/pam_login_access/pam_login_access.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _BSD_SOURCE
#include <sys/param.h>
diff --git a/lib/libpam/modules/pam_nologin/pam_nologin.c b/lib/libpam/modules/pam_nologin/pam_nologin.c
index 1ba2dcd92fad..d944c79814a4 100644
--- a/lib/libpam/modules/pam_nologin/pam_nologin.c
+++ b/lib/libpam/modules/pam_nologin/pam_nologin.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/lib/libpam/modules/pam_permit/pam_permit.c b/lib/libpam/modules/pam_permit/pam_permit.c
index a9b9bc14eba4..9dfc76ce5cf2 100644
--- a/lib/libpam/modules/pam_permit/pam_permit.c
+++ b/lib/libpam/modules/pam_permit/pam_permit.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#define PAM_SM_AUTH
diff --git a/lib/libpam/modules/pam_radius/pam_radius.c b/lib/libpam/modules/pam_radius/pam_radius.c
index 377652382dc4..418527771446 100644
--- a/lib/libpam/modules/pam_radius/pam_radius.c
+++ b/lib/libpam/modules/pam_radius/pam_radius.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <netdb.h>
diff --git a/lib/libpam/modules/pam_rhosts/pam_rhosts.c b/lib/libpam/modules/pam_rhosts/pam_rhosts.c
index e8b6ba461b2c..597fb47e95c8 100644
--- a/lib/libpam/modules/pam_rhosts/pam_rhosts.c
+++ b/lib/libpam/modules/pam_rhosts/pam_rhosts.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <pwd.h>
#include <stddef.h>
#include <string.h>
diff --git a/lib/libpam/modules/pam_rootok/pam_rootok.c b/lib/libpam/modules/pam_rootok/pam_rootok.c
index c5540a2683e3..d267d267ef27 100644
--- a/lib/libpam/modules/pam_rootok/pam_rootok.c
+++ b/lib/libpam/modules/pam_rootok/pam_rootok.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _BSD_SOURCE
#include <unistd.h>
diff --git a/lib/libpam/modules/pam_securetty/pam_securetty.c b/lib/libpam/modules/pam_securetty/pam_securetty.c
index 50574d315608..4bef10331f2f 100644
--- a/lib/libpam/modules/pam_securetty/pam_securetty.c
+++ b/lib/libpam/modules/pam_securetty/pam_securetty.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <pwd.h>
diff --git a/lib/libpam/modules/pam_self/pam_self.c b/lib/libpam/modules/pam_self/pam_self.c
index de69f408d3f9..fceb6466d8fb 100644
--- a/lib/libpam/modules/pam_self/pam_self.c
+++ b/lib/libpam/modules/pam_self/pam_self.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _BSD_SOURCE
#include <pwd.h>
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c
index 1990a8657eaf..d79676244694 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.c
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/wait.h>
diff --git a/lib/libpam/modules/pam_tacplus/pam_tacplus.c b/lib/libpam/modules/pam_tacplus/pam_tacplus.c
index 8f8e9d553ee7..297c1e761d44 100644
--- a/lib/libpam/modules/pam_tacplus/pam_tacplus.c
+++ b/lib/libpam/modules/pam_tacplus/pam_tacplus.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <pwd.h>
diff --git a/lib/libpam/modules/pam_unix/pam_unix.c b/lib/libpam/modules/pam_unix/pam_unix.c
index 2e9e272eaa77..3949e6f126ff 100644
--- a/lib/libpam/modules/pam_unix/pam_unix.c
+++ b/lib/libpam/modules/pam_unix/pam_unix.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/lib/libpjdlog/pjdlog.c b/lib/libpjdlog/pjdlog.c
index 64deabceda03..5cf0976c7a0e 100644
--- a/lib/libpjdlog/pjdlog.c
+++ b/lib/libpjdlog/pjdlog.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c
index 003d9615a44a..71fba89237ff 100644
--- a/lib/libpmc/libpmc.c
+++ b/lib/libpmc/libpmc.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/module.h>
diff --git a/lib/libpmc/pmclog.c b/lib/libpmc/pmclog.c
index 00ab84057be2..a21fe42c9947 100644
--- a/lib/libpmc/pmclog.c
+++ b/lib/libpmc/pmclog.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/pmc.h>
#include <sys/pmclog.h>
diff --git a/lib/libpmcstat/libpmcstat_event.c b/lib/libpmcstat/libpmcstat_event.c
index 623a6f5400df..c964537ad2a1 100644
--- a/lib/libpmcstat/libpmcstat_event.c
+++ b/lib/libpmcstat/libpmcstat_event.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/cpuset.h>
#include <sys/pmc.h>
diff --git a/lib/libpmcstat/libpmcstat_image.c b/lib/libpmcstat/libpmcstat_image.c
index bd62a4818f2c..f8f76bfc148b 100644
--- a/lib/libpmcstat/libpmcstat_image.c
+++ b/lib/libpmcstat/libpmcstat_image.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/cpuset.h>
#include <sys/param.h>
diff --git a/lib/libpmcstat/libpmcstat_logging.c b/lib/libpmcstat/libpmcstat_logging.c
index b41e93b4f729..3e68824f0f0c 100644
--- a/lib/libpmcstat/libpmcstat_logging.c
+++ b/lib/libpmcstat/libpmcstat_logging.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/cpuset.h>
#include <sys/param.h>
diff --git a/lib/libpmcstat/libpmcstat_process.c b/lib/libpmcstat/libpmcstat_process.c
index 4d710eac2f58..6d000fe2fc61 100644
--- a/lib/libpmcstat/libpmcstat_process.c
+++ b/lib/libpmcstat/libpmcstat_process.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/lib/libpmcstat/libpmcstat_string.c b/lib/libpmcstat/libpmcstat_string.c
index d7932c680eb4..dc48617b99b9 100644
--- a/lib/libpmcstat/libpmcstat_string.c
+++ b/lib/libpmcstat/libpmcstat_string.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/cpuset.h>
#include <sys/param.h>
diff --git a/lib/libpmcstat/libpmcstat_symbol.c b/lib/libpmcstat/libpmcstat_symbol.c
index 155582f85f2f..05040b1f304b 100644
--- a/lib/libpmcstat/libpmcstat_symbol.c
+++ b/lib/libpmcstat/libpmcstat_symbol.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/lib/libproc/proc_bkpt.c b/lib/libproc/proc_bkpt.c
index e5ac55fa17bd..25ff3a86291d 100644
--- a/lib/libproc/proc_bkpt.c
+++ b/lib/libproc/proc_bkpt.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
diff --git a/lib/libproc/proc_create.c b/lib/libproc/proc_create.c
index 3645f2825bd5..9acee3682e45 100644
--- a/lib/libproc/proc_create.c
+++ b/lib/libproc/proc_create.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/lib/libproc/proc_regs.c b/lib/libproc/proc_regs.c
index 39bce7c2245e..492fbf712ef5 100644
--- a/lib/libproc/proc_regs.c
+++ b/lib/libproc/proc_regs.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ptrace.h>
diff --git a/lib/libproc/proc_rtld.c b/lib/libproc/proc_rtld.c
index 6fccb4b3430a..db17c2b02b95 100644
--- a/lib/libproc/proc_rtld.c
+++ b/lib/libproc/proc_rtld.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libproc/proc_sym.c b/lib/libproc/proc_sym.c
index e34e5f655f21..1bb34bdaac67 100644
--- a/lib/libproc/proc_sym.c
+++ b/lib/libproc/proc_sym.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#ifndef NO_CTF
#include <sys/ctf.h>
diff --git a/lib/libproc/proc_util.c b/lib/libproc/proc_util.c
index cd2c0dff3451..9af627422ef8 100644
--- a/lib/libproc/proc_util.c
+++ b/lib/libproc/proc_util.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
diff --git a/lib/libproc/tests/proc_test.c b/lib/libproc/tests/proc_test.c
index 6be8b93f18ea..ba1535940b81 100644
--- a/lib/libproc/tests/proc_test.c
+++ b/lib/libproc/tests/proc_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/lib/libproc/tests/target_prog.c b/lib/libproc/tests/target_prog.c
index 3cafb562a3b1..7e54dad6501a 100644
--- a/lib/libproc/tests/target_prog.c
+++ b/lib/libproc/tests/target_prog.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <signal.h>
#include <stdlib.h>
diff --git a/lib/libprocstat/cd9660.c b/lib/libprocstat/cd9660.c
index 26e0b732eb55..0d0030715c28 100644
--- a/lib/libprocstat/cd9660.c
+++ b/lib/libprocstat/cd9660.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/lib/libprocstat/common_kvm.c b/lib/libprocstat/common_kvm.c
index 0ce2a2900f66..9d96d935be6a 100644
--- a/lib/libprocstat/common_kvm.c
+++ b/lib/libprocstat/common_kvm.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/user.h>
#include <sys/stat.h>
diff --git a/lib/libprocstat/core.c b/lib/libprocstat/core.c
index 95c633c6f323..dea078c848eb 100644
--- a/lib/libprocstat/core.c
+++ b/lib/libprocstat/core.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/elf.h>
#include <sys/exec.h>
diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c
index 5948bf72230d..0af79b6e63a0 100644
--- a/lib/libprocstat/libprocstat.c
+++ b/lib/libprocstat/libprocstat.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/elf.h>
#include <sys/time.h>
diff --git a/lib/libprocstat/libprocstat_compat.c b/lib/libprocstat/libprocstat_compat.c
index d7e1f9775538..58c4ce0d2558 100644
--- a/lib/libprocstat/libprocstat_compat.c
+++ b/lib/libprocstat/libprocstat_compat.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/user.h>
#include <sys/socket.h>
diff --git a/lib/libprocstat/msdosfs.c b/lib/libprocstat/msdosfs.c
index c77e8a803211..bb1ad65e6b1a 100644
--- a/lib/libprocstat/msdosfs.c
+++ b/lib/libprocstat/msdosfs.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdbool.h>
#include <sys/param.h>
diff --git a/lib/libprocstat/smbfs.c b/lib/libprocstat/smbfs.c
index fe1216f32c0c..136cceacb471 100644
--- a/lib/libprocstat/smbfs.c
+++ b/lib/libprocstat/smbfs.c
@@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdbool.h>
#include <sys/param.h>
diff --git a/lib/libprocstat/udf.c b/lib/libprocstat/udf.c
index e076c01cff60..9a110950f8b0 100644
--- a/lib/libprocstat/udf.c
+++ b/lib/libprocstat/udf.c
@@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdbool.h>
#include <sys/param.h>
diff --git a/lib/libprocstat/zfs_defs.c b/lib/libprocstat/zfs_defs.c
index 7b86e3b974c8..c03c99249f42 100644
--- a/lib/libprocstat/zfs_defs.c
+++ b/lib/libprocstat/zfs_defs.c
@@ -27,9 +27,6 @@
#include <sys/cdefs.h>
#include <sys/types.h>
-__FBSDID("$FreeBSD$");
-
-
/*
* Prevent some headers from getting included and fake some types
* in order to allow this file to compile without bringing in
diff --git a/lib/libradius/radlib.c b/lib/libradius/radlib.c
index 56c66aa81bdb..2049468f455f 100644
--- a/lib/libradius/radlib.c
+++ b/lib/libradius/radlib.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/lib/librpcsvc/rnusers.c b/lib/librpcsvc/rnusers.c
index 2a68de5578c5..19e8e30988a0 100644
--- a/lib/librpcsvc/rnusers.c
+++ b/lib/librpcsvc/rnusers.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if !defined(lint) && defined(SCCSIDS)
static char sccsid[] = "@(#)rnusers.c 1.2 91/03/11 TIRPC 1.0; from 1.7 89/03/24 SMI";
#endif
diff --git a/lib/librpcsvc/rstat.c b/lib/librpcsvc/rstat.c
index c5cbe800c031..777525dfa90c 100644
--- a/lib/librpcsvc/rstat.c
+++ b/lib/librpcsvc/rstat.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if !defined(lint) && defined(SCCSIDS)
static char sccsid[] = "@(#)rstat.c 1.2 91/03/11 TIRPC 1.0; from 1.6 89/03/24 SMI";
#endif
diff --git a/lib/librpcsvc/rwall.c b/lib/librpcsvc/rwall.c
index d53f2643a27d..7d1422a75715 100644
--- a/lib/librpcsvc/rwall.c
+++ b/lib/librpcsvc/rwall.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if !defined(lint) && defined(SCCSIDS)
static char sccsid[] = "@(#)rwall.c 1.2 91/03/11 TIRPC 1.0; from 1.3 89/03/24 SMI";
#endif
diff --git a/lib/librpcsvc/secretkey.c b/lib/librpcsvc/secretkey.c
index 636fd89c1bba..62148d0c404c 100644
--- a/lib/librpcsvc/secretkey.c
+++ b/lib/librpcsvc/secretkey.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if !defined(lint) && defined(SCCSIDS)
static char sccsid[] = "@(#)secretkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
#endif
diff --git a/lib/librpcsvc/xcrypt.c b/lib/librpcsvc/xcrypt.c
index 17eec49b257e..c46ed93835bd 100644
--- a/lib/librpcsvc/xcrypt.c
+++ b/lib/librpcsvc/xcrypt.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/librpcsvc/yp_passwd.c b/lib/librpcsvc/yp_passwd.c
index b8d99a66ab59..8f923055ff0c 100644
--- a/lib/librpcsvc/yp_passwd.c
+++ b/lib/librpcsvc/yp_passwd.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <rpc/rpc.h>
#include <rpcsvc/yp_prot.h>
diff --git a/lib/librpcsvc/yp_update.c b/lib/librpcsvc/yp_update.c
index 081ef4f547f7..8a31b2c22d9b 100644
--- a/lib/librpcsvc/yp_update.c
+++ b/lib/librpcsvc/yp_update.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <rpc/rpc.h>
#include <rpcsvc/yp_prot.h>
diff --git a/lib/librss/librss.c b/lib/librss/librss.c
index fcaac4cc7366..d52b00fbf276 100644
--- a/lib/librss/librss.c
+++ b/lib/librss/librss.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/lib/librtld_db/rtld_db.c b/lib/librtld_db/rtld_db.c
index ac392801d7c7..2546f572780d 100644
--- a/lib/librtld_db/rtld_db.c
+++ b/lib/librtld_db/rtld_db.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/lib/libsbuf/tests/sbuf_core_test.c b/lib/libsbuf/tests/sbuf_core_test.c
index 13a27933c20d..1ed320316510 100644
--- a/lib/libsbuf/tests/sbuf_core_test.c
+++ b/lib/libsbuf/tests/sbuf_core_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sbuf.h>
#include <errno.h>
diff --git a/lib/libsbuf/tests/sbuf_stdio_test.c b/lib/libsbuf/tests/sbuf_stdio_test.c
index 74928d9d09ea..5bf32c674901 100644
--- a/lib/libsbuf/tests/sbuf_stdio_test.c
+++ b/lib/libsbuf/tests/sbuf_stdio_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sbuf.h>
#include <errno.h>
diff --git a/lib/libsbuf/tests/sbuf_string_test.c b/lib/libsbuf/tests/sbuf_string_test.c
index 04b727afc8a1..9deccc572692 100644
--- a/lib/libsbuf/tests/sbuf_string_test.c
+++ b/lib/libsbuf/tests/sbuf_string_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sbuf.h>
#include <errno.h>
diff --git a/lib/libsecureboot/brf.c b/lib/libsecureboot/brf.c
index 9e3af4a7c089..fbd24f322bee 100644
--- a/lib/libsecureboot/brf.c
+++ b/lib/libsecureboot/brf.c
@@ -24,8 +24,6 @@
* SOFTWARE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define NEED_BRSSL_H
#include "libsecureboot-priv.h"
#include <brssl.h>
diff --git a/lib/libsecureboot/efi/efi_init.c b/lib/libsecureboot/efi/efi_init.c
index 241e99dab17a..1078d9bc24ca 100644
--- a/lib/libsecureboot/efi/efi_init.c
+++ b/lib/libsecureboot/efi/efi_init.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define NEED_BRSSL_H
#include "../libsecureboot-priv.h"
#include <brssl.h>
diff --git a/lib/libsecureboot/efi/efi_variables.c b/lib/libsecureboot/efi/efi_variables.c
index 6eefde504cbe..3c36bc66f788 100644
--- a/lib/libsecureboot/efi/efi_variables.c
+++ b/lib/libsecureboot/efi/efi_variables.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
diff --git a/lib/libsecureboot/efi/include/Guid/GlobalVariable.h b/lib/libsecureboot/efi/include/Guid/GlobalVariable.h
index cef7995e7497..3bd0a815fcf6 100644
--- a/lib/libsecureboot/efi/include/Guid/GlobalVariable.h
+++ b/lib/libsecureboot/efi/include/Guid/GlobalVariable.h
@@ -15,8 +15,6 @@
#define __GLOBAL_VARIABLE_GUID_H__
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef EFI_GLOBAL_VARIABLE
#define EFI_GLOBAL_VARIABLE \
{ \
diff --git a/lib/libsecureboot/efi/include/Guid/ImageAuthentication.h b/lib/libsecureboot/efi/include/Guid/ImageAuthentication.h
index c68e5fce205a..b1fc1f54cce1 100644
--- a/lib/libsecureboot/efi/include/Guid/ImageAuthentication.h
+++ b/lib/libsecureboot/efi/include/Guid/ImageAuthentication.h
@@ -15,8 +15,6 @@
#define __IMAGE_AUTHTICATION_H__
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <Guid/GlobalVariable.h>
#include <Protocol/Hash.h>
diff --git a/lib/libsecureboot/efi/include/Protocol/Hash.h b/lib/libsecureboot/efi/include/Protocol/Hash.h
index f25267952391..094bf20964cc 100644
--- a/lib/libsecureboot/efi/include/Protocol/Hash.h
+++ b/lib/libsecureboot/efi/include/Protocol/Hash.h
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define __EFI_HASH_PROTOCOL_H__
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define CONST const
#define EFI_HASH_SERVICE_BINDING_PROTOCOL_GUID \
diff --git a/lib/libsecureboot/openpgp/dearmor.c b/lib/libsecureboot/openpgp/dearmor.c
index 3d53b54474dc..452722ff1a10 100644
--- a/lib/libsecureboot/openpgp/dearmor.c
+++ b/lib/libsecureboot/openpgp/dearmor.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define NEED_BRSSL_H
#include <libsecureboot.h>
#include <brssl.h>
diff --git a/lib/libsecureboot/openpgp/decode.c b/lib/libsecureboot/openpgp/decode.c
index fd6a19ad1bea..c59b5722c29e 100644
--- a/lib/libsecureboot/openpgp/decode.c
+++ b/lib/libsecureboot/openpgp/decode.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <libsecureboot.h>
#include "decode.h"
diff --git a/lib/libsecureboot/openpgp/opgp_key.c b/lib/libsecureboot/openpgp/opgp_key.c
index c108cd2fa328..568d334ec117 100644
--- a/lib/libsecureboot/openpgp/opgp_key.c
+++ b/lib/libsecureboot/openpgp/opgp_key.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "../libsecureboot-priv.h"
#include "decode.h"
diff --git a/lib/libsecureboot/openpgp/opgp_sig.c b/lib/libsecureboot/openpgp/opgp_sig.c
index 7f4e6fb98fd1..a6aa787ee5c0 100644
--- a/lib/libsecureboot/openpgp/opgp_sig.c
+++ b/lib/libsecureboot/openpgp/opgp_sig.c
@@ -40,8 +40,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "../libsecureboot-priv.h"
#ifdef _STANDALONE
#define warnx printf
diff --git a/lib/libsecureboot/pass_manifest.c b/lib/libsecureboot/pass_manifest.c
index 570961574d3e..e3ef1fa96aae 100644
--- a/lib/libsecureboot/pass_manifest.c
+++ b/lib/libsecureboot/pass_manifest.c
@@ -24,8 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include "libsecureboot-priv.h"
diff --git a/lib/libsecureboot/readfile.c b/lib/libsecureboot/readfile.c
index 550c9419c159..19784f6f4139 100644
--- a/lib/libsecureboot/readfile.c
+++ b/lib/libsecureboot/readfile.c
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <libsecureboot.h>
unsigned char *
diff --git a/lib/libsecureboot/tests/tvo.c b/lib/libsecureboot/tests/tvo.c
index 5ea471faa0ba..7851e79c5a2a 100644
--- a/lib/libsecureboot/tests/tvo.c
+++ b/lib/libsecureboot/tests/tvo.c
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "../libsecureboot-priv.h"
#include <unistd.h>
diff --git a/lib/libsecureboot/vectx.c b/lib/libsecureboot/vectx.c
index 45a15ddece4b..dba728421ce4 100644
--- a/lib/libsecureboot/vectx.c
+++ b/lib/libsecureboot/vectx.c
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef _STANDALONE
/* Avoid unwanted userlandish components */
#define _KERNEL
diff --git a/lib/libsecureboot/veopen.c b/lib/libsecureboot/veopen.c
index b428fa4b13a3..0a1fc59eb9b4 100644
--- a/lib/libsecureboot/veopen.c
+++ b/lib/libsecureboot/veopen.c
@@ -23,7 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/queue.h>
#include "libsecureboot-priv.h"
diff --git a/lib/libsecureboot/vepcr.c b/lib/libsecureboot/vepcr.c
index 88128647b086..f4f146975e5e 100644
--- a/lib/libsecureboot/vepcr.c
+++ b/lib/libsecureboot/vepcr.c
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include "libsecureboot-priv.h"
diff --git a/lib/libsecureboot/verify_file.c b/lib/libsecureboot/verify_file.c
index a6d4410a5724..1e1c714d1fa8 100644
--- a/lib/libsecureboot/verify_file.c
+++ b/lib/libsecureboot/verify_file.c
@@ -26,8 +26,6 @@
* Routines to verify files loaded.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <string.h>
#include <sys/queue.h>
diff --git a/lib/libsecureboot/vesigned.c b/lib/libsecureboot/vesigned.c
index 47195f82494a..4015923eabfd 100644
--- a/lib/libsecureboot/vesigned.c
+++ b/lib/libsecureboot/vesigned.c
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <libsecureboot.h>
#include <vse.h>
diff --git a/lib/libsecureboot/veta.c b/lib/libsecureboot/veta.c
index f052f41792bf..c0ddbfb4921f 100644
--- a/lib/libsecureboot/veta.c
+++ b/lib/libsecureboot/veta.c
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/**
* @file veta.c - add to trust anchors
*
diff --git a/lib/libsecureboot/vets.c b/lib/libsecureboot/vets.c
index ca1eb12937bb..4a2aba433191 100644
--- a/lib/libsecureboot/vets.c
+++ b/lib/libsecureboot/vets.c
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/**
* @file vets.c - trust store
* @brief verify signatures
diff --git a/lib/libssp/fortify_stubs.c b/lib/libssp/fortify_stubs.c
index 32dc4b25c58b..a500a1405aaf 100644
--- a/lib/libssp/fortify_stubs.c
+++ b/lib/libssp/fortify_stubs.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdarg.h>
diff --git a/lib/libssp_nonshared/libssp_nonshared.c b/lib/libssp_nonshared/libssp_nonshared.c
index ab07badbf9fc..ae0e65bdbf0b 100644
--- a/lib/libssp_nonshared/libssp_nonshared.c
+++ b/lib/libssp_nonshared/libssp_nonshared.c
@@ -4,8 +4,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
void __stack_chk_fail(void);
void __stack_chk_fail_local(void);
diff --git a/lib/libstdthreads/call_once.c b/lib/libstdthreads/call_once.c
index 42c12d8c1fff..7d17a4b667a7 100644
--- a/lib/libstdthreads/call_once.c
+++ b/lib/libstdthreads/call_once.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <pthread.h>
#include "threads.h"
diff --git a/lib/libstdthreads/cnd.c b/lib/libstdthreads/cnd.c
index 67d044faec28..49605c952b0e 100644
--- a/lib/libstdthreads/cnd.c
+++ b/lib/libstdthreads/cnd.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <pthread.h>
diff --git a/lib/libstdthreads/mtx.c b/lib/libstdthreads/mtx.c
index 3b0d48e2d20d..719ba6486e41 100644
--- a/lib/libstdthreads/mtx.c
+++ b/lib/libstdthreads/mtx.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <pthread.h>
diff --git a/lib/libstdthreads/thrd.c b/lib/libstdthreads/thrd.c
index 5374f1bfde8f..a50c1d11ed45 100644
--- a/lib/libstdthreads/thrd.c
+++ b/lib/libstdthreads/thrd.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <pthread.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/lib/libstdthreads/tss.c b/lib/libstdthreads/tss.c
index b05736fffdce..b2cd7fec4b7b 100644
--- a/lib/libstdthreads/tss.c
+++ b/lib/libstdthreads/tss.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <pthread.h>
#include "threads.h"
diff --git a/lib/libsysdecode/errno.c b/lib/libsysdecode/errno.c
index b235e3abf4ed..75e9ccfe7ccc 100644
--- a/lib/libsysdecode/errno.c
+++ b/lib/libsysdecode/errno.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/acl.h>
#include <sys/wait.h>
diff --git a/lib/libsysdecode/flags.c b/lib/libsysdecode/flags.c
index 31c125ad71af..33c778c391ee 100644
--- a/lib/libsysdecode/flags.c
+++ b/lib/libsysdecode/flags.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define L2CAP_SOCKET_CHECKED
#include <sys/types.h>
diff --git a/lib/libsysdecode/linux.c b/lib/libsysdecode/linux.c
index 4a0c8a602728..318406a9ee40 100644
--- a/lib/libsysdecode/linux.c
+++ b/lib/libsysdecode/linux.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/proc.h>
#include <stdbool.h>
diff --git a/lib/libsysdecode/signal.c b/lib/libsysdecode/signal.c
index b947f8cfd836..9ae836625315 100644
--- a/lib/libsysdecode/signal.c
+++ b/lib/libsysdecode/signal.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <signal.h>
#include <stdbool.h>
diff --git a/lib/libsysdecode/support.c b/lib/libsysdecode/support.c
index 0777ab28f52e..2fb048409e26 100644
--- a/lib/libsysdecode/support.c
+++ b/lib/libsysdecode/support.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/lib/libsysdecode/syscallnames.c b/lib/libsysdecode/syscallnames.c
index fcc14886f39f..da356d8ac016 100644
--- a/lib/libsysdecode/syscallnames.c
+++ b/lib/libsysdecode/syscallnames.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Map system call codes to names for the supported ABIs on each
* platform. Rather than regnerating system call name tables locally
diff --git a/lib/libsysdecode/utrace.c b/lib/libsysdecode/utrace.c
index 24d9b9cffedf..a03cc66cac03 100644
--- a/lib/libsysdecode/utrace.c
+++ b/lib/libsysdecode/utrace.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <dlfcn.h>
#include <stdbool.h>
diff --git a/lib/libtacplus/taclib.c b/lib/libtacplus/taclib.c
index 585513f6c1c2..00bee367ca9f 100644
--- a/lib/libtacplus/taclib.c
+++ b/lib/libtacplus/taclib.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/lib/libthr/tests/umtx_op_test.c b/lib/libthr/tests/umtx_op_test.c
index f7046ab42fc4..7bffc2d5bfbf 100644
--- a/lib/libthr/tests/umtx_op_test.c
+++ b/lib/libthr/tests/umtx_op_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/umtx.h>
diff --git a/lib/libthr/thread/thr_affinity.c b/lib/libthr/thread/thr_affinity.c
index 796e5d77f4ec..89f654ebffc2 100644
--- a/lib/libthr/thread/thr_affinity.c
+++ b/lib/libthr/thread/thr_affinity.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <pthread_np.h>
#include <sys/param.h>
diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c
index a5957fa407a8..9740bed6ebd3 100644
--- a/lib/libthr/thread/thr_attr.c
+++ b/lib/libthr/thread/thr_attr.c
@@ -94,8 +94,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <pthread.h>
diff --git a/lib/libthr/thread/thr_autoinit.c b/lib/libthr/thread/thr_autoinit.c
index a38ab6ebc76e..f18f53517e06 100644
--- a/lib/libthr/thread/thr_autoinit.c
+++ b/lib/libthr/thread/thr_autoinit.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <pthread.h>
#include "thr_private.h"
diff --git a/lib/libthr/thread/thr_barrier.c b/lib/libthr/thread/thr_barrier.c
index 8c0271040345..8f5936409c05 100644
--- a/lib/libthr/thread/thr_barrier.c
+++ b/lib/libthr/thread/thr_barrier.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/lib/libthr/thread/thr_barrierattr.c b/lib/libthr/thread/thr_barrierattr.c
index 7036f0ff63d3..7af7e40f9159 100644
--- a/lib/libthr/thread/thr_barrierattr.c
+++ b/lib/libthr/thread/thr_barrierattr.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c
index 69388526508c..86632e41449b 100644
--- a/lib/libthr/thread/thr_cancel.c
+++ b/lib/libthr/thread/thr_cancel.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <pthread.h>
#include "un-namespace.h"
diff --git a/lib/libthr/thread/thr_clean.c b/lib/libthr/thread/thr_clean.c
index 4c73c486eeff..ba699f0376d8 100644
--- a/lib/libthr/thread/thr_clean.c
+++ b/lib/libthr/thread/thr_clean.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <signal.h>
#include <errno.h>
diff --git a/lib/libthr/thread/thr_concurrency.c b/lib/libthr/thread/thr_concurrency.c
index 9f60dca1e445..cc0d1075b92d 100644
--- a/lib/libthr/thread/thr_concurrency.c
+++ b/lib/libthr/thread/thr_concurrency.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <pthread.h>
diff --git a/lib/libthr/thread/thr_cond.c b/lib/libthr/thread/thr_cond.c
index 8ba2c572fe54..bec7933537b3 100644
--- a/lib/libthr/thread/thr_cond.c
+++ b/lib/libthr/thread/thr_cond.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdlib.h>
#include <errno.h>
diff --git a/lib/libthr/thread/thr_condattr.c b/lib/libthr/thread/thr_condattr.c
index 0a06d004cef7..c5f675f0023d 100644
--- a/lib/libthr/thread/thr_condattr.c
+++ b/lib/libthr/thread/thr_condattr.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libthr/thread/thr_create.c b/lib/libthr/thread/thr_create.c
index 8d4d72e950d4..4b9f45ac49de 100644
--- a/lib/libthr/thread/thr_create.c
+++ b/lib/libthr/thread/thr_create.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/rtprio.h>
diff --git a/lib/libthr/thread/thr_ctrdtr.c b/lib/libthr/thread/thr_ctrdtr.c
index 9ce068072524..ae8fa38d3cb0 100644
--- a/lib/libthr/thread/thr_ctrdtr.c
+++ b/lib/libthr/thread/thr_ctrdtr.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <rtld_tls.h>
diff --git a/lib/libthr/thread/thr_detach.c b/lib/libthr/thread/thr_detach.c
index d08715738a59..214d5e76262e 100644
--- a/lib/libthr/thread/thr_detach.c
+++ b/lib/libthr/thread/thr_detach.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <errno.h>
diff --git a/lib/libthr/thread/thr_equal.c b/lib/libthr/thread/thr_equal.c
index 69aa6bff8922..2a4cc9f6d049 100644
--- a/lib/libthr/thread/thr_equal.c
+++ b/lib/libthr/thread/thr_equal.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <pthread.h>
#include "un-namespace.h"
diff --git a/lib/libthr/thread/thr_event.c b/lib/libthr/thread/thr_event.c
index 714de15b0720..afe0b307423c 100644
--- a/lib/libthr/thread/thr_event.c
+++ b/lib/libthr/thread/thr_event.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "thr_private.h"
void
diff --git a/lib/libthr/thread/thr_exit.c b/lib/libthr/thread/thr_exit.c
index b9d81787c3bb..001b30f6671a 100644
--- a/lib/libthr/thread/thr_exit.c
+++ b/lib/libthr/thread/thr_exit.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#ifdef _PTHREAD_FORCED_UNWIND
diff --git a/lib/libthr/thread/thr_fork.c b/lib/libthr/thread/thr_fork.c
index 341afc2b06ec..fc7d77180e8b 100644
--- a/lib/libthr/thread/thr_fork.c
+++ b/lib/libthr/thread/thr_fork.c
@@ -58,8 +58,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/syscall.h>
#include "namespace.h"
#include <errno.h>
diff --git a/lib/libthr/thread/thr_getcpuclockid.c b/lib/libthr/thread/thr_getcpuclockid.c
index 4bedcc379010..0281fc626882 100644
--- a/lib/libthr/thread/thr_getcpuclockid.c
+++ b/lib/libthr/thread/thr_getcpuclockid.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <pthread.h>
diff --git a/lib/libthr/thread/thr_getprio.c b/lib/libthr/thread/thr_getprio.c
index a8d8d2bfe017..5ab147af212c 100644
--- a/lib/libthr/thread/thr_getprio.c
+++ b/lib/libthr/thread/thr_getprio.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <pthread.h>
diff --git a/lib/libthr/thread/thr_getschedparam.c b/lib/libthr/thread/thr_getschedparam.c
index 5785438f3085..557bcc834950 100644
--- a/lib/libthr/thread/thr_getschedparam.c
+++ b/lib/libthr/thread/thr_getschedparam.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/rtprio.h>
diff --git a/lib/libthr/thread/thr_getthreadid_np.c b/lib/libthr/thread/thr_getthreadid_np.c
index 5891b8b2e23d..1fe927435b02 100644
--- a/lib/libthr/thread/thr_getthreadid_np.c
+++ b/lib/libthr/thread/thr_getthreadid_np.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <pthread.h>
#include <pthread_np.h>
diff --git a/lib/libthr/thread/thr_info.c b/lib/libthr/thread/thr_info.c
index 117d55c7bc4f..b5b84b733db6 100644
--- a/lib/libthr/thread/thr_info.c
+++ b/lib/libthr/thread/thr_info.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/errno.h>
#include <stdlib.h>
diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c
index 6010dd4c0451..ef8c7d59d729 100644
--- a/lib/libthr/thread/thr_init.c
+++ b/lib/libthr/thread/thr_init.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/auxv.h>
diff --git a/lib/libthr/thread/thr_join.c b/lib/libthr/thread/thr_join.c
index 453d48243586..4b48249489f6 100644
--- a/lib/libthr/thread/thr_join.c
+++ b/lib/libthr/thread/thr_join.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <pthread.h>
diff --git a/lib/libthr/thread/thr_kern.c b/lib/libthr/thread/thr_kern.c
index bdc749d38968..05522569fbfb 100644
--- a/lib/libthr/thread/thr_kern.c
+++ b/lib/libthr/thread/thr_kern.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/signalvar.h>
#include <sys/rtprio.h>
diff --git a/lib/libthr/thread/thr_kill.c b/lib/libthr/thread/thr_kill.c
index c96c1b3ecbaa..dd7beddd5c33 100644
--- a/lib/libthr/thread/thr_kill.c
+++ b/lib/libthr/thread/thr_kill.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <signal.h>
diff --git a/lib/libthr/thread/thr_list.c b/lib/libthr/thread/thr_list.c
index 6ecdeda0af8a..72018d94f496 100644
--- a/lib/libthr/thread/thr_list.c
+++ b/lib/libthr/thread/thr_list.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/lib/libthr/thread/thr_main_np.c b/lib/libthr/thread/thr_main_np.c
index 35871d805ef4..9dd8b1820acd 100644
--- a/lib/libthr/thread/thr_main_np.c
+++ b/lib/libthr/thread/thr_main_np.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <pthread.h>
#include <pthread_np.h>
diff --git a/lib/libthr/thread/thr_malloc.c b/lib/libthr/thread/thr_malloc.c
index 216791ee4fce..d60fbc1b1fe8 100644
--- a/lib/libthr/thread/thr_malloc.c
+++ b/lib/libthr/thread/thr_malloc.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mman.h>
#include <rtld_malloc.h>
diff --git a/lib/libthr/thread/thr_multi_np.c b/lib/libthr/thread/thr_multi_np.c
index 59e782cc59b2..cbd3f31fddf0 100644
--- a/lib/libthr/thread/thr_multi_np.c
+++ b/lib/libthr/thread/thr_multi_np.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <pthread.h>
#include <pthread_np.h>
diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c
index 8d64d26c12ab..5dd624a269e4 100644
--- a/lib/libthr/thread/thr_mutex.c
+++ b/lib/libthr/thread/thr_mutex.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <stdlib.h>
#include <errno.h>
diff --git a/lib/libthr/thread/thr_mutexattr.c b/lib/libthr/thread/thr_mutexattr.c
index 1f5d3b284af8..6d38f164df52 100644
--- a/lib/libthr/thread/thr_mutexattr.c
+++ b/lib/libthr/thread/thr_mutexattr.c
@@ -60,8 +60,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <string.h>
#include <stdlib.h>
diff --git a/lib/libthr/thread/thr_once.c b/lib/libthr/thread/thr_once.c
index e34c2f34b5e2..065781907771 100644
--- a/lib/libthr/thread/thr_once.c
+++ b/lib/libthr/thread/thr_once.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <pthread.h>
#include "un-namespace.h"
diff --git a/lib/libthr/thread/thr_printf.c b/lib/libthr/thread/thr_printf.c
index 817030f946de..5304cc00c5c8 100644
--- a/lib/libthr/thread/thr_printf.c
+++ b/lib/libthr/thread/thr_printf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdarg.h>
#include <string.h>
#include <unistd.h>
diff --git a/lib/libthr/thread/thr_pshared.c b/lib/libthr/thread/thr_pshared.c
index 446e9983bcae..42b1430907ad 100644
--- a/lib/libthr/thread/thr_pshared.c
+++ b/lib/libthr/thread/thr_pshared.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/queue.h>
diff --git a/lib/libthr/thread/thr_pspinlock.c b/lib/libthr/thread/thr_pspinlock.c
index 374fe498034b..37f14d22909d 100644
--- a/lib/libthr/thread/thr_pspinlock.c
+++ b/lib/libthr/thread/thr_pspinlock.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/lib/libthr/thread/thr_resume_np.c b/lib/libthr/thread/thr_resume_np.c
index 125d70a595e9..6dac28ab1f4b 100644
--- a/lib/libthr/thread/thr_resume_np.c
+++ b/lib/libthr/thread/thr_resume_np.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <pthread.h>
diff --git a/lib/libthr/thread/thr_rtld.c b/lib/libthr/thread/thr_rtld.c
index cedc13a1440e..9026abf941e2 100644
--- a/lib/libthr/thread/thr_rtld.c
+++ b/lib/libthr/thread/thr_rtld.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* A lockless rwlock for rtld.
*/
diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c
index af32b09963d9..f8d5fa4f673f 100644
--- a/lib/libthr/thread/thr_rwlock.c
+++ b/lib/libthr/thread/thr_rwlock.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
diff --git a/lib/libthr/thread/thr_rwlockattr.c b/lib/libthr/thread/thr_rwlockattr.c
index 8c8e20b8ddd9..068ad7d3acbf 100644
--- a/lib/libthr/thread/thr_rwlockattr.c
+++ b/lib/libthr/thread/thr_rwlockattr.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/lib/libthr/thread/thr_self.c b/lib/libthr/thread/thr_self.c
index 68bf5bc39312..f5b1ce8fdb98 100644
--- a/lib/libthr/thread/thr_self.c
+++ b/lib/libthr/thread/thr_self.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <pthread.h>
#include "un-namespace.h"
diff --git a/lib/libthr/thread/thr_sem.c b/lib/libthr/thread/thr_sem.c
index 73817761b02c..c7b5ac009a8c 100644
--- a/lib/libthr/thread/thr_sem.c
+++ b/lib/libthr/thread/thr_sem.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/lib/libthr/thread/thr_setprio.c b/lib/libthr/thread/thr_setprio.c
index 537b9b89f201..6ee60ffeb205 100644
--- a/lib/libthr/thread/thr_setprio.c
+++ b/lib/libthr/thread/thr_setprio.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <pthread.h>
#include "un-namespace.h"
diff --git a/lib/libthr/thread/thr_setschedparam.c b/lib/libthr/thread/thr_setschedparam.c
index cf2c1f919e12..e3e4174c753b 100644
--- a/lib/libthr/thread/thr_setschedparam.c
+++ b/lib/libthr/thread/thr_setschedparam.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <errno.h>
diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c
index b47e520b2edf..e082f0601be1 100644
--- a/lib/libthr/thread/thr_sig.c
+++ b/lib/libthr/thread/thr_sig.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/param.h>
#include <sys/auxv.h>
diff --git a/lib/libthr/thread/thr_single_np.c b/lib/libthr/thread/thr_single_np.c
index 7aecfc93b3e3..e772fb5d3bb7 100644
--- a/lib/libthr/thread/thr_single_np.c
+++ b/lib/libthr/thread/thr_single_np.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <pthread.h>
#include <pthread_np.h>
diff --git a/lib/libthr/thread/thr_sleepq.c b/lib/libthr/thread/thr_sleepq.c
index ca374ab2ed65..b3feef8c9381 100644
--- a/lib/libthr/thread/thr_sleepq.c
+++ b/lib/libthr/thread/thr_sleepq.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include "thr_private.h"
diff --git a/lib/libthr/thread/thr_spec.c b/lib/libthr/thread/thr_spec.c
index bce3d1fa2507..ee58bb37f6f7 100644
--- a/lib/libthr/thread/thr_spec.c
+++ b/lib/libthr/thread/thr_spec.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/mman.h>
#include <signal.h>
diff --git a/lib/libthr/thread/thr_spinlock.c b/lib/libthr/thread/thr_spinlock.c
index 42077ce5d447..13744569b94f 100644
--- a/lib/libthr/thread/thr_spinlock.c
+++ b/lib/libthr/thread/thr_spinlock.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <pthread.h>
#include <libc_private.h>
diff --git a/lib/libthr/thread/thr_stack.c b/lib/libthr/thread/thr_stack.c
index 73a176081853..5e888bbfe9b6 100644
--- a/lib/libthr/thread/thr_stack.c
+++ b/lib/libthr/thread/thr_stack.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/auxv.h>
#include <sys/mman.h>
diff --git a/lib/libthr/thread/thr_suspend_np.c b/lib/libthr/thread/thr_suspend_np.c
index 2d68582623dd..b594ea562480 100644
--- a/lib/libthr/thread/thr_suspend_np.c
+++ b/lib/libthr/thread/thr_suspend_np.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <pthread.h>
diff --git a/lib/libthr/thread/thr_switch_np.c b/lib/libthr/thread/thr_switch_np.c
index aad8641e4806..cbf959f161e3 100644
--- a/lib/libthr/thread/thr_switch_np.c
+++ b/lib/libthr/thread/thr_switch_np.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <errno.h>
#include <pthread.h>
diff --git a/lib/libthr/thread/thr_symbols.c b/lib/libthr/thread/thr_symbols.c
index 71737392c62f..7d5adcbbfb0b 100644
--- a/lib/libthr/thread/thr_symbols.c
+++ b/lib/libthr/thread/thr_symbols.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stddef.h>
#include <pthread.h>
diff --git a/lib/libthr/thread/thr_syscalls.c b/lib/libthr/thread/thr_syscalls.c
index c60308fcd1d2..d68ca60e5993 100644
--- a/lib/libthr/thread/thr_syscalls.c
+++ b/lib/libthr/thread/thr_syscalls.c
@@ -66,8 +66,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <sys/types.h>
#include <sys/mman.h>
diff --git a/lib/libthr/thread/thr_umtx.c b/lib/libthr/thread/thr_umtx.c
index 5143ffb78496..37b378e74405 100644
--- a/lib/libthr/thread/thr_umtx.c
+++ b/lib/libthr/thread/thr_umtx.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "thr_private.h"
#include "thr_umtx.h"
diff --git a/lib/libthr/thread/thr_yield.c b/lib/libthr/thread/thr_yield.c
index 0d666d52a554..b391e69cabc1 100644
--- a/lib/libthr/thread/thr_yield.c
+++ b/lib/libthr/thread/thr_yield.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "namespace.h"
#include <pthread.h>
#include <sched.h>
diff --git a/lib/libthread_db/arch/aarch64/libpthread_md.c b/lib/libthread_db/arch/aarch64/libpthread_md.c
index 75f45531bf10..17f8345e596b 100644
--- a/lib/libthread_db/arch/aarch64/libpthread_md.c
+++ b/lib/libthread_db/arch/aarch64/libpthread_md.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
#include <thread_db.h>
diff --git a/lib/libthread_db/arch/amd64/libpthread_md.c b/lib/libthread_db/arch/amd64/libpthread_md.c
index 7aff9c070830..572f9d248562 100644
--- a/lib/libthread_db/arch/amd64/libpthread_md.c
+++ b/lib/libthread_db/arch/amd64/libpthread_md.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/procfs.h>
#include <string.h>
#include <thread_db.h>
diff --git a/lib/libthread_db/arch/arm/libpthread_md.c b/lib/libthread_db/arch/arm/libpthread_md.c
index ef3e03cb5405..9cb319eead4d 100644
--- a/lib/libthread_db/arch/arm/libpthread_md.c
+++ b/lib/libthread_db/arch/arm/libpthread_md.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
#include <thread_db.h>
diff --git a/lib/libthread_db/arch/i386/libpthread_md.c b/lib/libthread_db/arch/i386/libpthread_md.c
index f01b844d355b..b1d74d397d4a 100644
--- a/lib/libthread_db/arch/i386/libpthread_md.c
+++ b/lib/libthread_db/arch/i386/libpthread_md.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/npx.h>
#include <string.h>
diff --git a/lib/libthread_db/arch/powerpc/libpthread_md.c b/lib/libthread_db/arch/powerpc/libpthread_md.c
index b9aa25b561b5..ba91703c690d 100644
--- a/lib/libthread_db/arch/powerpc/libpthread_md.c
+++ b/lib/libthread_db/arch/powerpc/libpthread_md.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
#include <thread_db.h>
diff --git a/lib/libthread_db/arch/riscv/libpthread_md.c b/lib/libthread_db/arch/riscv/libpthread_md.c
index 0ac211ac6e5f..4835e458b942 100644
--- a/lib/libthread_db/arch/riscv/libpthread_md.c
+++ b/lib/libthread_db/arch/riscv/libpthread_md.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
#include <thread_db.h>
diff --git a/lib/libthread_db/libpthread_db.c b/lib/libthread_db/libpthread_db.c
index b7b2ca70cb3b..8a1a2ee7b014 100644
--- a/lib/libthread_db/libpthread_db.c
+++ b/lib/libthread_db/libpthread_db.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libthread_db/libthr_db.c b/lib/libthread_db/libthr_db.c
index 5e105c6040cc..f6e8283d49db 100644
--- a/lib/libthread_db/libthr_db.c
+++ b/lib/libthread_db/libthr_db.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <proc_service.h>
#include <stddef.h>
#include <stdlib.h>
diff --git a/lib/libthread_db/thread_db.c b/lib/libthread_db/thread_db.c
index 99c283e77479..77886eb49cca 100644
--- a/lib/libthread_db/thread_db.c
+++ b/lib/libthread_db/thread_db.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <proc_service.h>
#include <stddef.h>
#include <thread_db.h>
diff --git a/lib/libufs/block.c b/lib/libufs/block.c
index 35821738c1c9..20002fc4df1b 100644
--- a/lib/libufs/block.c
+++ b/lib/libufs/block.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/disk.h>
diff --git a/lib/libufs/cgroup.c b/lib/libufs/cgroup.c
index da0f6ddfc318..5391157826c8 100644
--- a/lib/libufs/cgroup.c
+++ b/lib/libufs/cgroup.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/disklabel.h>
diff --git a/lib/libufs/inode.c b/lib/libufs/inode.c
index 2e549d13a4e9..fe34fd45b815 100644
--- a/lib/libufs/inode.c
+++ b/lib/libufs/inode.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/disklabel.h>
diff --git a/lib/libufs/sblock.c b/lib/libufs/sblock.c
index ba53741568fe..9f1d8a2485bd 100644
--- a/lib/libufs/sblock.c
+++ b/lib/libufs/sblock.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/disklabel.h>
diff --git a/lib/libufs/type.c b/lib/libufs/type.c
index 4579b8351f08..1d0c4c0200eb 100644
--- a/lib/libufs/type.c
+++ b/lib/libufs/type.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/disklabel.h>
diff --git a/lib/libulog/ulog_login.c b/lib/libulog/ulog_login.c
index ce2cd31b3a27..dc08ac7d331d 100644
--- a/lib/libulog/ulog_login.c
+++ b/lib/libulog/ulog_login.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <paths.h>
diff --git a/lib/libulog/ulog_login_pseudo.c b/lib/libulog/ulog_login_pseudo.c
index a67a3822f02f..3a43cc6034fc 100644
--- a/lib/libulog/ulog_login_pseudo.c
+++ b/lib/libulog/ulog_login_pseudo.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/wait.h>
#include <errno.h>
diff --git a/lib/libulog/utempter.c b/lib/libulog/utempter.c
index 8a663ee969c8..2578221d8654 100644
--- a/lib/libulog/utempter.c
+++ b/lib/libulog/utempter.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "ulog.h"
#include "utempter.h"
diff --git a/lib/libusbhid/data.c b/lib/libusbhid/data.c
index 944edbb60d64..cc7bf99f9c5d 100644
--- a/lib/libusbhid/data.c
+++ b/lib/libusbhid/data.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <assert.h>
#include <stdlib.h>
diff --git a/lib/libusbhid/descr.c b/lib/libusbhid/descr.c
index c340fe1ef402..aade28f28293 100644
--- a/lib/libusbhid/descr.c
+++ b/lib/libusbhid/descr.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
diff --git a/lib/libusbhid/descr_compat.c b/lib/libusbhid/descr_compat.c
index fdcc7dbac061..03efe7bc945e 100644
--- a/lib/libusbhid/descr_compat.c
+++ b/lib/libusbhid/descr_compat.c
@@ -33,8 +33,6 @@
#ifdef HID_COMPAT7
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
diff --git a/lib/libusbhid/parse.c b/lib/libusbhid/parse.c
index 2f677172be02..8eb94ab82fc8 100644
--- a/lib/libusbhid/parse.c
+++ b/lib/libusbhid/parse.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libusbhid/usage.c b/lib/libusbhid/usage.c
index 6317567248d0..1a12ee35c91b 100644
--- a/lib/libusbhid/usage.c
+++ b/lib/libusbhid/usage.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <assert.h>
#include <ctype.h>
diff --git a/lib/libutil/_secure_path.c b/lib/libutil/_secure_path.c
index 363378b0d649..3deee78abc87 100644
--- a/lib/libutil/_secure_path.c
+++ b/lib/libutil/_secure_path.c
@@ -20,8 +20,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libutil/auth.c b/lib/libutil/auth.c
index 44ff1cccd256..3414fc8e26e7 100644
--- a/lib/libutil/auth.c
+++ b/lib/libutil/auth.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <libutil.h>
diff --git a/lib/libutil/expand_number.c b/lib/libutil/expand_number.c
index 61b73039f3bd..8346a2e5f079 100644
--- a/lib/libutil/expand_number.c
+++ b/lib/libutil/expand_number.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
#include <errno.h>
diff --git a/lib/libutil/flopen.c b/lib/libutil/flopen.c
index fed233c00b76..b1961894c11f 100644
--- a/lib/libutil/flopen.c
+++ b/lib/libutil/flopen.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index 436ec2018653..170080f8aec3 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/libutil/fparseln.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
#include <errno.h>
diff --git a/lib/libutil/getlocalbase.c b/lib/libutil/getlocalbase.c
index c19cb95212dd..2cbee6b5b237 100644
--- a/lib/libutil/getlocalbase.c
+++ b/lib/libutil/getlocalbase.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/limits.h>
diff --git a/lib/libutil/gr_util.c b/lib/libutil/gr_util.c
index ee55b92c89c3..23be3324d129 100644
--- a/lib/libutil/gr_util.c
+++ b/lib/libutil/gr_util.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/stat.h>
diff --git a/lib/libutil/hexdump.c b/lib/libutil/hexdump.c
index 9e42237e17fb..5627400d5b48 100644
--- a/lib/libutil/hexdump.c
+++ b/lib/libutil/hexdump.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <libutil.h>
#include <stdio.h>
diff --git a/lib/libutil/humanize_number.c b/lib/libutil/humanize_number.c
index 985709e4fc9a..7b51bd5f2383 100644
--- a/lib/libutil/humanize_number.c
+++ b/lib/libutil/humanize_number.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
#include <inttypes.h>
diff --git a/lib/libutil/kinfo_getallproc.c b/lib/libutil/kinfo_getallproc.c
index cd006f9abbb7..b4d6bfa56328 100644
--- a/lib/libutil/kinfo_getallproc.c
+++ b/lib/libutil/kinfo_getallproc.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/lib/libutil/kinfo_getfile.c b/lib/libutil/kinfo_getfile.c
index 22baf534f504..f1441bdf771a 100644
--- a/lib/libutil/kinfo_getfile.c
+++ b/lib/libutil/kinfo_getfile.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/lib/libutil/kinfo_getproc.c b/lib/libutil/kinfo_getproc.c
index 85b0e3d8bb2c..f519e1ab083e 100644
--- a/lib/libutil/kinfo_getproc.c
+++ b/lib/libutil/kinfo_getproc.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/lib/libutil/kinfo_getvmmap.c b/lib/libutil/kinfo_getvmmap.c
index e01f48284c68..15dd4f0deeda 100644
--- a/lib/libutil/kinfo_getvmmap.c
+++ b/lib/libutil/kinfo_getvmmap.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/lib/libutil/kinfo_getvmobject.c b/lib/libutil/kinfo_getvmobject.c
index 4bf666fd7f3b..433adb6690fe 100644
--- a/lib/libutil/kinfo_getvmobject.c
+++ b/lib/libutil/kinfo_getvmobject.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/lib/libutil/login_auth.c b/lib/libutil/login_auth.c
index 647db1ec19e6..5accfbabe57a 100644
--- a/lib/libutil/login_auth.c
+++ b/lib/libutil/login_auth.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
index 6b3bf663bb2b..e71d38d2d93b 100644
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
index 38666bc8e3d3..f561479690c1 100644
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -23,8 +23,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/mac.h>
diff --git a/lib/libutil/login_crypt.c b/lib/libutil/login_crypt.c
index 469255ac46c6..f82bdbc7258d 100644
--- a/lib/libutil/login_crypt.c
+++ b/lib/libutil/login_crypt.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <login_cap.h>
diff --git a/lib/libutil/login_ok.c b/lib/libutil/login_ok.c
index 26971a9f5f1f..22464ce2ada1 100644
--- a/lib/libutil/login_ok.c
+++ b/lib/libutil/login_ok.c
@@ -22,8 +22,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/lib/libutil/login_times.c b/lib/libutil/login_times.c
index d13ed9970618..1f5b2e2742c5 100644
--- a/lib/libutil/login_times.c
+++ b/lib/libutil/login_times.c
@@ -22,8 +22,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
#include <login_cap.h>
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
index 0fc6bfca2235..705ab0bad20e 100644
--- a/lib/libutil/login_tty.c
+++ b/lib/libutil/login_tty.c
@@ -30,7 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
__SCCSID("@(#)login_tty.c 8.1 (Berkeley) 6/4/93");
#include <sys/param.h>
diff --git a/lib/libutil/pidfile.c b/lib/libutil/pidfile.c
index 943bd7fa3c5a..0563175b97c9 100644
--- a/lib/libutil/pidfile.c
+++ b/lib/libutil/pidfile.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/capsicum.h>
diff --git a/lib/libutil/property.c b/lib/libutil/property.c
index 472fd906c1f5..45e1cd85f940 100644
--- a/lib/libutil/property.c
+++ b/lib/libutil/property.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
#include <err.h>
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index 8eb2c2965759..f52407608e9a 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -30,7 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
__SCCSID("@(#)pty.c 8.3 (Berkeley) 5/16/94");
#include <sys/types.h>
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c
index 4d708c007f44..24e7e3bd6d36 100644
--- a/lib/libutil/pw_util.c
+++ b/lib/libutil/pw_util.c
@@ -37,7 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
__SCCSID("@(#)pw_util.c 8.3 (Berkeley) 4/2/94");
/*
diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c
index 884e19f99bf6..02dca54af7a5 100644
--- a/lib/libutil/realhostname.c
+++ b/lib/libutil/realhostname.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libutil/stub.c b/lib/libutil/stub.c
index fa201454779e..997a9e2d9707 100644
--- a/lib/libutil/stub.c
+++ b/lib/libutil/stub.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/lib/libutil/tests/cpuset_test.c b/lib/libutil/tests/cpuset_test.c
index ea8eb8d83743..0c3c51eac054 100644
--- a/lib/libutil/tests/cpuset_test.c
+++ b/lib/libutil/tests/cpuset_test.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/cpuset.h>
diff --git a/lib/libutil/tests/expand_number_test.c b/lib/libutil/tests/expand_number_test.c
index 42e3170ac4cf..6bf3ff082ee4 100644
--- a/lib/libutil/tests/expand_number_test.c
+++ b/lib/libutil/tests/expand_number_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <libutil.h>
diff --git a/lib/libutil/tests/flopen_test.c b/lib/libutil/tests/flopen_test.c
index 047158466503..b86dd123eb9b 100644
--- a/lib/libutil/tests/flopen_test.c
+++ b/lib/libutil/tests/flopen_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/fcntl.h>
diff --git a/lib/libutil/tests/grp_test.c b/lib/libutil/tests/grp_test.c
index ae7ce73bf1c0..824600905289 100644
--- a/lib/libutil/tests/grp_test.c
+++ b/lib/libutil/tests/grp_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
#include <grp.h>
diff --git a/lib/libutil/tests/pidfile_test.c b/lib/libutil/tests/pidfile_test.c
index 9bfa6754ce54..0463b7b29c87 100644
--- a/lib/libutil/tests/pidfile_test.c
+++ b/lib/libutil/tests/pidfile_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/wait.h>
#include <sys/event.h>
diff --git a/lib/libutil/tests/trimdomain-nodomain_test.c b/lib/libutil/tests/trimdomain-nodomain_test.c
index c02ccdb8fd10..ecbfe96e8c3a 100644
--- a/lib/libutil/tests/trimdomain-nodomain_test.c
+++ b/lib/libutil/tests/trimdomain-nodomain_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <errno.h>
diff --git a/lib/libutil/tests/trimdomain_test.c b/lib/libutil/tests/trimdomain_test.c
index 08fcfc0130d6..6ae55d7e8756 100644
--- a/lib/libutil/tests/trimdomain_test.c
+++ b/lib/libutil/tests/trimdomain_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <errno.h>
diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c
index 38c7c6052644..ce91ac64babe 100644
--- a/lib/libutil/trimdomain.c
+++ b/lib/libutil/trimdomain.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <libutil.h>
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index f76a23771cc6..c9103536d916 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -30,7 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
__SCCSID("@(#)uucplock.c 8.1 (Berkeley) 6/6/93");
#include <sys/types.h>
diff --git a/lib/libveriexec/veriexec_get.c b/lib/libveriexec/veriexec_get.c
index 59ee6cdba8b0..8d12d0a9890c 100644
--- a/lib/libveriexec/veriexec_get.c
+++ b/lib/libveriexec/veriexec_get.c
@@ -28,7 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/mac.h>
diff --git a/lib/libvgl/bitmap.c b/lib/libvgl/bitmap.c
index e37a96318e0f..0b0e75128296 100644
--- a/lib/libvgl/bitmap.c
+++ b/lib/libvgl/bitmap.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <signal.h>
#include <sys/fbio.h>
diff --git a/lib/libvgl/keyboard.c b/lib/libvgl/keyboard.c
index dc1b25cdaeec..25399330dba5 100644
--- a/lib/libvgl/keyboard.c
+++ b/lib/libvgl/keyboard.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/lib/libvgl/main.c b/lib/libvgl/main.c
index b409327b3f4c..b98e59ff801f 100644
--- a/lib/libvgl/main.c
+++ b/lib/libvgl/main.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <signal.h>
#include <stdio.h>
#include <sys/types.h>
diff --git a/lib/libvgl/mouse.c b/lib/libvgl/mouse.c
index fc7ba2399387..c4019fd7606f 100644
--- a/lib/libvgl/mouse.c
+++ b/lib/libvgl/mouse.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/lib/libvgl/simple.c b/lib/libvgl/simple.c
index d4ffaed782ad..3ae07db1993b 100644
--- a/lib/libvgl/simple.c
+++ b/lib/libvgl/simple.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <signal.h>
#include <sys/fbio.h>
#include <sys/kbio.h>
diff --git a/lib/libvgl/text.c b/lib/libvgl/text.c
index 18633f8d4be0..2aaa197c1a64 100644
--- a/lib/libvgl/text.c
+++ b/lib/libvgl/text.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <sys/fbio.h>
#include "vgl.h"
diff --git a/lib/libvmmapi/vmmapi.c b/lib/libvmmapi/vmmapi.c
index b393494e9876..d1470a4aed6e 100644
--- a/lib/libvmmapi/vmmapi.c
+++ b/lib/libvmmapi/vmmapi.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/sysctl.h>
diff --git a/lib/libvmmapi/vmmapi_freebsd.c b/lib/libvmmapi/vmmapi_freebsd.c
index 8ea86462b25f..e829febf0157 100644
--- a/lib/libvmmapi/vmmapi_freebsd.c
+++ b/lib/libvmmapi/vmmapi_freebsd.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/specialreg.h>
diff --git a/lib/liby/main.c b/lib/liby/main.c
index 7c3a6acf0ccc..5e7ae6fa8f0d 100644
--- a/lib/liby/main.c
+++ b/lib/liby/main.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
diff --git a/lib/liby/yyerror.c b/lib/liby/yyerror.c
index 861ad5ad4c35..2b67cfcf0fa2 100644
--- a/lib/liby/yyerror.c
+++ b/lib/liby/yyerror.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)yyerror.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
diff --git a/lib/libz/zopen.c b/lib/libz/zopen.c
index a6ac99166128..faef346f7ce5 100644
--- a/lib/libz/zopen.c
+++ b/lib/libz/zopen.c
@@ -3,8 +3,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <zlib.h>
diff --git a/lib/msun/amd64/e_fmod.S b/lib/msun/amd64/e_fmod.S
index 6163134e6c30..2562bf326d41 100644
--- a/lib/msun/amd64/e_fmod.S
+++ b/lib/msun/amd64/e_fmod.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(fmod)
movsd %xmm0,-8(%rsp)
movsd %xmm1,-16(%rsp)
diff --git a/lib/msun/amd64/e_fmodf.S b/lib/msun/amd64/e_fmodf.S
index 4b52040cab95..a0676625cc5e 100644
--- a/lib/msun/amd64/e_fmodf.S
+++ b/lib/msun/amd64/e_fmodf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(fmodf)
movss %xmm0,-4(%rsp)
movss %xmm1,-8(%rsp)
diff --git a/lib/msun/amd64/e_fmodl.S b/lib/msun/amd64/e_fmodl.S
index 8f7a3b544fac..f27d38f1a107 100644
--- a/lib/msun/amd64/e_fmodl.S
+++ b/lib/msun/amd64/e_fmodl.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(fmodl)
fldt 24(%rsp)
fldt 8(%rsp)
diff --git a/lib/msun/amd64/e_remainder.S b/lib/msun/amd64/e_remainder.S
index 9d6085617213..c17542e71aa8 100644
--- a/lib/msun/amd64/e_remainder.S
+++ b/lib/msun/amd64/e_remainder.S
@@ -36,8 +36,6 @@
#include <machine/asm.h>
RCSID("from: FreeBSD: src/lib/msun/i387/e_remainder.S,v 1.8 2005/02/04 14:08:32 das Exp")
-__FBSDID("$FreeBSD$")
-
ENTRY(remainder)
movsd %xmm0,-8(%rsp)
movsd %xmm1,-16(%rsp)
diff --git a/lib/msun/amd64/e_remainderf.S b/lib/msun/amd64/e_remainderf.S
index d78595f7b40a..de4df521148f 100644
--- a/lib/msun/amd64/e_remainderf.S
+++ b/lib/msun/amd64/e_remainderf.S
@@ -6,8 +6,6 @@
#include <machine/asm.h>
RCSID("from: $NetBSD: e_remainderf.S,v 1.2 1995/05/08 23:49:47 jtc Exp $")
-__FBSDID("$FreeBSD$")
-
ENTRY(remainderf)
movss %xmm0,-4(%rsp)
movss %xmm1,-8(%rsp)
diff --git a/lib/msun/amd64/e_remainderl.S b/lib/msun/amd64/e_remainderl.S
index 977934b9d4e2..704939b5dcfa 100644
--- a/lib/msun/amd64/e_remainderl.S
+++ b/lib/msun/amd64/e_remainderl.S
@@ -34,9 +34,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$")
-
ENTRY(remainderl)
fldt 24(%rsp)
fldt 8(%rsp)
diff --git a/lib/msun/amd64/e_sqrt.S b/lib/msun/amd64/e_sqrt.S
index 6f9eeff95c71..3a49f8f05441 100644
--- a/lib/msun/amd64/e_sqrt.S
+++ b/lib/msun/amd64/e_sqrt.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(sqrt)
sqrtsd %xmm0, %xmm0
ret
diff --git a/lib/msun/amd64/e_sqrtf.S b/lib/msun/amd64/e_sqrtf.S
index 25df7b1fe316..d299980be6d0 100644
--- a/lib/msun/amd64/e_sqrtf.S
+++ b/lib/msun/amd64/e_sqrtf.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(sqrtf)
sqrtss %xmm0, %xmm0
ret
diff --git a/lib/msun/amd64/e_sqrtl.S b/lib/msun/amd64/e_sqrtl.S
index 2726bf06e04c..8fd42546cea9 100644
--- a/lib/msun/amd64/e_sqrtl.S
+++ b/lib/msun/amd64/e_sqrtl.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(sqrtl)
fldt 8(%rsp)
fsqrt
diff --git a/lib/msun/amd64/s_llrint.S b/lib/msun/amd64/s_llrint.S
index ab098465cd57..6e07e3f26cd3 100644
--- a/lib/msun/amd64/s_llrint.S
+++ b/lib/msun/amd64/s_llrint.S
@@ -1,6 +1,4 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
/* sizeof(long) == sizeof(long long) */
#define fn llrint
#include "s_lrint.S"
diff --git a/lib/msun/amd64/s_llrintf.S b/lib/msun/amd64/s_llrintf.S
index e810e40b640d..dd951647464a 100644
--- a/lib/msun/amd64/s_llrintf.S
+++ b/lib/msun/amd64/s_llrintf.S
@@ -1,6 +1,4 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
/* sizeof(long) == sizeof(long long) */
#define fn llrintf
#include "s_lrintf.S"
diff --git a/lib/msun/amd64/s_llrintl.S b/lib/msun/amd64/s_llrintl.S
index 69c7041558a8..9d304e2793f3 100644
--- a/lib/msun/amd64/s_llrintl.S
+++ b/lib/msun/amd64/s_llrintl.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(llrintl)
fldt 8(%rsp)
subq $8,%rsp
diff --git a/lib/msun/amd64/s_logbl.S b/lib/msun/amd64/s_logbl.S
index 857ef7628b0d..918ebb2c1d27 100644
--- a/lib/msun/amd64/s_logbl.S
+++ b/lib/msun/amd64/s_logbl.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(logbl)
fldt 8(%rsp)
fxtract
diff --git a/lib/msun/amd64/s_lrint.S b/lib/msun/amd64/s_lrint.S
index 5a5d28540c21..7e8b6243eafd 100644
--- a/lib/msun/amd64/s_lrint.S
+++ b/lib/msun/amd64/s_lrint.S
@@ -27,7 +27,6 @@
#include <machine/asm.h>
#ifndef fn
-__FBSDID("$FreeBSD$")
#define fn lrint
#endif
diff --git a/lib/msun/amd64/s_lrintf.S b/lib/msun/amd64/s_lrintf.S
index 0c25a7f4c01e..26ae000def02 100644
--- a/lib/msun/amd64/s_lrintf.S
+++ b/lib/msun/amd64/s_lrintf.S
@@ -27,7 +27,6 @@
#include <machine/asm.h>
#ifndef fn
-__FBSDID("$FreeBSD$")
#define fn lrintf
#endif
diff --git a/lib/msun/amd64/s_lrintl.S b/lib/msun/amd64/s_lrintl.S
index bffdeb6386cc..14c99e0ef237 100644
--- a/lib/msun/amd64/s_lrintl.S
+++ b/lib/msun/amd64/s_lrintl.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(lrintl)
fldt 8(%rsp)
subq $8,%rsp
diff --git a/lib/msun/amd64/s_remquo.S b/lib/msun/amd64/s_remquo.S
index f000c360924f..4ac4c1fd1c16 100644
--- a/lib/msun/amd64/s_remquo.S
+++ b/lib/msun/amd64/s_remquo.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(remquo)
movsd %xmm0,-8(%rsp)
movsd %xmm1,-16(%rsp)
diff --git a/lib/msun/amd64/s_remquof.S b/lib/msun/amd64/s_remquof.S
index 3b2cd2db37bb..d682670031de 100644
--- a/lib/msun/amd64/s_remquof.S
+++ b/lib/msun/amd64/s_remquof.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(remquof)
movss %xmm0,-4(%rsp)
movss %xmm1,-8(%rsp)
diff --git a/lib/msun/amd64/s_remquol.S b/lib/msun/amd64/s_remquol.S
index 42a5ea207544..5479d676aaf2 100644
--- a/lib/msun/amd64/s_remquol.S
+++ b/lib/msun/amd64/s_remquol.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(remquol)
fldt 24(%rsp)
fldt 8(%rsp)
diff --git a/lib/msun/amd64/s_scalbn.S b/lib/msun/amd64/s_scalbn.S
index 3dc25ad49d40..a855c3f1ac27 100644
--- a/lib/msun/amd64/s_scalbn.S
+++ b/lib/msun/amd64/s_scalbn.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(scalbn)
movsd %xmm0,-8(%rsp)
movl %edi,-12(%rsp)
diff --git a/lib/msun/amd64/s_scalbnf.S b/lib/msun/amd64/s_scalbnf.S
index 5ab4eec58446..32051444ef08 100644
--- a/lib/msun/amd64/s_scalbnf.S
+++ b/lib/msun/amd64/s_scalbnf.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(scalbnf)
movss %xmm0,-8(%rsp)
movl %edi,-4(%rsp)
diff --git a/lib/msun/amd64/s_scalbnl.S b/lib/msun/amd64/s_scalbnl.S
index 021d329ff1a0..1c9222fb0e82 100644
--- a/lib/msun/amd64/s_scalbnl.S
+++ b/lib/msun/amd64/s_scalbnl.S
@@ -4,7 +4,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
/* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */
ENTRY(scalbnl)
diff --git a/lib/msun/bsdsrc/b_exp.c b/lib/msun/bsdsrc/b_exp.c
index c667293ed7c6..398755a0aaeb 100644
--- a/lib/msun/bsdsrc/b_exp.c
+++ b/lib/msun/bsdsrc/b_exp.c
@@ -31,8 +31,6 @@
/* @(#)exp.c 8.1 (Berkeley) 6/4/93 */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* EXP(X)
* RETURN THE EXPONENTIAL OF X
* DOUBLE PRECISION (IEEE 53 bits, VAX D FORMAT 56 BITS)
diff --git a/lib/msun/bsdsrc/b_log.c b/lib/msun/bsdsrc/b_log.c
index 9d09ac754706..aeec29368412 100644
--- a/lib/msun/bsdsrc/b_log.c
+++ b/lib/msun/bsdsrc/b_log.c
@@ -31,8 +31,6 @@
/* @(#)log.c 8.2 (Berkeley) 11/30/93 */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Table-driven natural logarithm.
*
* This code was derived, with minor modifications, from:
diff --git a/lib/msun/bsdsrc/b_tgamma.c b/lib/msun/bsdsrc/b_tgamma.c
index 493ced3769c7..cc9f8f70297e 100644
--- a/lib/msun/bsdsrc/b_tgamma.c
+++ b/lib/msun/bsdsrc/b_tgamma.c
@@ -44,8 +44,6 @@
/* @(#)gamma.c 8.1 (Berkeley) 6/4/93 */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/i387/e_exp.S b/lib/msun/i387/e_exp.S
index a89ba4256044..fa3a498a5e6d 100644
--- a/lib/msun/i387/e_exp.S
+++ b/lib/msun/i387/e_exp.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
/* e^x = 2^(x * log2(e)) */
ENTRY(exp)
/*
diff --git a/lib/msun/i387/e_fmod.S b/lib/msun/i387/e_fmod.S
index 421cbba9be68..e0af3cb2e9c0 100644
--- a/lib/msun/i387/e_fmod.S
+++ b/lib/msun/i387/e_fmod.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(fmod)
fldl 12(%esp)
fldl 4(%esp)
diff --git a/lib/msun/i387/e_fmodf.S b/lib/msun/i387/e_fmodf.S
index e269447226e9..60d1773e1e85 100644
--- a/lib/msun/i387/e_fmodf.S
+++ b/lib/msun/i387/e_fmodf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(fmodf)
flds 8(%esp)
flds 4(%esp)
diff --git a/lib/msun/i387/e_fmodl.S b/lib/msun/i387/e_fmodl.S
index 57e986c3d9f4..34e49925c300 100644
--- a/lib/msun/i387/e_fmodl.S
+++ b/lib/msun/i387/e_fmodl.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(fmodl)
fldt 16(%esp)
fldt 4(%esp)
diff --git a/lib/msun/i387/e_log.S b/lib/msun/i387/e_log.S
index 103e118249a3..3ac99a3fdd72 100644
--- a/lib/msun/i387/e_log.S
+++ b/lib/msun/i387/e_log.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(log)
fldln2
fldl 4(%esp)
diff --git a/lib/msun/i387/e_log10.S b/lib/msun/i387/e_log10.S
index 6ab4a5dc6932..ed1c7349a5dd 100644
--- a/lib/msun/i387/e_log10.S
+++ b/lib/msun/i387/e_log10.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(log10)
fldlg2
fldl 4(%esp)
diff --git a/lib/msun/i387/e_log10f.S b/lib/msun/i387/e_log10f.S
index fc75674115d9..c7925a117f72 100644
--- a/lib/msun/i387/e_log10f.S
+++ b/lib/msun/i387/e_log10f.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
/* RCSID("$NetBSD: e_log10f.S,v 1.1 1996/07/03 16:50:22 jtc Exp $") */
ENTRY(log10f)
diff --git a/lib/msun/i387/e_logf.S b/lib/msun/i387/e_logf.S
index 01511af1c750..e122afcace52 100644
--- a/lib/msun/i387/e_logf.S
+++ b/lib/msun/i387/e_logf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
/* RCSID("$NetBSD: e_logf.S,v 1.2 1996/07/06 00:15:45 jtc Exp $") */
ENTRY(logf)
diff --git a/lib/msun/i387/e_remainder.S b/lib/msun/i387/e_remainder.S
index 0be86388ef47..163ad74120ce 100644
--- a/lib/msun/i387/e_remainder.S
+++ b/lib/msun/i387/e_remainder.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(remainder)
fldl 12(%esp)
fldl 4(%esp)
diff --git a/lib/msun/i387/e_remainderf.S b/lib/msun/i387/e_remainderf.S
index 38987e5bf4db..fcd46c3e4183 100644
--- a/lib/msun/i387/e_remainderf.S
+++ b/lib/msun/i387/e_remainderf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
/* RCSID("$NetBSD: e_remainderf.S,v 1.2 1995/05/08 23:49:47 jtc Exp $") */
ENTRY(remainderf)
diff --git a/lib/msun/i387/e_remainderl.S b/lib/msun/i387/e_remainderl.S
index 3dac08836405..d03cd4acb89a 100644
--- a/lib/msun/i387/e_remainderl.S
+++ b/lib/msun/i387/e_remainderl.S
@@ -34,9 +34,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$")
-
ENTRY(remainderl)
fldt 16(%esp)
fldt 4(%esp)
diff --git a/lib/msun/i387/e_sqrt.S b/lib/msun/i387/e_sqrt.S
index 85814392553c..7d8653e72097 100644
--- a/lib/msun/i387/e_sqrt.S
+++ b/lib/msun/i387/e_sqrt.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(sqrt)
fldl 4(%esp)
fsqrt
diff --git a/lib/msun/i387/e_sqrtf.S b/lib/msun/i387/e_sqrtf.S
index 75a9ae2770ab..b8e561b8b875 100644
--- a/lib/msun/i387/e_sqrtf.S
+++ b/lib/msun/i387/e_sqrtf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
/* RCSID("$NetBSD: e_sqrtf.S,v 1.2 1995/05/08 23:50:14 jtc Exp $") */
ENTRY(sqrtf)
diff --git a/lib/msun/i387/e_sqrtl.S b/lib/msun/i387/e_sqrtl.S
index aec8fbd9e533..c916dbca782b 100644
--- a/lib/msun/i387/e_sqrtl.S
+++ b/lib/msun/i387/e_sqrtl.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(sqrtl)
fldt 4(%esp)
fsqrt
diff --git a/lib/msun/i387/invtrig.c b/lib/msun/i387/invtrig.c
index d300663b282d..523f022e0546 100644
--- a/lib/msun/i387/invtrig.c
+++ b/lib/msun/i387/invtrig.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#define STRUCT_DECLS
diff --git a/lib/msun/i387/s_ceil.S b/lib/msun/i387/s_ceil.S
index 71019ec6090f..08fd2d500cf1 100644
--- a/lib/msun/i387/s_ceil.S
+++ b/lib/msun/i387/s_ceil.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(ceil)
pushl %ebp
movl %esp,%ebp
diff --git a/lib/msun/i387/s_ceilf.S b/lib/msun/i387/s_ceilf.S
index 44480dededac..27e2f3b4c02f 100644
--- a/lib/msun/i387/s_ceilf.S
+++ b/lib/msun/i387/s_ceilf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
/* RCSID("$NetBSD: s_ceilf.S,v 1.3 1995/05/08 23:52:44 jtc Exp $") */
ENTRY(ceilf)
diff --git a/lib/msun/i387/s_ceill.S b/lib/msun/i387/s_ceill.S
index 8ed48aa1e603..4f60c07d9ac7 100644
--- a/lib/msun/i387/s_ceill.S
+++ b/lib/msun/i387/s_ceill.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(ceill)
pushl %ebp
movl %esp,%ebp
diff --git a/lib/msun/i387/s_copysign.S b/lib/msun/i387/s_copysign.S
index 63a916f31272..6f69db1245f6 100644
--- a/lib/msun/i387/s_copysign.S
+++ b/lib/msun/i387/s_copysign.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(copysign)
movl 16(%esp),%edx
andl $0x80000000,%edx
diff --git a/lib/msun/i387/s_copysignf.S b/lib/msun/i387/s_copysignf.S
index 7ad1a64b3adc..cab971c888f0 100644
--- a/lib/msun/i387/s_copysignf.S
+++ b/lib/msun/i387/s_copysignf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
/* RCSID("$NetBSD: s_copysignf.S,v 1.3 1995/05/08 23:53:25 jtc Exp $") */
ENTRY(copysignf)
diff --git a/lib/msun/i387/s_copysignl.S b/lib/msun/i387/s_copysignl.S
index b4143c0dcee9..7751792eb3b5 100644
--- a/lib/msun/i387/s_copysignl.S
+++ b/lib/msun/i387/s_copysignl.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(copysignl)
movl 24(%esp),%edx
andl $0x8000,%edx
diff --git a/lib/msun/i387/s_cos.S b/lib/msun/i387/s_cos.S
index 9951ab0674aa..299f90b689bb 100644
--- a/lib/msun/i387/s_cos.S
+++ b/lib/msun/i387/s_cos.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(cos)
fldl 4(%esp)
fcos
diff --git a/lib/msun/i387/s_finite.S b/lib/msun/i387/s_finite.S
index 010785670d27..aec5afeb27ed 100644
--- a/lib/msun/i387/s_finite.S
+++ b/lib/msun/i387/s_finite.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(finite)
movl 8(%esp),%eax
andl $0x7ff00000, %eax
diff --git a/lib/msun/i387/s_floor.S b/lib/msun/i387/s_floor.S
index f9d1ab976897..b3a6621931f9 100644
--- a/lib/msun/i387/s_floor.S
+++ b/lib/msun/i387/s_floor.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(floor)
pushl %ebp
movl %esp,%ebp
diff --git a/lib/msun/i387/s_floorf.S b/lib/msun/i387/s_floorf.S
index ecd9307f7b3d..65eb5b604f56 100644
--- a/lib/msun/i387/s_floorf.S
+++ b/lib/msun/i387/s_floorf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
/* RCSID("$NetBSD: s_floorf.S,v 1.3 1995/05/09 00:04:32 jtc Exp $") */
ENTRY(floorf)
diff --git a/lib/msun/i387/s_floorl.S b/lib/msun/i387/s_floorl.S
index ae9e91baf216..b202c15db4f5 100644
--- a/lib/msun/i387/s_floorl.S
+++ b/lib/msun/i387/s_floorl.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(floorl)
pushl %ebp
movl %esp,%ebp
diff --git a/lib/msun/i387/s_llrint.S b/lib/msun/i387/s_llrint.S
index ded12a763424..ea9bea24f2fe 100644
--- a/lib/msun/i387/s_llrint.S
+++ b/lib/msun/i387/s_llrint.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(llrint)
fldl 4(%esp)
subl $8,%esp
diff --git a/lib/msun/i387/s_llrintf.S b/lib/msun/i387/s_llrintf.S
index 4372b7d6b29b..31afcd0fdc41 100644
--- a/lib/msun/i387/s_llrintf.S
+++ b/lib/msun/i387/s_llrintf.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(llrintf)
flds 4(%esp)
subl $8,%esp
diff --git a/lib/msun/i387/s_llrintl.S b/lib/msun/i387/s_llrintl.S
index aa349cbc1aae..3a5239080bdf 100644
--- a/lib/msun/i387/s_llrintl.S
+++ b/lib/msun/i387/s_llrintl.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(llrintl)
fldt 4(%esp)
subl $8,%esp
diff --git a/lib/msun/i387/s_logb.S b/lib/msun/i387/s_logb.S
index 8304aa240efc..d49e15db3e15 100644
--- a/lib/msun/i387/s_logb.S
+++ b/lib/msun/i387/s_logb.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(logb)
fldl 4(%esp)
fxtract
diff --git a/lib/msun/i387/s_logbf.S b/lib/msun/i387/s_logbf.S
index 960f6f15c61f..383b189182be 100644
--- a/lib/msun/i387/s_logbf.S
+++ b/lib/msun/i387/s_logbf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
/* RCSID("$NetBSD: s_logbf.S,v 1.3 1995/05/09 00:15:12 jtc Exp $") */
ENTRY(logbf)
diff --git a/lib/msun/i387/s_logbl.S b/lib/msun/i387/s_logbl.S
index f175e7b51a40..e6eb369a5ecd 100644
--- a/lib/msun/i387/s_logbl.S
+++ b/lib/msun/i387/s_logbl.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(logbl)
fldt 4(%esp)
fxtract
diff --git a/lib/msun/i387/s_lrint.S b/lib/msun/i387/s_lrint.S
index e138c523b1da..0203bda5c2cf 100644
--- a/lib/msun/i387/s_lrint.S
+++ b/lib/msun/i387/s_lrint.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(lrint)
fldl 4(%esp)
subl $4,%esp
diff --git a/lib/msun/i387/s_lrintf.S b/lib/msun/i387/s_lrintf.S
index 7571b7f1dd0b..75f70d4b8de6 100644
--- a/lib/msun/i387/s_lrintf.S
+++ b/lib/msun/i387/s_lrintf.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(lrintf)
flds 4(%esp)
subl $4,%esp
diff --git a/lib/msun/i387/s_lrintl.S b/lib/msun/i387/s_lrintl.S
index 9a8b467a3c13..3aeef8e03324 100644
--- a/lib/msun/i387/s_lrintl.S
+++ b/lib/msun/i387/s_lrintl.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(lrintl)
fldt 4(%esp)
subl $4,%esp
diff --git a/lib/msun/i387/s_remquo.S b/lib/msun/i387/s_remquo.S
index 5fc43886224f..07c327e29c88 100644
--- a/lib/msun/i387/s_remquo.S
+++ b/lib/msun/i387/s_remquo.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(remquo)
fldl 12(%esp)
fldl 4(%esp)
diff --git a/lib/msun/i387/s_remquof.S b/lib/msun/i387/s_remquof.S
index 32ee3997839c..6cad8ec57cb2 100644
--- a/lib/msun/i387/s_remquof.S
+++ b/lib/msun/i387/s_remquof.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(remquof)
flds 8(%esp)
flds 4(%esp)
diff --git a/lib/msun/i387/s_remquol.S b/lib/msun/i387/s_remquol.S
index 59a62cbefe7d..435bb15352ed 100644
--- a/lib/msun/i387/s_remquol.S
+++ b/lib/msun/i387/s_remquol.S
@@ -29,8 +29,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(remquol)
fldt 16(%esp)
fldt 4(%esp)
diff --git a/lib/msun/i387/s_rint.S b/lib/msun/i387/s_rint.S
index 130819bfce5a..d78658a973be 100644
--- a/lib/msun/i387/s_rint.S
+++ b/lib/msun/i387/s_rint.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(rint)
fldl 4(%esp)
frndint
diff --git a/lib/msun/i387/s_rintf.S b/lib/msun/i387/s_rintf.S
index e188ae4c7f07..51ecf8c6c1d5 100644
--- a/lib/msun/i387/s_rintf.S
+++ b/lib/msun/i387/s_rintf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
/* RCSID("$NetBSD: s_rintf.S,v 1.3 1995/05/09 00:17:22 jtc Exp $") */
ENTRY(rintf)
diff --git a/lib/msun/i387/s_rintl.S b/lib/msun/i387/s_rintl.S
index 8be8d96ebcdb..0efb554302d3 100644
--- a/lib/msun/i387/s_rintl.S
+++ b/lib/msun/i387/s_rintl.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(rintl)
fldt 4(%esp)
frndint
diff --git a/lib/msun/i387/s_scalbn.S b/lib/msun/i387/s_scalbn.S
index 94d73e48e036..ee5eabaecb1e 100644
--- a/lib/msun/i387/s_scalbn.S
+++ b/lib/msun/i387/s_scalbn.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(scalbn)
fildl 12(%esp)
fldl 4(%esp)
diff --git a/lib/msun/i387/s_scalbnf.S b/lib/msun/i387/s_scalbnf.S
index d61888bde21f..ce1377c87920 100644
--- a/lib/msun/i387/s_scalbnf.S
+++ b/lib/msun/i387/s_scalbnf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
/* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */
ENTRY(scalbnf)
diff --git a/lib/msun/i387/s_scalbnl.S b/lib/msun/i387/s_scalbnl.S
index 3881f8177b78..6c81c7d586ef 100644
--- a/lib/msun/i387/s_scalbnl.S
+++ b/lib/msun/i387/s_scalbnl.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
/* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */
ENTRY(scalbnl)
diff --git a/lib/msun/i387/s_significand.S b/lib/msun/i387/s_significand.S
index ac0ffcf7b90d..38003bb4bf2e 100644
--- a/lib/msun/i387/s_significand.S
+++ b/lib/msun/i387/s_significand.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(significand)
fldl 4(%esp)
fxtract
diff --git a/lib/msun/i387/s_significandf.S b/lib/msun/i387/s_significandf.S
index 985ad970cf44..b2f7f03da83e 100644
--- a/lib/msun/i387/s_significandf.S
+++ b/lib/msun/i387/s_significandf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
/* RCSID("$NetBSD: s_significandf.S,v 1.3 1995/05/09 00:24:07 jtc Exp $") */
ENTRY(significandf)
diff --git a/lib/msun/i387/s_sin.S b/lib/msun/i387/s_sin.S
index eb047540d736..affe27894ba1 100644
--- a/lib/msun/i387/s_sin.S
+++ b/lib/msun/i387/s_sin.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(sin)
fldl 4(%esp)
fsin
diff --git a/lib/msun/i387/s_tan.S b/lib/msun/i387/s_tan.S
index 182b9f76459e..e14b223def4c 100644
--- a/lib/msun/i387/s_tan.S
+++ b/lib/msun/i387/s_tan.S
@@ -34,8 +34,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(tan)
fldl 4(%esp)
fptan
diff --git a/lib/msun/i387/s_trunc.S b/lib/msun/i387/s_trunc.S
index 61bbc537556a..1124d5430090 100644
--- a/lib/msun/i387/s_trunc.S
+++ b/lib/msun/i387/s_trunc.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(trunc)
pushl %ebp
movl %esp,%ebp
diff --git a/lib/msun/i387/s_truncf.S b/lib/msun/i387/s_truncf.S
index 4c6c3f1f2cab..332834ff2085 100644
--- a/lib/msun/i387/s_truncf.S
+++ b/lib/msun/i387/s_truncf.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(truncf)
pushl %ebp
movl %esp,%ebp
diff --git a/lib/msun/i387/s_truncl.S b/lib/msun/i387/s_truncl.S
index a52471966b90..16181b61f8ba 100644
--- a/lib/msun/i387/s_truncl.S
+++ b/lib/msun/i387/s_truncl.S
@@ -4,8 +4,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
ENTRY(truncl)
pushl %ebp
movl %esp,%ebp
diff --git a/lib/msun/ld128/e_lgammal_r.c b/lib/msun/ld128/e_lgammal_r.c
index 53d3af17d89d..e3d97b6d18b7 100644
--- a/lib/msun/ld128/e_lgammal_r.c
+++ b/lib/msun/ld128/e_lgammal_r.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See e_lgamma_r.c for complete comments.
*
diff --git a/lib/msun/ld128/e_powl.c b/lib/msun/ld128/e_powl.c
index 12b92a1a98b9..fd8b57b66bd5 100644
--- a/lib/msun/ld128/e_powl.c
+++ b/lib/msun/ld128/e_powl.c
@@ -60,8 +60,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <math.h>
diff --git a/lib/msun/ld128/e_rem_pio2l.h b/lib/msun/ld128/e_rem_pio2l.h
index fcef399a83a6..35ed0b865a7c 100644
--- a/lib/msun/ld128/e_rem_pio2l.h
+++ b/lib/msun/ld128/e_rem_pio2l.h
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* ld128 version of __ieee754_rem_pio2l(x,y)
*
* return the remainder of x rem pi/2 in y[0]+y[1]
diff --git a/lib/msun/ld128/invtrig.c b/lib/msun/ld128/invtrig.c
index 3ba767ba598a..cd9a276b68d1 100644
--- a/lib/msun/ld128/invtrig.c
+++ b/lib/msun/ld128/invtrig.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "invtrig.h"
/*
diff --git a/lib/msun/ld128/k_cosl.c b/lib/msun/ld128/k_cosl.c
index 422357bf8a6c..8280378c429c 100644
--- a/lib/msun/ld128/k_cosl.c
+++ b/lib/msun/ld128/k_cosl.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ld128 version of k_cos.c. See ../src/k_cos.c for most comments.
*/
diff --git a/lib/msun/ld128/k_expl.h b/lib/msun/ld128/k_expl.h
index 3faf7a7f097a..71924f16c8a4 100644
--- a/lib/msun/ld128/k_expl.h
+++ b/lib/msun/ld128/k_expl.h
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ld128 version of k_expl.h. See ../ld80/s_expl.c for most comments.
*
diff --git a/lib/msun/ld128/k_sinl.c b/lib/msun/ld128/k_sinl.c
index 09472d65f5c9..ca54f9f1a630 100644
--- a/lib/msun/ld128/k_sinl.c
+++ b/lib/msun/ld128/k_sinl.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ld128 version of k_sin.c. See ../src/k_sin.c for most comments.
*/
diff --git a/lib/msun/ld128/k_tanl.c b/lib/msun/ld128/k_tanl.c
index d7ec0b93d0ee..daff6b2bde8c 100644
--- a/lib/msun/ld128/k_tanl.c
+++ b/lib/msun/ld128/k_tanl.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ld128 version of k_tan.c. See ../src/k_tan.c for most comments.
*/
diff --git a/lib/msun/ld128/s_cexpl.c b/lib/msun/ld128/s_cexpl.c
index a7b81c764153..1e4141f162c5 100644
--- a/lib/msun/ld128/s_cexpl.c
+++ b/lib/msun/ld128/s_cexpl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/ld128/s_erfl.c b/lib/msun/ld128/s_erfl.c
index e29c9691f45d..43ba2f0bed8b 100644
--- a/lib/msun/ld128/s_erfl.c
+++ b/lib/msun/ld128/s_erfl.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See s_erf.c for complete comments.
*
diff --git a/lib/msun/ld128/s_exp2l.c b/lib/msun/ld128/s_exp2l.c
index bcbdc5f50170..74ae8c2daad8 100644
--- a/lib/msun/ld128/s_exp2l.c
+++ b/lib/msun/ld128/s_exp2l.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <stdint.h>
diff --git a/lib/msun/ld128/s_expl.c b/lib/msun/ld128/s_expl.c
index 0274a8f302db..6d6c22d917fe 100644
--- a/lib/msun/ld128/s_expl.c
+++ b/lib/msun/ld128/s_expl.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ld128 version of s_expl.c. See ../ld80/s_expl.c for most comments.
*/
diff --git a/lib/msun/ld128/s_logl.c b/lib/msun/ld128/s_logl.c
index bc538840a760..8961dd0c96db 100644
--- a/lib/msun/ld128/s_logl.c
+++ b/lib/msun/ld128/s_logl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/**
* Implementation of the natural logarithm of x for 128-bit format.
*
diff --git a/lib/msun/ld80/e_lgammal_r.c b/lib/msun/ld80/e_lgammal_r.c
index f56758b18917..cfd73b408b87 100644
--- a/lib/msun/ld80/e_lgammal_r.c
+++ b/lib/msun/ld80/e_lgammal_r.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See e_lgamma_r.c for complete comments.
*
diff --git a/lib/msun/ld80/e_powl.c b/lib/msun/ld80/e_powl.c
index ea25354c2aa2..2daf26aab93b 100644
--- a/lib/msun/ld80/e_powl.c
+++ b/lib/msun/ld80/e_powl.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
#include "math_private.h"
@@ -117,8 +115,6 @@ __p1evll(long double x, long double *PP, int n)
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <math.h>
diff --git a/lib/msun/ld80/e_rem_pio2l.h b/lib/msun/ld80/e_rem_pio2l.h
index 9a5c64ca9943..d9e4d3a0941f 100644
--- a/lib/msun/ld80/e_rem_pio2l.h
+++ b/lib/msun/ld80/e_rem_pio2l.h
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* ld80 version of __ieee754_rem_pio2l(x,y)
*
* return the remainder of x rem pi/2 in y[0]+y[1]
diff --git a/lib/msun/ld80/invtrig.c b/lib/msun/ld80/invtrig.c
index 879009b0c7b2..0e2d49546391 100644
--- a/lib/msun/ld80/invtrig.c
+++ b/lib/msun/ld80/invtrig.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "invtrig.h"
/*
diff --git a/lib/msun/ld80/k_cosl.c b/lib/msun/ld80/k_cosl.c
index 6dde6adad2dd..e76d429b90ef 100644
--- a/lib/msun/ld80/k_cosl.c
+++ b/lib/msun/ld80/k_cosl.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ld80 version of k_cos.c. See ../src/k_cos.c for most comments.
*/
diff --git a/lib/msun/ld80/k_expl.h b/lib/msun/ld80/k_expl.h
index b93fef8440dc..8c3617e4b177 100644
--- a/lib/msun/ld80/k_expl.h
+++ b/lib/msun/ld80/k_expl.h
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See s_expl.c for more comments about __k_expl().
*
diff --git a/lib/msun/ld80/k_sinl.c b/lib/msun/ld80/k_sinl.c
index af5598dbadf1..21c1946b5e1b 100644
--- a/lib/msun/ld80/k_sinl.c
+++ b/lib/msun/ld80/k_sinl.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ld80 version of k_sin.c. See ../src/k_sin.c for most comments.
*/
diff --git a/lib/msun/ld80/k_tanl.c b/lib/msun/ld80/k_tanl.c
index 80ceef61f1c4..4965c669979f 100644
--- a/lib/msun/ld80/k_tanl.c
+++ b/lib/msun/ld80/k_tanl.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ld80 version of k_tan.c. See ../src/k_tan.c for most comments.
*/
diff --git a/lib/msun/ld80/s_cexpl.c b/lib/msun/ld80/s_cexpl.c
index 2d7624fac337..81a4d727561b 100644
--- a/lib/msun/ld80/s_cexpl.c
+++ b/lib/msun/ld80/s_cexpl.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
#ifdef __i386__
diff --git a/lib/msun/ld80/s_erfl.c b/lib/msun/ld80/s_erfl.c
index 1ae2f9092705..362b4f07d6bc 100644
--- a/lib/msun/ld80/s_erfl.c
+++ b/lib/msun/ld80/s_erfl.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See s_erf.c for complete comments.
*
diff --git a/lib/msun/ld80/s_exp2l.c b/lib/msun/ld80/s_exp2l.c
index a7125e4162ea..94aecf1843cd 100644
--- a/lib/msun/ld80/s_exp2l.c
+++ b/lib/msun/ld80/s_exp2l.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <stdint.h>
diff --git a/lib/msun/ld80/s_expl.c b/lib/msun/ld80/s_expl.c
index a41de4d6d1d8..065e02fae1b0 100644
--- a/lib/msun/ld80/s_expl.c
+++ b/lib/msun/ld80/s_expl.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/**
* Compute the exponential of x for Intel 80-bit format. This is based on:
*
diff --git a/lib/msun/ld80/s_logl.c b/lib/msun/ld80/s_logl.c
index abe778249549..459374d7d164 100644
--- a/lib/msun/ld80/s_logl.c
+++ b/lib/msun/ld80/s_logl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/**
* Implementation of the natural logarithm of x for Intel 80-bit format.
*
diff --git a/lib/msun/src/catrig.c b/lib/msun/src/catrig.c
index 82061b5ba433..929811a09a3b 100644
--- a/lib/msun/src/catrig.c
+++ b/lib/msun/src/catrig.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
diff --git a/lib/msun/src/catrigf.c b/lib/msun/src/catrigf.c
index fb4a6bf5d471..7feecfc5de38 100644
--- a/lib/msun/src/catrigf.c
+++ b/lib/msun/src/catrigf.c
@@ -41,8 +41,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
diff --git a/lib/msun/src/catrigl.c b/lib/msun/src/catrigl.c
index e66f87a24a4b..7cc3c1431731 100644
--- a/lib/msun/src/catrigl.c
+++ b/lib/msun/src/catrigl.c
@@ -40,8 +40,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c
index 6623355baa7c..275d0ebb7756 100644
--- a/lib/msun/src/e_acos.c
+++ b/lib/msun/src/e_acos.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* acos(x)
* Method :
* acos(x) = pi/2 - asin(x)
diff --git a/lib/msun/src/e_acosf.c b/lib/msun/src/e_acosf.c
index 64f1c5afb182..29f6d4a78495 100644
--- a/lib/msun/src/e_acosf.c
+++ b/lib/msun/src/e_acosf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_acosh.c b/lib/msun/src/e_acosh.c
index 7947995820d0..d50f5513ee59 100644
--- a/lib/msun/src/e_acosh.c
+++ b/lib/msun/src/e_acosh.c
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* acosh(x)
* Method :
* Based on
diff --git a/lib/msun/src/e_acoshf.c b/lib/msun/src/e_acoshf.c
index 781ccf2a1151..df12609671cf 100644
--- a/lib/msun/src/e_acoshf.c
+++ b/lib/msun/src/e_acoshf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_acoshl.c b/lib/msun/src/e_acoshl.c
index b9f3aed67e63..8f3d3963e7cf 100644
--- a/lib/msun/src/e_acoshl.c
+++ b/lib/msun/src/e_acoshl.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See e_acosh.c for complete comments.
*
diff --git a/lib/msun/src/e_acosl.c b/lib/msun/src/e_acosl.c
index d33c8fedab8a..524fa756a103 100644
--- a/lib/msun/src/e_acosl.c
+++ b/lib/msun/src/e_acosl.c
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See comments in e_acos.c.
* Converted to long double by David Schultz <das@FreeBSD.ORG>.
diff --git a/lib/msun/src/e_asin.c b/lib/msun/src/e_asin.c
index fa180ab5701b..ae6e496850e1 100644
--- a/lib/msun/src/e_asin.c
+++ b/lib/msun/src/e_asin.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* asin(x)
* Method :
* Since asin(x) = x + x^3/6 + x^5*3/40 + x^7*15/336 + ...
diff --git a/lib/msun/src/e_asinf.c b/lib/msun/src/e_asinf.c
index db4b9b6034f7..391c15870f84 100644
--- a/lib/msun/src/e_asinf.c
+++ b/lib/msun/src/e_asinf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_asinl.c b/lib/msun/src/e_asinl.c
index a85765f1bf56..d0cff2f536fa 100644
--- a/lib/msun/src/e_asinl.c
+++ b/lib/msun/src/e_asinl.c
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See comments in e_asin.c.
* Converted to long double by David Schultz <das@FreeBSD.ORG>.
diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c
index 0b2e72102edb..f4d3ed2e00db 100644
--- a/lib/msun/src/e_atan2.c
+++ b/lib/msun/src/e_atan2.c
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* atan2(y,x)
* Method :
* 1. Reduce y to positive by atan2(y,x)=-atan2(-y,x).
diff --git a/lib/msun/src/e_atan2f.c b/lib/msun/src/e_atan2f.c
index 4ea001df974a..af8c00851476 100644
--- a/lib/msun/src/e_atan2f.c
+++ b/lib/msun/src/e_atan2f.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_atan2l.c b/lib/msun/src/e_atan2l.c
index 94ebdec54322..722334f76791 100644
--- a/lib/msun/src/e_atan2l.c
+++ b/lib/msun/src/e_atan2l.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See comments in e_atan2.c.
* Converted to long double by David Schultz <das@FreeBSD.ORG>.
diff --git a/lib/msun/src/e_atanh.c b/lib/msun/src/e_atanh.c
index 41f3bcaca26d..3eabaaf82403 100644
--- a/lib/msun/src/e_atanh.c
+++ b/lib/msun/src/e_atanh.c
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* atanh(x)
* Method :
* 1.Reduced x to positive by atanh(-x) = -atanh(x)
diff --git a/lib/msun/src/e_atanhf.c b/lib/msun/src/e_atanhf.c
index 46643beb5ab0..134513e5b817 100644
--- a/lib/msun/src/e_atanhf.c
+++ b/lib/msun/src/e_atanhf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_atanhl.c b/lib/msun/src/e_atanhl.c
index 11d56ea52e7f..66a301f52ab6 100644
--- a/lib/msun/src/e_atanhl.c
+++ b/lib/msun/src/e_atanhl.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See e_atanh.c for complete comments.
*
diff --git a/lib/msun/src/e_cosh.c b/lib/msun/src/e_cosh.c
index 071663eb4e15..56ec7d56093d 100644
--- a/lib/msun/src/e_cosh.c
+++ b/lib/msun/src/e_cosh.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* cosh(x)
* Method :
* mathematically cosh(x) if defined to be (exp(x)+exp(-x))/2
diff --git a/lib/msun/src/e_coshf.c b/lib/msun/src/e_coshf.c
index 1673315d7b31..8c5457e24a51 100644
--- a/lib/msun/src/e_coshf.c
+++ b/lib/msun/src/e_coshf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_coshl.c b/lib/msun/src/e_coshl.c
index 4e3b28311e79..de54b8183bbb 100644
--- a/lib/msun/src/e_coshl.c
+++ b/lib/msun/src/e_coshl.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See e_cosh.c for complete comments.
*
diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c
index 59da39217391..afbcdb3db7b6 100644
--- a/lib/msun/src/e_exp.c
+++ b/lib/msun/src/e_exp.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* exp(x)
* Returns the exponential of x.
*
diff --git a/lib/msun/src/e_expf.c b/lib/msun/src/e_expf.c
index 620d341be274..2dbce9dd870d 100644
--- a/lib/msun/src/e_expf.c
+++ b/lib/msun/src/e_expf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c
index 6d5f5332cb85..fdfb56c2a475 100644
--- a/lib/msun/src/e_fmod.c
+++ b/lib/msun/src/e_fmod.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* fmod(x,y)
* Return x mod y in exact arithmetic
diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c
index 3cef9213c1e5..0e6633fbe739 100644
--- a/lib/msun/src/e_fmodf.c
+++ b/lib/msun/src/e_fmodf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* fmodf(x,y)
* Return x mod y in exact arithmetic
diff --git a/lib/msun/src/e_fmodl.c b/lib/msun/src/e_fmodl.c
index ad3bcc34c9a2..8a348ee117e7 100644
--- a/lib/msun/src/e_fmodl.c
+++ b/lib/msun/src/e_fmodl.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <stdint.h>
diff --git a/lib/msun/src/e_gamma.c b/lib/msun/src/e_gamma.c
index a13f3e22c08b..7757337b59af 100644
--- a/lib/msun/src/e_gamma.c
+++ b/lib/msun/src/e_gamma.c
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* gamma(x)
* Return the logarithm of the Gamma function of x.
*
diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c
index 2d996cabca20..f204685c3f7a 100644
--- a/lib/msun/src/e_gamma_r.c
+++ b/lib/msun/src/e_gamma_r.c
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* gamma_r(x, signgamp)
* Reentrant version of the logarithm of the Gamma function
* with user provide pointer for the sign of Gamma(x).
diff --git a/lib/msun/src/e_gammaf.c b/lib/msun/src/e_gammaf.c
index 563c1482282d..3afef79de53a 100644
--- a/lib/msun/src/e_gammaf.c
+++ b/lib/msun/src/e_gammaf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* gammaf(x)
* Return the logarithm of the Gamma function of x.
*
diff --git a/lib/msun/src/e_gammaf_r.c b/lib/msun/src/e_gammaf_r.c
index d7fc2db1e96c..5b3bd535aa42 100644
--- a/lib/msun/src/e_gammaf_r.c
+++ b/lib/msun/src/e_gammaf_r.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* gammaf_r(x, signgamp)
* Reentrant version of the logarithm of the Gamma function
* with user provide pointer for the sign of Gamma(x).
diff --git a/lib/msun/src/e_hypot.c b/lib/msun/src/e_hypot.c
index 8e3f9317b3a6..8d9c2b11dd97 100644
--- a/lib/msun/src/e_hypot.c
+++ b/lib/msun/src/e_hypot.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* hypot(x,y)
*
* Method :
diff --git a/lib/msun/src/e_hypotf.c b/lib/msun/src/e_hypotf.c
index a3b8c866697b..c976fd33014d 100644
--- a/lib/msun/src/e_hypotf.c
+++ b/lib/msun/src/e_hypotf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_hypotl.c b/lib/msun/src/e_hypotl.c
index fc43538dfa65..0a89e3a0e218 100644
--- a/lib/msun/src/e_hypotl.c
+++ b/lib/msun/src/e_hypotl.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* long double version of hypot(). See e_hypot.c for most comments. */
#include <float.h>
diff --git a/lib/msun/src/e_j0.c b/lib/msun/src/e_j0.c
index c43ab6996b4a..20e0d36b162e 100644
--- a/lib/msun/src/e_j0.c
+++ b/lib/msun/src/e_j0.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* j0(x), y0(x)
* Bessel function of the first and second kinds of order zero.
* Method -- j0(x):
diff --git a/lib/msun/src/e_j0f.c b/lib/msun/src/e_j0f.c
index 290be04fc900..1cb318d80851 100644
--- a/lib/msun/src/e_j0f.c
+++ b/lib/msun/src/e_j0f.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See e_j0.c for complete comments.
*/
diff --git a/lib/msun/src/e_j1.c b/lib/msun/src/e_j1.c
index ee3f6fcc69d4..7c7812325cc2 100644
--- a/lib/msun/src/e_j1.c
+++ b/lib/msun/src/e_j1.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* j1(x), y1(x)
* Bessel function of the first and second kinds of order zero.
* Method -- j1(x):
diff --git a/lib/msun/src/e_j1f.c b/lib/msun/src/e_j1f.c
index e1f4498b71af..c022557c4d6b 100644
--- a/lib/msun/src/e_j1f.c
+++ b/lib/msun/src/e_j1f.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See e_j1.c for complete comments.
*/
diff --git a/lib/msun/src/e_jn.c b/lib/msun/src/e_jn.c
index 6b876ce69554..9735b03429ff 100644
--- a/lib/msun/src/e_jn.c
+++ b/lib/msun/src/e_jn.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* jn(n, x), yn(n, x)
* floating point Bessel's function of the 1st and 2nd kind
diff --git a/lib/msun/src/e_jnf.c b/lib/msun/src/e_jnf.c
index ba586226dae5..2eadaa1cc07b 100644
--- a/lib/msun/src/e_jnf.c
+++ b/lib/msun/src/e_jnf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See e_jn.c for complete comments.
*/
diff --git a/lib/msun/src/e_lgamma.c b/lib/msun/src/e_lgamma.c
index 9c4a30e6e135..1d74db1c6af8 100644
--- a/lib/msun/src/e_lgamma.c
+++ b/lib/msun/src/e_lgamma.c
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* lgamma(x)
* Return the logarithm of the Gamma function of x.
*
diff --git a/lib/msun/src/e_lgamma_r.c b/lib/msun/src/e_lgamma_r.c
index c020b638e7c7..38efe4385631 100644
--- a/lib/msun/src/e_lgamma_r.c
+++ b/lib/msun/src/e_lgamma_r.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* lgamma_r(x, signgamp)
* Reentrant version of the logarithm of the Gamma function
* with user provide pointer for the sign of Gamma(x).
diff --git a/lib/msun/src/e_lgammaf.c b/lib/msun/src/e_lgammaf.c
index 00a816c35c37..b3073557c92d 100644
--- a/lib/msun/src/e_lgammaf.c
+++ b/lib/msun/src/e_lgammaf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* lgammaf(x)
* Return the logarithm of the Gamma function of x.
*
diff --git a/lib/msun/src/e_lgammaf_r.c b/lib/msun/src/e_lgammaf_r.c
index fdd23218e58d..86f554f3bd38 100644
--- a/lib/msun/src/e_lgammaf_r.c
+++ b/lib/msun/src/e_lgammaf_r.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_lgammal.c b/lib/msun/src/e_lgammal.c
index ebc2fc78cbb1..c45a62a7268e 100644
--- a/lib/msun/src/e_lgammal.c
+++ b/lib/msun/src/e_lgammal.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_log.c b/lib/msun/src/e_log.c
index 03ce82061375..5dff93c66c5e 100644
--- a/lib/msun/src/e_log.c
+++ b/lib/msun/src/e_log.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* log(x)
* Return the logrithm of x
*
diff --git a/lib/msun/src/e_log10.c b/lib/msun/src/e_log10.c
index 595c23808941..89efd791265d 100644
--- a/lib/msun/src/e_log10.c
+++ b/lib/msun/src/e_log10.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Return the base 10 logarithm of x. See e_log.c and k_log.h for most
* comments.
diff --git a/lib/msun/src/e_log10f.c b/lib/msun/src/e_log10f.c
index d0c3a53c88ea..f240d14fca27 100644
--- a/lib/msun/src/e_log10f.c
+++ b/lib/msun/src/e_log10f.c
@@ -10,8 +10,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Float version of e_log10.c. See the latter for most comments.
*/
diff --git a/lib/msun/src/e_log2.c b/lib/msun/src/e_log2.c
index 10b1c00d50de..eb099171f669 100644
--- a/lib/msun/src/e_log2.c
+++ b/lib/msun/src/e_log2.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Return the base 2 logarithm of x. See e_log.c and k_log.h for most
* comments.
diff --git a/lib/msun/src/e_log2f.c b/lib/msun/src/e_log2f.c
index 956f33a344a0..7c1b5c032bdc 100644
--- a/lib/msun/src/e_log2f.c
+++ b/lib/msun/src/e_log2f.c
@@ -10,8 +10,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Float version of e_log2.c. See the latter for most comments.
*/
diff --git a/lib/msun/src/e_logf.c b/lib/msun/src/e_logf.c
index 68a4d5d88342..2bbdd068591c 100644
--- a/lib/msun/src/e_logf.c
+++ b/lib/msun/src/e_logf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_pow.c b/lib/msun/src/e_pow.c
index adc64c99852f..8b62c49abe4a 100644
--- a/lib/msun/src/e_pow.c
+++ b/lib/msun/src/e_pow.c
@@ -10,8 +10,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* pow(x,y) return x**y
*
* n
diff --git a/lib/msun/src/e_powf.c b/lib/msun/src/e_powf.c
index f5a2c70c7c26..ff872ab46327 100644
--- a/lib/msun/src/e_powf.c
+++ b/lib/msun/src/e_powf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_rem_pio2.c b/lib/msun/src/e_rem_pio2.c
index 47b651351a8c..ef4107af94cb 100644
--- a/lib/msun/src/e_rem_pio2.c
+++ b/lib/msun/src/e_rem_pio2.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* __ieee754_rem_pio2(x,y)
*
* return the remainder of x rem pi/2 in y[0]+y[1]
diff --git a/lib/msun/src/e_rem_pio2f.c b/lib/msun/src/e_rem_pio2f.c
index 597f6139f248..26f6bc85791b 100644
--- a/lib/msun/src/e_rem_pio2f.c
+++ b/lib/msun/src/e_rem_pio2f.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* __ieee754_rem_pio2f(x,y)
*
* return the remainder of x rem pi/2 in *y
diff --git a/lib/msun/src/e_remainder.c b/lib/msun/src/e_remainder.c
index 13156d8cbc65..bd1ce8950619 100644
--- a/lib/msun/src/e_remainder.c
+++ b/lib/msun/src/e_remainder.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* remainder(x,p)
* Return :
* returns x REM p = x - [x/p]*p as if in infinite
diff --git a/lib/msun/src/e_remainderf.c b/lib/msun/src/e_remainderf.c
index e0dcfd181dfd..053ae45c4a10 100644
--- a/lib/msun/src/e_remainderf.c
+++ b/lib/msun/src/e_remainderf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_remainderl.c b/lib/msun/src/e_remainderl.c
index 229567334567..4606cf874d75 100644
--- a/lib/msun/src/e_remainderl.c
+++ b/lib/msun/src/e_remainderl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
long double
diff --git a/lib/msun/src/e_scalb.c b/lib/msun/src/e_scalb.c
index 84a68939b836..8a38ddb68d81 100644
--- a/lib/msun/src/e_scalb.c
+++ b/lib/msun/src/e_scalb.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* scalb(x, fn) is provide for
* passing various standard test suite. One
diff --git a/lib/msun/src/e_scalbf.c b/lib/msun/src/e_scalbf.c
index 28483a5e2826..ca94a9fb1634 100644
--- a/lib/msun/src/e_scalbf.c
+++ b/lib/msun/src/e_scalbf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_sinh.c b/lib/msun/src/e_sinh.c
index 9fe89996a098..b19a4a2f7d48 100644
--- a/lib/msun/src/e_sinh.c
+++ b/lib/msun/src/e_sinh.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* sinh(x)
* Method :
* mathematically sinh(x) if defined to be (exp(x)-exp(-x))/2
diff --git a/lib/msun/src/e_sinhf.c b/lib/msun/src/e_sinhf.c
index 082beb14fb14..7aa177b69f11 100644
--- a/lib/msun/src/e_sinhf.c
+++ b/lib/msun/src/e_sinhf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/e_sinhl.c b/lib/msun/src/e_sinhl.c
index 38d3df195969..121bace1d6c1 100644
--- a/lib/msun/src/e_sinhl.c
+++ b/lib/msun/src/e_sinhl.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See e_sinh.c for complete comments.
*
diff --git a/lib/msun/src/e_sqrt.c b/lib/msun/src/e_sqrt.c
index 5460dd0dbddd..ea588c97f5d1 100644
--- a/lib/msun/src/e_sqrt.c
+++ b/lib/msun/src/e_sqrt.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/e_sqrtl.c b/lib/msun/src/e_sqrtl.c
index 67c777f960d7..beb4e7a9c948 100644
--- a/lib/msun/src/e_sqrtl.c
+++ b/lib/msun/src/e_sqrtl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <float.h>
diff --git a/lib/msun/src/k_cos.c b/lib/msun/src/k_cos.c
index c4702e65b282..8cc9a0e83efe 100644
--- a/lib/msun/src/k_cos.c
+++ b/lib/msun/src/k_cos.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* __kernel_cos( x, y )
* kernel cos function on [-pi/4, pi/4], pi/4 ~ 0.785398164
diff --git a/lib/msun/src/k_cosf.c b/lib/msun/src/k_cosf.c
index f7a2c0ae15c2..a93011b52c0d 100644
--- a/lib/msun/src/k_cosf.c
+++ b/lib/msun/src/k_cosf.c
@@ -16,7 +16,6 @@
#ifndef INLINE_KERNEL_COSDF
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#endif
#include "math.h"
diff --git a/lib/msun/src/k_exp.c b/lib/msun/src/k_exp.c
index 1b86cd6852d3..ce8e3591827a 100644
--- a/lib/msun/src/k_exp.c
+++ b/lib/msun/src/k_exp.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include "math.h"
diff --git a/lib/msun/src/k_expf.c b/lib/msun/src/k_expf.c
index 7071632c35c8..61478214e736 100644
--- a/lib/msun/src/k_expf.c
+++ b/lib/msun/src/k_expf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include "math.h"
diff --git a/lib/msun/src/k_log.h b/lib/msun/src/k_log.h
index aaff8bd9000e..f15227139324 100644
--- a/lib/msun/src/k_log.h
+++ b/lib/msun/src/k_log.h
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* k_log1p(f):
* Return log(1+f) - f for 1+f in ~[sqrt(2)/2, sqrt(2)].
diff --git a/lib/msun/src/k_logf.h b/lib/msun/src/k_logf.h
index 71c547e888ae..3f637cd6a9ec 100644
--- a/lib/msun/src/k_logf.h
+++ b/lib/msun/src/k_logf.h
@@ -10,8 +10,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Float version of k_log.h. See the latter for most comments.
*/
diff --git a/lib/msun/src/k_rem_pio2.c b/lib/msun/src/k_rem_pio2.c
index 0a717f768428..952bebb6ed2d 100644
--- a/lib/msun/src/k_rem_pio2.c
+++ b/lib/msun/src/k_rem_pio2.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* __kernel_rem_pio2(x,y,e0,nx,prec)
* double x[],y[]; int e0,nx,prec;
diff --git a/lib/msun/src/k_sin.c b/lib/msun/src/k_sin.c
index 12ee8c143a5d..6d24a0f21d92 100644
--- a/lib/msun/src/k_sin.c
+++ b/lib/msun/src/k_sin.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* __kernel_sin( x, y, iy)
* kernel sin function on ~[-pi/4, pi/4] (except on -0), pi/4 ~ 0.7854
* Input x is assumed to be bounded by ~pi/4 in magnitude.
diff --git a/lib/msun/src/k_sincos.h b/lib/msun/src/k_sincos.h
index 6f03be29776a..a29a57c06342 100644
--- a/lib/msun/src/k_sincos.h
+++ b/lib/msun/src/k_sincos.h
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
static const double
S1 = -1.66666666666666324348e-01, /* 0xBFC55555, 0x55555549 */
S2 = 8.33333333332248946124e-03, /* 0x3F811111, 0x1110F8A6 */
diff --git a/lib/msun/src/k_sincosf.h b/lib/msun/src/k_sincosf.h
index 073986db8818..01f5d48b23ee 100644
--- a/lib/msun/src/k_sincosf.h
+++ b/lib/msun/src/k_sincosf.h
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* |sin(x)/x - s(x)| < 2**-37.5 (~[-4.89e-12, 4.824e-12]). */
static const double
S1 = -0x15555554cbac77.0p-55, /* -0.166666666416265235595 */
diff --git a/lib/msun/src/k_sincosl.h b/lib/msun/src/k_sincosl.h
index 6425f14a1ea0..918d49f54f54 100644
--- a/lib/msun/src/k_sincosl.h
+++ b/lib/msun/src/k_sincosl.h
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if LDBL_MANT_DIG == 64 /* ld80 version of k_sincosl.c. */
#if defined(__amd64__) || defined(__i386__)
diff --git a/lib/msun/src/k_sinf.c b/lib/msun/src/k_sinf.c
index 0841759b17f7..ef547e36bf50 100644
--- a/lib/msun/src/k_sinf.c
+++ b/lib/msun/src/k_sinf.c
@@ -16,7 +16,6 @@
#ifndef INLINE_KERNEL_SINDF
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#endif
#include "math.h"
diff --git a/lib/msun/src/k_tan.c b/lib/msun/src/k_tan.c
index 2e86c3bf6488..5ebcddda09e6 100644
--- a/lib/msun/src/k_tan.c
+++ b/lib/msun/src/k_tan.c
@@ -12,8 +12,6 @@
/* INDENT OFF */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* __kernel_tan( x, y, k )
* kernel tan function on ~[-pi/4, pi/4] (except on -0), pi/4 ~ 0.7854
* Input x is assumed to be bounded by ~pi/4 in magnitude.
diff --git a/lib/msun/src/k_tanf.c b/lib/msun/src/k_tanf.c
index 5be14458b80c..6ab7be71e323 100644
--- a/lib/msun/src/k_tanf.c
+++ b/lib/msun/src/k_tanf.c
@@ -15,7 +15,6 @@
#ifndef INLINE_KERNEL_TANDF
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#endif
#include "math.h"
diff --git a/lib/msun/src/s_asinh.c b/lib/msun/src/s_asinh.c
index a1b9169bef99..a8bad118f6b3 100644
--- a/lib/msun/src/s_asinh.c
+++ b/lib/msun/src/s_asinh.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* asinh(x)
* Method :
* Based on
diff --git a/lib/msun/src/s_asinhf.c b/lib/msun/src/s_asinhf.c
index 72bcefed9343..822b0187ad09 100644
--- a/lib/msun/src/s_asinhf.c
+++ b/lib/msun/src/s_asinhf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_asinhl.c b/lib/msun/src/s_asinhl.c
index ba28f599c3ca..d80405821ff4 100644
--- a/lib/msun/src/s_asinhl.c
+++ b/lib/msun/src/s_asinhl.c
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See s_asinh.c for complete comments.
*
diff --git a/lib/msun/src/s_atan.c b/lib/msun/src/s_atan.c
index 566f5dc7b99b..d2bfacf52ab6 100644
--- a/lib/msun/src/s_atan.c
+++ b/lib/msun/src/s_atan.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* atan(x)
* Method
* 1. Reduce x to positive by atan(x) = -atan(-x).
diff --git a/lib/msun/src/s_atanf.c b/lib/msun/src/s_atanf.c
index b3a371f3712e..30666fe0b66a 100644
--- a/lib/msun/src/s_atanf.c
+++ b/lib/msun/src/s_atanf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_atanl.c b/lib/msun/src/s_atanl.c
index ff29c3ce8a18..b85cb131035f 100644
--- a/lib/msun/src/s_atanl.c
+++ b/lib/msun/src/s_atanl.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See comments in s_atan.c.
* Converted to long double by David Schultz <das@FreeBSD.ORG>.
diff --git a/lib/msun/src/s_carg.c b/lib/msun/src/s_carg.c
index f203198ecbc7..45714bbdb18a 100644
--- a/lib/msun/src/s_carg.c
+++ b/lib/msun/src/s_carg.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_cargf.c b/lib/msun/src/s_cargf.c
index 6ea487cdb88d..c4d53006b542 100644
--- a/lib/msun/src/s_cargf.c
+++ b/lib/msun/src/s_cargf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_cargl.c b/lib/msun/src/s_cargl.c
index ba3943822f66..d7f8206e9608 100644
--- a/lib/msun/src/s_cargl.c
+++ b/lib/msun/src/s_cargl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_cbrt.c b/lib/msun/src/s_cbrt.c
index 4353d340a1ac..afb601bf0fb6 100644
--- a/lib/msun/src/s_cbrt.c
+++ b/lib/msun/src/s_cbrt.c
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_cbrtf.c b/lib/msun/src/s_cbrtf.c
index 454f97484b7b..f013e1f1eb6f 100644
--- a/lib/msun/src/s_cbrtf.c
+++ b/lib/msun/src/s_cbrtf.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_cbrtl.c b/lib/msun/src/s_cbrtl.c
index b15c96ecde03..3ed939cccf92 100644
--- a/lib/msun/src/s_cbrtl.c
+++ b/lib/msun/src/s_cbrtl.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#ifdef __i386__
#include <ieeefp.h>
diff --git a/lib/msun/src/s_ccosh.c b/lib/msun/src/s_ccosh.c
index 0fd9206da349..95ed3a32ddd7 100644
--- a/lib/msun/src/s_ccosh.c
+++ b/lib/msun/src/s_ccosh.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_ccoshf.c b/lib/msun/src/s_ccoshf.c
index 2db840362bad..ba97a390c832 100644
--- a/lib/msun/src/s_ccoshf.c
+++ b/lib/msun/src/s_ccoshf.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_ceil.c b/lib/msun/src/s_ceil.c
index 929f813de0a2..9c041b2a94e1 100644
--- a/lib/msun/src/s_ceil.c
+++ b/lib/msun/src/s_ceil.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ceil(x)
* Return x rounded toward -inf to integral value
diff --git a/lib/msun/src/s_ceilf.c b/lib/msun/src/s_ceilf.c
index 23bfe04e89a9..3cb0e11688bf 100644
--- a/lib/msun/src/s_ceilf.c
+++ b/lib/msun/src/s_ceilf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_ceill.c b/lib/msun/src/s_ceill.c
index 2d1045fe60d1..28c0881e8da6 100644
--- a/lib/msun/src/s_ceill.c
+++ b/lib/msun/src/s_ceill.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ceill(x)
* Return x rounded toward -inf to integral value
diff --git a/lib/msun/src/s_cexp.c b/lib/msun/src/s_cexp.c
index 8db763d9f8ee..056d273f6932 100644
--- a/lib/msun/src/s_cexp.c
+++ b/lib/msun/src/s_cexp.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/src/s_cexpf.c b/lib/msun/src/s_cexpf.c
index 7247301704e3..872e9253daa5 100644
--- a/lib/msun/src/s_cexpf.c
+++ b/lib/msun/src/s_cexpf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_clog.c b/lib/msun/src/s_clog.c
index 8150fa7f8bce..e51ff5230e45 100644
--- a/lib/msun/src/s_clog.c
+++ b/lib/msun/src/s_clog.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
diff --git a/lib/msun/src/s_clogf.c b/lib/msun/src/s_clogf.c
index 19a94453ea37..761f91b12efa 100644
--- a/lib/msun/src/s_clogf.c
+++ b/lib/msun/src/s_clogf.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
diff --git a/lib/msun/src/s_clogl.c b/lib/msun/src/s_clogl.c
index e59a1377afd8..78244961df5c 100644
--- a/lib/msun/src/s_clogl.c
+++ b/lib/msun/src/s_clogl.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
#ifdef __i386__
diff --git a/lib/msun/src/s_copysign.c b/lib/msun/src/s_copysign.c
index a5f3870e6261..2a9923a2480a 100644
--- a/lib/msun/src/s_copysign.c
+++ b/lib/msun/src/s_copysign.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* copysign(double x, double y)
* copysign(x,y) returns a value with the magnitude of x and
diff --git a/lib/msun/src/s_copysignf.c b/lib/msun/src/s_copysignf.c
index 05ca1e368d89..a35b07ccbb5b 100644
--- a/lib/msun/src/s_copysignf.c
+++ b/lib/msun/src/s_copysignf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* copysignf(float x, float y)
* copysignf(x,y) returns a value with the magnitude of x and
diff --git a/lib/msun/src/s_cos.c b/lib/msun/src/s_cos.c
index 29804f4cb6cb..97f72a15ce4d 100644
--- a/lib/msun/src/s_cos.c
+++ b/lib/msun/src/s_cos.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* cos(x)
* Return cosine function of x.
*
diff --git a/lib/msun/src/s_cosf.c b/lib/msun/src/s_cosf.c
index b701fd27ac57..a0ba8598f7e6 100644
--- a/lib/msun/src/s_cosf.c
+++ b/lib/msun/src/s_cosf.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/s_cosl.c b/lib/msun/src/s_cosl.c
index 6f0b36f479e6..00c24ce13d12 100644
--- a/lib/msun/src/s_cosl.c
+++ b/lib/msun/src/s_cosl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Limited testing on pseudorandom numbers drawn within [-2e8:4e8] shows
* an accuracy of <= 0.7412 ULP.
diff --git a/lib/msun/src/s_cpow.c b/lib/msun/src/s_cpow.c
index cdc57bd4677d..735d38956380 100644
--- a/lib/msun/src/s_cpow.c
+++ b/lib/msun/src/s_cpow.c
@@ -44,8 +44,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/src/s_cpowf.c b/lib/msun/src/s_cpowf.c
index aeb773b02e31..aefcd7619de1 100644
--- a/lib/msun/src/s_cpowf.c
+++ b/lib/msun/src/s_cpowf.c
@@ -44,8 +44,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
#include "math_private.h"
diff --git a/lib/msun/src/s_cpowl.c b/lib/msun/src/s_cpowl.c
index 5d43b55a7b68..342dfcff8481 100644
--- a/lib/msun/src/s_cpowl.c
+++ b/lib/msun/src/s_cpowl.c
@@ -44,8 +44,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
#include "math_private.h"
diff --git a/lib/msun/src/s_cproj.c b/lib/msun/src/s_cproj.c
index 5b0d4ed0636c..75cb083baf17 100644
--- a/lib/msun/src/s_cproj.c
+++ b/lib/msun/src/s_cproj.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/src/s_cprojf.c b/lib/msun/src/s_cprojf.c
index 0d76e75c70fc..aadc5ef35cbd 100644
--- a/lib/msun/src/s_cprojf.c
+++ b/lib/msun/src/s_cprojf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_cprojl.c b/lib/msun/src/s_cprojl.c
index 7fc35d212f5c..78e3e9a6fdca 100644
--- a/lib/msun/src/s_cprojl.c
+++ b/lib/msun/src/s_cprojl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_csinh.c b/lib/msun/src/s_csinh.c
index b3928ce87eb2..1bd78b1e49bf 100644
--- a/lib/msun/src/s_csinh.c
+++ b/lib/msun/src/s_csinh.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_csinhf.c b/lib/msun/src/s_csinhf.c
index a8d6f2d1da59..b1f333955e53 100644
--- a/lib/msun/src/s_csinhf.c
+++ b/lib/msun/src/s_csinhf.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_csqrt.c b/lib/msun/src/s_csqrt.c
index d96c34446f1f..afac4db17b61 100644
--- a/lib/msun/src/s_csqrt.c
+++ b/lib/msun/src/s_csqrt.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/src/s_csqrtf.c b/lib/msun/src/s_csqrtf.c
index e3ef4d0f65a7..ece9f6c13657 100644
--- a/lib/msun/src/s_csqrtf.c
+++ b/lib/msun/src/s_csqrtf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_csqrtl.c b/lib/msun/src/s_csqrtl.c
index d5641337d036..b0fc37c902f1 100644
--- a/lib/msun/src/s_csqrtl.c
+++ b/lib/msun/src/s_csqrtl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/src/s_ctanh.c b/lib/msun/src/s_ctanh.c
index aa4e10c749a3..33186510a8a3 100644
--- a/lib/msun/src/s_ctanh.c
+++ b/lib/msun/src/s_ctanh.c
@@ -66,8 +66,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_ctanhf.c b/lib/msun/src/s_ctanhf.c
index e9ebe4f01037..c2fb2f8618f6 100644
--- a/lib/msun/src/s_ctanhf.c
+++ b/lib/msun/src/s_ctanhf.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/src/s_erf.c b/lib/msun/src/s_erf.c
index ab2dc19058bd..6fc9e56d11af 100644
--- a/lib/msun/src/s_erf.c
+++ b/lib/msun/src/s_erf.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* double erf(double x)
* double erfc(double x)
* x
diff --git a/lib/msun/src/s_erff.c b/lib/msun/src/s_erff.c
index d6cfbd227678..bf011b312bfb 100644
--- a/lib/msun/src/s_erff.c
+++ b/lib/msun/src/s_erff.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_exp2.c b/lib/msun/src/s_exp2.c
index 1dd9673dcc75..5bf9d65975e0 100644
--- a/lib/msun/src/s_exp2.c
+++ b/lib/msun/src/s_exp2.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/s_exp2f.c b/lib/msun/src/s_exp2f.c
index c5b4c8e60e28..f94cfaf9ce96 100644
--- a/lib/msun/src/s_exp2f.c
+++ b/lib/msun/src/s_exp2f.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/s_expm1.c b/lib/msun/src/s_expm1.c
index 844f10360fe6..154a5d8148a5 100644
--- a/lib/msun/src/s_expm1.c
+++ b/lib/msun/src/s_expm1.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* expm1(x)
* Returns exp(x)-1, the exponential of x minus 1.
*
diff --git a/lib/msun/src/s_expm1f.c b/lib/msun/src/s_expm1f.c
index b47daac2eb35..831c0caa6db8 100644
--- a/lib/msun/src/s_expm1f.c
+++ b/lib/msun/src/s_expm1f.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/s_fabs.c b/lib/msun/src/s_fabs.c
index 48aab252db3c..ec071d481ac6 100644
--- a/lib/msun/src/s_fabs.c
+++ b/lib/msun/src/s_fabs.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* fabs(x) returns the absolute value of x.
*/
diff --git a/lib/msun/src/s_fabsf.c b/lib/msun/src/s_fabsf.c
index e9383d0db37c..501676253385 100644
--- a/lib/msun/src/s_fabsf.c
+++ b/lib/msun/src/s_fabsf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* fabsf(x) returns the absolute value of x.
*/
diff --git a/lib/msun/src/s_fdim.c b/lib/msun/src/s_fdim.c
index b81dbacbfce0..580ab4605f92 100644
--- a/lib/msun/src/s_fdim.c
+++ b/lib/msun/src/s_fdim.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
#define DECL(type, fn) \
diff --git a/lib/msun/src/s_finite.c b/lib/msun/src/s_finite.c
index 4c5135290a45..c6b1cfa6d111 100644
--- a/lib/msun/src/s_finite.c
+++ b/lib/msun/src/s_finite.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* finite(x) returns 1 is x is finite, else 0;
* no branching!
diff --git a/lib/msun/src/s_finitef.c b/lib/msun/src/s_finitef.c
index c62239e44515..94e527257c06 100644
--- a/lib/msun/src/s_finitef.c
+++ b/lib/msun/src/s_finitef.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* finitef(x) returns 1 is x is finite, else 0;
* no branching!
diff --git a/lib/msun/src/s_floor.c b/lib/msun/src/s_floor.c
index 65f696a1578d..1746cf27f016 100644
--- a/lib/msun/src/s_floor.c
+++ b/lib/msun/src/s_floor.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* floor(x)
* Return x rounded toward -inf to integral value
diff --git a/lib/msun/src/s_floorf.c b/lib/msun/src/s_floorf.c
index 6b510dee3a80..145a50321046 100644
--- a/lib/msun/src/s_floorf.c
+++ b/lib/msun/src/s_floorf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* floorf(x)
* Return x rounded toward -inf to integral value
diff --git a/lib/msun/src/s_floorl.c b/lib/msun/src/s_floorl.c
index 6cec3e781cd2..ee9a391ffe41 100644
--- a/lib/msun/src/s_floorl.c
+++ b/lib/msun/src/s_floorl.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* floorl(x)
* Return x rounded toward -inf to integral value
diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c
index 2fd7075a7f5a..0788bb2d47e8 100644
--- a/lib/msun/src/s_fma.c
+++ b/lib/msun/src/s_fma.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/src/s_fmaf.c b/lib/msun/src/s_fmaf.c
index ae979cb4a0af..c433f523fe08 100644
--- a/lib/msun/src/s_fmaf.c
+++ b/lib/msun/src/s_fmaf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include "math.h"
diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c
index a0622a295531..0d5e2c0bc98f 100644
--- a/lib/msun/src/s_fmal.c
+++ b/lib/msun/src/s_fmal.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/src/s_fmax.c b/lib/msun/src/s_fmax.c
index 42bd11c426d0..aca4e0585cdd 100644
--- a/lib/msun/src/s_fmax.c
+++ b/lib/msun/src/s_fmax.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <math.h>
diff --git a/lib/msun/src/s_fmaxf.c b/lib/msun/src/s_fmaxf.c
index 10667d382798..8684fb6bb68c 100644
--- a/lib/msun/src/s_fmaxf.c
+++ b/lib/msun/src/s_fmaxf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
#include "fpmath.h"
diff --git a/lib/msun/src/s_fmaxl.c b/lib/msun/src/s_fmaxl.c
index bf42587824d5..d0c1a806bdaf 100644
--- a/lib/msun/src/s_fmaxl.c
+++ b/lib/msun/src/s_fmaxl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
#include "fpmath.h"
diff --git a/lib/msun/src/s_fmin.c b/lib/msun/src/s_fmin.c
index e79071d2faa7..aa67d161ec34 100644
--- a/lib/msun/src/s_fmin.c
+++ b/lib/msun/src/s_fmin.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <math.h>
diff --git a/lib/msun/src/s_fminf.c b/lib/msun/src/s_fminf.c
index 19ffd4289467..01e52d9becdc 100644
--- a/lib/msun/src/s_fminf.c
+++ b/lib/msun/src/s_fminf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
#include "fpmath.h"
diff --git a/lib/msun/src/s_fminl.c b/lib/msun/src/s_fminl.c
index c906f1d3eb6c..f79a08d6c774 100644
--- a/lib/msun/src/s_fminl.c
+++ b/lib/msun/src/s_fminl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
#include "fpmath.h"
diff --git a/lib/msun/src/s_frexp.c b/lib/msun/src/s_frexp.c
index 318a99166878..ee234d247300 100644
--- a/lib/msun/src/s_frexp.c
+++ b/lib/msun/src/s_frexp.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* for non-zero x
* x = frexp(arg,&exp);
diff --git a/lib/msun/src/s_frexpf.c b/lib/msun/src/s_frexpf.c
index 5a7c4862d28d..6b39e6ff8b2b 100644
--- a/lib/msun/src/s_frexpf.c
+++ b/lib/msun/src/s_frexpf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_ilogb.c b/lib/msun/src/s_ilogb.c
index a930bc9eccc7..0b076edbd9b5 100644
--- a/lib/msun/src/s_ilogb.c
+++ b/lib/msun/src/s_ilogb.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* ilogb(double x)
* return the binary exponent of non-zero x
* ilogb(0) = FP_ILOGB0
diff --git a/lib/msun/src/s_ilogbf.c b/lib/msun/src/s_ilogbf.c
index 93fe2958bdd9..ff3df1fc5b90 100644
--- a/lib/msun/src/s_ilogbf.c
+++ b/lib/msun/src/s_ilogbf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include "math.h"
diff --git a/lib/msun/src/s_ilogbl.c b/lib/msun/src/s_ilogbl.c
index 3211f44090a2..f45cd7b67159 100644
--- a/lib/msun/src/s_ilogbl.c
+++ b/lib/msun/src/s_ilogbl.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <limits.h>
#include <math.h>
diff --git a/lib/msun/src/s_llrint.c b/lib/msun/src/s_llrint.c
index 7c959ec950ae..460c4a07d5e3 100644
--- a/lib/msun/src/s_llrint.c
+++ b/lib/msun/src/s_llrint.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define type double
#define roundit rint
#define dtype long long
diff --git a/lib/msun/src/s_llrintf.c b/lib/msun/src/s_llrintf.c
index 7ec6015238d3..3ed16799f47f 100644
--- a/lib/msun/src/s_llrintf.c
+++ b/lib/msun/src/s_llrintf.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define type float
#define roundit rintf
#define dtype long long
diff --git a/lib/msun/src/s_llrintl.c b/lib/msun/src/s_llrintl.c
index 6ef83759c314..fed23f32fd6f 100644
--- a/lib/msun/src/s_llrintl.c
+++ b/lib/msun/src/s_llrintl.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define type long double
#define roundit rintl
#define dtype long long
diff --git a/lib/msun/src/s_llround.c b/lib/msun/src/s_llround.c
index 827dfc1f6367..f8e76134b654 100644
--- a/lib/msun/src/s_llround.c
+++ b/lib/msun/src/s_llround.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define type double
#define roundit round
#define dtype long long
diff --git a/lib/msun/src/s_llroundf.c b/lib/msun/src/s_llroundf.c
index c037a18d5708..753fd96265aa 100644
--- a/lib/msun/src/s_llroundf.c
+++ b/lib/msun/src/s_llroundf.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define type float
#define roundit roundf
#define dtype long long
diff --git a/lib/msun/src/s_llroundl.c b/lib/msun/src/s_llroundl.c
index 02c44eb4bdec..b5a97d97f2ae 100644
--- a/lib/msun/src/s_llroundl.c
+++ b/lib/msun/src/s_llroundl.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define type long double
#define roundit roundl
#define dtype long long
diff --git a/lib/msun/src/s_log1p.c b/lib/msun/src/s_log1p.c
index 3cc77bda2ec8..61b03f00f33b 100644
--- a/lib/msun/src/s_log1p.c
+++ b/lib/msun/src/s_log1p.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* double log1p(double x)
*
* Method :
diff --git a/lib/msun/src/s_log1pf.c b/lib/msun/src/s_log1pf.c
index df04c6756e8d..d53fc7144e1d 100644
--- a/lib/msun/src/s_log1pf.c
+++ b/lib/msun/src/s_log1pf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/s_logb.c b/lib/msun/src/s_logb.c
index a47e35489a4b..b5ffff4fd11a 100644
--- a/lib/msun/src/s_logb.c
+++ b/lib/msun/src/s_logb.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* double logb(x)
* IEEE 754 logb. Included to pass IEEE test suite. Not recommend.
diff --git a/lib/msun/src/s_logbf.c b/lib/msun/src/s_logbf.c
index 3ab190d9862f..658c7d3a15c3 100644
--- a/lib/msun/src/s_logbf.c
+++ b/lib/msun/src/s_logbf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_logbl.c b/lib/msun/src/s_logbl.c
index ee1a91fd8385..280c302ac014 100644
--- a/lib/msun/src/s_logbl.c
+++ b/lib/msun/src/s_logbl.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <limits.h>
#include <math.h>
diff --git a/lib/msun/src/s_lrint.c b/lib/msun/src/s_lrint.c
index be00cbb6a91a..f4e56ac34b69 100644
--- a/lib/msun/src/s_lrint.c
+++ b/lib/msun/src/s_lrint.c
@@ -31,7 +31,6 @@
#include <math.h>
#ifndef type
-__FBSDID("$FreeBSD$");
#define type double
#define roundit rint
#define dtype long
diff --git a/lib/msun/src/s_lrintf.c b/lib/msun/src/s_lrintf.c
index a757ded233a3..ca7cb99a3cf2 100644
--- a/lib/msun/src/s_lrintf.c
+++ b/lib/msun/src/s_lrintf.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define type float
#define roundit rintf
#define dtype long
diff --git a/lib/msun/src/s_lrintl.c b/lib/msun/src/s_lrintl.c
index 497b442f32d7..7eedbc707c6e 100644
--- a/lib/msun/src/s_lrintl.c
+++ b/lib/msun/src/s_lrintl.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define type long double
#define roundit rintl
#define dtype long
diff --git a/lib/msun/src/s_lround.c b/lib/msun/src/s_lround.c
index 00f4b95aeb89..0b305918adc3 100644
--- a/lib/msun/src/s_lround.c
+++ b/lib/msun/src/s_lround.c
@@ -32,7 +32,6 @@
#include <math.h>
#ifndef type
-__FBSDID("$FreeBSD$");
#define type double
#define roundit round
#define dtype long
diff --git a/lib/msun/src/s_lroundf.c b/lib/msun/src/s_lroundf.c
index e24fe7f81902..e27e6a2fe187 100644
--- a/lib/msun/src/s_lroundf.c
+++ b/lib/msun/src/s_lroundf.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define type float
#define roundit roundf
#define dtype long
diff --git a/lib/msun/src/s_lroundl.c b/lib/msun/src/s_lroundl.c
index e410827e2622..cfd43bc7fbf1 100644
--- a/lib/msun/src/s_lroundl.c
+++ b/lib/msun/src/s_lroundl.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define type long double
#define roundit roundl
#define dtype long
diff --git a/lib/msun/src/s_modff.c b/lib/msun/src/s_modff.c
index 062259c66f64..57f59117a878 100644
--- a/lib/msun/src/s_modff.c
+++ b/lib/msun/src/s_modff.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_nearbyint.c b/lib/msun/src/s_nearbyint.c
index ae6ffdecd474..96604594c499 100644
--- a/lib/msun/src/s_nearbyint.c
+++ b/lib/msun/src/s_nearbyint.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <math.h>
diff --git a/lib/msun/src/s_nextafter.c b/lib/msun/src/s_nextafter.c
index 52dd21cb2f9c..99c65b11aeba 100644
--- a/lib/msun/src/s_nextafter.c
+++ b/lib/msun/src/s_nextafter.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* IEEE functions
* nextafter(x,y)
* return the next machine floating-point number of x in the
diff --git a/lib/msun/src/s_nextafterf.c b/lib/msun/src/s_nextafterf.c
index 96e21eff896e..18e046324957 100644
--- a/lib/msun/src/s_nextafterf.c
+++ b/lib/msun/src/s_nextafterf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_nextafterl.c b/lib/msun/src/s_nextafterl.c
index 9c61a436a661..168dbb4ed093 100644
--- a/lib/msun/src/s_nextafterl.c
+++ b/lib/msun/src/s_nextafterl.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* IEEE functions
* nextafter(x,y)
* return the next machine floating-point number of x in the
diff --git a/lib/msun/src/s_nexttoward.c b/lib/msun/src/s_nexttoward.c
index b2a50d3139de..d876ba2bfebc 100644
--- a/lib/msun/src/s_nexttoward.c
+++ b/lib/msun/src/s_nexttoward.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* We assume that a long double has a 15-bit exponent. On systems
* where long double is the same as double, nexttoward() is an alias
diff --git a/lib/msun/src/s_nexttowardf.c b/lib/msun/src/s_nexttowardf.c
index 9ddfff961bff..03d8cc5e4729 100644
--- a/lib/msun/src/s_nexttowardf.c
+++ b/lib/msun/src/s_nexttowardf.c
@@ -10,8 +10,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "fpmath.h"
diff --git a/lib/msun/src/s_remquo.c b/lib/msun/src/s_remquo.c
index 6a111dfc6e10..e3aac25230e0 100644
--- a/lib/msun/src/s_remquo.c
+++ b/lib/msun/src/s_remquo.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/s_remquof.c b/lib/msun/src/s_remquof.c
index f4c101620682..c42bd8c4320d 100644
--- a/lib/msun/src/s_remquof.c
+++ b/lib/msun/src/s_remquof.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_remquol.c b/lib/msun/src/s_remquol.c
index a9f5813d0424..a0f93d4fcae0 100644
--- a/lib/msun/src/s_remquol.c
+++ b/lib/msun/src/s_remquol.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <stdint.h>
diff --git a/lib/msun/src/s_rint.c b/lib/msun/src/s_rint.c
index c56f8fb264ba..96faf6a007ee 100644
--- a/lib/msun/src/s_rint.c
+++ b/lib/msun/src/s_rint.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rint(x)
* Return x rounded to integral value according to the prevailing
diff --git a/lib/msun/src/s_rintf.c b/lib/msun/src/s_rintf.c
index f8743a4f0f81..328738f0ba0c 100644
--- a/lib/msun/src/s_rintf.c
+++ b/lib/msun/src/s_rintf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <stdint.h>
diff --git a/lib/msun/src/s_rintl.c b/lib/msun/src/s_rintl.c
index 790edbcf6204..15bce02e219d 100644
--- a/lib/msun/src/s_rintl.c
+++ b/lib/msun/src/s_rintl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <math.h>
diff --git a/lib/msun/src/s_round.c b/lib/msun/src/s_round.c
index a112bc592392..04d49c220973 100644
--- a/lib/msun/src/s_round.c
+++ b/lib/msun/src/s_round.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/s_roundf.c b/lib/msun/src/s_roundf.c
index bb6f77c78c34..795d88df3050 100644
--- a/lib/msun/src/s_roundf.c
+++ b/lib/msun/src/s_roundf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_roundl.c b/lib/msun/src/s_roundl.c
index 9e85423a54ea..05cb3e9f4918 100644
--- a/lib/msun/src/s_roundl.c
+++ b/lib/msun/src/s_roundl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#ifdef __i386__
#include <ieeefp.h>
diff --git a/lib/msun/src/s_scalbln.c b/lib/msun/src/s_scalbln.c
index e8c637793f44..ff402b0f8fab 100644
--- a/lib/msun/src/s_scalbln.c
+++ b/lib/msun/src/s_scalbln.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
#define NMAX 65536
diff --git a/lib/msun/src/s_significand.c b/lib/msun/src/s_significand.c
index eed80ece1cc4..29ff0cc29807 100644
--- a/lib/msun/src/s_significand.c
+++ b/lib/msun/src/s_significand.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* significand(x) computes just
* scalb(x, (double) -ilogb(x)),
diff --git a/lib/msun/src/s_significandf.c b/lib/msun/src/s_significandf.c
index b33ab7b6f6b2..9fd919d65a91 100644
--- a/lib/msun/src/s_significandf.c
+++ b/lib/msun/src/s_significandf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_sin.c b/lib/msun/src/s_sin.c
index 17ea84695d75..e9cd928d300b 100644
--- a/lib/msun/src/s_sin.c
+++ b/lib/msun/src/s_sin.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* sin(x)
* Return sine function of x.
*
diff --git a/lib/msun/src/s_sincos.c b/lib/msun/src/s_sincos.c
index 85e8d740829b..028ce416280a 100644
--- a/lib/msun/src/s_sincos.c
+++ b/lib/msun/src/s_sincos.c
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/s_sincosf.c b/lib/msun/src/s_sincosf.c
index 755ff05d481d..ee9f03444944 100644
--- a/lib/msun/src/s_sincosf.c
+++ b/lib/msun/src/s_sincosf.c
@@ -16,8 +16,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/s_sincosl.c b/lib/msun/src/s_sincosl.c
index 3dd34575f894..2d3833c93d46 100644
--- a/lib/msun/src/s_sincosl.c
+++ b/lib/msun/src/s_sincosl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#ifdef __i386__
#include <ieeefp.h>
diff --git a/lib/msun/src/s_sinf.c b/lib/msun/src/s_sinf.c
index 41b5dc11827a..9837e80bb6ff 100644
--- a/lib/msun/src/s_sinf.c
+++ b/lib/msun/src/s_sinf.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/s_sinl.c b/lib/msun/src/s_sinl.c
index c5ee10679b92..605a4b4b6272 100644
--- a/lib/msun/src/s_sinl.c
+++ b/lib/msun/src/s_sinl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#ifdef __i386__
#include <ieeefp.h>
diff --git a/lib/msun/src/s_tan.c b/lib/msun/src/s_tan.c
index 196c27e7ce36..be5154e89468 100644
--- a/lib/msun/src/s_tan.c
+++ b/lib/msun/src/s_tan.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* tan(x)
* Return tangent function of x.
*
diff --git a/lib/msun/src/s_tanf.c b/lib/msun/src/s_tanf.c
index 4fe8c17c0acd..1b72cd6cae91 100644
--- a/lib/msun/src/s_tanf.c
+++ b/lib/msun/src/s_tanf.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include "math.h"
diff --git a/lib/msun/src/s_tanh.c b/lib/msun/src/s_tanh.c
index 6d26c695dd3b..1dbd1d4630eb 100644
--- a/lib/msun/src/s_tanh.c
+++ b/lib/msun/src/s_tanh.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Tanh(x)
* Return the Hyperbolic Tangent of x
*
diff --git a/lib/msun/src/s_tanhf.c b/lib/msun/src/s_tanhf.c
index f537be4fd0be..986404f52f5a 100644
--- a/lib/msun/src/s_tanhf.c
+++ b/lib/msun/src/s_tanhf.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/msun/src/s_tanhl.c b/lib/msun/src/s_tanhl.c
index b7531866dd99..3ee5b50bd2c8 100644
--- a/lib/msun/src/s_tanhl.c
+++ b/lib/msun/src/s_tanhl.c
@@ -13,8 +13,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* See s_tanh.c for complete comments.
*
diff --git a/lib/msun/src/s_tanl.c b/lib/msun/src/s_tanl.c
index c21e38d7f712..1e9d7263c289 100644
--- a/lib/msun/src/s_tanl.c
+++ b/lib/msun/src/s_tanl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Limited testing on pseudorandom numbers drawn within [0:4e8] shows
* an accuracy of <= 1.5 ULP where 247024 values of x out of 40 million
diff --git a/lib/msun/src/s_tgammaf.c b/lib/msun/src/s_tgammaf.c
index 6cbd356a87c1..3bf937ce958d 100644
--- a/lib/msun/src/s_tgammaf.c
+++ b/lib/msun/src/s_tgammaf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
/*
diff --git a/lib/msun/src/s_trunc.c b/lib/msun/src/s_trunc.c
index 63a6753748e0..4bd1249544ea 100644
--- a/lib/msun/src/s_trunc.c
+++ b/lib/msun/src/s_trunc.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* trunc(x)
* Return x rounded toward 0 to integral value
diff --git a/lib/msun/src/s_truncf.c b/lib/msun/src/s_truncf.c
index 384eaee55006..8d15c78d69da 100644
--- a/lib/msun/src/s_truncf.c
+++ b/lib/msun/src/s_truncf.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* truncf(x)
* Return x rounded toward 0 to integral value
diff --git a/lib/msun/src/s_truncl.c b/lib/msun/src/s_truncl.c
index 9e2b51132535..f54608ac7ab0 100644
--- a/lib/msun/src/s_truncl.c
+++ b/lib/msun/src/s_truncl.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* truncl(x)
* Return x rounded toward 0 to integral value
diff --git a/lib/msun/src/w_cabs.c b/lib/msun/src/w_cabs.c
index 543b8581044d..dfae649b9906 100644
--- a/lib/msun/src/w_cabs.c
+++ b/lib/msun/src/w_cabs.c
@@ -6,8 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/src/w_cabsl.c b/lib/msun/src/w_cabsl.c
index b715e0c340d8..943413c31106 100644
--- a/lib/msun/src/w_cabsl.c
+++ b/lib/msun/src/w_cabsl.c
@@ -8,8 +8,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <math.h>
diff --git a/lib/msun/tests/cexp_test.c b/lib/msun/tests/cexp_test.c
index bb5b45b38492..a23e448ee62a 100644
--- a/lib/msun/tests/cexp_test.c
+++ b/lib/msun/tests/cexp_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <complex.h>
diff --git a/lib/msun/tests/conj_test.c b/lib/msun/tests/conj_test.c
index d0256c13b229..313f284925c3 100644
--- a/lib/msun/tests/conj_test.c
+++ b/lib/msun/tests/conj_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <complex.h>
#include <fenv.h>
#include <math.h>
diff --git a/lib/msun/tests/csqrt_test.c b/lib/msun/tests/csqrt_test.c
index 895aec481b60..1154c0fc016a 100644
--- a/lib/msun/tests/csqrt_test.c
+++ b/lib/msun/tests/csqrt_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <complex.h>
diff --git a/lib/msun/tests/ctrig_test.c b/lib/msun/tests/ctrig_test.c
index f5d52a0c06f1..dd03d11fdbd1 100644
--- a/lib/msun/tests/ctrig_test.c
+++ b/lib/msun/tests/ctrig_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <complex.h>
#include <fenv.h>
diff --git a/lib/msun/tests/exponential_test.c b/lib/msun/tests/exponential_test.c
index 280f3e483d06..9dc3b2698744 100644
--- a/lib/msun/tests/exponential_test.c
+++ b/lib/msun/tests/exponential_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/tests/fenv_test.c b/lib/msun/tests/fenv_test.c
index 7750764406d7..9069921d8eaf 100644
--- a/lib/msun/tests/fenv_test.c
+++ b/lib/msun/tests/fenv_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
#include <assert.h>
diff --git a/lib/msun/tests/fma_test.c b/lib/msun/tests/fma_test.c
index 2855877c68d0..e6a34e0f2afa 100644
--- a/lib/msun/tests/fma_test.c
+++ b/lib/msun/tests/fma_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <fenv.h>
#include <float.h>
diff --git a/lib/msun/tests/fmaxmin_test.c b/lib/msun/tests/fmaxmin_test.c
index 12d845b76395..51956b1084af 100644
--- a/lib/msun/tests/fmaxmin_test.c
+++ b/lib/msun/tests/fmaxmin_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/tests/invctrig_test.c b/lib/msun/tests/invctrig_test.c
index 179499f9f0b2..170fb1cad3a3 100644
--- a/lib/msun/tests/invctrig_test.c
+++ b/lib/msun/tests/invctrig_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <complex.h>
#include <fenv.h>
diff --git a/lib/msun/tests/invtrig_test.c b/lib/msun/tests/invtrig_test.c
index 90ebcc5dfdad..8c6fdb7c6e2f 100644
--- a/lib/msun/tests/invtrig_test.c
+++ b/lib/msun/tests/invtrig_test.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/tests/logarithm_test.c b/lib/msun/tests/logarithm_test.c
index e372e889cb82..9da4ad3ba407 100644
--- a/lib/msun/tests/logarithm_test.c
+++ b/lib/msun/tests/logarithm_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <fenv.h>
#include <float.h>
diff --git a/lib/msun/tests/lrint_test.c b/lib/msun/tests/lrint_test.c
index a2a93180e97e..29ba82222642 100644
--- a/lib/msun/tests/lrint_test.c
+++ b/lib/msun/tests/lrint_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <limits.h>
#include <math.h>
diff --git a/lib/msun/tests/lround_test.c b/lib/msun/tests/lround_test.c
index ddb2b2cea9b3..a61672617081 100644
--- a/lib/msun/tests/lround_test.c
+++ b/lib/msun/tests/lround_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <limits.h>
#include <math.h>
diff --git a/lib/msun/tests/nan_test.c b/lib/msun/tests/nan_test.c
index 8913596f6e15..75c28d45fb78 100644
--- a/lib/msun/tests/nan_test.c
+++ b/lib/msun/tests/nan_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <fenv.h>
#include <float.h>
diff --git a/lib/msun/tests/nearbyint_test.c b/lib/msun/tests/nearbyint_test.c
index 25950eedd5d0..9dcdbdf6b852 100644
--- a/lib/msun/tests/nearbyint_test.c
+++ b/lib/msun/tests/nearbyint_test.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <fenv.h>
#include <math.h>
diff --git a/lib/msun/tests/next_test.c b/lib/msun/tests/next_test.c
index 763b1cc14e60..282e47d783a0 100644
--- a/lib/msun/tests/next_test.c
+++ b/lib/msun/tests/next_test.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fenv.h>
#include <float.h>
#include <math.h>
diff --git a/lib/msun/tests/rem_test.c b/lib/msun/tests/rem_test.c
index 96c3822aba9d..9e5b8c302948 100644
--- a/lib/msun/tests/rem_test.c
+++ b/lib/msun/tests/rem_test.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <float.h>
#include <math.h>
#include <stdio.h>
diff --git a/lib/msun/tests/trig_test.c b/lib/msun/tests/trig_test.c
index 2660c3f2c476..d1d831e07c71 100644
--- a/lib/msun/tests/trig_test.c
+++ b/lib/msun/tests/trig_test.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <fenv.h>
diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
index 938444127f45..14edf3333722 100644
--- a/libexec/bootpd/bootpd.c
+++ b/libexec/bootpd/bootpd.c
@@ -38,8 +38,6 @@ SOFTWARE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/libexec/bootpd/bootpgw/bootpgw.c b/libexec/bootpd/bootpgw/bootpgw.c
index 1aab5e7f6f50..74f159cb397e 100644
--- a/libexec/bootpd/bootpgw/bootpgw.c
+++ b/libexec/bootpd/bootpgw/bootpgw.c
@@ -31,8 +31,6 @@ SOFTWARE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c
index c02735649236..a0ee5ed6897b 100644
--- a/libexec/bootpd/rtmsg.c
+++ b/libexec/bootpd/rtmsg.c
@@ -40,8 +40,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
/*
* Verify that we are at least 4.4 BSD
diff --git a/libexec/bootpd/tools/bootptest/bootptest.c b/libexec/bootpd/tools/bootptest/bootptest.c
index 5e7d61fc52b6..1797bcb9574d 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.c
+++ b/libexec/bootpd/tools/bootptest/bootptest.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
char *usage = "bootptest [-h] server-name [vendor-data-template-file]";
#include <sys/types.h>
diff --git a/libexec/flua/modules/lfs.c b/libexec/flua/modules/lfs.c
index e36c78d3b35b..8cb8d6fc9fed 100644
--- a/libexec/flua/modules/lfs.c
+++ b/libexec/flua/modules/lfs.c
@@ -50,8 +50,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef _STANDALONE
#include <sys/stat.h>
#include <dirent.h>
diff --git a/libexec/flua/modules/lposix.c b/libexec/flua/modules/lposix.c
index 22df27ff2971..5b6e80a0309f 100644
--- a/libexec/flua/modules/lposix.c
+++ b/libexec/flua/modules/lposix.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <errno.h>
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 917dd5ef79e8..9d57017e2f19 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 45c6c96d4471..a41a23ab1184 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* FTP server.
*/
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 0ae48dd4cd7b..933fca37a417 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <netinet/in.h>
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index 082b2270a953..887883af3480 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
#include <netinet/in.h>
diff --git a/libexec/getty/chat.c b/libexec/getty/chat.c
index 0a348d6b2ebb..b4e6cf83899e 100644
--- a/libexec/getty/chat.c
+++ b/libexec/getty/chat.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/utsname.h>
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index b8af86c22e92..2cdcfaeb3e02 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)from: main.c 8.1 (Berkeley) 6/20/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/time.h>
diff --git a/libexec/phttpget/phttpget.c b/libexec/phttpget/phttpget.c
index 714f609d1fac..e51fdaea59e3 100644
--- a/libexec/phttpget/phttpget.c
+++ b/libexec/phttpget/phttpget.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c
index 6afceae050ab..6b0fb75184c4 100644
--- a/libexec/rbootd/rbootd.c
+++ b/libexec/rbootd/rbootd.c
@@ -54,8 +54,6 @@ static const char sccsid[] = "@(#)rbootd.c 8.1 (Berkeley) 6/4/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <ctype.h>
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c
index cc78a9a71c39..a8ff56a0171a 100644
--- a/libexec/rpc.rquotad/rquotad.c
+++ b/libexec/rpc.rquotad/rquotad.c
@@ -5,8 +5,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/file.h>
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index d1167219bd26..f265ff034e9c 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <pwd.h>
#include <signal.h>
diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c
index f9a1ae4c2b6c..c8f09d797215 100644
--- a/libexec/rtld-elf/aarch64/reloc.c
+++ b/libexec/rtld-elf/aarch64/reloc.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdlib.h>
diff --git a/libexec/rtld-elf/aarch64/rtld_start.S b/libexec/rtld-elf/aarch64/rtld_start.S
index 107920548432..7dc87213b5fb 100644
--- a/libexec/rtld-elf/aarch64/rtld_start.S
+++ b/libexec/rtld-elf/aarch64/rtld_start.S
@@ -28,8 +28,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
ENTRY(.rtld_start)
.cfi_undefined x30
mov x19, x0 /* Put ps_strings in a callee-saved register */
diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c
index 36e73b55aee1..b2fb3fdad2c7 100644
--- a/libexec/rtld-elf/arm/reloc.c
+++ b/libexec/rtld-elf/arm/reloc.c
@@ -1,7 +1,6 @@
/* $NetBSD: mdreloc.c,v 1.23 2003/07/26 15:04:38 mrg Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/mman.h>
diff --git a/libexec/rtld-elf/arm/rtld_start.S b/libexec/rtld-elf/arm/rtld_start.S
index 431ea4801b7e..609a7d0603ed 100644
--- a/libexec/rtld-elf/arm/rtld_start.S
+++ b/libexec/rtld-elf/arm/rtld_start.S
@@ -30,8 +30,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.text
.align 0
.globl .rtld_start
diff --git a/libexec/rtld-elf/riscv/reloc.c b/libexec/rtld-elf/riscv/reloc.c
index b5dea298b74d..5ed516bc4337 100644
--- a/libexec/rtld-elf/riscv/reloc.c
+++ b/libexec/rtld-elf/riscv/reloc.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdlib.h>
diff --git a/libexec/rtld-elf/riscv/rtld_start.S b/libexec/rtld-elf/riscv/rtld_start.S
index 71806123debc..5459089fa1e6 100644
--- a/libexec/rtld-elf/riscv/rtld_start.S
+++ b/libexec/rtld-elf/riscv/rtld_start.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* func_ptr_type
* _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp)
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 83315d5023ba..886758a5a484 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/mman.h>
diff --git a/libexec/tftpd/tests/functional.c b/libexec/tftpd/tests/functional.c
index dd77ed5be1e5..1d5c1e17c420 100644
--- a/libexec/tftpd/tests/functional.c
+++ b/libexec/tftpd/tests/functional.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/libexec/tftpd/tftp-file.c b/libexec/tftpd/tftp-file.c
index 1da85d3dec32..949cf9c74752 100644
--- a/libexec/tftpd/tftp-file.c
+++ b/libexec/tftpd/tftp-file.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/libexec/tftpd/tftp-file.h b/libexec/tftpd/tftp-file.h
index c456ffff313a..0fb7f6c1decc 100644
--- a/libexec/tftpd/tftp-file.h
+++ b/libexec/tftpd/tftp-file.h
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
int write_init(int fd, FILE *f, const char *mode);
size_t write_file(char *buffer, int count);
int write_close(void);
diff --git a/libexec/tftpd/tftp-io.c b/libexec/tftpd/tftp-io.c
index e32e472a07c2..b5f39423fd60 100644
--- a/libexec/tftpd/tftp-io.c
+++ b/libexec/tftpd/tftp-io.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/libexec/tftpd/tftp-io.h b/libexec/tftpd/tftp-io.h
index 16590139461a..85934e824a1a 100644
--- a/libexec/tftpd/tftp-io.h
+++ b/libexec/tftpd/tftp-io.h
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define RP_NONE 0
#define RP_RECVFROM -1
#define RP_TOOSMALL -2
diff --git a/libexec/tftpd/tftp-options.c b/libexec/tftpd/tftp-options.c
index 162a43d586e2..ee413603fbfb 100644
--- a/libexec/tftpd/tftp-options.c
+++ b/libexec/tftpd/tftp-options.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/libexec/tftpd/tftp-options.h b/libexec/tftpd/tftp-options.h
index 82dc4169caae..c68db53de4e2 100644
--- a/libexec/tftpd/tftp-options.h
+++ b/libexec/tftpd/tftp-options.h
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Options
*/
diff --git a/libexec/tftpd/tftp-transfer.c b/libexec/tftpd/tftp-transfer.c
index 4560101d7052..5655d912ab6a 100644
--- a/libexec/tftpd/tftp-transfer.c
+++ b/libexec/tftpd/tftp-transfer.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/libexec/tftpd/tftp-transfer.h b/libexec/tftpd/tftp-transfer.h
index 0edfb1e0a5eb..48431ebbc863 100644
--- a/libexec/tftpd/tftp-transfer.h
+++ b/libexec/tftpd/tftp-transfer.h
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
int tftp_send(int peer, uint16_t *block, struct tftp_stats *tp);
int tftp_receive(int peer, uint16_t *block, struct tftp_stats *tp,
struct tftphdr *firstblock, size_t fb_size);
diff --git a/libexec/tftpd/tftp-utils.c b/libexec/tftpd/tftp-utils.c
index 93abad7a8280..9754c3238d50 100644
--- a/libexec/tftpd/tftp-utils.c
+++ b/libexec/tftpd/tftp-utils.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/libexec/tftpd/tftp-utils.h b/libexec/tftpd/tftp-utils.h
index af80a9bfe092..3fecf1fc8696 100644
--- a/libexec/tftpd/tftp-utils.h
+++ b/libexec/tftpd/tftp-utils.h
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
*/
#define TIMEOUT 5
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index 1c04cd113932..ffe31927780e 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)tftpd.c 8.1 (Berkeley) 6/4/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Trivial file transfer protocol server.
*
diff --git a/libexec/ulog-helper/ulog-helper.c b/libexec/ulog-helper/ulog-helper.c
index 47174f633060..e92ea87cbd59 100644
--- a/libexec/ulog-helper/ulog-helper.c
+++ b/libexec/ulog-helper/ulog-helper.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <pwd.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/libexec/ypxfr/yp_dbwrite.c b/libexec/ypxfr/yp_dbwrite.c
index 120e6748b609..30c52c3cb88b 100644
--- a/libexec/ypxfr/yp_dbwrite.c
+++ b/libexec/ypxfr/yp_dbwrite.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <db.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/libexec/ypxfr/ypxfr_getmap.c b/libexec/ypxfr/ypxfr_getmap.c
index 5fc45b327d85..83b860dd75b2 100644
--- a/libexec/ypxfr/ypxfr_getmap.c
+++ b/libexec/ypxfr/ypxfr_getmap.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <time.h>
#include <sys/types.h>
diff --git a/libexec/ypxfr/ypxfr_main.c b/libexec/ypxfr/ypxfr_main.c
index 6ea877a49925..409d37fe15f4 100644
--- a/libexec/ypxfr/ypxfr_main.c
+++ b/libexec/ypxfr/ypxfr_main.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/libexec/ypxfr/ypxfr_misc.c b/libexec/ypxfr/ypxfr_misc.c
index 3ee3ff58b8d5..48baf75f9f55 100644
--- a/libexec/ypxfr/ypxfr_misc.c
+++ b/libexec/ypxfr/ypxfr_misc.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/libexec/ypxfr/ypxfrd_getmap.c b/libexec/ypxfr/ypxfrd_getmap.c
index 2358b68b9be2..62bd881f1a7d 100644
--- a/libexec/ypxfr/ypxfrd_getmap.c
+++ b/libexec/ypxfr/ypxfrd_getmap.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdlib.h>
#include <string.h>
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index 1bbae1837c71..7ed46f9c4d85 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -34,8 +34,6 @@ static const char copyright[] =
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Andrey A. Chernov <ache@astral.msk.su> Dec 20 1993
*
diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c
index 018b8cb7930f..287eeaf29fab 100644
--- a/sbin/bectl/bectl.c
+++ b/sbin/bectl/bectl.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <errno.h>
diff --git a/sbin/bectl/bectl_jail.c b/sbin/bectl/bectl_jail.c
index 702dc7ecbf2d..ae48202163de 100644
--- a/sbin/bectl/bectl_jail.c
+++ b/sbin/bectl/bectl_jail.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/mount.h>
diff --git a/sbin/bectl/bectl_list.c b/sbin/bectl/bectl_list.c
index 4f04389f6b3a..0fcb5deb37f3 100644
--- a/sbin/bectl/bectl_list.c
+++ b/sbin/bectl/bectl_list.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index f438b9f45158..766def59ffe9 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -55,8 +55,6 @@ static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 1/7/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdint.h>
#include <sys/file.h>
diff --git a/sbin/camcontrol/attrib.c b/sbin/camcontrol/attrib.c
index 05cabb1b8145..7e89dbc3d48e 100644
--- a/sbin/camcontrol/attrib.c
+++ b/sbin/camcontrol/attrib.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index fb0556111fa6..9417943afcb3 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/sbin/camcontrol/depop.c b/sbin/camcontrol/depop.c
index cf205ab6b471..3be67650cdae 100644
--- a/sbin/camcontrol/depop.c
+++ b/sbin/camcontrol/depop.c
@@ -51,8 +51,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/sbin/camcontrol/epc.c b/sbin/camcontrol/epc.c
index aac94ccaa4e5..206b34594f4f 100644
--- a/sbin/camcontrol/epc.c
+++ b/sbin/camcontrol/epc.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/sbin/camcontrol/fwdownload.c b/sbin/camcontrol/fwdownload.c
index a8493aab37a5..25b98c804e3e 100644
--- a/sbin/camcontrol/fwdownload.c
+++ b/sbin/camcontrol/fwdownload.c
@@ -50,8 +50,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index 724229951ea7..46accea0da43 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/types.h>
#include <sys/sbuf.h>
diff --git a/sbin/camcontrol/persist.c b/sbin/camcontrol/persist.c
index f7ef30e06ede..d6fb9c6a5f2c 100644
--- a/sbin/camcontrol/persist.c
+++ b/sbin/camcontrol/persist.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/sbin/camcontrol/progress.c b/sbin/camcontrol/progress.c
index c620b577416a..c3c23fba428a 100644
--- a/sbin/camcontrol/progress.c
+++ b/sbin/camcontrol/progress.c
@@ -44,8 +44,6 @@
#include <unistd.h>
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "progress.h"
static const char * const suffixes[] = {
diff --git a/sbin/camcontrol/timestamp.c b/sbin/camcontrol/timestamp.c
index 9667db832298..403c126c95d9 100644
--- a/sbin/camcontrol/timestamp.c
+++ b/sbin/camcontrol/timestamp.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
diff --git a/sbin/camcontrol/util.c b/sbin/camcontrol/util.c
index 58fc93746fc7..08b4cb7630ca 100644
--- a/sbin/camcontrol/util.c
+++ b/sbin/camcontrol/util.c
@@ -46,8 +46,6 @@
* from: scsi.c,v 1.17 1998/01/12 07:57:57 charnier Exp $";
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/sbin/camcontrol/zone.c b/sbin/camcontrol/zone.c
index fed94cd967e1..d651ca0e2acf 100644
--- a/sbin/camcontrol/zone.c
+++ b/sbin/camcontrol/zone.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 1429426e8638..fd62c459a78f 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index 7f9a4f09bfe0..7144490869cd 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)clri.c 8.2 (Berkeley) 9/23/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disklabel.h>
diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c
index fc7e619c6239..7a03b3a569cf 100644
--- a/sbin/comcontrol/comcontrol.c
+++ b/sbin/comcontrol/comcontrol.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c
index 5633720b7987..b8890cf22030 100644
--- a/sbin/conscontrol/conscontrol.c
+++ b/sbin/conscontrol/conscontrol.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/ioctl.h>
diff --git a/sbin/ddb/ddb.c b/sbin/ddb/ddb.c
index d886ce9bdc52..885921d7c51f 100644
--- a/sbin/ddb/ddb.c
+++ b/sbin/ddb/ddb.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/sbin/ddb/ddb_capture.c b/sbin/ddb/ddb_capture.c
index 3754e810e038..fcff16e292ea 100644
--- a/sbin/ddb/ddb_capture.c
+++ b/sbin/ddb/ddb_capture.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/sbin/ddb/ddb_script.c b/sbin/ddb/ddb_script.c
index f110a7a16434..c40b8b96b21f 100644
--- a/sbin/ddb/ddb_script.c
+++ b/sbin/ddb/ddb_script.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/sbin/decryptcore/decryptcore.c b/sbin/decryptcore/decryptcore.c
index 04892395a542..adeccfac8d47 100644
--- a/sbin/decryptcore/decryptcore.c
+++ b/sbin/decryptcore/decryptcore.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/endian.h>
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index 0dd6b32b7ed7..05715c18708f 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -64,8 +64,6 @@
// - devd.conf needs more details on the supported statements.
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/sbin/devd/tests/client_test.c b/sbin/devd/tests/client_test.c
index 90081d963f4b..729c7a2f8bad 100644
--- a/sbin/devd/tests/client_test.c
+++ b/sbin/devd/tests/client_test.c
@@ -23,8 +23,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdbool.h>
#include <stdio.h>
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index 5f6352064f1f..72feed7fb857 100644
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c
index 9a7d100be128..b9b493ae3742 100644
--- a/sbin/devfs/rule.c
+++ b/sbin/devfs/rule.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/ioctl.h>
diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c
index f9f5122663a1..2485120c57b6 100644
--- a/sbin/devmatch/devmatch.c
+++ b/sbin/devmatch/devmatch.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <ctype.h>
#include <devinfo.h>
diff --git a/sbin/dhclient/alloc.c b/sbin/dhclient/alloc.c
index c3ea309a5456..1926f7924170 100644
--- a/sbin/dhclient/alloc.c
+++ b/sbin/dhclient/alloc.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "dhcpd.h"
struct string_list *
diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c
index d938b68c7c94..d4bbe56332c8 100644
--- a/sbin/dhclient/bpf.c
+++ b/sbin/dhclient/bpf.c
@@ -44,8 +44,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "dhcpd.h"
#include "privsep.h"
#include <sys/capsicum.h>
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index 295a800a7328..c883e2a0ddb5 100644
--- a/sbin/dhclient/clparse.c
+++ b/sbin/dhclient/clparse.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "dhcpd.h"
#include "dhctoken.h"
diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c
index 3a6824a9a815..377f7a1d440a 100644
--- a/sbin/dhclient/conflex.c
+++ b/sbin/dhclient/conflex.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include "dhcpd.h"
diff --git a/sbin/dhclient/convert.c b/sbin/dhclient/convert.c
index c30195254d4b..8401615b5bf0 100644
--- a/sbin/dhclient/convert.c
+++ b/sbin/dhclient/convert.c
@@ -46,8 +46,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "dhcpd.h"
u_int32_t
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 4261251b6b78..8179a5c34209 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -56,8 +56,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "dhcpd.h"
#include "privsep.h"
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index 29ae73103913..310f477f8a4f 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -42,8 +42,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "dhcpd.h"
#include "privsep.h"
diff --git a/sbin/dhclient/errwarn.c b/sbin/dhclient/errwarn.c
index 824faafd75a3..c073d5997056 100644
--- a/sbin/dhclient/errwarn.c
+++ b/sbin/dhclient/errwarn.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include "dhcpd.h"
diff --git a/sbin/dhclient/hash.c b/sbin/dhclient/hash.c
index 5d797cc96964..b2d72a5a299a 100644
--- a/sbin/dhclient/hash.c
+++ b/sbin/dhclient/hash.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "dhcpd.h"
static int do_hash(const unsigned char *, int, int);
diff --git a/sbin/dhclient/inet.c b/sbin/dhclient/inet.c
index c72a7f6b702e..1684994129b8 100644
--- a/sbin/dhclient/inet.c
+++ b/sbin/dhclient/inet.c
@@ -45,8 +45,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "dhcpd.h"
/*
diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c
index afdb3985aa59..4bc26c007921 100644
--- a/sbin/dhclient/options.c
+++ b/sbin/dhclient/options.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#define DHCP_OPTION_DATA
diff --git a/sbin/dhclient/packet.c b/sbin/dhclient/packet.c
index 276bb5c2457f..3d7390c06ee0 100644
--- a/sbin/dhclient/packet.c
+++ b/sbin/dhclient/packet.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "dhcpd.h"
#include <netinet/in_systm.h>
diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c
index 70e2013d0813..da0c4aa754e1 100644
--- a/sbin/dhclient/parse.c
+++ b/sbin/dhclient/parse.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdbool.h>
#include "dhcpd.h"
diff --git a/sbin/dhclient/privsep.c b/sbin/dhclient/privsep.c
index a286b6900808..02d12a36a3d9 100644
--- a/sbin/dhclient/privsep.c
+++ b/sbin/dhclient/privsep.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "dhcpd.h"
#include "privsep.h"
diff --git a/sbin/dhclient/tables.c b/sbin/dhclient/tables.c
index 9225c4fe2051..134b54fa3b56 100644
--- a/sbin/dhclient/tables.c
+++ b/sbin/dhclient/tables.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "dhcpd.h"
/*
diff --git a/sbin/dhclient/tree.c b/sbin/dhclient/tree.c
index 9639cb87321b..0414129b2efb 100644
--- a/sbin/dhclient/tree.c
+++ b/sbin/dhclient/tree.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "dhcpd.h"
pair
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index f266e6b98b39..9b744aee7d2e 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -41,8 +41,6 @@ static const char sccsid[] = "@(#)dmesg.c 8.1 (Berkeley) 6/5/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/msgbuf.h>
#include <sys/sysctl.h>
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 5bcfe2b8f1e7..81144e33bc71 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -41,8 +41,6 @@ static char sccsid[] = "From: @(#)swapon.c 8.1 (Berkeley) 6/5/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/disk.h>
diff --git a/sbin/etherswitchcfg/etherswitchcfg.c b/sbin/etherswitchcfg/etherswitchcfg.c
index a0d6931371e2..f47dff1f0de2 100644
--- a/sbin/etherswitchcfg/etherswitchcfg.c
+++ b/sbin/etherswitchcfg/etherswitchcfg.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index 30382a56d135..6cfa2b510f22 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/diskmbr.h>
diff --git a/sbin/fdisk/fdisk_mbr_enc.c b/sbin/fdisk/fdisk_mbr_enc.c
index 351fd3ef0a08..6fe99bbba1b3 100644
--- a/sbin/fdisk/fdisk_mbr_enc.c
+++ b/sbin/fdisk/fdisk_mbr_enc.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/diskmbr.h>
#include <sys/endian.h>
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index b6ad92ebf49b..3757ed062ba5 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/queue.h>
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index a3888eeea25a..9b011e0ed18e 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -35,8 +35,6 @@
#ifndef lint
__RCSID("$NetBSD: fsutil.c,v 1.15 2006/06/05 16:52:05 christos Exp $");
#endif /* not lint */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/mount.h>
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index 3ff6c467ee08..0551ba4521c3 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)dir.c 8.8 (Berkeley) 4/28/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c
index c64fb20ee9e8..8e5e8ebe8aa0 100644
--- a/sbin/fsck_ffs/ea.c
+++ b/sbin/fsck_ffs/ea.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/stdint.h>
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 5edc258d54bf..5cf17e22fe80 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c
index 03bf7f08b662..b94f27758315 100644
--- a/sbin/fsck_ffs/gjournal.c
+++ b/sbin/fsck_ffs/gjournal.c
@@ -54,8 +54,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <sys/stat.h>
#include <ufs/ffs/fs.h>
diff --git a/sbin/fsck_ffs/globs.c b/sbin/fsck_ffs/globs.c
index 22b15186ecaa..038fc3475742 100644
--- a/sbin/fsck_ffs/globs.c
+++ b/sbin/fsck_ffs/globs.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index c56d938cce41..3db8a5e5c23d 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/stdint.h>
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index bfe2901c4053..58e184f3581f 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _WANT_P_OSREL
#include <sys/param.h>
#include <sys/file.h>
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 5b27cf8cbfbe..bed9d547f637 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)pass1.c 8.6 (Berkeley) 4/28/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index e2a200b8b2f2..c1af6158f92c 100644
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)pass1b.c 8.4 (Berkeley) 4/28/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index 48bf27a8b142..977ee1b1c61e 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)pass2.c 8.9 (Berkeley) 4/28/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index 49cb43620392..9a01bb02ccc8 100644
--- a/sbin/fsck_ffs/pass3.c
+++ b/sbin/fsck_ffs/pass3.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)pass3.c 8.2 (Berkeley) 4/27/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index cfcd36296887..b4cf59bc97dc 100644
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)pass4.c 8.4 (Berkeley) 4/28/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index d973183eb36a..58de6791903f 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)pass5.c 8.9 (Berkeley) 4/28/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index fbcf069c9c97..49e89f9221b0 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/stat.h>
diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c
index b78123b59678..c66b605bd69d 100644
--- a/sbin/fsck_ffs/suj.c
+++ b/sbin/fsck_ffs/suj.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 4f56f1ed8c26..45bbcc9d6612 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index 5556c846c565..ccaf7adca305 100644
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/sbin/geom/misc/subr.c b/sbin/geom/misc/subr.c
index c297d0182b49..2d3db86c943f 100644
--- a/sbin/geom/misc/subr.c
+++ b/sbin/geom/misc/subr.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/endian.h>
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index 51bf997406d0..fc314d19a4e3 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -53,8 +53,6 @@ All rights reserved.\n";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
diff --git a/sbin/hastctl/hastctl.c b/sbin/hastctl/hastctl.c
index b649ced1f29e..ab2d618c698c 100644
--- a/sbin/hastctl/hastctl.c
+++ b/sbin/hastctl/hastctl.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/sbin/hastd/activemap.c b/sbin/hastd/activemap.c
index 439461f8b04a..f5e3c60fd0a0 100644
--- a/sbin/hastd/activemap.c
+++ b/sbin/hastd/activemap.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h> /* powerof2() */
#include <sys/queue.h>
diff --git a/sbin/hastd/control.c b/sbin/hastd/control.c
index 61bec25b95e1..f6f937d3b180 100644
--- a/sbin/hastd/control.c
+++ b/sbin/hastd/control.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/sbin/hastd/ebuf.c b/sbin/hastd/ebuf.c
index 5e6e1bb558a1..522e4e821b11 100644
--- a/sbin/hastd/ebuf.c
+++ b/sbin/hastd/ebuf.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <errno.h>
diff --git a/sbin/hastd/event.c b/sbin/hastd/event.c
index b4548d3da190..aff8018dd49c 100644
--- a/sbin/hastd/event.c
+++ b/sbin/hastd/event.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include "hast.h"
diff --git a/sbin/hastd/hast_checksum.c b/sbin/hastd/hast_checksum.c
index f975d28f13f4..ea3113b01849 100644
--- a/sbin/hastd/hast_checksum.c
+++ b/sbin/hastd/hast_checksum.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <string.h>
#include <strings.h>
diff --git a/sbin/hastd/hast_compression.c b/sbin/hastd/hast_compression.c
index def7dd0ff29c..769fd1d2676e 100644
--- a/sbin/hastd/hast_compression.c
+++ b/sbin/hastd/hast_compression.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <errno.h>
diff --git a/sbin/hastd/hast_proto.c b/sbin/hastd/hast_proto.c
index 0a85b46fa2c8..d9f231e7b007 100644
--- a/sbin/hastd/hast_proto.c
+++ b/sbin/hastd/hast_proto.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <errno.h>
diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c
index 4f0acfeac9c0..f303f277e0ad 100644
--- a/sbin/hastd/hastd.c
+++ b/sbin/hastd/hastd.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/sbin/hastd/hooks.c b/sbin/hastd/hooks.c
index e15e5df43ed5..7a5ccb4e22e6 100644
--- a/sbin/hastd/hooks.c
+++ b/sbin/hastd/hooks.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/wait.h>
diff --git a/sbin/hastd/metadata.c b/sbin/hastd/metadata.c
index 2bdbb9612a8b..2f9cbc5e0971 100644
--- a/sbin/hastd/metadata.c
+++ b/sbin/hastd/metadata.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <fcntl.h>
#include <string.h>
diff --git a/sbin/hastd/nv.c b/sbin/hastd/nv.c
index 128db3f7f0ad..5f50ae349023 100644
--- a/sbin/hastd/nv.c
+++ b/sbin/hastd/nv.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/sbin/hastd/pjdlog.c b/sbin/hastd/pjdlog.c
index d314f2b9e3b5..6726cab47697 100644
--- a/sbin/hastd/pjdlog.c
+++ b/sbin/hastd/pjdlog.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c
index f8e88e344a36..76c454d14a74 100644
--- a/sbin/hastd/primary.c
+++ b/sbin/hastd/primary.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/bio.h>
diff --git a/sbin/hastd/proto.c b/sbin/hastd/proto.c
index 9e6b8a4c0670..56ff4933c9b8 100644
--- a/sbin/hastd/proto.c
+++ b/sbin/hastd/proto.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/sbin/hastd/proto_common.c b/sbin/hastd/proto_common.c
index c6d4dbbedff9..143b7666b7ca 100644
--- a/sbin/hastd/proto_common.c
+++ b/sbin/hastd/proto_common.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/hastd/proto_socketpair.c b/sbin/hastd/proto_socketpair.c
index a51b3e543517..ab30a6a27263 100644
--- a/sbin/hastd/proto_socketpair.c
+++ b/sbin/hastd/proto_socketpair.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/hastd/proto_tcp.c b/sbin/hastd/proto_tcp.c
index 9ec0326c7daa..dc5a23da7b23 100644
--- a/sbin/hastd/proto_tcp.c
+++ b/sbin/hastd/proto_tcp.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h> /* MAXHOSTNAMELEN */
#include <sys/socket.h>
diff --git a/sbin/hastd/proto_uds.c b/sbin/hastd/proto_uds.c
index 183f630ebb69..5bf4c64fe5f6 100644
--- a/sbin/hastd/proto_uds.c
+++ b/sbin/hastd/proto_uds.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* UDS - UNIX Domain Socket */
#include <sys/types.h>
diff --git a/sbin/hastd/rangelock.c b/sbin/hastd/rangelock.c
index 715aea122780..33aee39651a4 100644
--- a/sbin/hastd/rangelock.c
+++ b/sbin/hastd/rangelock.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <stdbool.h>
diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c
index e9882dbc7f3a..bf118d7e1237 100644
--- a/sbin/hastd/secondary.c
+++ b/sbin/hastd/secondary.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/bio.h>
diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c
index 1319a4d942cc..27641a6f8acb 100644
--- a/sbin/hastd/subr.c
+++ b/sbin/hastd/subr.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/ioctl.h>
diff --git a/sbin/ifconfig/ifgre.c b/sbin/ifconfig/ifgre.c
index 018167a32046..dda04e363bfc 100644
--- a/sbin/ifconfig/ifgre.c
+++ b/sbin/ifconfig/ifgre.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/ifconfig/ifipsec.c b/sbin/ifconfig/ifipsec.c
index 2d9790208858..6fd1f9f630f4 100644
--- a/sbin/ifconfig/ifipsec.c
+++ b/sbin/ifconfig/ifipsec.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/ifconfig/ifvxlan.c b/sbin/ifconfig/ifvxlan.c
index 6a0bacfc32a6..e4871da645fd 100644
--- a/sbin/ifconfig/ifvxlan.c
+++ b/sbin/ifconfig/ifvxlan.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/ipfw/nat64clat.c b/sbin/ipfw/nat64clat.c
index bd286f78cfc2..e8b767a0c801 100644
--- a/sbin/ipfw/nat64clat.c
+++ b/sbin/ipfw/nat64clat.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/ipfw/nat64lsn.c b/sbin/ipfw/nat64lsn.c
index f005432d7fbc..f50ea3661236 100644
--- a/sbin/ipfw/nat64lsn.c
+++ b/sbin/ipfw/nat64lsn.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/ipfw/nat64stl.c b/sbin/ipfw/nat64stl.c
index 8ac0b546a44d..d8dd239e7daa 100644
--- a/sbin/ipfw/nat64stl.c
+++ b/sbin/ipfw/nat64stl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/ipfw/nptv6.c b/sbin/ipfw/nptv6.c
index 27b6d3945d26..fc9ce638b8af 100644
--- a/sbin/ipfw/nptv6.c
+++ b/sbin/ipfw/nptv6.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c
index 7f256c17f1c8..27956a961ccf 100644
--- a/sbin/kldconfig/kldconfig.c
+++ b/sbin/kldconfig/kldconfig.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index 8946d8ac281f..c573a253c7c3 100644
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index 2fee78238e9e..60d12e0327ab 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/module.h>
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index 44a602d33f49..ebdc17ce414f 100644
--- a/sbin/kldunload/kldunload.c
+++ b/sbin/kldunload/kldunload.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index abc542ced82c..15fd7ebec5d4 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -18,8 +18,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/resource.h>
#include <sys/stat.h>
diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c
index e42bea43575f..dbd206f953d2 100644
--- a/sbin/mdmfs/mdmfs.c
+++ b/sbin/mdmfs/mdmfs.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/mdioctl.h>
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index 3a5cac0d9bac..31987f7b0b78 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)getmntopts.c 8.3 (Berkeley) 3/29/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/stat.h>
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 8ab17d37a0ff..2fcc94e40818 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#define _WANT_MNTOPTNAMES
#include <sys/mount.h>
diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c
index e45aaec5fc09..3785451e65b2 100644
--- a/sbin/mount/vfslist.c
+++ b/sbin/mount/vfslist.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)vfslist.c 8.1 (Berkeley) 5/8/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdlib.h>
#include <string.h>
diff --git a/sbin/mount_fusefs/mount_fusefs.c b/sbin/mount_fusefs/mount_fusefs.c
index 9b9b6d002d08..59667c39db10 100644
--- a/sbin/mount_fusefs/mount_fusefs.c
+++ b/sbin/mount_fusefs/mount_fusefs.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/uio.h>
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 284b34323885..f2f22e0a0ccd 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index 599a5247ac85..29c68987adf4 100644
--- a/sbin/natd/natd.c
+++ b/sbin/natd/natd.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define SYSLOG_NAMES
#include <sys/types.h>
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 85137c7881f9..b0d178de984e 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _WANT_P_OSREL
#include <sys/param.h>
#include <sys/disklabel.h>
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 2e46b50e7d43..afb71f9f25b4 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -50,8 +50,6 @@ static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* newfs: friendly front end to mkfs
*/
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index b518d94d384c..45a0ec0a9741 100644
--- a/sbin/nfsiod/nfsiod.c
+++ b/sbin/nfsiod/nfsiod.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)nfsiod.c 8.4 (Berkeley) 5/3/95";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/syslog.h>
#include <sys/wait.h>
diff --git a/sbin/nvmecontrol/comnd.c b/sbin/nvmecontrol/comnd.c
index 6f460670c442..de979af71d90 100644
--- a/sbin/nvmecontrol/comnd.c
+++ b/sbin/nvmecontrol/comnd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/devlist.c b/sbin/nvmecontrol/devlist.c
index ce54bb85f234..7e3dfe60fff4 100644
--- a/sbin/nvmecontrol/devlist.c
+++ b/sbin/nvmecontrol/devlist.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c
index 4fada6aa04e3..256847ef8ac2 100644
--- a/sbin/nvmecontrol/firmware.c
+++ b/sbin/nvmecontrol/firmware.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
#include <sys/stat.h>
diff --git a/sbin/nvmecontrol/format.c b/sbin/nvmecontrol/format.c
index c9a15b133381..541b207b373f 100644
--- a/sbin/nvmecontrol/format.c
+++ b/sbin/nvmecontrol/format.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/identify.c b/sbin/nvmecontrol/identify.c
index 7d80103ba539..50698e8bfc70 100644
--- a/sbin/nvmecontrol/identify.c
+++ b/sbin/nvmecontrol/identify.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <ctype.h>
diff --git a/sbin/nvmecontrol/identify_ext.c b/sbin/nvmecontrol/identify_ext.c
index 617db86b6ddb..72b1ff5ccd7b 100644
--- a/sbin/nvmecontrol/identify_ext.c
+++ b/sbin/nvmecontrol/identify_ext.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <ctype.h>
diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c
index ae5bcc3a5aa6..725815edc475 100644
--- a/sbin/nvmecontrol/logpage.c
+++ b/sbin/nvmecontrol/logpage.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/modules/intel/intel.c b/sbin/nvmecontrol/modules/intel/intel.c
index 02fad72d4bc2..cc5c9c49beb5 100644
--- a/sbin/nvmecontrol/modules/intel/intel.c
+++ b/sbin/nvmecontrol/modules/intel/intel.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/modules/samsung/samsung.c b/sbin/nvmecontrol/modules/samsung/samsung.c
index b85959eaa937..cc4528a0a78c 100644
--- a/sbin/nvmecontrol/modules/samsung/samsung.c
+++ b/sbin/nvmecontrol/modules/samsung/samsung.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/modules/wdc/wdc.c b/sbin/nvmecontrol/modules/wdc/wdc.c
index 8936a74bab9a..2600464eeb0a 100644
--- a/sbin/nvmecontrol/modules/wdc/wdc.c
+++ b/sbin/nvmecontrol/modules/wdc/wdc.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
#include <sys/endian.h>
diff --git a/sbin/nvmecontrol/nc_util.c b/sbin/nvmecontrol/nc_util.c
index f5382cf311dc..6b02ac0098ec 100644
--- a/sbin/nvmecontrol/nc_util.c
+++ b/sbin/nvmecontrol/nc_util.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include "nvmecontrol.h"
diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c
index 9b9de403e125..dd678568d5ca 100644
--- a/sbin/nvmecontrol/ns.c
+++ b/sbin/nvmecontrol/ns.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/nsid.c b/sbin/nvmecontrol/nsid.c
index 4b9cb568eaee..3d71186f396a 100644
--- a/sbin/nvmecontrol/nsid.c
+++ b/sbin/nvmecontrol/nsid.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stdio.h>
diff --git a/sbin/nvmecontrol/nvmecontrol.c b/sbin/nvmecontrol/nvmecontrol.c
index 91e2d516f691..92fbf9e25378 100644
--- a/sbin/nvmecontrol/nvmecontrol.c
+++ b/sbin/nvmecontrol/nvmecontrol.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
#include <sys/stat.h>
diff --git a/sbin/nvmecontrol/passthru.c b/sbin/nvmecontrol/passthru.c
index 9f4e3189bd04..015c52305ceb 100644
--- a/sbin/nvmecontrol/passthru.c
+++ b/sbin/nvmecontrol/passthru.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/perftest.c b/sbin/nvmecontrol/perftest.c
index a54301aecf39..0afab9951e50 100644
--- a/sbin/nvmecontrol/perftest.c
+++ b/sbin/nvmecontrol/perftest.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/power.c b/sbin/nvmecontrol/power.c
index c6d7ad5455ff..95ee1763a28c 100644
--- a/sbin/nvmecontrol/power.c
+++ b/sbin/nvmecontrol/power.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/reset.c b/sbin/nvmecontrol/reset.c
index 8d5285c867c2..4cd4987d88b5 100644
--- a/sbin/nvmecontrol/reset.c
+++ b/sbin/nvmecontrol/reset.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/resv.c b/sbin/nvmecontrol/resv.c
index f70a44dba381..835ad47a924c 100644
--- a/sbin/nvmecontrol/resv.c
+++ b/sbin/nvmecontrol/resv.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/sanitize.c b/sbin/nvmecontrol/sanitize.c
index 9680b3d138d9..d56a74685651 100644
--- a/sbin/nvmecontrol/sanitize.c
+++ b/sbin/nvmecontrol/sanitize.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/nvmecontrol/selftest.c b/sbin/nvmecontrol/selftest.c
index 4dc2d4c0b517..6139a7902234 100644
--- a/sbin/nvmecontrol/selftest.c
+++ b/sbin/nvmecontrol/selftest.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 390888526006..041dcb0587b3 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -30,8 +30,6 @@
*/
%{
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define PFIOC_USE_LATEST
#include <sys/types.h>
diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c
index cabfc78de97a..20594e050c9e 100644
--- a/sbin/pfctl/pf_print_state.c
+++ b/sbin/pfctl/pf_print_state.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/endian.h>
diff --git a/sbin/pfctl/pf_ruleset.c b/sbin/pfctl/pf_ruleset.c
index a7f31366f48c..09ee0fdb916c 100644
--- a/sbin/pfctl/pf_ruleset.c
+++ b/sbin/pfctl/pf_ruleset.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/mbuf.h>
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index ea1812a3858d..bfa76b299a02 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define PFIOC_USE_LATEST
#include <sys/types.h>
diff --git a/sbin/pfctl/pfctl_altq.c b/sbin/pfctl/pfctl_altq.c
index 66075258f106..1b32e90aea10 100644
--- a/sbin/pfctl/pfctl_altq.c
+++ b/sbin/pfctl/pfctl_altq.c
@@ -19,8 +19,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define PFIOC_USE_LATEST
#define _WANT_FREEBSD_BITSET
diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c
index 99c597ec84c1..a377f9eb04dc 100644
--- a/sbin/pfctl/pfctl_optimize.c
+++ b/sbin/pfctl/pfctl_optimize.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/pfctl/pfctl_osfp.c b/sbin/pfctl/pfctl_osfp.c
index e26578051574..7fcdcf96228d 100644
--- a/sbin/pfctl/pfctl_osfp.c
+++ b/sbin/pfctl/pfctl_osfp.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index c3aa840bca40..936c5ec53759 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/pfctl/pfctl_qstats.c b/sbin/pfctl/pfctl_qstats.c
index 5312a6da8eaa..397598b0c114 100644
--- a/sbin/pfctl/pfctl_qstats.c
+++ b/sbin/pfctl/pfctl_qstats.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define PFIOC_USE_LATEST
#include <sys/types.h>
diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c
index 95407ccae261..d33f091d8b69 100644
--- a/sbin/pfctl/pfctl_radix.c
+++ b/sbin/pfctl/pfctl_radix.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c
index 3d1aef5571d6..fe934a8d2ea2 100644
--- a/sbin/pfctl/pfctl_table.c
+++ b/sbin/pfctl/pfctl_table.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/sbin/pfctl/tests/pfctl_test.c b/sbin/pfctl/tests/pfctl_test.c
index 4f342a9b95e2..5a98ad9f0d5f 100644
--- a/sbin/pfctl/tests/pfctl_test.c
+++ b/sbin/pfctl/tests/pfctl_test.c
@@ -31,8 +31,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <err.h>
diff --git a/sbin/pfilctl/pfilctl.c b/sbin/pfilctl/pfilctl.c
index 3c6a2d980494..c2fe04ecc777 100644
--- a/sbin/pfilctl/pfilctl.c
+++ b/sbin/pfilctl/pfilctl.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <net/if.h>
diff --git a/sbin/ping/main.c b/sbin/ping/main.c
index bfe19e0ff442..47d20f569008 100644
--- a/sbin/ping/main.c
+++ b/sbin/ping/main.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 965b565da7b9..072d4607f745 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* P I N G . C
*
diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c
index 5449d02a5d56..bd1658f9500a 100644
--- a/sbin/ping/ping6.c
+++ b/sbin/ping/ping6.c
@@ -78,8 +78,6 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Using the InterNet Control Message Protocol (ICMP) "ECHO" facility,
* measure round-trip-delays and packet loss across network paths.
diff --git a/sbin/ping/tests/in_cksum_test.c b/sbin/ping/tests/in_cksum_test.c
index a0353adfc9a4..fd51a83b1f4a 100644
--- a/sbin/ping/tests/in_cksum_test.c
+++ b/sbin/ping/tests/in_cksum_test.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <atf-c.h>
diff --git a/sbin/ping/utils.c b/sbin/ping/utils.c
index 1df233995bf0..920102a68961 100644
--- a/sbin/ping/utils.c
+++ b/sbin/ping/utils.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include "utils.h"
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 1e656d2a5811..3f608c103b1d 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)quotacheck.c 8.3 (Berkeley) 1/29/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Fix up / report on disk quotas & usage
*/
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 1e3c60f8a1c8..87b0e873c7ae 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -40,8 +40,6 @@
*/
#include <sys/types.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <err.h>
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index 8cae59002b2d..6f656fd5f88c 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)reboot.c 8.1 (Berkeley) 6/5/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/boottrace.h>
#include <sys/reboot.h>
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 15b1fb45bb04..336ab61221dc 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)interactive.c 8.5 (Berkeley) 5/1/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 7b9a5359d57d..6eba6954b6e4 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/4/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 7c9056ee16d9..33e97c18c41c 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)restore.c 8.3 (Berkeley) 9/13/94";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <limits.h>
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index e5508bc08639..c3fe0d7d8b05 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)tape.c 8.9 (Berkeley) 5/1/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/mtio.h>
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 223b1d6f69dc..3913bdc9e6af 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/socket.h>
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index 9f1f04422a55..a571144589bb 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -63,8 +63,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/kerneldump.h>
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 76e02d1fd6b1..3864e44025eb 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)shutdown.c 8.4 (Berkeley) 4/28/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/boottrace.h>
#include <sys/resource.h>
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index d98f63b153d0..b9b865c0fc09 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)swapon.c 8.1 (Berkeley) 6/5/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 9a1f8c5431a9..fe1a53a9d645 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 4445603dbc90..9b38e23effd0 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)tunefs.c 8.2 (Berkeley) 4/19/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* tunefs: change layout parameters to an existing file system.
*/
diff --git a/sbin/veriexec/veriexec.c b/sbin/veriexec/veriexec.c
index e30aabe55faf..3899a781625a 100644
--- a/sbin/veriexec/veriexec.c
+++ b/sbin/veriexec/veriexec.c
@@ -25,8 +25,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <sysexits.h>
#include <unistd.h>
diff --git a/sbin/zfsbootcfg/zfsbootcfg.c b/sbin/zfsbootcfg/zfsbootcfg.c
index f4b2eeabcc3b..0c1e9e0f7ea1 100644
--- a/sbin/zfsbootcfg/zfsbootcfg.c
+++ b/sbin/zfsbootcfg/zfsbootcfg.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
#include <limits.h>
diff --git a/secure/lib/libcrypt/blowfish.c b/secure/lib/libcrypt/blowfish.c
index 5b33f025fdfd..3a3ac1283f85 100644
--- a/secure/lib/libcrypt/blowfish.c
+++ b/secure/lib/libcrypt/blowfish.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This code is derived from section 14.3 and the given source
* in section V of Applied Cryptography, second edition.
diff --git a/secure/lib/libcrypt/crypt-blowfish.c b/secure/lib/libcrypt/crypt-blowfish.c
index eb2d3456b25c..e0b14f675b02 100644
--- a/secure/lib/libcrypt/crypt-blowfish.c
+++ b/secure/lib/libcrypt/crypt-blowfish.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* This password hashing algorithm was designed by David Mazieres
* <dm@lcs.mit.edu> and works as follows:
*
diff --git a/secure/lib/libcrypt/crypt-des.c b/secure/lib/libcrypt/crypt-des.c
index 6d8591330ecd..f96933ab1bfd 100644
--- a/secure/lib/libcrypt/crypt-des.c
+++ b/secure/lib/libcrypt/crypt-des.c
@@ -57,8 +57,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <arpa/inet.h>
diff --git a/share/examples/kld/firmware/fwconsumer/fw_consumer.c b/share/examples/kld/firmware/fwconsumer/fw_consumer.c
index 294d2fbb636f..05c93446eed3 100644
--- a/share/examples/kld/firmware/fwconsumer/fw_consumer.c
+++ b/share/examples/kld/firmware/fwconsumer/fw_consumer.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/errno.h>
diff --git a/share/examples/kld/khelp/h_example.c b/share/examples/kld/khelp/h_example.c
index 16f4351a4d22..5bca2b36af50 100644
--- a/share/examples/kld/khelp/h_example.c
+++ b/share/examples/kld/khelp/h_example.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/hhook.h>
diff --git a/share/examples/kld/random_adaptor/random_adaptor_example.c b/share/examples/kld/random_adaptor/random_adaptor_example.c
index 7907179d3078..f462f64cd174 100644
--- a/share/examples/kld/random_adaptor/random_adaptor_example.c
+++ b/share/examples/kld/random_adaptor/random_adaptor_example.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/lock.h>
diff --git a/stand/arm64/libarm64/cache.c b/stand/arm64/libarm64/cache.c
index e0c627f36a60..291b55f3b250 100644
--- a/stand/arm64/libarm64/cache.c
+++ b/stand/arm64/libarm64/cache.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <machine/armreg.h>
diff --git a/stand/common/bcache.c b/stand/common/bcache.c
index 88dee8c7ce2d..2b4603525740 100644
--- a/stand/common/bcache.c
+++ b/stand/common/bcache.c
@@ -27,8 +27,6 @@
#include <sys/cdefs.h>
#include <sys/param.h>
-__FBSDID("$FreeBSD$");
-
/*
* Simple hashed block cache
*/
diff --git a/stand/common/boot.c b/stand/common/boot.c
index 3ec827617d56..db4bb4fc2ea8 100644
--- a/stand/common/boot.c
+++ b/stand/common/boot.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Loading modules, booting the system
*/
diff --git a/stand/common/commands.c b/stand/common/commands.c
index 6643a3ca360e..b09bb9604386 100644
--- a/stand/common/commands.c
+++ b/stand/common/commands.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
diff --git a/stand/common/console.c b/stand/common/console.c
index ae1bb7c9f952..d9d075ef7bde 100644
--- a/stand/common/console.c
+++ b/stand/common/console.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stand.h>
#include <string.h>
diff --git a/stand/common/dev_net.c b/stand/common/dev_net.c
index 24bfbe9636e3..b6880e894477 100644
--- a/stand/common/dev_net.c
+++ b/stand/common/dev_net.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*-
* This module implements a "raw device" interface suitable for
* use by the stand-alone I/O library NFS code. This interface
diff --git a/stand/common/devopen.c b/stand/common/devopen.c
index 4fd955d5a9eb..a51ebaf0c9d7 100644
--- a/stand/common/devopen.c
+++ b/stand/common/devopen.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
diff --git a/stand/common/disk.c b/stand/common/disk.c
index eecf519c52aa..e1add50bd1fb 100644
--- a/stand/common/disk.c
+++ b/stand/common/disk.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/disk.h>
#include <sys/queue.h>
#include <stand.h>
diff --git a/stand/common/gfx_fb_stub.c b/stand/common/gfx_fb_stub.c
index e212bd2daa12..a4ebdeb8c388 100644
--- a/stand/common/gfx_fb_stub.c
+++ b/stand/common/gfx_fb_stub.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Generic gfx stubs.
*/
diff --git a/stand/common/install.c b/stand/common/install.c
index ea6eaaa7cebc..418799822e4e 100644
--- a/stand/common/install.c
+++ b/stand/common/install.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <net/if.h>
diff --git a/stand/common/interp.c b/stand/common/interp.c
index 8b779fb7a5e9..b71e0858e702 100644
--- a/stand/common/interp.c
+++ b/stand/common/interp.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Simple commandline interpreter, toplevel and misc.
*
diff --git a/stand/common/interp_backslash.c b/stand/common/interp_backslash.c
index c75081beca56..6d650cd2e286 100644
--- a/stand/common/interp_backslash.c
+++ b/stand/common/interp_backslash.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
#include "bootstrap.h"
diff --git a/stand/common/interp_forth.c b/stand/common/interp_forth.c
index edf21e53dc18..0320e081d406 100644
--- a/stand/common/interp_forth.c
+++ b/stand/common/interp_forth.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h> /* to pick up __FreeBSD_version */
#include <string.h>
#include <stand.h>
diff --git a/stand/common/interp_lua.c b/stand/common/interp_lua.c
index 8a420660683e..db58d80b2048 100644
--- a/stand/common/interp_lua.c
+++ b/stand/common/interp_lua.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "bootstrap.h"
diff --git a/stand/common/interp_parse.c b/stand/common/interp_parse.c
index c46a497e240d..6e883a81e383 100644
--- a/stand/common/interp_parse.c
+++ b/stand/common/interp_parse.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
#include "bootstrap.h"
diff --git a/stand/common/interp_simple.c b/stand/common/interp_simple.c
index e25743d4f01c..fa021c796308 100644
--- a/stand/common/interp_simple.c
+++ b/stand/common/interp_simple.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Simple commandline interpreter, toplevel and misc.
*/
diff --git a/stand/common/isapnp.c b/stand/common/isapnp.c
index 8a0cdfda2ace..3f554305c2e2 100644
--- a/stand/common/isapnp.c
+++ b/stand/common/isapnp.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Machine-independent ISA PnP enumerator implementing a subset of the
* ISA PnP specification.
diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c
index 81b9e3e7ee9f..9f3b015fef7e 100644
--- a/stand/common/load_elf.c
+++ b/stand/common/load_elf.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/exec.h>
diff --git a/stand/common/load_elf32.c b/stand/common/load_elf32.c
index 0c9f460d4863..5b942fd63444 100644
--- a/stand/common/load_elf32.c
+++ b/stand/common/load_elf32.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 32
#define _MACHINE_ELF_WANT_32BIT
diff --git a/stand/common/load_elf32_obj.c b/stand/common/load_elf32_obj.c
index 94b089618836..dffb0070b0c0 100644
--- a/stand/common/load_elf32_obj.c
+++ b/stand/common/load_elf32_obj.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 32
#define _MACHINE_ELF_WANT_32BIT
diff --git a/stand/common/load_elf64.c b/stand/common/load_elf64.c
index c29e8e3596a7..e3a913c0ce8c 100644
--- a/stand/common/load_elf64.c
+++ b/stand/common/load_elf64.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 64
#include "load_elf.c"
diff --git a/stand/common/load_elf64_obj.c b/stand/common/load_elf64_obj.c
index 3c9371ba0130..14d6e3dc3d4d 100644
--- a/stand/common/load_elf64_obj.c
+++ b/stand/common/load_elf64_obj.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 64
#include "load_elf_obj.c"
diff --git a/stand/common/load_elf_obj.c b/stand/common/load_elf_obj.c
index ed202e08b780..86e0fb2b5d22 100644
--- a/stand/common/load_elf_obj.c
+++ b/stand/common/load_elf_obj.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/exec.h>
#include <sys/linker.h>
diff --git a/stand/common/ls.c b/stand/common/ls.c
index cd6b7c49ea5f..daeecfa488da 100644
--- a/stand/common/ls.c
+++ b/stand/common/ls.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ufs/dir.h>
diff --git a/stand/common/md.c b/stand/common/md.c
index 61db56ece7ae..6b6e6303c898 100644
--- a/stand/common/md.c
+++ b/stand/common/md.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/stand/common/metadata.c b/stand/common/metadata.c
index a69c6d824d44..8d5003ec47bf 100644
--- a/stand/common/metadata.c
+++ b/stand/common/metadata.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/stand/common/misc.c b/stand/common/misc.c
index b80909b9edfb..046094f868e0 100644
--- a/stand/common/misc.c
+++ b/stand/common/misc.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <stand.h>
#include <bootstrap.h>
diff --git a/stand/common/module.c b/stand/common/module.c
index 9902309b7f99..289d174733da 100644
--- a/stand/common/module.c
+++ b/stand/common/module.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* file/module function dispatcher, support, etc.
*/
diff --git a/stand/common/part.c b/stand/common/part.c
index 90d7855b53ff..41c0eef95d7d 100644
--- a/stand/common/part.c
+++ b/stand/common/part.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <sys/diskmbr.h>
diff --git a/stand/common/pnp.c b/stand/common/pnp.c
index 4759c4417d19..8ee7f5f711b1 100644
--- a/stand/common/pnp.c
+++ b/stand/common/pnp.c
@@ -4,8 +4,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* "Plug and Play" functionality.
*
diff --git a/stand/common/reloc_elf.c b/stand/common/reloc_elf.c
index f143b20eee5c..a7243bc634fd 100644
--- a/stand/common/reloc_elf.c
+++ b/stand/common/reloc_elf.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/elf.h>
diff --git a/stand/common/reloc_elf32.c b/stand/common/reloc_elf32.c
index 03d9d73bab7f..ee2617b371c1 100644
--- a/stand/common/reloc_elf32.c
+++ b/stand/common/reloc_elf32.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 32
#include "reloc_elf.c"
diff --git a/stand/common/reloc_elf64.c b/stand/common/reloc_elf64.c
index c8dcf2a36b0d..c7b76ca6b265 100644
--- a/stand/common/reloc_elf64.c
+++ b/stand/common/reloc_elf64.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 64
#include "reloc_elf.c"
diff --git a/stand/common/self_reloc.c b/stand/common/self_reloc.c
index aee19cd8c574..39dad510b0b0 100644
--- a/stand/common/self_reloc.c
+++ b/stand/common/self_reloc.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <elf.h>
#include <bootstrap.h>
diff --git a/stand/common/tslog.c b/stand/common/tslog.c
index 3851e760daf1..6f27b9ebc316 100644
--- a/stand/common/tslog.c
+++ b/stand/common/tslog.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stand.h>
diff --git a/stand/common/vdisk.c b/stand/common/vdisk.c
index 5c08a524b4d3..3bbb13d908c5 100644
--- a/stand/common/vdisk.c
+++ b/stand/common/vdisk.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <stdarg.h>
#include <machine/_inttypes.h>
diff --git a/stand/common/zfs_cmd.c b/stand/common/zfs_cmd.c
index cee5b8993210..9a4dc01f0159 100644
--- a/stand/common/zfs_cmd.c
+++ b/stand/common/zfs_cmd.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* MD bootstrap main() and assorted miscellaneous
* commands.
diff --git a/stand/efi/boot1/boot1.c b/stand/efi/boot1/boot1.c
index 2f9801c8ea92..19627e870201 100644
--- a/stand/efi/boot1/boot1.c
+++ b/stand/efi/boot1/boot1.c
@@ -20,8 +20,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <machine/elf.h>
#include <machine/stdarg.h>
diff --git a/stand/efi/boot1/proto.c b/stand/efi/boot1/proto.c
index eeb3cd9568a4..cec4e2d1942c 100644
--- a/stand/efi/boot1/proto.c
+++ b/stand/efi/boot1/proto.c
@@ -20,8 +20,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <machine/elf.h>
#include <machine/stdarg.h>
diff --git a/stand/efi/fdt/efi_fdt.c b/stand/efi/fdt/efi_fdt.c
index 21107bb2ccbf..7010a272d9db 100644
--- a/stand/efi/fdt/efi_fdt.c
+++ b/stand/efi/fdt/efi_fdt.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stand.h>
#include <efi.h>
diff --git a/stand/efi/gptboot/proto.c b/stand/efi/gptboot/proto.c
index 38ccb5023c16..54a229db7bca 100644
--- a/stand/efi/gptboot/proto.c
+++ b/stand/efi/gptboot/proto.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <machine/elf.h>
#include <machine/stdarg.h>
diff --git a/stand/efi/libefi/delay.c b/stand/efi/libefi/delay.c
index 9bf40d28f96b..becdcb3fa267 100644
--- a/stand/efi/libefi/delay.c
+++ b/stand/efi/libefi/delay.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/devicename.c b/stand/efi/libefi/devicename.c
index ec821821bdf5..22844bbbd6ec 100644
--- a/stand/efi/libefi/devicename.c
+++ b/stand/efi/libefi/devicename.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
#include <sys/disklabel.h>
diff --git a/stand/efi/libefi/devpath.c b/stand/efi/libefi/devpath.c
index 94bb07540376..6b4b8785a2dd 100644
--- a/stand/efi/libefi/devpath.c
+++ b/stand/efi/libefi/devpath.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <efi.h>
#include <efilib.h>
#include <efichar.h>
diff --git a/stand/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c
index 1aeb94344c58..1758cd9d4d6d 100644
--- a/stand/efi/libefi/efi_console.c
+++ b/stand/efi/libefi/efi_console.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/efichar.c b/stand/efi/libefi/efichar.c
index 233027f4e6ea..0703c167de47 100644
--- a/stand/efi/libefi/efichar.c
+++ b/stand/efi/libefi/efichar.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
#ifdef _STANDALONE
diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c
index f5969cc5d42a..c84e040420e7 100644
--- a/stand/efi/libefi/eficom.c
+++ b/stand/efi/libefi/eficom.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/errno.h>
#include <bootstrap.h>
diff --git a/stand/efi/libefi/efienv.c b/stand/efi/libefi/efienv.c
index 04df6bc00fc3..031c144ee194 100644
--- a/stand/efi/libefi/efienv.c
+++ b/stand/efi/libefi/efienv.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <efi.h>
#include <efichar.h>
diff --git a/stand/efi/libefi/efihttp.c b/stand/efi/libefi/efihttp.c
index 4e65b8dac163..081b34336cb0 100644
--- a/stand/efi/libefi/efihttp.c
+++ b/stand/efi/libefi/efihttp.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <netinet/in.h>
diff --git a/stand/efi/libefi/efinet.c b/stand/efi/libefi/efinet.c
index a6582bd2c1b5..ede8b7297f17 100644
--- a/stand/efi/libefi/efinet.c
+++ b/stand/efi/libefi/efinet.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <net/ethernet.h>
#include <netinet/in.h>
diff --git a/stand/efi/libefi/efipart.c b/stand/efi/libefi/efipart.c
index 9a4d2b22ed20..475a796b4da5 100644
--- a/stand/efi/libefi/efipart.c
+++ b/stand/efi/libefi/efipart.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/disk.h>
#include <sys/param.h>
#include <sys/time.h>
diff --git a/stand/efi/libefi/efizfs.c b/stand/efi/libefi/efizfs.c
index 4fa336df1d59..83551596bb32 100644
--- a/stand/efi/libefi/efizfs.c
+++ b/stand/efi/libefi/efizfs.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stand.h>
diff --git a/stand/efi/libefi/env.c b/stand/efi/libefi/env.c
index 1d70e78e2a64..6887038fe950 100644
--- a/stand/efi/libefi/env.c
+++ b/stand/efi/libefi/env.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
#include <efi.h>
diff --git a/stand/efi/libefi/errno.c b/stand/efi/libefi/errno.c
index 0f354c3f3c8f..e614824a2bed 100644
--- a/stand/efi/libefi/errno.c
+++ b/stand/efi/libefi/errno.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/handles.c b/stand/efi/libefi/handles.c
index a55239dbec8c..bc42ae144509 100644
--- a/stand/efi/libefi/handles.c
+++ b/stand/efi/libefi/handles.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/libefi.c b/stand/efi/libefi/libefi.c
index e7b1406839fe..c33c61cdef16 100644
--- a/stand/efi/libefi/libefi.c
+++ b/stand/efi/libefi/libefi.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <efi.h>
#include <eficonsctl.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/time.c b/stand/efi/libefi/time.c
index fe0d2ef2702b..bab8e4f73434 100644
--- a/stand/efi/libefi/time.c
+++ b/stand/efi/libefi/time.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/time_arm64.c b/stand/efi/libefi/time_arm64.c
index baa0f8bfa1ed..616d05adb806 100644
--- a/stand/efi/libefi/time_arm64.c
+++ b/stand/efi/libefi/time_arm64.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/time_event.c b/stand/efi/libefi/time_event.c
index f171bf997078..e6aad64342ce 100644
--- a/stand/efi/libefi/time_event.c
+++ b/stand/efi/libefi/time_event.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/libefi/wchar.c b/stand/efi/libefi/wchar.c
index d0c653514366..d67f1bf34cf8 100644
--- a/stand/efi/libefi/wchar.c
+++ b/stand/efi/libefi/wchar.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <efi.h>
#include <efilib.h>
diff --git a/stand/efi/loader/arch/amd64/elf64_freebsd.c b/stand/efi/loader/arch/amd64/elf64_freebsd.c
index 0ed9d2d78ffd..196efb048064 100644
--- a/stand/efi/loader/arch/amd64/elf64_freebsd.c
+++ b/stand/efi/loader/arch/amd64/elf64_freebsd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 64
#include <sys/param.h>
#include <sys/exec.h>
diff --git a/stand/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c
index 81357e558185..56a3ee67da6f 100644
--- a/stand/efi/loader/arch/amd64/trap.c
+++ b/stand/efi/loader/arch/amd64/trap.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
#include <sys/param.h>
diff --git a/stand/efi/loader/arch/arm/exec.c b/stand/efi/loader/arch/arm/exec.c
index 2fecb2ea043a..99ee498b1b65 100644
--- a/stand/efi/loader/arch/arm/exec.c
+++ b/stand/efi/loader/arch/arm/exec.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/stand/efi/loader/arch/arm64/exec.c b/stand/efi/loader/arch/arm64/exec.c
index a8cd80cd0fc6..09be15b2b6f3 100644
--- a/stand/efi/loader/arch/arm64/exec.c
+++ b/stand/efi/loader/arch/arm64/exec.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
diff --git a/stand/efi/loader/arch/riscv/exec.c b/stand/efi/loader/arch/riscv/exec.c
index c7d90a4f31d0..686a42028608 100644
--- a/stand/efi/loader/arch/riscv/exec.c
+++ b/stand/efi/loader/arch/riscv/exec.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/stand/efi/loader/autoload.c b/stand/efi/loader/autoload.c
index d409285834c3..a7a5f8212e9c 100644
--- a/stand/efi/loader/autoload.c
+++ b/stand/efi/loader/autoload.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LOADER_FDT_SUPPORT)
#include <sys/param.h>
#include <fdt_platform.h>
diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c
index 6dad3868b840..f47d81e23591 100644
--- a/stand/efi/loader/bootinfo.c
+++ b/stand/efi/loader/bootinfo.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
#include <sys/param.h>
diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c
index 163b5835e4a7..389489726d84 100644
--- a/stand/efi/loader/conf.c
+++ b/stand/efi/loader/conf.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <bootstrap.h>
#include <efi.h>
diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c
index 6a4e65f2dbc3..12f7273edacd 100644
--- a/stand/efi/loader/copy.c
+++ b/stand/efi/loader/copy.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stand.h>
diff --git a/stand/efi/loader/efi_main.c b/stand/efi/loader/efi_main.c
index 3e1fa06638e9..25b13d5d3728 100644
--- a/stand/efi/loader/efi_main.c
+++ b/stand/efi/loader/efi_main.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <bootstrap.h>
#include <efi.h>
#include <eficonsctl.h>
diff --git a/stand/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c
index 9dfe547d7557..b8e61dc73acf 100644
--- a/stand/efi/loader/framebuffer.c
+++ b/stand/efi/loader/framebuffer.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <bootstrap.h>
#include <sys/endian.h>
#include <sys/param.h>
diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
index 5e6a10adb98b..39e32a56adc0 100644
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/disk.h>
diff --git a/stand/fdt/fdt_loader_cmd.c b/stand/fdt/fdt_loader_cmd.c
index 8703d5f05e3c..a27ac53cb13b 100644
--- a/stand/fdt/fdt_loader_cmd.c
+++ b/stand/fdt/fdt_loader_cmd.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <libfdt.h>
#include <fdt.h>
diff --git a/stand/i386/boot2/boot2.c b/stand/i386/boot2/boot2.c
index 0c35fe9b7d93..da699b58b3b4 100644
--- a/stand/i386/boot2/boot2.c
+++ b/stand/i386/boot2/boot2.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disklabel.h>
#include <sys/diskmbr.h>
diff --git a/stand/i386/common/cons.c b/stand/i386/common/cons.c
index 25dda1ce7405..c3a44499b5b4 100644
--- a/stand/i386/common/cons.c
+++ b/stand/i386/common/cons.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <machine/psl.h>
diff --git a/stand/i386/common/drv.c b/stand/i386/common/drv.c
index e2e4d55e533c..bc8927dc6c5e 100644
--- a/stand/i386/common/drv.c
+++ b/stand/i386/common/drv.c
@@ -15,8 +15,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <btxv86.h>
diff --git a/stand/i386/gptboot/gptboot.c b/stand/i386/gptboot/gptboot.c
index 78d876554c86..7cae837f9a56 100644
--- a/stand/i386/gptboot/gptboot.c
+++ b/stand/i386/gptboot/gptboot.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/gpt.h>
#include <sys/dirent.h>
diff --git a/stand/i386/isoboot/isoboot.c b/stand/i386/isoboot/isoboot.c
index f7da4c7d3101..4c3f7af8537a 100644
--- a/stand/i386/isoboot/isoboot.c
+++ b/stand/i386/isoboot/isoboot.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/gpt.h>
#include <sys/dirent.h>
diff --git a/stand/i386/libi386/bio.c b/stand/i386/libi386/bio.c
index 1bcb35f77aa1..e3b17ccc2a44 100644
--- a/stand/i386/libi386/bio.c
+++ b/stand/i386/libi386/bio.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "libi386.h"
diff --git a/stand/i386/libi386/biosacpi.c b/stand/i386/libi386/biosacpi.c
index 3bda472f3fc6..f94e8684c970 100644
--- a/stand/i386/libi386/biosacpi.c
+++ b/stand/i386/libi386/biosacpi.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <machine/stdarg.h>
#include <bootstrap.h>
diff --git a/stand/i386/libi386/biosdisk.c b/stand/i386/libi386/biosdisk.c
index 87c8c47844b0..29cd39e157b8 100644
--- a/stand/i386/libi386/biosdisk.c
+++ b/stand/i386/libi386/biosdisk.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* BIOS disk device handling.
*
diff --git a/stand/i386/libi386/biosmem.c b/stand/i386/libi386/biosmem.c
index 8596ce6abf44..eaf41743bb1f 100644
--- a/stand/i386/libi386/biosmem.c
+++ b/stand/i386/libi386/biosmem.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Obtain memory configuration information from the BIOS
*/
diff --git a/stand/i386/libi386/biospci.c b/stand/i386/libi386/biospci.c
index 968533e210c4..1003e368043d 100644
--- a/stand/i386/libi386/biospci.c
+++ b/stand/i386/libi386/biospci.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* PnP enumerator using the PCI BIOS.
*/
diff --git a/stand/i386/libi386/biospnp.c b/stand/i386/libi386/biospnp.c
index 6cd381b2ee11..7e3bc97a35ee 100644
--- a/stand/i386/libi386/biospnp.c
+++ b/stand/i386/libi386/biospnp.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* PnP BIOS enumerator.
*/
diff --git a/stand/i386/libi386/biossmap.c b/stand/i386/libi386/biossmap.c
index e95ea64517d0..a2ad83cafdba 100644
--- a/stand/i386/libi386/biossmap.c
+++ b/stand/i386/libi386/biossmap.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Obtain memory configuration information from the BIOS
*/
diff --git a/stand/i386/libi386/bootinfo.c b/stand/i386/libi386/bootinfo.c
index 92238d4fab44..cc9a42164ed3 100644
--- a/stand/i386/libi386/bootinfo.c
+++ b/stand/i386/libi386/bootinfo.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
diff --git a/stand/i386/libi386/bootinfo32.c b/stand/i386/libi386/bootinfo32.c
index 169d2dfb81f4..1b038ff6b245 100644
--- a/stand/i386/libi386/bootinfo32.c
+++ b/stand/i386/libi386/bootinfo32.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
diff --git a/stand/i386/libi386/bootinfo64.c b/stand/i386/libi386/bootinfo64.c
index bc8830d09098..2a62eba4fc09 100644
--- a/stand/i386/libi386/bootinfo64.c
+++ b/stand/i386/libi386/bootinfo64.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c
index 6d48e876fa37..8a8373cf144b 100644
--- a/stand/i386/libi386/comconsole.c
+++ b/stand/i386/libi386/comconsole.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <bootstrap.h>
#include <machine/cpufunc.h>
diff --git a/stand/i386/libi386/devicename.c b/stand/i386/libi386/devicename.c
index 99674a4ac877..c6125ba7a78b 100644
--- a/stand/i386/libi386/devicename.c
+++ b/stand/i386/libi386/devicename.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
#include "bootstrap.h"
diff --git a/stand/i386/libi386/elf32_freebsd.c b/stand/i386/libi386/elf32_freebsd.c
index 641e2733c3a2..185dc0c08d0f 100644
--- a/stand/i386/libi386/elf32_freebsd.c
+++ b/stand/i386/libi386/elf32_freebsd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/exec.h>
#include <sys/linker.h>
diff --git a/stand/i386/libi386/elf64_freebsd.c b/stand/i386/libi386/elf64_freebsd.c
index 1108a9e4d713..da034437c6e0 100644
--- a/stand/i386/libi386/elf64_freebsd.c
+++ b/stand/i386/libi386/elf64_freebsd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 64
#include <sys/param.h>
#include <sys/exec.h>
diff --git a/stand/i386/libi386/i386_copy.c b/stand/i386/libi386/i386_copy.c
index a1e7c734ebf3..3fcf9d09b280 100644
--- a/stand/i386/libi386/i386_copy.c
+++ b/stand/i386/libi386/i386_copy.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* MD primitives supporting placement of module data
*
diff --git a/stand/i386/libi386/i386_module.c b/stand/i386/libi386/i386_module.c
index 78ab61ba9a59..8c6300b3ad98 100644
--- a/stand/i386/libi386/i386_module.c
+++ b/stand/i386/libi386/i386_module.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* i386-specific module functionality.
*
diff --git a/stand/i386/libi386/multiboot.c b/stand/i386/libi386/multiboot.c
index 2d0a4a9b2274..1ac5aefebf38 100644
--- a/stand/i386/libi386/multiboot.c
+++ b/stand/i386/libi386/multiboot.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/exec.h>
#include <sys/linker.h>
diff --git a/stand/i386/libi386/nullconsole.c b/stand/i386/libi386/nullconsole.c
index ebb1e7edd2b6..b39e52630c9d 100644
--- a/stand/i386/libi386/nullconsole.c
+++ b/stand/i386/libi386/nullconsole.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <bootstrap.h>
diff --git a/stand/i386/libi386/pread.c b/stand/i386/libi386/pread.c
index 870e2540150f..854f28068ab0 100644
--- a/stand/i386/libi386/pread.c
+++ b/stand/i386/libi386/pread.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* read into destination in flat addr space */
#include <stand.h>
diff --git a/stand/i386/libi386/pxe.c b/stand/i386/libi386/pxe.c
index 3c6c5468fe37..895e8fc5ff51 100644
--- a/stand/i386/libi386/pxe.c
+++ b/stand/i386/libi386/pxe.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <errno.h>
#include <stdbool.h>
diff --git a/stand/i386/libi386/spinconsole.c b/stand/i386/libi386/spinconsole.c
index 1daac3586939..05ce33bfc5a8 100644
--- a/stand/i386/libi386/spinconsole.c
+++ b/stand/i386/libi386/spinconsole.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <bootstrap.h>
diff --git a/stand/i386/libi386/time.c b/stand/i386/libi386/time.c
index 5b8a9c9017a7..74d0fecda4de 100644
--- a/stand/i386/libi386/time.c
+++ b/stand/i386/libi386/time.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <btxv86.h>
#include "bootstrap.h"
diff --git a/stand/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c
index 7e798a1b8504..aec41a6373d6 100644
--- a/stand/i386/libi386/vidconsole.c
+++ b/stand/i386/libi386/vidconsole.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <bootstrap.h>
diff --git a/stand/i386/loader/chain.c b/stand/i386/loader/chain.c
index d4e3936e13df..5fab9183ccc3 100644
--- a/stand/i386/loader/chain.c
+++ b/stand/i386/loader/chain.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/stand/i386/loader/conf.c b/stand/i386/loader/conf.c
index 9d7f4c7b8144..329bcd577fbe 100644
--- a/stand/i386/loader/conf.c
+++ b/stand/i386/loader/conf.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <bootstrap.h>
#include "libi386/libi386.h"
diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c
index 76e309d4130b..97c4448afdc3 100644
--- a/stand/i386/loader/main.c
+++ b/stand/i386/loader/main.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* MD bootstrap main() and assorted miscellaneous
* commands.
diff --git a/stand/i386/zfsboot/zfsboot.c b/stand/i386/zfsboot/zfsboot.c
index 6b8c72ea0fb8..14464eeda567 100644
--- a/stand/i386/zfsboot/zfsboot.c
+++ b/stand/i386/zfsboot/zfsboot.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
diff --git a/stand/kboot/arch/aarch64/exec.c b/stand/kboot/arch/aarch64/exec.c
index 22fb48471dc2..5ea45226bd3e 100644
--- a/stand/kboot/arch/aarch64/exec.c
+++ b/stand/kboot/arch/aarch64/exec.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
diff --git a/stand/kboot/arch/amd64/elf64_freebsd.c b/stand/kboot/arch/amd64/elf64_freebsd.c
index c25a22f504f8..4da5a7177a33 100644
--- a/stand/kboot/arch/amd64/elf64_freebsd.c
+++ b/stand/kboot/arch/amd64/elf64_freebsd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 64
#include <sys/param.h>
#include <sys/exec.h>
diff --git a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c b/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c
index 613186ab19cb..ebf35dc72ba0 100644
--- a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c
+++ b/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 64
#include <sys/param.h>
diff --git a/stand/kboot/conf.c b/stand/kboot/conf.c
index 160cd0ad9554..b24171ab6e3e 100644
--- a/stand/kboot/conf.c
+++ b/stand/kboot/conf.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "bootstrap.h"
diff --git a/stand/kboot/hostcons.c b/stand/kboot/hostcons.c
index 9ff536279a73..24e26af2ab19 100644
--- a/stand/kboot/hostcons.c
+++ b/stand/kboot/hostcons.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "bootstrap.h"
#include "host_syscall.h"
diff --git a/stand/kboot/hostdisk.c b/stand/kboot/hostdisk.c
index d28530891e0e..a659c6e63530 100644
--- a/stand/kboot/hostdisk.c
+++ b/stand/kboot/hostdisk.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/disk.h>
#include <stdarg.h>
diff --git a/stand/kboot/kbootfdt.c b/stand/kboot/kbootfdt.c
index 3791b0c92ddd..34c475f0bb3a 100644
--- a/stand/kboot/kbootfdt.c
+++ b/stand/kboot/kbootfdt.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <fdt_platform.h>
#include <libfdt.h>
diff --git a/stand/kboot/main.c b/stand/kboot/main.c
index c8c49067bcc7..17cbfa975926 100644
--- a/stand/kboot/main.c
+++ b/stand/kboot/main.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <sys/boot.h>
diff --git a/stand/liblua/lerrno.c b/stand/liblua/lerrno.c
index defa3c73baad..3056e21aa997 100644
--- a/stand/liblua/lerrno.c
+++ b/stand/liblua/lerrno.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _WANT_KERNEL_ERRNO 1
#include <errno.h>
diff --git a/stand/liblua/lpager.c b/stand/liblua/lpager.c
index 910931e11d58..7156941eee60 100644
--- a/stand/liblua/lpager.c
+++ b/stand/liblua/lpager.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <lua.h>
#include "lauxlib.h"
diff --git a/stand/liblua/lstd.c b/stand/liblua/lstd.c
index 12675842f65d..95bf37c70d17 100644
--- a/stand/liblua/lstd.c
+++ b/stand/liblua/lstd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "lstd.h"
#include "math.h"
diff --git a/stand/liblua/lutils.c b/stand/liblua/lutils.c
index 8ae77b523270..d6c9051f9039 100644
--- a/stand/liblua/lutils.c
+++ b/stand/liblua/lutils.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include "lua.h"
diff --git a/stand/libofw/devicename.c b/stand/libofw/devicename.c
index 510fe9d92ec1..2238fd000ddd 100644
--- a/stand/libofw/devicename.c
+++ b/stand/libofw/devicename.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "bootstrap.h"
diff --git a/stand/libofw/ofw_console.c b/stand/libofw/ofw_console.c
index a129997c5df2..76942358e5c5 100644
--- a/stand/libofw/ofw_console.c
+++ b/stand/libofw/ofw_console.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "bootstrap.h"
diff --git a/stand/libofw/ofw_copy.c b/stand/libofw/ofw_copy.c
index 1d46ba29d9ca..e819c61b21f7 100644
--- a/stand/libofw/ofw_copy.c
+++ b/stand/libofw/ofw_copy.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* MD primitives supporting placement of module data
*
diff --git a/stand/libofw/ofw_disk.c b/stand/libofw/ofw_disk.c
index ae36ca8be4b9..e9002ca23fe9 100644
--- a/stand/libofw/ofw_disk.c
+++ b/stand/libofw/ofw_disk.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Disk I/O routines using Open Firmware
*/
diff --git a/stand/libofw/ofw_memory.c b/stand/libofw/ofw_memory.c
index 2b7cd87ac765..cd95827cba9a 100644
--- a/stand/libofw/ofw_memory.c
+++ b/stand/libofw/ofw_memory.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
diff --git a/stand/libofw/ofw_module.c b/stand/libofw/ofw_module.c
index d39a34344556..d5371543051c 100644
--- a/stand/libofw/ofw_module.c
+++ b/stand/libofw/ofw_module.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ofw-specific module functionality.
*
diff --git a/stand/libofw/ofw_net.c b/stand/libofw/ofw_net.c
index 0a2e7e2a8714..15bac848a340 100644
--- a/stand/libofw/ofw_net.c
+++ b/stand/libofw/ofw_net.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/stand/libofw/ofw_reboot.c b/stand/libofw/ofw_reboot.c
index bbb420ac1767..d23492695a5a 100644
--- a/stand/libofw/ofw_reboot.c
+++ b/stand/libofw/ofw_reboot.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "openfirm.h"
diff --git a/stand/libofw/ofw_time.c b/stand/libofw/ofw_time.c
index d5ca271564de..46a3c0840ac8 100644
--- a/stand/libofw/ofw_time.c
+++ b/stand/libofw/ofw_time.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "openfirm.h"
diff --git a/stand/libofw/openfirm.c b/stand/libofw/openfirm.c
index b780a9e36125..211722c08e10 100644
--- a/stand/libofw/openfirm.c
+++ b/stand/libofw/openfirm.c
@@ -56,8 +56,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <machine/stdarg.h>
diff --git a/stand/libsa/__main.c b/stand/libsa/__main.c
index e38f33865c05..f65f3a4105b4 100644
--- a/stand/libsa/__main.c
+++ b/stand/libsa/__main.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
void __main(void);
diff --git a/stand/libsa/abort.c b/stand/libsa/abort.c
index d8f66ca0ba23..266a1525054f 100644
--- a/stand/libsa/abort.c
+++ b/stand/libsa/abort.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
void
diff --git a/stand/libsa/amd64/_setjmp.S b/stand/libsa/amd64/_setjmp.S
index 38f27dc1968d..077f080faa7e 100644
--- a/stand/libsa/amd64/_setjmp.S
+++ b/stand/libsa/amd64/_setjmp.S
@@ -34,8 +34,6 @@
.asciz "@(#)_setjmp.s 5.1 (Berkeley) 4/23/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* C library -- _setjmp, _longjmp
*
diff --git a/stand/libsa/arp.c b/stand/libsa/arp.c
index 9152cb2773dd..caca08d4cc89 100644
--- a/stand/libsa/arp.c
+++ b/stand/libsa/arp.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>
diff --git a/stand/libsa/assert.c b/stand/libsa/assert.c
index 74b9fb4bacbf..35d24e4355bb 100644
--- a/stand/libsa/assert.c
+++ b/stand/libsa/assert.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include "stand.h"
diff --git a/stand/libsa/bcd.c b/stand/libsa/bcd.c
index 7bd67c91620a..600d2bbff703 100644
--- a/stand/libsa/bcd.c
+++ b/stand/libsa/bcd.c
@@ -4,8 +4,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
u_char const bcd2bin_data[] = {
diff --git a/stand/libsa/bootp.c b/stand/libsa/bootp.c
index b00c713d1c30..2dc823027234 100644
--- a/stand/libsa/bootp.c
+++ b/stand/libsa/bootp.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include <sys/types.h>
#include <sys/limits.h>
diff --git a/stand/libsa/bootparam.c b/stand/libsa/bootparam.c
index 30e109e75742..688c4be0d66f 100644
--- a/stand/libsa/bootparam.c
+++ b/stand/libsa/bootparam.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* RPC/bootparams
*/
diff --git a/stand/libsa/bzipfs.c b/stand/libsa/bzipfs.c
index efa2806ce1d4..9a14380bae51 100644
--- a/stand/libsa/bzipfs.c
+++ b/stand/libsa/bzipfs.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef REGRESSION
#include "stand.h"
#else
diff --git a/stand/libsa/cd9660.c b/stand/libsa/cd9660.c
index 57e4916c0fb5..58b16725f91e 100644
--- a/stand/libsa/cd9660.c
+++ b/stand/libsa/cd9660.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Stand-alone ISO9660 file reading package.
*
diff --git a/stand/libsa/cd9660read.c b/stand/libsa/cd9660read.c
index 3f4e667f6942..4a4501ada529 100644
--- a/stand/libsa/cd9660read.c
+++ b/stand/libsa/cd9660read.c
@@ -33,8 +33,6 @@
/* $NetBSD: cd9660.c,v 1.5 1997/06/26 19:11:33 drochner Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <fs/cd9660/iso.h>
#include <fs/cd9660/cd9660_rrip.h>
diff --git a/stand/libsa/close.c b/stand/libsa/close.c
index a177eb85eb3a..523578996483 100644
--- a/stand/libsa/close.c
+++ b/stand/libsa/close.c
@@ -61,8 +61,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
int
diff --git a/stand/libsa/closeall.c b/stand/libsa/closeall.c
index 1624788f8548..61c9d69f64d4 100644
--- a/stand/libsa/closeall.c
+++ b/stand/libsa/closeall.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
void
diff --git a/stand/libsa/dev.c b/stand/libsa/dev.c
index e76be6cd0eb0..e83af5d2e6a0 100644
--- a/stand/libsa/dev.c
+++ b/stand/libsa/dev.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/reboot.h>
diff --git a/stand/libsa/dosfs.c b/stand/libsa/dosfs.c
index e50f8f25e16a..06215b1ab0fd 100644
--- a/stand/libsa/dosfs.c
+++ b/stand/libsa/dosfs.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Readonly filesystem for Microsoft FAT12/FAT16/FAT32 filesystems,
* also supports VFAT.
diff --git a/stand/libsa/environment.c b/stand/libsa/environment.c
index 53b6a75cc020..2dabaa593524 100644
--- a/stand/libsa/environment.c
+++ b/stand/libsa/environment.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Manage an environment-like space in which string variables may be stored.
* Provide support for some method-like operations for setting/retrieving
diff --git a/stand/libsa/ether.c b/stand/libsa/ether.c
index 3616777e7955..304983295eb2 100644
--- a/stand/libsa/ether.c
+++ b/stand/libsa/ether.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <string.h>
diff --git a/stand/libsa/ext2fs.c b/stand/libsa/ext2fs.c
index 043da159f0ee..7de39c27d6ad 100644
--- a/stand/libsa/ext2fs.c
+++ b/stand/libsa/ext2fs.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/stand/libsa/fstat.c b/stand/libsa/fstat.c
index 47893416e0bf..a0bdd8fe8605 100644
--- a/stand/libsa/fstat.c
+++ b/stand/libsa/fstat.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
int
diff --git a/stand/libsa/geli/pwgets.c b/stand/libsa/geli/pwgets.c
index 450255f1ee36..5b3c85861786 100644
--- a/stand/libsa/geli/pwgets.c
+++ b/stand/libsa/geli/pwgets.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
/* gets() with constrained input length, for passwords */
diff --git a/stand/libsa/getopt.c b/stand/libsa/getopt.c
index ead2ee56267c..22c8b2b7fe0a 100644
--- a/stand/libsa/getopt.c
+++ b/stand/libsa/getopt.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95";
#endif /* LIBC_SCCS and not lint */
diff --git a/stand/libsa/gets.c b/stand/libsa/gets.c
index 206a6d25fcea..04775f6f5280 100644
--- a/stand/libsa/gets.c
+++ b/stand/libsa/gets.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
/* gets() with constrained input length */
diff --git a/stand/libsa/globals.c b/stand/libsa/globals.c
index 8fb56cf23e6b..ca8d190eeeef 100644
--- a/stand/libsa/globals.c
+++ b/stand/libsa/globals.c
@@ -8,8 +8,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
diff --git a/stand/libsa/gpt.c b/stand/libsa/gpt.c
index 6f061e4a8096..14e9821eef8e 100644
--- a/stand/libsa/gpt.c
+++ b/stand/libsa/gpt.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/gpt.h>
diff --git a/stand/libsa/gzipfs.c b/stand/libsa/gzipfs.c
index 1486df039aac..6924ad4975ca 100644
--- a/stand/libsa/gzipfs.c
+++ b/stand/libsa/gzipfs.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
#include <sys/stat.h>
diff --git a/stand/libsa/hexdump.c b/stand/libsa/hexdump.c
index 50cce47b8f30..8d62828eb9f9 100644
--- a/stand/libsa/hexdump.c
+++ b/stand/libsa/hexdump.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <stand.h>
diff --git a/stand/libsa/in_cksum.c b/stand/libsa/in_cksum.c
index 590a304271d0..cdc1110fa4a1 100644
--- a/stand/libsa/in_cksum.c
+++ b/stand/libsa/in_cksum.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/endian.h>
diff --git a/stand/libsa/inet_ntoa.c b/stand/libsa/inet_ntoa.c
index 45c79f26151d..6c32c020557c 100644
--- a/stand/libsa/inet_ntoa.c
+++ b/stand/libsa/inet_ntoa.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)inet_ntoa.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
diff --git a/stand/libsa/ioctl.c b/stand/libsa/ioctl.c
index 5d38d73bf106..26d817dbaefd 100644
--- a/stand/libsa/ioctl.c
+++ b/stand/libsa/ioctl.c
@@ -61,8 +61,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
int
diff --git a/stand/libsa/ip.c b/stand/libsa/ip.c
index f9e373bb1157..753aeb1bae5e 100644
--- a/stand/libsa/ip.c
+++ b/stand/libsa/ip.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/queue.h>
diff --git a/stand/libsa/lseek.c b/stand/libsa/lseek.c
index c4ca97b148d6..eb063394a144 100644
--- a/stand/libsa/lseek.c
+++ b/stand/libsa/lseek.c
@@ -61,8 +61,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
off_t
diff --git a/stand/libsa/mount.c b/stand/libsa/mount.c
index c9abe6b945fe..6d42f0c23faa 100644
--- a/stand/libsa/mount.c
+++ b/stand/libsa/mount.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/queue.h>
diff --git a/stand/libsa/net.c b/stand/libsa/net.c
index e04a370e466e..5125f89aaa9f 100644
--- a/stand/libsa/net.c
+++ b/stand/libsa/net.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/stand/libsa/netif.c b/stand/libsa/netif.c
index 91d07dcf96a4..30e1528bdfea 100644
--- a/stand/libsa/netif.c
+++ b/stand/libsa/netif.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/cdefs.h>
diff --git a/stand/libsa/nfs.c b/stand/libsa/nfs.c
index 8957fce51a6f..1cc8fb009944 100644
--- a/stand/libsa/nfs.c
+++ b/stand/libsa/nfs.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/stand/libsa/nullfs.c b/stand/libsa/nullfs.c
index cc77f9500786..157c8a3178ec 100644
--- a/stand/libsa/nullfs.c
+++ b/stand/libsa/nullfs.c
@@ -61,8 +61,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
/*
diff --git a/stand/libsa/nvstore.c b/stand/libsa/nvstore.c
index e5a804ff15e8..fb4cf9cac413 100644
--- a/stand/libsa/nvstore.c
+++ b/stand/libsa/nvstore.c
@@ -43,8 +43,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdbool.h>
#include <sys/queue.h>
#include "stand.h"
diff --git a/stand/libsa/open.c b/stand/libsa/open.c
index c62e48f0e1d8..fc70e2c3904a 100644
--- a/stand/libsa/open.c
+++ b/stand/libsa/open.c
@@ -61,8 +61,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
struct fs_ops *exclusive_file_system;
diff --git a/stand/libsa/pager.c b/stand/libsa/pager.c
index a966b0bd7992..b6f20c8d9420 100644
--- a/stand/libsa/pager.c
+++ b/stand/libsa/pager.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
#include <string.h>
diff --git a/stand/libsa/panic.c b/stand/libsa/panic.c
index bc6e7e2aca5a..b54668ce21cc 100644
--- a/stand/libsa/panic.c
+++ b/stand/libsa/panic.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <machine/stdarg.h>
diff --git a/stand/libsa/pkgfs.c b/stand/libsa/pkgfs.c
index 9d98e48d9a84..56e34dfe842e 100644
--- a/stand/libsa/pkgfs.c
+++ b/stand/libsa/pkgfs.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
#include <sys/stat.h>
diff --git a/stand/libsa/preload.c b/stand/libsa/preload.c
index 3d41101dc861..9ca80e2c6ab2 100644
--- a/stand/libsa/preload.c
+++ b/stand/libsa/preload.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include "stand.h"
diff --git a/stand/libsa/printf.c b/stand/libsa/printf.c
index 4de547b644dd..4d4696828988 100644
--- a/stand/libsa/printf.c
+++ b/stand/libsa/printf.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Standaloneified version of the FreeBSD kernel printf family.
*/
diff --git a/stand/libsa/random.c b/stand/libsa/random.c
index e4eee6e43c8e..8570c9d514c1 100644
--- a/stand/libsa/random.c
+++ b/stand/libsa/random.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
static long randseed = 1;
diff --git a/stand/libsa/rarp.c b/stand/libsa/rarp.c
index 72aa2650f15e..38a936a8833e 100644
--- a/stand/libsa/rarp.c
+++ b/stand/libsa/rarp.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <net/if.h>
diff --git a/stand/libsa/read.c b/stand/libsa/read.c
index d079944bf5d0..3f928f8e6916 100644
--- a/stand/libsa/read.c
+++ b/stand/libsa/read.c
@@ -61,8 +61,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include "stand.h"
diff --git a/stand/libsa/readdir.c b/stand/libsa/readdir.c
index 7757647e11e8..56c2b880d214 100644
--- a/stand/libsa/readdir.c
+++ b/stand/libsa/readdir.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include "stand.h"
diff --git a/stand/libsa/rpc.c b/stand/libsa/rpc.c
index 0f011e13a309..c1fecd422610 100644
--- a/stand/libsa/rpc.c
+++ b/stand/libsa/rpc.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* RPC functions used by NFS and bootparams.
* Note that bootparams requires the ability to find out the
diff --git a/stand/libsa/sbrk.c b/stand/libsa/sbrk.c
index 2f169ea60f66..3d9cf97a7c9b 100644
--- a/stand/libsa/sbrk.c
+++ b/stand/libsa/sbrk.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Minimal sbrk() emulation required for malloc support.
*/
diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c
index 01083fdfd756..2708cbe16502 100644
--- a/stand/libsa/smbios.c
+++ b/stand/libsa/smbios.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/endian.h>
diff --git a/stand/libsa/splitfs.c b/stand/libsa/splitfs.c
index 30762563d135..550ed708bf26 100644
--- a/stand/libsa/splitfs.c
+++ b/stand/libsa/splitfs.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
#define NTRIES (3)
diff --git a/stand/libsa/stat.c b/stand/libsa/stat.c
index f3b198955ab8..fb79723ad03f 100644
--- a/stand/libsa/stat.c
+++ b/stand/libsa/stat.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
int
diff --git a/stand/libsa/strcasecmp.c b/stand/libsa/strcasecmp.c
index 12ec81b022c4..6c149e1fa5da 100644
--- a/stand/libsa/strcasecmp.c
+++ b/stand/libsa/strcasecmp.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/cdefs.h>
#include <string.h>
#include "stand.h"
diff --git a/stand/libsa/strdup.c b/stand/libsa/strdup.c
index ad7200c69850..f256bb95afff 100644
--- a/stand/libsa/strdup.c
+++ b/stand/libsa/strdup.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)strdup.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
diff --git a/stand/libsa/strerror.c b/stand/libsa/strerror.c
index e08ca0a7f175..5895329bb8cc 100644
--- a/stand/libsa/strerror.c
+++ b/stand/libsa/strerror.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "stand.h"
static struct
diff --git a/stand/libsa/tftp.c b/stand/libsa/tftp.c
index f1e056da3561..71600fd45b85 100644
--- a/stand/libsa/tftp.c
+++ b/stand/libsa/tftp.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Simple TFTP implementation for libsa.
* Assumes:
diff --git a/stand/libsa/time.c b/stand/libsa/time.c
index c34cbfc92af1..333ca216fbad 100644
--- a/stand/libsa/time.c
+++ b/stand/libsa/time.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
volatile time_t time_second = 1;
diff --git a/stand/libsa/tslog.c b/stand/libsa/tslog.c
index a2791f9dc9c4..4501746474ea 100644
--- a/stand/libsa/tslog.c
+++ b/stand/libsa/tslog.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#if defined(__amd64__) || defined(__i386__)
diff --git a/stand/libsa/twiddle.c b/stand/libsa/twiddle.c
index 60022e4c8167..682e66424cf6 100644
--- a/stand/libsa/twiddle.c
+++ b/stand/libsa/twiddle.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "stand.h"
diff --git a/stand/libsa/udp.c b/stand/libsa/udp.c
index e531627e0577..ae7989c17451 100644
--- a/stand/libsa/udp.c
+++ b/stand/libsa/udp.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c
index cb4c7ca6453c..6239fc4bd252 100644
--- a/stand/libsa/ufs.c
+++ b/stand/libsa/ufs.c
@@ -68,8 +68,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Stand-alone file reading package.
*/
diff --git a/stand/libsa/ufsread.c b/stand/libsa/ufsread.c
index bd9ad2c57103..0ae1b3eb7149 100644
--- a/stand/libsa/ufsread.c
+++ b/stand/libsa/ufsread.c
@@ -44,8 +44,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ufs/ufs/dinode.h>
#include <ufs/ufs/dir.h>
#include <ufs/ffs/fs.h>
diff --git a/stand/libsa/write.c b/stand/libsa/write.c
index db82d7eaf4f6..2827f986974f 100644
--- a/stand/libsa/write.c
+++ b/stand/libsa/write.c
@@ -61,8 +61,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include "stand.h"
diff --git a/stand/libsa/x86/hypervisor.c b/stand/libsa/x86/hypervisor.c
index 8061a6386630..ef329059e437 100644
--- a/stand/libsa/x86/hypervisor.c
+++ b/stand/libsa/x86/hypervisor.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <machine/cpufunc.h>
#include <machine/specialreg.h>
diff --git a/stand/libsa/zalloc.c b/stand/libsa/zalloc.c
index 851cdfbd563d..3bee66c02201 100644
--- a/stand/libsa/zalloc.c
+++ b/stand/libsa/zalloc.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
/*
diff --git a/stand/libsa/zalloc_malloc.c b/stand/libsa/zalloc_malloc.c
index 215e07d34a84..aa98ad87e597 100644
--- a/stand/libsa/zalloc_malloc.c
+++ b/stand/libsa/zalloc_malloc.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* MALLOC.C - malloc equivalent, runs on top of zalloc and uses sbrk
*/
diff --git a/stand/libsa/zfs/nvlist.c b/stand/libsa/zfs/nvlist.c
index e5e0abecb274..e6634ec969d4 100644
--- a/stand/libsa/zfs/nvlist.c
+++ b/stand/libsa/zfs/nvlist.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/stdint.h>
diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c
index 64c53d3a82b8..af938fbe1b2b 100644
--- a/stand/libsa/zfs/zfs.c
+++ b/stand/libsa/zfs/zfs.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Stand-alone file reading package.
*/
diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c
index fb8938c587cd..b904ead24e1d 100644
--- a/stand/libsa/zfs/zfsimpl.c
+++ b/stand/libsa/zfs/zfsimpl.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Stand-alone ZFS file reader.
*/
diff --git a/stand/powerpc/boot1.chrp/boot1.c b/stand/powerpc/boot1.chrp/boot1.c
index 2423b5680551..2804a2a2befd 100644
--- a/stand/powerpc/boot1.chrp/boot1.c
+++ b/stand/powerpc/boot1.chrp/boot1.c
@@ -16,8 +16,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/dirent.h>
#include <sys/endian.h>
diff --git a/stand/powerpc/ofw/cas.c b/stand/powerpc/ofw/cas.c
index e95af42762a5..93816fa07cf5 100644
--- a/stand/powerpc/ofw/cas.c
+++ b/stand/powerpc/ofw/cas.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <openfirm.h>
#include <stand.h>
diff --git a/stand/powerpc/ofw/conf.c b/stand/powerpc/ofw/conf.c
index c2b28f4fe0f0..4930eea18644 100644
--- a/stand/powerpc/ofw/conf.c
+++ b/stand/powerpc/ofw/conf.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "bootstrap.h"
#include "libofw.h"
diff --git a/stand/powerpc/ofw/elf_freebsd.c b/stand/powerpc/ofw/elf_freebsd.c
index ee173d55e25c..5cd8a974cfb6 100644
--- a/stand/powerpc/ofw/elf_freebsd.c
+++ b/stand/powerpc/ofw/elf_freebsd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/stand/powerpc/ofw/main.c b/stand/powerpc/ofw/main.c
index 83ab2647f308..868d1eea6dce 100644
--- a/stand/powerpc/ofw/main.c
+++ b/stand/powerpc/ofw/main.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <stand.h>
diff --git a/stand/powerpc/ofw/ofwfdt.c b/stand/powerpc/ofw/ofwfdt.c
index ff1458ed2edf..4eccefa3d4c4 100644
--- a/stand/powerpc/ofw/ofwfdt.c
+++ b/stand/powerpc/ofw/ofwfdt.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <fdt_platform.h>
diff --git a/stand/powerpc/ofw/ppc64_elf_freebsd.c b/stand/powerpc/ofw/ppc64_elf_freebsd.c
index ece3dbc6d822..5d449c79bd36 100644
--- a/stand/powerpc/ofw/ppc64_elf_freebsd.c
+++ b/stand/powerpc/ofw/ppc64_elf_freebsd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 64
#include <sys/param.h>
diff --git a/stand/powerpc/ofw/start.c b/stand/powerpc/ofw/start.c
index 5e0744be45a3..e5973e12da84 100644
--- a/stand/powerpc/ofw/start.c
+++ b/stand/powerpc/ofw/start.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "libofw.h"
diff --git a/stand/uboot/arch/arm/conf.c b/stand/uboot/arch/arm/conf.c
index 077541220f92..90f8f929149c 100644
--- a/stand/uboot/arch/arm/conf.c
+++ b/stand/uboot/arch/arm/conf.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "bootstrap.h"
#include "libuboot.h"
diff --git a/stand/uboot/arch/powerpc/conf.c b/stand/uboot/arch/powerpc/conf.c
index 1ace9b5e53de..e36336e20196 100644
--- a/stand/uboot/arch/powerpc/conf.c
+++ b/stand/uboot/arch/powerpc/conf.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "bootstrap.h"
#include "libuboot.h"
diff --git a/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c b/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c
index feabcde3bf4a..0b4864d3a545 100644
--- a/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c
+++ b/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 64
#include <sys/param.h>
diff --git a/stand/uboot/copy.c b/stand/uboot/copy.c
index 65451d0fbec0..cc12cfaeef35 100644
--- a/stand/uboot/copy.c
+++ b/stand/uboot/copy.c
@@ -26,7 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <stand.h>
diff --git a/stand/uboot/devicename.c b/stand/uboot/devicename.c
index d5de86384369..aaeb3632bdd1 100644
--- a/stand/uboot/devicename.c
+++ b/stand/uboot/devicename.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
diff --git a/stand/uboot/elf_freebsd.c b/stand/uboot/elf_freebsd.c
index 0541edd92c64..42ed4080c363 100644
--- a/stand/uboot/elf_freebsd.c
+++ b/stand/uboot/elf_freebsd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/stand/uboot/glue.c b/stand/uboot/glue.c
index 83c0e3da41a5..782636817001 100644
--- a/stand/uboot/glue.c
+++ b/stand/uboot/glue.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <zlib.h>
diff --git a/stand/uboot/main.c b/stand/uboot/main.c
index 58de335edf7f..0106243a0e1e 100644
--- a/stand/uboot/main.c
+++ b/stand/uboot/main.c
@@ -27,7 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <stand.h>
diff --git a/stand/uboot/net.c b/stand/uboot/net.c
index 81b8c5bc9f5b..e703afcadca4 100644
--- a/stand/uboot/net.c
+++ b/stand/uboot/net.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/stand/uboot/reboot.c b/stand/uboot/reboot.c
index 9f4d277eb6f9..d8ded778130f 100644
--- a/stand/uboot/reboot.c
+++ b/stand/uboot/reboot.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "glue.h"
diff --git a/stand/uboot/time.c b/stand/uboot/time.c
index a3c73f471a25..547e3118c51b 100644
--- a/stand/uboot/time.c
+++ b/stand/uboot/time.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "glue.h"
diff --git a/stand/uboot/uboot_console.c b/stand/uboot/uboot_console.c
index f49f455c7efa..d8819b8193e2 100644
--- a/stand/uboot/uboot_console.c
+++ b/stand/uboot/uboot_console.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "bootstrap.h"
#include "glue.h"
diff --git a/stand/uboot/uboot_disk.c b/stand/uboot/uboot_disk.c
index 63a7a68e8c1b..407de94017fd 100644
--- a/stand/uboot/uboot_disk.c
+++ b/stand/uboot/uboot_disk.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disk.h>
#include <machine/stdarg.h>
diff --git a/stand/uboot/uboot_fdt.c b/stand/uboot/uboot_fdt.c
index 697aa85ea01b..4d592db1aeda 100644
--- a/stand/uboot/uboot_fdt.c
+++ b/stand/uboot/uboot_fdt.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <stand.h>
#include <fdt_platform.h>
diff --git a/stand/uboot/uboot_module.c b/stand/uboot/uboot_module.c
index 0951ed6618e4..6120dcb1d488 100644
--- a/stand/uboot/uboot_module.c
+++ b/stand/uboot/uboot_module.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* U-Boot-specific module functionality.
*/
diff --git a/stand/userboot/userboot/autoload.c b/stand/userboot/userboot/autoload.c
index a86afcfa2b4b..a165a31fa013 100644
--- a/stand/userboot/userboot/autoload.c
+++ b/stand/userboot/userboot/autoload.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
int
userboot_autoload(void)
{
diff --git a/stand/userboot/userboot/biossmap.c b/stand/userboot/userboot/biossmap.c
index 9e556be373cc..01dccacb999e 100644
--- a/stand/userboot/userboot/biossmap.c
+++ b/stand/userboot/userboot/biossmap.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
diff --git a/stand/userboot/userboot/bootinfo.c b/stand/userboot/userboot/bootinfo.c
index d77b2f3e51c7..350a906351bd 100644
--- a/stand/userboot/userboot/bootinfo.c
+++ b/stand/userboot/userboot/bootinfo.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
diff --git a/stand/userboot/userboot/bootinfo32.c b/stand/userboot/userboot/bootinfo32.c
index 782628c4126c..f4950d2f09fc 100644
--- a/stand/userboot/userboot/bootinfo32.c
+++ b/stand/userboot/userboot/bootinfo32.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
diff --git a/stand/userboot/userboot/bootinfo64.c b/stand/userboot/userboot/bootinfo64.c
index 530ddaf768ed..e44c84ea9f68 100644
--- a/stand/userboot/userboot/bootinfo64.c
+++ b/stand/userboot/userboot/bootinfo64.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
diff --git a/stand/userboot/userboot/conf.c b/stand/userboot/userboot/conf.c
index 066c2aa87492..1c6801038bb9 100644
--- a/stand/userboot/userboot/conf.c
+++ b/stand/userboot/userboot/conf.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "libuserboot.h"
diff --git a/stand/userboot/userboot/copy.c b/stand/userboot/userboot/copy.c
index f39c83c57d70..d417b015429e 100644
--- a/stand/userboot/userboot/copy.c
+++ b/stand/userboot/userboot/copy.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include "libuserboot.h"
diff --git a/stand/userboot/userboot/devicename.c b/stand/userboot/userboot/devicename.c
index 8caafd1cab67..e6f97d908ce9 100644
--- a/stand/userboot/userboot/devicename.c
+++ b/stand/userboot/userboot/devicename.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
diff --git a/stand/userboot/userboot/elf32_freebsd.c b/stand/userboot/userboot/elf32_freebsd.c
index d8ccc3375cfd..edbee9ec090e 100644
--- a/stand/userboot/userboot/elf32_freebsd.c
+++ b/stand/userboot/userboot/elf32_freebsd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/exec.h>
#include <sys/linker.h>
diff --git a/stand/userboot/userboot/elf64_freebsd.c b/stand/userboot/userboot/elf64_freebsd.c
index 12fd3aa04096..f2948006d619 100644
--- a/stand/userboot/userboot/elf64_freebsd.c
+++ b/stand/userboot/userboot/elf64_freebsd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define __ELF_WORD_SIZE 64
#include <sys/param.h>
#include <sys/exec.h>
diff --git a/stand/userboot/userboot/host.c b/stand/userboot/userboot/host.c
index d7f01f45c0ab..c222d599e4c5 100644
--- a/stand/userboot/userboot/host.c
+++ b/stand/userboot/userboot/host.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Read from the host filesystem
*/
diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c
index 3dde6f6b4109..371f4b6a4e6f 100644
--- a/stand/userboot/userboot/main.c
+++ b/stand/userboot/userboot/main.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <string.h>
#include <setjmp.h>
diff --git a/stand/userboot/userboot/userboot_cons.c b/stand/userboot/userboot/userboot_cons.c
index 89c1e70b116f..b2f8d73fa3f9 100644
--- a/stand/userboot/userboot/userboot_cons.c
+++ b/stand/userboot/userboot/userboot_cons.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stand.h>
#include <sys/font.h>
#include "bootstrap.h"
diff --git a/stand/userboot/userboot/userboot_disk.c b/stand/userboot/userboot/userboot_disk.c
index 7af31a158ed2..025fd00cb78b 100644
--- a/stand/userboot/userboot/userboot_disk.c
+++ b/stand/userboot/userboot/userboot_disk.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Userboot disk image handling.
*/
diff --git a/tests/sys/capsicum/bindat_connectat.c b/tests/sys/capsicum/bindat_connectat.c
index 03695128a675..397bbbd562ae 100644
--- a/tests/sys/capsicum/bindat_connectat.c
+++ b/tests/sys/capsicum/bindat_connectat.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/socket.h>
diff --git a/tests/sys/capsicum/ioctls_test.c b/tests/sys/capsicum/ioctls_test.c
index df5098708864..d35e1582861b 100644
--- a/tests/sys/capsicum/ioctls_test.c
+++ b/tests/sys/capsicum/ioctls_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/filio.h>
#include <sys/socket.h>
diff --git a/tests/sys/devrandom/uint128_test.c b/tests/sys/devrandom/uint128_test.c
index d1a0502b5a36..2c9b956c9c8f 100644
--- a/tests/sys/devrandom/uint128_test.c
+++ b/tests/sys/devrandom/uint128_test.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/random.h>
diff --git a/tests/sys/fifo/fifo_kqueue.c b/tests/sys/fifo/fifo_kqueue.c
index 410b389c5a41..43af68545ba9 100644
--- a/tests/sys/fifo/fifo_kqueue.c
+++ b/tests/sys/fifo/fifo_kqueue.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/event.h>
#include <sys/stat.h>
diff --git a/tests/sys/file/closefrom_test.c b/tests/sys/file/closefrom_test.c
index 729312c2fdf0..7c6787bfd5f2 100644
--- a/tests/sys/file/closefrom_test.c
+++ b/tests/sys/file/closefrom_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Regression tests for the closefrom(2) system call.
*/
diff --git a/tests/sys/kern/acct/acct_test.c b/tests/sys/kern/acct/acct_test.c
index c2e9673df8f2..b3028d518885 100644
--- a/tests/sys/kern/acct/acct_test.c
+++ b/tests/sys/kern/acct/acct_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
diff --git a/tests/sys/kern/fdgrowtable_test.c b/tests/sys/kern/fdgrowtable_test.c
index bd348e10b262..e066c97a05fb 100644
--- a/tests/sys/kern/fdgrowtable_test.c
+++ b/tests/sys/kern/fdgrowtable_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/filedesc.h>
#include <sys/queue.h>
diff --git a/tests/sys/kern/kcov.c b/tests/sys/kern/kcov.c
index d7d22109cc49..914511f7d137 100644
--- a/tests/sys/kern/kcov.c
+++ b/tests/sys/kern/kcov.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/kcov.h>
diff --git a/tests/sys/kern/kern_copyin.c b/tests/sys/kern/kern_copyin.c
index db29fb1ce3b1..25c9eda96541 100644
--- a/tests/sys/kern/kern_copyin.c
+++ b/tests/sys/kern/kern_copyin.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/exec.h>
#include <sys/sysctl.h>
diff --git a/tests/sys/kern/kern_descrip_test.c b/tests/sys/kern/kern_descrip_test.c
index 676c121da37b..b181187fa168 100644
--- a/tests/sys/kern/kern_descrip_test.c
+++ b/tests/sys/kern/kern_descrip_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/limits.h>
#include <sys/resource.h>
diff --git a/tests/sys/kern/kill_zombie.c b/tests/sys/kern/kill_zombie.c
index c7cff7ef69a7..a62b8dbab816 100644
--- a/tests/sys/kern/kill_zombie.c
+++ b/tests/sys/kern/kill_zombie.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/wait.h>
#include <atf-c.h>
diff --git a/tests/sys/kern/pdeathsig.c b/tests/sys/kern/pdeathsig.c
index 34c9adef577c..51032e07ff9f 100644
--- a/tests/sys/kern/pdeathsig.c
+++ b/tests/sys/kern/pdeathsig.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <atf-c.h>
#include <errno.h>
diff --git a/tests/sys/kern/pdeathsig_helper.c b/tests/sys/kern/pdeathsig_helper.c
index e1a82520fc17..27d286a10268 100644
--- a/tests/sys/kern/pdeathsig_helper.c
+++ b/tests/sys/kern/pdeathsig_helper.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <signal.h>
#include <sys/procctl.h>
diff --git a/tests/sys/kern/pipe/pipe_kqueue_test.c b/tests/sys/kern/pipe/pipe_kqueue_test.c
index b184d84180a7..b432e839c102 100644
--- a/tests/sys/kern/pipe/pipe_kqueue_test.c
+++ b/tests/sys/kern/pipe/pipe_kqueue_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/event.h>
#include <sys/stat.h>
diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c
index 0a0f219d6f36..5666215f9377 100644
--- a/tests/sys/kern/ptrace_test.c
+++ b/tests/sys/kern/ptrace_test.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/cpuset.h>
#include <sys/elf.h>
diff --git a/tests/sys/kern/reaper.c b/tests/sys/kern/reaper.c
index d85513882553..fb5eeb9b324b 100644
--- a/tests/sys/kern/reaper.c
+++ b/tests/sys/kern/reaper.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/procctl.h>
#include <sys/procdesc.h>
#include <sys/wait.h>
diff --git a/tests/sys/kern/sched_affinity.c b/tests/sys/kern/sched_affinity.c
index db8d9132550c..dce8678bcf6e 100644
--- a/tests/sys/kern/sched_affinity.c
+++ b/tests/sys/kern/sched_affinity.c
@@ -4,8 +4,6 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stdint.h>
#include <sys/sysctl.h>
diff --git a/tests/sys/kern/sigaltstack.c b/tests/sys/kern/sigaltstack.c
index a66ca8f578ba..36d9542e5548 100644
--- a/tests/sys/kern/sigaltstack.c
+++ b/tests/sys/kern/sigaltstack.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <atf-c.h>
#include <errno.h>
#include <signal.h>
diff --git a/tests/sys/kern/sigwait.c b/tests/sys/kern/sigwait.c
index 960a315cafce..b971985de02f 100644
--- a/tests/sys/kern/sigwait.c
+++ b/tests/sys/kern/sigwait.c
@@ -4,8 +4,6 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/limits.h>
#include <sys/time.h>
#include <sys/sysctl.h>
diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c
index 561577611353..a863705adbae 100644
--- a/tests/sys/kern/socket_msg_trunc.c
+++ b/tests/sys/kern/socket_msg_trunc.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <sys/errno.h>
diff --git a/tests/sys/kern/subr_physmem_test.c b/tests/sys/kern/subr_physmem_test.c
index 10824f7fe4ff..92420fd39ee5 100644
--- a/tests/sys/kern/subr_physmem_test.c
+++ b/tests/sys/kern/subr_physmem_test.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/physmem.h>
diff --git a/tests/sys/kern/sys_getrandom.c b/tests/sys/kern/sys_getrandom.c
index e6ef9c41fde6..5f1acdc2efb1 100644
--- a/tests/sys/kern/sys_getrandom.c
+++ b/tests/sys/kern/sys_getrandom.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/random.h>
#include <errno.h>
diff --git a/tests/sys/kern/unix_passfd_test.c b/tests/sys/kern/unix_passfd_test.c
index 16a9a304bf3a..94f0c420029a 100644
--- a/tests/sys/kern/unix_passfd_test.c
+++ b/tests/sys/kern/unix_passfd_test.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/tests/sys/kern/unix_seqpacket_test.c b/tests/sys/kern/unix_seqpacket_test.c
index 72be92ee398b..a2604d065024 100644
--- a/tests/sys/kern/unix_seqpacket_test.c
+++ b/tests/sys/kern/unix_seqpacket_test.c
@@ -23,8 +23,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <fcntl.h>
#include <pthread.h>
diff --git a/tests/sys/kern/unix_socketpair_test.c b/tests/sys/kern/unix_socketpair_test.c
index 3ca9172f3585..b994b791a2ed 100644
--- a/tests/sys/kern/unix_socketpair_test.c
+++ b/tests/sys/kern/unix_socketpair_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <fcntl.h>
#include <pthread.h>
diff --git a/tests/sys/kern/waitpid_nohang.c b/tests/sys/kern/waitpid_nohang.c
index 116ccf335d38..279eda740f78 100644
--- a/tests/sys/kern/waitpid_nohang.c
+++ b/tests/sys/kern/waitpid_nohang.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/wait.h>
#include <atf-c.h>
diff --git a/tests/sys/net/routing/test_rtsock_ops.c b/tests/sys/net/routing/test_rtsock_ops.c
index 2d085d3517ee..bc1694116404 100644
--- a/tests/sys/net/routing/test_rtsock_ops.c
+++ b/tests/sys/net/routing/test_rtsock_ops.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/socket.h>
diff --git a/tests/sys/netinet/ip_reass_test.c b/tests/sys/netinet/ip_reass_test.c
index 46b3ded7f379..f649dd9ad4db 100644
--- a/tests/sys/netinet/ip_reass_test.c
+++ b/tests/sys/netinet/ip_reass_test.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c
index 89014b3597ee..5d3b2ab03af8 100644
--- a/tests/sys/netinet/so_reuseport_lb_test.c
+++ b/tests/sys/netinet/so_reuseport_lb_test.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c
index 8c6bb4ccd294..7076f084719a 100644
--- a/tests/sys/netinet/socket_afinet.c
+++ b/tests/sys/netinet/socket_afinet.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/socket.h>
#include <netinet/in.h>
#include <errno.h>
diff --git a/tests/sys/netinet/tcp6_v4mapped_bind_test.c b/tests/sys/netinet/tcp6_v4mapped_bind_test.c
index 0d768500a150..c7fc682d7ae7 100644
--- a/tests/sys/netinet/tcp6_v4mapped_bind_test.c
+++ b/tests/sys/netinet/tcp6_v4mapped_bind_test.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/tests/sys/netinet/tcp_connect_port_test.c b/tests/sys/netinet/tcp_connect_port_test.c
index 6805c9cf1785..c8d211cc87cc 100644
--- a/tests/sys/netinet/tcp_connect_port_test.c
+++ b/tests/sys/netinet/tcp_connect_port_test.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/tests/sys/posixshm/memfd_test.c b/tests/sys/posixshm/memfd_test.c
index 0bb95b301627..5cae184206b1 100644
--- a/tests/sys/posixshm/memfd_test.c
+++ b/tests/sys/posixshm/memfd_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/fcntl.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c
index bc48863f98a0..c97a10bb0a86 100644
--- a/tests/sys/posixshm/posixshm_test.c
+++ b/tests/sys/posixshm/posixshm_test.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
diff --git a/tests/sys/vfs/lookup_cap_dotdot.c b/tests/sys/vfs/lookup_cap_dotdot.c
index 916129f7067f..416c045d2f5d 100644
--- a/tests/sys/vfs/lookup_cap_dotdot.c
+++ b/tests/sys/vfs/lookup_cap_dotdot.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/sysctl.h>
diff --git a/tests/sys/vm/mlock_test.c b/tests/sys/vm/mlock_test.c
index dfbb59a0dc91..f0c76fe86b56 100644
--- a/tests/sys/vm/mlock_test.c
+++ b/tests/sys/vm/mlock_test.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/mman.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
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/fspacectl.c b/tools/build/fspacectl.c
index 13abca23a318..478539a8798c 100644
--- a/tools/build/fspacectl.c
+++ b/tools/build/fspacectl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <fcntl.h>
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 ecf180d23b98..1640bdc631fe 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 3e813226fa5e..1ca9d43d9caa 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 12d44ae753ff..843f8f6cb135 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 fecf58f429cb..2e214af2e45b 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>
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index fc90af6d3dff..88f14c479dfb 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sbuf.h>
#include <sys/wait.h>
diff --git a/usr.bin/ar/acplex.l b/usr.bin/ar/acplex.l
index 427147ebfca6..a294de1adcfd 100644
--- a/usr.bin/ar/acplex.l
+++ b/usr.bin/ar/acplex.l
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <stdio.h>
diff --git a/usr.bin/ar/acpyacc.y b/usr.bin/ar/acpyacc.y
index ef5c5ec08569..4bfc5ab8424d 100644
--- a/usr.bin/ar/acpyacc.y
+++ b/usr.bin/ar/acpyacc.y
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/mman.h>
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index 17dd2a88d25b..9e7cc08468cd 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -61,8 +61,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/types.h>
#include <archive.h>
diff --git a/usr.bin/ar/read.c b/usr.bin/ar/read.c
index fc098e84b7bc..bd3586234c69 100644
--- a/usr.bin/ar/read.c
+++ b/usr.bin/ar/read.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/stat.h>
#include <archive.h>
diff --git a/usr.bin/ar/util.c b/usr.bin/ar/util.c
index c5ec93547fe4..920a2e00e6de 100644
--- a/usr.bin/ar/util.c
+++ b/usr.bin/ar/util.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/types.h>
#include <errno.h>
diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c
index e29f37204eee..1279a1ca7cb8 100644
--- a/usr.bin/ar/write.c
+++ b/usr.bin/ar/write.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/mman.h>
#include <sys/queue.h>
diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c
index 4491beeead04..757278442a52 100644
--- a/usr.bin/asa/asa.c
+++ b/usr.bin/asa/asa.c
@@ -38,8 +38,6 @@
__RCSID("$NetBSD: asa.c,v 1.11 1997/09/20 14:55:00 lukem Exp $");
#endif
#endif
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 2096369859b1..5b423d9d40d0 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _USE_BSD 1
/* System Headers */
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index 00418625f5d9..e72cae4596fa 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* System Headers */
#include <err.h>
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index 99b67ccd3ec6..a9223f3fb256 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* System Headers */
#include <sys/types.h>
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 0ad343e98624..9e26dbe3563d 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* System Headers */
#include <sys/types.h>
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index b28c5e440281..c7bfa6e27b19 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)banner.c 8.4 (Berkeley) 4/29/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* banner - prints large signs
* banner [-w#] [-d] [-t] message ...
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index 78f6d52e8647..c2a734688a1a 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <capsicum_helpers.h>
#include <err.h>
#include <libgen.h>
diff --git a/usr.bin/bc/bc.y b/usr.bin/bc/bc.y
index 793ad46d7f53..245748528a53 100644
--- a/usr.bin/bc/bc.y
+++ b/usr.bin/bc/bc.y
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/usr.bin/bc/scan.l b/usr.bin/bc/scan.l
index cb1977ad5c07..0f57f02e50d5 100644
--- a/usr.bin/bc/scan.l
+++ b/usr.bin/bc/scan.l
@@ -18,8 +18,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <histedit.h>
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index ad238b951366..1de902800cad 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <err.h>
diff --git a/usr.bin/bintrans/uudecode.c b/usr.bin/bintrans/uudecode.c
index 29e31d474aae..b0ab415486c8 100644
--- a/usr.bin/bintrans/uudecode.c
+++ b/usr.bin/bintrans/uudecode.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)uudecode.c 8.2 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* uudecode [file ...]
*
diff --git a/usr.bin/bintrans/uuencode.c b/usr.bin/bintrans/uuencode.c
index a0e1406c3648..267ab7deb8d1 100644
--- a/usr.bin/bintrans/uuencode.c
+++ b/usr.bin/bintrans/uuencode.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)uuencode.c 8.2 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* uuencode [input] output
*
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index c95f2aef806e..2c908efdc227 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/elf_common.h>
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c
index a1f51dbc9a64..9836b8ee96f4 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.c
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <bzlib.h>
diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c
index b7abdfb88d4a..a596ab1837dd 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.c
+++ b/usr.bin/bsdiff/bspatch/bspatch.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
#endif
diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c
index dd2d3b47d4bf..3e1fd5dbdfeb 100644
--- a/usr.bin/c89/c89.c
+++ b/usr.bin/c89/c89.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/c99/c99.c b/usr.bin/c99/c99.c
index a1752e6f4540..9040aab4e7f0 100644
--- a/usr.bin/c99/c99.c
+++ b/usr.bin/c99/c99.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/caesar/caesar.c b/usr.bin/caesar/caesar.c
index b1f9920e6a52..296fa77120cb 100644
--- a/usr.bin/caesar/caesar.c
+++ b/usr.bin/caesar/caesar.c
@@ -47,8 +47,6 @@ static const char sccsid[] = "@(#)caesar.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <math.h>
#include <stdio.h>
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 5f6d97ad1494..476c0495d218 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/calendar/dates.c b/usr.bin/calendar/dates.c
index 88fd029c5919..cdcd565dd6e6 100644
--- a/usr.bin/calendar/dates.c
+++ b/usr.bin/calendar/dates.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <err.h>
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 84562ccd9b30..7e52439cad6a 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <locale.h>
#include <stdio.h>
diff --git a/usr.bin/calendar/events.c b/usr.bin/calendar/events.c
index 5a7592ef46e8..cbc1d09f3890 100644
--- a/usr.bin/calendar/events.c
+++ b/usr.bin/calendar/events.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <err.h>
#include <langinfo.h>
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 5a77455d0ff6..5390882305a0 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/usr.bin/calendar/locale.c b/usr.bin/calendar/locale.c
index 34f0f98ca87b..572b715b8e92 100644
--- a/usr.bin/calendar/locale.c
+++ b/usr.bin/calendar/locale.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index ed6da20d827a..dfbca892cec7 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/calendar/parsedata.c b/usr.bin/calendar/parsedata.c
index 656a3c391858..7b2b4d9114b0 100644
--- a/usr.bin/calendar/parsedata.c
+++ b/usr.bin/calendar/parsedata.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <math.h>
#include <stdio.h>
diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c
index 86fa203d9ff5..4ea345f9cd5d 100644
--- a/usr.bin/calendar/paskha.c
+++ b/usr.bin/calendar/paskha.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/calendar/pom.c b/usr.bin/calendar/pom.c
index 79a0d1bbf9a3..2cd12e8f75fc 100644
--- a/usr.bin/calendar/pom.c
+++ b/usr.bin/calendar/pom.c
@@ -43,8 +43,6 @@ static const char sccsid[] = "@(#)pom.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Phase of the Moon. Calculates the current phase of the moon.
* Based on routines from `Practical Astronomy with Your Calculator',
diff --git a/usr.bin/calendar/sunpos.c b/usr.bin/calendar/sunpos.c
index 5b91f007faa9..a919f40007aa 100644
--- a/usr.bin/calendar/sunpos.c
+++ b/usr.bin/calendar/sunpos.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This code is created to match the formulas available at:
* Formula and examples obtained from "How to Calculate alt/az: SAAO" at
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index fbff878c9cc8..ff85c14b9b33 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)cap_mkdb.c 8.2 (Berkeley) 4/27/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index ec558a615901..c15c3037d8a0 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -78,8 +78,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
diff --git a/usr.bin/chkey/chkey.c b/usr.bin/chkey/chkey.c
index 55d34bcc0fc3..afacae4d0f75 100644
--- a/usr.bin/chkey/chkey.c
+++ b/usr.bin/chkey/chkey.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)chkey.c 1.7 91/03/11 Copyr 1986 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Copyright (C) 1986, Sun Microsystems, Inc.
*/
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 643b0f387c3a..b48d17e80a11 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -52,8 +52,6 @@ static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index fbe101592b3a..9c832bfbcd95 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -47,8 +47,6 @@ static char sccsid[] = "@(#)edit.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c
index 3b5129c085a1..6a3aa59b13f2 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -47,8 +47,6 @@ static char sccsid[] = "@(#)field.c 8.4 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c
index bebb27cd2ca9..29550dcad273 100644
--- a/usr.bin/chpass/table.c
+++ b/usr.bin/chpass/table.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)table.c 8.3 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stddef.h>
#include "chpass.h"
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index 6b10b684b446..2d32f228f7e8 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -46,8 +46,6 @@ static char sccsid[] = "@(#)util.c 8.4 (Berkeley) 4/2/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 6634bd1903d0..8eebb89d3263 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)cksum.c 8.2 (Berkeley) 4/28/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index b7285132e9b9..f44656737310 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 6/17/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdint.h>
diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c
index 4389969716c3..646704dcea47 100644
--- a/usr.bin/cksum/crc32.c
+++ b/usr.bin/cksum/crc32.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c
index 34766104de44..3e0967049ced 100644
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index cb32bfc43537..49d75ae45d2f 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)sum1.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <unistd.h>
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index 84c4d7a725df..bd4da5ae3fa3 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)sum2.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <unistd.h>
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index a71565760a83..56775e73ffa2 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/cmp/link.c b/usr.bin/cmp/link.c
index d19f2f49c51a..550273cb471a 100644
--- a/usr.bin/cmp/link.c
+++ b/usr.bin/cmp/link.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
#include <limits.h>
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 1dba34d28792..1924025a3a5d 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index 182a303f70ed..fbe62bb75602 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index 1342f2a86270..3da54fde24e4 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 5ed097c232b7..a3e7a25d11fb 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 739b184b6e6c..06b5e817f618 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)colrm.c 8.2 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index a253d24ca1b3..a808113649bc 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/param.h>
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 4c237606825a..e3bb682d70c6 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -45,8 +45,6 @@ static char sccsid[] = "From: @(#)comm.c 8.4 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <locale.h>
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index d50f08571e3b..602572ac31b6 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)compress.c 8.2 (Berkeley) 1/7/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index 1622508fb6c1..a5b34ef83ecb 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)zopen.c 8.1 (Berkeley) 6/27/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*-
* fcompress.c - File compression ala IEEE Computer, June 1984.
*
diff --git a/usr.bin/csplit/csplit.c b/usr.bin/csplit/csplit.c
index 431293c20f39..dd645396948d 100644
--- a/usr.bin/csplit/csplit.c
+++ b/usr.bin/csplit/csplit.c
@@ -45,8 +45,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index e36b60de4a55..25c5db5d405b 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)C.c 8.4 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stddef.h>
#include <stdio.h>
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index 9b5139f08be1..6053a52f32da 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index 4174d4fda91f..7fa6ec3823d9 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)fortran.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index 7d2c2d50b797..d167c82e7c69 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)lisp.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index 49dc371a3ebd..4174cd28d0e6 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index 85ac5dd0d8b2..15291f4a5e80 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)tree.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index bc60469db698..0fd8537fb74f 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)yacc.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/ctlstat/ctlstat.c b/usr.bin/ctlstat/ctlstat.c
index f21ddf65c404..8aed0f52e350 100644
--- a/usr.bin/ctlstat/ctlstat.c
+++ b/usr.bin/ctlstat/ctlstat.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/callout.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index f5847794f313..796ab66c0c6e 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -39,8 +39,6 @@ static const char copyright[] =
static const char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/dc/bcode.c b/usr.bin/dc/bcode.c
index d9a42073e6b3..0e34f0399035 100644
--- a/usr.bin/dc/bcode.c
+++ b/usr.bin/dc/bcode.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <openssl/ssl.h>
diff --git a/usr.bin/dc/dc.c b/usr.bin/dc/dc.c
index 79e0aca87a74..4f9a55f450bb 100644
--- a/usr.bin/dc/dc.c
+++ b/usr.bin/dc/dc.c
@@ -18,8 +18,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/dc/inout.c b/usr.bin/dc/inout.c
index 29d8d147e9e7..a91531b2c769 100644
--- a/usr.bin/dc/inout.c
+++ b/usr.bin/dc/inout.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <openssl/ssl.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.bin/dc/mem.c b/usr.bin/dc/mem.c
index 0bb3ef39c759..95c5068f2041 100644
--- a/usr.bin/dc/mem.c
+++ b/usr.bin/dc/mem.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <openssl/err.h>
#include <err.h>
diff --git a/usr.bin/dc/stack.c b/usr.bin/dc/stack.c
index ba7c7e4a589b..c4b15dda4a14 100644
--- a/usr.bin/dc/stack.c
+++ b/usr.bin/dc/stack.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
index 8b8b1f65c07b..03eb363fc323 100644
--- a/usr.bin/diff/diff.c
+++ b/usr.bin/diff/diff.c
@@ -21,8 +21,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <ctype.h>
diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c
index c5a32c217c36..798229e990df 100644
--- a/usr.bin/diff/diffdir.c
+++ b/usr.bin/diff/diffdir.c
@@ -21,8 +21,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <dirent.h>
diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
index d9b08aece64a..11aefb73cda6 100644
--- a/usr.bin/diff/diffreg.c
+++ b/usr.bin/diff/diffreg.c
@@ -67,8 +67,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/stat.h>
diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c
index 4c7108cd7451..5dedf689351c 100644
--- a/usr.bin/diff/pr.c
+++ b/usr.bin/diff/pr.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/procdesc.h>
#include <sys/wait.h>
diff --git a/usr.bin/diff/xmalloc.c b/usr.bin/diff/xmalloc.c
index 9d02238e87f7..69ccae83cfdd 100644
--- a/usr.bin/diff/xmalloc.c
+++ b/usr.bin/diff/xmalloc.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdarg.h>
#include <stdint.h>
diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c
index d52678846fae..e80b1d142231 100644
--- a/usr.bin/diff3/diff3.c
+++ b/usr.bin/diff3/diff3.c
@@ -70,8 +70,6 @@ static char sccsid[] = "@(#)diff3.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/procdesc.h>
#include <sys/types.h>
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index 38028423dd45..58083e8a0cbf 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -39,8 +39,6 @@ static const char copyright[] =
static const char sccsid[] = "@(#)dirname.c 8.4 (Berkeley) 5/4/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <capsicum_helpers.h>
#include <err.h>
#include <libgen.h>
diff --git a/usr.bin/dpv/dpv.c b/usr.bin/dpv/dpv.c
index 725b24f6bbe9..1fd89eca77c8 100644
--- a/usr.bin/dpv/dpv.c
+++ b/usr.bin/dpv/dpv.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 012e439bba34..ead3e952ce0f 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -44,8 +44,6 @@ static const char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/elfctl/elfctl.c b/usr.bin/elfctl/elfctl.c
index 5c15ddd43528..d9cb557bbad4 100644
--- a/usr.bin/elfctl/elfctl.c
+++ b/usr.bin/elfctl/elfctl.c
@@ -48,9 +48,6 @@
#include <unistd.h>
#include "_elftc.h"
-
-__FBSDID("$FreeBSD$");
-
static bool convert_to_feature_val(const char *, uint32_t *);
static bool edit_file_features(Elf *, int, int, char *, bool);
static bool get_file_features(Elf *, int, int, uint32_t *, uint64_t *, bool);
diff --git a/usr.bin/elfdump/elfdump.c b/usr.bin/elfdump/elfdump.c
index 0ab64534ac50..e5d5bccc414e 100644
--- a/usr.bin/elfdump/elfdump.c
+++ b/usr.bin/elfdump/elfdump.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
diff --git a/usr.bin/enigma/enigma.c b/usr.bin/enigma/enigma.c
index 0961d8764331..32f8972b238a 100644
--- a/usr.bin/enigma/enigma.c
+++ b/usr.bin/enigma/enigma.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index 4c4e36d12075..784caa76063e 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)env.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/env/envopts.c b/usr.bin/env/envopts.c
index 3834385f3139..8b8df5b47e71 100644
--- a/usr.bin/env/envopts.c
+++ b/usr.bin/env/envopts.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/etdump/etdump.c b/usr.bin/etdump/etdump.c
index e393eba61a84..6c4a256e15f5 100644
--- a/usr.bin/etdump/etdump.c
+++ b/usr.bin/etdump/etdump.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <getopt.h>
#include <libgen.h>
diff --git a/usr.bin/etdump/output_shell.c b/usr.bin/etdump/output_shell.c
index d1e1d570269b..d709684c02dc 100644
--- a/usr.bin/etdump/output_shell.c
+++ b/usr.bin/etdump/output_shell.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdbool.h>
#include <stdio.h>
diff --git a/usr.bin/etdump/output_text.c b/usr.bin/etdump/output_text.c
index 26b19e9c7ab9..aafc6d702a54 100644
--- a/usr.bin/etdump/output_text.c
+++ b/usr.bin/etdump/output_text.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdbool.h>
#include <stdio.h>
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 26f350d9ac53..ae063c2c6499 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <locale.h>
diff --git a/usr.bin/factor/factor.c b/usr.bin/factor/factor.c
index 0b53ac3b5836..cc25b9dd2bf5 100644
--- a/usr.bin/factor/factor.c
+++ b/usr.bin/factor/factor.c
@@ -43,7 +43,6 @@ __SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95");
__RCSID("$NetBSD: factor.c,v 1.19 2009/08/12 05:54:31 dholland Exp $");
#endif
#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
#endif
#endif /* not lint */
diff --git a/usr.bin/false/false.c b/usr.bin/false/false.c
index 3f2c61dd7e9d..7b3f1199626f 100644
--- a/usr.bin/false/false.c
+++ b/usr.bin/false/false.c
@@ -39,8 +39,6 @@ static const char copyright[] =
static const char sccsid[] = "@(#)false.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
int
main(void)
{
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index ad51de15f4d3..8be5742386e7 100644
--- a/usr.bin/fetch/fetch.c
+++ b/usr.bin/fetch/fetch.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index e50bd1f8a46d..3f9b81aaf834 100644
--- a/usr.bin/file2c/file2c.c
+++ b/usr.bin/file2c/file2c.c
@@ -8,8 +8,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index 656a7e06204e..3bff4982b4b6 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)find.c 8.5 (Berkeley) 8/5/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 0b78d9cafce1..d887c8479099 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -37,8 +37,6 @@ static const char sccsid[] = "@(#)function.c 8.10 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ucred.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/getdate.y b/usr.bin/find/getdate.y
index d1326537c67b..a1aeaf0cacd6 100644
--- a/usr.bin/find/getdate.y
+++ b/usr.bin/find/getdate.y
@@ -13,8 +13,6 @@
/* SUPPRESS 288 on yyerrlab *//* Label unused */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <ctype.h>
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index 8d7406216256..d8a150a30eea 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -34,8 +34,6 @@ static char sccsid[] = "@(#)ls.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 6090f71d6e7c..56f1feece6e4 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index 4ac402ede446..0ef7af894b2d 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)misc.c 8.2 (Berkeley) 4/1/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index 83094b801835..2a2317da765f 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)operator.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index d467b80f2687..c5b461f3389b 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)option.c 8.2 (Berkeley) 4/16/94";
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 6f357f9d994b..c489b4b84c49 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -55,8 +55,6 @@ static char sccsid[] = "@(#)finger.c 8.5 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Finger prints out information about users. It is not portable since
* certain fields (e.g. the full user name, office, and phone numbers) are
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index a169e5ca5b92..d276855afaec 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)lprint.c 8.3 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 659bae0c2f78..3ed3ac0813f9 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)net.c 8.4 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/uio.h>
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 3e629df1b274..af7802acc177 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)sprint.c 8.3 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 5a19d25ba626..39a6553b16c7 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index 967de1309e9e..78646f4e37a2 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -173,8 +173,6 @@ static const char copyright[] =
"Copyright (c) 1997 Gareth McCaughan. All rights reserved.\n";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <locale.h>
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index e2995ee049cd..1124f373828c 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)fold.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <locale.h>
diff --git a/usr.bin/fortune/fortune/fortune.c b/usr.bin/fortune/fortune/fortune.c
index 0a49c3229077..62977e15d5e3 100644
--- a/usr.bin/fortune/fortune/fortune.c
+++ b/usr.bin/fortune/fortune/fortune.c
@@ -42,8 +42,6 @@ static const char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/endian.h>
diff --git a/usr.bin/fortune/strfile/strfile.c b/usr.bin/fortune/strfile/strfile.c
index abc35946e77e..15caadd27c0d 100644
--- a/usr.bin/fortune/strfile/strfile.c
+++ b/usr.bin/fortune/strfile/strfile.c
@@ -42,8 +42,6 @@ static const char sccsid[] = "@(#)strfile.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <ctype.h>
diff --git a/usr.bin/fortune/unstr/unstr.c b/usr.bin/fortune/unstr/unstr.c
index 77ee1ecce608..de67c2b790d5 100644
--- a/usr.bin/fortune/unstr/unstr.c
+++ b/usr.bin/fortune/unstr/unstr.c
@@ -42,8 +42,6 @@ static const char sccsid[] = "@(#)unstr.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This program un-does what "strfile" makes, thereby obtaining the
* original file again. This can be invoked with the name of the output
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 5569ec1c2757..8579ed37ae0c 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)from.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index ee5ba0ca1f0b..c3374ecfffac 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/user.h>
#include <sys/stat.h>
diff --git a/usr.bin/fstat/fuser.c b/usr.bin/fstat/fuser.c
index 87e5284c53eb..2e2befde6392 100644
--- a/usr.bin/fstat/fuser.c
+++ b/usr.bin/fstat/fuser.c
@@ -27,8 +27,6 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/fstat/main.c b/usr.bin/fstat/main.c
index 6d2c0ff43d0c..c1ad8cacc147 100644
--- a/usr.bin/fstat/main.c
+++ b/usr.bin/fstat/main.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <libgen.h>
#include <stdlib.h>
diff --git a/usr.bin/fsync/fsync.c b/usr.bin/fsync/fsync.c
index 1ec963587810..16d5a176da93 100644
--- a/usr.bin/fsync/fsync.c
+++ b/usr.bin/fsync/fsync.c
@@ -29,8 +29,6 @@
#ifndef lint
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index b1d1d4898e13..2bffd409bb11 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/param.h>
#include <sys/procfs.h>
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 8055193625f9..52630fb976b4 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)gcore.c 8.2 (Berkeley) 9/23/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Originally written by Eric Cooper in Fall 1981.
* Inspired by a version 6 program by Len Levin, 1978.
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c
index f79bbb56d5cd..d618c49fcc32 100644
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@@ -67,8 +67,6 @@ up-to-date. Many thanks.
******************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _NLS_PRIVATE
#include <sys/types.h>
diff --git a/usr.bin/getaddrinfo/getaddrinfo.c b/usr.bin/getaddrinfo/getaddrinfo.c
index a42fe1a201c9..f01ccd7b2e10 100644
--- a/usr.bin/getaddrinfo/getaddrinfo.c
+++ b/usr.bin/getaddrinfo/getaddrinfo.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c
index 8edb3c380a4b..a4434c31fd36 100644
--- a/usr.bin/getconf/getconf.c
+++ b/usr.bin/getconf/getconf.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/getent/getent.c b/usr.bin/getent/getent.c
index 440d59a7a41d..34fcf0571a43 100644
--- a/usr.bin/getent/getent.c
+++ b/usr.bin/getent/getent.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/socket.h>
#include <sys/param.h>
#include <arpa/inet.h>
diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c
index 970a4c7659af..09036a34b657 100644
--- a/usr.bin/getopt/getopt.c
+++ b/usr.bin/getopt/getopt.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This material, written by Henry Spencer, was released by him
* into the public domain and is thus not subject to any copyright.
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index 5198654c880d..e70a0f5628a2 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)arcs.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include "gprof.h"
diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c
index ef03b3924b5c..5c4104f50825 100644
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)dfn.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include "gprof.h"
diff --git a/usr.bin/gprof/elf.c b/usr.bin/gprof/elf.c
index b4dbf279e525..8f7d21dc08cb 100644
--- a/usr.bin/gprof/elf.c
+++ b/usr.bin/gprof/elf.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)gprof.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index 2723eb2d8178..ef4f0e27d6de 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)gprof.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <stdint.h>
diff --git a/usr.bin/gprof/hertz.c b/usr.bin/gprof/hertz.c
index 684c9767aa6e..0a6726345cb7 100644
--- a/usr.bin/gprof/hertz.c
+++ b/usr.bin/gprof/hertz.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)hertz.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
/*
diff --git a/usr.bin/gprof/kernel.c b/usr.bin/gprof/kernel.c
index 7af98977de24..ca2d53ed3f56 100644
--- a/usr.bin/gprof/kernel.c
+++ b/usr.bin/gprof/kernel.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index 8279ff5bc876..b399ec199856 100644
--- a/usr.bin/gprof/lookup.c
+++ b/usr.bin/gprof/lookup.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)lookup.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "gprof.h"
/*
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index a38527598698..b7bd70489fb5 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)printgprof.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <string.h>
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index bf07aa85cb47..93040990bc23 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)printlist.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <string.h>
diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c
index 12c524188583..2845f0ec225d 100644
--- a/usr.bin/grep/file.c
+++ b/usr.bin/grep/file.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index 4b7cbc4e1bb0..cbf52a4df820 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/grep/queue.c b/usr.bin/grep/queue.c
index 1b74c1799991..3ef8a640b37d 100644
--- a/usr.bin/grep/queue.c
+++ b/usr.bin/grep/queue.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index 723b41e8798a..68bfd504279e 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c
index 560fdd31d6f0..8eddac4adcdd 100644
--- a/usr.bin/gzip/gzip.c
+++ b/usr.bin/gzip/gzip.c
@@ -34,7 +34,6 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008,\
2009, 2010, 2011, 2015, 2017 Matthew R. Green. All rights reserved.");
-__FBSDID("$FreeBSD$");
#endif /* not lint */
/*
diff --git a/usr.bin/gzip/unxz.c b/usr.bin/gzip/unxz.c
index 1764358b210d..de6683b246b8 100644
--- a/usr.bin/gzip/unxz.c
+++ b/usr.bin/gzip/unxz.c
@@ -31,8 +31,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdarg.h>
#include <errno.h>
#include <stdio.h>
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index e323099754ab..d3c3cacdf018 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)head.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/types.h>
diff --git a/usr.bin/hesinfo/hesinfo.c b/usr.bin/hesinfo/hesinfo.c
index fa81864a5d00..ed91f14f5644 100644
--- a/usr.bin/hesinfo/hesinfo.c
+++ b/usr.bin/hesinfo/hesinfo.c
@@ -19,8 +19,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <hesiod.h>
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
index 160158b0a5b6..591826efa6a6 100644
--- a/usr.bin/hexdump/conv.c
+++ b/usr.bin/hexdump/conv.c
@@ -33,8 +33,6 @@
static const char sccsid[] = "@(#)conv.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index b4e7084e1e97..6c0018dcef3c 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/conf.h>
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index ff97a189b1f2..a71728c9f800 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)hexdump.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index 3ab9a3b4a686..2253e4e4c4e7 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)hexsyntax.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 5032d434d445..6cd07197de67 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)odsyntax.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index c6616fdd24d7..e16dd416d6e0 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index b8988dedd6f6..772558191306 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)id.c 8.2 (Berkeley) 2/16/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mac.h>
diff --git a/usr.bin/ident/ident.c b/usr.bin/ident/ident.c
index 14ff8ec8f335..84ac402f74d0 100644
--- a/usr.bin/ident/ident.c
+++ b/usr.bin/ident/ident.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/types.h>
#include <sys/sbuf.h>
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 58ab9bf4b9f2..2f8ea7659128 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)args.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Argument scanning and profile reading code. Default parameters are set
* here as well.
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index 7af4c6ae17c6..5d97a5069add 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)indent.c 5.17 (Berkeley) 6/7/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/indent/indent.h b/usr.bin/indent/indent.h
index a15acb7e6fbf..bbbb5dc805dd 100644
--- a/usr.bin/indent/indent.h
+++ b/usr.bin/indent/indent.h
@@ -27,7 +27,6 @@
*/
#if 0
-__FBSDID("$FreeBSD$");
#endif
void add_typename(const char *);
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 4a27a74ff6fa..65568891cf16 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c
index c47db6baead3..7ad1ddc74fff 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)lexi.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Here we have the token scanner for indent. It scans off one token and puts
* it in the global variable "token". It returns a code, indicating the type
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index 68e07bc922e7..b6e8ee076fd6 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include "indent_globs.h"
diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c
index 229e4005423e..58ef9a0eec0f 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)pr_comment.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index 7f132c182a07..6c2361f056d2 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#define _WANT_SYSVMSG_INTERNALS
#include <sys/msg.h>
diff --git a/usr.bin/ipcs/ipc.c b/usr.bin/ipcs/ipc.c
index d48389dd54bb..0729f27e5945 100644
--- a/usr.bin/ipcs/ipc.c
+++ b/usr.bin/ipcs/ipc.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
#define _WANT_SYSVMSG_INTERNALS
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index cc1884ad0e0b..bcb4f1953fa1 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/proc.h>
#define _WANT_SYSVMSG_INTERNALS
diff --git a/usr.bin/iscsictl/iscsictl.c b/usr.bin/iscsictl/iscsictl.c
index 698f2cebbe6d..d95cb9a1c096 100644
--- a/usr.bin/iscsictl/iscsictl.c
+++ b/usr.bin/iscsictl/iscsictl.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/usr.bin/iscsictl/periphs.c b/usr.bin/iscsictl/periphs.c
index e4d4f99264b9..1f623277af10 100644
--- a/usr.bin/iscsictl/periphs.c
+++ b/usr.bin/iscsictl/periphs.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 0ad4b467793e..b9e708dd98cd 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)join.c 8.6 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 23c8e1a24d6c..deda23a0c75a 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)jot.c 8.1 (Berkeley) 6/6/93";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* jot - print sequential or random data
*
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index bff2920c6aa5..cb8f5ff1f537 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)kdump.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _WANT_KERNEL_ERRNO
#ifdef __LP64__
#define _WANT_KEVENT32
diff --git a/usr.bin/kdump/linux.c b/usr.bin/kdump/linux.c
index 48c82b2a8017..4b115f051b44 100644
--- a/usr.bin/kdump/linux.c
+++ b/usr.bin/kdump/linux.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/uio.h>
#include <sys/ktrace.h>
diff --git a/usr.bin/keylogin/keylogin.c b/usr.bin/keylogin/keylogin.c
index 3f4bdba94d21..021935163a1d 100644
--- a/usr.bin/keylogin/keylogin.c
+++ b/usr.bin/keylogin/keylogin.c
@@ -31,8 +31,6 @@
static char sccsid[] = "@(#)keylogin.c 1.4 91/03/11 Copyr 1986 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Copyright (C) 1986, Sun Microsystems, Inc.
*/
diff --git a/usr.bin/keylogout/keylogout.c b/usr.bin/keylogout/keylogout.c
index c7ec0496b676..03eeee0f6417 100644
--- a/usr.bin/keylogout/keylogout.c
+++ b/usr.bin/keylogout/keylogout.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* unset the secret key on local machine
*/
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
index 6966460236b2..deedd06cada7 100644
--- a/usr.bin/killall/killall.c
+++ b/usr.bin/killall/killall.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/stat.h>
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 1b477fca2fc1..27c31dd83035 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)ktrace.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 7049985740ff..b52ae1b981ec 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/proc.h>
diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c
index 4718a577f52d..f1c49cbbd418 100644
--- a/usr.bin/ktrdump/ktrdump.c
+++ b/usr.bin/ktrdump/ktrdump.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/ktr.h>
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 693e9903cd36..7b27eb6194b4 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)lam.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* lam - laminate files
* Author: John Kunze, UCB
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index 28d14dbbaceb..846ab5d2c087 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -40,8 +40,6 @@ static const char copyright[] =
static const char sccsid[] = "@(#)last.c 8.2 (Berkeley) 4/2/94";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/queue.h>
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 3f712066fe6d..bcd84b2ed37a 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)lastcomm.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/acct.h>
diff --git a/usr.bin/lastcomm/readrec.c b/usr.bin/lastcomm/readrec.c
index 03991e0282c7..b99e76645402 100644
--- a/usr.bin/lastcomm/readrec.c
+++ b/usr.bin/lastcomm/readrec.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index 148df2df9468..5dcac0e56c2f 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/wait.h>
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index bc2d524b7f94..f9e40be124a0 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)leave.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <ctype.h>
#include <locale.h>
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index 558d8adf1f0a..68b1853651b9 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -22,8 +22,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <string.h>
diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c
index cfa05ef8152c..bc302965de1a 100644
--- a/usr.bin/localedef/charmap.c
+++ b/usr.bin/localedef/charmap.c
@@ -32,8 +32,6 @@
* CHARMAP file handling for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/tree.h>
diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c
index 0bed283b6aab..d76c2c2c08b2 100644
--- a/usr.bin/localedef/collate.c
+++ b/usr.bin/localedef/collate.c
@@ -32,8 +32,6 @@
* LC_COLLATE database generation routines for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/tree.h>
diff --git a/usr.bin/localedef/ctype.c b/usr.bin/localedef/ctype.c
index 02e525c5aed2..ab7b76e57b2d 100644
--- a/usr.bin/localedef/ctype.c
+++ b/usr.bin/localedef/ctype.c
@@ -33,8 +33,6 @@
* LC_CTYPE database generation routines for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/tree.h>
#include <stdio.h>
diff --git a/usr.bin/localedef/localedef.c b/usr.bin/localedef/localedef.c
index 390ebf8784ef..ae0bd052b40c 100644
--- a/usr.bin/localedef/localedef.c
+++ b/usr.bin/localedef/localedef.c
@@ -32,8 +32,6 @@
* POSIX localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/localedef/messages.c b/usr.bin/localedef/messages.c
index a25711c4a17b..6b8eb9d684dd 100644
--- a/usr.bin/localedef/messages.c
+++ b/usr.bin/localedef/messages.c
@@ -32,8 +32,6 @@
* LC_MESSAGES database generation routines for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/usr.bin/localedef/monetary.c b/usr.bin/localedef/monetary.c
index dd144d73b806..659c495a71fe 100644
--- a/usr.bin/localedef/monetary.c
+++ b/usr.bin/localedef/monetary.c
@@ -32,8 +32,6 @@
* LC_MONETARY database generation routines for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/usr.bin/localedef/numeric.c b/usr.bin/localedef/numeric.c
index 2950420897ca..358355fe96ae 100644
--- a/usr.bin/localedef/numeric.c
+++ b/usr.bin/localedef/numeric.c
@@ -32,8 +32,6 @@
* LC_NUMERIC database generation routines for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/usr.bin/localedef/scanner.c b/usr.bin/localedef/scanner.c
index 2c0c2d0465e1..c6d45a993f28 100644
--- a/usr.bin/localedef/scanner.c
+++ b/usr.bin/localedef/scanner.c
@@ -33,8 +33,6 @@
* for localedef for processing by the higher level grammar processor.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
diff --git a/usr.bin/localedef/time.c b/usr.bin/localedef/time.c
index 8715abb42aa0..2de922a8eb12 100644
--- a/usr.bin/localedef/time.c
+++ b/usr.bin/localedef/time.c
@@ -32,8 +32,6 @@
* LC_TIME database generation routines for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/usr.bin/localedef/wide.c b/usr.bin/localedef/wide.c
index 808239620dbb..062e120e6912 100644
--- a/usr.bin/localedef/wide.c
+++ b/usr.bin/localedef/wide.c
@@ -35,8 +35,6 @@
* this approach means that we need a method for each and every encoding.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <stdlib.h>
#include <wchar.h>
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 30b7e7ac9df6..5932699244f0 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)lock.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Lock a terminal up until the given key is entered or the given
* interval times out.
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 3f582d014314..c98c584bc6a9 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index 32fda60717d6..18292010c7ca 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)logger.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 2ac0d9324c26..c96738151151 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -47,8 +47,6 @@ static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* login [ name ]
* login -h hostname (for telnetd, etc.)
diff --git a/usr.bin/login/login_audit.c b/usr.bin/login/login_audit.c
index 91aa4336c659..59b182e19de3 100644
--- a/usr.bin/login/login_audit.c
+++ b/usr.bin/login/login_audit.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <bsm/libbsm.h>
diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c
index f4f0516a5a3c..0fb9289346c0 100644
--- a/usr.bin/login/login_fbtab.c
+++ b/usr.bin/login/login_fbtab.c
@@ -59,8 +59,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/usr.bin/logins/logins.c b/usr.bin/logins/logins.c
index 48f4abf302af..aef7eb7aba5b 100644
--- a/usr.bin/logins/logins.c
+++ b/usr.bin/logins/logins.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <grp.h>
#include <pwd.h>
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index c939e49eddfc..6da78d384921 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -39,8 +39,6 @@ static const char copyright[] =
static const char sccsid[] = "@(#)logname.c 8.2 (Berkeley) 4/3/94";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <capsicum_helpers.h>
#include <err.h>
#include <unistd.h>
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index cded8d398401..459105ba0d73 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)look.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* look -- find lines in a sorted list.
*
diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c
index 596a4ddf23d4..4ec983287607 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -6,8 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index c55bac4bbc8c..82218eb9ba1c 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -36,9 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-
/*
* eval.c
* Facility: m4 macro processor
diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index 8a64217b5768..7910403d74f0 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -15,8 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <stdio.h>
#include <stddef.h>
diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c
index f09033786161..ecd89b5c8b6a 100644
--- a/usr.bin/m4/gnum4.c
+++ b/usr.bin/m4/gnum4.c
@@ -27,8 +27,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* functions needed to support gnu-m4 extensions, including a fake freezing
*/
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index acda95996033..d7ad94b18bd0 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -34,8 +34,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* look.c
* Facility: m4 macro processor
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index f776ca8594e4..d68069cb10a8 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -41,8 +41,6 @@
* by: oz
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <signal.h>
#include <err.h>
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 52d122ff241e..4533e106a37f 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
#include <unistd.h>
diff --git a/usr.bin/m4/trace.c b/usr.bin/m4/trace.c
index cce4c79e79b7..fe84c5ee405f 100644
--- a/usr.bin/m4/trace.c
+++ b/usr.bin/m4/trace.c
@@ -26,8 +26,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 0689c1eb0cb5..1f08ed3e37a6 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)cmd1.c 8.2 (Berkeley) 4/20/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index 2c0f8d55e299..7aaf1d4891ff 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <sys/wait.h>
#include "extern.h"
diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c
index 2b4a20b96bb5..089299ad7853 100644
--- a/usr.bin/mail/cmd3.c
+++ b/usr.bin/mail/cmd3.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)cmd3.c 8.2 (Berkeley) 4/20/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index 7937849a1141..ae55c8314f9d 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "def.h"
#include "extern.h"
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index e8249a10f867..ccb3b60bec2b 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index bc7f4beb29fb..b4f3ec88effa 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)edit.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <fcntl.h>
#include "extern.h"
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index 338062817b14..77339080bc01 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)fio.c 8.2 (Berkeley) 4/20/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <sys/file.h>
#include <sys/wait.h>
diff --git a/usr.bin/mail/getname.c b/usr.bin/mail/getname.c
index 728c6aac4b22..ec76be9ff02d 100644
--- a/usr.bin/mail/getname.c
+++ b/usr.bin/mail/getname.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)getname.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <pwd.h>
#include "extern.h"
diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c
index 831c99c71579..9446b3b3ab74 100644
--- a/usr.bin/mail/head.c
+++ b/usr.bin/mail/head.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)head.c 8.2 (Berkeley) 4/20/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index dfca9edeab8e..b931d6e16a15 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index 9f1305edba78..3507d0b5dc98 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)list.c 8.4 (Berkeley) 5/1/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <ctype.h>
#include "extern.h"
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index 5ea48985cc2e..ec64d04c20b6 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/20/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <fcntl.h>
#include "extern.h"
diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c
index 9e08b0870c50..9ab6cf52e6a2 100644
--- a/usr.bin/mail/names.c
+++ b/usr.bin/mail/names.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)names.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index b28539a90cff..29f7fb9f0922 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)popen.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <sys/wait.h>
#include <fcntl.h>
diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c
index e9d93285c65e..a6ac212b8f92 100644
--- a/usr.bin/mail/quit.c
+++ b/usr.bin/mail/quit.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)quit.c 8.2 (Berkeley) 4/28/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <fcntl.h>
#include "extern.h"
diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c
index 702dbd031216..002157ba55cb 100644
--- a/usr.bin/mail/send.c
+++ b/usr.bin/mail/send.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)send.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c
index 804313387370..52ef8a8627be 100644
--- a/usr.bin/mail/strings.c
+++ b/usr.bin/mail/strings.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)strings.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 85aa06fc6900..d1fdaadc89bf 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)temp.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index ed5c5f546347..92cec3c6865c 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)tty.c 8.2 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/util.c b/usr.bin/mail/util.c
index 7187d1b520f9..9300484814e0 100644
--- a/usr.bin/mail/util.c
+++ b/usr.bin/mail/util.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)aux.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <fcntl.h>
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c
index 25e31783a5f9..4b473f6f2a9b 100644
--- a/usr.bin/mail/v7.local.c
+++ b/usr.bin/mail/v7.local.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)v7.local.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c
index afed46a72b7c..439d8fb62145 100644
--- a/usr.bin/mail/vars.c
+++ b/usr.bin/mail/vars.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/version.c b/usr.bin/mail/version.c
index e9d2c7f15140..c9f44b417882 100644
--- a/usr.bin/mail/version.c
+++ b/usr.bin/mail/version.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)version.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Just keep track of the date/sid of this version of Mail.
* Load this file first to get a "total" Mail version.
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index f998e4cde7ac..a4b4f649dbd6 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -46,8 +46,6 @@ static char sccsid[] = "@(#)mesg.c 8.2 (Berkeley) 1/21/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/ministat/ministat.c b/usr.bin/ministat/ministat.c
index aa6bc27f89ab..32472a8acee7 100644
--- a/usr.bin/ministat/ministat.c
+++ b/usr.bin/ministat/ministat.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/ioctl.h>
#include <sys/queue.h>
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 91355c142fce..44a828766382 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)mkfifo.c 8.2 (Berkeley) 1/5/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/mkimg/apm.c b/usr.bin/mkimg/apm.c
index e1a591a9924c..259a7533c27c 100644
--- a/usr.bin/mkimg/apm.c
+++ b/usr.bin/mkimg/apm.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/usr.bin/mkimg/bsd.c b/usr.bin/mkimg/bsd.c
index 035bbae910f9..17933c01ac07 100644
--- a/usr.bin/mkimg/bsd.c
+++ b/usr.bin/mkimg/bsd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/usr.bin/mkimg/ebr.c b/usr.bin/mkimg/ebr.c
index bee2e64bea14..4d6adbb3b8ba 100644
--- a/usr.bin/mkimg/ebr.c
+++ b/usr.bin/mkimg/ebr.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/usr.bin/mkimg/format.c b/usr.bin/mkimg/format.c
index bca61c17ce47..6730c22ca153 100644
--- a/usr.bin/mkimg/format.c
+++ b/usr.bin/mkimg/format.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <errno.h>
#include <string.h>
diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c
index a071fbfac272..59c51a6a177b 100644
--- a/usr.bin/mkimg/gpt.c
+++ b/usr.bin/mkimg/gpt.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/usr.bin/mkimg/image.c b/usr.bin/mkimg/image.c
index b9e51ebe9f3a..07aaf1a6c0ea 100644
--- a/usr.bin/mkimg/image.c
+++ b/usr.bin/mkimg/image.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/mman.h>
#include <sys/stat.h>
#include <assert.h>
diff --git a/usr.bin/mkimg/mbr.c b/usr.bin/mkimg/mbr.c
index e52e9df7ca64..7bda01c72e6a 100644
--- a/usr.bin/mkimg/mbr.c
+++ b/usr.bin/mkimg/mbr.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c
index 71af45b5815d..bcf500cd675f 100644
--- a/usr.bin/mkimg/mkimg.c
+++ b/usr.bin/mkimg/mkimg.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/usr.bin/mkimg/qcow.c b/usr.bin/mkimg/qcow.c
index de4a48169789..2dc3e5498420 100644
--- a/usr.bin/mkimg/qcow.c
+++ b/usr.bin/mkimg/qcow.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <assert.h>
#include <stdio.h>
diff --git a/usr.bin/mkimg/raw.c b/usr.bin/mkimg/raw.c
index f94a0050ca60..2de674b908ac 100644
--- a/usr.bin/mkimg/raw.c
+++ b/usr.bin/mkimg/raw.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <unistd.h>
diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c
index 5afe3245a2ba..85ed94013e8d 100644
--- a/usr.bin/mkimg/scheme.c
+++ b/usr.bin/mkimg/scheme.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <assert.h>
#include <errno.h>
diff --git a/usr.bin/mkimg/uuid.c b/usr.bin/mkimg/uuid.c
index 215e8acb385f..470d92c76293 100644
--- a/usr.bin/mkimg/uuid.c
+++ b/usr.bin/mkimg/uuid.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <string.h>
diff --git a/usr.bin/mkimg/vhd.c b/usr.bin/mkimg/vhd.c
index 871873804544..1e1f1e7f3c3e 100644
--- a/usr.bin/mkimg/vhd.c
+++ b/usr.bin/mkimg/vhd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/mkimg/vhdx.c b/usr.bin/mkimg/vhdx.c
index 744d6e810ca5..e280250bd964 100644
--- a/usr.bin/mkimg/vhdx.c
+++ b/usr.bin/mkimg/vhdx.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/mkimg/vmdk.c b/usr.bin/mkimg/vmdk.c
index eac84d8bae4d..132eb801387a 100644
--- a/usr.bin/mkimg/vmdk.c
+++ b/usr.bin/mkimg/vmdk.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 8d572d1d5b6a..cefc564181c3 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)mkstr.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <stdio.h>
diff --git a/usr.bin/mkuzip/mkuz_blk.c b/usr.bin/mkuzip/mkuz_blk.c
index cfc527379260..347532a972bf 100644
--- a/usr.bin/mkuzip/mkuz_blk.c
+++ b/usr.bin/mkuzip/mkuz_blk.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <stdlib.h>
diff --git a/usr.bin/mkuzip/mkuz_blockcache.c b/usr.bin/mkuzip/mkuz_blockcache.c
index a369eebf287c..ffaad69dd7b3 100644
--- a/usr.bin/mkuzip/mkuz_blockcache.c
+++ b/usr.bin/mkuzip/mkuz_blockcache.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/mkuzip/mkuz_conveyor.c b/usr.bin/mkuzip/mkuz_conveyor.c
index 2cfae1c0775c..b355be419907 100644
--- a/usr.bin/mkuzip/mkuz_conveyor.c
+++ b/usr.bin/mkuzip/mkuz_conveyor.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
#include <inttypes.h>
diff --git a/usr.bin/mkuzip/mkuz_fqueue.c b/usr.bin/mkuzip/mkuz_fqueue.c
index db47a05cb5ae..ef823e19d0d7 100644
--- a/usr.bin/mkuzip/mkuz_fqueue.c
+++ b/usr.bin/mkuzip/mkuz_fqueue.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <pthread.h>
#include <stdint.h>
diff --git a/usr.bin/mkuzip/mkuz_insize.c b/usr.bin/mkuzip/mkuz_insize.c
index f1c2d1eaca71..f0b2f39229ed 100644
--- a/usr.bin/mkuzip/mkuz_insize.c
+++ b/usr.bin/mkuzip/mkuz_insize.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/disk.h>
#include <sys/ioctl.h>
#include <sys/param.h>
diff --git a/usr.bin/mkuzip/mkuz_lzma.c b/usr.bin/mkuzip/mkuz_lzma.c
index bab2820f7c38..1c2ccf6a5045 100644
--- a/usr.bin/mkuzip/mkuz_lzma.c
+++ b/usr.bin/mkuzip/mkuz_lzma.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
#include <stdint.h>
diff --git a/usr.bin/mkuzip/mkuz_time.c b/usr.bin/mkuzip/mkuz_time.c
index a2219578d7fb..10ad7aead3b5 100644
--- a/usr.bin/mkuzip/mkuz_time.c
+++ b/usr.bin/mkuzip/mkuz_time.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
#include <stdint.h>
#include <time.h>
diff --git a/usr.bin/mkuzip/mkuz_zlib.c b/usr.bin/mkuzip/mkuz_zlib.c
index fa2519ffb60d..7ec6fe378235 100644
--- a/usr.bin/mkuzip/mkuz_zlib.c
+++ b/usr.bin/mkuzip/mkuz_zlib.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
#include <stdint.h>
diff --git a/usr.bin/mkuzip/mkuz_zstd.c b/usr.bin/mkuzip/mkuz_zstd.c
index d7f3a704688d..e188b42ee0d5 100644
--- a/usr.bin/mkuzip/mkuz_zstd.c
+++ b/usr.bin/mkuzip/mkuz_zstd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <stddef.h>
diff --git a/usr.bin/mkuzip/mkuzip.c b/usr.bin/mkuzip/mkuzip.c
index c834432a8347..05d974a77748 100644
--- a/usr.bin/mkuzip/mkuzip.c
+++ b/usr.bin/mkuzip/mkuzip.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/endian.h>
#include <sys/param.h>
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index f7a18e1682cb..e4b3b09efc81 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)msgs.c 8.2 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* msgs - a user bulletin board program
*
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index cfada982eaf8..035fbaabf1a6 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -72,8 +72,6 @@ static char sccsid[] = "@(#)mt.c 8.2 (Berkeley) 5/4/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* mt --
* magnetic tape manipulation program
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 1018e2216002..20d14b3a4bde 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <calendar.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c
index ca0359466353..c9b28b5eb085 100644
--- a/usr.bin/netstat/bpf.c
+++ b/usr.bin/netstat/bpf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/common.c b/usr.bin/netstat/common.c
index 9dbbaeee25ea..4b1a778737dc 100644
--- a/usr.bin/netstat/common.c
+++ b/usr.bin/netstat/common.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 8fe9e3a3c924..2ac36fde94f9 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)if.c 8.3 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 691f9d9e912c..19f7ba1490c4 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -34,8 +34,6 @@ static char sccsid[] = "@(#)inet.c 8.5 (Berkeley) 5/24/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/domain.h>
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 2724590de7d3..b88e84ecc564 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)inet6.c 8.4 (Berkeley) 4/20/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef INET6
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index c15fb5a2b5aa..8a2fe55bd562 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -91,8 +91,6 @@ static char sccsid[] = "@(#)inet.c 8.5 (Berkeley) 5/24/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index e8a808bb4f56..481284cb88a6 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 3/1/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/file.h>
#ifdef JAIL
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 2391de8b2c9c..657caa865667 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)mbuf.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index 73b51b57c89e..a5da29e89009 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -40,8 +40,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Print multicast routing structures and statistics.
*
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index e992d11e7d39..5873c1ee85c6 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -68,8 +68,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef INET6
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c
index 68ebcf7eff0a..95821efc39ac 100644
--- a/usr.bin/netstat/netgraph.c
+++ b/usr.bin/netstat/netgraph.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/nhgrp.c b/usr.bin/netstat/nhgrp.c
index 45175f30e56b..99bc5ce7d593 100644
--- a/usr.bin/netstat/nhgrp.c
+++ b/usr.bin/netstat/nhgrp.c
@@ -26,7 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/netstat/pfkey.c b/usr.bin/netstat/pfkey.c
index 6e382f290a8e..4ee26f5d25da 100644
--- a/usr.bin/netstat/pfkey.c
+++ b/usr.bin/netstat/pfkey.c
@@ -66,8 +66,6 @@ static char sccsid[] = "@(#)inet.c 8.5 (Berkeley) 5/24/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index c597f3632fa6..9096d5f58daf 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -36,8 +36,6 @@ static char sccsid[] = "From: @(#)route.c 8.6 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/route_netlink.c b/usr.bin/netstat/route_netlink.c
index 3b1880fb9d90..796f8d3eca68 100644
--- a/usr.bin/netstat/route_netlink.c
+++ b/usr.bin/netstat/route_netlink.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
index 5f67e9157880..09aea6cbf46d 100644
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)sctp.c 0.1 (Berkeley) 4/18/2007";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/types.h>
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 685cbff2cd3f..3852651d2eae 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)unix.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Display protocol blocks in the unix domain.
*/
diff --git a/usr.bin/newgrp/newgrp.c b/usr.bin/newgrp/newgrp.c
index bec6806661df..4a00cbbd45c6 100644
--- a/usr.bin/newgrp/newgrp.c
+++ b/usr.bin/newgrp/newgrp.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/newkey/generic.c b/usr.bin/newkey/generic.c
index 324cb5b604ad..124695ac259b 100644
--- a/usr.bin/newkey/generic.c
+++ b/usr.bin/newkey/generic.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)generic.c 1.2 91/03/11 Copyr 1986 Sun Micro";
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/file.h>
#include <rpc/rpc.h>
diff --git a/usr.bin/newkey/newkey.c b/usr.bin/newkey/newkey.c
index cc4a73f18081..6efe64993ec5 100644
--- a/usr.bin/newkey/newkey.c
+++ b/usr.bin/newkey/newkey.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)newkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
* Administrative tool to add a new user to the publickey database
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index b6d18c47c954..514476eabf8c 100644
--- a/usr.bin/newkey/update.c
+++ b/usr.bin/newkey/update.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
* Administrative tool to add a new user to the publickey database
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index 7d29cac05936..3aee7cfaa68a 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)nice.c 8.2 (Berkeley) 4/16/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 358cca73fbf2..cbabf5a7552f 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)nohup.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 7896428eb1c8..b2ca1b352108 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 9296b94118b8..98d480b3c355 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)paste.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/pathchk/pathchk.c b/usr.bin/pathchk/pathchk.c
index 651243388735..821c5de0ee22 100644
--- a/usr.bin/pathchk/pathchk.c
+++ b/usr.bin/pathchk/pathchk.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/perror/perror.c b/usr.bin/perror/perror.c
index f6ffc9a5587c..2ef65adf56e2 100644
--- a/usr.bin/perror/perror.c
+++ b/usr.bin/perror/perror.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/pom/pom.c b/usr.bin/pom/pom.c
index 8e7bf8d8f84e..01370114f36e 100644
--- a/usr.bin/pom/pom.c
+++ b/usr.bin/pom/pom.c
@@ -41,8 +41,6 @@ static const char sccsid[] = "@(#)pom.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Phase of the Moon. Calculates the current phase of the moon.
* Based on routines from `Practical Astronomy with Your Calculator',
diff --git a/usr.bin/posixshmcontrol/posixshmcontrol.c b/usr.bin/posixshmcontrol/posixshmcontrol.c
index 5bb8aa473502..8b9206c56800 100644
--- a/usr.bin/posixshmcontrol/posixshmcontrol.c
+++ b/usr.bin/posixshmcontrol/posixshmcontrol.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/filio.h>
#include <sys/mman.h>
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 4c60204c10e0..a193f64b614b 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)egetopt.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <stdio.h>
#include <string.h>
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index cc6d290ca4c2..295566677c1f 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -50,8 +50,6 @@ static char sccsid[] = "@(#)pr.c 8.2 (Berkeley) 4/16/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/usr.bin/primes/spsp.c b/usr.bin/primes/spsp.c
index 8afd5f12b50f..a07dbab016c1 100644
--- a/usr.bin/primes/spsp.c
+++ b/usr.bin/primes/spsp.c
@@ -24,8 +24,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include <stdint.h>
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 485e4da2f252..69e102d1f520 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)printenv.c 8.2 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/proccontrol/proccontrol.c b/usr.bin/proccontrol/proccontrol.c
index d9237c4c6b33..5b48ef2916f8 100644
--- a/usr.bin/proccontrol/proccontrol.c
+++ b/usr.bin/proccontrol/proccontrol.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/procctl.h>
#include <err.h>
#include <stdbool.h>
diff --git a/usr.bin/procstat/procstat.c b/usr.bin/procstat/procstat.c
index a0d5b91072ca..445ea213ba2a 100644
--- a/usr.bin/procstat/procstat.c
+++ b/usr.bin/procstat/procstat.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_args.c b/usr.bin/procstat/procstat_args.c
index a43915e0d901..c618bc37a7ca 100644
--- a/usr.bin/procstat/procstat_args.c
+++ b/usr.bin/procstat/procstat_args.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_auxv.c b/usr.bin/procstat/procstat_auxv.c
index 0bc51f125a45..9c37c511d190 100644
--- a/usr.bin/procstat/procstat_auxv.c
+++ b/usr.bin/procstat/procstat_auxv.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/elf.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/procstat/procstat_basic.c b/usr.bin/procstat/procstat_basic.c
index cc08c8674e65..082689b6bd84 100644
--- a/usr.bin/procstat/procstat_basic.c
+++ b/usr.bin/procstat/procstat_basic.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_bin.c b/usr.bin/procstat/procstat_bin.c
index 223d16f66909..a0e272808f1c 100644
--- a/usr.bin/procstat/procstat_bin.c
+++ b/usr.bin/procstat/procstat_bin.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_cred.c b/usr.bin/procstat/procstat_cred.c
index a98d622e4f66..f37a328e362f 100644
--- a/usr.bin/procstat/procstat_cred.c
+++ b/usr.bin/procstat/procstat_cred.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_cs.c b/usr.bin/procstat/procstat_cs.c
index 9fcc92de143f..89da29c598c2 100644
--- a/usr.bin/procstat/procstat_cs.c
+++ b/usr.bin/procstat/procstat_cs.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/sbuf.h>
diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c
index 87995c7602a4..99a0580f50d4 100644
--- a/usr.bin/procstat/procstat_files.c
+++ b/usr.bin/procstat/procstat_files.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/socket.h>
diff --git a/usr.bin/procstat/procstat_kstack.c b/usr.bin/procstat/procstat_kstack.c
index aa27a65be019..c1b7e06a64f7 100644
--- a/usr.bin/procstat/procstat_kstack.c
+++ b/usr.bin/procstat/procstat_kstack.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_penv.c b/usr.bin/procstat/procstat_penv.c
index d374aa7e0a74..188f761149e5 100644
--- a/usr.bin/procstat/procstat_penv.c
+++ b/usr.bin/procstat/procstat_penv.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_ptlwpinfo.c b/usr.bin/procstat/procstat_ptlwpinfo.c
index 5c2515397121..b2b27a4746ab 100644
--- a/usr.bin/procstat/procstat_ptlwpinfo.c
+++ b/usr.bin/procstat/procstat_ptlwpinfo.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ptrace.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_pwdx.c b/usr.bin/procstat/procstat_pwdx.c
index fc8500314255..f364856b0b27 100644
--- a/usr.bin/procstat/procstat_pwdx.c
+++ b/usr.bin/procstat/procstat_pwdx.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/socket.h>
diff --git a/usr.bin/procstat/procstat_rlimit.c b/usr.bin/procstat/procstat_rlimit.c
index 17e91a2b3a4d..f2dcfcd47327 100644
--- a/usr.bin/procstat/procstat_rlimit.c
+++ b/usr.bin/procstat/procstat_rlimit.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/procstat/procstat_rusage.c b/usr.bin/procstat/procstat_rusage.c
index 3d8c76370c0c..5ee01c3211fd 100644
--- a/usr.bin/procstat/procstat_rusage.c
+++ b/usr.bin/procstat/procstat_rusage.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_sigs.c b/usr.bin/procstat/procstat_sigs.c
index 21104abf7096..973d622f2036 100644
--- a/usr.bin/procstat/procstat_sigs.c
+++ b/usr.bin/procstat/procstat_sigs.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_threads.c b/usr.bin/procstat/procstat_threads.c
index b20085366ee1..d0679a830441 100644
--- a/usr.bin/procstat/procstat_threads.c
+++ b/usr.bin/procstat/procstat_threads.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c
index cf1cc58380c3..26a8fee57d1c 100644
--- a/usr.bin/procstat/procstat_vm.c
+++ b/usr.bin/procstat/procstat_vm.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/protect/protect.c b/usr.bin/protect/protect.c
index 1bf807d7919c..12c5c53083b1 100644
--- a/usr.bin/protect/protect.c
+++ b/usr.bin/protect/protect.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/procctl.h>
#include <sys/types.h>
#include <sys/mman.h>
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 2b8411c0f3b8..d09f8f317850 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -46,8 +46,6 @@ static const char sccsid[] = "from: @(#)quota.c 8.1 (Berkeley) 6/6/93";
* Disk quota reporting program.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/file.h>
diff --git a/usr.bin/random/random.c b/usr.bin/random/random.c
index 4325469608a8..7e19e26b30cc 100644
--- a/usr.bin/random/random.c
+++ b/usr.bin/random/random.c
@@ -42,8 +42,6 @@ static const char sccsid[] = "@(#)random.c 8.5 (Berkeley) 4/5/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/random/randomize_fd.c b/usr.bin/random/randomize_fd.c
index a60bb0c15e68..5efd1974b54d 100644
--- a/usr.bin/random/randomize_fd.c
+++ b/usr.bin/random/randomize_fd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
diff --git a/usr.bin/rctl/rctl.c b/usr.bin/rctl/rctl.c
index 1dbc945f1954..e7b2ec24bcb4 100644
--- a/usr.bin/rctl/rctl.c
+++ b/usr.bin/rctl/rctl.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/rctl.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 42e93cce240e..25a9c5130180 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)renice.c 8.1 (Berkeley) 6/9/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/resizewin/resizewin.c b/usr.bin/resizewin/resizewin.c
index e53364cf1254..c6fefd79624c 100644
--- a/usr.bin/resizewin/resizewin.c
+++ b/usr.bin/resizewin/resizewin.c
@@ -28,7 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/ioctl.h>
#include <sys/time.h>
#include <err.h>
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index ab357fc275e1..c6ef785ed456 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)rev.c 8.3 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/revoke/revoke.c b/usr.bin/revoke/revoke.c
index 3996ca8df8ce..a332a470edd5 100644
--- a/usr.bin/revoke/revoke.c
+++ b/usr.bin/revoke/revoke.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index 713cba11d55a..c5cfa473036f 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_clntout.c, Client-stub outputter for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsytsems, Inc.
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 6e245bf6ca42..257ca67e702d 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_cout.c, XDR routine outputter for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index 6aa6ff7b4667..fb1163010563 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_hout.c, Header file outputter for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 6576d6cfb919..91ad16683cec 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_main.c, Top level of the RPC protocol compiler.
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index 0081106f8512..ac9409295e66 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_parse.c, Parser for the RPC protocol compiler
* Copyright (C) 1987 Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c
index 5d6c9a9a9b0c..d0c8c21ecdea 100644
--- a/usr.bin/rpcgen/rpc_sample.c
+++ b/usr.bin/rpcgen/rpc_sample.c
@@ -30,8 +30,6 @@
/* #pragma ident "@(#)rpc_sample.c 1.9 94/04/25 SMI" */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c
index 49466bd18849..4d6fba6a1980 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_scan.c, Scanner for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index 06951940ff4e..e339b50b83f6 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 618d1f998bbe..0b17ff9541ac 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler
* Copyright (C) 1989, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 13b3a028bcd5..03f5ba24683c 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_util.c, Utility routines for the RPC protocol compiler
* Copyright (C) 1989, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index c528a145319b..6945c1de481f 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)rpcinfo.c 1.16 89/04/05 Copyr 1986 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpcinfo: ping a particular rpc program
* or dump the registered programs on the remote machine.
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 62a771b02d39..44941afd1369 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -40,8 +40,6 @@ static const char sccsid[] = "@(#)ruptime.c 8.2 (Berkeley) 4/5/94";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <protocols/rwhod.h>
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 2ed658a14400..511579aa0341 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -45,8 +45,6 @@ static const char sccsid[] = "from: @(#)wall.c 5.14 (Berkeley) 3/2/91";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This program is not related to David Wall, whose Stanford Ph.D. thesis
* is entitled "Mechanisms for Broadcast and Selective Broadcast".
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index adc697989a18..aef64911d80e 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)rwho.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/param.h>
#include <sys/file.h>
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 72e639e413dd..b3a1869fcb42 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -31,7 +31,6 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD$");
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1980, 1992, 1993\n\
diff --git a/usr.bin/sdiff/edit.c b/usr.bin/sdiff/edit.c
index 993b515c49b5..af49fd16a2ad 100644
--- a/usr.bin/sdiff/edit.c
+++ b/usr.bin/sdiff/edit.c
@@ -6,8 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/usr.bin/sdiff/sdiff.c b/usr.bin/sdiff/sdiff.c
index 9cfecbc79378..b863d5875db6 100644
--- a/usr.bin/sdiff/sdiff.c
+++ b/usr.bin/sdiff/sdiff.c
@@ -6,8 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/sdiotool/cam_sdio.c b/usr.bin/sdiotool/cam_sdio.c
index 3d074eb391fa..0cd8eeb0485a 100644
--- a/usr.bin/sdiotool/cam_sdio.c
+++ b/usr.bin/sdiotool/cam_sdio.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "cam_sdio.h"
/* Use CMD52 to read or write a single byte */
diff --git a/usr.bin/sdiotool/cam_sdio.h b/usr.bin/sdiotool/cam_sdio.h
index ea3ea48025f0..10d668951bfe 100644
--- a/usr.bin/sdiotool/cam_sdio.h
+++ b/usr.bin/sdiotool/cam_sdio.h
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/usr.bin/sdiotool/linux_compat.h b/usr.bin/sdiotool/linux_compat.h
index dd35ab89a684..58611fe52242 100644
--- a/usr.bin/sdiotool/linux_compat.h
+++ b/usr.bin/sdiotool/linux_compat.h
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef _LINUX_COMPAT_H_
#define _LINUX_COMPAT_H_
diff --git a/usr.bin/sdiotool/linux_sdio_compat.c b/usr.bin/sdiotool/linux_sdio_compat.c
index 93b6d40835c1..7d89bff01dcf 100644
--- a/usr.bin/sdiotool/linux_sdio_compat.c
+++ b/usr.bin/sdiotool/linux_sdio_compat.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/usr.bin/sdiotool/linux_sdio_compat.h b/usr.bin/sdiotool/linux_sdio_compat.h
index 1422cc0ab60f..2b56a74d624f 100644
--- a/usr.bin/sdiotool/linux_sdio_compat.h
+++ b/usr.bin/sdiotool/linux_sdio_compat.h
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef _LINUX_SDIO_COMPAT_H_
#define _LINUX_SDIO_COMPAT_H_
diff --git a/usr.bin/sdiotool/sdiotool.c b/usr.bin/sdiotool/sdiotool.c
index 80aad26266da..448fe830f7dd 100644
--- a/usr.bin/sdiotool/sdiotool.c
+++ b/usr.bin/sdiotool/sdiotool.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index a7cb3cbd6a73..9c2eba953301 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char sccsid[] = "@(#)compile.c 8.1 (Berkeley) 6/6/93";
#endif
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 4139b69da2f8..efa28b5e7239 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1992, 1993\n\
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index 7068f705d70b..9d677475aeb6 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
#endif
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index 261c6239c273..3d88096ffb77 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char sccsid[] = "@(#)process.c 8.6 (Berkeley) 4/20/94";
#endif
diff --git a/usr.bin/seq/seq.c b/usr.bin/seq/seq.c
index d3d074985d85..2a35ef51690f 100644
--- a/usr.bin/seq/seq.c
+++ b/usr.bin/seq/seq.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c
index b50fd5f11e12..378fbbf0fef5 100644
--- a/usr.bin/sockstat/sockstat.c
+++ b/usr.bin/sockstat/sockstat.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/socket.h>
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index 72406f62a4f8..8d012a20254b 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c
index d84c5558ba6f..fc1b50cb78ac 100644
--- a/usr.bin/sort/bwstring.c
+++ b/usr.bin/sort/bwstring.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <errno.h>
#include <err.h>
diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c
index 410137e36153..a8bdc4c3e8ae 100644
--- a/usr.bin/sort/coll.c
+++ b/usr.bin/sort/coll.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c
index 4fd3c153816c..339c9b8de270 100644
--- a/usr.bin/sort/file.c
+++ b/usr.bin/sort/file.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/sort/mem.c b/usr.bin/sort/mem.c
index 8f0a44569fe6..ce5ad3b901f4 100644
--- a/usr.bin/sort/mem.c
+++ b/usr.bin/sort/mem.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/sort/radixsort.c b/usr.bin/sort/radixsort.c
index 7add9c498f5f..5ee998500d30 100644
--- a/usr.bin/sort/radixsort.c
+++ b/usr.bin/sort/radixsort.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <err.h>
#include <langinfo.h>
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index 09c21635c9ca..6e4023c43063 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/sysctl.h>
#include <sys/types.h>
diff --git a/usr.bin/sort/vsort.c b/usr.bin/sort/vsort.c
index 6cc22e4adbde..6b04feff8f6b 100644
--- a/usr.bin/sort/vsort.c
+++ b/usr.bin/sort/vsort.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index cee3980ea291..b5a457ab6ecd 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1987, 1993, 1994\n\
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index 40e0b23950ab..720069db3195 100644
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -36,9 +36,6 @@ __RCSID("$NetBSD: stat.c,v 1.33 2011/01/15 22:54:10 njoly Exp $"
"$OpenBSD: stat.c,v 1.14 2009/06/24 09:44:25 sobrado Exp $");
#endif
#endif
-
-__FBSDID("$FreeBSD$");
-
#if HAVE_CONFIG_H
#include "config.h"
#else /* HAVE_CONFIG_H */
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 65c5640b0bae..3d97ab8deb30 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -72,8 +72,6 @@ static char sccsid[] = "@(#)su.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 0bec6aceaaa1..00a077720dfa 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)pigs.c 8.2 (Berkeley) 9/23/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Pigs display from Bill Reeves at Lucasfilm
*/
diff --git a/usr.bin/systat/sctp.c b/usr.bin/systat/sctp.c
index b2170d965e79..928472dbfdc5 100644
--- a/usr.bin/systat/sctp.c
+++ b/usr.bin/systat/sctp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.bin/systat/sysput.c b/usr.bin/systat/sysput.c
index 491c4223e2d2..78d681158766 100644
--- a/usr.bin/systat/sysput.c
+++ b/usr.bin/systat/sysput.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index 76f4c77d009f..935a138be8e7 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -39,8 +39,6 @@ static const char rcsid[] =
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.bin/systat/zarc.c b/usr.bin/systat/zarc.c
index abc5336a6cf7..f2971094cdbe 100644
--- a/usr.bin/systat/zarc.c
+++ b/usr.bin/systat/zarc.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/tabs/tabs.c b/usr.bin/tabs/tabs.c
index e01d7fcc6e0e..7aa50472c343 100644
--- a/usr.bin/tabs/tabs.c
+++ b/usr.bin/tabs/tabs.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/tty.h>
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 3373f072c228..12231530e679 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)reverse.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 9cc18fbb0d5b..15ca7e03eb70 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
/*
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index d5f36e77d853..9d727fe8bc2c 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)tftp.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
/*
diff --git a/usr.bin/tip/libacu/biz22.c b/usr.bin/tip/libacu/biz22.c
index 7e0a2acd8468..099697a309e7 100644
--- a/usr.bin/tip/libacu/biz22.c
+++ b/usr.bin/tip/libacu/biz22.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)biz22.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/biz31.c b/usr.bin/tip/libacu/biz31.c
index dc8f26af13ce..830946598084 100644
--- a/usr.bin/tip/libacu/biz31.c
+++ b/usr.bin/tip/libacu/biz31.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)biz31.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/courier.c b/usr.bin/tip/libacu/courier.c
index a0a9b5c0efff..e8413e340ecb 100644
--- a/usr.bin/tip/libacu/courier.c
+++ b/usr.bin/tip/libacu/courier.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)courier.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/df.c b/usr.bin/tip/libacu/df.c
index cef96080b1b0..7148ca12897b 100644
--- a/usr.bin/tip/libacu/df.c
+++ b/usr.bin/tip/libacu/df.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)df.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/dn11.c b/usr.bin/tip/libacu/dn11.c
index 385ba8b61be1..28ae987f77b6 100644
--- a/usr.bin/tip/libacu/dn11.c
+++ b/usr.bin/tip/libacu/dn11.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)dn11.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/hayes.c b/usr.bin/tip/libacu/hayes.c
index 12e8401bfd6e..b82f8466539f 100644
--- a/usr.bin/tip/libacu/hayes.c
+++ b/usr.bin/tip/libacu/hayes.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)hayes.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/t3000.c b/usr.bin/tip/libacu/t3000.c
index 861d8d04e007..a8507e7c7ffd 100644
--- a/usr.bin/tip/libacu/t3000.c
+++ b/usr.bin/tip/libacu/t3000.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)t3000.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/v3451.c b/usr.bin/tip/libacu/v3451.c
index 3fe6c21b9b14..3a8db034c614 100644
--- a/usr.bin/tip/libacu/v3451.c
+++ b/usr.bin/tip/libacu/v3451.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)v3451.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/v831.c b/usr.bin/tip/libacu/v831.c
index 60666383700e..a635654f8b0b 100644
--- a/usr.bin/tip/libacu/v831.c
+++ b/usr.bin/tip/libacu/v831.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)v831.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index df086625e9a6..18af5396405d 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)ventel.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 1177e67bea28..2b0c5219566e 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)acu.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index 49f1b4a4a608..502d42225d6f 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)acutab.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index 6676ae34ac94..734455ca2823 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index d8c1231fffa5..49ba3dade12b 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index 6c888d1d6e63..639d99125ffe 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)cu.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 2f6711d0b14d..c32c0f181cff 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)hunt.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index aeb324ad7ef8..953b0185c4d0 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index f2d6c313313e..02080a7c7720 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)partab.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 1fe03beb9c2b..cef14a4f8856 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1992, 1993\n\
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index 9425e42d5c06..faed6ddd6ce0 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1983, 1993\n\
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index 8018229c02a9..2fd200acd82a 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)tipout.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/uucplock.c b/usr.bin/tip/tip/uucplock.c
index da1601590dae..3833630cbce2 100644
--- a/usr.bin/tip/tip/uucplock.c
+++ b/usr.bin/tip/tip/uucplock.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)uucplock.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index 9cf1052d3ea2..76effba26f96 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)value.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index a412264295c6..34f6ef820d50 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tr/cmap.c b/usr.bin/tr/cmap.c
index cd67aa91a799..3789a91ced88 100644
--- a/usr.bin/tr/cmap.c
+++ b/usr.bin/tr/cmap.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <limits.h>
#include <stdbool.h>
diff --git a/usr.bin/tr/cset.c b/usr.bin/tr/cset.c
index f6e110999a5d..3fc20a977915 100644
--- a/usr.bin/tr/cset.c
+++ b/usr.bin/tr/cset.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdbool.h>
#include <stdlib.h>
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 942f98008071..217066681746 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* The main module for truss. Surprisingly simple, but, then, the other
* files handle the bulk of the work. And, of course, the kernel has to
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index db5361a88e86..52f02b6f8700 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Various setup functions for truss. Not the cleanest-written code,
* I'm afraid.
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 1d3232b15122..f9763d10c1b4 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This file has routines used to print out system calls and their
* arguments.
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index 53c66e44c76a..705563511915 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -43,8 +43,6 @@ static const char sccsid[] = "@(#)tsort.c 8.3 (Berkeley) 5/4/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index 4f9549eb67c5..945e62cc6f3a 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/usr.bin/users/users.cc b/usr.bin/users/users.cc
index 44b1f591e051..f25b9206120d 100644
--- a/usr.bin/users/users.cc
+++ b/usr.bin/users/users.cc
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index d007d4f6098f..a03c28f19d00 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)vmstat.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/uio.h>
diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c
index eafe7209796f..d68516dda360 100644
--- a/usr.bin/vtfontcvt/vtfontcvt.c
+++ b/usr.bin/vtfontcvt/vtfontcvt.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/endian.h>
#include <sys/fnv_hash.h>
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index 0ea22ec98f67..1cbe5cfabb51 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)proc_compare.c 8.2 (Berkeley) 9/23/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/time.h>
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index 6ba827612e3d..246edcaec7a8 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)wc.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c
index 046800c42df2..8de56b9cf654 100644
--- a/usr.bin/whereis/whereis.c
+++ b/usr.bin/whereis/whereis.c
@@ -33,9 +33,6 @@
*/
#include <sys/types.h>
-
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index f6acab0c2496..c7331296913b 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 5dccb3c4a485..13b9c7d13aef 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/poll.h>
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 399373c5bc57..b5f484dcdf27 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)write.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/filio.h>
diff --git a/usr.bin/xargs/strnsubst.c b/usr.bin/xargs/strnsubst.c
index 4a2ecd5aa9a8..1d4eaac77727 100644
--- a/usr.bin/xargs/strnsubst.c
+++ b/usr.bin/xargs/strnsubst.c
@@ -9,8 +9,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdbool.h>
#include <stdlib.h>
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index cd6b7da1a186..51f42ba2c842 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -46,8 +46,6 @@ static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/time.h>
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 6c269bbb5d91..d19bacbe8c1b 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/mount.h>
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index c2aee21e7d9e..20d9b8bc4687 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 8d75c4ba1013..1146475d5f14 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index 91b775928389..367307311b9d 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)accton.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index 05652da3f1c1..01e75eb1f8b1 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/file.h>
#include <sys/ioctl.h>
#include <sys/types.h>
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 8b82d73aab08..02b2bb1ac4f8 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -44,8 +44,6 @@ static char const sccsid[] = "@(#)from: arp.c 8.2 (Berkeley) 1/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* arp - display, set, and delete arp table entries
*/
diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c
index 540b64b3a374..188bbc3a040f 100644
--- a/usr.sbin/autofs/automount.c
+++ b/usr.sbin/autofs/automount.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/automountd.c b/usr.sbin/autofs/automountd.c
index 905a46343684..50136044b503 100644
--- a/usr.sbin/autofs/automountd.c
+++ b/usr.sbin/autofs/automountd.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/autounmountd.c b/usr.sbin/autofs/autounmountd.c
index 0bc74ac67bda..04705faaaf9e 100644
--- a/usr.sbin/autofs/autounmountd.c
+++ b/usr.sbin/autofs/autounmountd.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/event.h>
#include <sys/mount.h>
diff --git a/usr.sbin/autofs/common.c b/usr.sbin/autofs/common.c
index 96d7b910caf9..b6e435603dc7 100644
--- a/usr.sbin/autofs/common.c
+++ b/usr.sbin/autofs/common.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/defined.c b/usr.sbin/autofs/defined.c
index 9b84dc8c373d..01bc8218ac5d 100644
--- a/usr.sbin/autofs/defined.c
+++ b/usr.sbin/autofs/defined.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/log.c b/usr.sbin/autofs/log.c
index 8d9319d45290..02a889bffbed 100644
--- a/usr.sbin/autofs/log.c
+++ b/usr.sbin/autofs/log.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
diff --git a/usr.sbin/autofs/popen.c b/usr.sbin/autofs/popen.c
index f1be8ec9a4ca..2d3790ff2b0d 100644
--- a/usr.sbin/autofs/popen.c
+++ b/usr.sbin/autofs/popen.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/wait.h>
diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
index 36cfbe39d4c9..4a3233291b7a 100644
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/errno.h>
diff --git a/usr.sbin/bhyve/atkbdc.c b/usr.sbin/bhyve/atkbdc.c
index 96a952a84e00..c5dea0d220cf 100644
--- a/usr.sbin/bhyve/atkbdc.c
+++ b/usr.sbin/bhyve/atkbdc.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/vmm.h>
diff --git a/usr.sbin/bhyve/audio.c b/usr.sbin/bhyve/audio.c
index deb2913bd782..fc9ded37044a 100644
--- a/usr.sbin/bhyve/audio.c
+++ b/usr.sbin/bhyve/audio.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.sbin/bhyve/bhyvegc.c b/usr.sbin/bhyve/bhyvegc.c
index 82981bb92071..1527343412bf 100644
--- a/usr.sbin/bhyve/bhyvegc.c
+++ b/usr.sbin/bhyve/bhyvegc.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdlib.h>
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index 057f6650e01e..384c469f9ce7 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c
index 3660974e14c3..93ddf6d8e0c6 100644
--- a/usr.sbin/bhyve/block_if.c
+++ b/usr.sbin/bhyve/block_if.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/bootrom.c b/usr.sbin/bhyve/bootrom.c
index 63d8d13a9182..cf527b98af89 100644
--- a/usr.sbin/bhyve/bootrom.c
+++ b/usr.sbin/bhyve/bootrom.c
@@ -27,8 +27,6 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/usr.sbin/bhyve/config.c b/usr.sbin/bhyve/config.c
index c844d30f2f74..cc9311624e5e 100644
--- a/usr.sbin/bhyve/config.c
+++ b/usr.sbin/bhyve/config.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.sbin/bhyve/console.c b/usr.sbin/bhyve/console.c
index fe1d691b7676..176ae2e2a298 100644
--- a/usr.sbin/bhyve/console.c
+++ b/usr.sbin/bhyve/console.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "bhyvegc.h"
diff --git a/usr.sbin/bhyve/fwctl.c b/usr.sbin/bhyve/fwctl.c
index daf5ae423e26..01b16c38f3a7 100644
--- a/usr.sbin/bhyve/fwctl.c
+++ b/usr.sbin/bhyve/fwctl.c
@@ -31,8 +31,6 @@
* but with a request/response messaging protocol.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/errno.h>
diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c
index aff87cf72966..dcd733c484ca 100644
--- a/usr.sbin/bhyve/gdb.c
+++ b/usr.sbin/bhyve/gdb.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/hda_codec.c b/usr.sbin/bhyve/hda_codec.c
index b23171bf94fb..1866149c020a 100644
--- a/usr.sbin/bhyve/hda_codec.c
+++ b/usr.sbin/bhyve/hda_codec.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <pthread.h>
#include <pthread_np.h>
#include <unistd.h>
diff --git a/usr.sbin/bhyve/inout.c b/usr.sbin/bhyve/inout.c
index f5cfdc598164..898dc9aa1ea5 100644
--- a/usr.sbin/bhyve/inout.c
+++ b/usr.sbin/bhyve/inout.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/_iovec.h>
diff --git a/usr.sbin/bhyve/ioapic.c b/usr.sbin/bhyve/ioapic.c
index 2907b521f1e5..89bb891fdaf0 100644
--- a/usr.sbin/bhyve/ioapic.c
+++ b/usr.sbin/bhyve/ioapic.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/bhyve/iov.c b/usr.sbin/bhyve/iov.c
index bc24f370e6a2..d01c7a5601f4 100644
--- a/usr.sbin/bhyve/iov.c
+++ b/usr.sbin/bhyve/iov.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/usr.sbin/bhyve/kernemu_dev.c b/usr.sbin/bhyve/kernemu_dev.c
index d66c5b7d2b70..54ca55307c62 100644
--- a/usr.sbin/bhyve/kernemu_dev.c
+++ b/usr.sbin/bhyve/kernemu_dev.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/tree.h>
diff --git a/usr.sbin/bhyve/mem.c b/usr.sbin/bhyve/mem.c
index 483235bc822a..b4cb93a1cea4 100644
--- a/usr.sbin/bhyve/mem.c
+++ b/usr.sbin/bhyve/mem.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/tree.h>
diff --git a/usr.sbin/bhyve/mevent.c b/usr.sbin/bhyve/mevent.c
index 723efcd657e4..ce272ce87f3d 100644
--- a/usr.sbin/bhyve/mevent.c
+++ b/usr.sbin/bhyve/mevent.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#ifndef WITHOUT_CAPSICUM
#include <capsicum_helpers.h>
diff --git a/usr.sbin/bhyve/mptbl.c b/usr.sbin/bhyve/mptbl.c
index 2e7b28e89ec7..e2653ddcf37d 100644
--- a/usr.sbin/bhyve/mptbl.c
+++ b/usr.sbin/bhyve/mptbl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/errno.h>
#include <x86/mptable.h>
diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c
index dc7b9d0b2607..fa7cd9c81f46 100644
--- a/usr.sbin/bhyve/net_backends.c
+++ b/usr.sbin/bhyve/net_backends.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h> /* u_short etc */
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/net_utils.c b/usr.sbin/bhyve/net_utils.c
index 1cee3f90ae8c..9230895b49fe 100644
--- a/usr.sbin/bhyve/net_utils.c
+++ b/usr.sbin/bhyve/net_utils.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <net/ethernet.h>
diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c
index 9cab0ff7e762..5ffb65269608 100644
--- a/usr.sbin/bhyve/pci_ahci.c
+++ b/usr.sbin/bhyve/pci_ahci.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/stat.h>
diff --git a/usr.sbin/bhyve/pci_e82545.c b/usr.sbin/bhyve/pci_e82545.c
index 0d0acd216cad..7ab8f13f74f9 100644
--- a/usr.sbin/bhyve/pci_e82545.c
+++ b/usr.sbin/bhyve/pci_e82545.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
index a15f3ebc4b78..3c34d0e22478 100644
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/mman.h>
diff --git a/usr.sbin/bhyve/pci_fbuf.c b/usr.sbin/bhyve/pci_fbuf.c
index b8004c5ba9b9..3d63707affa8 100644
--- a/usr.sbin/bhyve/pci_fbuf.c
+++ b/usr.sbin/bhyve/pci_fbuf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mman.h>
diff --git a/usr.sbin/bhyve/pci_hda.c b/usr.sbin/bhyve/pci_hda.c
index 1d9a8c1652d6..6f0c1b6cfba9 100644
--- a/usr.sbin/bhyve/pci_hda.c
+++ b/usr.sbin/bhyve/pci_hda.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <time.h>
diff --git a/usr.sbin/bhyve/pci_hostbridge.c b/usr.sbin/bhyve/pci_hostbridge.c
index b7d231299aa4..df75da4283a5 100644
--- a/usr.sbin/bhyve/pci_hostbridge.c
+++ b/usr.sbin/bhyve/pci_hostbridge.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdlib.h>
diff --git a/usr.sbin/bhyve/pci_irq.c b/usr.sbin/bhyve/pci_irq.c
index dbc4e1df1bcb..12c2d94925ad 100644
--- a/usr.sbin/bhyve/pci_irq.c
+++ b/usr.sbin/bhyve/pci_irq.c
@@ -29,8 +29,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <machine/vmm.h>
diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c
index 2b1a8bc4006a..ebda61aaea60 100644
--- a/usr.sbin/bhyve/pci_lpc.c
+++ b/usr.sbin/bhyve/pci_lpc.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/vmm.h>
#include <machine/vmm_snapshot.h>
diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c
index 67153b4cd00f..5bdf4c454a23 100644
--- a/usr.sbin/bhyve/pci_nvme.c
+++ b/usr.sbin/bhyve/pci_nvme.c
@@ -54,8 +54,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <sys/types.h>
#include <sys/crc16.h>
diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c
index fbcf52ceff2e..fa23358c07a2 100644
--- a/usr.sbin/bhyve/pci_passthru.c
+++ b/usr.sbin/bhyve/pci_passthru.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_uart.c b/usr.sbin/bhyve/pci_uart.c
index af5dcd5070bd..362238bf3168 100644
--- a/usr.sbin/bhyve/pci_uart.c
+++ b/usr.sbin/bhyve/pci_uart.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/bhyve/pci_virtio_9p.c b/usr.sbin/bhyve/pci_virtio_9p.c
index 405692bec37f..77ea2f4bed75 100644
--- a/usr.sbin/bhyve/pci_virtio_9p.c
+++ b/usr.sbin/bhyve/pci_virtio_9p.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/uio.h>
diff --git a/usr.sbin/bhyve/pci_virtio_block.c b/usr.sbin/bhyve/pci_virtio_block.c
index 8c7e26b6d123..680c53c0c974 100644
--- a/usr.sbin/bhyve/pci_virtio_block.c
+++ b/usr.sbin/bhyve/pci_virtio_block.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/stat.h>
diff --git a/usr.sbin/bhyve/pci_virtio_console.c b/usr.sbin/bhyve/pci_virtio_console.c
index 51e4ca84b2be..a0bb8591811c 100644
--- a/usr.sbin/bhyve/pci_virtio_console.c
+++ b/usr.sbin/bhyve/pci_virtio_console.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_virtio_input.c b/usr.sbin/bhyve/pci_virtio_input.c
index 6556c229208b..389e6d2e9313 100644
--- a/usr.sbin/bhyve/pci_virtio_input.c
+++ b/usr.sbin/bhyve/pci_virtio_input.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_virtio_net.c b/usr.sbin/bhyve/pci_virtio_net.c
index 350dbeb2211c..1bf45aadfd4f 100644
--- a/usr.sbin/bhyve/pci_virtio_net.c
+++ b/usr.sbin/bhyve/pci_virtio_net.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/select.h>
diff --git a/usr.sbin/bhyve/pci_virtio_rnd.c b/usr.sbin/bhyve/pci_virtio_rnd.c
index a3d31b311148..779a664a636a 100644
--- a/usr.sbin/bhyve/pci_virtio_rnd.c
+++ b/usr.sbin/bhyve/pci_virtio_rnd.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c
index fa6cb3a48787..08b52a55d385 100644
--- a/usr.sbin/bhyve/pci_virtio_scsi.c
+++ b/usr.sbin/bhyve/pci_virtio_scsi.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/types.h>
diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c
index b963d0fdc3bd..2d37cb0f08fc 100644
--- a/usr.sbin/bhyve/pci_xhci.c
+++ b/usr.sbin/bhyve/pci_xhci.c
@@ -33,8 +33,6 @@
tablet USB tablet mouse
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/uio.h>
#include <sys/types.h>
diff --git a/usr.sbin/bhyve/pctestdev.c b/usr.sbin/bhyve/pctestdev.c
index 6c5a9dc5952e..b6fc3c336a93 100644
--- a/usr.sbin/bhyve/pctestdev.c
+++ b/usr.sbin/bhyve/pctestdev.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mman.h>
#include <machine/vmm.h>
diff --git a/usr.sbin/bhyve/pm.c b/usr.sbin/bhyve/pm.c
index 54fc9fa70594..e54854dee855 100644
--- a/usr.sbin/bhyve/pm.c
+++ b/usr.sbin/bhyve/pm.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/vmm.h>
diff --git a/usr.sbin/bhyve/post.c b/usr.sbin/bhyve/post.c
index e4583771b451..53ca34f418b5 100644
--- a/usr.sbin/bhyve/post.c
+++ b/usr.sbin/bhyve/post.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
diff --git a/usr.sbin/bhyve/ps2kbd.c b/usr.sbin/bhyve/ps2kbd.c
index ac6a6e6b5ec3..6fe36dbc4a55 100644
--- a/usr.sbin/bhyve/ps2kbd.c
+++ b/usr.sbin/bhyve/ps2kbd.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.sbin/bhyve/ps2mouse.c b/usr.sbin/bhyve/ps2mouse.c
index 211e7f221363..f0b4b7cabd91 100644
--- a/usr.sbin/bhyve/ps2mouse.c
+++ b/usr.sbin/bhyve/ps2mouse.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/vmm_snapshot.h>
diff --git a/usr.sbin/bhyve/rfb.c b/usr.sbin/bhyve/rfb.c
index eb7333911867..db2924fee453 100644
--- a/usr.sbin/bhyve/rfb.c
+++ b/usr.sbin/bhyve/rfb.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/rtc.c b/usr.sbin/bhyve/rtc.c
index 09093a4359ce..ef1bdcaf7a2c 100644
--- a/usr.sbin/bhyve/rtc.c
+++ b/usr.sbin/bhyve/rtc.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <time.h>
diff --git a/usr.sbin/bhyve/smbiostbl.c b/usr.sbin/bhyve/smbiostbl.c
index 046870078a8c..0bc15087ac62 100644
--- a/usr.sbin/bhyve/smbiostbl.c
+++ b/usr.sbin/bhyve/smbiostbl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c
index 655f8299bf0e..ec56bd0fed9a 100644
--- a/usr.sbin/bhyve/snapshot.c
+++ b/usr.sbin/bhyve/snapshot.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/sockstream.c b/usr.sbin/bhyve/sockstream.c
index 27f614a1b2b8..5b877fa11d44 100644
--- a/usr.sbin/bhyve/sockstream.c
+++ b/usr.sbin/bhyve/sockstream.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <unistd.h>
diff --git a/usr.sbin/bhyve/spinup_ap.c b/usr.sbin/bhyve/spinup_ap.c
index 31db31fa5c59..f874efcd374b 100644
--- a/usr.sbin/bhyve/spinup_ap.c
+++ b/usr.sbin/bhyve/spinup_ap.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.sbin/bhyve/task_switch.c b/usr.sbin/bhyve/task_switch.c
index f6bf7210f46c..351df7fb738b 100644
--- a/usr.sbin/bhyve/task_switch.c
+++ b/usr.sbin/bhyve/task_switch.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/_iovec.h>
#include <sys/mman.h>
diff --git a/usr.sbin/bhyve/uart_emul.c b/usr.sbin/bhyve/uart_emul.c
index b4a6d1e4e226..645abf6dc243 100644
--- a/usr.sbin/bhyve/uart_emul.c
+++ b/usr.sbin/bhyve/uart_emul.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <dev/ic/ns16550.h>
#ifndef WITHOUT_CAPSICUM
diff --git a/usr.sbin/bhyve/usb_emul.c b/usr.sbin/bhyve/usb_emul.c
index fb3ef7031ee8..dba11ef0922b 100644
--- a/usr.sbin/bhyve/usb_emul.c
+++ b/usr.sbin/bhyve/usb_emul.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.sbin/bhyve/usb_mouse.c b/usr.sbin/bhyve/usb_mouse.c
index 79a3a1c296d3..80f79980a98e 100644
--- a/usr.sbin/bhyve/usb_mouse.c
+++ b/usr.sbin/bhyve/usb_mouse.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <machine/vmm_snapshot.h>
diff --git a/usr.sbin/bhyve/vga.c b/usr.sbin/bhyve/vga.c
index 67c473f6b725..9e78ed93424e 100644
--- a/usr.sbin/bhyve/vga.c
+++ b/usr.sbin/bhyve/vga.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c
index d9ceb6bbbf29..0aeafa011bbc 100644
--- a/usr.sbin/bhyve/virtio.c
+++ b/usr.sbin/bhyve/virtio.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/uio.h>
diff --git a/usr.sbin/bhyve/vmgenc.c b/usr.sbin/bhyve/vmgenc.c
index 05618c5cba8b..4da5bb90e2fa 100644
--- a/usr.sbin/bhyve/vmgenc.c
+++ b/usr.sbin/bhyve/vmgenc.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/uuid.h>
diff --git a/usr.sbin/bhyve/xmsr.c b/usr.sbin/bhyve/xmsr.c
index a32957a66d35..99e758e84fff 100644
--- a/usr.sbin/bhyve/xmsr.c
+++ b/usr.sbin/bhyve/xmsr.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/cpufunc.h>
diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c
index 2f69cd6636c2..843e7a7b9dd5 100644
--- a/usr.sbin/bhyvectl/bhyvectl.c
+++ b/usr.sbin/bhyvectl/bhyvectl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/cpuset.h>
diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c
index da6e6acb177a..6b2633cac288 100644
--- a/usr.sbin/bhyveload/bhyveload.c
+++ b/usr.sbin/bhyveload/bhyveload.c
@@ -53,8 +53,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/disk.h>
diff --git a/usr.sbin/binmiscctl/binmiscctl.c b/usr.sbin/binmiscctl/binmiscctl.c
index 2ec2cc3f64d4..c2c541155805 100644
--- a/usr.sbin/binmiscctl/binmiscctl.c
+++ b/usr.sbin/binmiscctl/binmiscctl.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/imgact_binmisc.h>
#include <sys/linker.h>
diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c
index 1b742dd6ef9c..8c00329f53d9 100644
--- a/usr.sbin/boot0cfg/boot0cfg.c
+++ b/usr.sbin/boot0cfg/boot0cfg.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disklabel.h>
#include <sys/diskmbr.h>
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c
index 5bbd5b4becef..5100c64b5d3d 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.c
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.c
@@ -8,8 +8,6 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef YP
#include <rpc/rpc.h>
#include <rpcsvc/yp_prot.h>
diff --git a/usr.sbin/bootparamd/bootparamd/main.c b/usr.sbin/bootparamd/bootparamd/main.c
index 578bb2605be6..e0aa85f4b40a 100644
--- a/usr.sbin/bootparamd/bootparamd/main.c
+++ b/usr.sbin/bootparamd/bootparamd/main.c
@@ -8,8 +8,6 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <netdb.h>
diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c
index 0a0980bd4aa0..f9939d83cab9 100644
--- a/usr.sbin/bootparamd/callbootd/callbootd.c
+++ b/usr.sbin/bootparamd/callbootd/callbootd.c
@@ -8,8 +8,6 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "bootparam_prot.h"
#include <rpc/rpc.h>
#include <sys/types.h>
diff --git a/usr.sbin/bsdinstall/distextract/distextract.c b/usr.sbin/bsdinstall/distextract/distextract.c
index b5ce93f4cc41..0cb89ffabcbe 100644
--- a/usr.sbin/bsdinstall/distextract/distextract.c
+++ b/usr.sbin/bsdinstall/distextract/distextract.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <archive.h>
diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c b/usr.sbin/bsdinstall/distfetch/distfetch.c
index 37bd78925efc..01f5f1aa214b 100644
--- a/usr.sbin/bsdinstall/distfetch/distfetch.c
+++ b/usr.sbin/bsdinstall/distfetch/distfetch.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <bsddialog.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c b/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
index a7099eca7d83..74ddd48cd31d 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c b/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
index 9da1dcc95cdb..d3e1dcf051cb 100644
--- a/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
+++ b/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c
index 1be2ca0f59a0..4f15aa8eedcf 100644
--- a/usr.sbin/camdd/camdd.c
+++ b/usr.sbin/camdd/camdd.c
@@ -38,8 +38,6 @@
* - An example of how to use the asynchronous pass(4) driver interface.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c
index 94337196157e..c63ec3ee49f3 100644
--- a/usr.sbin/cdcontrol/cdcontrol.c
+++ b/usr.sbin/cdcontrol/cdcontrol.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/cdio.h>
#include <sys/cdrio.h>
#include <sys/file.h>
diff --git a/usr.sbin/chkgrp/chkgrp.c b/usr.sbin/chkgrp/chkgrp.c
index 06e78d440556..650448d9e40b 100644
--- a/usr.sbin/chkgrp/chkgrp.c
+++ b/usr.sbin/chkgrp/chkgrp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <ctype.h>
diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c
index a3fe5d351320..caf801287ca5 100644
--- a/usr.sbin/chown/chown.c
+++ b/usr.sbin/chown/chown.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)chown.c 8.8 (Berkeley) 4/4/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index 59bf8f0791a2..9fc918e38eac 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)chroot.c 8.1 (Berkeley) 6/9/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/procctl.h>
diff --git a/usr.sbin/clear_locks/clear_locks.c b/usr.sbin/clear_locks/clear_locks.c
index 9479a607e370..f2abfeb2d816 100644
--- a/usr.sbin/clear_locks/clear_locks.c
+++ b/usr.sbin/clear_locks/clear_locks.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/usr.sbin/cpucontrol/amd.c b/usr.sbin/cpucontrol/amd.c
index 6dedba5a5257..21a3389ced2f 100644
--- a/usr.sbin/cpucontrol/amd.c
+++ b/usr.sbin/cpucontrol/amd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/cpucontrol/amd10h.c b/usr.sbin/cpucontrol/amd10h.c
index 5d3c4a1ac003..b0c458fabb58 100644
--- a/usr.sbin/cpucontrol/amd10h.c
+++ b/usr.sbin/cpucontrol/amd10h.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
diff --git a/usr.sbin/cpucontrol/cpucontrol.c b/usr.sbin/cpucontrol/cpucontrol.c
index 467b901a5caa..9cc3968de01d 100644
--- a/usr.sbin/cpucontrol/cpucontrol.c
+++ b/usr.sbin/cpucontrol/cpucontrol.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/cpucontrol/intel.c b/usr.sbin/cpucontrol/intel.c
index 215c034462e0..d775d66d33aa 100644
--- a/usr.sbin/cpucontrol/intel.c
+++ b/usr.sbin/cpucontrol/intel.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/cpucontrol/via.c b/usr.sbin/cpucontrol/via.c
index 0a233b8b50b2..432399c69e35 100644
--- a/usr.sbin/cpucontrol/via.c
+++ b/usr.sbin/cpucontrol/via.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/crunch/crunchgen/crunched_main.c b/usr.sbin/crunch/crunchgen/crunched_main.c
index 45f61baae23e..493c2de188b4 100644
--- a/usr.sbin/crunch/crunchgen/crunched_main.c
+++ b/usr.sbin/crunch/crunchgen/crunched_main.c
@@ -65,8 +65,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/auxv.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c
index 63ce727496b7..dfde38ed0b70 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.c
+++ b/usr.sbin/crunch/crunchgen/crunchgen.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/crunch/crunchide/crunchide.c b/usr.sbin/crunch/crunchide/crunchide.c
index 94778e8c9d3e..eec9f19847ab 100644
--- a/usr.sbin/crunch/crunchide/crunchide.c
+++ b/usr.sbin/crunch/crunchide/crunchide.c
@@ -61,8 +61,6 @@
#ifndef lint
__RCSID("$NetBSD: crunchide.c,v 1.8 1997/11/01 06:51:45 lukem Exp $");
#endif
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/errno.h>
diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c
index b9af82e1e5e7..c67129f34a83 100644
--- a/usr.sbin/crunch/crunchide/exec_elf32.c
+++ b/usr.sbin/crunch/crunchide/exec_elf32.c
@@ -36,8 +36,6 @@
__RCSID("$NetBSD: exec_elf32.c,v 1.6 1999/09/20 04:12:16 christos Exp $");
#endif
#endif
-__FBSDID("$FreeBSD$");
-
#ifndef ELFSIZE
#define ELFSIZE 32
#endif
diff --git a/usr.sbin/crunch/crunchide/exec_elf64.c b/usr.sbin/crunch/crunchide/exec_elf64.c
index c447116ccf5e..30bd16fd65d8 100644
--- a/usr.sbin/crunch/crunchide/exec_elf64.c
+++ b/usr.sbin/crunch/crunchide/exec_elf64.c
@@ -36,8 +36,6 @@
#ifndef lint
__IDSTRING(elf64rcsid, "$NetBSD: exec_elf64.c,v 1.2 1997/08/02 21:30:19 perry Exp $");
#endif
-__FBSDID("$FreeBSD$");
-
#define ELFSIZE 64
#include "exec_elf32.c"
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
index 2b51a2222bce..62dd87155671 100644
--- a/usr.sbin/ctladm/ctladm.c
+++ b/usr.sbin/ctladm/ctladm.c
@@ -44,8 +44,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/callout.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/ctladm/util.c b/usr.sbin/ctladm/util.c
index 60293e499475..23723c2a2286 100644
--- a/usr.sbin/ctladm/util.c
+++ b/usr.sbin/ctladm/util.c
@@ -46,8 +46,6 @@
* from: scsi.c,v 1.17 1998/01/12 07:57:57 charnier Exp $";
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c
index da8047104bc9..2a69308ff067 100644
--- a/usr.sbin/ctld/ctld.c
+++ b/usr.sbin/ctld/ctld.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ctld/discovery.c b/usr.sbin/ctld/discovery.c
index 50b0a2d0eeea..f548b41d5cba 100644
--- a/usr.sbin/ctld/discovery.c
+++ b/usr.sbin/ctld/discovery.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/ctld/isns.c b/usr.sbin/ctld/isns.c
index 63b8425e9b9e..3c85c1a3cade 100644
--- a/usr.sbin/ctld/isns.c
+++ b/usr.sbin/ctld/isns.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
index 2202a780b31c..cbb8e2c25f5d 100644
--- a/usr.sbin/ctld/kernel.c
+++ b/usr.sbin/ctld/kernel.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/callout.h>
diff --git a/usr.sbin/ctld/login.c b/usr.sbin/ctld/login.c
index 40a647b68cd4..afd3210a828a 100644
--- a/usr.sbin/ctld/login.c
+++ b/usr.sbin/ctld/login.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdbool.h>
#include <stdlib.h>
diff --git a/usr.sbin/cxgbetool/cxgbetool.c b/usr.sbin/cxgbetool/cxgbetool.c
index 149eacb54924..c02bc7fdc054 100644
--- a/usr.sbin/cxgbetool/cxgbetool.c
+++ b/usr.sbin/cxgbetool/cxgbetool.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
diff --git a/usr.sbin/cxgbetool/reg_defs_t4.c b/usr.sbin/cxgbetool/reg_defs_t4.c
index 5207073b2498..dac485778be1 100644
--- a/usr.sbin/cxgbetool/reg_defs_t4.c
+++ b/usr.sbin/cxgbetool/reg_defs_t4.c
@@ -1,8 +1,6 @@
/* This file is automatically generated --- changes will be lost */
/* Generation Date : Tue Dec 8 09:33:01 IST 2015 */
/* Directory name: t4_reg.txt, Changeset: */
-__FBSDID("$FreeBSD$");
-
struct reg_info t4_sge_regs[] = {
{ "SGE_PF_KDOORBELL", 0x1e000, 0 },
{ "QID", 15, 17 },
diff --git a/usr.sbin/cxgbetool/reg_defs_t4vf.c b/usr.sbin/cxgbetool/reg_defs_t4vf.c
index 34909036d42b..5ea7d4f276dd 100644
--- a/usr.sbin/cxgbetool/reg_defs_t4vf.c
+++ b/usr.sbin/cxgbetool/reg_defs_t4vf.c
@@ -3,8 +3,6 @@
* Virtual Function register map definitions in t4vf_defs.h in the common
* code.
*/
-__FBSDID("$FreeBSD$");
-
struct reg_info t4vf_sge_regs[] = {
{ "SGE_KDOORBELL", 0x000, 0 },
{ "QID", 15, 17 },
diff --git a/usr.sbin/cxgbetool/reg_defs_t5.c b/usr.sbin/cxgbetool/reg_defs_t5.c
index f5f64da7ebd2..3c31a66e2360 100644
--- a/usr.sbin/cxgbetool/reg_defs_t5.c
+++ b/usr.sbin/cxgbetool/reg_defs_t5.c
@@ -1,8 +1,6 @@
/* This file is automatically generated --- changes will be lost */
/* Generation Date : Tue Jan 28 03:02:12 IST 2020 */
/* Directory name: t5_reg.txt, Changeset: 6941:9063655afd44 */
-__FBSDID("$FreeBSD$");
-
struct reg_info t5_sge_regs[] = {
{ "SGE_PF_KDOORBELL", 0x1e000, 0 },
{ "QID", 15, 17 },
diff --git a/usr.sbin/cxgbetool/reg_defs_t6.c b/usr.sbin/cxgbetool/reg_defs_t6.c
index 23a3d6d44a5a..ffa2c9c57689 100644
--- a/usr.sbin/cxgbetool/reg_defs_t6.c
+++ b/usr.sbin/cxgbetool/reg_defs_t6.c
@@ -1,8 +1,6 @@
/* This file is automatically generated --- changes will be lost */
/* Generation Date : Tue Jan 28 03:02:08 IST 2020 */
/* Directory name: t6_reg.txt, Changeset: 4272:a648ba4d5c0c */
-__FBSDID("$FreeBSD$");
-
struct reg_info t6_sge_regs[] = {
{ "SGE_PF_KDOORBELL", 0x1e000, 0 },
{ "QID", 15, 17 },
diff --git a/usr.sbin/cxgbetool/tcb_common.c b/usr.sbin/cxgbetool/tcb_common.c
index e37233d4ad3c..53422c994584 100644
--- a/usr.sbin/cxgbetool/tcb_common.c
+++ b/usr.sbin/cxgbetool/tcb_common.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "tcb_common.h"
/***:-----------------------------------------------------------------------
diff --git a/usr.sbin/cxgbetool/tcbinfot4.c b/usr.sbin/cxgbetool/tcbinfot4.c
index e6f3aa6a3d25..ed7ea18dcf88 100644
--- a/usr.sbin/cxgbetool/tcbinfot4.c
+++ b/usr.sbin/cxgbetool/tcbinfot4.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Auto-generated file. Avoid direct editing. */
/* Edits will be lost when file regenerated. */
#include <stdio.h>
diff --git a/usr.sbin/cxgbetool/tcbinfot5.c b/usr.sbin/cxgbetool/tcbinfot5.c
index 8b684fd31877..de20bc1e2cf0 100644
--- a/usr.sbin/cxgbetool/tcbinfot5.c
+++ b/usr.sbin/cxgbetool/tcbinfot5.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Auto-generated file. Avoid direct editing. */
/* Edits will be lost when file regenerated. */
#include <stdio.h>
diff --git a/usr.sbin/cxgbetool/tcbinfot6.c b/usr.sbin/cxgbetool/tcbinfot6.c
index 5f8316c0d89d..ab44205c4046 100644
--- a/usr.sbin/cxgbetool/tcbinfot6.c
+++ b/usr.sbin/cxgbetool/tcbinfot6.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Auto-generated file. Avoid direct editing. */
/* Edits will be lost when file regenerated. */
#include <stdio.h>
diff --git a/usr.sbin/cxgbetool/tcbshowt4.c b/usr.sbin/cxgbetool/tcbshowt4.c
index 6beb72671b07..819b68c37e12 100644
--- a/usr.sbin/cxgbetool/tcbshowt4.c
+++ b/usr.sbin/cxgbetool/tcbshowt4.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Auto-generated file. Avoid direct editing. */
/* Edits will be lost when file regenerated. */
#include <stdio.h>
diff --git a/usr.sbin/cxgbetool/tcbshowt5.c b/usr.sbin/cxgbetool/tcbshowt5.c
index cbdbb35c6232..698345ce0d67 100644
--- a/usr.sbin/cxgbetool/tcbshowt5.c
+++ b/usr.sbin/cxgbetool/tcbshowt5.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Auto-generated file. Avoid direct editing. */
/* Edits will be lost when file regenerated. */
#include <stdio.h>
diff --git a/usr.sbin/cxgbetool/tcbshowt6.c b/usr.sbin/cxgbetool/tcbshowt6.c
index 9d54512daf3c..18a5c6f39440 100644
--- a/usr.sbin/cxgbetool/tcbshowt6.c
+++ b/usr.sbin/cxgbetool/tcbshowt6.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Auto-generated file. Avoid direct editing. */
/* Edits will be lost when file regenerated. */
#include <stdio.h>
diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c
index 92e640271d10..dfbb609ce10d 100644
--- a/usr.sbin/daemon/daemon.c
+++ b/usr.sbin/daemon/daemon.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/event.h>
#include <sys/mman.h>
diff --git a/usr.sbin/devctl/devctl.c b/usr.sbin/devctl/devctl.c
index 1417b087b535..66bfb7dc6ed1 100644
--- a/usr.sbin/devctl/devctl.c
+++ b/usr.sbin/devctl/devctl.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/linker_set.h>
#include <devctl.h>
#include <err.h>
diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c
index ce35357162e5..060f272dda79 100644
--- a/usr.sbin/devinfo/devinfo.c
+++ b/usr.sbin/devinfo/devinfo.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/dumpcis/main.c b/usr.sbin/dumpcis/main.c
index 3099a09805d4..50d87bcfeb4b 100644
--- a/usr.sbin/dumpcis/main.c
+++ b/usr.sbin/dumpcis/main.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/usr.sbin/dumpcis/printcis.c b/usr.sbin/dumpcis/printcis.c
index c6ec2beb3787..641fd19944d4 100644
--- a/usr.sbin/dumpcis/printcis.c
+++ b/usr.sbin/dumpcis/printcis.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Code cleanup, bug-fix and extension
* by Tatsumi Hosokawa <hosokawa@mt.cs.keio.ac.jp>
diff --git a/usr.sbin/dumpcis/readcis.c b/usr.sbin/dumpcis/readcis.c
index ce072d017cf4..9afdb6f2ba24 100644
--- a/usr.sbin/dumpcis/readcis.c
+++ b/usr.sbin/dumpcis/readcis.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Code cleanup, bug-fix and extension
* by Tatsumi Hosokawa <hosokawa@mt.cs.keio.ac.jp>
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 036b3f699eae..464694a5090d 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)edquota.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Disk quota editor.
*/
diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c
index 625abd3bb8b7..b0d023e3539c 100644
--- a/usr.sbin/efibootmgr/efibootmgr.c
+++ b/usr.sbin/efibootmgr/efibootmgr.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/efidp/efidp.c b/usr.sbin/efidp/efidp.c
index 1f071c95bdd7..513aa259e99a 100644
--- a/usr.sbin/efidp/efidp.c
+++ b/usr.sbin/efidp/efidp.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <efivar.h>
#include <efivar-dp.h>
diff --git a/usr.sbin/efitable/efitable.c b/usr.sbin/efitable/efitable.c
index 329c784611ae..a5b37e64c13a 100644
--- a/usr.sbin/efitable/efitable.c
+++ b/usr.sbin/efitable/efitable.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/efi.h>
#include <sys/efiio.h>
diff --git a/usr.sbin/efivar/efiutil.c b/usr.sbin/efivar/efiutil.c
index 838e56334066..fc2a309a81ef 100644
--- a/usr.sbin/efivar/efiutil.c
+++ b/usr.sbin/efivar/efiutil.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <efivar.h>
#include <efivar-dp.h>
diff --git a/usr.sbin/efivar/efivar.c b/usr.sbin/efivar/efivar.c
index 5bdf0c11a488..a87c73abef36 100644
--- a/usr.sbin/efivar/efivar.c
+++ b/usr.sbin/efivar/efivar.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <efivar.h>
#include <efivar-dp.h>
diff --git a/usr.sbin/fdcontrol/fdcontrol.c b/usr.sbin/fdcontrol/fdcontrol.c
index d0ea0c705ae5..ebe9a90c8472 100644
--- a/usr.sbin/fdcontrol/fdcontrol.c
+++ b/usr.sbin/fdcontrol/fdcontrol.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/fdcio.h>
#include <sys/file.h>
diff --git a/usr.sbin/fstyp/apfs.c b/usr.sbin/fstyp/apfs.c
index 7f8543a5a108..aeb459a1c3af 100644
--- a/usr.sbin/fstyp/apfs.c
+++ b/usr.sbin/fstyp/apfs.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/fstyp/befs.c b/usr.sbin/fstyp/befs.c
index fd412c8fe498..6c204f7eb381 100644
--- a/usr.sbin/fstyp/befs.c
+++ b/usr.sbin/fstyp/befs.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/fstyp/cd9660.c b/usr.sbin/fstyp/cd9660.c
index 658af338d4dd..e981a5978dd4 100644
--- a/usr.sbin/fstyp/cd9660.c
+++ b/usr.sbin/fstyp/cd9660.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/fstyp/exfat.c b/usr.sbin/fstyp/exfat.c
index 80cef5cbf822..83138fc26b98 100644
--- a/usr.sbin/fstyp/exfat.c
+++ b/usr.sbin/fstyp/exfat.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/usr.sbin/fstyp/ext2fs.c b/usr.sbin/fstyp/ext2fs.c
index 79a4e3ad4172..d7110f6896ce 100644
--- a/usr.sbin/fstyp/ext2fs.c
+++ b/usr.sbin/fstyp/ext2fs.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/usr.sbin/fstyp/fstyp.c b/usr.sbin/fstyp/fstyp.c
index 91c36d9d9191..d62f9af7ce18 100644
--- a/usr.sbin/fstyp/fstyp.c
+++ b/usr.sbin/fstyp/fstyp.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/disk.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/fstyp/geli.c b/usr.sbin/fstyp/geli.c
index 59e8653bf195..17d1faf8407f 100644
--- a/usr.sbin/fstyp/geli.c
+++ b/usr.sbin/fstyp/geli.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/disk.h>
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/fstyp/hammer.c b/usr.sbin/fstyp/hammer.c
index 777f5d312371..45aee42fb53a 100644
--- a/usr.sbin/fstyp/hammer.c
+++ b/usr.sbin/fstyp/hammer.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/fstyp/hammer2.c b/usr.sbin/fstyp/hammer2.c
index dfd026649fdb..e0c036c7442a 100644
--- a/usr.sbin/fstyp/hammer2.c
+++ b/usr.sbin/fstyp/hammer2.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
diff --git a/usr.sbin/fstyp/hfsplus.c b/usr.sbin/fstyp/hfsplus.c
index 3a94faf7766f..bdeaaa3b397c 100644
--- a/usr.sbin/fstyp/hfsplus.c
+++ b/usr.sbin/fstyp/hfsplus.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/fstyp/msdosfs.c b/usr.sbin/fstyp/msdosfs.c
index 473180d9c644..cd0a67243a15 100644
--- a/usr.sbin/fstyp/msdosfs.c
+++ b/usr.sbin/fstyp/msdosfs.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/fstyp/ntfs.c b/usr.sbin/fstyp/ntfs.c
index c286d950dc2b..a3457c285edc 100644
--- a/usr.sbin/fstyp/ntfs.c
+++ b/usr.sbin/fstyp/ntfs.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#ifdef WITH_ICONV
#include <iconv.h>
diff --git a/usr.sbin/fstyp/ufs.c b/usr.sbin/fstyp/ufs.c
index 69ce90d600f2..c62358704dfe 100644
--- a/usr.sbin/fstyp/ufs.c
+++ b/usr.sbin/fstyp/ufs.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
diff --git a/usr.sbin/fstyp/zfs.c b/usr.sbin/fstyp/zfs.c
index 2678a0444d10..62a5aca6a493 100644
--- a/usr.sbin/fstyp/zfs.c
+++ b/usr.sbin/fstyp/zfs.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <stdint.h>
diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c
index 4554ab9a8fbb..94478259606d 100644
--- a/usr.sbin/fwcontrol/fwcontrol.c
+++ b/usr.sbin/fwcontrol/fwcontrol.c
@@ -36,7 +36,6 @@
#if defined(__FreeBSD__)
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#endif
#include <sys/param.h>
diff --git a/usr.sbin/gpioctl/gpioctl.c b/usr.sbin/gpioctl/gpioctl.c
index 2b351d2ad56f..86cbabb24f5c 100644
--- a/usr.sbin/gpioctl/gpioctl.c
+++ b/usr.sbin/gpioctl/gpioctl.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fcntl.h>
#include <getopt.h>
#include <paths.h>
diff --git a/usr.sbin/gssd/gssd.c b/usr.sbin/gssd/gssd.c
index 2bc839b7a2ea..59e0fc057f84 100644
--- a/usr.sbin/gssd/gssd.c
+++ b/usr.sbin/gssd/gssd.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/linker.h>
diff --git a/usr.sbin/i2c/i2c.c b/usr.sbin/i2c/i2c.c
index f9c79c015940..12155f1a0663 100644
--- a/usr.sbin/i2c/i2c.c
+++ b/usr.sbin/i2c/i2c.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index 81befd3d6af1..7e82ec0d72e0 100644
--- a/usr.sbin/ifmcstat/ifmcstat.c
+++ b/usr.sbin/ifmcstat/ifmcstat.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/ifmcstat/printb.c b/usr.sbin/ifmcstat/printb.c
index 9481a0dc1bff..6054be88a2be 100644
--- a/usr.sbin/ifmcstat/printb.c
+++ b/usr.sbin/ifmcstat/printb.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c
index b9e0f9899d34..aed304ae99c2 100644
--- a/usr.sbin/inetd/builtins.c
+++ b/usr.sbin/inetd/builtins.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/filio.h>
#include <sys/ioccom.h>
#include <sys/param.h>
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 848714bd395a..700821588423 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1983, 1991, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n");
diff --git a/usr.sbin/iovctl/iovctl.c b/usr.sbin/iovctl/iovctl.c
index 0350c732f671..413fb7b2f4a5 100644
--- a/usr.sbin/iovctl/iovctl.c
+++ b/usr.sbin/iovctl/iovctl.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/iov.h>
#include <sys/dnv.h>
diff --git a/usr.sbin/iovctl/parse.c b/usr.sbin/iovctl/parse.c
index 227e51ae28ad..d04c008b449c 100644
--- a/usr.sbin/iovctl/parse.c
+++ b/usr.sbin/iovctl/parse.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/iov.h>
#include <sys/nv.h>
diff --git a/usr.sbin/iovctl/validate.c b/usr.sbin/iovctl/validate.c
index 6658a8c0c281..005a371fe353 100644
--- a/usr.sbin/iovctl/validate.c
+++ b/usr.sbin/iovctl/validate.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/iov.h>
#include <sys/dnv.h>
diff --git a/usr.sbin/iscsid/discovery.c b/usr.sbin/iscsid/discovery.c
index 590490542b62..f6072db36804 100644
--- a/usr.sbin/iscsid/discovery.c
+++ b/usr.sbin/iscsid/discovery.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <stdbool.h>
diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c
index ada9b98084fe..53ea278af019 100644
--- a/usr.sbin/iscsid/iscsid.c
+++ b/usr.sbin/iscsid/iscsid.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/iscsid/login.c b/usr.sbin/iscsid/login.c
index dc69f00fbaa7..1c53c5733fde 100644
--- a/usr.sbin/iscsid/login.c
+++ b/usr.sbin/iscsid/login.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <assert.h>
diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c
index eee06b3f74a3..9eabcc5ff53c 100644
--- a/usr.sbin/jail/command.c
+++ b/usr.sbin/jail/command.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c
index 35f40c123042..8c9ff0a7bd09 100644
--- a/usr.sbin/jail/config.c
+++ b/usr.sbin/jail/config.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/socket.h>
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index b8cccbbd625e..9e443c9f3f1d 100644
--- a/usr.sbin/jail/jail.c
+++ b/usr.sbin/jail/jail.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
diff --git a/usr.sbin/jail/jaillex.l b/usr.sbin/jail/jaillex.l
index 540b43ab3c5c..1dc61c1e9ab0 100644
--- a/usr.sbin/jail/jaillex.l
+++ b/usr.sbin/jail/jaillex.l
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stddef.h>
#include <stdlib.h>
diff --git a/usr.sbin/jail/jailparse.y b/usr.sbin/jail/jailparse.y
index e4f2310c7fb4..047ca882e59f 100644
--- a/usr.sbin/jail/jailparse.y
+++ b/usr.sbin/jail/jailparse.y
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/jail/state.c b/usr.sbin/jail/state.c
index 5b0c62842061..6cbe879acc55 100644
--- a/usr.sbin/jail/state.c
+++ b/usr.sbin/jail/state.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/uio.h>
#include <err.h>
diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c
index 9d0bebe4855a..c1cf074cd605 100644
--- a/usr.sbin/jls/jls.c
+++ b/usr.sbin/jls/jls.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/socket.h>
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index d7a0ff5ecfd0..522aab54c466 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c
index 4d8bc8a74386..78bb9e2741c5 100644
--- a/usr.sbin/kbdmap/kbdmap.c
+++ b/usr.sbin/kbdmap/kbdmap.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/kldxref/ef_riscv.c b/usr.sbin/kldxref/ef_riscv.c
index b94b37b3a92f..aeb45d2b7eb4 100644
--- a/usr.sbin/kldxref/ef_riscv.c
+++ b/usr.sbin/kldxref/ef_riscv.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/elf.h>
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.c b/usr.sbin/lpr/chkprintcap/chkprintcap.c
index fab2239adbd2..5e9179b03f21 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.c
@@ -31,8 +31,6 @@ static const char copyright[] =
"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.sbin/lpr/chkprintcap/skimprintcap.c b/usr.sbin/lpr/chkprintcap/skimprintcap.c
index a6bfbbb11c86..f6e74bc6df03 100644
--- a/usr.sbin/lpr/chkprintcap/skimprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/skimprintcap.c
@@ -34,8 +34,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index 21735fe4dfc9..51d4c7a1cd00 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.sbin/lpr/common_source/ctlinfo.c b/usr.sbin/lpr/common_source/ctlinfo.c
index 3d529b2c2a1f..5f5351b613c2 100644
--- a/usr.sbin/lpr/common_source/ctlinfo.c
+++ b/usr.sbin/lpr/common_source/ctlinfo.c
@@ -34,8 +34,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* ctlinfo - This collection of routines will know everything there is to
* know about the information inside a control file ('cf*') which is used
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index f21852cdc5b4..22fc41ca6d34 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/matchjobs.c b/usr.sbin/lpr/common_source/matchjobs.c
index 5dd860becef2..47309cf25702 100644
--- a/usr.sbin/lpr/common_source/matchjobs.c
+++ b/usr.sbin/lpr/common_source/matchjobs.c
@@ -35,8 +35,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* movejobs.c - The lpc commands which move jobs around.
*/
diff --git a/usr.sbin/lpr/common_source/net.c b/usr.sbin/lpr/common_source/net.c
index 3954b2286dc6..93fe1f232433 100644
--- a/usr.sbin/lpr/common_source/net.c
+++ b/usr.sbin/lpr/common_source/net.c
@@ -41,8 +41,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c
index 96b3e9dfdbac..070c08d04263 100644
--- a/usr.sbin/lpr/common_source/printcap.c
+++ b/usr.sbin/lpr/common_source/printcap.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)printcap.c 8.2 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/lpr/common_source/request.c b/usr.sbin/lpr/common_source/request.c
index 0c68fe92674a..e0a41a1161e0 100644
--- a/usr.sbin/lpr/common_source/request.c
+++ b/usr.sbin/lpr/common_source/request.c
@@ -31,8 +31,6 @@ static const char copyright[] =
"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c
index f3502000ee08..3b4d37f01c41 100644
--- a/usr.sbin/lpr/common_source/rmjob.c
+++ b/usr.sbin/lpr/common_source/rmjob.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)rmjob.c 8.2 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/uio.h>
diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c
index 112846ebc0c9..d1c08806a420 100644
--- a/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr.sbin/lpr/common_source/startdaemon.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)startdaemon.c 8.2 (Berkeley) 4/17/94";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/uio.h>
diff --git a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
index 4e6de53d9632..595ea375a266 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
+++ b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
@@ -28,8 +28,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* KOI8-R -> CP855 conversion filter (Russian character sets)
*/
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
index dc6e38a06510..25cf23e3a513 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
+++ b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
@@ -27,8 +27,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* KOI8-R -> CP866 conversion filter (Russian character sets)
*/
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 2f2f88f02089..a7c8c3748ce4 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)lpf.c 8.1 (Berkeley) 6/6/93";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* filter which reads the output of nroff and converts lines
* with ^H's to overwritten lines. Thus this works like 'ul'
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index ad147a18a8c7..5243e69154f2 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* lpc -- line printer control program -- commands:
*/
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index 8e8b2b634991..e4d9a5e6787f 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include "lpc.h"
#include "extern.h"
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index 3155a7cc7714..a79e09bf9743 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)lpc.c 8.3 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <ctype.h>
diff --git a/usr.sbin/lpr/lpc/movejobs.c b/usr.sbin/lpr/lpc/movejobs.c
index 1f5420c03114..35fdcaec3b0c 100644
--- a/usr.sbin/lpr/lpc/movejobs.c
+++ b/usr.sbin/lpr/lpc/movejobs.c
@@ -35,8 +35,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* movejobs.c - The lpc commands which move jobs around.
*/
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index 56821d114268..19456c9406df 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)lpd.c 8.7 (Berkeley) 5/10/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* lpd -- line printer daemon.
*
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index acdb3a4f7411..b86d9d34ad4e 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)lpdchar.c 8.1 (Berkeley) 6/6/93";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* Character set for line printer daemon
*/
diff --git a/usr.sbin/lpr/lpd/modes.c b/usr.sbin/lpr/lpd/modes.c
index 653a2cefce7e..03c794a4defd 100644
--- a/usr.sbin/lpr/lpd/modes.c
+++ b/usr.sbin/lpr/lpd/modes.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)modes.c 8.3 (Berkeley) 4/2/94";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include <string.h>
#include <termios.h>
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index ff16f8f298c1..79bc36aef13d 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* printjob -- print jobs in the queue.
*
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index a6e93019481a..a6495940b342 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)recvjob.c 8.2 (Berkeley) 4/27/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* Receive printer jobs from the network, queue them and
* start the printer daemon.
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index 7a492950253f..51a81fc83966 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)lpq.c 8.3 (Berkeley) 5/10/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* Spool Queue examination program
*
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 4f69259303af..f539844851d7 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -52,8 +52,6 @@ static char sccsid[] = "@(#)lpr.c 8.4 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* lpr -- off line print
*
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index 17aac1adc798..23916fb533da 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)lprm.c 8.1 (Berkeley) 6/6/93";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* lprm - remove the current user's spool entry
*
diff --git a/usr.sbin/lpr/lptest/lptest.c b/usr.sbin/lpr/lptest/lptest.c
index f064e3333628..32d0c6ba4191 100644
--- a/usr.sbin/lpr/lptest/lptest.c
+++ b/usr.sbin/lpr/lptest/lptest.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)lptest.c 8.1 (Berkeley) 6/6/93";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <stdio.h>
#include <err.h>
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index 7713096da641..85c9327f433f 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)pac.c 8.1 (Berkeley) 6/6/93";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* Do Printer accounting summary.
* Currently, usage is
diff --git a/usr.sbin/lptcontrol/lptcontrol.c b/usr.sbin/lptcontrol/lptcontrol.c
index 834f62456b54..9381722a6d0c 100644
--- a/usr.sbin/lptcontrol/lptcontrol.c
+++ b/usr.sbin/lptcontrol/lptcontrol.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <dev/ppbus/lptio.h>
#include <err.h>
diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c
index ef9c3b4d55c2..af732674a527 100644
--- a/usr.sbin/mailwrapper/mailwrapper.c
+++ b/usr.sbin/mailwrapper/mailwrapper.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
index 7d3088025562..cc56421a873c 100644
--- a/usr.sbin/makefs/cd9660.c
+++ b/usr.sbin/makefs/cd9660.c
@@ -98,8 +98,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <ctype.h>
diff --git a/usr.sbin/makefs/cd9660/cd9660_archimedes.c b/usr.sbin/makefs/cd9660/cd9660_archimedes.c
index cf53e0123d24..93560da40d54 100644
--- a/usr.sbin/makefs/cd9660/cd9660_archimedes.c
+++ b/usr.sbin/makefs/cd9660/cd9660_archimedes.c
@@ -40,8 +40,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/usr.sbin/makefs/cd9660/cd9660_conversion.c b/usr.sbin/makefs/cd9660/cd9660_conversion.c
index e21becbab44c..4ccc87e22661 100644
--- a/usr.sbin/makefs/cd9660/cd9660_conversion.c
+++ b/usr.sbin/makefs/cd9660/cd9660_conversion.c
@@ -36,8 +36,6 @@
#include "cd9660.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
static char cd9660_compute_gm_offset(time_t);
#if 0
diff --git a/usr.sbin/makefs/cd9660/cd9660_debug.c b/usr.sbin/makefs/cd9660/cd9660_debug.c
index 9fe85d4e5aae..da9d73203cb4 100644
--- a/usr.sbin/makefs/cd9660/cd9660_debug.c
+++ b/usr.sbin/makefs/cd9660/cd9660_debug.c
@@ -35,7 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
index e84ea53507bc..dd5bf67b2b09 100644
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
@@ -39,8 +39,6 @@
#include <util.h>
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Partition Status Information from Apple Tech Note 1189
*/
diff --git a/usr.sbin/makefs/cd9660/cd9660_strings.c b/usr.sbin/makefs/cd9660/cd9660_strings.c
index 6c60ea92fac8..c1890e23d8c2 100644
--- a/usr.sbin/makefs/cd9660/cd9660_strings.c
+++ b/usr.sbin/makefs/cd9660/cd9660_strings.c
@@ -37,7 +37,6 @@
#include <sys/mount.h>
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <ctype.h>
diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c
index 7e3910ceb83b..828af11669c1 100644
--- a/usr.sbin/makefs/cd9660/cd9660_write.c
+++ b/usr.sbin/makefs/cd9660/cd9660_write.c
@@ -38,8 +38,6 @@
#include "iso9660_rrip.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <util.h>
static int cd9660_write_volume_descriptors(iso9660_disk *, FILE *);
diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c
index 3b5ee2c51c44..a4ce5c09b24b 100644
--- a/usr.sbin/makefs/cd9660/iso9660_rrip.c
+++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 17682dea2a4b..597379cc1a4c 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -68,8 +68,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c
index 3d03e9866b3b..db73ceb6be59 100644
--- a/usr.sbin/makefs/ffs/buf.c
+++ b/usr.sbin/makefs/ffs/buf.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c
index 4dee635fba96..063024576963 100644
--- a/usr.sbin/makefs/ffs/ffs_alloc.c
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c
@@ -44,8 +44,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/makefs/ffs/ffs_balloc.c b/usr.sbin/makefs/ffs/ffs_balloc.c
index 275ec4c04471..db3b72856433 100644
--- a/usr.sbin/makefs/ffs/ffs_balloc.c
+++ b/usr.sbin/makefs/ffs/ffs_balloc.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/makefs/ffs/ffs_bswap.c b/usr.sbin/makefs/ffs/ffs_bswap.c
index 1f28a3cccd99..ebbd17441807 100644
--- a/usr.sbin/makefs/ffs/ffs_bswap.c
+++ b/usr.sbin/makefs/ffs/ffs_bswap.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#if defined(_KERNEL)
#include <sys/systm.h>
diff --git a/usr.sbin/makefs/ffs/ffs_subr.c b/usr.sbin/makefs/ffs/ffs_subr.c
index 53e5b97ada48..63dd9d9f280f 100644
--- a/usr.sbin/makefs/ffs/ffs_subr.c
+++ b/usr.sbin/makefs/ffs/ffs_subr.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c
index 4e88dae7aae8..b579565b6a01 100644
--- a/usr.sbin/makefs/ffs/mkfs.c
+++ b/usr.sbin/makefs/ffs/mkfs.c
@@ -41,8 +41,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.sbin/makefs/ffs/ufs_bmap.c b/usr.sbin/makefs/ffs/ufs_bmap.c
index 196693587da0..e095f1ab7a07 100644
--- a/usr.sbin/makefs/ffs/ufs_bmap.c
+++ b/usr.sbin/makefs/ffs/ufs_bmap.c
@@ -40,8 +40,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index e775b72fd4bb..8c8e03b9d59f 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <assert.h>
diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c
index ec38c1d207dd..75aad6949203 100644
--- a/usr.sbin/makefs/msdos.c
+++ b/usr.sbin/makefs/msdos.c
@@ -34,7 +34,6 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__FBSDID("$FreeBSD$");
#endif /* !__lint */
#include <sys/param.h>
diff --git a/usr.sbin/makefs/msdos/msdosfs_conv.c b/usr.sbin/makefs/msdos/msdosfs_conv.c
index b53656d3b439..4dcb1170bbb3 100644
--- a/usr.sbin/makefs/msdos/msdosfs_conv.c
+++ b/usr.sbin/makefs/msdos/msdosfs_conv.c
@@ -48,8 +48,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/usr.sbin/makefs/msdos/msdosfs_denode.c b/usr.sbin/makefs/msdos/msdosfs_denode.c
index ff706ad99563..a9c37ebf8f60 100644
--- a/usr.sbin/makefs/msdos/msdosfs_denode.c
+++ b/usr.sbin/makefs/msdos/msdosfs_denode.c
@@ -50,8 +50,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/usr.sbin/makefs/msdos/msdosfs_vfsops.c b/usr.sbin/makefs/msdos/msdosfs_vfsops.c
index d543adc2bbcd..8b5eac4a4b66 100644
--- a/usr.sbin/makefs/msdos/msdosfs_vfsops.c
+++ b/usr.sbin/makefs/msdos/msdosfs_vfsops.c
@@ -49,8 +49,6 @@
#include <sys/cdefs.h>
/* $NetBSD: msdosfs_vfsops.c,v 1.10 2016/01/30 09:59:27 mlelstv Exp $ */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c
index 5bc9b495c586..13a6ade47d6d 100644
--- a/usr.sbin/makefs/msdos/msdosfs_vnops.c
+++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c
@@ -50,8 +50,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/mman.h>
diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c
index d1d300261a1e..45588e202542 100644
--- a/usr.sbin/makefs/mtree.c
+++ b/usr.sbin/makefs/mtree.c
@@ -30,8 +30,6 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/sbuf.h>
diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c
index 79b68d1d3e19..56e2d19c6f00 100644
--- a/usr.sbin/makefs/walk.c
+++ b/usr.sbin/makefs/walk.c
@@ -39,8 +39,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.sbin/mld6query/mld6.c b/usr.sbin/mld6query/mld6.c
index e722f91eb990..d0830e7233da 100644
--- a/usr.sbin/mld6query/mld6.c
+++ b/usr.sbin/mld6query/mld6.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/uio.h>
#include <sys/socket.h>
diff --git a/usr.sbin/mlx5tool/mlx5tool.c b/usr.sbin/mlx5tool/mlx5tool.c
index 4d2cbe51cffa..cc13d008fcd1 100644
--- a/usr.sbin/mlx5tool/mlx5tool.c
+++ b/usr.sbin/mlx5tool/mlx5tool.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index 22dfcc3c1abb..436481bad14c 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index a6d7a9c2f29b..dcfd72099cb9 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -47,8 +47,6 @@
**/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/consio.h>
#include <sys/mouse.h>
diff --git a/usr.sbin/mtest/mtest.c b/usr.sbin/mtest/mtest.c
index 0b315b778b7b..d0ed511c21fa 100644
--- a/usr.sbin/mtest/mtest.c
+++ b/usr.sbin/mtest/mtest.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c
index 5cd0f8b7a5d1..c867237d212c 100644
--- a/usr.sbin/newsyslog/newsyslog.c
+++ b/usr.sbin/newsyslog/newsyslog.c
@@ -54,8 +54,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define OSF
#include <sys/param.h>
diff --git a/usr.sbin/newsyslog/ptimes.c b/usr.sbin/newsyslog/ptimes.c
index d54ca1d40050..792ad3e1727d 100644
--- a/usr.sbin/newsyslog/ptimes.c
+++ b/usr.sbin/newsyslog/ptimes.c
@@ -41,8 +41,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.sbin/nfscbd/nfscbd.c b/usr.sbin/nfscbd/nfscbd.c
index 3731575b4822..9d8efaecee57 100644
--- a/usr.sbin/nfscbd/nfscbd.c
+++ b/usr.sbin/nfscbd/nfscbd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/linker.h>
diff --git a/usr.sbin/nfsdumpstate/nfsdumpstate.c b/usr.sbin/nfsdumpstate/nfsdumpstate.c
index 16f6efab3033..831a1efa46b9 100644
--- a/usr.sbin/nfsdumpstate/nfsdumpstate.c
+++ b/usr.sbin/nfsdumpstate/nfsdumpstate.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/usr.sbin/nfsrevoke/nfsrevoke.c b/usr.sbin/nfsrevoke/nfsrevoke.c
index e9750afac722..0f7ef0f77137 100644
--- a/usr.sbin/nfsrevoke/nfsrevoke.c
+++ b/usr.sbin/nfsrevoke/nfsrevoke.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/usr.sbin/nfsuserd/nfsuserd.c b/usr.sbin/nfsuserd/nfsuserd.c
index 0f632a6efccc..08e8c3c5e6a2 100644
--- a/usr.sbin/nfsuserd/nfsuserd.c
+++ b/usr.sbin/nfsuserd/nfsuserd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/linker.h>
diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c
index 4b1cdabdb8e9..b9e88681d593 100644
--- a/usr.sbin/ngctl/main.c
+++ b/usr.sbin/ngctl/main.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/select.h>
diff --git a/usr.sbin/ngctl/msg.c b/usr.sbin/ngctl/msg.c
index 38f0db704927..2cc733408380 100644
--- a/usr.sbin/ngctl/msg.c
+++ b/usr.sbin/ngctl/msg.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <netgraph.h>
#include <stdio.h>
diff --git a/usr.sbin/nghook/main.c b/usr.sbin/nghook/main.c
index 700ca5e1a59d..cee8bf481df4 100644
--- a/usr.sbin/nghook/main.c
+++ b/usr.sbin/nghook/main.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/nologin/nologin.c b/usr.sbin/nologin/nologin.c
index 658637ef2ae8..9535ed64390e 100644
--- a/usr.sbin/nologin/nologin.c
+++ b/usr.sbin/nologin/nologin.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <syslog.h>
#include <unistd.h>
diff --git a/usr.sbin/nscd/agent.c b/usr.sbin/nscd/agent.c
index 55b1565a1195..f44cc1071bd5 100644
--- a/usr.sbin/nscd/agent.c
+++ b/usr.sbin/nscd/agent.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/nscd/agents/group.c b/usr.sbin/nscd/agents/group.c
index 92be7ed0ae48..b91b77fe5df8 100644
--- a/usr.sbin/nscd/agents/group.c
+++ b/usr.sbin/nscd/agents/group.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/agents/passwd.c b/usr.sbin/nscd/agents/passwd.c
index 247444f5c4ba..79b69e87db06 100644
--- a/usr.sbin/nscd/agents/passwd.c
+++ b/usr.sbin/nscd/agents/passwd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/agents/services.c b/usr.sbin/nscd/agents/services.c
index 7b02e50cebd8..c234af2950d9 100644
--- a/usr.sbin/nscd/agents/services.c
+++ b/usr.sbin/nscd/agents/services.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/cachelib.c b/usr.sbin/nscd/cachelib.c
index ff3e8cb730aa..3a2d58300f31 100644
--- a/usr.sbin/nscd/cachelib.c
+++ b/usr.sbin/nscd/cachelib.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/cacheplcs.c b/usr.sbin/nscd/cacheplcs.c
index be71baa773ae..534f757c22fc 100644
--- a/usr.sbin/nscd/cacheplcs.c
+++ b/usr.sbin/nscd/cacheplcs.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/config.c b/usr.sbin/nscd/config.c
index 74a5cddc1436..f8d33625b520 100644
--- a/usr.sbin/nscd/config.c
+++ b/usr.sbin/nscd/config.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.sbin/nscd/debug.c b/usr.sbin/nscd/debug.c
index 2d2ea5b2ca44..6485cb19f221 100644
--- a/usr.sbin/nscd/debug.c
+++ b/usr.sbin/nscd/debug.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include "debug.h"
diff --git a/usr.sbin/nscd/log.c b/usr.sbin/nscd/log.c
index 5f4c578f1130..d76b2b380b35 100644
--- a/usr.sbin/nscd/log.c
+++ b/usr.sbin/nscd/log.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
diff --git a/usr.sbin/nscd/mp_rs_query.c b/usr.sbin/nscd/mp_rs_query.c
index 4bec5174a635..2c09d6151b8b 100644
--- a/usr.sbin/nscd/mp_rs_query.c
+++ b/usr.sbin/nscd/mp_rs_query.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/event.h>
#include <sys/socket.h>
diff --git a/usr.sbin/nscd/mp_ws_query.c b/usr.sbin/nscd/mp_ws_query.c
index 5e29748529ed..0e4bf657b47c 100644
--- a/usr.sbin/nscd/mp_ws_query.c
+++ b/usr.sbin/nscd/mp_ws_query.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/event.h>
#include <sys/socket.h>
diff --git a/usr.sbin/nscd/nscd.c b/usr.sbin/nscd/nscd.c
index 14d0a6780bf4..5f70eea3d396 100644
--- a/usr.sbin/nscd/nscd.c
+++ b/usr.sbin/nscd/nscd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/event.h>
#include <sys/socket.h>
diff --git a/usr.sbin/nscd/nscdcli.c b/usr.sbin/nscd/nscdcli.c
index f9aa1903ed74..ba603f610283 100644
--- a/usr.sbin/nscd/nscdcli.c
+++ b/usr.sbin/nscd/nscdcli.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/event.h>
diff --git a/usr.sbin/nscd/parser.c b/usr.sbin/nscd/parser.c
index 1c1523a031a3..6427f179707b 100644
--- a/usr.sbin/nscd/parser.c
+++ b/usr.sbin/nscd/parser.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/protocol.c b/usr.sbin/nscd/protocol.c
index 3e40739600a6..528fec1c7554 100644
--- a/usr.sbin/nscd/protocol.c
+++ b/usr.sbin/nscd/protocol.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/nscd/query.c b/usr.sbin/nscd/query.c
index a7737c0ea9aa..652be2357003 100644
--- a/usr.sbin/nscd/query.c
+++ b/usr.sbin/nscd/query.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/event.h>
#include <sys/socket.h>
diff --git a/usr.sbin/nscd/singletons.c b/usr.sbin/nscd/singletons.c
index e557c20cfc1c..a6c3d1337b33 100644
--- a/usr.sbin/nscd/singletons.c
+++ b/usr.sbin/nscd/singletons.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include "singletons.h"
diff --git a/usr.sbin/ofwdump/ofw_util.c b/usr.sbin/ofwdump/ofw_util.c
index 71361d452511..2f90eb1652c0 100644
--- a/usr.sbin/ofwdump/ofw_util.c
+++ b/usr.sbin/ofwdump/ofw_util.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/ofwdump/ofwdump.c b/usr.sbin/ofwdump/ofwdump.c
index 6bca1ac839ab..f2bcad8b7c1f 100644
--- a/usr.sbin/ofwdump/ofwdump.c
+++ b/usr.sbin/ofwdump/ofwdump.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <dev/ofw/openfirm.h>
#include <dev/ofw/openfirmio.h>
diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c
index b7b3018e0ae6..a2b005eca835 100644
--- a/usr.sbin/pkg/config.c
+++ b/usr.sbin/pkg/config.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/utsname.h>
diff --git a/usr.sbin/pkg/dns_utils.c b/usr.sbin/pkg/dns_utils.c
index b656d1db011a..dcf4b5599532 100644
--- a/usr.sbin/pkg/dns_utils.c
+++ b/usr.sbin/pkg/dns_utils.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <string.h>
#include <netinet/in.h>
diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c
index b64ccb2c34c2..0689c67cf822 100644
--- a/usr.sbin/pkg/pkg.c
+++ b/usr.sbin/pkg/pkg.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/types.h>
diff --git a/usr.sbin/pmc/cmd_pmc_filter.cc b/usr.sbin/pmc/cmd_pmc_filter.cc
index 283af229f635..286d9cc97da6 100644
--- a/usr.sbin/pmc/cmd_pmc_filter.cc
+++ b/usr.sbin/pmc/cmd_pmc_filter.cc
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmc/cmd_pmc_list.c b/usr.sbin/pmc/cmd_pmc_list.c
index 46886c8f1fe2..9701abd66796 100644
--- a/usr.sbin/pmc/cmd_pmc_list.c
+++ b/usr.sbin/pmc/cmd_pmc_list.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmc/cmd_pmc_stat.c b/usr.sbin/pmc/cmd_pmc_stat.c
index 029807618117..659b36137724 100644
--- a/usr.sbin/pmc/cmd_pmc_stat.c
+++ b/usr.sbin/pmc/cmd_pmc_stat.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmc/cmd_pmc_summary.cc b/usr.sbin/pmc/cmd_pmc_summary.cc
index 771a09555794..9f7e36c694b7 100644
--- a/usr.sbin/pmc/cmd_pmc_summary.cc
+++ b/usr.sbin/pmc/cmd_pmc_summary.cc
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmc/pmc_util.c b/usr.sbin/pmc/pmc_util.c
index 7ca4b28ad4b7..03e9a7554fbe 100644
--- a/usr.sbin/pmc/pmc_util.c
+++ b/usr.sbin/pmc/pmc_util.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmcannotate/pmcannotate.c b/usr.sbin/pmcannotate/pmcannotate.c
index b9af29e28b8a..32138aa6c3a7 100644
--- a/usr.sbin/pmcannotate/pmcannotate.c
+++ b/usr.sbin/pmcannotate/pmcannotate.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.sbin/pmccontrol/pmccontrol.c b/usr.sbin/pmccontrol/pmccontrol.c
index 878518e78c3a..6734e6d16d99 100644
--- a/usr.sbin/pmccontrol/pmccontrol.c
+++ b/usr.sbin/pmccontrol/pmccontrol.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/cpuset.h>
diff --git a/usr.sbin/pmcstat/pmcpl_annotate.c b/usr.sbin/pmcstat/pmcpl_annotate.c
index 3a4076318aa6..fbc6c90f75a9 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate.c
+++ b/usr.sbin/pmcstat/pmcpl_annotate.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/gmon.h>
diff --git a/usr.sbin/pmcstat/pmcpl_annotate_cg.c b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
index 7c3f2c435bf2..c7399cc5467e 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate_cg.c
+++ b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/gmon.h>
diff --git a/usr.sbin/pmcstat/pmcpl_callgraph.c b/usr.sbin/pmcstat/pmcpl_callgraph.c
index 2df3aa675f52..2ba6dfc0f8d5 100644
--- a/usr.sbin/pmcstat/pmcpl_callgraph.c
+++ b/usr.sbin/pmcstat/pmcpl_callgraph.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/gmon.h>
diff --git a/usr.sbin/pmcstat/pmcpl_calltree.c b/usr.sbin/pmcstat/pmcpl_calltree.c
index 26b6299731c7..434263ccee26 100644
--- a/usr.sbin/pmcstat/pmcpl_calltree.c
+++ b/usr.sbin/pmcstat/pmcpl_calltree.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/queue.h>
diff --git a/usr.sbin/pmcstat/pmcpl_gprof.c b/usr.sbin/pmcstat/pmcpl_gprof.c
index f9897d52c248..2c98c1c494a1 100644
--- a/usr.sbin/pmcstat/pmcpl_gprof.c
+++ b/usr.sbin/pmcstat/pmcpl_gprof.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/gmon.h>
diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c
index 634085a95335..fd4be99f83c8 100644
--- a/usr.sbin/pmcstat/pmcstat.c
+++ b/usr.sbin/pmcstat/pmcstat.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmcstat/pmcstat_log.c b/usr.sbin/pmcstat/pmcstat_log.c
index 8eb01d0e230f..cab41873eef1 100644
--- a/usr.sbin/pmcstat/pmcstat_log.c
+++ b/usr.sbin/pmcstat/pmcstat_log.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/cpuset.h>
diff --git a/usr.sbin/pmcstudy/eval_expr.c b/usr.sbin/pmcstudy/eval_expr.c
index 984e5ea72176..32369f046177 100644
--- a/usr.sbin/pmcstudy/eval_expr.c
+++ b/usr.sbin/pmcstudy/eval_expr.c
@@ -32,8 +32,6 @@
#include <strings.h>
#include <ctype.h>
#include "eval_expr.h"
-__FBSDID("$FreeBSD$");
-
static struct expression *
alloc_and_hook_expr(struct expression **exp_p, struct expression **last_p)
{
diff --git a/usr.sbin/pmcstudy/eval_expr.h b/usr.sbin/pmcstudy/eval_expr.h
index 2c264ff711b2..de61e54b8c96 100644
--- a/usr.sbin/pmcstudy/eval_expr.h
+++ b/usr.sbin/pmcstudy/eval_expr.h
@@ -26,8 +26,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-__FBSDID("$FreeBSD$");
-
enum exptype {
TYPE_OP_PLUS,
TYPE_OP_MINUS,
diff --git a/usr.sbin/pmcstudy/pmcstudy.c b/usr.sbin/pmcstudy/pmcstudy.c
index c72822ccccf5..653ae7c53b44 100644
--- a/usr.sbin/pmcstudy/pmcstudy.c
+++ b/usr.sbin/pmcstudy/pmcstudy.c
@@ -35,8 +35,6 @@
#include <sys/wait.h>
#include <getopt.h>
#include "eval_expr.h"
-__FBSDID("$FreeBSD$");
-
static int max_pmc_counters = 1;
static int run_all = 0;
diff --git a/usr.sbin/pnfsdscopymr/pnfsdscopymr.c b/usr.sbin/pnfsdscopymr/pnfsdscopymr.c
index 7a6eb298fa8d..639cb7f92027 100644
--- a/usr.sbin/pnfsdscopymr/pnfsdscopymr.c
+++ b/usr.sbin/pnfsdscopymr/pnfsdscopymr.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <getopt.h>
diff --git a/usr.sbin/pnfsdsfile/pnfsdsfile.c b/usr.sbin/pnfsdsfile/pnfsdsfile.c
index 7669f1f29b93..37b2bc79d46a 100644
--- a/usr.sbin/pnfsdsfile/pnfsdsfile.c
+++ b/usr.sbin/pnfsdsfile/pnfsdsfile.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <getopt.h>
#include <netdb.h>
diff --git a/usr.sbin/pnfsdskill/pnfsdskill.c b/usr.sbin/pnfsdskill/pnfsdskill.c
index 878ca584d142..06b0dee6d361 100644
--- a/usr.sbin/pnfsdskill/pnfsdskill.c
+++ b/usr.sbin/pnfsdskill/pnfsdskill.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <getopt.h>
#include <stdio.h>
diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c
index 1dcc9ae38fe3..5e4c752519f2 100644
--- a/usr.sbin/powerd/powerd.c
+++ b/usr.sbin/powerd/powerd.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index f5e9dde06d7d..6a0cc9e8e971 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
diff --git a/usr.sbin/pppctl/pppctl.c b/usr.sbin/pppctl/pppctl.c
index 59cbcd0c0ffc..0b2dfd5f4b3e 100644
--- a/usr.sbin/pppctl/pppctl.c
+++ b/usr.sbin/pppctl/pppctl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c b/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
index 6c20d639a6d3..09c8051786d3 100644
--- a/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
+++ b/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/resource.h>
#include <sys/socket.h>
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index bcb3df20b8bd..4b31947f6c46 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -48,8 +48,6 @@ static char sccsid[] = "@(#)pstat.c 8.16 (Berkeley) 5/9/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/file.h>
diff --git a/usr.sbin/pw/pw_utils.c b/usr.sbin/pw/pw_utils.c
index fbf4a3f5f560..9be1656bcfe1 100644
--- a/usr.sbin/pw/pw_utils.c
+++ b/usr.sbin/pw/pw_utils.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/wait.h>
#include <err.h>
diff --git a/usr.sbin/pw/strtounum.c b/usr.sbin/pw/strtounum.c
index ae578bdeaeba..b138e7f130b7 100644
--- a/usr.sbin/pw/strtounum.c
+++ b/usr.sbin/pw/strtounum.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <inttypes.h>
#include <limits.h>
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index f843b7eae376..aac4fb8f3a3a 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)pwd_mkdb.c 8.5 (Berkeley) 4/20/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/stat.h>
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index 7e84dd79e148..dc189f0b8e42 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stdint.h>
#include <sys/mount.h>
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 224da3b2032c..44f0c564f13e 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)quotaon.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Turn quota on/off for a filesystem.
*/
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index 29781be817f9..14b45c1d8996 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -24,8 +24,6 @@ The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rarpd - Reverse ARP Daemon
*
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 9fc8829ad1b6..b212a470f2d1 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)repquota.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Quota report
*/
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index 308d41b14c64..e2d6f859e32e 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)rmt.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rmt
*/
diff --git a/usr.sbin/rpc.lockd/kern.c b/usr.sbin/rpc.lockd/kern.c
index b25ca828fa27..1bd6fadc737d 100644
--- a/usr.sbin/rpc.lockd/kern.c
+++ b/usr.sbin/rpc.lockd/kern.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/queue.h>
diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c
index 0bde779642c0..7ba948c5ca8e 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define LOCKD_DEBUG
#include <stdio.h>
diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c
index 3f1b60bd3f22..70fb52e32452 100644
--- a/usr.sbin/rpc.statd/procs.c
+++ b/usr.sbin/rpc.statd/procs.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c
index a1cd8582e7a6..c71270181999 100644
--- a/usr.sbin/rpc.statd/statd.c
+++ b/usr.sbin/rpc.statd/statd.c
@@ -38,8 +38,6 @@
/* The actual program logic is in the file procs.c */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <stdio.h>
diff --git a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c
index e6784576982a..223ec61aba7a 100644
--- a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c
+++ b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.sbin/rpc.tlsservd/rpc.tlscommon.c b/usr.sbin/rpc.tlsservd/rpc.tlscommon.c
index 6aeeb3ff5dea..5bf7f86fba23 100644
--- a/usr.sbin/rpc.tlsservd/rpc.tlscommon.c
+++ b/usr.sbin/rpc.tlsservd/rpc.tlscommon.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/syslog.h>
#include <sys/select.h>
diff --git a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
index 275bc2b9389b..9103cff2204e 100644
--- a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
+++ b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/linker.h>
diff --git a/usr.sbin/rpc.umntall/mounttab.c b/usr.sbin/rpc.umntall/mounttab.c
index 72032d96c1a9..0043d4302e59 100644
--- a/usr.sbin/rpc.umntall/mounttab.c
+++ b/usr.sbin/rpc.umntall/mounttab.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/syslog.h>
#include <rpc/rpc.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
index b48ba40aeeca..9a4779f9293a 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index 8089dac2a6ea..5d0879005934 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/fcntl.h>
#include <sys/socket.h>
diff --git a/usr.sbin/rpc.ypupdated/yp_dbdelete.c b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
index 7ef145867391..d07a8fcd2ff9 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbdelete.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
diff --git a/usr.sbin/rpc.ypupdated/yp_dbupdate.c b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
index d4cfc7ac0353..af17bf5244ef 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbupdate.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/fcntl.h>
#include <stdint.h>
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_main.c b/usr.sbin/rpc.ypupdated/ypupdated_main.c
index 4d826afa4e63..dae956594da0 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "ypupdate_prot.h"
#include <stdio.h>
#include <stdlib.h> /* getenv, exit */
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_server.c b/usr.sbin/rpc.ypupdated/ypupdated_server.c
index 67fa05eceee5..47e52401cd6e 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_server.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_server.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <rpc/rpc.h>
#include <rpc/key_prot.h>
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
index 412190c9ebe9..be24b8d7dff1 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "ypxfrd.h"
#include <err.h>
#include <fcntl.h>
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
index ca8a2a3c4fe4..f012fbaf50d3 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "ypxfrd.h"
#include <stdio.h>
diff --git a/usr.sbin/rtprio/rtprio.c b/usr.sbin/rtprio/rtprio.c
index f8da2cc96290..63d89971b8ed 100644
--- a/usr.sbin/rtprio/rtprio.c
+++ b/usr.sbin/rtprio/rtprio.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/rtprio.h>
diff --git a/usr.sbin/rtsold/cap_llflags.c b/usr.sbin/rtsold/cap_llflags.c
index aea45d9fb8a0..bc07b2f1e3e4 100644
--- a/usr.sbin/rtsold/cap_llflags.c
+++ b/usr.sbin/rtsold/cap_llflags.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/dnv.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/rtsold/cap_script.c b/usr.sbin/rtsold/cap_script.c
index 971d0bae4172..ba27bd1987c6 100644
--- a/usr.sbin/rtsold/cap_script.c
+++ b/usr.sbin/rtsold/cap_script.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/dnv.h>
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 1b2b2b153a0f..f23b45a0da22 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)rwhod.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/sa/db.c b/usr.sbin/sa/db.c
index e717ee02c20a..f9af179b0db8 100644
--- a/usr.sbin/sa/db.c
+++ b/usr.sbin/sa/db.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/acct.h>
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index b6c9708de74f..e19fc00aaa90 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -38,8 +38,6 @@ static const char copyright[] =
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* sa: system accounting
*/
diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c
index eb3f4a40c983..348c5494f95b 100644
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/acct.h>
#include <err.h>
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index 50a33e1a91ae..8161bca3f8db 100644
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/acct.h>
diff --git a/usr.sbin/services_mkdb/services_mkdb.c b/usr.sbin/services_mkdb/services_mkdb.c
index b77e74c819f4..9c2a79750029 100644
--- a/usr.sbin/services_mkdb/services_mkdb.c
+++ b/usr.sbin/services_mkdb/services_mkdb.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/services_mkdb/uniq.c b/usr.sbin/services_mkdb/uniq.c
index e95ecf145b12..e18d0e462c90 100644
--- a/usr.sbin/services_mkdb/uniq.c
+++ b/usr.sbin/services_mkdb/uniq.c
@@ -31,8 +31,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/usr.sbin/sesutil/sesutil.c b/usr.sbin/sesutil/sesutil.c
index 9c546f8ba210..b6cdd2cf3314 100644
--- a/usr.sbin/sesutil/sesutil.c
+++ b/usr.sbin/sesutil/sesutil.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/param.h>
#include <sys/disk.h>
diff --git a/usr.sbin/setfib/setfib.c b/usr.sbin/setfib/setfib.c
index 1c8adbc988da..aa998a0f6e77 100644
--- a/usr.sbin/setfib/setfib.c
+++ b/usr.sbin/setfib/setfib.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/spi/spi.c b/usr.sbin/spi/spi.c
index 0407f40a3521..d5344edd18c0 100644
--- a/usr.sbin/spi/spi.c
+++ b/usr.sbin/spi/spi.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioccom.h>
#include <sys/spigenio.h>
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 730575c24156..de3d7c106f8a 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -69,8 +69,6 @@ static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* syslogd -- log system messages
*
diff --git a/usr.sbin/tcpdrop/tcpdrop.c b/usr.sbin/tcpdrop/tcpdrop.c
index 018ef8456e6a..882dff732304 100644
--- a/usr.sbin/tcpdrop/tcpdrop.c
+++ b/usr.sbin/tcpdrop/tcpdrop.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/usr.sbin/trim/trim.c b/usr.sbin/trim/trim.c
index da036b45f5f5..3e187faa0fb3 100644
--- a/usr.sbin/trim/trim.c
+++ b/usr.sbin/trim/trim.c
@@ -45,8 +45,6 @@
#include <unistd.h>
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
static bool candelete(int fd);
static off_t getsize(const char *path);
static int opendev(const char *path, int flags);
diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c
index 4865e4571bd3..5dfe840528b5 100644
--- a/usr.sbin/tzsetup/tzsetup.c
+++ b/usr.sbin/tzsetup/tzsetup.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <stdio.h>
diff --git a/usr.sbin/uefisign/child.c b/usr.sbin/uefisign/child.c
index 00adb9945837..ee3f518f1473 100644
--- a/usr.sbin/uefisign/child.c
+++ b/usr.sbin/uefisign/child.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/types.h>
diff --git a/usr.sbin/uefisign/pe.c b/usr.sbin/uefisign/pe.c
index 21e782a541cf..7c194cc134a7 100644
--- a/usr.sbin/uefisign/pe.c
+++ b/usr.sbin/uefisign/pe.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/uefisign/uefisign.c b/usr.sbin/uefisign/uefisign.c
index df9770d5bfee..bf6a2c0d0e42 100644
--- a/usr.sbin/uefisign/uefisign.c
+++ b/usr.sbin/uefisign/uefisign.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/wait.h>
#include <assert.h>
#include <err.h>
diff --git a/usr.sbin/ugidfw/ugidfw.c b/usr.sbin/ugidfw/ugidfw.c
index 4a8c2dc2118f..99156e6bbf94 100644
--- a/usr.sbin/ugidfw/ugidfw.c
+++ b/usr.sbin/ugidfw/ugidfw.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/mount.h>
diff --git a/usr.sbin/utx/utx.c b/usr.sbin/utx/utx.c
index 2bd7d89286ca..ab40668a0926 100644
--- a/usr.sbin/utx/utx.c
+++ b/usr.sbin/utx/utx.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <errno.h>
#include <ctype.h>
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index 09d37ea440d0..28247eb21634 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -48,8 +48,6 @@ static char sccsid[] = "@(#)vipw.c 8.3 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.sbin/wake/wake.c b/usr.sbin/wake/wake.c
index 0281bf8deb9c..7b3a87c01033 100644
--- a/usr.sbin/wake/wake.c
+++ b/usr.sbin/wake/wake.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 85583882ea4e..f52a70872dee 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/fcntl.h>
#include <sys/filio.h>
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c
index aa3806e1a9a4..88b467486da1 100644
--- a/usr.sbin/watchdogd/watchdogd.c
+++ b/usr.sbin/watchdogd/watchdogd.c
@@ -34,8 +34,6 @@
*/
#include <sys/types.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/mman.h>
#include <sys/param.h>
#include <sys/rtprio.h>
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c
index 021153bdb03a..4e733325141a 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <fcntl.h>
#include <limits.h>
diff --git a/usr.sbin/ypbind/yp_ping.c b/usr.sbin/ypbind/yp_ping.c
index d65c5eb695e2..b5d18817ce56 100644
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@@ -66,8 +66,6 @@ static char *sccsid = "@(#)from: clnt_udp.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* clnt_udp.c, Implements a UDP/IP based, client side RPC.
*
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 357e35a9a7b6..1cfe7d4edcb7 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index 03828238f67a..e6ca3015f30a 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c
index bfcdeb7f4f22..15163bc6ba80 100644
--- a/usr.sbin/yppush/yppush_main.c
+++ b/usr.sbin/yppush/yppush_main.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <signal.h>
#include <stdio.h>
diff --git a/usr.sbin/ypserv/common/yplib_host.c b/usr.sbin/ypserv/common/yplib_host.c
index dfdfda22ffc8..8462d61432d4 100644
--- a/usr.sbin/ypserv/common/yplib_host.c
+++ b/usr.sbin/ypserv/common/yplib_host.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/types.h>
diff --git a/usr.sbin/ypserv/yp_access.c b/usr.sbin/ypserv/yp_access.c
index 50c8d3dbd532..fefe96076092 100644
--- a/usr.sbin/ypserv/yp_access.c
+++ b/usr.sbin/ypserv/yp_access.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <rpc/rpc.h>
#include <rpcsvc/yp.h>
diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index 291daba0da09..ee3a4c2e9d98 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <db.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c
index b33b80c2e82c..b1dc712c35ff 100644
--- a/usr.sbin/ypserv/yp_dnslookup.c
+++ b/usr.sbin/ypserv/yp_dnslookup.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Do standard and reverse DNS lookups using the resolver library.
* Take care of all the dirty work here so the main program only has to
diff --git a/usr.sbin/ypserv/yp_error.c b/usr.sbin/ypserv/yp_error.c
index c22375f859ac..314c11d2514d 100644
--- a/usr.sbin/ypserv/yp_error.c
+++ b/usr.sbin/ypserv/yp_error.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* error logging/reporting facilities
* stolen from /usr/libexec/mail.local via ypserv
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c
index 452bee79d2ca..dac006d4bc28 100644
--- a/usr.sbin/ypserv/yp_main.c
+++ b/usr.sbin/ypserv/yp_main.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ypserv startup function.
* We need out own main() since we have to do some additional work
diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index 7acb5d7f2b5c..8bfff7355a16 100644
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "yp.h"
#include "yp_extern.h"
#include <dirent.h>
diff --git a/usr.sbin/ypserv/yp_svc_udp.c b/usr.sbin/ypserv/yp_svc_udp.c
index 288bd28423b1..9cb904db01b1 100644
--- a/usr.sbin/ypserv/yp_svc_udp.c
+++ b/usr.sbin/ypserv/yp_svc_udp.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <rpc/rpc.h>
#include <rpc/svc_dg.h>
#include "yp_extern.h"
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index fb6ed90d6b89..7f269e361969 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/zonectl/zonectl.c b/usr.sbin/zonectl/zonectl.c
index dac773974deb..56cd3c436d10 100644
--- a/usr.sbin/zonectl/zonectl.c
+++ b/usr.sbin/zonectl/zonectl.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>