Moved some headers around so OSX doesn't try to read the ones it's not supposed to