Further efforts for Mac OSX compatibility. Fixed some includes that confused windows build