I don't know if it's correct, but I sent only the changes I made recently and not the whole diff. I built the xserver and the files have been generated to the right directory, as it was before.