Move includes out of templates