add some missing includes in templates