diff -up xf86-video-intel-20120529/src/sna/sna_video_overlay.c.jx xf86-video-intel-20120529/src/sna/sna_video_overlay.c
--- xf86-video-intel-20120529/src/sna/sna_video_overlay.c.jx	2012-05-29 16:20:25.000000000 -0400
+++ xf86-video-intel-20120529/src/sna/sna_video_overlay.c	2012-05-29 16:33:49.880486568 -0400
@@ -34,6 +34,7 @@
 #include <xf86xv.h>
 #include <X11/extensions/Xv.h>
 #include <fourcc.h>
+#include <xf86drm.h>
 #include <i915_drm.h>
 
 #include "intel_options.h"
diff -up xf86-video-intel-20120529/src/sna/sna_video_sprite.c.jx xf86-video-intel-20120529/src/sna/sna_video_sprite.c
--- xf86-video-intel-20120529/src/sna/sna_video_sprite.c.jx	2012-05-29 16:20:25.000000000 -0400
+++ xf86-video-intel-20120529/src/sna/sna_video_sprite.c	2012-05-29 16:37:05.749768749 -0400
@@ -37,6 +37,7 @@
 #include <X11/extensions/Xv.h>
 #include <fourcc.h>
 #include <drm_fourcc.h>
+#include <xf86drm.h>
 #include <i915_drm.h>
 
 #if DEBUG_VIDEO_OVERLAY