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/i810_driver.c xserver-xorg-video-i810-1.6.5-hurd/src/i810_driver.c
--- xserver-xorg-video-i810-1.6.5/src/i810_driver.c	2006-08-10 20:40:39.000000000 +0000
+++ xserver-xorg-video-i810-1.6.5-hurd/src/i810_driver.c	2006-08-20 19:06:38.000000000 +0000
@@ -333,6 +333,8 @@
    NULL
 };
 
+#endif /* I830_ONLY */
+
 const char *I810shadowSymbols[] = {
     "shadowInit",
     "shadowSetup",
@@ -340,8 +342,6 @@
     NULL
 };
 
-#endif /* I830_ONLY */
-
 #ifndef I810_DEBUG
 int I810_DEBUG = (0
 /*     		  | DEBUG_ALWAYS_SYNC  */
@@ -408,9 +408,9 @@
 #ifdef XF86DRI
 			I810drmSymbols,
 			I810driSymbols,
+#endif
 			I810shadowSymbols,
 			I810shadowFBSymbols,
-#endif
 			I810vbeSymbols, vbeOptionalSymbols,
 			I810ddcSymbols, I810int10Symbols, NULL);
 
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,