More includes resolution support changes