diff --git a/src/radeon.h b/src/radeon.h
index 8e77313..add9622 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -588,7 +588,9 @@ #ifdef XF86DRI
     int               backPitch;
     int               depthOffset;
     int               depthPitch;
+#endif
     int               depthBits;
+#ifdef XF86DRI
     int               textureOffset;
     int               textureSize;
     int               log2TexGran;
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 5a20ac6..f0a075e 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -6372,6 +6372,7 @@ static void RADEONAdjustMemMapRegisters(
 		    RADEONRestoreMemMapRegisters(pScrn, save);
     }
 
+#ifdef XF86DRI
     if (info->accelDFS)
     {
 	drmRadeonGetParam gp;
@@ -6391,6 +6392,7 @@ static void RADEONAdjustMemMapRegisters(
 	    info->gartLocation = gart_base;
 	}
     }
+#endif
 }
 
 /* Write common registers */
@@ -6874,7 +6876,7 @@ void RADEONChangeSurfaces(ScrnInfoPtr pS
   
     RADEONInfoPtr  info  = RADEONPTR(pScrn);
     int cpp = info->CurrentLayout.pixel_bytes;
-    int depthCpp = (info->depthBits - 8) / 4;
+    int depthCpp = (pScrn->depth - 8) / 4;
     /* depth/front/back pitch must be identical (and the same as displayWidth) */
     int width_bytes = pScrn->displayWidth * cpp;
     int bufferSize = ((((pScrn->virtualY + 15) & ~15) * width_bytes