Many changes for includes analysis, start of work on eval information extraction