Sort provider-includes
Fix Finder call for GC of old provider files, fixes #293