aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-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/aarch64/reloc.c2
-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/amd64/reloc.c2
-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.c2
-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/i386/reloc.c2
-rw-r--r--lib/csu/mips/crt1_c.c2
-rw-r--r--lib/csu/mips/crti.S2
-rw-r--r--lib/csu/mips/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/powerpc64/reloc.c2
-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/_get_tp.c2
-rw-r--r--lib/libc/aarch64/gen/_set_tp.c2
-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/_get_tp.c2
-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/_get_tp.c2
-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.S1
-rw-r--r--lib/libc/arm/string/memcpy_arm.S2
-rw-r--r--lib/libc/arm/string/memcpy_xscale.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/_get_tp.c2
-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/mips/gen/_ctx_start.S2
-rw-r--r--lib/libc/mips/gen/_get_tp.c2
-rw-r--r--lib/libc/mips/gen/_setjmp.S2
-rw-r--r--lib/libc/mips/gen/fabs.S2
-rw-r--r--lib/libc/mips/gen/fabs.c2
-rw-r--r--lib/libc/mips/gen/flt_rounds.c1
-rw-r--r--lib/libc/mips/gen/hardfloat/fpgetmask.c1
-rw-r--r--lib/libc/mips/gen/hardfloat/fpgetround.c1
-rw-r--r--lib/libc/mips/gen/hardfloat/fpgetsticky.c1
-rw-r--r--lib/libc/mips/gen/hardfloat/fpsetmask.c1
-rw-r--r--lib/libc/mips/gen/hardfloat/fpsetround.c1
-rw-r--r--lib/libc/mips/gen/hardfloat/fpsetsticky.c1
-rw-r--r--lib/libc/mips/gen/infinity.c2
-rw-r--r--lib/libc/mips/gen/ldexp.S2
-rw-r--r--lib/libc/mips/gen/makecontext.c1
-rw-r--r--lib/libc/mips/gen/setjmp.S2
-rw-r--r--lib/libc/mips/gen/signalcontext.c2
-rw-r--r--lib/libc/mips/gen/sigsetjmp.S1
-rw-r--r--lib/libc/mips/net/htonl.S3
-rw-r--r--lib/libc/mips/net/htons.S3
-rw-r--r--lib/libc/mips/net/ntohl.S3
-rw-r--r--lib/libc/mips/net/ntohs.S2
-rw-r--r--lib/libc/mips/string/bcmp.S2
-rw-r--r--lib/libc/mips/string/bcopy.S2
-rw-r--r--lib/libc/mips/string/bzero.S2
-rw-r--r--lib/libc/mips/string/ffs.S2
-rw-r--r--lib/libc/mips/string/memcpy.S2
-rw-r--r--lib/libc/mips/string/memmove.S2
-rw-r--r--lib/libc/mips/string/strchr.S2
-rw-r--r--lib/libc/mips/string/strcmp.S2
-rw-r--r--lib/libc/mips/string/strlen.S2
-rw-r--r--lib/libc/mips/string/strrchr.S2
-rw-r--r--lib/libc/mips/sys/Ovfork.S1
-rw-r--r--lib/libc/mips/sys/cerror.S1
-rw-r--r--lib/libc/mips/sys/syscall.S1
-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_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_flag.c2
-rw-r--r--lib/libc/posix1e/acl_free.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/_get_tp.c2
-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/_get_tp.c2
-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/_get_tp.c2
-rw-r--r--lib/libc/riscv/gen/_set_tp.c2
-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/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_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/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_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/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_mips.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/libopie/opieextra.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_opie/pam_opie.c2
-rw-r--r--lib/libpam/modules/pam_opieaccess/pam_opieaccess.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/mips/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/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/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--lib/ncurses/ncurses/termcap.c2
1885 files changed, 0 insertions, 3751 deletions
diff --git a/lib/csu/aarch64/crt1_c.c b/lib/csu/aarch64/crt1_c.c
index 9b3ffbff22d0..4cc9455a81a3 100644
--- a/lib/csu/aarch64/crt1_c.c
+++ b/lib/csu/aarch64/crt1_c.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include "libc_private.h"
diff --git a/lib/csu/aarch64/crt1_s.S b/lib/csu/aarch64/crt1_s.S
index 65803c8246ae..f5f9034a4f94 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$");
-
ENTRY(_start)
mov x3, x2 /* cleanup */
add x1, x0, #8 /* load argv */
diff --git a/lib/csu/aarch64/crti.S b/lib/csu/aarch64/crti.S
index 13e3b74642d8..b13dd1381b06 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 ebb59b710412..679ed704a97d 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
ldr lr, [sp]
add sp, sp, #16
diff --git a/lib/csu/aarch64/reloc.c b/lib/csu/aarch64/reloc.c
index f3dbf3e3b570..7f5dff497fe2 100644
--- a/lib/csu/aarch64/reloc.c
+++ b/lib/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/csu/amd64/crt1_c.c b/lib/csu/amd64/crt1_c.c
index 965d50608a7f..5a5b187fa349 100644
--- a/lib/csu/amd64/crt1_c.c
+++ b/lib/csu/amd64/crt1_c.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include "libc_private.h"
diff --git a/lib/csu/amd64/crti.S b/lib/csu/amd64/crti.S
index 618dca178877..2e9f684a3fa3 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 c411f001ac1f..d79d4a3d2784 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
addq $8,%rsp
ret
diff --git a/lib/csu/amd64/reloc.c b/lib/csu/amd64/reloc.c
index adb52e42a32c..c3d00218506e 100644
--- a/lib/csu/amd64/reloc.c
+++ b/lib/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/csu/arm/crt1_c.c b/lib/csu/arm/crt1_c.c
index 9725f173ff78..850e5b97f567 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>
#include <stdlib.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.c b/lib/csu/common/ignore_init.c
index 2cdb869c4a87..21606558d98f 100644
--- a/lib/csu/common/ignore_init.c
+++ b/lib/csu/common/ignore_init.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/elf.h>
#include <sys/elf_common.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 24c0d747e195..b9410b7b6dbf 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 <stdlib.h>
#include "libc_private.h"
diff --git a/lib/csu/i386/crt1_s.S b/lib/csu/i386/crt1_s.S
index d9b05bf9ecdf..95078783659b 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 77e4e77722d7..7ceec5f02271 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 0264e22540f1..5125bd388f8b 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
add $12,%esp
ret
diff --git a/lib/csu/i386/reloc.c b/lib/csu/i386/reloc.c
index 13438035841d..a1804a7d4f33 100644
--- a/lib/csu/i386/reloc.c
+++ b/lib/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/csu/mips/crt1_c.c b/lib/csu/mips/crt1_c.c
index 40f65e81a322..c127940aec73 100644
--- a/lib/csu/mips/crt1_c.c
+++ b/lib/csu/mips/crt1_c.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include "libc_private.h"
#include "ignore_init.c"
diff --git a/lib/csu/mips/crti.S b/lib/csu/mips/crti.S
index 7289f0a91f47..2626867eb993 100644
--- a/lib/csu/mips/crti.S
+++ b/lib/csu/mips/crti.S
@@ -1,6 +1,4 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#ifndef __clang__
.gnu_attribute 4, 0
#endif
diff --git a/lib/csu/mips/crtn.S b/lib/csu/mips/crtn.S
index db03f6c65d20..d17d30f5ff86 100644
--- a/lib/csu/mips/crtn.S
+++ b/lib/csu/mips/crtn.S
@@ -1,6 +1,4 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#ifndef __clang__
.gnu_attribute 4, 0
#endif
diff --git a/lib/csu/powerpc/crt1_c.c b/lib/csu/powerpc/crt1_c.c
index 8ad291bb4f4d..ff6a4e021f46 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 c9115be75fba..429cda8885ae 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 <stdlib.h>
#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/powerpc64/reloc.c b/lib/csu/powerpc64/reloc.c
index afa3f2fbec18..ae50c5af5aab 100644
--- a/lib/csu/powerpc64/reloc.c
+++ b/lib/csu/powerpc64/reloc.c
@@ -21,8 +21,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
static void
crt1_handle_rela(const Elf_Rela *r)
{
diff --git a/lib/csu/riscv/crt1_c.c b/lib/csu/riscv/crt1_c.c
index 11519e46c7f3..c3bdb8b4eaba 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 <stdlib.h>
#include "libc_private.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 1d2ee27d5aaf..9ab170d074eb 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 9c7899ff6e05..3eb00a077199 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 7de71dd1b23a..cb8ff95c4e07 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 8664f69667c3..1aeea94d0229 100644
--- a/lib/libc/aarch64/gen/_ctx_start.S
+++ b/lib/libc/aarch64/gen/_ctx_start.S
@@ -28,8 +28,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/_get_tp.c b/lib/libc/aarch64/gen/_get_tp.c
index ac383b104d66..3428603c51ee 100644
--- a/lib/libc/aarch64/gen/_get_tp.c
+++ b/lib/libc/aarch64/gen/_get_tp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <stdint.h>
#include "libc_private.h"
diff --git a/lib/libc/aarch64/gen/_set_tp.c b/lib/libc/aarch64/gen/_set_tp.c
index 871acb3001a3..88788c3c4a8c 100644
--- a/lib/libc/aarch64/gen/_set_tp.c
+++ b/lib/libc/aarch64/gen/_set_tp.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <sys/types.h>
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 2f5fd06dec6c..79f74ecc2647 100644
--- a/lib/libc/aarch64/gen/fabs.S
+++ b/lib/libc/aarch64/gen/fabs.S
@@ -25,8 +25,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 afc05b479a44..34309d86959f 100644
--- a/lib/libc/aarch64/gen/fpgetmask.c
+++ b/lib/libc/aarch64/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/aarch64/gen/fpsetmask.c b/lib/libc/aarch64/gen/fpsetmask.c
index de9ac043b472..c91ba2498b13 100644
--- a/lib/libc/aarch64/gen/fpsetmask.c
+++ b/lib/libc/aarch64/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/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 747d2c53b198..d1775efa4725 100644
--- a/lib/libc/aarch64/gen/makecontext.c
+++ b/lib/libc/aarch64/gen/makecontext.c
@@ -28,8 +28,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 917e1ef6ee56..df75b9399d73 100644
--- a/lib/libc/aarch64/gen/sigsetjmp.S
+++ b/lib/libc/aarch64/gen/sigsetjmp.S
@@ -28,8 +28,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 63148357d567..d373e1d6c52e 100644
--- a/lib/libc/aarch64/sys/syscall.S
+++ b/lib/libc/aarch64/sys/syscall.S
@@ -28,8 +28,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/_get_tp.c b/lib/libc/amd64/gen/_get_tp.c
index 355541cfe289..463557d2e98a 100644
--- a/lib/libc/amd64/gen/_get_tp.c
+++ b/lib/libc/amd64/gen/_get_tp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <stdint.h>
#include "libc_private.h"
diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S
index 0e1e5f8f265d..cdcca3a38fa4 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 90eff9e9ed6b..634aa0c4ec61 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 447134122019..e01a7f7b53df 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 1d2428e3420e..e77ea16511a9 100644
--- a/lib/libc/amd64/string/strlen.S
+++ b/lib/libc/amd64/string/strlen.S
@@ -4,8 +4,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/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 224d6a632185..b2dffa243b1b 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/_get_tp.c b/lib/libc/arm/gen/_get_tp.c
index f4ec68161615..4ca428a372c9 100644
--- a/lib/libc/arm/gen/_get_tp.c
+++ b/lib/libc/arm/gen/_get_tp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <string.h>
#include <stdint.h>
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 3628652681e0..e1d6e3a4c309 100644
--- a/lib/libc/arm/string/memcpy.S
+++ b/lib/libc/arm/string/memcpy.S
@@ -1,7 +1,6 @@
/* $NetBSD: memcpy.S,v 1.4 2003/10/14 07:51:45 scw Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
#if !defined(_ARM_ARCH_5E) || defined(_STANDALONE)
#include "memcpy_arm.S"
#else
diff --git a/lib/libc/arm/string/memcpy_arm.S b/lib/libc/arm/string/memcpy_arm.S
index 57b0449e5099..f066bacf5f0a 100644
--- a/lib/libc/arm/string/memcpy_arm.S
+++ b/lib/libc/arm/string/memcpy_arm.S
@@ -30,8 +30,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
.syntax unified
/*
diff --git a/lib/libc/arm/string/memcpy_xscale.S b/lib/libc/arm/string/memcpy_xscale.S
index ab01544fc176..8d9fe8f7cd30 100644
--- a/lib/libc/arm/string/memcpy_xscale.S
+++ b/lib/libc/arm/string/memcpy_xscale.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 8f961470076c..b3539b22b8c2 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 240fa7d9e85f..46e790c7d896 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 ce3b8a1ecf1b..eb212e0da2d6 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 fba854b51f33..c01f6ca1fedf 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 00795efa39cc..a6045f59e5d0 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 fab7bdad43bb..776b3d8f898a 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 62c1d21f4be5..cc77946de0b7 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 81fd125b2ee6..f882f0a8203b 100644
--- a/lib/libc/gen/__getosreldate.c
+++ b/lib/libc/gen/__getosreldate.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/libc/gen/__pthread_mutex_init_calloc_cb_stub.c b/lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c
index 1c566ecf4809..ee7a12f1c1ac 100644
--- a/lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c
+++ b/lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c
@@ -31,8 +31,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 95fed05674ba..0252a702c6e4 100644
--- a/lib/libc/gen/cap_sandboxed.c
+++ b/lib/libc/gen/cap_sandboxed.c
@@ -30,8 +30,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 b757f82029a9..4db4203f0a96 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 a14905cc0747..ebf18fc6a1c4 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 3813202afb15..912c3bba0ed3 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 76a4553c922c..16f14023bfa5 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 b014c8b716fa..c2744b80ac69 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 88feeaef7afd..60daeaf3a884 100644
--- a/lib/libc/gen/memalign.c
+++ b/lib/libc/gen/memalign.c
@@ -28,8 +28,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 e6af1929a4d2..51482a080cc3 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 496b1ddc29db..22d36c2ecbad 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 08612e99d9bb..9f3cf256735b 100644
--- a/lib/libc/gen/setproctitle.c
+++ b/lib/libc/gen/setproctitle.c
@@ -16,8 +16,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 1209c5b88b82..4d6f6f2ce7e9 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/_get_tp.c b/lib/libc/i386/gen/_get_tp.c
index 8c9b7bfcf380..24bf74a220dd 100644
--- a/lib/libc/i386/gen/_get_tp.c
+++ b/lib/libc/i386/gen/_get_tp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <stdint.h>
#include "libc_private.h"
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 99bf94108c89..2bf62386dc14 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 c1f94d39c7da..de0c10ce3f28 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 4da1b9983dae..cd9e11524369 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 4f3b1b51b9f6..3031d33dbb08 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 fc11af70d067..c3fe384aee4b 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 55055965ab4e..0ce49e070d1f 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 8969857fd23e..f2f2847578eb 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 dfebcb09a949..a3472117a4aa 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 78ff623be379..a0ed8a10cedc 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 ae0594ee22b7..ae562eaf688e 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 b664f1cd26b5..116f32ae3623 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 d4b8a596f5bf..b37af113e319 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 641773944e32..144bada3d89f 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 bc6141580c0d..00d0ec4d2feb 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 a949b150d3b1..dd0154b79681 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 2dc3f026e8d0..f4aaffb98b94 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 b53034068457..5947132088f8 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 b800a3f065b6..c543a6c7e631 100644
--- a/lib/libc/locale/mbsnrtowcs.c
+++ b/lib/libc/locale/mbsnrtowcs.c
@@ -34,8 +34,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 576a3f9c00c4..2b2b840a8821 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 d177abe70efd..12f164584971 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 47e8f1b95392..785b898abd92 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 1585886cea31..22861edc036f 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 15b27a19b118..73b2607e23af 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 db35d6d50626..5a0991412c29 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 d95bb0087c09..7fc63a74181e 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 8fe656aded05..b10550c501f8 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 e0ba66e0e35a..4a7eb8f6d6a6 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 41c82e637529..5d5116a95bbe 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 2f790afd4dd8..2208a3c0455c 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 00ac7279fbb4..fdf07b56532f 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 26bb93f3f2da..d43c03761d0f 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 84dd05378832..d9cd94c9b3ab 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 00907061c2d8..9ba0707f0723 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 def5e7732673..2b47f939c804 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 c0b38c9721ca..2a0c15fecb31 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 b5f6291ef490..001b7950cd42 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 3ea9a4c4e1b1..e97ca7d219f9 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 8e57c0106331..c2a428043798 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 5e4d9af26a80..729800704bef 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 98bd5f85a4d1..a61db0ec8b60 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 55a911b229db..586aa9728dea 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 6c3184a0de34..f6de4ca38332 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 f9eba5be44f7..b83bc9c7273c 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 b550e869f7c5..cc9f50fbfbc9 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 6a04d213ff9b..a967e1691292 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 0c1cd0b4b8dc..a14dca8ba80b 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 8dba3beba104..2060020a9202 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 2d84eb7880bb..9611488f5a92 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 346e8ba6519d..8b847821f6e0 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 2f729cb9edc5..51065bba5ec9 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 53145e9b8254..f79060c52ef7 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/mips/gen/_ctx_start.S b/lib/libc/mips/gen/_ctx_start.S
index f1f5cdc32641..9be537a8d1be 100644
--- a/lib/libc/mips/gen/_ctx_start.S
+++ b/lib/libc/mips/gen/_ctx_start.S
@@ -25,8 +25,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* This requires makecontext() to setup a valid GP for locating
* _ctx_done rather than deriving GP from T9 on entry. Currently this
diff --git a/lib/libc/mips/gen/_get_tp.c b/lib/libc/mips/gen/_get_tp.c
index 447f3e020ff9..f0a1dc54f9c7 100644
--- a/lib/libc/mips/gen/_get_tp.c
+++ b/lib/libc/mips/gen/_get_tp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
#include <stdint.h>
diff --git a/lib/libc/mips/gen/_setjmp.S b/lib/libc/mips/gen/_setjmp.S
index ba9b89f208c4..6361d2fe806b 100644
--- a/lib/libc/mips/gen/_setjmp.S
+++ b/lib/libc/mips/gen/_setjmp.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/mips/gen/fabs.S b/lib/libc/mips/gen/fabs.S
index 3b79249864d1..81cb66970591 100644
--- a/lib/libc/mips/gen/fabs.S
+++ b/lib/libc/mips/gen/fabs.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
ASMSTR("from: @(#)fabs.s 8.1 (Berkeley) 2/16/94")
ASMSTR("$NetBSD: fabs.S,v 1.7 2003/08/07 16:42:15 agc Exp $")
diff --git a/lib/libc/mips/gen/fabs.c b/lib/libc/mips/gen/fabs.c
index 9c51f43ff4e7..1ac060205e18 100644
--- a/lib/libc/mips/gen/fabs.c
+++ b/lib/libc/mips/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/mips/gen/flt_rounds.c b/lib/libc/mips/gen/flt_rounds.c
index 27d8bf35315f..c65a401569f1 100644
--- a/lib/libc/mips/gen/flt_rounds.c
+++ b/lib/libc/mips/gen/flt_rounds.c
@@ -6,7 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: flt_rounds.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
#endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/mips/gen/hardfloat/fpgetmask.c b/lib/libc/mips/gen/hardfloat/fpgetmask.c
index 505a74c68466..6f7f0ec4db0a 100644
--- a/lib/libc/mips/gen/hardfloat/fpgetmask.c
+++ b/lib/libc/mips/gen/hardfloat/fpgetmask.c
@@ -6,7 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: fpgetmask.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
#endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/mips/gen/hardfloat/fpgetround.c b/lib/libc/mips/gen/hardfloat/fpgetround.c
index 6d0f11a5cb6e..0a70b9f8f199 100644
--- a/lib/libc/mips/gen/hardfloat/fpgetround.c
+++ b/lib/libc/mips/gen/hardfloat/fpgetround.c
@@ -6,7 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: fpgetround.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
#endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/mips/gen/hardfloat/fpgetsticky.c b/lib/libc/mips/gen/hardfloat/fpgetsticky.c
index 8028261c2c81..b7332043d207 100644
--- a/lib/libc/mips/gen/hardfloat/fpgetsticky.c
+++ b/lib/libc/mips/gen/hardfloat/fpgetsticky.c
@@ -6,7 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: fpgetsticky.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
#endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/mips/gen/hardfloat/fpsetmask.c b/lib/libc/mips/gen/hardfloat/fpsetmask.c
index 7abb3fd05f92..f7cce8d2889e 100644
--- a/lib/libc/mips/gen/hardfloat/fpsetmask.c
+++ b/lib/libc/mips/gen/hardfloat/fpsetmask.c
@@ -6,7 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: fpsetmask.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
#endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/mips/gen/hardfloat/fpsetround.c b/lib/libc/mips/gen/hardfloat/fpsetround.c
index 020516180033..c16b9f5c2de3 100644
--- a/lib/libc/mips/gen/hardfloat/fpsetround.c
+++ b/lib/libc/mips/gen/hardfloat/fpsetround.c
@@ -6,7 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: fpsetround.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
#endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/mips/gen/hardfloat/fpsetsticky.c b/lib/libc/mips/gen/hardfloat/fpsetsticky.c
index e43367117792..c86f59511021 100644
--- a/lib/libc/mips/gen/hardfloat/fpsetsticky.c
+++ b/lib/libc/mips/gen/hardfloat/fpsetsticky.c
@@ -6,7 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: fpsetsticky.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
#endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/mips/gen/infinity.c b/lib/libc/mips/gen/infinity.c
index 55cf25f8e9d7..13d59ef5a07e 100644
--- a/lib/libc/mips/gen/infinity.c
+++ b/lib/libc/mips/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/mips/gen/ldexp.S b/lib/libc/mips/gen/ldexp.S
index caee70380707..e71954bc5bbc 100644
--- a/lib/libc/mips/gen/ldexp.S
+++ b/lib/libc/mips/gen/ldexp.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
ASMSTR("from: @(#)ldexp.s 8.1 (Berkeley) 6/4/93")
ASMSTR("$NetBSD: ldexp.S,v 1.8 2003/08/07 16:42:15 agc Exp $")
diff --git a/lib/libc/mips/gen/makecontext.c b/lib/libc/mips/gen/makecontext.c
index ce964d050866..0017cc4f58c6 100644
--- a/lib/libc/mips/gen/makecontext.c
+++ b/lib/libc/mips/gen/makecontext.c
@@ -32,7 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: makecontext.c,v 1.5 2009/12/14 01:07:42 matt Exp $");
#endif
diff --git a/lib/libc/mips/gen/setjmp.S b/lib/libc/mips/gen/setjmp.S
index 6b8f196735c4..b7189a9939c5 100644
--- a/lib/libc/mips/gen/setjmp.S
+++ b/lib/libc/mips/gen/setjmp.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
ASMSTR("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93")
ASMSTR("$NetBSD: setjmp.S,v 1.17 2005/09/17 11:49:39 tsutsui Exp $")
diff --git a/lib/libc/mips/gen/signalcontext.c b/lib/libc/mips/gen/signalcontext.c
index c7bb9cfc7ed4..7634e3002ba9 100644
--- a/lib/libc/mips/gen/signalcontext.c
+++ b/lib/libc/mips/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/mips/gen/sigsetjmp.S b/lib/libc/mips/gen/sigsetjmp.S
index a36b2803a10b..47f718fbdbea 100644
--- a/lib/libc/mips/gen/sigsetjmp.S
+++ b/lib/libc/mips/gen/sigsetjmp.S
@@ -33,7 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
#if defined(LIBC_SCCS) && !defined(lint)
ASMSTR("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93")
ASMSTR("$NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $")
diff --git a/lib/libc/mips/net/htonl.S b/lib/libc/mips/net/htonl.S
index 66c4f90fd65f..e255ae06acdf 100644
--- a/lib/libc/mips/net/htonl.S
+++ b/lib/libc/mips/net/htonl.S
@@ -30,9 +30,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
-
LEAF(htonl) # a0 = 0x11223344, return 0x44332211
#ifdef __MIPSEB__
move v0, a0
diff --git a/lib/libc/mips/net/htons.S b/lib/libc/mips/net/htons.S
index 0449c4d82e5c..89f700e70e0e 100644
--- a/lib/libc/mips/net/htons.S
+++ b/lib/libc/mips/net/htons.S
@@ -30,9 +30,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
-
LEAF(htons)
#ifdef __MIPSEB__
move v0, a0
diff --git a/lib/libc/mips/net/ntohl.S b/lib/libc/mips/net/ntohl.S
index 39001aa86bbe..0fbefc7ffb33 100644
--- a/lib/libc/mips/net/ntohl.S
+++ b/lib/libc/mips/net/ntohl.S
@@ -30,9 +30,6 @@
*/
#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
-
LEAF(ntohl) # a0 = 0x11223344, return 0x44332211
#ifdef __MIPSEB__
move v0, a0
diff --git a/lib/libc/mips/net/ntohs.S b/lib/libc/mips/net/ntohs.S
index 4761371be1af..f7721148d3fe 100644
--- a/lib/libc/mips/net/ntohs.S
+++ b/lib/libc/mips/net/ntohs.S
@@ -30,8 +30,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
LEAF(ntohs)
#ifdef __MIPSEB__
move v0, a0
diff --git a/lib/libc/mips/string/bcmp.S b/lib/libc/mips/string/bcmp.S
index ffcaeeb1a3fa..466d4949e511 100644
--- a/lib/libc/mips/string/bcmp.S
+++ b/lib/libc/mips/string/bcmp.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#define _LOCORE /* XXX not really, just assembly-code source */
#include <machine/endian.h> /* LWLO/LWHI, SWLO/SWHI */
diff --git a/lib/libc/mips/string/bcopy.S b/lib/libc/mips/string/bcopy.S
index bc227e07d662..b40586339965 100644
--- a/lib/libc/mips/string/bcopy.S
+++ b/lib/libc/mips/string/bcopy.S
@@ -36,8 +36,6 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#define _LOCORE /* XXX not really, just assembly-code source */
#include <machine/endian.h>
diff --git a/lib/libc/mips/string/bzero.S b/lib/libc/mips/string/bzero.S
index 83e54ba4baea..1ed5fd9c125d 100644
--- a/lib/libc/mips/string/bzero.S
+++ b/lib/libc/mips/string/bzero.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
ASMSTR("from: @(#)bzero.s 8.1 (Berkeley) 6/4/93")
diff --git a/lib/libc/mips/string/ffs.S b/lib/libc/mips/string/ffs.S
index 17e509c24637..49c4da039c3d 100644
--- a/lib/libc/mips/string/ffs.S
+++ b/lib/libc/mips/string/ffs.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
ASMSTR("from: @(#)ffs.s 8.1 (Berkeley) 6/4/93")
ASMSTR("$NetBSD: ffs.S,v 1.2 2009/12/14 00:39:00 matt Exp $")
diff --git a/lib/libc/mips/string/memcpy.S b/lib/libc/mips/string/memcpy.S
index 8d3c0dbfcf2c..7c9cfa71355e 100644
--- a/lib/libc/mips/string/memcpy.S
+++ b/lib/libc/mips/string/memcpy.S
@@ -1,7 +1,5 @@
/* $NetBSD: memcpy.S,v 1.1 2005/12/20 19:28:50 christos Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#define MEMCOPY
#include "bcopy.S"
diff --git a/lib/libc/mips/string/memmove.S b/lib/libc/mips/string/memmove.S
index 29d9e707ee46..1bfcfb6af661 100644
--- a/lib/libc/mips/string/memmove.S
+++ b/lib/libc/mips/string/memmove.S
@@ -1,7 +1,5 @@
/* $NetBSD: memmove.S,v 1.1 2005/12/20 19:28:50 christos Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#define MEMMOVE
#include "bcopy.S"
diff --git a/lib/libc/mips/string/strchr.S b/lib/libc/mips/string/strchr.S
index 19dae58415e2..5c0cf16dcca2 100644
--- a/lib/libc/mips/string/strchr.S
+++ b/lib/libc/mips/string/strchr.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
ASMSTR("from: @(#)index.s 8.1 (Berkeley) 6/4/93")
ASMSTR("$NetBSD: index.S,v 1.8 2005/04/22 06:59:00 simonb Exp $")
diff --git a/lib/libc/mips/string/strcmp.S b/lib/libc/mips/string/strcmp.S
index 8a9905630ce8..6f8d64dda753 100644
--- a/lib/libc/mips/string/strcmp.S
+++ b/lib/libc/mips/string/strcmp.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
ASMSTR("from: @(#)strcmp.s 8.1 (Berkeley) 6/4/93")
ASMSTR("$NetBSD: strcmp.S,v 1.2 2009/12/14 00:39:00 matt Exp $")
diff --git a/lib/libc/mips/string/strlen.S b/lib/libc/mips/string/strlen.S
index 3b46ccceb54b..ecea8d0aa45b 100644
--- a/lib/libc/mips/string/strlen.S
+++ b/lib/libc/mips/string/strlen.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
ASMSTR("from: @(#)strlen.s 8.1 (Berkeley) 6/4/93")
ASMSTR("$NetBSD: strlen.S,v 1.2 2009/12/14 00:39:00 matt Exp $")
diff --git a/lib/libc/mips/string/strrchr.S b/lib/libc/mips/string/strrchr.S
index c0dcef049d6e..d8e92fc4f9e2 100644
--- a/lib/libc/mips/string/strrchr.S
+++ b/lib/libc/mips/string/strrchr.S
@@ -33,8 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#if defined(LIBC_SCCS) && !defined(lint)
ASMSTR("from: @(#)rindex.s 8.1 (Berkeley) 6/4/93")
ASMSTR("$NetBSD: rindex.S,v 1.7 2003/08/07 16:42:16 agc Exp $")
diff --git a/lib/libc/mips/sys/Ovfork.S b/lib/libc/mips/sys/Ovfork.S
index 9df93ea59e9d..27e2aa6e6e45 100644
--- a/lib/libc/mips/sys/Ovfork.S
+++ b/lib/libc/mips/sys/Ovfork.S
@@ -33,7 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/mips/sys/cerror.S b/lib/libc/mips/sys/cerror.S
index c504d73afa3f..04e567f4b98b 100644
--- a/lib/libc/mips/sys/cerror.S
+++ b/lib/libc/mips/sys/cerror.S
@@ -33,7 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/mips/sys/syscall.S b/lib/libc/mips/sys/syscall.S
index b3c6708b5da5..5995db0b12e5 100644
--- a/lib/libc/mips/sys/syscall.S
+++ b/lib/libc/mips/sys/syscall.S
@@ -33,7 +33,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
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 998c3c213834..d45af019082a 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 ad54920aa793..7ef7fe64e961 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 0966b6d7ef91..fbead770730f 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 e8b4ffd356c4..ced3fcfabcb2 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 f27bf7918b88..2c1b9048c965 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_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_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_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 a7233a0403ff..5a7bf13d0bec 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 c9ba29676df1..28403f8d3833 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/_get_tp.c b/lib/libc/powerpc/gen/_get_tp.c
index 641a6bfe5ffa..82bcb2825abb 100644
--- a/lib/libc/powerpc/gen/_get_tp.c
+++ b/lib/libc/powerpc/gen/_get_tp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
#include <stdint.h>
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/_get_tp.c b/lib/libc/powerpc64/gen/_get_tp.c
index e4c53e4456c4..15d34555298f 100644
--- a/lib/libc/powerpc64/gen/_get_tp.c
+++ b/lib/libc/powerpc64/gen/_get_tp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
#include <stdint.h>
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 970a448b649a..7e2b81a9e925 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 bf27d05f86c6..d4325ae016ce 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 274ffbf999d6..7e434a0d0bab 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 8270e26ecdfb..557acc174a1d 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/_get_tp.c b/lib/libc/riscv/gen/_get_tp.c
index a13667dad6ec..34d5ea2fd859 100644
--- a/lib/libc/riscv/gen/_get_tp.c
+++ b/lib/libc/riscv/gen/_get_tp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
#include <stdint.h>
diff --git a/lib/libc/riscv/gen/_set_tp.c b/lib/libc/riscv/gen/_set_tp.c
index 49295e26857c..315dde888fec 100644
--- a/lib/libc/riscv/gen/_set_tp.c
+++ b/lib/libc/riscv/gen/_set_tp.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <string.h>
#include <sys/types.h>
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 7ddd6338ec55..1b7e88612970 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 1d9034b653d5..a39e1ee4c21f 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 6b1d5b18e387..63f3e353ef45 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 e04a7a708de8..9d564fc4c15e 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 de54b0afdb2d..6bbf0521050b 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 95b71cc065c7..ec9a0390b095 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 e0c8f8e97189..83ae7c3ae483 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 d1607fda56e3..f8b0ca78cfb7 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 6d2cfe9b5a3f..b06dd83c7979 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 4dd230112c8e..7428d77b7d2f 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 3f14b83f5ecb..198941dde645 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 0963ffe3d9d7..f123cfe97f25 100644
--- a/lib/libc/stdio/getdelim.c
+++ b/lib/libc/stdio/getdelim.c
@@ -27,8 +27,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 bdb46d6c304b..b7004cc44a73 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 ecf7aa75b996..03b47c68893f 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 7e7e5c8c128b..a801e6dbbc08 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 8931cf0c042c..4185f3b8a783 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 df7d5c4f51b1..0ca9591e4f66 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 baffba9f9018..9d6e4355c856 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 8ee0b4429340..4e9379d391bc 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 8a7611f384a2..94ec7e45cff5 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 cab6408535a8..580316538c63 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 f8c204c2a8fc..4113a8b77a1c 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 702f9a9c46b8..494f4fba1b18 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 2d7bd90e08a4..f066e22761bf 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 e5ee1be2884e..046737a6dd3f 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 3676c59ab04f..2e3607c49ea7 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 f3545f149a73..bb4c79873f92 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 fd6a64ae216a..e4225987bcf4 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 70f5074e2f72..c4531e87c984 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 bd3830c19907..38801af4723b 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 91238fed138a..6f25d3d9c94a 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 34488912171a..316493894652 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 7a4cc69dec98..8d189dedcac1 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 15024fdfc09c..2de4d4e7c8bc 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 f108a6d7871a..3cd5b944d191 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 9e03e7126d4a..867917737462 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 771dee0c1c42..c4414815f21b 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 9bd31abe992c..c327dc35f1a4 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 d3f96774a71c..642b0bde675c 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 3d6788e0704d..01b57926ae2e 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 4f6e31446316..8da57531d22b 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 5552e2314ecf..ea05fb8c5328 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 d425bc238b7e..f639597d5df5 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 c7e0676188ea..3d7e895a2cbb 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 700c498029d7..2a8d52fc708b 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 35e83fbf6181..bc38894a2170 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 bfbdb976501a..bd3a17dc5498 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 6f03ef0d3235..4f27b8e855b7 100644
--- a/lib/libc/stdlib/cxa_thread_atexit.c
+++ b/lib/libc/stdlib/cxa_thread_atexit.c
@@ -28,8 +28,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 0f0a7a314fa9..2ebf20ef7fd9 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 00eb860e17e4..056f96296938 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 98f7d02eb099..dc0a5452161e 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 505cec637620..307d1159356b 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 b26451232170..14926fedd9e3 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 25212d8930ad..7b7200356131 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 ab7f9a4049cf..17ba939db6a6 100644
--- a/lib/libc/stdlib/strtold.c
+++ b/lib/libc/stdlib/strtold.c
@@ -30,8 +30,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 c87aefb1cd22..a5aeb57179de 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 50ce1cbf07a8..c9966d9a05ec 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 58a9b23b566d..871c458ef51b 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 80937036de75..92d464b081f0 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 73089ce46344..69d2bb02ceee 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 b975137c60bb..9842d02e220d 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 3a401dc4d0ee..1ad2950e0118 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 2838df7d2743..17697c2569aa 100644
--- a/lib/libc/string/mempcpy.c
+++ b/lib/libc/string/mempcpy.c
@@ -30,8 +30,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 60b5bb4f0c4c..f90943d48e50 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 b70c2195a94e..cac3d5385acd 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 ee1c88531f20..c62c85052290 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 000b5c5e5361..3ff024bd9588 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 50016be21ea1..c65f13909511 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 a5b25273fa31..22a0bc187577 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 1a30ce813784..d73c555c5c99 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 974166b8967a..24d8df1faaed 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 3a8805f1b754..25d86ab0bbc4 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 ff40a8fc45f5..be64d23b79f4 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 1cf2382f1ead..451e41e97ecb 100644
--- a/lib/libc/string/wmempcpy.c
+++ b/lib/libc/string/wmempcpy.c
@@ -30,8 +30,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 a7aaf82429bb..0af88ae9b49b 100644
--- a/lib/libc/sys/POSIX2x_Fork.c
+++ b/lib/libc/sys/POSIX2x_Fork.c
@@ -31,8 +31,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 38e32f2c836d..d7dcd29d85f1 100644
--- a/lib/libc/sys/accept.c
+++ b/lib/libc/sys/accept.c
@@ -31,8 +31,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 2907b047efdc..0cba423096ef 100644
--- a/lib/libc/sys/accept4.c
+++ b/lib/libc/sys/accept4.c
@@ -31,8 +31,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 020edf8a74fa..595be6183083 100644
--- a/lib/libc/sys/aio_suspend.c
+++ b/lib/libc/sys/aio_suspend.c
@@ -31,8 +31,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 f7b36f85ddd5..373fb36f81d0 100644
--- a/lib/libc/sys/close.c
+++ b/lib/libc/sys/close.c
@@ -31,8 +31,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 7969142ad072..89d3ae0b8688 100644
--- a/lib/libc/sys/connect.c
+++ b/lib/libc/sys/connect.c
@@ -31,8 +31,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 974835b8f163..682541774187 100644
--- a/lib/libc/sys/fcntl.c
+++ b/lib/libc/sys/fcntl.c
@@ -34,8 +34,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 fed97913d31e..ff19ea6f02ae 100644
--- a/lib/libc/sys/fdatasync.c
+++ b/lib/libc/sys/fdatasync.c
@@ -31,8 +31,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 695540a7264f..dfa17fd0c670 100644
--- a/lib/libc/sys/fork.c
+++ b/lib/libc/sys/fork.c
@@ -31,8 +31,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 5f1512932baa..27d108cd9c98 100644
--- a/lib/libc/sys/fsync.c
+++ b/lib/libc/sys/fsync.c
@@ -31,8 +31,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 b2cfb3250cd9..6c19180c589e 100644
--- a/lib/libc/sys/interposing_table.c
+++ b/lib/libc/sys/interposing_table.c
@@ -31,8 +31,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 5f84ef8b10a6..dafec8fa692f 100644
--- a/lib/libc/sys/kevent.c
+++ b/lib/libc/sys/kevent.c
@@ -31,8 +31,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 d86cc0462dd8..a4cd6d16adc3 100644
--- a/lib/libc/sys/msync.c
+++ b/lib/libc/sys/msync.c
@@ -31,8 +31,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 412b05e778b0..6b5711192d0a 100644
--- a/lib/libc/sys/nanosleep.c
+++ b/lib/libc/sys/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/open.c b/lib/libc/sys/open.c
index e0273c68a34c..24552c024ef2 100644
--- a/lib/libc/sys/open.c
+++ b/lib/libc/sys/open.c
@@ -31,8 +31,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 1bd12ea2a8d8..3150400a9dca 100644
--- a/lib/libc/sys/openat.c
+++ b/lib/libc/sys/openat.c
@@ -31,8 +31,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 003262d1237d..912aba2b23dc 100644
--- a/lib/libc/sys/pdfork.c
+++ b/lib/libc/sys/pdfork.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <unistd.h>
#include "libc_private.h"
diff --git a/lib/libc/sys/poll.c b/lib/libc/sys/poll.c
index 43c17d2f65ce..f4c92a9463bf 100644
--- a/lib/libc/sys/poll.c
+++ b/lib/libc/sys/poll.c
@@ -31,8 +31,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 f62fd19cafe1..a58dac393439 100644
--- a/lib/libc/sys/ppoll.c
+++ b/lib/libc/sys/ppoll.c
@@ -31,8 +31,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 a623a7d5cc74..1774c465f0db 100644
--- a/lib/libc/sys/pselect.c
+++ b/lib/libc/sys/pselect.c
@@ -31,8 +31,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 2bb615fe563e..4d0d3a4a3f9a 100644
--- a/lib/libc/sys/ptrace.c
+++ b/lib/libc/sys/ptrace.c
@@ -31,8 +31,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 ab30189026e3..ef4eced3ca13 100644
--- a/lib/libc/sys/read.c
+++ b/lib/libc/sys/read.c
@@ -31,8 +31,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 567292750da0..4eae423008af 100644
--- a/lib/libc/sys/readv.c
+++ b/lib/libc/sys/readv.c
@@ -31,8 +31,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 aa6ef3fb7be2..00e2eb23d939 100644
--- a/lib/libc/sys/recvfrom.c
+++ b/lib/libc/sys/recvfrom.c
@@ -31,8 +31,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 282ede9995ff..f205c4834b34 100644
--- a/lib/libc/sys/recvmsg.c
+++ b/lib/libc/sys/recvmsg.c
@@ -31,8 +31,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 3990496ec412..9ad78b0787d3 100644
--- a/lib/libc/sys/select.c
+++ b/lib/libc/sys/select.c
@@ -31,8 +31,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 794464339043..3170f5cbc106 100644
--- a/lib/libc/sys/sendmsg.c
+++ b/lib/libc/sys/sendmsg.c
@@ -31,8 +31,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 ecf98ee05b19..4155f329d03c 100644
--- a/lib/libc/sys/sendto.c
+++ b/lib/libc/sys/sendto.c
@@ -31,8 +31,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 31b888f2bcff..6e04c4782107 100644
--- a/lib/libc/sys/setcontext.c
+++ b/lib/libc/sys/setcontext.c
@@ -31,8 +31,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 b4d65639b816..16d4c286e39b 100644
--- a/lib/libc/sys/sigaction.c
+++ b/lib/libc/sys/sigaction.c
@@ -31,8 +31,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 d24bb89c1f79..866d3dcdcd76 100644
--- a/lib/libc/sys/sigprocmask.c
+++ b/lib/libc/sys/sigprocmask.c
@@ -31,8 +31,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 1f980a117a1b..3eb664f37037 100644
--- a/lib/libc/sys/sigsuspend.c
+++ b/lib/libc/sys/sigsuspend.c
@@ -31,8 +31,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 4e067192ca4b..3ef107784a2e 100644
--- a/lib/libc/sys/sigtimedwait.c
+++ b/lib/libc/sys/sigtimedwait.c
@@ -31,8 +31,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 b9cdc79bc224..39254839666c 100644
--- a/lib/libc/sys/sigwaitinfo.c
+++ b/lib/libc/sys/sigwaitinfo.c
@@ -31,8 +31,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 a5dbd0fcb1aa..8d243f387b09 100644
--- a/lib/libc/sys/wait4.c
+++ b/lib/libc/sys/wait4.c
@@ -31,8 +31,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 d280a7698747..1f19ec4d5bcc 100644
--- a/lib/libc/sys/wait6.c
+++ b/lib/libc/sys/wait6.c
@@ -31,8 +31,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 ffb1aa5ffba7..b7014a35c3b9 100644
--- a/lib/libc/sys/write.c
+++ b/lib/libc/sys/write.c
@@ -31,8 +31,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 20b10053dc59..fa760e14b6fc 100644
--- a/lib/libc/sys/writev.c
+++ b/lib/libc/sys/writev.c
@@ -31,8 +31,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 ea1f64f7d308..df9fbcf61711 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 8dc662fcab8f..53642883fac0 100644
--- a/lib/libc/tests/stdio/getdelim_test.c
+++ b/lib/libc/tests/stdio/getdelim_test.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.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/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_test.c b/lib/libc/tests/stdlib/qsort_r_test.c
index c27e6d92d587..5cfcb43398e6 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 0a205f2bb1d1..d1508da32f85 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 28ce93389fd0..d21c03331ab9 100644
--- a/lib/libc/x86/sys/pkru.c
+++ b/lib/libc/x86/sys/pkru.c
@@ -28,8 +28,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 b123d2747ca9..287e08d530ab 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/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 46fcf7a69e70..4d0a3bb222ac 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 e975db1b2a1a..dabeb2f4634c 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 9a7f9dfcb9aa..0b4857f6ed07 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 67b39bb2dd21..06fbc780bbce 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 8397cf028bd6..989a98f3ae22 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_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 528e3a3c407a..b56630c9ad31 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 c6bb0f9dba7d..babefc45b41b 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 3fc4fd8a62fd..21b9d4084bb9 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/libfetch/common.c b/lib/libfetch/common.c
index 7bf487b0db1d..c01710832791 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 76848f3cb0a5..f6ad7e0876ef 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 37e02778ef51..e388117c7684 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 4e304bc97018..9bcbffc188b1 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 a6706d4ec68a..3db7fa56e37d 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 f4a003b94905..15025a535290 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 a9c45804ab0d..eb098e6d3861 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 0f2a5f69bcf0..eb40dab4693c 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 7fd4219fbf21..16803c000052 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_mips.c b/lib/libkvm/kvm_minidump_mips.c
index a4ede5b01511..54f975099897 100644
--- a/lib/libkvm/kvm_minidump_mips.c
+++ b/lib/libkvm/kvm_minidump_mips.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* MIPS 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 baa2fd1ebc08..4e95154caf62 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 aad2e0a672ed..0b1196232951 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 fa58b7b8735f..8dfc40c3228c 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 438c3a4852ff..f8b3ab2f76d7 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 870af2ab1556..dc7e17fcd365 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 f44504140b8b..dbb7874a04e2 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 fc4418bfc8e0..afc02dba7a46 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 a8eed7adcd8d..ce3c682a8c7f 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/libopie/opieextra.c b/lib/libopie/opieextra.c
index 6e2b6b88328c..15004c9dbd8c 100644
--- a/lib/libopie/opieextra.c
+++ b/lib/libopie/opieextra.c
@@ -5,8 +5,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
#include <opie.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 3c7976297ed2..66eb8b7f29c4 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_opie/pam_opie.c b/lib/libpam/modules/pam_opie/pam_opie.c
index 41ad84b751bc..cf42e521f45f 100644
--- a/lib/libpam/modules/pam_opie/pam_opie.c
+++ b/lib/libpam/modules/pam_opie/pam_opie.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <opie.h>
#include <pwd.h>
diff --git a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
index 090d98e5f2a6..b9f2dff038bd 100644
--- a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
+++ b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _BSD_SOURCE
#include <sys/types.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 aa1952eb9c82..d2f5e997b9cc 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 10a0aec03cc7..b2ef468929e7 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 b219ed53fe3f..dd1d5ba3c358 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 7e021666aa58..80ef083ae31a 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 42054e636b4b..79d4a6c5adc9 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 147eff9ab23e..183e5904e17d 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 cb5e1ece58b6..9b81c410def7 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 578e1fa9131e..c5844f368d13 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>
#define _WANT_MIPS_REGNUM
#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 f62848acd986..058fde270aa1 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 36d0de76e8fe..d1b80fa9bcf3 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 2889f802775d..a0c8c8ca0144 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 a5d26ba9e52d..3a676c3e0ffc 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 87906423f9b6..2af34f856e50 100644
--- a/lib/libprocstat/msdosfs.c
+++ b/lib/libprocstat/msdosfs.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/lib/libprocstat/smbfs.c b/lib/libprocstat/smbfs.c
index 59d6f135aa2f..f705ccd207dd 100644
--- a/lib/libprocstat/smbfs.c
+++ b/lib/libprocstat/smbfs.c
@@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/lib/libprocstat/udf.c b/lib/libprocstat/udf.c
index 15d1050d0100..43e79c39a62d 100644
--- a/lib/libprocstat/udf.c
+++ b/lib/libprocstat/udf.c
@@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/lib/libprocstat/zfs_defs.c b/lib/libprocstat/zfs_defs.c
index 098fdfe981a9..1da6b96a2d1b 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 f8e16c27a4a1..f36369b78fcc 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 eec3469e3457..cddb6b8940db 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 4375dfa76a89..6caf233f21b0 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 d66493ad739d..75486dc791c1 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 ac109cc454e0..baa5d8ac2af0 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 44de91ef66cb..323774c8e9b1 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 897f7e0fa53b..407d0d6c56bd 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 54bdb95c68ab..6577876ef44f 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 a3e4b24f7280..51a2b93c0622 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/mips/libpthread_md.c b/lib/libthread_db/arch/mips/libpthread_md.c
index 1ded66d1c3fe..b43f9a9cab2c 100644
--- a/lib/libthread_db/arch/mips/libpthread_md.c
+++ b/lib/libthread_db/arch/mips/libpthread_md.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#define _WANT_MIPS_REGNUM
#include <sys/procfs.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 4ea9b1be9b5b..56ecdd1954f5 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 5f2902dc3697..036f0b9565e0 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 e40efd7bdbcc..780e863928aa 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 d93affa0d554..95ce3d400c49 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 cbd98f522304..2453e434fd53 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 f34db013ff18..d944a612333f 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 8ecd8447155c..112924c33a12 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 ffefb865ed5e..dd7bcefabea6 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 a4b60750b282..4efff186ae79 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/capsicum.h>
#include <sys/file.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/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/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 010a1b7b9c52..51910de86f6e 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 fd5b93d46e87..61a8684b77c7 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 603895dad192..47b81985467b 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/lib/ncurses/ncurses/termcap.c b/lib/ncurses/ncurses/termcap.c
index 535301a1b474..6d330a7cf92f 100644
--- a/lib/ncurses/ncurses/termcap.c
+++ b/lib/ncurses/ncurses/termcap.c
@@ -59,8 +59,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if 0
#ifndef lint
static const char sccsid[] = "@(#)termcap.c 8.1 (Berkeley) 6/4/93";