xdiff: remove duplicate headers from xpatience.c