diff -urN xf86-video-intel-2.8.1.ORIG/src/ch7017/ch7017.c xf86-video-intel-2.8.1/src/ch7017/ch7017.c
--- xf86-video-intel-2.8.1.ORIG/src/ch7017/ch7017.c	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/src/ch7017/ch7017.c	2009-09-08 23:33:37.254110779 +0000
@@ -34,12 +34,12 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #define DPMS_SERVER
+#include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 
 #include "../i2c_vid.h"
diff -urN xf86-video-intel-2.8.1.ORIG/src/ch7xxx/ch7xxx.c xf86-video-intel-2.8.1/src/ch7xxx/ch7xxx.c
--- xf86-video-intel-2.8.1.ORIG/src/ch7xxx/ch7xxx.c	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/src/ch7xxx/ch7xxx.c	2009-09-08 23:33:37.254110779 +0000
@@ -34,12 +34,12 @@
 #include <string.h>
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #define DPMS_SERVER
+#include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 
 #include "../i2c_vid.h"
diff -urN xf86-video-intel-2.8.1.ORIG/src/i810_driver.c xf86-video-intel-2.8.1/src/i810_driver.c
--- xf86-video-intel-2.8.1.ORIG/src/i810_driver.c	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/src/i810_driver.c	2009-09-08 23:33:37.317454494 +0000
@@ -55,8 +55,6 @@
  */
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
 #include "xf86cmap.h"
 #include "compiler.h"
 #include "mibstore.h"
@@ -549,10 +547,6 @@
 
    pI810->PciInfo = xf86GetPciInfoForEntity(pI810->pEnt->index);
 
-   if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone))
-      return FALSE;
-   pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
-
    /* Set pScrn->monitor */
    pScrn->monitor = pScrn->confScreen->monitor;
 
@@ -937,8 +931,6 @@
 
    /*  We won't be using the VGA access after the probe */
    I810SetMMIOAccess(pI810);
-   xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
-   xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
 
    return TRUE;
 }
diff -urN xf86-video-intel-2.8.1.ORIG/src/i810_hwmc.c xf86-video-intel-2.8.1/src/i810_hwmc.c
--- xf86-video-intel-2.8.1.ORIG/src/i810_hwmc.c	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/src/i810_hwmc.c	2009-09-08 23:33:37.124089324 +0000
@@ -41,7 +41,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff -urN xf86-video-intel-2.8.1.ORIG/src/i810_video.c xf86-video-intel-2.8.1/src/i810_video.c
--- xf86-video-intel-2.8.1.ORIG/src/i810_video.c	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/src/i810_video.c	2009-09-08 23:33:37.127423120 +0000
@@ -41,7 +41,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff -urN xf86-video-intel-2.8.1.ORIG/src/i830_driver.c xf86-video-intel-2.8.1/src/i830_driver.c
--- xf86-video-intel-2.8.1.ORIG/src/i830_driver.c	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/src/i830_driver.c	2009-09-08 23:33:37.324110662 +0000
@@ -51,8 +51,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
 #include "xf86Priv.h"
 #include "xf86cmap.h"
 #include "compiler.h"
@@ -1541,12 +1539,6 @@
        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to become DRM master.\n");
 
 
-   if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) {
-      PreInitCleanup(pScrn);
-      return FALSE;
-   }
-
-   pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
    pScrn->monitor = pScrn->confScreen->monitor;
    pScrn->progClock = TRUE;
    pScrn->rgbBits = 8;
@@ -1632,8 +1624,6 @@
 
        /*  We won't be using the VGA access after the probe. */
        I830SetMMIOAccess(pI830);
-       xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr);
-       xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr);
    }
 
    /* Load the dri2 module if requested. */
diff -urN xf86-video-intel-2.8.1.ORIG/src/i830_i2c.c xf86-video-intel-2.8.1/src/i830_i2c.c
--- xf86-video-intel-2.8.1.ORIG/src/i830_i2c.c	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/src/i830_i2c.c	2009-09-08 23:33:37.160756497 +0000
@@ -31,8 +31,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
 #include "xf86cmap.h"
 #include "compiler.h"
 #include "mibstore.h"
diff -urN xf86-video-intel-2.8.1.ORIG/src/i830_video.c xf86-video-intel-2.8.1/src/i830_video.c
--- xf86-video-intel-2.8.1.ORIG/src/i830_video.c	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/src/i830_video.c	2009-09-08 23:33:37.194089562 +0000
@@ -56,7 +56,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff -urN xf86-video-intel-2.8.1.ORIG/src/i915_hwmc.c xf86-video-intel-2.8.1/src/i915_hwmc.c
--- xf86-video-intel-2.8.1.ORIG/src/i915_hwmc.c	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/src/i915_hwmc.c	2009-09-08 23:33:37.197038724 +0000
@@ -32,7 +32,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff -urN xf86-video-intel-2.8.1.ORIG/src/ivch/ivch.c xf86-video-intel-2.8.1/src/ivch/ivch.c
--- xf86-video-intel-2.8.1.ORIG/src/ivch/ivch.c	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/src/ivch/ivch.c	2009-09-08 23:33:37.254110779 +0000
@@ -31,12 +31,12 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #define DPMS_SERVER
+#include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 #include <unistd.h>
 
diff -urN xf86-video-intel-2.8.1.ORIG/src/sil164/sil164.c xf86-video-intel-2.8.1/src/sil164/sil164.c
--- xf86-video-intel-2.8.1.ORIG/src/sil164/sil164.c	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/src/sil164/sil164.c	2009-09-08 23:33:37.260798371 +0000
@@ -35,12 +35,12 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #define DPMS_SERVER
+#include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 
 #include "../i2c_vid.h"
diff -urN xf86-video-intel-2.8.1.ORIG/src/tfp410/tfp410.c xf86-video-intel-2.8.1/src/tfp410/tfp410.c
--- xf86-video-intel-2.8.1.ORIG/src/tfp410/tfp410.c	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/src/tfp410/tfp410.c	2009-09-08 23:33:37.260798371 +0000
@@ -34,12 +34,12 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #define DPMS_SERVER
+#include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 
 #include "../i2c_vid.h"
diff -urN xf86-video-intel-2.8.1.ORIG/uxa/shmint.h xf86-video-intel-2.8.1/uxa/shmint.h
--- xf86-video-intel-2.8.1.ORIG/uxa/shmint.h	1970-01-01 00:00:00.000000000 +0000
+++ xf86-video-intel-2.8.1/uxa/shmint.h	2009-09-08 23:33:36.957017250 +0000
@@ -0,0 +1,69 @@
+/* COPIED FROM xorg-server-1.6.99.900/Xext/shmint.h
+ * Copyright © 2003 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _SHMINT_H_
+#define _SHMINT_H_
+
+#include <X11/extensions/shmproto.h>
+
+#include "screenint.h"
+#include "pixmap.h"
+#include "gc.h"
+
+#define XSHM_PUT_IMAGE_ARGS \
+    DrawablePtr		/* dst */, \
+    GCPtr		/* pGC */, \
+    int			/* depth */, \
+    unsigned int	/* format */, \
+    int			/* w */, \
+    int			/* h */, \
+    int			/* sx */, \
+    int			/* sy */, \
+    int			/* sw */, \
+    int			/* sh */, \
+    int			/* dx */, \
+    int			/* dy */, \
+    char *		/* data */
+
+#define XSHM_CREATE_PIXMAP_ARGS \
+    ScreenPtr	/* pScreen */, \
+    int		/* width */, \
+    int		/* height */, \
+    int		/* depth */, \
+    char *	/* addr */
+
+typedef struct _ShmFuncs {
+    PixmapPtr	(* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
+    void	(* PutImage)(XSHM_PUT_IMAGE_ARGS);
+} ShmFuncs, *ShmFuncsPtr;
+
+extern _X_EXPORT void
+ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
+
+extern _X_EXPORT void
+ShmRegisterFbFuncs(ScreenPtr pScreen);
+
+extern _X_EXPORT RESTYPE ShmSegType;
+extern _X_EXPORT int ShmCompletionCode;
+extern _X_EXPORT int BadShmSegCode;
+
+#endif /* _SHMINT_H_ */
diff -urN xf86-video-intel-2.8.1.ORIG/uxa/uxa-priv.h xf86-video-intel-2.8.1/uxa/uxa-priv.h
--- xf86-video-intel-2.8.1.ORIG/uxa/uxa-priv.h	2009-08-13 20:06:44.000000000 +0000
+++ xf86-video-intel-2.8.1/uxa/uxa-priv.h	2009-09-08 23:33:36.960360903 +0000
@@ -43,7 +43,7 @@
 #include <X11/Xproto.h>
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include "shmint.h"
 #endif
 #include "scrnintstr.h"
 #include "pixmapstr.h"