drv: get to build

35 files changed, 279 insertions, 280 deletions

diff --git a/drv/fb/Makefile.am b/drv/fb/Makefile.am
index 204bf16fa..b0a9fb368 100644
--- a/drv/fb/Makefile.am
+++ b/drv/fb/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libdrvfb.la libdrvwfb.la
 AM_CFLAGS = $(DIX_CFLAGS)
 
 if XORG
-sdk_HEADERS = drv_fb.h drv_fbrop.h drv_fboverlay.h drv_wfbrename.h drv_fbpict.h
+sdk_HEADERS = drvfb.h drvfboverlay.h drv_wfbrename.h drv_fbpict.h
 endif
 
 libdrvfb_la_CFLAGS = $(AM_CFLAGS)
diff --git a/drv/fb/fbpict.h b/drv/fb/drv_fbpict.h
index 96ff75e53..96ff75e53 100644
--- a/drv/fb/fbpict.h
+++ b/drv/fb/drv_fbpict.h
diff --git a/drv/fb/wfbrename.h b/drv/fb/drv_wfbrename.h
index 38adf4e1a..38adf4e1a 100644
--- a/drv/fb/wfbrename.h
+++ b/drv/fb/drv_wfbrename.h
diff --git a/drv/fb/fb.h b/drv/fb/drvfb.h
index db254e39c..601486cba 100644
--- a/drv/fb/fb.h
+++ b/drv/fb/drvfb.h
@@ -28,7 +28,7 @@
 #include <X11/X.h>
 #include <pixman.h>
 
-#include "scrnintstr.h"
+#include "drv_scrnintstr.h"
 #include "drv_pixmap.h"
 #include "drv_pixmapstr.h"
 #include "region.h"
@@ -49,7 +49,7 @@
 
 #ifdef FB_ACCESS_WRAPPER
 
-#include "wfbrename.h"
+#include "drv_wfbrename.h"
 #define FBPREFIX(x) wfb##x
 #define WRITE(ptr, val) ((*wfbWriteMemory)((ptr), (val), sizeof(*(ptr))))
 #define READ(ptr) ((*wfbReadMemory)((ptr), sizeof(*(ptr))))
@@ -592,7 +592,7 @@ fbGetGCPrivateKey (void);
 extern _X_EXPORT DevPrivateKey
 fbGetWinPrivateKey (void);
 
-extern _X_EXPORT const GCOps	fbGCOps;
+extern _X_EXPORT const DrvGCOps	fbGCOps;
 //extern _X_EXPORT const GCFuncs	fbGCFuncs;
 
 
@@ -601,18 +601,18 @@ typedef FbBits (*ReadMemoryProcPtr)(const void *src, int size);
 typedef void (*WriteMemoryProcPtr)(void *dst, FbBits value, int size);
 typedef void (*SetupWrapProcPtr)(ReadMemoryProcPtr  *pRead,
                                  WriteMemoryProcPtr *pWrite,
-                                 PixmapPtr         pPixmap);
-typedef void (*FinishWrapProcPtr)(PixmapPtr pPixmap);
+                                 DrvPixmapPtr         pPixmap);
+typedef void (*FinishWrapProcPtr)(DrvPixmapPtr pPixmap);
 
 #ifdef FB_ACCESS_WRAPPER
 
 #define fbPrepareAccess(pDraw) \
-	fbGetScreenPrivate((pDraw)->pScreen)->setupWrap( \
+	fbGetScreenPrivate((pDraw)->pDrvScreen)->setupWrap( \
 		&wfbReadMemory, \
 		&wfbWriteMemory, \
 		(pDraw))
 #define fbFinishAccess(pDraw) \
-	fbGetScreenPrivate((pDraw)->pScreen)->finishWrap(pDraw)
+	fbGetScreenPrivate((pDraw)->pDrvScreen)->finishWrap(pDraw)
 
 #else
 
@@ -635,8 +635,8 @@ typedef struct {
 #endif
 } FbScreenPrivRec, *FbScreenPrivPtr;
 
-#define fbGetScreenPrivate(pScreen) ((FbScreenPrivPtr) \
-				     dixLookupPrivate(&(pScreen)->devPrivates, fbGetScreenPrivateKey()))
+#define fbGetScreenPrivate(pDrvScreen) ((FbScreenPrivPtr) \
+				     dixLookupPrivate(&(pDrvScreen)->devPrivates, fbGetScreenPrivateKey()))
 
 /* private field of GC */
 typedef struct {
@@ -656,7 +656,7 @@ typedef struct {
 #define fbGetFreeCompClip(pGC)	((pGC)->freeCompClip)
 #define fbGetRotatedPixmap(pGC)	((pGC)->pRotatedPixmap)
 
-#define fbGetScreenPixmap(s)	((PixmapPtr) (s)->devPrivate)
+#define fbGetScreenPixmap(s)	((DrvPixmapPtr) (s)->devPrivate)
 
 #ifdef ROOTLESS
 #define __fbPixDrawableX(pPix)	((pPix)->x)
@@ -670,14 +670,14 @@ typedef struct {
 #define __fbPixOffYPix(pPix)	(__fbPixDrawableY(pPix))
 
 #define fbGetDrawablePixmap(pDrawable, pixmap, xoff, yoff) {			\
-    (pixmap) = (PixmapPtr) (pDrawable);					\
+    (pixmap) = (DrvPixmapPtr) (pDrawable);					\
     (xoff) = __fbPixOffXPix(pixmap); 					\
     (yoff) = __fbPixOffYPix(pixmap); 					\
     fbPrepareAccess(pDrawable); 						\
 }
 
 #define fbGetPixmap(pDrawable, pixmap, xoff, yoff) {			\
-	(pixmap) = (PixmapPtr) (pDrawable);					\
+	(pixmap) = (DrvPixmapPtr) (pDrawable);					\
 	(xoff) = __fbPixOffXPix(pixmap); 					\
 	(yoff) = __fbPixOffYPix(pixmap); 					\
     } 										\
@@ -696,13 +696,13 @@ typedef struct {
 }
 
 #define fbGetDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { 		\
-    PixmapPtr   _pPix; 								\
+    DrvPixmapPtr   _pPix; 								\
     fbGetDrawablePixmap(pDrawable, _pPix, xoff, yoff); 				\
     fbGetPixmapBitsData(_pPix, pointer, stride, bpp);				\
 }
 
 #define fbGetStipDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { 	\
-    PixmapPtr   _pPix;							\
+    DrvPixmapPtr   _pPix;							\
     fbGetDrawablePixmap(pDrawable, _pPix, xoff, yoff);				\
     fbGetPixmapStipData(_pPix, pointer, stride, bpp);				\
 }
@@ -724,7 +724,7 @@ typedef struct {
  * fb24_32.c
  */
 extern _X_EXPORT void
-fb24_32GetSpans(PixmapPtr	pPixmap, 
+fb24_32GetSpans(DrvPixmapPtr	pPixmap, 
 		int		wMax, 
 		DDXPointPtr	ppt, 
 		int		*pwidth, 
@@ -732,7 +732,7 @@ fb24_32GetSpans(PixmapPtr	pPixmap,
 		char		*pchardstStart);
 
 extern _X_EXPORT void
-fb24_32SetSpans (PixmapPtr	    pPixmap,
+fb24_32SetSpans (DrvPixmapPtr	    pPixmap,
 		 DrvGCPtr		    pGC,
 		 char		    *src,
 		 DDXPointPtr	    ppt,
@@ -741,7 +741,7 @@ fb24_32SetSpans (PixmapPtr	    pPixmap,
 		 int		    fSorted);
 
 extern _X_EXPORT void
-fb24_32PutZImage (PixmapPtr	pPixmap,
+fb24_32PutZImage (DrvPixmapPtr	pPixmap,
 		  RegionPtr	pClip,
 		  int		alu,
 		  FbBits	pm,
@@ -753,7 +753,7 @@ fb24_32PutZImage (PixmapPtr	pPixmap,
 		  FbStride	srcStride);
     
 extern _X_EXPORT void
-fb24_32GetImage (PixmapPtr     pPixmap,
+fb24_32GetImage (DrvPixmapPtr     pPixmap,
 		 int             x,
 		 int             y,
 		 int             w,
@@ -763,8 +763,8 @@ fb24_32GetImage (PixmapPtr     pPixmap,
 		 char            *d);
 
 extern _X_EXPORT void
-fb24_32CopyMtoN (PixmapPtr pSrcDrawable,
-		 PixmapPtr pDstDrawable,
+fb24_32CopyMtoN (DrvPixmapPtr pSrcDrawable,
+		 DrvPixmapPtr pDstDrawable,
 		 DrvGCPtr       pGC,
 		 BoxPtr      pbox,
 		 int         nbox,
@@ -775,14 +775,14 @@ fb24_32CopyMtoN (PixmapPtr pSrcDrawable,
 		 Pixel       bitplane,
 		 void        *closure);
 
-extern _X_EXPORT PixmapPtr
-fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel);
+extern _X_EXPORT DrvPixmapPtr
+fb24_32ReformatTile(DrvPixmapPtr pOldTile, int bitsPerPixel);
     
 extern _X_EXPORT Bool
 fb24_32CreateScreenResources(ScreenPtr pScreen);
 
 extern _X_EXPORT Bool
-fb24_32ModifyPixmapHeader (PixmapPtr   pPixmap,
+fb24_32ModifyPixmapHeader (DrvPixmapPtr   pPixmap,
 			   int         width,
 			   int         height,
 			   int         depth,
@@ -794,14 +794,14 @@ fb24_32ModifyPixmapHeader (PixmapPtr   pPixmap,
  * fballpriv.c
  */
 extern _X_EXPORT Bool
-fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCIndex);
+fbAllocatePrivates(DrvScreenPtr pScreen, DevPrivateKey *pGCIndex);
     
 /*
  * fbarc.c
  */
 
 extern _X_EXPORT void
-fbPolyArc (PixmapPtr	pPixmap,
+fbPolyArc (DrvPixmapPtr	pPixmap,
 	   DrvGCPtr	pGC,
 	   int		narcs,
 	   xArc		*parcs);
@@ -811,7 +811,7 @@ fbPolyArc (PixmapPtr	pPixmap,
  */
 
 extern _X_EXPORT void
-fbBresSolid8(PixmapPtr    pPixmap,
+fbBresSolid8(DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     int	    dashOffset,
 	     int	    signdx,
@@ -825,7 +825,7 @@ fbBresSolid8(PixmapPtr    pPixmap,
 	     int	    len);
 
 extern _X_EXPORT void
-fbBresDash8 (PixmapPtr    pPixmap,
+fbBresDash8 (DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     int	    dashOffset,
 	     int	    signdx,
@@ -872,20 +872,20 @@ fbGlyph8 (FbBits    *dstLine,
 	  int	    shift);
 
 extern _X_EXPORT void
-fbPolyline8 (PixmapPtr    pPixmap,
+fbPolyline8 (DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     int	    mode,
 	     int	    npt,
 	     DDXPointPtr    ptsOrig);
 
 extern _X_EXPORT void
-fbPolySegment8 (PixmapPtr pPixmap,
+fbPolySegment8 (DrvPixmapPtr pPixmap,
 		DrvGCPtr	    pGC,
 		int	    nseg,
 		xSegment    *pseg);
 
 extern _X_EXPORT void
-fbBresSolid16(PixmapPtr   pPixmap,
+fbBresSolid16(DrvPixmapPtr   pPixmap,
 	      DrvGCPtr	    pGC,
 	      int	    dashOffset,
 	      int	    signdx,
@@ -899,7 +899,7 @@ fbBresSolid16(PixmapPtr   pPixmap,
 	      int	    len);
 
 extern _X_EXPORT void
-fbBresDash16(PixmapPtr    pPixmap,
+fbBresDash16(DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     int	    dashOffset,
 	     int	    signdx,
@@ -946,21 +946,21 @@ fbGlyph16(FbBits    *dstLine,
 	  int	    shift);
 
 extern _X_EXPORT void
-fbPolyline16 (PixmapPtr   pPixmap,
+fbPolyline16 (DrvPixmapPtr   pPixmap,
 	      DrvGCPtr	    pGC,
 	      int	    mode,
 	      int	    npt,
 	      DDXPointPtr   ptsOrig);
 
 extern _X_EXPORT void
-fbPolySegment16 (PixmapPtr	pPixmap,
+fbPolySegment16 (DrvPixmapPtr	pPixmap,
 		 DrvGCPtr		pGC,
 		 int		nseg,
 		 xSegment	*pseg);
 
 
 extern _X_EXPORT void
-fbBresSolid24(PixmapPtr   pPixmap,
+fbBresSolid24(DrvPixmapPtr   pPixmap,
 	      DrvGCPtr	    pGC,
 	      int	    dashOffset,
 	      int	    signdx,
@@ -974,7 +974,7 @@ fbBresSolid24(PixmapPtr   pPixmap,
 	      int	    len);
 
 extern _X_EXPORT void
-fbBresDash24(PixmapPtr    pPixmap,
+fbBresDash24(DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     int	    dashOffset,
 	     int	    signdx,
@@ -1021,21 +1021,21 @@ fbGlyph24(FbBits    *dstLine,
 	  int	    shift);
 
 extern _X_EXPORT void
-fbPolyline24 (PixmapPtr   pPixmap,
+fbPolyline24 (DrvPixmapPtr   pPixmap,
 	      DrvGCPtr	    pGC,
 	      int	    mode,
 	      int	    npt,
 	      DDXPointPtr   ptsOrig);
 
 extern _X_EXPORT void
-fbPolySegment24 (PixmapPtr	pPixmap,
+fbPolySegment24 (DrvPixmapPtr	pPixmap,
 		 DrvGCPtr		pGC,
 		 int		nseg,
 		 xSegment	*pseg);
 
 
 extern _X_EXPORT void
-fbBresSolid32(PixmapPtr   pPixmap,
+fbBresSolid32(DrvPixmapPtr   pPixmap,
 	      DrvGCPtr	    pGC,
 	      int	    dashOffset,
 	      int	    signdx,
@@ -1049,7 +1049,7 @@ fbBresSolid32(PixmapPtr   pPixmap,
 	      int	    len);
 
 extern _X_EXPORT void
-fbBresDash32(PixmapPtr    pPixmap,
+fbBresDash32(DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     int	    dashOffset,
 	     int	    signdx,
@@ -1095,14 +1095,14 @@ fbGlyph32(FbBits    *dstLine,
 	  int	    height,
 	  int	    shift);
 extern _X_EXPORT void
-fbPolyline32 (PixmapPtr   pPixmap,
+fbPolyline32 (DrvPixmapPtr   pPixmap,
 	      DrvGCPtr	    pGC,
 	      int	    mode,
 	      int	    npt,
 	      DDXPointPtr   ptsOrig);
 
 extern _X_EXPORT void
-fbPolySegment32 (PixmapPtr	pPixmap,
+fbPolySegment32 (DrvPixmapPtr	pPixmap,
 		 DrvGCPtr		pGC,
 		 int		nseg,
 		 xSegment	*pseg);
@@ -1224,8 +1224,8 @@ fbBltPlane (FbBits	    *src,
  */
 
 extern _X_EXPORT void
-fbCopyNtoN (PixmapPtr	pSrcPixmap,
-	    PixmapPtr	pDstPixmap,
+fbCopyNtoN (DrvPixmapPtr	pSrcPixmap,
+	    DrvPixmapPtr	pDstPixmap,
 	    DrvGCPtr	pGC,
 	    BoxPtr	pbox,
 	    int		nbox,
@@ -1237,8 +1237,8 @@ fbCopyNtoN (PixmapPtr	pSrcPixmap,
 	    void	*closure);
 
 extern _X_EXPORT void
-fbCopy1toN (PixmapPtr	pSrcPixmap,
-	    PixmapPtr	pDstPixmap,
+fbCopy1toN (DrvPixmapPtr	pSrcPixmap,
+	    DrvPixmapPtr	pDstPixmap,
 	    DrvGCPtr	pGC,
 	    BoxPtr	pbox,
 	    int		nbox,
@@ -1250,8 +1250,8 @@ fbCopy1toN (PixmapPtr	pSrcPixmap,
 	    void	*closure);
 
 extern _X_EXPORT void
-fbCopyNto1 (PixmapPtr	pSrcPixmap,
-	    PixmapPtr	pDstPixmap,
+fbCopyNto1 (DrvPixmapPtr	pSrcPixmap,
+	    DrvPixmapPtr	pDstPixmap,
 	    DrvGCPtr	pGC,
 	    BoxPtr	pbox,
 	    int		nbox,
@@ -1263,18 +1263,18 @@ fbCopyNto1 (PixmapPtr	pSrcPixmap,
 	    void	*closure);
 
 drvCopyProc
-fbGetCopyAreaFunction(PixmapPtr pSrc,
-		      PixmapPtr pDst);
+fbGetCopyAreaFunction(DrvPixmapPtr pSrc,
+		      DrvPixmapPtr pDst);
 
 drvCopyProc
-fbGetCopyPlaneFunction(PixmapPtr pSrc,
-		       PixmapPtr pDst, int bitplane);
+fbGetCopyPlaneFunction(DrvPixmapPtr pSrc,
+		       DrvPixmapPtr pDst, int bitplane);
 
 /*
  * fbfill.c
  */
 extern _X_EXPORT void
-fbFill (PixmapPtr pPixmap,
+fbFill (DrvPixmapPtr pPixmap,
 	DrvGCPtr	    pGC,
 	int	    x,
 	int	    y,
@@ -1282,7 +1282,7 @@ fbFill (PixmapPtr pPixmap,
 	int	    height);
 
 extern _X_EXPORT void
-fbSolidBoxClipped (PixmapPtr pPixmap,
+fbSolidBoxClipped (DrvPixmapPtr pPixmap,
 		   RegionPtr	pClip,
 		   int		xa,
 		   int		ya,
@@ -1295,7 +1295,7 @@ fbSolidBoxClipped (PixmapPtr pPixmap,
  * fbfillrect.c
  */
 extern _X_EXPORT void
-fbPolyFillRect(PixmapPtr  pPixmap, 
+fbPolyFillRect(DrvPixmapPtr  pPixmap, 
 	       DrvGCPtr	    pGC, 
 	       int	    nrectInit,
 	       xRectangle   *prectInit);
@@ -1308,7 +1308,7 @@ fbPolyFillRect(PixmapPtr  pPixmap,
  * fbfillsp.c
  */
 extern _X_EXPORT void
-fbFillSpans (PixmapPtr    pPixmap,
+fbFillSpans (DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     int	    nInit,
 	     DDXPointPtr    pptInit,
@@ -1324,16 +1324,16 @@ extern _X_EXPORT Bool
 fbCreateGC(DrvGCPtr pGC);
 
 extern _X_EXPORT void
-fbPadPixmap (PixmapPtr pPixmap);
+fbPadPixmap (DrvPixmapPtr pPixmap);
     
 extern _X_EXPORT void
-fbValidateGC(DrvGCPtr pGC, unsigned long changes, PixmapPtr pPixmap);
+fbValidateGC(DrvGCPtr pGC, unsigned long changes, DrvPixmapPtr pPixmap);
 
 /*
  * fbgetsp.c
  */
 extern _X_EXPORT void
-fbGetSpans(PixmapPtr	pPixmap, 
+fbGetSpans(DrvPixmapPtr	pPixmap, 
 	   int		wMax, 
 	   DDXPointPtr	ppt, 
 	   int		*pwidth, 
@@ -1352,7 +1352,7 @@ fbGlyphIn (RegionPtr	pRegion,
 	   int		height);
     
 extern _X_EXPORT void
-fbPolyGlyphBlt (PixmapPtr	pPixmap,
+fbPolyGlyphBlt (DrvPixmapPtr	pPixmap,
 		DrvGCPtr		pGC,
 		int		x, 
 		int		y,
@@ -1361,7 +1361,7 @@ fbPolyGlyphBlt (PixmapPtr	pPixmap,
 		pointer		pglyphBase);
 
 extern _X_EXPORT void
-fbImageGlyphBlt (PixmapPtr	pPixmap,
+fbImageGlyphBlt (DrvPixmapPtr	pPixmap,
 		 DrvGCPtr		pGC,
 		 int		x,
 		 int		y,
@@ -1374,7 +1374,7 @@ fbImageGlyphBlt (PixmapPtr	pPixmap,
  */
 
 extern _X_EXPORT void
-fbPutImage (PixmapPtr	pPixmap,
+fbPutImage (DrvPixmapPtr	pPixmap,
 	    DrvGCPtr	pGC,
 	    int		depth,
 	    int		x,
@@ -1386,7 +1386,7 @@ fbPutImage (PixmapPtr	pPixmap,
 	    char	*pImage);
 
 extern _X_EXPORT void
-fbPutZImage (PixmapPtr	pPixmap,
+fbPutZImage (DrvPixmapPtr	pPixmap,
 	     RegionPtr		pClip,
 	     int		alu,
 	     FbBits		pm,
@@ -1398,7 +1398,7 @@ fbPutZImage (PixmapPtr	pPixmap,
 	     FbStride		srcStride);
 
 extern _X_EXPORT void
-fbPutXYImage (PixmapPtr	pPixmap,
+fbPutXYImage (DrvPixmapPtr	pPixmap,
 	      RegionPtr		pClip,
 	      FbBits		fg,
 	      FbBits		bg,
@@ -1416,7 +1416,7 @@ fbPutXYImage (PixmapPtr	pPixmap,
 	      int		srcX);
 
 extern _X_EXPORT void
-fbGetImage (PixmapPtr	    pPixmap,
+fbGetImage (DrvPixmapPtr	    pPixmap,
 	    int		    x,
 	    int		    y,
 	    int		    w,
@@ -1429,20 +1429,20 @@ fbGetImage (PixmapPtr	    pPixmap,
  */
 
 extern _X_EXPORT void
-fbZeroLine (PixmapPtr	pPixmap,
+fbZeroLine (DrvPixmapPtr	pPixmap,
 	    DrvGCPtr	pGC,
 	    int		mode,
 	    int		npt,
 	    DDXPointPtr	ppt);
 
 extern _X_EXPORT void
-fbZeroSegment (PixmapPtr  pPixmap,
+fbZeroSegment (DrvPixmapPtr  pPixmap,
 	       DrvGCPtr	    pGC,
 	       int	    nseg,
 	       xSegment	    *pSegs);
 
 extern _X_EXPORT void
-fbPolyLine (PixmapPtr	pPixmap,
+fbPolyLine (DrvPixmapPtr	pPixmap,
 	    DrvGCPtr	pGC,
 	    int		mode,
 	    int		npt,
@@ -1453,7 +1453,7 @@ fbFixCoordModePrevious (int npt,
 			DDXPointPtr ppt);
 
 extern _X_EXPORT void
-fbPolySegment (PixmapPtr  pPixmap,
+fbPolySegment (DrvPixmapPtr  pPixmap,
 	       DrvGCPtr	    pGC,
 	       int	    nseg,
 	       xSegment	    *pseg);
@@ -1465,7 +1465,7 @@ fbPolySegment (PixmapPtr  pPixmap,
  */
 
 extern _X_EXPORT Bool
-fbPictureInit (ScreenPtr pScreen,
+fbPictureInit (DrvScreenPtr pScreen,
 	       PictFormatPtr formats,
 	       int nformats);
 
@@ -1473,19 +1473,19 @@ fbPictureInit (ScreenPtr pScreen,
  * fbpixmap.c
  */
 
-extern _X_EXPORT PixmapPtr
-fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
-		   unsigned usage_hint, ProtoPixmapPtr parent);
+extern _X_EXPORT DrvPixmapPtr
+fbCreatePixmapBpp (DrvScreenPtr pScreen, int width, int height, int depth, int bpp,
+		   unsigned usage_hint, PixmapPtr parent);
 
-extern _X_EXPORT PixmapPtr
-fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
-		unsigned usage_hint, ProtoPixmapPtr parent);
+extern _X_EXPORT DrvPixmapPtr
+fbCreatePixmap (DrvScreenPtr pScreen, int width, int height, int depth,
+		unsigned usage_hint, PixmapPtr parent);
 
 extern _X_EXPORT Bool
-fbDestroyPixmap (PixmapPtr pPixmap);
+fbDestroyPixmap (DrvPixmapPtr pPixmap);
 
 extern _X_EXPORT RegionPtr
-fbPixmapToRegion(PixmapPtr pPix);
+fbPixmapToRegion(DrvPixmapPtr pPix);
 
 /*
  * fbpoint.c
@@ -1506,7 +1506,7 @@ fbDots (FbBits	    *dstOrig,
 	FbBits	    xorOrig);
 
 extern _X_EXPORT void
-fbPolyPoint (PixmapPtr    pPixmap,
+fbPolyPoint (DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     int	    mode,
 	     int	    npt,
@@ -1516,7 +1516,7 @@ fbPolyPoint (PixmapPtr    pPixmap,
  * fbpush.c
  */
 extern _X_EXPORT void
-fbPushPattern (PixmapPtr  pPixmap,
+fbPushPattern (DrvPixmapPtr  pPixmap,
 	       DrvGCPtr	    pGC,
 	       
 	       FbStip	    *src,
@@ -1530,7 +1530,7 @@ fbPushPattern (PixmapPtr  pPixmap,
 	       int	    height);
 
 extern _X_EXPORT void
-fbPushFill (PixmapPtr	pPixmap,
+fbPushFill (DrvPixmapPtr	pPixmap,
 	    DrvGCPtr	pGC,
 
 	    FbStip	*src,
@@ -1543,7 +1543,7 @@ fbPushFill (PixmapPtr	pPixmap,
 	    int		height);
 
 extern _X_EXPORT void
-fbPushImage (PixmapPtr    pPixmap,
+fbPushImage (DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     
 	     FbStip	    *src,
@@ -1557,8 +1557,8 @@ fbPushImage (PixmapPtr    pPixmap,
 
 extern _X_EXPORT void
 fbPushPixels (DrvGCPtr	    pGC,
-	      PixmapPtr	    pBitmap,
-	      PixmapPtr   pPixmap,
+	      DrvPixmapPtr	    pBitmap,
+	      DrvPixmapPtr   pPixmap,
 	      int	    dx,
 	      int	    dy,
 	      int	    xOrg,
@@ -1570,7 +1570,7 @@ fbPushPixels (DrvGCPtr	    pGC,
  */
 
 extern _X_EXPORT Bool
-fbCloseScreen (int indx, ScreenPtr pScreen);
+fbCloseScreen (int indx, DrvScreenPtr pScreen);
 
 extern _X_EXPORT Bool
 fbRealizeFont(ScreenPtr pScreen, FontPtr pFont);
@@ -1581,10 +1581,10 @@ fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont);
 extern _X_EXPORT void
 fbQueryBestSize (int class, 
 		 unsigned short *width, unsigned short *height,
-		 ScreenPtr pScreen);
+		 DrvScreenPtr pScreen);
 
 extern _X_EXPORT Bool
-fbSetupScreen(ScreenPtr	pScreen, 
+fbSetupScreen(DrvScreenPtr	pScreen, 
 	      pointer	pbits,		/* pointer to screen bitmap */
 	      int	xsize, 		/* in pixels */
 	      int	ysize,
@@ -1594,7 +1594,7 @@ fbSetupScreen(ScreenPtr	pScreen,
 	      int	bpp);		/* bits per pixel of frame buffer */
 
 extern _X_EXPORT Bool
-wfbFinishScreenInit(ScreenPtr	pScreen,
+wfbFinishScreenInit(DrvScreenPtr	pScreen,
 		    pointer	pbits,
 		    int		xsize,
 		    int		ysize,
@@ -1606,7 +1606,7 @@ wfbFinishScreenInit(ScreenPtr	pScreen,
 		    FinishWrapProcPtr finishWrap);
 
 extern _X_EXPORT Bool
-wfbScreenInit(ScreenPtr	pScreen,
+wfbScreenInit(DrvScreenPtr	pScreen,
 	      pointer	pbits,
 	      int	xsize,
 	      int	ysize,
@@ -1618,7 +1618,7 @@ wfbScreenInit(ScreenPtr	pScreen,
 	      FinishWrapProcPtr finishWrap);
 
 extern _X_EXPORT Bool
-fbFinishScreenInit(ScreenPtr	pScreen,
+fbFinishScreenInit(DrvScreenPtr	pScreen,
 		   pointer	pbits,
 		   int		xsize,
 		   int		ysize,
@@ -1628,7 +1628,7 @@ fbFinishScreenInit(ScreenPtr	pScreen,
 		   int		bpp);
 
 extern _X_EXPORT Bool
-fbScreenInit(ScreenPtr	pScreen,
+fbScreenInit(DrvScreenPtr	pScreen,
 	     pointer	pbits,
 	     int	xsize,
 	     int	ysize,
@@ -1640,7 +1640,7 @@ fbScreenInit(ScreenPtr	pScreen,
 /*
  * fbseg.c
  */
-typedef void	FbBres (PixmapPtr	pPixmap,
+typedef void	FbBres (DrvPixmapPtr	pPixmap,
 			DrvGCPtr		pGC,
 			int		dashOffset,
 			int		signdx,
@@ -1659,7 +1659,7 @@ extern _X_EXPORT FbBres fbBresSolid, fbBresDash, fbBresFill, fbBresFillDash;
  */
 
 extern _X_EXPORT void
-fbSetSpans (PixmapPtr	    pPixmap,
+fbSetSpans (DrvPixmapPtr	    pPixmap,
 	    DrvGCPtr	    pGC,
 	    char	    *src,
 	    DDXPointPtr	    ppt,
@@ -1668,11 +1668,11 @@ fbSetSpans (PixmapPtr	    pPixmap,
 	    int		    fSorted);
 
 extern _X_EXPORT FbBres *
-fbSelectBres (PixmapPtr   pPixmap,
+fbSelectBres (DrvPixmapPtr   pPixmap,
 	      DrvGCPtr	    pGC);
 
 extern _X_EXPORT void
-fbBres (PixmapPtr	pPixmap,
+fbBres (DrvPixmapPtr	pPixmap,
 	DrvGCPtr		pGC,
 	int		dashOffset,
 	int		signdx,
@@ -1686,7 +1686,7 @@ fbBres (PixmapPtr	pPixmap,
 	int		len);
 
 extern _X_EXPORT void
-fbSegment (PixmapPtr	pPixmap,
+fbSegment (DrvPixmapPtr	pPixmap,
 	   DrvGCPtr	pGC,
 	   int		xa,
 	   int		ya,
@@ -1879,10 +1879,10 @@ extern _X_EXPORT WriteMemoryProcPtr wfbWriteMemory;
  */
 
 extern _X_EXPORT void
-fbPixmapWindowFixup(PixmapPtr *ppPixmap, int bpp);
+fbPixmapWindowFixup(DrvPixmapPtr *ppPixmap, int bpp);
 
 extern _X_EXPORT void
-fbFillRegionSolid (PixmapPtr pPixmap,
+fbFillRegionSolid (DrvPixmapPtr pPixmap,
 		   RegionPtr	pRegion,
 		   FbBits	and,
 		   FbBits	xor);
diff --git a/drv/fb/fboverlay.h b/drv/fb/drvfboverlay.h
index b626a7702..b626a7702 100644
--- a/drv/fb/fboverlay.h
+++ b/drv/fb/drvfboverlay.h
diff --git a/drv/fb/fb24_32.c b/drv/fb/fb24_32.c
index 356749e64..bde49d922 100644
--- a/drv/fb/fb24_32.c
+++ b/drv/fb/fb24_32.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include "fb.h"
+#include "drvfb.h"
 
 /* X apps don't like 24bpp images, this code exposes 32bpp images */
 
@@ -266,7 +266,7 @@ fb24_32BltUp (CARD8	    *srcLine,
  * Spans functions; probably unused.
  */
 void
-fb24_32GetSpans(PixmapPtr	pDrawable, 
+fb24_32GetSpans(DrvPixmapPtr	pDrawable, 
 		int		wMax, 
 		DDXPointPtr	ppt, 
 		int		*pwidth, 
@@ -309,7 +309,7 @@ fb24_32GetSpans(PixmapPtr	pDrawable,
 }
 
 void
-fb24_32SetSpans (PixmapPtr	    pDrawable,
+fb24_32SetSpans (DrvPixmapPtr	    pDrawable,
 		 DrvGCPtr		    pGC,
 		 char		    *src,
 		 DDXPointPtr	    ppt,
@@ -375,7 +375,7 @@ fb24_32SetSpans (PixmapPtr	    pDrawable,
  * Clip and put 32bpp Z-format images to a 24bpp drawable
  */
 void
-fb24_32PutZImage (PixmapPtr	pDrawable,
+fb24_32PutZImage (DrvPixmapPtr	pDrawable,
 		  RegionPtr	pClip,
 		  int		alu,
 		  FbBits	pm,
@@ -437,7 +437,7 @@ fb24_32PutZImage (PixmapPtr	pDrawable,
 }
 
 void
-fb24_32GetImage (PixmapPtr     pDrawable,
+fb24_32GetImage (DrvPixmapPtr     pDrawable,
 		 int             x,
 		 int             y,
 		 int             w,
@@ -470,8 +470,8 @@ fb24_32GetImage (PixmapPtr     pDrawable,
 }
 
 void
-fb24_32CopyMtoN (PixmapPtr pSrcDrawable,
-		 PixmapPtr pDstDrawable,
+fb24_32CopyMtoN (DrvPixmapPtr pSrcDrawable,
+		 DrvPixmapPtr pDstDrawable,
 		 DrvGCPtr       pGC,
 		 BoxPtr      pbox,
 		 int         nbox,
@@ -528,11 +528,11 @@ fb24_32CopyMtoN (PixmapPtr pSrcDrawable,
     fbFinishAccess (pDstDrawable);
 }
 
-PixmapPtr
-fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
+DrvPixmapPtr
+fb24_32ReformatTile(DrvPixmapPtr pOldTile, int bitsPerPixel)
 {
-    ScreenPtr	pScreen = pOldTile->pScreen;
-    PixmapPtr	pNewTile;
+    DrvScreenPtr	pDrvScreen = pOldTile->pDrvScreen;
+    DrvPixmapPtr	pNewTile;
     FbBits	*old, *new;
     FbStride	oldStride, newStride;
     int		oldBpp, newBpp;
@@ -540,7 +540,7 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
     int		oldXoff, oldYoff;
     int		newXoff, newYoff;
 
-    pNewTile = pScreen->gpu.CreatePixmap(pScreen, pOldTile->width,
+    pNewTile = pDrvScreen->CreatePixmap(pDrvScreen, pOldTile->width,
 					 pOldTile->height,
 					 pOldTile->depth,
 					 pOldTile->usage_hint, NULL);
@@ -593,7 +593,7 @@ fb24_32CreateScreenResources(ScreenPtr pScreen)
 
     if((retval = miCreateScreenResources(pScreen))) {
 	/* fix the screen pixmap */
-	PixmapPtr pPix = (PixmapPtr)pScreen->devPrivate;
+	DrvPixmapPtr pPix = (DrvPixmapPtr)pScreen->devPrivate;
 	pPix->bitsPerPixel = 24;
 	pPix->devKind = pitch;
     }
@@ -602,7 +602,7 @@ fb24_32CreateScreenResources(ScreenPtr pScreen)
 }
 
 Bool
-fb24_32ModifyPixmapHeader (PixmapPtr   pPixmap,
+fb24_32ModifyPixmapHeader (DrvPixmapPtr   pPixmap,
 			   int         width,
 			   int         height,
 			   int         depth,
diff --git a/drv/fb/fballpriv.c b/drv/fb/fballpriv.c
index ab3ca5165..83e9193f4 100644
--- a/drv/fb/fballpriv.c
+++ b/drv/fb/fballpriv.c
@@ -24,7 +24,7 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 static DevPrivateKeyRec fbScreenPrivateKeyRec;
 DevPrivateKey
@@ -35,14 +35,14 @@ DevPrivateKey
 fbGetGCPrivateKey (void) { return &fbGCPrivateKeyRec; }
 
 Bool
-fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey)
+fbAllocatePrivates(DrvScreenPtr pScreen, DevPrivateKey *pGCKey)
 {
     if (pGCKey)
 	*pGCKey = &fbGCPrivateKeyRec;
     
     if (!dixRegisterPrivateKey(&fbGCPrivateKeyRec, PRIVATE_DRV_GC, sizeof(FbGCPrivRec)))
 	return FALSE;
-    if (!dixRegisterPrivateKey(&fbScreenPrivateKeyRec, PRIVATE_SCREEN, sizeof (FbScreenPrivRec)))
+    if (!dixRegisterPrivateKey(&fbScreenPrivateKeyRec, PRIVATE_DRV_SCREEN, sizeof (FbScreenPrivRec)))
 	return FALSE;
 
     return TRUE;
diff --git a/drv/fb/fbarc.c b/drv/fb/fbarc.c
index 9831953c7..1cca33660 100644
--- a/drv/fb/fbarc.c
+++ b/drv/fb/fbarc.c
@@ -24,7 +24,7 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 #include "drvzerarc.h"
 #include <limits.h>
 
@@ -38,7 +38,7 @@ typedef void	(*FbArc) (FbBits    *dst,
 			  FbBits    xor);
 
 void
-fbPolyArc (PixmapPtr	pPixmap,
+fbPolyArc (DrvPixmapPtr	pPixmap,
 	   DrvGCPtr	pGC,
 	   int		narcs,
 	   xArc		*parcs)
diff --git a/drv/fb/fbbits.c b/drv/fb/fbbits.c
index 565b9c1b9..f0c0a2fa2 100644
--- a/drv/fb/fbbits.c
+++ b/drv/fb/fbbits.c
@@ -24,7 +24,7 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 #include "drvline.h"
 #include "drvzerarc.h"
 
diff --git a/drv/fb/fbbits.h b/drv/fb/fbbits.h
index 249879dc7..2e0e5d322 100644
--- a/drv/fb/fbbits.h
+++ b/drv/fb/fbbits.h
@@ -68,7 +68,7 @@
 
 #ifdef BRESSOLID
 void
-BRESSOLID (PixmapPtr	pPixmap,
+BRESSOLID (DrvPixmapPtr	pPixmap,
 	   DrvGCPtr	pGC,
 	   int		dashOffset,
 	   int		signdx,
@@ -124,7 +124,7 @@ BRESSOLID (PixmapPtr	pPixmap,
 
 #ifdef BRESDASH
 void
-BRESDASH (PixmapPtr	pPixmap,
+BRESDASH (DrvPixmapPtr	pPixmap,
 	  DrvGCPtr		pGC,
 	  int		dashOffset,
 	  int		signdx,
@@ -660,7 +660,7 @@ GLYPH (FbBits	*dstBits,
 
 #ifdef POLYLINE
 void
-POLYLINE (PixmapPtr	pPixmap,
+POLYLINE (DrvPixmapPtr	pPixmap,
 	  DrvGCPtr		pGC,
 	  int		mode,
 	  int		npt,
@@ -669,7 +669,7 @@ POLYLINE (PixmapPtr	pPixmap,
     INT32	    *pts = (INT32 *) ptsOrig;
     int		    xoff = 0;
     int		    yoff = 0;
-    unsigned int    bias = drvGetZeroLineBias(pPixmap->pScreen);
+    unsigned int    bias = drvGetZeroLineBias(pPixmap->pDrvScreen);
     BoxPtr	    pBox = RegionExtents(fbGetCompositeClip (pGC));
     
     FbBits	    *dst;
@@ -798,7 +798,7 @@ POLYLINE (PixmapPtr	pPixmap,
 
 #ifdef POLYSEGMENT
 void
-POLYSEGMENT (PixmapPtr    pPixmap,
+POLYSEGMENT (DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     int	    nseg,
 	     xSegment	    *pseg)
@@ -806,7 +806,7 @@ POLYSEGMENT (PixmapPtr    pPixmap,
     INT32	    *pts = (INT32 *) pseg;
     int		    xoff = 0;
     int		    yoff = 0;
-    unsigned int    bias = drvGetZeroLineBias(pPixmap->pScreen);
+    unsigned int    bias = drvGetZeroLineBias(pPixmap->pDrvScreen);
     BoxPtr	    pBox = RegionExtents(fbGetCompositeClip (pGC));
     
     FbBits	    *dst;
diff --git a/drv/fb/fbblt.c b/drv/fb/fbblt.c
index a0402986c..2bd9bd055 100644
--- a/drv/fb/fbblt.c
+++ b/drv/fb/fbblt.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <string.h>
-#include "fb.h"
+#include "drvfb.h"
 
 #define InitializeShifts(sx,dx,ls,rs) { \
     if (sx != dx) { \
diff --git a/drv/fb/fbbltone.c b/drv/fb/fbbltone.c
index 629b13a0e..b2934326b 100644
--- a/drv/fb/fbbltone.c
+++ b/drv/fb/fbbltone.c
@@ -24,7 +24,7 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 /*
  *  Example: srcX = 13 dstX = 8	(FB unit 32 dstBpp 8)
diff --git a/drv/fb/fbcopy.c b/drv/fb/fbcopy.c
index 4dbba78f5..53e7dd384 100644
--- a/drv/fb/fbcopy.c
+++ b/drv/fb/fbcopy.c
@@ -26,11 +26,11 @@
 
 #include <stdlib.h>
 
-#include "fb.h"
+#include "drvfb.h"
 
 void
-fbCopyNtoN (PixmapPtr	pSrcPixmap,
-	    PixmapPtr	pDstPixmap,
+fbCopyNtoN (DrvPixmapPtr	pSrcPixmap,
+	    DrvPixmapPtr	pDstPixmap,
 	    DrvGCPtr	pGC,
 	    BoxPtr	pbox,
 	    int		nbox,
@@ -101,8 +101,8 @@ fbCopyNtoN (PixmapPtr	pSrcPixmap,
 }
 
 void
-fbCopy1toN (PixmapPtr	pSrcPixmap,
-	    PixmapPtr	pDstPixmap,
+fbCopy1toN (DrvPixmapPtr	pSrcPixmap,
+	    DrvPixmapPtr	pDstPixmap,
 	    DrvGCPtr	pGC,
 	    BoxPtr	pbox,
 	    int		nbox,
@@ -174,8 +174,8 @@ fbCopy1toN (PixmapPtr	pSrcPixmap,
 }
 
 void
-fbCopyNto1 (PixmapPtr	pSrcPixmap,
-	    PixmapPtr	pDstPixmap,
+fbCopyNto1 (DrvPixmapPtr	pSrcPixmap,
+	    DrvPixmapPtr	pDstPixmap,
 	    DrvGCPtr	pGC,
 	    BoxPtr	pbox,
 	    int		nbox,
@@ -290,8 +290,8 @@ fbCopyNto1 (PixmapPtr	pSrcPixmap,
 }
 
 drvCopyProc
-fbGetCopyAreaFunction(PixmapPtr pSrc,
-		      PixmapPtr pDst)
+fbGetCopyAreaFunction(DrvPixmapPtr pSrc,
+		      DrvPixmapPtr pDst)
 {
     if (pSrc->bitsPerPixel != pDst->bitsPerPixel)
 	return fb24_32CopyMtoN;
@@ -300,8 +300,8 @@ fbGetCopyAreaFunction(PixmapPtr pSrc,
 }
 
 drvCopyProc
-fbGetCopyPlaneFunction(PixmapPtr pSrc,
-		       PixmapPtr pDst, int bitplane)
+fbGetCopyPlaneFunction(DrvPixmapPtr pSrc,
+		       DrvPixmapPtr pDst, int bitplane)
 {
     if (pSrc->bitsPerPixel > 1)
 	return fbCopyNto1;
diff --git a/drv/fb/fbfill.c b/drv/fb/fbfill.c
index e7931829f..1cc25bbc2 100644
--- a/drv/fb/fbfill.c
+++ b/drv/fb/fbfill.c
@@ -24,10 +24,10 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 void
-fbFill (PixmapPtr pPixmap,
+fbFill (DrvPixmapPtr pPixmap,
 	DrvGCPtr	    pGC,
 	int	    x,
 	int	    y,
@@ -60,7 +60,7 @@ fbFill (PixmapPtr pPixmap,
 	break;
     case FillStippled:
     case FillOpaqueStippled: {
-        PixmapPtr   pStip = pGC->stipple;
+        DrvPixmapPtr   pStip = pGC->stipple;
 	int	    stipWidth = pStip->width;
 	int	    stipHeight = pStip->height;
 	
@@ -134,7 +134,7 @@ fbFill (PixmapPtr pPixmap,
 	break;
     }
     case FillTiled: {
-        PixmapPtr   pTile = pGC->tile.pixmap;
+        DrvPixmapPtr   pTile = pGC->tile.pixmap;
 	FbBits	    *tile;
 	FbStride    tileStride;
 	int	    tileBpp;
@@ -167,7 +167,7 @@ fbFill (PixmapPtr pPixmap,
 }
 
 void
-fbSolidBoxClipped (PixmapPtr	pPixmap,
+fbSolidBoxClipped (DrvPixmapPtr	pPixmap,
 		   RegionPtr	pClip,
 		   int		x1,
 		   int		y1,
diff --git a/drv/fb/fbfillrect.c b/drv/fb/fbfillrect.c
index 8b5be6852..8dab837db 100644
--- a/drv/fb/fbfillrect.c
+++ b/drv/fb/fbfillrect.c
@@ -24,10 +24,10 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 void
-fbPolyFillRect(PixmapPtr  pPixmap, 
+fbPolyFillRect(DrvPixmapPtr  pPixmap, 
 	       DrvGCPtr	    pGC, 
 	       int	    nrect,
 	       xRectangle   *prect)
diff --git a/drv/fb/fbfillsp.c b/drv/fb/fbfillsp.c
index b0657d81d..75eccafc7 100644
--- a/drv/fb/fbfillsp.c
+++ b/drv/fb/fbfillsp.c
@@ -24,10 +24,10 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 void
-fbFillSpans (PixmapPtr    pPixmap,
+fbFillSpans (DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     int	    n,
 	     DDXPointPtr    ppt,
diff --git a/drv/fb/fbgc.c b/drv/fb/fbgc.c
index 8d1aa0aeb..142541f35 100644
--- a/drv/fb/fbgc.c
+++ b/drv/fb/fbgc.c
@@ -26,11 +26,11 @@
 
 #include <stdlib.h>
 
-#include "fb.h"
-#include "imped.h"
+#include "drvfb.h"
+//#include "imped.h"
 
 
-const GCOps	fbGCOps = {
+const DrvGCOps	fbGCOps = {
     fbFillSpans,
     fbSetSpans,
     fbPutImage,
@@ -57,7 +57,7 @@ const GCOps	fbGCOps = {
 Bool
 fbCreateGC(DrvGCPtr pGC)
 {
-    pGC->ops = (GCOps *) &fbGCOps;
+    pGC->ops = (DrvGCOps *) &fbGCOps;
     fbGetGCPrivate(pGC)->bpp = BitsPerPixel (pGC->depth);
     return TRUE;
 }
@@ -66,7 +66,7 @@ fbCreateGC(DrvGCPtr pGC)
  * Pad pixmap to FB_UNIT bits wide
  */
 void
-fbPadPixmap (PixmapPtr pPixmap)
+fbPadPixmap (DrvPixmapPtr pPixmap)
 {
     int	    width;
     FbBits  *bits;
@@ -144,7 +144,7 @@ fbLineRepeat (FbBits *bits, int len, int width)
  * each scanline to represent the entire stipple
  */
 static Bool
-fbCanEvenStipple (PixmapPtr pStipple, int bpp)
+fbCanEvenStipple (DrvPixmapPtr pStipple, int bpp)
 {
     int	    len = FB_UNIT / bpp;
     FbBits  *bits;
@@ -175,7 +175,7 @@ fbCanEvenStipple (PixmapPtr pStipple, int bpp)
 }
 
 void
-fbValidateGC(DrvGCPtr pGC, unsigned long changes, PixmapPtr pPixmap)
+fbValidateGC(DrvGCPtr pGC, unsigned long changes, DrvPixmapPtr pPixmap)
 {
     FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);
     FbBits	mask;
@@ -187,13 +187,13 @@ fbValidateGC(DrvGCPtr pGC, unsigned long changes, PixmapPtr pPixmap)
     }
     if ((changes & GCTile) && fbGetRotatedPixmap(pGC))
     {
-	(*pGC->pScreen->gpu.DestroyPixmap) (fbGetRotatedPixmap(pGC));
+	(*pGC->pDrvScreen->DestroyPixmap) (fbGetRotatedPixmap(pGC));
 	fbGetRotatedPixmap(pGC) = 0;
     }
 	
     if (pGC->fillStyle == FillTiled)
     {
-	PixmapPtr	pOldTile, pNewTile;
+	DrvPixmapPtr	pOldTile, pNewTile;
 
 	pOldTile = pGC->tile.pixmap;
 	if (pOldTile->bitsPerPixel != pPixmap->bitsPerPixel)
@@ -202,7 +202,7 @@ fbValidateGC(DrvGCPtr pGC, unsigned long changes, PixmapPtr pPixmap)
 	    if (!pNewTile || pNewTile ->bitsPerPixel != pPixmap->bitsPerPixel)
 	    {
 		if (pNewTile)
-		    (*pGC->pScreen->gpu.DestroyPixmap) (pNewTile);
+		    (*pGC->pDrvScreen->DestroyPixmap) (pNewTile);
 		pNewTile = fb24_32ReformatTile (pOldTile, pPixmap->bitsPerPixel);
 	    }
 	    if (pNewTile)
diff --git a/drv/fb/fbgetsp.c b/drv/fb/fbgetsp.c
index 24bfe330f..ddb25fd09 100644
--- a/drv/fb/fbgetsp.c
+++ b/drv/fb/fbgetsp.c
@@ -24,10 +24,10 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 void
-fbGetSpans(PixmapPtr	pPixmap, 
+fbGetSpans(DrvPixmapPtr	pPixmap, 
 	   int		wMax, 
 	   DDXPointPtr	ppt, 
 	   int		*pwidth, 
diff --git a/drv/fb/fbglyph.c b/drv/fb/fbglyph.c
index 81a08ba82..6a751002d 100644
--- a/drv/fb/fbglyph.c
+++ b/drv/fb/fbglyph.c
@@ -25,7 +25,7 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 #include	<X11/fonts/fontstruct.h>
 #include	"dixfontstr.h"
 
@@ -248,7 +248,7 @@ fbGlyph24 (FbBits   *dstBits,
 }
 
 void
-fbPolyGlyphBlt (PixmapPtr	pPixmap,
+fbPolyGlyphBlt (DrvPixmapPtr	pPixmap,
 		DrvGCPtr		pGC,
 		int		x, 
 		int		y,
@@ -330,7 +330,7 @@ fbPolyGlyphBlt (PixmapPtr	pPixmap,
 
 
 void
-fbImageGlyphBlt (PixmapPtr	pPixmap,
+fbImageGlyphBlt (DrvPixmapPtr	pPixmap,
 		 DrvGCPtr		pGC,
 		 int		x, 
 		 int		y,
diff --git a/drv/fb/fbimage.c b/drv/fb/fbimage.c
index 8407b6feb..a002dab0a 100644
--- a/drv/fb/fbimage.c
+++ b/drv/fb/fbimage.c
@@ -26,10 +26,10 @@
 
 #include <string.h>
 
-#include "fb.h"
+#include "drvfb.h"
 
 void
-fbPutImage (PixmapPtr	pPixmap,
+fbPutImage (DrvPixmapPtr	pPixmap,
 	    DrvGCPtr	pGC,
 	    int		depth,
 	    int		x,
@@ -108,7 +108,7 @@ fbPutImage (PixmapPtr	pPixmap,
 }
 
 void
-fbPutZImage (PixmapPtr	pPixmap,
+fbPutZImage (DrvPixmapPtr	pPixmap,
 	     RegionPtr		pClip,
 	     int		alu,
 	     FbBits		pm,
@@ -168,7 +168,7 @@ fbPutZImage (PixmapPtr	pPixmap,
 }
 	     
 void
-fbPutXYImage (PixmapPtr	pPixmap,
+fbPutXYImage (DrvPixmapPtr	pPixmap,
 	      RegionPtr		pClip,
 	      FbBits		fg,
 	      FbBits		bg,
@@ -277,7 +277,7 @@ fbPutXYImage (PixmapPtr	pPixmap,
 }
 
 void
-fbGetImage (PixmapPtr	    pPixmap,
+fbGetImage (DrvPixmapPtr	    pPixmap,
 	    int		    x,
 	    int		    y,
 	    int		    w,
diff --git a/drv/fb/fbline.c b/drv/fb/fbline.c
index 79ca8f2aa..1d0abcd99 100644
--- a/drv/fb/fbline.c
+++ b/drv/fb/fbline.c
@@ -24,10 +24,10 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 void
-fbZeroLine (PixmapPtr	pPixmap,
+fbZeroLine (DrvPixmapPtr	pPixmap,
 	    DrvGCPtr	pGC,
 	    int		mode,
 	    int		npt,
@@ -62,7 +62,7 @@ fbZeroLine (PixmapPtr	pPixmap,
 }
 
 void
-fbZeroSegment (PixmapPtr  pPixmap,
+fbZeroSegment (DrvPixmapPtr  pPixmap,
 	       DrvGCPtr	    pGC,
 	       int	    nseg,
 	       xSegment	    *pSegs)
@@ -103,13 +103,13 @@ fbFixCoordModePrevious (int	    npt,
 }
 
 void
-fbPolyLine (PixmapPtr	pPixmap,
+fbPolyLine (DrvPixmapPtr	pPixmap,
 	    DrvGCPtr	pGC,
 	    int		mode,
 	    int		npt,
 	    DDXPointPtr	ppt)
 {
-    void	(*line) (PixmapPtr, DrvGCPtr, int mode, int npt, DDXPointPtr ppt);
+    void	(*line) (DrvPixmapPtr, DrvGCPtr, int mode, int npt, DDXPointPtr ppt);
     
     if (pGC->lineWidth == 0)
     {
@@ -137,12 +137,12 @@ fbPolyLine (PixmapPtr	pPixmap,
 }
 
 void
-fbPolySegment (PixmapPtr  pPixmap,
+fbPolySegment (DrvPixmapPtr  pPixmap,
 	       DrvGCPtr	    pGC,
 	       int	    nseg,
 	       xSegment	    *pseg)
 {
-    void    (*seg) (PixmapPtr pPixmap, DrvGCPtr pGC, int nseg, xSegment *pseg);
+    void    (*seg) (DrvPixmapPtr pPixmap, DrvGCPtr pGC, int nseg, xSegment *pseg);
 
     if (pGC->lineWidth == 0)
     {
diff --git a/drv/fb/fboverlay.c b/drv/fb/fboverlay.c
index 93edffecb..b705648fc 100644
--- a/drv/fb/fboverlay.c
+++ b/drv/fb/fboverlay.c
@@ -29,8 +29,8 @@
 
 #include <stdlib.h>
 
-#include "fb.h"
-#include "fboverlay.h"
+#include "drvfb.h"
+#include "drvfboverlay.h"
 #include "shmint.h"
 
 static DevPrivateKeyRec fbOverlayScreenPrivateKeyRec;
@@ -50,7 +50,7 @@ fbOverlayCreateWindow(WindowPtr pWin)
 {
     FbOverlayScrPrivPtr	pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);
     int			i;
-    PixmapPtr		pPixmap;
+    DrvPixmapPtr		pPixmap;
     
     if (pWin->drawable.class != InputOutput)
 	return TRUE;
@@ -116,7 +116,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen)
 {
     int			i;
     FbOverlayScrPrivPtr	pScrPriv = fbOverlayGetScrPriv(pScreen);
-    PixmapPtr		pPixmap;
+    DrvPixmapPtr		pPixmap;
     pointer		pbits;
     int			width;
     int			depth;
@@ -216,7 +216,7 @@ fbOverlayCopyWindow(WindowPtr	pWin,
     int			dx, dy;
     int			i;
     RegionRec		layerRgn[FB_OVERLAY_MAX];
-    PixmapPtr		pPixmap;
+    DrvPixmapPtr		pPixmap;
 
     dx = ptOldOrg.x - pWin->drawable.x;
     dy = ptOldOrg.y - pWin->drawable.y;
@@ -305,7 +305,7 @@ fb24_32OverlayCreateScreenResources(ScreenPtr pScreen)
 	for (i = 0; i < pScrPriv->nlayers; i++)
 	{
 	    /* fix the screen pixmap */
-	    PixmapPtr pPix = (PixmapPtr) pScrPriv->layer[i].u.run.pixmap;
+	    DrvPixmapPtr pPix = (DrvPixmapPtr) pScrPriv->layer[i].u.run.pixmap;
 	    if (pPix->bitsPerPixel == 32) {
 		pPix->bitsPerPixel = 24;
 		pitch = BitmapBytePad(pPix->width * 24);
diff --git a/drv/fb/fbpict.c b/drv/fb/fbpict.c
index d548cff58..79e65fdc0 100644
--- a/drv/fb/fbpict.c
+++ b/drv/fb/fbpict.c
@@ -29,12 +29,12 @@
 
 #include <string.h>
 
-#include "fb.h"
+#include "drvfb.h"
 
 #include "drv_picturestr.h"
 #include "mipict.h"
-#include "fbpict.h"
-#include "impedpict.h"
+#include "drv_fbpict.h"
+//#include "impedpict.h"
 
 void
 fbComposite (CARD8      op,
@@ -347,21 +347,20 @@ free_pixman_pict (DrvPicturePtr pict, pixman_image_t *image)
 }
 
 Bool
-fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
+fbPictureInit (DrvScreenPtr pScreen, PictFormatPtr formats, int nformats)
 {
+    DrvPictureScreenPtr    ps;
 
-    PictureScreenPtr    ps;
-
-    if (!impedPictureInit (pScreen, formats, nformats))
-        return FALSE;
+    //    if (!impedPictureInit (pScreen, formats, nformats))
+    //        return FALSE;
 
     ps = GetPictureScreen(pScreen);
-    ps->gpu.Composite = fbComposite;
-    ps->gpu.RasterizeTrapezoid = fbRasterizeTrapezoid;
-    ps->gpu.Trapezoids = fbTrapezoids;
-    ps->gpu.AddTraps = fbAddTraps;
-    ps->gpu.AddTriangles = fbAddTriangles;
-    ps->gpu.Triangles = fbTriangles;
-    ps->gpu.Glyphs = DrvGlyphs;
+    ps->Composite = fbComposite;
+    ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
+    ps->Trapezoids = fbTrapezoids;
+    ps->AddTraps = fbAddTraps;
+    ps->AddTriangles = fbAddTriangles;
+    ps->Triangles = fbTriangles;
+    ps->Glyphs = DrvGlyphs;
     return TRUE;
 }
diff --git a/drv/fb/fbpixmap.c b/drv/fb/fbpixmap.c
index bba18553c..7d01bc826 100644
--- a/drv/fb/fbpixmap.c
+++ b/drv/fb/fbpixmap.c
@@ -26,13 +26,13 @@
 
 #include <stdlib.h>
 
-#include "fb.h"
+#include "drvfb.h"
 
-PixmapPtr
-fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
-		   unsigned usage_hint, ProtoPixmapPtr parent)
+DrvPixmapPtr
+fbCreatePixmapBpp (DrvScreenPtr pDrvScreen, int width, int height, int depth, int bpp,
+		   unsigned usage_hint, PixmapPtr parent)
 {
-    PixmapPtr	pPixmap;
+    DrvPixmapPtr	pPixmap;
     size_t	datasize;
     size_t	paddedWidth;
     int		adjust;
@@ -40,9 +40,9 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
 
     paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits);
     if (paddedWidth / 4 > 32767 || height > 32767)
-	return NullPixmap;
+	return NullDrvPixmap;
     datasize = height * paddedWidth;
-    base = pScreen->totalPixmapSize;
+    base = pDrvScreen->pScreen->totalPixmapSize;
     adjust = 0;
     if (base & 7)
 	adjust = 8 - (base & 7);
@@ -50,12 +50,12 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
 #ifdef FB_DEBUG
     datasize += 2 * paddedWidth;
 #endif
-    pPixmap = AllocatePixmap(pScreen, datasize);
+    pPixmap = DrvAllocatePixmap(pDrvScreen, datasize);
     if (!pPixmap)
-	return NullPixmap;
+	return NullDrvPixmap;
     pPixmap->type = DRAWABLE_PIXMAP;
     pPixmap->class = 0;
-    pPixmap->pScreen = pScreen;
+    pPixmap->pDrvScreen = pDrvScreen;
     pPixmap->depth = depth;
     pPixmap->bitsPerPixel = bpp;
     //    pPixmap->id = 0;
@@ -78,23 +78,23 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
     return pPixmap;
 }
 
-PixmapPtr
-fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
-		unsigned usage_hint, ProtoPixmapPtr parent)
+DrvPixmapPtr
+fbCreatePixmap (DrvScreenPtr pDrvScreen, int width, int height, int depth,
+		unsigned usage_hint, PixmapPtr parent)
 {
     int	bpp;
     bpp = BitsPerPixel (depth);
     if (bpp == 32 && depth <= 24)
-	bpp = fbGetScreenPrivate(pScreen)->pix32bpp;
-    return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, usage_hint, parent);
+	bpp = fbGetScreenPrivate(pDrvScreen)->pix32bpp;
+    return fbCreatePixmapBpp (pDrvScreen, width, height, depth, bpp, usage_hint, parent);
 }
 
 Bool
-fbDestroyPixmap (PixmapPtr pPixmap)
+fbDestroyPixmap (DrvPixmapPtr pPixmap)
 {
     if(--pPixmap->refcnt)
 	return TRUE;
-    FreePixmap(pPixmap);
+    DrvFreePixmap(pPixmap);
     return TRUE;
 }
 
@@ -131,7 +131,7 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&			\
  * at the same X coordinates.
  */
 RegionPtr
-fbPixmapToRegion(PixmapPtr pPix)
+fbPixmapToRegion(DrvPixmapPtr pPix)
 {
     register RegionPtr	pReg;
     FbBits		*pw, w;
diff --git a/drv/fb/fbpoint.c b/drv/fb/fbpoint.c
index 4c7183175..32a9f2f76 100644
--- a/drv/fb/fbpoint.c
+++ b/drv/fb/fbpoint.c
@@ -24,7 +24,7 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 typedef void	(*FbDots)  (FbBits	*dst,
 			    FbStride    dstStride,
@@ -106,7 +106,7 @@ fbDots (FbBits	    *dstOrig,
 }
 
 void
-fbPolyPoint (PixmapPtr    pPixmap,
+fbPolyPoint (DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     int	    mode,
 	     int	    nptInit,
diff --git a/drv/fb/fbpush.c b/drv/fb/fbpush.c
index 8d17d1054..bc57013f9 100644
--- a/drv/fb/fbpush.c
+++ b/drv/fb/fbpush.c
@@ -24,10 +24,10 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 void
-fbPushPattern (PixmapPtr  pPixmap,
+fbPushPattern (DrvPixmapPtr  pPixmap,
 	       DrvGCPtr	    pGC,
 	       
 	       FbStip	    *src,
@@ -101,7 +101,7 @@ fbPushPattern (PixmapPtr  pPixmap,
 }
 
 void
-fbPushFill (PixmapPtr	pPixmap,
+fbPushFill (DrvPixmapPtr	pPixmap,
 	    DrvGCPtr	pGC,
 
 	    FbStip	*src,
@@ -173,7 +173,7 @@ fbPushFill (PixmapPtr	pPixmap,
 }
 	    
 void
-fbPushImage (PixmapPtr    pPixmap,
+fbPushImage (DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     
 	     FbStip	    *src,
@@ -225,8 +225,8 @@ fbPushImage (PixmapPtr    pPixmap,
 	     
 void
 fbPushPixels (DrvGCPtr	    pGC,
-	      PixmapPtr	    pBitmap,
-	      PixmapPtr   pPixmap,
+	      DrvPixmapPtr	    pBitmap,
+	      DrvPixmapPtr   pPixmap,
 	      int	    dx,
 	      int	    dy,
 	      int	    xOrg,
diff --git a/drv/fb/fbscreen.c b/drv/fb/fbscreen.c
index 5b5b93a5a..030b3b522 100644
--- a/drv/fb/fbscreen.c
+++ b/drv/fb/fbscreen.c
@@ -24,36 +24,36 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
-#include "imped.h"
+#include "drvfb.h"
+//#include "imped.h"
 
 Bool
-fbCloseScreen (int index, ScreenPtr pScreen)
+fbCloseScreen (int index, DrvScreenPtr pScreen)
 {
     int	    d;
-    DepthPtr	depths = pScreen->allowedDepths;
+    //    DepthPtr	depths = pScreen->allowedDepths;
 
-    for (d = 0; d < pScreen->numDepths; d++)
-	free(depths[d].vids);
-    free(depths);
-    free(pScreen->visuals);
-    free(pScreen->devPrivate);
+    //    for (d = 0; d < pScreen->numDepths; d++)
+    //	free(depths[d].vids);
+    //  free(depths);
+    //    free(pScreen->visuals);
+    //    free(pScreen->devPrivate);
     return TRUE;
 }
 
 void
 fbQueryBestSize (int class, 
 		 unsigned short *width, unsigned short *height,
-		 ScreenPtr pScreen)
+		 DrvScreenPtr pScreen)
 {
     unsigned short  w;
     
     switch (class) {
     case CursorShape:
-	if (*width > pScreen->width)
-	    *width = pScreen->width;
-	if (*height > pScreen->height)
-	    *height = pScreen->height;
+	if (*width > pScreen->pScreen->width)
+	    *width = pScreen->pScreen->width;
+	if (*height > pScreen->pScreen->height)
+	    *height = pScreen->pScreen->height;
 	break;
     case TileShape:
     case StippleShape:
@@ -68,7 +68,7 @@ fbQueryBestSize (int class,
 }
 
 Bool
-fbSetupScreen(ScreenPtr	pScreen, 
+fbSetupScreen(DrvScreenPtr	pScreen, 
 	      pointer	pbits,		/* pointer to screen bitmap */
 	      int	xsize, 		/* in pixels */
 	      int	ysize,
@@ -79,26 +79,26 @@ fbSetupScreen(ScreenPtr	pScreen,
 {
     if (!fbAllocatePrivates(pScreen, NULL))
 	return FALSE;
-    pScreen->defColormap = FakeClientID(0);
+    //    pScreen->defColormap = FakeClientID(0);
     /* let CreateDefColormap do whatever it wants for pixels */ 
-    pScreen->blackPixel = pScreen->whitePixel = (Pixel) 0;
+    //    pScreen->blackPixel = pScreen->whitePixel = (Pixel) 0;
     /* SaveScreen */
 
-    pScreen->gpu.PixmapToRegion = fbPixmapToRegion;
+    pScreen->PixmapToRegion = fbPixmapToRegion;
 
-    pScreen->gpu.CreateGC = fbCreateGC;
+    pScreen->CreateGC = fbCreateGC;
 
-    pScreen->gpu.QueryBestSize = fbQueryBestSize;
+    pScreen->QueryBestSize = fbQueryBestSize;
     
-    pScreen->gpu.GetCopyAreaFunction = fbGetCopyAreaFunction;
-    pScreen->gpu.GetCopyPlaneFunction = fbGetCopyPlaneFunction;
+    pScreen->GetCopyAreaFunction = fbGetCopyAreaFunction;
+    pScreen->GetCopyPlaneFunction = fbGetCopyPlaneFunction;
 
-    pScreen->gpu.PixmapWindowFixup = fbPixmapWindowFixup;
-    pScreen->gpu.GetImage = fbGetImage;
-    pScreen->gpu.GetSpans = fbGetSpans;
-    pScreen->gpu.CreatePixmap = fbCreatePixmap;
-    pScreen->gpu.DestroyPixmap = fbDestroyPixmap;
-    pScreen->gpu.ModifyPixmapHeader = drvModifyPixmapHeader;
+    pScreen->PixmapWindowFixup = fbPixmapWindowFixup;
+    pScreen->GetImage = fbGetImage;
+    pScreen->GetSpans = fbGetSpans;
+    pScreen->CreatePixmap = fbCreatePixmap;
+    pScreen->DestroyPixmap = fbDestroyPixmap;
+    pScreen->ModifyPixmapHeader = drvModifyPixmapHeader;
 
     if (!impedScreenInit(pScreen))
         return FALSE;
@@ -107,7 +107,7 @@ fbSetupScreen(ScreenPtr	pScreen,
 
 #ifdef FB_ACCESS_WRAPPER
 Bool
-wfbFinishScreenInit(ScreenPtr		pScreen,
+wfbFinishScreenInit(DrvScreenPtr		pScreen,
 		    pointer		pbits,
 		    int			xsize,
 		    int			ysize,
@@ -119,7 +119,7 @@ wfbFinishScreenInit(ScreenPtr		pScreen,
 		    FinishWrapProcPtr	finishWrap)
 #else
 Bool
-fbFinishScreenInit(ScreenPtr	pScreen,
+fbFinishScreenInit(DrvScreenPtr	pScreen,
 		   pointer	pbits,
 		   int		xsize,
 		   int		ysize,
@@ -200,11 +200,11 @@ fbFinishScreenInit(ScreenPtr	pScreen,
 			defaultVisual, nvisuals, visuals))
 	return FALSE;
     /* overwrite miCloseScreen with our own */
-    pScreen->gpu.CloseScreen = fbCloseScreen;
+    pScreen->CloseScreen = fbCloseScreen;
     if (bpp == 24 && imagebpp == 32)
     {
-	pScreen->gpu.ModifyPixmapHeader = fb24_32ModifyPixmapHeader;
-	pScreen->CreateScreenResources = fb24_32CreateScreenResources;
+	pScreen->ModifyPixmapHeader = fb24_32ModifyPixmapHeader;
+	//	pScreen->CreateScreenResources = fb24_32CreateScreenResources;
     }
     return TRUE;
 }
@@ -212,7 +212,7 @@ fbFinishScreenInit(ScreenPtr	pScreen,
 /* dts * (inch/dot) * (25.4 mm / inch) = mm */
 #ifdef FB_ACCESS_WRAPPER
 Bool
-wfbScreenInit(ScreenPtr		pScreen,
+wfbScreenInit(DrvScreenPtr		pScreen,
 	      pointer		pbits,
 	      int		xsize,
 	      int		ysize,
@@ -232,7 +232,7 @@ wfbScreenInit(ScreenPtr		pScreen,
 }
 #else
 Bool
-fbScreenInit(ScreenPtr	pScreen,
+fbScreenInit(DrvScreenPtr	pScreen,
 	     pointer	pbits,
 	     int	xsize,
 	     int	ysize,
diff --git a/drv/fb/fbseg.c b/drv/fb/fbseg.c
index b82607895..4c65af5e9 100644
--- a/drv/fb/fbseg.c
+++ b/drv/fb/fbseg.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include "fb.h"
+#include "drvfb.h"
 #include "drvline.h"
 
 #define fbBresShiftMask(mask,dir,bpp) ((bpp == FB_STIP_UNIT) ? 0 : \
@@ -34,7 +34,7 @@
 					 FbStipRight(mask,bpp)))
 
 void
-fbBresSolid (PixmapPtr    pPixmap,
+fbBresSolid (DrvPixmapPtr    pPixmap,
 	     DrvGCPtr	    pGC,
 	     int	    dashOffset,
 	     int	    signdx,
@@ -118,7 +118,7 @@ fbBresSolid (PixmapPtr    pPixmap,
 }
 
 void
-fbBresDash (PixmapPtr	pPixmap,
+fbBresDash (DrvPixmapPtr	pPixmap,
 	    DrvGCPtr	pGC,
 	    int		dashOffset,
 	    int		signdx,
@@ -204,7 +204,7 @@ fbBresDash (PixmapPtr	pPixmap,
 }
 
 void
-fbBresFill (PixmapPtr	pPixmap,
+fbBresFill (DrvPixmapPtr	pPixmap,
 	    DrvGCPtr	pGC,
 	    int		dashOffset,
 	    int		signdx,
@@ -244,7 +244,7 @@ fbBresFill (PixmapPtr	pPixmap,
 }
 
 static void
-fbSetFg (PixmapPtr	pPixmap,
+fbSetFg (DrvPixmapPtr	pPixmap,
 	 DrvGCPtr		pGC,
 	 Pixel		fg)
 {
@@ -258,7 +258,7 @@ fbSetFg (PixmapPtr	pPixmap,
 }
 
 void
-fbBresFillDash (PixmapPtr pPixmap,
+fbBresFillDash (DrvPixmapPtr pPixmap,
 		DrvGCPtr	    pGC,
 		int	    dashOffset,
 		int	    signdx,
@@ -331,7 +331,7 @@ fbBresFillDash (PixmapPtr pPixmap,
 }
 
 static void
-fbBresSolid24RRop (PixmapPtr  pPixmap,
+fbBresSolid24RRop (DrvPixmapPtr  pPixmap,
 		   DrvGCPtr	pGC,
 		   int		dashOffset,
 		   int		signdx,
@@ -407,7 +407,7 @@ fbBresSolid24RRop (PixmapPtr  pPixmap,
 }
 
 static void
-fbBresDash24RRop (PixmapPtr	pPixmap,
+fbBresDash24RRop (DrvPixmapPtr	pPixmap,
 		  DrvGCPtr		pGC,
 		  int		dashOffset,
 		  int		signdx,
@@ -514,7 +514,7 @@ fbBresDash24RRop (PixmapPtr	pPixmap,
  */
 
 FbBres *
-fbSelectBres (PixmapPtr   pPixmap,
+fbSelectBres (DrvPixmapPtr   pPixmap,
 	      DrvGCPtr	    pGC)
 {
     FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);
@@ -564,7 +564,7 @@ fbSelectBres (PixmapPtr   pPixmap,
 }
 
 void
-fbBres (PixmapPtr	pPixmap,
+fbBres (DrvPixmapPtr	pPixmap,
 	DrvGCPtr		pGC,
 	int		dashOffset,
 	int		signdx,
@@ -583,7 +583,7 @@ fbBres (PixmapPtr	pPixmap,
 }
 
 void
-fbSegment (PixmapPtr	pPixmap,
+fbSegment (DrvPixmapPtr	pPixmap,
 	   DrvGCPtr	pGC,
 	   int		x1,
 	   int		y1,
@@ -606,7 +606,7 @@ fbSegment (PixmapPtr	pPixmap,
     int		octant;
     int		dashoff;
     int		doff;
-    unsigned int bias = drvGetZeroLineBias(pPixmap->pScreen);
+    unsigned int bias = drvGetZeroLineBias(pPixmap->pDrvScreen);
     unsigned int oc1;	/* outcode of point 1 */
     unsigned int oc2;	/* outcode of point 2 */
 
diff --git a/drv/fb/fbsetsp.c b/drv/fb/fbsetsp.c
index 1d92256ce..1fa9ed588 100644
--- a/drv/fb/fbsetsp.c
+++ b/drv/fb/fbsetsp.c
@@ -24,10 +24,10 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 void
-fbSetSpans (PixmapPtr	    pPixmap,
+fbSetSpans (DrvPixmapPtr	    pPixmap,
 	    DrvGCPtr	    pGC,
 	    char	    *src,
 	    DDXPointPtr	    ppt,
diff --git a/drv/fb/fbsolid.c b/drv/fb/fbsolid.c
index 414378531..83120ac44 100644
--- a/drv/fb/fbsolid.c
+++ b/drv/fb/fbsolid.c
@@ -26,7 +26,7 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 void
 fbSolid (FbBits	    *dst,
diff --git a/drv/fb/fbstipple.c b/drv/fb/fbstipple.c
index dc1fd468f..50c1fe9af 100644
--- a/drv/fb/fbstipple.c
+++ b/drv/fb/fbstipple.c
@@ -24,7 +24,7 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 /*
  * This is a slight abuse of the preprocessor to generate repetitive
diff --git a/drv/fb/fbtile.c b/drv/fb/fbtile.c
index 05a27a17b..5d6d56917 100644
--- a/drv/fb/fbtile.c
+++ b/drv/fb/fbtile.c
@@ -24,7 +24,7 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 /*
  * Accelerated tile fill -- tile width is a power of two not greater
diff --git a/drv/fb/fbtrap.c b/drv/fb/fbtrap.c
index 5d6c5fc26..f304465e8 100644
--- a/drv/fb/fbtrap.c
+++ b/drv/fb/fbtrap.c
@@ -24,11 +24,11 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 #include "drv_picturestr.h"
 #include "mipict.h"
-#include "fbpict.h"
+#include "drv_fbpict.h"
 
 void
 fbAddTraps (DrvPicturePtr	pPicture,
diff --git a/drv/fb/fbutil.c b/drv/fb/fbutil.c
index 5e232971e..491957998 100644
--- a/drv/fb/fbutil.c
+++ b/drv/fb/fbutil.c
@@ -24,7 +24,7 @@
 #include <dix-config.h>
 #endif
 
-#include "fb.h"
+#include "drvfb.h"
 
 FbBits
 fbReplicatePixel (Pixel p, int bpp)
diff --git a/drv/fb/fbwindow.c b/drv/fb/fbwindow.c
index 3be506c27..cd5e0a7e0 100644
--- a/drv/fb/fbwindow.c
+++ b/drv/fb/fbwindow.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include "fb.h"
+#include "drvfb.h"
 
 #if 0
 Bool
@@ -39,16 +39,16 @@ fbCreateWindow(WindowPtr pWin)
 #endif
 
 void
-fbPixmapWindowFixup(PixmapPtr *ppPixmap, int bpp)
+fbPixmapWindowFixup(DrvPixmapPtr *ppPixmap, int bpp)
 {
-    PixmapPtr pPixmap = *ppPixmap;
+    DrvPixmapPtr pPixmap = *ppPixmap;
 
     if (pPixmap->bitsPerPixel != bpp)
     {
         pPixmap = fb24_32ReformatTile (pPixmap, bpp);
         if (!pPixmap)
             return;
-        (*pPixmap->pScreen->gpu.DestroyPixmap) (*ppPixmap);
+        (*pPixmap->pDrvScreen->DestroyPixmap) (*ppPixmap);
         *ppPixmap = pPixmap;
     }
     if (FbEvenTile (pPixmap->width *
@@ -57,7 +57,7 @@ fbPixmapWindowFixup(PixmapPtr *ppPixmap, int bpp)
 }
 
 void
-fbFillRegionSolid (PixmapPtr pPixmap,
+fbFillRegionSolid (DrvPixmapPtr pPixmap,
 		   RegionPtr	pRegion,
 		   FbBits	and,
 		   FbBits	xor)