add includes and tags