diff --git a/configure.ac b/configure.ac
index 905239801..7c0ed602d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -708,7 +708,7 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la'
 XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
 
 dnl Core modules for most extensions, et al.
-REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.99.1] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.15] [kbproto >= 1.0.3]"
+REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.99.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.15] [kbproto >= 1.0.3]"
 REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.15.14]"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
diff --git a/mi/miinitext.c b/mi/miinitext.c
index fbe92216f..7f59126a4 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -159,7 +159,7 @@ typedef void (*InitExtension)(INITARGS);
 #include <X11/extensions/shm.h>
 #endif
 #ifdef XTEST
-#include <X11/extensions/xtest.h>
+#include <X11/extensions/xtestconst.h>
 #endif
 #include <X11/extensions/XKB.h>
 #ifdef XCSECURITY