diff -up xf86-video-intel-2.8.0/uxa/uxa-priv.h.jx xf86-video-intel-2.8.0/uxa/uxa-priv.h
--- xf86-video-intel-2.8.0/uxa/uxa-priv.h.jx	2009-07-21 02:00:14.000000000 -0400
+++ xf86-video-intel-2.8.0/uxa/uxa-priv.h	2009-07-21 11:39:10.000000000 -0400
@@ -1,5 +1,4 @@
 /*
- *
  * Copyright © 2000,2008 Keith Packard
  *             2005 Zack Rusin, Trolltech
  *
@@ -42,8 +41,7 @@
 #define NEED_EVENTS
 #include <X11/Xproto.h>
 #ifdef MITSHM
-#define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include "shmint.h"
 #endif
 #include "scrnintstr.h"
 #include "pixmapstr.h"
diff -up xf86-video-intel-2.8.0/src/ch7017/ch7017.c.jx xf86-video-intel-2.8.0/src/ch7017/ch7017.c
--- xf86-video-intel-2.8.0/src/ch7017/ch7017.c.jx	2009-07-21 02:00:14.000000000 -0400
+++ xf86-video-intel-2.8.0/src/ch7017/ch7017.c	2009-07-21 12:34:56.000000000 -0400
@@ -40,7 +40,7 @@
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 
 #include "../i2c_vid.h"
 #include "ch7017_reg.h"
diff -up xf86-video-intel-2.8.0/src/ch7xxx/ch7xxx.c.jx xf86-video-intel-2.8.0/src/ch7xxx/ch7xxx.c
--- xf86-video-intel-2.8.0/src/ch7xxx/ch7xxx.c.jx	2009-07-21 02:00:14.000000000 -0400
+++ xf86-video-intel-2.8.0/src/ch7xxx/ch7xxx.c	2009-07-21 12:35:38.000000000 -0400
@@ -40,7 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 
 #include "../i2c_vid.h"
 #include "ch7xxx.h"
diff -up xf86-video-intel-2.8.0/src/ivch/ivch.c.jx xf86-video-intel-2.8.0/src/ivch/ivch.c
--- xf86-video-intel-2.8.0/src/ivch/ivch.c.jx	2009-07-21 02:00:14.000000000 -0400
+++ xf86-video-intel-2.8.0/src/ivch/ivch.c	2009-07-21 12:36:00.000000000 -0400
@@ -37,7 +37,7 @@
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 #include <unistd.h>
 
 #include "../i2c_vid.h"
diff -up xf86-video-intel-2.8.0/src/sil164/sil164.c.jx xf86-video-intel-2.8.0/src/sil164/sil164.c
--- xf86-video-intel-2.8.0/src/sil164/sil164.c.jx	2009-07-21 02:00:14.000000000 -0400
+++ xf86-video-intel-2.8.0/src/sil164/sil164.c	2009-07-21 12:36:00.000000000 -0400
@@ -41,7 +41,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 
 #include "../i2c_vid.h"
 #include "sil164.h"
diff -up xf86-video-intel-2.8.0/src/tfp410/tfp410.c.jx xf86-video-intel-2.8.0/src/tfp410/tfp410.c
--- xf86-video-intel-2.8.0/src/tfp410/tfp410.c.jx	2009-07-21 02:00:14.000000000 -0400
+++ xf86-video-intel-2.8.0/src/tfp410/tfp410.c	2009-07-21 12:36:00.000000000 -0400
@@ -40,7 +40,7 @@
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 
 #include "../i2c_vid.h"
 #include "tfp410.h"