Changed controller generator to output a list of includes