Fixes for building on OS X and against pcl-1.7

The changes in 6b1437f are specific to hydro.