Simplified CompilerPass::sortProviders
Removed two unused includes