Git update 8 jan 2010

29 files changed, 6 insertions, 2432 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Mode.c b/xorg-server/hw/xfree86/common/xf86Mode.c
index 4a948d752..949d4fcfa 100644
--- a/xorg-server/hw/xfree86/common/xf86Mode.c
+++ b/xorg-server/hw/xfree86/common/xf86Mode.c
@@ -941,14 +941,13 @@ xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
 ModeStatus
 xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int flags)
 {
-    ClockRangesPtr cp;
+    ClockRangePtr cp;
     int i, k, gap, minimumGap = CLOCK_TOLERANCE + 1;
     int extraFlags = 0;
     int clockIndex = -1;
     int MulFactor = 1;
     int DivFactor = 1;
     int ModePrivFlags = 0;
-    Bool allowDiv2;
     ModeStatus status = MODE_NOMODE;
 
     /* Some sanity checking */
@@ -1005,8 +1004,7 @@ xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int flags)
 		 * find a matching clock.
 		 */
     
-		allowDiv2 = (cp->strategy & LOOKUP_CLKDIV2) != 0;
-		i = xf86GetNearestClock(scrp, mode->Clock, allowDiv2,
+		i = xf86GetNearestClock(scrp, mode->Clock, 0,
 			   cp->ClockDivFactor, cp->ClockMulFactor, &k);
 		/*
 		 * If the clock is too far from the requested clock, this
@@ -1194,7 +1192,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
     int saveType;
     PixmapFormatRec *BankFormat;
     ClockRangePtr cp;
-    ClockRangesPtr storeClockRanges;
+    ClockRangePtr storeClockRanges;
     int numTimings = 0;
     range hsync[MAX_HSYNC];
     range vrefresh[MAX_VREFRESH];
@@ -1300,8 +1298,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
     }
 
     /*
-     * Store the clockRanges for later use by the VidMode extension. Must
-     * also store the strategy, since ClockDiv2 flag is stored there.
+     * Store the clockRanges for later use by the VidMode extension.
      */
     storeClockRanges = scrp->clockRanges;
     while (storeClockRanges != NULL) {
@@ -1309,11 +1306,10 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
     }
     for (cp = clockRanges; cp != NULL; cp = cp->next,
 	   	storeClockRanges = storeClockRanges->next) {
-	storeClockRanges = xnfalloc(sizeof(ClockRanges));
+	storeClockRanges = xnfalloc(sizeof(ClockRange));
 	if (scrp->clockRanges == NULL)
 	    scrp->clockRanges = storeClockRanges;
 	memcpy(storeClockRanges, cp, sizeof(ClockRange));
-	storeClockRanges->strategy = strategy;
     }
 
     /* Determine which pixmap format to pass to miScanLineWidth() */
diff --git a/xorg-server/hw/xfree86/common/xf86str.h b/xorg-server/hw/xfree86/common/xf86str.h
index 7b0b758d4..de1f1b60a 100644
--- a/xorg-server/hw/xfree86/common/xf86str.h
+++ b/xorg-server/hw/xfree86/common/xf86str.h
@@ -241,20 +241,6 @@ typedef struct x_ClockRange {
     int			PrivFlags;
 } ClockRange, *ClockRangePtr;
 
-/* Need to store the strategy with clockRange for VidMode extension */
-typedef struct x_ClockRanges {
-    struct x_ClockRanges *next;
-    int			minClock;
-    int			maxClock;
-    int			clockIndex;	/* -1 for programmable clocks */
-    Bool		interlaceAllowed;
-    Bool		doubleScanAllowed;
-    int			ClockMulFactor;
-    int			ClockDivFactor;
-    int			PrivFlags;
-    int			strategy;
-} ClockRanges, *ClockRangesPtr;
-
 /*
  * The driverFunc. xorgDriverFuncOp specifies the action driver should
  * perform. If requested option is not supported function should return
@@ -786,7 +772,7 @@ typedef struct _ScrnInfoRec {
     Bool		silkenMouse;
 
     /* Storage for clockRanges and adjustFlags for use with the VidMode ext */
-    ClockRangesPtr	clockRanges;
+    ClockRangePtr	clockRanges;
     int			adjustFlags;
 
     /*
diff --git a/xorg-server/hw/xfree86/libxorg.c b/xorg-server/hw/xfree86/libxorg.c
deleted file mode 100644
index e69de29bb..000000000
--- a/xorg-server/hw/xfree86/libxorg.c
+++ /dev/null
diff --git a/xorg-server/hw/xfree86/loader/sdksyms.c b/xorg-server/hw/xfree86/loader/sdksyms.c
deleted file mode 100644
index 022ec73a9..000000000
--- a/xorg-server/hw/xfree86/loader/sdksyms.c
+++ /dev/null
@@ -1,2344 +0,0 @@
-/* This file is automatically generated by sdksyms.sh. */
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-
-/* These must be included first */
-#include "misc.h"
-#include "miscstruct.h"
-
-
-/* render/Makefile.am */
-#include "picture.h"
-#include "mipict.h"
-#include "glyphstr.h"
-#include "picturestr.h"
-#include "renderedge.h"
-
-
-/* fb/Makefile.am -- module */
-/*
-#include "fb.h"
-#include "fbrop.h"
-#include "fboverlay.h"
-#include "wfbrename.h"
-#include "fbpict.h"
- */
-
-
-/* miext/shadow/Makefile.am -- module */
-/*
-#include "shadow.h"
- */
-
-
-/* miext/damage/Makefile.am */
-#include "damage.h"
-#include "damagestr.h"
-
-
-/* Xext/Makefile.am -- half is module, half is builtin */
-/*
-#include "xvdix.h"
-#include "xvmcext.h"
- */
-#include "geext.h"
-#include "geint.h"
-#include "shmint.h"
-#if XINERAMA
-# include "panoramiXsrv.h"
-# include "panoramiX.h"
-#endif
-
-
-/* hw/xfree86/int10/Makefile.am -- module */
-/*
-#include "xf86int10.h"
- */
-
-
-/* hw/xfree86/i2c/Makefile.am -- "mostly" modules */
-#include "xf86i2c.h"
-/*
-#include "bt829.h"
-#include "fi1236.h"
-#include "msp3430.h"
-#include "tda8425.h"
-#include "tda9850.h"
-#include "tda9885.h"
-#include "uda1380.h"
-#include "i2c_def.h"
- */
-
-
-/* hw/xfree86/modes/Makefile.am */
-#include "xf86Crtc.h"
-#include "xf86Modes.h"
-#include "xf86RandR12.h"
-/* #include "xf86Rename.h" */
-
-
-/* hw/xfree86/ddc/Makefile.am */
-#include "edid.h"
-#include "xf86DDC.h"
-
-
-/* hw/xfree86/dri2/Makefile.am -- module */
-/*
-#if DRI2
-# include "dri2.h"
-#endif
- */
-
-
-/* hw/xfree86/vgahw/Makefile.am -- module */
-/*
-#include "vgaHW.h"
- */
-
-
-/* hw/xfree86/fbdevhw/Makefile.am -- module */
-/*
-#include "fbdevhw.h"
- */
-
-
-/* hw/xfree86/common/Makefile.am */
-#include "compiler.h"
-#include "fourcc.h"
-#include "xf86.h"
-#include "xf86Module.h"
-#include "xf86Opt.h"
-#include "xf86PciInfo.h"
-#include "xf86Priv.h"
-#include "xf86Privstr.h"
-#include "xf86cmap.h"
-#include "xf86fbman.h"
-#include "xf86str.h"
-#include "xf86Xinput.h"
-#include "xf86VGAarbiter.h"
-#include "xisb.h"
-#if XV
-# include "xf86xv.h"
-# include "xf86xvmc.h"
-# include "xf86xvpriv.h"
-#endif
-/* XF86VidMode code is in libextmod module */
-/*
-#if XF86VIDMODE
-# include "vidmodeproc.h"
-#endif
- */
-#include "xorgVersion.h"
-#if defined(__sparc__) || defined(__sparc)
-# include "xf86sbusBus.h"
-#endif
-
-
-/* hw/xfree86/ramdac/Makefile.am */
-#include "BT.h"
-#include "IBM.h"
-#include "TI.h"
-#include "xf86Cursor.h"
-#include "xf86RamDac.h"
-
-
-/* hw/xfree86/shadowfb/Makefile.am -- module */
-/*
-#include "shadowfb.h"
- */
-
-
-/* hw/xfree86/os-support/solaris/Makefile.am */
-#if defined(sun386)
-# include "agpgart.h"
-#endif
-
-
-/* hw/xfree86/os-support/Makefile.am */
-#include "xf86_OSproc.h"
-#include "xf86_OSlib.h"
-
-
-/* hw/xfree86/os-support/bus/Makefile.am */
-#include "xf86Pci.h"
-#if defined(__sparc__) || defined(__sparc)
-# include "xf86Sbus.h"
-#endif
-
-
-/* hw/xfree86/xaa/Makefile.am -- module */
-/*
-#include "xaa.h"
-#include "xaalocal.h"
-#include "xaarop.h"
-#include "xaaWrapper.h"
- */
-
-
-/* hw/xfree86/dixmods/extmod/Makefile.am -- module */
-/*
-#include "dgaproc.h"
- */
-
-
-/* hw/xfree86/parser/Makefile.am */
-#include "xf86Parser.h"
-#include "xf86Optrec.h"
-
-
-/* hw/xfree86/vbe/Makefile.am -- module */
-/*
-#include "vbe.h"
-#include "vbeModes.h"
- */
-
-
-/* hw/xfree86/dri/Makefile.am -- module */
-/*
-#if XF86DRI
-# include "dri.h"
-# include "sarea.h"
-# include "dristruct.h"
-#endif
- */
-
-
-/* hw/xfree86/xf8_16bpp/Makefile.am -- module */
-/*
-#include "cfb8_16.h"
- */
-
-
-/* mi/Makefile.am */
-#include "mibank.h"
-#include "micmap.h"
-#include "miline.h"
-#include "mipointer.h"
-#include "mi.h"
-#include "mibstore.h"
-#include "migc.h"
-#include "mipointrst.h"
-#include "mizerarc.h"
-#include "micoord.h"
-#include "mifillarc.h"
-#include "mispans.h"
-#include "miwideline.h"
-#include "mistruct.h"
-#include "mifpoly.h"
-#include "mioverlay.h"
-
-
-/* randr/Makefile.am */
-#include "randrstr.h"
-#include "rrtransform.h"
-
-
-/* dbe/Makefile.am -- module */
-/*
-#include "dbestruct.h"
- */
-
-
-/* exa/Makefile.am -- module */
-/*
-#include "exa.h"
- */
-
-
-/* xfixes/Makefile.am */
-#include "xfixes.h"
-
-
-/* include/Makefile.am */
-#include "XIstubs.h"
-#include "bstore.h"
-#include "bstorestr.h"
-#include "closestr.h"
-#include "closure.h"
-#include "colormap.h"
-#include "colormapst.h"
-#include "hotplug.h"
-#include "cursor.h"
-#include "cursorstr.h"
-#include "dix.h"
-#include "dixaccess.h"
-#include "dixevents.h"
-#include "dixfont.h"
-#include "dixfontstr.h"
-#include "dixgrabs.h"
-#include "dixstruct.h"
-#include "exevents.h"
-#include "extension.h"
-#include "extinit.h"
-#include "extnsionst.h"
-#include "gc.h"
-#include "gcstruct.h"
-#include "globals.h"
-#include "input.h"
-#include "inputstr.h"
-/* already included */
-/*
-#include "misc.h"
-#include "miscstruct.h"
- */
-#include "opaque.h"
-#include "os.h"
-#include "pixmap.h"
-#include "pixmapstr.h"
-#include "privates.h"
-#include "property.h"
-#include "propertyst.h"
-#include "ptrveloc.h"
-#include "region.h"
-#include "regionstr.h"
-#include "registry.h"
-#include "resource.h"
-#include "rgb.h"
-#include "screenint.h"
-#include "scrnintstr.h"
-#include "selection.h"
-#include "servermd.h"
-#include "site.h"
-#include "swaprep.h"
-#include "swapreq.h"
-#include "validate.h"
-#include "window.h"
-#include "windowstr.h"
-#include "xace.h"
-#include "xkbfile.h"
-#include "xkbsrv.h"
-#include "xkbstr.h"
-#include "xkbrules.h"
-#include "xserver-properties.h"
-
-/*
- * These symbols are referenced to ensure they
- * will be available in the X Server binary.
- */
-/* topdir=../../.. */
-_X_HIDDEN void *xorg_symbols[] = {
-    (void *) &WaitForSomething,
-    (void *) &ReadRequestFromClient,
-    (void *) &InsertFakeRequest,
-    (void *) &ResetCurrentRequest,
-    (void *) &FlushAllOutput,
-    (void *) &FlushIfCriticalOutputPending,
-    (void *) &SetCriticalOutputPending,
-    (void *) &WriteToClient,
-    (void *) &ResetOsBuffers,
-    (void *) &InitConnectionLimits,
-    (void *) &NotifyParentProcess,
-    (void *) &CreateWellKnownSockets,
-    (void *) &ResetWellKnownSockets,
-    (void *) &CloseWellKnownConnections,
-    (void *) &AuthorizationIDOfClient,
-    (void *) &ClientAuthorized,
-    (void *) &EstablishNewConnections,
-    (void *) &CheckConnections,
-    (void *) &CloseDownConnection,
-    (void *) &AddGeneralSocket,
-    (void *) &RemoveGeneralSocket,
-    (void *) &AddEnabledDevice,
-    (void *) &RemoveEnabledDevice,
-    (void *) &OnlyListenToOneClient,
-    (void *) &ListenToAllClients,
-    (void *) &IgnoreClient,
-    (void *) &AttendClient,
-    (void *) &MakeClientGrabImpervious,
-    (void *) &MakeClientGrabPervious,
-    (void *) &GetTimeInMillis,
-    (void *) &AdjustWaitForDelay,
-    (void *) &TimerInit,
-    (void *) &TimerForce,
-    (void *) &TimerSet,
-    (void *) &TimerCheck,
-    (void *) &TimerCancel,
-    (void *) &TimerFree,
-    (void *) &SetScreenSaverTimer,
-    (void *) &FreeScreenSaverTimer,
-    (void *) &AutoResetServer,
-    (void *) &GiveUp,
-    (void *) &UseMsg,
-    (void *) &ProcessCommandLine,
-    (void *) &set_font_authorizations,
-    (void *) &Xalloc,
-    (void *) &Xcalloc,
-    (void *) &Xrealloc,
-    (void *) &Xfree,
-    (void *) &XNFalloc,
-    (void *) &XNFcalloc,
-    (void *) &XNFrealloc,
-    (void *) &Xstrdup,
-    (void *) &XNFstrdup,
-    (void *) &Xprintf,
-    (void *) &Xvprintf,
-    (void *) &XNFprintf,
-    (void *) &XNFvprintf,
-    (void *) &OsSignal,
-    (void *) &OsRegisterSigWrapper,
-    (void *) &auditTrailLevel,
-    (void *) &LockServer,
-    (void *) &UnlockServer,
-    (void *) &OsLookupColor,
-    (void *) &OsInit,
-    (void *) &OsCleanup,
-    (void *) &OsVendorFatalError,
-    (void *) &OsVendorInit,
-    (void *) &OsBlockSignals,
-    (void *) &OsReleaseSignals,
-    (void *) &System,
-    (void *) &Popen,
-    (void *) &Pclose,
-    (void *) &Fopen,
-    (void *) &Fclose,
-    (void *) &CheckUserParameters,
-    (void *) &CheckUserAuthorization,
-    (void *) &AddHost,
-    (void *) &ForEachHostInFamily,
-    (void *) &RemoveHost,
-    (void *) &GetHosts,
-    (void *) &InvalidHost,
-    (void *) &LocalClient,
-    (void *) &LocalClientCred,
-    (void *) &GetLocalClientCreds,
-    (void *) &FreeLocalClientCreds,
-    (void *) &ChangeAccessControl,
-    (void *) &GetAccessControl,
-    (void *) &AddLocalHosts,
-    (void *) &ResetHosts,
-    (void *) &EnableLocalHost,
-    (void *) &DisableLocalHost,
-    (void *) &AccessUsingXdmcp,
-    (void *) &DefineSelf,
-    (void *) &AugmentSelf,
-    (void *) &RegisterAuthorizations,
-    (void *) &InitAuthorization,
-    (void *) &AuthorizationFromID,
-    (void *) &CheckAuthorization,
-    (void *) &ResetAuthorization,
-    (void *) &RemoveAuthorization,
-    (void *) &AddAuthorization,
-    (void *) &ddxProcessArgument,
-    (void *) &ddxUseMsg,
-    (void *) &ReplyCallback,
-    (void *) &FlushCallback,
-    (void *) &AbortDDX,
-    (void *) &ddxGiveUp,
-    (void *) &TimeSinceLastInputEvent,
-    (void *) &strlcpy,
-    (void *) &strlcat,
-    (void *) &LogInit,
-    (void *) &LogClose,
-    (void *) &LogSetParameter,
-    (void *) &LogVWrite,
-    (void *) &LogWrite,
-    (void *) &LogVMessageVerb,
-    (void *) &LogMessageVerb,
-    (void *) &LogMessage,
-    (void *) &FreeAuditTimer,
-    (void *) &AuditF,
-    (void *) &VAuditF,
-    (void *) &FatalError,
-    (void *) &VErrorF,
-    (void *) &ErrorF,
-    (void *) &Error,
-    (void *) &LogPrintMarkers,
-    (void *) &xorg_backtrace,
-    (void *) &SwapLongs,
-    (void *) &SwapShorts,
-    (void *) &MakePredeclaredAtoms,
-    (void *) &Ones,
-    (void *) &globalSerialNumber,
-    (void *) &serverGeneration,
-    (void *) &AddScreen,
-    (void *) &GetScratchPixmapHeader,
-    (void *) &FreeScratchPixmapHeader,
-    (void *) &CreateScratchPixmapsForScreen,
-    (void *) &FreeScratchPixmapsForScreen,
-    (void *) &AllocatePixmap,
-    (void *) &ValidateGC,
-    (void *) &ChangeGC,
-    (void *) &DoChangeGC,
-    (void *) &dixChangeGC,
-    (void *) &CreateGC,
-    (void *) &CopyGC,
-    (void *) &FreeGC,
-    (void *) &CreateScratchGC,
-    (void *) &FreeGCperDepth,
-    (void *) &CreateGCperDepth,
-    (void *) &CreateDefaultStipple,
-    (void *) &FreeDefaultStipple,
-    (void *) &SetDashes,
-    (void *) &VerifyRectOrder,
-    (void *) &SetClipRects,
-    (void *) &GetScratchGC,
-    (void *) &FreeScratchGC,
-    (void *) &miEmptyBox,
-    (void *) &miEmptyData,
-    (void *) &miBrokenData,
-    (void *) &InitRegions,
-    (void *) &miRegionCreate,
-    (void *) &miRegionInit,
-    (void *) &miRegionDestroy,
-    (void *) &miRegionUninit,
-    (void *) &miRegionCopy,
-    (void *) &miIntersect,
-    (void *) &miUnion,
-    (void *) &miRegionAppend,
-    (void *) &miRegionValidate,
-    (void *) &miRectsToRegion,
-    (void *) &miSubtract,
-    (void *) &miInverse,
-    (void *) &miRectIn,
-    (void *) &miTranslateRegion,
-    (void *) &miRegionReset,
-    (void *) &miRegionBreak,
-    (void *) &miPointInRegion,
-    (void *) &miRegionEqual,
-    (void *) &miRegionNotEmpty,
-    (void *) &miRegionEmpty,
-    (void *) &miRegionExtents,
-    (void *) &miPrintRegion,
-    (void *) &TraverseTree,
-    (void *) &WalkTree,
-    (void *) &CreateRootWindow,
-    (void *) &InitRootWindow,
-    (void *) &RegisterRealChildHeadProc,
-    (void *) &RealChildHead,
-    (void *) &CreateWindow,
-    (void *) &DeleteWindow,
-    (void *) &DestroySubwindows,
-    (void *) &ChangeWindowAttributes,
-    (void *) &ChangeWindowDeviceCursor,
-    (void *) &WindowGetDeviceCursor,
-    (void *) &GetWindowAttributes,
-    (void *) &GravityTranslate,
-    (void *) &ConfigureWindow,
-    (void *) &CirculateWindow,
-    (void *) &ReparentWindow,
-    (void *) &MapWindow,
-    (void *) &MapSubwindows,
-    (void *) &UnmapWindow,
-    (void *) &UnmapSubwindows,
-    (void *) &HandleSaveSet,
-    (void *) &PointInWindowIsVisible,
-    (void *) &NotClippedByChildren,
-    (void *) &SendVisibilityNotify,
-    (void *) &dixSaveScreens,
-    (void *) &SaveScreens,
-    (void *) &FindWindowWithOptional,
-    (void *) &CheckWindowOptionalNeed,
-    (void *) &MakeWindowOptional,
-    (void *) &MoveWindowInStack,
-    (void *) &SetWinSize,
-    (void *) &SetBorderSize,
-    (void *) &ResizeChildrenWinSize,
-    (void *) &ShapeExtensionInit,
-    (void *) &SendShapeNotify,
-    (void *) &CreateBoundingShape,
-    (void *) &CreateClipShape,
-    (void *) &DisableMapUnmapEvents,
-    (void *) &EnableMapUnmapEvents,
-    (void *) &XkbRF_GetComponents,
-    (void *) &XkbRF_LoadRules,
-    (void *) &XkbRF_LoadRulesByName,
-    (void *) &XkbRF_Create,
-    (void *) &XkbRF_Free,
-    (void *) &InputEventList,
-    (void *) &InputEventListLen,
-    (void *) &defaultKeyboardControl,
-    (void *) &defaultPointerControl,
-    (void *) &set_key_down,
-    (void *) &set_key_up,
-    (void *) &key_is_down,
-    (void *) &InitCoreDevices,
-    (void *) &InitXTestDevices,
-    (void *) &AddInputDevice,
-    (void *) &EnableDevice,
-    (void *) &ActivateDevice,
-    (void *) &DisableDevice,
-    (void *) &InitAndStartDevices,
-    (void *) &CloseDownDevices,
-    (void *) &UndisplayDevices,
-    (void *) &RemoveDevice,
-    (void *) &NumMotionEvents,
-    (void *) &RegisterPointerDevice,
-    (void *) &RegisterKeyboardDevice,
-    (void *) &dixLookupDevice,
-    (void *) &QueryMinMaxKeyCodes,
-    (void *) &SetKeySymsMap,
-    (void *) &InitButtonClassDeviceStruct,
-    (void *) &InitValuatorClassDeviceStruct,
-    (void *) &InitPointerAccelerationScheme,
-    (void *) &InitAbsoluteClassDeviceStruct,
-    (void *) &InitFocusClassDeviceStruct,
-    (void *) &InitPtrFeedbackClassDeviceStruct,
-    (void *) &InitStringFeedbackClassDeviceStruct,
-    (void *) &InitBellFeedbackClassDeviceStruct,
-    (void *) &InitLedFeedbackClassDeviceStruct,
-    (void *) &InitIntegerFeedbackClassDeviceStruct,
-    (void *) &InitPointerDeviceStruct,
-    (void *) &InitKeyboardDeviceStruct,
-    (void *) &ApplyPointerMapping,
-    (void *) &BadDeviceMap,
-    (void *) &NoteLedState,
-    (void *) &MaybeStopHint,
-    (void *) &ProcessPointerEvent,
-    (void *) &ProcessKeyboardEvent,
-    (void *) &LegalModifier,
-    (void *) &ProcessInputEvents,
-    (void *) &InitInput,
-    (void *) &GetMaximumEventsNum,
-    (void *) &GetEventList,
-    (void *) &InitEventList,
-    (void *) &FreeEventList,
-    (void *) &CreateClassesChangedEvent,
-    (void *) &GetPointerEvents,
-    (void *) &GetKeyboardEvents,
-    (void *) &GetKeyboardValuatorEvents,
-    (void *) &GetProximityEvents,
-    (void *) &PostSyntheticMotion,
-    (void *) &GetMotionHistorySize,
-    (void *) &AllocateMotionHistory,
-    (void *) &GetMotionHistory,
-    (void *) &AttachDevice,
-    (void *) &GetPairedDevice,
-    (void *) &GetMaster,
-    (void *) &AllocDevicePair,
-    (void *) &DeepCopyDeviceClasses,
-    (void *) &generate_modkeymap,
-    (void *) &change_modmap,
-    (void *) &AllocXTestDevice,
-    (void *) &IsXTestDevice,
-    (void *) &GetXTestDevice,
-    (void *) &SendDevicePresenceEvent,
-    (void *) &GetEventFilter,
-    (void *) &GetWindowXI2Mask,
-    (void *) &NewInputDeviceRequest,
-    (void *) &DeleteInputDeviceRequest,
-    (void *) &DDXRingBell,
-    (void *) &EnableCursor,
-    (void *) &cursorScreenDevPriv,
-    (void *) &rootCursor,
-    (void *) &FreeCursor,
-    (void *) &AllocARGBCursor,
-    (void *) &AllocGlyphCursor,
-    (void *) &CreateRootCursor,
-    (void *) &ServerBitsFromGlyph,
-    (void *) &CursorMetricsFromGlyph,
-    (void *) &CheckCursorConfinement,
-    (void *) &NewCurrentScreen,
-    (void *) &PointerConfinedToScreen,
-    (void *) &GetSpritePosition,
-    (void *) &XineramaGetCursorScreen,
-    (void *) &GEExtensions,
-    (void *) &GERegisterExtension,
-    (void *) &GEInitEvent,
-    (void *) &GEExtensionInit,
-    (void *) &clients,
-    (void *) &serverClient,
-    (void *) &currentMaxClients,
-    (void *) &dispatchExceptionAtReset,
-    (void *) &checkForInput,
-    (void *) &SetInputCheck,
-    (void *) &CloseDownClient,
-    (void *) &UpdateCurrentTime,
-    (void *) &UpdateCurrentTimeIf,
-    (void *) &dixDestroyPixmap,
-    (void *) &InitClient,
-    (void *) &NextAvailableClient,
-    (void *) &SendErrorToClient,
-    (void *) &MarkClientException,
-    (void *) &CreateConnectionBlock,
-    (void *) &CompareISOLatin1Lowered,
-    (void *) &dixLookupWindow,
-    (void *) &dixLookupDrawable,
-    (void *) &dixLookupGC,
-    (void *) &dixLookupClient,
-    (void *) &NoopDDA,
-    (void *) &AlterSaveSetForClient,
-    (void *) &DeleteWindowFromAnySaveSet,
-    (void *) &BlockHandler,
-    (void *) &WakeupHandler,
-    (void *) &RegisterBlockAndWakeupHandlers,
-    (void *) &RemoveBlockAndWakeupHandlers,
-    (void *) &InitBlockAndWakeupHandlers,
-    (void *) &ProcessWorkQueue,
-    (void *) &ProcessWorkQueueZombies,
-    (void *) &QueueWorkProc,
-    (void *) &ClientSleep,
-    (void *) &ClientSignal,
-    (void *) &ClientWakeup,
-    (void *) &ClientIsAsleep,
-    (void *) &MakeAtom,
-    (void *) &ValidAtom,
-    (void *) &NameForAtom,
-    (void *) &AtomError,
-    (void *) &FreeAllAtoms,
-    (void *) &InitAtoms,
-    (void *) &SetVendorRelease,
-    (void *) &SetVendorString,
-    (void *) &SetMaskForEvent,
-    (void *) &ConfineToShape,
-    (void *) &IsParent,
-    (void *) &GetCurrentRootWindow,
-    (void *) &GetSpriteWindow,
-    (void *) &NoticeEventTime,
-    (void *) &EnqueueEvent,
-    (void *) &ActivatePointerGrab,
-    (void *) &DeactivatePointerGrab,
-    (void *) &ActivateKeyboardGrab,
-    (void *) &DeactivateKeyboardGrab,
-    (void *) &ActivateFocusInGrab,
-    (void *) &AllowSome,
-    (void *) &ReleaseActiveGrabs,
-    (void *) &DeliverEventsToWindow,
-    (void *) &DeliverDeviceEvents,
-    (void *) &InitializeSprite,
-    (void *) &UpdateSpriteForScreen,
-    (void *) &WindowHasNewCursor,
-    (void *) &CheckDeviceGrabs,
-    (void *) &DeliverFocusedEvent,
-    (void *) &DeliverGrabbedEvent,
-    (void *) &FixKeyState,
-    (void *) &RecalculateDeliverableEvents,
-    (void *) &OtherClientGone,
-    (void *) &DoFocusEvents,
-    (void *) &SetInputFocus,
-    (void *) &GrabDevice,
-    (void *) &InitEvents,
-    (void *) &CloseDownEvents,
-    (void *) &DeleteWindowFromAnyEvents,
-    (void *) &EventMaskForClient,
-    (void *) &DeliverEvents,
-    (void *) &CheckMotion,
-    (void *) &WriteEventsToClient,
-    (void *) &TryClientEvents,
-    (void *) &WindowsRestructured,
-    (void *) &SetClientPointer,
-    (void *) &PickPointer,
-    (void *) &PickKeyboard,
-    (void *) &IsInterferingGrab,
-    (void *) &ReinitializeRootWindow,
-    (void *) &ScreenRestructured,
-    (void *) &ffs,
-    (void *) &AddCallback,
-    (void *) &DeleteCallback,
-    (void *) &CallCallbacks,
-    (void *) &DeleteCallbackList,
-    (void *) &InitCallbackManager,
-    (void *) &ServerGrabCallback,
-    (void *) &EventCallback,
-    (void *) &DeviceEventCallback,
-    (void *) &XItoCoreType,
-    (void *) &DevHasCursor,
-    (void *) &IsPointerDevice,
-    (void *) &IsKeyboardDevice,
-    (void *) &IsPointerEvent,
-    (void *) &IsMaster,
-    (void *) &CopyKeyClass,
-    (void *) &CorePointerProc,
-    (void *) &CoreKeyboardProc,
-    (void *) &SecurityLookupWindow,
-    (void *) &LookupWindow,
-    (void *) &SecurityLookupDrawable,
-    (void *) &LookupDrawable,
-    (void *) &LookupClient,
-    (void *) &ResourceStateCallback,
-    (void *) &CreateNewResourceType,
-    (void *) &CreateNewResourceClass,
-    (void *) &InitClientResources,
-    (void *) &FakeClientID,
-    (void *) &AddResource,
-    (void *) &FreeResource,
-    (void *) &FreeResourceByType,
-    (void *) &ChangeResourceValue,
-    (void *) &FindClientResourcesByType,
-    (void *) &FindAllClientResources,
-    (void *) &FreeClientNeverRetainResources,
-    (void *) &FreeClientResources,
-    (void *) &FreeAllResources,
-    (void *) &LegalNewID,
-    (void *) &LookupClientResourceComplex,
-    (void *) &dixLookupResourceByType,
-    (void *) &dixLookupResourceByClass,
-    (void *) &GetXIDRange,
-    (void *) &GetXIDList,
-    (void *) &lastResourceType,
-    (void *) &TypeMask,
-    (void *) &SecurityLookupIDByType,
-    (void *) &SecurityLookupIDByClass,
-    (void *) &LookupIDByType,
-    (void *) &LookupIDByClass,
-    (void *) &dixRequestPrivate,
-    (void *) &dixAllocatePrivate,
-    (void *) &dixLookupPrivate,
-    (void *) &dixLookupPrivateAddr,
-    (void *) &dixSetPrivate,
-    (void *) &dixRegisterPrivateInitFunc,
-    (void *) &dixRegisterPrivateDeleteFunc,
-    (void *) &dixFreePrivates,
-    (void *) &dixResetPrivates,
-    (void *) &dixLookupPrivateOffset,
-    (void *) &dixRegisterPrivateOffset,
-    (void *) &PictureCmapPolicy,
-    (void *) &PictureParseCmapPolicy,
-    (void *) &RenderErrBase,
-    (void *) &RenderClientPrivateKey,
-    (void *) &CreateColormap,
-    (void *) &FreeColormap,
-    (void *) &TellLostMap,
-    (void *) &TellGainedMap,
-    (void *) &CopyColormapAndFree,
-    (void *) &AllocColor,
-    (void *) &FakeAllocColor,
-    (void *) &FakeFreeColor,
-    (void *) &FindColor,
-    (void *) &QueryColors,
-    (void *) &FreeClientPixels,
-    (void *) &AllocColorCells,
-    (void *) &AllocColorPlanes,
-    (void *) &FreeColors,
-    (void *) &StoreColors,
-    (void *) &IsMapInstalled,
-    (void *) &ResizeVisualArray,
-    (void *) &screenInfo,
-    (void *) &InitOutput,
-    (void *) &FindGlyphHashSet,
-    (void *) &GlyphUninit,
-    (void *) &FindGlyphHashSet,
-    (void *) &FindGlyphRef,
-    (void *) &FindGlyphByHash,
-    (void *) &HashGlyph,
-    (void *) &FreeGlyph,
-    (void *) &AddGlyph,
-    (void *) &DeleteGlyph,
-    (void *) &FindGlyph,
-    (void *) &AllocateGlyph,
-    (void *) &AllocateGlyphHash,
-    (void *) &ResizeGlyphHash,
-    (void *) &ResizeGlyphSet,
-    (void *) &AllocateGlyphSet,
-    (void *) &FreeGlyphSet,
-    (void *) &PictureScreenPrivateKey,
-    (void *) &PictureWindowPrivateKey,
-    (void *) &PictureType,
-    (void *) &PictFormatType,
-    (void *) &GlyphSetType,
-    (void *) &PictureDestroyWindow,
-    (void *) &PictureCloseScreen,
-    (void *) &PictureStoreColors,
-    (void *) &PictureInitIndexedFormat,
-    (void *) &PictureSetSubpixelOrder,
-    (void *) &PictureGetSubpixelOrder,
-    (void *) &PictureCreateDefaultFormats,
-    (void *) &PictureMatchVisual,
-    (void *) &PictureMatchFormat,
-    (void *) &PictureInit,
-    (void *) &PictureGetFilterId,
-    (void *) &PictureGetFilterName,
-    (void *) &PictureAddFilter,
-    (void *) &PictureSetFilterAlias,
-    (void *) &PictureSetDefaultFilters,
-    (void *) &PictureResetFilters,
-    (void *) &PictureFindFilter,
-    (void *) &SetPicturePictFilter,
-    (void *) &SetPictureFilter,
-    (void *) &PictureFinishInit,
-    (void *) &SetPictureToDefaults,
-    (void *) &CreatePicture,
-    (void *) &ChangePicture,
-    (void *) &SetPictureClipRects,
-    (void *) &SetPictureClipRegion,
-    (void *) &SetPictureTransform,
-    (void *) &CopyPicture,
-    (void *) &ValidatePicture,
-    (void *) &FreePicture,
-    (void *) &FreePictFormat,
-    (void *) &CompositePicture,
-    (void *) &CompositeGlyphs,
-    (void *) &CompositeRects,
-    (void *) &CompositeTrapezoids,
-    (void *) &CompositeTriangles,
-    (void *) &CompositeTriStrip,
-    (void *) &CompositeTriFan,
-    (void *) &PictureGradientColor,
-    (void *) &RenderExtensionInit,
-    (void *) &AddTraps,
-    (void *) &CreateSolidPicture,
-    (void *) &CreateLinearGradientPicture,
-    (void *) &CreateRadialGradientPicture,
-    (void *) &CreateConicalGradientPicture,
-    (void *) &PanoramiXRenderInit,
-    (void *) &PanoramiXRenderReset,
-    (void *) &PictTransform_from_xRenderTransform,
-    (void *) &xRenderTransform_from_PictTransform,
-    (void *) &PictureTransformPoint,
-    (void *) &PictureTransformPoint3d,
-    (void *) &miCreatePicture,
-    (void *) &miDestroyPicture,
-    (void *) &miDestroyPictureClip,
-    (void *) &miChangePictureClip,
-    (void *) &miChangePicture,
-    (void *) &miValidatePicture,
-    (void *) &miChangePictureTransform,
-    (void *) &miChangePictureFilter,
-    (void *) &miCompositeSourceValidate,
-    (void *) &miComputeCompositeRegion,
-    (void *) &miPictureInit,
-    (void *) &miRealizeGlyph,
-    (void *) &miUnrealizeGlyph,
-    (void *) &miGlyphs,
-    (void *) &miRenderColorToPixel,
-    (void *) &miRenderPixelToColor,
-    (void *) &miIsSolidAlpha,
-    (void *) &miCompositeRects,
-    (void *) &miTrapezoidBounds,
-    (void *) &miTrapezoids,
-    (void *) &miPointFixedBounds,
-    (void *) &miTriangleBounds,
-    (void *) &miTriangles,
-    (void *) &miTriStrip,
-    (void *) &miTriFan,
-    (void *) &miCreateAlphaPicture,
-    (void *) &miInitIndexed,
-    (void *) &miCloseIndexed,
-    (void *) &miUpdateIndexed,
-    (void *) &RenderSampleCeilY,
-    (void *) &RenderSampleFloorY,
-    (void *) &RenderEdgeStep,
-    (void *) &RenderEdgeInit,
-    (void *) &RenderLineFixedEdgeInit,
-    (void *) &miDamageCreate,
-    (void *) &miDamageRegister,
-    (void *) &miDamageUnregister,
-    (void *) &miDamageDestroy,
-    (void *) &DamageSetup,
-    (void *) &DamageCreate,
-    (void *) &DamageDrawInternal,
-    (void *) &DamageRegister,
-    (void *) &DamageUnregister,
-    (void *) &DamageDestroy,
-    (void *) &DamageSubtract,
-    (void *) &DamageEmpty,
-    (void *) &DamageRegion,
-    (void *) &DamagePendingRegion,
-    (void *) &DamageRegionAppend,
-    (void *) &DamageRegionProcessPending,
-    (void *) &DamageRegionRendered,
-    (void *) &DamageDamageRegion,
-    (void *) &DamageSetReportAfterOp,
-    (void *) &DamageSetPostRenderingFunctions,
-    (void *) &DamageGetScreenFuncs,
-    (void *) &ClientStateCallback,
-    (void *) &ReplyNotSwappd,
-    (void *) &SmartScheduleTime,
-    (void *) &SmartScheduleInterval,
-    (void *) &SmartScheduleSlice,
-    (void *) &SmartScheduleMaxSlice,
-    (void *) &SmartScheduleDisable,
-    (void *) &SmartScheduleStartTimer,
-    (void *) &SmartScheduleStopTimer,
-    (void *) &SmartScheduleInit,
-    (void *) &currentTime,
-    (void *) &lastDeviceEventTime,
-    (void *) &CompareTimeStamps,
-    (void *) &ClientTimeToServerTime,
-    (void *) &InitialVector,
-    (void *) &ProcVector,
-    (void *) &SwappedProcVector,
-    (void *) &ReplySwapVector,
-    (void *) &ProcBadRequest,
-    (void *) &StandardMinorOpcode,
-    (void *) &MinorOpcodeOfRequest,
-    (void *) &EnableDisableExtension,
-    (void *) &EnableDisableExtensionError,
-    (void *) &InitExtensions,
-    (void *) &CloseDownExtensions,
-    (void *) &EventSwapVector,
-    (void *) &NotImplemented,
-    (void *) &AddExtension,
-    (void *) &AddExtensionAlias,
-    (void *) &CheckExtension,
-    (void *) &GetExtensionEntry,
-    (void *) &GEEventType,
-    (void *) &GEEventBase,
-    (void *) &GEErrorBase,
-    (void *) &GEClientPrivateKey,
-    (void *) &ProcGEVector,
-    (void *) &SProcGEVector,
-    (void *) &ShmRegisterFuncs,
-    (void *) &ShmRegisterFbFuncs,
-    (void *) &ShmSegType,
-    (void *) &ShmCompletionCode,
-    (void *) &BadShmSegCode,
-    (void *) &PanoramiXNumScreens,
-    (void *) &panoramiXdataPtr,
-    (void *) &PanoramiXPixWidth,
-    (void *) &PanoramiXPixHeight,
-    (void *) &PanoramiXTranslateVisualID,
-    (void *) &PanoramiXConsolidate,
-    (void *) &PanoramiXCreateConnectionBlock,
-    (void *) &PanoramiXFindIDByScrnum,
-    (void *) &XineramaRegisterConnectionBlockCallback,
-    (void *) &XineramaDeleteResource,
-    (void *) &XineramaReinitData,
-    (void *) &XineramaScreenRegions,
-    (void *) &XRC_DRAWABLE,
-    (void *) &XRT_WINDOW,
-    (void *) &XRT_PIXMAP,
-    (void *) &XRT_GC,
-    (void *) &XRT_COLORMAP,
-    (void *) &XineramaVisualsEqualPtr,
-    (void *) &XineramaGetImageData,
-    (void *) &xf86CreateI2CBusRec,
-    (void *) &xf86DestroyI2CBusRec,
-    (void *) &xf86I2CBusInit,
-    (void *) &xf86I2CFindBus,
-    (void *) &xf86I2CGetScreenBuses,
-    (void *) &xf86CreateI2CDevRec,
-    (void *) &xf86DestroyI2CDevRec,
-    (void *) &xf86I2CDevInit,
-    (void *) &xf86I2CFindDev,
-    (void *) &xf86I2CProbeAddress,
-    (void *) &xf86I2CWriteRead,
-    (void *) &xf86I2CReadStatus,
-    (void *) &xf86I2CReadByte,
-    (void *) &xf86I2CReadBytes,
-    (void *) &xf86I2CReadWord,
-    (void *) &xf86I2CWriteByte,
-    (void *) &xf86I2CWriteBytes,
-    (void *) &xf86I2CWriteWord,
-    (void *) &xf86I2CWriteVec,
-    (void *) &ConfiguredMonitor,
-    (void *) &dixLookupProperty,
-    (void *) &dixChangeWindowProperty,
-    (void *) &ChangeWindowProperty,
-    (void *) &DeleteProperty,
-    (void *) &DeleteAllWindowProperties,
-    (void *) &defaultScreenSaverTime,
-    (void *) &defaultScreenSaverInterval,
-    (void *) &ScreenSaverTime,
-    (void *) &ScreenSaverInterval,
-    (void *) &screenSaverSuspended,
-    (void *) &defaultFontPath,
-    (void *) &monitorResolution,
-    (void *) &defaultColorVisualClass,
-    (void *) &WindowTable,
-    (void *) &GrabInProgress,
-    (void *) &noTestExtensions,
-    (void *) &dixScreenOrigins,
-    (void *) &ConnectionInfo,
-    (void *) &DPMSStandbyTime,
-    (void *) &DPMSSuspendTime,
-    (void *) &DPMSOffTime,
-    (void *) &DPMSPowerLevel,
-    (void *) &DPMSEnabled,
-    (void *) &DPMSDisabledSwitch,
-    (void *) &DPMSCapableFlag,
-    (void *) &PanoramiXExtensionDisabledHack,
-    (void *) &noCompositeExtension,
-    (void *) &noDamageExtension,
-    (void *) &noDbeExtension,
-    (void *) &noDPMSExtension,
-    (void *) &noGlxExtension,
-    (void *) &noScreenSaverExtension,
-    (void *) &noMITShmExtension,
-    (void *) &noRRExtension,
-    (void *) &noRenderExtension,
-    (void *) &noResExtension,
-    (void *) &noXFree86DGAExtension,
-    (void *) &noXFree86DRIExtension,
-    (void *) &noXFixesExtension,
-    (void *) &noPanoramiXExtension,
-    (void *) &noXvExtension,
-    (void *) &noDRI2Extension,
-    (void *) &defaultTextFont,
-    (void *) &defaultCursorFont,
-    (void *) &MaxClients,
-    (void *) &isItTimeToYield,
-    (void *) &dispatchException,
-    (void *) &TimeOutValue,
-    (void *) &ScreenSaverBlanking,
-    (void *) &ScreenSaverAllowExposures,
-    (void *) &defaultScreenSaverBlanking,
-    (void *) &defaultScreenSaverAllowExposures,
-    (void *) &display,
-    (void *) &defaultBackingStore,
-    (void *) &disableBackingStore,
-    (void *) &enableBackingStore,
-    (void *) &PartialNetwork,
-    (void *) &logoScreenSaver,
-    (void *) &defeatAccessControl,
-    (void *) &maxBigRequestSize,
-    (void *) &party_like_its_1989,
-    (void *) &whiteRoot,
-    (void *) &CoreDump,
-    (void *) &DontPropagateMasks,
-    (void *) &screenIsSaved,
-    (void *) &savedScreenInfo,
-    (void *) &PixmapWidthPaddingInfo,
-    (void *) &RRTransformInit,
-    (void *) &RRTransformFini,
-    (void *) &RRTransformEqual,
-    (void *) &RRTransformSetFilter,
-    (void *) &RRTransformCopy,
-    (void *) &RRTransformCompute,
-    (void *) &RREventBase,
-    (void *) &ProcRandrVector,
-    (void *) &SProcRandrVector,
-    (void *) &rrPrivKey,
-    (void *) &RRClientType,
-    (void *) &RRClientPrivateKey,
-    (void *) &RRCrtcType,
-    (void *) &RRExtensionInit,
-    (void *) &RRScreenSetSizeRange,
-    (void *) &RRScreenSizeNotify,
-    (void *) &RRScreenSizeSet,
-    (void *) &RRSendConfigNotify,
-    (void *) &ProcRRGetScreenSizeRange,
-    (void *) &ProcRRSetScreenSize,
-    (void *) &ProcRRGetScreenResources,
-    (void *) &ProcRRGetScreenResourcesCurrent,
-    (void *) &ProcRRSetScreenConfig,
-    (void *) &ProcRRGetScreenInfo,
-    (void *) &RRDeliverScreenEvent,
-    (void *) &miRandRInit,
-    (void *) &miRRGetInfo,
-    (void *) &miRRCrtcSet,
-    (void *) &miRROutputSetProperty,
-    (void *) &miRROutputGetProperty,
-    (void *) &miRROutputValidateMode,
-    (void *) &miRRModeDestroy,
-    (void *) &RRTellChanged,
-    (void *) &RRGetInfo,
-    (void *) &RRInit,
-    (void *) &RRScreenInit,
-    (void *) &RRFirstOutput,
-    (void *) &RRGetRotation,
-    (void *) &RRVerticalRefresh,
-    (void *) &RRRegisterSize,
-    (void *) &RRRegisterRate,
-    (void *) &RRSetCurrentConfig,
-    (void *) &RRScreenInit,
-    (void *) &RRGetRotation,
-    (void *) &RRCrtcChanged,
-    (void *) &RRCrtcCreate,
-    (void *) &RRCrtcSetRotations,
-    (void *) &RRCrtcSetTransformSupport,
-    (void *) &RRCrtcNotify,
-    (void *) &RRDeliverCrtcEvent,
-    (void *) &RRCrtcSet,
-    (void *) &RRCrtcGammaSet,
-    (void *) &RRCrtcGammaGet,
-    (void *) &RRCrtcGammaNotify,
-    (void *) &RRCrtcGammaSetSize,
-    (void *) &RRCrtcGetScanoutSize,
-    (void *) &RRTransformCompute,
-    (void *) &RRCrtcGetTransform,
-    (void *) &RRCrtcPendingTransform,
-    (void *) &RRCrtcDestroy,
-    (void *) &RRCrtcTransformSet,
-    (void *) &RRCrtcInit,
-    (void *) &ProcRRGetCrtcInfo,
-    (void *) &ProcRRSetCrtcConfig,
-    (void *) &ProcRRGetCrtcGammaSize,
-    (void *) &ProcRRGetCrtcGamma,
-    (void *) &ProcRRSetCrtcGamma,
-    (void *) &ProcRRSetCrtcTransform,
-    (void *) &ProcRRGetCrtcTransform,
-    (void *) &RRClientKnowsRates,
-    (void *) &RRModeGet,
-    (void *) &RRModeDestroy,
-    (void *) &RRModesForScreen,
-    (void *) &RRModeInit,
-    (void *) &ProcRRCreateMode,
-    (void *) &ProcRRDestroyMode,
-    (void *) &ProcRRAddOutputMode,
-    (void *) &ProcRRDeleteOutputMode,
-    (void *) &RROutputChanged,
-    (void *) &RROutputCreate,
-    (void *) &RROutputSetClones,
-    (void *) &RROutputSetModes,
-    (void *) &RROutputAddUserMode,
-    (void *) &RROutputDeleteUserMode,
-    (void *) &RROutputSetCrtcs,
-    (void *) &RROutputSetConnection,
-    (void *) &RROutputSetSubpixelOrder,
-    (void *) &RROutputSetPhysicalSize,
-    (void *) &RRDeliverOutputEvent,
-    (void *) &RROutputDestroy,
-    (void *) &ProcRRGetOutputInfo,
-    (void *) &ProcRRSetOutputPrimary,
-    (void *) &ProcRRGetOutputPrimary,
-    (void *) &RROutputInit,
-    (void *) &RRPointerMoved,
-    (void *) &RRPointerScreenConfigured,
-    (void *) &RRDeleteAllOutputProperties,
-    (void *) &RRGetOutputProperty,
-    (void *) &RRQueryOutputProperty,
-    (void *) &RRDeleteOutputProperty,
-    (void *) &RRPostPendingProperties,
-    (void *) &RRChangeOutputProperty,
-    (void *) &RRConfigureOutputProperty,
-    (void *) &ProcRRChangeOutputProperty,
-    (void *) &ProcRRGetOutputProperty,
-    (void *) &ProcRRListOutputProperties,
-    (void *) &ProcRRQueryOutputProperty,
-    (void *) &ProcRRConfigureOutputProperty,
-    (void *) &ProcRRDeleteOutputProperty,
-    (void *) &RRXineramaExtensionInit,
-    (void *) &ExtensionModuleList,
-    (void *) &LoadSubModule,
-    (void *) &UnloadSubModule,
-    (void *) &UnloadModule,
-    (void *) &LoaderSymbol,
-    (void *) &LoaderListDirs,
-    (void *) &LoaderFreeDirList,
-    (void *) &LoaderErrorMsg,
-    (void *) &LoadExtension,
-    (void *) &LoaderGetOS,
-    (void *) &LoaderShouldIgnoreABI,
-    (void *) &LoaderGetABIVersion,
-    (void *) &xf86SetIntOption,
-    (void *) &xf86SetRealOption,
-    (void *) &xf86SetStrOption,
-    (void *) &xf86SetBoolOption,
-    (void *) &xf86CheckIntOption,
-    (void *) &xf86CheckRealOption,
-    (void *) &xf86CheckStrOption,
-    (void *) &xf86CheckBoolOption,
-    (void *) &xf86AddNewOption,
-    (void *) &xf86NewOption,
-    (void *) &xf86NextOption,
-    (void *) &xf86OptionListCreate,
-    (void *) &xf86OptionListMerge,
-    (void *) &xf86OptionListFree,
-    (void *) &xf86OptionName,
-    (void *) &xf86OptionValue,
-    (void *) &xf86OptionListReport,
-    (void *) &xf86FindOption,
-    (void *) &xf86FindOptionValue,
-    (void *) &xf86MarkOptionUsed,
-    (void *) &xf86MarkOptionUsedByName,
-    (void *) &xf86CheckIfOptionUsed,
-    (void *) &xf86CheckIfOptionUsedByName,
-    (void *) &xf86ShowUnusedOptions,
-    (void *) &xf86ProcessOptions,
-    (void *) &xf86TokenToOptinfo,
-    (void *) &xf86TokenToOptName,
-    (void *) &xf86IsOptionSet,
-    (void *) &xf86GetOptValString,
-    (void *) &xf86GetOptValInteger,
-    (void *) &xf86GetOptValULong,
-    (void *) &xf86GetOptValReal,
-    (void *) &xf86GetOptValFreq,
-    (void *) &xf86GetOptValBool,
-    (void *) &xf86ReturnOptValBool,
-    (void *) &xf86NameCmp,
-    (void *) &xf86NormalizeName,
-    (void *) &xf86ReplaceIntOption,
-    (void *) &xf86ReplaceRealOption,
-    (void *) &xf86ReplaceBoolOption,
-    (void *) &xf86ReplaceStrOption,
-    (void *) &pciTag,
-    (void *) &xf86scanpci,
-    (void *) &xf86MapDomainMemory,
-    (void *) &xf86MapLegacyIO,
-    (void *) &xf86DoConfigure,
-    (void *) &xf86DoShowOptions,
-    (void *) &xf86DoConfigurePass1,
-    (void *) &xf86ScreenKey,
-    (void *) &xf86CreateRootWindowKey,
-    (void *) &xf86PixmapKey,
-    (void *) &xf86Screens,
-    (void *) &byte_reversed,
-    (void *) &pciSlotClaimed,
-    (void *) &fbSlotClaimed,
-    (void *) &xf86ConfigDRI,
-    (void *) &xf86inSuspend,
-    (void *) &xf86DRI2Enabled,
-    (void *) &VTSwitchEnabled,
-    (void *) &xf86CheckPciSlot,
-    (void *) &xf86ClaimPciSlot,
-    (void *) &xf86UnclaimPciSlot,
-    (void *) &xf86ParsePciBusString,
-    (void *) &xf86ComparePciBusString,
-    (void *) &xf86FormatPciBusNumber,
-    (void *) &xf86GetFbInfoForScreen,
-    (void *) &xf86ClaimFbSlot,
-    (void *) &xf86ClaimNoSlot,
-    (void *) &xf86EnableAccess,
-    (void *) &xf86IsPrimaryPci,
-    (void *) &xf86DriverHasEntities,
-    (void *) &xf86AddEntityToScreen,
-    (void *) &xf86SetEntityInstanceForScreen,
-    (void *) &xf86GetNumEntityInstances,
-    (void *) &xf86GetDevFromEntity,
-    (void *) &xf86RemoveEntityFromScreen,
-    (void *) &xf86GetEntityInfo,
-    (void *) &xf86GetPciInfoForEntity,
-    (void *) &xf86SetEntityFuncs,
-    (void *) &xf86CheckPciMemBase,
-    (void *) &xf86IsEntityPrimary,
-    (void *) &xf86EnterServerState,
-    (void *) &xf86FindScreenForEntity,
-    (void *) &xf86GetLastScrnFlag,
-    (void *) &xf86SetLastScrnFlag,
-    (void *) &xf86IsEntityShared,
-    (void *) &xf86SetEntityShared,
-    (void *) &xf86IsEntitySharable,
-    (void *) &xf86SetEntitySharable,
-    (void *) &xf86IsPrimInitDone,
-    (void *) &xf86SetPrimInitDone,
-    (void *) &xf86ClearPrimInitDone,
-    (void *) &xf86AllocateEntityPrivateIndex,
-    (void *) &xf86GetEntityPrivate,
-    (void *) &xf86AddBusDeviceToConfigure,
-    (void *) &xf86LockZoom,
-    (void *) &xf86InitViewport,
-    (void *) &xf86SetViewport,
-    (void *) &xf86ZoomViewport,
-    (void *) &xf86SwitchMode,
-    (void *) &xf86GetPointerScreenFuncs,
-    (void *) &xf86InitOrigins,
-    (void *) &xf86ReconfigureLayout,
-    (void *) &xf86CVTMode,
-    (void *) &xf86DPMSInit,
-    (void *) &DPMSSet,
-    (void *) &DPMSSupported,
-    (void *) &DGAInit,
-    (void *) &DGAReInitModes,
-    (void *) &xf86SetDGAMode,
-    (void *) &SetTimeSinceLastInputEvent,
-    (void *) &xf86AddInputHandler,
-    (void *) &xf86RemoveInputHandler,
-    (void *) &xf86DisableInputHandler,
-    (void *) &xf86EnableInputHandler,
-    (void *) &xf86AddGeneralHandler,
-    (void *) &xf86RemoveGeneralHandler,
-    (void *) &xf86DisableGeneralHandler,
-    (void *) &xf86EnableGeneralHandler,
-    (void *) &xf86InterceptSignals,
-    (void *) &xf86InterceptSigIll,
-    (void *) &xf86EnableVTSwitch,
-    (void *) &xf86ProcessActionEvent,
-    (void *) &xf86PrintBacktrace,
-    (void *) &xf86AddDriver,
-    (void *) &xf86DeleteDriver,
-    (void *) &xf86AllocateScreen,
-    (void *) &xf86DeleteScreen,
-    (void *) &xf86AllocateScrnInfoPrivateIndex,
-    (void *) &xf86AddPixFormat,
-    (void *) &xf86SetDepthBpp,
-    (void *) &xf86PrintDepthBpp,
-    (void *) &xf86SetWeight,
-    (void *) &xf86SetDefaultVisual,
-    (void *) &xf86SetGamma,
-    (void *) &xf86SetDpi,
-    (void *) &xf86SetBlackWhitePixels,
-    (void *) &xf86EnableDisableFBAccess,
-    (void *) &xf86VDrvMsgVerb,
-    (void *) &xf86DrvMsgVerb,
-    (void *) &xf86DrvMsg,
-    (void *) &xf86MsgVerb,
-    (void *) &xf86Msg,
-    (void *) &xf86ErrorFVerb,
-    (void *) &xf86ErrorF,
-    (void *) &xf86TokenToString,
-    (void *) &xf86StringToToken,
-    (void *) &xf86ShowClocks,
-    (void *) &xf86PrintChipsets,
-    (void *) &xf86MatchDevice,
-    (void *) &xf86MatchPciInstances,
-    (void *) &xf86GetClocks,
-    (void *) &xf86GetVisualName,
-    (void *) &xf86GetVerbosity,
-    (void *) &xf86GetPix24,
-    (void *) &xf86GetDepth,
-    (void *) &xf86GetWeight,
-    (void *) &xf86GetGamma,
-    (void *) &xf86GetFlipPixels,
-    (void *) &xf86GetServerName,
-    (void *) &xf86ServerIsExiting,
-    (void *) &xf86ServerIsResetting,
-    (void *) &xf86ServerIsInitialising,
-    (void *) &xf86ServerIsOnlyDetecting,
-    (void *) &xf86CaughtSignal,
-    (void *) &xf86GetVidModeAllowNonLocal,
-    (void *) &xf86GetVidModeEnabled,
-    (void *) &xf86GetModInDevAllowNonLocal,
-    (void *) &xf86GetModInDevEnabled,
-    (void *) &xf86GetAllowMouseOpenFail,
-    (void *) &xf86IsPc98,
-    (void *) &xf86DisableRandR,
-    (void *) &xorgGetVersion,
-    (void *) &xf86GetModuleVersion,
-    (void *) &xf86LoadDrvSubModule,
-    (void *) &xf86LoadSubModule,
-    (void *) &xf86LoadOneModule,
-    (void *) &xf86UnloadSubModule,
-    (void *) &xf86LoaderCheckSymbol,
-    (void *) &xf86SetBackingStore,
-    (void *) &xf86SetSilkenMouse,
-    (void *) &xf86FindXvOptions,
-    (void *) &xf86GetOS,
-    (void *) &xf86ConfigPciEntity,
-    (void *) &xf86ConfigFbEntity,
-    (void *) &xf86ConfigActivePciEntity,
-    (void *) &xf86IsScreenPrimary,
-    (void *) &xf86RegisterRootWindowProperty,
-    (void *) &xf86IsUnblank,
-    (void *) &xf86GetPixFormat,
-    (void *) &xf86GetBppFromDepth,
-    (void *) &xf86GetNearestClock,
-    (void *) &xf86ModeStatusToString,
-    (void *) &xf86LookupMode,
-    (void *) &xf86CheckModeForMonitor,
-    (void *) &xf86InitialCheckModeForDriver,
-    (void *) &xf86CheckModeForDriver,
-    (void *) &xf86ValidateModes,
-    (void *) &xf86DeleteMode,
-    (void *) &xf86PruneDriverModes,
-    (void *) &xf86SetCrtcForModes,
-    (void *) &xf86PrintModes,
-    (void *) &xf86ShowClockRanges,
-    (void *) &xf86ModeHSync,
-    (void *) &xf86ModeVRefresh,
-    (void *) &xf86SetModeDefaultName,
-    (void *) &xf86SetModeCrtc,
-    (void *) &xf86DuplicateMode,
-    (void *) &xf86DuplicateModes,
-    (void *) &xf86ModesEqual,
-    (void *) &xf86PrintModeline,
-    (void *) &xf86ModesAdd,
-    (void *) &xf86CollectOptions,
-    (void *) &xf86RandRInit,
-    (void *) &xf86GetRotation,
-    (void *) &xf86RandRSetNewVirtualAndDimensions,
-    (void *) &VidModeExtensionInit,
-    (void *) &xf86addNewOption,
-    (void *) &xf86optionListDup,
-    (void *) &xf86optionListFree,
-    (void *) &xf86optionName,
-    (void *) &xf86optionValue,
-    (void *) &xf86newOption,
-    (void *) &xf86nextOption,
-    (void *) &xf86findOption,
-    (void *) &xf86findOptionValue,
-    (void *) &xf86optionListCreate,
-    (void *) &xf86optionListMerge,
-    (void *) &xf86nameCompare,
-    (void *) &xf86uLongToString,
-    (void *) &xf86parseOption,
-    (void *) &xf86printOptionList,
-    (void *) &xf86openConfigFile,
-    (void *) &xf86setBuiltinConfig,
-    (void *) &xf86readConfigFile,
-    (void *) &xf86closeConfigFile,
-    (void *) &xf86freeConfig,
-    (void *) &xf86writeConfigFile,
-    (void *) &xf86findDevice,
-    (void *) &xf86findLayout,
-    (void *) &xf86findMonitor,
-    (void *) &xf86findModes,
-    (void *) &xf86findModeLine,
-    (void *) &xf86findScreen,
-    (void *) &xf86findInput,
-    (void *) &xf86findInputByDriver,
-    (void *) &xf86findVideoAdaptor,
-    (void *) &xf86addListItem,
-    (void *) &xf86itemNotSublist,
-    (void *) &xf86pathIsAbsolute,
-    (void *) &xf86pathIsSafe,
-    (void *) &xf86addComment,
-    (void *) &xf86ModeHSync,
-    (void *) &xf86ModeVRefresh,
-    (void *) &xf86ModeBandwidth,
-    (void *) &xf86ModeWidth,
-    (void *) &xf86ModeHeight,
-    (void *) &xf86DuplicateMode,
-    (void *) &xf86DuplicateModes,
-    (void *) &xf86SetModeDefaultName,
-    (void *) &xf86SetModeCrtc,
-    (void *) &xf86ModesEqual,
-    (void *) &xf86PrintModeline,
-    (void *) &xf86ModesAdd,
-    (void *) &xf86DDCGetModes,
-    (void *) &xf86CVTMode,
-    (void *) &xf86GTFMode,
-    (void *) &xf86ModeIsReduced,
-    (void *) &xf86ValidateModesFlags,
-    (void *) &xf86ValidateModesClocks,
-    (void *) &xf86ValidateModesSize,
-    (void *) &xf86ValidateModesSync,
-    (void *) &xf86ValidateModesBandwidth,
-    (void *) &xf86ValidateModesReducedBlanking,
-    (void *) &xf86PruneInvalidModes,
-    (void *) &xf86PruneDuplicateModes,
-    (void *) &xf86ValidateModesFlags,
-    (void *) &xf86ValidateModesUserConfig,
-    (void *) &xf86GetMonitorModes,
-    (void *) &xf86GetDefaultModes,
-    (void *) &xf86DDCApplyQuirks,
-    (void *) &miDCInitialize,
-    (void *) &miPointerInitialize,
-    (void *) &miPointerWarpCursor,
-    (void *) &miPointerCurrentScreen,
-    (void *) &miPointerGetScreen,
-    (void *) &miPointerSetScreen,
-    (void *) &miPointerGetPosition,
-    (void *) &miPointerSetPosition,
-    (void *) &miPointerUpdateSprite,
-    (void *) &miPointerScreenKey,
-    (void *) &xf86InitCursor,
-    (void *) &xf86CreateCursorInfoRec,
-    (void *) &xf86DestroyCursorInfoRec,
-    (void *) &xf86ForceHWCursor,
-    (void *) &xf86CrtcConfigPrivateIndex,
-    (void *) &xf86CrtcConfigInit,
-    (void *) &xf86CrtcSetSizeRange,
-    (void *) &xf86CrtcCreate,
-    (void *) &xf86CrtcDestroy,
-    (void *) &xf86CrtcSetModeTransform,
-    (void *) &xf86CrtcSetMode,
-    (void *) &xf86CrtcSetOrigin,
-    (void *) &xf86CrtcRotate,
-    (void *) &xf86RotateDestroy,
-    (void *) &xf86RotateFreeShadow,
-    (void *) &xf86RotateCloseScreen,
-    (void *) &xf86CrtcInUse,
-    (void *) &xf86OutputCreate,
-    (void *) &xf86OutputUseScreenMonitor,
-    (void *) &xf86OutputRename,
-    (void *) &xf86OutputDestroy,
-    (void *) &xf86ProbeOutputModes,
-    (void *) &xf86SetScrnInfoModes,
-    (void *) &xf86CrtcScreenInit,
-    (void *) &xf86InitialConfiguration,
-    (void *) &xf86DPMSSet,
-    (void *) &xf86SaveScreen,
-    (void *) &xf86DisableUnusedFunctions,
-    (void *) &xf86OutputFindClosestMode,
-    (void *) &xf86SetSingleMode,
-    (void *) &xf86OutputSetEDID,
-    (void *) &xf86OutputGetEDIDModes,
-    (void *) &xf86OutputGetEDID,
-    (void *) &xf86DiDGAInit,
-    (void *) &xf86DiDGAReInit,
-    (void *) &xf86CrtcSetScreenSubpixelOrder,
-    (void *) &xf86ConnectorGetName,
-    (void *) &xf86SetDesiredModes,
-    (void *) &xf86_cursors_init,
-    (void *) &xf86_reload_cursors,
-    (void *) &xf86_show_cursors,
-    (void *) &xf86_hide_cursors,
-    (void *) &xf86_cursors_fini,
-    (void *) &xf86_crtc_clip_video_helper,
-    (void *) &xf86_wrap_crtc_notify,
-    (void *) &xf86_unwrap_crtc_notify,
-    (void *) &xf86_crtc_notify,
-    (void *) &xf86_crtc_supports_gamma,
-    (void *) &xf86RandR12CreateScreenResources,
-    (void *) &xf86RandR12Init,
-    (void *) &xf86RandR12SetRotations,
-    (void *) &xf86RandR12SetTransformSupport,
-    (void *) &xf86RandR12SetConfig,
-    (void *) &xf86RandR12GetRotation,
-    (void *) &xf86RandR12GetOriginalVirtualSize,
-    (void *) &xf86RandR12PreInit,
-    (void *) &xf86RandR12TellChanged,
-    (void *) &xf86DoEDID_DDC1,
-    (void *) &xf86DoEDID_DDC2,
-    (void *) &xf86DoEEDID,
-    (void *) &xf86PrintEDID,
-    (void *) &xf86InterpretEDID,
-    (void *) &xf86InterpretEEDID,
-    (void *) &xf86EdidMonitorSet,
-    (void *) &xf86SetDDCproperties,
-    (void *) &xf86DDCGetModes,
-    (void *) &xf86MonitorIsHDMI,
-    (void *) &xf86DoDisplayID,
-    (void *) &xf86DisplayIDMonitorSet,
-    (void *) &FindDMTMode,
-    (void *) &DMTModes,
-    (void *) &xf86MonitorIsHDMI,
-    (void *) &xf86ConfigFile,
-    (void *) &xf86AllowMouseOpenFail,
-    (void *) &xf86fpFlag,
-    (void *) &xf86sFlag,
-    (void *) &xf86bsEnableFlag,
-    (void *) &xf86bsDisableFlag,
-    (void *) &xf86silkenMouseDisableFlag,
-    (void *) &xf86xkbdirFlag,
-    (void *) &xf86LayoutName,
-    (void *) &xf86ScreenName,
-    (void *) &xf86PointerName,
-    (void *) &xf86KeyboardName,
-    (void *) &xf86FbBpp,
-    (void *) &xf86Depth,
-    (void *) &xf86Pix24,
-    (void *) &xf86Weight,
-    (void *) &xf86FlipPixels,
-    (void *) &xf86Gamma,
-    (void *) &xf86ServerName,
-    (void *) &xf86IsolateDevice,
-    (void *) &xf86Info,
-    (void *) &xf86ModulePath,
-    (void *) &xf86ModPathFrom,
-    (void *) &xf86LogFile,
-    (void *) &xf86LogFileFrom,
-    (void *) &xf86LogFileWasOpened,
-    (void *) &xf86ConfigLayout,
-    (void *) &xf86DriverList,
-    (void *) &xf86NumDrivers,
-    (void *) &xf86Resetting,
-    (void *) &xf86Initialising,
-    (void *) &xf86NumScreens,
-    (void *) &xf86VisualNames,
-    (void *) &xf86Verbose,
-    (void *) &xf86LogVerbose,
-    (void *) &xorgHWAccess,
-    (void *) &xf86RegisteredPropertiesTable,
-    (void *) &xf86BusProbe,
-    (void *) &xf86AccessInit,
-    (void *) &xf86AccessEnter,
-    (void *) &xf86AccessLeave,
-    (void *) &xf86EntityInit,
-    (void *) &xf86FindPrimaryDevice,
-    (void *) &xf86PostProbe,
-    (void *) &xf86ClearEntityListForScreen,
-    (void *) &xf86AddDevToEntity,
-    (void *) &xf86PostScreenInit,
-    (void *) &xf86PathIsSafe,
-    (void *) &xf86DefaultModes,
-    (void *) &xf86NumDefaultModes,
-    (void *) &DoConfigure,
-    (void *) &DoShowOptions,
-    (void *) &xf86Wakeup,
-    (void *) &xf86SigWrapper,
-    (void *) &xf86HandlePMEvents,
-    (void *) &xf86PMGetEventFromOs,
-    (void *) &xf86PMConfirmEventToOs,
-    (void *) &xf86LogInit,
-    (void *) &xf86CloseLog,
-    (void *) &xf86LoadModules,
-    (void *) &xf86SetVerbosity,
-    (void *) &xf86SetLogVerbosity,
-    (void *) &xf86CallDriverProbe,
-    (void *) &xf86Events,
-    (void *) &xf86HandleColormaps,
-    (void *) &xf86ChangeGamma,
-    (void *) &xf86ChangeGammaRamp,
-    (void *) &xf86GetGammaRampSize,
-    (void *) &xf86GetGammaRamp,
-    (void *) &xf86RegisterOffscreenManager,
-    (void *) &xf86InitFBManagerRegion,
-    (void *) &xf86InitFBManagerArea,
-    (void *) &xf86InitFBManager,
-    (void *) &xf86InitFBManagerLinear,
-    (void *) &xf86FBManagerRunning,
-    (void *) &xf86AllocateOffscreenArea,
-    (void *) &xf86AllocateLinearOffscreenArea,
-    (void *) &xf86AllocateOffscreenLinear,
-    (void *) &xf86FreeOffscreenArea,
-    (void *) &xf86FreeOffscreenLinear,
-    (void *) &xf86ResizeOffscreenArea,
-    (void *) &xf86ResizeOffscreenLinear,
-    (void *) &xf86RegisterFreeBoxCallback,
-    (void *) &xf86PurgeUnlockedOffscreenAreas,
-    (void *) &xf86QueryLargestOffscreenArea,
-    (void *) &xf86QueryLargestOffscreenLinear,
-    (void *) &inputInfo,
-    (void *) &CloseInputDevice,
-    (void *) &AddOtherInputDevices,
-    (void *) &OpenInputDevice,
-    (void *) &SetDeviceMode,
-    (void *) &SetDeviceValuators,
-    (void *) &ChangeDeviceControl,
-    (void *) &xf86InputDevs,
-    (void *) &xf86PostMotionEvent,
-    (void *) &xf86PostMotionEventP,
-    (void *) &xf86PostProximityEvent,
-    (void *) &xf86PostProximityEventP,
-    (void *) &xf86PostButtonEvent,
-    (void *) &xf86PostButtonEventP,
-    (void *) &xf86PostKeyEvent,
-    (void *) &xf86PostKeyEventP,
-    (void *) &xf86PostKeyboardEvent,
-    (void *) &xf86ActivateDevice,
-    (void *) &xf86FirstLocalDevice,
-    (void *) &xf86ScaleAxis,
-    (void *) &xf86XInputSetScreen,
-    (void *) &xf86ProcessCommonOptions,
-    (void *) &xf86InitValuatorAxisStruct,
-    (void *) &xf86InitValuatorDefaults,
-    (void *) &xf86AddEnabledDevice,
-    (void *) &xf86RemoveEnabledDevice,
-    (void *) &xf86DisableDevice,
-    (void *) &xf86EnableDevice,
-    (void *) &xf86AddInputDriver,
-    (void *) &xf86DeleteInputDriver,
-    (void *) &xf86AllocateInput,
-    (void *) &xf86LookupInputDriver,
-    (void *) &xf86LookupInput,
-    (void *) &xf86DeleteInput,
-    (void *) &xf86MotionHistoryAllocate,
-    (void *) &xf86CollectInputOptions,
-    (void *) &xf86VGAarbiterInit,
-    (void *) &xf86VGAarbiterFini,
-    (void *) &xf86VGAarbiterWrapFunctions,
-    (void *) &xf86VGAarbiterLock,
-    (void *) &xf86VGAarbiterUnlock,
-    (void *) &xf86VGAarbiterDeviceDecodes,
-    (void *) &xf86VGAarbiterAllowDRI,
-    (void *) &XisbNew,
-    (void *) &XisbFree,
-    (void *) &XisbRead,
-    (void *) &XisbWrite,
-    (void *) &XisbTrace,
-    (void *) &XisbBlockDuration,
-    (void *) &xf86XVScreenInit,
-    (void *) &xf86XVRegisterGenericAdaptorDriver,
-    (void *) &xf86XVListGenericAdaptors,
-    (void *) &xf86XVRegisterOffscreenImages,
-    (void *) &xf86XVQueryOffscreenImages,
-    (void *) &xf86XVAllocateVideoAdaptorRec,
-    (void *) &xf86XVFreeVideoAdaptorRec,
-    (void *) &xf86XVFillKeyHelper,
-    (void *) &xf86XVFillKeyHelperDrawable,
-    (void *) &xf86XVClipVideoHelper,
-    (void *) &xf86XVCopyYUV12ToPacked,
-    (void *) &xf86XVCopyPacked,
-    (void *) &XvGetScreenKeyProc,
-    (void *) &XvGetRTPortProc,
-    (void *) &XvScreenInitProc,
-    (void *) &xf86XvMCScreenInit,
-    (void *) &xf86XvMCCreateAdaptorRec,
-    (void *) &xf86XvMCDestroyAdaptorRec,
-    (void *) &XvMCScreenInitProc,
-    (void *) &XF86XvScreenKey,
-    (void *) &RamDacHWPrivateIndex,
-    (void *) &RamDacScreenPrivateIndex,
-    (void *) &RamDacCreateInfoRec,
-    (void *) &RamDacHelperCreateInfoRec,
-    (void *) &RamDacDestroyInfoRec,
-    (void *) &RamDacHelperDestroyInfoRec,
-    (void *) &RamDacInit,
-    (void *) &RamDacHandleColormaps,
-    (void *) &RamDacFreeRec,
-    (void *) &RamDacGetHWIndex,
-    (void *) &BTramdacProbe,
-    (void *) &BTramdacSave,
-    (void *) &BTramdacRestore,
-    (void *) &BTramdacSetBpp,
-    (void *) &IBMramdacProbe,
-    (void *) &IBMramdacSave,
-    (void *) &IBMramdacRestore,
-    (void *) &IBMramdac526SetBpp,
-    (void *) &IBMramdac640SetBpp,
-    (void *) &IBMramdac526CalculateMNPCForClock,
-    (void *) &IBMramdac640CalculateMNPCForClock,
-    (void *) &IBMramdac526HWCursorInit,
-    (void *) &IBMramdac640HWCursorInit,
-    (void *) &IBMramdac526SetBppWeak,
-    (void *) &TIramdacCalculateMNPForClock,
-    (void *) &TIramdacProbe,
-    (void *) &TIramdacSave,
-    (void *) &TIramdacRestore,
-    (void *) &TIramdac3026SetBpp,
-    (void *) &TIramdac3030SetBpp,
-    (void *) &TIramdacHWCursorInit,
-    (void *) &TIramdacLoadPalette,
-    (void *) &TIramdacLoadPaletteWeak,
-    (void *) &xf86LinearVidMem,
-    (void *) &xf86CheckMTRR,
-    (void *) &xf86MapVidMem,
-    (void *) &xf86UnMapVidMem,
-    (void *) &xf86MapReadSideEffects,
-    (void *) &xf86ReadBIOS,
-    (void *) &xf86EnableIO,
-    (void *) &xf86DisableIO,
-    (void *) &xf86OSRingBell,
-    (void *) &xf86SetReallySlowBcopy,
-    (void *) &xf86SlowBcopy,
-    (void *) &xf86OpenSerial,
-    (void *) &xf86SetSerial,
-    (void *) &xf86SetSerialSpeed,
-    (void *) &xf86ReadSerial,
-    (void *) &xf86WriteSerial,
-    (void *) &xf86CloseSerial,
-    (void *) &xf86FlushInput,
-    (void *) &xf86WaitForInput,
-    (void *) &xf86SerialSendBreak,
-    (void *) &xf86SetSerialModemState,
-    (void *) &xf86GetSerialModemState,
-    (void *) &xf86SerialModemSetBits,
-    (void *) &xf86SerialModemClearBits,
-    (void *) &xf86LoadKernelModule,
-    (void *) &xf86AgpGARTSupported,
-    (void *) &xf86GetAGPInfo,
-    (void *) &xf86AcquireGART,
-    (void *) &xf86ReleaseGART,
-    (void *) &xf86AllocateGARTMemory,
-    (void *) &xf86DeallocateGARTMemory,
-    (void *) &xf86BindGARTMemory,
-    (void *) &xf86UnbindGARTMemory,
-    (void *) &xf86EnableAGP,
-    (void *) &xf86GARTCloseScreen,
-    (void *) &xf86InstallSIGIOHandler,
-    (void *) &xf86RemoveSIGIOHandler,
-    (void *) &xf86BlockSIGIO,
-    (void *) &xf86UnblockSIGIO,
-    (void *) &xf86AssertBlockedSIGIO,
-    (void *) &xf86SIGIOSupported,
-    (void *) &miInitializeBanking,
-    (void *) &miScanLineWidth,
-    (void *) &miInstalledMaps,
-    (void *) &miListInstalledColormaps,
-    (void *) &miInstallColormap,
-    (void *) &miUninstallColormap,
-    (void *) &miResolveColor,
-    (void *) &miInitializeColormap,
-    (void *) &miExpandDirectColors,
-    (void *) &miCreateDefColormap,
-    (void *) &miClearVisualTypes,
-    (void *) &miSetVisualTypes,
-    (void *) &miSetPixmapDepths,
-    (void *) &miSetVisualTypesAndMasks,
-    (void *) &miGetDefaultVisualMask,
-    (void *) &miInitVisuals,
-    (void *) &miSetZeroLineBias,
-    (void *) &miZeroLineScreenKey,
-    (void *) &miZeroClipLine,
-    (void *) &miPolyArc,
-    (void *) &miCopyArea,
-    (void *) &miCopyPlane,
-    (void *) &miGetImage,
-    (void *) &miPutImage,
-    (void *) &miCopyRegion,
-    (void *) &miDoCopy,
-    (void *) &miRecolorCursor,
-    (void *) &miStepDash,
-    (void *) &mieqInit,
-    (void *) &mieqFini,
-    (void *) &mieqEnqueue,
-    (void *) &mieqSwitchScreen,
-    (void *) &mieqProcessDeviceEvent,
-    (void *) &mieqProcessInputEvents,
-    (void *) &CopyGetMasterEvent,
-    (void *) &miHandleExposures,
-    (void *) &miSendGraphicsExpose,
-    (void *) &miSendExposures,
-    (void *) &miWindowExposures,
-    (void *) &miPaintWindow,
-    (void *) &miClearDrawable,
-    (void *) &miPolyFillRect,
-    (void *) &miPolyGlyphBlt,
-    (void *) &miImageGlyphBlt,
-    (void *) &miFillPolygon,
-    (void *) &miFillConvexPoly,
-    (void *) &miFillGeneralPoly,
-    (void *) &miPolyPoint,
-    (void *) &miPolyRectangle,
-    (void *) &miPolySegment,
-    (void *) &miPolyText8,
-    (void *) &miPolyText16,
-    (void *) &miImageText8,
-    (void *) &miImageText16,
-    (void *) &miPushPixels,
-    (void *) &miRectAlloc,
-    (void *) &miRegionBroken,
-    (void *) &miModifyPixmapHeader,
-    (void *) &miCreateScreenResources,
-    (void *) &miScreenDevPrivateInit,
-    (void *) &miScreenInit,
-    (void *) &miAllocateGCPrivateIndex,
-    (void *) &miShapedWindowIn,
-    (void *) &miRegisterRedirectBorderClipProc,
-    (void *) &miValidateTree,
-    (void *) &miWideLine,
-    (void *) &miWideDash,
-    (void *) &miClearToBackground,
-    (void *) &miMarkWindow,
-    (void *) &miMarkOverlappedWindows,
-    (void *) &miHandleValidateExposures,
-    (void *) &miMoveWindow,
-    (void *) &miSlideAndSizeWindow,
-    (void *) &miGetLayerWindow,
-    (void *) &miSetShape,
-    (void *) &miChangeBorderWidth,
-    (void *) &miMarkUnrealizedWindow,
-    (void *) &miSegregateChildren,
-    (void *) &miZeroPolyArc,
-    (void *) &miZeroLine,
-    (void *) &miZeroDashLine,
-    (void *) &miPolyFillArc,
-    (void *) &miInitializeBackingStore,
-    (void *) &miChangeGC,
-    (void *) &miDestroyGC,
-    (void *) &miDestroyClip,
-    (void *) &miChangeClip,
-    (void *) &miCopyClip,
-    (void *) &miCopyGC,
-    (void *) &miComputeCompositeClip,
-    (void *) &miZeroArcSetup,
-    (void *) &miFillArcSetup,
-    (void *) &miFillArcSliceSetup,
-    (void *) &miInitSpanGroup,
-    (void *) &miAppendSpans,
-    (void *) &miFillUniqueSpanGroup,
-    (void *) &miFreeSpanGroup,
-    (void *) &miClipSpans,
-    (void *) &miFillSppPoly,
-    (void *) &miRoundJoinClip,
-    (void *) &miRoundCapClip,
-    (void *) &miPolyBuildEdge,
-    (void *) &miPolyBuildPoly,
-    (void *) &miInitOverlay,
-    (void *) &miOverlayGetPrivateClips,
-    (void *) &miOverlayCollectUnderlayRegions,
-    (void *) &miOverlayComputeCompositeClip,
-    (void *) &miOverlayCopyUnderlay,
-    (void *) &miOverlaySetTransFunction,
-    (void *) &miOverlaySetRootClip,
-    (void *) &RegionResType,
-    (void *) &XFixesErrorBase,
-    (void *) &XFixesRegionCopy,
-    (void *) &config_init,
-    (void *) &config_fini,
-    (void *) &SetCriticalEvent,
-    (void *) &GetSpriteCursor,
-    (void *) &ProcAllowEvents,
-    (void *) &MaybeDeliverEventsToClient,
-    (void *) &ProcWarpPointer,
-    (void *) &EventSelectForWindow,
-    (void *) &EventSuppressForWindow,
-    (void *) &ProcSetInputFocus,
-    (void *) &ProcGetInputFocus,
-    (void *) &ProcGrabPointer,
-    (void *) &ProcChangeActivePointerGrab,
-    (void *) &ProcUngrabPointer,
-    (void *) &ProcGrabKeyboard,
-    (void *) &ProcUngrabKeyboard,
-    (void *) &ProcQueryPointer,
-    (void *) &ProcSendEvent,
-    (void *) &ProcUngrabKey,
-    (void *) &ProcGrabKey,
-    (void *) &ProcGrabButton,
-    (void *) &ProcUngrabButton,
-    (void *) &ProcRecolorCursor,
-    (void *) &PostSyntheticMotion,
-    (void *) &SetDefaultFont,
-    (void *) &QueueFontWakeup,
-    (void *) &RemoveFontWakeup,
-    (void *) &FontWakeup,
-    (void *) &OpenFont,
-    (void *) &CloseFont,
-    (void *) &QueryFont,
-    (void *) &ListFonts,
-    (void *) &doListFontsWithInfo,
-    (void *) &doPolyText,
-    (void *) &PolyText,
-    (void *) &doImageText,
-    (void *) &ImageText,
-    (void *) &SetFontPath,
-    (void *) &SetDefaultFontPath,
-    (void *) &GetFontPath,
-    (void *) &DeleteClientFontStuff,
-    (void *) &InitFonts,
-    (void *) &FreeFonts,
-    (void *) &find_old_font,
-    (void *) &GetGlyphs,
-    (void *) &QueryGlyphExtents,
-    (void *) &QueryTextExtents,
-    (void *) &ParseGlyphCachingMode,
-    (void *) &InitGlyphCaching,
-    (void *) &SetGlyphCachingMode,
-    (void *) &BuiltinRegisterFpeFunctions,
-    (void *) &client_auth_generation,
-    (void *) &DeleteFontClientID,
-    (void *) &GetClientResolutions,
-    (void *) &GetDefaultPointSize,
-    (void *) &GetNewFontClientID,
-    (void *) &init_fs_handlers,
-    (void *) &RegisterFPEFunctions,
-    (void *) &remove_fs_handlers,
-    (void *) &StoreFontClientFont,
-    (void *) &CreateGrab,
-    (void *) &DeletePassiveGrab,
-    (void *) &GrabMatchesSecond,
-    (void *) &AddPassiveGrabToList,
-    (void *) &DeletePassiveGrabFromList,
-    (void *) &InitProximityClassDeviceStruct,
-    (void *) &InitValuatorAxisStruct,
-    (void *) &XIDeleteAllDeviceProperties,
-    (void *) &XIDeleteDeviceProperty,
-    (void *) &XIChangeDeviceProperty,
-    (void *) &XIGetDeviceProperty,
-    (void *) &XISetDevicePropertyDeletable,
-    (void *) &XIRegisterPropertyHandler,
-    (void *) &XIUnregisterPropertyHandler,
-    (void *) &XIGetKnownProperty,
-    (void *) &XIGetDevice,
-    (void *) &XIPropToInt,
-    (void *) &XIPropToFloat,
-    (void *) &RegisterOtherDevice,
-    (void *) &UpdateDeviceState,
-    (void *) &ProcessOtherEvent,
-    (void *) &DeviceFocusEvent,
-    (void *) &CheckGrabValues,
-    (void *) &GrabButton,
-    (void *) &GrabKey,
-    (void *) &GrabWindow,
-    (void *) &SelectForWindow,
-    (void *) &AddExtensionClient,
-    (void *) &RecalculateDeviceDeliverableEvents,
-    (void *) &InputClientGone,
-    (void *) &SendEvent,
-    (void *) &SetButtonMapping,
-    (void *) &ChangeKeyMapping,
-    (void *) &DeleteWindowFromAnyExtEvents,
-    (void *) &MaybeSendDeviceMotionNotifyHint,
-    (void *) &CheckDeviceGrabAndHintWindow,
-    (void *) &MaybeStopDeviceHint,
-    (void *) &DeviceEventSuppressForWindow,
-    (void *) &SendEventToAllWindows,
-    (void *) &XI2EventSwap,
-    (void *) &XIShouldNotify,
-    (void *) &XISendDeviceChangedEvent,
-    (void *) &XISetEventMask,
-    (void *) &XICheckInvalidMaskBits,
-    (void *) &XInputExtensionInit,
-    (void *) &AssignTypeAndName,
-    (void *) &InitVelocityData,
-    (void *) &InitTrackers,
-    (void *) &ProcessVelocityData2D,
-    (void *) &BasicComputeAcceleration,
-    (void *) &FreeVelocityData,
-    (void *) &InitializePredictableAccelerationProperties,
-    (void *) &DeletePredictableAccelerationProperties,
-    (void *) &SetAccelerationProfile,
-    (void *) &GetDevicePredictableAccelData,
-    (void *) &SetDeviceSpecificAccelerationProfile,
-    (void *) &AccelerationDefaultCleanup,
-    (void *) &acceleratePointerPredictable,
-    (void *) &acceleratePointerLightweight,
-    (void *) &RegisterResourceName,
-    (void *) &RegisterExtensionNames,
-    (void *) &LookupMajorName,
-    (void *) &LookupRequestName,
-    (void *) &LookupEventName,
-    (void *) &LookupErrorName,
-    (void *) &LookupResourceName,
-    (void *) &dixResetRegistry,
-    (void *) &dixLookupSelection,
-    (void *) &CurrentSelections,
-    (void *) &SelectionCallback,
-    (void *) &InitSelections,
-    (void *) &DeleteWindowFromAnySelections,
-    (void *) &DeleteClientFromAnySelections,
-    (void *) &Swap32Write,
-    (void *) &CopySwap32Write,
-    (void *) &CopySwap16Write,
-    (void *) &SGenericReply,
-    (void *) &SGetWindowAttributesReply,
-    (void *) &SGetGeometryReply,
-    (void *) &SQueryTreeReply,
-    (void *) &SInternAtomReply,
-    (void *) &SGetAtomNameReply,
-    (void *) &SGetPropertyReply,
-    (void *) &SListPropertiesReply,
-    (void *) &SGetSelectionOwnerReply,
-    (void *) &SQueryPointerReply,
-    (void *) &SwapTimeCoordWrite,
-    (void *) &SGetMotionEventsReply,
-    (void *) &STranslateCoordsReply,
-    (void *) &SGetInputFocusReply,
-    (void *) &SQueryKeymapReply,
-    (void *) &SQueryFontReply,
-    (void *) &SQueryTextExtentsReply,
-    (void *) &SListFontsReply,
-    (void *) &SListFontsWithInfoReply,
-    (void *) &SGetFontPathReply,
-    (void *) &SGetImageReply,
-    (void *) &SListInstalledColormapsReply,
-    (void *) &SAllocColorReply,
-    (void *) &SAllocNamedColorReply,
-    (void *) &SAllocColorCellsReply,
-    (void *) &SAllocColorPlanesReply,
-    (void *) &SQColorsExtend,
-    (void *) &SQueryColorsReply,
-    (void *) &SLookupColorReply,
-    (void *) &SQueryBestSizeReply,
-    (void *) &SListExtensionsReply,
-    (void *) &SGetKeyboardMappingReply,
-    (void *) &SGetPointerMappingReply,
-    (void *) &SGetModifierMappingReply,
-    (void *) &SGetKeyboardControlReply,
-    (void *) &SGetPointerControlReply,
-    (void *) &SGetScreenSaverReply,
-    (void *) &SLHostsExtend,
-    (void *) &SListHostsReply,
-    (void *) &SErrorEvent,
-    (void *) &SwapConnSetupInfo,
-    (void *) &WriteSConnectionInfo,
-    (void *) &SwapConnSetupPrefix,
-    (void *) &WriteSConnSetupPrefix,
-    (void *) &SCirculateEvent,
-    (void *) &SClientMessageEvent,
-    (void *) &SColormapEvent,
-    (void *) &SConfigureNotifyEvent,
-    (void *) &SConfigureRequestEvent,
-    (void *) &SCreateNotifyEvent,
-    (void *) &SDestroyNotifyEvent,
-    (void *) &SEnterLeaveEvent,
-    (void *) &SExposeEvent,
-    (void *) &SFocusEvent,
-    (void *) &SGraphicsExposureEvent,
-    (void *) &SGravityEvent,
-    (void *) &SKeyButtonPtrEvent,
-    (void *) &SKeymapNotifyEvent,
-    (void *) &SMapNotifyEvent,
-    (void *) &SMapRequestEvent,
-    (void *) &SMappingEvent,
-    (void *) &SNoExposureEvent,
-    (void *) &SPropertyEvent,
-    (void *) &SReparentEvent,
-    (void *) &SResizeRequestEvent,
-    (void *) &SSelectionClearEvent,
-    (void *) &SSelectionNotifyEvent,
-    (void *) &SSelectionRequestEvent,
-    (void *) &SUnmapNotifyEvent,
-    (void *) &SVisibilityEvent,
-    (void *) &SwapColorItem,
-    (void *) &SwapConnClientPrefix,
-    (void *) &SProcAllocColor,
-    (void *) &SProcAllocColorCells,
-    (void *) &SProcAllocColorPlanes,
-    (void *) &SProcAllocNamedColor,
-    (void *) &SProcChangeActivePointerGrab,
-    (void *) &SProcChangeGC,
-    (void *) &SProcChangeHosts,
-    (void *) &SProcChangeKeyboardControl,
-    (void *) &SProcChangeKeyboardMapping,
-    (void *) &SProcChangePointerControl,
-    (void *) &SProcChangeProperty,
-    (void *) &SProcChangeWindowAttributes,
-    (void *) &SProcClearToBackground,
-    (void *) &SProcConfigureWindow,
-    (void *) &SProcConvertSelection,
-    (void *) &SProcCopyArea,
-    (void *) &SProcCopyColormapAndFree,
-    (void *) &SProcCopyGC,
-    (void *) &SProcCopyPlane,
-    (void *) &SProcCreateColormap,
-    (void *) &SProcCreateCursor,
-    (void *) &SProcCreateGC,
-    (void *) &SProcCreateGlyphCursor,
-    (void *) &SProcCreatePixmap,
-    (void *) &SProcCreateWindow,
-    (void *) &SProcDeleteProperty,
-    (void *) &SProcFillPoly,
-    (void *) &SProcFreeColors,
-    (void *) &SProcGetImage,
-    (void *) &SProcGetMotionEvents,
-    (void *) &SProcGetProperty,
-    (void *) &SProcGrabButton,
-    (void *) &SProcGrabKey,
-    (void *) &SProcGrabKeyboard,
-    (void *) &SProcGrabPointer,
-    (void *) &SProcImageText,
-    (void *) &SProcInternAtom,
-    (void *) &SProcListFonts,
-    (void *) &SProcListFontsWithInfo,
-    (void *) &SProcLookupColor,
-    (void *) &SProcNoOperation,
-    (void *) &SProcOpenFont,
-    (void *) &SProcPoly,
-    (void *) &SProcPolyText,
-    (void *) &SProcPutImage,
-    (void *) &SProcQueryBestSize,
-    (void *) &SProcQueryColors,
-    (void *) &SProcQueryExtension,
-    (void *) &SProcRecolorCursor,
-    (void *) &SProcReparentWindow,
-    (void *) &SProcResourceReq,
-    (void *) &SProcRotateProperties,
-    (void *) &SProcSendEvent,
-    (void *) &SProcSetClipRectangles,
-    (void *) &SProcSetDashes,
-    (void *) &SProcSetFontPath,
-    (void *) &SProcSetInputFocus,
-    (void *) &SProcSetScreenSaver,
-    (void *) &SProcSetSelectionOwner,
-    (void *) &SProcSimpleReq,
-    (void *) &SProcStoreColors,
-    (void *) &SProcStoreNamedColor,
-    (void *) &SProcTranslateCoords,
-    (void *) &SProcUngrabButton,
-    (void *) &SProcUngrabKey,
-    (void *) &SProcWarpPointer,
-    (void *) &XaceHooks,
-    (void *) &XaceHook,
-    (void *) &XaceHookDispatch,
-    (void *) &XaceHookPropertyAccess,
-    (void *) &XaceHookSelectionAccess,
-    (void *) &XaceHookAuditEnd,
-    (void *) &XaceGetConnectionNumber,
-    (void *) &XaceIsLocal,
-    (void *) &XaceCensorImage,
-    (void *) &XkbIndentText,
-    (void *) &XkbAtomText,
-    (void *) &XkbKeysymText,
-    (void *) &XkbStringText,
-    (void *) &XkbKeyNameText,
-    (void *) &XkbModIndexText,
-    (void *) &XkbModMaskText,
-    (void *) &XkbVModIndexText,
-    (void *) &XkbVModMaskText,
-    (void *) &XkbConfigText,
-    (void *) &XkbSIMatchText,
-    (void *) &XkbIMWhichStateMaskText,
-    (void *) &XkbControlsMaskText,
-    (void *) &XkbGeomFPText,
-    (void *) &XkbDoodadTypeText,
-    (void *) &XkbActionTypeText,
-    (void *) &XkbActionText,
-    (void *) &XkbBehaviorText,
-    (void *) &_XkbKSCheckCase,
-    (void *) &XkbFindKeycodeByName,
-    (void *) &XkbInternAtom,
-    (void *) &XkbConvertGetByNameComponents,
-    (void *) &XkbNameMatchesPattern,
-    (void *) &XkbWriteXKBKeycodes,
-    (void *) &XkbWriteXKBKeyTypes,
-    (void *) &XkbWriteXKBCompatMap,
-    (void *) &XkbWriteXKBSymbols,
-    (void *) &XkbWriteXKBGeometry,
-    (void *) &XkbWriteXKBKeymapForNames,
-    (void *) &XkmProbe,
-    (void *) &XkmReadFile,
-    (void *) &xkbDevicePrivateKey,
-    (void *) &xkbUnwrapProc,
-    (void *) &XkbReqCode,
-    (void *) &XkbEventBase,
-    (void *) &XkbKeyboardErrorCode,
-    (void *) &XkbBaseDirectory,
-    (void *) &XkbBinDirectory,
-    (void *) &xkbDebugFlags,
-    (void *) &DeviceKeyPress,
-    (void *) &DeviceButtonPress,
-    (void *) &XkbUseMsg,
-    (void *) &XkbProcessArguments,
-    (void *) &XkbSetExtension,
-    (void *) &SrvXkbFreeCompatMap,
-    (void *) &SrvXkbFreeNames,
-    (void *) &_XkbLookupAnyDevice,
-    (void *) &_XkbLookupKeyboard,
-    (void *) &_XkbLookupBellDevice,
-    (void *) &_XkbLookupLedDevice,
-    (void *) &_XkbLookupButtonDevice,
-    (void *) &SrvXkbAllocKeyboard,
-    (void *) &SrvXkbAllocClientMap,
-    (void *) &SrvXkbAllocServerMap,
-    (void *) &SrvXkbFreeClientMap,
-    (void *) &SrvXkbFreeServerMap,
-    (void *) &SrvXkbAllocIndicatorMaps,
-    (void *) &SrvXkbAllocCompatMap,
-    (void *) &SrvXkbAllocNames,
-    (void *) &SrvXkbAllocControls,
-    (void *) &SrvXkbCopyKeyTypes,
-    (void *) &SrvXkbResizeKeyType,
-    (void *) &SrvXkbFreeKeyboard,
-    (void *) &XkbSetActionKeyMods,
-    (void *) &XkbMaskForVMask,
-    (void *) &SrvXkbVirtualModsToReal,
-    (void *) &XkbAdjustGroup,
-    (void *) &SrvXkbResizeKeySyms,
-    (void *) &SrvXkbResizeKeyActions,
-    (void *) &XkbUpdateKeyTypesFromCore,
-    (void *) &XkbUpdateDescActions,
-    (void *) &XkbUpdateActions,
-    (void *) &XkbGetCoreMap,
-    (void *) &XkbApplyMappingChange,
-    (void *) &XkbSetIndicators,
-    (void *) &XkbUpdateIndicators,
-    (void *) &XkbAllocSrvLedInfo,
-    (void *) &XkbCopySrvLedInfo,
-    (void *) &XkbFindSrvLedInfo,
-    (void *) &XkbApplyLedNameChanges,
-    (void *) &XkbApplyLedMapChanges,
-    (void *) &XkbApplyLedStateChanges,
-    (void *) &XkbFlushLedEvents,
-    (void *) &XkbIndicatorsToUpdate,
-    (void *) &XkbComputeDerivedState,
-    (void *) &XkbCheckSecondaryEffects,
-    (void *) &XkbCheckIndicatorMaps,
-    (void *) &XkbStateChangedFlags,
-    (void *) &XkbSendStateNotify,
-    (void *) &XkbSendMapNotify,
-    (void *) &XkbComputeControlsNotify,
-    (void *) &XkbSendControlsNotify,
-    (void *) &XkbSendCompatMapNotify,
-    (void *) &XkbHandleBell,
-    (void *) &XkbSendAccessXNotify,
-    (void *) &XkbSendNamesNotify,
-    (void *) &XkbSendActionMessage,
-    (void *) &XkbSendExtensionDeviceNotify,
-    (void *) &XkbSendNotification,
-    (void *) &XkbProcessKeyboardEvent,
-    (void *) &XkbHandleActions,
-    (void *) &XkbEnableDisableControls,
-    (void *) &AccessXInit,
-    (void *) &AccessXFilterPressEvent,
-    (void *) &AccessXFilterReleaseEvent,
-    (void *) &AccessXCancelRepeatKey,
-    (void *) &AccessXComputeCurveFactor,
-    (void *) &XkbFindClientResource,
-    (void *) &XkbAddClientResource,
-    (void *) &XkbRemoveResourceClient,
-    (void *) &XkbDDXAccessXBeep,
-    (void *) &XkbDDXUsesSoftRepeat,
-    (void *) &XkbDDXKeybdCtrlProc,
-    (void *) &XkbDDXChangeControls,
-    (void *) &XkbDDXUpdateDeviceIndicators,
-    (void *) &XkbDDXFakePointerMotion,
-    (void *) &XkbDDXFakeDeviceButton,
-    (void *) &XkbDDXTerminateServer,
-    (void *) &XkbDDXSwitchScreen,
-    (void *) &XkbDDXPrivate,
-    (void *) &XkbDisableComputedAutoRepeats,
-    (void *) &XkbSetRepeatKeys,
-    (void *) &SrvXkbLatchModifiers,
-    (void *) &SrvXkbLatchGroup,
-    (void *) &XkbClearAllLatchesAndLocks,
-    (void *) &XkbGetRulesDflts,
-    (void *) &XkbFreeRMLVOSet,
-    (void *) &XkbSetRulesDflts,
-    (void *) &XkbDeleteRulesDflts,
-    (void *) &SProcXkbDispatch,
-    (void *) &XkbLookupNamedGeometry,
-    (void *) &_XkbDupString,
-    (void *) &XkbConvertCase,
-    (void *) &SrvXkbChangeKeycodeRange,
-    (void *) &XkbFreeSrvLedInfo,
-    (void *) &XkbFreeInfo,
-    (void *) &SrvXkbChangeTypesOfKey,
-    (void *) &SrvXkbKeyTypesForCoreSymbols,
-    (void *) &SrvXkbApplyCompatMapToKey,
-    (void *) &SrvXkbApplyVirtualModChanges,
-    (void *) &XkbSendNewKeyboardNotify,
-    (void *) &XkbCopyKeymap,
-    (void *) &XkbCopyDeviceKeymap,
-    (void *) &XkbFilterEvents,
-    (void *) &XkbGetEffectiveGroup,
-    (void *) &XkbDDXList,
-    (void *) &XkbDDXLoadKeymapByNames,
-    (void *) &XkbDDXNamesFromRules,
-    (void *) &XkbCompileKeymap,
-};
diff --git a/xorg-server/hw/xfree86/os-support/xorgos.c b/xorg-server/hw/xfree86/os-support/xorgos.c
deleted file mode 100644
index e69de29bb..000000000
--- a/xorg-server/hw/xfree86/os-support/xorgos.c
+++ /dev/null
diff --git a/xorg-server/hw/xfree86/ramdac/xf86BitOrder.c b/xorg-server/hw/xfree86/ramdac/xf86BitOrder.c
deleted file mode 100644
index 713934d3b..000000000
--- a/xorg-server/hw/xfree86/ramdac/xf86BitOrder.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define XAAReverseBitOrder xf86ReverseBitOrder
-#include "./../xaa/xaaBitOrder.c"
diff --git a/xorg-server/hw/xfree86/xaa/l-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/l-xaaBitmap.c
deleted file mode 100644
index 4b20dee13..000000000
--- a/xorg-server/hw/xfree86/xaa/l-xaaBitmap.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define LSBFIRST
-#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/l-xaaStipple.c b/xorg-server/hw/xfree86/xaa/l-xaaStipple.c
deleted file mode 100644
index 91c52c778..000000000
--- a/xorg-server/hw/xfree86/xaa/l-xaaStipple.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define LSBFIRST
-#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/l-xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/l-xaaTEGlyph.c
deleted file mode 100644
index e58359cd2..000000000
--- a/xorg-server/hw/xfree86/xaa/l-xaaTEGlyph.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define LSBFIRST
-#include "./xaaTEGlyph.c"
diff --git a/xorg-server/hw/xfree86/xaa/l3-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/l3-xaaBitmap.c
deleted file mode 100644
index 0c1fd552d..000000000
--- a/xorg-server/hw/xfree86/xaa/l3-xaaBitmap.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define LSBFIRST
-#define TRIPLE_BITS
-#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/l3-xaaStipple.c b/xorg-server/hw/xfree86/xaa/l3-xaaStipple.c
deleted file mode 100644
index 9a182c695..000000000
--- a/xorg-server/hw/xfree86/xaa/l3-xaaStipple.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define LSBFIRST
-#define TRIPLE_BITS
-#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/lf-xaaBitmap.c
deleted file mode 100644
index 031407b9c..000000000
--- a/xorg-server/hw/xfree86/xaa/lf-xaaBitmap.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define LSBFIRST
-#define FIXEDBASE
-#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf-xaaStipple.c b/xorg-server/hw/xfree86/xaa/lf-xaaStipple.c
deleted file mode 100644
index d91265890..000000000
--- a/xorg-server/hw/xfree86/xaa/lf-xaaStipple.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define LSBFIRST
-#define FIXEDBASE
-#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf-xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/lf-xaaTEGlyph.c
deleted file mode 100644
index c578603f3..000000000
--- a/xorg-server/hw/xfree86/xaa/lf-xaaTEGlyph.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define LSBFIRST
-#define FIXEDBASE
-#include "./xaaTEGlyph.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf3-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/lf3-xaaBitmap.c
deleted file mode 100644
index 0607a7390..000000000
--- a/xorg-server/hw/xfree86/xaa/lf3-xaaBitmap.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#define LSBFIRST
-#define TRIPLE_BITS
-#define FIXEDBASE
-#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf3-xaaStipple.c b/xorg-server/hw/xfree86/xaa/lf3-xaaStipple.c
deleted file mode 100644
index af1698b99..000000000
--- a/xorg-server/hw/xfree86/xaa/lf3-xaaStipple.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#define LSBFIRST
-#define TRIPLE_BITS
-#define FIXEDBASE
-#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/m-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/m-xaaBitmap.c
deleted file mode 100644
index d0e3cb33d..000000000
--- a/xorg-server/hw/xfree86/xaa/m-xaaBitmap.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MSBFIRST
-#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/m-xaaStipple.c b/xorg-server/hw/xfree86/xaa/m-xaaStipple.c
deleted file mode 100644
index 1ba789918..000000000
--- a/xorg-server/hw/xfree86/xaa/m-xaaStipple.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MSBFIRST
-#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/m-xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/m-xaaTEGlyph.c
deleted file mode 100644
index 521390c32..000000000
--- a/xorg-server/hw/xfree86/xaa/m-xaaTEGlyph.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MSBFIRST
-#include "./xaaTEGlyph.c"
diff --git a/xorg-server/hw/xfree86/xaa/m3-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/m3-xaaBitmap.c
deleted file mode 100644
index 7b4ce814d..000000000
--- a/xorg-server/hw/xfree86/xaa/m3-xaaBitmap.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define MSBFIRST
-#define TRIPLE_BITS
-#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/m3-xaaStipple.c b/xorg-server/hw/xfree86/xaa/m3-xaaStipple.c
deleted file mode 100644
index eb2c83e8d..000000000
--- a/xorg-server/hw/xfree86/xaa/m3-xaaStipple.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define MSBFIRST
-#define TRIPLE_BITS
-#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/mf-xaaBitmap.c
deleted file mode 100644
index 36075e65d..000000000
--- a/xorg-server/hw/xfree86/xaa/mf-xaaBitmap.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define MSBFIRST
-#define FIXEDBASE
-#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf-xaaStipple.c b/xorg-server/hw/xfree86/xaa/mf-xaaStipple.c
deleted file mode 100644
index 41b469c71..000000000
--- a/xorg-server/hw/xfree86/xaa/mf-xaaStipple.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define MSBFIRST
-#define FIXEDBASE
-#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf-xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/mf-xaaTEGlyph.c
deleted file mode 100644
index 3fd657b4b..000000000
--- a/xorg-server/hw/xfree86/xaa/mf-xaaTEGlyph.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define MSBFIRST
-#define FIXEDBASE
-#include "./xaaTEGlyph.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf3-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/mf3-xaaBitmap.c
deleted file mode 100644
index 630775c52..000000000
--- a/xorg-server/hw/xfree86/xaa/mf3-xaaBitmap.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#define MSBFIRST
-#define TRIPLE_BITS
-#define FIXEDBASE
-#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf3-xaaStipple.c b/xorg-server/hw/xfree86/xaa/mf3-xaaStipple.c
deleted file mode 100644
index c9a86d008..000000000
--- a/xorg-server/hw/xfree86/xaa/mf3-xaaStipple.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#define MSBFIRST
-#define TRIPLE_BITS
-#define FIXEDBASE
-#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/s-xaaDashLine.c b/xorg-server/hw/xfree86/xaa/s-xaaDashLine.c
deleted file mode 100644
index 5ad3deb92..000000000
--- a/xorg-server/hw/xfree86/xaa/s-xaaDashLine.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define POLYSEGMENT
-#include "./xaaDashLine.c"
diff --git a/xorg-server/hw/xfree86/xaa/s-xaaLine.c b/xorg-server/hw/xfree86/xaa/s-xaaLine.c
deleted file mode 100644
index 12a37f419..000000000
--- a/xorg-server/hw/xfree86/xaa/s-xaaLine.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define POLYSEGMENT
-#include "./xaaLine.c"
diff --git a/xorg-server/hw/xfree86/xorg.c b/xorg-server/hw/xfree86/xorg.c
deleted file mode 100644
index e69de29bb..000000000
--- a/xorg-server/hw/xfree86/xorg.c
+++ /dev/null