--- xorg-x11-drv-armsoc-0.5.2/src/armsoc_driver.h.orig	2013-04-21 20:05:41.910984026 +0100
+++ xorg-x11-drv-armsoc-0.5.2/src/armsoc_driver.h	2013-04-21 20:06:17.742345818 +0100
@@ -40,7 +40,6 @@
  * XXX - figure out what can be removed..
  */
 #include "mipointer.h"
-#include "mibstore.h"
 #include "micmap.h"
 #include "colormapst.h"
 #include "xf86cmap.h"
--- xorg-x11-drv-armsoc-0.5.2/src/drm_pl111_cursor.c.orig	2013-04-21 20:05:55.787124130 +0100
+++ xorg-x11-drv-armsoc-0.5.2/src/drm_pl111_cursor.c	2013-04-21 20:06:28.644455906 +0100
@@ -46,9 +46,6 @@
 #include "compiler.h"
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 #include "micmap.h"
 
 #include "xf86DDC.h"
--- xorg-x11-drv-armsoc-0.5.2/src/armsoc_driver.c.orig	2013-04-21 20:09:21.011196981 +0100
+++ xorg-x11-drv-armsoc-0.5.2/src/armsoc_driver.c	2013-04-21 20:09:39.690385720 +0100
@@ -693,7 +693,6 @@
 	ARMSOCAccelInit(pScreen);
 
 	/* Initialize backing store: */
-	miInitializeBackingStore(pScreen);
 	xf86SetBackingStore(pScreen);
 
 	/* Cause the cursor position to be updated by the mouse signal handler: */
--- xorg-x11-drv-armsoc-0.5.2/src/drmmode_display.c.orig	2013-04-21 20:53:42.235386485 +0100
+++ xorg-x11-drv-armsoc-0.5.2/src/drmmode_display.c	2013-04-21 20:53:55.863521018 +0100
@@ -52,9 +52,6 @@
 #include "compiler.h"
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 #include "micmap.h"
 
 #include "xf86DDC.h"