--- libX11-1.2.2/src/util/Makefile.am.orig	2009-09-11 16:58:09.000000000 +0200
+++ libX11-1.2.2/src/util/Makefile.am	2009-09-11 16:58:30.000000000 +0200
@@ -2,9 +2,8 @@
 
 noinst_PROGRAMS=makekeys
 
-makekeys_CFLAGS=$(X11_CFLAGS)
-
 CC = @CC_FOR_BUILD@
+LIBS = 
 
 EXTRA_DIST = mkks.sh
 
--- libX11-1.2.2/src/util/makekeys.c.orig	2009-09-11 16:58:48.000000000 +0200
+++ libX11-1.2.2/src/util/makekeys.c	2009-09-11 16:58:59.000000000 +0200
@@ -31,13 +31,14 @@
 
 /* Constructs hash tables for XStringToKeysym and XKeysymToString. */
 
-#include <X11/X.h>
-#include <X11/Xos.h>
-#include <X11/keysymdef.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 typedef unsigned long Signature;
+typedef unsigned long KeySym;
+
+#define XK_VoidSymbol                  0xffffff  /* Void symbol */
 
 #define KTNUM 4000