Include performance fixes before moving to std::filesystem