cleanup Faceplus and Faceshift find modules, fix for OVR stitched include