added new includes to templates