diff --git a/include/Makefile.am b/include/Makefile.am
index c5394cf..5ff1a97 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,2 +1,2 @@
-x11includedir = $(includedir)/X11
-x11include_HEADERS = X11/XkbCommon.h
+x11includedir = $(includedir)/extensions/X11
+x11include_HEADERS = X11/extensions/XKBcommon.h
diff --git a/include/X11/XkbCommon.h b/include/X11/extensions/XKBcommon.h
similarity index 100%
rename from include/X11/XkbCommon.h
rename to include/X11/extensions/XKBcommon.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 3a0b2fa..2b5fa2b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ $(builddir)/makekeys/makekeys$(EXEEXT):
 
 lib_LTLIBRARIES = libxkbcommon.la
 libxkbcommon_la_SOURCES = \
-	XkbCommonInt.h \
+	XKBcommonint.h \
 	ks_tables.h \
 	alloc.c \
 	galloc.c \
diff --git a/src/XkbCommonInt.h b/src/XKBcommonint.h
similarity index 100%
rename from src/XkbCommonInt.h
rename to src/XKBcommonint.h
diff --git a/src/alloc.c b/src/alloc.c
index dadf4e2..e2d2c17 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -26,8 +26,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "X11/XkbCommon.h"
-#include "XkbCommonInt.h"
+#include "X11/extensions/XKBcommon.h"
+#include "XKBcommonint.h"
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include <X11/extensions/XKB.h>
diff --git a/src/galloc.c b/src/galloc.c
index c9b41ab..31e2b53 100644
--- a/src/galloc.c
+++ b/src/galloc.c
@@ -26,8 +26,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "X11/XkbCommon.h"
-#include "XkbCommonInt.h"
+#include "X11/extensions/XKBcommon.h"
+#include "XKBcommonint.h"
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include <X11/extensions/XKB.h>
diff --git a/src/keysym.c b/src/keysym.c
index 9a419ba..a289a9a 100644
--- a/src/keysym.c
+++ b/src/keysym.c
@@ -30,7 +30,7 @@ authorization from the authors.
 #endif
 #include <X11/X.h>
 #include <X11/keysymdef.h>
-#include "X11/XkbCommon.h"
+#include "X11/extensions/XKBcommon.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/test/xkey.c b/test/xkey.c
index 4013201..015a432 100644
--- a/test/xkey.c
+++ b/test/xkey.c
@@ -1,4 +1,4 @@
-#include <X11/XkbCommon.h>
+#include "X11/extensions/XKBcommon.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>