This is a list of files in base that could be merged with a little work.

Kernel

Files Review Commit
sys/*/*/bcopy.c
sys/*/*/uma_machdep.c
sys/*/include/floatingpoint.h
sys/*/include/resource.h
sys/boot/efi/include/*/efibind.h
sys/boot/efi/loader/arch/*/reloc.c D2241 r281237
sys/boot/ficl/*/sysdep.c
sys/boot/ficl/*/sysdep.h
Some copies of machine/in_cksum.h

Userland

Files Review Commit
etc/*/ttys See D445
lib/libc/*/gen/fabs.c
lib/msun/*/fenv.h See D445
usr.bin/truss/*-fbsd.c
usr.bin/find/getdate.y
usr.sbin/fifolog/lib/getdate.y
contrib/libarchive/libarchive/archive_getdate.c