Added header files to tags construction.