aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2023-08-22 01:31:18 +0000
committerWarner Losh <imp@FreeBSD.org>2023-08-23 17:43:23 +0000
commit8ad303d68cec3ee1133550de37e0009502621e50 (patch)
tree6e78406653c12d2aebd2b2ad6e826036ec07e01a
parent4fbf14e22d7b83de7080a8e491ba14a5785a0ff4 (diff)
downloadsrc-8ad303d68cec3ee1133550de37e0009502621e50.tar.gz
src-8ad303d68cec3ee1133550de37e0009502621e50.zip
Remove $FreeBSD$: one-line .c comment pattern
Remove /^/[*/]\s*\$FreeBSD\$.*\n/ Similar commit in main: (cherry picked from commit 2a63c3be1582)
-rw-r--r--bin/chio/defs.h1
-rw-r--r--bin/chio/pathnames.h1
-rw-r--r--bin/csh/config.h1
-rw-r--r--bin/csh/config_p.h1
-rw-r--r--cddl/compat/opensolaris/include/libintl.h1
-rw-r--r--cddl/compat/opensolaris/include/priv.h1
-rw-r--r--cddl/compat/opensolaris/include/solaris.h1
-rw-r--r--cddl/compat/opensolaris/include/zone.h1
-rw-r--r--include/getopt.h1
-rw-r--r--include/gssapi.h1
-rw-r--r--include/hesiod.h1
-rw-r--r--include/iconv.h1
-rw-r--r--include/ieeefp.h1
-rw-r--r--include/ifaddrs.h1
-rw-r--r--include/libgen.h1
-rw-r--r--include/netconfig.h1
-rw-r--r--include/nsswitch.h1
-rw-r--r--include/readpassphrase.h1
-rw-r--r--include/rpc/auth_des.h1
-rw-r--r--include/rpc/auth_kerb.h1
-rw-r--r--include/rpc/clnt_soc.h1
-rw-r--r--include/rpc/clnt_stat.h1
-rw-r--r--include/rpc/des.h1
-rw-r--r--include/rpc/nettype.h1
-rw-r--r--include/rpc/raw.h1
-rw-r--r--include/rpc/rpc_com.h1
-rw-r--r--include/rpc/rpcb_clnt.h1
-rw-r--r--include/rpc/rpcent.h1
-rw-r--r--include/rpc/svc_dg.h1
-rw-r--r--include/rpc/svc_soc.h1
-rw-r--r--include/rpcsvc/nis_object.x1
-rw-r--r--include/rpcsvc/nis_tags.h1
-rw-r--r--kerberos5/include/config.h1
-rw-r--r--kerberos5/include/crypto-headers.h1
-rw-r--r--kerberos5/include/krb5-types.h1
-rw-r--r--kerberos5/include/version.h1
-rw-r--r--kerberos5/lib/libgssapi_krb5/gss_oid.c1
-rw-r--r--kerberos5/lib/libgssapi_krb5/pname_to_uid.c1
-rw-r--r--lib/csu/aarch64/crt.h1
-rw-r--r--lib/csu/arm/crt.h1
-rw-r--r--lib/csu/riscv/crt.h1
-rw-r--r--lib/libblocksruntime/config.h1
-rw-r--r--lib/libc++/libc++.ldscript1
-rw-r--r--lib/libc/amd64/gen/fpgetmask.c1
-rw-r--r--lib/libc/amd64/gen/fpgetprec.c1
-rw-r--r--lib/libc/amd64/gen/fpgetround.c1
-rw-r--r--lib/libc/amd64/gen/fpgetsticky.c1
-rw-r--r--lib/libc/amd64/gen/fpsetmask.c1
-rw-r--r--lib/libc/amd64/gen/fpsetprec.c1
-rw-r--r--lib/libc/amd64/gen/fpsetround.c1
-rw-r--r--lib/libc/amd64/string/memcpy.S1
-rw-r--r--lib/libc/arm/softfloat/arm-gcc.h1
-rw-r--r--lib/libc/arm/softfloat/milieu.h1
-rw-r--r--lib/libc/arm/softfloat/softfloat.h1
-rw-r--r--lib/libc/iconv/_strtol.h1
-rw-r--r--lib/libc/iconv/_strtoul.h1
-rw-r--r--lib/libc/iconv/bsd_iconv.c1
-rw-r--r--lib/libc/iconv/citrus_aliasname_local.h1
-rw-r--r--lib/libc/iconv/citrus_bcs.c1
-rw-r--r--lib/libc/iconv/citrus_bcs.h1
-rw-r--r--lib/libc/iconv/citrus_bcs_strtol.c1
-rw-r--r--lib/libc/iconv/citrus_bcs_strtoul.c1
-rw-r--r--lib/libc/iconv/citrus_csmapper.c1
-rw-r--r--lib/libc/iconv/citrus_csmapper.h1
-rw-r--r--lib/libc/iconv/citrus_db.c1
-rw-r--r--lib/libc/iconv/citrus_db.h1
-rw-r--r--lib/libc/iconv/citrus_db_factory.c1
-rw-r--r--lib/libc/iconv/citrus_db_factory.h1
-rw-r--r--lib/libc/iconv/citrus_db_file.h1
-rw-r--r--lib/libc/iconv/citrus_db_hash.c1
-rw-r--r--lib/libc/iconv/citrus_db_hash.h1
-rw-r--r--lib/libc/iconv/citrus_esdb.c1
-rw-r--r--lib/libc/iconv/citrus_esdb.h1
-rw-r--r--lib/libc/iconv/citrus_esdb_file.h1
-rw-r--r--lib/libc/iconv/citrus_fix_grouping.h1
-rw-r--r--lib/libc/iconv/citrus_hash.c1
-rw-r--r--lib/libc/iconv/citrus_hash.h1
-rw-r--r--lib/libc/iconv/citrus_iconv.c1
-rw-r--r--lib/libc/iconv/citrus_iconv.h1
-rw-r--r--lib/libc/iconv/citrus_iconv_local.h1
-rw-r--r--lib/libc/iconv/citrus_lock.h1
-rw-r--r--lib/libc/iconv/citrus_lookup.c1
-rw-r--r--lib/libc/iconv/citrus_lookup.h1
-rw-r--r--lib/libc/iconv/citrus_lookup_factory.c1
-rw-r--r--lib/libc/iconv/citrus_lookup_factory.h1
-rw-r--r--lib/libc/iconv/citrus_lookup_file.h1
-rw-r--r--lib/libc/iconv/citrus_mapper.c1
-rw-r--r--lib/libc/iconv/citrus_mapper.h1
-rw-r--r--lib/libc/iconv/citrus_mapper_local.h1
-rw-r--r--lib/libc/iconv/citrus_memstream.c1
-rw-r--r--lib/libc/iconv/citrus_memstream.h1
-rw-r--r--lib/libc/iconv/citrus_mmap.c1
-rw-r--r--lib/libc/iconv/citrus_mmap.h1
-rw-r--r--lib/libc/iconv/citrus_module.c1
-rw-r--r--lib/libc/iconv/citrus_module.h1
-rw-r--r--lib/libc/iconv/citrus_namespace.h1
-rw-r--r--lib/libc/iconv/citrus_none.c1
-rw-r--r--lib/libc/iconv/citrus_none.h1
-rw-r--r--lib/libc/iconv/citrus_pivot_factory.c1
-rw-r--r--lib/libc/iconv/citrus_pivot_factory.h1
-rw-r--r--lib/libc/iconv/citrus_pivot_file.h1
-rw-r--r--lib/libc/iconv/citrus_prop.c1
-rw-r--r--lib/libc/iconv/citrus_prop.h1
-rw-r--r--lib/libc/iconv/citrus_region.h1
-rw-r--r--lib/libc/iconv/citrus_stdenc.c1
-rw-r--r--lib/libc/iconv/citrus_stdenc.h1
-rw-r--r--lib/libc/iconv/citrus_stdenc_local.h1
-rw-r--r--lib/libc/iconv/citrus_stdenc_template.h1
-rw-r--r--lib/libc/iconv/citrus_types.h1
-rw-r--r--lib/libc/include/isc/list.h1
-rw-r--r--lib/libc/include/isc/platform.h1
-rw-r--r--lib/libc/include/port_after.h1
-rw-r--r--lib/libc/include/port_before.h1
-rw-r--r--lib/libc/libc.ldscript1
-rw-r--r--lib/libc/libc_nossp.ldscript1
-rw-r--r--lib/libc/locale/c16rtomb_iconv.c1
-rw-r--r--lib/libc/locale/c32rtomb_iconv.c1
-rw-r--r--lib/libc/locale/mbrtoc16_iconv.c1
-rw-r--r--lib/libc/locale/mbrtoc32_iconv.c1
-rw-r--r--lib/libc/mips/SYS.h1
-rw-r--r--lib/libc/mips/softfloat/milieu.h1
-rw-r--r--lib/libc/mips/softfloat/mips-gcc.h1
-rw-r--r--lib/libc/mips/softfloat/softfloat.h1
-rw-r--r--lib/libc/net/res_config.h1
-rw-r--r--lib/libc/powerpc/softfloat/milieu.h1
-rw-r--r--lib/libc/powerpc/softfloat/powerpc-gcc.h1
-rw-r--r--lib/libc/powerpc/softfloat/softfloat.h1
-rw-r--r--lib/libc/powerpc64/softfloat/milieu.h1
-rw-r--r--lib/libc/powerpc64/softfloat/powerpc-gcc.h1
-rw-r--r--lib/libc/powerpc64/softfloat/softfloat.h1
-rw-r--r--lib/libc/powerpc64/string/memcpy_resolver.c1
-rw-r--r--lib/libc/powerpc64/string/memmove.S1
-rw-r--r--lib/libc/powerpc64/string/memmove_resolver.c1
-rw-r--r--lib/libc/powerpc64/string/memmove_vsx.S1
-rw-r--r--lib/libc/powerpcspe/softfloat/milieu.h1
-rw-r--r--lib/libc/powerpcspe/softfloat/powerpc-gcc.h1
-rw-r--r--lib/libc/powerpcspe/softfloat/softfloat.h1
-rw-r--r--lib/libc/resolv/res_private.h1
-rw-r--r--lib/libc/riscv/softfloat/milieu.h1
-rw-r--r--lib/libc/riscv/softfloat/riscv-gcc.h1
-rw-r--r--lib/libc/riscv/softfloat/softfloat.h1
-rw-r--r--lib/libc/rpc/DISCLAIMER1
-rw-r--r--lib/libc/softfloat/bits32/softfloat-macros1
-rw-r--r--lib/libc/softfloat/bits64/softfloat-macros1
-rw-r--r--lib/libc/softfloat/softfloat-for-gcc.h1
-rw-r--r--lib/libc/softfloat/softfloat-specialize1
-rw-r--r--lib/libc/softfloat/templates/milieu.h1
-rw-r--r--lib/libc/softfloat/templates/softfloat-specialize1
-rw-r--r--lib/libc/softfloat/templates/softfloat.h1
-rw-r--r--lib/libc/tests/resolv/resolv_test.c1
-rw-r--r--lib/libcuse/cuse.h1
-rw-r--r--lib/libcuse/cuse_lib.c1
-rw-r--r--lib/libefivar/ProcessorBind.h1
-rw-r--r--lib/libefivar/uefi-guid.c1
-rw-r--r--lib/libelftc/elftc_version.c1
-rw-r--r--lib/libgssapi/gss_buffer_set.c1
-rw-r--r--lib/libgssapi/gss_inquire_cred_by_oid.c1
-rw-r--r--lib/libgssapi/gss_oid_to_str.c1
-rw-r--r--lib/libgssapi/gss_pname_to_uid.c1
-rw-r--r--lib/libgssapi/gss_pseudo_random.c1
-rw-r--r--lib/libgssapi/gss_release_oid.c1
-rw-r--r--lib/libgssapi/gss_set_cred_option.c1
-rw-r--r--lib/libgssapi/gss_set_sec_context_option.c1
-rw-r--r--lib/libiconv_modules/BIG5/citrus_big5.c1
-rw-r--r--lib/libiconv_modules/BIG5/citrus_big5.h1
-rw-r--r--lib/libiconv_modules/DECHanyu/citrus_dechanyu.c1
-rw-r--r--lib/libiconv_modules/DECHanyu/citrus_dechanyu.h1
-rw-r--r--lib/libiconv_modules/EUC/citrus_euc.c1
-rw-r--r--lib/libiconv_modules/EUC/citrus_euc.h1
-rw-r--r--lib/libiconv_modules/EUCTW/citrus_euctw.c1
-rw-r--r--lib/libiconv_modules/EUCTW/citrus_euctw.h1
-rw-r--r--lib/libiconv_modules/GBK2K/citrus_gbk2k.c1
-rw-r--r--lib/libiconv_modules/GBK2K/citrus_gbk2k.h1
-rw-r--r--lib/libiconv_modules/HZ/citrus_hz.c1
-rw-r--r--lib/libiconv_modules/HZ/citrus_hz.h1
-rw-r--r--lib/libiconv_modules/ISO2022/citrus_iso2022.c1
-rw-r--r--lib/libiconv_modules/ISO2022/citrus_iso2022.h1
-rw-r--r--lib/libiconv_modules/JOHAB/citrus_johab.c1
-rw-r--r--lib/libiconv_modules/JOHAB/citrus_johab.h1
-rw-r--r--lib/libiconv_modules/MSKanji/citrus_mskanji.c1
-rw-r--r--lib/libiconv_modules/MSKanji/citrus_mskanji.h1
-rw-r--r--lib/libiconv_modules/UES/citrus_ues.c1
-rw-r--r--lib/libiconv_modules/UES/citrus_ues.h1
-rw-r--r--lib/libiconv_modules/UTF1632/citrus_utf1632.c1
-rw-r--r--lib/libiconv_modules/UTF1632/citrus_utf1632.h1
-rw-r--r--lib/libiconv_modules/UTF7/citrus_utf7.c1
-rw-r--r--lib/libiconv_modules/UTF7/citrus_utf7.h1
-rw-r--r--lib/libiconv_modules/UTF8/citrus_utf8.c1
-rw-r--r--lib/libiconv_modules/UTF8/citrus_utf8.h1
-rw-r--r--lib/libiconv_modules/VIQR/citrus_viqr.c1
-rw-r--r--lib/libiconv_modules/VIQR/citrus_viqr.h1
-rw-r--r--lib/libiconv_modules/ZW/citrus_zw.c1
-rw-r--r--lib/libiconv_modules/ZW/citrus_zw.h1
-rw-r--r--lib/libiconv_modules/iconv_none/citrus_iconv_none.c1
-rw-r--r--lib/libiconv_modules/iconv_none/citrus_iconv_none.h1
-rw-r--r--lib/libiconv_modules/iconv_std/citrus_iconv_std.c1
-rw-r--r--lib/libiconv_modules/iconv_std/citrus_iconv_std.h1
-rw-r--r--lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h1
-rw-r--r--lib/libiconv_modules/mapper_646/citrus_mapper_646.c1
-rw-r--r--lib/libiconv_modules/mapper_646/citrus_mapper_646.h1
-rw-r--r--lib/libiconv_modules/mapper_none/citrus_mapper_none.c1
-rw-r--r--lib/libiconv_modules/mapper_none/citrus_mapper_none.h1
-rw-r--r--lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c1
-rw-r--r--lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h1
-rw-r--r--lib/libiconv_modules/mapper_std/citrus_mapper_std.c1
-rw-r--r--lib/libiconv_modules/mapper_std/citrus_mapper_std.h1
-rw-r--r--lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h1
-rw-r--r--lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h1
-rw-r--r--lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c1
-rw-r--r--lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h1
-rw-r--r--lib/libipsec/ipsec_strerror.h1
-rw-r--r--lib/libipsec/libpfkey.h1
-rw-r--r--lib/libipsec/policy_token.l1
-rw-r--r--lib/libmd/i386/rmd160.S1
-rw-r--r--lib/libmd/i386/sha.S1
-rw-r--r--lib/libmd/md5.h1
-rw-r--r--lib/libmp/mp.h1
-rw-r--r--lib/libnetbsd/efun.c1
-rw-r--r--lib/libnetbsd/netinet/in.h1
-rw-r--r--lib/libnetbsd/rmd160.h1
-rw-r--r--lib/libnetbsd/sha1.h1
-rw-r--r--lib/libnetbsd/sha2.h1
-rw-r--r--lib/libnetbsd/stdlib.h1
-rw-r--r--lib/libnetbsd/sys/cdefs.h1
-rw-r--r--lib/libnetbsd/util.h1
-rw-r--r--lib/libopie/config.h1
-rw-r--r--lib/libpcap/config.h1
-rw-r--r--lib/libpmc/pmu-events/jsmn.h1
-rw-r--r--lib/libpmc/pmu-events/json.h1
-rw-r--r--lib/librpcsec_gss/rpcsec_gss_int.h1
-rw-r--r--lib/librpcsec_gss/rpcsec_gss_prot.c1
-rw-r--r--lib/libusb/libusb.h1
-rw-r--r--lib/libusb/libusb01.c1
-rw-r--r--lib/libusb/libusb10.c1
-rw-r--r--lib/libusb/libusb10.h1
-rw-r--r--lib/libusb/libusb10_desc.c1
-rw-r--r--lib/libusb/libusb10_hotplug.c1
-rw-r--r--lib/libusb/libusb10_io.c1
-rw-r--r--lib/libusb/libusb20.c1
-rw-r--r--lib/libusb/libusb20.h1
-rw-r--r--lib/libusb/libusb20_desc.c1
-rw-r--r--lib/libusb/libusb20_desc.h1
-rw-r--r--lib/libusb/libusb20_int.h1
-rw-r--r--lib/libusb/libusb20_ugen20.c1
-rw-r--r--lib/libusb/libusb_global_linux.h1
-rw-r--r--lib/libusb/usb.h1
-rw-r--r--lib/libxo/libxo/xo_config.h1
-rw-r--r--lib/msun/src/w_dremf.c1
-rw-r--r--lib/ncurses/ncurses/ncurses_cfg.h1
-rw-r--r--libexec/bootpd/bptypes.h1
-rw-r--r--libexec/bootpd/dovend.h1
-rw-r--r--libexec/bootpd/getether.h1
-rw-r--r--libexec/bootpd/getif.h1
-rw-r--r--libexec/bootpd/lookup.h1
-rw-r--r--libexec/bootpd/readfile.h1
-rw-r--r--libexec/bootpd/report.c1
-rw-r--r--libexec/bootpd/report.h1
-rw-r--r--libexec/bootpd/tools/bootptest/bootptest.h1
-rw-r--r--libexec/flua/linit_flua.c1
-rw-r--r--libexec/flua/modules/lposix.h1
-rw-r--r--libexec/ftpd/blacklist.c1
-rw-r--r--libexec/ftpd/blacklist_client.h1
-rw-r--r--libexec/ftpd/config.h1
-rw-r--r--sbin/dhclient/dhcp.h1
-rw-r--r--sbin/dhclient/tests/fake.c1
-rw-r--r--sbin/dhclient/tests/option-domain-search.c1
-rw-r--r--sbin/etherswitchcfg/ifmedia.c1
-rw-r--r--sbin/gvinum/gvinum.h1
-rw-r--r--sbin/ifconfig/carp.c1
-rw-r--r--sbin/ifconfig/ifmedia.c1
-rw-r--r--sbin/ipf/common/ipf.h1
-rw-r--r--sbin/ipf/common/ipf_y.y1
-rw-r--r--sbin/ipf/common/ipmon.h1
-rw-r--r--sbin/ipf/common/ipt.h1
-rw-r--r--sbin/ipf/common/kmem.h1
-rw-r--r--sbin/ipf/common/lexer.c1
-rw-r--r--sbin/ipf/common/lexer.h1
-rw-r--r--sbin/ipf/common/opts.h1
-rw-r--r--sbin/ipf/common/pcap-ipf.h1
-rw-r--r--sbin/ipf/ipf/bpf-ipf.h1
-rw-r--r--sbin/ipf/ipf/bpf_filter.c1
-rw-r--r--sbin/ipf/ipf/ipf.c1
-rw-r--r--sbin/ipf/ipf/ipfcomp.c1
-rw-r--r--sbin/ipf/ipfs/ipfs.c1
-rw-r--r--sbin/ipf/ipfstat/ipfstat.c1
-rw-r--r--sbin/ipf/ipfsync/ipsyncm.c1
-rw-r--r--sbin/ipf/ipfsync/ipsyncs.c1
-rw-r--r--sbin/ipf/ipftest/ip_fil.c1
-rw-r--r--sbin/ipf/ipftest/ipftest.c1
-rw-r--r--sbin/ipf/ipftest/md5.c1
-rw-r--r--sbin/ipf/ipftest/md5.h1
-rw-r--r--sbin/ipf/iplang/iplang.h1
-rw-r--r--sbin/ipf/iplang/iplang_l.l1
-rw-r--r--sbin/ipf/iplang/iplang_y.y1
-rw-r--r--sbin/ipf/ipmon/ipmon.c1
-rw-r--r--sbin/ipf/ipmon/ipmon_y.y1
-rw-r--r--sbin/ipf/ipnat/ipnat.c1
-rw-r--r--sbin/ipf/ipnat/ipnat_y.y1
-rw-r--r--sbin/ipf/ippool/ippool.c1
-rw-r--r--sbin/ipf/ippool/ippool_y.y1
-rw-r--r--sbin/ipf/ipscan/ipscan_y.y1
-rw-r--r--sbin/ipf/ipsend/44arp.c1
-rw-r--r--sbin/ipf/ipsend/arp.c1
-rw-r--r--sbin/ipf/ipsend/dlcommon.c1
-rw-r--r--sbin/ipf/ipsend/dltest.h1
-rw-r--r--sbin/ipf/ipsend/ip.c1
-rw-r--r--sbin/ipf/ipsend/ipresend.c1
-rw-r--r--sbin/ipf/ipsend/ipsend.c1
-rw-r--r--sbin/ipf/ipsend/ipsend.h1
-rw-r--r--sbin/ipf/ipsend/ipsopt.c1
-rw-r--r--sbin/ipf/ipsend/iptest.c1
-rw-r--r--sbin/ipf/ipsend/iptests.c1
-rw-r--r--sbin/ipf/ipsend/resend.c1
-rw-r--r--sbin/ipf/ipsend/sbpf.c1
-rw-r--r--sbin/ipf/ipsend/sdlpi.c1
-rw-r--r--sbin/ipf/ipsend/snit.c1
-rw-r--r--sbin/ipf/ipsend/sock.c1
-rw-r--r--sbin/ipf/ipsend/sockraw.c1
-rw-r--r--sbin/ipf/libipf/addicmp.c1
-rw-r--r--sbin/ipf/libipf/addipopt.c1
-rw-r--r--sbin/ipf/libipf/bcopywrap.c1
-rw-r--r--sbin/ipf/libipf/binprint.c1
-rw-r--r--sbin/ipf/libipf/buildopts.c1
-rw-r--r--sbin/ipf/libipf/checkrev.c1
-rw-r--r--sbin/ipf/libipf/count4bits.c1
-rw-r--r--sbin/ipf/libipf/count6bits.c1
-rw-r--r--sbin/ipf/libipf/debug.c1
-rw-r--r--sbin/ipf/libipf/facpri.c1
-rw-r--r--sbin/ipf/libipf/facpri.h1
-rw-r--r--sbin/ipf/libipf/fill6bits.c1
-rw-r--r--sbin/ipf/libipf/flags.c1
-rw-r--r--sbin/ipf/libipf/gethost.c1
-rw-r--r--sbin/ipf/libipf/getifname.c1
-rw-r--r--sbin/ipf/libipf/getnattype.c1
-rw-r--r--sbin/ipf/libipf/getport.c1
-rw-r--r--sbin/ipf/libipf/getportproto.c1
-rw-r--r--sbin/ipf/libipf/getproto.c1
-rw-r--r--sbin/ipf/libipf/getsumd.c1
-rw-r--r--sbin/ipf/libipf/hostname.c1
-rw-r--r--sbin/ipf/libipf/icmpcode.c1
-rw-r--r--sbin/ipf/libipf/inet_addr.c1
-rw-r--r--sbin/ipf/libipf/initparse.c1
-rw-r--r--sbin/ipf/libipf/ionames.c1
-rw-r--r--sbin/ipf/libipf/ipf_dotuning.c1
-rw-r--r--sbin/ipf/libipf/ipft_hx.c1
-rw-r--r--sbin/ipf/libipf/ipft_pc.c1
-rw-r--r--sbin/ipf/libipf/ipft_tx.c1
-rw-r--r--sbin/ipf/libipf/ipoptsec.c1
-rw-r--r--sbin/ipf/libipf/kmem.c1
-rw-r--r--sbin/ipf/libipf/kmem.h1
-rw-r--r--sbin/ipf/libipf/kmemcpywrap.c1
-rw-r--r--sbin/ipf/libipf/kvatoname.c1
-rw-r--r--sbin/ipf/libipf/load_hash.c1
-rw-r--r--sbin/ipf/libipf/load_hashnode.c1
-rw-r--r--sbin/ipf/libipf/load_http.c1
-rw-r--r--sbin/ipf/libipf/load_pool.c1
-rw-r--r--sbin/ipf/libipf/load_poolnode.c1
-rw-r--r--sbin/ipf/libipf/mutex_emul.c1
-rw-r--r--sbin/ipf/libipf/nametokva.c1
-rw-r--r--sbin/ipf/libipf/nat_setgroupmap.c1
-rw-r--r--sbin/ipf/libipf/ntomask.c1
-rw-r--r--sbin/ipf/libipf/optname.c1
-rw-r--r--sbin/ipf/libipf/optprint.c1
-rw-r--r--sbin/ipf/libipf/optprintv6.c1
-rw-r--r--sbin/ipf/libipf/optvalue.c1
-rw-r--r--sbin/ipf/libipf/portname.c1
-rw-r--r--sbin/ipf/libipf/print_toif.c1
-rw-r--r--sbin/ipf/libipf/printactivenat.c1
-rw-r--r--sbin/ipf/libipf/printaps.c1
-rw-r--r--sbin/ipf/libipf/printbuf.c1
-rw-r--r--sbin/ipf/libipf/printfr.c1
-rw-r--r--sbin/ipf/libipf/printfraginfo.c1
-rw-r--r--sbin/ipf/libipf/printhash.c1
-rw-r--r--sbin/ipf/libipf/printhashnode.c1
-rw-r--r--sbin/ipf/libipf/printhostmap.c1
-rw-r--r--sbin/ipf/libipf/printhostmask.c1
-rw-r--r--sbin/ipf/libipf/printifname.c1
-rw-r--r--sbin/ipf/libipf/printip.c1
-rw-r--r--sbin/ipf/libipf/printlog.c1
-rw-r--r--sbin/ipf/libipf/printmask.c1
-rw-r--r--sbin/ipf/libipf/printnat.c1
-rw-r--r--sbin/ipf/libipf/printpacket.c1
-rw-r--r--sbin/ipf/libipf/printpacket6.c1
-rw-r--r--sbin/ipf/libipf/printpool.c1
-rw-r--r--sbin/ipf/libipf/printpoolnode.c1
-rw-r--r--sbin/ipf/libipf/printportcmp.c1
-rw-r--r--sbin/ipf/libipf/printsbuf.c1
-rw-r--r--sbin/ipf/libipf/printstate.c1
-rw-r--r--sbin/ipf/libipf/printtunable.c1
-rw-r--r--sbin/ipf/libipf/remove_hash.c1
-rw-r--r--sbin/ipf/libipf/remove_hashnode.c1
-rw-r--r--sbin/ipf/libipf/remove_pool.c1
-rw-r--r--sbin/ipf/libipf/remove_poolnode.c1
-rw-r--r--sbin/ipf/libipf/resetlexer.c1
-rw-r--r--sbin/ipf/libipf/rwlock_emul.c1
-rw-r--r--sbin/ipf/libipf/tcp_flags.c1
-rw-r--r--sbin/ipf/libipf/tcpflags.c1
-rw-r--r--sbin/ipf/libipf/tcpoptnames.c1
-rw-r--r--sbin/ipf/libipf/v6ionames.c1
-rw-r--r--sbin/ipf/libipf/v6optvalue.c1
-rw-r--r--sbin/ipf/libipf/var.c1
-rw-r--r--sbin/ipf/libipf/verbose.c1
-rw-r--r--sbin/newfs_msdos/mkfs_msdos.h1
-rw-r--r--sbin/rcorder/ealloc.c1
-rw-r--r--sbin/rcorder/ealloc.h1
-rw-r--r--sbin/rcorder/hash.c1
-rw-r--r--sbin/rcorder/hash.h1
-rw-r--r--sbin/setkey/parse.y1
-rw-r--r--sbin/setkey/setkey.c1
-rw-r--r--sbin/setkey/test-pfkey.c1
-rw-r--r--sbin/setkey/token.l1
-rw-r--r--sbin/setkey/vchar.h1
-rw-r--r--secure/lib/libcrypto/opensslconf.h.in1
-rw-r--r--share/examples/FreeBSD_version/FreeBSD_version.c1
-rw-r--r--share/examples/ipfilter/l4check/l4check.c1
-rw-r--r--share/examples/ipfilter/mlfk_rule.c1
-rw-r--r--share/examples/ipfilter/samples/proxy.c1
-rw-r--r--share/examples/ipfilter/samples/relay.c1
-rw-r--r--share/examples/ipfilter/samples/userauth.c1
-rw-r--r--share/examples/ses/srcs/chpmon.c1
-rw-r--r--share/examples/ses/srcs/eltsub.c1
-rw-r--r--share/examples/ses/srcs/eltsub.h1
-rw-r--r--share/examples/ses/srcs/getencstat.c1
-rw-r--r--share/examples/ses/srcs/getnobj.c1
-rw-r--r--share/examples/ses/srcs/getobjmap.c1
-rw-r--r--share/examples/ses/srcs/getobjstat.c1
-rw-r--r--share/examples/ses/srcs/inienc.c1
-rw-r--r--share/examples/ses/srcs/sesd.c1
-rw-r--r--share/examples/ses/srcs/setencstat.c1
-rw-r--r--share/examples/ses/srcs/setobjstat.c1
-rw-r--r--share/examples/sunrpc/msg/msg_proc.c1
-rw-r--r--share/examples/sunrpc/msg/printmsg.c1
-rw-r--r--share/examples/tests/tests/atf/printf_test.c1
-rw-r--r--share/examples/tests/tests/plain/printf_test.c1
-rw-r--r--share/examples/tests/tests/tap/printf_test.c1
-rw-r--r--stand/efi/include/Guid/MemoryTypeInformation.h1
-rw-r--r--stand/efi/include/Guid/MtcVendor.h1
-rw-r--r--stand/efi/include/Guid/ZeroGuid.h1
-rw-r--r--stand/efi/include/Protocol/EdidActive.h1
-rw-r--r--stand/efi/include/Protocol/EdidDiscovered.h1
-rw-r--r--stand/efi/include/Protocol/EdidOverride.h1
-rw-r--r--stand/efi/include/Protocol/Http.h1
-rw-r--r--stand/efi/include/Protocol/Ip4Config2.h1
-rw-r--r--stand/efi/include/Protocol/ServiceBinding.h1
-rw-r--r--stand/efi/include/README1
-rw-r--r--stand/efi/include/amd64/efibind.h1
-rw-r--r--stand/efi/include/amd64/pe.h1
-rw-r--r--stand/efi/include/arm/efibind.h1
-rw-r--r--stand/efi/include/arm64/efibind.h1
-rw-r--r--stand/efi/include/efi.h1
-rw-r--r--stand/efi/include/efi_nii.h1
-rw-r--r--stand/efi/include/efiapi.h1
-rw-r--r--stand/efi/include/eficon.h1
-rw-r--r--stand/efi/include/eficonsctl.h1
-rw-r--r--stand/efi/include/efidebug.h1
-rw-r--r--stand/efi/include/efidef.h1
-rw-r--r--stand/efi/include/efidevp.h1
-rw-r--r--stand/efi/include/efierr.h1
-rw-r--r--stand/efi/include/efifpswa.h1
-rw-r--r--stand/efi/include/efifs.h1
-rw-r--r--stand/efi/include/efigop.h1
-rw-r--r--stand/efi/include/efigpt.h1
-rw-r--r--stand/efi/include/efiip.h1
-rw-r--r--stand/efi/include/efinet.h1
-rw-r--r--stand/efi/include/efipart.h1
-rw-r--r--stand/efi/include/efipciio.h1
-rw-r--r--stand/efi/include/efipoint.h1
-rw-r--r--stand/efi/include/efiprot.h1
-rw-r--r--stand/efi/include/efipxebc.h1
-rw-r--r--stand/efi/include/efiser.h1
-rw-r--r--stand/efi/include/efistdarg.h1
-rw-r--r--stand/efi/include/efitcp.h1
-rw-r--r--stand/efi/include/efiudp.h1
-rw-r--r--stand/efi/include/efiuga.h1
-rw-r--r--stand/efi/include/i386/efibind.h1
-rw-r--r--stand/efi/include/i386/pe.h1
-rw-r--r--stand/efi/include/riscv/efibind.h1
-rw-r--r--stand/efi/loader/arch/amd64/ldscript.amd641
-rw-r--r--stand/efi/loader/arch/arm/ldscript.arm1
-rw-r--r--stand/efi/loader/arch/arm64/ldscript.arm641
-rw-r--r--stand/efi/loader/arch/i386/ldscript.i3861
-rw-r--r--stand/efi/loader/arch/riscv/ldscript.riscv1
-rw-r--r--stand/ficl/aarch64/sysdep.c1
-rw-r--r--stand/ficl/amd64/sysdep.c1
-rw-r--r--stand/ficl/amd64/sysdep.h1
-rw-r--r--stand/ficl/arm/sysdep.c1
-rw-r--r--stand/ficl/dict.c1
-rw-r--r--stand/ficl/ficl.c1
-rw-r--r--stand/ficl/ficl.h1
-rw-r--r--stand/ficl/fileaccess.c1
-rw-r--r--stand/ficl/float.c1
-rw-r--r--stand/ficl/i386/sysdep.c1
-rw-r--r--stand/ficl/i386/sysdep.h1
-rw-r--r--stand/ficl/math64.c1
-rw-r--r--stand/ficl/math64.h1
-rw-r--r--stand/ficl/mips/sysdep.c1
-rw-r--r--stand/ficl/mips64/sysdep.c1
-rw-r--r--stand/ficl/powerpc/sysdep.c1
-rw-r--r--stand/ficl/prefix.c1
-rw-r--r--stand/ficl/riscv/sysdep.c1
-rw-r--r--stand/ficl/search.c1
-rw-r--r--stand/ficl/stack.c1
-rw-r--r--stand/ficl/testmain.c1
-rw-r--r--stand/ficl/tools.c1
-rw-r--r--stand/ficl/unix.c1
-rw-r--r--stand/ficl/vm.c1
-rw-r--r--stand/ficl/words.c1
-rw-r--r--stand/ficl/x86/sysdep.c1
-rw-r--r--stand/i386/boot.ldscript1
-rw-r--r--stand/kboot/arch/aarch64/ldscript.aarch641
-rw-r--r--stand/kboot/arch/amd64/ldscript.amd641
-rw-r--r--stand/kshim/bsd_busspace.c1
-rw-r--r--stand/kshim/bsd_global.h1
-rw-r--r--stand/kshim/bsd_kernel.c1
-rw-r--r--stand/kshim/bsd_kernel.h1
-rw-r--r--stand/kshim/sysinit.h1
-rw-r--r--stand/libsa/bootparam.h1
-rw-r--r--stand/libsa/crc32_libkern.c1
-rw-r--r--stand/libsa/netif.h1
-rw-r--r--stand/libsa/nfsv2.h1
-rw-r--r--stand/libsa/powerpc/_setjmp.S1
-rw-r--r--stand/powerpc/ofw/ldscript.powerpc1
-rw-r--r--stand/powerpc/ofw/ldscript.powerpcle1
-rw-r--r--stand/uboot/arch/arm/ldscript.arm1
-rw-r--r--stand/uboot/arch/mips/ldscript.mips1
-rw-r--r--stand/uboot/arch/powerpc/ldscript.powerpc1
-rw-r--r--stand/usb/storage/umass_common.c1
-rw-r--r--stand/usb/storage/umass_common.h1
-rw-r--r--stand/usb/storage/umass_loader.c1
-rw-r--r--stand/usb/test/bsd_usbloader_test.c1
-rw-r--r--stand/usb/tools/sysinit.c1
-rw-r--r--stand/usb/usb_busdma_loader.c1
-rw-r--r--tests/sys/geom/class/eli/testvect.h1
-rw-r--r--tests/sys/kqueue/libkqueue/config.h1
-rw-r--r--tests/sys/mqueue/mqtest1.c1
-rw-r--r--tests/sys/mqueue/mqtest2.c1
-rw-r--r--tests/sys/mqueue/mqtest3.c1
-rw-r--r--tests/sys/mqueue/mqtest4.c1
-rw-r--r--tests/sys/mqueue/mqtest5.c1
-rw-r--r--tests/sys/pjdfstest/config.h1
-rw-r--r--tools/diag/dumpvfscache/dumpvfscache.c1
-rw-r--r--tools/kerneldoc/subsys/notreviewed.dox1
-rw-r--r--tools/regression/ccd/layout/a.c1
-rw-r--r--tools/regression/ccd/layout/b.c1
-rw-r--r--tools/regression/p1003_1b/main.c1
-rw-r--r--tools/regression/poll/pipepoll.c1
-rw-r--r--tools/regression/poll/pipeselect.c1
-rw-r--r--tools/regression/poll/sockpoll.c1
-rw-r--r--tools/regression/posixsem2/semtest.c1
-rw-r--r--tools/regression/pthread/unwind/Test.cpp1
-rw-r--r--tools/regression/pthread/unwind/catch_pthread_exit.cpp1
-rw-r--r--tools/regression/pthread/unwind/cond_wait_cancel.cpp1
-rw-r--r--tools/regression/pthread/unwind/main_thread_exit.cpp1
-rw-r--r--tools/regression/pthread/unwind/sem_wait_cancel.cpp1
-rw-r--r--tools/regression/pthread/unwind/thread_normal_exit.cpp1
-rw-r--r--tools/regression/sigqueue/sigqtest1/sigqtest1.c1
-rw-r--r--tools/regression/sigqueue/sigqtest2/sigqtest2.c1
-rw-r--r--tools/regression/tls/libxx/xx.c1
-rw-r--r--tools/regression/tls/libyy/yy.c1
-rw-r--r--tools/regression/tls/ttls1/ttls1.c1
-rw-r--r--tools/regression/tls/ttls2/ttls2.c1
-rw-r--r--tools/test/malloc/main.c1
-rw-r--r--tools/tools/ath/ath_ee_9287_print/9287.h1
-rw-r--r--tools/tools/ath/ath_ee_9287_print/eeprom.h1
-rw-r--r--tools/tools/ath/ath_ee_v4k_print/eeprom.h1
-rw-r--r--tools/tools/ath/ath_ee_v4k_print/v4k.h1
-rw-r--r--tools/tools/crypto/cryptokeytest.c1
-rw-r--r--tools/tools/iwi/iwistats.c1
-rw-r--r--tools/tools/kttcp/kttcp.c1
-rw-r--r--tools/tools/kttcp/sys/kttcp.c1
-rw-r--r--tools/tools/kttcp/sys/kttcpio.h1
-rw-r--r--tools/tools/mctest/mctest.h1
-rw-r--r--tools/tools/ncpus/ncpus.c1
-rw-r--r--tools/tools/netmap/ctrs.h1
-rw-r--r--tools/tools/netmap/lb.c1
-rw-r--r--tools/tools/netmap/pkt_hash.c1
-rw-r--r--tools/tools/netmap/pkt_hash.h1
-rw-r--r--tools/tools/usbtest/usb_control_ep_test.c1
-rw-r--r--tools/tools/usbtest/usb_modem_test.c1
-rw-r--r--tools/tools/usbtest/usb_msc_test.c1
-rw-r--r--tools/tools/usbtest/usb_msc_test.h1
-rw-r--r--tools/tools/usbtest/usbtest.c1
-rw-r--r--tools/tools/usbtest/usbtest.h1
-rw-r--r--tools/tools/vhba/faulty/vhba_faulty.c1
-rw-r--r--tools/tools/vhba/lots/vhba_lots.c1
-rw-r--r--tools/tools/vhba/medium/vhba_medium.c1
-rw-r--r--tools/tools/vhba/mptest/vhba_mptest.c1
-rw-r--r--tools/tools/vhba/opt_cam.h1
-rw-r--r--tools/tools/vhba/rptluns/vhba_rptluns.c1
-rw-r--r--tools/tools/vhba/simple/vhba_simple.c1
-rw-r--r--tools/tools/vhba/vhba.c1
-rw-r--r--tools/tools/vhba/vhba.h1
-rw-r--r--tools/tools/zfsboottest/zfsboottest.c1
-rw-r--r--usr.bin/bc/bc.library1
-rw-r--r--usr.bin/bc/extern.h1
-rw-r--r--usr.bin/bc/pathnames.h1
-rw-r--r--usr.bin/bc/tty.c1
-rw-r--r--usr.bin/bmake/config.h1
-rw-r--r--usr.bin/compress/doc/revision.log1
-rw-r--r--usr.bin/dc/bcode.h1
-rw-r--r--usr.bin/dc/extern.h1
-rw-r--r--usr.bin/fortune/strfile/strfile.h1
-rw-r--r--usr.bin/ftp/tnftp_config.h1
-rw-r--r--usr.bin/gcore/elf32core.c1
-rw-r--r--usr.bin/grep/file.c1
-rw-r--r--usr.bin/grep/grep.c1
-rw-r--r--usr.bin/grep/grep.h1
-rw-r--r--usr.bin/grep/queue.c1
-rw-r--r--usr.bin/grep/util.c1
-rw-r--r--usr.bin/gzip/unpack.c1
-rw-r--r--usr.bin/iconv/iconv.c1
-rw-r--r--usr.bin/indent/tests/binary.01
-rw-r--r--usr.bin/indent/tests/binary.0.stdout1
-rw-r--r--usr.bin/indent/tests/comments.01
-rw-r--r--usr.bin/indent/tests/comments.0.pro1
-rw-r--r--usr.bin/indent/tests/comments.0.stdout1
-rw-r--r--usr.bin/indent/tests/cs.01
-rw-r--r--usr.bin/indent/tests/cs.0.pro1
-rw-r--r--usr.bin/indent/tests/cs.0.stdout1
-rw-r--r--usr.bin/indent/tests/declarations.01
-rw-r--r--usr.bin/indent/tests/declarations.0.stdout1
-rw-r--r--usr.bin/indent/tests/elsecomment.01
-rw-r--r--usr.bin/indent/tests/elsecomment.0.pro1
-rw-r--r--usr.bin/indent/tests/elsecomment.0.stdout1
-rw-r--r--usr.bin/indent/tests/f_decls.01
-rw-r--r--usr.bin/indent/tests/f_decls.0.stdout1
-rw-r--r--usr.bin/indent/tests/float.01
-rw-r--r--usr.bin/indent/tests/float.0.stdout1
-rw-r--r--usr.bin/indent/tests/label.01
-rw-r--r--usr.bin/indent/tests/label.0.pro1
-rw-r--r--usr.bin/indent/tests/label.0.stdout1
-rw-r--r--usr.bin/indent/tests/list_head.01
-rw-r--r--usr.bin/indent/tests/list_head.0.stdout1
-rw-r--r--usr.bin/indent/tests/ncs.01
-rw-r--r--usr.bin/indent/tests/ncs.0.pro1
-rw-r--r--usr.bin/indent/tests/ncs.0.stdout1
-rw-r--r--usr.bin/indent/tests/offsetof.01
-rw-r--r--usr.bin/indent/tests/offsetof.0.stdout1
-rw-r--r--usr.bin/indent/tests/parens.01
-rw-r--r--usr.bin/indent/tests/parens.0.pro1
-rw-r--r--usr.bin/indent/tests/parens.0.stdout1
-rw-r--r--usr.bin/indent/tests/pcs.01
-rw-r--r--usr.bin/indent/tests/pcs.0.pro1
-rw-r--r--usr.bin/indent/tests/pcs.0.stdout1
-rw-r--r--usr.bin/indent/tests/struct.01
-rw-r--r--usr.bin/indent/tests/struct.0.stdout1
-rw-r--r--usr.bin/indent/tests/surplusbad.01
-rw-r--r--usr.bin/indent/tests/surplusbad.0.pro1
-rw-r--r--usr.bin/indent/tests/surplusbad.0.stdout1
-rw-r--r--usr.bin/indent/tests/types_from_file.01
-rw-r--r--usr.bin/indent/tests/types_from_file.0.pro1
-rw-r--r--usr.bin/indent/tests/types_from_file.0.stdout1
-rw-r--r--usr.bin/indent/tests/wchar.01
-rw-r--r--usr.bin/indent/tests/wchar.0.stdout1
-rw-r--r--usr.bin/lex/config.h1
-rw-r--r--usr.bin/mkcsmapper/ldef.h1
-rw-r--r--usr.bin/mkcsmapper/lex.l1
-rw-r--r--usr.bin/mkcsmapper/yacc.y1
-rw-r--r--usr.bin/mkesdb/ldef.h1
-rw-r--r--usr.bin/mkesdb/lex.l1
-rw-r--r--usr.bin/mkesdb/yacc.y1
-rw-r--r--usr.bin/sdiff/extern.h1
-rw-r--r--usr.bin/sort/bwstring.h1
-rw-r--r--usr.bin/sort/coll.h1
-rw-r--r--usr.bin/sort/file.h1
-rw-r--r--usr.bin/sort/mem.h1
-rw-r--r--usr.bin/sort/radixsort.h1
-rw-r--r--usr.bin/sort/sort.h1
-rw-r--r--usr.bin/sort/vsort.h1
-rw-r--r--usr.bin/svn/expat.h1
-rw-r--r--usr.bin/svn/lib/libapr/apr.h1
-rw-r--r--usr.bin/svn/lib/libapr/apr_escape_test_char.h1
-rw-r--r--usr.bin/svn/lib/libapr/apr_private.h1
-rw-r--r--usr.bin/svn/lib/libapr_util/apr_ldap.h1
-rw-r--r--usr.bin/svn/lib/libapr_util/apu.h1
-rw-r--r--usr.bin/svn/lib/libapr_util/apu_config.h1
-rw-r--r--usr.bin/svn/lib/libapr_util/apu_select_dbm.h1
-rw-r--r--usr.bin/svn/lib/libapr_util/apu_want.h1
-rw-r--r--usr.bin/svn/lib/libapr_util/expat.h1
-rw-r--r--usr.bin/svn/svn_private_config.h1
-rw-r--r--usr.bin/tip/tip/pathnames.h1
-rw-r--r--usr.bin/tip/tip/tip.h1
-rw-r--r--usr.bin/top/display.h1
-rw-r--r--usr.bin/usbhidaction/usbhidaction.c1
-rw-r--r--usr.bin/usbhidctl/usbhid.c1
-rw-r--r--usr.bin/vi/config.h1
-rw-r--r--usr.bin/vi/ex/version.h1
-rw-r--r--usr.bin/vi/pathnames.h1
-rw-r--r--usr.bin/wall/ttymsg.h1
-rw-r--r--usr.bin/yacc/config.h1
-rw-r--r--usr.sbin/apmd/contrib/pccardq.c1
-rw-r--r--usr.sbin/bluetooth/btpand/bnep.c1
-rw-r--r--usr.sbin/bluetooth/btpand/bnep.h1
-rw-r--r--usr.sbin/bluetooth/btpand/btpand.c1
-rw-r--r--usr.sbin/bluetooth/btpand/btpand.h1
-rw-r--r--usr.sbin/bluetooth/btpand/channel.c1
-rw-r--r--usr.sbin/bluetooth/btpand/client.c1
-rw-r--r--usr.sbin/bluetooth/btpand/event.c1
-rw-r--r--usr.sbin/bluetooth/btpand/event.h1
-rw-r--r--usr.sbin/bluetooth/btpand/packet.c1
-rw-r--r--usr.sbin/bluetooth/btpand/sdp.c1
-rw-r--r--usr.sbin/bluetooth/btpand/sdp.h1
-rw-r--r--usr.sbin/bluetooth/btpand/server.c1
-rw-r--r--usr.sbin/bluetooth/btpand/tap.c1
-rw-r--r--usr.sbin/cron/cron/externs.h1
-rw-r--r--usr.sbin/crunch/crunchide/extern.h1
-rw-r--r--usr.sbin/dumpcis/cardinfo.h1
-rw-r--r--usr.sbin/fifolog/flint.lnt1
-rw-r--r--usr.sbin/kbdcontrol/path.h1
-rw-r--r--usr.sbin/kldxref/ef.h1
-rw-r--r--usr.sbin/mailwrapper/pathnames.h1
-rw-r--r--usr.sbin/makefs/msdos.h1
-rw-r--r--usr.sbin/makefs/msdos/direntry.h1
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_fat.c1
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_lookup.c1
-rw-r--r--usr.sbin/ndp/ndp.c1
-rw-r--r--usr.sbin/ntp/config.h1
-rw-r--r--usr.sbin/ntp/ntpdc/nl.c1
-rw-r--r--usr.sbin/pciconf/pathnames.h1
-rw-r--r--usr.sbin/route6d/route6d.c1
-rw-r--r--usr.sbin/route6d/route6d.h1
-rw-r--r--usr.sbin/rpc.lockd/lock_proc.c1
-rw-r--r--usr.sbin/rpc.lockd/lockd.c1
-rw-r--r--usr.sbin/rpc.lockd/lockd.h1
-rw-r--r--usr.sbin/rpc.lockd/lockd_lock.h1
-rw-r--r--usr.sbin/rpcbind/check_bound.c1
-rw-r--r--usr.sbin/rpcbind/pmap_svc.c1
-rw-r--r--usr.sbin/rpcbind/rpcb_svc.c1
-rw-r--r--usr.sbin/rpcbind/rpcb_svc_com.c1
-rw-r--r--usr.sbin/rpcbind/rpcbind.c1
-rw-r--r--usr.sbin/rpcbind/rpcbind.h1
-rw-r--r--usr.sbin/rpcbind/security.c1
-rw-r--r--usr.sbin/rtadvd/advcap.c1
-rw-r--r--usr.sbin/rtadvd/advcap.h1
-rw-r--r--usr.sbin/rtadvd/config.c1
-rw-r--r--usr.sbin/rtadvd/config.h1
-rw-r--r--usr.sbin/rtadvd/if.c1
-rw-r--r--usr.sbin/rtadvd/if.h1
-rw-r--r--usr.sbin/rtadvd/pathnames.h1
-rw-r--r--usr.sbin/rtadvd/rrenum.c1
-rw-r--r--usr.sbin/rtadvd/rrenum.h1
-rw-r--r--usr.sbin/rtadvd/rtadvd.c1
-rw-r--r--usr.sbin/rtadvd/rtadvd.h1
-rw-r--r--usr.sbin/rtadvd/timer.c1
-rw-r--r--usr.sbin/rtadvd/timer.h1
-rw-r--r--usr.sbin/rtadvd/timer_subr.c1
-rw-r--r--usr.sbin/rtadvd/timer_subr.h1
-rw-r--r--usr.sbin/rtsold/rtsock.c1
-rw-r--r--usr.sbin/sesutil/eltsub.c1
-rw-r--r--usr.sbin/sesutil/eltsub.h1
-rw-r--r--usr.sbin/tcpdump/tcpdump/config.h1
-rw-r--r--usr.sbin/unbound/config.h1
-rw-r--r--usr.sbin/usbconfig/dump.c1
-rw-r--r--usr.sbin/usbconfig/dump.h1
-rw-r--r--usr.sbin/usbconfig/usbconfig.c1
-rw-r--r--usr.sbin/valectl/valectl.c1
-rw-r--r--usr.sbin/vidcontrol/decode.h1
-rw-r--r--usr.sbin/vidcontrol/path.h1
-rw-r--r--usr.sbin/ypldap/aldap.c1
-rw-r--r--usr.sbin/ypldap/aldap.h1
-rw-r--r--usr.sbin/ypldap/ber.c1
-rw-r--r--usr.sbin/ypldap/ber.h1
-rw-r--r--usr.sbin/ypldap/entries.c1
-rw-r--r--usr.sbin/ypldap/ldapclient.c1
-rw-r--r--usr.sbin/ypldap/log.c1
-rw-r--r--usr.sbin/ypldap/parse.y1
-rw-r--r--usr.sbin/ypldap/yp.c1
-rw-r--r--usr.sbin/ypldap/ypldap.h1
-rw-r--r--usr.sbin/ypldap/ypldap_dns.c1
769 files changed, 0 insertions, 769 deletions
diff --git a/bin/chio/defs.h b/bin/chio/defs.h
index 8f10c9d9243a..6b4381a3d447 100644
--- a/bin/chio/defs.h
+++ b/bin/chio/defs.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h
index 5b9b1e429dc2..a8308ed7b0ac 100644
--- a/bin/chio/pathnames.h
+++ b/bin/chio/pathnames.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/csh/config.h b/bin/csh/config.h
index 103ceb604062..6705cc58f5bd 100644
--- a/bin/csh/config.h
+++ b/bin/csh/config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
diff --git a/bin/csh/config_p.h b/bin/csh/config_p.h
index c25e87a903ea..8b7ecd20de19 100644
--- a/bin/csh/config_p.h
+++ b/bin/csh/config_p.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* config.h -- configure various defines for tcsh
*
diff --git a/cddl/compat/opensolaris/include/libintl.h b/cddl/compat/opensolaris/include/libintl.h
index da13f4749081..5dbc06a75b2f 100644
--- a/cddl/compat/opensolaris/include/libintl.h
+++ b/cddl/compat/opensolaris/include/libintl.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _LIBINTL_H_
#define _LIBINTL_H_
diff --git a/cddl/compat/opensolaris/include/priv.h b/cddl/compat/opensolaris/include/priv.h
index 2fee5b0d40c8..182921a02b3f 100644
--- a/cddl/compat/opensolaris/include/priv.h
+++ b/cddl/compat/opensolaris/include/priv.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _OPENSOLARIS_PRIV_H_
#define _OPENSOLARIS_PRIV_H_
diff --git a/cddl/compat/opensolaris/include/solaris.h b/cddl/compat/opensolaris/include/solaris.h
index 9bead018bcec..b4fb71be92a6 100644
--- a/cddl/compat/opensolaris/include/solaris.h
+++ b/cddl/compat/opensolaris/include/solaris.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _SOLARIS_H_
#define _SOLARIS_H_
diff --git a/cddl/compat/opensolaris/include/zone.h b/cddl/compat/opensolaris/include/zone.h
index 8c377cf6574d..66a041772963 100644
--- a/cddl/compat/opensolaris/include/zone.h
+++ b/cddl/compat/opensolaris/include/zone.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _ZONE_H_
#define _ZONE_H_
diff --git a/include/getopt.h b/include/getopt.h
index 4c0399db8545..caeef8ff5ed7 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -1,5 +1,4 @@
/* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/include/gssapi.h b/include/gssapi.h
index 5557de8f7356..560edb730960 100644
--- a/include/gssapi.h
+++ b/include/gssapi.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifdef __GNUC__
#warning "this file includes <gssapi.h> which is deprecated, use <gssapi/gssapi.h> instead"
#endif
diff --git a/include/hesiod.h b/include/hesiod.h
index a06b69d32413..1fb96b4dc0e0 100644
--- a/include/hesiod.h
+++ b/include/hesiod.h
@@ -1,5 +1,4 @@
/* $NetBSD: hesiod.h,v 1.3 1999/01/24 23:53:18 lukem Exp $ */
-/* $FreeBSD$ */
/*-
diff --git a/include/iconv.h b/include/iconv.h
index 338ca1544d8a..05e7427a4bf0 100644
--- a/include/iconv.h
+++ b/include/iconv.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $ */
/*-
diff --git a/include/ieeefp.h b/include/ieeefp.h
index 3f64555d5a14..0639150e40b9 100644
--- a/include/ieeefp.h
+++ b/include/ieeefp.h
@@ -1,5 +1,4 @@
/* $NetBSD: ieeefp.h,v 1.4 1998/01/09 08:03:43 perry Exp $ */
-/* $FreeBSD$ */
/*
* Written by J.T. Conklin, Apr 6, 1995
diff --git a/include/ifaddrs.h b/include/ifaddrs.h
index 5e1953639af6..08a4a695b89f 100644
--- a/include/ifaddrs.h
+++ b/include/ifaddrs.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-1-Clause
diff --git a/include/libgen.h b/include/libgen.h
index 615d1dd6202e..036362ebcb9a 100644
--- a/include/libgen.h
+++ b/include/libgen.h
@@ -1,5 +1,4 @@
/* $OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/include/netconfig.h b/include/netconfig.h
index c4aec6a3e791..6185d6890dfa 100644
--- a/include/netconfig.h
+++ b/include/netconfig.h
@@ -1,5 +1,4 @@
/* $NetBSD: netconfig.h,v 1.6 2008/04/28 20:22:54 martin Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/include/nsswitch.h b/include/nsswitch.h
index e44a9e4a44a3..b94ffdcab291 100644
--- a/include/nsswitch.h
+++ b/include/nsswitch.h
@@ -1,5 +1,4 @@
/* $NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/include/readpassphrase.h b/include/readpassphrase.h
index fd54642da21b..9dfef0bc9f25 100644
--- a/include/readpassphrase.h
+++ b/include/readpassphrase.h
@@ -1,5 +1,4 @@
/* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: ISC
diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h
index 3b860d8c7ac3..d395dbf49a46 100644
--- a/include/rpc/auth_des.h
+++ b/include/rpc/auth_des.h
@@ -1,5 +1,4 @@
/* @(#)auth_des.h 2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
*
diff --git a/include/rpc/auth_kerb.h b/include/rpc/auth_kerb.h
index 29b09d507006..726741f91ddb 100644
--- a/include/rpc/auth_kerb.h
+++ b/include/rpc/auth_kerb.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
*
diff --git a/include/rpc/clnt_soc.h b/include/rpc/clnt_soc.h
index c16609bb6aac..e20edc4cca0a 100644
--- a/include/rpc/clnt_soc.h
+++ b/include/rpc/clnt_soc.h
@@ -1,5 +1,4 @@
/* $NetBSD: clnt_soc.h,v 1.1 2000/06/02 22:57:55 fvdl Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/include/rpc/clnt_stat.h b/include/rpc/clnt_stat.h
index 6148b4eb94a5..7b367132f2d4 100644
--- a/include/rpc/clnt_stat.h
+++ b/include/rpc/clnt_stat.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 1986 - 1991, 1994, 1996, 1997 by Sun Microsystems, Inc.
* All rights reserved.
diff --git a/include/rpc/des.h b/include/rpc/des.h
index 93698cce6cbc..4c3ca16e8e39 100644
--- a/include/rpc/des.h
+++ b/include/rpc/des.h
@@ -1,5 +1,4 @@
/* @(#)des.h 2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
*
diff --git a/include/rpc/nettype.h b/include/rpc/nettype.h
index 39c1f76970fb..42986de892db 100644
--- a/include/rpc/nettype.h
+++ b/include/rpc/nettype.h
@@ -1,5 +1,4 @@
/* $NetBSD: nettype.h,v 1.2 2000/07/06 03:17:19 christos Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/include/rpc/raw.h b/include/rpc/raw.h
index b56b9026d93f..9c4e8b05dd2c 100644
--- a/include/rpc/raw.h
+++ b/include/rpc/raw.h
@@ -1,5 +1,4 @@
/* $NetBSD: raw.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/include/rpc/rpc_com.h b/include/rpc/rpc_com.h
index dd331e2601f6..a98e3f73bac8 100644
--- a/include/rpc/rpc_com.h
+++ b/include/rpc/rpc_com.h
@@ -1,5 +1,4 @@
/* $NetBSD: rpc_com.h,v 1.3 2000/12/10 04:10:08 christos Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/include/rpc/rpcb_clnt.h b/include/rpc/rpcb_clnt.h
index b642aacd6a57..4b1f58d273ff 100644
--- a/include/rpc/rpcb_clnt.h
+++ b/include/rpc/rpcb_clnt.h
@@ -1,5 +1,4 @@
/* $NetBSD: rpcb_clnt.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/include/rpc/rpcent.h b/include/rpc/rpcent.h
index 15c4ae4d00a6..b9f154d4ebfe 100644
--- a/include/rpc/rpcent.h
+++ b/include/rpc/rpcent.h
@@ -1,5 +1,4 @@
/* $NetBSD: rpcent.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/include/rpc/svc_dg.h b/include/rpc/svc_dg.h
index d9f3012c4f06..51397113d372 100644
--- a/include/rpc/svc_dg.h
+++ b/include/rpc/svc_dg.h
@@ -1,5 +1,4 @@
/* $NetBSD: svc_dg.h,v 1.1 2000/06/02 23:11:16 fvdl Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/include/rpc/svc_soc.h b/include/rpc/svc_soc.h
index 912e2ec2df1f..e82215b33d65 100644
--- a/include/rpc/svc_soc.h
+++ b/include/rpc/svc_soc.h
@@ -1,5 +1,4 @@
/* $NetBSD: svc_soc.h,v 1.1 2000/06/02 22:57:57 fvdl Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/include/rpcsvc/nis_object.x b/include/rpcsvc/nis_object.x
index f63cf938571a..1507828b60ff 100644
--- a/include/rpcsvc/nis_object.x
+++ b/include/rpcsvc/nis_object.x
@@ -36,7 +36,6 @@
* All Rights Reserved.
*/
-/* $FreeBSD$ */
/* From: %#pragma ident "@(#)nis_object.x 1.10 94/05/03 SMI" */
#if RPC_HDR
diff --git a/include/rpcsvc/nis_tags.h b/include/rpcsvc/nis_tags.h
index 55920a0297fd..0c30d9b33a82 100644
--- a/include/rpcsvc/nis_tags.h
+++ b/include/rpcsvc/nis_tags.h
@@ -45,7 +45,6 @@
#ifndef _RPCSVC_NIS_TAGS_H
#define _RPCSVC_NIS_TAGS_H
-/* $FreeBSD$ */
/* From: #pragma ident "@(#)nis_tags.h 1.10 94/05/03 SMI" */
/* from file: zns_tags.h 1.7 Copyright (c) 1990 Sun Microsystems */
diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h
index 73aacf8dfa6e..7e59c57727f6 100644
--- a/kerberos5/include/config.h
+++ b/kerberos5/include/config.h
@@ -1,7 +1,6 @@
/* include/config.h. Generated from config.h.in by configure. */
/* include/config.h.in. Generated from configure.ac by autoheader. */
-/* $FreeBSD$ */
#ifndef RCSID
#define RCSID(msg) \
diff --git a/kerberos5/include/crypto-headers.h b/kerberos5/include/crypto-headers.h
index 625c8083a6eb..3ae0d9624ffd 100644
--- a/kerberos5/include/crypto-headers.h
+++ b/kerberos5/include/crypto-headers.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef __crypto_headers_h__
#define __crypto_headers_h__
diff --git a/kerberos5/include/krb5-types.h b/kerberos5/include/krb5-types.h
index 32b20fae88ca..8d228ecc2d4a 100644
--- a/kerberos5/include/krb5-types.h
+++ b/kerberos5/include/krb5-types.h
@@ -2,7 +2,6 @@
* generic krb5-types.h for cross compiling, assume system is posix/sus
*/
-/* $FreeBSD$ */
#ifndef __krb5_types_h__
#define __krb5_types_h__
diff --git a/kerberos5/include/version.h b/kerberos5/include/version.h
index ee4d93db1947..de3758e47ffa 100644
--- a/kerberos5/include/version.h
+++ b/kerberos5/include/version.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef VERSION_HIDDEN
#define VERSION_HIDDEN
#endif
diff --git a/kerberos5/lib/libgssapi_krb5/gss_oid.c b/kerberos5/lib/libgssapi_krb5/gss_oid.c
index d359afae4d31..a52c66abbc89 100644
--- a/kerberos5/lib/libgssapi_krb5/gss_oid.c
+++ b/kerberos5/lib/libgssapi_krb5/gss_oid.c
@@ -1,5 +1,4 @@
/* Generated file */
-/* $FreeBSD$ */
#include <gssapi/gssapi.h>
#include <roken.h>
#include "config.h"
diff --git a/kerberos5/lib/libgssapi_krb5/pname_to_uid.c b/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
index 9c996479947e..faf54cf1e5ea 100644
--- a/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
+++ b/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <errno.h>
#include <pwd.h>
diff --git a/lib/csu/aarch64/crt.h b/lib/csu/aarch64/crt.h
index 9f41c2fac0fe..d3dcf25e9039 100644
--- a/lib/csu/aarch64/crt.h
+++ b/lib/csu/aarch64/crt.h
@@ -1,2 +1 @@
-/* $FreeBSD$ */
/* Empty so we can include this unconditionally */
diff --git a/lib/csu/arm/crt.h b/lib/csu/arm/crt.h
index 9f41c2fac0fe..d3dcf25e9039 100644
--- a/lib/csu/arm/crt.h
+++ b/lib/csu/arm/crt.h
@@ -1,2 +1 @@
-/* $FreeBSD$ */
/* Empty so we can include this unconditionally */
diff --git a/lib/csu/riscv/crt.h b/lib/csu/riscv/crt.h
index 8332092a36ad..e6b6b97f2525 100644
--- a/lib/csu/riscv/crt.h
+++ b/lib/csu/riscv/crt.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _CRT_H_
#define _CRT_H_
diff --git a/lib/libblocksruntime/config.h b/lib/libblocksruntime/config.h
index 36418d30fedf..fe7921dba95a 100644
--- a/lib/libblocksruntime/config.h
+++ b/lib/libblocksruntime/config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* #undef HAVE_SYS_BYTEORDER_H */
/* #undef HAVE_AVAILABILITY_MACROS_H */
diff --git a/lib/libc++/libc++.ldscript b/lib/libc++/libc++.ldscript
index bec57f161698..50f8581fec58 100644
--- a/lib/libc++/libc++.ldscript
+++ b/lib/libc++/libc++.ldscript
@@ -1,2 +1 @@
-/* $FreeBSD$ */
GROUP ( @@SHLIB@@ @@LIBDIR@@/libcxxrt.so )
diff --git a/lib/libc/amd64/gen/fpgetmask.c b/lib/libc/amd64/gen/fpgetmask.c
index 03bb2741ef6a..a1ab8a79c2ea 100644
--- a/lib/libc/amd64/gen/fpgetmask.c
+++ b/lib/libc/amd64/gen/fpgetmask.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define __IEEEFP_NOINLINES__ 1
#include <ieeefp.h>
diff --git a/lib/libc/amd64/gen/fpgetprec.c b/lib/libc/amd64/gen/fpgetprec.c
index 22d21480566a..eed244f3c36f 100644
--- a/lib/libc/amd64/gen/fpgetprec.c
+++ b/lib/libc/amd64/gen/fpgetprec.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define __IEEEFP_NOINLINES__ 1
#include <ieeefp.h>
diff --git a/lib/libc/amd64/gen/fpgetround.c b/lib/libc/amd64/gen/fpgetround.c
index 9c066b149ca2..6d79bb9d30c6 100644
--- a/lib/libc/amd64/gen/fpgetround.c
+++ b/lib/libc/amd64/gen/fpgetround.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define __IEEEFP_NOINLINES__ 1
#include <ieeefp.h>
diff --git a/lib/libc/amd64/gen/fpgetsticky.c b/lib/libc/amd64/gen/fpgetsticky.c
index c3acb91d63e5..842fb2cdf748 100644
--- a/lib/libc/amd64/gen/fpgetsticky.c
+++ b/lib/libc/amd64/gen/fpgetsticky.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define __IEEEFP_NOINLINES__ 1
#include <ieeefp.h>
diff --git a/lib/libc/amd64/gen/fpsetmask.c b/lib/libc/amd64/gen/fpsetmask.c
index 996e167ac1d9..808144dce4b8 100644
--- a/lib/libc/amd64/gen/fpsetmask.c
+++ b/lib/libc/amd64/gen/fpsetmask.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define __IEEEFP_NOINLINES__ 1
#include <ieeefp.h>
diff --git a/lib/libc/amd64/gen/fpsetprec.c b/lib/libc/amd64/gen/fpsetprec.c
index 5898de7e0e82..8fd0249652bd 100644
--- a/lib/libc/amd64/gen/fpsetprec.c
+++ b/lib/libc/amd64/gen/fpsetprec.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define __IEEEFP_NOINLINES__ 1
#include <ieeefp.h>
diff --git a/lib/libc/amd64/gen/fpsetround.c b/lib/libc/amd64/gen/fpsetround.c
index 6f13367510d6..a069ec2e372c 100644
--- a/lib/libc/amd64/gen/fpsetround.c
+++ b/lib/libc/amd64/gen/fpsetround.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define __IEEEFP_NOINLINES__ 1
#include <ieeefp.h>
diff --git a/lib/libc/amd64/string/memcpy.S b/lib/libc/amd64/string/memcpy.S
index 2b6c73abeb98..1876ee600f20 100644
--- a/lib/libc/amd64/string/memcpy.S
+++ b/lib/libc/amd64/string/memcpy.S
@@ -1,5 +1,4 @@
/* $NetBSD: memcpy.S,v 1.1 2001/06/19 00:25:05 fvdl Exp $ */
-/* $FreeBSD$ */
#define MEMCPY
#include "memmove.S"
diff --git a/lib/libc/arm/softfloat/arm-gcc.h b/lib/libc/arm/softfloat/arm-gcc.h
index 0e20ef91f059..00ee99a5af3e 100644
--- a/lib/libc/arm/softfloat/arm-gcc.h
+++ b/lib/libc/arm/softfloat/arm-gcc.h
@@ -1,5 +1,4 @@
/* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
-/* $FreeBSD$ */
/*
-------------------------------------------------------------------------------
diff --git a/lib/libc/arm/softfloat/milieu.h b/lib/libc/arm/softfloat/milieu.h
index 54775c768b91..a3f829c4281b 100644
--- a/lib/libc/arm/softfloat/milieu.h
+++ b/lib/libc/arm/softfloat/milieu.h
@@ -1,5 +1,4 @@
/* $NetBSD: milieu.h,v 1.1 2000/12/29 20:13:54 bjh21 Exp $ */
-/* $FreeBSD$ */
/*
===============================================================================
diff --git a/lib/libc/arm/softfloat/softfloat.h b/lib/libc/arm/softfloat/softfloat.h
index 6aef49975a38..d202a1f7f420 100644
--- a/lib/libc/arm/softfloat/softfloat.h
+++ b/lib/libc/arm/softfloat/softfloat.h
@@ -1,5 +1,4 @@
/* $NetBSD: softfloat.h,v 1.6 2002/05/12 13:12:46 bjh21 Exp $ */
-/* $FreeBSD$ */
/* This is a derivative work. */
diff --git a/lib/libc/iconv/_strtol.h b/lib/libc/iconv/_strtol.h
index dee7bab733e8..786ae2efbaa9 100644
--- a/lib/libc/iconv/_strtol.h
+++ b/lib/libc/iconv/_strtol.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: _strtol.h,v 1.2 2009/05/20 22:03:29 christos Exp $ */
/*-
diff --git a/lib/libc/iconv/_strtoul.h b/lib/libc/iconv/_strtoul.h
index 2dd3e92ba302..2d5c7776b0e3 100644
--- a/lib/libc/iconv/_strtoul.h
+++ b/lib/libc/iconv/_strtoul.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: _strtoul.h,v 1.1 2008/08/20 12:42:26 joerg Exp $ */
/*-
diff --git a/lib/libc/iconv/bsd_iconv.c b/lib/libc/iconv/bsd_iconv.c
index 0fcff0e2d1b8..04583ebcf6c0 100644
--- a/lib/libc/iconv/bsd_iconv.c
+++ b/lib/libc/iconv/bsd_iconv.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: iconv.c,v 1.11 2009/03/03 16:22:33 explorer Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_aliasname_local.h b/lib/libc/iconv/citrus_aliasname_local.h
index 0dc883a54c92..e4ae8c70562c 100644
--- a/lib/libc/iconv/citrus_aliasname_local.h
+++ b/lib/libc/iconv/citrus_aliasname_local.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_aliasname_local.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_bcs.c b/lib/libc/iconv/citrus_bcs.c
index cd88ea7fe2fd..9e7cb8c0749f 100644
--- a/lib/libc/iconv/citrus_bcs.c
+++ b/lib/libc/iconv/citrus_bcs.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_bcs.c,v 1.5 2005/05/14 17:55:42 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_bcs.h b/lib/libc/iconv/citrus_bcs.h
index 3bf6f72e988e..ba4d97aa7c3f 100644
--- a/lib/libc/iconv/citrus_bcs.h
+++ b/lib/libc/iconv/citrus_bcs.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_bcs.h,v 1.6 2009/01/11 02:46:24 christos Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_bcs_strtol.c b/lib/libc/iconv/citrus_bcs_strtol.c
index fda263b6479f..c1273acba344 100644
--- a/lib/libc/iconv/citrus_bcs_strtol.c
+++ b/lib/libc/iconv/citrus_bcs_strtol.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_bcs_strtol.c,v 1.4 2013/04/26 21:20:47 joerg Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_bcs_strtoul.c b/lib/libc/iconv/citrus_bcs_strtoul.c
index 981aa5ad1b8c..0ea896d90b0e 100644
--- a/lib/libc/iconv/citrus_bcs_strtoul.c
+++ b/lib/libc/iconv/citrus_bcs_strtoul.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_bcs_strtoul.c,v 1.5 2013/04/26 21:20:48 joerg Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_csmapper.c b/lib/libc/iconv/citrus_csmapper.c
index 90d52cba2ce3..e59ccfb3f02a 100644
--- a/lib/libc/iconv/citrus_csmapper.c
+++ b/lib/libc/iconv/citrus_csmapper.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_csmapper.c,v 1.11 2011/11/20 07:43:52 tnozaki Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_csmapper.h b/lib/libc/iconv/citrus_csmapper.h
index cdc7b0e3375e..d19e754adb44 100644
--- a/lib/libc/iconv/citrus_csmapper.h
+++ b/lib/libc/iconv/citrus_csmapper.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_csmapper.h,v 1.3 2013/06/24 17:28:35 joerg Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_db.c b/lib/libc/iconv/citrus_db.c
index 09df5bfaf07f..4a89a9cb86f4 100644
--- a/lib/libc/iconv/citrus_db.c
+++ b/lib/libc/iconv/citrus_db.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_db.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_db.h b/lib/libc/iconv/citrus_db.h
index fd46675a5d0b..b885df55c53f 100644
--- a/lib/libc/iconv/citrus_db.h
+++ b/lib/libc/iconv/citrus_db.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_db.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_db_factory.c b/lib/libc/iconv/citrus_db_factory.c
index fd3375d6b2e0..589c1f43a60b 100644
--- a/lib/libc/iconv/citrus_db_factory.c
+++ b/lib/libc/iconv/citrus_db_factory.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_db_factory.c,v 1.10 2013/09/14 13:05:51 joerg Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_db_factory.h b/lib/libc/iconv/citrus_db_factory.h
index c542046532c1..cf3c1b166cb7 100644
--- a/lib/libc/iconv/citrus_db_factory.h
+++ b/lib/libc/iconv/citrus_db_factory.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_db_factory.h,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_db_file.h b/lib/libc/iconv/citrus_db_file.h
index 7eea27694746..6fedc6064646 100644
--- a/lib/libc/iconv/citrus_db_file.h
+++ b/lib/libc/iconv/citrus_db_file.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_db_file.h,v 1.4 2008/02/10 05:58:22 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_db_hash.c b/lib/libc/iconv/citrus_db_hash.c
index 1033c3fe8867..9e9918e38655 100644
--- a/lib/libc/iconv/citrus_db_hash.c
+++ b/lib/libc/iconv/citrus_db_hash.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_db_hash.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_db_hash.h b/lib/libc/iconv/citrus_db_hash.h
index ca2caa5282af..5f8703396502 100644
--- a/lib/libc/iconv/citrus_db_hash.h
+++ b/lib/libc/iconv/citrus_db_hash.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_db_hash.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_esdb.c b/lib/libc/iconv/citrus_esdb.c
index a07d5d09e72f..15c107566101 100644
--- a/lib/libc/iconv/citrus_esdb.c
+++ b/lib/libc/iconv/citrus_esdb.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_esdb.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_esdb.h b/lib/libc/iconv/citrus_esdb.h
index a2fb8041554d..3c4ef2f7e1e6 100644
--- a/lib/libc/iconv/citrus_esdb.h
+++ b/lib/libc/iconv/citrus_esdb.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_esdb.h,v 1.1 2003/06/25 09:51:32 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_esdb_file.h b/lib/libc/iconv/citrus_esdb_file.h
index 518d35587326..81548d49c061 100644
--- a/lib/libc/iconv/citrus_esdb_file.h
+++ b/lib/libc/iconv/citrus_esdb_file.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_esdb_file.h,v 1.1 2003/06/25 09:51:32 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_fix_grouping.h b/lib/libc/iconv/citrus_fix_grouping.h
index 31f9c23f42de..460989426b53 100644
--- a/lib/libc/iconv/citrus_fix_grouping.h
+++ b/lib/libc/iconv/citrus_fix_grouping.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_fix_grouping.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_hash.c b/lib/libc/iconv/citrus_hash.c
index aff6d55bcfbd..9dcf86354b3d 100644
--- a/lib/libc/iconv/citrus_hash.c
+++ b/lib/libc/iconv/citrus_hash.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_hash.c,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_hash.h b/lib/libc/iconv/citrus_hash.h
index 62f2ae23b872..d44571d00a40 100644
--- a/lib/libc/iconv/citrus_hash.h
+++ b/lib/libc/iconv/citrus_hash.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_hash.h,v 1.3 2004/01/02 21:49:35 itojun Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_iconv.c b/lib/libc/iconv/citrus_iconv.c
index fbabf6524399..73986cb5b033 100644
--- a/lib/libc/iconv/citrus_iconv.c
+++ b/lib/libc/iconv/citrus_iconv.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_iconv.c,v 1.10 2011/11/19 18:34:21 tnozaki Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_iconv.h b/lib/libc/iconv/citrus_iconv.h
index 8fe630af6c2d..49117cc15051 100644
--- a/lib/libc/iconv/citrus_iconv.h
+++ b/lib/libc/iconv/citrus_iconv.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_iconv.h,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_iconv_local.h b/lib/libc/iconv/citrus_iconv_local.h
index bd02d085d1ca..0374a05c324c 100644
--- a/lib/libc/iconv/citrus_iconv_local.h
+++ b/lib/libc/iconv/citrus_iconv_local.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_iconv_local.h,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_lock.h b/lib/libc/iconv/citrus_lock.h
index f49b338a6d63..7c42e7bc7c26 100644
--- a/lib/libc/iconv/citrus_lock.h
+++ b/lib/libc/iconv/citrus_lock.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libc/iconv/citrus_lookup.c b/lib/libc/iconv/citrus_lookup.c
index 51a82951376c..4d66a7d53ef2 100644
--- a/lib/libc/iconv/citrus_lookup.c
+++ b/lib/libc/iconv/citrus_lookup.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_lookup.c,v 1.7 2012/05/04 16:45:05 joerg Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_lookup.h b/lib/libc/iconv/citrus_lookup.h
index 88a0d4e7ef51..53ce42ea943b 100644
--- a/lib/libc/iconv/citrus_lookup.h
+++ b/lib/libc/iconv/citrus_lookup.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_lookup.h,v 1.2 2004/07/21 14:16:34 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_lookup_factory.c b/lib/libc/iconv/citrus_lookup_factory.c
index 85d20dfe8cfe..c2afe1d869b8 100644
--- a/lib/libc/iconv/citrus_lookup_factory.c
+++ b/lib/libc/iconv/citrus_lookup_factory.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_lookup_factory.c,v 1.4 2003/10/27 00:12:42 lukem Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_lookup_factory.h b/lib/libc/iconv/citrus_lookup_factory.h
index e716184a8d17..e630578b931e 100644
--- a/lib/libc/iconv/citrus_lookup_factory.h
+++ b/lib/libc/iconv/citrus_lookup_factory.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_lookup_factory.h,v 1.1 2003/06/25 09:51:35 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_lookup_file.h b/lib/libc/iconv/citrus_lookup_file.h
index a2ada5fc7d5c..c7510d134d00 100644
--- a/lib/libc/iconv/citrus_lookup_file.h
+++ b/lib/libc/iconv/citrus_lookup_file.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_lookup_file.h,v 1.1 2003/06/25 09:51:36 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_mapper.c b/lib/libc/iconv/citrus_mapper.c
index cbc0a58c35c9..5b919a9e9c92 100644
--- a/lib/libc/iconv/citrus_mapper.c
+++ b/lib/libc/iconv/citrus_mapper.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper.c,v 1.10 2012/06/08 07:49:42 martin Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_mapper.h b/lib/libc/iconv/citrus_mapper.h
index 7e9056c761e9..ae093fc97ce3 100644
--- a/lib/libc/iconv/citrus_mapper.h
+++ b/lib/libc/iconv/citrus_mapper.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper.h,v 1.3 2003/07/12 15:39:19 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_mapper_local.h b/lib/libc/iconv/citrus_mapper_local.h
index cfdb3be868e2..cb18e2eae8c1 100644
--- a/lib/libc/iconv/citrus_mapper_local.h
+++ b/lib/libc/iconv/citrus_mapper_local.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_local.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_memstream.c b/lib/libc/iconv/citrus_memstream.c
index 51092cb792b7..25ab088ee413 100644
--- a/lib/libc/iconv/citrus_memstream.c
+++ b/lib/libc/iconv/citrus_memstream.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_memstream.c,v 1.5 2012/03/13 21:13:31 christos Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_memstream.h b/lib/libc/iconv/citrus_memstream.h
index 4c398a8c7a5b..998aeefe1dff 100644
--- a/lib/libc/iconv/citrus_memstream.h
+++ b/lib/libc/iconv/citrus_memstream.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_memstream.h,v 1.3 2005/05/14 17:55:42 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_mmap.c b/lib/libc/iconv/citrus_mmap.c
index e058f3d2cdc3..b48242d94d38 100644
--- a/lib/libc/iconv/citrus_mmap.c
+++ b/lib/libc/iconv/citrus_mmap.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mmap.c,v 1.4 2011/10/15 23:00:01 christos Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_mmap.h b/lib/libc/iconv/citrus_mmap.h
index 83520646f378..b06ddd4909c6 100644
--- a/lib/libc/iconv/citrus_mmap.h
+++ b/lib/libc/iconv/citrus_mmap.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mmap.h,v 1.1 2003/06/25 09:51:38 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_module.c b/lib/libc/iconv/citrus_module.c
index 64ef0271ea18..25150032cda4 100644
--- a/lib/libc/iconv/citrus_module.c
+++ b/lib/libc/iconv/citrus_module.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_module.c,v 1.9 2009/01/11 02:46:24 christos Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_module.h b/lib/libc/iconv/citrus_module.h
index 0bcb53e2efa5..c733fb1fe3cb 100644
--- a/lib/libc/iconv/citrus_module.h
+++ b/lib/libc/iconv/citrus_module.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_module.h,v 1.1 2002/03/17 22:14:20 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_namespace.h b/lib/libc/iconv/citrus_namespace.h
index 4244c70d701e..3e57ba7e7854 100644
--- a/lib/libc/iconv/citrus_namespace.h
+++ b/lib/libc/iconv/citrus_namespace.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_namespace.h,v 1.8 2009/01/11 02:46:24 christos Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_none.c b/lib/libc/iconv/citrus_none.c
index 033fe4011e00..3ae0a236f8f1 100644
--- a/lib/libc/iconv/citrus_none.c
+++ b/lib/libc/iconv/citrus_none.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_none.c,v 1.18 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_none.h b/lib/libc/iconv/citrus_none.h
index a0ebd61f296e..241b4db1cd58 100644
--- a/lib/libc/iconv/citrus_none.h
+++ b/lib/libc/iconv/citrus_none.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_none.h,v 1.3 2003/06/25 09:51:38 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_pivot_factory.c b/lib/libc/iconv/citrus_pivot_factory.c
index c307a9d5aa32..8441ae3c5cdb 100644
--- a/lib/libc/iconv/citrus_pivot_factory.c
+++ b/lib/libc/iconv/citrus_pivot_factory.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_pivot_factory.c,v 1.7 2009/04/12 14:20:19 lukem Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_pivot_factory.h b/lib/libc/iconv/citrus_pivot_factory.h
index adbfc8c77524..0b4d8513f732 100644
--- a/lib/libc/iconv/citrus_pivot_factory.h
+++ b/lib/libc/iconv/citrus_pivot_factory.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_pivot_factory.h,v 1.1 2003/06/25 09:51:39 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_pivot_file.h b/lib/libc/iconv/citrus_pivot_file.h
index b2b4f2408dba..24b9101b9071 100644
--- a/lib/libc/iconv/citrus_pivot_file.h
+++ b/lib/libc/iconv/citrus_pivot_file.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_pivot_file.h,v 1.1 2003/06/25 09:51:39 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_prop.c b/lib/libc/iconv/citrus_prop.c
index 0b627f362c22..283200f10073 100644
--- a/lib/libc/iconv/citrus_prop.c
+++ b/lib/libc/iconv/citrus_prop.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_prop.c,v 1.4 2011/03/30 08:22:01 jruoho Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_prop.h b/lib/libc/iconv/citrus_prop.h
index f09c833b8da6..065055f0d9bc 100644
--- a/lib/libc/iconv/citrus_prop.h
+++ b/lib/libc/iconv/citrus_prop.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_prop.h,v 1.5 2011/05/23 14:52:32 joerg Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_region.h b/lib/libc/iconv/citrus_region.h
index 0a78eec2b85c..f84d4163e240 100644
--- a/lib/libc/iconv/citrus_region.h
+++ b/lib/libc/iconv/citrus_region.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_region.h,v 1.7 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_stdenc.c b/lib/libc/iconv/citrus_stdenc.c
index 2bc79a11d333..afb472507c14 100644
--- a/lib/libc/iconv/citrus_stdenc.c
+++ b/lib/libc/iconv/citrus_stdenc.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_stdenc.c,v 1.4 2011/11/19 18:39:58 tnozaki Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_stdenc.h b/lib/libc/iconv/citrus_stdenc.h
index a643b77a27aa..7367a917ea1c 100644
--- a/lib/libc/iconv/citrus_stdenc.h
+++ b/lib/libc/iconv/citrus_stdenc.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_stdenc.h,v 1.4 2005/10/29 18:02:04 tshiozak Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_stdenc_local.h b/lib/libc/iconv/citrus_stdenc_local.h
index 2af3b8a992b7..057120e5dcab 100644
--- a/lib/libc/iconv/citrus_stdenc_local.h
+++ b/lib/libc/iconv/citrus_stdenc_local.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_stdenc_local.h,v 1.4 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_stdenc_template.h b/lib/libc/iconv/citrus_stdenc_template.h
index 06fca844392f..eec40c8eaf4f 100644
--- a/lib/libc/iconv/citrus_stdenc_template.h
+++ b/lib/libc/iconv/citrus_stdenc_template.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_stdenc_template.h,v 1.4 2008/02/09 14:56:20 junyoung Exp $ */
/*-
diff --git a/lib/libc/iconv/citrus_types.h b/lib/libc/iconv/citrus_types.h
index 2e4be11dd4cd..55ef4929ec6f 100644
--- a/lib/libc/iconv/citrus_types.h
+++ b/lib/libc/iconv/citrus_types.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_types.h,v 1.3 2003/10/27 00:12:42 lukem Exp $ */
/*-
diff --git a/lib/libc/include/isc/list.h b/lib/libc/include/isc/list.h
index cdc98a8474be..66c67a72a22b 100644
--- a/lib/libc/include/isc/list.h
+++ b/lib/libc/include/isc/list.h
@@ -17,7 +17,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $FreeBSD$ */
#ifndef LIST_H
#define LIST_H 1
diff --git a/lib/libc/include/isc/platform.h b/lib/libc/include/isc/platform.h
index b514cb4243a3..06997eea3c8e 100644
--- a/lib/libc/include/isc/platform.h
+++ b/lib/libc/include/isc/platform.h
@@ -17,7 +17,6 @@
*/
/* $Id: platform.h.in,v 1.2.6.2 2008/01/23 02:15:02 tbox Exp $ */
-/* $FreeBSD$ */
/*! \file */
diff --git a/lib/libc/include/port_after.h b/lib/libc/include/port_after.h
index 94f3a6431e98..1bbece4f350b 100644
--- a/lib/libc/include/port_after.h
+++ b/lib/libc/include/port_after.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _PORT_AFTER_H_
#define _PORT_AFTER_H_
diff --git a/lib/libc/include/port_before.h b/lib/libc/include/port_before.h
index 430d23363c87..cfc43c53f157 100644
--- a/lib/libc/include/port_before.h
+++ b/lib/libc/include/port_before.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _PORT_BEFORE_H_
#define _PORT_BEFORE_H_
diff --git a/lib/libc/libc.ldscript b/lib/libc/libc.ldscript
index 02e4d962a318..0e89e1868f9a 100644
--- a/lib/libc/libc.ldscript
+++ b/lib/libc/libc.ldscript
@@ -1,2 +1 @@
-/* $FreeBSD$ */
GROUP ( @@SHLIB@@ @@LIBDIR@@/libc_nonshared.a @@LIBDIR@@/libssp_nonshared.a )
diff --git a/lib/libc/libc_nossp.ldscript b/lib/libc/libc_nossp.ldscript
index c610cc21e018..be6325610595 100644
--- a/lib/libc/libc_nossp.ldscript
+++ b/lib/libc/libc_nossp.ldscript
@@ -1,2 +1 @@
-/* $FreeBSD$ */
GROUP ( @@SHLIB@@ @@LIBDIR@@/libc_nonshared.a )
diff --git a/lib/libc/locale/c16rtomb_iconv.c b/lib/libc/locale/c16rtomb_iconv.c
index 86bd9dab2a52..df671bd6e320 100644
--- a/lib/libc/locale/c16rtomb_iconv.c
+++ b/lib/libc/locale/c16rtomb_iconv.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define charXX_t char16_t
#define cXXrtomb c16rtomb
#define cXXrtomb_l c16rtomb_l
diff --git a/lib/libc/locale/c32rtomb_iconv.c b/lib/libc/locale/c32rtomb_iconv.c
index dabbfd7f7ab4..5d89baac3f69 100644
--- a/lib/libc/locale/c32rtomb_iconv.c
+++ b/lib/libc/locale/c32rtomb_iconv.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define charXX_t char32_t
#define cXXrtomb c32rtomb
#define cXXrtomb_l c32rtomb_l
diff --git a/lib/libc/locale/mbrtoc16_iconv.c b/lib/libc/locale/mbrtoc16_iconv.c
index f1eaf1925496..f4e37a0489eb 100644
--- a/lib/libc/locale/mbrtoc16_iconv.c
+++ b/lib/libc/locale/mbrtoc16_iconv.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define charXX_t char16_t
#define mbrtocXX mbrtoc16
#define mbrtocXX_l mbrtoc16_l
diff --git a/lib/libc/locale/mbrtoc32_iconv.c b/lib/libc/locale/mbrtoc32_iconv.c
index ec2c0145d9d6..503d7b378538 100644
--- a/lib/libc/locale/mbrtoc32_iconv.c
+++ b/lib/libc/locale/mbrtoc32_iconv.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define charXX_t char32_t
#define mbrtocXX mbrtoc32
#define mbrtocXX_l mbrtoc32_l
diff --git a/lib/libc/mips/SYS.h b/lib/libc/mips/SYS.h
index c4767a5cd96b..2fbbfe0737e4 100644
--- a/lib/libc/mips/SYS.h
+++ b/lib/libc/mips/SYS.h
@@ -1,5 +1,4 @@
/* $NetBSD: SYS.h,v 1.19 2009/12/14 01:07:41 matt Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: (BSD-4-Clause AND BSD-3-Clause)
diff --git a/lib/libc/mips/softfloat/milieu.h b/lib/libc/mips/softfloat/milieu.h
index e04b26692113..0bf7e42d5f70 100644
--- a/lib/libc/mips/softfloat/milieu.h
+++ b/lib/libc/mips/softfloat/milieu.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
===============================================================================
diff --git a/lib/libc/mips/softfloat/mips-gcc.h b/lib/libc/mips/softfloat/mips-gcc.h
index c8ec07c839c8..1a588921b3e6 100644
--- a/lib/libc/mips/softfloat/mips-gcc.h
+++ b/lib/libc/mips/softfloat/mips-gcc.h
@@ -1,5 +1,4 @@
/* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
-/* $FreeBSD$ */
/*
-------------------------------------------------------------------------------
diff --git a/lib/libc/mips/softfloat/softfloat.h b/lib/libc/mips/softfloat/softfloat.h
index 6aef49975a38..d202a1f7f420 100644
--- a/lib/libc/mips/softfloat/softfloat.h
+++ b/lib/libc/mips/softfloat/softfloat.h
@@ -1,5 +1,4 @@
/* $NetBSD: softfloat.h,v 1.6 2002/05/12 13:12:46 bjh21 Exp $ */
-/* $FreeBSD$ */
/* This is a derivative work. */
diff --git a/lib/libc/net/res_config.h b/lib/libc/net/res_config.h
index 51b609b48eaf..f049d6817b7a 100644
--- a/lib/libc/net/res_config.h
+++ b/lib/libc/net/res_config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define DEBUG 1 /* enable debugging code (needed for dig) */
#define RESOLVSORT /* allow sorting of addresses in gethostbyname */
diff --git a/lib/libc/powerpc/softfloat/milieu.h b/lib/libc/powerpc/softfloat/milieu.h
index e2e43b150073..6139aa58b982 100644
--- a/lib/libc/powerpc/softfloat/milieu.h
+++ b/lib/libc/powerpc/softfloat/milieu.h
@@ -1,5 +1,4 @@
/* $NetBSD: milieu.h,v 1.1 2000/12/29 20:13:54 bjh21 Exp $ */
-/* $FreeBSD$ */
/*
===============================================================================
diff --git a/lib/libc/powerpc/softfloat/powerpc-gcc.h b/lib/libc/powerpc/softfloat/powerpc-gcc.h
index 0fbb8006e22d..4520826cc36d 100644
--- a/lib/libc/powerpc/softfloat/powerpc-gcc.h
+++ b/lib/libc/powerpc/softfloat/powerpc-gcc.h
@@ -1,5 +1,4 @@
/* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
-/* $FreeBSD$ */
/*
-------------------------------------------------------------------------------
diff --git a/lib/libc/powerpc/softfloat/softfloat.h b/lib/libc/powerpc/softfloat/softfloat.h
index 6b9c9b06956d..b20cb3e7aa00 100644
--- a/lib/libc/powerpc/softfloat/softfloat.h
+++ b/lib/libc/powerpc/softfloat/softfloat.h
@@ -1,5 +1,4 @@
/* $NetBSD: softfloat.h,v 1.6 2002/05/12 13:12:46 bjh21 Exp $ */
-/* $FreeBSD$ */
/* This is a derivative work. */
diff --git a/lib/libc/powerpc64/softfloat/milieu.h b/lib/libc/powerpc64/softfloat/milieu.h
index e2e43b150073..6139aa58b982 100644
--- a/lib/libc/powerpc64/softfloat/milieu.h
+++ b/lib/libc/powerpc64/softfloat/milieu.h
@@ -1,5 +1,4 @@
/* $NetBSD: milieu.h,v 1.1 2000/12/29 20:13:54 bjh21 Exp $ */
-/* $FreeBSD$ */
/*
===============================================================================
diff --git a/lib/libc/powerpc64/softfloat/powerpc-gcc.h b/lib/libc/powerpc64/softfloat/powerpc-gcc.h
index e2f8680dd74e..d11198866e39 100644
--- a/lib/libc/powerpc64/softfloat/powerpc-gcc.h
+++ b/lib/libc/powerpc64/softfloat/powerpc-gcc.h
@@ -1,5 +1,4 @@
/* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
-/* $FreeBSD$ */
/*
-------------------------------------------------------------------------------
diff --git a/lib/libc/powerpc64/softfloat/softfloat.h b/lib/libc/powerpc64/softfloat/softfloat.h
index 6b9c9b06956d..b20cb3e7aa00 100644
--- a/lib/libc/powerpc64/softfloat/softfloat.h
+++ b/lib/libc/powerpc64/softfloat/softfloat.h
@@ -1,5 +1,4 @@
/* $NetBSD: softfloat.h,v 1.6 2002/05/12 13:12:46 bjh21 Exp $ */
-/* $FreeBSD$ */
/* This is a derivative work. */
diff --git a/lib/libc/powerpc64/string/memcpy_resolver.c b/lib/libc/powerpc64/string/memcpy_resolver.c
index d5f4303f3069..d1ac75edf5b4 100644
--- a/lib/libc/powerpc64/string/memcpy_resolver.c
+++ b/lib/libc/powerpc64/string/memcpy_resolver.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define MEMCOPY
#include "bcopy_resolver.c"
diff --git a/lib/libc/powerpc64/string/memmove.S b/lib/libc/powerpc64/string/memmove.S
index e0b8c6c502f1..3d49c57100df 100644
--- a/lib/libc/powerpc64/string/memmove.S
+++ b/lib/libc/powerpc64/string/memmove.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define MEMMOVE
#include "bcopy.S"
diff --git a/lib/libc/powerpc64/string/memmove_resolver.c b/lib/libc/powerpc64/string/memmove_resolver.c
index 3f5fd973bd0a..fcb11ee0ae43 100644
--- a/lib/libc/powerpc64/string/memmove_resolver.c
+++ b/lib/libc/powerpc64/string/memmove_resolver.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define MEMMOVE
#include "bcopy_resolver.c"
diff --git a/lib/libc/powerpc64/string/memmove_vsx.S b/lib/libc/powerpc64/string/memmove_vsx.S
index bf8a90da468a..9e7d51ce4683 100644
--- a/lib/libc/powerpc64/string/memmove_vsx.S
+++ b/lib/libc/powerpc64/string/memmove_vsx.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define MEMMOVE
#define FN_NAME __memmove_vsx
diff --git a/lib/libc/powerpcspe/softfloat/milieu.h b/lib/libc/powerpcspe/softfloat/milieu.h
index e2e43b150073..6139aa58b982 100644
--- a/lib/libc/powerpcspe/softfloat/milieu.h
+++ b/lib/libc/powerpcspe/softfloat/milieu.h
@@ -1,5 +1,4 @@
/* $NetBSD: milieu.h,v 1.1 2000/12/29 20:13:54 bjh21 Exp $ */
-/* $FreeBSD$ */
/*
===============================================================================
diff --git a/lib/libc/powerpcspe/softfloat/powerpc-gcc.h b/lib/libc/powerpcspe/softfloat/powerpc-gcc.h
index e2f8680dd74e..d11198866e39 100644
--- a/lib/libc/powerpcspe/softfloat/powerpc-gcc.h
+++ b/lib/libc/powerpcspe/softfloat/powerpc-gcc.h
@@ -1,5 +1,4 @@
/* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
-/* $FreeBSD$ */
/*
-------------------------------------------------------------------------------
diff --git a/lib/libc/powerpcspe/softfloat/softfloat.h b/lib/libc/powerpcspe/softfloat/softfloat.h
index 6b9c9b06956d..b20cb3e7aa00 100644
--- a/lib/libc/powerpcspe/softfloat/softfloat.h
+++ b/lib/libc/powerpcspe/softfloat/softfloat.h
@@ -1,5 +1,4 @@
/* $NetBSD: softfloat.h,v 1.6 2002/05/12 13:12:46 bjh21 Exp $ */
-/* $FreeBSD$ */
/* This is a derivative work. */
diff --git a/lib/libc/resolv/res_private.h b/lib/libc/resolv/res_private.h
index a986e95ce2eb..0b86f6c742a1 100644
--- a/lib/libc/resolv/res_private.h
+++ b/lib/libc/resolv/res_private.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef res_private_h
#define res_private_h
diff --git a/lib/libc/riscv/softfloat/milieu.h b/lib/libc/riscv/softfloat/milieu.h
index e97437bdc2d1..0b5fda35de30 100644
--- a/lib/libc/riscv/softfloat/milieu.h
+++ b/lib/libc/riscv/softfloat/milieu.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
===============================================================================
diff --git a/lib/libc/riscv/softfloat/riscv-gcc.h b/lib/libc/riscv/softfloat/riscv-gcc.h
index 3fe1767e63cc..945536012289 100644
--- a/lib/libc/riscv/softfloat/riscv-gcc.h
+++ b/lib/libc/riscv/softfloat/riscv-gcc.h
@@ -1,5 +1,4 @@
/* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
-/* $FreeBSD$ */
/*
-------------------------------------------------------------------------------
diff --git a/lib/libc/riscv/softfloat/softfloat.h b/lib/libc/riscv/softfloat/softfloat.h
index 6aef49975a38..d202a1f7f420 100644
--- a/lib/libc/riscv/softfloat/softfloat.h
+++ b/lib/libc/riscv/softfloat/softfloat.h
@@ -1,5 +1,4 @@
/* $NetBSD: softfloat.h,v 1.6 2002/05/12 13:12:46 bjh21 Exp $ */
-/* $FreeBSD$ */
/* This is a derivative work. */
diff --git a/lib/libc/rpc/DISCLAIMER b/lib/libc/rpc/DISCLAIMER
index d8dcb7ffd4a6..8e0763a0e4dd 100644
--- a/lib/libc/rpc/DISCLAIMER
+++ b/lib/libc/rpc/DISCLAIMER
@@ -1,5 +1,4 @@
/* $NetBSD: DISCLAIMER,v 1.2 1998/01/09 04:11:51 perry Exp $ */
-/* $FreeBSD$ */
/*-
* Copyright (c) 2009, Sun Microsystems, Inc.
diff --git a/lib/libc/softfloat/bits32/softfloat-macros b/lib/libc/softfloat/bits32/softfloat-macros
index db4e038eb0b7..59e6e76fe00d 100644
--- a/lib/libc/softfloat/bits32/softfloat-macros
+++ b/lib/libc/softfloat/bits32/softfloat-macros
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
===============================================================================
diff --git a/lib/libc/softfloat/bits64/softfloat-macros b/lib/libc/softfloat/bits64/softfloat-macros
index 7fedb0c348d0..22124031855c 100644
--- a/lib/libc/softfloat/bits64/softfloat-macros
+++ b/lib/libc/softfloat/bits64/softfloat-macros
@@ -1,5 +1,4 @@
/* $NetBSD: softfloat-macros,v 1.2 2009/02/16 10:23:35 tron Exp $ */
-/* $FreeBSD$ */
/*
===============================================================================
diff --git a/lib/libc/softfloat/softfloat-for-gcc.h b/lib/libc/softfloat/softfloat-for-gcc.h
index cf17e56768a9..8a62de032879 100644
--- a/lib/libc/softfloat/softfloat-for-gcc.h
+++ b/lib/libc/softfloat/softfloat-for-gcc.h
@@ -1,5 +1,4 @@
/* $NetBSD: softfloat-for-gcc.h,v 1.8 2009/12/14 01:07:42 matt Exp $ */
-/* $FreeBSD$ */
/*
* Move private identifiers with external linkage into implementation
diff --git a/lib/libc/softfloat/softfloat-specialize b/lib/libc/softfloat/softfloat-specialize
index b5eb8c34cdc8..13f2d6fa351a 100644
--- a/lib/libc/softfloat/softfloat-specialize
+++ b/lib/libc/softfloat/softfloat-specialize
@@ -1,5 +1,4 @@
/* $NetBSD: softfloat-specialize,v 1.6 2011/03/06 10:27:37 martin Exp $ */
-/* $FreeBSD$ */
/* This is a derivative work. */
diff --git a/lib/libc/softfloat/templates/milieu.h b/lib/libc/softfloat/templates/milieu.h
index 914efdf4fe7b..8a6414a8c86e 100644
--- a/lib/libc/softfloat/templates/milieu.h
+++ b/lib/libc/softfloat/templates/milieu.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
===============================================================================
diff --git a/lib/libc/softfloat/templates/softfloat-specialize b/lib/libc/softfloat/templates/softfloat-specialize
index b1a39021734f..07eea64ddcc3 100644
--- a/lib/libc/softfloat/templates/softfloat-specialize
+++ b/lib/libc/softfloat/templates/softfloat-specialize
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
===============================================================================
diff --git a/lib/libc/softfloat/templates/softfloat.h b/lib/libc/softfloat/templates/softfloat.h
index fd83aa43f133..aaf84e6842a0 100644
--- a/lib/libc/softfloat/templates/softfloat.h
+++ b/lib/libc/softfloat/templates/softfloat.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
===============================================================================
diff --git a/lib/libc/tests/resolv/resolv_test.c b/lib/libc/tests/resolv/resolv_test.c
index 4f17469fa0cb..d7b836ed8f3e 100644
--- a/lib/libc/tests/resolv/resolv_test.c
+++ b/lib/libc/tests/resolv/resolv_test.c
@@ -28,7 +28,6 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <sys/cdefs.h>
__RCSID("$NetBSD: resolv.c,v 1.6 2004/05/23 16:59:11 christos Exp $");
diff --git a/lib/libcuse/cuse.h b/lib/libcuse/cuse.h
index f82401b98bf3..acc19c2ca663 100644
--- a/lib/libcuse/cuse.h
+++ b/lib/libcuse/cuse.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2014 Hans Petter Selasky. All rights reserved.
*
diff --git a/lib/libcuse/cuse_lib.c b/lib/libcuse/cuse_lib.c
index 2653ed3067d5..3f040d0eeeda 100644
--- a/lib/libcuse/cuse_lib.c
+++ b/lib/libcuse/cuse_lib.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2010-2022 Hans Petter Selasky. All rights reserved.
*
diff --git a/lib/libefivar/ProcessorBind.h b/lib/libefivar/ProcessorBind.h
index ecba6874b5fe..46abe715d38f 100644
--- a/lib/libefivar/ProcessorBind.h
+++ b/lib/libefivar/ProcessorBind.h
@@ -1,4 +1,3 @@
/* File in public domain */
/* Brings in the glue for UEFI/EDK2 Tianocore code to run on this OS */
-/* $FreeBSD$ */
#include "efi-osdep.h"
diff --git a/lib/libefivar/uefi-guid.c b/lib/libefivar/uefi-guid.c
index c173a449cf09..4ed3b8e616ce 100644
--- a/lib/libefivar/uefi-guid.c
+++ b/lib/libefivar/uefi-guid.c
@@ -1,5 +1,4 @@
/* This generated file is in the public domain */
-/* $FreeBSD$ */
#include <uuid.h>
#include <stdint.h>
diff --git a/lib/libelftc/elftc_version.c b/lib/libelftc/elftc_version.c
index a0920e2724bc..def790f7ed6c 100644
--- a/lib/libelftc/elftc_version.c
+++ b/lib/libelftc/elftc_version.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <sys/types.h>
#include <libelftc.h>
diff --git a/lib/libgssapi/gss_buffer_set.c b/lib/libgssapi/gss_buffer_set.c
index 7105f33e9539..2e1e63304d41 100644
--- a/lib/libgssapi/gss_buffer_set.c
+++ b/lib/libgssapi/gss_buffer_set.c
@@ -31,7 +31,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <gssapi/gssapi.h>
#include <errno.h>
diff --git a/lib/libgssapi/gss_inquire_cred_by_oid.c b/lib/libgssapi/gss_inquire_cred_by_oid.c
index b3df65297446..8b4e0704dfd8 100644
--- a/lib/libgssapi/gss_inquire_cred_by_oid.c
+++ b/lib/libgssapi/gss_inquire_cred_by_oid.c
@@ -31,7 +31,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_oid_to_str.c b/lib/libgssapi/gss_oid_to_str.c
index 836b149676d8..6b58a3ff6640 100644
--- a/lib/libgssapi/gss_oid_to_str.c
+++ b/lib/libgssapi/gss_oid_to_str.c
@@ -32,7 +32,6 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <gssapi/gssapi.h>
#include <stdio.h>
diff --git a/lib/libgssapi/gss_pname_to_uid.c b/lib/libgssapi/gss_pname_to_uid.c
index bd450c1e9a12..7f66d236ef35 100644
--- a/lib/libgssapi/gss_pname_to_uid.c
+++ b/lib/libgssapi/gss_pname_to_uid.c
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <unistd.h>
#include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_pseudo_random.c b/lib/libgssapi/gss_pseudo_random.c
index 55c7d4905012..606137d8f481 100644
--- a/lib/libgssapi/gss_pseudo_random.c
+++ b/lib/libgssapi/gss_pseudo_random.c
@@ -32,7 +32,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/* $Id: gss_pseudo_random.c 20053 2007-01-24 01:31:35Z lha $ */
#include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_release_oid.c b/lib/libgssapi/gss_release_oid.c
index 41b44d2e6f4f..106e188bc9a6 100644
--- a/lib/libgssapi/gss_release_oid.c
+++ b/lib/libgssapi/gss_release_oid.c
@@ -32,7 +32,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <gssapi/gssapi.h>
#include <stdlib.h>
diff --git a/lib/libgssapi/gss_set_cred_option.c b/lib/libgssapi/gss_set_cred_option.c
index afb160c92c86..4208db8f055b 100644
--- a/lib/libgssapi/gss_set_cred_option.c
+++ b/lib/libgssapi/gss_set_cred_option.c
@@ -31,7 +31,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/* RCSID("$Id: gss_set_cred_option.c 21126 2007-06-18 20:19:59Z lha $"); */
#include <gssapi/gssapi.h>
diff --git a/lib/libgssapi/gss_set_sec_context_option.c b/lib/libgssapi/gss_set_sec_context_option.c
index cda908d7ded8..a94f27aa69d1 100644
--- a/lib/libgssapi/gss_set_sec_context_option.c
+++ b/lib/libgssapi/gss_set_sec_context_option.c
@@ -31,7 +31,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/* RCSID("$Id: gss_set_sec_context_option.c 19928 2007-01-16 10:37:54Z lha $"); */
#include <gssapi/gssapi.h>
diff --git a/lib/libiconv_modules/BIG5/citrus_big5.c b/lib/libiconv_modules/BIG5/citrus_big5.c
index 9486ddafc206..f9e758b7806b 100644
--- a/lib/libiconv_modules/BIG5/citrus_big5.c
+++ b/lib/libiconv_modules/BIG5/citrus_big5.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_big5.c,v 1.13 2011/05/23 14:53:46 joerg Exp $ */
/*-
diff --git a/lib/libiconv_modules/BIG5/citrus_big5.h b/lib/libiconv_modules/BIG5/citrus_big5.h
index fd8de6af6dd8..b7b7310326da 100644
--- a/lib/libiconv_modules/BIG5/citrus_big5.h
+++ b/lib/libiconv_modules/BIG5/citrus_big5.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_big5.h,v 1.2 2003/06/25 09:51:41 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c b/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
index fe27da24b383..9b0deb051d4e 100644
--- a/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
+++ b/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_dechanyu.c,v 1.4 2011/11/19 18:20:13 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h b/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h
index 28a752d7c7d3..107291da9439 100644
--- a/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h
+++ b/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_dechanyu.h,v 1.1 2007/04/01 18:52:32 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/EUC/citrus_euc.c b/lib/libiconv_modules/EUC/citrus_euc.c
index e83e23fb4666..fbc140a3c913 100644
--- a/lib/libiconv_modules/EUC/citrus_euc.c
+++ b/lib/libiconv_modules/EUC/citrus_euc.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_euc.c,v 1.14 2009/01/11 02:46:24 christos Exp $ */
/*-
diff --git a/lib/libiconv_modules/EUC/citrus_euc.h b/lib/libiconv_modules/EUC/citrus_euc.h
index a7ffa8ab47e0..19db7c13a51c 100644
--- a/lib/libiconv_modules/EUC/citrus_euc.h
+++ b/lib/libiconv_modules/EUC/citrus_euc.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_euc.h,v 1.2 2003/06/25 09:51:42 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/EUCTW/citrus_euctw.c b/lib/libiconv_modules/EUCTW/citrus_euctw.c
index 9132e38e5ecb..f2ce43c643d9 100644
--- a/lib/libiconv_modules/EUCTW/citrus_euctw.c
+++ b/lib/libiconv_modules/EUCTW/citrus_euctw.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_euctw.c,v 1.11 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/EUCTW/citrus_euctw.h b/lib/libiconv_modules/EUCTW/citrus_euctw.h
index 2dca8457cf8a..5783cc3256e1 100644
--- a/lib/libiconv_modules/EUCTW/citrus_euctw.h
+++ b/lib/libiconv_modules/EUCTW/citrus_euctw.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_euctw.h,v 1.2 2003/06/25 09:51:42 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/GBK2K/citrus_gbk2k.c b/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
index 87ec6ebecc6a..83c1ee7e7ef8 100644
--- a/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
+++ b/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_gbk2k.c,v 1.7 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/GBK2K/citrus_gbk2k.h b/lib/libiconv_modules/GBK2K/citrus_gbk2k.h
index c5df93faa934..ab4716a3e1de 100644
--- a/lib/libiconv_modules/GBK2K/citrus_gbk2k.h
+++ b/lib/libiconv_modules/GBK2K/citrus_gbk2k.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_gbk2k.h,v 1.2 2003/06/25 09:51:43 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/HZ/citrus_hz.c b/lib/libiconv_modules/HZ/citrus_hz.c
index f41a302fff9e..f12938a7dab8 100644
--- a/lib/libiconv_modules/HZ/citrus_hz.c
+++ b/lib/libiconv_modules/HZ/citrus_hz.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_hz.c,v 1.2 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/HZ/citrus_hz.h b/lib/libiconv_modules/HZ/citrus_hz.h
index 6fc36d5a1743..ade378d78184 100644
--- a/lib/libiconv_modules/HZ/citrus_hz.h
+++ b/lib/libiconv_modules/HZ/citrus_hz.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_hz.h,v 1.1 2006/11/22 23:38:27 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/ISO2022/citrus_iso2022.c b/lib/libiconv_modules/ISO2022/citrus_iso2022.c
index 394495de906e..a311dbc26e59 100644
--- a/lib/libiconv_modules/ISO2022/citrus_iso2022.c
+++ b/lib/libiconv_modules/ISO2022/citrus_iso2022.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_iso2022.c,v 1.20 2010/12/07 22:01:45 joerg Exp $ */
/*-
diff --git a/lib/libiconv_modules/ISO2022/citrus_iso2022.h b/lib/libiconv_modules/ISO2022/citrus_iso2022.h
index 30cbf012a3b3..5812483ea655 100644
--- a/lib/libiconv_modules/ISO2022/citrus_iso2022.h
+++ b/lib/libiconv_modules/ISO2022/citrus_iso2022.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_iso2022.h,v 1.2 2003/06/25 09:51:44 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/JOHAB/citrus_johab.c b/lib/libiconv_modules/JOHAB/citrus_johab.c
index cd50bd3ed0e0..3551f8199a78 100644
--- a/lib/libiconv_modules/JOHAB/citrus_johab.c
+++ b/lib/libiconv_modules/JOHAB/citrus_johab.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_johab.c,v 1.4 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/JOHAB/citrus_johab.h b/lib/libiconv_modules/JOHAB/citrus_johab.h
index c91ffea023a0..bbf1df4c7027 100644
--- a/lib/libiconv_modules/JOHAB/citrus_johab.h
+++ b/lib/libiconv_modules/JOHAB/citrus_johab.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_johab.h,v 1.1 2006/10/18 17:54:55 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/MSKanji/citrus_mskanji.c b/lib/libiconv_modules/MSKanji/citrus_mskanji.c
index 423ea3b8592f..997221dcb3ab 100644
--- a/lib/libiconv_modules/MSKanji/citrus_mskanji.c
+++ b/lib/libiconv_modules/MSKanji/citrus_mskanji.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mskanji.c,v 1.13 2008/06/14 16:01:08 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/MSKanji/citrus_mskanji.h b/lib/libiconv_modules/MSKanji/citrus_mskanji.h
index 36f79f26ce6b..4e8a57e928ed 100644
--- a/lib/libiconv_modules/MSKanji/citrus_mskanji.h
+++ b/lib/libiconv_modules/MSKanji/citrus_mskanji.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mskanji.h,v 1.2 2003/06/25 09:51:48 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/UES/citrus_ues.c b/lib/libiconv_modules/UES/citrus_ues.c
index 1c7b83687854..083b2fa70b0c 100644
--- a/lib/libiconv_modules/UES/citrus_ues.c
+++ b/lib/libiconv_modules/UES/citrus_ues.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_ues.c,v 1.3 2012/02/12 13:51:29 wiz Exp $ */
/*-
diff --git a/lib/libiconv_modules/UES/citrus_ues.h b/lib/libiconv_modules/UES/citrus_ues.h
index 82c13ac2b7ab..84d708244066 100644
--- a/lib/libiconv_modules/UES/citrus_ues.h
+++ b/lib/libiconv_modules/UES/citrus_ues.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_ues.h,v 1.1 2006/11/13 15:16:31 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/UTF1632/citrus_utf1632.c b/lib/libiconv_modules/UTF1632/citrus_utf1632.c
index b9625165051c..8f3e9ce1027f 100644
--- a/lib/libiconv_modules/UTF1632/citrus_utf1632.c
+++ b/lib/libiconv_modules/UTF1632/citrus_utf1632.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_utf1632.c,v 1.9 2008/06/14 16:01:08 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/UTF1632/citrus_utf1632.h b/lib/libiconv_modules/UTF1632/citrus_utf1632.h
index 2327f5e14dc8..0a4775b4dbf5 100644
--- a/lib/libiconv_modules/UTF1632/citrus_utf1632.h
+++ b/lib/libiconv_modules/UTF1632/citrus_utf1632.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_utf1632.h,v 1.1 2003/06/25 09:51:49 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/UTF7/citrus_utf7.c b/lib/libiconv_modules/UTF7/citrus_utf7.c
index b899b1a4f5ba..f924366551f1 100644
--- a/lib/libiconv_modules/UTF7/citrus_utf7.c
+++ b/lib/libiconv_modules/UTF7/citrus_utf7.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_utf7.c,v 1.5 2006/08/23 12:57:24 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/UTF7/citrus_utf7.h b/lib/libiconv_modules/UTF7/citrus_utf7.h
index 925e970a90fc..c805cfd79cca 100644
--- a/lib/libiconv_modules/UTF7/citrus_utf7.h
+++ b/lib/libiconv_modules/UTF7/citrus_utf7.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_utf7.h,v 1.1 2005/03/05 18:05:15 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/UTF8/citrus_utf8.c b/lib/libiconv_modules/UTF8/citrus_utf8.c
index 397823cf6144..c28cc5323c24 100644
--- a/lib/libiconv_modules/UTF8/citrus_utf8.c
+++ b/lib/libiconv_modules/UTF8/citrus_utf8.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_utf8.c,v 1.17 2008/06/14 16:01:08 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/UTF8/citrus_utf8.h b/lib/libiconv_modules/UTF8/citrus_utf8.h
index 033d4ad659e9..6e7b403c9366 100644
--- a/lib/libiconv_modules/UTF8/citrus_utf8.h
+++ b/lib/libiconv_modules/UTF8/citrus_utf8.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_utf8.h,v 1.2 2003/06/25 09:51:49 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/VIQR/citrus_viqr.c b/lib/libiconv_modules/VIQR/citrus_viqr.c
index f40910d8edf3..1747c0a1705e 100644
--- a/lib/libiconv_modules/VIQR/citrus_viqr.c
+++ b/lib/libiconv_modules/VIQR/citrus_viqr.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_viqr.c,v 1.5 2011/11/19 18:20:13 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/VIQR/citrus_viqr.h b/lib/libiconv_modules/VIQR/citrus_viqr.h
index ed2c1c2a5fe7..5832a6ba9a00 100644
--- a/lib/libiconv_modules/VIQR/citrus_viqr.h
+++ b/lib/libiconv_modules/VIQR/citrus_viqr.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_viqr.h,v 1.1 2006/11/13 15:16:31 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/ZW/citrus_zw.c b/lib/libiconv_modules/ZW/citrus_zw.c
index cbe86241196c..93590e550952 100644
--- a/lib/libiconv_modules/ZW/citrus_zw.c
+++ b/lib/libiconv_modules/ZW/citrus_zw.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_zw.c,v 1.4 2008/06/14 16:01:08 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/ZW/citrus_zw.h b/lib/libiconv_modules/ZW/citrus_zw.h
index f86de57665e4..d97499750ea1 100644
--- a/lib/libiconv_modules/ZW/citrus_zw.h
+++ b/lib/libiconv_modules/ZW/citrus_zw.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_zw.h,v 1.1 2006/11/22 23:38:27 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/iconv_none/citrus_iconv_none.c b/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
index ca09aab9451f..a2f2910c9da4 100644
--- a/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
+++ b/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_iconv_none.c,v 1.3 2011/05/23 14:45:44 joerg Exp $ */
/*-
diff --git a/lib/libiconv_modules/iconv_none/citrus_iconv_none.h b/lib/libiconv_modules/iconv_none/citrus_iconv_none.h
index ef804377308a..d820097c6afe 100644
--- a/lib/libiconv_modules/iconv_none/citrus_iconv_none.h
+++ b/lib/libiconv_modules/iconv_none/citrus_iconv_none.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_iconv_none.h,v 1.1 2003/06/25 09:51:43 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/iconv_std/citrus_iconv_std.c b/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
index ec9f21de541e..1dc856ebac4c 100644
--- a/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
+++ b/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_iconv_std.c,v 1.16 2012/02/12 13:51:29 wiz Exp $ */
/*-
diff --git a/lib/libiconv_modules/iconv_std/citrus_iconv_std.h b/lib/libiconv_modules/iconv_std/citrus_iconv_std.h
index 5ca21bf48ea1..1190b61ef299 100644
--- a/lib/libiconv_modules/iconv_std/citrus_iconv_std.h
+++ b/lib/libiconv_modules/iconv_std/citrus_iconv_std.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_iconv_std.h,v 1.1 2003/06/25 09:51:44 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h b/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h
index 97c89dc89eee..dedb730e5441 100644
--- a/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h
+++ b/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_iconv_std_local.h,v 1.2 2003/07/01 09:42:16 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/mapper_646/citrus_mapper_646.c b/lib/libiconv_modules/mapper_646/citrus_mapper_646.c
index 6295afde2864..97210359179c 100644
--- a/lib/libiconv_modules/mapper_646/citrus_mapper_646.c
+++ b/lib/libiconv_modules/mapper_646/citrus_mapper_646.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_646.c,v 1.4 2003/07/14 11:37:49 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/mapper_646/citrus_mapper_646.h b/lib/libiconv_modules/mapper_646/citrus_mapper_646.h
index c4cb50bc0b3e..129188741f3b 100644
--- a/lib/libiconv_modules/mapper_646/citrus_mapper_646.h
+++ b/lib/libiconv_modules/mapper_646/citrus_mapper_646.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_646.h,v 1.1 2003/06/25 09:51:45 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/mapper_none/citrus_mapper_none.c b/lib/libiconv_modules/mapper_none/citrus_mapper_none.c
index 59f9c23d4294..2a400fc9548b 100644
--- a/lib/libiconv_modules/mapper_none/citrus_mapper_none.c
+++ b/lib/libiconv_modules/mapper_none/citrus_mapper_none.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_none.c,v 1.2 2003/06/27 17:53:31 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/mapper_none/citrus_mapper_none.h b/lib/libiconv_modules/mapper_none/citrus_mapper_none.h
index 45dc72ccf2cb..9930fcee52de 100644
--- a/lib/libiconv_modules/mapper_none/citrus_mapper_none.h
+++ b/lib/libiconv_modules/mapper_none/citrus_mapper_none.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_none.h,v 1.1 2003/06/25 09:51:45 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c b/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c
index 37633c15cf72..a194378b0085 100644
--- a/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c
+++ b/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_serial.c,v 1.2 2003/07/12 15:39:20 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h b/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h
index 45fb8f83d12d..2564ae525ae1 100644
--- a/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h
+++ b/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_serial.h,v 1.1 2003/06/25 09:51:46 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/mapper_std/citrus_mapper_std.c b/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
index 23f88f6f2fe1..5db142fcd36a 100644
--- a/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
+++ b/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_std.c,v 1.11 2018/06/11 18:03:38 kamil Exp $ */
/*-
diff --git a/lib/libiconv_modules/mapper_std/citrus_mapper_std.h b/lib/libiconv_modules/mapper_std/citrus_mapper_std.h
index 10e5a1e36770..d3443f42e078 100644
--- a/lib/libiconv_modules/mapper_std/citrus_mapper_std.h
+++ b/lib/libiconv_modules/mapper_std/citrus_mapper_std.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_std.h,v 1.1 2003/06/25 09:51:47 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h b/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h
index 96f0f59bef27..c61a9f360738 100644
--- a/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h
+++ b/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_std_file.h,v 1.3 2006/09/09 14:35:17 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h b/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h
index 02e8601e4f12..5d978838af67 100644
--- a/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h
+++ b/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_std_local.h,v 1.3 2006/09/09 14:35:17 tnozaki Exp $ */
/*-
diff --git a/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c b/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c
index 12d6d1171126..dd1926c7ec2b 100644
--- a/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c
+++ b/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_zone.c,v 1.4 2003/07/12 15:39:21 tshiozak Exp $ */
/*-
diff --git a/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h b/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h
index 3274f0760e96..969cccfc9f25 100644
--- a/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h
+++ b/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: citrus_mapper_zone.h,v 1.1 2003/06/25 09:51:48 tshiozak Exp $ */
/*-
diff --git a/lib/libipsec/ipsec_strerror.h b/lib/libipsec/ipsec_strerror.h
index 3eed691eeb75..05c0d11b2e3b 100644
--- a/lib/libipsec/ipsec_strerror.h
+++ b/lib/libipsec/ipsec_strerror.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: ipsec_strerror.h,v 1.8 2000/07/30 00:45:12 itojun Exp $ */
/*-
diff --git a/lib/libipsec/libpfkey.h b/lib/libipsec/libpfkey.h
index c4c191e3e438..87a38b6bea18 100644
--- a/lib/libipsec/libpfkey.h
+++ b/lib/libipsec/libpfkey.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: libpfkey.h,v 1.6 2001/03/05 18:22:17 thorpej Exp $ */
/*-
diff --git a/lib/libipsec/policy_token.l b/lib/libipsec/policy_token.l
index 81893912714d..ee8b0b0e89d4 100644
--- a/lib/libipsec/policy_token.l
+++ b/lib/libipsec/policy_token.l
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: policy_token.l,v 1.13 2003/05/09 05:19:55 sakane Exp $ */
/*-
diff --git a/lib/libmd/i386/rmd160.S b/lib/libmd/i386/rmd160.S
index 7ccfb22daf12..57da14f83a7c 100644
--- a/lib/libmd/i386/rmd160.S
+++ b/lib/libmd/i386/rmd160.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Run the C pre-processor over this file with one of the following defined
* ELF - elf object files,
* OUT - a.out object files,
diff --git a/lib/libmd/i386/sha.S b/lib/libmd/i386/sha.S
index 1e5201f5cb89..3bb54aa9b251 100644
--- a/lib/libmd/i386/sha.S
+++ b/lib/libmd/i386/sha.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* -*- Fundamental -*- Emacs' assembler mode hoses this file */
#ifndef PIC
/* Run the C pre-processor over this file with one of the following defined
diff --git a/lib/libmd/md5.h b/lib/libmd/md5.h
index 631dec819e79..a4a9f47d4d90 100644
--- a/lib/libmd/md5.h
+++ b/lib/libmd/md5.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _MD5_H_
#define _MD5_H_
diff --git a/lib/libmp/mp.h b/lib/libmp/mp.h
index 78f09fd4a129..16a6d040bc29 100644
--- a/lib/libmp/mp.h
+++ b/lib/libmp/mp.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _MP_H_
#define _MP_H_
diff --git a/lib/libnetbsd/efun.c b/lib/libnetbsd/efun.c
index 8a622e4e5524..495bfc5b9368 100644
--- a/lib/libnetbsd/efun.c
+++ b/lib/libnetbsd/efun.c
@@ -1,5 +1,4 @@
/* $NetBSD: efun.c,v 1.10 2015/07/26 02:20:30 kamil Exp $ */
-/* $FreeBSD$ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
diff --git a/lib/libnetbsd/netinet/in.h b/lib/libnetbsd/netinet/in.h
index c108ae3b4445..d77238a005c2 100644
--- a/lib/libnetbsd/netinet/in.h
+++ b/lib/libnetbsd/netinet/in.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
diff --git a/lib/libnetbsd/rmd160.h b/lib/libnetbsd/rmd160.h
index 0eefac837f57..6aff4b7bcf1c 100644
--- a/lib/libnetbsd/rmd160.h
+++ b/lib/libnetbsd/rmd160.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/lib/libnetbsd/sha1.h b/lib/libnetbsd/sha1.h
index 3dc7ce5536a5..f74f465620c7 100644
--- a/lib/libnetbsd/sha1.h
+++ b/lib/libnetbsd/sha1.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/lib/libnetbsd/sha2.h b/lib/libnetbsd/sha2.h
index 84d79310e882..6831e134bb86 100644
--- a/lib/libnetbsd/sha2.h
+++ b/lib/libnetbsd/sha2.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/lib/libnetbsd/stdlib.h b/lib/libnetbsd/stdlib.h
index 1ccc18b3ec49..82ce33420492 100644
--- a/lib/libnetbsd/stdlib.h
+++ b/lib/libnetbsd/stdlib.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/lib/libnetbsd/sys/cdefs.h b/lib/libnetbsd/sys/cdefs.h
index 9adb99193d83..8da812693961 100644
--- a/lib/libnetbsd/sys/cdefs.h
+++ b/lib/libnetbsd/sys/cdefs.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/lib/libnetbsd/util.h b/lib/libnetbsd/util.h
index 47100fd45375..1fbd2eee0ebc 100644
--- a/lib/libnetbsd/util.h
+++ b/lib/libnetbsd/util.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/lib/libopie/config.h b/lib/libopie/config.h
index b9bc40c06627..b1d1e453324a 100644
--- a/lib/libopie/config.h
+++ b/lib/libopie/config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
diff --git a/lib/libpcap/config.h b/lib/libpcap/config.h
index a0e94c76c8b9..0ba6342040ef 100644
--- a/lib/libpcap/config.h
+++ b/lib/libpcap/config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* This is an edited copy of the config.h generated by configure. */
/* config.h. Generated from config.h.in by configure. */
diff --git a/lib/libpmc/pmu-events/jsmn.h b/lib/libpmc/pmu-events/jsmn.h
index cb92cabeb5b8..1bdfd55fff30 100644
--- a/lib/libpmc/pmu-events/jsmn.h
+++ b/lib/libpmc/pmu-events/jsmn.h
@@ -1,5 +1,4 @@
/* SPDX-License-Identifier: MIT */
-/* $FreeBSD$ */
#ifndef __JSMN_H_
#define __JSMN_H_
diff --git a/lib/libpmc/pmu-events/json.h b/lib/libpmc/pmu-events/json.h
index 871362aaf1da..278ebd32cfb6 100644
--- a/lib/libpmc/pmu-events/json.h
+++ b/lib/libpmc/pmu-events/json.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef JSON_H
#define JSON_H 1
diff --git a/lib/librpcsec_gss/rpcsec_gss_int.h b/lib/librpcsec_gss/rpcsec_gss_int.h
index e247d70fc3c5..34f75cb1a0d5 100644
--- a/lib/librpcsec_gss/rpcsec_gss_int.h
+++ b/lib/librpcsec_gss/rpcsec_gss_int.h
@@ -36,7 +36,6 @@
$Id: auth_gss.h,v 1.12 2001/04/30 19:44:47 andros Exp $
*/
-/* $FreeBSD$ */
#ifndef _RPCSEC_GSS_INT_H
#define _RPCSEC_GSS_INT_H
diff --git a/lib/librpcsec_gss/rpcsec_gss_prot.c b/lib/librpcsec_gss/rpcsec_gss_prot.c
index 08a00f6bdb97..466bccd989d2 100644
--- a/lib/librpcsec_gss/rpcsec_gss_prot.c
+++ b/lib/librpcsec_gss/rpcsec_gss_prot.c
@@ -36,7 +36,6 @@
$Id: authgss_prot.c,v 1.18 2000/09/01 04:14:03 dugsong Exp $
*/
-/* $FreeBSD$ */
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
index 28542881a558..022b5562a819 100644
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/libusb01.c b/lib/libusb/libusb01.c
index 46370b7250ae..7017016693af 100644
--- a/lib/libusb/libusb01.c
+++ b/lib/libusb/libusb01.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
index fb82e99b6d52..6d9c11910ea0 100644
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/libusb10.h b/lib/libusb/libusb10.h
index 18c8aab9e5dc..544364386061 100644
--- a/lib/libusb/libusb10.h
+++ b/lib/libusb/libusb10.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/libusb10_desc.c b/lib/libusb/libusb10_desc.c
index f73d9756685b..3e36009cbb3a 100644
--- a/lib/libusb/libusb10_desc.c
+++ b/lib/libusb/libusb10_desc.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/libusb10_hotplug.c b/lib/libusb/libusb10_hotplug.c
index fb1c3d59e51f..9d00b1dbe5a0 100644
--- a/lib/libusb/libusb10_hotplug.c
+++ b/lib/libusb/libusb10_hotplug.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2016-2019 Hans Petter Selasky. All rights reserved.
*
diff --git a/lib/libusb/libusb10_io.c b/lib/libusb/libusb10_io.c
index fff76475390e..59bac60c4672 100644
--- a/lib/libusb/libusb10_io.c
+++ b/lib/libusb/libusb10_io.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/libusb20.c b/lib/libusb/libusb20.c
index 6527b1d17ea2..25c95adc27ff 100644
--- a/lib/libusb/libusb20.c
+++ b/lib/libusb/libusb20.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/libusb20.h b/lib/libusb/libusb20.h
index 868e8d7a4fdd..7bca2f7508c7 100644
--- a/lib/libusb/libusb20.h
+++ b/lib/libusb/libusb20.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/libusb20_desc.c b/lib/libusb/libusb20_desc.c
index 3408a90690ca..89c01d5afeff 100644
--- a/lib/libusb/libusb20_desc.c
+++ b/lib/libusb/libusb20_desc.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/libusb20_desc.h b/lib/libusb/libusb20_desc.h
index ca0ebdccbf06..017148a34b1c 100644
--- a/lib/libusb/libusb20_desc.h
+++ b/lib/libusb/libusb20_desc.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/libusb20_int.h b/lib/libusb/libusb20_int.h
index 8f3b19d79e18..4b0cef442c36 100644
--- a/lib/libusb/libusb20_int.h
+++ b/lib/libusb/libusb20_int.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/libusb20_ugen20.c b/lib/libusb/libusb20_ugen20.c
index fe96509682f9..11064d2644d6 100644
--- a/lib/libusb/libusb20_ugen20.c
+++ b/lib/libusb/libusb20_ugen20.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/libusb_global_linux.h b/lib/libusb/libusb_global_linux.h
index 2d5446001b96..1964f19c6e5e 100644
--- a/lib/libusb/libusb_global_linux.h
+++ b/lib/libusb/libusb_global_linux.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libusb/usb.h b/lib/libusb/usb.h
index 01f742472ca5..ab225060c55e 100644
--- a/lib/libusb/usb.h
+++ b/lib/libusb/usb.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/lib/libxo/libxo/xo_config.h b/lib/libxo/libxo/xo_config.h
index 079eef508ad1..3eed725118c8 100644
--- a/lib/libxo/libxo/xo_config.h
+++ b/lib/libxo/libxo/xo_config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* libxo/xo_config.h. Generated from xo_config.h.in by configure. */
/* libxo/xo_config.h.in. Generated from configure.ac by autoheader. */
diff --git a/lib/msun/src/w_dremf.c b/lib/msun/src/w_dremf.c
index 4bfcff27f702..18df0780135f 100644
--- a/lib/msun/src/w_dremf.c
+++ b/lib/msun/src/w_dremf.c
@@ -4,7 +4,6 @@
* Written by J.T. Conklin, <jtc@wimsey.com>
* Placed into the Public Domain, 1994.
*/
-/* $FreeBSD$ */
#include "math.h"
#include "math_private.h"
diff --git a/lib/ncurses/ncurses/ncurses_cfg.h b/lib/ncurses/ncurses/ncurses_cfg.h
index 0a92c2f23ba4..26f2066eb063 100644
--- a/lib/ncurses/ncurses/ncurses_cfg.h
+++ b/lib/ncurses/ncurses/ncurses_cfg.h
@@ -47,7 +47,6 @@
* ftp://ftp.invisible-island.net/autoconf/
*/
-/* $FreeBSD$ */
#ifndef NC_CONFIG_H
#define NC_CONFIG_H
diff --git a/libexec/bootpd/bptypes.h b/libexec/bootpd/bptypes.h
index e27cc832c5fe..13882d03eb29 100644
--- a/libexec/bootpd/bptypes.h
+++ b/libexec/bootpd/bptypes.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$
*/
#ifndef BPTYPES_H
diff --git a/libexec/bootpd/dovend.h b/libexec/bootpd/dovend.h
index ef3b62de7126..f1ea014a2f01 100644
--- a/libexec/bootpd/dovend.h
+++ b/libexec/bootpd/dovend.h
@@ -1,5 +1,4 @@
/* dovend.h */
-/* $FreeBSD$ */
extern int dovend_rfc1497(struct host *hp, u_char *buf, int len);
extern int insert_ip(int, struct in_addr_list *, u_char **, int *);
diff --git a/libexec/bootpd/getether.h b/libexec/bootpd/getether.h
index 026df158b50c..a68b1f8f12f5 100644
--- a/libexec/bootpd/getether.h
+++ b/libexec/bootpd/getether.h
@@ -1,4 +1,3 @@
/* getether.h */
-/* $FreeBSD$ */
extern int getether(char *ifname, char *eaptr);
diff --git a/libexec/bootpd/getif.h b/libexec/bootpd/getif.h
index a2c86cfba04b..3199b6c151dc 100644
--- a/libexec/bootpd/getif.h
+++ b/libexec/bootpd/getif.h
@@ -1,4 +1,3 @@
/* getif.h */
-/* $FreeBSD$ */
extern struct ifreq *getif(int, struct in_addr *);
diff --git a/libexec/bootpd/lookup.h b/libexec/bootpd/lookup.h
index 4940f054696a..3b1890967351 100644
--- a/libexec/bootpd/lookup.h
+++ b/libexec/bootpd/lookup.h
@@ -1,5 +1,4 @@
/* lookup.h */
-/* $FreeBSD$ */
#include "bptypes.h" /* for int32, u_int32 */
diff --git a/libexec/bootpd/readfile.h b/libexec/bootpd/readfile.h
index be9cada23779..5da0c42af4a2 100644
--- a/libexec/bootpd/readfile.h
+++ b/libexec/bootpd/readfile.h
@@ -1,5 +1,4 @@
/* readfile.h */
-/* $FreeBSD$ */
#include "bptypes.h"
#include "hash.h"
diff --git a/libexec/bootpd/report.c b/libexec/bootpd/report.c
index 290e19e74063..94035e8e3e41 100644
--- a/libexec/bootpd/report.c
+++ b/libexec/bootpd/report.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* report() - calls syslog
diff --git a/libexec/bootpd/report.h b/libexec/bootpd/report.h
index 55cec5c76845..a51e5f27f1f1 100644
--- a/libexec/bootpd/report.h
+++ b/libexec/bootpd/report.h
@@ -1,5 +1,4 @@
/* report.h */
-/* $FreeBSD$ */
extern void report_init(int nolog);
extern void report(int, const char *, ...) __printflike(2, 3);
diff --git a/libexec/bootpd/tools/bootptest/bootptest.h b/libexec/bootpd/tools/bootptest/bootptest.h
index 2d9e451bddef..e4da8c6bbb47 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.h
+++ b/libexec/bootpd/tools/bootptest/bootptest.h
@@ -1,5 +1,4 @@
/* bootptest.h */
-/* $FreeBSD$ */
/*
* Hacks for sharing print-bootp.c between tcpdump and bootptest.
*/
diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c
index b62084b66ffa..671a0300783c 100644
--- a/libexec/flua/linit_flua.c
+++ b/libexec/flua/linit_flua.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
** $Id: linit.c,v 1.39.1.1 2017/04/19 17:20:42 roberto Exp $
** Initialization of libraries for lua.c and other clients
diff --git a/libexec/flua/modules/lposix.h b/libexec/flua/modules/lposix.h
index d2d9ec0cd677..6085bf045d79 100644
--- a/libexec/flua/modules/lposix.h
+++ b/libexec/flua/modules/lposix.h
@@ -2,7 +2,6 @@
*
* This file is in the public domain.
*/
-/* $FreeBSD$ */
#pragma once
diff --git a/libexec/ftpd/blacklist.c b/libexec/ftpd/blacklist.c
index 7aca755f7d2d..e8954f11bbe7 100644
--- a/libexec/ftpd/blacklist.c
+++ b/libexec/ftpd/blacklist.c
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. */
-/* $FreeBSD$ */
#include <ctype.h>
#include <stdarg.h>
diff --git a/libexec/ftpd/blacklist_client.h b/libexec/ftpd/blacklist_client.h
index 391b49c9bdfd..94ecc66c17ce 100644
--- a/libexec/ftpd/blacklist_client.h
+++ b/libexec/ftpd/blacklist_client.h
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. */
-/* $FreeBSD$ */
#ifndef BLACKLIST_CLIENT_H
#define BLACKLIST_CLIENT_H
diff --git a/libexec/ftpd/config.h b/libexec/ftpd/config.h
index 8e10bbb270dc..c5ca1f01e10e 100644
--- a/libexec/ftpd/config.h
+++ b/libexec/ftpd/config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* config.h. Generated automatically by configure. */
diff --git a/sbin/dhclient/dhcp.h b/sbin/dhclient/dhcp.h
index 9183a9c82aec..300deb464238 100644
--- a/sbin/dhclient/dhcp.h
+++ b/sbin/dhclient/dhcp.h
@@ -1,5 +1,4 @@
/* $OpenBSD: dhcp.h,v 1.5 2004/05/04 15:49:49 deraadt Exp $ */
-/* $FreeBSD$ */
/* Protocol structures... */
diff --git a/sbin/dhclient/tests/fake.c b/sbin/dhclient/tests/fake.c
index 6a170953beb0..6bfaf3d01656 100644
--- a/sbin/dhclient/tests/fake.c
+++ b/sbin/dhclient/tests/fake.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <setjmp.h>
#include <stdarg.h>
diff --git a/sbin/dhclient/tests/option-domain-search.c b/sbin/dhclient/tests/option-domain-search.c
index b79f9a560137..2969f300693b 100644
--- a/sbin/dhclient/tests/option-domain-search.c
+++ b/sbin/dhclient/tests/option-domain-search.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <setjmp.h>
#include <stdlib.h>
diff --git a/sbin/etherswitchcfg/ifmedia.c b/sbin/etherswitchcfg/ifmedia.c
index 03ed4e56ab79..a54857ee2437 100644
--- a/sbin/etherswitchcfg/ifmedia.c
+++ b/sbin/etherswitchcfg/ifmedia.c
@@ -1,5 +1,4 @@
/* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
diff --git a/sbin/gvinum/gvinum.h b/sbin/gvinum/gvinum.h
index e9c112a5e936..f29dc4c986a4 100644
--- a/sbin/gvinum/gvinum.h
+++ b/sbin/gvinum/gvinum.h
@@ -36,7 +36,6 @@
* advised of the possibility of such damage.
*/
-/* $FreeBSD$ */
#define GVINUMMOD "g_vinum"
#define GVINUMKLD "geom_vinum"
diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c
index 5331a1fc969e..134c591cd52c 100644
--- a/sbin/ifconfig/carp.c
+++ b/sbin/ifconfig/carp.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* from $OpenBSD: ifconfig.c,v 1.82 2003/10/19 05:43:35 mcbride Exp $ */
/*-
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index aacf34a13248..42319c28370a 100644
--- a/sbin/ifconfig/ifmedia.c
+++ b/sbin/ifconfig/ifmedia.c
@@ -1,5 +1,4 @@
/* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
diff --git a/sbin/ipf/common/ipf.h b/sbin/ipf/common/ipf.h
index db4ba91319ad..c672c53cb56d 100644
--- a/sbin/ipf/common/ipf.h
+++ b/sbin/ipf/common/ipf.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/common/ipf_y.y b/sbin/ipf/common/ipf_y.y
index ad4200023781..b3f7221672f3 100644
--- a/sbin/ipf/common/ipf_y.y
+++ b/sbin/ipf/common/ipf_y.y
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/common/ipmon.h b/sbin/ipf/common/ipmon.h
index 4807299c49d2..8caf20fdf725 100644
--- a/sbin/ipf/common/ipmon.h
+++ b/sbin/ipf/common/ipmon.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/common/ipt.h b/sbin/ipf/common/ipt.h
index 9a4d75a85ccb..3ecdabdb61c5 100644
--- a/sbin/ipf/common/ipt.h
+++ b/sbin/ipf/common/ipt.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/common/kmem.h b/sbin/ipf/common/kmem.h
index c4b65ed63ce9..2adff4363b0b 100644
--- a/sbin/ipf/common/kmem.h
+++ b/sbin/ipf/common/kmem.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/common/lexer.c b/sbin/ipf/common/lexer.c
index 16fbb2272034..0ea2e25ec396 100644
--- a/sbin/ipf/common/lexer.c
+++ b/sbin/ipf/common/lexer.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/common/lexer.h b/sbin/ipf/common/lexer.h
index cc200f1cad41..c5f9a0c4183e 100644
--- a/sbin/ipf/common/lexer.h
+++ b/sbin/ipf/common/lexer.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/common/opts.h b/sbin/ipf/common/opts.h
index 17844e89ecfc..1281458c145a 100644
--- a/sbin/ipf/common/opts.h
+++ b/sbin/ipf/common/opts.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/common/pcap-ipf.h b/sbin/ipf/common/pcap-ipf.h
index b856760eaa53..ba596e795efa 100644
--- a/sbin/ipf/common/pcap-ipf.h
+++ b/sbin/ipf/common/pcap-ipf.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipf/bpf-ipf.h b/sbin/ipf/ipf/bpf-ipf.h
index 2350e6cf0692..1c3032150377 100644
--- a/sbin/ipf/ipf/bpf-ipf.h
+++ b/sbin/ipf/ipf/bpf-ipf.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
diff --git a/sbin/ipf/ipf/bpf_filter.c b/sbin/ipf/ipf/bpf_filter.c
index fbb0138f51d8..74eac25af5b2 100644
--- a/sbin/ipf/ipf/bpf_filter.c
+++ b/sbin/ipf/ipf/bpf_filter.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
diff --git a/sbin/ipf/ipf/ipf.c b/sbin/ipf/ipf/ipf.c
index de5121d94767..57ce1427812b 100644
--- a/sbin/ipf/ipf/ipf.c
+++ b/sbin/ipf/ipf/ipf.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipf/ipfcomp.c b/sbin/ipf/ipf/ipfcomp.c
index cf01838d7966..47094e01ab2f 100644
--- a/sbin/ipf/ipf/ipfcomp.c
+++ b/sbin/ipf/ipf/ipfcomp.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipfs/ipfs.c b/sbin/ipf/ipfs/ipfs.c
index 3f1202894fad..bb342cbb9319 100644
--- a/sbin/ipf/ipfs/ipfs.c
+++ b/sbin/ipf/ipfs/ipfs.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipfstat/ipfstat.c b/sbin/ipf/ipfstat/ipfstat.c
index 11b3043f919c..4f3dabed9ff2 100644
--- a/sbin/ipf/ipfstat/ipfstat.c
+++ b/sbin/ipf/ipfstat/ipfstat.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipfsync/ipsyncm.c b/sbin/ipf/ipfsync/ipsyncm.c
index d57196379210..a9484a339c82 100644
--- a/sbin/ipf/ipfsync/ipsyncm.c
+++ b/sbin/ipf/ipfsync/ipsyncm.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipfsync/ipsyncs.c b/sbin/ipf/ipfsync/ipsyncs.c
index a53cfb8c9508..ee9ecfd4f886 100644
--- a/sbin/ipf/ipfsync/ipsyncs.c
+++ b/sbin/ipf/ipfsync/ipsyncs.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipftest/ip_fil.c b/sbin/ipf/ipftest/ip_fil.c
index f5955ddffdfe..6222015f164d 100644
--- a/sbin/ipf/ipftest/ip_fil.c
+++ b/sbin/ipf/ipftest/ip_fil.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipftest/ipftest.c b/sbin/ipf/ipftest/ipftest.c
index e7a0d71fffca..d83d47884089 100644
--- a/sbin/ipf/ipftest/ipftest.c
+++ b/sbin/ipf/ipftest/ipftest.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipftest/md5.c b/sbin/ipf/ipftest/md5.c
index d27430b1f212..54c0ac1ed5b0 100644
--- a/sbin/ipf/ipftest/md5.c
+++ b/sbin/ipf/ipftest/md5.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
diff --git a/sbin/ipf/ipftest/md5.h b/sbin/ipf/ipftest/md5.h
index 6f59500daf19..ab94cd21eac7 100644
--- a/sbin/ipf/ipftest/md5.h
+++ b/sbin/ipf/ipftest/md5.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
***********************************************************************
diff --git a/sbin/ipf/iplang/iplang.h b/sbin/ipf/iplang/iplang.h
index f38ef9671701..acf8369afb15 100644
--- a/sbin/ipf/iplang/iplang.h
+++ b/sbin/ipf/iplang/iplang.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/iplang/iplang_l.l b/sbin/ipf/iplang/iplang_l.l
index 58538d8e4d1c..ce1ae2031454 100644
--- a/sbin/ipf/iplang/iplang_l.l
+++ b/sbin/ipf/iplang/iplang_l.l
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
%{
/*
diff --git a/sbin/ipf/iplang/iplang_y.y b/sbin/ipf/iplang/iplang_y.y
index efddeacbf9c6..c5c7c729e0a9 100644
--- a/sbin/ipf/iplang/iplang_y.y
+++ b/sbin/ipf/iplang/iplang_y.y
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
%{
/*
diff --git a/sbin/ipf/ipmon/ipmon.c b/sbin/ipf/ipmon/ipmon.c
index f71a33b1034e..00ad4acc47f3 100644
--- a/sbin/ipf/ipmon/ipmon.c
+++ b/sbin/ipf/ipmon/ipmon.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipmon/ipmon_y.y b/sbin/ipf/ipmon/ipmon_y.y
index c70e17adcec0..9d3a7ff30c93 100644
--- a/sbin/ipf/ipmon/ipmon_y.y
+++ b/sbin/ipf/ipmon/ipmon_y.y
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipnat/ipnat.c b/sbin/ipf/ipnat/ipnat.c
index 5558ef8693d0..07d11fc535ee 100644
--- a/sbin/ipf/ipnat/ipnat.c
+++ b/sbin/ipf/ipnat/ipnat.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipnat/ipnat_y.y b/sbin/ipf/ipnat/ipnat_y.y
index 175026b4083e..11f62c98aa8c 100644
--- a/sbin/ipf/ipnat/ipnat_y.y
+++ b/sbin/ipf/ipnat/ipnat_y.y
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ippool/ippool.c b/sbin/ipf/ippool/ippool.c
index 53e1f19c6f90..797f83af1419 100644
--- a/sbin/ipf/ippool/ippool.c
+++ b/sbin/ipf/ippool/ippool.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ippool/ippool_y.y b/sbin/ipf/ippool/ippool_y.y
index c798ff50596b..6baa48dfa01c 100644
--- a/sbin/ipf/ippool/ippool_y.y
+++ b/sbin/ipf/ippool/ippool_y.y
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipscan/ipscan_y.y b/sbin/ipf/ipscan/ipscan_y.y
index 21d1b15aed70..b6693e294dae 100644
--- a/sbin/ipf/ipscan/ipscan_y.y
+++ b/sbin/ipf/ipscan/ipscan_y.y
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipsend/44arp.c b/sbin/ipf/ipsend/44arp.c
index e7a15b5d5cad..0a11c8732a12 100644
--- a/sbin/ipf/ipsend/44arp.c
+++ b/sbin/ipf/ipsend/44arp.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Based upon 4.4BSD's /usr/sbin/arp
diff --git a/sbin/ipf/ipsend/arp.c b/sbin/ipf/ipsend/arp.c
index 1d8f4213f246..1aed79aa500f 100644
--- a/sbin/ipf/ipsend/arp.c
+++ b/sbin/ipf/ipsend/arp.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* arp.c (C) 1995-1998 Darren Reed
diff --git a/sbin/ipf/ipsend/dlcommon.c b/sbin/ipf/ipsend/dlcommon.c
index 86554660240d..a73f7df96d54 100644
--- a/sbin/ipf/ipsend/dlcommon.c
+++ b/sbin/ipf/ipsend/dlcommon.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Common (shared) DLPI test routines.
diff --git a/sbin/ipf/ipsend/dltest.h b/sbin/ipf/ipsend/dltest.h
index 086782c1fbb7..fe6e33735849 100644
--- a/sbin/ipf/ipsend/dltest.h
+++ b/sbin/ipf/ipsend/dltest.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Common DLPI Test Suite header file
diff --git a/sbin/ipf/ipsend/ip.c b/sbin/ipf/ipsend/ip.c
index 7c623103b901..14197c382260 100644
--- a/sbin/ipf/ipsend/ip.c
+++ b/sbin/ipf/ipsend/ip.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* ip.c (C) 1995-1998 Darren Reed
diff --git a/sbin/ipf/ipsend/ipresend.c b/sbin/ipf/ipsend/ipresend.c
index c9e625f02e2a..be7b5bc1943a 100644
--- a/sbin/ipf/ipsend/ipresend.c
+++ b/sbin/ipf/ipsend/ipresend.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* ipresend.c (C) 1995-1998 Darren Reed
diff --git a/sbin/ipf/ipsend/ipsend.c b/sbin/ipf/ipsend/ipsend.c
index 1996c01dec6c..22218b07c40e 100644
--- a/sbin/ipf/ipsend/ipsend.c
+++ b/sbin/ipf/ipsend/ipsend.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* ipsend.c (C) 1995-1998 Darren Reed
*
diff --git a/sbin/ipf/ipsend/ipsend.h b/sbin/ipf/ipsend/ipsend.h
index bfec90f1c5b3..31e977a4dcaa 100644
--- a/sbin/ipf/ipsend/ipsend.h
+++ b/sbin/ipf/ipsend/ipsend.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* ipsend.h (C) 1997-1998 Darren Reed
diff --git a/sbin/ipf/ipsend/ipsopt.c b/sbin/ipf/ipsend/ipsopt.c
index 0e053e2c75bb..6efbea16bc26 100644
--- a/sbin/ipf/ipsend/ipsopt.c
+++ b/sbin/ipf/ipsend/ipsopt.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipsend/iptest.c b/sbin/ipf/ipsend/iptest.c
index ed92ab9306ea..16b97c221f41 100644
--- a/sbin/ipf/ipsend/iptest.c
+++ b/sbin/ipf/ipsend/iptest.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* ipsend.c (C) 1995-1998 Darren Reed
diff --git a/sbin/ipf/ipsend/iptests.c b/sbin/ipf/ipsend/iptests.c
index cbda02893162..3fccf1389f6c 100644
--- a/sbin/ipf/ipsend/iptests.c
+++ b/sbin/ipf/ipsend/iptests.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/ipsend/resend.c b/sbin/ipf/ipsend/resend.c
index c3f86baaadc3..484709e89c53 100644
--- a/sbin/ipf/ipsend/resend.c
+++ b/sbin/ipf/ipsend/resend.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* resend.c (C) 1995-1998 Darren Reed
diff --git a/sbin/ipf/ipsend/sbpf.c b/sbin/ipf/ipsend/sbpf.c
index b46585f1f340..d2efc4a19f6b 100644
--- a/sbin/ipf/ipsend/sbpf.c
+++ b/sbin/ipf/ipsend/sbpf.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* (C)opyright 1995-1998 Darren Reed. (from tcplog)
*
diff --git a/sbin/ipf/ipsend/sdlpi.c b/sbin/ipf/ipsend/sdlpi.c
index 5570495dd2d7..a8ccd2d41df4 100644
--- a/sbin/ipf/ipsend/sdlpi.c
+++ b/sbin/ipf/ipsend/sdlpi.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/sbin/ipf/ipsend/snit.c b/sbin/ipf/ipsend/snit.c
index 187299436d2d..e7fb51b72546 100644
--- a/sbin/ipf/ipsend/snit.c
+++ b/sbin/ipf/ipsend/snit.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* (C)opyright 1992-1998 Darren Reed. (from tcplog)
diff --git a/sbin/ipf/ipsend/sock.c b/sbin/ipf/ipsend/sock.c
index bab36182a9e7..ab59f815a37c 100644
--- a/sbin/ipf/ipsend/sock.c
+++ b/sbin/ipf/ipsend/sock.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* sock.c (C) 1995-1998 Darren Reed
*
diff --git a/sbin/ipf/ipsend/sockraw.c b/sbin/ipf/ipsend/sockraw.c
index 16384230f543..56fcb7174532 100644
--- a/sbin/ipf/ipsend/sockraw.c
+++ b/sbin/ipf/ipsend/sockraw.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* (C)opyright 2000 Darren Reed.
diff --git a/sbin/ipf/libipf/addicmp.c b/sbin/ipf/libipf/addicmp.c
index da52f1caacfe..f84cae01644e 100644
--- a/sbin/ipf/libipf/addicmp.c
+++ b/sbin/ipf/libipf/addicmp.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/addipopt.c b/sbin/ipf/libipf/addipopt.c
index a6c699ddc701..ab0579d00063 100644
--- a/sbin/ipf/libipf/addipopt.c
+++ b/sbin/ipf/libipf/addipopt.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/bcopywrap.c b/sbin/ipf/libipf/bcopywrap.c
index 9eec27f4538c..e20462ea9b04 100644
--- a/sbin/ipf/libipf/bcopywrap.c
+++ b/sbin/ipf/libipf/bcopywrap.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/binprint.c b/sbin/ipf/libipf/binprint.c
index 131e3f62d481..8d09b347db2c 100644
--- a/sbin/ipf/libipf/binprint.c
+++ b/sbin/ipf/libipf/binprint.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/buildopts.c b/sbin/ipf/libipf/buildopts.c
index 7f2397bf7c95..27eb1b7323f0 100644
--- a/sbin/ipf/libipf/buildopts.c
+++ b/sbin/ipf/libipf/buildopts.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/checkrev.c b/sbin/ipf/libipf/checkrev.c
index 148acaff571b..ded9ce04d500 100644
--- a/sbin/ipf/libipf/checkrev.c
+++ b/sbin/ipf/libipf/checkrev.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/count4bits.c b/sbin/ipf/libipf/count4bits.c
index 52942771f800..10e9d6bb2207 100644
--- a/sbin/ipf/libipf/count4bits.c
+++ b/sbin/ipf/libipf/count4bits.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/count6bits.c b/sbin/ipf/libipf/count6bits.c
index fd4f11226c0b..ff013046613c 100644
--- a/sbin/ipf/libipf/count6bits.c
+++ b/sbin/ipf/libipf/count6bits.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/debug.c b/sbin/ipf/libipf/debug.c
index 0e3276e21705..9fcdf98317bd 100644
--- a/sbin/ipf/libipf/debug.c
+++ b/sbin/ipf/libipf/debug.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/facpri.c b/sbin/ipf/libipf/facpri.c
index 3286248d3205..eac41abcfea5 100644
--- a/sbin/ipf/libipf/facpri.c
+++ b/sbin/ipf/libipf/facpri.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/facpri.h b/sbin/ipf/libipf/facpri.h
index 5698c0ebe047..dac5c591410c 100644
--- a/sbin/ipf/libipf/facpri.h
+++ b/sbin/ipf/libipf/facpri.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/fill6bits.c b/sbin/ipf/libipf/fill6bits.c
index b8f5914ef426..e9e8b7fe7099 100644
--- a/sbin/ipf/libipf/fill6bits.c
+++ b/sbin/ipf/libipf/fill6bits.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/flags.c b/sbin/ipf/libipf/flags.c
index 05fcc9874866..f16624b97d4f 100644
--- a/sbin/ipf/libipf/flags.c
+++ b/sbin/ipf/libipf/flags.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/gethost.c b/sbin/ipf/libipf/gethost.c
index aefdbbae9fb3..6ae34a577519 100644
--- a/sbin/ipf/libipf/gethost.c
+++ b/sbin/ipf/libipf/gethost.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/getifname.c b/sbin/ipf/libipf/getifname.c
index a2d9ef6885d1..970f2a6707bb 100644
--- a/sbin/ipf/libipf/getifname.c
+++ b/sbin/ipf/libipf/getifname.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/getnattype.c b/sbin/ipf/libipf/getnattype.c
index 3e3853208dc1..60ab7793a325 100644
--- a/sbin/ipf/libipf/getnattype.c
+++ b/sbin/ipf/libipf/getnattype.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/getport.c b/sbin/ipf/libipf/getport.c
index ea52fad3234c..8b659b2761b3 100644
--- a/sbin/ipf/libipf/getport.c
+++ b/sbin/ipf/libipf/getport.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/getportproto.c b/sbin/ipf/libipf/getportproto.c
index 9f84ab21c476..637b000d8d51 100644
--- a/sbin/ipf/libipf/getportproto.c
+++ b/sbin/ipf/libipf/getportproto.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/getproto.c b/sbin/ipf/libipf/getproto.c
index 4d3f2d9e1ea2..139bfd3ee41a 100644
--- a/sbin/ipf/libipf/getproto.c
+++ b/sbin/ipf/libipf/getproto.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/getsumd.c b/sbin/ipf/libipf/getsumd.c
index 3d66d273f843..ede6f7ea134d 100644
--- a/sbin/ipf/libipf/getsumd.c
+++ b/sbin/ipf/libipf/getsumd.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/hostname.c b/sbin/ipf/libipf/hostname.c
index 3b179954bbff..1c3d3451b487 100644
--- a/sbin/ipf/libipf/hostname.c
+++ b/sbin/ipf/libipf/hostname.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/icmpcode.c b/sbin/ipf/libipf/icmpcode.c
index e898ebfa39a5..b7fc15451e08 100644
--- a/sbin/ipf/libipf/icmpcode.c
+++ b/sbin/ipf/libipf/icmpcode.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/inet_addr.c b/sbin/ipf/libipf/inet_addr.c
index 367c25f44d51..11e468eb09f7 100644
--- a/sbin/ipf/libipf/inet_addr.c
+++ b/sbin/ipf/libipf/inet_addr.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* ++Copyright++ 1983, 1990, 1993
diff --git a/sbin/ipf/libipf/initparse.c b/sbin/ipf/libipf/initparse.c
index c85d6d3ed69d..2cb8906555dd 100644
--- a/sbin/ipf/libipf/initparse.c
+++ b/sbin/ipf/libipf/initparse.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/ionames.c b/sbin/ipf/libipf/ionames.c
index 9b586422a392..9b2442f4e6e3 100644
--- a/sbin/ipf/libipf/ionames.c
+++ b/sbin/ipf/libipf/ionames.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/ipf_dotuning.c b/sbin/ipf/libipf/ipf_dotuning.c
index 1db47d76eac1..e435ce035194 100644
--- a/sbin/ipf/libipf/ipf_dotuning.c
+++ b/sbin/ipf/libipf/ipf_dotuning.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/ipft_hx.c b/sbin/ipf/libipf/ipft_hx.c
index a540b52da05d..d6ae80ec4efd 100644
--- a/sbin/ipf/libipf/ipft_hx.c
+++ b/sbin/ipf/libipf/ipft_hx.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/ipft_pc.c b/sbin/ipf/libipf/ipft_pc.c
index 349b9390e745..0f4a9f6a5983 100644
--- a/sbin/ipf/libipf/ipft_pc.c
+++ b/sbin/ipf/libipf/ipft_pc.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/ipft_tx.c b/sbin/ipf/libipf/ipft_tx.c
index 87215f5b7b6e..bab33016b9cc 100644
--- a/sbin/ipf/libipf/ipft_tx.c
+++ b/sbin/ipf/libipf/ipft_tx.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/ipoptsec.c b/sbin/ipf/libipf/ipoptsec.c
index 7617daec33dd..fad2a564371e 100644
--- a/sbin/ipf/libipf/ipoptsec.c
+++ b/sbin/ipf/libipf/ipoptsec.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/kmem.c b/sbin/ipf/libipf/kmem.c
index c39e36aa5add..0f15159b0348 100644
--- a/sbin/ipf/libipf/kmem.c
+++ b/sbin/ipf/libipf/kmem.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/kmem.h b/sbin/ipf/libipf/kmem.h
index bcf6a0be7e27..623d5760c614 100644
--- a/sbin/ipf/libipf/kmem.h
+++ b/sbin/ipf/libipf/kmem.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/kmemcpywrap.c b/sbin/ipf/libipf/kmemcpywrap.c
index fab86242c449..43f8833be72d 100644
--- a/sbin/ipf/libipf/kmemcpywrap.c
+++ b/sbin/ipf/libipf/kmemcpywrap.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/kvatoname.c b/sbin/ipf/libipf/kvatoname.c
index 47b226f13450..1e53cd9c2cd5 100644
--- a/sbin/ipf/libipf/kvatoname.c
+++ b/sbin/ipf/libipf/kvatoname.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/load_hash.c b/sbin/ipf/libipf/load_hash.c
index 63894a3cfa72..bfee0fc64642 100644
--- a/sbin/ipf/libipf/load_hash.c
+++ b/sbin/ipf/libipf/load_hash.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/load_hashnode.c b/sbin/ipf/libipf/load_hashnode.c
index 46e5552fdbab..11525dc96e35 100644
--- a/sbin/ipf/libipf/load_hashnode.c
+++ b/sbin/ipf/libipf/load_hashnode.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/load_http.c b/sbin/ipf/libipf/load_http.c
index 738a6f8006f9..5f86b018cca5 100644
--- a/sbin/ipf/libipf/load_http.c
+++ b/sbin/ipf/libipf/load_http.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/load_pool.c b/sbin/ipf/libipf/load_pool.c
index c502f3dc77e0..0d90c81e81ff 100644
--- a/sbin/ipf/libipf/load_pool.c
+++ b/sbin/ipf/libipf/load_pool.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/load_poolnode.c b/sbin/ipf/libipf/load_poolnode.c
index 849bd60791a7..5c9fd838bfa0 100644
--- a/sbin/ipf/libipf/load_poolnode.c
+++ b/sbin/ipf/libipf/load_poolnode.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/mutex_emul.c b/sbin/ipf/libipf/mutex_emul.c
index 3152d2e47013..a1bd8444b333 100644
--- a/sbin/ipf/libipf/mutex_emul.c
+++ b/sbin/ipf/libipf/mutex_emul.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/nametokva.c b/sbin/ipf/libipf/nametokva.c
index 6b86657eba97..06635238165c 100644
--- a/sbin/ipf/libipf/nametokva.c
+++ b/sbin/ipf/libipf/nametokva.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/nat_setgroupmap.c b/sbin/ipf/libipf/nat_setgroupmap.c
index 8a4b461c5a88..fd3a2c120e1e 100644
--- a/sbin/ipf/libipf/nat_setgroupmap.c
+++ b/sbin/ipf/libipf/nat_setgroupmap.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/ntomask.c b/sbin/ipf/libipf/ntomask.c
index 0947784106ba..3664d255254c 100644
--- a/sbin/ipf/libipf/ntomask.c
+++ b/sbin/ipf/libipf/ntomask.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/optname.c b/sbin/ipf/libipf/optname.c
index 1523d31b710a..93bf276c7818 100644
--- a/sbin/ipf/libipf/optname.c
+++ b/sbin/ipf/libipf/optname.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/optprint.c b/sbin/ipf/libipf/optprint.c
index f18ad00dba2a..a70ed28d611f 100644
--- a/sbin/ipf/libipf/optprint.c
+++ b/sbin/ipf/libipf/optprint.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/optprintv6.c b/sbin/ipf/libipf/optprintv6.c
index d043ff774031..e53a879fa439 100644
--- a/sbin/ipf/libipf/optprintv6.c
+++ b/sbin/ipf/libipf/optprintv6.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/optvalue.c b/sbin/ipf/libipf/optvalue.c
index 370a9d272ed2..44635b04a13a 100644
--- a/sbin/ipf/libipf/optvalue.c
+++ b/sbin/ipf/libipf/optvalue.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/portname.c b/sbin/ipf/libipf/portname.c
index f567b26fc3fd..034c8255537d 100644
--- a/sbin/ipf/libipf/portname.c
+++ b/sbin/ipf/libipf/portname.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/print_toif.c b/sbin/ipf/libipf/print_toif.c
index 438207bf7e72..2dcaec7394f9 100644
--- a/sbin/ipf/libipf/print_toif.c
+++ b/sbin/ipf/libipf/print_toif.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printactivenat.c b/sbin/ipf/libipf/printactivenat.c
index 222f85a5818b..0a4c254c9529 100644
--- a/sbin/ipf/libipf/printactivenat.c
+++ b/sbin/ipf/libipf/printactivenat.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printaps.c b/sbin/ipf/libipf/printaps.c
index 00e4db4cb2b8..ee0c516ae2e3 100644
--- a/sbin/ipf/libipf/printaps.c
+++ b/sbin/ipf/libipf/printaps.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printbuf.c b/sbin/ipf/libipf/printbuf.c
index 3a9281217f6a..0fef3c5de854 100644
--- a/sbin/ipf/libipf/printbuf.c
+++ b/sbin/ipf/libipf/printbuf.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printfr.c b/sbin/ipf/libipf/printfr.c
index 2ffb65f69207..f507c8065c82 100644
--- a/sbin/ipf/libipf/printfr.c
+++ b/sbin/ipf/libipf/printfr.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printfraginfo.c b/sbin/ipf/libipf/printfraginfo.c
index fcafdde707be..880c01a06454 100644
--- a/sbin/ipf/libipf/printfraginfo.c
+++ b/sbin/ipf/libipf/printfraginfo.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printhash.c b/sbin/ipf/libipf/printhash.c
index 2db6ace81256..f5ebb57a1c33 100644
--- a/sbin/ipf/libipf/printhash.c
+++ b/sbin/ipf/libipf/printhash.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printhashnode.c b/sbin/ipf/libipf/printhashnode.c
index 777083d456ac..b3c7140c84d3 100644
--- a/sbin/ipf/libipf/printhashnode.c
+++ b/sbin/ipf/libipf/printhashnode.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printhostmap.c b/sbin/ipf/libipf/printhostmap.c
index bdb15d84995f..bd8b71ceec16 100644
--- a/sbin/ipf/libipf/printhostmap.c
+++ b/sbin/ipf/libipf/printhostmap.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printhostmask.c b/sbin/ipf/libipf/printhostmask.c
index f5495458fa04..7f607dbedcfc 100644
--- a/sbin/ipf/libipf/printhostmask.c
+++ b/sbin/ipf/libipf/printhostmask.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printifname.c b/sbin/ipf/libipf/printifname.c
index e6a38a8692ad..4f19c30aef2a 100644
--- a/sbin/ipf/libipf/printifname.c
+++ b/sbin/ipf/libipf/printifname.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printip.c b/sbin/ipf/libipf/printip.c
index 7cf55f04afec..e4249541f946 100644
--- a/sbin/ipf/libipf/printip.c
+++ b/sbin/ipf/libipf/printip.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printlog.c b/sbin/ipf/libipf/printlog.c
index a04842530504..c9faf40595c9 100644
--- a/sbin/ipf/libipf/printlog.c
+++ b/sbin/ipf/libipf/printlog.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printmask.c b/sbin/ipf/libipf/printmask.c
index 1130c5190f58..bdb28d8ee4a2 100644
--- a/sbin/ipf/libipf/printmask.c
+++ b/sbin/ipf/libipf/printmask.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printnat.c b/sbin/ipf/libipf/printnat.c
index e778d9393d9a..e4c096429b59 100644
--- a/sbin/ipf/libipf/printnat.c
+++ b/sbin/ipf/libipf/printnat.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printpacket.c b/sbin/ipf/libipf/printpacket.c
index 9444f93fe840..a48725a220e0 100644
--- a/sbin/ipf/libipf/printpacket.c
+++ b/sbin/ipf/libipf/printpacket.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printpacket6.c b/sbin/ipf/libipf/printpacket6.c
index 42d1a36b96b3..c015eabdada5 100644
--- a/sbin/ipf/libipf/printpacket6.c
+++ b/sbin/ipf/libipf/printpacket6.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printpool.c b/sbin/ipf/libipf/printpool.c
index b3bdd02b64b4..86f389c6cbaf 100644
--- a/sbin/ipf/libipf/printpool.c
+++ b/sbin/ipf/libipf/printpool.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printpoolnode.c b/sbin/ipf/libipf/printpoolnode.c
index 023aca47c7ff..8cec3fcae757 100644
--- a/sbin/ipf/libipf/printpoolnode.c
+++ b/sbin/ipf/libipf/printpoolnode.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printportcmp.c b/sbin/ipf/libipf/printportcmp.c
index 556a3ac2fb0b..2e3ee471e3e2 100644
--- a/sbin/ipf/libipf/printportcmp.c
+++ b/sbin/ipf/libipf/printportcmp.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printsbuf.c b/sbin/ipf/libipf/printsbuf.c
index c9c89ef6eb01..4d3de8468dee 100644
--- a/sbin/ipf/libipf/printsbuf.c
+++ b/sbin/ipf/libipf/printsbuf.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printstate.c b/sbin/ipf/libipf/printstate.c
index 1f135231ff58..3b6f6c3b07d4 100644
--- a/sbin/ipf/libipf/printstate.c
+++ b/sbin/ipf/libipf/printstate.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/printtunable.c b/sbin/ipf/libipf/printtunable.c
index b748efd5129a..8cd212a2b8b4 100644
--- a/sbin/ipf/libipf/printtunable.c
+++ b/sbin/ipf/libipf/printtunable.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/remove_hash.c b/sbin/ipf/libipf/remove_hash.c
index 3af2a3f427d7..c6778e372224 100644
--- a/sbin/ipf/libipf/remove_hash.c
+++ b/sbin/ipf/libipf/remove_hash.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/remove_hashnode.c b/sbin/ipf/libipf/remove_hashnode.c
index f6679d6acd95..95fada0a81e5 100644
--- a/sbin/ipf/libipf/remove_hashnode.c
+++ b/sbin/ipf/libipf/remove_hashnode.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/remove_pool.c b/sbin/ipf/libipf/remove_pool.c
index 0f67368b2b33..21d01fdbc0a4 100644
--- a/sbin/ipf/libipf/remove_pool.c
+++ b/sbin/ipf/libipf/remove_pool.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/remove_poolnode.c b/sbin/ipf/libipf/remove_poolnode.c
index b3c39aa21ec8..2d8caa158604 100644
--- a/sbin/ipf/libipf/remove_poolnode.c
+++ b/sbin/ipf/libipf/remove_poolnode.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/resetlexer.c b/sbin/ipf/libipf/resetlexer.c
index e6fbbce4ccc0..307ed657a46a 100644
--- a/sbin/ipf/libipf/resetlexer.c
+++ b/sbin/ipf/libipf/resetlexer.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/rwlock_emul.c b/sbin/ipf/libipf/rwlock_emul.c
index e15d9610887f..ec8a61c5cff2 100644
--- a/sbin/ipf/libipf/rwlock_emul.c
+++ b/sbin/ipf/libipf/rwlock_emul.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/tcp_flags.c b/sbin/ipf/libipf/tcp_flags.c
index e652819bebb1..0156d8cd7f31 100644
--- a/sbin/ipf/libipf/tcp_flags.c
+++ b/sbin/ipf/libipf/tcp_flags.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2000-2004 by Darren Reed.
diff --git a/sbin/ipf/libipf/tcpflags.c b/sbin/ipf/libipf/tcpflags.c
index ef2950836393..92437d1be798 100644
--- a/sbin/ipf/libipf/tcpflags.c
+++ b/sbin/ipf/libipf/tcpflags.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/tcpoptnames.c b/sbin/ipf/libipf/tcpoptnames.c
index 24e41bb18b8b..3044f939438d 100644
--- a/sbin/ipf/libipf/tcpoptnames.c
+++ b/sbin/ipf/libipf/tcpoptnames.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/v6ionames.c b/sbin/ipf/libipf/v6ionames.c
index 9f1207f13431..485af14f7863 100644
--- a/sbin/ipf/libipf/v6ionames.c
+++ b/sbin/ipf/libipf/v6ionames.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/v6optvalue.c b/sbin/ipf/libipf/v6optvalue.c
index c0d13bc51d85..5d09ad1b584d 100644
--- a/sbin/ipf/libipf/v6optvalue.c
+++ b/sbin/ipf/libipf/v6optvalue.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/var.c b/sbin/ipf/libipf/var.c
index d3a03b6e46d7..56dcee326478 100644
--- a/sbin/ipf/libipf/var.c
+++ b/sbin/ipf/libipf/var.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/ipf/libipf/verbose.c b/sbin/ipf/libipf/verbose.c
index 47988c084516..cfa22083ed02 100644
--- a/sbin/ipf/libipf/verbose.c
+++ b/sbin/ipf/libipf/verbose.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/sbin/newfs_msdos/mkfs_msdos.h b/sbin/newfs_msdos/mkfs_msdos.h
index 7e0c6622c8b7..6e5bad0da8f0 100644
--- a/sbin/newfs_msdos/mkfs_msdos.h
+++ b/sbin/newfs_msdos/mkfs_msdos.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: mkfs_msdos.h,v 1.3 2015/10/16 17:38:17 christos Exp $ */
/*-
diff --git a/sbin/rcorder/ealloc.c b/sbin/rcorder/ealloc.c
index eae8bb67d69a..9d6f20f77137 100644
--- a/sbin/rcorder/ealloc.c
+++ b/sbin/rcorder/ealloc.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: ealloc.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
/*-
diff --git a/sbin/rcorder/ealloc.h b/sbin/rcorder/ealloc.h
index 093ebc3dadc8..f1c81fb2fd18 100644
--- a/sbin/rcorder/ealloc.h
+++ b/sbin/rcorder/ealloc.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: ealloc.h,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
void *emalloc(size_t len);
diff --git a/sbin/rcorder/hash.c b/sbin/rcorder/hash.c
index 3dcb77054960..e2231461f1a9 100644
--- a/sbin/rcorder/hash.c
+++ b/sbin/rcorder/hash.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: hash.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
/*-
diff --git a/sbin/rcorder/hash.h b/sbin/rcorder/hash.h
index d190633861a0..6ccf76d002a8 100644
--- a/sbin/rcorder/hash.h
+++ b/sbin/rcorder/hash.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: hash.h,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
/*-
diff --git a/sbin/setkey/parse.y b/sbin/setkey/parse.y
index 8e4866e7e848..448a8ee5278c 100644
--- a/sbin/setkey/parse.y
+++ b/sbin/setkey/parse.y
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: parse.y,v 1.83 2004/05/18 08:48:23 sakane Exp $ */
/*-
diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c
index ff2509555ff2..37613bfdb76e 100644
--- a/sbin/setkey/setkey.c
+++ b/sbin/setkey/setkey.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: setkey.c,v 1.28 2003/06/27 07:15:45 itojun Exp $ */
/*-
diff --git a/sbin/setkey/test-pfkey.c b/sbin/setkey/test-pfkey.c
index ba702c80eb37..c3d2ac88e4c0 100644
--- a/sbin/setkey/test-pfkey.c
+++ b/sbin/setkey/test-pfkey.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: test-pfkey.c,v 1.4 2000/06/07 00:29:14 itojun Exp $ */
/*-
diff --git a/sbin/setkey/token.l b/sbin/setkey/token.l
index f5ccb4297d33..5acca879a944 100644
--- a/sbin/setkey/token.l
+++ b/sbin/setkey/token.l
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: token.l,v 1.43 2003/07/25 09:35:28 itojun Exp $ */
/*-
diff --git a/sbin/setkey/vchar.h b/sbin/setkey/vchar.h
index c7e96cb9ca1a..035bfa82e1e6 100644
--- a/sbin/setkey/vchar.h
+++ b/sbin/setkey/vchar.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: vchar.h,v 1.2 2000/06/07 00:29:14 itojun Exp $ */
/*-
diff --git a/secure/lib/libcrypto/opensslconf.h.in b/secure/lib/libcrypto/opensslconf.h.in
index b0936858a221..2658796beb66 100644
--- a/secure/lib/libcrypto/opensslconf.h.in
+++ b/secure/lib/libcrypto/opensslconf.h.in
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* WARNING: do not edit!
* Generated by Makefile from include/openssl/opensslconf.h.in
diff --git a/share/examples/FreeBSD_version/FreeBSD_version.c b/share/examples/FreeBSD_version/FreeBSD_version.c
index 036a5aeaaa20..e3f5600a857f 100644
--- a/share/examples/FreeBSD_version/FreeBSD_version.c
+++ b/share/examples/FreeBSD_version/FreeBSD_version.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#if __FreeBSD__ == 0 /* 1.0 did not define __FreeBSD__ */
#define __FreeBSD_version 199401
#elif __FreeBSD__ == 1 /* 1.1 defined it to be 1 */
diff --git a/share/examples/ipfilter/l4check/l4check.c b/share/examples/ipfilter/l4check/l4check.c
index 961eeab934fd..6a77d147ce5f 100644
--- a/share/examples/ipfilter/l4check/l4check.c
+++ b/share/examples/ipfilter/l4check/l4check.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* (C)Copyright (C) 2012 by Darren Reed.
diff --git a/share/examples/ipfilter/mlfk_rule.c b/share/examples/ipfilter/mlfk_rule.c
index 9f951cf6c31d..0858f21c4241 100644
--- a/share/examples/ipfilter/mlfk_rule.c
+++ b/share/examples/ipfilter/mlfk_rule.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (C) 2012 by Darren Reed.
diff --git a/share/examples/ipfilter/samples/proxy.c b/share/examples/ipfilter/samples/proxy.c
index 483c4b5d768a..7f5949b519be 100644
--- a/share/examples/ipfilter/samples/proxy.c
+++ b/share/examples/ipfilter/samples/proxy.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Sample transparent proxy program.
diff --git a/share/examples/ipfilter/samples/relay.c b/share/examples/ipfilter/samples/relay.c
index 11b76b07c509..3d53fd7386ef 100644
--- a/share/examples/ipfilter/samples/relay.c
+++ b/share/examples/ipfilter/samples/relay.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Sample program to be used as a transparent proxy.
diff --git a/share/examples/ipfilter/samples/userauth.c b/share/examples/ipfilter/samples/userauth.c
index 620bd7220057..cc733a715322 100644
--- a/share/examples/ipfilter/samples/userauth.c
+++ b/share/examples/ipfilter/samples/userauth.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/share/examples/ses/srcs/chpmon.c b/share/examples/ses/srcs/chpmon.c
index cb78f062f354..40574e16cf0f 100644
--- a/share/examples/ses/srcs/chpmon.c
+++ b/share/examples/ses/srcs/chpmon.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/share/examples/ses/srcs/eltsub.c b/share/examples/ses/srcs/eltsub.c
index 0dfded94a583..4173eba4997f 100644
--- a/share/examples/ses/srcs/eltsub.c
+++ b/share/examples/ses/srcs/eltsub.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/share/examples/ses/srcs/eltsub.h b/share/examples/ses/srcs/eltsub.h
index 3d98572352e9..0623b4ac1e5c 100644
--- a/share/examples/ses/srcs/eltsub.h
+++ b/share/examples/ses/srcs/eltsub.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/share/examples/ses/srcs/getencstat.c b/share/examples/ses/srcs/getencstat.c
index 7cdde90dc74b..55a7a0e8edc4 100644
--- a/share/examples/ses/srcs/getencstat.c
+++ b/share/examples/ses/srcs/getencstat.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/share/examples/ses/srcs/getnobj.c b/share/examples/ses/srcs/getnobj.c
index 92d3458dec6e..6ad1bc892717 100644
--- a/share/examples/ses/srcs/getnobj.c
+++ b/share/examples/ses/srcs/getnobj.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/share/examples/ses/srcs/getobjmap.c b/share/examples/ses/srcs/getobjmap.c
index fbcc12e63f36..a52484185d0e 100644
--- a/share/examples/ses/srcs/getobjmap.c
+++ b/share/examples/ses/srcs/getobjmap.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/share/examples/ses/srcs/getobjstat.c b/share/examples/ses/srcs/getobjstat.c
index d49f6f97d2f3..83a5e6462961 100644
--- a/share/examples/ses/srcs/getobjstat.c
+++ b/share/examples/ses/srcs/getobjstat.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/share/examples/ses/srcs/inienc.c b/share/examples/ses/srcs/inienc.c
index f418787b303c..f72e71552f7b 100644
--- a/share/examples/ses/srcs/inienc.c
+++ b/share/examples/ses/srcs/inienc.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/share/examples/ses/srcs/sesd.c b/share/examples/ses/srcs/sesd.c
index acf9508fefce..9a6cb8cfe34a 100644
--- a/share/examples/ses/srcs/sesd.c
+++ b/share/examples/ses/srcs/sesd.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/share/examples/ses/srcs/setencstat.c b/share/examples/ses/srcs/setencstat.c
index 87a7fa263043..dbfbaf27aacb 100644
--- a/share/examples/ses/srcs/setencstat.c
+++ b/share/examples/ses/srcs/setencstat.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/share/examples/ses/srcs/setobjstat.c b/share/examples/ses/srcs/setobjstat.c
index 26a5dd19ebcd..e5d374e5252a 100644
--- a/share/examples/ses/srcs/setobjstat.c
+++ b/share/examples/ses/srcs/setobjstat.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/share/examples/sunrpc/msg/msg_proc.c b/share/examples/sunrpc/msg/msg_proc.c
index 45ffe7cc1153..bc7130bf029a 100644
--- a/share/examples/sunrpc/msg/msg_proc.c
+++ b/share/examples/sunrpc/msg/msg_proc.c
@@ -1,5 +1,4 @@
/* @(#)msg_proc.c 2.1 88/08/11 4.0 RPCSRC */
-/* $FreeBSD$ */
/*
* msg_proc.c: implementation of the remote procedure "printmessage"
*/
diff --git a/share/examples/sunrpc/msg/printmsg.c b/share/examples/sunrpc/msg/printmsg.c
index 681007c4b1fe..d8b227bde926 100644
--- a/share/examples/sunrpc/msg/printmsg.c
+++ b/share/examples/sunrpc/msg/printmsg.c
@@ -1,5 +1,4 @@
/* @(#)printmsg.c 2.1 88/08/11 4.0 RPCSRC */
-/* $FreeBSD$ */
/*
* printmsg.c: print a message on the console
*/
diff --git a/share/examples/tests/tests/atf/printf_test.c b/share/examples/tests/tests/atf/printf_test.c
index 5a4cb658395e..90fe32b23a3a 100644
--- a/share/examples/tests/tests/atf/printf_test.c
+++ b/share/examples/tests/tests/atf/printf_test.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$
*
* SPDX-License-Identifier: BSD-3-Clause
*
diff --git a/share/examples/tests/tests/plain/printf_test.c b/share/examples/tests/tests/plain/printf_test.c
index 89d96d037791..09c46086a58b 100644
--- a/share/examples/tests/tests/plain/printf_test.c
+++ b/share/examples/tests/tests/plain/printf_test.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/share/examples/tests/tests/tap/printf_test.c b/share/examples/tests/tests/tap/printf_test.c
index 4e74f790a826..b3dd90fca3eb 100644
--- a/share/examples/tests/tests/tap/printf_test.c
+++ b/share/examples/tests/tests/tap/printf_test.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$
*
* Copyright 2013 Google Inc.
* All rights reserved.
diff --git a/stand/efi/include/Guid/MemoryTypeInformation.h b/stand/efi/include/Guid/MemoryTypeInformation.h
index 50386b747d35..be9c4b5177a9 100644
--- a/stand/efi/include/Guid/MemoryTypeInformation.h
+++ b/stand/efi/include/Guid/MemoryTypeInformation.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/** @file
This file defines:
* Memory Type Information GUID for HOB and Variable.
diff --git a/stand/efi/include/Guid/MtcVendor.h b/stand/efi/include/Guid/MtcVendor.h
index 471e7df4d673..3aa774f55477 100644
--- a/stand/efi/include/Guid/MtcVendor.h
+++ b/stand/efi/include/Guid/MtcVendor.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/** @file
GUID is for MTC variable.
diff --git a/stand/efi/include/Guid/ZeroGuid.h b/stand/efi/include/Guid/ZeroGuid.h
index a7502cb83534..6de8c3821f5f 100644
--- a/stand/efi/include/Guid/ZeroGuid.h
+++ b/stand/efi/include/Guid/ZeroGuid.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/** @file
GUID has all zero values.
diff --git a/stand/efi/include/Protocol/EdidActive.h b/stand/efi/include/Protocol/EdidActive.h
index 88fc0c68ec37..1f6ff052a91c 100644
--- a/stand/efi/include/Protocol/EdidActive.h
+++ b/stand/efi/include/Protocol/EdidActive.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/** @file
EDID Active Protocol from the UEFI 2.0 specification.
diff --git a/stand/efi/include/Protocol/EdidDiscovered.h b/stand/efi/include/Protocol/EdidDiscovered.h
index a521e90d0056..c10b6ee89a82 100644
--- a/stand/efi/include/Protocol/EdidDiscovered.h
+++ b/stand/efi/include/Protocol/EdidDiscovered.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/** @file
EDID Discovered Protocol from the UEFI 2.0 specification.
diff --git a/stand/efi/include/Protocol/EdidOverride.h b/stand/efi/include/Protocol/EdidOverride.h
index d64d400e8c06..450c95641fce 100644
--- a/stand/efi/include/Protocol/EdidOverride.h
+++ b/stand/efi/include/Protocol/EdidOverride.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/** @file
EDID Override Protocol from the UEFI 2.0 specification.
diff --git a/stand/efi/include/Protocol/Http.h b/stand/efi/include/Protocol/Http.h
index 54f49ab5e35c..c88cc9f78847 100644
--- a/stand/efi/include/Protocol/Http.h
+++ b/stand/efi/include/Protocol/Http.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/** @file
This file defines the EFI HTTP Protocol interface. It is split into
the following two main sections:
diff --git a/stand/efi/include/Protocol/Ip4Config2.h b/stand/efi/include/Protocol/Ip4Config2.h
index 47241d7ad7d4..41b5abaafa02 100644
--- a/stand/efi/include/Protocol/Ip4Config2.h
+++ b/stand/efi/include/Protocol/Ip4Config2.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/** @file
This file provides a definition of the EFI IPv4 Configuration II
Protocol.
diff --git a/stand/efi/include/Protocol/ServiceBinding.h b/stand/efi/include/Protocol/ServiceBinding.h
index 39602b086e5b..ac501515ac67 100644
--- a/stand/efi/include/Protocol/ServiceBinding.h
+++ b/stand/efi/include/Protocol/ServiceBinding.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/** @file
UEFI Service Binding Protocol is defined in UEFI specification.
diff --git a/stand/efi/include/README b/stand/efi/include/README
index bf821fae7e60..126cfa752f69 100644
--- a/stand/efi/include/README
+++ b/stand/efi/include/README
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
Files in this directory and subdirectories are subject to the following
diff --git a/stand/efi/include/amd64/efibind.h b/stand/efi/include/amd64/efibind.h
index 8cfce5bbc5f1..2f900786fb9d 100644
--- a/stand/efi/include/amd64/efibind.h
+++ b/stand/efi/include/amd64/efibind.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*++
Copyright (c) 1999 - 2003 Intel Corporation. All rights reserved
diff --git a/stand/efi/include/amd64/pe.h b/stand/efi/include/amd64/pe.h
index f8033c55ac55..ad5985cc2740 100644
--- a/stand/efi/include/amd64/pe.h
+++ b/stand/efi/include/amd64/pe.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
PE32+ header file
*/
diff --git a/stand/efi/include/arm/efibind.h b/stand/efi/include/arm/efibind.h
index 177032adc01a..8bc9f4b56eb2 100644
--- a/stand/efi/include/arm/efibind.h
+++ b/stand/efi/include/arm/efibind.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*++
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.
diff --git a/stand/efi/include/arm64/efibind.h b/stand/efi/include/arm64/efibind.h
index 4751e2e944a8..4fdfd9f21386 100644
--- a/stand/efi/include/arm64/efibind.h
+++ b/stand/efi/include/arm64/efibind.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*++
Copyright (c) 1999 - 2003 Intel Corporation. All rights reserved
diff --git a/stand/efi/include/efi.h b/stand/efi/include/efi.h
index 7e44a5b819fc..20776dcee2fc 100644
--- a/stand/efi/include/efi.h
+++ b/stand/efi/include/efi.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*++
Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved
diff --git a/stand/efi/include/efi_nii.h b/stand/efi/include/efi_nii.h
index 561cbd46a3ea..069e318428ea 100644
--- a/stand/efi/include/efi_nii.h
+++ b/stand/efi/include/efi_nii.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_NII_H
#define _EFI_NII_H
diff --git a/stand/efi/include/efiapi.h b/stand/efi/include/efiapi.h
index 2347a4d9cf73..6c96c6f707ad 100644
--- a/stand/efi/include/efiapi.h
+++ b/stand/efi/include/efiapi.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_API_H
#define _EFI_API_H
diff --git a/stand/efi/include/eficon.h b/stand/efi/include/eficon.h
index ba80114eb9be..39855b8b0725 100644
--- a/stand/efi/include/eficon.h
+++ b/stand/efi/include/eficon.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_CON_H
#define _EFI_CON_H
diff --git a/stand/efi/include/eficonsctl.h b/stand/efi/include/eficonsctl.h
index 68be3d69f4fd..c7f5a137045e 100644
--- a/stand/efi/include/eficonsctl.h
+++ b/stand/efi/include/eficonsctl.h
@@ -29,7 +29,6 @@
* Abstract: Abstraction of a Text mode or GOP/UGA screen
*/
-/* $FreeBSD$ */
#ifndef _EFI_CONS_CTL_H
#define _EFI_CONS_CTL_H
diff --git a/stand/efi/include/efidebug.h b/stand/efi/include/efidebug.h
index 5576d5f4e48c..b43b62d1283c 100644
--- a/stand/efi/include/efidebug.h
+++ b/stand/efi/include/efidebug.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_DEBUG_H
#define _EFI_DEBUG_H
diff --git a/stand/efi/include/efidef.h b/stand/efi/include/efidef.h
index a8f88d41df24..54be3bb2a0ce 100644
--- a/stand/efi/include/efidef.h
+++ b/stand/efi/include/efidef.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_DEF_H
#define _EFI_DEF_H
diff --git a/stand/efi/include/efidevp.h b/stand/efi/include/efidevp.h
index b00b78f02c6a..409f2b23b9ef 100644
--- a/stand/efi/include/efidevp.h
+++ b/stand/efi/include/efidevp.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _DEVPATH_H
#define _DEVPATH_H
diff --git a/stand/efi/include/efierr.h b/stand/efi/include/efierr.h
index a8b655718599..2aa2622a3877 100644
--- a/stand/efi/include/efierr.h
+++ b/stand/efi/include/efierr.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_ERR_H
#define _EFI_ERR_H
diff --git a/stand/efi/include/efifpswa.h b/stand/efi/include/efifpswa.h
index 21823c5ff6f1..ed831d02e51b 100644
--- a/stand/efi/include/efifpswa.h
+++ b/stand/efi/include/efifpswa.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_FPSWA_H
#define _EFI_FPSWA_H
diff --git a/stand/efi/include/efifs.h b/stand/efi/include/efifs.h
index 58febb66eb75..cb92eac9557f 100644
--- a/stand/efi/include/efifs.h
+++ b/stand/efi/include/efifs.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_FS_H
#define _EFI_FS_H
diff --git a/stand/efi/include/efigop.h b/stand/efi/include/efigop.h
index 104fa6e44b5a..e1d4b8163401 100644
--- a/stand/efi/include/efigop.h
+++ b/stand/efi/include/efigop.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*++
Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved
diff --git a/stand/efi/include/efigpt.h b/stand/efi/include/efigpt.h
index 045d49520b40..ac90a304f762 100644
--- a/stand/efi/include/efigpt.h
+++ b/stand/efi/include/efigpt.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_GPT_H
#define _EFI_GPT_H
/*++
diff --git a/stand/efi/include/efiip.h b/stand/efi/include/efiip.h
index ce0910a1b998..839507964f75 100644
--- a/stand/efi/include/efiip.h
+++ b/stand/efi/include/efiip.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_IP_H
#define _EFI_IP_H
diff --git a/stand/efi/include/efinet.h b/stand/efi/include/efinet.h
index 3ac58b2431ca..9cd13f5a4653 100644
--- a/stand/efi/include/efinet.h
+++ b/stand/efi/include/efinet.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFINET_H
#define _EFINET_H
diff --git a/stand/efi/include/efipart.h b/stand/efi/include/efipart.h
index ef1a8709d91b..32a715c8781b 100644
--- a/stand/efi/include/efipart.h
+++ b/stand/efi/include/efipart.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_PART_H
#define _EFI_PART_H
diff --git a/stand/efi/include/efipciio.h b/stand/efi/include/efipciio.h
index b42fa59395a0..4e9ca153f721 100644
--- a/stand/efi/include/efipciio.h
+++ b/stand/efi/include/efipciio.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/** @file
EFI PCI I/O Protocol provides the basic Memory, I/O, PCI configuration,
and DMA interfaces that a driver uses to access its PCI controller.
diff --git a/stand/efi/include/efipoint.h b/stand/efi/include/efipoint.h
index 99944f720378..46e92ffd3b48 100644
--- a/stand/efi/include/efipoint.h
+++ b/stand/efi/include/efipoint.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Copyright (C) 2014 by John Cronin
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/stand/efi/include/efiprot.h b/stand/efi/include/efiprot.h
index 351b2d347ad4..be11ea83b3a2 100644
--- a/stand/efi/include/efiprot.h
+++ b/stand/efi/include/efiprot.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_PROT_H
#define _EFI_PROT_H
diff --git a/stand/efi/include/efipxebc.h b/stand/efi/include/efipxebc.h
index ba0b2e9b6c5d..5d5c60a104b0 100644
--- a/stand/efi/include/efipxebc.h
+++ b/stand/efi/include/efipxebc.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFIPXEBC_H
#define _EFIPXEBC_H
diff --git a/stand/efi/include/efiser.h b/stand/efi/include/efiser.h
index e3d66e203a4b..9a13653453fb 100644
--- a/stand/efi/include/efiser.h
+++ b/stand/efi/include/efiser.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_SER_H
#define _EFI_SER_H
diff --git a/stand/efi/include/efistdarg.h b/stand/efi/include/efistdarg.h
index 25f556984112..f4cf0356563c 100644
--- a/stand/efi/include/efistdarg.h
+++ b/stand/efi/include/efistdarg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFISTDARG_H_
#define _EFISTDARG_H_
diff --git a/stand/efi/include/efitcp.h b/stand/efi/include/efitcp.h
index 9f47b5ce8edc..6c5df7fd944d 100644
--- a/stand/efi/include/efitcp.h
+++ b/stand/efi/include/efitcp.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_TCP_H
#define _EFI_TCP_H
diff --git a/stand/efi/include/efiudp.h b/stand/efi/include/efiudp.h
index 82c8df79b59a..7c8b467eb9c4 100644
--- a/stand/efi/include/efiudp.h
+++ b/stand/efi/include/efiudp.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EFI_UDP_H
#define _EFI_UDP_H
diff --git a/stand/efi/include/efiuga.h b/stand/efi/include/efiuga.h
index 00464b7cb4c0..b15c2176c32f 100644
--- a/stand/efi/include/efiuga.h
+++ b/stand/efi/include/efiuga.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/** @file
UGA Draw protocol from the EFI 1.1 specification.
diff --git a/stand/efi/include/i386/efibind.h b/stand/efi/include/i386/efibind.h
index 0f1d4f115598..6123a98d1b9b 100644
--- a/stand/efi/include/i386/efibind.h
+++ b/stand/efi/include/i386/efibind.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*++
Copyright (c) 1999 - 2003 Intel Corporation. All rights reserved
diff --git a/stand/efi/include/i386/pe.h b/stand/efi/include/i386/pe.h
index e2ae25c3ddf6..ede10814939f 100644
--- a/stand/efi/include/i386/pe.h
+++ b/stand/efi/include/i386/pe.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
PE32+ header file
*/
diff --git a/stand/efi/include/riscv/efibind.h b/stand/efi/include/riscv/efibind.h
index 4751e2e944a8..4fdfd9f21386 100644
--- a/stand/efi/include/riscv/efibind.h
+++ b/stand/efi/include/riscv/efibind.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*++
Copyright (c) 1999 - 2003 Intel Corporation. All rights reserved
diff --git a/stand/efi/loader/arch/amd64/ldscript.amd64 b/stand/efi/loader/arch/amd64/ldscript.amd64
index 874df9b08f9e..57014aefc025 100644
--- a/stand/efi/loader/arch/amd64/ldscript.amd64
+++ b/stand/efi/loader/arch/amd64/ldscript.amd64
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
OUTPUT_ARCH(i386:x86-64)
ENTRY(_start)
diff --git a/stand/efi/loader/arch/arm/ldscript.arm b/stand/efi/loader/arch/arm/ldscript.arm
index 68775a88a9cd..13affe12bbba 100644
--- a/stand/efi/loader/arch/arm/ldscript.arm
+++ b/stand/efi/loader/arch/arm/ldscript.arm
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
OUTPUT_ARCH(arm)
ENTRY(_start)
SECTIONS
diff --git a/stand/efi/loader/arch/arm64/ldscript.arm64 b/stand/efi/loader/arch/arm64/ldscript.arm64
index c10448f4180e..bacb81b5032f 100644
--- a/stand/efi/loader/arch/arm64/ldscript.arm64
+++ b/stand/efi/loader/arch/arm64/ldscript.arm64
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
OUTPUT_FORMAT("elf64-aarch64-freebsd", "elf64-aarch64-freebsd", "elf64-aarch64-freebsd")
*/
diff --git a/stand/efi/loader/arch/i386/ldscript.i386 b/stand/efi/loader/arch/i386/ldscript.i386
index e17212a1bddd..d305a1bcbeca 100644
--- a/stand/efi/loader/arch/i386/ldscript.i386
+++ b/stand/efi/loader/arch/i386/ldscript.i386
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd")
OUTPUT_ARCH(i386)
ENTRY(_start)
diff --git a/stand/efi/loader/arch/riscv/ldscript.riscv b/stand/efi/loader/arch/riscv/ldscript.riscv
index aa736f0d9b2a..342ec62cf03e 100644
--- a/stand/efi/loader/arch/riscv/ldscript.riscv
+++ b/stand/efi/loader/arch/riscv/ldscript.riscv
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
OUTPUT_FORMAT("elf64-littleriscv", "elf64-littleriscv", "elf64-littleriscv")
OUTPUT_ARCH(riscv64)
ENTRY(_start)
diff --git a/stand/ficl/aarch64/sysdep.c b/stand/ficl/aarch64/sysdep.c
index 43e7c3c91f1d..87bed142d684 100644
--- a/stand/ficl/aarch64/sysdep.c
+++ b/stand/ficl/aarch64/sysdep.c
@@ -7,7 +7,6 @@
**
*******************************************************************/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdio.h>
diff --git a/stand/ficl/amd64/sysdep.c b/stand/ficl/amd64/sysdep.c
index 147c4683b6c2..41a5c679e9b3 100644
--- a/stand/ficl/amd64/sysdep.c
+++ b/stand/ficl/amd64/sysdep.c
@@ -7,7 +7,6 @@
**
*******************************************************************/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdio.h>
diff --git a/stand/ficl/amd64/sysdep.h b/stand/ficl/amd64/sysdep.h
index 08bc0e1f4d0b..0e9a8bb0c788 100644
--- a/stand/ficl/amd64/sysdep.h
+++ b/stand/ficl/amd64/sysdep.h
@@ -48,7 +48,6 @@
** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
*/
-/* $FreeBSD$ */
#if !defined (__SYSDEP_H__)
#define __SYSDEP_H__
diff --git a/stand/ficl/arm/sysdep.c b/stand/ficl/arm/sysdep.c
index 43e7c3c91f1d..87bed142d684 100644
--- a/stand/ficl/arm/sysdep.c
+++ b/stand/ficl/arm/sysdep.c
@@ -7,7 +7,6 @@
**
*******************************************************************/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdio.h>
diff --git a/stand/ficl/dict.c b/stand/ficl/dict.c
index b76d92559f8f..7a6fc7568236 100644
--- a/stand/ficl/dict.c
+++ b/stand/ficl/dict.c
@@ -51,7 +51,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdio.h>
diff --git a/stand/ficl/ficl.c b/stand/ficl/ficl.c
index 219cf84b2225..3731b42b2a32 100644
--- a/stand/ficl/ficl.c
+++ b/stand/ficl/ficl.c
@@ -55,7 +55,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdlib.h>
diff --git a/stand/ficl/ficl.h b/stand/ficl/ficl.h
index 97cf00b0dff3..bdade26eee09 100644
--- a/stand/ficl/ficl.h
+++ b/stand/ficl/ficl.h
@@ -41,7 +41,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#if !defined (__FICL_H__)
#define __FICL_H__
diff --git a/stand/ficl/fileaccess.c b/stand/ficl/fileaccess.c
index 9dd23f9d34b8..a66262fb2bf3 100644
--- a/stand/ficl/fileaccess.c
+++ b/stand/ficl/fileaccess.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <errno.h>
#include <stdlib.h>
diff --git a/stand/ficl/float.c b/stand/ficl/float.c
index dfd1456c8dac..895252b60f20 100644
--- a/stand/ficl/float.c
+++ b/stand/ficl/float.c
@@ -41,7 +41,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include "ficl.h"
diff --git a/stand/ficl/i386/sysdep.c b/stand/ficl/i386/sysdep.c
index 147c4683b6c2..41a5c679e9b3 100644
--- a/stand/ficl/i386/sysdep.c
+++ b/stand/ficl/i386/sysdep.c
@@ -7,7 +7,6 @@
**
*******************************************************************/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdio.h>
diff --git a/stand/ficl/i386/sysdep.h b/stand/ficl/i386/sysdep.h
index 94fda2047ede..8eebbe9e7177 100644
--- a/stand/ficl/i386/sysdep.h
+++ b/stand/ficl/i386/sysdep.h
@@ -46,7 +46,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#if !defined (__SYSDEP_H__)
#define __SYSDEP_H__
diff --git a/stand/ficl/math64.c b/stand/ficl/math64.c
index 6e50458151bc..2122a02629f0 100644
--- a/stand/ficl/math64.c
+++ b/stand/ficl/math64.c
@@ -42,7 +42,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include "ficl.h"
#include "math64.h"
diff --git a/stand/ficl/math64.h b/stand/ficl/math64.h
index a4e56369564f..3acbbffec75f 100644
--- a/stand/ficl/math64.h
+++ b/stand/ficl/math64.h
@@ -40,7 +40,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#if !defined (__MATH64_H__)
#define __MATH64_H__
diff --git a/stand/ficl/mips/sysdep.c b/stand/ficl/mips/sysdep.c
index 43e7c3c91f1d..87bed142d684 100644
--- a/stand/ficl/mips/sysdep.c
+++ b/stand/ficl/mips/sysdep.c
@@ -7,7 +7,6 @@
**
*******************************************************************/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdio.h>
diff --git a/stand/ficl/mips64/sysdep.c b/stand/ficl/mips64/sysdep.c
index 43e7c3c91f1d..87bed142d684 100644
--- a/stand/ficl/mips64/sysdep.c
+++ b/stand/ficl/mips64/sysdep.c
@@ -7,7 +7,6 @@
**
*******************************************************************/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdio.h>
diff --git a/stand/ficl/powerpc/sysdep.c b/stand/ficl/powerpc/sysdep.c
index 43e7c3c91f1d..87bed142d684 100644
--- a/stand/ficl/powerpc/sysdep.c
+++ b/stand/ficl/powerpc/sysdep.c
@@ -7,7 +7,6 @@
**
*******************************************************************/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdio.h>
diff --git a/stand/ficl/prefix.c b/stand/ficl/prefix.c
index a34fc6c78240..f78ee597480f 100644
--- a/stand/ficl/prefix.c
+++ b/stand/ficl/prefix.c
@@ -41,7 +41,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <string.h>
#include <ctype.h>
diff --git a/stand/ficl/riscv/sysdep.c b/stand/ficl/riscv/sysdep.c
index 43e7c3c91f1d..87bed142d684 100644
--- a/stand/ficl/riscv/sysdep.c
+++ b/stand/ficl/riscv/sysdep.c
@@ -7,7 +7,6 @@
**
*******************************************************************/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdio.h>
diff --git a/stand/ficl/search.c b/stand/ficl/search.c
index d445cb32d93a..2fa0d39ed36e 100644
--- a/stand/ficl/search.c
+++ b/stand/ficl/search.c
@@ -41,7 +41,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <string.h>
#include "ficl.h"
diff --git a/stand/ficl/stack.c b/stand/ficl/stack.c
index f98a3b61db7d..366e0adc3cf0 100644
--- a/stand/ficl/stack.c
+++ b/stand/ficl/stack.c
@@ -40,7 +40,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdlib.h>
diff --git a/stand/ficl/testmain.c b/stand/ficl/testmain.c
index 7167f30a2561..42c8edf4efa5 100644
--- a/stand/ficl/testmain.c
+++ b/stand/ficl/testmain.c
@@ -37,7 +37,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <stdlib.h>
#include <stdio.h>
diff --git a/stand/ficl/tools.c b/stand/ficl/tools.c
index db1e94850f5e..2e5d3cd3b55b 100644
--- a/stand/ficl/tools.c
+++ b/stand/ficl/tools.c
@@ -54,7 +54,6 @@
** Specify breakpoint default action
*/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdlib.h>
diff --git a/stand/ficl/unix.c b/stand/ficl/unix.c
index 5b5644079ba9..77ab3a405d70 100644
--- a/stand/ficl/unix.c
+++ b/stand/ficl/unix.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <string.h>
#include <netinet/in.h>
diff --git a/stand/ficl/vm.c b/stand/ficl/vm.c
index 97a4f04e3b3b..b435e1b6069c 100644
--- a/stand/ficl/vm.c
+++ b/stand/ficl/vm.c
@@ -47,7 +47,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdlib.h>
diff --git a/stand/ficl/words.c b/stand/ficl/words.c
index 3f781c6d2ff4..8d06bedf8375 100644
--- a/stand/ficl/words.c
+++ b/stand/ficl/words.c
@@ -41,7 +41,6 @@
** SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#ifdef TESTMAIN
#include <stdlib.h>
diff --git a/stand/ficl/x86/sysdep.c b/stand/ficl/x86/sysdep.c
index f45c115f7fca..eed3db8ad4c3 100644
--- a/stand/ficl/x86/sysdep.c
+++ b/stand/ficl/x86/sysdep.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef TESTMAIN
#include <machine/cpufunc.h>
diff --git a/stand/i386/boot.ldscript b/stand/i386/boot.ldscript
index 2f2a2d3e936e..6d2eb71ba465 100644
--- a/stand/i386/boot.ldscript
+++ b/stand/i386/boot.ldscript
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Simplified linker script for the boot loaders. */
OUTPUT_FORMAT("elf32-i386-freebsd")
OUTPUT_ARCH(i386)
diff --git a/stand/kboot/arch/aarch64/ldscript.aarch64 b/stand/kboot/arch/aarch64/ldscript.aarch64
index d7107fe8c18a..62b7d2b6be01 100644
--- a/stand/kboot/arch/aarch64/ldscript.aarch64
+++ b/stand/kboot/arch/aarch64/ldscript.aarch64
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
OUTPUT_FORMAT("elf64-aarch64", "elf64-aarch64", "elf64-aarch64")
OUTPUT_ARCH(aarch64)
ENTRY(_start)
diff --git a/stand/kboot/arch/amd64/ldscript.amd64 b/stand/kboot/arch/amd64/ldscript.amd64
index bbfe47cd4ef5..4009ba5fa81c 100644
--- a/stand/kboot/arch/amd64/ldscript.amd64
+++ b/stand/kboot/arch/amd64/ldscript.amd64
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
OUTPUT_ARCH(i386:x86-64)
ENTRY(_start)
diff --git a/stand/kshim/bsd_busspace.c b/stand/kshim/bsd_busspace.c
index 778c4494d96c..fc35ffcb9a0c 100644
--- a/stand/kshim/bsd_busspace.c
+++ b/stand/kshim/bsd_busspace.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
*
diff --git a/stand/kshim/bsd_global.h b/stand/kshim/bsd_global.h
index 63bba757736d..4f4bb4e499bd 100644
--- a/stand/kshim/bsd_global.h
+++ b/stand/kshim/bsd_global.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
*
diff --git a/stand/kshim/bsd_kernel.c b/stand/kshim/bsd_kernel.c
index 5d47c799921b..ac552d86603f 100644
--- a/stand/kshim/bsd_kernel.c
+++ b/stand/kshim/bsd_kernel.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
*
diff --git a/stand/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h
index 18ac71e1d7ff..10f9451d7b95 100644
--- a/stand/kshim/bsd_kernel.h
+++ b/stand/kshim/bsd_kernel.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2011 Hans Petter Selasky. All rights reserved.
*
diff --git a/stand/kshim/sysinit.h b/stand/kshim/sysinit.h
index a7a450ee4cf2..d74ab9e3af59 100644
--- a/stand/kshim/sysinit.h
+++ b/stand/kshim/sysinit.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
*
diff --git a/stand/libsa/bootparam.h b/stand/libsa/bootparam.h
index 9c9f50ea434d..6f0c773a0759 100644
--- a/stand/libsa/bootparam.h
+++ b/stand/libsa/bootparam.h
@@ -1,5 +1,4 @@
/* $NetBSD: bootparam.h,v 1.3 1998/01/05 19:19:41 perry Exp $ */
-/* $FreeBSD$ */
int bp_whoami(int sock);
int bp_getfile(int sock, char *key, struct in_addr *addrp, char *path);
diff --git a/stand/libsa/crc32_libkern.c b/stand/libsa/crc32_libkern.c
index d2bd738d4c20..bf9a20f82a47 100644
--- a/stand/libsa/crc32_libkern.c
+++ b/stand/libsa/crc32_libkern.c
@@ -1,3 +1,2 @@
-/* $FreeBSD$ */
#include "../../sys/libkern/gsb_crc32.c"
diff --git a/stand/libsa/netif.h b/stand/libsa/netif.h
index 44165ab0d88a..74b41c75666c 100644
--- a/stand/libsa/netif.h
+++ b/stand/libsa/netif.h
@@ -1,6 +1,5 @@
/* $NetBSD: netif.h,v 1.4 1995/09/14 23:45:30 pk Exp $ */
-/* $FreeBSD$ */
#ifndef __SYS_LIBNETBOOT_NETIF_H
#define __SYS_LIBNETBOOT_NETIF_H
diff --git a/stand/libsa/nfsv2.h b/stand/libsa/nfsv2.h
index 09b2428b8012..165517760eca 100644
--- a/stand/libsa/nfsv2.h
+++ b/stand/libsa/nfsv2.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: nfsv2.h,v 1.2 1996/02/26 23:05:23 gwr Exp $ */
/*
diff --git a/stand/libsa/powerpc/_setjmp.S b/stand/libsa/powerpc/_setjmp.S
index c36f2e6a6b87..a47920380a23 100644
--- a/stand/libsa/powerpc/_setjmp.S
+++ b/stand/libsa/powerpc/_setjmp.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* from: NetBSD: setjmp.S,v 1.1 1998/01/27 15:13:12 sakamoto Exp $ */
/* from: OpenBSD: setjmp.S,v 1.2 1996/12/28 06:22:18 rahnds Exp */
/* kernel version of this file, does not have signal goop */
diff --git a/stand/powerpc/ofw/ldscript.powerpc b/stand/powerpc/ofw/ldscript.powerpc
index 9202eff286b2..1c023ce6ade6 100644
--- a/stand/powerpc/ofw/ldscript.powerpc
+++ b/stand/powerpc/ofw/ldscript.powerpc
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd",
"elf32-powerpc-freebsd")
diff --git a/stand/powerpc/ofw/ldscript.powerpcle b/stand/powerpc/ofw/ldscript.powerpcle
index 47fe96e0233f..946e3dd48ae9 100644
--- a/stand/powerpc/ofw/ldscript.powerpcle
+++ b/stand/powerpc/ofw/ldscript.powerpcle
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
OUTPUT_FORMAT("elf32-powerpcle-freebsd", "elf32-powerpcle-freebsd",
"elf32-powerpcle-freebsd")
diff --git a/stand/uboot/arch/arm/ldscript.arm b/stand/uboot/arch/arm/ldscript.arm
index b768e00f39a3..3ab3d165cde2 100644
--- a/stand/uboot/arch/arm/ldscript.arm
+++ b/stand/uboot/arch/arm/ldscript.arm
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
OUTPUT_ARCH(arm)
ENTRY(_start)
diff --git a/stand/uboot/arch/mips/ldscript.mips b/stand/uboot/arch/mips/ldscript.mips
index 815dabc74587..44bb1a0b2c9a 100644
--- a/stand/uboot/arch/mips/ldscript.mips
+++ b/stand/uboot/arch/mips/ldscript.mips
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
OUTPUT_ARCH(mips)
ENTRY(_start)
diff --git a/stand/uboot/arch/powerpc/ldscript.powerpc b/stand/uboot/arch/powerpc/ldscript.powerpc
index 923838365793..7f33129a7b59 100644
--- a/stand/uboot/arch/powerpc/ldscript.powerpc
+++ b/stand/uboot/arch/powerpc/ldscript.powerpc
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd",
"elf32-powerpc-freebsd")
diff --git a/stand/usb/storage/umass_common.c b/stand/usb/storage/umass_common.c
index 5ddd159297b7..639d70a7f7e6 100644
--- a/stand/usb/storage/umass_common.c
+++ b/stand/usb/storage/umass_common.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2014 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
diff --git a/stand/usb/storage/umass_common.h b/stand/usb/storage/umass_common.h
index a8ffd4987eb9..964f60836e4a 100644
--- a/stand/usb/storage/umass_common.h
+++ b/stand/usb/storage/umass_common.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2014 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
diff --git a/stand/usb/storage/umass_loader.c b/stand/usb/storage/umass_loader.c
index 647d8a58b534..01f1e3602b6a 100644
--- a/stand/usb/storage/umass_loader.c
+++ b/stand/usb/storage/umass_loader.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2014 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
diff --git a/stand/usb/test/bsd_usbloader_test.c b/stand/usb/test/bsd_usbloader_test.c
index 35140b87c360..a92bdebfbebe 100644
--- a/stand/usb/test/bsd_usbloader_test.c
+++ b/stand/usb/test/bsd_usbloader_test.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
*
diff --git a/stand/usb/tools/sysinit.c b/stand/usb/tools/sysinit.c
index b968fe0ab858..cb2868a0d728 100644
--- a/stand/usb/tools/sysinit.c
+++ b/stand/usb/tools/sysinit.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
*
diff --git a/stand/usb/usb_busdma_loader.c b/stand/usb/usb_busdma_loader.c
index 90dc1692ba01..2ca855e468a1 100644
--- a/stand/usb/usb_busdma_loader.c
+++ b/stand/usb/usb_busdma_loader.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
*
diff --git a/tests/sys/geom/class/eli/testvect.h b/tests/sys/geom/class/eli/testvect.h
index 873457340579..49fb0588f596 100644
--- a/tests/sys/geom/class/eli/testvect.h
+++ b/tests/sys/geom/class/eli/testvect.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Test Vectors for PBKDF2-SHA512 */
/* salt, saltlen, passwd, itr, hmacout, hmacoutlen */
{ "\331}\035\215\000\272\350\261", 8, "\323\303\210\231\260\225\217\035", 100, "J\257\275\352n\371\300!tp\367\257\347c'\000\243F\246\376\274H\263\312m\336\304\3515P\222Cb\037-\313W\0067\232\024%\235\252\322\035\225k\025\2248\251r\312]v\316\021j\231\224\2556\350", 64 },
diff --git a/tests/sys/kqueue/libkqueue/config.h b/tests/sys/kqueue/libkqueue/config.h
index 41a67837efe8..e15fb73e55ef 100644
--- a/tests/sys/kqueue/libkqueue/config.h
+++ b/tests/sys/kqueue/libkqueue/config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define HAVE_ERR_H 1
#define HAVE_SYS_EVENT_H 1
diff --git a/tests/sys/mqueue/mqtest1.c b/tests/sys/mqueue/mqtest1.c
index 3accb286ae98..78acde1122ce 100644
--- a/tests/sys/mqueue/mqtest1.c
+++ b/tests/sys/mqueue/mqtest1.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <err.h>
#include <errno.h>
diff --git a/tests/sys/mqueue/mqtest2.c b/tests/sys/mqueue/mqtest2.c
index 067e6190d22f..08d4d9a8003a 100644
--- a/tests/sys/mqueue/mqtest2.c
+++ b/tests/sys/mqueue/mqtest2.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/tests/sys/mqueue/mqtest3.c b/tests/sys/mqueue/mqtest3.c
index 3e20c4d458d1..65b8f4fcc2b9 100644
--- a/tests/sys/mqueue/mqtest3.c
+++ b/tests/sys/mqueue/mqtest3.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <sys/types.h>
#include <sys/select.h>
diff --git a/tests/sys/mqueue/mqtest4.c b/tests/sys/mqueue/mqtest4.c
index b0b395298ef8..99841c670b5c 100644
--- a/tests/sys/mqueue/mqtest4.c
+++ b/tests/sys/mqueue/mqtest4.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <sys/types.h>
#include <sys/event.h>
diff --git a/tests/sys/mqueue/mqtest5.c b/tests/sys/mqueue/mqtest5.c
index 0c8aa895ead2..f48ef1121289 100644
--- a/tests/sys/mqueue/mqtest5.c
+++ b/tests/sys/mqueue/mqtest5.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <sys/types.h>
#include <sys/event.h>
diff --git a/tests/sys/pjdfstest/config.h b/tests/sys/pjdfstest/config.h
index 450581c4b7e0..76dd4028fcaf 100644
--- a/tests/sys/pjdfstest/config.h
+++ b/tests/sys/pjdfstest/config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
diff --git a/tools/diag/dumpvfscache/dumpvfscache.c b/tools/diag/dumpvfscache/dumpvfscache.c
index 3f5eb5793a8a..44c2021a5a42 100644
--- a/tools/diag/dumpvfscache/dumpvfscache.c
+++ b/tools/diag/dumpvfscache/dumpvfscache.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/tools/kerneldoc/subsys/notreviewed.dox b/tools/kerneldoc/subsys/notreviewed.dox
index bcc4bed1f61a..29a868e27c1f 100644
--- a/tools/kerneldoc/subsys/notreviewed.dox
+++ b/tools/kerneldoc/subsys/notreviewed.dox
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/** @mainpage
* <b>IMPORTANT:</b> This API documentation may contain both functions which
diff --git a/tools/regression/ccd/layout/a.c b/tools/regression/ccd/layout/a.c
index 33eea10f2a3c..0feb1f28c093 100644
--- a/tools/regression/ccd/layout/a.c
+++ b/tools/regression/ccd/layout/a.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <unistd.h>
static uint32_t buf[512/4];
diff --git a/tools/regression/ccd/layout/b.c b/tools/regression/ccd/layout/b.c
index 5b4ae8ed6a9e..eea078db37d2 100644
--- a/tools/regression/ccd/layout/b.c
+++ b/tools/regression/ccd/layout/b.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <unistd.h>
#include <fcntl.h>
diff --git a/tools/regression/p1003_1b/main.c b/tools/regression/p1003_1b/main.c
index 5cf3183955f8..7333b64bd455 100644
--- a/tools/regression/p1003_1b/main.c
+++ b/tools/regression/p1003_1b/main.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <sys/param.h>
diff --git a/tools/regression/poll/pipepoll.c b/tools/regression/poll/pipepoll.c
index 5ca064bf6bf3..9fcf450adeba 100644
--- a/tools/regression/poll/pipepoll.c
+++ b/tools/regression/poll/pipepoll.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <sys/poll.h>
#include <sys/socket.h>
diff --git a/tools/regression/poll/pipeselect.c b/tools/regression/poll/pipeselect.c
index fe6e8ed33daa..7e16ec071ede 100644
--- a/tools/regression/poll/pipeselect.c
+++ b/tools/regression/poll/pipeselect.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <sys/socket.h>
#include <sys/select.h>
diff --git a/tools/regression/poll/sockpoll.c b/tools/regression/poll/sockpoll.c
index 31ebcaf9bcb2..ea3c91c3affb 100644
--- a/tools/regression/poll/sockpoll.c
+++ b/tools/regression/poll/sockpoll.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define _GNU_SOURCE /* expose POLLRDHUP when testing on Linux */
diff --git a/tools/regression/posixsem2/semtest.c b/tools/regression/posixsem2/semtest.c
index 0879ff9fda78..5ff2d3e9a888 100644
--- a/tools/regression/posixsem2/semtest.c
+++ b/tools/regression/posixsem2/semtest.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/tools/regression/pthread/unwind/Test.cpp b/tools/regression/pthread/unwind/Test.cpp
index 46e451c390b6..bad63be44798 100644
--- a/tools/regression/pthread/unwind/Test.cpp
+++ b/tools/regression/pthread/unwind/Test.cpp
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
static int destructed;
static int destructed2;
diff --git a/tools/regression/pthread/unwind/catch_pthread_exit.cpp b/tools/regression/pthread/unwind/catch_pthread_exit.cpp
index db0e875ccaeb..b5074cd4beb1 100644
--- a/tools/regression/pthread/unwind/catch_pthread_exit.cpp
+++ b/tools/regression/pthread/unwind/catch_pthread_exit.cpp
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* try to catch thread exiting, and rethrow the exception */
#include <pthread.h>
diff --git a/tools/regression/pthread/unwind/cond_wait_cancel.cpp b/tools/regression/pthread/unwind/cond_wait_cancel.cpp
index 4dfa57746552..d241b55909b6 100644
--- a/tools/regression/pthread/unwind/cond_wait_cancel.cpp
+++ b/tools/regression/pthread/unwind/cond_wait_cancel.cpp
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Test stack unwinding for pthread_cond_wait function */
#include <pthread.h>
diff --git a/tools/regression/pthread/unwind/main_thread_exit.cpp b/tools/regression/pthread/unwind/main_thread_exit.cpp
index 182c194b07af..c3ee859a5f0f 100644
--- a/tools/regression/pthread/unwind/main_thread_exit.cpp
+++ b/tools/regression/pthread/unwind/main_thread_exit.cpp
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* check unwinding for main thread */
#include <pthread.h>
diff --git a/tools/regression/pthread/unwind/sem_wait_cancel.cpp b/tools/regression/pthread/unwind/sem_wait_cancel.cpp
index 2086de6037cb..45f881c521fe 100644
--- a/tools/regression/pthread/unwind/sem_wait_cancel.cpp
+++ b/tools/regression/pthread/unwind/sem_wait_cancel.cpp
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Test stack unwinding for libc's sem */
#include <pthread.h>
diff --git a/tools/regression/pthread/unwind/thread_normal_exit.cpp b/tools/regression/pthread/unwind/thread_normal_exit.cpp
index 70768265be70..3549db432f38 100644
--- a/tools/regression/pthread/unwind/thread_normal_exit.cpp
+++ b/tools/regression/pthread/unwind/thread_normal_exit.cpp
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* test stack unwinding for a new thread */
#include <pthread.h>
diff --git a/tools/regression/sigqueue/sigqtest1/sigqtest1.c b/tools/regression/sigqueue/sigqtest1/sigqtest1.c
index f0201c37af86..074f140f11c8 100644
--- a/tools/regression/sigqueue/sigqtest1/sigqtest1.c
+++ b/tools/regression/sigqueue/sigqtest1/sigqtest1.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <err.h>
#include <errno.h>
#include <signal.h>
diff --git a/tools/regression/sigqueue/sigqtest2/sigqtest2.c b/tools/regression/sigqueue/sigqtest2/sigqtest2.c
index 50b579d0a42c..50ab140dbd9a 100644
--- a/tools/regression/sigqueue/sigqtest2/sigqtest2.c
+++ b/tools/regression/sigqueue/sigqtest2/sigqtest2.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <sys/types.h>
#include <sys/wait.h>
#include <err.h>
diff --git a/tools/regression/tls/libxx/xx.c b/tools/regression/tls/libxx/xx.c
index 6d1e73f79a05..bc81531e2ce0 100644
--- a/tools/regression/tls/libxx/xx.c
+++ b/tools/regression/tls/libxx/xx.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
extern int __thread yy1;
int __thread xx1 = 1;
diff --git a/tools/regression/tls/libyy/yy.c b/tools/regression/tls/libyy/yy.c
index c00cb8770ec4..e7265829b93a 100644
--- a/tools/regression/tls/libyy/yy.c
+++ b/tools/regression/tls/libyy/yy.c
@@ -1,3 +1,2 @@
-/* $FreeBSD$ */
int __thread yy1 = 101;
diff --git a/tools/regression/tls/ttls1/ttls1.c b/tools/regression/tls/ttls1/ttls1.c
index 9c514aeecf7a..24e4b1636e7d 100644
--- a/tools/regression/tls/ttls1/ttls1.c
+++ b/tools/regression/tls/ttls1/ttls1.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <stdio.h>
diff --git a/tools/regression/tls/ttls2/ttls2.c b/tools/regression/tls/ttls2/ttls2.c
index 15eb640e3e3c..6fe316e15128 100644
--- a/tools/regression/tls/ttls2/ttls2.c
+++ b/tools/regression/tls/ttls2/ttls2.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <pthread.h>
#include <stdio.h>
diff --git a/tools/test/malloc/main.c b/tools/test/malloc/main.c
index 5fef9a92f4da..7c5bf14924de 100644
--- a/tools/test/malloc/main.c
+++ b/tools/test/malloc/main.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/tools/tools/ath/ath_ee_9287_print/9287.h b/tools/tools/ath/ath_ee_9287_print/9287.h
index 4cfc4241fdf3..ff14b72c8a91 100644
--- a/tools/tools/ath/ath_ee_9287_print/9287.h
+++ b/tools/tools/ath/ath_ee_9287_print/9287.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef __9287_H__
#define __9287_H__
diff --git a/tools/tools/ath/ath_ee_9287_print/eeprom.h b/tools/tools/ath/ath_ee_9287_print/eeprom.h
index a5fc76a9b58d..3eb8e0da912d 100644
--- a/tools/tools/ath/ath_ee_9287_print/eeprom.h
+++ b/tools/tools/ath/ath_ee_9287_print/eeprom.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef __EEPROM_H__
#define __EEPROM_H__
diff --git a/tools/tools/ath/ath_ee_v4k_print/eeprom.h b/tools/tools/ath/ath_ee_v4k_print/eeprom.h
index a5fc76a9b58d..3eb8e0da912d 100644
--- a/tools/tools/ath/ath_ee_v4k_print/eeprom.h
+++ b/tools/tools/ath/ath_ee_v4k_print/eeprom.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef __EEPROM_H__
#define __EEPROM_H__
diff --git a/tools/tools/ath/ath_ee_v4k_print/v4k.h b/tools/tools/ath/ath_ee_v4k_print/v4k.h
index efe2dc945b86..356312dc1aa8 100644
--- a/tools/tools/ath/ath_ee_v4k_print/v4k.h
+++ b/tools/tools/ath/ath_ee_v4k_print/v4k.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef __V4K_H__
#define __V4K_H__
diff --git a/tools/tools/crypto/cryptokeytest.c b/tools/tools/crypto/cryptokeytest.c
index 5f0ad74b8eba..d455e7140047 100644
--- a/tools/tools/crypto/cryptokeytest.c
+++ b/tools/tools/crypto/cryptokeytest.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* The big num stuff is a bit broken at the moment and I've not yet fixed it.
* The symtom is that odd size big nums will fail. Test code below (it only
diff --git a/tools/tools/iwi/iwistats.c b/tools/tools/iwi/iwistats.c
index 1034dac7701f..31ccf13e8d46 100644
--- a/tools/tools/iwi/iwistats.c
+++ b/tools/tools/iwi/iwistats.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2005
diff --git a/tools/tools/kttcp/kttcp.c b/tools/tools/kttcp/kttcp.c
index 44c6613fa90b..52dc1eff7bc5 100644
--- a/tools/tools/kttcp/kttcp.c
+++ b/tools/tools/kttcp/kttcp.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: kttcp.c,v 1.5 2002/07/11 23:32:35 simonb Exp $ */
/*
diff --git a/tools/tools/kttcp/sys/kttcp.c b/tools/tools/kttcp/sys/kttcp.c
index 09739600feaf..2adca499b4d1 100644
--- a/tools/tools/kttcp/sys/kttcp.c
+++ b/tools/tools/kttcp/sys/kttcp.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: kttcp.c,v 1.3 2002/07/03 19:36:52 thorpej Exp $ */
/*
diff --git a/tools/tools/kttcp/sys/kttcpio.h b/tools/tools/kttcp/sys/kttcpio.h
index 1375f6ef6c9d..6b0756528a27 100644
--- a/tools/tools/kttcp/sys/kttcpio.h
+++ b/tools/tools/kttcp/sys/kttcpio.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD$ */
/*
diff --git a/tools/tools/mctest/mctest.h b/tools/tools/mctest/mctest.h
index 955464c8795a..019b8b5efef7 100644
--- a/tools/tools/mctest/mctest.h
+++ b/tools/tools/mctest/mctest.h
@@ -24,7 +24,6 @@
// SUCH DAMAGE.
//
//
-// $FreeBSD$
//
const char* DEFAULT_GROUP = "239.255.255.1";
diff --git a/tools/tools/ncpus/ncpus.c b/tools/tools/ncpus/ncpus.c
index 0f4498f095ba..85023e11c696 100644
--- a/tools/tools/ncpus/ncpus.c
+++ b/tools/tools/ncpus/ncpus.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <stdio.h>
diff --git a/tools/tools/netmap/ctrs.h b/tools/tools/netmap/ctrs.h
index eb4c4c9d4bfd..29e054442db0 100644
--- a/tools/tools/netmap/ctrs.h
+++ b/tools/tools/netmap/ctrs.h
@@ -1,7 +1,6 @@
#ifndef CTRS_H_
#define CTRS_H_
-/* $FreeBSD$ */
#include <sys/time.h>
diff --git a/tools/tools/netmap/lb.c b/tools/tools/netmap/lb.c
index 66d7aab8f6e1..b45e5274553c 100644
--- a/tools/tools/netmap/lb.c
+++ b/tools/tools/netmap/lb.c
@@ -22,7 +22,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <ctype.h>
#include <errno.h>
#include <inttypes.h>
diff --git a/tools/tools/netmap/pkt_hash.c b/tools/tools/netmap/pkt_hash.c
index eb9704fd2058..0016544f9090 100644
--- a/tools/tools/netmap/pkt_hash.c
+++ b/tools/tools/netmap/pkt_hash.c
@@ -25,7 +25,6 @@
** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
** POSSIBILITY OF SUCH DAMAGE.
**/
-/* $FreeBSD$ */
/* for func prototypes */
#include "pkt_hash.h"
diff --git a/tools/tools/netmap/pkt_hash.h b/tools/tools/netmap/pkt_hash.h
index 7371f074079f..1f73ff97ecb0 100644
--- a/tools/tools/netmap/pkt_hash.h
+++ b/tools/tools/netmap/pkt_hash.h
@@ -25,7 +25,6 @@
** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
** POSSIBILITY OF SUCH DAMAGE.
**/
-/* $FreeBSD$ */
#ifndef LB_PKT_HASH_H
#define LB_PKT_HASH_H
/*---------------------------------------------------------------------*/
diff --git a/tools/tools/usbtest/usb_control_ep_test.c b/tools/tools/usbtest/usb_control_ep_test.c
index 4ee3bf3e05b6..1ffb89e42728 100644
--- a/tools/tools/usbtest/usb_control_ep_test.c
+++ b/tools/tools/usbtest/usb_control_ep_test.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2007-2022 Hans Petter Selasky
*
diff --git a/tools/tools/usbtest/usb_modem_test.c b/tools/tools/usbtest/usb_modem_test.c
index 0ac7ac594601..eb264df7dfed 100644
--- a/tools/tools/usbtest/usb_modem_test.c
+++ b/tools/tools/usbtest/usb_modem_test.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2007-2022 Hans Petter Selasky
*
diff --git a/tools/tools/usbtest/usb_msc_test.c b/tools/tools/usbtest/usb_msc_test.c
index 8a67d040f63c..713da381820e 100644
--- a/tools/tools/usbtest/usb_msc_test.c
+++ b/tools/tools/usbtest/usb_msc_test.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2007-2022 Hans Petter Selasky
*
diff --git a/tools/tools/usbtest/usb_msc_test.h b/tools/tools/usbtest/usb_msc_test.h
index 4c6a4c4bcf5b..5718e6cd513f 100644
--- a/tools/tools/usbtest/usb_msc_test.h
+++ b/tools/tools/usbtest/usb_msc_test.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
diff --git a/tools/tools/usbtest/usbtest.c b/tools/tools/usbtest/usbtest.c
index 40d67589c5a9..adb46ef44b34 100644
--- a/tools/tools/usbtest/usbtest.c
+++ b/tools/tools/usbtest/usbtest.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2010-2022 Hans Petter Selasky
*
diff --git a/tools/tools/usbtest/usbtest.h b/tools/tools/usbtest/usbtest.h
index f274bebc848b..efe484bc7d37 100644
--- a/tools/tools/usbtest/usbtest.h
+++ b/tools/tools/usbtest/usbtest.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2010-2022 Hans Petter Selasky
*
diff --git a/tools/tools/vhba/faulty/vhba_faulty.c b/tools/tools/vhba/faulty/vhba_faulty.c
index 49cbb4b1065e..28d0dffecc8d 100644
--- a/tools/tools/vhba/faulty/vhba_faulty.c
+++ b/tools/tools/vhba/faulty/vhba_faulty.c
@@ -23,7 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/*
* "Faulty" Device. Victimize random commands with a Selection Timeout.
*/
diff --git a/tools/tools/vhba/lots/vhba_lots.c b/tools/tools/vhba/lots/vhba_lots.c
index 07126663c42d..24d336c75d63 100644
--- a/tools/tools/vhba/lots/vhba_lots.c
+++ b/tools/tools/vhba/lots/vhba_lots.c
@@ -23,7 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/*
* VHBA device that just reate boatloads of devices.
*/
diff --git a/tools/tools/vhba/medium/vhba_medium.c b/tools/tools/vhba/medium/vhba_medium.c
index 2fc9f926af78..2a1f61dc6861 100644
--- a/tools/tools/vhba/medium/vhba_medium.c
+++ b/tools/tools/vhba/medium/vhba_medium.c
@@ -23,7 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/*
* A VHBA device that has a medium number of device.
*/
diff --git a/tools/tools/vhba/mptest/vhba_mptest.c b/tools/tools/vhba/mptest/vhba_mptest.c
index 9a2ec850e509..44e59c4d2008 100644
--- a/tools/tools/vhba/mptest/vhba_mptest.c
+++ b/tools/tools/vhba/mptest/vhba_mptest.c
@@ -23,7 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/*
* "Faulty" Multipath Device. Creates to devices to be set up as multipath,
* makes one or both of them non existent (or re existent) on demand.
diff --git a/tools/tools/vhba/opt_cam.h b/tools/tools/vhba/opt_cam.h
index da23dbe43a4f..e69de29bb2d1 100644
--- a/tools/tools/vhba/opt_cam.h
+++ b/tools/tools/vhba/opt_cam.h
@@ -1 +0,0 @@
-/* $FreeBSD$ */
diff --git a/tools/tools/vhba/rptluns/vhba_rptluns.c b/tools/tools/vhba/rptluns/vhba_rptluns.c
index 28424c4facd3..8af132d7087b 100644
--- a/tools/tools/vhba/rptluns/vhba_rptluns.c
+++ b/tools/tools/vhba/rptluns/vhba_rptluns.c
@@ -23,7 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/*
* A VHBA device to test REPORT LUN functionality.
*/
diff --git a/tools/tools/vhba/simple/vhba_simple.c b/tools/tools/vhba/simple/vhba_simple.c
index bc40bea77f8d..0a87dc811341 100644
--- a/tools/tools/vhba/simple/vhba_simple.c
+++ b/tools/tools/vhba/simple/vhba_simple.c
@@ -23,7 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/*
* "Simple" VHBA device
*/
diff --git a/tools/tools/vhba/vhba.c b/tools/tools/vhba/vhba.c
index 3fdfe355d9c7..fcb4ffc002b1 100644
--- a/tools/tools/vhba/vhba.c
+++ b/tools/tools/vhba/vhba.c
@@ -23,7 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/*
* Virtual HBA infrastructure, to be used for testing as well as other cute hacks.
*/
diff --git a/tools/tools/vhba/vhba.h b/tools/tools/vhba/vhba.h
index c09bd000de3e..9e9ca0e7eabe 100644
--- a/tools/tools/vhba/vhba.h
+++ b/tools/tools/vhba/vhba.h
@@ -23,7 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/*
* Virtual HBA defines
*/
diff --git a/tools/tools/zfsboottest/zfsboottest.c b/tools/tools/zfsboottest/zfsboottest.c
index 88f946e9d3fe..5ee239789b57 100644
--- a/tools/tools/zfsboottest/zfsboottest.c
+++ b/tools/tools/zfsboottest/zfsboottest.c
@@ -25,7 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <sys/param.h>
#include <sys/disk.h>
diff --git a/usr.bin/bc/bc.library b/usr.bin/bc/bc.library
index 8b92d25c95f8..9cd67e4e6f60 100644
--- a/usr.bin/bc/bc.library
+++ b/usr.bin/bc/bc.library
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $OpenBSD: bc.library,v 1.4 2012/03/14 07:35:53 otto Exp $ */
/*
diff --git a/usr.bin/bc/extern.h b/usr.bin/bc/extern.h
index 7909a17ddeb2..98adf069f9b1 100644
--- a/usr.bin/bc/extern.h
+++ b/usr.bin/bc/extern.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $OpenBSD: extern.h,v 1.12 2014/04/17 19:07:14 otto Exp $ */
/*
diff --git a/usr.bin/bc/pathnames.h b/usr.bin/bc/pathnames.h
index defb766f7169..cf1c13a6c702 100644
--- a/usr.bin/bc/pathnames.h
+++ b/usr.bin/bc/pathnames.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $OpenBSD: pathnames.h,v 1.1 2003/09/25 19:32:44 otto Exp $ */
/*
diff --git a/usr.bin/bc/tty.c b/usr.bin/bc/tty.c
index f5d72fc9c817..3b2a04077040 100644
--- a/usr.bin/bc/tty.c
+++ b/usr.bin/bc/tty.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $OpenBSD: tty.c,v 1.3 2015/09/05 09:49:24 jsg Exp $ */
/*
diff --git a/usr.bin/bmake/config.h b/usr.bin/bmake/config.h
index 6c053cf96cfd..d8573c66656a 100644
--- a/usr.bin/bmake/config.h
+++ b/usr.bin/bmake/config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
diff --git a/usr.bin/compress/doc/revision.log b/usr.bin/compress/doc/revision.log
index 2d5d9d9c82b4..8fbaa00f1c46 100644
--- a/usr.bin/compress/doc/revision.log
+++ b/usr.bin/compress/doc/revision.log
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* $Header: compress.c,v 4.0 85/07/30 12:50:00 joe Release $
diff --git a/usr.bin/dc/bcode.h b/usr.bin/dc/bcode.h
index d23efd9fb026..b03f11999a9a 100644
--- a/usr.bin/dc/bcode.h
+++ b/usr.bin/dc/bcode.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $OpenBSD: bcode.h,v 1.7 2012/11/07 11:06:14 otto Exp $ */
/*
diff --git a/usr.bin/dc/extern.h b/usr.bin/dc/extern.h
index 38f0c8c714ef..86ab2d80dd6f 100644
--- a/usr.bin/dc/extern.h
+++ b/usr.bin/dc/extern.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $OpenBSD: extern.h,v 1.4 2014/12/01 13:13:00 deraadt Exp $ */
/*
diff --git a/usr.bin/fortune/strfile/strfile.h b/usr.bin/fortune/strfile/strfile.h
index 5d4f87558411..40a2a4e80ec9 100644
--- a/usr.bin/fortune/strfile/strfile.h
+++ b/usr.bin/fortune/strfile/strfile.h
@@ -31,7 +31,6 @@
*
* @(#)strfile.h 8.1 (Berkeley) 5/31/93
*/
-/* $FreeBSD$ */
#include <sys/types.h>
diff --git a/usr.bin/ftp/tnftp_config.h b/usr.bin/ftp/tnftp_config.h
index 75bfb7542c01..f551312f64a0 100644
--- a/usr.bin/ftp/tnftp_config.h
+++ b/usr.bin/ftp/tnftp_config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* tnftp_config.h. Generated from tnftp_config.h.in by configure. */
/* tnftp_config.h.in. Generated from configure.ac by autoheader. */
diff --git a/usr.bin/gcore/elf32core.c b/usr.bin/gcore/elf32core.c
index 196ba9f1cec0..292ff59b98b1 100644
--- a/usr.bin/gcore/elf32core.c
+++ b/usr.bin/gcore/elf32core.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef __LP64__
#error "this file must be compiled for LP64."
#endif
diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c
index 1710b5aacdb3..12c524188583 100644
--- a/usr.bin/grep/file.c
+++ b/usr.bin/grep/file.c
@@ -1,5 +1,4 @@
/* $NetBSD: file.c,v 1.5 2011/02/16 18:35:39 joerg Exp $ */
-/* $FreeBSD$ */
/* $OpenBSD: file.c,v 1.11 2010/07/02 20:48:48 nicm Exp $ */
/*-
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index f9e8b9e5a2a5..c29a03f07702 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -1,5 +1,4 @@
/* $NetBSD: grep.c,v 1.6 2011/04/18 03:48:23 joerg Exp $ */
-/* $FreeBSD$ */
/* $OpenBSD: grep.c,v 1.42 2010/07/02 22:18:03 tedu Exp $ */
/*-
diff --git a/usr.bin/grep/grep.h b/usr.bin/grep/grep.h
index 3ac05f75fa8b..02f612aecf1f 100644
--- a/usr.bin/grep/grep.h
+++ b/usr.bin/grep/grep.h
@@ -1,6 +1,5 @@
/* $NetBSD: grep.h,v 1.5 2011/02/27 17:33:37 joerg Exp $ */
/* $OpenBSD: grep.h,v 1.15 2010/04/05 03:03:55 tedu Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/usr.bin/grep/queue.c b/usr.bin/grep/queue.c
index bcaa959f406c..1b74c1799991 100644
--- a/usr.bin/grep/queue.c
+++ b/usr.bin/grep/queue.c
@@ -1,5 +1,4 @@
/* $NetBSD: queue.c,v 1.5 2011/08/31 16:24:57 plunky Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index eba060ba6cdc..723b41e8798a 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -1,5 +1,4 @@
/* $NetBSD: util.c,v 1.9 2011/02/27 17:33:37 joerg Exp $ */
-/* $FreeBSD$ */
/* $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $ */
/*-
diff --git a/usr.bin/gzip/unpack.c b/usr.bin/gzip/unpack.c
index 408ba4dfd259..110500ac21d6 100644
--- a/usr.bin/gzip/unpack.c
+++ b/usr.bin/gzip/unpack.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: unpack.c,v 1.3 2017/08/04 07:27:08 mrg Exp $ */
/*-
diff --git a/usr.bin/iconv/iconv.c b/usr.bin/iconv/iconv.c
index ba099f8af520..54a464de273a 100644
--- a/usr.bin/iconv/iconv.c
+++ b/usr.bin/iconv/iconv.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: iconv.c,v 1.16 2009/02/20 15:28:21 yamt Exp $ */
/*-
diff --git a/usr.bin/indent/tests/binary.0 b/usr.bin/indent/tests/binary.0
index b2adc1fe6428..0c5ebf7e8f89 100644
--- a/usr.bin/indent/tests/binary.0
+++ b/usr.bin/indent/tests/binary.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define b00101010 -1
void t(void) {
unsigned a[] = {0b00101010, 0x00005678, 02, 17U};
diff --git a/usr.bin/indent/tests/binary.0.stdout b/usr.bin/indent/tests/binary.0.stdout
index 5bb9a31a3832..6118ac505550 100644
--- a/usr.bin/indent/tests/binary.0.stdout
+++ b/usr.bin/indent/tests/binary.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define b00101010 -1
void
t(void)
diff --git a/usr.bin/indent/tests/comments.0 b/usr.bin/indent/tests/comments.0
index 7b65c2eb552b..4a627b9f39ec 100644
--- a/usr.bin/indent/tests/comments.0
+++ b/usr.bin/indent/tests/comments.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
typedef enum x {
aaaaaaaaaaaaaaaaaaaaaa = 1 << 0, /* test a */
bbbbbbbbbbbbbbbbb = 1 << 1, /* test b */
diff --git a/usr.bin/indent/tests/comments.0.pro b/usr.bin/indent/tests/comments.0.pro
index cac04fc8b8ea..ce818772931d 100644
--- a/usr.bin/indent/tests/comments.0.pro
+++ b/usr.bin/indent/tests/comments.0.pro
@@ -1,2 +1 @@
-/* $FreeBSD$ */
-bbb
diff --git a/usr.bin/indent/tests/comments.0.stdout b/usr.bin/indent/tests/comments.0.stdout
index 8ca5aa518c5e..5c4fc6824a0c 100644
--- a/usr.bin/indent/tests/comments.0.stdout
+++ b/usr.bin/indent/tests/comments.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
typedef enum x {
aaaaaaaaaaaaaaaaaaaaaa = 1 << 0, /* test a */
bbbbbbbbbbbbbbbbb = 1 << 1, /* test b */
diff --git a/usr.bin/indent/tests/cs.0 b/usr.bin/indent/tests/cs.0
index 449eadf3ae0e..129feeeeae4b 100644
--- a/usr.bin/indent/tests/cs.0
+++ b/usr.bin/indent/tests/cs.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
void t(void) {
int a = (double) 8;
}
diff --git a/usr.bin/indent/tests/cs.0.pro b/usr.bin/indent/tests/cs.0.pro
index 01e5f8671c2d..b0d3b81a79c5 100644
--- a/usr.bin/indent/tests/cs.0.pro
+++ b/usr.bin/indent/tests/cs.0.pro
@@ -1,2 +1 @@
-/* $FreeBSD$ */
-cs
diff --git a/usr.bin/indent/tests/cs.0.stdout b/usr.bin/indent/tests/cs.0.stdout
index 1849b2833793..177882470c02 100644
--- a/usr.bin/indent/tests/cs.0.stdout
+++ b/usr.bin/indent/tests/cs.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
void
t(void)
{
diff --git a/usr.bin/indent/tests/declarations.0 b/usr.bin/indent/tests/declarations.0
index 6d668b13c57f..706352ee2e37 100644
--- a/usr.bin/indent/tests/declarations.0
+++ b/usr.bin/indent/tests/declarations.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r303570 */
typedef void (*voidptr) (int *);
diff --git a/usr.bin/indent/tests/declarations.0.stdout b/usr.bin/indent/tests/declarations.0.stdout
index a164ec2753c8..f807c559c6ea 100644
--- a/usr.bin/indent/tests/declarations.0.stdout
+++ b/usr.bin/indent/tests/declarations.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r303570 */
typedef void (*voidptr) (int *);
diff --git a/usr.bin/indent/tests/elsecomment.0 b/usr.bin/indent/tests/elsecomment.0
index 61066c22b586..f8aa05c77d82 100644
--- a/usr.bin/indent/tests/elsecomment.0
+++ b/usr.bin/indent/tests/elsecomment.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r303484 and r309342 */
void t(void) {
/* The two if statements below excercise two different code paths. */
diff --git a/usr.bin/indent/tests/elsecomment.0.pro b/usr.bin/indent/tests/elsecomment.0.pro
index 892386ffbf45..84cf83a1ea27 100644
--- a/usr.bin/indent/tests/elsecomment.0.pro
+++ b/usr.bin/indent/tests/elsecomment.0.pro
@@ -1,2 +1 @@
-/* $FreeBSD$ */
-bl
diff --git a/usr.bin/indent/tests/elsecomment.0.stdout b/usr.bin/indent/tests/elsecomment.0.stdout
index 7de23be0894d..349f168d7e0a 100644
--- a/usr.bin/indent/tests/elsecomment.0.stdout
+++ b/usr.bin/indent/tests/elsecomment.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r303484 and r309342 */
void
t(void)
diff --git a/usr.bin/indent/tests/f_decls.0 b/usr.bin/indent/tests/f_decls.0
index a463d3c46a5d..dc175af40904 100644
--- a/usr.bin/indent/tests/f_decls.0
+++ b/usr.bin/indent/tests/f_decls.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
char * x(void)
{
diff --git a/usr.bin/indent/tests/f_decls.0.stdout b/usr.bin/indent/tests/f_decls.0.stdout
index 534d4ac8160a..1e95f9ae7e03 100644
--- a/usr.bin/indent/tests/f_decls.0.stdout
+++ b/usr.bin/indent/tests/f_decls.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
char *
x(void)
diff --git a/usr.bin/indent/tests/float.0 b/usr.bin/indent/tests/float.0
index ea146e23d8a7..8ea2b41b7cc2 100644
--- a/usr.bin/indent/tests/float.0
+++ b/usr.bin/indent/tests/float.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
void t(void) {
unsigned long x = 314UL;
double y[] = {0x1P+9F, 0.3, .1, 1.2f, 0xa.p01f, 3.14f, 2.L};
diff --git a/usr.bin/indent/tests/float.0.stdout b/usr.bin/indent/tests/float.0.stdout
index 891b03648655..52bba26c2a3f 100644
--- a/usr.bin/indent/tests/float.0.stdout
+++ b/usr.bin/indent/tests/float.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
void
t(void)
{
diff --git a/usr.bin/indent/tests/label.0 b/usr.bin/indent/tests/label.0
index 7798a4d5c24e..d4c54446e0bf 100644
--- a/usr.bin/indent/tests/label.0
+++ b/usr.bin/indent/tests/label.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r303489 */
void t(void) {
switch (1)
diff --git a/usr.bin/indent/tests/label.0.pro b/usr.bin/indent/tests/label.0.pro
index b5afc20b7c06..09d814950dfa 100644
--- a/usr.bin/indent/tests/label.0.pro
+++ b/usr.bin/indent/tests/label.0.pro
@@ -1,2 +1 @@
-/* $FreeBSD$ */
-nut
diff --git a/usr.bin/indent/tests/label.0.stdout b/usr.bin/indent/tests/label.0.stdout
index 22ec12272af3..ab1b985e9687 100644
--- a/usr.bin/indent/tests/label.0.stdout
+++ b/usr.bin/indent/tests/label.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r303489 */
void
t(void)
diff --git a/usr.bin/indent/tests/list_head.0 b/usr.bin/indent/tests/list_head.0
index 3a186ca33e07..ec17a7bc1c9a 100644
--- a/usr.bin/indent/tests/list_head.0
+++ b/usr.bin/indent/tests/list_head.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r309380 */
static int
do_execve(td, args, mac_p)
diff --git a/usr.bin/indent/tests/list_head.0.stdout b/usr.bin/indent/tests/list_head.0.stdout
index b6f076241a0d..b74117a097e6 100644
--- a/usr.bin/indent/tests/list_head.0.stdout
+++ b/usr.bin/indent/tests/list_head.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r309380 */
static int
do_execve(td, args, mac_p)
diff --git a/usr.bin/indent/tests/ncs.0 b/usr.bin/indent/tests/ncs.0
index 449eadf3ae0e..129feeeeae4b 100644
--- a/usr.bin/indent/tests/ncs.0
+++ b/usr.bin/indent/tests/ncs.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
void t(void) {
int a = (double) 8;
}
diff --git a/usr.bin/indent/tests/ncs.0.pro b/usr.bin/indent/tests/ncs.0.pro
index dc0abae9150c..3f2185b2863a 100644
--- a/usr.bin/indent/tests/ncs.0.pro
+++ b/usr.bin/indent/tests/ncs.0.pro
@@ -1,2 +1 @@
-/* $FreeBSD$ */
-ncs
diff --git a/usr.bin/indent/tests/ncs.0.stdout b/usr.bin/indent/tests/ncs.0.stdout
index 78f3b287574c..e7ad0b5dbf12 100644
--- a/usr.bin/indent/tests/ncs.0.stdout
+++ b/usr.bin/indent/tests/ncs.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
void
t(void)
{
diff --git a/usr.bin/indent/tests/offsetof.0 b/usr.bin/indent/tests/offsetof.0
index 078db19c2913..c1870fa0daa3 100644
--- a/usr.bin/indent/tests/offsetof.0
+++ b/usr.bin/indent/tests/offsetof.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r303718 */
void t(void) {
int n = malloc(offsetof(struct s, f) + 1);
diff --git a/usr.bin/indent/tests/offsetof.0.stdout b/usr.bin/indent/tests/offsetof.0.stdout
index 199bf0fa0755..dedf90e8ab3a 100644
--- a/usr.bin/indent/tests/offsetof.0.stdout
+++ b/usr.bin/indent/tests/offsetof.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r303718 */
void
t(void)
diff --git a/usr.bin/indent/tests/parens.0 b/usr.bin/indent/tests/parens.0
index 40d8de39169c..5293ad7666a9 100644
--- a/usr.bin/indent/tests/parens.0
+++ b/usr.bin/indent/tests/parens.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
typedef void (*xxxxxxxxxxx) (int,
char);
diff --git a/usr.bin/indent/tests/parens.0.pro b/usr.bin/indent/tests/parens.0.pro
index 95ac30fab36d..e860911a1173 100644
--- a/usr.bin/indent/tests/parens.0.pro
+++ b/usr.bin/indent/tests/parens.0.pro
@@ -1,2 +1 @@
-/* $FreeBSD$ */
-ts4 -i4 -di12 -Tallocfunc
diff --git a/usr.bin/indent/tests/parens.0.stdout b/usr.bin/indent/tests/parens.0.stdout
index 7041bf1f05c2..99433239bc30 100644
--- a/usr.bin/indent/tests/parens.0.stdout
+++ b/usr.bin/indent/tests/parens.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
typedef void (*xxxxxxxxxxx) (int,
char);
diff --git a/usr.bin/indent/tests/pcs.0 b/usr.bin/indent/tests/pcs.0
index aed296b1ca16..9fd8aad863a1 100644
--- a/usr.bin/indent/tests/pcs.0
+++ b/usr.bin/indent/tests/pcs.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <stdio.h>
int main(void) {
diff --git a/usr.bin/indent/tests/pcs.0.pro b/usr.bin/indent/tests/pcs.0.pro
index 41027f063dfa..60d7c2ccd850 100644
--- a/usr.bin/indent/tests/pcs.0.pro
+++ b/usr.bin/indent/tests/pcs.0.pro
@@ -1,2 +1 @@
-/* $FreeBSD$ */
-pcs
diff --git a/usr.bin/indent/tests/pcs.0.stdout b/usr.bin/indent/tests/pcs.0.stdout
index c96fb5442ae6..013082de8b38 100644
--- a/usr.bin/indent/tests/pcs.0.stdout
+++ b/usr.bin/indent/tests/pcs.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <stdio.h>
int
diff --git a/usr.bin/indent/tests/struct.0 b/usr.bin/indent/tests/struct.0
index 83142bfb1972..784d387cc717 100644
--- a/usr.bin/indent/tests/struct.0
+++ b/usr.bin/indent/tests/struct.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
int f(struct x *a);
diff --git a/usr.bin/indent/tests/struct.0.stdout b/usr.bin/indent/tests/struct.0.stdout
index 38613128654f..55b559ab9d6b 100644
--- a/usr.bin/indent/tests/struct.0.stdout
+++ b/usr.bin/indent/tests/struct.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
int f(struct x *a);
diff --git a/usr.bin/indent/tests/surplusbad.0 b/usr.bin/indent/tests/surplusbad.0
index 07d07026db0e..f9f2bf80c24a 100644
--- a/usr.bin/indent/tests/surplusbad.0
+++ b/usr.bin/indent/tests/surplusbad.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r303599 */
#if defined(__i386__)
int a;
diff --git a/usr.bin/indent/tests/surplusbad.0.pro b/usr.bin/indent/tests/surplusbad.0.pro
index 77c3a28ceb07..b3fe0943ec66 100644
--- a/usr.bin/indent/tests/surplusbad.0.pro
+++ b/usr.bin/indent/tests/surplusbad.0.pro
@@ -1,2 +1 @@
-/* $FreeBSD$ */
-bad
diff --git a/usr.bin/indent/tests/surplusbad.0.stdout b/usr.bin/indent/tests/surplusbad.0.stdout
index b288970fb93e..2f5856bc4092 100644
--- a/usr.bin/indent/tests/surplusbad.0.stdout
+++ b/usr.bin/indent/tests/surplusbad.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r303599 */
#if defined(__i386__)
int a;
diff --git a/usr.bin/indent/tests/types_from_file.0 b/usr.bin/indent/tests/types_from_file.0
index 6efca24fe1b4..c7673f55a0fc 100644
--- a/usr.bin/indent/tests/types_from_file.0
+++ b/usr.bin/indent/tests/types_from_file.0
@@ -1,3 +1,2 @@
-/* $FreeBSD$ */
/* See r303735 */
void t(a *x, b *y, c *z);
diff --git a/usr.bin/indent/tests/types_from_file.0.pro b/usr.bin/indent/tests/types_from_file.0.pro
index eeca804be089..255b8817589b 100644
--- a/usr.bin/indent/tests/types_from_file.0.pro
+++ b/usr.bin/indent/tests/types_from_file.0.pro
@@ -1,2 +1 @@
-/* $FreeBSD$ */
-Utypes_from_file.0.list
diff --git a/usr.bin/indent/tests/types_from_file.0.stdout b/usr.bin/indent/tests/types_from_file.0.stdout
index 8776ca6ba886..dca345ffafbf 100644
--- a/usr.bin/indent/tests/types_from_file.0.stdout
+++ b/usr.bin/indent/tests/types_from_file.0.stdout
@@ -1,3 +1,2 @@
-/* $FreeBSD$ */
/* See r303735 */
void t(a *x, b *y, c * z);
diff --git a/usr.bin/indent/tests/wchar.0 b/usr.bin/indent/tests/wchar.0
index 9910e77857f2..699703903373 100644
--- a/usr.bin/indent/tests/wchar.0
+++ b/usr.bin/indent/tests/wchar.0
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r309220 */
#include <wchar.h>
diff --git a/usr.bin/indent/tests/wchar.0.stdout b/usr.bin/indent/tests/wchar.0.stdout
index 92774abfdd31..a901b043328e 100644
--- a/usr.bin/indent/tests/wchar.0.stdout
+++ b/usr.bin/indent/tests/wchar.0.stdout
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* See r309220 */
#include <wchar.h>
diff --git a/usr.bin/lex/config.h b/usr.bin/lex/config.h
index 525a1cbf4eee..941a74d9d71c 100644
--- a/usr.bin/lex/config.h
+++ b/usr.bin/lex/config.h
@@ -1,6 +1,5 @@
/* src/config.h. Generated from config.h.in by configure. */
/* src/config.h.in. Generated from configure.ac by autoheader. */
-/* $FreeBSD$ */
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
diff --git a/usr.bin/mkcsmapper/ldef.h b/usr.bin/mkcsmapper/ldef.h
index 0aedc564c036..c5b10a87cd26 100644
--- a/usr.bin/mkcsmapper/ldef.h
+++ b/usr.bin/mkcsmapper/ldef.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: ldef.h,v 1.2 2006/09/09 14:35:17 tnozaki Exp $ */
/*-
diff --git a/usr.bin/mkcsmapper/lex.l b/usr.bin/mkcsmapper/lex.l
index adbdf78ff7b1..74d86f90e25f 100644
--- a/usr.bin/mkcsmapper/lex.l
+++ b/usr.bin/mkcsmapper/lex.l
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: lex.l,v 1.4 2006/02/09 22:03:15 dogcow Exp $ */
%{
diff --git a/usr.bin/mkcsmapper/yacc.y b/usr.bin/mkcsmapper/yacc.y
index 8d67be70beec..f048881b5b38 100644
--- a/usr.bin/mkcsmapper/yacc.y
+++ b/usr.bin/mkcsmapper/yacc.y
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: yacc.y,v 1.11 2016/06/28 09:22:16 wiz Exp $ */
%{
diff --git a/usr.bin/mkesdb/ldef.h b/usr.bin/mkesdb/ldef.h
index e543936683f9..27ef9663f06e 100644
--- a/usr.bin/mkesdb/ldef.h
+++ b/usr.bin/mkesdb/ldef.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: ldef.h,v 1.2 2005/06/27 01:23:59 fvdl Exp $ */
/*-
diff --git a/usr.bin/mkesdb/lex.l b/usr.bin/mkesdb/lex.l
index 3d6b8368b369..2b17a337d6e7 100644
--- a/usr.bin/mkesdb/lex.l
+++ b/usr.bin/mkesdb/lex.l
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: lex.l,v 1.3 2006/02/09 22:03:15 dogcow Exp $ */
%{
diff --git a/usr.bin/mkesdb/yacc.y b/usr.bin/mkesdb/yacc.y
index 4b3f9c7d382f..9f1781f31b59 100644
--- a/usr.bin/mkesdb/yacc.y
+++ b/usr.bin/mkesdb/yacc.y
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: yacc.y,v 1.4 2005/06/02 02:09:25 lukem Exp $ */
%{
diff --git a/usr.bin/sdiff/extern.h b/usr.bin/sdiff/extern.h
index 2f240912ddc1..c9ebaef7d22c 100644
--- a/usr.bin/sdiff/extern.h
+++ b/usr.bin/sdiff/extern.h
@@ -1,5 +1,4 @@
/* $OpenBSD: extern.h,v 1.5 2009/06/07 13:29:50 ray Exp $ */
-/* $FreeBSD$ */
/*
* Written by Raymond Lai <ray@cyth.net>.
diff --git a/usr.bin/sort/bwstring.h b/usr.bin/sort/bwstring.h
index efc0c8b4fe28..c9a7d6778fd6 100644
--- a/usr.bin/sort/bwstring.h
+++ b/usr.bin/sort/bwstring.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/usr.bin/sort/coll.h b/usr.bin/sort/coll.h
index 6a7b9dd50007..0ae1f20eab38 100644
--- a/usr.bin/sort/coll.h
+++ b/usr.bin/sort/coll.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/usr.bin/sort/file.h b/usr.bin/sort/file.h
index fc3b7261fe79..c3f7bb23f200 100644
--- a/usr.bin/sort/file.h
+++ b/usr.bin/sort/file.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/usr.bin/sort/mem.h b/usr.bin/sort/mem.h
index a6c1af1be5bb..4e733efd0f61 100644
--- a/usr.bin/sort/mem.h
+++ b/usr.bin/sort/mem.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/usr.bin/sort/radixsort.h b/usr.bin/sort/radixsort.h
index e3b694167635..4388cfc2951a 100644
--- a/usr.bin/sort/radixsort.h
+++ b/usr.bin/sort/radixsort.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h
index c1a17df1044c..449d2a59ed3e 100644
--- a/usr.bin/sort/sort.h
+++ b/usr.bin/sort/sort.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/usr.bin/sort/vsort.h b/usr.bin/sort/vsort.h
index b2f78538fdf2..28904e595980 100644
--- a/usr.bin/sort/vsort.h
+++ b/usr.bin/sort/vsort.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/usr.bin/svn/expat.h b/usr.bin/svn/expat.h
index a501ce30cac1..90ad709a2b5c 100644
--- a/usr.bin/svn/expat.h
+++ b/usr.bin/svn/expat.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Hack to avoid changing vendor code */
#include <bsdxml.h>
diff --git a/usr.bin/svn/lib/libapr/apr.h b/usr.bin/svn/lib/libapr/apr.h
index 8120937d50d3..63193760719c 100644
--- a/usr.bin/svn/lib/libapr/apr.h
+++ b/usr.bin/svn/lib/libapr/apr.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/usr.bin/svn/lib/libapr/apr_escape_test_char.h b/usr.bin/svn/lib/libapr/apr_escape_test_char.h
index a1f2cc2e3690..35693599479a 100644
--- a/usr.bin/svn/lib/libapr/apr_escape_test_char.h
+++ b/usr.bin/svn/lib/libapr/apr_escape_test_char.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
#define T_ESCAPE_SHELL_CMD (1)
diff --git a/usr.bin/svn/lib/libapr/apr_private.h b/usr.bin/svn/lib/libapr/apr_private.h
index 496837a8f862..3dbbc4da8973 100644
--- a/usr.bin/svn/lib/libapr/apr_private.h
+++ b/usr.bin/svn/lib/libapr/apr_private.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* include/arch/unix/apr_private.h. Generated from apr_private.h.in by configure. */
/* include/arch/unix/apr_private.h.in. Generated from configure.in by autoheader. */
diff --git a/usr.bin/svn/lib/libapr_util/apr_ldap.h b/usr.bin/svn/lib/libapr_util/apr_ldap.h
index 27a96de7087c..bd328537c988 100644
--- a/usr.bin/svn/lib/libapr_util/apr_ldap.h
+++ b/usr.bin/svn/lib/libapr_util/apr_ldap.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/usr.bin/svn/lib/libapr_util/apu.h b/usr.bin/svn/lib/libapr_util/apu.h
index 875e28c05e74..5964b627a00e 100644
--- a/usr.bin/svn/lib/libapr_util/apu.h
+++ b/usr.bin/svn/lib/libapr_util/apu.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git a/usr.bin/svn/lib/libapr_util/apu_config.h b/usr.bin/svn/lib/libapr_util/apu_config.h
index 1e709f71da7e..d886d5eeea02 100644
--- a/usr.bin/svn/lib/libapr_util/apu_config.h
+++ b/usr.bin/svn/lib/libapr_util/apu_config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* include/private/apu_config.h. Generated from apu_config.h.in by configure. */
/* include/private/apu_config.h.in. Generated from configure.in by autoheader. */
diff --git a/usr.bin/svn/lib/libapr_util/apu_select_dbm.h b/usr.bin/svn/lib/libapr_util/apu_select_dbm.h
index cf756e9603a3..09a5d4c0bb47 100644
--- a/usr.bin/svn/lib/libapr_util/apu_select_dbm.h
+++ b/usr.bin/svn/lib/libapr_util/apu_select_dbm.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/usr.bin/svn/lib/libapr_util/apu_want.h b/usr.bin/svn/lib/libapr_util/apu_want.h
index 7d6316c55391..0f2a0653e69a 100644
--- a/usr.bin/svn/lib/libapr_util/apu_want.h
+++ b/usr.bin/svn/lib/libapr_util/apu_want.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/usr.bin/svn/lib/libapr_util/expat.h b/usr.bin/svn/lib/libapr_util/expat.h
index 6ab04ef19656..1c237cb196be 100644
--- a/usr.bin/svn/lib/libapr_util/expat.h
+++ b/usr.bin/svn/lib/libapr_util/expat.h
@@ -1,3 +1,2 @@
-/* $FreeBSD$ */
/* Hack to avoid changing vendor code */
#include <bsdxml.h>
diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h
index d748e077183c..fd06ec15e86c 100644
--- a/usr.bin/svn/svn_private_config.h
+++ b/usr.bin/svn/svn_private_config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* subversion/svn_private_config.h.tmp. Generated from svn_private_config.h.in by configure. */
/* subversion/svn_private_config.h.in. Generated from configure.ac by autoheader. */
diff --git a/usr.bin/tip/tip/pathnames.h b/usr.bin/tip/tip/pathnames.h
index a42aed3f7368..8a2f9195032f 100644
--- a/usr.bin/tip/tip/pathnames.h
+++ b/usr.bin/tip/tip/pathnames.h
@@ -1,6 +1,5 @@
/* $OpenBSD: pathnames.h,v 1.3 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/12/08 09:30:59 jtc Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/usr.bin/tip/tip/tip.h b/usr.bin/tip/tip/tip.h
index 51178cb08365..3da2f76cfe39 100644
--- a/usr.bin/tip/tip/tip.h
+++ b/usr.bin/tip/tip/tip.h
@@ -1,6 +1,5 @@
/* $OpenBSD: tip.h,v 1.27 2006/08/18 03:06:18 jason Exp $ */
/* $NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/usr.bin/top/display.h b/usr.bin/top/display.h
index 76e88acb4d88..6e930f5ae6eb 100644
--- a/usr.bin/top/display.h
+++ b/usr.bin/top/display.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* constants needed for display.c */
#define MT_standout 1
diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c
index 847f7daa0466..c12adfa81e8a 100644
--- a/usr.bin/usbhidaction/usbhidaction.c
+++ b/usr.bin/usbhidaction/usbhidaction.c
@@ -1,5 +1,4 @@
/* $NetBSD: usbhidaction.c,v 1.8 2002/06/11 06:06:21 itojun Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c
index 984cdebc3289..5226958da3eb 100644
--- a/usr.bin/usbhidctl/usbhid.c
+++ b/usr.bin/usbhidctl/usbhid.c
@@ -1,5 +1,4 @@
/* $NetBSD: usbhid.c,v 1.14 2000/07/03 02:51:37 matt Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/usr.bin/vi/config.h b/usr.bin/vi/config.h
index 2b4348870db4..8041fb76dce9 100644
--- a/usr.bin/vi/config.h
+++ b/usr.bin/vi/config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Define when using wide characters */
#define USE_WIDECHAR
diff --git a/usr.bin/vi/ex/version.h b/usr.bin/vi/ex/version.h
index f14fc879222e..657da969e721 100644
--- a/usr.bin/vi/ex/version.h
+++ b/usr.bin/vi/ex/version.h
@@ -1,3 +1,2 @@
-/* $FreeBSD$ */
#define VI_VERSION "2.2.0 (2020-08-01)"
diff --git a/usr.bin/vi/pathnames.h b/usr.bin/vi/pathnames.h
index f788c05bb5eb..f1c706f5ecbd 100644
--- a/usr.bin/vi/pathnames.h
+++ b/usr.bin/vi/pathnames.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Read standard system paths first. */
#include <paths.h>
diff --git a/usr.bin/wall/ttymsg.h b/usr.bin/wall/ttymsg.h
index 1915720087e6..be97592f5e1c 100644
--- a/usr.bin/wall/ttymsg.h
+++ b/usr.bin/wall/ttymsg.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define TTYMSG_IOV_MAX 32
diff --git a/usr.bin/yacc/config.h b/usr.bin/yacc/config.h
index cff3a544de22..cf7e27051509 100644
--- a/usr.bin/yacc/config.h
+++ b/usr.bin/yacc/config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* config.h. Generated automatically by configure. */
/* config_h.in. Generated automatically from configure.in by autoheader. */
diff --git a/usr.sbin/apmd/contrib/pccardq.c b/usr.sbin/apmd/contrib/pccardq.c
index aebd1d544470..acdeaaecb261 100644
--- a/usr.sbin/apmd/contrib/pccardq.c
+++ b/usr.sbin/apmd/contrib/pccardq.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <err.h>
#include <errno.h>
diff --git a/usr.sbin/bluetooth/btpand/bnep.c b/usr.sbin/bluetooth/btpand/bnep.c
index 9c53a5ff2519..5fdcd9407525 100644
--- a/usr.sbin/bluetooth/btpand/bnep.c
+++ b/usr.sbin/bluetooth/btpand/bnep.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <sys/cdefs.h>
__RCSID("$NetBSD: bnep.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
diff --git a/usr.sbin/bluetooth/btpand/bnep.h b/usr.sbin/bluetooth/btpand/bnep.h
index e8c85c7b6353..7a187e551eed 100644
--- a/usr.sbin/bluetooth/btpand/bnep.h
+++ b/usr.sbin/bluetooth/btpand/bnep.h
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/*
* Constants defined in the Bluetooth Network Encapsulation
diff --git a/usr.sbin/bluetooth/btpand/btpand.c b/usr.sbin/bluetooth/btpand/btpand.c
index 6e215fe32269..a0f380918bf1 100644
--- a/usr.sbin/bluetooth/btpand/btpand.c
+++ b/usr.sbin/bluetooth/btpand/btpand.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008 Iain Hibbert. All rights reserved.");
diff --git a/usr.sbin/bluetooth/btpand/btpand.h b/usr.sbin/bluetooth/btpand/btpand.h
index db09b581822f..a3beb7f211da 100644
--- a/usr.sbin/bluetooth/btpand/btpand.h
+++ b/usr.sbin/bluetooth/btpand/btpand.h
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.sbin/bluetooth/btpand/channel.c b/usr.sbin/bluetooth/btpand/channel.c
index abc912db7af3..960b1ae30152 100644
--- a/usr.sbin/bluetooth/btpand/channel.c
+++ b/usr.sbin/bluetooth/btpand/channel.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <sys/cdefs.h>
__RCSID("$NetBSD: channel.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
diff --git a/usr.sbin/bluetooth/btpand/client.c b/usr.sbin/bluetooth/btpand/client.c
index e4aa0aec9430..ecef7e9c3c14 100644
--- a/usr.sbin/bluetooth/btpand/client.c
+++ b/usr.sbin/bluetooth/btpand/client.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <sys/cdefs.h>
__RCSID("$NetBSD: client.c,v 1.2 2008/12/06 20:01:14 plunky Exp $");
diff --git a/usr.sbin/bluetooth/btpand/event.c b/usr.sbin/bluetooth/btpand/event.c
index f87084add858..61825b63a3fc 100644
--- a/usr.sbin/bluetooth/btpand/event.c
+++ b/usr.sbin/bluetooth/btpand/event.c
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/*
* Hack to provide libevent (see devel/libevent port) like API.
diff --git a/usr.sbin/bluetooth/btpand/event.h b/usr.sbin/bluetooth/btpand/event.h
index e7a0341ceec8..dd588e86f6bf 100644
--- a/usr.sbin/bluetooth/btpand/event.h
+++ b/usr.sbin/bluetooth/btpand/event.h
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
/*
* Hack to provide libevent (see devel/libevent port) like API.
diff --git a/usr.sbin/bluetooth/btpand/packet.c b/usr.sbin/bluetooth/btpand/packet.c
index 266dee3c1baa..3051b0fbaecd 100644
--- a/usr.sbin/bluetooth/btpand/packet.c
+++ b/usr.sbin/bluetooth/btpand/packet.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <sys/cdefs.h>
__RCSID("$NetBSD: packet.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
diff --git a/usr.sbin/bluetooth/btpand/sdp.c b/usr.sbin/bluetooth/btpand/sdp.c
index 3029713f7de2..a21710781cf2 100644
--- a/usr.sbin/bluetooth/btpand/sdp.c
+++ b/usr.sbin/bluetooth/btpand/sdp.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <sys/cdefs.h>
__RCSID("$NetBSD: sdp.c,v 1.2 2008/12/06 20:01:14 plunky Exp $");
diff --git a/usr.sbin/bluetooth/btpand/sdp.h b/usr.sbin/bluetooth/btpand/sdp.h
index 1b9337a857b7..66c5c601bd1a 100644
--- a/usr.sbin/bluetooth/btpand/sdp.h
+++ b/usr.sbin/bluetooth/btpand/sdp.h
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <bluetooth.h>
#include <sdp.h>
diff --git a/usr.sbin/bluetooth/btpand/server.c b/usr.sbin/bluetooth/btpand/server.c
index d6bec1fb614b..f0967d058ca4 100644
--- a/usr.sbin/bluetooth/btpand/server.c
+++ b/usr.sbin/bluetooth/btpand/server.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <sys/cdefs.h>
__RCSID("$NetBSD: server.c,v 1.2 2009/01/24 17:29:28 plunky Exp $");
diff --git a/usr.sbin/bluetooth/btpand/tap.c b/usr.sbin/bluetooth/btpand/tap.c
index c880775ed888..011ae3989154 100644
--- a/usr.sbin/bluetooth/btpand/tap.c
+++ b/usr.sbin/bluetooth/btpand/tap.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#include <sys/cdefs.h>
__RCSID("$NetBSD: tap.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
diff --git a/usr.sbin/cron/cron/externs.h b/usr.sbin/cron/cron/externs.h
index 8b1ff71b36e2..1e9a75ed9a85 100644
--- a/usr.sbin/cron/cron/externs.h
+++ b/usr.sbin/cron/cron/externs.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* Copyright 1993,1994 by Paul Vixie
* All rights reserved
diff --git a/usr.sbin/crunch/crunchide/extern.h b/usr.sbin/crunch/crunchide/extern.h
index b5f9165a1e1b..86e96ae47be5 100644
--- a/usr.sbin/crunch/crunchide/extern.h
+++ b/usr.sbin/crunch/crunchide/extern.h
@@ -1,5 +1,4 @@
/* $NetBSD: extern.h,v 1.5 1998/05/06 13:16:57 mycroft Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
diff --git a/usr.sbin/dumpcis/cardinfo.h b/usr.sbin/dumpcis/cardinfo.h
index 5cd810dabbd9..d58199158c4d 100644
--- a/usr.sbin/dumpcis/cardinfo.h
+++ b/usr.sbin/dumpcis/cardinfo.h
@@ -31,7 +31,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#ifndef _PCCARD_CARDINFO_H_
#define _PCCARD_CARDINFO_H_
diff --git a/usr.sbin/fifolog/flint.lnt b/usr.sbin/fifolog/flint.lnt
index 87e0c86cef07..f12bb6fbd975 100644
--- a/usr.sbin/fifolog/flint.lnt
+++ b/usr.sbin/fifolog/flint.lnt
@@ -1,4 +1,3 @@
-// $FreeBSD$
// FlexeLint file for fifolog tools
//
//
diff --git a/usr.sbin/kbdcontrol/path.h b/usr.sbin/kbdcontrol/path.h
index e1fa341e0c78..12ea4a5b3f66 100644
--- a/usr.sbin/kbdcontrol/path.h
+++ b/usr.sbin/kbdcontrol/path.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define KEYMAP_PATH "/usr/share/syscons/keymaps/"
#define FONT_PATH "/usr/share/syscons/fonts/"
diff --git a/usr.sbin/kldxref/ef.h b/usr.sbin/kldxref/ef.h
index 0b13b5570f9f..f10af49fafba 100644
--- a/usr.sbin/kldxref/ef.h
+++ b/usr.sbin/kldxref/ef.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#ifndef _EF_H_
#define _EF_H_
diff --git a/usr.sbin/mailwrapper/pathnames.h b/usr.sbin/mailwrapper/pathnames.h
index 5511d1eccff9..ba87ef75947a 100644
--- a/usr.sbin/mailwrapper/pathnames.h
+++ b/usr.sbin/mailwrapper/pathnames.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
diff --git a/usr.sbin/makefs/msdos.h b/usr.sbin/makefs/msdos.h
index d9f1cc4cdb11..1e844203376e 100644
--- a/usr.sbin/makefs/msdos.h
+++ b/usr.sbin/makefs/msdos.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: msdos.h,v 1.3 2015/10/16 16:40:02 christos Exp $ */
/*-
diff --git a/usr.sbin/makefs/msdos/direntry.h b/usr.sbin/makefs/msdos/direntry.h
index 9cc601d5e96c..9d6c65dfcc7d 100644
--- a/usr.sbin/makefs/msdos/direntry.h
+++ b/usr.sbin/makefs/msdos/direntry.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $ */
/*-
diff --git a/usr.sbin/makefs/msdos/msdosfs_fat.c b/usr.sbin/makefs/msdos/msdosfs_fat.c
index f8744419f0cc..bb5eea457516 100644
--- a/usr.sbin/makefs/msdos/msdosfs_fat.c
+++ b/usr.sbin/makefs/msdos/msdosfs_fat.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $ */
/*-
diff --git a/usr.sbin/makefs/msdos/msdosfs_lookup.c b/usr.sbin/makefs/msdos/msdosfs_lookup.c
index cebaad69e7d4..cb5178d2ab20 100644
--- a/usr.sbin/makefs/msdos/msdosfs_lookup.c
+++ b/usr.sbin/makefs/msdos/msdosfs_lookup.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $ */
/*-
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index 5097c156e624..5e79666e6c38 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: ndp.c,v 1.104 2003/06/27 07:48:39 itojun Exp $ */
/*-
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h
index 94cc3d5233b5..4ca72b0ab8d7 100644
--- a/usr.sbin/ntp/config.h
+++ b/usr.sbin/ntp/config.h
@@ -1,6 +1,5 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
-/* $FreeBSD$ */
/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
diff --git a/usr.sbin/ntp/ntpdc/nl.c b/usr.sbin/ntp/ntpdc/nl.c
index 045d000fe252..6ad05f368742 100644
--- a/usr.sbin/ntp/ntpdc/nl.c
+++ b/usr.sbin/ntp/ntpdc/nl.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
printf("sizeof(union req_data_u_tag) = %d\n",
(int) sizeof(union req_data_u_tag));
printf("offsetof(u32) = %d\n",
diff --git a/usr.sbin/pciconf/pathnames.h b/usr.sbin/pciconf/pathnames.h
index c35c721aa838..7e8e562b94a1 100644
--- a/usr.sbin/pciconf/pathnames.h
+++ b/usr.sbin/pciconf/pathnames.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#include <paths.h>
#define _PATH_DEVPCI "/dev/pci"
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 7d873d4dfa40..6de680ec3a42 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: route6d.c,v 1.104 2003/10/31 00:30:20 itojun Exp $ */
/*-
diff --git a/usr.sbin/route6d/route6d.h b/usr.sbin/route6d/route6d.h
index d556799c7177..3193514ddeb3 100644
--- a/usr.sbin/route6d/route6d.h
+++ b/usr.sbin/route6d/route6d.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: route6d.h,v 1.8 2003/05/28 09:11:13 itojun Exp $ */
/*-
diff --git a/usr.sbin/rpc.lockd/lock_proc.c b/usr.sbin/rpc.lockd/lock_proc.c
index 395baf399832..b720be7dba69 100644
--- a/usr.sbin/rpc.lockd/lock_proc.c
+++ b/usr.sbin/rpc.lockd/lock_proc.c
@@ -1,5 +1,4 @@
/* $NetBSD: lock_proc.c,v 1.7 2000/10/11 20:23:56 is Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
*
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index 24dacc81a37a..35953f32692e 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -1,5 +1,4 @@
/* $NetBSD: lockd.c,v 1.7 2000/08/12 18:08:44 thorpej Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
diff --git a/usr.sbin/rpc.lockd/lockd.h b/usr.sbin/rpc.lockd/lockd.h
index 23cb19fd79c6..ae73c075e4bb 100644
--- a/usr.sbin/rpc.lockd/lockd.h
+++ b/usr.sbin/rpc.lockd/lockd.h
@@ -1,5 +1,4 @@
/* $NetBSD: lockd.h,v 1.2 2000/06/07 14:34:40 bouyer Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
diff --git a/usr.sbin/rpc.lockd/lockd_lock.h b/usr.sbin/rpc.lockd/lockd_lock.h
index 62f6981151ed..31f0913fd067 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.h
+++ b/usr.sbin/rpc.lockd/lockd_lock.h
@@ -1,5 +1,4 @@
/* $NetBSD: lockd_lock.h,v 1.2 2000/06/09 14:00:54 fvdl Exp $ */
-/* $FreeBSD$ */
/* Headers and function declarations for file-locking utilities */
diff --git a/usr.sbin/rpcbind/check_bound.c b/usr.sbin/rpcbind/check_bound.c
index cf0a029dad72..9a68e1574c8f 100644
--- a/usr.sbin/rpcbind/check_bound.c
+++ b/usr.sbin/rpcbind/check_bound.c
@@ -1,5 +1,4 @@
/* $NetBSD: check_bound.c,v 1.2 2000/06/22 08:09:26 fvdl Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/usr.sbin/rpcbind/pmap_svc.c b/usr.sbin/rpcbind/pmap_svc.c
index 991a28d680fb..ddb38e1433f3 100644
--- a/usr.sbin/rpcbind/pmap_svc.c
+++ b/usr.sbin/rpcbind/pmap_svc.c
@@ -1,5 +1,4 @@
/* $NetBSD: pmap_svc.c,v 1.2 2000/10/20 11:49:40 fvdl Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/usr.sbin/rpcbind/rpcb_svc.c b/usr.sbin/rpcbind/rpcb_svc.c
index 474f8ec77d17..68c026bb0b6a 100644
--- a/usr.sbin/rpcbind/rpcb_svc.c
+++ b/usr.sbin/rpcbind/rpcb_svc.c
@@ -1,5 +1,4 @@
/* $NetBSD: rpcb_svc.c,v 1.1 2000/06/02 23:15:41 fvdl Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/usr.sbin/rpcbind/rpcb_svc_com.c b/usr.sbin/rpcbind/rpcb_svc_com.c
index 31cdaf96f074..5faba0813890 100644
--- a/usr.sbin/rpcbind/rpcb_svc_com.c
+++ b/usr.sbin/rpcbind/rpcb_svc_com.c
@@ -1,5 +1,4 @@
/* $NetBSD: rpcb_svc_com.c,v 1.9 2002/11/08 00:16:39 fvdl Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c
index b0d79df20b16..0f7da00198a9 100644
--- a/usr.sbin/rpcbind/rpcbind.c
+++ b/usr.sbin/rpcbind/rpcbind.c
@@ -1,5 +1,4 @@
/* $NetBSD: rpcbind.c,v 1.3 2002/11/08 00:16:40 fvdl Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/usr.sbin/rpcbind/rpcbind.h b/usr.sbin/rpcbind/rpcbind.h
index a4bb3d274066..1ecc518c05e3 100644
--- a/usr.sbin/rpcbind/rpcbind.h
+++ b/usr.sbin/rpcbind/rpcbind.h
@@ -1,5 +1,4 @@
/* $NetBSD: rpcbind.h,v 1.1 2000/06/03 00:47:21 fvdl Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/usr.sbin/rpcbind/security.c b/usr.sbin/rpcbind/security.c
index 22cf0b26fa9c..6d899f0a9269 100644
--- a/usr.sbin/rpcbind/security.c
+++ b/usr.sbin/rpcbind/security.c
@@ -1,5 +1,4 @@
/* $NetBSD: security.c,v 1.5 2000/06/08 09:01:05 fvdl Exp $ */
-/* $FreeBSD$ */
#include <sys/types.h>
#include <sys/time.h>
diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c
index 5efa5ce2dd9c..7e7c1ad4fe0b 100644
--- a/usr.sbin/rtadvd/advcap.c
+++ b/usr.sbin/rtadvd/advcap.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: advcap.c,v 1.11 2003/05/19 09:46:50 keiichi Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/advcap.h b/usr.sbin/rtadvd/advcap.h
index fd74cfd0e534..75c8e5c1976a 100644
--- a/usr.sbin/rtadvd/advcap.h
+++ b/usr.sbin/rtadvd/advcap.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: advcap.h,v 1.5 2003/06/09 05:40:54 t-momose Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
index f857889332a4..a264858edaf7 100644
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: config.c,v 1.84 2003/08/05 12:34:23 itojun Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/config.h b/usr.sbin/rtadvd/config.h
index 24e6f493bdbc..cfea1821ca5e 100644
--- a/usr.sbin/rtadvd/config.h
+++ b/usr.sbin/rtadvd/config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: config.h,v 1.8 2003/06/17 08:26:22 itojun Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c
index 34fe7ad49dc2..ead273bbcdd2 100644
--- a/usr.sbin/rtadvd/if.c
+++ b/usr.sbin/rtadvd/if.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: if.c,v 1.17 2001/01/21 15:27:30 itojun Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h
index 42b4be795859..c477a836e251 100644
--- a/usr.sbin/rtadvd/if.h
+++ b/usr.sbin/rtadvd/if.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: if.h,v 1.10 2003/02/24 11:29:10 ono Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/pathnames.h b/usr.sbin/rtadvd/pathnames.h
index 248ee19f66e0..154feab97f07 100644
--- a/usr.sbin/rtadvd/pathnames.h
+++ b/usr.sbin/rtadvd/pathnames.h
@@ -1,5 +1,4 @@
/* $KAME: pathnames.h,v 1.2 2000/05/16 13:34:13 itojun Exp $ */
-/* $FreeBSD$ */
#define _PATH_RTADVDCONF "/etc/rtadvd.conf"
#define _PATH_RTADVDPID "/var/run/rtadvd.pid"
diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c
index f12fcaaed8c7..0d0d7d5bf708 100644
--- a/usr.sbin/rtadvd/rrenum.c
+++ b/usr.sbin/rtadvd/rrenum.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: rrenum.c,v 1.12 2002/06/10 19:59:47 itojun Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/rrenum.h b/usr.sbin/rtadvd/rrenum.h
index 93cd96b6d189..c4bc3e1af376 100644
--- a/usr.sbin/rtadvd/rrenum.h
+++ b/usr.sbin/rtadvd/rrenum.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: rrenum.h,v 1.3 2001/01/21 15:37:14 itojun Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index 391c95c9bd48..181b1211d7af 100644
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: rtadvd.c,v 1.82 2003/08/05 12:34:23 itojun Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h
index 885d2fbb3c80..eb7746733c6e 100644
--- a/usr.sbin/rtadvd/rtadvd.h
+++ b/usr.sbin/rtadvd/rtadvd.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: rtadvd.h,v 1.26 2003/08/05 12:34:23 itojun Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c
index 94c5dcd91f70..0e0cdd277071 100644
--- a/usr.sbin/rtadvd/timer.c
+++ b/usr.sbin/rtadvd/timer.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: timer.c,v 1.9 2002/06/10 19:59:47 itojun Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h
index 74ac7d41d8fe..49364bf19c9f 100644
--- a/usr.sbin/rtadvd/timer.h
+++ b/usr.sbin/rtadvd/timer.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: timer.h,v 1.5 2002/05/31 13:30:38 jinmei Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/timer_subr.c b/usr.sbin/rtadvd/timer_subr.c
index 7a7a23cd98f7..9bd91753dd23 100644
--- a/usr.sbin/rtadvd/timer_subr.c
+++ b/usr.sbin/rtadvd/timer_subr.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: timer.c,v 1.9 2002/06/10 19:59:47 itojun Exp $ */
/*-
diff --git a/usr.sbin/rtadvd/timer_subr.h b/usr.sbin/rtadvd/timer_subr.h
index 36e8b3bdc192..ccf1b3b7f8c7 100644
--- a/usr.sbin/rtadvd/timer_subr.h
+++ b/usr.sbin/rtadvd/timer_subr.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $KAME: timer.h,v 1.5 2002/05/31 13:30:38 jinmei Exp $ */
/*-
diff --git a/usr.sbin/rtsold/rtsock.c b/usr.sbin/rtsold/rtsock.c
index 4dfbf61f47db..1dfdea0f5c3d 100644
--- a/usr.sbin/rtsold/rtsock.c
+++ b/usr.sbin/rtsold/rtsock.c
@@ -1,5 +1,4 @@
/* $KAME: rtsock.c,v 1.3 2000/10/10 08:46:45 itojun Exp $ */
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-3-Clause
diff --git a/usr.sbin/sesutil/eltsub.c b/usr.sbin/sesutil/eltsub.c
index 740182e91211..d18fad5cb784 100644
--- a/usr.sbin/sesutil/eltsub.c
+++ b/usr.sbin/sesutil/eltsub.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/usr.sbin/sesutil/eltsub.h b/usr.sbin/sesutil/eltsub.h
index d1818ef3ee8b..3be59d31cb7c 100644
--- a/usr.sbin/sesutil/eltsub.h
+++ b/usr.sbin/sesutil/eltsub.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h
index 8980b31c8591..93d02a5b337a 100644
--- a/usr.sbin/tcpdump/tcpdump/config.h
+++ b/usr.sbin/tcpdump/tcpdump/config.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* This is an edited copy of the config.h generated by configure. */
/* config.h. Generated from config.h.in by configure. */
diff --git a/usr.sbin/unbound/config.h b/usr.sbin/unbound/config.h
index 2068cbfe7295..74a4796af1cd 100644
--- a/usr.sbin/unbound/config.h
+++ b/usr.sbin/unbound/config.h
@@ -1,6 +1,5 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
-/* $FreeBSD$ */
/* apply the noreturn attribute to a function that exits the program */
#define ATTR_NORETURN __attribute__((__noreturn__))
diff --git a/usr.sbin/usbconfig/dump.c b/usr.sbin/usbconfig/dump.c
index dbd5287551fc..493c518b9ae2 100644
--- a/usr.sbin/usbconfig/dump.c
+++ b/usr.sbin/usbconfig/dump.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/usr.sbin/usbconfig/dump.h b/usr.sbin/usbconfig/dump.h
index d2935fe3924d..71adb47262ea 100644
--- a/usr.sbin/usbconfig/dump.h
+++ b/usr.sbin/usbconfig/dump.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/usr.sbin/usbconfig/usbconfig.c b/usr.sbin/usbconfig/usbconfig.c
index ff0ef711d64f..34d179f09b98 100644
--- a/usr.sbin/usbconfig/usbconfig.c
+++ b/usr.sbin/usbconfig/usbconfig.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/usr.sbin/valectl/valectl.c b/usr.sbin/valectl/valectl.c
index bf1bc6229fb8..0e4dffd34290 100644
--- a/usr.sbin/valectl/valectl.c
+++ b/usr.sbin/valectl/valectl.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
#define LIBNETMAP_NOTHREADSAFE
#include <libnetmap.h>
diff --git a/usr.sbin/vidcontrol/decode.h b/usr.sbin/vidcontrol/decode.h
index 1f1cba4a4720..b4dba1ba391e 100644
--- a/usr.sbin/vidcontrol/decode.h
+++ b/usr.sbin/vidcontrol/decode.h
@@ -1,3 +1,2 @@
-/* $FreeBSD$ */
int decode(FILE *fd, char *buffer, int len);
diff --git a/usr.sbin/vidcontrol/path.h b/usr.sbin/vidcontrol/path.h
index e1fa341e0c78..12ea4a5b3f66 100644
--- a/usr.sbin/vidcontrol/path.h
+++ b/usr.sbin/vidcontrol/path.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
#define KEYMAP_PATH "/usr/share/syscons/keymaps/"
#define FONT_PATH "/usr/share/syscons/fonts/"
diff --git a/usr.sbin/ypldap/aldap.c b/usr.sbin/ypldap/aldap.c
index 4fb6608ec3f0..5a84068b9520 100644
--- a/usr.sbin/ypldap/aldap.c
+++ b/usr.sbin/ypldap/aldap.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/* $Id: aldap.c,v 1.32 2016/04/27 10:53:27 schwarze Exp $ */
/* $OpenBSD: aldap.c,v 1.32 2016/04/27 10:53:27 schwarze Exp $ */
diff --git a/usr.sbin/ypldap/aldap.h b/usr.sbin/ypldap/aldap.h
index cdf5316e8328..8e3a7d8088c7 100644
--- a/usr.sbin/ypldap/aldap.h
+++ b/usr.sbin/ypldap/aldap.h
@@ -1,6 +1,5 @@
/* $Id: aldap.h,v 1.9 2012/04/30 21:40:03 jmatthew Exp $ */
/* $OpenBSD: aldap.h,v 1.9 2012/04/30 21:40:03 jmatthew Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2008 Alexander Schrijver <aschrijver@openbsd.org>
diff --git a/usr.sbin/ypldap/ber.c b/usr.sbin/ypldap/ber.c
index 62ba8f0f0d3b..b7d4d5e2939b 100644
--- a/usr.sbin/ypldap/ber.c
+++ b/usr.sbin/ypldap/ber.c
@@ -1,5 +1,4 @@
/* $OpenBSD: ber.c,v 1.9 2015/02/12 00:30:38 pelikan Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2007 Reyk Floeter <reyk@vantronix.net>
diff --git a/usr.sbin/ypldap/ber.h b/usr.sbin/ypldap/ber.h
index eec02d4ac1b4..8498fd02be38 100644
--- a/usr.sbin/ypldap/ber.h
+++ b/usr.sbin/ypldap/ber.h
@@ -1,5 +1,4 @@
/* $OpenBSD: ber.h,v 1.2 2008/12/29 15:48:13 aschrijver Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2007 Reyk Floeter <reyk@vantronix.net>
diff --git a/usr.sbin/ypldap/entries.c b/usr.sbin/ypldap/entries.c
index 1d57d5cd7b05..06720af089ef 100644
--- a/usr.sbin/ypldap/entries.c
+++ b/usr.sbin/ypldap/entries.c
@@ -1,5 +1,4 @@
/* $OpenBSD: entries.c,v 1.3 2015/01/16 06:40:22 deraadt Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
*
diff --git a/usr.sbin/ypldap/ldapclient.c b/usr.sbin/ypldap/ldapclient.c
index 5f446a6f847e..ab6dc76c4ecd 100644
--- a/usr.sbin/ypldap/ldapclient.c
+++ b/usr.sbin/ypldap/ldapclient.c
@@ -1,5 +1,4 @@
/* $OpenBSD: ldapclient.c,v 1.31 2014/11/16 23:24:44 tedu Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2008 Alexander Schrijver <aschrijver@openbsd.org>
diff --git a/usr.sbin/ypldap/log.c b/usr.sbin/ypldap/log.c
index 7fec6f7427b7..0df690e27f55 100644
--- a/usr.sbin/ypldap/log.c
+++ b/usr.sbin/ypldap/log.c
@@ -1,5 +1,4 @@
/* $OpenBSD: log.c,v 1.1 2008/06/26 15:10:01 pyr Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
diff --git a/usr.sbin/ypldap/parse.y b/usr.sbin/ypldap/parse.y
index b97af1dfa801..2a3bb8cf5c35 100644
--- a/usr.sbin/ypldap/parse.y
+++ b/usr.sbin/ypldap/parse.y
@@ -1,5 +1,4 @@
/* $OpenBSD: parse.y,v 1.18 2015/01/16 06:40:22 deraadt Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
diff --git a/usr.sbin/ypldap/yp.c b/usr.sbin/ypldap/yp.c
index 0cbadc371c5e..0f12d588cf0f 100644
--- a/usr.sbin/ypldap/yp.c
+++ b/usr.sbin/ypldap/yp.c
@@ -1,5 +1,4 @@
/* $OpenBSD: yp.c,v 1.14 2015/02/11 01:26:00 pelikan Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
*
diff --git a/usr.sbin/ypldap/ypldap.h b/usr.sbin/ypldap/ypldap.h
index 702e3a5d06d6..e1a08d9e5cf8 100644
--- a/usr.sbin/ypldap/ypldap.h
+++ b/usr.sbin/ypldap/ypldap.h
@@ -1,5 +1,4 @@
/* $OpenBSD: ypldap.h,v 1.16 2015/01/16 06:40:22 deraadt Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
diff --git a/usr.sbin/ypldap/ypldap_dns.c b/usr.sbin/ypldap/ypldap_dns.c
index 5cb0390c8603..09ce636ebdc8 100644
--- a/usr.sbin/ypldap/ypldap_dns.c
+++ b/usr.sbin/ypldap/ypldap_dns.c
@@ -1,5 +1,4 @@
/* $OpenBSD: ypldap_dns.c,v 1.8 2015/01/16 06:40:22 deraadt Exp $ */
-/* $FreeBSD$ */
/*
* Copyright (c) 2003-2008 Henning Brauer <henning@openbsd.org>