Merge "Reorganize headers to improve documentation.  Mac prebuilts."