Further updates for includes, plus updated lines of code counts for current corpus contents
Fixed merge conflict