fix find-references across multiple files + bump CPlusPlus