diff --git a/src/sna/fb/fbgc.c b/src/sna/fb/fbgc.c
index 83956c41..99437949 100644
--- a/src/sna/fb/fbgc.c
+++ b/src/sna/fb/fbgc.c
@@ -23,7 +23,6 @@
 
 #include "fb.h"
 #include <gcstruct.h>
-#include <migc.h>
 #include <scrnintstr.h>
 
 /*
diff --git a/src/sna/fb/fbseg.c b/src/sna/fb/fbseg.c
index 67ad3895..58d22669 100644
--- a/src/sna/fb/fbseg.c
+++ b/src/sna/fb/fbseg.c
@@ -25,7 +25,6 @@
 
 #include "fb.h"
 #include "fbclip.h"
-#include <mi.h>
 #include <miline.h>
 #include <scrnintstr.h>
 
diff --git a/src/sna/kgem_debug_gen2.c b/src/sna/kgem_debug_gen2.c
index 09f3873b..3f91c29d 100644
--- a/src/sna/kgem_debug_gen2.c
+++ b/src/sna/kgem_debug_gen2.c
@@ -34,7 +34,6 @@
 #include <assert.h>
 
 #include "sna.h"
-#include "sna_reg.h"
 
 #include "gen2_render.h"
 
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index a218be32..99f95aea 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -42,7 +42,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <unistd.h>
 
 #include "sna.h"
-#include "sna_reg.h"
 #include "intel_options.h"
 
 #include <xf86drm.h>
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 1832cd85..d89fb1f8 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -57,7 +57,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <xf86RandR12.h>
 #include <mi.h>
 #include <micmap.h>
-#include <mipict.h>
 
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 759e4159..9b272eff 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -67,8 +67,6 @@
 #include "sna_render_inline.h"
 #include "fb/fbpict.h"
 
-#include <mipict.h>
-
 #define FALLBACK 0
 #define NO_GLYPH_CACHE 0
 #define NO_GLYPHS_TO_DST 0
diff --git a/src/sna/sna_video.c b/src/sna/sna_video.c
index 132ca280..7f1eeb2c 100644
--- a/src/sna/sna_video.c
+++ b/src/sna/sna_video.c
@@ -60,7 +60,6 @@
 #include "intel_options.h"
 
 #include <xf86xv.h>
-#include <X11/extensions/Xv.h>
 
 #ifdef SNA_XVMC
 #define _SNA_XVMC_SERVER_
diff --git a/src/uxa/i965_3d.c b/src/uxa/i965_3d.c
index fe2d9aa6..757a9794 100644
--- a/src/uxa/i965_3d.c
+++ b/src/uxa/i965_3d.c
@@ -30,7 +30,6 @@
 #include "intel.h"
 #include "i965_reg.h"
 #include "brw_defines.h"
-#include "brw_structs.h"
 
 void
 gen6_upload_invariant_states(intel_screen_private *intel)
diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
index 3c2f9643..9bda0068 100644
--- a/src/uxa/intel_display.c
+++ b/src/uxa/intel_display.c
@@ -35,7 +35,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-#include <poll.h>
 #include <sys/ioctl.h>
 
 #include "xorg-server.h"
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index 431c34ba..e035973b 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -53,13 +53,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "compiler.h"
 #include "mipointer.h"
 #include "micmap.h"
-#include "shadowfb.h"
 #include <X11/extensions/randr.h>
 #include "fb.h"
 #include "miscstruct.h"
 #include "dixstruct.h"
 #include "xf86xv.h"
-#include <X11/extensions/Xv.h>
 #include "shadow.h"
 #include "intel.h"
 #include "intel_video.h"
@@ -70,12 +68,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "intel_xvmc.h"
 #endif
 
-#include "legacy/legacy.h"
 #include "uxa.h"
 
-#include <sys/ioctl.h>
 #include "i915_drm.h"
-#include <xf86drmMode.h>
 
 #include "intel_glamor.h"
 #include "intel_options.h"
diff --git a/src/uxa/uxa-accel.c b/src/uxa/uxa-accel.c
index 27215ddf..f1ae9a1f 100644
--- a/src/uxa/uxa-accel.c
+++ b/src/uxa/uxa-accel.c
@@ -36,7 +36,6 @@
 #include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 #include "uxa.h"
-#include "mipict.h"
 
 static void
 uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n,
diff --git a/src/uxa/uxa-glyphs.c b/src/uxa/uxa-glyphs.c
index b022c833..de36fcbe 100644
--- a/src/uxa/uxa-glyphs.c
+++ b/src/uxa/uxa-glyphs.c
@@ -68,8 +68,6 @@
 #include "uxa-glamor.h"
 #include "common.h"
 
-#include "mipict.h"
-
 /* Width of the pixmaps we use for the caches; this should be less than
  * max texture size of the driver; this may need to actually come from
  * the driver.
diff --git a/src/uxa/uxa-render.c b/src/uxa/uxa-render.c
index d783ea26..992a008e 100644
--- a/src/uxa/uxa-render.c
+++ b/src/uxa/uxa-render.c
@@ -30,7 +30,6 @@
 
 #include "uxa-priv.h"
 #include "uxa-glamor.h"
-#include <xorgVersion.h>
 
 #ifdef RENDER
 #include "mipict.h"
diff --git a/src/uxa/uxa-unaccel.c b/src/uxa/uxa-unaccel.c
index f4310494..6d383e41 100644
--- a/src/uxa/uxa-unaccel.c
+++ b/src/uxa/uxa-unaccel.c
@@ -23,10 +23,6 @@
 
 #include "uxa-priv.h"
 
-#ifdef RENDER
-#include "mipict.h"
-#endif
-
 /*
  * These functions wrap the low-level fb rendering functions and
  * synchronize framebuffer/accelerated drawing by stalling until
diff --git a/tools/virtual.c b/tools/virtual.c
index a02db68c..a475ba5d 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -61,7 +61,6 @@
 #include <signal.h>
 #include <getopt.h>
 #include <limits.h>
-#include <ctype.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <assert.h>