Header template updated for changes in the code related to include header files