Remove declarations of symbols that are never defined.

  These symbols were removed from the X Server, or never declared.
  One symbol that may need special attention is XkbBuildCoreState(),
that doesn't have a prototype anywhere, but is called from
xkb/xkbEvents.c:XkbFilterEvents(), and also used by the macros
XkbStateFieldFromRec() and XkbGrabStateFromRec() defined in
include/xkbstr.h.
  fb/wfbrename.h also may need some cleanup, as it makes several
"renames" of non existing symbols.

22 files changed, 0 insertions, 264 deletions

diff --git a/fb/fb.h b/fb/fb.h
index 4572af612..9c3959551 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1676,19 +1676,6 @@ fbPushFill (DrawablePtr	pDrawable,
             int         height);
 
 void
-fbPush1toN (DrawablePtr pSrcDrawable,
-            DrawablePtr pDstDrawable,
-            GCPtr       pGC,
-            BoxPtr      pbox,
-            int         nbox,
-            int         dx,
-            int         dy,
-            Bool        reverse,
-            Bool        upsidedown,
-            Pixel       bitplane,
-            void        *closure);
-
-void
 fbPushImage (DrawablePtr    pDrawable,
              GCPtr          pGC,
              
@@ -1788,9 +1775,6 @@ fbScreenInit(ScreenPtr	pScreen,
              int        dpiy,
              int        width,
              int        bpp);
-
-void
-fbInitializeBackingStore (ScreenPtr pScreen);
     
 /*
  * fbseg.c
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index d7e1d7912..483171cb3 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -242,14 +242,6 @@ fbFinishScreenInit(ScreenPtr	pScreen,
         pScreen->CreateScreenResources = fb24_32CreateScreenResources;
     }
 #endif
-#if 0
-    /* leave backing store initialization to the enclosing code so
-     * it can choose the correct order of wrappers
-     */
-    /* init backing store here so we can overwrite CloseScreen without stepping
-     * on the backing store wrapped version */
-    fbInitializeBackingStore (pScreen);
-#endif
     return TRUE;
 }
 
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index a32aa9bcc..90e8ff871 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -64,7 +64,6 @@ extern DevPrivateKey xf86CreateRootWindowKey;
 extern DevPrivateKey xf86PixmapKey;
 extern ScrnInfoPtr *xf86Screens;        /* List of pointers to ScrnInfoRecs */
 extern const unsigned char byte_reversed[256];
-extern ScrnInfoPtr xf86CurrentScreen;
 extern Bool pciSlotClaimed;
 extern Bool fbSlotClaimed;
 #if defined(__sparc__) || defined(__sparc)
@@ -130,7 +129,6 @@ Bool xf86CheckPciMemBase(struct pci_device * pPci, memType base);
 void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs,
                         xf86SetAccessFuncPtr oldFuncs);
 Bool xf86IsEntityPrimary(int entityIndex);
-resPtr xf86ReallocatePciResources(int entityIndex, resPtr pRes);
 resPtr xf86SetOperatingState(resList list, int entityIndex, int mask);
 void xf86EnterServerState(xf86State state);
 ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
@@ -277,7 +275,6 @@ void xf86LoaderRefSymLists(const char **, ...);
 void xf86LoaderRefSymbols(const char *, ...);
 void xf86SetBackingStore(ScreenPtr pScreen);
 void xf86SetSilkenMouse(ScreenPtr pScreen);
-int xf86NewSerialNumber(WindowPtr p, pointer unused);
 pointer xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name,
                           char **adaptor_name, pointer *adaptor_options);
 void xf86GetOS(const char **name, int *major, int *minor, int *teeny);
@@ -363,7 +360,6 @@ void xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts);
 /* xf86RandR.c */
 #ifdef RANDR
 Bool xf86RandRInit (ScreenPtr    pScreen);
-void xf86RandRSetInitialMode (ScreenPtr pScreen);
 Rotation xf86GetRotation(ScreenPtr pScreen);
 Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,
                         int newvirtX, int newvirtY,
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 81011e163..f4ce387a4 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -189,9 +189,6 @@ extern ExtensionModule *ExtensionModuleList;
 pointer LoadSubModule(pointer, const char *, const char **,
                       const char **, pointer, const XF86ModReqInfo *,
                       int *, int *);
-pointer LoadSubModuleLocal(pointer, const char *, const char **,
-                           const char **, pointer, const XF86ModReqInfo *,
-                           int *, int *);
 void UnloadSubModule(pointer);
 void UnloadModule (pointer);
 #endif
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 5de48ac77..d2d806f4e 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -61,9 +61,6 @@ extern char *xf86LayoutName;
 extern char *xf86ScreenName;
 extern char *xf86PointerName;
 extern char *xf86KeyboardName;
-#ifdef KEEPBPP
-extern int xf86Bpp;
-#endif
 extern int xf86FbBpp;
 extern int xf86Depth;
 extern Pix24Flags xf86Pix24;
@@ -83,11 +80,6 @@ extern const char *xf86LogFile;
 extern MessageType xf86LogFileFrom;
 extern Bool xf86LogFileWasOpened;
 extern serverLayoutRec xf86ConfigLayout;
-extern Pix24Flags xf86ConfigPix24;
-
-extern unsigned short xf86MouseCflags[];
-extern Bool xf86SupportedMouseTypes[];
-extern int xf86NumMouseTypes;
 
 extern DriverPtr *xf86DriverList;
 extern int xf86NumDrivers;
@@ -123,13 +115,10 @@ extern RootWinPropPtr *xf86RegisteredPropertiesTable;
 /* xf86Bus.c */
 
 void xf86BusProbe(void);
-void xf86ChangeBusIndex(int oldIndex, int newIndex);
 void xf86AccessInit(void);
 void xf86AccessEnter(void);
 void xf86AccessLeave(void);
 void xf86EntityInit(void);
-void xf86EntityEnter(void);
-void xf86EntityLeave(void);
 void xf86AccessLeaveState(void);
 
 void xf86FindPrimaryDevice(void);
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index 28a331594..d7f50e082 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -155,7 +155,6 @@ typedef struct _DeviceAssocRec
 extern InputInfoPtr xf86InputDevs;
 
 /* xf86Xinput.c */
-void InitExtInput(void);
 void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute,
                          int first_valuator, int num_valuators, ...);
 void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute,
@@ -171,8 +170,6 @@ void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down,
 void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code,
                            int is_down);
 void xf86ActivateDevice(LocalDevicePtr local);
-Bool xf86CheckButton(int button, int down);
-void xf86SwitchCoreDevice(LocalDevicePtr device, DeviceIntPtr core);
 LocalDevicePtr xf86FirstLocalDevice(void);
 int xf86ScaleAxis(int Cx, int Sxhigh, int Sxlow, int Rxhigh, int Rxlow);
 void xf86XInputSetScreen(LocalDevicePtr local, int screen_number, int x, int y);
@@ -185,7 +182,6 @@ void xf86AddEnabledDevice(InputInfoPtr pInfo);
 void xf86RemoveEnabledDevice(InputInfoPtr pInfo);
 void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
 void xf86EnableDevice(DeviceIntPtr dev);
-int xf86NewInputDevice(IDevPtr idev, DeviceIntPtr *pdev, BOOL is_auto);
 
 /* xf86Helper.c */
 void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags);
diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h
index f4d3fe45b..67ca39c06 100644
--- a/hw/xfree86/dixmods/extmod/dgaproc.h
+++ b/hw/xfree86/dixmods/extmod/dgaproc.h
@@ -125,8 +125,6 @@ Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index, int button,
 Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx, int dy);
 Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index, int key_code, int is_down);
 Bool DGAIsDgaEvent (xEvent *e);
-
-Bool DGADeliverEvent (ScreenPtr pScreen, xEvent *e);
             
 Bool DGAOpenFramebuffer(int Index, char **name, unsigned char **mem, 
                         int *size, int *offset, int *flags);
diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h
index 0e6669d8f..2af709b9a 100644
--- a/hw/xfree86/int10/xf86int10.h
+++ b/hw/xfree86/int10/xf86int10.h
@@ -129,7 +129,6 @@ int run_bios_int(int num, xf86Int10InfoPtr pInt);
 void dump_code(xf86Int10InfoPtr pInt);
 void dump_registers(xf86Int10InfoPtr pInt);
 void stack_trace(xf86Int10InfoPtr pInt);
-xf86Int10InfoPtr getInt10Rec(int entityIndex);
 CARD8 bios_checksum(const CARD8 *start, int size);
 void LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga);
 void UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga);
diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h
index 827f3a92f..f468a36a0 100644
--- a/hw/xfree86/loader/loaderProcs.h
+++ b/hw/xfree86/loader/loaderProcs.h
@@ -82,10 +82,6 @@ ModuleDescPtr LoadModule(const char *, const char *, const char **,
 ModuleDescPtr LoadSubModule(ModuleDescPtr, const char *,
                             const char **, const char **, pointer,
                             const XF86ModReqInfo *, int *, int *);
-ModuleDescPtr LoadSubModuleLocal(ModuleDescPtr, const char *,
-                                 const char **, const char **,
-                                 pointer, const XF86ModReqInfo *,
-                                 int *, int *);
 ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent);
 void UnloadModule(ModuleDescPtr);
 void UnloadSubModule(ModuleDescPtr);
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index b4513d65f..664c7cbb9 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -110,10 +110,6 @@
 #define XF86_M_RNG              0x080   /* ring */
 #define XF86_M_DSR              0x100   /* data set ready */
 
-#ifdef XF86_OS_PRIVS
-extern void xf86WrapperInit(void);
-#endif
-
 #ifndef NO_OSLIB_PROTOTYPES
 /*
  * This is to prevent re-entrancy to FatalError() when aborting.
@@ -168,7 +164,6 @@ extern int xf86GetSerialModemState(int fd);
 extern int xf86SerialModemSetBits(int fd, int bits);
 extern int xf86SerialModemClearBits(int fd, int bits);
 extern int xf86LoadKernelModule(const char *pathname);
-extern void xf86RingBell(int volume, int pitch, int duration);
 
 /* AGP GART interface */
 
diff --git a/hw/xfree86/parser/xf86Optrec.h b/hw/xfree86/parser/xf86Optrec.h
index 51b8de6ef..77a5728bb 100644
--- a/hw/xfree86/parser/xf86Optrec.h
+++ b/hw/xfree86/parser/xf86Optrec.h
@@ -100,13 +100,11 @@ XF86OptionPtr xf86newOption(char *name, char *value);
 XF86OptionPtr xf86nextOption(XF86OptionPtr list);
 XF86OptionPtr xf86findOption(XF86OptionPtr list, const char *name);
 char *xf86findOptionValue(XF86OptionPtr list, const char *name);
-int xf86findOptionBoolean (XF86OptionPtr, const char *, int);
 XF86OptionPtr xf86optionListCreate(const char **options, int count, int used);
 XF86OptionPtr xf86optionListMerge(XF86OptionPtr head, XF86OptionPtr tail);
 char *xf86configStrdup (const char *s);
 int xf86nameCompare (const char *s1, const char *s2);
 char *xf86uLongToString(unsigned long i);
-void xf86debugListOptions(XF86OptionPtr);
 XF86OptionPtr xf86parseOption(XF86OptionPtr head);
 void xf86printOptionList(FILE *fp, XF86OptionPtr list, int tabs);
 
diff --git a/hw/xfree86/ramdac/TI.h b/hw/xfree86/ramdac/TI.h
index bc807f40c..5eb94cbc7 100644
--- a/hw/xfree86/ramdac/TI.h
+++ b/hw/xfree86/ramdac/TI.h
@@ -10,10 +10,6 @@ void TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr Ram
 void TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec);
 void TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec);
 void TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec);
-unsigned long TIramdac3030CalculateMNPForClock(unsigned long RefClock,
-    unsigned long ReqClock, char IsPixClock, unsigned long MinClock,
-    unsigned long MaxClock, unsigned long *rM, unsigned long *rN,
-    unsigned long *rP);
 void TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr);
 void TIramdacLoadPalette( ScrnInfoPtr pScrn, int numColors, int *indices,
     LOCO *colors, VisualPtr pVisual);
diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h
index 1f03dfb99..3d2982ecf 100644
--- a/hw/xfree86/ramdac/xf86RamDac.h
+++ b/hw/xfree86/ramdac/xf86RamDac.h
@@ -113,8 +113,6 @@ RamDacHelperRecPtr RamDacHelperCreateInfoRec(void);
 void RamDacDestroyInfoRec(RamDacRecPtr RamDacRec);
 void RamDacHelperDestroyInfoRec(RamDacHelperRecPtr RamDacRec);
 Bool RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec);
-void RamDacSetGamma(ScrnInfoPtr pScrn, Bool Real8BitDac);
-void RamDacRestoreDACValues(ScrnInfoPtr pScrn);
 Bool RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits,
                            unsigned int flags);
 void RamDacFreeRec(ScrnInfoPtr pScrn);
diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h
index de9237c9d..7f05e6b23 100644
--- a/hw/xfree86/vbe/vbe.h
+++ b/hw/xfree86/vbe/vbe.h
@@ -307,12 +307,6 @@ typedef struct _vbeModeInfoRec {
     struct _vbeModeInfoRec *next;
 } vbeModeInfoRec, *vbeModeInfoPtr;
 
-vbeModeInfoPtr    VBEBuildVbeModeList(vbeInfoPtr pVbe, 
-                            VbeInfoBlock *vbe);
-
-unsigned short VBECalcVbeModeIndex(vbeModeInfoPtr m, 
-                                   DisplayModePtr mode, int bpp);
-
 typedef struct {
     CARD8 *state;
     CARD8 *pstate;
diff --git a/include/dix.h b/include/dix.h
index 66af953b2..1e3e78db1 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -169,8 +169,6 @@ extern void SendErrorToClient(
 extern void MarkClientException(
     ClientPtr /*client*/);
 
-extern void ddxBeforeReset (void);
-
 /* dixutils.c */
 
 extern void CopyISOLatin1Lowered(
@@ -381,10 +379,6 @@ extern int DeliverDeviceEvents(
 extern void DefineInitialRootWindow(
     WindowPtr /* win */);
 
-extern void SetupSprite(
-    DeviceIntPtr /* pDev */,
-    ScreenPtr    /* pScreen */);
-
 extern void InitializeSprite(
     DeviceIntPtr /* pDev */,
     WindowPtr    /* pWin */);
@@ -454,10 +448,6 @@ extern int GrabDevice(
     Bool /* coreGrab */);
 
 extern void InitEvents(void);
-extern void InitSprite(
-        DeviceIntPtr /* pDev */, 
-        Bool /* hasCursor */
-        );
 
 extern void CloseDownEvents(void);
 
diff --git a/include/xkbfile.h b/include/xkbfile.h
index 0a6cb18b9..c84f21dd4 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -76,11 +76,6 @@ typedef void	(*XkbFileAddOnFunc)(
 #define _XkbErrXReqFailure              25
 #define _XkbErrBadImplementation        26
 
-extern char *           _XkbErrMessages[];
-extern unsigned         _XkbErrCode;
-extern char *           _XkbErrLocation;
-extern unsigned         _XkbErrData;
-
 /***====================================================================***/
 
 _XFUNCPROTOBEGIN
@@ -149,16 +144,6 @@ extern char *	XkbIMWhichStateMaskText(
     unsigned    /* format */
 );
 
-extern char *   XkbAccessXDetailText(
-    unsigned    /* state */,
-    unsigned    /* format */
-);
-
-extern char *   XkbNKNDetailMaskText(
-    unsigned    /* detail */,
-    unsigned    /* format */
-);
-
 extern char *   XkbControlsMaskText(
     unsigned    /* ctrls */,
     unsigned    /* format */
@@ -212,14 +197,6 @@ extern	int	 XkbFindKeycodeByName(
     Bool        /* use_aliases */
 );
 
-extern  Bool    XkbLookupGroupAndLevel(
-    XkbDescPtr  /* xkb */,
-    int         /* key */,
-    int *       /* mods_inout */,
-    int *       /* grp_inout */,
-    int *       /* lvl_rtrn */
-);
-
 /***====================================================================***/
 
 extern  Atom    XkbInternAtom(
@@ -227,8 +204,6 @@ extern	Atom	XkbInternAtom(
     Bool        /* onlyIfExists */
 );
 
-extern  void    XkbInitAtoms(void);
-
 /***====================================================================***/
 
 #ifdef _XKBGEOM_H_
@@ -246,17 +221,6 @@ typedef struct _XkbDrawable {
         struct _XkbDrawable *   next;
 } XkbDrawableRec,*XkbDrawablePtr; 
 
-extern  XkbDrawablePtr
-XkbGetOrderedDrawables(
-    XkbGeometryPtr      /* geom */,
-    XkbSectionPtr       /* section */
-);
-
-extern  void
-XkbFreeOrderedDrawables(
-    XkbDrawablePtr      /* draw */
-);
-
 #endif
 
 /***====================================================================***/
@@ -266,11 +230,6 @@ extern	unsigned	XkbConvertGetByNameComponents(
     unsigned            /* orig */
 );
 
-extern  unsigned        XkbConvertXkbComponents(
-    Bool                /* toXkm */,
-    unsigned            /* orig */
-);
-
 extern  Bool    XkbNameMatchesPattern(
     char *              /* name */,
     char *              /* pattern */
@@ -323,56 +282,6 @@ extern	Bool	XkbWriteXKBGeometry(
     void *              /* priv */
 );
 
-extern  Bool    XkbWriteXKBSemantics(
-    FILE *              /* file */,
-    XkbDescPtr  /* result */,
-    Bool                /* topLevel */,
-    Bool                /* showImplicit */,
-    XkbFileAddOnFunc    /* addOn */,
-    void *              /* priv */
-);
-
-extern  Bool    XkbWriteXKBLayout(
-    FILE *              /* file */,
-    XkbDescPtr  /* result */,
-    Bool                /* topLevel */,
-    Bool                /* showImplicit */,
-    XkbFileAddOnFunc    /* addOn */,
-    void *              /* priv */
-);
-
-extern  Bool    XkbWriteXKBKeymap(
-    FILE *              /* file */,
-    XkbDescPtr  /* result */,
-    Bool                /* topLevel */,
-    Bool                /* showImplicit */,
-    XkbFileAddOnFunc    /* addOn */,
-    void *              /* priv */
-);
-
-extern  Bool    XkbWriteXKBFile(
-    FILE *              /* file */,
-    XkbDescPtr  /* result */,
-    Bool                /* showImplicit */,
-    XkbFileAddOnFunc    /* addOn */,
-    void *              /* priv */
-);
-
-extern  Bool    XkbWriteCFile(
-    FILE *              /* file */,
-    char *              /* name */,
-    XkbDescPtr  /* info */
-);
-
-extern  Bool    XkbWriteXKMFile(
-    FILE *              /* file */,
-    XkbDescPtr  /* result */
-);
-
-extern  Bool    XkbWriteToServer(
-    XkbDescPtr  /* result */
-);
-
 extern  void    XkbEnsureSafeMapName(
     char *              /* name */
 );
@@ -385,10 +294,6 @@ extern	Bool	XkbWriteXKBKeymapForNames(
     unsigned                    /* need */
 );
 
-extern  Status  XkbMergeFile(
-    XkbDescPtr                  /* xkb */
-);
-
 /***====================================================================***/
 
 extern Bool     XkmProbe(
@@ -411,24 +316,6 @@ extern Bool	XkmReadTOC(
     xkmSectionInfo *    /* toc */
 );
 
-extern xkmSectionInfo *XkmFindTOCEntry(
-    xkmFileInfo *       /* finfo */,
-    xkmSectionInfo *    /* toc */,
-    unsigned            /* type */
-);
-
-extern Bool     XkmReadFileSection(
-    FILE *              /* file */,
-    xkmSectionInfo *    /* toc */,
-    XkbDescPtr       /* result */,
-    unsigned *          /* loaded_rtrn */
-);
-
-extern char *   XkmReadFileSectionName(
-    FILE *              /* file */,
-    xkmSectionInfo *    /* toc */
-);
-
 #endif /* _XKMFORMAT_H  */
 
 _XFUNCPROTOEND
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index d43755e06..32661a931 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -295,8 +295,6 @@ extern int	XkbDisableLockActions;
 extern int      XkbKeyboardErrorCode;
 extern char *   XkbBaseDirectory;
 extern char *   XkbBinDirectory;
-extern char *   XkbInitialMap;
-extern unsigned int XkbXIUnsupported;
 
 extern Bool     noXkbExtension;
 
@@ -484,12 +482,6 @@ extern  void XkbSetActionKeyMods(
         unsigned int            /* mods */
 );
 
-extern Bool XkbCheckActionVMods(
-        XkbDescPtr              /* xkb */,
-        XkbAction *             /* act */,
-        unsigned int            /* changed */
-);
-
 extern  unsigned int XkbMaskForVMask(
     XkbDescPtr          /* xkb */,
     unsigned int        /* vmask */
@@ -705,11 +697,6 @@ extern	void XkbSendNamesNotify(
        xkbNamesNotify * /* ev */
 );
 
-extern  void XkbSendCompatNotify(
-       DeviceIntPtr             /* kbd */,
-       xkbCompatMapNotify *     /* ev */
-);
-
 extern  void XkbSendActionMessage(
        DeviceIntPtr             /* kbd */,
        xkbActionMessage *       /* ev */
@@ -827,11 +814,6 @@ extern void XkbDDXUpdateDeviceIndicators(
         CARD32                  /* newState */
 );
 
-extern void XkbDDXFakePointerButton(
-        int             /* event */,
-        int             /* button */
-);
-
 extern void XkbDDXFakePointerMotion(
         unsigned int    /* flags */,
         int             /* x */,
@@ -1037,16 +1019,6 @@ extern	Bool XkbDDXNamesFromRules(
         XkbComponentNamesPtr    /* names */
 );
 
-extern  Bool XkbDDXApplyConfig(
-        void *  /* cfg_in */,
-        XkbSrvInfoPtr   /* xkbi */
-);
-
-extern  int _XkbStrCaseCmp(
-        char *                  /* str1 */,
-        char *                  /* str2 */
-);
-
 _XFUNCPROTOEND
 
 #define XkbAtomGetString(s)     NameForAtom(s)
diff --git a/mi/mipointer.h b/mi/mipointer.h
index d1eac987f..c004ba4b0 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -110,14 +110,6 @@ extern void miPointerWarpCursor(
     int /*y*/
 ) _X_DEPRECATED;
 
-extern int miPointerGetMotionEvents(
-    DeviceIntPtr /*pPtr*/,
-    xTimecoord * /*coords*/,
-    unsigned long /*start*/,
-    unsigned long /*stop*/,
-    ScreenPtr /*pScreen*/
-);
-
 /* Deprecated in favour of miPointerSetPosition. */
 extern void miPointerAbsoluteCursor(
     int /*x*/,
diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h
index 2e45df2b5..ee99fe61f 100644
--- a/miext/shadow/shadow.h
+++ b/miext/shadow/shadow.h
@@ -95,9 +95,6 @@ shadowAdd (ScreenPtr	    pScreen,
 void
 shadowRemove (ScreenPtr pScreen, PixmapPtr pPixmap);
 
-shadowBufPtr
-shadowFindBuf (WindowPtr pWindow);
-
 Bool
 shadowInit (ScreenPtr pScreen, ShadowUpdateProc update, ShadowWindowProc window);
 
diff --git a/randr/randrstr.h b/randr/randrstr.h
index 64206e88d..82c7b6131 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -410,9 +410,6 @@ Bool
 miRRGetInfo (ScreenPtr pScreen, Rotation *rotations);
 
 Bool
-miRRGetScreenInfo (ScreenPtr pScreen);
-
-Bool
 miRRCrtcSet (ScreenPtr  pScreen,
              RRCrtcPtr  crtc,
              RRModePtr  mode,
@@ -504,12 +501,6 @@ Bool RRScreenInit (ScreenPtr pScreen);
 Rotation
 RRGetRotation (ScreenPtr pScreen);
 
-int
-RRSetScreenConfig (ScreenPtr            pScreen,
-                   Rotation             rotation,
-                   int                  rate,
-                   RRScreenSizePtr      pSize);
-
 #endif                                  
 
 /* rrcrtc.c */
@@ -699,9 +690,6 @@ RRModePtr
 RRModeGet (xRRModeInfo  *modeInfo,
            const char   *name);
 
-void
-RRModePruneUnused (ScreenPtr pScreen);
-
 /*
  * Destroy a mode.
  */
diff --git a/render/mipict.h b/render/mipict.h
index 60baf7f66..b3d4bae6f 100644
--- a/render/mipict.h
+++ b/render/mipict.h
@@ -80,14 +80,6 @@ miChangePictureFilter (PicturePtr pPicture,
                        xFixed     *params,
                        int        nparams);
 
-Bool
-miClipPicture (RegionPtr    pRegion,
-               PicturePtr   pPicture,
-               INT16        xReg,
-               INT16        yReg,
-               INT16        xPict,
-               INT16        yPict);
-
 void
 miCompositeSourceValidate (PicturePtr   pPicture,
                            INT16        x,
@@ -170,12 +162,6 @@ void
 miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds);
 
 void
-miRasterizeTriangle (PicturePtr pMask,
-                     xTriangle  *tri,
-                     int        x_off,
-                     int        y_off);
-
-void
 miTriangles (CARD8          op,
              PicturePtr     pSrc,
              PicturePtr     pDst,
diff --git a/render/picturestr.h b/render/picturestr.h
index 4d788fcfb..500f800ce 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -634,10 +634,6 @@ AddTraps (PicturePtr	pPicture,
           int           ntraps,
           xTrap         *traps);
 
-pixman_image_t *
-PixmanImageFromPicture (PicturePtr pPict,
-                        Bool hasClip);
-
 PicturePtr
 CreateSolidPicture (Picture pid,
                     xRenderColor *color,