1 files changed, 7 insertions, 7 deletions
diff --git a/drv/drv_pixmap.c b/drv/drv_pixmap.c
index de1173f12..56a7bcbad 100644
--- a/drv/drv_pixmap.c
+++ b/drv/drv_pixmap.c
@@ -31,25 +31,25 @@ from The Open Group.
 
 #include <X11/X.h>
 #include "servermd.h"
-#include "scrnintstr.h"
 #include "drv_types.h"
+#include "drv_scrnintstr.h"
 #include "drv_pixmapstr.h"
 #include "drv_pixmap.h"
 
 /* callable by ddx */
 DrvPixmapPtr
-DrvAllocatePixmap(ScreenPtr pScreen, int pixDataSize)
+DrvAllocatePixmap(DrvScreenPtr pScreen, int pixDataSize)
 {
     DrvPixmapPtr pPixmap;
 
-    assert(pScreen->totalPixmapSize > 0);
+    assert(pScreen->pScreen->totalPixmapSize > 0);
 
-    if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)
-	return NullPixmap;
+    if (pScreen->pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)
+	return NullDrvPixmap;
     
-    pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
+    pPixmap = malloc(pScreen->pScreen->totalPixmapSize + pixDataSize);
     if (!pPixmap)
-	return NullPixmap;
+	return NullDrvPixmap;
 
     dixInitPrivates(pPixmap, pPixmap + 1, PRIVATE_PIXMAP);
     return pPixmap;