Fixes to #include in templates: