Remove trailing '+' from the tag at the top of the file. (copy-pasto...)
Don't include a copy of strl{cat,cpy}, but use the one in libbsd (we're already depending on it anyway).