Fix places where include should be types.