Add include paths for OSX
Merge branch 'native'