Some header changes to fix the build with other compilers.
tree5bc177891c836d3f4aba7c11392e5c9f581aff60
drwxr-xr-x - ld64