Fix for build on Mac: conditionals, boost headers, etc.