More improvements to includes resolution, mainly performance related