Merge branch 'master' of git://ozlabs.org/~paulus/gitk

diff --git a/xdiff/xinclude.h b/xdiff/xinclude.h
index f35c4485dfee480badc0d383a556ac3a17768e10..a4285ac0eb2840fb3d128b81ab4e19ca3fa673ae 100644 (file)
--- a/xdiff/xinclude.h
+++ b/xdiff/xinclude.h
@@ -23,13 +23,7 @@
 #if !defined(XINCLUDE_H)
 #define XINCLUDE_H
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <limits.h>
-
+#include "git-compat-util.h"
 #include "xmacros.h"
 #include "xdiff.h"
 #include "xtypes.h"