Fix references to includes