Issue/customtemplate

As the includefiles are required in both cases (custom template for vcl and default template) they also need to be generated in both cases