diff --git a/include/compiz.h b/include/compiz.h
index 11b916b..5bb9ddf 100644
--- a/include/compiz.h
+++ b/include/compiz.h
@@ -1069,27 +1069,6 @@ #define COMP_SCREEN_OPTION_DEFAULT_ICON 
 #define COMP_SCREEN_OPTION_SYNC_TO_VBLANK      7
 #define COMP_SCREEN_OPTION_NUM		       8
 
-#ifndef GLX_EXT_texture_from_pixmap
-#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
-#define GLX_Y_INVERTED_EXT                 0x20D4
-#define GLX_TEXTURE_FORMAT_EXT             0x20D5
-#define GLX_TEXTURE_TARGET_EXT             0x20D6
-#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
-#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
-#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
-#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
-#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
-#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
-#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
-#define GLX_TEXTURE_1D_EXT                 0x20DB
-#define GLX_TEXTURE_2D_EXT                 0x20DC
-#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
-#define GLX_FRONT_LEFT_EXT                 0x20DE
-#endif
-
 typedef void (*FuncPtr) (void);
 typedef FuncPtr (*GLXGetProcAddressProc) (const GLubyte *procName);
 
diff --git a/plugins/cube.c b/plugins/cube.c
diff --git a/plugins/place.c b/plugins/place.c
diff --git a/plugins/rotate.c b/plugins/rotate.c
diff --git a/src/event.c b/src/event.c
diff --git a/src/screen.c b/src/screen.c
diff --git a/src/window.c b/src/window.c