fix includes for OS X
Merge branch 'fix-include' into devel