Indexing of include files
More refactoring of parsing and indexing
Index changes