Added functionality to recognise include files and variable declarations