Export symbols defined in the sdk.

  This is the biggest "visibility" patch. Instead of doing a "export"
symbol on demand, export everything in the sdk, so that if some module
fails due to an unresolved symbol, it is because it is using a symbol
not in the sdk.

  Most exported symbols shouldn't really be made visible, neither
advertised in the sdk, as they are only used by a single shared object.

  Symbols in the sdk (or referenced in sdk macros), but not defined
anywhere include:
XkbBuildCoreState()
XkbInitialMap
XkbXIUnsupported
XkbCheckActionVMods()
XkbSendCompatNotify()
XkbDDXFakePointerButton()
XkbDDXApplyConfig()
_XkbStrCaseCmp()
_XkbErrMessages[]
_XkbErrCode
_XkbErrLocation
_XkbErrData
XkbAccessXDetailText()
XkbNKNDetailMaskText()
XkbLookupGroupAndLevel()
XkbInitAtoms()
XkbGetOrderedDrawables()
XkbFreeOrderedDrawables()
XkbConvertXkbComponents()
XkbWriteXKBSemantics()
XkbWriteXKBLayout()
XkbWriteXKBKeymap()
XkbWriteXKBFile()
XkbWriteCFile()
XkbWriteXKMFile()
XkbWriteToServer()
XkbMergeFile()
XkmFindTOCEntry()
XkmReadFileSection()
XkmReadFileSectionName()
InitExtInput()
xf86CheckButton()
xf86SwitchCoreDevice()
RamDacSetGamma()
RamDacRestoreDACValues()
xf86Bpp
xf86ConfigPix24
xf86MouseCflags[]
xf86SupportedMouseTypes[]
xf86NumMouseTypes
xf86ChangeBusIndex()
xf86EntityEnter()
xf86EntityLeave()
xf86WrapperInit()
xf86RingBell()
xf86findOptionBoolean()
xf86debugListOptions()
LoadSubModuleLocal()
LoaderSymbolLocal()
getInt10Rec()
xf86CurrentScreen
xf86ReallocatePciResources()
xf86NewSerialNumber()
xf86RandRSetInitialMode()
fbCompositeSolidMask_nx1xn
fbCompositeSolidMask_nx8888x0565C
fbCompositeSolidMask_nx8888x8888C
fbCompositeSolidMask_nx8x0565
fbCompositeSolidMask_nx8x0888
fbCompositeSolidMask_nx8x8888
fbCompositeSrc_0565x0565
fbCompositeSrc_8888x0565
fbCompositeSrc_8888x0888
fbCompositeSrc_8888x8888
fbCompositeSrcAdd_1000x1000
fbCompositeSrcAdd_8000x8000
fbCompositeSrcAdd_8888x8888
fbGeneration
fbIn
fbOver
fbOver24
fbOverlayGeneration
fbRasterizeEdges
fbRestoreAreas
fbSaveAreas
composeFunctions
VBEBuildVbeModeList()
VBECalcVbeModeIndex()
TIramdac3030CalculateMNPForClock()
shadowBufPtr
shadowFindBuf()
miRRGetScreenInfo()
RRSetScreenConfig()
RRModePruneUnused()
PixmanImageFromPicture()
extern int miPointerGetMotionEvents()
miClipPicture()
miRasterizeTriangle()
fbPush1toN()
fbInitializeBackingStore()
ddxBeforeReset()
SetupSprite()
InitSprite()
DGADeliverEvent()

  SPECIAL CASES
o defined as _X_INTERNAL
	xf86NewInputDevice()
o defined as static
	fbGCPrivateKey
	fbOverlayScreenPrivateKey
	fbScreenPrivateKey
	fbWinPrivateKey
o defined in libXfont.so, but declared in xorg/dixfont.h
	GetGlyphs()
	QueryGlyphExtents()
	QueryTextExtents()
	ParseGlyphCachingMode()
	InitGlyphCaching()
	SetGlyphCachingMode()

30 files changed, 159 insertions, 159 deletions

diff --git a/fb/fb24_32.c b/fb/fb24_32.c
index 1ebd598a8..0f874f0f1 100644
--- a/fb/fb24_32.c
+++ b/fb/fb24_32.c
@@ -265,7 +265,7 @@ fb24_32BltUp (CARD8	    *srcLine,
 /*
  * Spans functions; probably unused.
  */
-void
+_X_EXPORT void
 fb24_32GetSpans(DrawablePtr	pDrawable, 
 		int		wMax, 
 		DDXPointPtr	ppt, 
@@ -308,7 +308,7 @@ fb24_32GetSpans(DrawablePtr	pDrawable,
     fbFinishAccess (pDrawable);
 }
 
-void
+_X_EXPORT void
 fb24_32SetSpans (DrawablePtr	    pDrawable,
 		 GCPtr		    pGC,
 		 char		    *src,
@@ -374,7 +374,7 @@ fb24_32SetSpans (DrawablePtr	    pDrawable,
 /*
  * Clip and put 32bpp Z-format images to a 24bpp drawable
  */
-void
+_X_EXPORT void
 fb24_32PutZImage (DrawablePtr	pDrawable,
 		  RegionPtr	pClip,
 		  int		alu,
@@ -436,7 +436,7 @@ fb24_32PutZImage (DrawablePtr	pDrawable,
     fbFinishAccess (pDrawable);
 }
 
-void
+_X_EXPORT void
 fb24_32GetImage (DrawablePtr     pDrawable,
 		 int             x,
 		 int             y,
@@ -472,7 +472,7 @@ fb24_32GetImage (DrawablePtr     pDrawable,
     fbFinishAccess (pDrawable);
 }
 
-void
+_X_EXPORT void
 fb24_32CopyMtoN (DrawablePtr pSrcDrawable,
 		 DrawablePtr pDstDrawable,
 		 GCPtr       pGC,
@@ -531,7 +531,7 @@ fb24_32CopyMtoN (DrawablePtr pSrcDrawable,
     fbFinishAccess (pDstDrawable);
 }
 
-PixmapPtr
+_X_EXPORT PixmapPtr
 fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
 {
     ScreenPtr	pScreen = pOldTile->drawable.pScreen;
@@ -583,7 +583,7 @@ typedef struct {
     int width;   
 } miScreenInitParmsRec, *miScreenInitParmsPtr;
 
-Bool
+_X_EXPORT Bool
 fb24_32CreateScreenResources(ScreenPtr pScreen)
 {
     miScreenInitParmsPtr pScrInitParms;
@@ -604,7 +604,7 @@ fb24_32CreateScreenResources(ScreenPtr pScreen)
     return retval;
 }
 
-Bool
+_X_EXPORT Bool
 fb24_32ModifyPixmapHeader (PixmapPtr   pPixmap,
 			   int         width,
 			   int         height,
diff --git a/fb/fballpriv.c b/fb/fballpriv.c
index c40796c11..42960061c 100644
--- a/fb/fballpriv.c
+++ b/fb/fballpriv.c
@@ -29,7 +29,7 @@
 #ifdef FB_SCREEN_PRIVATE
 static int fbScreenPrivateKeyIndex;
 static DevPrivateKey fbScreenPrivateKey = &fbScreenPrivateKeyIndex;
-DevPrivateKey fbGetScreenPrivateKey(void)
+_X_EXPORT DevPrivateKey fbGetScreenPrivateKey(void)
 {
     return fbScreenPrivateKey;
 }
@@ -37,19 +37,19 @@ DevPrivateKey fbGetScreenPrivateKey(void)
 
 static int fbGCPrivateKeyIndex;
 static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKeyIndex;
-DevPrivateKey fbGetGCPrivateKey(void)
+_X_EXPORT DevPrivateKey fbGetGCPrivateKey(void)
 {
     return fbGCPrivateKey;
 }
 
 static int fbWinPrivateKeyIndex;
 static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKeyIndex;
-DevPrivateKey fbGetWinPrivateKey(void)
+_X_EXPORT DevPrivateKey fbGetWinPrivateKey(void)
 {
     return fbWinPrivateKey;
 }
 
-Bool
+_X_EXPORT Bool
 fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey)
 {
     if (pGCKey)
@@ -71,6 +71,6 @@ fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey)
 }
 
 #ifdef FB_ACCESS_WRAPPER
-ReadMemoryProcPtr wfbReadMemory;
-WriteMemoryProcPtr wfbWriteMemory;
+_X_EXPORT ReadMemoryProcPtr wfbReadMemory;
+_X_EXPORT WriteMemoryProcPtr wfbWriteMemory;
 #endif
diff --git a/fb/fbarc.c b/fb/fbarc.c
index 3a8a2c56a..2597368b4 100644
--- a/fb/fbarc.c
+++ b/fb/fbarc.c
@@ -37,7 +37,7 @@ typedef void	(*FbArc) (FbBits    *dst,
 			  FbBits    and, 
 			  FbBits    xor);
 
-void
+_X_EXPORT void
 fbPolyArc (DrawablePtr	pDrawable,
 	   GCPtr	pGC,
 	   int		narcs,
diff --git a/fb/fbblt.c b/fb/fbblt.c
index 38271c0c9..6c9d50cf1 100644
--- a/fb/fbblt.c
+++ b/fb/fbblt.c
@@ -39,7 +39,7 @@
     } \
 }
 
-void
+_X_EXPORT void
 fbBlt (FbBits   *srcLine,
        FbStride	srcStride,
        int	srcX,
@@ -568,7 +568,7 @@ fbBlt24Line (FbBits	    *src,
 #endif
 }
 
-void
+_X_EXPORT void
 fbBlt24 (FbBits	    *srcLine,
 	 FbStride   srcStride,
 	 int	    srcX,
@@ -873,7 +873,7 @@ fbSetBltOdd (FbStip	*stip,
 }
 #endif
 
-void
+_X_EXPORT void
 fbBltStip (FbStip   *src,
 	   FbStride srcStride,	    /* in FbStip units, not FbBits units */
 	   int	    srcX,
diff --git a/fb/fbbltone.c b/fb/fbbltone.c
index ffe69775a..ec9300f6c 100644
--- a/fb/fbbltone.c
+++ b/fb/fbbltone.c
@@ -78,7 +78,7 @@
 #endif
 							   
 #if FB_SHIFT == 6
-CARD8	fb8Lane[256] = {
+_X_EXPORT CARD8	fb8Lane[256] = {
 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
@@ -95,33 +95,33 @@ CARD8	fb8Lane[256] = {
 242, 243, 244,245,246,247,248,249,250,251,252,253,254,255,
 };
 
-CARD8	fb16Lane[256] = {
+_X_EXPORT CARD8	fb16Lane[256] = {
     0x00, 0x03, 0x0c, 0x0f,
     0x30, 0x33, 0x3c, 0x3f,
     0xc0, 0xc3, 0xcc, 0xcf,
     0xf0, 0xf3, 0xfc, 0xff,
 };
 
-CARD8	fb32Lane[16] = {
+_X_EXPORT CARD8	fb32Lane[16] = {
     0x00, 0x0f, 0xf0, 0xff,
 };
 #endif
 
 #if FB_SHIFT == 5
-CARD8	fb8Lane[16] = {
+_X_EXPORT CARD8	fb8Lane[16] = {
     0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
 };
 
-CARD8	fb16Lane[16] = {
+_X_EXPORT CARD8	fb16Lane[16] = {
     0, 3, 12, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 };
 
-CARD8	fb32Lane[16] = {
+_X_EXPORT CARD8	fb32Lane[16] = {
     0, 15,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 #endif
 
-CARD8	*fbLaneTable[33] = {
+_X_EXPORT CARD8	*fbLaneTable[33] = {
     0, 0, 0, 0, 0, 0, 0, 0,
     fb8Lane,  0, 0, 0, 0, 0, 0, 0, 
     fb16Lane, 0, 0, 0, 0, 0, 0, 0,
@@ -130,7 +130,7 @@ CARD8	*fbLaneTable[33] = {
 };
 #endif
 
-void
+_X_EXPORT void
 fbBltOne (FbStip    *src,
 	  FbStride  srcStride,	    /* FbStip units per scanline */
 	  int	    srcX,	    /* bit position of source */
@@ -457,7 +457,7 @@ fbBltOne (FbStip    *src,
 #define FbStip24New(rot)    (2 + (rot != 0))
 #define FbStip24Len	    4
 
-const FbBits	fbStipple24Bits[3][1 << FbStip24Len] = {
+_X_EXPORT const FbBits	fbStipple24Bits[3][1 << FbStip24Len] = {
     /* rotate 0 */
     {
 	C4_24( 0, 0), C4_24( 1, 0), C4_24( 2, 0), C4_24( 3, 0),
@@ -569,7 +569,7 @@ const FbBits	fbStipple24Bits[3][1 << FbStip24Len] = {
  * have no acceleration so this code is used for stipples, copyplane
  * and text
  */
-void
+_X_EXPORT void
 fbBltOne24 (FbStip	*srcLine,
 	    FbStride	srcStride,  /* FbStip units per scanline */
 	    int		srcX,	    /* bit position of source */
@@ -754,7 +754,7 @@ fbBltOne24 (FbStip	*srcLine,
  * from an N bit image to a 1 bit image
  */
  
-void
+_X_EXPORT void
 fbBltPlane (FbBits	    *src,
 	    FbStride	    srcStride,
 	    int		    srcX,
diff --git a/fb/fbcmap.c b/fb/fbcmap.c
index 0ec0e852c..c01e37940 100644
--- a/fb/fbcmap.c
+++ b/fb/fbcmap.c
@@ -47,7 +47,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ColormapPtr FbInstalledMaps[MAXSCREENS];
 
-int
+_X_EXPORT int
 fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
 {
     /* By the time we are processing requests, we can guarantee that there
@@ -57,7 +57,7 @@ fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
 }
 
 
-void
+_X_EXPORT void
 fbInstallColormap(ColormapPtr pmap)
 {
     int index = pmap->pScreen->myNum;
@@ -75,7 +75,7 @@ fbInstallColormap(ColormapPtr pmap)
     }
 }
 
-void
+_X_EXPORT void
 fbUninstallColormap(ColormapPtr pmap)
 {
     int index = pmap->pScreen->myNum;
@@ -92,7 +92,7 @@ fbUninstallColormap(ColormapPtr pmap)
     }
 }
 
-void
+_X_EXPORT void
 fbResolveColor(unsigned short	*pred, 
 	       unsigned short	*pgreen, 
 	       unsigned short	*pblue,
@@ -116,7 +116,7 @@ fbResolveColor(unsigned short	*pred,
     }
 }
 
-Bool
+_X_EXPORT Bool
 fbInitializeColormap(ColormapPtr pmap)
 {
     register unsigned i;
@@ -216,7 +216,7 @@ fbInitializeColormap(ColormapPtr pmap)
     outdefs[i].blue = pmap->blue[blue >> pVisual->offsetBlue].co.local.blue; \
 }
 
-int
+_X_EXPORT int
 fbExpandDirectColors (ColormapPtr   pmap, 
 		      int	    ndef,
 		      xColorItem    *indefs,
@@ -387,7 +387,7 @@ maskShift (Pixel p)
     return s;
 }
 
-Bool
+_X_EXPORT Bool
 fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
 			  Pixel redMask, Pixel greenMask, Pixel blueMask)
 {
@@ -415,7 +415,7 @@ fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 fbHasVisualTypes (int depth)
 {
     fbVisualsPtr    v;
@@ -426,7 +426,7 @@ fbHasVisualTypes (int depth)
     return FALSE;
 }
 
-Bool
+_X_EXPORT Bool
 fbSetVisualTypes (int depth, int visuals, int bitsPerRGB)
 {
     return fbSetVisualTypesAndMasks (depth, visuals, bitsPerRGB,
@@ -439,7 +439,7 @@ fbSetVisualTypes (int depth, int visuals, int bitsPerRGB)
  * the set which can be used with this version of fb.
  */
 
-Bool
+_X_EXPORT Bool
 fbInitVisuals (VisualPtr    *visualp, 
 	       DepthPtr	    *depthp,
 	       int	    *nvisualp,
diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c
index 074797287..269a55552 100644
--- a/fb/fbcmap_mi.c
+++ b/fb/fbcmap_mi.c
@@ -49,19 +49,19 @@ fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
     return miListInstalledColormaps(pScreen, pmaps);
 }
 
-void
+_X_EXPORT void
 fbInstallColormap(ColormapPtr pmap)
 {
     miInstallColormap(pmap);
 }
 
-void
+_X_EXPORT void
 fbUninstallColormap(ColormapPtr pmap)
 {
     miUninstallColormap(pmap);
 }
 
-void
+_X_EXPORT void
 fbResolveColor(unsigned short   *pred,
 	       unsigned short   *pgreen,
 	       unsigned short   *pblue,
@@ -70,7 +70,7 @@ fbResolveColor(unsigned short   *pred,
     miResolveColor(pred, pgreen, pblue, pVisual);
 }
 
-Bool
+_X_EXPORT Bool
 fbInitializeColormap(ColormapPtr pmap)
 {
     return miInitializeColormap(pmap);
@@ -91,19 +91,19 @@ fbCreateDefColormap(ScreenPtr pScreen)
     return miCreateDefColormap(pScreen);
 }
 
-void
+_X_EXPORT void
 fbClearVisualTypes(void)
 {
     miClearVisualTypes();
 }
 
-Bool
+_X_EXPORT Bool
 fbSetVisualTypes (int depth, int visuals, int bitsPerRGB)
 {
     return miSetVisualTypes(depth, visuals, bitsPerRGB, -1);
 }
 
-Bool
+_X_EXPORT Bool
 fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
                           Pixel redMask, Pixel greenMask, Pixel blueMask)
 {
@@ -116,7 +116,7 @@ fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
  * of visuals and depths for the screen which coorespond to
  * the set which can be used with this version of fb.
  */
-Bool
+_X_EXPORT Bool
 fbInitVisuals (VisualPtr    *visualp, 
 	       DepthPtr	    *depthp,
 	       int	    *nvisualp,
diff --git a/fb/fbcopy.c b/fb/fbcopy.c
index b8b0b6a8c..084fadab2 100644
--- a/fb/fbcopy.c
+++ b/fb/fbcopy.c
@@ -28,7 +28,7 @@
 
 #include "fb.h"
 
-void
+_X_EXPORT void
 fbCopyNtoN (DrawablePtr	pSrcDrawable,
 	    DrawablePtr	pDstDrawable,
 	    GCPtr	pGC,
@@ -100,7 +100,7 @@ fbCopyNtoN (DrawablePtr	pSrcDrawable,
     fbFinishAccess (pSrcDrawable);
 }
 
-void
+_X_EXPORT void
 fbCopy1toN (DrawablePtr	pSrcDrawable,
 	    DrawablePtr	pDstDrawable,
 	    GCPtr	pGC,
@@ -173,7 +173,7 @@ fbCopy1toN (DrawablePtr	pSrcDrawable,
     fbFinishAccess (pSrcDrawable);
 }
 
-void
+_X_EXPORT void
 fbCopyNto1 (DrawablePtr	pSrcDrawable,
 	    DrawablePtr	pDstDrawable,
 	    GCPtr	pGC,
@@ -289,7 +289,7 @@ fbCopyNto1 (DrawablePtr	pSrcDrawable,
     }
 }
 
-void
+_X_EXPORT void
 fbCopyRegion (DrawablePtr   pSrcDrawable,
 	      DrawablePtr   pDstDrawable,
 	      GCPtr	    pGC,
@@ -407,7 +407,7 @@ fbCopyRegion (DrawablePtr   pSrcDrawable,
 	xfree (pboxNew2);
 }
 
-RegionPtr
+_X_EXPORT RegionPtr
 fbDoCopy (DrawablePtr	pSrcDrawable,
 	  DrawablePtr	pDstDrawable,
 	  GCPtr		pGC,
@@ -612,7 +612,7 @@ fbDoCopy (DrawablePtr	pSrcDrawable,
     return prgnExposed;
 }
 
-RegionPtr
+_X_EXPORT RegionPtr
 fbCopyArea (DrawablePtr	pSrcDrawable,
 	    DrawablePtr	pDstDrawable,
 	    GCPtr	pGC,
@@ -635,7 +635,7 @@ fbCopyArea (DrawablePtr	pSrcDrawable,
 		     widthSrc, heightSrc, xOut, yOut, copy, 0, 0);
 }
 
-RegionPtr
+_X_EXPORT RegionPtr
 fbCopyPlane (DrawablePtr    pSrcDrawable,
 	     DrawablePtr    pDstDrawable,
 	     GCPtr	    pGC,
diff --git a/fb/fbfill.c b/fb/fbfill.c
index 831b1ce76..f31d1bba4 100644
--- a/fb/fbfill.c
+++ b/fb/fbfill.c
@@ -26,7 +26,7 @@
 
 #include "fb.h"
 
-void
+_X_EXPORT void
 fbFill (DrawablePtr pDrawable,
 	GCPtr	    pGC,
 	int	    x,
@@ -165,7 +165,7 @@ fbFill (DrawablePtr pDrawable,
     fbFinishAccess (pDrawable);
 }
 
-void
+_X_EXPORT void
 fbSolidBoxClipped (DrawablePtr	pDrawable,
 		   RegionPtr	pClip,
 		   int		x1,
diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c
index 4e4edb3fd..a22e648ab 100644
--- a/fb/fbfillrect.c
+++ b/fb/fbfillrect.c
@@ -26,7 +26,7 @@
 
 #include "fb.h"
 
-void
+_X_EXPORT void
 fbPolyFillRect(DrawablePtr  pDrawable, 
 	       GCPtr	    pGC, 
 	       int	    nrect,
diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c
index 5d2147213..60a70754f 100644
--- a/fb/fbfillsp.c
+++ b/fb/fbfillsp.c
@@ -26,7 +26,7 @@
 
 #include "fb.h"
 
-void
+_X_EXPORT void
 fbFillSpans (DrawablePtr    pDrawable,
 	     GCPtr	    pGC,
 	     int	    n,
diff --git a/fb/fbgc.c b/fb/fbgc.c
index fda391b14..d638f164c 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -28,7 +28,7 @@
 
 #include "fb.h"
 
-const GCFuncs fbGCFuncs = {
+_X_EXPORT const GCFuncs fbGCFuncs = {
     fbValidateGC,
     miChangeGC,
     miCopyGC,
@@ -38,7 +38,7 @@ const GCFuncs fbGCFuncs = {
     miCopyClip,
 };
 
-const GCOps	fbGCOps = {
+_X_EXPORT const GCOps	fbGCOps = {
     fbFillSpans,
     fbSetSpans,
     fbPutImage,
@@ -61,7 +61,7 @@ const GCOps	fbGCOps = {
     fbPushPixels
 };
 
-Bool
+_X_EXPORT Bool
 fbCreateGC(GCPtr pGC)
 {
     pGC->clientClip = NULL;
@@ -84,7 +84,7 @@ fbCreateGC(GCPtr pGC)
 /*
  * Pad pixmap to FB_UNIT bits wide
  */
-void
+_X_EXPORT void
 fbPadPixmap (PixmapPtr pPixmap)
 {
     int	    width;
@@ -193,7 +193,7 @@ fbCanEvenStipple (PixmapPtr pStipple, int bpp)
     return TRUE;
 }
 
-void
+_X_EXPORT void
 fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
 {
     FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);
diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c
index 6402c6c38..b939d6930 100644
--- a/fb/fbgetsp.c
+++ b/fb/fbgetsp.c
@@ -26,7 +26,7 @@
 
 #include "fb.h"
 
-void
+_X_EXPORT void
 fbGetSpans(DrawablePtr	pDrawable, 
 	   int		wMax, 
 	   DDXPointPtr	ppt, 
diff --git a/fb/fbglyph.c b/fb/fbglyph.c
index 2c19b742f..3f2ec75b3 100644
--- a/fb/fbglyph.c
+++ b/fb/fbglyph.c
@@ -31,7 +31,7 @@
 
 #define dummyScreen screenInfo.screens[0]
       
-Bool
+_X_EXPORT Bool
 fbGlyphIn (RegionPtr	pRegion,
 	   int		x,
 	   int		y,
@@ -253,7 +253,7 @@ fbGlyph24 (FbBits   *dstBits,
 #endif
 #endif
 
-void
+_X_EXPORT void
 fbPolyGlyphBlt (DrawablePtr	pDrawable,
 		GCPtr		pGC,
 		int		x, 
@@ -343,7 +343,7 @@ fbPolyGlyphBlt (DrawablePtr	pDrawable,
 }
 
 
-void
+_X_EXPORT void
 fbImageGlyphBlt (DrawablePtr	pDrawable,
 		 GCPtr		pGC,
 		 int		x, 
diff --git a/fb/fbimage.c b/fb/fbimage.c
index 2b9ac27c0..030a6a45d 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -28,7 +28,7 @@
 
 #include "fb.h"
 
-void
+_X_EXPORT void
 fbPutImage (DrawablePtr	pDrawable,
 	    GCPtr	pGC,
 	    int		depth,
@@ -112,7 +112,7 @@ fbPutImage (DrawablePtr	pDrawable,
     }
 }
 
-void
+_X_EXPORT void
 fbPutZImage (DrawablePtr	pDrawable,
 	     RegionPtr		pClip,
 	     int		alu,
@@ -172,7 +172,7 @@ fbPutZImage (DrawablePtr	pDrawable,
     fbFinishAccess (pDrawable);
 }
 	     
-void
+_X_EXPORT void
 fbPutXYImage (DrawablePtr	pDrawable,
 	      RegionPtr		pClip,
 	      FbBits		fg,
@@ -281,7 +281,7 @@ fbPutXYImage (DrawablePtr	pDrawable,
     fbFinishAccess (pDrawable);
 }
 
-void
+_X_EXPORT void
 fbGetImage (DrawablePtr	    pDrawable,
 	    int		    x,
 	    int		    y,
diff --git a/fb/fbline.c b/fb/fbline.c
index 2cee123ae..eddb6d521 100644
--- a/fb/fbline.c
+++ b/fb/fbline.c
@@ -26,7 +26,7 @@
 
 #include "fb.h"
 
-void
+_X_EXPORT void
 fbZeroLine (DrawablePtr	pDrawable,
 	    GCPtr	pGC,
 	    int		mode,
@@ -61,7 +61,7 @@ fbZeroLine (DrawablePtr	pDrawable,
     }
 }
 
-void
+_X_EXPORT void
 fbZeroSegment (DrawablePtr  pDrawable,
 	       GCPtr	    pGC,
 	       int	    nseg,
@@ -85,7 +85,7 @@ fbZeroSegment (DrawablePtr  pDrawable,
     }
 }
 
-void
+_X_EXPORT void
 fbFixCoordModePrevious (int	    npt,
 			DDXPointPtr ppt)
 {
@@ -102,7 +102,7 @@ fbFixCoordModePrevious (int	    npt,
     }
 }
 
-void
+_X_EXPORT void
 fbPolyLine (DrawablePtr	pDrawable,
 	    GCPtr	pGC,
 	    int		mode,
@@ -140,7 +140,7 @@ fbPolyLine (DrawablePtr	pDrawable,
     (*line) (pDrawable, pGC, mode, npt, ppt);
 }
 
-void
+_X_EXPORT void
 fbPolySegment (DrawablePtr  pDrawable,
 	       GCPtr	    pGC,
 	       int	    nseg,
diff --git a/fb/fboverlay.c b/fb/fboverlay.c
index 1432cb6f0..cbfaace6d 100644
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -36,7 +36,7 @@
 static int fbOverlayScreenPrivateKeyIndex;
 static DevPrivateKey fbOverlayScreenPrivateKey = &fbOverlayScreenPrivateKeyIndex;
 
-DevPrivateKey fbOverlayGetScreenPrivateKey(void)
+_X_EXPORT DevPrivateKey fbOverlayGetScreenPrivateKey(void)
 {
     return fbOverlayScreenPrivateKey;
 }
@@ -45,7 +45,7 @@ DevPrivateKey fbOverlayGetScreenPrivateKey(void)
  * Replace this if you want something supporting
  * multiple overlays with the same depth
  */
-Bool
+_X_EXPORT Bool
 fbOverlayCreateWindow(WindowPtr pWin)
 {
     FbOverlayScrPrivPtr	pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);
@@ -84,7 +84,7 @@ fbOverlayCreateWindow(WindowPtr pWin)
     return FALSE;
 }
 
-Bool
+_X_EXPORT Bool
 fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen)
 {
     FbOverlayScrPrivPtr	pScrPriv = fbOverlayGetScrPriv(pScreen);
@@ -101,7 +101,7 @@ fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen)
 /*
  * Return layer containing this window
  */
-int
+_X_EXPORT int
 fbOverlayWindowLayer(WindowPtr pWin)
 {
     FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);
@@ -114,7 +114,7 @@ fbOverlayWindowLayer(WindowPtr pWin)
     return 0;
 }
 
-Bool
+_X_EXPORT Bool
 fbOverlayCreateScreenResources(ScreenPtr pScreen)
 {
     int			i;
@@ -153,7 +153,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen)
     return TRUE;
 }
 
-void
+_X_EXPORT void
 fbOverlayPaintKey (DrawablePtr	pDrawable,
 		   RegionPtr	pRegion,
 		   CARD32	pixel,
@@ -166,7 +166,7 @@ fbOverlayPaintKey (DrawablePtr	pDrawable,
 /*
  * Track visible region for each layer
  */
-void
+_X_EXPORT void
 fbOverlayUpdateLayerRegion (ScreenPtr	pScreen,
 			    int		layer,
 			    RegionPtr	prgn)
@@ -213,7 +213,7 @@ fbOverlayUpdateLayerRegion (ScreenPtr	pScreen,
 /*
  * Copy only areas in each layer containing real bits
  */
-void
+_X_EXPORT void
 fbOverlayCopyWindow(WindowPtr	pWin,
 		    DDXPointRec	ptOldOrg,
 		    RegionPtr	prgnSrc)
@@ -267,7 +267,7 @@ fbOverlayCopyWindow(WindowPtr	pWin,
     REGION_UNINIT(pScreen, &rgnDst);
 }   
 
-void
+_X_EXPORT void
 fbOverlayWindowExposures (WindowPtr	pWin,
 			  RegionPtr	prgn,
 			  RegionPtr	other_exposed)
@@ -278,7 +278,7 @@ fbOverlayWindowExposures (WindowPtr	pWin,
     miWindowExposures(pWin, prgn, other_exposed);
 }
 
-Bool
+_X_EXPORT Bool
 fbOverlaySetupScreen(ScreenPtr	pScreen,
 		     pointer	pbits1,
 		     pointer	pbits2,
@@ -325,7 +325,7 @@ fb24_32OverlayCreateScreenResources(ScreenPtr pScreen)
     return retval;
 }
 
-Bool
+_X_EXPORT Bool
 fbOverlayFinishScreenInit(ScreenPtr	pScreen,
 			  pointer	pbits1,
 			  pointer	pbits2,
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 1355e9071..5dff4e13f 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -39,7 +39,7 @@
 
 #define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
 
-void
+_X_EXPORT void
 fbWalkCompositeRegion (CARD8 op,
 		       PicturePtr pSrc,
 		       PicturePtr pMask,
@@ -143,7 +143,7 @@ fbWalkCompositeRegion (CARD8 op,
     REGION_UNINIT (pDst->pDrawable->pScreen, &region);
 }
 
-void
+_X_EXPORT void
 fbComposite (CARD8      op,
 	     PicturePtr pSrc,
 	     PicturePtr pMask,
@@ -192,7 +192,7 @@ fbComposite (CARD8      op,
     free_pixman_pict (pDst, dest);
 }
 
-void
+_X_EXPORT void
 fbCompositeGeneral (CARD8	op,
 		    PicturePtr	pSrc,
 		    PicturePtr	pMask,
@@ -400,7 +400,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict)
     pixman_image_set_source_clipping (image, TRUE);
 }
 
-pixman_image_t *
+_X_EXPORT pixman_image_t *
 image_from_pict (PicturePtr pict,
 		 Bool has_clip)
 {
@@ -440,14 +440,14 @@ image_from_pict (PicturePtr pict,
     return image;
 }
 
-void
+_X_EXPORT void
 free_pixman_pict (PicturePtr pict, pixman_image_t *image)
 {
     if (image && pixman_image_unref (image) && pict->pDrawable)
 	fbFinishAccess (pict->pDrawable);
 }
 
-Bool
+_X_EXPORT Bool
 fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
 {
 
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index 311da9e62..96b3cf015 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -28,7 +28,7 @@
 
 #include "fb.h"
 
-PixmapPtr
+_X_EXPORT PixmapPtr
 fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
 		   unsigned usage_hint)
 {
@@ -82,7 +82,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
     return pPixmap;
 }
 
-PixmapPtr
+_X_EXPORT PixmapPtr
 fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
 		unsigned usage_hint)
 {
@@ -95,7 +95,7 @@ fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
     return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, usage_hint);
 }
 
-Bool
+_X_EXPORT Bool
 fbDestroyPixmap (PixmapPtr pPixmap)
 {
     if(--pPixmap->refcnt)
@@ -137,7 +137,7 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&			\
  * Then it coalesces the current line with the previous if they have boxes
  * at the same X coordinates.
  */
-RegionPtr
+_X_EXPORT RegionPtr
 fbPixmapToRegion(PixmapPtr pPix)
 {
     register RegionPtr	pReg;
@@ -348,7 +348,7 @@ fbValidateBits (FbStip *bits, int stride, FbStip data)
     }
 }
 
-void
+_X_EXPORT void
 fbValidateDrawable (DrawablePtr pDrawable)
 {
     FbStip	*bits, *first, *last;
@@ -368,14 +368,14 @@ fbValidateDrawable (DrawablePtr pDrawable)
     fbFinishAccess (pDrawable);
 }
 
-void
+_X_EXPORT void
 fbSetBits (FbStip *bits, int stride, FbStip data)
 {
     while (stride--)
 	*bits++ = data;
 }
 
-void
+_X_EXPORT void
 fbInitializeDrawable (DrawablePtr pDrawable)
 {
     FbStip  *bits, *first, *last;
diff --git a/fb/fbpoint.c b/fb/fbpoint.c
index c0ea8ba5b..d6637d884 100644
--- a/fb/fbpoint.c
+++ b/fb/fbpoint.c
@@ -39,7 +39,7 @@ typedef void	(*FbDots)  (FbBits	*dst,
 			    FbBits	and,
 			    FbBits	xor);
 
-void
+_X_EXPORT void
 fbDots (FbBits	    *dstOrig,
 	FbStride    dstStride,
 	int	    dstBpp,
@@ -107,7 +107,7 @@ fbDots (FbBits	    *dstOrig,
     }
 }
 
-void
+_X_EXPORT void
 fbPolyPoint (DrawablePtr    pDrawable,
 	     GCPtr	    pGC,
 	     int	    mode,
diff --git a/fb/fbpush.c b/fb/fbpush.c
index 891572f0d..55be9b389 100644
--- a/fb/fbpush.c
+++ b/fb/fbpush.c
@@ -26,7 +26,7 @@
 
 #include "fb.h"
 
-void
+_X_EXPORT void
 fbPushPattern (DrawablePtr  pDrawable,
 	       GCPtr	    pGC,
 	       
@@ -100,7 +100,7 @@ fbPushPattern (DrawablePtr  pDrawable,
     }
 }
 
-void
+_X_EXPORT void
 fbPushFill (DrawablePtr	pDrawable,
 	    GCPtr	pGC,
 
@@ -172,7 +172,7 @@ fbPushFill (DrawablePtr	pDrawable,
     }
 }
 	    
-void
+_X_EXPORT void
 fbPushImage (DrawablePtr    pDrawable,
 	     GCPtr	    pGC,
 	     
@@ -223,7 +223,7 @@ fbPushImage (DrawablePtr    pDrawable,
     }
 }
 	     
-void
+_X_EXPORT void
 fbPushPixels (GCPtr	    pGC,
 	      PixmapPtr	    pBitmap,
 	      DrawablePtr   pDrawable,
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index ea2491211..d7e1d7912 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -26,7 +26,7 @@
 
 #include "fb.h"
 
-Bool
+_X_EXPORT Bool
 fbCloseScreen (int index, ScreenPtr pScreen)
 {
     int	    d;
@@ -43,19 +43,19 @@ fbCloseScreen (int index, ScreenPtr pScreen)
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 fbRealizeFont(ScreenPtr pScreen, FontPtr pFont)
 {
     return (TRUE);
 }
 
-Bool
+_X_EXPORT Bool
 fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
 {
     return (TRUE);
 }
 
-void
+_X_EXPORT void
 fbQueryBestSize (int class, 
 		 unsigned short *width, unsigned short *height,
 		 ScreenPtr pScreen)
@@ -81,7 +81,7 @@ fbQueryBestSize (int class,
     }
 }
 
-PixmapPtr
+_X_EXPORT PixmapPtr
 _fbGetWindowPixmap (WindowPtr pWindow)
 {
     return fbGetWindowPixmap (pWindow);
@@ -93,7 +93,7 @@ _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap)
     dixSetPrivate(&pWindow->devPrivates, fbGetWinPrivateKey(), pPixmap);
 }
 
-Bool
+_X_EXPORT Bool
 fbSetupScreen(ScreenPtr	pScreen, 
 	      pointer	pbits,		/* pointer to screen bitmap */
 	      int	xsize, 		/* in pixels */
@@ -140,7 +140,7 @@ fbSetupScreen(ScreenPtr	pScreen,
 }
 
 #ifdef FB_ACCESS_WRAPPER
-Bool
+_X_EXPORT Bool
 wfbFinishScreenInit(ScreenPtr		pScreen,
 		    pointer		pbits,
 		    int			xsize,
@@ -255,7 +255,7 @@ fbFinishScreenInit(ScreenPtr	pScreen,
 
 /* dts * (inch/dot) * (25.4 mm / inch) = mm */
 #ifdef FB_ACCESS_WRAPPER
-Bool
+_X_EXPORT Bool
 wfbScreenInit(ScreenPtr		pScreen,
 	      pointer		pbits,
 	      int		xsize,
@@ -275,7 +275,7 @@ wfbScreenInit(ScreenPtr		pScreen,
     return TRUE;
 }
 #else
-Bool
+_X_EXPORT Bool
 fbScreenInit(ScreenPtr	pScreen,
 	     pointer	pbits,
 	     int	xsize,
diff --git a/fb/fbseg.c b/fb/fbseg.c
index 80ce7404e..b26035514 100644
--- a/fb/fbseg.c
+++ b/fb/fbseg.c
@@ -33,7 +33,7 @@
 					((dir < 0) ? FbStipLeft(mask,bpp) : \
 					 FbStipRight(mask,bpp)))
 
-void
+_X_EXPORT void
 fbBresSolid (DrawablePtr    pDrawable,
 	     GCPtr	    pGC,
 	     int	    dashOffset,
@@ -117,7 +117,7 @@ fbBresSolid (DrawablePtr    pDrawable,
     fbFinishAccess (pDrawable);
 }
 
-void
+_X_EXPORT void
 fbBresDash (DrawablePtr	pDrawable,
 	    GCPtr	pGC,
 	    int		dashOffset,
@@ -203,7 +203,7 @@ fbBresDash (DrawablePtr	pDrawable,
     fbFinishAccess (pDrawable);
 }
 
-void
+_X_EXPORT void
 fbBresFill (DrawablePtr	pDrawable,
 	    GCPtr	pGC,
 	    int		dashOffset,
@@ -255,7 +255,7 @@ fbSetFg (DrawablePtr	pDrawable,
     }
 }
 
-void
+_X_EXPORT void
 fbBresFillDash (DrawablePtr pDrawable,
 		GCPtr	    pGC,
 		int	    dashOffset,
@@ -513,7 +513,7 @@ fbBresDash24RRop (DrawablePtr	pDrawable,
  * based on the contents of the specified GC.
  */
 
-FbBres *
+_X_EXPORT FbBres *
 fbSelectBres (DrawablePtr   pDrawable,
 	      GCPtr	    pGC)
 {
@@ -575,7 +575,7 @@ fbSelectBres (DrawablePtr   pDrawable,
     return bres;
 }
 
-void
+_X_EXPORT void
 fbBres (DrawablePtr	pDrawable,
 	GCPtr		pGC,
 	int		dashOffset,
@@ -594,7 +594,7 @@ fbBres (DrawablePtr	pDrawable,
 				      e, e1, e3, len);
 }
 
-void
+_X_EXPORT void
 fbSegment (DrawablePtr	pDrawable,
 	   GCPtr	pGC,
 	   int		x1,
diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c
index 227ba4c62..f64622aef 100644
--- a/fb/fbsetsp.c
+++ b/fb/fbsetsp.c
@@ -26,7 +26,7 @@
 
 #include "fb.h"
 
-void
+_X_EXPORT void
 fbSetSpans (DrawablePtr	    pDrawable,
 	    GCPtr	    pGC,
 	    char	    *src,
diff --git a/fb/fbsolid.c b/fb/fbsolid.c
index 53fcae071..cc3e72828 100644
--- a/fb/fbsolid.c
+++ b/fb/fbsolid.c
@@ -28,7 +28,7 @@
 
 #include "fb.h"
 
-void
+_X_EXPORT void
 fbSolid (FbBits	    *dst,
 	 FbStride   dstStride,
 	 int	    dstX,
@@ -82,7 +82,7 @@ fbSolid (FbBits	    *dst,
 }
 
 #ifdef FB_24BIT
-void
+_X_EXPORT void
 fbSolid24 (FbBits   *dst,
 	   FbStride dstStride,
 	   int	    dstX,
diff --git a/fb/fbstipple.c b/fb/fbstipple.c
index 7d1326367..4ceab862d 100644
--- a/fb/fbstipple.c
+++ b/fb/fbstipple.c
@@ -56,7 +56,7 @@
  * Repeat a transparent stipple across a scanline n times
  */
 
-void
+_X_EXPORT void
 fbTransparentSpan (FbBits   *dst,
 		   FbBits   stip,
 		   FbBits   fgxor,
@@ -80,7 +80,7 @@ fbTransparentSpan (FbBits   *dst,
 }
 #endif
 
-void
+_X_EXPORT void
 fbEvenStipple (FbBits	*dst,
 	       FbStride	dstStride,
 	       int	dstX,
@@ -213,7 +213,7 @@ fbEvenStipple (FbBits	*dst,
     }
 }
 
-void
+_X_EXPORT void
 fbOddStipple (FbBits	*dst,
 	      FbStride	dstStride,
 	      int	dstX,
@@ -278,7 +278,7 @@ fbOddStipple (FbBits	*dst,
     }
 }
 
-void
+_X_EXPORT void
 fbStipple (FbBits	*dst,
 	   FbStride	dstStride,
 	   int		dstX,
diff --git a/fb/fbtile.c b/fb/fbtile.c
index 05a27a17b..62d326625 100644
--- a/fb/fbtile.c
+++ b/fb/fbtile.c
@@ -31,7 +31,7 @@
  * than FB_UNIT
  */
 
-void
+_X_EXPORT void
 fbEvenTile (FbBits	*dst,
 	    FbStride	dstStride,
 	    int		dstX,
@@ -107,7 +107,7 @@ fbEvenTile (FbBits	*dst,
     }
 }
 	    
-void
+_X_EXPORT void
 fbOddTile(FbBits    *dst,
 	  FbStride  dstStride,
 	  int	    dstX,
@@ -172,7 +172,7 @@ fbOddTile(FbBits    *dst,
     }
 }
 
-void
+_X_EXPORT void
 fbTile (FbBits	    *dst,
 	FbStride    dstStride,
 	int	    dstX,
diff --git a/fb/fbtrap.c b/fb/fbtrap.c
index 830603ae7..ab64701ec 100644
--- a/fb/fbtrap.c
+++ b/fb/fbtrap.c
@@ -33,7 +33,7 @@
 #include "renderedge.h"
 #include "fbpict.h"
 
-void
+_X_EXPORT void
 fbAddTraps (PicturePtr	pPicture,
 	    INT16	x_off,
 	    INT16	y_off,
@@ -50,7 +50,7 @@ fbAddTraps (PicturePtr	pPicture,
     free_pixman_pict (pPicture, image);
 }
 
-void
+_X_EXPORT void
 fbRasterizeTrapezoid (PicturePtr    pPicture,
 		      xTrapezoid  *trap,
 		      int	    x_off,
@@ -92,7 +92,7 @@ _Clockwise (xPointFixed *ref, xPointFixed *a, xPointFixed *b)
 }
 
 /* FIXME -- this could be made more efficient */
-void
+_X_EXPORT void
 fbAddTriangles (PicturePtr  pPicture,
 		INT16	    x_off,
 		INT16	    y_off,
diff --git a/fb/fbutil.c b/fb/fbutil.c
index 5e232971e..db1f5a3f3 100644
--- a/fb/fbutil.c
+++ b/fb/fbutil.c
@@ -26,7 +26,7 @@
 
 #include "fb.h"
 
-FbBits
+_X_EXPORT FbBits
 fbReplicatePixel (Pixel p, int bpp)
 {
     FbBits  b = p;
@@ -40,7 +40,7 @@ fbReplicatePixel (Pixel p, int bpp)
     return b;
 }
 
-void
+_X_EXPORT void
 fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp)
 {
     FbBits	and, xor;
@@ -122,7 +122,7 @@ fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp)
 #define O 0
 #define I FB_ALLONES
 
-const FbMergeRopRec FbMergeRopBits[16] = {
+_X_EXPORT const FbMergeRopRec FbMergeRopBits[16] = {
     { O,O,O,O },   /* clear	    0x0		0 */
     { I,O,O,O },   /* and	    0x1		src AND dst */
     { I,O,I,O },   /* andReverse    0x2		src AND NOT dst */
@@ -180,20 +180,20 @@ const FbMergeRopRec FbMergeRopBits[16] = {
 #if FB_UNIT == 16
 #define fbStipple16Bits 0
 #define fbStipple8Bits 0
-const FbBits fbStipple4Bits[16] = {
+_X_EXPORT const FbBits fbStipple4Bits[16] = {
     C4(  0,4), C4(  1,4), C4(  2,4), C4(  3,4), C4(  4,4), C4(  5,4),
     C4(  6,4), C4(  7,4), C4(  8,4), C4(  9,4), C4( 10,4), C4( 11,4),
     C4( 12,4), C4( 13,4), C4( 14,4), C4( 15,4),};
-const FbBits fbStipple2Bits[4] = {
+_X_EXPORT const FbBits fbStipple2Bits[4] = {
     C2(  0,8), C2(  1,8), C2(  2,8), C2(  3,8),
 };
-const FbBits fbStipple1Bits[2] = {
+_X_EXPORT const FbBits fbStipple1Bits[2] = {
     C1(  0,16), C1(  1,16),
 };
 #endif
 #if FB_UNIT == 32
 #define fbStipple16Bits 0
-const FbBits fbStipple8Bits[256] = {
+_X_EXPORT const FbBits fbStipple8Bits[256] = {
     C8(  0,4), C8(  1,4), C8(  2,4), C8(  3,4), C8(  4,4), C8(  5,4),
     C8(  6,4), C8(  7,4), C8(  8,4), C8(  9,4), C8( 10,4), C8( 11,4),
     C8( 12,4), C8( 13,4), C8( 14,4), C8( 15,4), C8( 16,4), C8( 17,4),
@@ -238,19 +238,19 @@ const FbBits fbStipple8Bits[256] = {
     C8(246,4), C8(247,4), C8(248,4), C8(249,4), C8(250,4), C8(251,4),
     C8(252,4), C8(253,4), C8(254,4), C8(255,4),
 };
-const FbBits fbStipple4Bits[16] = {
+_X_EXPORT const FbBits fbStipple4Bits[16] = {
     C4(  0,8), C4(  1,8), C4(  2,8), C4(  3,8), C4(  4,8), C4(  5,8),
     C4(  6,8), C4(  7,8), C4(  8,8), C4(  9,8), C4( 10,8), C4( 11,8),
     C4( 12,8), C4( 13,8), C4( 14,8), C4( 15,8),};
-const FbBits fbStipple2Bits[4] = {
+_X_EXPORT const FbBits fbStipple2Bits[4] = {
     C2(  0,16), C2(  1,16), C2(  2,16), C2(  3,16),
 };
-const FbBits fbStipple1Bits[2] = {
+_X_EXPORT const FbBits fbStipple1Bits[2] = {
     C1(  0,32), C1(  1,32),
 };
 #endif
 #if FB_UNIT == 64
-const FbBits fbStipple16Bits[256] = {
+_X_EXPORT const FbBits fbStipple16Bits[256] = {
     C8(  0,4), C8(  1,4), C8(  2,4), C8(  3,4), C8(  4,4), C8(  5,4),
     C8(  6,4), C8(  7,4), C8(  8,4), C8(  9,4), C8( 10,4), C8( 11,4),
     C8( 12,4), C8( 13,4), C8( 14,4), C8( 15,4), C8( 16,4), C8( 17,4),
@@ -295,7 +295,7 @@ const FbBits fbStipple16Bits[256] = {
     C8(246,4), C8(247,4), C8(248,4), C8(249,4), C8(250,4), C8(251,4),
     C8(252,4), C8(253,4), C8(254,4), C8(255,4),
 };
-const FbBits fbStipple8Bits[256] = {
+_X_EXPORT const FbBits fbStipple8Bits[256] = {
     C8(  0,8), C8(  1,8), C8(  2,8), C8(  3,8), C8(  4,8), C8(  5,8),
     C8(  6,8), C8(  7,8), C8(  8,8), C8(  9,8), C8( 10,8), C8( 11,8),
     C8( 12,8), C8( 13,8), C8( 14,8), C8( 15,8), C8( 16,8), C8( 17,8),
@@ -340,16 +340,16 @@ const FbBits fbStipple8Bits[256] = {
     C8(246,8), C8(247,8), C8(248,8), C8(249,8), C8(250,8), C8(251,8),
     C8(252,8), C8(253,8), C8(254,8), C8(255,8),
 };
-const FbBits fbStipple4Bits[16] = {
+_X_EXPORT const FbBits fbStipple4Bits[16] = {
     C4(  0,16), C4(  1,16), C4(  2,16), C4(  3,16), C4(  4,16), C4(  5,16),
     C4(  6,16), C4(  7,16), C4(  8,16), C4(  9,16), C4( 10,16), C4( 11,16),
     C4( 12,16), C4( 13,16), C4( 14,16), C4( 15,16),};
-const FbBits fbStipple2Bits[4] = {
+_X_EXPORT const FbBits fbStipple2Bits[4] = {
     C2(  0,32), C2(  1,32), C2(  2,32), C2(  3,32),
 };
 #define fbStipple1Bits 0
 #endif
-const FbBits	* const fbStippleTable[] = {
+_X_EXPORT const FbBits	* const fbStippleTable[] = {
     0,
     fbStipple1Bits,
     fbStipple2Bits,
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 70e75a9e9..926ed4532 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -28,7 +28,7 @@
 
 #include "fb.h"
 
-Bool
+_X_EXPORT Bool
 fbCreateWindow(WindowPtr pWin)
 {
     dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(),
@@ -40,31 +40,31 @@ fbCreateWindow(WindowPtr pWin)
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 fbDestroyWindow(WindowPtr pWin)
 {
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 fbMapWindow(WindowPtr pWindow)
 {
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 fbPositionWindow(WindowPtr pWin, int x, int y)
 {
     return TRUE;
 }
 
-Bool
+_X_EXPORT Bool
 fbUnmapWindow(WindowPtr pWindow)
 {
     return TRUE;
 }
 
-void
+_X_EXPORT void
 fbCopyWindowProc (DrawablePtr	pSrcDrawable,
 		  DrawablePtr	pDstDrawable,
 		  GCPtr		pGC,
@@ -115,7 +115,7 @@ fbCopyWindowProc (DrawablePtr	pSrcDrawable,
     fbFinishAccess (pSrcDrawable);
 }
 
-void 
+_X_EXPORT void 
 fbCopyWindow(WindowPtr	    pWin, 
 	     DDXPointRec    ptOldOrg, 
 	     RegionPtr	    prgnSrc)
@@ -148,7 +148,7 @@ fbCopyWindow(WindowPtr	    pWin,
     fbValidateDrawable (&pWin->drawable);
 }
 
-Bool
+_X_EXPORT Bool
 fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
 {
     PixmapPtr	pPixmap;
@@ -201,7 +201,7 @@ fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
     return TRUE;
 }
 
-void
+_X_EXPORT void
 fbFillRegionSolid (DrawablePtr	pDrawable,
 		   RegionPtr	pRegion,
 		   FbBits	and,