A number of changes for the includes resolution analysis, plus for the writeup for ESEC