Small changes to includes