diff --git a/driver/xf86-video-ati/src/atombios_crtc.c b/driver/xf86-video-ati/src/atombios_crtc.c
index 31c032baf..9bc1ad2f0 100644
--- a/driver/xf86-video-ati/src/atombios_crtc.c
+++ b/driver/xf86-video-ati/src/atombios_crtc.c
@@ -33,8 +33,12 @@
 #include "config.h"
 #endif
 /* DPMS */
+#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
 
 #include "radeon.h"
 #include "radeon_reg.h"
diff --git a/driver/xf86-video-ati/src/atombios_output.c b/driver/xf86-video-ati/src/atombios_output.c
index 158e76f50..30ef6418b 100644
--- a/driver/xf86-video-ati/src/atombios_output.c
+++ b/driver/xf86-video-ati/src/atombios_output.c
@@ -34,8 +34,12 @@
 #include "config.h"
 #endif
 /* DPMS */
+#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
 #include <unistd.h>
 
 #include "radeon.h"
diff --git a/driver/xf86-video-ati/src/radeon_driver.c b/driver/xf86-video-ati/src/radeon_driver.c
index 530251641..dbaaa39ea 100644
--- a/driver/xf86-video-ati/src/radeon_driver.c
+++ b/driver/xf86-video-ati/src/radeon_driver.c
@@ -104,8 +104,12 @@
 #include "vgaHW.h"
 #endif
 
+#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
 
 #include "atipciids.h"
 #include "radeon_chipset_gen.h"
diff --git a/driver/xf86-video-glint/src/glint_driver.c b/driver/xf86-video-glint/src/glint_driver.c
index 9c7eb9cce..63ffcb621 100644
--- a/driver/xf86-video-glint/src/glint_driver.c
+++ b/driver/xf86-video-glint/src/glint_driver.c
@@ -65,8 +65,12 @@
 #endif
 
 #include "globals.h"
+#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
 
 #define DEBUG 0
 
diff --git a/driver/xf86-video-intel/src/ch7017/ch7017.c b/driver/xf86-video-intel/src/ch7017/ch7017.c
index 759fc24b0..d3b37d44b 100644
--- a/driver/xf86-video-intel/src/ch7017/ch7017.c
+++ b/driver/xf86-video-intel/src/ch7017/ch7017.c
@@ -39,8 +39,12 @@
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
+#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
 
 #include "../i2c_vid.h"
 #include "ch7017_reg.h"
diff --git a/driver/xf86-video-intel/src/ch7xxx/ch7xxx.c b/driver/xf86-video-intel/src/ch7xxx/ch7xxx.c
index 8a439e420..a878a7f91 100644
--- a/driver/xf86-video-intel/src/ch7xxx/ch7xxx.c
+++ b/driver/xf86-video-intel/src/ch7xxx/ch7xxx.c
@@ -39,8 +39,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
+#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
 
 #include "../i2c_vid.h"
 #include "ch7xxx.h"
diff --git a/driver/xf86-video-intel/src/ivch/ivch.c b/driver/xf86-video-intel/src/ivch/ivch.c
index 873afcc9e..dd942cdf9 100644
--- a/driver/xf86-video-intel/src/ivch/ivch.c
+++ b/driver/xf86-video-intel/src/ivch/ivch.c
@@ -36,8 +36,12 @@
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
+#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
 #include <unistd.h>
 
 #include "../i2c_vid.h"
diff --git a/driver/xf86-video-intel/src/sil164/sil164.c b/driver/xf86-video-intel/src/sil164/sil164.c
index 410a681f5..eec59aa6f 100644
--- a/driver/xf86-video-intel/src/sil164/sil164.c
+++ b/driver/xf86-video-intel/src/sil164/sil164.c
@@ -40,8 +40,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
+#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
 
 #include "../i2c_vid.h"
 #include "sil164.h"
diff --git a/driver/xf86-video-intel/src/tfp410/tfp410.c b/driver/xf86-video-intel/src/tfp410/tfp410.c
index c2c4fc3d5..fc2d9cf83 100644
--- a/driver/xf86-video-intel/src/tfp410/tfp410.c
+++ b/driver/xf86-video-intel/src/tfp410/tfp410.c
@@ -39,8 +39,12 @@
 #include "miscstruct.h"
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
+#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
 
 #include "../i2c_vid.h"
 #include "tfp410.h"
diff --git a/driver/xf86-video-intel/uxa/uxa-priv.h b/driver/xf86-video-intel/uxa/uxa-priv.h
index d1cd341eb..96b183302 100644
--- a/driver/xf86-video-intel/uxa/uxa-priv.h
+++ b/driver/xf86-video-intel/uxa/uxa-priv.h
@@ -42,9 +42,13 @@
 #define NEED_EVENTS
 #include <X11/Xproto.h>
 #ifdef MITSHM
+#ifdef HAVE_X11_EXTENSIONS_SHMPROTO_H
+#include <X11/extensions/shmproto.h>
+#else
 #define _XSHM_SERVER_
 #include <X11/extensions/shmstr.h>
 #endif
+#endif
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"
@@ -319,6 +323,36 @@ uxa_get_image (DrawablePtr pDrawable, int x, int y, int w, int h,
 extern const GCOps uxa_ops;
 
 #ifdef MITSHM
+
+#ifdef HAVE_X11_EXTENSIONS_SHMPROTO_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;
+
+#endif
 extern ShmFuncs uxa_shm_funcs;
 
 /* XXX these come from shmint.h, which isn't exported by the server */
diff --git a/driver/xf86-video-mach64/src/atimach64.c b/driver/xf86-video-mach64/src/atimach64.c
index c7b0ecc2c..cf817d9ad 100644
--- a/driver/xf86-video-mach64/src/atimach64.c
+++ b/driver/xf86-video-mach64/src/atimach64.c
@@ -63,10 +63,14 @@
 #include "atimach64io.h"
 #include "atirgb514.h"
 
+#ifdef HAVE_X11_EXTENSIONS_DPMSCONST_H
+#include <X11/extensions/dpmsconst.h>
+#else
 #ifndef DPMS_SERVER
 # define DPMS_SERVER
 #endif
 #include <X11/extensions/dpms.h>
+#endif
 
 /*
  * ATIMach64PreInit --