diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 1ea891aef..dc9d18f4e 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -1681,7 +1681,7 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId)
     reply.numAttribs = numAttribs;
 
     attributes[0] = GLX_TEXTURE_TARGET_EXT;
-    attributes[1] = GLX_NO_TEXTURE_EXT;
+    attributes[1] = GLX_TEXTURE_RECTANGLE_EXT;
 
     glxScreen = glxPixmap->pGlxScreen;
     if (glxScreen->textureFromPixmap)
diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index b623c3eea..6961011fb 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -35,6 +35,7 @@
 #include <drm.h>
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
+#include <GL/glxtokens.h>
 
 #include <windowstr.h>
 #include <os.h>
diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h
index 662ce9340..7c41f8019 100644
--- a/GL/glx/glxserver.h
+++ b/GL/glx/glxserver.h
@@ -63,22 +63,6 @@
 #include <GL/glxproto.h>
 #include <GL/glxint.h>
 
-#ifndef GLX_TEXTURE_TARGET_EXT
-#define GLX_TEXTURE_TARGET_EXT              0x6001
-#define GLX_TEXTURE_2D_EXT                  0x6002
-#define GLX_TEXTURE_RECTANGLE_EXT           0x6003
-#define GLX_NO_TEXTURE_EXT                  0x6004
-#define GLX_FRONT_LEFT_EXT                  0x6005
-#define GLX_TEXTURE_FORMAT_EXT              0x6006
-#define GLX_TEXTURE_FORMAT_RGB_EXT          0x6007
-#define GLX_TEXTURE_FORMAT_RGBA_EXT         0x6008
-#define GLX_Y_INVERTED_EXT                  0x6009
-#define GLX_BIND_TO_TEXTURE_RGB_EXT         0x600A
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT        0x600B
-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT      0x600C
-#define GLX_MIPMAP_TEXTURE_EXT              0x600D
-#endif
-
 /* For glxscreens.h */
 typedef struct __GLXdrawable __GLXdrawable;
 typedef struct __GLXcontext __GLXcontext;
diff --git a/configure.ac b/configure.ac
index edf4ab7ef..a41030155 100644
--- a/configure.ac
+++ b/configure.ac
@@ -565,7 +565,7 @@ fi
 
 if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
 	PKG_CHECK_MODULES([XLIB], [x11])
-	PKG_CHECK_MODULES([GL], [glproto >= 1.4.6])
+	PKG_CHECK_MODULES([GL], [glproto >= 1.4.7])
 	AC_SUBST(XLIB_CFLAGS)
 	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
 	GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
diff --git a/hw/xgl/glxext/xglglxext.c b/hw/xgl/glxext/xglglxext.c
index f2c13a913..99150120a 100644
--- a/hw/xgl/glxext/xglglxext.c
+++ b/hw/xgl/glxext/xglglxext.c
@@ -30,6 +30,7 @@
 #include <GL/gl.h>
 #include <GL/glext.h>
 #include <GL/internal/glcore.h>
+#include <GL/glxtokens.h>
 
 #include "glxserver.h"
 #include "glxdrawable.h"
@@ -6310,7 +6311,7 @@ static int
 xglGetTexTarget (__GLXscreen *screen,
 		 __GLXpixmap *pixmap)
 {
-    int target = GLX_NO_TEXTURE_EXT;
+    int target = GLX_TEXTURE_2D_EXT;
 
     XGL_DRAWABLE_PIXMAP (pixmap->pDraw);