diff --git a/src/intel_driver.c b/src/intel_driver.c
index 78f7ce3..92ef7ee 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -50,7 +50,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86cmap.h"
 #include "xf86drm.h"
 #include "compiler.h"
+#ifdef HAVE_MIBSTORE_H
 #include "mibstore.h"
+#endif
 #include "mipointer.h"
 #include "micmap.h"
 #include "shadowfb.h"
@@ -926,7 +928,9 @@ I830ScreenInit(SCREEN_INIT_ARGS_DECL)
 		return FALSE;
 	}
 
+#ifdef HAVE_MIBSTORE_H
 	miInitializeBackingStore(screen);
+#endif
 	xf86SetBackingStore(screen);
 	xf86SetSilkenMouse(screen);
 	miDCInitialize(screen, xf86GetPointerScreenFuncs());
@@ -1140,8 +1144,7 @@ static Bool I830CloseScreen(CLOSE_SCREEN_ARGS_DECL)
 	}
 
 	if (intel->shadow_damage) {
-		DamageUnregister(&screen->GetScreenPixmap(screen)->drawable,
-				 intel->shadow_damage);
+		DamageUnregister(intel->shadow_damage);
 		DamageDestroy(intel->shadow_damage);
 		intel->shadow_damage = NULL;
 	}
diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c
index 9821612..ac3ec1f 100644
--- a/src/legacy/i810/i810_driver.c
+++ b/src/legacy/i810/i810_driver.c
@@ -58,7 +58,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86cmap.h"
 
 #include "compiler.h"
+#ifdef HAVE_MIBSTORE_H
 #include "mibstore.h"
+#endif
 #include "vgaHW.h"
 #include "mipointer.h"
 #include "micmap.h"
@@ -1715,7 +1717,9 @@ I810ScreenInit(SCREEN_INIT_ARGS_DECL)
    }
 #endif
 
+#ifdef HAVE_MIBSTORE_H
    miInitializeBackingStore(screen);
+#endif
    xf86SetBackingStore(screen);
    xf86SetSilkenMouse(screen);
 
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 87a69ba..450f710 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -586,7 +586,7 @@ static void sna_mode_disable_shadow(struct sna *sna)
 
 	DBG(("%s\n", __FUNCTION__));
 
-	DamageUnregister(&sna->front->drawable, sna->mode.shadow_damage);
+	DamageUnregister(sna->mode.shadow_damage);
 	DamageDestroy(sna->mode.shadow_damage);
 	sna->mode.shadow_damage = NULL;
 
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 3871ab6..fa70df3 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -51,7 +51,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <mi.h>
 #include <micmap.h>
 #include <mipict.h>
+#ifdef HAVE_MIBSTORE_H
 #include <mibstore.h>
+#endif
 
 #include "compiler.h"
 #include "sna.h"
@@ -897,7 +899,9 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
 
 	xf86SetBlackWhitePixels(screen);
 
+#ifdef HAVE_MIBSTORE_H
 	miInitializeBackingStore(screen);
+#endif
 	xf86SetBackingStore(screen);
 	xf86SetSilkenMouse(screen);
 	if (!miDCInitialize(screen, xf86GetPointerScreenFuncs()))
diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h
index 91ef4e0..40c6fa7 100644
--- a/uxa/uxa-priv.h
+++ b/uxa/uxa-priv.h
@@ -44,7 +44,9 @@
 #include "pixmapstr.h"
 #include "windowstr.h"
 #include "servermd.h"
+#ifdef HAVE_MIBSTORE_H
 #include "mibstore.h"
+#endif
 #include "colormapst.h"
 #include "gcstruct.h"
 #include "input.h"