Merge branch 'cb/xdiff-no-system-includes-in-dot-c'