Fix includes in mac specific headers