diff --git a/src/xkbcomp/alias.c b/src/xkbcomp/alias.c
index ba55d3d..aadf535 100644
--- a/src/xkbcomp/alias.c
+++ b/src/xkbcomp/alias.c
@@ -29,7 +29,7 @@
 #include "alias.h"
 #include "keycodes.h"
 
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
 
 static void
 HandleCollision(AliasInfo * old, AliasInfo * new)
diff --git a/src/xkbcomp/geometry.c b/src/xkbcomp/geometry.c
index 6eb3fb8..64d73fe 100644
--- a/src/xkbcomp/geometry.c
+++ b/src/xkbcomp/geometry.c
@@ -34,7 +34,7 @@
 #include "keycodes.h"
 #include "alias.h"
 
-#include "X11/extensions/XKBgeom.h"
+#include <X11/extensions/XKBgeomcommon.h>
 
 #define	DFLT_FONT	"helvetica"
 #define	DFLT_SLANT	"r"
diff --git a/src/xkbcomp/listing.c b/src/xkbcomp/listing.c
index 146ecba..6d3fb8f 100644
--- a/src/xkbcomp/listing.c
+++ b/src/xkbcomp/listing.c
@@ -121,7 +121,7 @@ SOFTWARE.
 #include "parseutils.h"
 #include "misc.h"
 #include "tokens.h"
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
 
 #define	lowbit(x)	((x) & (-(x)))
 
diff --git a/src/xkbcomp/misc.c b/src/xkbcomp/misc.c
index 1607ff5..993c62f 100644
--- a/src/xkbcomp/misc.c
+++ b/src/xkbcomp/misc.c
@@ -32,7 +32,7 @@
 #include <X11/keysym.h>
 #include "parseutils.h"
 
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
 
 /***====================================================================***/
 
diff --git a/src/xkbcomp/parseutils.c b/src/xkbcomp/parseutils.c
index ad1b0d1..5ab435e 100644
--- a/src/xkbcomp/parseutils.c
+++ b/src/xkbcomp/parseutils.c
@@ -28,7 +28,7 @@
 #include "parseutils.h"
 #include "xkbpath.h"
 #include <X11/keysym.h>
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
 #include <X11/Xalloca.h>
 
 XkbFile *rtrnValue;
diff --git a/src/xkbcomp/vmod.c b/src/xkbcomp/vmod.c
index 5578fd0..c912a84 100644
--- a/src/xkbcomp/vmod.c
+++ b/src/xkbcomp/vmod.c
@@ -32,7 +32,7 @@
 #include "misc.h"
 
 #include <X11/extensions/XKB.h>
-#include <X11/extensions/XKBstr.h>
+#include <X11/extensions/XKBstrcommon.h>
 
 #include "vmod.h"
 
diff --git a/src/xkbcomp/xkbcomp.h b/src/xkbcomp/xkbcomp.h
index 6e02ed5..c6fce0b 100644
--- a/src/xkbcomp/xkbcomp.h
+++ b/src/xkbcomp/xkbcomp.h
@@ -31,13 +31,9 @@
 #define	DEBUG_VAR debugFlags
 #endif
 
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-
 #include "utils.h"
 
 #include <X11/extensions/XKM.h>
-#include <X11/extensions/XKBfile.h>
 
 extern char *scanFile;
 
diff --git a/src/xkbcomp/xkbparse.c b/src/xkbcomp/xkbparse.c
index b71df99..db4dfc5 100644
--- a/src/xkbcomp/xkbparse.c
+++ b/src/xkbcomp/xkbparse.c
@@ -208,7 +208,7 @@
 #define	DEBUG_VAR parseDebug
 #include "parseutils.h"
 #include <X11/keysym.h>
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
 #include <stdlib.h>
 
 unsigned int parseDebug;
diff --git a/src/xkbcomp/xkbparse.y b/src/xkbcomp/xkbparse.y
index 63f87bb..2360f24 100644
--- a/src/xkbcomp/xkbparse.y
+++ b/src/xkbcomp/xkbparse.y
@@ -95,7 +95,7 @@
 #define	DEBUG_VAR parseDebug
 #include "parseutils.h"
 #include <X11/keysym.h>
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
 #include <stdlib.h>
 
 unsigned int parseDebug;
diff --git a/src/xkbcomp/xkbpath.c b/src/xkbcomp/xkbpath.c
index 6802012..0566b08 100644
--- a/src/xkbcomp/xkbpath.c
+++ b/src/xkbcomp/xkbpath.c
@@ -24,9 +24,6 @@
 
  ********************************************************/
 
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-
 #define	DEBUG_VAR debugFlags
 #include "utils.h"
 #include <stdlib.h>
diff --git a/src/xkbcomp/xkbscan.c b/src/xkbcomp/xkbscan.c
index 31cafd4..997b5f5 100644
--- a/src/xkbcomp/xkbscan.c
+++ b/src/xkbcomp/xkbscan.c
@@ -27,8 +27,6 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
 
 #include "tokens.h"
 #define	DEBUG_VAR	scanDebug