? src/glu/sgi/depend
? src/glut/glx/depend
? src/glw/depend
? src/mesa/depend
Index: configs/linux-dri-xcb
===================================================================
RCS file: /cvs/mesa/Mesa/configs/linux-dri-xcb,v
retrieving revision 1.5
diff -u -b -B -r1.5 linux-dri-xcb
--- configs/linux-dri-xcb	26 Sep 2006 23:45:28 -0000	1.5
+++ configs/linux-dri-xcb	9 Oct 2006 01:33:17 -0000
@@ -24,7 +24,7 @@
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN
 
-X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I xcb-glx`
+X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`
 
 CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 	$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math 
@@ -41,7 +41,7 @@
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
-                $(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs xcb-glx`
+                $(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`
 
 
 # This is now 0 by default since it seems to confuse the hell out of people
Index: src/glx/x11/glxext.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/glx/x11/glxext.c,v
retrieving revision 1.27
diff -u -b -B -r1.27 glxext.c
--- src/glx/x11/glxext.c	7 Oct 2006 02:52:18 -0000	1.27
+++ src/glx/x11/glxext.c	9 Oct 2006 01:33:19 -0000
@@ -64,7 +64,7 @@
 #endif
 
 #ifdef USE_XCB
-#include <X11/xcl.h>
+#include <X11/Xlib-xcb.h>
 #include <xcb/xcb.h>
 #include <xcb/glx.h>
 #endif
Index: src/glx/x11/indirect.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/glx/x11/indirect.c,v
retrieving revision 1.34
diff -u -b -B -r1.34 indirect.c
--- src/glx/x11/indirect.c	4 Oct 2006 22:33:54 -0000	1.34
+++ src/glx/x11/indirect.c	9 Oct 2006 01:33:28 -0000
@@ -32,7 +32,7 @@
 #include "indirect_size.h"
 #include <GL/glxproto.h>
 #ifdef USE_XCB
-#include <X11/xcl.h>
+#include <X11/Xlib-xcb.h>
 #include <xcb/xcb.h>
 #include <xcb/glx.h>
 #endif /* USE_XCB */