diff --git a/ChangeLog b/ChangeLog
index ddd0b5dfb..979bcf5d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-29  Kristian Høgsberg  <krh@redhat.com>
+
+	* GL/glx/glxcmds.c: Remove superfluous definition of tfp tokens.
+
 2005-05-24  Daniel Stone  <daniel@freedesktop.org>
 
 	* xkb/ddxKillSrv.c:
diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 3845c9289..3202f75dc 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -59,14 +59,6 @@
 #include "dispatch.h"
 #include "indirect_dispatch.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_Y_INVERTED_EXT                  0x6006
-#endif
-
 /************************************************************************/
 
 void