2 more dependencies, rebuild generated files