diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c
index 53bfb14a2..271e98145 100644
--- a/fb/fbpseudocolor.c
+++ b/fb/fbpseudocolor.c
@@ -143,10 +143,10 @@ typedef struct _xxGCPriv {
 				      (pGC)->devPrivates[xxGCPrivateIndex].ptr)
 #define xxGCPriv(pGC)   xxGCPrivPtr  pGCPriv = xxGetGCPriv(pGC)
 
-static int xxScrPrivateIndex = -1;
-static int xxGCPrivateIndex;
-static int xxColormapPrivateIndex = -1;
-static int xxGeneration;
+int xxScrPrivateIndex = -1;
+int xxGCPrivateIndex;
+int xxColormapPrivateIndex = -1;
+int xxGeneration;
 
 
 #define wrap(priv,real,mem,func) {\
@@ -1199,7 +1199,7 @@ xxSetup(ScreenPtr pScreen, int myDepth, int baseDepth, char* addr, xxSyncFunc sy
     return TRUE;
 }
 
-static GCFuncs xxGCFuncs = {
+GCFuncs xxGCFuncs = {
     xxValidateGC, xxChangeGC, xxCopyGC, xxDestroyGC,
     xxChangeClip, xxDestroyClip, xxCopyClip
 };
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 4c3bc1785..8f875c88b 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -187,6 +187,12 @@
 #define fbWinPrivateIndex wfbWinPrivateIndex
 #define fbZeroLine wfbZeroLine
 #define fbZeroSegment wfbZeroSegment
+#define xxScrPrivateIndex wfbxxScrPrivateIndex
+#define xxGCPrivateIndex wfbxxGCPrivateIndex
+#define xxColormapPrivateIndex wfbxxColormapPrivateIndex
+#define xxGeneration wfbxxGeneration
 #define xxPrintVisuals wfbxxPrintVisuals
+#define xxGCFuncs wfbxxGCFuncs
+#define xxGCOps wfbxxGCOps
 #define xxSetup wfbxxSetup
 #define composeFunctions wfbComposeFunctions