diff -rupN xf86-video-nv-2.1.20-orig/src/g80_driver.c xf86-video-nv-2.1.20/src/g80_driver.c
--- xf86-video-nv-2.1.20-orig/src/g80_driver.c	2013-03-09 15:22:43.549152630 +0100
+++ xf86-video-nv-2.1.20/src/g80_driver.c	2013-03-09 15:23:08.148993854 +0100
@@ -34,7 +34,6 @@
 #include <xf86Resources.h>
 #endif
 #include <mipointer.h>
-#include <mibstore.h>
 #include <micmap.h>
 #include <xf86cmap.h>
 #include <fb.h>
@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
         }
     }
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 
diff -rupN xf86-video-nv-2.1.20-orig/src/nv_include.h xf86-video-nv-2.1.20/src/nv_include.h
--- xf86-video-nv-2.1.20-orig/src/nv_include.h	2013-03-09 15:22:43.549152630 +0100
+++ xf86-video-nv-2.1.20/src/nv_include.h	2013-03-09 15:23:21.828461637 +0100
@@ -24,9 +24,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 #include "micmap.h"
 
 #include "xf86DDC.h"
diff -rupN xf86-video-nv-2.1.20-orig/src/riva_include.h xf86-video-nv-2.1.20/src/riva_include.h
--- xf86-video-nv-2.1.20-orig/src/riva_include.h	2013-03-09 15:22:43.549152630 +0100
+++ xf86-video-nv-2.1.20/src/riva_include.h	2013-03-09 15:23:33.397857262 +0100
@@ -22,9 +22,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 #include "micmap.h"
 
 #include "xf86DDC.h"