diff -ur xserver-xorg-video-i810-1.6.5/src/brw_structs.h xserver-xorg-video-i810-1.6.5-hurd/src/brw_structs.h
--- xserver-xorg-video-i810-1.6.5/src/brw_structs.h	2006-08-08 22:51:25.000000000 +0000
+++ xserver-xorg-video-i810-1.6.5-hurd/src/brw_structs.h	2006-08-20 17:23:05.000000000 +0000
@@ -28,6 +28,8 @@
 #ifndef BRW_STRUCTS_H
 #define BRW_STRUCTS_H
 
+#include <GL/gl.h>
+
 /* Command packets:
  */
 struct header 
diff -ur xserver-xorg-video-i810-1.6.5/src/i830_accel.c xserver-xorg-video-i810-1.6.5-hurd/src/i830_accel.c
--- xserver-xorg-video-i810-1.6.5/src/i830_accel.c	2006-08-08 22:51:25.000000000 +0000
+++ xserver-xorg-video-i810-1.6.5-hurd/src/i830_accel.c	2006-08-20 17:17:35.000000000 +0000
@@ -395,6 +395,7 @@
    return XAAInit(pScreen, infoPtr);
 }
 
+#ifdef XF86DRI
 static unsigned int
 CheckTiling(ScrnInfoPtr pScrn)
 {
@@ -416,6 +417,9 @@
 
    return tiled;
 }
+#else
+#define CheckTiling(pScrn) 0
+#endif
 
 void
 I830SetupForSolidFill(ScrnInfoPtr pScrn, int color, int rop,