aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ac/ac.c2
-rw-r--r--usr.sbin/accton/accton.c2
-rw-r--r--usr.sbin/ancontrol/ancontrol.c2
-rw-r--r--usr.sbin/apm/apm.c2
-rw-r--r--usr.sbin/arp/arp.c2
-rw-r--r--usr.sbin/autofs/automount.c2
-rw-r--r--usr.sbin/autofs/automountd.c2
-rw-r--r--usr.sbin/autofs/autounmountd.c2
-rw-r--r--usr.sbin/autofs/common.c2
-rw-r--r--usr.sbin/autofs/defined.c2
-rw-r--r--usr.sbin/autofs/log.c2
-rw-r--r--usr.sbin/autofs/popen.c2
-rw-r--r--usr.sbin/bhyve/acpi.c2
-rw-r--r--usr.sbin/bhyve/atkbdc.c2
-rw-r--r--usr.sbin/bhyve/audio.c2
-rw-r--r--usr.sbin/bhyve/bhyvegc.c2
-rw-r--r--usr.sbin/bhyve/bhyverun.c2
-rw-r--r--usr.sbin/bhyve/block_if.c2
-rw-r--r--usr.sbin/bhyve/bootrom.c2
-rw-r--r--usr.sbin/bhyve/config.c2
-rw-r--r--usr.sbin/bhyve/console.c2
-rw-r--r--usr.sbin/bhyve/fwctl.c2
-rw-r--r--usr.sbin/bhyve/gdb.c2
-rw-r--r--usr.sbin/bhyve/hda_codec.c2
-rw-r--r--usr.sbin/bhyve/inout.c2
-rw-r--r--usr.sbin/bhyve/ioapic.c2
-rw-r--r--usr.sbin/bhyve/iov.c2
-rw-r--r--usr.sbin/bhyve/kernemu_dev.c2
-rw-r--r--usr.sbin/bhyve/mem.c2
-rw-r--r--usr.sbin/bhyve/mevent.c2
-rw-r--r--usr.sbin/bhyve/mptbl.c2
-rw-r--r--usr.sbin/bhyve/net_backends.c2
-rw-r--r--usr.sbin/bhyve/net_utils.c2
-rw-r--r--usr.sbin/bhyve/pci_ahci.c2
-rw-r--r--usr.sbin/bhyve/pci_e82545.c2
-rw-r--r--usr.sbin/bhyve/pci_emul.c2
-rw-r--r--usr.sbin/bhyve/pci_fbuf.c2
-rw-r--r--usr.sbin/bhyve/pci_hda.c2
-rw-r--r--usr.sbin/bhyve/pci_hostbridge.c2
-rw-r--r--usr.sbin/bhyve/pci_irq.c2
-rw-r--r--usr.sbin/bhyve/pci_lpc.c2
-rw-r--r--usr.sbin/bhyve/pci_nvme.c2
-rw-r--r--usr.sbin/bhyve/pci_passthru.c2
-rw-r--r--usr.sbin/bhyve/pci_uart.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_9p.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_block.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_console.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_input.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_net.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_rnd.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_scsi.c2
-rw-r--r--usr.sbin/bhyve/pci_xhci.c2
-rw-r--r--usr.sbin/bhyve/pctestdev.c2
-rw-r--r--usr.sbin/bhyve/pm.c2
-rw-r--r--usr.sbin/bhyve/post.c2
-rw-r--r--usr.sbin/bhyve/ps2kbd.c2
-rw-r--r--usr.sbin/bhyve/ps2mouse.c2
-rw-r--r--usr.sbin/bhyve/rfb.c2
-rw-r--r--usr.sbin/bhyve/rtc.c2
-rw-r--r--usr.sbin/bhyve/smbiostbl.c2
-rw-r--r--usr.sbin/bhyve/snapshot.c2
-rw-r--r--usr.sbin/bhyve/sockstream.c2
-rw-r--r--usr.sbin/bhyve/spinup_ap.c2
-rw-r--r--usr.sbin/bhyve/task_switch.c2
-rw-r--r--usr.sbin/bhyve/uart_emul.c2
-rw-r--r--usr.sbin/bhyve/usb_emul.c2
-rw-r--r--usr.sbin/bhyve/usb_mouse.c2
-rw-r--r--usr.sbin/bhyve/vga.c2
-rw-r--r--usr.sbin/bhyve/virtio.c2
-rw-r--r--usr.sbin/bhyve/vmgenc.c2
-rw-r--r--usr.sbin/bhyve/xmsr.c2
-rw-r--r--usr.sbin/bhyvectl/bhyvectl.c2
-rw-r--r--usr.sbin/bhyveload/bhyveload.c2
-rw-r--r--usr.sbin/binmiscctl/binmiscctl.c2
-rw-r--r--usr.sbin/boot0cfg/boot0cfg.c2
-rw-r--r--usr.sbin/bootparamd/bootparamd/bootparamd.c2
-rw-r--r--usr.sbin/bootparamd/bootparamd/main.c2
-rw-r--r--usr.sbin/bootparamd/callbootd/callbootd.c2
-rw-r--r--usr.sbin/bsdinstall/distextract/distextract.c2
-rw-r--r--usr.sbin/bsdinstall/distfetch/distfetch.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c2
-rw-r--r--usr.sbin/camdd/camdd.c2
-rw-r--r--usr.sbin/cdcontrol/cdcontrol.c2
-rw-r--r--usr.sbin/chkgrp/chkgrp.c2
-rw-r--r--usr.sbin/chown/chown.c2
-rw-r--r--usr.sbin/chroot/chroot.c2
-rw-r--r--usr.sbin/clear_locks/clear_locks.c2
-rw-r--r--usr.sbin/cpucontrol/amd.c2
-rw-r--r--usr.sbin/cpucontrol/amd10h.c2
-rw-r--r--usr.sbin/cpucontrol/cpucontrol.c2
-rw-r--r--usr.sbin/cpucontrol/intel.c2
-rw-r--r--usr.sbin/cpucontrol/via.c2
-rw-r--r--usr.sbin/crunch/crunchgen/crunched_main.c2
-rw-r--r--usr.sbin/crunch/crunchgen/crunchgen.c2
-rw-r--r--usr.sbin/crunch/crunchide/crunchide.c2
-rw-r--r--usr.sbin/crunch/crunchide/exec_elf32.c2
-rw-r--r--usr.sbin/crunch/crunchide/exec_elf64.c2
-rw-r--r--usr.sbin/ctladm/ctladm.c2
-rw-r--r--usr.sbin/ctladm/util.c2
-rw-r--r--usr.sbin/ctld/ctld.c2
-rw-r--r--usr.sbin/ctld/discovery.c2
-rw-r--r--usr.sbin/ctld/isns.c2
-rw-r--r--usr.sbin/ctld/kernel.c2
-rw-r--r--usr.sbin/ctld/login.c2
-rw-r--r--usr.sbin/cxgbetool/cxgbetool.c2
-rw-r--r--usr.sbin/cxgbetool/reg_defs_t4.c2
-rw-r--r--usr.sbin/cxgbetool/reg_defs_t4vf.c2
-rw-r--r--usr.sbin/cxgbetool/reg_defs_t5.c2
-rw-r--r--usr.sbin/cxgbetool/reg_defs_t6.c2
-rw-r--r--usr.sbin/cxgbetool/tcb_common.c2
-rw-r--r--usr.sbin/cxgbetool/tcbinfot4.c2
-rw-r--r--usr.sbin/cxgbetool/tcbinfot5.c2
-rw-r--r--usr.sbin/cxgbetool/tcbinfot6.c2
-rw-r--r--usr.sbin/cxgbetool/tcbshowt4.c2
-rw-r--r--usr.sbin/cxgbetool/tcbshowt5.c2
-rw-r--r--usr.sbin/cxgbetool/tcbshowt6.c2
-rw-r--r--usr.sbin/daemon/daemon.c2
-rw-r--r--usr.sbin/devctl/devctl.c2
-rw-r--r--usr.sbin/devinfo/devinfo.c2
-rw-r--r--usr.sbin/dumpcis/main.c2
-rw-r--r--usr.sbin/dumpcis/printcis.c2
-rw-r--r--usr.sbin/dumpcis/readcis.c2
-rw-r--r--usr.sbin/edquota/edquota.c2
-rw-r--r--usr.sbin/efibootmgr/efibootmgr.c2
-rw-r--r--usr.sbin/efidp/efidp.c2
-rw-r--r--usr.sbin/efivar/efiutil.c2
-rw-r--r--usr.sbin/efivar/efivar.c2
-rw-r--r--usr.sbin/fdcontrol/fdcontrol.c2
-rw-r--r--usr.sbin/fmtree/compare.c2
-rw-r--r--usr.sbin/fmtree/create.c2
-rw-r--r--usr.sbin/fmtree/excludes.c2
-rw-r--r--usr.sbin/fmtree/misc.c2
-rw-r--r--usr.sbin/fmtree/mtree.c2
-rw-r--r--usr.sbin/fmtree/spec.c2
-rw-r--r--usr.sbin/fmtree/specspec.c2
-rw-r--r--usr.sbin/fmtree/verify.c2
-rw-r--r--usr.sbin/fstyp/apfs.c2
-rw-r--r--usr.sbin/fstyp/befs.c2
-rw-r--r--usr.sbin/fstyp/cd9660.c2
-rw-r--r--usr.sbin/fstyp/exfat.c2
-rw-r--r--usr.sbin/fstyp/ext2fs.c2
-rw-r--r--usr.sbin/fstyp/fstyp.c2
-rw-r--r--usr.sbin/fstyp/geli.c2
-rw-r--r--usr.sbin/fstyp/hammer.c2
-rw-r--r--usr.sbin/fstyp/hammer2.c2
-rw-r--r--usr.sbin/fstyp/hfsplus.c2
-rw-r--r--usr.sbin/fstyp/msdosfs.c2
-rw-r--r--usr.sbin/fstyp/ntfs.c2
-rw-r--r--usr.sbin/fstyp/ufs.c2
-rw-r--r--usr.sbin/fstyp/zfs.c2
-rw-r--r--usr.sbin/fwcontrol/fwcontrol.c1
-rw-r--r--usr.sbin/gpioctl/gpioctl.c2
-rw-r--r--usr.sbin/gssd/gssd.c2
-rw-r--r--usr.sbin/i2c/i2c.c2
-rw-r--r--usr.sbin/ifmcstat/ifmcstat.c2
-rw-r--r--usr.sbin/ifmcstat/printb.c2
-rw-r--r--usr.sbin/inetd/builtins.c2
-rw-r--r--usr.sbin/inetd/inetd.c2
-rw-r--r--usr.sbin/iovctl/iovctl.c2
-rw-r--r--usr.sbin/iovctl/parse.c2
-rw-r--r--usr.sbin/iovctl/validate.c2
-rw-r--r--usr.sbin/iscsid/discovery.c2
-rw-r--r--usr.sbin/iscsid/iscsid.c2
-rw-r--r--usr.sbin/iscsid/login.c2
-rw-r--r--usr.sbin/jail/command.c2
-rw-r--r--usr.sbin/jail/config.c2
-rw-r--r--usr.sbin/jail/jail.c2
-rw-r--r--usr.sbin/jail/jaillex.l2
-rw-r--r--usr.sbin/jail/jailparse.y2
-rw-r--r--usr.sbin/jail/state.c2
-rw-r--r--usr.sbin/jls/jls.c2
-rw-r--r--usr.sbin/kbdcontrol/kbdcontrol.c2
-rw-r--r--usr.sbin/kbdmap/kbdmap.c2
-rw-r--r--usr.sbin/kgmon/kgmon.c2
-rw-r--r--usr.sbin/kldxref/ef_riscv.c2
-rw-r--r--usr.sbin/lpr/chkprintcap/chkprintcap.c2
-rw-r--r--usr.sbin/lpr/chkprintcap/skimprintcap.c2
-rw-r--r--usr.sbin/lpr/common_source/common.c2
-rw-r--r--usr.sbin/lpr/common_source/ctlinfo.c2
-rw-r--r--usr.sbin/lpr/common_source/displayq.c2
-rw-r--r--usr.sbin/lpr/common_source/matchjobs.c2
-rw-r--r--usr.sbin/lpr/common_source/net.c2
-rw-r--r--usr.sbin/lpr/common_source/printcap.c2
-rw-r--r--usr.sbin/lpr/common_source/request.c2
-rw-r--r--usr.sbin/lpr/common_source/rmjob.c2
-rw-r--r--usr.sbin/lpr/common_source/startdaemon.c2
-rw-r--r--usr.sbin/lpr/filters.ru/koi2855/koi2855.c2
-rw-r--r--usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c2
-rw-r--r--usr.sbin/lpr/filters/lpf.c2
-rw-r--r--usr.sbin/lpr/lpc/cmds.c2
-rw-r--r--usr.sbin/lpr/lpc/cmdtab.c2
-rw-r--r--usr.sbin/lpr/lpc/lpc.c2
-rw-r--r--usr.sbin/lpr/lpc/movejobs.c2
-rw-r--r--usr.sbin/lpr/lpd/lpd.c2
-rw-r--r--usr.sbin/lpr/lpd/lpdchar.c2
-rw-r--r--usr.sbin/lpr/lpd/modes.c2
-rw-r--r--usr.sbin/lpr/lpd/printjob.c2
-rw-r--r--usr.sbin/lpr/lpd/recvjob.c2
-rw-r--r--usr.sbin/lpr/lpq/lpq.c2
-rw-r--r--usr.sbin/lpr/lpr/lpr.c2
-rw-r--r--usr.sbin/lpr/lprm/lprm.c2
-rw-r--r--usr.sbin/lpr/lptest/lptest.c2
-rw-r--r--usr.sbin/lpr/pac/pac.c2
-rw-r--r--usr.sbin/lptcontrol/lptcontrol.c2
-rw-r--r--usr.sbin/mailwrapper/mailwrapper.c2
-rw-r--r--usr.sbin/makefs/cd9660.c2
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_archimedes.c2
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_conversion.c2
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_debug.c1
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_eltorito.c2
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_strings.c1
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_write.c2
-rw-r--r--usr.sbin/makefs/cd9660/iso9660_rrip.c2
-rw-r--r--usr.sbin/makefs/ffs.c2
-rw-r--r--usr.sbin/makefs/ffs/buf.c2
-rw-r--r--usr.sbin/makefs/ffs/ffs_alloc.c2
-rw-r--r--usr.sbin/makefs/ffs/ffs_balloc.c2
-rw-r--r--usr.sbin/makefs/ffs/ffs_bswap.c2
-rw-r--r--usr.sbin/makefs/ffs/ffs_subr.c2
-rw-r--r--usr.sbin/makefs/ffs/mkfs.c2
-rw-r--r--usr.sbin/makefs/ffs/ufs_bmap.c2
-rw-r--r--usr.sbin/makefs/makefs.c2
-rw-r--r--usr.sbin/makefs/msdos.c1
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_conv.c2
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_denode.c2
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_vfsops.c2
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_vnops.c2
-rw-r--r--usr.sbin/makefs/mtree.c2
-rw-r--r--usr.sbin/makefs/walk.c2
-rw-r--r--usr.sbin/mixer/mixer.c2
-rw-r--r--usr.sbin/mld6query/mld6.c2
-rw-r--r--usr.sbin/mlx5tool/mlx5tool.c2
-rw-r--r--usr.sbin/mountd/mountd.c2
-rw-r--r--usr.sbin/moused/moused.c2
-rw-r--r--usr.sbin/mtest/mtest.c2
-rw-r--r--usr.sbin/ndiscvt/inf-parse.y2
-rw-r--r--usr.sbin/ndiscvt/inf-token.l2
-rw-r--r--usr.sbin/ndiscvt/inf.c2
-rw-r--r--usr.sbin/ndiscvt/ndiscvt.c2
-rw-r--r--usr.sbin/ndiscvt/windrv_stub.c2
-rw-r--r--usr.sbin/newsyslog/newsyslog.c2
-rw-r--r--usr.sbin/newsyslog/ptimes.c2
-rw-r--r--usr.sbin/nfscbd/nfscbd.c2
-rw-r--r--usr.sbin/nfsdumpstate/nfsdumpstate.c2
-rw-r--r--usr.sbin/nfsrevoke/nfsrevoke.c2
-rw-r--r--usr.sbin/nfsuserd/nfsuserd.c2
-rw-r--r--usr.sbin/ngctl/main.c2
-rw-r--r--usr.sbin/ngctl/msg.c2
-rw-r--r--usr.sbin/nghook/main.c2
-rw-r--r--usr.sbin/nologin/nologin.c2
-rw-r--r--usr.sbin/nscd/agent.c2
-rw-r--r--usr.sbin/nscd/agents/group.c2
-rw-r--r--usr.sbin/nscd/agents/passwd.c2
-rw-r--r--usr.sbin/nscd/agents/services.c2
-rw-r--r--usr.sbin/nscd/cachelib.c2
-rw-r--r--usr.sbin/nscd/cacheplcs.c2
-rw-r--r--usr.sbin/nscd/config.c2
-rw-r--r--usr.sbin/nscd/debug.c2
-rw-r--r--usr.sbin/nscd/log.c2
-rw-r--r--usr.sbin/nscd/mp_rs_query.c2
-rw-r--r--usr.sbin/nscd/mp_ws_query.c2
-rw-r--r--usr.sbin/nscd/nscd.c2
-rw-r--r--usr.sbin/nscd/nscdcli.c2
-rw-r--r--usr.sbin/nscd/parser.c2
-rw-r--r--usr.sbin/nscd/protocol.c2
-rw-r--r--usr.sbin/nscd/query.c2
-rw-r--r--usr.sbin/nscd/singletons.c2
-rw-r--r--usr.sbin/ofwdump/ofw_util.c2
-rw-r--r--usr.sbin/ofwdump/ofwdump.c2
-rw-r--r--usr.sbin/pkg/config.c2
-rw-r--r--usr.sbin/pkg/dns_utils.c2
-rw-r--r--usr.sbin/pkg/pkg.c2
-rw-r--r--usr.sbin/pmc/cmd_pmc_filter.cc2
-rw-r--r--usr.sbin/pmc/cmd_pmc_list.c2
-rw-r--r--usr.sbin/pmc/cmd_pmc_stat.c2
-rw-r--r--usr.sbin/pmc/cmd_pmc_summary.cc2
-rw-r--r--usr.sbin/pmc/pmc_util.c2
-rw-r--r--usr.sbin/pmcannotate/pmcannotate.c2
-rw-r--r--usr.sbin/pmccontrol/pmccontrol.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate_cg.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_callgraph.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_calltree.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_gprof.c2
-rw-r--r--usr.sbin/pmcstat/pmcstat.c2
-rw-r--r--usr.sbin/pmcstat/pmcstat_log.c2
-rw-r--r--usr.sbin/pmcstudy/eval_expr.c2
-rw-r--r--usr.sbin/pmcstudy/eval_expr.h2
-rw-r--r--usr.sbin/pmcstudy/pmcstudy.c2
-rw-r--r--usr.sbin/pnfsdscopymr/pnfsdscopymr.c2
-rw-r--r--usr.sbin/pnfsdsfile/pnfsdsfile.c2
-rw-r--r--usr.sbin/pnfsdskill/pnfsdskill.c2
-rw-r--r--usr.sbin/portsnap/make_index/make_index.c2
-rw-r--r--usr.sbin/powerd/powerd.c2
-rw-r--r--usr.sbin/ppp/async.c2
-rw-r--r--usr.sbin/pppctl/pppctl.c2
-rw-r--r--usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c2
-rw-r--r--usr.sbin/pstat/pstat.c2
-rw-r--r--usr.sbin/pw/pw_utils.c2
-rw-r--r--usr.sbin/pw/strtounum.c2
-rw-r--r--usr.sbin/pwd_mkdb/pwd_mkdb.c2
-rw-r--r--usr.sbin/quot/quot.c2
-rw-r--r--usr.sbin/quotaon/quotaon.c2
-rw-r--r--usr.sbin/rarpd/rarpd.c2
-rw-r--r--usr.sbin/repquota/repquota.c2
-rw-r--r--usr.sbin/rmt/rmt.c2
-rw-r--r--usr.sbin/rpc.lockd/kern.c2
-rw-r--r--usr.sbin/rpc.lockd/lockd_lock.c2
-rw-r--r--usr.sbin/rpc.statd/procs.c2
-rw-r--r--usr.sbin/rpc.statd/statd.c2
-rw-r--r--usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c2
-rw-r--r--usr.sbin/rpc.tlsservd/rpc.tlscommon.c2
-rw-r--r--usr.sbin/rpc.tlsservd/rpc.tlsservd.c2
-rw-r--r--usr.sbin/rpc.umntall/mounttab.c2
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_main.c2
-rw-r--r--usr.sbin/rpc.yppasswdd/yppasswdd_server.c2
-rw-r--r--usr.sbin/rpc.ypupdated/yp_dbdelete.c2
-rw-r--r--usr.sbin/rpc.ypupdated/yp_dbupdate.c2
-rw-r--r--usr.sbin/rpc.ypupdated/ypupdated_main.c2
-rw-r--r--usr.sbin/rpc.ypupdated/ypupdated_server.c2
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_main.c2
-rw-r--r--usr.sbin/rpc.ypxfrd/ypxfrd_server.c2
-rw-r--r--usr.sbin/rtprio/rtprio.c2
-rw-r--r--usr.sbin/rtsold/cap_llflags.c2
-rw-r--r--usr.sbin/rtsold/cap_script.c2
-rw-r--r--usr.sbin/rwhod/rwhod.c2
-rw-r--r--usr.sbin/sa/db.c2
-rw-r--r--usr.sbin/sa/main.c2
-rw-r--r--usr.sbin/sa/pdb.c2
-rw-r--r--usr.sbin/sa/usrdb.c2
-rw-r--r--usr.sbin/services_mkdb/services_mkdb.c2
-rw-r--r--usr.sbin/services_mkdb/uniq.c2
-rw-r--r--usr.sbin/sesutil/sesutil.c2
-rw-r--r--usr.sbin/setfib/setfib.c2
-rw-r--r--usr.sbin/spi/spi.c2
-rw-r--r--usr.sbin/syslogd/syslogd.c2
-rw-r--r--usr.sbin/tcpdrop/tcpdrop.c2
-rw-r--r--usr.sbin/trim/trim.c2
-rw-r--r--usr.sbin/trpt/trpt.c2
-rw-r--r--usr.sbin/tzsetup/tzsetup.c2
-rw-r--r--usr.sbin/uefisign/child.c2
-rw-r--r--usr.sbin/uefisign/pe.c2
-rw-r--r--usr.sbin/uefisign/uefisign.c2
-rw-r--r--usr.sbin/ugidfw/ugidfw.c2
-rw-r--r--usr.sbin/utx/utx.c2
-rw-r--r--usr.sbin/vipw/vipw.c2
-rw-r--r--usr.sbin/wake/wake.c2
-rw-r--r--usr.sbin/watch/watch.c2
-rw-r--r--usr.sbin/watchdogd/watchdogd.c2
-rw-r--r--usr.sbin/wpa/ndis_events/ndis_events.c2
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Packet32.c2
-rw-r--r--usr.sbin/yp_mkdb/yp_mkdb.c2
-rw-r--r--usr.sbin/ypbind/yp_ping.c2
-rw-r--r--usr.sbin/ypbind/ypbind.c2
-rw-r--r--usr.sbin/yppoll/yppoll.c2
-rw-r--r--usr.sbin/yppush/yppush_main.c2
-rw-r--r--usr.sbin/ypserv/common/yplib_host.c2
-rw-r--r--usr.sbin/ypserv/yp_access.c2
-rw-r--r--usr.sbin/ypserv/yp_dblookup.c2
-rw-r--r--usr.sbin/ypserv/yp_dnslookup.c2
-rw-r--r--usr.sbin/ypserv/yp_error.c2
-rw-r--r--usr.sbin/ypserv/yp_main.c2
-rw-r--r--usr.sbin/ypserv/yp_server.c2
-rw-r--r--usr.sbin/ypserv/yp_svc_udp.c2
-rw-r--r--usr.sbin/ypset/ypset.c2
-rw-r--r--usr.sbin/zonectl/zonectl.c2
367 files changed, 0 insertions, 730 deletions
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 1372b175f116..2b9be8489023 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index 80823ecabbc5..e17561442865 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)accton.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c
index 6d76f0770f4a..eb5c718ecdf6 100644
--- a/usr.sbin/ancontrol/ancontrol.c
+++ b/usr.sbin/ancontrol/ancontrol.c
@@ -39,8 +39,6 @@ static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index 05652da3f1c1..01e75eb1f8b1 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/file.h>
#include <sys/ioctl.h>
#include <sys/types.h>
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index f018baa2679e..8ea8db9256cc 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -44,8 +44,6 @@ static char const sccsid[] = "@(#)from: arp.c 8.2 (Berkeley) 1/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* arp - display, set, and delete arp table entries
*/
diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c
index 540b64b3a374..188bbc3a040f 100644
--- a/usr.sbin/autofs/automount.c
+++ b/usr.sbin/autofs/automount.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/automountd.c b/usr.sbin/autofs/automountd.c
index 905a46343684..50136044b503 100644
--- a/usr.sbin/autofs/automountd.c
+++ b/usr.sbin/autofs/automountd.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/autounmountd.c b/usr.sbin/autofs/autounmountd.c
index 53b85fdf6a34..84c3e8906357 100644
--- a/usr.sbin/autofs/autounmountd.c
+++ b/usr.sbin/autofs/autounmountd.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/event.h>
#include <sys/mount.h>
diff --git a/usr.sbin/autofs/common.c b/usr.sbin/autofs/common.c
index 96d7b910caf9..b6e435603dc7 100644
--- a/usr.sbin/autofs/common.c
+++ b/usr.sbin/autofs/common.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/defined.c b/usr.sbin/autofs/defined.c
index 9b84dc8c373d..01bc8218ac5d 100644
--- a/usr.sbin/autofs/defined.c
+++ b/usr.sbin/autofs/defined.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/autofs/log.c b/usr.sbin/autofs/log.c
index 8d9319d45290..02a889bffbed 100644
--- a/usr.sbin/autofs/log.c
+++ b/usr.sbin/autofs/log.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
diff --git a/usr.sbin/autofs/popen.c b/usr.sbin/autofs/popen.c
index f1be8ec9a4ca..2d3790ff2b0d 100644
--- a/usr.sbin/autofs/popen.c
+++ b/usr.sbin/autofs/popen.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/wait.h>
diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
index a0917b70a5e2..04fe5e26a4f7 100644
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/errno.h>
diff --git a/usr.sbin/bhyve/atkbdc.c b/usr.sbin/bhyve/atkbdc.c
index 96a952a84e00..c5dea0d220cf 100644
--- a/usr.sbin/bhyve/atkbdc.c
+++ b/usr.sbin/bhyve/atkbdc.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/vmm.h>
diff --git a/usr.sbin/bhyve/audio.c b/usr.sbin/bhyve/audio.c
index deb2913bd782..fc9ded37044a 100644
--- a/usr.sbin/bhyve/audio.c
+++ b/usr.sbin/bhyve/audio.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.sbin/bhyve/bhyvegc.c b/usr.sbin/bhyve/bhyvegc.c
index 82981bb92071..1527343412bf 100644
--- a/usr.sbin/bhyve/bhyvegc.c
+++ b/usr.sbin/bhyve/bhyvegc.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdlib.h>
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index 662f986ef940..56acf5bfb5d7 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c
index b8bf322e49cc..dc8dc434d447 100644
--- a/usr.sbin/bhyve/block_if.c
+++ b/usr.sbin/bhyve/block_if.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/bootrom.c b/usr.sbin/bhyve/bootrom.c
index b6530873bf50..4f0ab733acb2 100644
--- a/usr.sbin/bhyve/bootrom.c
+++ b/usr.sbin/bhyve/bootrom.c
@@ -27,8 +27,6 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/usr.sbin/bhyve/config.c b/usr.sbin/bhyve/config.c
index ba51f81dd011..18b7f0a1ba87 100644
--- a/usr.sbin/bhyve/config.c
+++ b/usr.sbin/bhyve/config.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.sbin/bhyve/console.c b/usr.sbin/bhyve/console.c
index fe1d691b7676..176ae2e2a298 100644
--- a/usr.sbin/bhyve/console.c
+++ b/usr.sbin/bhyve/console.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include "bhyvegc.h"
diff --git a/usr.sbin/bhyve/fwctl.c b/usr.sbin/bhyve/fwctl.c
index daf5ae423e26..01b16c38f3a7 100644
--- a/usr.sbin/bhyve/fwctl.c
+++ b/usr.sbin/bhyve/fwctl.c
@@ -31,8 +31,6 @@
* but with a request/response messaging protocol.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/errno.h>
diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c
index 03f684e002ce..a9ece8cf35e9 100644
--- a/usr.sbin/bhyve/gdb.c
+++ b/usr.sbin/bhyve/gdb.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/hda_codec.c b/usr.sbin/bhyve/hda_codec.c
index b23171bf94fb..1866149c020a 100644
--- a/usr.sbin/bhyve/hda_codec.c
+++ b/usr.sbin/bhyve/hda_codec.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <pthread.h>
#include <pthread_np.h>
#include <unistd.h>
diff --git a/usr.sbin/bhyve/inout.c b/usr.sbin/bhyve/inout.c
index 4d78f510b569..c389a042b306 100644
--- a/usr.sbin/bhyve/inout.c
+++ b/usr.sbin/bhyve/inout.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/_iovec.h>
diff --git a/usr.sbin/bhyve/ioapic.c b/usr.sbin/bhyve/ioapic.c
index 2907b521f1e5..89bb891fdaf0 100644
--- a/usr.sbin/bhyve/ioapic.c
+++ b/usr.sbin/bhyve/ioapic.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/bhyve/iov.c b/usr.sbin/bhyve/iov.c
index bc24f370e6a2..d01c7a5601f4 100644
--- a/usr.sbin/bhyve/iov.c
+++ b/usr.sbin/bhyve/iov.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/usr.sbin/bhyve/kernemu_dev.c b/usr.sbin/bhyve/kernemu_dev.c
index 64341cceccfd..e2ac0a1952df 100644
--- a/usr.sbin/bhyve/kernemu_dev.c
+++ b/usr.sbin/bhyve/kernemu_dev.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/tree.h>
diff --git a/usr.sbin/bhyve/mem.c b/usr.sbin/bhyve/mem.c
index 6c127b0e1c1c..5a8e782ce169 100644
--- a/usr.sbin/bhyve/mem.c
+++ b/usr.sbin/bhyve/mem.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/tree.h>
diff --git a/usr.sbin/bhyve/mevent.c b/usr.sbin/bhyve/mevent.c
index 723efcd657e4..ce272ce87f3d 100644
--- a/usr.sbin/bhyve/mevent.c
+++ b/usr.sbin/bhyve/mevent.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#ifndef WITHOUT_CAPSICUM
#include <capsicum_helpers.h>
diff --git a/usr.sbin/bhyve/mptbl.c b/usr.sbin/bhyve/mptbl.c
index 2e7b28e89ec7..e2653ddcf37d 100644
--- a/usr.sbin/bhyve/mptbl.c
+++ b/usr.sbin/bhyve/mptbl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/errno.h>
#include <x86/mptable.h>
diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c
index dc7b9d0b2607..fa7cd9c81f46 100644
--- a/usr.sbin/bhyve/net_backends.c
+++ b/usr.sbin/bhyve/net_backends.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h> /* u_short etc */
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/net_utils.c b/usr.sbin/bhyve/net_utils.c
index 1cee3f90ae8c..9230895b49fe 100644
--- a/usr.sbin/bhyve/net_utils.c
+++ b/usr.sbin/bhyve/net_utils.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <net/ethernet.h>
diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c
index 0e3eb61e07b6..61679b1b2245 100644
--- a/usr.sbin/bhyve/pci_ahci.c
+++ b/usr.sbin/bhyve/pci_ahci.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/stat.h>
diff --git a/usr.sbin/bhyve/pci_e82545.c b/usr.sbin/bhyve/pci_e82545.c
index 7c670f5acb66..b686ff154bb2 100644
--- a/usr.sbin/bhyve/pci_e82545.c
+++ b/usr.sbin/bhyve/pci_e82545.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
index 52ae90f6cc1b..1adc27843e16 100644
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/mman.h>
diff --git a/usr.sbin/bhyve/pci_fbuf.c b/usr.sbin/bhyve/pci_fbuf.c
index fc270c65219b..32ccdabec8b5 100644
--- a/usr.sbin/bhyve/pci_fbuf.c
+++ b/usr.sbin/bhyve/pci_fbuf.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mman.h>
diff --git a/usr.sbin/bhyve/pci_hda.c b/usr.sbin/bhyve/pci_hda.c
index 24ad1ec08f52..7d824d7a1fd8 100644
--- a/usr.sbin/bhyve/pci_hda.c
+++ b/usr.sbin/bhyve/pci_hda.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <time.h>
diff --git a/usr.sbin/bhyve/pci_hostbridge.c b/usr.sbin/bhyve/pci_hostbridge.c
index b7d231299aa4..df75da4283a5 100644
--- a/usr.sbin/bhyve/pci_hostbridge.c
+++ b/usr.sbin/bhyve/pci_hostbridge.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdlib.h>
diff --git a/usr.sbin/bhyve/pci_irq.c b/usr.sbin/bhyve/pci_irq.c
index dbc4e1df1bcb..12c2d94925ad 100644
--- a/usr.sbin/bhyve/pci_irq.c
+++ b/usr.sbin/bhyve/pci_irq.c
@@ -29,8 +29,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <machine/vmm.h>
diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c
index 2b1a8bc4006a..ebda61aaea60 100644
--- a/usr.sbin/bhyve/pci_lpc.c
+++ b/usr.sbin/bhyve/pci_lpc.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/vmm.h>
#include <machine/vmm_snapshot.h>
diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c
index b446bc266716..2a4ce332fd1a 100644
--- a/usr.sbin/bhyve/pci_nvme.c
+++ b/usr.sbin/bhyve/pci_nvme.c
@@ -57,8 +57,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/errno.h>
#include <sys/types.h>
#include <net/ieee_oui.h>
diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c
index cad7d9856abf..ea546e041a0d 100644
--- a/usr.sbin/bhyve/pci_passthru.c
+++ b/usr.sbin/bhyve/pci_passthru.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_uart.c b/usr.sbin/bhyve/pci_uart.c
index af5dcd5070bd..362238bf3168 100644
--- a/usr.sbin/bhyve/pci_uart.c
+++ b/usr.sbin/bhyve/pci_uart.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/bhyve/pci_virtio_9p.c b/usr.sbin/bhyve/pci_virtio_9p.c
index 405692bec37f..77ea2f4bed75 100644
--- a/usr.sbin/bhyve/pci_virtio_9p.c
+++ b/usr.sbin/bhyve/pci_virtio_9p.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/uio.h>
diff --git a/usr.sbin/bhyve/pci_virtio_block.c b/usr.sbin/bhyve/pci_virtio_block.c
index 8c7e26b6d123..680c53c0c974 100644
--- a/usr.sbin/bhyve/pci_virtio_block.c
+++ b/usr.sbin/bhyve/pci_virtio_block.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/stat.h>
diff --git a/usr.sbin/bhyve/pci_virtio_console.c b/usr.sbin/bhyve/pci_virtio_console.c
index 51e4ca84b2be..a0bb8591811c 100644
--- a/usr.sbin/bhyve/pci_virtio_console.c
+++ b/usr.sbin/bhyve/pci_virtio_console.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_virtio_input.c b/usr.sbin/bhyve/pci_virtio_input.c
index 7c15eaeec29b..54c88d57f1d6 100644
--- a/usr.sbin/bhyve/pci_virtio_input.c
+++ b/usr.sbin/bhyve/pci_virtio_input.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_virtio_net.c b/usr.sbin/bhyve/pci_virtio_net.c
index c5ec4f8b1052..f597becabca9 100644
--- a/usr.sbin/bhyve/pci_virtio_net.c
+++ b/usr.sbin/bhyve/pci_virtio_net.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/select.h>
diff --git a/usr.sbin/bhyve/pci_virtio_rnd.c b/usr.sbin/bhyve/pci_virtio_rnd.c
index a3d31b311148..779a664a636a 100644
--- a/usr.sbin/bhyve/pci_virtio_rnd.c
+++ b/usr.sbin/bhyve/pci_virtio_rnd.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c
index d9ad1382f0c5..7ffe89031e1d 100644
--- a/usr.sbin/bhyve/pci_virtio_scsi.c
+++ b/usr.sbin/bhyve/pci_virtio_scsi.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker_set.h>
#include <sys/types.h>
diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c
index ad1d2f60ec3e..4be3381419c8 100644
--- a/usr.sbin/bhyve/pci_xhci.c
+++ b/usr.sbin/bhyve/pci_xhci.c
@@ -33,8 +33,6 @@
tablet USB tablet mouse
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/uio.h>
#include <sys/types.h>
diff --git a/usr.sbin/bhyve/pctestdev.c b/usr.sbin/bhyve/pctestdev.c
index 07c1d34f54eb..c7f8abcf7a6f 100644
--- a/usr.sbin/bhyve/pctestdev.c
+++ b/usr.sbin/bhyve/pctestdev.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/mman.h>
#include <machine/vmm.h>
diff --git a/usr.sbin/bhyve/pm.c b/usr.sbin/bhyve/pm.c
index 54fc9fa70594..e54854dee855 100644
--- a/usr.sbin/bhyve/pm.c
+++ b/usr.sbin/bhyve/pm.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/vmm.h>
diff --git a/usr.sbin/bhyve/post.c b/usr.sbin/bhyve/post.c
index e4583771b451..53ca34f418b5 100644
--- a/usr.sbin/bhyve/post.c
+++ b/usr.sbin/bhyve/post.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
diff --git a/usr.sbin/bhyve/ps2kbd.c b/usr.sbin/bhyve/ps2kbd.c
index ac6a6e6b5ec3..6fe36dbc4a55 100644
--- a/usr.sbin/bhyve/ps2kbd.c
+++ b/usr.sbin/bhyve/ps2kbd.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.sbin/bhyve/ps2mouse.c b/usr.sbin/bhyve/ps2mouse.c
index 211e7f221363..f0b4b7cabd91 100644
--- a/usr.sbin/bhyve/ps2mouse.c
+++ b/usr.sbin/bhyve/ps2mouse.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/vmm_snapshot.h>
diff --git a/usr.sbin/bhyve/rfb.c b/usr.sbin/bhyve/rfb.c
index eb7333911867..db2924fee453 100644
--- a/usr.sbin/bhyve/rfb.c
+++ b/usr.sbin/bhyve/rfb.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/rtc.c b/usr.sbin/bhyve/rtc.c
index 09093a4359ce..ef1bdcaf7a2c 100644
--- a/usr.sbin/bhyve/rtc.c
+++ b/usr.sbin/bhyve/rtc.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <time.h>
diff --git a/usr.sbin/bhyve/smbiostbl.c b/usr.sbin/bhyve/smbiostbl.c
index eddac4dae1fc..33f3fe5204f9 100644
--- a/usr.sbin/bhyve/smbiostbl.c
+++ b/usr.sbin/bhyve/smbiostbl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c
index 9cd1ce34eeea..953958b0fdab 100644
--- a/usr.sbin/bhyve/snapshot.c
+++ b/usr.sbin/bhyve/snapshot.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
diff --git a/usr.sbin/bhyve/sockstream.c b/usr.sbin/bhyve/sockstream.c
index 27f614a1b2b8..5b877fa11d44 100644
--- a/usr.sbin/bhyve/sockstream.c
+++ b/usr.sbin/bhyve/sockstream.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <unistd.h>
diff --git a/usr.sbin/bhyve/spinup_ap.c b/usr.sbin/bhyve/spinup_ap.c
index 1133b7c38ce0..4ff3df1548a3 100644
--- a/usr.sbin/bhyve/spinup_ap.c
+++ b/usr.sbin/bhyve/spinup_ap.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.sbin/bhyve/task_switch.c b/usr.sbin/bhyve/task_switch.c
index 23060963a33f..f2f9cab9a3f9 100644
--- a/usr.sbin/bhyve/task_switch.c
+++ b/usr.sbin/bhyve/task_switch.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/_iovec.h>
#include <sys/mman.h>
diff --git a/usr.sbin/bhyve/uart_emul.c b/usr.sbin/bhyve/uart_emul.c
index b4a6d1e4e226..645abf6dc243 100644
--- a/usr.sbin/bhyve/uart_emul.c
+++ b/usr.sbin/bhyve/uart_emul.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <dev/ic/ns16550.h>
#ifndef WITHOUT_CAPSICUM
diff --git a/usr.sbin/bhyve/usb_emul.c b/usr.sbin/bhyve/usb_emul.c
index fb3ef7031ee8..dba11ef0922b 100644
--- a/usr.sbin/bhyve/usb_emul.c
+++ b/usr.sbin/bhyve/usb_emul.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.sbin/bhyve/usb_mouse.c b/usr.sbin/bhyve/usb_mouse.c
index 79a3a1c296d3..80f79980a98e 100644
--- a/usr.sbin/bhyve/usb_mouse.c
+++ b/usr.sbin/bhyve/usb_mouse.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <machine/vmm_snapshot.h>
diff --git a/usr.sbin/bhyve/vga.c b/usr.sbin/bhyve/vga.c
index 50b6e37544d9..7fdfb793dafa 100644
--- a/usr.sbin/bhyve/vga.c
+++ b/usr.sbin/bhyve/vga.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c
index 16e3e532c3a2..5294da670677 100644
--- a/usr.sbin/bhyve/virtio.c
+++ b/usr.sbin/bhyve/virtio.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/uio.h>
diff --git a/usr.sbin/bhyve/vmgenc.c b/usr.sbin/bhyve/vmgenc.c
index 05618c5cba8b..4da5bb90e2fa 100644
--- a/usr.sbin/bhyve/vmgenc.c
+++ b/usr.sbin/bhyve/vmgenc.c
@@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/uuid.h>
diff --git a/usr.sbin/bhyve/xmsr.c b/usr.sbin/bhyve/xmsr.c
index 7709fdec6e0a..90ecb1de269a 100644
--- a/usr.sbin/bhyve/xmsr.c
+++ b/usr.sbin/bhyve/xmsr.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/cpufunc.h>
diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c
index 3d0c909fed96..b484ffaa7be7 100644
--- a/usr.sbin/bhyvectl/bhyvectl.c
+++ b/usr.sbin/bhyvectl/bhyvectl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/cpuset.h>
diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c
index 16bbc0fe6da7..d3095483b797 100644
--- a/usr.sbin/bhyveload/bhyveload.c
+++ b/usr.sbin/bhyveload/bhyveload.c
@@ -53,8 +53,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/disk.h>
diff --git a/usr.sbin/binmiscctl/binmiscctl.c b/usr.sbin/binmiscctl/binmiscctl.c
index 2ec2cc3f64d4..c2c541155805 100644
--- a/usr.sbin/binmiscctl/binmiscctl.c
+++ b/usr.sbin/binmiscctl/binmiscctl.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/imgact_binmisc.h>
#include <sys/linker.h>
diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c
index bccab173e2fb..f44eedea5c6a 100644
--- a/usr.sbin/boot0cfg/boot0cfg.c
+++ b/usr.sbin/boot0cfg/boot0cfg.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/disklabel.h>
#include <sys/diskmbr.h>
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c
index 5bbd5b4becef..5100c64b5d3d 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.c
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.c
@@ -8,8 +8,6 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifdef YP
#include <rpc/rpc.h>
#include <rpcsvc/yp_prot.h>
diff --git a/usr.sbin/bootparamd/bootparamd/main.c b/usr.sbin/bootparamd/bootparamd/main.c
index 95b49f8f39a0..732e4de9673b 100644
--- a/usr.sbin/bootparamd/bootparamd/main.c
+++ b/usr.sbin/bootparamd/bootparamd/main.c
@@ -8,8 +8,6 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <netdb.h>
diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c
index ea1432c3140a..51b8c336c772 100644
--- a/usr.sbin/bootparamd/callbootd/callbootd.c
+++ b/usr.sbin/bootparamd/callbootd/callbootd.c
@@ -8,8 +8,6 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "bootparam_prot.h"
#include <rpc/rpc.h>
#include <sys/types.h>
diff --git a/usr.sbin/bsdinstall/distextract/distextract.c b/usr.sbin/bsdinstall/distextract/distextract.c
index 492558a978bf..fd01e0e6ae8b 100644
--- a/usr.sbin/bsdinstall/distextract/distextract.c
+++ b/usr.sbin/bsdinstall/distextract/distextract.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <archive.h>
#include <ctype.h>
diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c b/usr.sbin/bsdinstall/distfetch/distfetch.c
index 3b348f6e6926..fb8d2cc048ad 100644
--- a/usr.sbin/bsdinstall/distfetch/distfetch.c
+++ b/usr.sbin/bsdinstall/distfetch/distfetch.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c b/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
index a7099eca7d83..74ddd48cd31d 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c b/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
index a55050b851d3..bba93d79ffbb 100644
--- a/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
+++ b/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c
index caf06ba9a596..b98f6c3e3e12 100644
--- a/usr.sbin/camdd/camdd.c
+++ b/usr.sbin/camdd/camdd.c
@@ -38,8 +38,6 @@
* - An example of how to use the asynchronous pass(4) driver interface.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c
index 546c20b6f94a..ef15742727c1 100644
--- a/usr.sbin/cdcontrol/cdcontrol.c
+++ b/usr.sbin/cdcontrol/cdcontrol.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/cdio.h>
#include <sys/cdrio.h>
#include <sys/file.h>
diff --git a/usr.sbin/chkgrp/chkgrp.c b/usr.sbin/chkgrp/chkgrp.c
index 06e78d440556..650448d9e40b 100644
--- a/usr.sbin/chkgrp/chkgrp.c
+++ b/usr.sbin/chkgrp/chkgrp.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <ctype.h>
diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c
index a3fe5d351320..caf801287ca5 100644
--- a/usr.sbin/chown/chown.c
+++ b/usr.sbin/chown/chown.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)chown.c 8.8 (Berkeley) 4/4/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index b14e1cbf4597..208be32f85ab 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)chroot.c 8.1 (Berkeley) 6/9/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/procctl.h>
diff --git a/usr.sbin/clear_locks/clear_locks.c b/usr.sbin/clear_locks/clear_locks.c
index 9479a607e370..f2abfeb2d816 100644
--- a/usr.sbin/clear_locks/clear_locks.c
+++ b/usr.sbin/clear_locks/clear_locks.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/usr.sbin/cpucontrol/amd.c b/usr.sbin/cpucontrol/amd.c
index 6dedba5a5257..21a3389ced2f 100644
--- a/usr.sbin/cpucontrol/amd.c
+++ b/usr.sbin/cpucontrol/amd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/cpucontrol/amd10h.c b/usr.sbin/cpucontrol/amd10h.c
index 5d3c4a1ac003..b0c458fabb58 100644
--- a/usr.sbin/cpucontrol/amd10h.c
+++ b/usr.sbin/cpucontrol/amd10h.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
diff --git a/usr.sbin/cpucontrol/cpucontrol.c b/usr.sbin/cpucontrol/cpucontrol.c
index 467b901a5caa..9cc3968de01d 100644
--- a/usr.sbin/cpucontrol/cpucontrol.c
+++ b/usr.sbin/cpucontrol/cpucontrol.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/cpucontrol/intel.c b/usr.sbin/cpucontrol/intel.c
index 215c034462e0..d775d66d33aa 100644
--- a/usr.sbin/cpucontrol/intel.c
+++ b/usr.sbin/cpucontrol/intel.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/cpucontrol/via.c b/usr.sbin/cpucontrol/via.c
index 0a233b8b50b2..432399c69e35 100644
--- a/usr.sbin/cpucontrol/via.c
+++ b/usr.sbin/cpucontrol/via.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/crunch/crunchgen/crunched_main.c b/usr.sbin/crunch/crunchgen/crunched_main.c
index 45f61baae23e..493c2de188b4 100644
--- a/usr.sbin/crunch/crunchgen/crunched_main.c
+++ b/usr.sbin/crunch/crunchgen/crunched_main.c
@@ -65,8 +65,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/auxv.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c
index 9d603abc9114..2065541b354c 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.c
+++ b/usr.sbin/crunch/crunchgen/crunchgen.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/crunch/crunchide/crunchide.c b/usr.sbin/crunch/crunchide/crunchide.c
index bd663e1d57bd..7f8efbf2d1ce 100644
--- a/usr.sbin/crunch/crunchide/crunchide.c
+++ b/usr.sbin/crunch/crunchide/crunchide.c
@@ -61,8 +61,6 @@
#ifndef lint
__RCSID("$NetBSD: crunchide.c,v 1.8 1997/11/01 06:51:45 lukem Exp $");
#endif
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/errno.h>
diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c
index b9af82e1e5e7..c67129f34a83 100644
--- a/usr.sbin/crunch/crunchide/exec_elf32.c
+++ b/usr.sbin/crunch/crunchide/exec_elf32.c
@@ -36,8 +36,6 @@
__RCSID("$NetBSD: exec_elf32.c,v 1.6 1999/09/20 04:12:16 christos Exp $");
#endif
#endif
-__FBSDID("$FreeBSD$");
-
#ifndef ELFSIZE
#define ELFSIZE 32
#endif
diff --git a/usr.sbin/crunch/crunchide/exec_elf64.c b/usr.sbin/crunch/crunchide/exec_elf64.c
index c447116ccf5e..30bd16fd65d8 100644
--- a/usr.sbin/crunch/crunchide/exec_elf64.c
+++ b/usr.sbin/crunch/crunchide/exec_elf64.c
@@ -36,8 +36,6 @@
#ifndef lint
__IDSTRING(elf64rcsid, "$NetBSD: exec_elf64.c,v 1.2 1997/08/02 21:30:19 perry Exp $");
#endif
-__FBSDID("$FreeBSD$");
-
#define ELFSIZE 64
#include "exec_elf32.c"
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
index 155a9b3e3a75..0a185d16835e 100644
--- a/usr.sbin/ctladm/ctladm.c
+++ b/usr.sbin/ctladm/ctladm.c
@@ -44,8 +44,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/callout.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/ctladm/util.c b/usr.sbin/ctladm/util.c
index 60293e499475..23723c2a2286 100644
--- a/usr.sbin/ctladm/util.c
+++ b/usr.sbin/ctladm/util.c
@@ -46,8 +46,6 @@
* from: scsi.c,v 1.17 1998/01/12 07:57:57 charnier Exp $";
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stdint.h>
#include <sys/types.h>
diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c
index da8047104bc9..2a69308ff067 100644
--- a/usr.sbin/ctld/ctld.c
+++ b/usr.sbin/ctld/ctld.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ctld/discovery.c b/usr.sbin/ctld/discovery.c
index 50b0a2d0eeea..f548b41d5cba 100644
--- a/usr.sbin/ctld/discovery.c
+++ b/usr.sbin/ctld/discovery.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/ctld/isns.c b/usr.sbin/ctld/isns.c
index 63b8425e9b9e..3c85c1a3cade 100644
--- a/usr.sbin/ctld/isns.c
+++ b/usr.sbin/ctld/isns.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
index 2202a780b31c..cbb8e2c25f5d 100644
--- a/usr.sbin/ctld/kernel.c
+++ b/usr.sbin/ctld/kernel.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/callout.h>
diff --git a/usr.sbin/ctld/login.c b/usr.sbin/ctld/login.c
index 40a647b68cd4..afd3210a828a 100644
--- a/usr.sbin/ctld/login.c
+++ b/usr.sbin/ctld/login.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdbool.h>
#include <stdlib.h>
diff --git a/usr.sbin/cxgbetool/cxgbetool.c b/usr.sbin/cxgbetool/cxgbetool.c
index 43707df0b47a..6f9031240515 100644
--- a/usr.sbin/cxgbetool/cxgbetool.c
+++ b/usr.sbin/cxgbetool/cxgbetool.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
diff --git a/usr.sbin/cxgbetool/reg_defs_t4.c b/usr.sbin/cxgbetool/reg_defs_t4.c
index 5207073b2498..dac485778be1 100644
--- a/usr.sbin/cxgbetool/reg_defs_t4.c
+++ b/usr.sbin/cxgbetool/reg_defs_t4.c
@@ -1,8 +1,6 @@
/* This file is automatically generated --- changes will be lost */
/* Generation Date : Tue Dec 8 09:33:01 IST 2015 */
/* Directory name: t4_reg.txt, Changeset: */
-__FBSDID("$FreeBSD$");
-
struct reg_info t4_sge_regs[] = {
{ "SGE_PF_KDOORBELL", 0x1e000, 0 },
{ "QID", 15, 17 },
diff --git a/usr.sbin/cxgbetool/reg_defs_t4vf.c b/usr.sbin/cxgbetool/reg_defs_t4vf.c
index 34909036d42b..5ea7d4f276dd 100644
--- a/usr.sbin/cxgbetool/reg_defs_t4vf.c
+++ b/usr.sbin/cxgbetool/reg_defs_t4vf.c
@@ -3,8 +3,6 @@
* Virtual Function register map definitions in t4vf_defs.h in the common
* code.
*/
-__FBSDID("$FreeBSD$");
-
struct reg_info t4vf_sge_regs[] = {
{ "SGE_KDOORBELL", 0x000, 0 },
{ "QID", 15, 17 },
diff --git a/usr.sbin/cxgbetool/reg_defs_t5.c b/usr.sbin/cxgbetool/reg_defs_t5.c
index f5f64da7ebd2..3c31a66e2360 100644
--- a/usr.sbin/cxgbetool/reg_defs_t5.c
+++ b/usr.sbin/cxgbetool/reg_defs_t5.c
@@ -1,8 +1,6 @@
/* This file is automatically generated --- changes will be lost */
/* Generation Date : Tue Jan 28 03:02:12 IST 2020 */
/* Directory name: t5_reg.txt, Changeset: 6941:9063655afd44 */
-__FBSDID("$FreeBSD$");
-
struct reg_info t5_sge_regs[] = {
{ "SGE_PF_KDOORBELL", 0x1e000, 0 },
{ "QID", 15, 17 },
diff --git a/usr.sbin/cxgbetool/reg_defs_t6.c b/usr.sbin/cxgbetool/reg_defs_t6.c
index 23a3d6d44a5a..ffa2c9c57689 100644
--- a/usr.sbin/cxgbetool/reg_defs_t6.c
+++ b/usr.sbin/cxgbetool/reg_defs_t6.c
@@ -1,8 +1,6 @@
/* This file is automatically generated --- changes will be lost */
/* Generation Date : Tue Jan 28 03:02:08 IST 2020 */
/* Directory name: t6_reg.txt, Changeset: 4272:a648ba4d5c0c */
-__FBSDID("$FreeBSD$");
-
struct reg_info t6_sge_regs[] = {
{ "SGE_PF_KDOORBELL", 0x1e000, 0 },
{ "QID", 15, 17 },
diff --git a/usr.sbin/cxgbetool/tcb_common.c b/usr.sbin/cxgbetool/tcb_common.c
index e40ecc787bd1..63a4df17d604 100644
--- a/usr.sbin/cxgbetool/tcb_common.c
+++ b/usr.sbin/cxgbetool/tcb_common.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "tcb_common.h"
/***:-----------------------------------------------------------------------
diff --git a/usr.sbin/cxgbetool/tcbinfot4.c b/usr.sbin/cxgbetool/tcbinfot4.c
index e6f3aa6a3d25..ed7ea18dcf88 100644
--- a/usr.sbin/cxgbetool/tcbinfot4.c
+++ b/usr.sbin/cxgbetool/tcbinfot4.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Auto-generated file. Avoid direct editing. */
/* Edits will be lost when file regenerated. */
#include <stdio.h>
diff --git a/usr.sbin/cxgbetool/tcbinfot5.c b/usr.sbin/cxgbetool/tcbinfot5.c
index 8b684fd31877..de20bc1e2cf0 100644
--- a/usr.sbin/cxgbetool/tcbinfot5.c
+++ b/usr.sbin/cxgbetool/tcbinfot5.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Auto-generated file. Avoid direct editing. */
/* Edits will be lost when file regenerated. */
#include <stdio.h>
diff --git a/usr.sbin/cxgbetool/tcbinfot6.c b/usr.sbin/cxgbetool/tcbinfot6.c
index 5f8316c0d89d..ab44205c4046 100644
--- a/usr.sbin/cxgbetool/tcbinfot6.c
+++ b/usr.sbin/cxgbetool/tcbinfot6.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Auto-generated file. Avoid direct editing. */
/* Edits will be lost when file regenerated. */
#include <stdio.h>
diff --git a/usr.sbin/cxgbetool/tcbshowt4.c b/usr.sbin/cxgbetool/tcbshowt4.c
index b92f89759090..bc80db390f78 100644
--- a/usr.sbin/cxgbetool/tcbshowt4.c
+++ b/usr.sbin/cxgbetool/tcbshowt4.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Auto-generated file. Avoid direct editing. */
/* Edits will be lost when file regenerated. */
#include <stdio.h>
diff --git a/usr.sbin/cxgbetool/tcbshowt5.c b/usr.sbin/cxgbetool/tcbshowt5.c
index f32b2e79b66c..db88efa3b6f8 100644
--- a/usr.sbin/cxgbetool/tcbshowt5.c
+++ b/usr.sbin/cxgbetool/tcbshowt5.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Auto-generated file. Avoid direct editing. */
/* Edits will be lost when file regenerated. */
#include <stdio.h>
diff --git a/usr.sbin/cxgbetool/tcbshowt6.c b/usr.sbin/cxgbetool/tcbshowt6.c
index ed9156d7c3e3..adc54addfdc5 100644
--- a/usr.sbin/cxgbetool/tcbshowt6.c
+++ b/usr.sbin/cxgbetool/tcbshowt6.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/* Auto-generated file. Avoid direct editing. */
/* Edits will be lost when file regenerated. */
#include <stdio.h>
diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c
index 790b0f6fcd0f..5bed64eaa0db 100644
--- a/usr.sbin/daemon/daemon.c
+++ b/usr.sbin/daemon/daemon.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/wait.h>
diff --git a/usr.sbin/devctl/devctl.c b/usr.sbin/devctl/devctl.c
index 7db6e6e529c0..7a4e66c4bd06 100644
--- a/usr.sbin/devctl/devctl.c
+++ b/usr.sbin/devctl/devctl.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/linker_set.h>
#include <devctl.h>
#include <err.h>
diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c
index ce35357162e5..060f272dda79 100644
--- a/usr.sbin/devinfo/devinfo.c
+++ b/usr.sbin/devinfo/devinfo.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/dumpcis/main.c b/usr.sbin/dumpcis/main.c
index 3099a09805d4..50d87bcfeb4b 100644
--- a/usr.sbin/dumpcis/main.c
+++ b/usr.sbin/dumpcis/main.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/usr.sbin/dumpcis/printcis.c b/usr.sbin/dumpcis/printcis.c
index c6ec2beb3787..641fd19944d4 100644
--- a/usr.sbin/dumpcis/printcis.c
+++ b/usr.sbin/dumpcis/printcis.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Code cleanup, bug-fix and extension
* by Tatsumi Hosokawa <hosokawa@mt.cs.keio.ac.jp>
diff --git a/usr.sbin/dumpcis/readcis.c b/usr.sbin/dumpcis/readcis.c
index ce072d017cf4..9afdb6f2ba24 100644
--- a/usr.sbin/dumpcis/readcis.c
+++ b/usr.sbin/dumpcis/readcis.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Code cleanup, bug-fix and extension
* by Tatsumi Hosokawa <hosokawa@mt.cs.keio.ac.jp>
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index de2083506864..d6ce0e017eb6 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)edquota.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Disk quota editor.
*/
diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c
index 3512f9d6f092..b779d7572070 100644
--- a/usr.sbin/efibootmgr/efibootmgr.c
+++ b/usr.sbin/efibootmgr/efibootmgr.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/efidp/efidp.c b/usr.sbin/efidp/efidp.c
index aef154112d66..62c4b60d1523 100644
--- a/usr.sbin/efidp/efidp.c
+++ b/usr.sbin/efidp/efidp.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <efivar.h>
#include <efivar-dp.h>
diff --git a/usr.sbin/efivar/efiutil.c b/usr.sbin/efivar/efiutil.c
index 838e56334066..fc2a309a81ef 100644
--- a/usr.sbin/efivar/efiutil.c
+++ b/usr.sbin/efivar/efiutil.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <efivar.h>
#include <efivar-dp.h>
diff --git a/usr.sbin/efivar/efivar.c b/usr.sbin/efivar/efivar.c
index 5bdf0c11a488..a87c73abef36 100644
--- a/usr.sbin/efivar/efivar.c
+++ b/usr.sbin/efivar/efivar.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <efivar.h>
#include <efivar-dp.h>
diff --git a/usr.sbin/fdcontrol/fdcontrol.c b/usr.sbin/fdcontrol/fdcontrol.c
index 953076b5af93..812089154d81 100644
--- a/usr.sbin/fdcontrol/fdcontrol.c
+++ b/usr.sbin/fdcontrol/fdcontrol.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/fdcio.h>
#include <sys/file.h>
diff --git a/usr.sbin/fmtree/compare.c b/usr.sbin/fmtree/compare.c
index c59d01e651d4..d2d632338355 100644
--- a/usr.sbin/fmtree/compare.c
+++ b/usr.sbin/fmtree/compare.c
@@ -33,8 +33,6 @@ static char sccsid[] = "@(#)compare.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>
#include <sys/time.h>
diff --git a/usr.sbin/fmtree/create.c b/usr.sbin/fmtree/create.c
index edfb09ebd2f2..a95a627d3d3c 100644
--- a/usr.sbin/fmtree/create.c
+++ b/usr.sbin/fmtree/create.c
@@ -33,8 +33,6 @@ static char sccsid[] = "@(#)create.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>
#include <dirent.h>
diff --git a/usr.sbin/fmtree/excludes.c b/usr.sbin/fmtree/excludes.c
index 9f1c56405706..1cd2379cb978 100644
--- a/usr.sbin/fmtree/excludes.c
+++ b/usr.sbin/fmtree/excludes.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h> /* XXX for mtree.h */
#include <sys/queue.h>
diff --git a/usr.sbin/fmtree/misc.c b/usr.sbin/fmtree/misc.c
index 65667d601138..380f3237fca4 100644
--- a/usr.sbin/fmtree/misc.c
+++ b/usr.sbin/fmtree/misc.c
@@ -33,8 +33,6 @@ static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
#endif /*not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <err.h>
diff --git a/usr.sbin/fmtree/mtree.c b/usr.sbin/fmtree/mtree.c
index e90a5bbca1d3..f0d1e1b1d634 100644
--- a/usr.sbin/fmtree/mtree.c
+++ b/usr.sbin/fmtree/mtree.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)mtree.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>
#include <err.h>
diff --git a/usr.sbin/fmtree/spec.c b/usr.sbin/fmtree/spec.c
index 417932db4310..6a3e441e1ebe 100644
--- a/usr.sbin/fmtree/spec.c
+++ b/usr.sbin/fmtree/spec.c
@@ -33,8 +33,6 @@ static char sccsid[] = "@(#)spec.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
diff --git a/usr.sbin/fmtree/specspec.c b/usr.sbin/fmtree/specspec.c
index c26e195fdaa6..7c48e01d1065 100644
--- a/usr.sbin/fmtree/specspec.c
+++ b/usr.sbin/fmtree/specspec.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <grp.h>
#include <pwd.h>
diff --git a/usr.sbin/fmtree/verify.c b/usr.sbin/fmtree/verify.c
index 2f9ca3dae927..74f17faff8b7 100644
--- a/usr.sbin/fmtree/verify.c
+++ b/usr.sbin/fmtree/verify.c
@@ -33,8 +33,6 @@ static char sccsid[] = "@(#)verify.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>
#include <dirent.h>
diff --git a/usr.sbin/fstyp/apfs.c b/usr.sbin/fstyp/apfs.c
index 7f8543a5a108..aeb459a1c3af 100644
--- a/usr.sbin/fstyp/apfs.c
+++ b/usr.sbin/fstyp/apfs.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/fstyp/befs.c b/usr.sbin/fstyp/befs.c
index fd412c8fe498..6c204f7eb381 100644
--- a/usr.sbin/fstyp/befs.c
+++ b/usr.sbin/fstyp/befs.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/fstyp/cd9660.c b/usr.sbin/fstyp/cd9660.c
index 658af338d4dd..e981a5978dd4 100644
--- a/usr.sbin/fstyp/cd9660.c
+++ b/usr.sbin/fstyp/cd9660.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/fstyp/exfat.c b/usr.sbin/fstyp/exfat.c
index 80cef5cbf822..83138fc26b98 100644
--- a/usr.sbin/fstyp/exfat.c
+++ b/usr.sbin/fstyp/exfat.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/usr.sbin/fstyp/ext2fs.c b/usr.sbin/fstyp/ext2fs.c
index 79a4e3ad4172..d7110f6896ce 100644
--- a/usr.sbin/fstyp/ext2fs.c
+++ b/usr.sbin/fstyp/ext2fs.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/usr.sbin/fstyp/fstyp.c b/usr.sbin/fstyp/fstyp.c
index 91c36d9d9191..d62f9af7ce18 100644
--- a/usr.sbin/fstyp/fstyp.c
+++ b/usr.sbin/fstyp/fstyp.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/capsicum.h>
#include <sys/disk.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/fstyp/geli.c b/usr.sbin/fstyp/geli.c
index 59e8653bf195..17d1faf8407f 100644
--- a/usr.sbin/fstyp/geli.c
+++ b/usr.sbin/fstyp/geli.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/disk.h>
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/fstyp/hammer.c b/usr.sbin/fstyp/hammer.c
index 777f5d312371..45aee42fb53a 100644
--- a/usr.sbin/fstyp/hammer.c
+++ b/usr.sbin/fstyp/hammer.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/fstyp/hammer2.c b/usr.sbin/fstyp/hammer2.c
index dfd026649fdb..e0c036c7442a 100644
--- a/usr.sbin/fstyp/hammer2.c
+++ b/usr.sbin/fstyp/hammer2.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
diff --git a/usr.sbin/fstyp/hfsplus.c b/usr.sbin/fstyp/hfsplus.c
index 3a94faf7766f..bdeaaa3b397c 100644
--- a/usr.sbin/fstyp/hfsplus.c
+++ b/usr.sbin/fstyp/hfsplus.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/fstyp/msdosfs.c b/usr.sbin/fstyp/msdosfs.c
index 2e74f769ca97..af0459d32e44 100644
--- a/usr.sbin/fstyp/msdosfs.c
+++ b/usr.sbin/fstyp/msdosfs.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/fstyp/ntfs.c b/usr.sbin/fstyp/ntfs.c
index c286d950dc2b..a3457c285edc 100644
--- a/usr.sbin/fstyp/ntfs.c
+++ b/usr.sbin/fstyp/ntfs.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#ifdef WITH_ICONV
#include <iconv.h>
diff --git a/usr.sbin/fstyp/ufs.c b/usr.sbin/fstyp/ufs.c
index e4de1283e769..6863b58ec016 100644
--- a/usr.sbin/fstyp/ufs.c
+++ b/usr.sbin/fstyp/ufs.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
diff --git a/usr.sbin/fstyp/zfs.c b/usr.sbin/fstyp/zfs.c
index 96ff0485d71e..93e2816d2550 100644
--- a/usr.sbin/fstyp/zfs.c
+++ b/usr.sbin/fstyp/zfs.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <stdint.h>
diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c
index 4554ab9a8fbb..94478259606d 100644
--- a/usr.sbin/fwcontrol/fwcontrol.c
+++ b/usr.sbin/fwcontrol/fwcontrol.c
@@ -36,7 +36,6 @@
#if defined(__FreeBSD__)
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#endif
#include <sys/param.h>
diff --git a/usr.sbin/gpioctl/gpioctl.c b/usr.sbin/gpioctl/gpioctl.c
index 2b351d2ad56f..86cbabb24f5c 100644
--- a/usr.sbin/gpioctl/gpioctl.c
+++ b/usr.sbin/gpioctl/gpioctl.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <fcntl.h>
#include <getopt.h>
#include <paths.h>
diff --git a/usr.sbin/gssd/gssd.c b/usr.sbin/gssd/gssd.c
index 2bc839b7a2ea..59e0fc057f84 100644
--- a/usr.sbin/gssd/gssd.c
+++ b/usr.sbin/gssd/gssd.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/linker.h>
diff --git a/usr.sbin/i2c/i2c.c b/usr.sbin/i2c/i2c.c
index 743740df9d39..9e946e941bab 100644
--- a/usr.sbin/i2c/i2c.c
+++ b/usr.sbin/i2c/i2c.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <sysexits.h>
diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index 81befd3d6af1..7e82ec0d72e0 100644
--- a/usr.sbin/ifmcstat/ifmcstat.c
+++ b/usr.sbin/ifmcstat/ifmcstat.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/ifmcstat/printb.c b/usr.sbin/ifmcstat/printb.c
index 9481a0dc1bff..6054be88a2be 100644
--- a/usr.sbin/ifmcstat/printb.c
+++ b/usr.sbin/ifmcstat/printb.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdio.h>
diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c
index b9e0f9899d34..aed304ae99c2 100644
--- a/usr.sbin/inetd/builtins.c
+++ b/usr.sbin/inetd/builtins.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/filio.h>
#include <sys/ioccom.h>
#include <sys/param.h>
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 848714bd395a..700821588423 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1983, 1991, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n");
diff --git a/usr.sbin/iovctl/iovctl.c b/usr.sbin/iovctl/iovctl.c
index 0350c732f671..413fb7b2f4a5 100644
--- a/usr.sbin/iovctl/iovctl.c
+++ b/usr.sbin/iovctl/iovctl.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/iov.h>
#include <sys/dnv.h>
diff --git a/usr.sbin/iovctl/parse.c b/usr.sbin/iovctl/parse.c
index 347b35fb417a..a5810ba077eb 100644
--- a/usr.sbin/iovctl/parse.c
+++ b/usr.sbin/iovctl/parse.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/iov.h>
#include <sys/nv.h>
diff --git a/usr.sbin/iovctl/validate.c b/usr.sbin/iovctl/validate.c
index 6658a8c0c281..005a371fe353 100644
--- a/usr.sbin/iovctl/validate.c
+++ b/usr.sbin/iovctl/validate.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/iov.h>
#include <sys/dnv.h>
diff --git a/usr.sbin/iscsid/discovery.c b/usr.sbin/iscsid/discovery.c
index 590490542b62..f6072db36804 100644
--- a/usr.sbin/iscsid/discovery.c
+++ b/usr.sbin/iscsid/discovery.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <stdbool.h>
diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c
index 72770b675731..7ba42bc9b8c6 100644
--- a/usr.sbin/iscsid/iscsid.c
+++ b/usr.sbin/iscsid/iscsid.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/iscsid/login.c b/usr.sbin/iscsid/login.c
index dc69f00fbaa7..1c53c5733fde 100644
--- a/usr.sbin/iscsid/login.c
+++ b/usr.sbin/iscsid/login.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <assert.h>
diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c
index eee06b3f74a3..9eabcc5ff53c 100644
--- a/usr.sbin/jail/command.c
+++ b/usr.sbin/jail/command.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c
index cbf5859b1329..28e61ffa7bf1 100644
--- a/usr.sbin/jail/config.c
+++ b/usr.sbin/jail/config.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/socket.h>
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index 02eb957a2d45..3b700d1e420b 100644
--- a/usr.sbin/jail/jail.c
+++ b/usr.sbin/jail/jail.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
diff --git a/usr.sbin/jail/jaillex.l b/usr.sbin/jail/jaillex.l
index 1dcf5bef5358..71a9fa09a8f8 100644
--- a/usr.sbin/jail/jaillex.l
+++ b/usr.sbin/jail/jaillex.l
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stddef.h>
#include <stdlib.h>
diff --git a/usr.sbin/jail/jailparse.y b/usr.sbin/jail/jailparse.y
index 9426444f0d09..0dc4545142ba 100644
--- a/usr.sbin/jail/jailparse.y
+++ b/usr.sbin/jail/jailparse.y
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/jail/state.c b/usr.sbin/jail/state.c
index 5b0c62842061..6cbe879acc55 100644
--- a/usr.sbin/jail/state.c
+++ b/usr.sbin/jail/state.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/uio.h>
#include <err.h>
diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c
index 8773df3cef1c..9f20e55a416f 100644
--- a/usr.sbin/jls/jls.c
+++ b/usr.sbin/jls/jls.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/socket.h>
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index 4f3be144132b..b08705481a5d 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c
index 5b2b9dbffab1..2752640b239b 100644
--- a/usr.sbin/kbdmap/kbdmap.c
+++ b/usr.sbin/kbdmap/kbdmap.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index 17f59cdd9ee2..11a747ce156b 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)kgmon.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/time.h>
diff --git a/usr.sbin/kldxref/ef_riscv.c b/usr.sbin/kldxref/ef_riscv.c
index b94b37b3a92f..aeb45d2b7eb4 100644
--- a/usr.sbin/kldxref/ef_riscv.c
+++ b/usr.sbin/kldxref/ef_riscv.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <machine/elf.h>
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.c b/usr.sbin/lpr/chkprintcap/chkprintcap.c
index fab2239adbd2..5e9179b03f21 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.c
@@ -31,8 +31,6 @@ static const char copyright[] =
"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.sbin/lpr/chkprintcap/skimprintcap.c b/usr.sbin/lpr/chkprintcap/skimprintcap.c
index a6bfbbb11c86..f6e74bc6df03 100644
--- a/usr.sbin/lpr/chkprintcap/skimprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/skimprintcap.c
@@ -34,8 +34,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index b20855515adb..44c3566b89ac 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.sbin/lpr/common_source/ctlinfo.c b/usr.sbin/lpr/common_source/ctlinfo.c
index 3d529b2c2a1f..5f5351b613c2 100644
--- a/usr.sbin/lpr/common_source/ctlinfo.c
+++ b/usr.sbin/lpr/common_source/ctlinfo.c
@@ -34,8 +34,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* ctlinfo - This collection of routines will know everything there is to
* know about the information inside a control file ('cf*') which is used
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index f21852cdc5b4..22fc41ca6d34 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/matchjobs.c b/usr.sbin/lpr/common_source/matchjobs.c
index 5dd860becef2..47309cf25702 100644
--- a/usr.sbin/lpr/common_source/matchjobs.c
+++ b/usr.sbin/lpr/common_source/matchjobs.c
@@ -35,8 +35,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* movejobs.c - The lpc commands which move jobs around.
*/
diff --git a/usr.sbin/lpr/common_source/net.c b/usr.sbin/lpr/common_source/net.c
index 3954b2286dc6..93fe1f232433 100644
--- a/usr.sbin/lpr/common_source/net.c
+++ b/usr.sbin/lpr/common_source/net.c
@@ -41,8 +41,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c
index 96b3e9dfdbac..070c08d04263 100644
--- a/usr.sbin/lpr/common_source/printcap.c
+++ b/usr.sbin/lpr/common_source/printcap.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)printcap.c 8.2 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/lpr/common_source/request.c b/usr.sbin/lpr/common_source/request.c
index 0c68fe92674a..e0a41a1161e0 100644
--- a/usr.sbin/lpr/common_source/request.c
+++ b/usr.sbin/lpr/common_source/request.c
@@ -31,8 +31,6 @@ static const char copyright[] =
"Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c
index f3502000ee08..3b4d37f01c41 100644
--- a/usr.sbin/lpr/common_source/rmjob.c
+++ b/usr.sbin/lpr/common_source/rmjob.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)rmjob.c 8.2 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/uio.h>
diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c
index 112846ebc0c9..d1c08806a420 100644
--- a/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr.sbin/lpr/common_source/startdaemon.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)startdaemon.c 8.2 (Berkeley) 4/17/94";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/uio.h>
diff --git a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
index 4e6de53d9632..595ea375a266 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
+++ b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
@@ -28,8 +28,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* KOI8-R -> CP855 conversion filter (Russian character sets)
*/
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
index dc6e38a06510..25cf23e3a513 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
+++ b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
@@ -27,8 +27,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* KOI8-R -> CP866 conversion filter (Russian character sets)
*/
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 2f2f88f02089..a7c8c3748ce4 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)lpf.c 8.1 (Berkeley) 6/6/93";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* filter which reads the output of nroff and converts lines
* with ^H's to overwritten lines. Thus this works like 'ul'
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 0fb2e676f6a7..9359a52296d4 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* lpc -- line printer control program -- commands:
*/
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index 8e8b2b634991..e4d9a5e6787f 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include "lpc.h"
#include "extern.h"
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index 3155a7cc7714..a79e09bf9743 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)lpc.c 8.3 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <ctype.h>
diff --git a/usr.sbin/lpr/lpc/movejobs.c b/usr.sbin/lpr/lpc/movejobs.c
index 1f5420c03114..35fdcaec3b0c 100644
--- a/usr.sbin/lpr/lpc/movejobs.c
+++ b/usr.sbin/lpr/lpc/movejobs.c
@@ -35,8 +35,6 @@
*/
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* movejobs.c - The lpc commands which move jobs around.
*/
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index f2f8994d1fee..21e8997bd87d 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)lpd.c 8.7 (Berkeley) 5/10/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* lpd -- line printer daemon.
*
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index acdb3a4f7411..b86d9d34ad4e 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)lpdchar.c 8.1 (Berkeley) 6/6/93";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* Character set for line printer daemon
*/
diff --git a/usr.sbin/lpr/lpd/modes.c b/usr.sbin/lpr/lpd/modes.c
index 653a2cefce7e..03c794a4defd 100644
--- a/usr.sbin/lpr/lpd/modes.c
+++ b/usr.sbin/lpr/lpd/modes.c
@@ -36,8 +36,6 @@ static char sccsid[] = "@(#)modes.c 8.3 (Berkeley) 4/2/94";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <stddef.h>
#include <string.h>
#include <termios.h>
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index ff16f8f298c1..79bc36aef13d 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* printjob -- print jobs in the queue.
*
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index 890ede4bcbf8..cf5cd4e15354 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)recvjob.c 8.2 (Berkeley) 4/27/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* Receive printer jobs from the network, queue them and
* start the printer daemon.
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index 7a492950253f..51a81fc83966 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)lpq.c 8.3 (Berkeley) 5/10/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* Spool Queue examination program
*
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 72ba2b3929f1..07a6e17e367e 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -52,8 +52,6 @@ static char sccsid[] = "@(#)lpr.c 8.4 (Berkeley) 4/28/95";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* lpr -- off line print
*
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index 17aac1adc798..23916fb533da 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)lprm.c 8.1 (Berkeley) 6/6/93";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* lprm - remove the current user's spool entry
*
diff --git a/usr.sbin/lpr/lptest/lptest.c b/usr.sbin/lpr/lptest/lptest.c
index f064e3333628..32d0c6ba4191 100644
--- a/usr.sbin/lpr/lptest/lptest.c
+++ b/usr.sbin/lpr/lptest/lptest.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)lptest.c 8.1 (Berkeley) 6/6/93";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <stdio.h>
#include <err.h>
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index 7713096da641..85c9327f433f 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)pac.c 8.1 (Berkeley) 6/6/93";
#endif
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
-__FBSDID("$FreeBSD$");
-
/*
* Do Printer accounting summary.
* Currently, usage is
diff --git a/usr.sbin/lptcontrol/lptcontrol.c b/usr.sbin/lptcontrol/lptcontrol.c
index 834f62456b54..9381722a6d0c 100644
--- a/usr.sbin/lptcontrol/lptcontrol.c
+++ b/usr.sbin/lptcontrol/lptcontrol.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <dev/ppbus/lptio.h>
#include <err.h>
diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c
index ef9c3b4d55c2..af732674a527 100644
--- a/usr.sbin/mailwrapper/mailwrapper.c
+++ b/usr.sbin/mailwrapper/mailwrapper.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
index 7d3088025562..cc56421a873c 100644
--- a/usr.sbin/makefs/cd9660.c
+++ b/usr.sbin/makefs/cd9660.c
@@ -98,8 +98,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <ctype.h>
diff --git a/usr.sbin/makefs/cd9660/cd9660_archimedes.c b/usr.sbin/makefs/cd9660/cd9660_archimedes.c
index cf53e0123d24..93560da40d54 100644
--- a/usr.sbin/makefs/cd9660/cd9660_archimedes.c
+++ b/usr.sbin/makefs/cd9660/cd9660_archimedes.c
@@ -40,8 +40,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/usr.sbin/makefs/cd9660/cd9660_conversion.c b/usr.sbin/makefs/cd9660/cd9660_conversion.c
index e21becbab44c..4ccc87e22661 100644
--- a/usr.sbin/makefs/cd9660/cd9660_conversion.c
+++ b/usr.sbin/makefs/cd9660/cd9660_conversion.c
@@ -36,8 +36,6 @@
#include "cd9660.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
static char cd9660_compute_gm_offset(time_t);
#if 0
diff --git a/usr.sbin/makefs/cd9660/cd9660_debug.c b/usr.sbin/makefs/cd9660/cd9660_debug.c
index 9fe85d4e5aae..da9d73203cb4 100644
--- a/usr.sbin/makefs/cd9660/cd9660_debug.c
+++ b/usr.sbin/makefs/cd9660/cd9660_debug.c
@@ -35,7 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
index e84ea53507bc..dd5bf67b2b09 100644
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
@@ -39,8 +39,6 @@
#include <util.h>
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Partition Status Information from Apple Tech Note 1189
*/
diff --git a/usr.sbin/makefs/cd9660/cd9660_strings.c b/usr.sbin/makefs/cd9660/cd9660_strings.c
index 6c60ea92fac8..c1890e23d8c2 100644
--- a/usr.sbin/makefs/cd9660/cd9660_strings.c
+++ b/usr.sbin/makefs/cd9660/cd9660_strings.c
@@ -37,7 +37,6 @@
#include <sys/mount.h>
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <ctype.h>
diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c
index 7e3910ceb83b..828af11669c1 100644
--- a/usr.sbin/makefs/cd9660/cd9660_write.c
+++ b/usr.sbin/makefs/cd9660/cd9660_write.c
@@ -38,8 +38,6 @@
#include "iso9660_rrip.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <util.h>
static int cd9660_write_volume_descriptors(iso9660_disk *, FILE *);
diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c
index 3b5ee2c51c44..a4ce5c09b24b 100644
--- a/usr.sbin/makefs/cd9660/iso9660_rrip.c
+++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 1eafa2bd00ef..7504d6653180 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -68,8 +68,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c
index 6caa3fd4fbc6..80ff6b504f25 100644
--- a/usr.sbin/makefs/ffs/buf.c
+++ b/usr.sbin/makefs/ffs/buf.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c
index 69cba0454b5f..5cab40854f63 100644
--- a/usr.sbin/makefs/ffs/ffs_alloc.c
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c
@@ -44,8 +44,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/makefs/ffs/ffs_balloc.c b/usr.sbin/makefs/ffs/ffs_balloc.c
index d56ed061457b..cff5df0341b5 100644
--- a/usr.sbin/makefs/ffs/ffs_balloc.c
+++ b/usr.sbin/makefs/ffs/ffs_balloc.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/makefs/ffs/ffs_bswap.c b/usr.sbin/makefs/ffs/ffs_bswap.c
index 1f28a3cccd99..ebbd17441807 100644
--- a/usr.sbin/makefs/ffs/ffs_bswap.c
+++ b/usr.sbin/makefs/ffs/ffs_bswap.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#if defined(_KERNEL)
#include <sys/systm.h>
diff --git a/usr.sbin/makefs/ffs/ffs_subr.c b/usr.sbin/makefs/ffs/ffs_subr.c
index 53e5b97ada48..63dd9d9f280f 100644
--- a/usr.sbin/makefs/ffs/ffs_subr.c
+++ b/usr.sbin/makefs/ffs/ffs_subr.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c
index 4e88dae7aae8..b579565b6a01 100644
--- a/usr.sbin/makefs/ffs/mkfs.c
+++ b/usr.sbin/makefs/ffs/mkfs.c
@@ -41,8 +41,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.sbin/makefs/ffs/ufs_bmap.c b/usr.sbin/makefs/ffs/ufs_bmap.c
index 196693587da0..e095f1ab7a07 100644
--- a/usr.sbin/makefs/ffs/ufs_bmap.c
+++ b/usr.sbin/makefs/ffs/ufs_bmap.c
@@ -40,8 +40,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index 7f23b8a6a5f1..f48953c3764e 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
#include <assert.h>
diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c
index a0e0f7174f25..07238a9aed63 100644
--- a/usr.sbin/makefs/msdos.c
+++ b/usr.sbin/makefs/msdos.c
@@ -34,7 +34,6 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__FBSDID("$FreeBSD$");
#endif /* !__lint */
#include <sys/param.h>
diff --git a/usr.sbin/makefs/msdos/msdosfs_conv.c b/usr.sbin/makefs/msdos/msdosfs_conv.c
index b53656d3b439..4dcb1170bbb3 100644
--- a/usr.sbin/makefs/msdos/msdosfs_conv.c
+++ b/usr.sbin/makefs/msdos/msdosfs_conv.c
@@ -48,8 +48,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
diff --git a/usr.sbin/makefs/msdos/msdosfs_denode.c b/usr.sbin/makefs/msdos/msdosfs_denode.c
index 2c8a443caacf..ab7ed9baa3db 100644
--- a/usr.sbin/makefs/msdos/msdosfs_denode.c
+++ b/usr.sbin/makefs/msdos/msdosfs_denode.c
@@ -50,8 +50,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/usr.sbin/makefs/msdos/msdosfs_vfsops.c b/usr.sbin/makefs/msdos/msdosfs_vfsops.c
index 4a5c658b7949..a142c143a05c 100644
--- a/usr.sbin/makefs/msdos/msdosfs_vfsops.c
+++ b/usr.sbin/makefs/msdos/msdosfs_vfsops.c
@@ -49,8 +49,6 @@
#include <sys/cdefs.h>
/* $NetBSD: msdosfs_vfsops.c,v 1.10 2016/01/30 09:59:27 mlelstv Exp $ */
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c
index ff470576ee79..267b667e6b1b 100644
--- a/usr.sbin/makefs/msdos/msdosfs_vnops.c
+++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c
@@ -50,8 +50,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/mman.h>
diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c
index d3279f48c6ba..688ce81e733d 100644
--- a/usr.sbin/makefs/mtree.c
+++ b/usr.sbin/makefs/mtree.c
@@ -30,8 +30,6 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/sbuf.h>
diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c
index 79b68d1d3e19..56e2d19c6f00 100644
--- a/usr.sbin/makefs/walk.c
+++ b/usr.sbin/makefs/walk.c
@@ -39,8 +39,6 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c
index 23193f22324b..2e614793a6b3 100644
--- a/usr.sbin/mixer/mixer.c
+++ b/usr.sbin/mixer/mixer.c
@@ -12,8 +12,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <fcntl.h>
#include <libgen.h>
diff --git a/usr.sbin/mld6query/mld6.c b/usr.sbin/mld6query/mld6.c
index 2506308702d4..cb2e3a2673a0 100644
--- a/usr.sbin/mld6query/mld6.c
+++ b/usr.sbin/mld6query/mld6.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/uio.h>
#include <sys/socket.h>
diff --git a/usr.sbin/mlx5tool/mlx5tool.c b/usr.sbin/mlx5tool/mlx5tool.c
index 4d2cbe51cffa..cc13d008fcd1 100644
--- a/usr.sbin/mlx5tool/mlx5tool.c
+++ b/usr.sbin/mlx5tool/mlx5tool.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index d985dd00acf8..34c3387c6236 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 08aa16f6103b..4ad5e6108e5d 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -47,8 +47,6 @@
**/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/consio.h>
#include <sys/mouse.h>
diff --git a/usr.sbin/mtest/mtest.c b/usr.sbin/mtest/mtest.c
index 0b315b778b7b..d0ed511c21fa 100644
--- a/usr.sbin/mtest/mtest.c
+++ b/usr.sbin/mtest/mtest.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/usr.sbin/ndiscvt/inf-parse.y b/usr.sbin/ndiscvt/inf-parse.y
index 740aba5e87d1..653ee868d2b8 100644
--- a/usr.sbin/ndiscvt/inf-parse.y
+++ b/usr.sbin/ndiscvt/inf-parse.y
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.sbin/ndiscvt/inf-token.l b/usr.sbin/ndiscvt/inf-token.l
index 2aac5b477067..141b0101ac64 100644
--- a/usr.sbin/ndiscvt/inf-token.l
+++ b/usr.sbin/ndiscvt/inf-token.l
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <regex.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.sbin/ndiscvt/inf.c b/usr.sbin/ndiscvt/inf.c
index 442e7f61b1fd..9977ab26a0f6 100644
--- a/usr.sbin/ndiscvt/inf.c
+++ b/usr.sbin/ndiscvt/inf.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
index 1c1a5d267b1d..23ce4f486b56 100644
--- a/usr.sbin/ndiscvt/ndiscvt.c
+++ b/usr.sbin/ndiscvt/ndiscvt.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ndiscvt/windrv_stub.c b/usr.sbin/ndiscvt/windrv_stub.c
index 8aaa23835cba..5f2686a66abb 100644
--- a/usr.sbin/ndiscvt/windrv_stub.c
+++ b/usr.sbin/ndiscvt/windrv_stub.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c
index 8f8bb54e9b46..115192058c82 100644
--- a/usr.sbin/newsyslog/newsyslog.c
+++ b/usr.sbin/newsyslog/newsyslog.c
@@ -54,8 +54,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define OSF
#include <sys/param.h>
diff --git a/usr.sbin/newsyslog/ptimes.c b/usr.sbin/newsyslog/ptimes.c
index b7b993f01959..06bdffdda084 100644
--- a/usr.sbin/newsyslog/ptimes.c
+++ b/usr.sbin/newsyslog/ptimes.c
@@ -41,8 +41,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.sbin/nfscbd/nfscbd.c b/usr.sbin/nfscbd/nfscbd.c
index 3731575b4822..9d8efaecee57 100644
--- a/usr.sbin/nfscbd/nfscbd.c
+++ b/usr.sbin/nfscbd/nfscbd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/linker.h>
diff --git a/usr.sbin/nfsdumpstate/nfsdumpstate.c b/usr.sbin/nfsdumpstate/nfsdumpstate.c
index c7e086655f79..123016dc5abf 100644
--- a/usr.sbin/nfsdumpstate/nfsdumpstate.c
+++ b/usr.sbin/nfsdumpstate/nfsdumpstate.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/usr.sbin/nfsrevoke/nfsrevoke.c b/usr.sbin/nfsrevoke/nfsrevoke.c
index 85eb48bfa8fb..cc6f6566981d 100644
--- a/usr.sbin/nfsrevoke/nfsrevoke.c
+++ b/usr.sbin/nfsrevoke/nfsrevoke.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/usr.sbin/nfsuserd/nfsuserd.c b/usr.sbin/nfsuserd/nfsuserd.c
index 3444b16fea78..fca9deb0eeab 100644
--- a/usr.sbin/nfsuserd/nfsuserd.c
+++ b/usr.sbin/nfsuserd/nfsuserd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/linker.h>
diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c
index 4b1cdabdb8e9..b9e88681d593 100644
--- a/usr.sbin/ngctl/main.c
+++ b/usr.sbin/ngctl/main.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/select.h>
diff --git a/usr.sbin/ngctl/msg.c b/usr.sbin/ngctl/msg.c
index 38f0db704927..2cc733408380 100644
--- a/usr.sbin/ngctl/msg.c
+++ b/usr.sbin/ngctl/msg.c
@@ -38,8 +38,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <netgraph.h>
#include <stdio.h>
diff --git a/usr.sbin/nghook/main.c b/usr.sbin/nghook/main.c
index 700ca5e1a59d..cee8bf481df4 100644
--- a/usr.sbin/nghook/main.c
+++ b/usr.sbin/nghook/main.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/nologin/nologin.c b/usr.sbin/nologin/nologin.c
index 658637ef2ae8..9535ed64390e 100644
--- a/usr.sbin/nologin/nologin.c
+++ b/usr.sbin/nologin/nologin.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <syslog.h>
#include <unistd.h>
diff --git a/usr.sbin/nscd/agent.c b/usr.sbin/nscd/agent.c
index 55b1565a1195..f44cc1071bd5 100644
--- a/usr.sbin/nscd/agent.c
+++ b/usr.sbin/nscd/agent.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/nscd/agents/group.c b/usr.sbin/nscd/agents/group.c
index 92be7ed0ae48..b91b77fe5df8 100644
--- a/usr.sbin/nscd/agents/group.c
+++ b/usr.sbin/nscd/agents/group.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/agents/passwd.c b/usr.sbin/nscd/agents/passwd.c
index 247444f5c4ba..79b69e87db06 100644
--- a/usr.sbin/nscd/agents/passwd.c
+++ b/usr.sbin/nscd/agents/passwd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/agents/services.c b/usr.sbin/nscd/agents/services.c
index 7b02e50cebd8..c234af2950d9 100644
--- a/usr.sbin/nscd/agents/services.c
+++ b/usr.sbin/nscd/agents/services.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/cachelib.c b/usr.sbin/nscd/cachelib.c
index ff3e8cb730aa..3a2d58300f31 100644
--- a/usr.sbin/nscd/cachelib.c
+++ b/usr.sbin/nscd/cachelib.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/cacheplcs.c b/usr.sbin/nscd/cacheplcs.c
index 37cf765459a0..fb528e79119c 100644
--- a/usr.sbin/nscd/cacheplcs.c
+++ b/usr.sbin/nscd/cacheplcs.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/config.c b/usr.sbin/nscd/config.c
index 74a5cddc1436..f8d33625b520 100644
--- a/usr.sbin/nscd/config.c
+++ b/usr.sbin/nscd/config.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.sbin/nscd/debug.c b/usr.sbin/nscd/debug.c
index 2d2ea5b2ca44..6485cb19f221 100644
--- a/usr.sbin/nscd/debug.c
+++ b/usr.sbin/nscd/debug.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include "debug.h"
diff --git a/usr.sbin/nscd/log.c b/usr.sbin/nscd/log.c
index 5f4c578f1130..d76b2b380b35 100644
--- a/usr.sbin/nscd/log.c
+++ b/usr.sbin/nscd/log.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
diff --git a/usr.sbin/nscd/mp_rs_query.c b/usr.sbin/nscd/mp_rs_query.c
index 4bec5174a635..2c09d6151b8b 100644
--- a/usr.sbin/nscd/mp_rs_query.c
+++ b/usr.sbin/nscd/mp_rs_query.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/event.h>
#include <sys/socket.h>
diff --git a/usr.sbin/nscd/mp_ws_query.c b/usr.sbin/nscd/mp_ws_query.c
index 5e29748529ed..0e4bf657b47c 100644
--- a/usr.sbin/nscd/mp_ws_query.c
+++ b/usr.sbin/nscd/mp_ws_query.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/event.h>
#include <sys/socket.h>
diff --git a/usr.sbin/nscd/nscd.c b/usr.sbin/nscd/nscd.c
index 3c3ebda565f6..d8e1223647a3 100644
--- a/usr.sbin/nscd/nscd.c
+++ b/usr.sbin/nscd/nscd.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/event.h>
#include <sys/socket.h>
diff --git a/usr.sbin/nscd/nscdcli.c b/usr.sbin/nscd/nscdcli.c
index 326acfae7dea..2cf82a8aaf50 100644
--- a/usr.sbin/nscd/nscdcli.c
+++ b/usr.sbin/nscd/nscdcli.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/event.h>
diff --git a/usr.sbin/nscd/parser.c b/usr.sbin/nscd/parser.c
index 1c1523a031a3..6427f179707b 100644
--- a/usr.sbin/nscd/parser.c
+++ b/usr.sbin/nscd/parser.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <assert.h>
diff --git a/usr.sbin/nscd/protocol.c b/usr.sbin/nscd/protocol.c
index 3e40739600a6..528fec1c7554 100644
--- a/usr.sbin/nscd/protocol.c
+++ b/usr.sbin/nscd/protocol.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/nscd/query.c b/usr.sbin/nscd/query.c
index a7737c0ea9aa..652be2357003 100644
--- a/usr.sbin/nscd/query.c
+++ b/usr.sbin/nscd/query.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/event.h>
#include <sys/socket.h>
diff --git a/usr.sbin/nscd/singletons.c b/usr.sbin/nscd/singletons.c
index e557c20cfc1c..a6c3d1337b33 100644
--- a/usr.sbin/nscd/singletons.c
+++ b/usr.sbin/nscd/singletons.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include "singletons.h"
diff --git a/usr.sbin/ofwdump/ofw_util.c b/usr.sbin/ofwdump/ofw_util.c
index 71361d452511..2f90eb1652c0 100644
--- a/usr.sbin/ofwdump/ofw_util.c
+++ b/usr.sbin/ofwdump/ofw_util.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/ofwdump/ofwdump.c b/usr.sbin/ofwdump/ofwdump.c
index 6bca1ac839ab..f2bcad8b7c1f 100644
--- a/usr.sbin/ofwdump/ofwdump.c
+++ b/usr.sbin/ofwdump/ofwdump.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <dev/ofw/openfirm.h>
#include <dev/ofw/openfirmio.h>
diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c
index b7b3018e0ae6..a2b005eca835 100644
--- a/usr.sbin/pkg/config.c
+++ b/usr.sbin/pkg/config.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/utsname.h>
diff --git a/usr.sbin/pkg/dns_utils.c b/usr.sbin/pkg/dns_utils.c
index b656d1db011a..dcf4b5599532 100644
--- a/usr.sbin/pkg/dns_utils.c
+++ b/usr.sbin/pkg/dns_utils.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <string.h>
#include <netinet/in.h>
diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c
index a287e867dd3b..519445e97484 100644
--- a/usr.sbin/pkg/pkg.c
+++ b/usr.sbin/pkg/pkg.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/types.h>
diff --git a/usr.sbin/pmc/cmd_pmc_filter.cc b/usr.sbin/pmc/cmd_pmc_filter.cc
index ecde5f053bdc..a93e97e093cd 100644
--- a/usr.sbin/pmc/cmd_pmc_filter.cc
+++ b/usr.sbin/pmc/cmd_pmc_filter.cc
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmc/cmd_pmc_list.c b/usr.sbin/pmc/cmd_pmc_list.c
index 46886c8f1fe2..9701abd66796 100644
--- a/usr.sbin/pmc/cmd_pmc_list.c
+++ b/usr.sbin/pmc/cmd_pmc_list.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmc/cmd_pmc_stat.c b/usr.sbin/pmc/cmd_pmc_stat.c
index 029807618117..659b36137724 100644
--- a/usr.sbin/pmc/cmd_pmc_stat.c
+++ b/usr.sbin/pmc/cmd_pmc_stat.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmc/cmd_pmc_summary.cc b/usr.sbin/pmc/cmd_pmc_summary.cc
index 771a09555794..9f7e36c694b7 100644
--- a/usr.sbin/pmc/cmd_pmc_summary.cc
+++ b/usr.sbin/pmc/cmd_pmc_summary.cc
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmc/pmc_util.c b/usr.sbin/pmc/pmc_util.c
index 7ca4b28ad4b7..03e9a7554fbe 100644
--- a/usr.sbin/pmc/pmc_util.c
+++ b/usr.sbin/pmc/pmc_util.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmcannotate/pmcannotate.c b/usr.sbin/pmcannotate/pmcannotate.c
index b9af29e28b8a..32138aa6c3a7 100644
--- a/usr.sbin/pmcannotate/pmcannotate.c
+++ b/usr.sbin/pmcannotate/pmcannotate.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.sbin/pmccontrol/pmccontrol.c b/usr.sbin/pmccontrol/pmccontrol.c
index d5afd0a472b3..2c3bde9a6bdc 100644
--- a/usr.sbin/pmccontrol/pmccontrol.c
+++ b/usr.sbin/pmccontrol/pmccontrol.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/cpuset.h>
diff --git a/usr.sbin/pmcstat/pmcpl_annotate.c b/usr.sbin/pmcstat/pmcpl_annotate.c
index 3a4076318aa6..fbc6c90f75a9 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate.c
+++ b/usr.sbin/pmcstat/pmcpl_annotate.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/gmon.h>
diff --git a/usr.sbin/pmcstat/pmcpl_annotate_cg.c b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
index 7c3f2c435bf2..c7399cc5467e 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate_cg.c
+++ b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/gmon.h>
diff --git a/usr.sbin/pmcstat/pmcpl_callgraph.c b/usr.sbin/pmcstat/pmcpl_callgraph.c
index 2df3aa675f52..2ba6dfc0f8d5 100644
--- a/usr.sbin/pmcstat/pmcpl_callgraph.c
+++ b/usr.sbin/pmcstat/pmcpl_callgraph.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/gmon.h>
diff --git a/usr.sbin/pmcstat/pmcpl_calltree.c b/usr.sbin/pmcstat/pmcpl_calltree.c
index 26b6299731c7..434263ccee26 100644
--- a/usr.sbin/pmcstat/pmcpl_calltree.c
+++ b/usr.sbin/pmcstat/pmcpl_calltree.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/queue.h>
diff --git a/usr.sbin/pmcstat/pmcpl_gprof.c b/usr.sbin/pmcstat/pmcpl_gprof.c
index f9897d52c248..2c98c1c494a1 100644
--- a/usr.sbin/pmcstat/pmcpl_gprof.c
+++ b/usr.sbin/pmcstat/pmcpl_gprof.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/gmon.h>
diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c
index 4b2d55b9a114..4b4562ed2f10 100644
--- a/usr.sbin/pmcstat/pmcstat.c
+++ b/usr.sbin/pmcstat/pmcstat.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/event.h>
diff --git a/usr.sbin/pmcstat/pmcstat_log.c b/usr.sbin/pmcstat/pmcstat_log.c
index 3f764da964cd..62177e6fded3 100644
--- a/usr.sbin/pmcstat/pmcstat_log.c
+++ b/usr.sbin/pmcstat/pmcstat_log.c
@@ -36,8 +36,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/cpuset.h>
diff --git a/usr.sbin/pmcstudy/eval_expr.c b/usr.sbin/pmcstudy/eval_expr.c
index 984e5ea72176..32369f046177 100644
--- a/usr.sbin/pmcstudy/eval_expr.c
+++ b/usr.sbin/pmcstudy/eval_expr.c
@@ -32,8 +32,6 @@
#include <strings.h>
#include <ctype.h>
#include "eval_expr.h"
-__FBSDID("$FreeBSD$");
-
static struct expression *
alloc_and_hook_expr(struct expression **exp_p, struct expression **last_p)
{
diff --git a/usr.sbin/pmcstudy/eval_expr.h b/usr.sbin/pmcstudy/eval_expr.h
index 2c264ff711b2..de61e54b8c96 100644
--- a/usr.sbin/pmcstudy/eval_expr.h
+++ b/usr.sbin/pmcstudy/eval_expr.h
@@ -26,8 +26,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-__FBSDID("$FreeBSD$");
-
enum exptype {
TYPE_OP_PLUS,
TYPE_OP_MINUS,
diff --git a/usr.sbin/pmcstudy/pmcstudy.c b/usr.sbin/pmcstudy/pmcstudy.c
index 97b059bb70be..8871ff632b1a 100644
--- a/usr.sbin/pmcstudy/pmcstudy.c
+++ b/usr.sbin/pmcstudy/pmcstudy.c
@@ -35,8 +35,6 @@
#include <sys/wait.h>
#include <getopt.h>
#include "eval_expr.h"
-__FBSDID("$FreeBSD$");
-
static int max_pmc_counters = 1;
static int run_all = 0;
diff --git a/usr.sbin/pnfsdscopymr/pnfsdscopymr.c b/usr.sbin/pnfsdscopymr/pnfsdscopymr.c
index 33dcd302ef73..0fdb1a050039 100644
--- a/usr.sbin/pnfsdscopymr/pnfsdscopymr.c
+++ b/usr.sbin/pnfsdscopymr/pnfsdscopymr.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <getopt.h>
diff --git a/usr.sbin/pnfsdsfile/pnfsdsfile.c b/usr.sbin/pnfsdsfile/pnfsdsfile.c
index ca17586dd3bd..28a64689a2fd 100644
--- a/usr.sbin/pnfsdsfile/pnfsdsfile.c
+++ b/usr.sbin/pnfsdsfile/pnfsdsfile.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <getopt.h>
#include <netdb.h>
diff --git a/usr.sbin/pnfsdskill/pnfsdskill.c b/usr.sbin/pnfsdskill/pnfsdskill.c
index dcca4a17b626..b83ce17908bc 100644
--- a/usr.sbin/pnfsdskill/pnfsdskill.c
+++ b/usr.sbin/pnfsdskill/pnfsdskill.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <getopt.h>
#include <stdio.h>
diff --git a/usr.sbin/portsnap/make_index/make_index.c b/usr.sbin/portsnap/make_index/make_index.c
index 6e153d5698d2..642f802d48a3 100644
--- a/usr.sbin/portsnap/make_index/make_index.c
+++ b/usr.sbin/portsnap/make_index/make_index.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c
index 1dcc9ae38fe3..5e4c752519f2 100644
--- a/usr.sbin/powerd/powerd.c
+++ b/usr.sbin/powerd/powerd.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index f5e9dde06d7d..6a0cc9e8e971 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <string.h>
diff --git a/usr.sbin/pppctl/pppctl.c b/usr.sbin/pppctl/pppctl.c
index 59cbcd0c0ffc..0b2dfd5f4b3e 100644
--- a/usr.sbin/pppctl/pppctl.c
+++ b/usr.sbin/pppctl/pppctl.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c b/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
index 931d8e965d00..f33a6c6a10f9 100644
--- a/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
+++ b/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
@@ -24,8 +24,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/resource.h>
#include <sys/socket.h>
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index bcb3df20b8bd..4b31947f6c46 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -48,8 +48,6 @@ static char sccsid[] = "@(#)pstat.c 8.16 (Berkeley) 5/9/95";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/file.h>
diff --git a/usr.sbin/pw/pw_utils.c b/usr.sbin/pw/pw_utils.c
index fbf4a3f5f560..9be1656bcfe1 100644
--- a/usr.sbin/pw/pw_utils.c
+++ b/usr.sbin/pw/pw_utils.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/wait.h>
#include <err.h>
diff --git a/usr.sbin/pw/strtounum.c b/usr.sbin/pw/strtounum.c
index ae578bdeaeba..b138e7f130b7 100644
--- a/usr.sbin/pw/strtounum.c
+++ b/usr.sbin/pw/strtounum.c
@@ -25,8 +25,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <inttypes.h>
#include <limits.h>
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 261e7951a126..dd173a139e17 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -42,8 +42,6 @@ static char sccsid[] = "@(#)pwd_mkdb.c 8.5 (Berkeley) 4/20/94";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/stat.h>
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index fa1ee1c65fe7..e1f8b96acbc6 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stdint.h>
#include <sys/mount.h>
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index f5340c6b44c5..1ada947419d3 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)quotaon.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Turn quota on/off for a filesystem.
*/
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index 29781be817f9..14b45c1d8996 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -24,8 +24,6 @@ The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rarpd - Reverse ARP Daemon
*
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 23abcca93752..5f75a7d4cec1 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -44,8 +44,6 @@ static char sccsid[] = "@(#)repquota.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Quota report
*/
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index 308d41b14c64..e2d6f859e32e 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)rmt.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* rmt
*/
diff --git a/usr.sbin/rpc.lockd/kern.c b/usr.sbin/rpc.lockd/kern.c
index 08566a5b4658..96943a7ccfe2 100644
--- a/usr.sbin/rpc.lockd/kern.c
+++ b/usr.sbin/rpc.lockd/kern.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/queue.h>
diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c
index 1fc4ce23597a..e5ab68a3b8bb 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -37,8 +37,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#define LOCKD_DEBUG
#include <stdio.h>
diff --git a/usr.sbin/rpc.statd/procs.c b/usr.sbin/rpc.statd/procs.c
index 3f1b60bd3f22..70fb52e32452 100644
--- a/usr.sbin/rpc.statd/procs.c
+++ b/usr.sbin/rpc.statd/procs.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c
index a1cd8582e7a6..c71270181999 100644
--- a/usr.sbin/rpc.statd/statd.c
+++ b/usr.sbin/rpc.statd/statd.c
@@ -38,8 +38,6 @@
/* The actual program logic is in the file procs.c */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <stdio.h>
diff --git a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c
index f08333b317ea..685e943c76d8 100644
--- a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c
+++ b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.sbin/rpc.tlsservd/rpc.tlscommon.c b/usr.sbin/rpc.tlsservd/rpc.tlscommon.c
index 6aeeb3ff5dea..5bf7f86fba23 100644
--- a/usr.sbin/rpc.tlsservd/rpc.tlscommon.c
+++ b/usr.sbin/rpc.tlsservd/rpc.tlscommon.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/queue.h>
#include <sys/syslog.h>
#include <sys/select.h>
diff --git a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
index a14ee811fd32..7eada8446a82 100644
--- a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
+++ b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/linker.h>
diff --git a/usr.sbin/rpc.umntall/mounttab.c b/usr.sbin/rpc.umntall/mounttab.c
index 72032d96c1a9..0043d4302e59 100644
--- a/usr.sbin/rpc.umntall/mounttab.c
+++ b/usr.sbin/rpc.umntall/mounttab.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/syslog.h>
#include <rpc/rpc.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
index b48ba40aeeca..9a4779f9293a 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index 56c8defc3ba7..3e1350788424 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/fcntl.h>
#include <sys/socket.h>
diff --git a/usr.sbin/rpc.ypupdated/yp_dbdelete.c b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
index 7ef145867391..d07a8fcd2ff9 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbdelete.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
diff --git a/usr.sbin/rpc.ypupdated/yp_dbupdate.c b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
index d4cfc7ac0353..af17bf5244ef 100644
--- a/usr.sbin/rpc.ypupdated/yp_dbupdate.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/fcntl.h>
#include <stdint.h>
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_main.c b/usr.sbin/rpc.ypupdated/ypupdated_main.c
index 4d826afa4e63..dae956594da0 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "ypupdate_prot.h"
#include <stdio.h>
#include <stdlib.h> /* getenv, exit */
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_server.c b/usr.sbin/rpc.ypupdated/ypupdated_server.c
index 67fa05eceee5..47e52401cd6e 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_server.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_server.c
@@ -39,8 +39,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <rpc/rpc.h>
#include <rpc/key_prot.h>
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
index 412190c9ebe9..be24b8d7dff1 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "ypxfrd.h"
#include <err.h>
#include <fcntl.h>
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
index ca8a2a3c4fe4..f012fbaf50d3 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "ypxfrd.h"
#include <stdio.h>
diff --git a/usr.sbin/rtprio/rtprio.c b/usr.sbin/rtprio/rtprio.c
index 9ce74b5547ad..e662d1d41dcb 100644
--- a/usr.sbin/rtprio/rtprio.c
+++ b/usr.sbin/rtprio/rtprio.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/rtprio.h>
diff --git a/usr.sbin/rtsold/cap_llflags.c b/usr.sbin/rtsold/cap_llflags.c
index aea45d9fb8a0..bc07b2f1e3e4 100644
--- a/usr.sbin/rtsold/cap_llflags.c
+++ b/usr.sbin/rtsold/cap_llflags.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/dnv.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/rtsold/cap_script.c b/usr.sbin/rtsold/cap_script.c
index 971d0bae4172..ba27bd1987c6 100644
--- a/usr.sbin/rtsold/cap_script.c
+++ b/usr.sbin/rtsold/cap_script.c
@@ -29,8 +29,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/dnv.h>
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 23c307e33829..a120ce69aeb0 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)rwhod.c 8.1 (Berkeley) 6/6/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/sa/db.c b/usr.sbin/sa/db.c
index e717ee02c20a..f9af179b0db8 100644
--- a/usr.sbin/sa/db.c
+++ b/usr.sbin/sa/db.c
@@ -28,8 +28,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/acct.h>
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index b6c9708de74f..e19fc00aaa90 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -38,8 +38,6 @@ static const char copyright[] =
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* sa: system accounting
*/
diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c
index eb3f4a40c983..348c5494f95b 100644
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/acct.h>
#include <err.h>
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index 50a33e1a91ae..8161bca3f8db 100644
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/acct.h>
diff --git a/usr.sbin/services_mkdb/services_mkdb.c b/usr.sbin/services_mkdb/services_mkdb.c
index b77e74c819f4..9c2a79750029 100644
--- a/usr.sbin/services_mkdb/services_mkdb.c
+++ b/usr.sbin/services_mkdb/services_mkdb.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/services_mkdb/uniq.c b/usr.sbin/services_mkdb/uniq.c
index e95ecf145b12..e18d0e462c90 100644
--- a/usr.sbin/services_mkdb/uniq.c
+++ b/usr.sbin/services_mkdb/uniq.c
@@ -31,8 +31,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/usr.sbin/sesutil/sesutil.c b/usr.sbin/sesutil/sesutil.c
index 47aa85a60a2e..99f6b2de63b0 100644
--- a/usr.sbin/sesutil/sesutil.c
+++ b/usr.sbin/sesutil/sesutil.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/endian.h>
#include <sys/param.h>
#include <sys/disk.h>
diff --git a/usr.sbin/setfib/setfib.c b/usr.sbin/setfib/setfib.c
index 0783a07f4597..bc05dfa70ae3 100644
--- a/usr.sbin/setfib/setfib.c
+++ b/usr.sbin/setfib/setfib.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/spi/spi.c b/usr.sbin/spi/spi.c
index 0407f40a3521..d5344edd18c0 100644
--- a/usr.sbin/spi/spi.c
+++ b/usr.sbin/spi/spi.c
@@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/ioccom.h>
#include <sys/spigenio.h>
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 4600c807a7df..02f8aa39afe8 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -69,8 +69,6 @@ static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* syslogd -- log system messages
*
diff --git a/usr.sbin/tcpdrop/tcpdrop.c b/usr.sbin/tcpdrop/tcpdrop.c
index 135f1b52c403..b96d31346304 100644
--- a/usr.sbin/tcpdrop/tcpdrop.c
+++ b/usr.sbin/tcpdrop/tcpdrop.c
@@ -18,8 +18,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/trim/trim.c b/usr.sbin/trim/trim.c
index da036b45f5f5..3e187faa0fb3 100644
--- a/usr.sbin/trim/trim.c
+++ b/usr.sbin/trim/trim.c
@@ -45,8 +45,6 @@
#include <unistd.h>
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
static bool candelete(int fd);
static off_t getsize(const char *path);
static int opendev(const char *path, int flags);
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index b89a82c191d8..3ae575663d85 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)trpt.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c
index 6446800ce519..18b5351cf4b9 100644
--- a/usr.sbin/tzsetup/tzsetup.c
+++ b/usr.sbin/tzsetup/tzsetup.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <errno.h>
#include <stdio.h>
diff --git a/usr.sbin/uefisign/child.c b/usr.sbin/uefisign/child.c
index 00adb9945837..ee3f518f1473 100644
--- a/usr.sbin/uefisign/child.c
+++ b/usr.sbin/uefisign/child.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/types.h>
diff --git a/usr.sbin/uefisign/pe.c b/usr.sbin/uefisign/pe.c
index 6c2f5a154b08..2d066ec4153f 100644
--- a/usr.sbin/uefisign/pe.c
+++ b/usr.sbin/uefisign/pe.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <assert.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/uefisign/uefisign.c b/usr.sbin/uefisign/uefisign.c
index df9770d5bfee..bf6a2c0d0e42 100644
--- a/usr.sbin/uefisign/uefisign.c
+++ b/usr.sbin/uefisign/uefisign.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/wait.h>
#include <assert.h>
#include <err.h>
diff --git a/usr.sbin/ugidfw/ugidfw.c b/usr.sbin/ugidfw/ugidfw.c
index 4a8c2dc2118f..99156e6bbf94 100644
--- a/usr.sbin/ugidfw/ugidfw.c
+++ b/usr.sbin/ugidfw/ugidfw.c
@@ -32,8 +32,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/mount.h>
diff --git a/usr.sbin/utx/utx.c b/usr.sbin/utx/utx.c
index 2bd7d89286ca..ab40668a0926 100644
--- a/usr.sbin/utx/utx.c
+++ b/usr.sbin/utx/utx.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/time.h>
#include <errno.h>
#include <ctype.h>
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index 09d37ea440d0..28247eb21634 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -48,8 +48,6 @@ static char sccsid[] = "@(#)vipw.c 8.3 (Berkeley) 4/2/94";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.sbin/wake/wake.c b/usr.sbin/wake/wake.c
index 0281bf8deb9c..7b3a87c01033 100644
--- a/usr.sbin/wake/wake.c
+++ b/usr.sbin/wake/wake.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 85583882ea4e..f52a70872dee 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -14,8 +14,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/fcntl.h>
#include <sys/filio.h>
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c
index aa3806e1a9a4..88b467486da1 100644
--- a/usr.sbin/watchdogd/watchdogd.c
+++ b/usr.sbin/watchdogd/watchdogd.c
@@ -34,8 +34,6 @@
*/
#include <sys/types.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/mman.h>
#include <sys/param.h>
#include <sys/rtprio.h>
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.c b/usr.sbin/wpa/ndis_events/ndis_events.c
index cfd971af8ea1..d1c67925dac2 100644
--- a/usr.sbin/wpa/ndis_events/ndis_events.c
+++ b/usr.sbin/wpa/ndis_events/ndis_events.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This program simulates the behavior of the ndis_events utility
* supplied with wpa_supplicant for Windows. The original utility
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.c b/usr.sbin/wpa/wpa_supplicant/Packet32.c
index 3f852b722080..b7dc805cd001 100644
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.c
+++ b/usr.sbin/wpa/wpa_supplicant/Packet32.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* This file implements a small portion of the Winpcap API for the
* Windows NDIS interface in wpa_supplicant. It provides just enough
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c
index 19139c3dc61e..3bdfadf9ccd1 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <err.h>
#include <fcntl.h>
#include <limits.h>
diff --git a/usr.sbin/ypbind/yp_ping.c b/usr.sbin/ypbind/yp_ping.c
index d65c5eb695e2..b5d18817ce56 100644
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@@ -66,8 +66,6 @@ static char *sccsid = "@(#)from: clnt_udp.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* clnt_udp.c, Implements a UDP/IP based, client side RPC.
*
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 60d439d32f09..fdfc265f04c0 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index 03828238f67a..e6ca3015f30a 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c
index bfcdeb7f4f22..15163bc6ba80 100644
--- a/usr.sbin/yppush/yppush_main.c
+++ b/usr.sbin/yppush/yppush_main.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <signal.h>
#include <stdio.h>
diff --git a/usr.sbin/ypserv/common/yplib_host.c b/usr.sbin/ypserv/common/yplib_host.c
index 05b6e961314a..7adc36b72a48 100644
--- a/usr.sbin/ypserv/common/yplib_host.c
+++ b/usr.sbin/ypserv/common/yplib_host.c
@@ -27,8 +27,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/types.h>
diff --git a/usr.sbin/ypserv/yp_access.c b/usr.sbin/ypserv/yp_access.c
index 50c8d3dbd532..fefe96076092 100644
--- a/usr.sbin/ypserv/yp_access.c
+++ b/usr.sbin/ypserv/yp_access.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <stdlib.h>
#include <rpc/rpc.h>
#include <rpcsvc/yp.h>
diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index 291daba0da09..ee3a4c2e9d98 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <db.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c
index b33b80c2e82c..b1dc712c35ff 100644
--- a/usr.sbin/ypserv/yp_dnslookup.c
+++ b/usr.sbin/ypserv/yp_dnslookup.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* Do standard and reverse DNS lookups using the resolver library.
* Take care of all the dirty work here so the main program only has to
diff --git a/usr.sbin/ypserv/yp_error.c b/usr.sbin/ypserv/yp_error.c
index c22375f859ac..314c11d2514d 100644
--- a/usr.sbin/ypserv/yp_error.c
+++ b/usr.sbin/ypserv/yp_error.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* error logging/reporting facilities
* stolen from /usr/libexec/mail.local via ypserv
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c
index 452bee79d2ca..dac006d4bc28 100644
--- a/usr.sbin/ypserv/yp_main.c
+++ b/usr.sbin/ypserv/yp_main.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*
* ypserv startup function.
* We need out own main() since we have to do some additional work
diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index 7acb5d7f2b5c..8bfff7355a16 100644
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@@ -34,8 +34,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "yp.h"
#include "yp_extern.h"
#include <dirent.h>
diff --git a/usr.sbin/ypserv/yp_svc_udp.c b/usr.sbin/ypserv/yp_svc_udp.c
index 288bd28423b1..9cb904db01b1 100644
--- a/usr.sbin/ypserv/yp_svc_udp.c
+++ b/usr.sbin/ypserv/yp_svc_udp.c
@@ -33,8 +33,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <rpc/rpc.h>
#include <rpc/svc_dg.h>
#include "yp_extern.h"
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index fb6ed90d6b89..7f269e361969 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -30,8 +30,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/zonectl/zonectl.c b/usr.sbin/zonectl/zonectl.c
index dac773974deb..56cd3c436d10 100644
--- a/usr.sbin/zonectl/zonectl.c
+++ b/usr.sbin/zonectl/zonectl.c
@@ -31,8 +31,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/ioctl.h>
#include <sys/stdint.h>
#include <sys/types.h>