Start changing includes to imports in templates

For jinja2 compat