... and move the OSX specific files there too so we don't need several
include paths.

Change-Id: I9368e12d4cf85da3795939b51540eaf7f5d0a7d3