aboutsummaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/apply/apply.c2
-rw-r--r--usr.bin/ar/acplex.l2
-rw-r--r--usr.bin/ar/acpyacc.y2
-rw-r--r--usr.bin/ar/ar.c2
-rw-r--r--usr.bin/ar/read.c2
-rw-r--r--usr.bin/ar/util.c2
-rw-r--r--usr.bin/ar/write.c2
-rw-r--r--usr.bin/asa/asa.c2
-rw-r--r--usr.bin/at/at.c2
-rw-r--r--usr.bin/at/panic.c2
-rw-r--r--usr.bin/at/parsetime.c2
-rw-r--r--usr.bin/at/perm.c2
-rw-r--r--usr.bin/banner/banner.c2
-rw-r--r--usr.bin/basename/basename.c2
-rw-r--r--usr.bin/bc/bc.y2
-rw-r--r--usr.bin/bc/scan.l2
-rw-r--r--usr.bin/biff/biff.c2
-rw-r--r--usr.bin/bintrans/uudecode.c2
-rw-r--r--usr.bin/bintrans/uuencode.c2
-rw-r--r--usr.bin/brandelf/brandelf.c2
-rw-r--r--usr.bin/bsdiff/bsdiff/bsdiff.c2
-rw-r--r--usr.bin/bsdiff/bspatch/bspatch.c2
-rw-r--r--usr.bin/c89/c89.c2
-rw-r--r--usr.bin/c99/c99.c2
-rw-r--r--usr.bin/caesar/caesar.c2
-rw-r--r--usr.bin/calendar/calendar.c2
-rw-r--r--usr.bin/calendar/dates.c2
-rw-r--r--usr.bin/calendar/day.c2
-rw-r--r--usr.bin/calendar/events.c2
-rw-r--r--usr.bin/calendar/io.c2
-rw-r--r--usr.bin/calendar/locale.c2
-rw-r--r--usr.bin/calendar/ostern.c2
-rw-r--r--usr.bin/calendar/parsedata.c2
-rw-r--r--usr.bin/calendar/paskha.c2
-rw-r--r--usr.bin/calendar/pom.c2
-rw-r--r--usr.bin/calendar/sunpos.c2
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.c2
-rw-r--r--usr.bin/chat/chat.c2
-rw-r--r--usr.bin/chkey/chkey.c2
-rw-r--r--usr.bin/chpass/chpass.c2
-rw-r--r--usr.bin/chpass/edit.c2
-rw-r--r--usr.bin/chpass/field.c2
-rw-r--r--usr.bin/chpass/table.c2
-rw-r--r--usr.bin/chpass/util.c2
-rw-r--r--usr.bin/cksum/cksum.c2
-rw-r--r--usr.bin/cksum/crc.c2
-rw-r--r--usr.bin/cksum/crc32.c2
-rw-r--r--usr.bin/cksum/print.c2
-rw-r--r--usr.bin/cksum/sum1.c2
-rw-r--r--usr.bin/cksum/sum2.c2
-rw-r--r--usr.bin/cmp/cmp.c2
-rw-r--r--usr.bin/cmp/link.c2
-rw-r--r--usr.bin/cmp/misc.c2
-rw-r--r--usr.bin/cmp/regular.c2
-rw-r--r--usr.bin/cmp/special.c2
-rw-r--r--usr.bin/col/col.c2
-rw-r--r--usr.bin/colrm/colrm.c2
-rw-r--r--usr.bin/column/column.c2
-rw-r--r--usr.bin/comm/comm.c2
-rw-r--r--usr.bin/compress/compress.c2
-rw-r--r--usr.bin/compress/zopen.c2
-rw-r--r--usr.bin/csplit/csplit.c2
-rw-r--r--usr.bin/ctags/C.c2
-rw-r--r--usr.bin/ctags/ctags.c2
-rw-r--r--usr.bin/ctags/fortran.c2
-rw-r--r--usr.bin/ctags/lisp.c2
-rw-r--r--usr.bin/ctags/print.c2
-rw-r--r--usr.bin/ctags/tree.c2
-rw-r--r--usr.bin/ctags/yacc.c2
-rw-r--r--usr.bin/ctlstat/ctlstat.c2
-rw-r--r--usr.bin/cut/cut.c2
-rw-r--r--usr.bin/dc/bcode.c2
-rw-r--r--usr.bin/dc/dc.c2
-rw-r--r--usr.bin/dc/inout.c2
-rw-r--r--usr.bin/dc/mem.c2
-rw-r--r--usr.bin/dc/stack.c2
-rw-r--r--usr.bin/diff/diff.c2
-rw-r--r--usr.bin/diff/diffdir.c2
-rw-r--r--usr.bin/diff/diffreg.c2
-rw-r--r--usr.bin/diff/pr.c2
-rw-r--r--usr.bin/diff/xmalloc.c2
-rw-r--r--usr.bin/diff3/diff3.c2
-rw-r--r--usr.bin/dirname/dirname.c2
-rw-r--r--usr.bin/dpv/dpv.c2
-rw-r--r--usr.bin/du/du.c2
-rw-r--r--usr.bin/elfctl/elfctl.c3
-rw-r--r--usr.bin/elfdump/elfdump.c2
-rw-r--r--usr.bin/enigma/enigma.c2
-rw-r--r--usr.bin/env/env.c2
-rw-r--r--usr.bin/env/envopts.c2
-rw-r--r--usr.bin/etdump/etdump.c2
-rw-r--r--usr.bin/etdump/output_shell.c2
-rw-r--r--usr.bin/etdump/output_text.c2
-rw-r--r--usr.bin/expand/expand.c2
-rw-r--r--usr.bin/factor/factor.c1
-rw-r--r--usr.bin/false/false.c2
-rw-r--r--usr.bin/fetch/fetch.c2
-rw-r--r--usr.bin/file2c/file2c.c2
-rw-r--r--usr.bin/find/find.c2
-rw-r--r--usr.bin/find/function.c2
-rw-r--r--usr.bin/find/getdate.y2
-rw-r--r--usr.bin/find/ls.c2
-rw-r--r--usr.bin/find/main.c2
-rw-r--r--usr.bin/find/misc.c2
-rw-r--r--usr.bin/find/operator.c2
-rw-r--r--usr.bin/find/option.c2
-rw-r--r--usr.bin/finger/finger.c2
-rw-r--r--usr.bin/finger/lprint.c2
-rw-r--r--usr.bin/finger/net.c2
-rw-r--r--usr.bin/finger/sprint.c2
-rw-r--r--usr.bin/finger/util.c2
-rw-r--r--usr.bin/fmt/fmt.c2
-rw-r--r--usr.bin/fold/fold.c2
-rw-r--r--usr.bin/fortune/fortune/fortune.c2
-rw-r--r--usr.bin/fortune/strfile/strfile.c2
-rw-r--r--usr.bin/fortune/unstr/unstr.c2
-rw-r--r--usr.bin/from/from.c2
-rw-r--r--usr.bin/fstat/fstat.c2
-rw-r--r--usr.bin/fstat/fuser.c2
-rw-r--r--usr.bin/fstat/main.c2
-rw-r--r--usr.bin/fsync/fsync.c2
-rw-r--r--usr.bin/gcore/elfcore.c2
-rw-r--r--usr.bin/gcore/gcore.c2
-rw-r--r--usr.bin/gencat/gencat.c2
-rw-r--r--usr.bin/getaddrinfo/getaddrinfo.c2
-rw-r--r--usr.bin/getconf/getconf.c2
-rw-r--r--usr.bin/getent/getent.c2
-rw-r--r--usr.bin/getopt/getopt.c2
-rw-r--r--usr.bin/gprof/arcs.c2
-rw-r--r--usr.bin/gprof/dfn.c2
-rw-r--r--usr.bin/gprof/elf.c2
-rw-r--r--usr.bin/gprof/gprof.c2
-rw-r--r--usr.bin/gprof/hertz.c2
-rw-r--r--usr.bin/gprof/kernel.c2
-rw-r--r--usr.bin/gprof/lookup.c2
-rw-r--r--usr.bin/gprof/printgprof.c2
-rw-r--r--usr.bin/gprof/printlist.c2
-rw-r--r--usr.bin/grep/file.c2
-rw-r--r--usr.bin/grep/grep.c2
-rw-r--r--usr.bin/grep/queue.c2
-rw-r--r--usr.bin/grep/util.c2
-rw-r--r--usr.bin/gzip/gzip.c1
-rw-r--r--usr.bin/gzip/unxz.c2
-rw-r--r--usr.bin/head/head.c2
-rw-r--r--usr.bin/hesinfo/hesinfo.c2
-rw-r--r--usr.bin/hexdump/conv.c2
-rw-r--r--usr.bin/hexdump/display.c2
-rw-r--r--usr.bin/hexdump/hexdump.c2
-rw-r--r--usr.bin/hexdump/hexsyntax.c2
-rw-r--r--usr.bin/hexdump/odsyntax.c2
-rw-r--r--usr.bin/hexdump/parse.c2
-rw-r--r--usr.bin/id/id.c2
-rw-r--r--usr.bin/ident/ident.c2
-rw-r--r--usr.bin/indent/args.c2
-rw-r--r--usr.bin/indent/indent.c2
-rw-r--r--usr.bin/indent/indent.h1
-rw-r--r--usr.bin/indent/io.c2
-rw-r--r--usr.bin/indent/lexi.c2
-rw-r--r--usr.bin/indent/parse.c2
-rw-r--r--usr.bin/indent/pr_comment.c2
-rw-r--r--usr.bin/ipcrm/ipcrm.c2
-rw-r--r--usr.bin/ipcs/ipc.c2
-rw-r--r--usr.bin/ipcs/ipcs.c2
-rw-r--r--usr.bin/iscsictl/iscsictl.c2
-rw-r--r--usr.bin/iscsictl/periphs.c2
-rw-r--r--usr.bin/join/join.c2
-rw-r--r--usr.bin/jot/jot.c2
-rw-r--r--usr.bin/kdump/kdump.c2
-rw-r--r--usr.bin/kdump/linux.c2
-rw-r--r--usr.bin/keylogin/keylogin.c2
-rw-r--r--usr.bin/keylogout/keylogout.c2
-rw-r--r--usr.bin/killall/killall.c2
-rw-r--r--usr.bin/ktrace/ktrace.c2
-rw-r--r--usr.bin/ktrace/subr.c2
-rw-r--r--usr.bin/ktrdump/ktrdump.c2
-rw-r--r--usr.bin/lam/lam.c2
-rw-r--r--usr.bin/last/last.c2
-rw-r--r--usr.bin/lastcomm/lastcomm.c2
-rw-r--r--usr.bin/lastcomm/readrec.c2
-rw-r--r--usr.bin/ldd/ldd.c2
-rw-r--r--usr.bin/leave/leave.c2
-rw-r--r--usr.bin/limits/limits.c2
-rw-r--r--usr.bin/localedef/charmap.c2
-rw-r--r--usr.bin/localedef/collate.c2
-rw-r--r--usr.bin/localedef/ctype.c2
-rw-r--r--usr.bin/localedef/localedef.c2
-rw-r--r--usr.bin/localedef/messages.c2
-rw-r--r--usr.bin/localedef/monetary.c2
-rw-r--r--usr.bin/localedef/numeric.c2
-rw-r--r--usr.bin/localedef/scanner.c2
-rw-r--r--usr.bin/localedef/time.c2
-rw-r--r--usr.bin/localedef/wide.c2
-rw-r--r--usr.bin/lock/lock.c2
-rw-r--r--usr.bin/lockf/lockf.c2
-rw-r--r--usr.bin/logger/logger.c2
-rw-r--r--usr.bin/login/login.c2
-rw-r--r--usr.bin/login/login_audit.c2
-rw-r--r--usr.bin/login/login_fbtab.c2
-rw-r--r--usr.bin/logins/logins.c2
-rw-r--r--usr.bin/logname/logname.c2
-rw-r--r--usr.bin/look/look.c2
-rw-r--r--usr.bin/lsvfs/lsvfs.c2
-rw-r--r--usr.bin/m4/eval.c3
-rw-r--r--usr.bin/m4/expr.c2
-rw-r--r--usr.bin/m4/gnum4.c2
-rw-r--r--usr.bin/m4/look.c2
-rw-r--r--usr.bin/m4/main.c2
-rw-r--r--usr.bin/m4/misc.c2
-rw-r--r--usr.bin/m4/trace.c2
-rw-r--r--usr.bin/mail/cmd1.c2
-rw-r--r--usr.bin/mail/cmd2.c2
-rw-r--r--usr.bin/mail/cmd3.c2
-rw-r--r--usr.bin/mail/cmdtab.c2
-rw-r--r--usr.bin/mail/collect.c2
-rw-r--r--usr.bin/mail/edit.c2
-rw-r--r--usr.bin/mail/fio.c2
-rw-r--r--usr.bin/mail/getname.c2
-rw-r--r--usr.bin/mail/head.c2
-rw-r--r--usr.bin/mail/lex.c2
-rw-r--r--usr.bin/mail/list.c2
-rw-r--r--usr.bin/mail/main.c2
-rw-r--r--usr.bin/mail/names.c2
-rw-r--r--usr.bin/mail/popen.c2
-rw-r--r--usr.bin/mail/quit.c2
-rw-r--r--usr.bin/mail/send.c2
-rw-r--r--usr.bin/mail/strings.c2
-rw-r--r--usr.bin/mail/temp.c2
-rw-r--r--usr.bin/mail/tty.c2
-rw-r--r--usr.bin/mail/util.c2
-rw-r--r--usr.bin/mail/v7.local.c2
-rw-r--r--usr.bin/mail/vars.c2
-rw-r--r--usr.bin/mail/version.c2
-rw-r--r--usr.bin/mesg/mesg.c2
-rw-r--r--usr.bin/ministat/ministat.c2
-rw-r--r--usr.bin/mkfifo/mkfifo.c2
-rw-r--r--usr.bin/mkimg/apm.c2
-rw-r--r--usr.bin/mkimg/bsd.c2
-rw-r--r--usr.bin/mkimg/ebr.c2
-rw-r--r--usr.bin/mkimg/format.c2
-rw-r--r--usr.bin/mkimg/gpt.c2
-rw-r--r--usr.bin/mkimg/image.c2
-rw-r--r--usr.bin/mkimg/mbr.c2
-rw-r--r--usr.bin/mkimg/mkimg.c2
-rw-r--r--usr.bin/mkimg/qcow.c2
-rw-r--r--usr.bin/mkimg/raw.c2
-rw-r--r--usr.bin/mkimg/scheme.c2
-rw-r--r--usr.bin/mkimg/uuid.c2
-rw-r--r--usr.bin/mkimg/vhd.c2
-rw-r--r--usr.bin/mkimg/vhdx.c2
-rw-r--r--usr.bin/mkimg/vmdk.c2
-rw-r--r--usr.bin/mkstr/mkstr.c2
-rw-r--r--usr.bin/mkuzip/mkuz_blk.c2
-rw-r--r--usr.bin/mkuzip/mkuz_blockcache.c2
-rw-r--r--usr.bin/mkuzip/mkuz_conveyor.c2
-rw-r--r--usr.bin/mkuzip/mkuz_fqueue.c2
-rw-r--r--usr.bin/mkuzip/mkuz_insize.c2
-rw-r--r--usr.bin/mkuzip/mkuz_lzma.c2
-rw-r--r--usr.bin/mkuzip/mkuz_time.c2
-rw-r--r--usr.bin/mkuzip/mkuz_zlib.c2
-rw-r--r--usr.bin/mkuzip/mkuz_zstd.c2
-rw-r--r--usr.bin/mkuzip/mkuzip.c2
-rw-r--r--usr.bin/msgs/msgs.c2
-rw-r--r--usr.bin/mt/mt.c2
-rw-r--r--usr.bin/ncal/ncal.c2
-rw-r--r--usr.bin/netstat/bpf.c2
-rw-r--r--usr.bin/netstat/common.c2
-rw-r--r--usr.bin/netstat/if.c2
-rw-r--r--usr.bin/netstat/inet.c2
-rw-r--r--usr.bin/netstat/inet6.c2
-rw-r--r--usr.bin/netstat/ipsec.c2
-rw-r--r--usr.bin/netstat/main.c2
-rw-r--r--usr.bin/netstat/mbuf.c2
-rw-r--r--usr.bin/netstat/mroute.c2
-rw-r--r--usr.bin/netstat/mroute6.c2
-rw-r--r--usr.bin/netstat/netgraph.c2
-rw-r--r--usr.bin/netstat/nhgrp.c1
-rw-r--r--usr.bin/netstat/pfkey.c2
-rw-r--r--usr.bin/netstat/route.c2
-rw-r--r--usr.bin/netstat/route_netlink.c2
-rw-r--r--usr.bin/netstat/sctp.c2
-rw-r--r--usr.bin/netstat/unix.c2
-rw-r--r--usr.bin/newgrp/newgrp.c2
-rw-r--r--usr.bin/newkey/generic.c2
-rw-r--r--usr.bin/newkey/newkey.c2
-rw-r--r--usr.bin/newkey/update.c2
-rw-r--r--usr.bin/nice/nice.c2
-rw-r--r--usr.bin/nohup/nohup.c2
-rw-r--r--usr.bin/passwd/passwd.c2
-rw-r--r--usr.bin/paste/paste.c2
-rw-r--r--usr.bin/pathchk/pathchk.c2
-rw-r--r--usr.bin/perror/perror.c2
-rw-r--r--usr.bin/pom/pom.c2
-rw-r--r--usr.bin/posixshmcontrol/posixshmcontrol.c2
-rw-r--r--usr.bin/pr/egetopt.c2
-rw-r--r--usr.bin/pr/pr.c2
-rw-r--r--usr.bin/primes/spsp.c2
-rw-r--r--usr.bin/printenv/printenv.c2
-rw-r--r--usr.bin/proccontrol/proccontrol.c2
-rw-r--r--usr.bin/procstat/procstat.c2
-rw-r--r--usr.bin/procstat/procstat_args.c2
-rw-r--r--usr.bin/procstat/procstat_auxv.c2
-rw-r--r--usr.bin/procstat/procstat_basic.c2
-rw-r--r--usr.bin/procstat/procstat_bin.c2
-rw-r--r--usr.bin/procstat/procstat_cred.c2
-rw-r--r--usr.bin/procstat/procstat_cs.c2
-rw-r--r--usr.bin/procstat/procstat_files.c2
-rw-r--r--usr.bin/procstat/procstat_kstack.c2
-rw-r--r--usr.bin/procstat/procstat_penv.c2
-rw-r--r--usr.bin/procstat/procstat_ptlwpinfo.c2
-rw-r--r--usr.bin/procstat/procstat_pwdx.c2
-rw-r--r--usr.bin/procstat/procstat_rlimit.c2
-rw-r--r--usr.bin/procstat/procstat_rusage.c2
-rw-r--r--usr.bin/procstat/procstat_sigs.c2
-rw-r--r--usr.bin/procstat/procstat_threads.c2
-rw-r--r--usr.bin/procstat/procstat_vm.c2
-rw-r--r--usr.bin/protect/protect.c2
-rw-r--r--usr.bin/quota/quota.c2
-rw-r--r--usr.bin/random/random.c2
-rw-r--r--usr.bin/random/randomize_fd.c2
-rw-r--r--usr.bin/rctl/rctl.c2
-rw-r--r--usr.bin/renice/renice.c2
-rw-r--r--usr.bin/resizewin/resizewin.c1
-rw-r--r--usr.bin/rev/rev.c2
-rw-r--r--usr.bin/revoke/revoke.c2
-rw-r--r--usr.bin/rpcgen/rpc_clntout.c2
-rw-r--r--usr.bin/rpcgen/rpc_cout.c2
-rw-r--r--usr.bin/rpcgen/rpc_hout.c2
-rw-r--r--usr.bin/rpcgen/rpc_main.c2
-rw-r--r--usr.bin/rpcgen/rpc_parse.c2
-rw-r--r--usr.bin/rpcgen/rpc_sample.c2
-rw-r--r--usr.bin/rpcgen/rpc_scan.c2
-rw-r--r--usr.bin/rpcgen/rpc_svcout.c2
-rw-r--r--usr.bin/rpcgen/rpc_tblout.c2
-rw-r--r--usr.bin/rpcgen/rpc_util.c2
-rw-r--r--usr.bin/rpcinfo/rpcinfo.c2
-rw-r--r--usr.bin/ruptime/ruptime.c2
-rw-r--r--usr.bin/rwall/rwall.c2
-rw-r--r--usr.bin/rwho/rwho.c2
-rw-r--r--usr.bin/script/script.c1
-rw-r--r--usr.bin/sdiff/edit.c2
-rw-r--r--usr.bin/sdiff/sdiff.c2
-rw-r--r--usr.bin/sdiotool/cam_sdio.c2
-rw-r--r--usr.bin/sdiotool/cam_sdio.h2
-rw-r--r--usr.bin/sdiotool/linux_compat.h2
-rw-r--r--usr.bin/sdiotool/linux_sdio_compat.c2
-rw-r--r--usr.bin/sdiotool/linux_sdio_compat.h2
-rw-r--r--usr.bin/sdiotool/sdiotool.c2
-rw-r--r--usr.bin/sed/compile.c2
-rw-r--r--usr.bin/sed/main.c2
-rw-r--r--usr.bin/sed/misc.c2
-rw-r--r--usr.bin/sed/process.c2
-rw-r--r--usr.bin/seq/seq.c2
-rw-r--r--usr.bin/sockstat/sockstat.c2
-rw-r--r--usr.bin/soelim/soelim.c2
-rw-r--r--usr.bin/sort/bwstring.c2
-rw-r--r--usr.bin/sort/coll.c2
-rw-r--r--usr.bin/sort/file.c2
-rw-r--r--usr.bin/sort/mem.c2
-rw-r--r--usr.bin/sort/radixsort.c2
-rw-r--r--usr.bin/sort/sort.c2
-rw-r--r--usr.bin/sort/vsort.c2
-rw-r--r--usr.bin/split/split.c2
-rw-r--r--usr.bin/stat/stat.c3
-rw-r--r--usr.bin/su/su.c2
-rw-r--r--usr.bin/systat/pigs.c2
-rw-r--r--usr.bin/systat/sctp.c2
-rw-r--r--usr.bin/systat/sysput.c2
-rw-r--r--usr.bin/systat/tcp.c2
-rw-r--r--usr.bin/systat/zarc.c2
-rw-r--r--usr.bin/tabs/tabs.c2
-rw-r--r--usr.bin/tail/reverse.c2
-rw-r--r--usr.bin/tftp/main.c2
-rw-r--r--usr.bin/tftp/tftp.c2
-rw-r--r--usr.bin/tip/libacu/biz22.c2
-rw-r--r--usr.bin/tip/libacu/biz31.c2
-rw-r--r--usr.bin/tip/libacu/courier.c2
-rw-r--r--usr.bin/tip/libacu/df.c2
-rw-r--r--usr.bin/tip/libacu/dn11.c2
-rw-r--r--usr.bin/tip/libacu/hayes.c2
-rw-r--r--usr.bin/tip/libacu/t3000.c2
-rw-r--r--usr.bin/tip/libacu/v3451.c2
-rw-r--r--usr.bin/tip/libacu/v831.c2
-rw-r--r--usr.bin/tip/libacu/ventel.c2
-rw-r--r--usr.bin/tip/tip/acu.c2
-rw-r--r--usr.bin/tip/tip/acutab.c2
-rw-r--r--usr.bin/tip/tip/cmds.c2
-rw-r--r--usr.bin/tip/tip/cmdtab.c2
-rw-r--r--usr.bin/tip/tip/cu.c2
-rw-r--r--usr.bin/tip/tip/hunt.c2
-rw-r--r--usr.bin/tip/tip/log.c2
-rw-r--r--usr.bin/tip/tip/partab.c2
-rw-r--r--usr.bin/tip/tip/remote.c2
-rw-r--r--usr.bin/tip/tip/tip.c2
-rw-r--r--usr.bin/tip/tip/tipout.c2
-rw-r--r--usr.bin/tip/tip/uucplock.c2
-rw-r--r--usr.bin/tip/tip/value.c2
-rw-r--r--usr.bin/tip/tip/vars.c2
-rw-r--r--usr.bin/tr/cmap.c2
-rw-r--r--usr.bin/tr/cset.c2
-rw-r--r--usr.bin/truss/main.c2
-rw-r--r--usr.bin/truss/setup.c2
-rw-r--r--usr.bin/truss/syscalls.c2
-rw-r--r--usr.bin/tsort/tsort.c2
-rw-r--r--usr.bin/tty/tty.c2
-rw-r--r--usr.bin/users/users.cc2
-rw-r--r--usr.bin/vmstat/vmstat.c2
-rw-r--r--usr.bin/vtfontcvt/vtfontcvt.c2
-rw-r--r--usr.bin/w/proc_compare.c2
-rw-r--r--usr.bin/wc/wc.c2
-rw-r--r--usr.bin/whereis/whereis.c3
-rw-r--r--usr.bin/who/who.c2
-rw-r--r--usr.bin/whois/whois.c2
-rw-r--r--usr.bin/write/write.c2
-rw-r--r--usr.bin/xargs/strnsubst.c2
-rw-r--r--usr.bin/xargs/xargs.c2
-rw-r--r--usr.bin/xinstall/xinstall.c2
-rw-r--r--usr.bin/ypwhich/ypwhich.c2
417 files changed, 0 insertions, 832 deletions
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index fc90af6d3dff..88f14c479dfb 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sbuf.h>
#include <sys/wait.h>
diff --git a/usr.bin/ar/acplex.l b/usr.bin/ar/acplex.l
index 427147ebfca6..a294de1adcfd 100644
--- a/usr.bin/ar/acplex.l
+++ b/usr.bin/ar/acplex.l
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <stdio.h>
diff --git a/usr.bin/ar/acpyacc.y b/usr.bin/ar/acpyacc.y
index ef5c5ec08569..4bfc5ab8424d 100644
--- a/usr.bin/ar/acpyacc.y
+++ b/usr.bin/ar/acpyacc.y
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/mman.h>
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index 17dd2a88d25b..9e7cc08468cd 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -61,8 +61,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/types.h>
#include <archive.h>
diff --git a/usr.bin/ar/read.c b/usr.bin/ar/read.c
index fc098e84b7bc..bd3586234c69 100644
--- a/usr.bin/ar/read.c
+++ b/usr.bin/ar/read.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/stat.h>
#include <archive.h>
diff --git a/usr.bin/ar/util.c b/usr.bin/ar/util.c
index c5ec93547fe4..920a2e00e6de 100644
--- a/usr.bin/ar/util.c
+++ b/usr.bin/ar/util.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/types.h>
#include <errno.h>
diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c
index e29f37204eee..1279a1ca7cb8 100644
--- a/usr.bin/ar/write.c
+++ b/usr.bin/ar/write.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/mman.h>
#include <sys/queue.h>
diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c
index 4491beeead04..757278442a52 100644
--- a/usr.bin/asa/asa.c
+++ b/usr.bin/asa/asa.c
@@ -38,8 +38,6 @@
__RCSID("$NetBSD: asa.c,v 1.11 1997/09/20 14:55:00 lukem Exp $");
#endif
#endif
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 2096369859b1..5b423d9d40d0 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _USE_BSD 1
/* System Headers */
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index 00418625f5d9..e72cae4596fa 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* System Headers */
#include <err.h>
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index 99b67ccd3ec6..a9223f3fb256 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* System Headers */
#include <sys/types.h>
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 0ad343e98624..9e26dbe3563d 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* System Headers */
#include <sys/types.h>
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index b28c5e440281..c7bfa6e27b19 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)banner.c 8.4 (Berkeley) 4/29/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* banner - prints large signs
* banner [-w#] [-d] [-t] message ...
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index 78f6d52e8647..c2a734688a1a 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <capsicum_helpers.h>
#include <err.h>
#include <libgen.h>
diff --git a/usr.bin/bc/bc.y b/usr.bin/bc/bc.y
index 793ad46d7f53..245748528a53 100644
--- a/usr.bin/bc/bc.y
+++ b/usr.bin/bc/bc.y
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/usr.bin/bc/scan.l b/usr.bin/bc/scan.l
index cb1977ad5c07..0f57f02e50d5 100644
--- a/usr.bin/bc/scan.l
+++ b/usr.bin/bc/scan.l
@@ -18,8 +18,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <histedit.h>
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index ad238b951366..1de902800cad 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <err.h>
diff --git a/usr.bin/bintrans/uudecode.c b/usr.bin/bintrans/uudecode.c
index 29e31d474aae..b0ab415486c8 100644
--- a/usr.bin/bintrans/uudecode.c
+++ b/usr.bin/bintrans/uudecode.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)uudecode.c 8.2 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* uudecode [file ...]
*
diff --git a/usr.bin/bintrans/uuencode.c b/usr.bin/bintrans/uuencode.c
index a0e1406c3648..267ab7deb8d1 100644
--- a/usr.bin/bintrans/uuencode.c
+++ b/usr.bin/bintrans/uuencode.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)uuencode.c 8.2 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* uuencode [input] output
*
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index c95f2aef806e..2c908efdc227 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/elf_common.h>
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c
index a1f51dbc9a64..9836b8ee96f4 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.c
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <bzlib.h>
diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c
index b7abdfb88d4a..a596ab1837dd 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.c
+++ b/usr.bin/bsdiff/bspatch/bspatch.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
#endif
diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c
index dd2d3b47d4bf..3e1fd5dbdfeb 100644
--- a/usr.bin/c89/c89.c
+++ b/usr.bin/c89/c89.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/c99/c99.c b/usr.bin/c99/c99.c
index a1752e6f4540..9040aab4e7f0 100644
--- a/usr.bin/c99/c99.c
+++ b/usr.bin/c99/c99.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/caesar/caesar.c b/usr.bin/caesar/caesar.c
index b1f9920e6a52..296fa77120cb 100644
--- a/usr.bin/caesar/caesar.c
+++ b/usr.bin/caesar/caesar.c
@@ -47,8 +47,6 @@ static const char sccsid[] = "@(#)caesar.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <math.h>
#include <stdio.h>
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 5f6d97ad1494..476c0495d218 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/calendar/dates.c b/usr.bin/calendar/dates.c
index 88fd029c5919..cdcd565dd6e6 100644
--- a/usr.bin/calendar/dates.c
+++ b/usr.bin/calendar/dates.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <err.h>
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 84562ccd9b30..7e52439cad6a 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <locale.h>
#include <stdio.h>
diff --git a/usr.bin/calendar/events.c b/usr.bin/calendar/events.c
index 5a7592ef46e8..cbc1d09f3890 100644
--- a/usr.bin/calendar/events.c
+++ b/usr.bin/calendar/events.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <err.h>
#include <langinfo.h>
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 5a77455d0ff6..5390882305a0 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/usr.bin/calendar/locale.c b/usr.bin/calendar/locale.c
index 34f0f98ca87b..572b715b8e92 100644
--- a/usr.bin/calendar/locale.c
+++ b/usr.bin/calendar/locale.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index ed6da20d827a..dfbca892cec7 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/calendar/parsedata.c b/usr.bin/calendar/parsedata.c
index 656a3c391858..7b2b4d9114b0 100644
--- a/usr.bin/calendar/parsedata.c
+++ b/usr.bin/calendar/parsedata.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <math.h>
#include <stdio.h>
diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c
index 86fa203d9ff5..4ea345f9cd5d 100644
--- a/usr.bin/calendar/paskha.c
+++ b/usr.bin/calendar/paskha.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/calendar/pom.c b/usr.bin/calendar/pom.c
index 79a0d1bbf9a3..2cd12e8f75fc 100644
--- a/usr.bin/calendar/pom.c
+++ b/usr.bin/calendar/pom.c
@@ -43,8 +43,6 @@ static const char sccsid[] = "@(#)pom.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Phase of the Moon. Calculates the current phase of the moon.
* Based on routines from `Practical Astronomy with Your Calculator',
diff --git a/usr.bin/calendar/sunpos.c b/usr.bin/calendar/sunpos.c
index 5b91f007faa9..a919f40007aa 100644
--- a/usr.bin/calendar/sunpos.c
+++ b/usr.bin/calendar/sunpos.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This code is created to match the formulas available at:
* Formula and examples obtained from "How to Calculate alt/az: SAAO" at
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index fbff878c9cc8..ff85c14b9b33 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)cap_mkdb.c 8.2 (Berkeley) 4/27/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index ec558a615901..c15c3037d8a0 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -78,8 +78,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
diff --git a/usr.bin/chkey/chkey.c b/usr.bin/chkey/chkey.c
index 55d34bcc0fc3..afacae4d0f75 100644
--- a/usr.bin/chkey/chkey.c
+++ b/usr.bin/chkey/chkey.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)chkey.c 1.7 91/03/11 Copyr 1986 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Copyright (C) 1986, Sun Microsystems, Inc.
*/
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 643b0f387c3a..b48d17e80a11 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -52,8 +52,6 @@ static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index fbe101592b3a..9c832bfbcd95 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -47,8 +47,6 @@ static char sccsid[] = "@(#)edit.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c
index 3b5129c085a1..6a3aa59b13f2 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -47,8 +47,6 @@ static char sccsid[] = "@(#)field.c 8.4 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c
index bebb27cd2ca9..29550dcad273 100644
--- a/usr.bin/chpass/table.c
+++ b/usr.bin/chpass/table.c
@@ -35,8 +35,6 @@ static const char sccsid[] = "@(#)table.c 8.3 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stddef.h>
#include "chpass.h"
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index 6b10b684b446..2d32f228f7e8 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -46,8 +46,6 @@ static char sccsid[] = "@(#)util.c 8.4 (Berkeley) 4/2/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 6634bd1903d0..8eebb89d3263 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)cksum.c 8.2 (Berkeley) 4/28/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index b7285132e9b9..f44656737310 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 6/17/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdint.h>
diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c
index 4389969716c3..646704dcea47 100644
--- a/usr.bin/cksum/crc32.c
+++ b/usr.bin/cksum/crc32.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c
index 34766104de44..3e0967049ced 100644
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index cb32bfc43537..49d75ae45d2f 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)sum1.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <unistd.h>
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index 84c4d7a725df..bd4da5ae3fa3 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)sum2.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <unistd.h>
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index a71565760a83..56775e73ffa2 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/cmp/link.c b/usr.bin/cmp/link.c
index d19f2f49c51a..550273cb471a 100644
--- a/usr.bin/cmp/link.c
+++ b/usr.bin/cmp/link.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
#include <limits.h>
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 1dba34d28792..1924025a3a5d 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index 182a303f70ed..fbe62bb75602 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index 1342f2a86270..3da54fde24e4 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 5ed097c232b7..a3e7a25d11fb 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 739b184b6e6c..06b5e817f618 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)colrm.c 8.2 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index a253d24ca1b3..a808113649bc 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/param.h>
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 4c237606825a..e3bb682d70c6 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -45,8 +45,6 @@ static char sccsid[] = "From: @(#)comm.c 8.4 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <locale.h>
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index d50f08571e3b..602572ac31b6 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)compress.c 8.2 (Berkeley) 1/7/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index 1622508fb6c1..a5b34ef83ecb 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)zopen.c 8.1 (Berkeley) 6/27/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*-
* fcompress.c - File compression ala IEEE Computer, June 1984.
*
diff --git a/usr.bin/csplit/csplit.c b/usr.bin/csplit/csplit.c
index 431293c20f39..dd645396948d 100644
--- a/usr.bin/csplit/csplit.c
+++ b/usr.bin/csplit/csplit.c
@@ -45,8 +45,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index e36b60de4a55..25c5db5d405b 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)C.c 8.4 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stddef.h>
#include <stdio.h>
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index 9b5139f08be1..6053a52f32da 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index 4174d4fda91f..7fa6ec3823d9 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)fortran.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index 7d2c2d50b797..d167c82e7c69 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)lisp.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index 49dc371a3ebd..4174cd28d0e6 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index 85ac5dd0d8b2..15291f4a5e80 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)tree.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index bc60469db698..0fd8537fb74f 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)yacc.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/ctlstat/ctlstat.c b/usr.bin/ctlstat/ctlstat.c
index f21ddf65c404..8aed0f52e350 100644
--- a/usr.bin/ctlstat/ctlstat.c
+++ b/usr.bin/ctlstat/ctlstat.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/callout.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index f5847794f313..796ab66c0c6e 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -39,8 +39,6 @@ static const char copyright[] =
static const char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/dc/bcode.c b/usr.bin/dc/bcode.c
index d9a42073e6b3..0e34f0399035 100644
--- a/usr.bin/dc/bcode.c
+++ b/usr.bin/dc/bcode.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <openssl/ssl.h>
diff --git a/usr.bin/dc/dc.c b/usr.bin/dc/dc.c
index 79e0aca87a74..4f9a55f450bb 100644
--- a/usr.bin/dc/dc.c
+++ b/usr.bin/dc/dc.c
@@ -18,8 +18,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/dc/inout.c b/usr.bin/dc/inout.c
index 29d8d147e9e7..a91531b2c769 100644
--- a/usr.bin/dc/inout.c
+++ b/usr.bin/dc/inout.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <openssl/ssl.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.bin/dc/mem.c b/usr.bin/dc/mem.c
index 0bb3ef39c759..95c5068f2041 100644
--- a/usr.bin/dc/mem.c
+++ b/usr.bin/dc/mem.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <openssl/err.h>
#include <err.h>
diff --git a/usr.bin/dc/stack.c b/usr.bin/dc/stack.c
index ba7c7e4a589b..c4b15dda4a14 100644
--- a/usr.bin/dc/stack.c
+++ b/usr.bin/dc/stack.c
@@ -17,8 +17,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
index 8b8b1f65c07b..03eb363fc323 100644
--- a/usr.bin/diff/diff.c
+++ b/usr.bin/diff/diff.c
@@ -21,8 +21,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <ctype.h>
diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c
index c5a32c217c36..798229e990df 100644
--- a/usr.bin/diff/diffdir.c
+++ b/usr.bin/diff/diffdir.c
@@ -21,8 +21,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <dirent.h>
diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
index d9b08aece64a..11aefb73cda6 100644
--- a/usr.bin/diff/diffreg.c
+++ b/usr.bin/diff/diffreg.c
@@ -67,8 +67,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/stat.h>
diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c
index 4c7108cd7451..5dedf689351c 100644
--- a/usr.bin/diff/pr.c
+++ b/usr.bin/diff/pr.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/procdesc.h>
#include <sys/wait.h>
diff --git a/usr.bin/diff/xmalloc.c b/usr.bin/diff/xmalloc.c
index 9d02238e87f7..69ccae83cfdd 100644
--- a/usr.bin/diff/xmalloc.c
+++ b/usr.bin/diff/xmalloc.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdarg.h>
#include <stdint.h>
diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c
index d52678846fae..e80b1d142231 100644
--- a/usr.bin/diff3/diff3.c
+++ b/usr.bin/diff3/diff3.c
@@ -70,8 +70,6 @@ static char sccsid[] = "@(#)diff3.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/procdesc.h>
#include <sys/types.h>
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index 38028423dd45..58083e8a0cbf 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -39,8 +39,6 @@ static const char copyright[] =
static const char sccsid[] = "@(#)dirname.c 8.4 (Berkeley) 5/4/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <capsicum_helpers.h>
#include <err.h>
#include <libgen.h>
diff --git a/usr.bin/dpv/dpv.c b/usr.bin/dpv/dpv.c
index 725b24f6bbe9..1fd89eca77c8 100644
--- a/usr.bin/dpv/dpv.c
+++ b/usr.bin/dpv/dpv.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 012e439bba34..ead3e952ce0f 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -44,8 +44,6 @@ static const char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/elfctl/elfctl.c b/usr.bin/elfctl/elfctl.c
index 5c15ddd43528..d9cb557bbad4 100644
--- a/usr.bin/elfctl/elfctl.c
+++ b/usr.bin/elfctl/elfctl.c
@@ -48,9 +48,6 @@
#include <unistd.h>
#include "_elftc.h"
-
-__FBSDID("$FreeBSD$");
-
static bool convert_to_feature_val(const char *, uint32_t *);
static bool edit_file_features(Elf *, int, int, char *, bool);
static bool get_file_features(Elf *, int, int, uint32_t *, uint64_t *, bool);
diff --git a/usr.bin/elfdump/elfdump.c b/usr.bin/elfdump/elfdump.c
index 0ab64534ac50..e5d5bccc414e 100644
--- a/usr.bin/elfdump/elfdump.c
+++ b/usr.bin/elfdump/elfdump.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
diff --git a/usr.bin/enigma/enigma.c b/usr.bin/enigma/enigma.c
index 0961d8764331..32f8972b238a 100644
--- a/usr.bin/enigma/enigma.c
+++ b/usr.bin/enigma/enigma.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index 4c4e36d12075..784caa76063e 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)env.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/env/envopts.c b/usr.bin/env/envopts.c
index 3834385f3139..8b8df5b47e71 100644
--- a/usr.bin/env/envopts.c
+++ b/usr.bin/env/envopts.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/etdump/etdump.c b/usr.bin/etdump/etdump.c
index e393eba61a84..6c4a256e15f5 100644
--- a/usr.bin/etdump/etdump.c
+++ b/usr.bin/etdump/etdump.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <getopt.h>
#include <libgen.h>
diff --git a/usr.bin/etdump/output_shell.c b/usr.bin/etdump/output_shell.c
index d1e1d570269b..d709684c02dc 100644
--- a/usr.bin/etdump/output_shell.c
+++ b/usr.bin/etdump/output_shell.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdbool.h>
#include <stdio.h>
diff --git a/usr.bin/etdump/output_text.c b/usr.bin/etdump/output_text.c
index 26b19e9c7ab9..aafc6d702a54 100644
--- a/usr.bin/etdump/output_text.c
+++ b/usr.bin/etdump/output_text.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdbool.h>
#include <stdio.h>
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 26f350d9ac53..ae063c2c6499 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <locale.h>
diff --git a/usr.bin/factor/factor.c b/usr.bin/factor/factor.c
index 0b53ac3b5836..cc25b9dd2bf5 100644
--- a/usr.bin/factor/factor.c
+++ b/usr.bin/factor/factor.c
@@ -43,7 +43,6 @@ __SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95");
__RCSID("$NetBSD: factor.c,v 1.19 2009/08/12 05:54:31 dholland Exp $");
#endif
#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
#endif
#endif /* not lint */
diff --git a/usr.bin/false/false.c b/usr.bin/false/false.c
index 3f2c61dd7e9d..7b3f1199626f 100644
--- a/usr.bin/false/false.c
+++ b/usr.bin/false/false.c
@@ -39,8 +39,6 @@ static const char copyright[] =
static const char sccsid[] = "@(#)false.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
int
main(void)
{
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index ad51de15f4d3..8be5742386e7 100644
--- a/usr.bin/fetch/fetch.c
+++ b/usr.bin/fetch/fetch.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index e50bd1f8a46d..3f9b81aaf834 100644
--- a/usr.bin/file2c/file2c.c
+++ b/usr.bin/file2c/file2c.c
@@ -8,8 +8,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index 656a7e06204e..3bff4982b4b6 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)find.c 8.5 (Berkeley) 8/5/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 0b78d9cafce1..d887c8479099 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -37,8 +37,6 @@ static const char sccsid[] = "@(#)function.c 8.10 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ucred.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/getdate.y b/usr.bin/find/getdate.y
index d1326537c67b..a1aeaf0cacd6 100644
--- a/usr.bin/find/getdate.y
+++ b/usr.bin/find/getdate.y
@@ -13,8 +13,6 @@
/* SUPPRESS 288 on yyerrlab *//* Label unused */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <ctype.h>
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index 8d7406216256..d8a150a30eea 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -34,8 +34,6 @@ static char sccsid[] = "@(#)ls.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 6090f71d6e7c..56f1feece6e4 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index 4ac402ede446..0ef7af894b2d 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)misc.c 8.2 (Berkeley) 4/1/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index 83094b801835..2a2317da765f 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)operator.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index d467b80f2687..c5b461f3389b 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)option.c 8.2 (Berkeley) 4/16/94";
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 6f357f9d994b..c489b4b84c49 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -55,8 +55,6 @@ static char sccsid[] = "@(#)finger.c 8.5 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Finger prints out information about users. It is not portable since
* certain fields (e.g. the full user name, office, and phone numbers) are
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index a169e5ca5b92..d276855afaec 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)lprint.c 8.3 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 659bae0c2f78..3ed3ac0813f9 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)net.c 8.4 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/uio.h>
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 3e629df1b274..af7802acc177 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)sprint.c 8.3 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 5a19d25ba626..39a6553b16c7 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index 967de1309e9e..78646f4e37a2 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -173,8 +173,6 @@ static const char copyright[] =
"Copyright (c) 1997 Gareth McCaughan. All rights reserved.\n";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <locale.h>
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index e2995ee049cd..1124f373828c 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)fold.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <locale.h>
diff --git a/usr.bin/fortune/fortune/fortune.c b/usr.bin/fortune/fortune/fortune.c
index 0a49c3229077..62977e15d5e3 100644
--- a/usr.bin/fortune/fortune/fortune.c
+++ b/usr.bin/fortune/fortune/fortune.c
@@ -42,8 +42,6 @@ static const char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/endian.h>
diff --git a/usr.bin/fortune/strfile/strfile.c b/usr.bin/fortune/strfile/strfile.c
index abc35946e77e..15caadd27c0d 100644
--- a/usr.bin/fortune/strfile/strfile.c
+++ b/usr.bin/fortune/strfile/strfile.c
@@ -42,8 +42,6 @@ static const char sccsid[] = "@(#)strfile.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <ctype.h>
diff --git a/usr.bin/fortune/unstr/unstr.c b/usr.bin/fortune/unstr/unstr.c
index 77ee1ecce608..de67c2b790d5 100644
--- a/usr.bin/fortune/unstr/unstr.c
+++ b/usr.bin/fortune/unstr/unstr.c
@@ -42,8 +42,6 @@ static const char sccsid[] = "@(#)unstr.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This program un-does what "strfile" makes, thereby obtaining the
* original file again. This can be invoked with the name of the output
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 5569ec1c2757..8579ed37ae0c 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)from.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index ee5ba0ca1f0b..c3374ecfffac 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/user.h>
#include <sys/stat.h>
diff --git a/usr.bin/fstat/fuser.c b/usr.bin/fstat/fuser.c
index 87e5284c53eb..2e2befde6392 100644
--- a/usr.bin/fstat/fuser.c
+++ b/usr.bin/fstat/fuser.c
@@ -27,8 +27,6 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/fstat/main.c b/usr.bin/fstat/main.c
index 6d2c0ff43d0c..c1ad8cacc147 100644
--- a/usr.bin/fstat/main.c
+++ b/usr.bin/fstat/main.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <libgen.h>
#include <stdlib.h>
diff --git a/usr.bin/fsync/fsync.c b/usr.bin/fsync/fsync.c
index 1ec963587810..16d5a176da93 100644
--- a/usr.bin/fsync/fsync.c
+++ b/usr.bin/fsync/fsync.c
@@ -29,8 +29,6 @@
#ifndef lint
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index b1d1d4898e13..2bffd409bb11 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/param.h>
#include <sys/procfs.h>
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 8055193625f9..52630fb976b4 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)gcore.c 8.2 (Berkeley) 9/23/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Originally written by Eric Cooper in Fall 1981.
* Inspired by a version 6 program by Len Levin, 1978.
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c
index f79bbb56d5cd..d618c49fcc32 100644
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@@ -67,8 +67,6 @@ up-to-date. Many thanks.
******************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _NLS_PRIVATE
#include <sys/types.h>
diff --git a/usr.bin/getaddrinfo/getaddrinfo.c b/usr.bin/getaddrinfo/getaddrinfo.c
index a42fe1a201c9..f01ccd7b2e10 100644
--- a/usr.bin/getaddrinfo/getaddrinfo.c
+++ b/usr.bin/getaddrinfo/getaddrinfo.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c
index 8edb3c380a4b..a4434c31fd36 100644
--- a/usr.bin/getconf/getconf.c
+++ b/usr.bin/getconf/getconf.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/getent/getent.c b/usr.bin/getent/getent.c
index 440d59a7a41d..34fcf0571a43 100644
--- a/usr.bin/getent/getent.c
+++ b/usr.bin/getent/getent.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/socket.h>
#include <sys/param.h>
#include <arpa/inet.h>
diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c
index 970a4c7659af..09036a34b657 100644
--- a/usr.bin/getopt/getopt.c
+++ b/usr.bin/getopt/getopt.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This material, written by Henry Spencer, was released by him
* into the public domain and is thus not subject to any copyright.
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index 5198654c880d..e70a0f5628a2 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)arcs.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include "gprof.h"
diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c
index ef03b3924b5c..5c4104f50825 100644
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)dfn.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include "gprof.h"
diff --git a/usr.bin/gprof/elf.c b/usr.bin/gprof/elf.c
index b4dbf279e525..8f7d21dc08cb 100644
--- a/usr.bin/gprof/elf.c
+++ b/usr.bin/gprof/elf.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)gprof.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index 2723eb2d8178..ef4f0e27d6de 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)gprof.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <stdint.h>
diff --git a/usr.bin/gprof/hertz.c b/usr.bin/gprof/hertz.c
index 684c9767aa6e..0a6726345cb7 100644
--- a/usr.bin/gprof/hertz.c
+++ b/usr.bin/gprof/hertz.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)hertz.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
/*
diff --git a/usr.bin/gprof/kernel.c b/usr.bin/gprof/kernel.c
index 7af98977de24..ca2d53ed3f56 100644
--- a/usr.bin/gprof/kernel.c
+++ b/usr.bin/gprof/kernel.c
@@ -1,6 +1,4 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index 8279ff5bc876..b399ec199856 100644
--- a/usr.bin/gprof/lookup.c
+++ b/usr.bin/gprof/lookup.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)lookup.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "gprof.h"
/*
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index a38527598698..b7bd70489fb5 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)printgprof.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <string.h>
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index bf07aa85cb47..93040990bc23 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)printlist.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <string.h>
diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c
index 12c524188583..2845f0ec225d 100644
--- a/usr.bin/grep/file.c
+++ b/usr.bin/grep/file.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index 4b7cbc4e1bb0..cbf52a4df820 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/grep/queue.c b/usr.bin/grep/queue.c
index 1b74c1799991..3ef8a640b37d 100644
--- a/usr.bin/grep/queue.c
+++ b/usr.bin/grep/queue.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index 723b41e8798a..68bfd504279e 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c
index 560fdd31d6f0..8eddac4adcdd 100644
--- a/usr.bin/gzip/gzip.c
+++ b/usr.bin/gzip/gzip.c
@@ -34,7 +34,6 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008,\
2009, 2010, 2011, 2015, 2017 Matthew R. Green. All rights reserved.");
-__FBSDID("$FreeBSD$");
#endif /* not lint */
/*
diff --git a/usr.bin/gzip/unxz.c b/usr.bin/gzip/unxz.c
index 1764358b210d..de6683b246b8 100644
--- a/usr.bin/gzip/unxz.c
+++ b/usr.bin/gzip/unxz.c
@@ -31,8 +31,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdarg.h>
#include <errno.h>
#include <stdio.h>
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index e323099754ab..d3c3cacdf018 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)head.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/types.h>
diff --git a/usr.bin/hesinfo/hesinfo.c b/usr.bin/hesinfo/hesinfo.c
index fa81864a5d00..ed91f14f5644 100644
--- a/usr.bin/hesinfo/hesinfo.c
+++ b/usr.bin/hesinfo/hesinfo.c
@@ -19,8 +19,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <hesiod.h>
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
index 160158b0a5b6..591826efa6a6 100644
--- a/usr.bin/hexdump/conv.c
+++ b/usr.bin/hexdump/conv.c
@@ -33,8 +33,6 @@
static const char sccsid[] = "@(#)conv.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index b4e7084e1e97..6c0018dcef3c 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/conf.h>
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index ff97a189b1f2..a71728c9f800 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)hexdump.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index 3ab9a3b4a686..2253e4e4c4e7 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)hexsyntax.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 5032d434d445..6cd07197de67 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)odsyntax.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index c6616fdd24d7..e16dd416d6e0 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index b8988dedd6f6..772558191306 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)id.c 8.2 (Berkeley) 2/16/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mac.h>
diff --git a/usr.bin/ident/ident.c b/usr.bin/ident/ident.c
index 14ff8ec8f335..84ac402f74d0 100644
--- a/usr.bin/ident/ident.c
+++ b/usr.bin/ident/ident.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/types.h>
#include <sys/sbuf.h>
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 58ab9bf4b9f2..2f8ea7659128 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)args.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Argument scanning and profile reading code. Default parameters are set
* here as well.
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index 7af4c6ae17c6..5d97a5069add 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)indent.c 5.17 (Berkeley) 6/7/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/indent/indent.h b/usr.bin/indent/indent.h
index a15acb7e6fbf..bbbb5dc805dd 100644
--- a/usr.bin/indent/indent.h
+++ b/usr.bin/indent/indent.h
@@ -27,7 +27,6 @@
*/
#if 0
-__FBSDID("$FreeBSD$");
#endif
void add_typename(const char *);
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 4a27a74ff6fa..65568891cf16 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c
index c47db6baead3..7ad1ddc74fff 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)lexi.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Here we have the token scanner for indent. It scans off one token and puts
* it in the global variable "token". It returns a code, indicating the type
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index 68e07bc922e7..b6e8ee076fd6 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include "indent_globs.h"
diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c
index 229e4005423e..58ef9a0eec0f 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)pr_comment.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index 7f132c182a07..6c2361f056d2 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#define _WANT_SYSVMSG_INTERNALS
#include <sys/msg.h>
diff --git a/usr.bin/ipcs/ipc.c b/usr.bin/ipcs/ipc.c
index d48389dd54bb..0729f27e5945 100644
--- a/usr.bin/ipcs/ipc.c
+++ b/usr.bin/ipcs/ipc.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
#define _WANT_SYSVMSG_INTERNALS
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index cc1884ad0e0b..bcb4f1953fa1 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/proc.h>
#define _WANT_SYSVMSG_INTERNALS
diff --git a/usr.bin/iscsictl/iscsictl.c b/usr.bin/iscsictl/iscsictl.c
index 698f2cebbe6d..d95cb9a1c096 100644
--- a/usr.bin/iscsictl/iscsictl.c
+++ b/usr.bin/iscsictl/iscsictl.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/param.h>
#include <sys/linker.h>
diff --git a/usr.bin/iscsictl/periphs.c b/usr.bin/iscsictl/periphs.c
index e4d4f99264b9..1f623277af10 100644
--- a/usr.bin/iscsictl/periphs.c
+++ b/usr.bin/iscsictl/periphs.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 0ad4b467793e..b9e708dd98cd 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)join.c 8.6 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 23c8e1a24d6c..deda23a0c75a 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)jot.c 8.1 (Berkeley) 6/6/93";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* jot - print sequential or random data
*
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index bff2920c6aa5..cb8f5ff1f537 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)kdump.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define _WANT_KERNEL_ERRNO
#ifdef __LP64__
#define _WANT_KEVENT32
diff --git a/usr.bin/kdump/linux.c b/usr.bin/kdump/linux.c
index 48c82b2a8017..4b115f051b44 100644
--- a/usr.bin/kdump/linux.c
+++ b/usr.bin/kdump/linux.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/uio.h>
#include <sys/ktrace.h>
diff --git a/usr.bin/keylogin/keylogin.c b/usr.bin/keylogin/keylogin.c
index 3f4bdba94d21..021935163a1d 100644
--- a/usr.bin/keylogin/keylogin.c
+++ b/usr.bin/keylogin/keylogin.c
@@ -31,8 +31,6 @@
static char sccsid[] = "@(#)keylogin.c 1.4 91/03/11 Copyr 1986 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Copyright (C) 1986, Sun Microsystems, Inc.
*/
diff --git a/usr.bin/keylogout/keylogout.c b/usr.bin/keylogout/keylogout.c
index c7ec0496b676..03eeee0f6417 100644
--- a/usr.bin/keylogout/keylogout.c
+++ b/usr.bin/keylogout/keylogout.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* unset the secret key on local machine
*/
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
index 6966460236b2..deedd06cada7 100644
--- a/usr.bin/killall/killall.c
+++ b/usr.bin/killall/killall.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/stat.h>
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 1b477fca2fc1..27c31dd83035 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)ktrace.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 7049985740ff..b52ae1b981ec 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/proc.h>
diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c
index 4718a577f52d..f1c49cbbd418 100644
--- a/usr.bin/ktrdump/ktrdump.c
+++ b/usr.bin/ktrdump/ktrdump.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/ktr.h>
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 693e9903cd36..7b27eb6194b4 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)lam.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* lam - laminate files
* Author: John Kunze, UCB
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index 28d14dbbaceb..846ab5d2c087 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -40,8 +40,6 @@ static const char copyright[] =
static const char sccsid[] = "@(#)last.c 8.2 (Berkeley) 4/2/94";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/queue.h>
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 3f712066fe6d..bcd84b2ed37a 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)lastcomm.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/acct.h>
diff --git a/usr.bin/lastcomm/readrec.c b/usr.bin/lastcomm/readrec.c
index 03991e0282c7..b99e76645402 100644
--- a/usr.bin/lastcomm/readrec.c
+++ b/usr.bin/lastcomm/readrec.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index 148df2df9468..5dcac0e56c2f 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/wait.h>
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index bc2d524b7f94..f9e40be124a0 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)leave.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <ctype.h>
#include <locale.h>
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index 558d8adf1f0a..68b1853651b9 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -22,8 +22,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <string.h>
diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c
index cfa05ef8152c..bc302965de1a 100644
--- a/usr.bin/localedef/charmap.c
+++ b/usr.bin/localedef/charmap.c
@@ -32,8 +32,6 @@
* CHARMAP file handling for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/tree.h>
diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c
index 0bed283b6aab..d76c2c2c08b2 100644
--- a/usr.bin/localedef/collate.c
+++ b/usr.bin/localedef/collate.c
@@ -32,8 +32,6 @@
* LC_COLLATE database generation routines for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/tree.h>
diff --git a/usr.bin/localedef/ctype.c b/usr.bin/localedef/ctype.c
index 02e525c5aed2..ab7b76e57b2d 100644
--- a/usr.bin/localedef/ctype.c
+++ b/usr.bin/localedef/ctype.c
@@ -33,8 +33,6 @@
* LC_CTYPE database generation routines for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/tree.h>
#include <stdio.h>
diff --git a/usr.bin/localedef/localedef.c b/usr.bin/localedef/localedef.c
index 390ebf8784ef..ae0bd052b40c 100644
--- a/usr.bin/localedef/localedef.c
+++ b/usr.bin/localedef/localedef.c
@@ -32,8 +32,6 @@
* POSIX localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/localedef/messages.c b/usr.bin/localedef/messages.c
index a25711c4a17b..6b8eb9d684dd 100644
--- a/usr.bin/localedef/messages.c
+++ b/usr.bin/localedef/messages.c
@@ -32,8 +32,6 @@
* LC_MESSAGES database generation routines for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/usr.bin/localedef/monetary.c b/usr.bin/localedef/monetary.c
index dd144d73b806..659c495a71fe 100644
--- a/usr.bin/localedef/monetary.c
+++ b/usr.bin/localedef/monetary.c
@@ -32,8 +32,6 @@
* LC_MONETARY database generation routines for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/usr.bin/localedef/numeric.c b/usr.bin/localedef/numeric.c
index 2950420897ca..358355fe96ae 100644
--- a/usr.bin/localedef/numeric.c
+++ b/usr.bin/localedef/numeric.c
@@ -32,8 +32,6 @@
* LC_NUMERIC database generation routines for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/usr.bin/localedef/scanner.c b/usr.bin/localedef/scanner.c
index 2c0c2d0465e1..c6d45a993f28 100644
--- a/usr.bin/localedef/scanner.c
+++ b/usr.bin/localedef/scanner.c
@@ -33,8 +33,6 @@
* for localedef for processing by the higher level grammar processor.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
diff --git a/usr.bin/localedef/time.c b/usr.bin/localedef/time.c
index 8715abb42aa0..2de922a8eb12 100644
--- a/usr.bin/localedef/time.c
+++ b/usr.bin/localedef/time.c
@@ -32,8 +32,6 @@
* LC_TIME database generation routines for localedef.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/usr.bin/localedef/wide.c b/usr.bin/localedef/wide.c
index 808239620dbb..062e120e6912 100644
--- a/usr.bin/localedef/wide.c
+++ b/usr.bin/localedef/wide.c
@@ -35,8 +35,6 @@
* this approach means that we need a method for each and every encoding.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <stdlib.h>
#include <wchar.h>
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 30b7e7ac9df6..5932699244f0 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)lock.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Lock a terminal up until the given key is entered or the given
* interval times out.
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 3f582d014314..c98c584bc6a9 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index 32fda60717d6..18292010c7ca 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)logger.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 2ac0d9324c26..c96738151151 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -47,8 +47,6 @@ static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* login [ name ]
* login -h hostname (for telnetd, etc.)
diff --git a/usr.bin/login/login_audit.c b/usr.bin/login/login_audit.c
index 91aa4336c659..59b182e19de3 100644
--- a/usr.bin/login/login_audit.c
+++ b/usr.bin/login/login_audit.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <bsm/libbsm.h>
diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c
index f4f0516a5a3c..0fb9289346c0 100644
--- a/usr.bin/login/login_fbtab.c
+++ b/usr.bin/login/login_fbtab.c
@@ -59,8 +59,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/usr.bin/logins/logins.c b/usr.bin/logins/logins.c
index 48f4abf302af..aef7eb7aba5b 100644
--- a/usr.bin/logins/logins.c
+++ b/usr.bin/logins/logins.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <grp.h>
#include <pwd.h>
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index c939e49eddfc..6da78d384921 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -39,8 +39,6 @@ static const char copyright[] =
static const char sccsid[] = "@(#)logname.c 8.2 (Berkeley) 4/3/94";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <capsicum_helpers.h>
#include <err.h>
#include <unistd.h>
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index cded8d398401..459105ba0d73 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)look.c 8.2 (Berkeley) 5/4/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* look -- find lines in a sorted list.
*
diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c
index 596a4ddf23d4..4ec983287607 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -6,8 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index c55bac4bbc8c..82218eb9ba1c 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -36,9 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-
/*
* eval.c
* Facility: m4 macro processor
diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index 8a64217b5768..7910403d74f0 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -15,8 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <stdio.h>
#include <stddef.h>
diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c
index f09033786161..ecd89b5c8b6a 100644
--- a/usr.bin/m4/gnum4.c
+++ b/usr.bin/m4/gnum4.c
@@ -27,8 +27,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* functions needed to support gnu-m4 extensions, including a fake freezing
*/
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index acda95996033..d7ad94b18bd0 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -34,8 +34,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* look.c
* Facility: m4 macro processor
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index f776ca8594e4..d68069cb10a8 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -41,8 +41,6 @@
* by: oz
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <signal.h>
#include <err.h>
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 52d122ff241e..4533e106a37f 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
#include <unistd.h>
diff --git a/usr.bin/m4/trace.c b/usr.bin/m4/trace.c
index cce4c79e79b7..fe84c5ee405f 100644
--- a/usr.bin/m4/trace.c
+++ b/usr.bin/m4/trace.c
@@ -26,8 +26,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 0689c1eb0cb5..1f08ed3e37a6 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)cmd1.c 8.2 (Berkeley) 4/20/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index 2c0f8d55e299..7aaf1d4891ff 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <sys/wait.h>
#include "extern.h"
diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c
index 2b4a20b96bb5..089299ad7853 100644
--- a/usr.bin/mail/cmd3.c
+++ b/usr.bin/mail/cmd3.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)cmd3.c 8.2 (Berkeley) 4/20/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index 7937849a1141..ae55c8314f9d 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "def.h"
#include "extern.h"
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index e8249a10f867..ccb3b60bec2b 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index bc7f4beb29fb..b4f3ec88effa 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)edit.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <fcntl.h>
#include "extern.h"
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index 338062817b14..77339080bc01 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)fio.c 8.2 (Berkeley) 4/20/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <sys/file.h>
#include <sys/wait.h>
diff --git a/usr.bin/mail/getname.c b/usr.bin/mail/getname.c
index 728c6aac4b22..ec76be9ff02d 100644
--- a/usr.bin/mail/getname.c
+++ b/usr.bin/mail/getname.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)getname.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <pwd.h>
#include "extern.h"
diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c
index 831c99c71579..9446b3b3ab74 100644
--- a/usr.bin/mail/head.c
+++ b/usr.bin/mail/head.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)head.c 8.2 (Berkeley) 4/20/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index dfca9edeab8e..b931d6e16a15 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index 9f1305edba78..3507d0b5dc98 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)list.c 8.4 (Berkeley) 5/1/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <ctype.h>
#include "extern.h"
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index 5ea48985cc2e..ec64d04c20b6 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/20/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <fcntl.h>
#include "extern.h"
diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c
index 9e08b0870c50..9ab6cf52e6a2 100644
--- a/usr.bin/mail/names.c
+++ b/usr.bin/mail/names.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)names.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index b28539a90cff..29f7fb9f0922 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)popen.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <sys/wait.h>
#include <fcntl.h>
diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c
index e9d93285c65e..a6ac212b8f92 100644
--- a/usr.bin/mail/quit.c
+++ b/usr.bin/mail/quit.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)quit.c 8.2 (Berkeley) 4/28/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include <fcntl.h>
#include "extern.h"
diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c
index 702dbd031216..002157ba55cb 100644
--- a/usr.bin/mail/send.c
+++ b/usr.bin/mail/send.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)send.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c
index 804313387370..52ef8a8627be 100644
--- a/usr.bin/mail/strings.c
+++ b/usr.bin/mail/strings.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)strings.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 85aa06fc6900..d1fdaadc89bf 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)temp.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index ed5c5f546347..92cec3c6865c 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)tty.c 8.2 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/util.c b/usr.bin/mail/util.c
index 7187d1b520f9..9300484814e0 100644
--- a/usr.bin/mail/util.c
+++ b/usr.bin/mail/util.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)aux.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <fcntl.h>
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c
index 25e31783a5f9..4b473f6f2a9b 100644
--- a/usr.bin/mail/v7.local.c
+++ b/usr.bin/mail/v7.local.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)v7.local.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c
index afed46a72b7c..439d8fb62145 100644
--- a/usr.bin/mail/vars.c
+++ b/usr.bin/mail/vars.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/version.c b/usr.bin/mail/version.c
index e9d2c7f15140..c9f44b417882 100644
--- a/usr.bin/mail/version.c
+++ b/usr.bin/mail/version.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)version.c 8.1 (Berkeley) 6/6/93";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Just keep track of the date/sid of this version of Mail.
* Load this file first to get a "total" Mail version.
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index f998e4cde7ac..a4b4f649dbd6 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -46,8 +46,6 @@ static char sccsid[] = "@(#)mesg.c 8.2 (Berkeley) 1/21/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/ministat/ministat.c b/usr.bin/ministat/ministat.c
index aa6bc27f89ab..32472a8acee7 100644
--- a/usr.bin/ministat/ministat.c
+++ b/usr.bin/ministat/ministat.c
@@ -11,8 +11,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/ioctl.h>
#include <sys/queue.h>
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 91355c142fce..44a828766382 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)mkfifo.c 8.2 (Berkeley) 1/5/94";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/mkimg/apm.c b/usr.bin/mkimg/apm.c
index e1a591a9924c..259a7533c27c 100644
--- a/usr.bin/mkimg/apm.c
+++ b/usr.bin/mkimg/apm.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/usr.bin/mkimg/bsd.c b/usr.bin/mkimg/bsd.c
index 035bbae910f9..17933c01ac07 100644
--- a/usr.bin/mkimg/bsd.c
+++ b/usr.bin/mkimg/bsd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/usr.bin/mkimg/ebr.c b/usr.bin/mkimg/ebr.c
index bee2e64bea14..4d6adbb3b8ba 100644
--- a/usr.bin/mkimg/ebr.c
+++ b/usr.bin/mkimg/ebr.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/usr.bin/mkimg/format.c b/usr.bin/mkimg/format.c
index bca61c17ce47..6730c22ca153 100644
--- a/usr.bin/mkimg/format.c
+++ b/usr.bin/mkimg/format.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <errno.h>
#include <string.h>
diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c
index a071fbfac272..59c51a6a177b 100644
--- a/usr.bin/mkimg/gpt.c
+++ b/usr.bin/mkimg/gpt.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/usr.bin/mkimg/image.c b/usr.bin/mkimg/image.c
index b9e51ebe9f3a..07aaf1a6c0ea 100644
--- a/usr.bin/mkimg/image.c
+++ b/usr.bin/mkimg/image.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/mman.h>
#include <sys/stat.h>
#include <assert.h>
diff --git a/usr.bin/mkimg/mbr.c b/usr.bin/mkimg/mbr.c
index e52e9df7ca64..7bda01c72e6a 100644
--- a/usr.bin/mkimg/mbr.c
+++ b/usr.bin/mkimg/mbr.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c
index 71af45b5815d..bcf500cd675f 100644
--- a/usr.bin/mkimg/mkimg.c
+++ b/usr.bin/mkimg/mkimg.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/usr.bin/mkimg/qcow.c b/usr.bin/mkimg/qcow.c
index de4a48169789..2dc3e5498420 100644
--- a/usr.bin/mkimg/qcow.c
+++ b/usr.bin/mkimg/qcow.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <assert.h>
#include <stdio.h>
diff --git a/usr.bin/mkimg/raw.c b/usr.bin/mkimg/raw.c
index f94a0050ca60..2de674b908ac 100644
--- a/usr.bin/mkimg/raw.c
+++ b/usr.bin/mkimg/raw.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <unistd.h>
diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c
index 5afe3245a2ba..85ed94013e8d 100644
--- a/usr.bin/mkimg/scheme.c
+++ b/usr.bin/mkimg/scheme.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <assert.h>
#include <errno.h>
diff --git a/usr.bin/mkimg/uuid.c b/usr.bin/mkimg/uuid.c
index 215e8acb385f..470d92c76293 100644
--- a/usr.bin/mkimg/uuid.c
+++ b/usr.bin/mkimg/uuid.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <string.h>
diff --git a/usr.bin/mkimg/vhd.c b/usr.bin/mkimg/vhd.c
index 871873804544..1e1f1e7f3c3e 100644
--- a/usr.bin/mkimg/vhd.c
+++ b/usr.bin/mkimg/vhd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/mkimg/vhdx.c b/usr.bin/mkimg/vhdx.c
index 744d6e810ca5..e280250bd964 100644
--- a/usr.bin/mkimg/vhdx.c
+++ b/usr.bin/mkimg/vhdx.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/mkimg/vmdk.c b/usr.bin/mkimg/vmdk.c
index eac84d8bae4d..132eb801387a 100644
--- a/usr.bin/mkimg/vmdk.c
+++ b/usr.bin/mkimg/vmdk.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 8d572d1d5b6a..cefc564181c3 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)mkstr.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <stdio.h>
diff --git a/usr.bin/mkuzip/mkuz_blk.c b/usr.bin/mkuzip/mkuz_blk.c
index cfc527379260..347532a972bf 100644
--- a/usr.bin/mkuzip/mkuz_blk.c
+++ b/usr.bin/mkuzip/mkuz_blk.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <stdlib.h>
diff --git a/usr.bin/mkuzip/mkuz_blockcache.c b/usr.bin/mkuzip/mkuz_blockcache.c
index a369eebf287c..ffaad69dd7b3 100644
--- a/usr.bin/mkuzip/mkuz_blockcache.c
+++ b/usr.bin/mkuzip/mkuz_blockcache.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/mkuzip/mkuz_conveyor.c b/usr.bin/mkuzip/mkuz_conveyor.c
index 2cfae1c0775c..b355be419907 100644
--- a/usr.bin/mkuzip/mkuz_conveyor.c
+++ b/usr.bin/mkuzip/mkuz_conveyor.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
#include <inttypes.h>
diff --git a/usr.bin/mkuzip/mkuz_fqueue.c b/usr.bin/mkuzip/mkuz_fqueue.c
index db47a05cb5ae..ef823e19d0d7 100644
--- a/usr.bin/mkuzip/mkuz_fqueue.c
+++ b/usr.bin/mkuzip/mkuz_fqueue.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <pthread.h>
#include <stdint.h>
diff --git a/usr.bin/mkuzip/mkuz_insize.c b/usr.bin/mkuzip/mkuz_insize.c
index f1c2d1eaca71..f0b2f39229ed 100644
--- a/usr.bin/mkuzip/mkuz_insize.c
+++ b/usr.bin/mkuzip/mkuz_insize.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/disk.h>
#include <sys/ioctl.h>
#include <sys/param.h>
diff --git a/usr.bin/mkuzip/mkuz_lzma.c b/usr.bin/mkuzip/mkuz_lzma.c
index bab2820f7c38..1c2ccf6a5045 100644
--- a/usr.bin/mkuzip/mkuz_lzma.c
+++ b/usr.bin/mkuzip/mkuz_lzma.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
#include <stdint.h>
diff --git a/usr.bin/mkuzip/mkuz_time.c b/usr.bin/mkuzip/mkuz_time.c
index a2219578d7fb..10ad7aead3b5 100644
--- a/usr.bin/mkuzip/mkuz_time.c
+++ b/usr.bin/mkuzip/mkuz_time.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <math.h>
#include <stdint.h>
#include <time.h>
diff --git a/usr.bin/mkuzip/mkuz_zlib.c b/usr.bin/mkuzip/mkuz_zlib.c
index fa2519ffb60d..7ec6fe378235 100644
--- a/usr.bin/mkuzip/mkuz_zlib.c
+++ b/usr.bin/mkuzip/mkuz_zlib.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
#include <stdint.h>
diff --git a/usr.bin/mkuzip/mkuz_zstd.c b/usr.bin/mkuzip/mkuz_zstd.c
index d7f3a704688d..e188b42ee0d5 100644
--- a/usr.bin/mkuzip/mkuz_zstd.c
+++ b/usr.bin/mkuzip/mkuz_zstd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <limits.h>
#include <stddef.h>
diff --git a/usr.bin/mkuzip/mkuzip.c b/usr.bin/mkuzip/mkuzip.c
index c834432a8347..05d974a77748 100644
--- a/usr.bin/mkuzip/mkuzip.c
+++ b/usr.bin/mkuzip/mkuzip.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/endian.h>
#include <sys/param.h>
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index f7a18e1682cb..e4b3b09efc81 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)msgs.c 8.2 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* msgs - a user bulletin board program
*
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index cfada982eaf8..035fbaabf1a6 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -72,8 +72,6 @@ static char sccsid[] = "@(#)mt.c 8.2 (Berkeley) 5/4/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* mt --
* magnetic tape manipulation program
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 1018e2216002..20d14b3a4bde 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <calendar.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c
index ca0359466353..c9b28b5eb085 100644
--- a/usr.bin/netstat/bpf.c
+++ b/usr.bin/netstat/bpf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/common.c b/usr.bin/netstat/common.c
index 9dbbaeee25ea..4b1a778737dc 100644
--- a/usr.bin/netstat/common.c
+++ b/usr.bin/netstat/common.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 8fe9e3a3c924..2ac36fde94f9 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)if.c 8.3 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 691f9d9e912c..19f7ba1490c4 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -34,8 +34,6 @@ static char sccsid[] = "@(#)inet.c 8.5 (Berkeley) 5/24/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/domain.h>
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 2724590de7d3..b88e84ecc564 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -37,8 +37,6 @@ static char sccsid[] = "@(#)inet6.c 8.4 (Berkeley) 4/20/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef INET6
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index c15fb5a2b5aa..8a2fe55bd562 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -91,8 +91,6 @@ static char sccsid[] = "@(#)inet.c 8.5 (Berkeley) 5/24/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index e8a808bb4f56..481284cb88a6 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 3/1/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/file.h>
#ifdef JAIL
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 2391de8b2c9c..657caa865667 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)mbuf.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index 73b51b57c89e..a5da29e89009 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -40,8 +40,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Print multicast routing structures and statistics.
*
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index e992d11e7d39..5873c1ee85c6 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -68,8 +68,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef INET6
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c
index 68ebcf7eff0a..95821efc39ac 100644
--- a/usr.bin/netstat/netgraph.c
+++ b/usr.bin/netstat/netgraph.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/nhgrp.c b/usr.bin/netstat/nhgrp.c
index 45175f30e56b..99bc5ce7d593 100644
--- a/usr.bin/netstat/nhgrp.c
+++ b/usr.bin/netstat/nhgrp.c
@@ -26,7 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/netstat/pfkey.c b/usr.bin/netstat/pfkey.c
index 6e382f290a8e..4ee26f5d25da 100644
--- a/usr.bin/netstat/pfkey.c
+++ b/usr.bin/netstat/pfkey.c
@@ -66,8 +66,6 @@ static char sccsid[] = "@(#)inet.c 8.5 (Berkeley) 5/24/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index c597f3632fa6..9096d5f58daf 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -36,8 +36,6 @@ static char sccsid[] = "From: @(#)route.c 8.6 (Berkeley) 4/28/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/route_netlink.c b/usr.bin/netstat/route_netlink.c
index 3b1880fb9d90..796f8d3eca68 100644
--- a/usr.bin/netstat/route_netlink.c
+++ b/usr.bin/netstat/route_netlink.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
index 5f67e9157880..09aea6cbf46d 100644
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)sctp.c 0.1 (Berkeley) 4/18/2007";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/types.h>
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 685cbff2cd3f..3852651d2eae 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)unix.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Display protocol blocks in the unix domain.
*/
diff --git a/usr.bin/newgrp/newgrp.c b/usr.bin/newgrp/newgrp.c
index bec6806661df..4a00cbbd45c6 100644
--- a/usr.bin/newgrp/newgrp.c
+++ b/usr.bin/newgrp/newgrp.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/newkey/generic.c b/usr.bin/newkey/generic.c
index 324cb5b604ad..124695ac259b 100644
--- a/usr.bin/newkey/generic.c
+++ b/usr.bin/newkey/generic.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)generic.c 1.2 91/03/11 Copyr 1986 Sun Micro";
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/file.h>
#include <rpc/rpc.h>
diff --git a/usr.bin/newkey/newkey.c b/usr.bin/newkey/newkey.c
index cc4a73f18081..6efe64993ec5 100644
--- a/usr.bin/newkey/newkey.c
+++ b/usr.bin/newkey/newkey.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)newkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
* Administrative tool to add a new user to the publickey database
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index b6d18c47c954..514476eabf8c 100644
--- a/usr.bin/newkey/update.c
+++ b/usr.bin/newkey/update.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
* Administrative tool to add a new user to the publickey database
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index 7d29cac05936..3aee7cfaa68a 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)nice.c 8.2 (Berkeley) 4/16/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 358cca73fbf2..cbabf5a7552f 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)nohup.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 7896428eb1c8..b2ca1b352108 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 9296b94118b8..98d480b3c355 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)paste.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/pathchk/pathchk.c b/usr.bin/pathchk/pathchk.c
index 651243388735..821c5de0ee22 100644
--- a/usr.bin/pathchk/pathchk.c
+++ b/usr.bin/pathchk/pathchk.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/perror/perror.c b/usr.bin/perror/perror.c
index f6ffc9a5587c..2ef65adf56e2 100644
--- a/usr.bin/perror/perror.c
+++ b/usr.bin/perror/perror.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/pom/pom.c b/usr.bin/pom/pom.c
index 8e7bf8d8f84e..01370114f36e 100644
--- a/usr.bin/pom/pom.c
+++ b/usr.bin/pom/pom.c
@@ -41,8 +41,6 @@ static const char sccsid[] = "@(#)pom.c 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Phase of the Moon. Calculates the current phase of the moon.
* Based on routines from `Practical Astronomy with Your Calculator',
diff --git a/usr.bin/posixshmcontrol/posixshmcontrol.c b/usr.bin/posixshmcontrol/posixshmcontrol.c
index 5bb8aa473502..8b9206c56800 100644
--- a/usr.bin/posixshmcontrol/posixshmcontrol.c
+++ b/usr.bin/posixshmcontrol/posixshmcontrol.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/filio.h>
#include <sys/mman.h>
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 4c60204c10e0..a193f64b614b 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)egetopt.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <stdio.h>
#include <string.h>
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index cc6d290ca4c2..295566677c1f 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -50,8 +50,6 @@ static char sccsid[] = "@(#)pr.c 8.2 (Berkeley) 4/16/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/usr.bin/primes/spsp.c b/usr.bin/primes/spsp.c
index 8afd5f12b50f..a07dbab016c1 100644
--- a/usr.bin/primes/spsp.c
+++ b/usr.bin/primes/spsp.c
@@ -24,8 +24,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include <stdint.h>
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 485e4da2f252..69e102d1f520 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)printenv.c 8.2 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/proccontrol/proccontrol.c b/usr.bin/proccontrol/proccontrol.c
index d9237c4c6b33..5b48ef2916f8 100644
--- a/usr.bin/proccontrol/proccontrol.c
+++ b/usr.bin/proccontrol/proccontrol.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/procctl.h>
#include <err.h>
#include <stdbool.h>
diff --git a/usr.bin/procstat/procstat.c b/usr.bin/procstat/procstat.c
index a0d5b91072ca..445ea213ba2a 100644
--- a/usr.bin/procstat/procstat.c
+++ b/usr.bin/procstat/procstat.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_args.c b/usr.bin/procstat/procstat_args.c
index a43915e0d901..c618bc37a7ca 100644
--- a/usr.bin/procstat/procstat_args.c
+++ b/usr.bin/procstat/procstat_args.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_auxv.c b/usr.bin/procstat/procstat_auxv.c
index 0bc51f125a45..9c37c511d190 100644
--- a/usr.bin/procstat/procstat_auxv.c
+++ b/usr.bin/procstat/procstat_auxv.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/elf.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/procstat/procstat_basic.c b/usr.bin/procstat/procstat_basic.c
index cc08c8674e65..082689b6bd84 100644
--- a/usr.bin/procstat/procstat_basic.c
+++ b/usr.bin/procstat/procstat_basic.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_bin.c b/usr.bin/procstat/procstat_bin.c
index 223d16f66909..a0e272808f1c 100644
--- a/usr.bin/procstat/procstat_bin.c
+++ b/usr.bin/procstat/procstat_bin.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_cred.c b/usr.bin/procstat/procstat_cred.c
index a98d622e4f66..f37a328e362f 100644
--- a/usr.bin/procstat/procstat_cred.c
+++ b/usr.bin/procstat/procstat_cred.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_cs.c b/usr.bin/procstat/procstat_cs.c
index 9fcc92de143f..89da29c598c2 100644
--- a/usr.bin/procstat/procstat_cs.c
+++ b/usr.bin/procstat/procstat_cs.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/sbuf.h>
diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c
index 87995c7602a4..99a0580f50d4 100644
--- a/usr.bin/procstat/procstat_files.c
+++ b/usr.bin/procstat/procstat_files.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/socket.h>
diff --git a/usr.bin/procstat/procstat_kstack.c b/usr.bin/procstat/procstat_kstack.c
index aa27a65be019..c1b7e06a64f7 100644
--- a/usr.bin/procstat/procstat_kstack.c
+++ b/usr.bin/procstat/procstat_kstack.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_penv.c b/usr.bin/procstat/procstat_penv.c
index d374aa7e0a74..188f761149e5 100644
--- a/usr.bin/procstat/procstat_penv.c
+++ b/usr.bin/procstat/procstat_penv.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_ptlwpinfo.c b/usr.bin/procstat/procstat_ptlwpinfo.c
index 5c2515397121..b2b27a4746ab 100644
--- a/usr.bin/procstat/procstat_ptlwpinfo.c
+++ b/usr.bin/procstat/procstat_ptlwpinfo.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ptrace.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_pwdx.c b/usr.bin/procstat/procstat_pwdx.c
index fc8500314255..f364856b0b27 100644
--- a/usr.bin/procstat/procstat_pwdx.c
+++ b/usr.bin/procstat/procstat_pwdx.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/socket.h>
diff --git a/usr.bin/procstat/procstat_rlimit.c b/usr.bin/procstat/procstat_rlimit.c
index 17e91a2b3a4d..f2dcfcd47327 100644
--- a/usr.bin/procstat/procstat_rlimit.c
+++ b/usr.bin/procstat/procstat_rlimit.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/procstat/procstat_rusage.c b/usr.bin/procstat/procstat_rusage.c
index 3d8c76370c0c..5ee01c3211fd 100644
--- a/usr.bin/procstat/procstat_rusage.c
+++ b/usr.bin/procstat/procstat_rusage.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_sigs.c b/usr.bin/procstat/procstat_sigs.c
index 21104abf7096..973d622f2036 100644
--- a/usr.bin/procstat/procstat_sigs.c
+++ b/usr.bin/procstat/procstat_sigs.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_threads.c b/usr.bin/procstat/procstat_threads.c
index b20085366ee1..d0679a830441 100644
--- a/usr.bin/procstat/procstat_threads.c
+++ b/usr.bin/procstat/procstat_threads.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c
index cf1cc58380c3..26a8fee57d1c 100644
--- a/usr.bin/procstat/procstat_vm.c
+++ b/usr.bin/procstat/procstat_vm.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/user.h>
diff --git a/usr.bin/protect/protect.c b/usr.bin/protect/protect.c
index 1bf807d7919c..12c5c53083b1 100644
--- a/usr.bin/protect/protect.c
+++ b/usr.bin/protect/protect.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/procctl.h>
#include <sys/types.h>
#include <sys/mman.h>
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 2b8411c0f3b8..d09f8f317850 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -46,8 +46,6 @@ static const char sccsid[] = "from: @(#)quota.c 8.1 (Berkeley) 6/6/93";
* Disk quota reporting program.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/file.h>
diff --git a/usr.bin/random/random.c b/usr.bin/random/random.c
index 4325469608a8..7e19e26b30cc 100644
--- a/usr.bin/random/random.c
+++ b/usr.bin/random/random.c
@@ -42,8 +42,6 @@ static const char sccsid[] = "@(#)random.c 8.5 (Berkeley) 4/5/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/random/randomize_fd.c b/usr.bin/random/randomize_fd.c
index a60bb0c15e68..5efd1974b54d 100644
--- a/usr.bin/random/randomize_fd.c
+++ b/usr.bin/random/randomize_fd.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
diff --git a/usr.bin/rctl/rctl.c b/usr.bin/rctl/rctl.c
index 1dbc945f1954..e7b2ec24bcb4 100644
--- a/usr.bin/rctl/rctl.c
+++ b/usr.bin/rctl/rctl.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/rctl.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 42e93cce240e..25a9c5130180 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)renice.c 8.1 (Berkeley) 6/9/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/resizewin/resizewin.c b/usr.bin/resizewin/resizewin.c
index e53364cf1254..c6fefd79624c 100644
--- a/usr.bin/resizewin/resizewin.c
+++ b/usr.bin/resizewin/resizewin.c
@@ -28,7 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/ioctl.h>
#include <sys/time.h>
#include <err.h>
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index ab357fc275e1..c6ef785ed456 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)rev.c 8.3 (Berkeley) 5/4/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/revoke/revoke.c b/usr.bin/revoke/revoke.c
index 3996ca8df8ce..a332a470edd5 100644
--- a/usr.bin/revoke/revoke.c
+++ b/usr.bin/revoke/revoke.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index 713cba11d55a..c5cfa473036f 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_clntout.c, Client-stub outputter for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsytsems, Inc.
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 6e245bf6ca42..257ca67e702d 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_cout.c, XDR routine outputter for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index 6aa6ff7b4667..fb1163010563 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_hout.c, Header file outputter for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 6576d6cfb919..91ad16683cec 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_main.c, Top level of the RPC protocol compiler.
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index 0081106f8512..ac9409295e66 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_parse.c, Parser for the RPC protocol compiler
* Copyright (C) 1987 Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c
index 5d6c9a9a9b0c..d0c8c21ecdea 100644
--- a/usr.bin/rpcgen/rpc_sample.c
+++ b/usr.bin/rpcgen/rpc_sample.c
@@ -30,8 +30,6 @@
/* #pragma ident "@(#)rpc_sample.c 1.9 94/04/25 SMI" */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c
index 49466bd18849..4d6fba6a1980 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_scan.c, Scanner for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index 06951940ff4e..e339b50b83f6 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 618d1f998bbe..0b17ff9541ac 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler
* Copyright (C) 1989, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 13b3a028bcd5..03f5ba24683c 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -35,8 +35,6 @@ static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpc_util.c, Utility routines for the RPC protocol compiler
* Copyright (C) 1989, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index c528a145319b..6945c1de481f 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)rpcinfo.c 1.16 89/04/05 Copyr 1986 Sun Micro";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rpcinfo: ping a particular rpc program
* or dump the registered programs on the remote machine.
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 62a771b02d39..44941afd1369 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -40,8 +40,6 @@ static const char sccsid[] = "@(#)ruptime.c 8.2 (Berkeley) 4/5/94";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <protocols/rwhod.h>
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 2ed658a14400..511579aa0341 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -45,8 +45,6 @@ static const char sccsid[] = "from: @(#)wall.c 5.14 (Berkeley) 3/2/91";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This program is not related to David Wall, whose Stanford Ph.D. thesis
* is entitled "Mechanisms for Broadcast and Selective Broadcast".
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index adc697989a18..aef64911d80e 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)rwho.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/param.h>
#include <sys/file.h>
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 72e639e413dd..b3a1869fcb42 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -31,7 +31,6 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD$");
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1980, 1992, 1993\n\
diff --git a/usr.bin/sdiff/edit.c b/usr.bin/sdiff/edit.c
index 993b515c49b5..af49fd16a2ad 100644
--- a/usr.bin/sdiff/edit.c
+++ b/usr.bin/sdiff/edit.c
@@ -6,8 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/usr.bin/sdiff/sdiff.c b/usr.bin/sdiff/sdiff.c
index 9cfecbc79378..b863d5875db6 100644
--- a/usr.bin/sdiff/sdiff.c
+++ b/usr.bin/sdiff/sdiff.c
@@ -6,8 +6,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/sdiotool/cam_sdio.c b/usr.bin/sdiotool/cam_sdio.c
index 3d074eb391fa..0cd8eeb0485a 100644
--- a/usr.bin/sdiotool/cam_sdio.c
+++ b/usr.bin/sdiotool/cam_sdio.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "cam_sdio.h"
/* Use CMD52 to read or write a single byte */
diff --git a/usr.bin/sdiotool/cam_sdio.h b/usr.bin/sdiotool/cam_sdio.h
index ea3ea48025f0..10d668951bfe 100644
--- a/usr.bin/sdiotool/cam_sdio.h
+++ b/usr.bin/sdiotool/cam_sdio.h
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/usr.bin/sdiotool/linux_compat.h b/usr.bin/sdiotool/linux_compat.h
index dd35ab89a684..58611fe52242 100644
--- a/usr.bin/sdiotool/linux_compat.h
+++ b/usr.bin/sdiotool/linux_compat.h
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef _LINUX_COMPAT_H_
#define _LINUX_COMPAT_H_
diff --git a/usr.bin/sdiotool/linux_sdio_compat.c b/usr.bin/sdiotool/linux_sdio_compat.c
index 93b6d40835c1..7d89bff01dcf 100644
--- a/usr.bin/sdiotool/linux_sdio_compat.c
+++ b/usr.bin/sdiotool/linux_sdio_compat.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/usr.bin/sdiotool/linux_sdio_compat.h b/usr.bin/sdiotool/linux_sdio_compat.h
index 1422cc0ab60f..2b56a74d624f 100644
--- a/usr.bin/sdiotool/linux_sdio_compat.h
+++ b/usr.bin/sdiotool/linux_sdio_compat.h
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef _LINUX_SDIO_COMPAT_H_
#define _LINUX_SDIO_COMPAT_H_
diff --git a/usr.bin/sdiotool/sdiotool.c b/usr.bin/sdiotool/sdiotool.c
index 80aad26266da..448fe830f7dd 100644
--- a/usr.bin/sdiotool/sdiotool.c
+++ b/usr.bin/sdiotool/sdiotool.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index a7cb3cbd6a73..9c2eba953301 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char sccsid[] = "@(#)compile.c 8.1 (Berkeley) 6/6/93";
#endif
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 4139b69da2f8..efa28b5e7239 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1992, 1993\n\
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index 7068f705d70b..9d677475aeb6 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
#endif
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index 261c6239c273..3d88096ffb77 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char sccsid[] = "@(#)process.c 8.6 (Berkeley) 4/20/94";
#endif
diff --git a/usr.bin/seq/seq.c b/usr.bin/seq/seq.c
index d3d074985d85..2a35ef51690f 100644
--- a/usr.bin/seq/seq.c
+++ b/usr.bin/seq/seq.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c
index b50fd5f11e12..378fbbf0fef5 100644
--- a/usr.bin/sockstat/sockstat.c
+++ b/usr.bin/sockstat/sockstat.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/socket.h>
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index 72406f62a4f8..8d012a20254b 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c
index d84c5558ba6f..fc1b50cb78ac 100644
--- a/usr.bin/sort/bwstring.c
+++ b/usr.bin/sort/bwstring.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <errno.h>
#include <err.h>
diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c
index 410137e36153..a8bdc4c3e8ae 100644
--- a/usr.bin/sort/coll.c
+++ b/usr.bin/sort/coll.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <errno.h>
diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c
index 4fd3c153816c..339c9b8de270 100644
--- a/usr.bin/sort/file.c
+++ b/usr.bin/sort/file.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/sort/mem.c b/usr.bin/sort/mem.c
index 8f0a44569fe6..ce5ad3b901f4 100644
--- a/usr.bin/sort/mem.c
+++ b/usr.bin/sort/mem.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/sort/radixsort.c b/usr.bin/sort/radixsort.c
index 7add9c498f5f..5ee998500d30 100644
--- a/usr.bin/sort/radixsort.c
+++ b/usr.bin/sort/radixsort.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <err.h>
#include <langinfo.h>
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index 09c21635c9ca..6e4023c43063 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/sysctl.h>
#include <sys/types.h>
diff --git a/usr.bin/sort/vsort.c b/usr.bin/sort/vsort.c
index 6cc22e4adbde..6b04feff8f6b 100644
--- a/usr.bin/sort/vsort.c
+++ b/usr.bin/sort/vsort.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index cee3980ea291..b5a457ab6ecd 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1987, 1993, 1994\n\
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index 40e0b23950ab..720069db3195 100644
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -36,9 +36,6 @@ __RCSID("$NetBSD: stat.c,v 1.33 2011/01/15 22:54:10 njoly Exp $"
"$OpenBSD: stat.c,v 1.14 2009/06/24 09:44:25 sobrado Exp $");
#endif
#endif
-
-__FBSDID("$FreeBSD$");
-
#if HAVE_CONFIG_H
#include "config.h"
#else /* HAVE_CONFIG_H */
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 65c5640b0bae..3d97ab8deb30 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -72,8 +72,6 @@ static char sccsid[] = "@(#)su.c 8.3 (Berkeley) 4/2/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 0bec6aceaaa1..00a077720dfa 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)pigs.c 8.2 (Berkeley) 9/23/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Pigs display from Bill Reeves at Lucasfilm
*/
diff --git a/usr.bin/systat/sctp.c b/usr.bin/systat/sctp.c
index b2170d965e79..928472dbfdc5 100644
--- a/usr.bin/systat/sctp.c
+++ b/usr.bin/systat/sctp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.bin/systat/sysput.c b/usr.bin/systat/sysput.c
index 491c4223e2d2..78d681158766 100644
--- a/usr.bin/systat/sysput.c
+++ b/usr.bin/systat/sysput.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index 76f4c77d009f..935a138be8e7 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -39,8 +39,6 @@ static const char rcsid[] =
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.bin/systat/zarc.c b/usr.bin/systat/zarc.c
index abc5336a6cf7..f2971094cdbe 100644
--- a/usr.bin/systat/zarc.c
+++ b/usr.bin/systat/zarc.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/tabs/tabs.c b/usr.bin/tabs/tabs.c
index e01d7fcc6e0e..7aa50472c343 100644
--- a/usr.bin/tabs/tabs.c
+++ b/usr.bin/tabs/tabs.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/tty.h>
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 3373f072c228..12231530e679 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)reverse.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 9cc18fbb0d5b..15ca7e03eb70 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
/*
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index d5f36e77d853..9d727fe8bc2c 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)tftp.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
/*
diff --git a/usr.bin/tip/libacu/biz22.c b/usr.bin/tip/libacu/biz22.c
index 7e0a2acd8468..099697a309e7 100644
--- a/usr.bin/tip/libacu/biz22.c
+++ b/usr.bin/tip/libacu/biz22.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)biz22.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/biz31.c b/usr.bin/tip/libacu/biz31.c
index dc8f26af13ce..830946598084 100644
--- a/usr.bin/tip/libacu/biz31.c
+++ b/usr.bin/tip/libacu/biz31.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)biz31.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/courier.c b/usr.bin/tip/libacu/courier.c
index a0a9b5c0efff..e8413e340ecb 100644
--- a/usr.bin/tip/libacu/courier.c
+++ b/usr.bin/tip/libacu/courier.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)courier.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/df.c b/usr.bin/tip/libacu/df.c
index cef96080b1b0..7148ca12897b 100644
--- a/usr.bin/tip/libacu/df.c
+++ b/usr.bin/tip/libacu/df.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)df.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/dn11.c b/usr.bin/tip/libacu/dn11.c
index 385ba8b61be1..28ae987f77b6 100644
--- a/usr.bin/tip/libacu/dn11.c
+++ b/usr.bin/tip/libacu/dn11.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)dn11.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/hayes.c b/usr.bin/tip/libacu/hayes.c
index 12e8401bfd6e..b82f8466539f 100644
--- a/usr.bin/tip/libacu/hayes.c
+++ b/usr.bin/tip/libacu/hayes.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)hayes.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/t3000.c b/usr.bin/tip/libacu/t3000.c
index 861d8d04e007..a8507e7c7ffd 100644
--- a/usr.bin/tip/libacu/t3000.c
+++ b/usr.bin/tip/libacu/t3000.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)t3000.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/v3451.c b/usr.bin/tip/libacu/v3451.c
index 3fe6c21b9b14..3a8db034c614 100644
--- a/usr.bin/tip/libacu/v3451.c
+++ b/usr.bin/tip/libacu/v3451.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)v3451.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/v831.c b/usr.bin/tip/libacu/v831.c
index 60666383700e..a635654f8b0b 100644
--- a/usr.bin/tip/libacu/v831.c
+++ b/usr.bin/tip/libacu/v831.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)v831.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index df086625e9a6..18af5396405d 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)ventel.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 1177e67bea28..2b0c5219566e 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)acu.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index 49f1b4a4a608..502d42225d6f 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)acutab.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index 6676ae34ac94..734455ca2823 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index d8c1231fffa5..49ba3dade12b 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index 6c888d1d6e63..639d99125ffe 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)cu.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 2f6711d0b14d..c32c0f181cff 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)hunt.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index aeb324ad7ef8..953b0185c4d0 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index f2d6c313313e..02080a7c7720 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)partab.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 1fe03beb9c2b..cef14a4f8856 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1992, 1993\n\
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index 9425e42d5c06..faed6ddd6ce0 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1983, 1993\n\
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index 8018229c02a9..2fd200acd82a 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)tipout.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/uucplock.c b/usr.bin/tip/tip/uucplock.c
index da1601590dae..3833630cbce2 100644
--- a/usr.bin/tip/tip/uucplock.c
+++ b/usr.bin/tip/tip/uucplock.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)uucplock.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index 9cf1052d3ea2..76effba26f96 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)value.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index a412264295c6..34f6ef820d50 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
#if 0
static char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93";
diff --git a/usr.bin/tr/cmap.c b/usr.bin/tr/cmap.c
index cd67aa91a799..3789a91ced88 100644
--- a/usr.bin/tr/cmap.c
+++ b/usr.bin/tr/cmap.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <limits.h>
#include <stdbool.h>
diff --git a/usr.bin/tr/cset.c b/usr.bin/tr/cset.c
index f6e110999a5d..3fc20a977915 100644
--- a/usr.bin/tr/cset.c
+++ b/usr.bin/tr/cset.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdbool.h>
#include <stdlib.h>
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 942f98008071..217066681746 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* The main module for truss. Surprisingly simple, but, then, the other
* files handle the bulk of the work. And, of course, the kernel has to
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index db5361a88e86..52f02b6f8700 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Various setup functions for truss. Not the cleanest-written code,
* I'm afraid.
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 1d3232b15122..f9763d10c1b4 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This file has routines used to print out system calls and their
* arguments.
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index 53c66e44c76a..705563511915 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -43,8 +43,6 @@ static const char sccsid[] = "@(#)tsort.c 8.3 (Berkeley) 5/4/95";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index 4f9549eb67c5..945e62cc6f3a 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/usr.bin/users/users.cc b/usr.bin/users/users.cc
index 44b1f591e051..f25b9206120d 100644
--- a/usr.bin/users/users.cc
+++ b/usr.bin/users/users.cc
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index d007d4f6098f..a03c28f19d00 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)vmstat.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/uio.h>
diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c
index eafe7209796f..d68516dda360 100644
--- a/usr.bin/vtfontcvt/vtfontcvt.c
+++ b/usr.bin/vtfontcvt/vtfontcvt.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/endian.h>
#include <sys/fnv_hash.h>
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index 0ea22ec98f67..1cbe5cfabb51 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)proc_compare.c 8.2 (Berkeley) 9/23/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/time.h>
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index 6ba827612e3d..246edcaec7a8 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)wc.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c
index 046800c42df2..8de56b9cf654 100644
--- a/usr.bin/whereis/whereis.c
+++ b/usr.bin/whereis/whereis.c
@@ -33,9 +33,6 @@
*/
#include <sys/types.h>
-
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index f6acab0c2496..c7331296913b 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 5dccb3c4a485..13b9c7d13aef 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/poll.h>
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 399373c5bc57..b5f484dcdf27 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)write.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/filio.h>
diff --git a/usr.bin/xargs/strnsubst.c b/usr.bin/xargs/strnsubst.c
index 4a2ecd5aa9a8..1d4eaac77727 100644
--- a/usr.bin/xargs/strnsubst.c
+++ b/usr.bin/xargs/strnsubst.c
@@ -9,8 +9,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdbool.h>
#include <stdlib.h>
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index cd6b7da1a186..51f42ba2c842 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -46,8 +46,6 @@ static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/time.h>
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 6c269bbb5d91..d19bacbe8c1b 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/mount.h>
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index c2aee21e7d9e..20d9b8bc4687 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>