Merge "Remove more BSD cruft from the public headers."