Minor change to includes resolution to improve performance