Changes to not break on OSX

Needed to change a few includes to not break on OSX.