Remove more BSD cruft from the public headers.

Change-Id: I1e3097f745b526db448bf72fbc05fb2ba23929a0
Merge "Remove more BSD cruft from the public headers."