Merge "Remove symlinks from include dir"