A number of changes for the includes analysis, plus additions of more extracted info to the serialized dir