added mac versions of headers
almost working on MacOS