Removal of rcsid.
after the copyright notices. Having them at the top next to the CVSIDs guarantees a conflict for each and every sync.
Add strtoll to the compat library, from OpenBSD.