Changes for includes resolution, including for reproducibility