dropped miregion and all the X stuff in favour of Wez' sraRegion, added dox

16 files changed, 0 insertions, 5549 deletions

diff --git a/include/Xserver/colormap.h b/include/Xserver/colormap.h
deleted file mode 100755
index 134f4a6..0000000
--- a/include/Xserver/colormap.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-*/
-/* $XConsortium: colormap.h,v 1.28 94/04/17 20:25:32 dpw Exp $ */
-
-
-
-
-/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.2 1997/01/14 22:22:38 dawes Exp $ */
-#ifndef CMAP_H
-#define CMAP_H 1
-
-#include "X11/Xproto.h"
-#include "screenint.h"
-#include "window.h"
-
-/* these follow X.h's AllocNone and AllocAll */
-#define CM_PSCREEN 2
-#define CM_PWIN    3
-/* Passed internally in colormap.c */
-#define REDMAP 0
-#define GREENMAP 1
-#define BLUEMAP 2
-#define PSEUDOMAP 3
-#define AllocPrivate (-1)
-#define AllocTemporary (-2)
-#define DynamicClass  1
-
-/* Values for the flags field of a colormap. These should have 1 bit set
- * and not overlap */
-#define IsDefault 1
-#define AllAllocated 2
-#define BeingCreated 4
-
-
-typedef CARD32 Pixel;
-typedef struct _CMEntry *EntryPtr;
-/* moved to screenint.h: typedef struct _ColormapRec *ColormapPtr */
-typedef struct _colorResource *colorResourcePtr;
-
-extern int CreateColormap(
-#if NeedFunctionPrototypes
-    Colormap /*mid*/,
-    ScreenPtr /*pScreen*/,
-    VisualPtr /*pVisual*/,
-    ColormapPtr* /*ppcmap*/,
-    int /*alloc*/,
-    int /*client*/
-#endif
-);
-
-extern int FreeColormap(
-#if NeedFunctionPrototypes
-    pointer /*pmap*/,
-    XID /*mid*/
-#endif
-);
-
-extern int TellLostMap(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pwin*/,
-    pointer /* Colormap *pmid */
-#endif
-);
-
-extern int TellGainedMap(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pwin*/,
-    pointer /* Colormap *pmid */
-#endif
-);
-
-extern int CopyColormapAndFree(
-#if NeedFunctionPrototypes
-    Colormap /*mid*/,
-    ColormapPtr /*pSrc*/,
-    int /*client*/
-#endif
-);
-
-extern int AllocColor(
-#if NeedFunctionPrototypes
-    ColormapPtr /*pmap*/,
-    unsigned short* /*pred*/,
-    unsigned short* /*pgreen*/,
-    unsigned short* /*pblue*/,
-    Pixel* /*pPix*/,
-    int /*client*/
-#endif
-);
-
-extern void FakeAllocColor(
-#if NeedFunctionPrototypes
-    ColormapPtr /*pmap*/,
-    xColorItem * /*item*/
-#endif
-);
-
-extern void FakeFreeColor(
-#if NeedFunctionPrototypes
-    ColormapPtr /*pmap*/,
-    Pixel /*pixel*/
-#endif
-);
-
-typedef int (*ColorCompareProcPtr)(
-#if NeedNestedPrototypes
-    EntryPtr /*pent*/,
-    xrgb * /*prgb*/
-#endif
-);
-
-extern int FindColor(
-#if NeedFunctionPrototypes
-    ColormapPtr /*pmap*/,
-    EntryPtr /*pentFirst*/,
-    int /*size*/,
-    xrgb* /*prgb*/,
-    Pixel* /*pPixel*/,
-    int /*channel*/,
-    int /*client*/,
-    ColorCompareProcPtr /*comp*/
-#endif
-);
-
-extern int QueryColors(
-#if NeedFunctionPrototypes
-    ColormapPtr /*pmap*/,
-    int /*count*/,
-    Pixel* /*ppixIn*/,
-    xrgb* /*prgbList*/
-#endif
-);
-
-extern int FreeClientPixels(
-#if NeedFunctionPrototypes
-    pointer /*pcr*/,
-    XID /*fakeid*/
-#endif
-);
-
-extern int AllocColorCells(
-#if NeedFunctionPrototypes
-    int /*client*/,
-    ColormapPtr /*pmap*/,
-    int /*colors*/,
-    int /*planes*/,
-    Bool /*contig*/,
-    Pixel* /*ppix*/,
-    Pixel* /*masks*/
-#endif
-);
-
-extern int AllocColorPlanes(
-#if NeedFunctionPrototypes
-    int /*client*/,
-    ColormapPtr /*pmap*/,
-    int /*colors*/,
-    int /*r*/,
-    int /*g*/,
-    int /*b*/,
-    Bool /*contig*/,
-    Pixel* /*pixels*/,
-    Pixel* /*prmask*/,
-    Pixel* /*pgmask*/,
-    Pixel* /*pbmask*/
-#endif
-);
-
-extern int FreeColors(
-#if NeedFunctionPrototypes
-    ColormapPtr /*pmap*/,
-    int /*client*/,
-    int /*count*/,
-    Pixel* /*pixels*/,
-    Pixel /*mask*/
-#endif
-);
-
-extern int StoreColors(
-#if NeedFunctionPrototypes
-    ColormapPtr /*pmap*/,
-    int /*count*/,
-    xColorItem* /*defs*/
-#endif
-);
-
-extern int IsMapInstalled(
-#if NeedFunctionPrototypes
-    Colormap /*map*/,
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-#endif /* CMAP_H */
diff --git a/include/Xserver/cursor.h b/include/Xserver/cursor.h
deleted file mode 100755
index 4069272..0000000
--- a/include/Xserver/cursor.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/***********************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XConsortium: cursor.h,v 1.22 94/04/17 20:25:34 dpw Exp $ */
-#ifndef CURSOR_H
-#define CURSOR_H 
-
-#include "misc.h"
-#include "screenint.h"
-#include "window.h"
-
-#define NullCursor ((CursorPtr)NULL)
-
-typedef struct _Cursor *CursorPtr;
-typedef struct _CursorMetric *CursorMetricPtr;
-
-extern CursorPtr rootCursor;
-
-extern int FreeCursor(
-#if NeedFunctionPrototypes
-    pointer /*pCurs*/,
-    XID /*cid*/
-#endif
-);
-
-extern CursorPtr X11AllocCursor(
-#if NeedFunctionPrototypes
-    unsigned char* /*psrcbits*/,
-    unsigned char* /*pmaskbits*/,
-    CursorMetricPtr /*cm*/,
-    unsigned /*foreRed*/,
-    unsigned /*foreGreen*/,
-    unsigned /*foreBlue*/,
-    unsigned /*backRed*/,
-    unsigned /*backGreen*/,
-    unsigned /*backBlue*/
-#endif
-);
-
-extern int AllocGlyphCursor(
-#if NeedFunctionPrototypes
-    Font /*source*/,
-    unsigned int /*sourceChar*/,
-    Font /*mask*/,
-    unsigned int /*maskChar*/,
-    unsigned /*foreRed*/,
-    unsigned /*foreGreen*/,
-    unsigned /*foreBlue*/,
-    unsigned /*backRed*/,
-    unsigned /*backGreen*/,
-    unsigned /*backBlue*/,
-    CursorPtr* /*ppCurs*/,
-    ClientPtr /*client*/
-#endif
-);
-
-extern CursorPtr CreateRootCursor(
-#if NeedFunctionPrototypes
-    char* /*pfilename*/,
-    unsigned int /*glyph*/
-#endif
-);
-
-extern int ServerBitsFromGlyph(
-#if NeedFunctionPrototypes
-    FontPtr /*pfont*/,
-    unsigned int /*ch*/,
-    register CursorMetricPtr /*cm*/,
-    unsigned char ** /*ppbits*/
-#endif
-);
-
-extern Bool CursorMetricsFromGlyph(
-#if NeedFunctionPrototypes
-    FontPtr /*pfont*/,
-    unsigned /*ch*/,
-    CursorMetricPtr /*cm*/
-#endif
-);
-
-extern void CheckCursorConfinement(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-extern void NewCurrentScreen(
-#if NeedFunctionPrototypes
-    ScreenPtr /*newScreen*/,
-    int /*x*/,
-    int /*y*/
-#endif
-);
-
-extern Bool PointerConfinedToScreen(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void GetSpritePosition(
-#if NeedFunctionPrototypes
-    int * /*px*/,
-    int * /*py*/
-#endif
-);
-
-#endif /* CURSOR_H */
diff --git a/include/Xserver/dix.h b/include/Xserver/dix.h
deleted file mode 100755
index 2982b61..0000000
--- a/include/Xserver/dix.h
+++ /dev/null
@@ -1,1103 +0,0 @@
-/***********************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XConsortium: dix.h /main/44 1996/12/15 21:24:57 rws $ */
-/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.7 1996/12/31 04:17:46 dawes Exp $ */
-
-#ifndef DIX_H
-#define DIX_H
-
-#include "gc.h"
-#include "window.h"
-#include "input.h"
-
-#define EARLIER -1
-#define SAMETIME 0
-#define LATER 1
-
-#define NullClient ((ClientPtr) 0)
-#define REQUEST(type) \
-        register type *stuff = (type *)client->requestBuffer
-
-
-#define REQUEST_SIZE_MATCH(req)\
-    if ((sizeof(req) >> 2) != client->req_len)\
-         return(BadLength)
-
-#define REQUEST_AT_LEAST_SIZE(req) \
-    if ((sizeof(req) >> 2) > client->req_len )\
-         return(BadLength)
-
-#define REQUEST_FIXED_SIZE(req, n)\
-    if (((sizeof(req) >> 2) > client->req_len) || \
-        (((sizeof(req) + (n) + 3) >> 2) != client->req_len)) \
-         return(BadLength)
-
-#define LEGAL_NEW_RESOURCE(id,client)\
-    if (!LegalNewID(id,client)) \
-    {\
-        client->errorValue = id;\
-        return(BadIDChoice);\
-    }
-
-/* XXX if you are using this macro, you are probably not generating Match
- * errors where appropriate */
-#define LOOKUP_DRAWABLE(did, client)\
-    ((client->lastDrawableID == did) ? \
-     client->lastDrawable : (DrawablePtr)LookupDrawable(did, client))
-
-#ifdef XCSECURITY
-
-#define SECURITY_VERIFY_DRAWABLE(pDraw, did, client, mode)\
-    if (client->lastDrawableID == did && !client->trustLevel)\
-        pDraw = client->lastDrawable;\
-    else \
-    {\
-        pDraw = (DrawablePtr) SecurityLookupIDByClass(client, did, \
-                                                      RC_DRAWABLE, mode);\
-        if (!pDraw) \
-        {\
-            client->errorValue = did; \
-            return BadDrawable;\
-        }\
-        if (pDraw->type == UNDRAWABLE_WINDOW)\
-            return BadMatch;\
-    }
-
-#define SECURITY_VERIFY_GEOMETRABLE(pDraw, did, client, mode)\
-    if (client->lastDrawableID == did && !client->trustLevel)\
-        pDraw = client->lastDrawable;\
-    else \
-    {\
-        pDraw = (DrawablePtr) SecurityLookupIDByClass(client, did, \
-                                                      RC_DRAWABLE, mode);\
-        if (!pDraw) \
-        {\
-            client->errorValue = did; \
-            return BadDrawable;\
-        }\
-    }
-
-#define SECURITY_VERIFY_GC(pGC, rid, client, mode)\
-    if (client->lastGCID == rid && !client->trustLevel)\
-        pGC = client->lastGC;\
-    else\
-        pGC = (GC *) SecurityLookupIDByType(client, rid, RT_GC, mode);\
-    if (!pGC)\
-    {\
-        client->errorValue = rid;\
-        return (BadGC);\
-    }
-
-#define VERIFY_DRAWABLE(pDraw, did, client)\
-        SECURITY_VERIFY_DRAWABLE(pDraw, did, client, SecurityUnknownAccess)
-
-#define VERIFY_GEOMETRABLE(pDraw, did, client)\
-        SECURITY_VERIFY_GEOMETRABLE(pDraw, did, client, SecurityUnknownAccess)
-
-#define VERIFY_GC(pGC, rid, client)\
-        SECURITY_VERIFY_GC(pGC, rid, client, SecurityUnknownAccess)
-
-#else /* not XCSECURITY */
-
-#define VERIFY_DRAWABLE(pDraw, did, client)\
-    if (client->lastDrawableID == did)\
-        pDraw = client->lastDrawable;\
-    else \
-    {\
-        pDraw = (DrawablePtr) LookupIDByClass(did, RC_DRAWABLE);\
-        if (!pDraw) \
-        {\
-            client->errorValue = did; \
-            return BadDrawable;\
-        }\
-        if (pDraw->type == UNDRAWABLE_WINDOW)\
-            return BadMatch;\
-    }
-
-#define VERIFY_GEOMETRABLE(pDraw, did, client)\
-    if (client->lastDrawableID == did)\
-        pDraw = client->lastDrawable;\
-    else \
-    {\
-        pDraw = (DrawablePtr) LookupIDByClass(did, RC_DRAWABLE);\
-        if (!pDraw) \
-        {\
-            client->errorValue = did; \
-            return BadDrawable;\
-        }\
-    }
-
-#define VERIFY_GC(pGC, rid, client)\
-    if (client->lastGCID == rid)\
-        pGC = client->lastGC;\
-    else\
-        pGC = (GC *)LookupIDByType(rid, RT_GC);\
-    if (!pGC)\
-    {\
-        client->errorValue = rid;\
-        return (BadGC);\
-    }
-
-#define SECURITY_VERIFY_DRAWABLE(pDraw, did, client, mode)\
-        VERIFY_DRAWABLE(pDraw, did, client)
-
-#define SECURITY_VERIFY_GEOMETRABLE(pDraw, did, client, mode)\
-        VERIFY_GEOMETRABLE(pDraw, did, client)
-
-#define SECURITY_VERIFY_GC(pGC, rid, client, mode)\
-        VERIFY_GC(pGC, rid, client)
-
-#endif /* XCSECURITY */
-
-/*
- * We think that most hardware implementations of DBE will want
- * LookupID*(dbe_back_buffer_id) to return the window structure that the
- * id is a back buffer for.  Since both front and back buffers will
- * return the same structure, you need to be able to distinguish
- * somewhere what kind of buffer (front/back) was being asked for, so
- * that ddx can render to the right place.  That's the problem that the
- * following code solves.  Note: we couldn't embed this in the LookupID*
- * functions because the VALIDATE_DRAWABLE_AND_GC macro often circumvents
- * those functions by checking a one-element cache.  That's why we're
- * mucking with VALIDATE_DRAWABLE_AND_GC.
- * 
- * If you put -DNEED_DBE_BUF_BITS into PervasiveDBEDefines, the window
- * structure will have two additional bits defined, srcBuffer and
- * dstBuffer, and their values will be maintained via the macros
- * SET_DBE_DSTBUF and SET_DBE_SRCBUF (below).  If you also
- * put -DNEED_DBE_BUF_VALIDATE into PervasiveDBEDefines, the function
- * DbeValidateBuffer will be called any time the bits change to give you
- * a chance to do some setup.  See the DBE code for more details on this
- * function.  We put in these levels of conditionality so that you can do
- * just what you need to do, and no more.  If neither of these defines
- * are used, the bits won't be there, and VALIDATE_DRAWABLE_AND_GC will
- * be unchanged.        dpw
- */
-
-#if defined(NEED_DBE_BUF_BITS)
-#define SET_DBE_DSTBUF(_pDraw, _drawID) \
-        SET_DBE_BUF(_pDraw, _drawID, dstBuffer, TRUE)
-#define SET_DBE_SRCBUF(_pDraw, _drawID) \
-        SET_DBE_BUF(_pDraw, _drawID, srcBuffer, FALSE)
-#if defined (NEED_DBE_BUF_VALIDATE)
-#define SET_DBE_BUF(_pDraw, _drawID, _whichBuffer, _dstbuf) \
-    if (_pDraw->type == DRAWABLE_WINDOW)\
-    {\
-        int thisbuf = (_pDraw->id == _drawID);\
-        if (thisbuf != ((X11WindowPtr)_pDraw)->_whichBuffer)\
-        {\
-             ((X11WindowPtr)_pDraw)->_whichBuffer = thisbuf;\
-             DbeValidateBuffer((X11WindowPtr)_pDraw, _drawID, _dstbuf);\
-        }\
-     }
-#else /* want buffer bits, but don't need to call DbeValidateBuffer */
-#define SET_DBE_BUF(_pDraw, _drawID, _whichBuffer, _dstbuf) \
-    if (_pDraw->type == DRAWABLE_WINDOW)\
-    {\
-        ((X11WindowPtr)_pDraw)->_whichBuffer = (_pDraw->id == _drawID);\
-    }
-#endif /* NEED_DBE_BUF_VALIDATE */
-#else /* don't want buffer bits in window */
-#define SET_DBE_DSTBUF(_pDraw, _drawID) /**/
-#define SET_DBE_SRCBUF(_pDraw, _drawID) /**/
-#endif /* NEED_DBE_BUF_BITS */
-
-#define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, pGC, client)\
-    if ((stuff->gc == INVALID) || (client->lastGCID != stuff->gc) ||\
-        (client->lastDrawableID != drawID))\
-    {\
-        SECURITY_VERIFY_GEOMETRABLE(pDraw, drawID, client, SecurityWriteAccess);\
-        SECURITY_VERIFY_GC(pGC, stuff->gc, client, SecurityReadAccess);\
-        if ((pGC->depth != pDraw->depth) ||\
-            (pGC->pScreen != pDraw->pScreen))\
-            return (BadMatch);\
-        client->lastDrawable = pDraw;\
-        client->lastDrawableID = drawID;\
-        client->lastGC = pGC;\
-        client->lastGCID = stuff->gc;\
-    }\
-    else\
-    {\
-        pGC = client->lastGC;\
-        pDraw = client->lastDrawable;\
-    }\
-    SET_DBE_DSTBUF(pDraw, drawID);\
-    if (pGC->serialNumber != pDraw->serialNumber)\
-        ValidateGC(pDraw, pGC);
-
-
-#define WriteReplyToClient(pClient, size, pReply) \
-   if ((pClient)->swapped) \
-      (*ReplySwapVector[((xReq *)(pClient)->requestBuffer)->reqType]) \
-           (pClient, (int)(size), pReply); \
-      else (void) WriteToClient(pClient, (int)(size), (char *)(pReply));
-
-#define WriteSwappedDataToClient(pClient, size, pbuf) \
-   if ((pClient)->swapped) \
-      (*(pClient)->pSwapReplyFunc)(pClient, (int)(size), pbuf); \
-   else (void) WriteToClient (pClient, (int)(size), (char *)(pbuf));
-
-typedef struct _TimeStamp *TimeStampPtr;
-
-#ifndef _XTYPEDEF_CLIENTPTR
-typedef struct _Client *ClientPtr; /* also in misc.h */
-#define _XTYPEDEF_CLIENTPTR
-#endif
-
-typedef struct _WorkQueue       *WorkQueuePtr;
-
-extern ClientPtr requestingClient;
-extern ClientPtr *clients;
-extern ClientPtr serverClient;
-extern int currentMaxClients;
-
-#if !(defined(__alpha) || defined(__alpha__))
-typedef long HWEventQueueType;
-#else
-typedef int HWEventQueueType;
-#endif
-typedef HWEventQueueType* HWEventQueuePtr;
-
-extern HWEventQueuePtr checkForInput[2];
-
-typedef struct _TimeStamp {
-    CARD32 months;      /* really ~49.7 days */
-    CARD32 milliseconds;
-}           TimeStamp;
-
-/* dispatch.c */
-
-extern void SetInputCheck(
-#if NeedFunctionPrototypes
-    HWEventQueuePtr /*c0*/,
-    HWEventQueuePtr /*c1*/
-#endif
-);
-
-extern void CloseDownClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern void UpdateCurrentTime(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void UpdateCurrentTimeIf(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void InitSelections(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void FlushClientCaches(
-#if NeedFunctionPrototypes
-    XID /*id*/
-#endif
-);
-
-extern int dixDestroyPixmap(
-#if NeedFunctionPrototypes
-    pointer /*value*/,
-    XID /*pid*/
-#endif
-);
-
-extern void CloseDownRetainedResources(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void InitClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/,
-    int /*i*/,
-    pointer /*ospriv*/
-#endif
-);
-
-extern ClientPtr NextAvailableClient(
-#if NeedFunctionPrototypes
-    pointer /*ospriv*/
-#endif
-);
-
-extern void SendErrorToClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/,
-    unsigned int /*majorCode*/,
-    unsigned int /*minorCode*/,
-    XID /*resId*/,
-    int /*errorCode*/
-#endif
-);
-
-extern void DeleteWindowFromAnySelections(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-extern void MarkClientException(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern int GetGeometry(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/,
-    xGetGeometryReply* /* wa */
-#endif
-);
-
-/* dixutils.c */
-
-extern void CopyISOLatin1Lowered(
-#if NeedFunctionPrototypes
-    unsigned char * /*dest*/,
-    unsigned char * /*source*/,
-    int /*length*/
-#endif
-);
-
-#ifdef XCSECURITY
-
-extern X11WindowPtr SecurityLookupWindow(
-#if NeedFunctionPrototypes
-    XID /*rid*/,
-    ClientPtr /*client*/,
-    Mask /*access_mode*/
-#endif
-);
-
-extern pointer SecurityLookupDrawable(
-#if NeedFunctionPrototypes
-    XID /*rid*/,
-    ClientPtr /*client*/,
-    Mask /*access_mode*/
-#endif
-);
-
-extern X11WindowPtr LookupWindow(
-#if NeedFunctionPrototypes
-    XID /*rid*/,
-    ClientPtr /*client*/
-#endif
-);
-
-extern pointer LookupDrawable(
-#if NeedFunctionPrototypes
-    XID /*rid*/,
-    ClientPtr /*client*/
-#endif
-);
-
-#else
-
-extern X11WindowPtr LookupWindow(
-#if NeedFunctionPrototypes
-    XID /*rid*/,
-    ClientPtr /*client*/
-#endif
-);
-
-extern pointer LookupDrawable(
-#if NeedFunctionPrototypes
-    XID /*rid*/,
-    ClientPtr /*client*/
-#endif
-);
-
-#define SecurityLookupWindow(rid, client, access_mode) \
-        LookupWindow(rid, client)
-
-#define SecurityLookupDrawable(rid, client, access_mode) \
-        LookupDrawable(rid, client)
-
-#endif /* XCSECURITY */
-
-extern ClientPtr LookupClient(
-#if NeedFunctionPrototypes
-    XID /*rid*/,
-    ClientPtr /*client*/
-#endif
-);
-
-extern void NoopDDA(
-#if NeedVarargsPrototypes
-    void *,
-    ...
-#endif
-);
-
-extern int AlterSaveSetForClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/,
-    X11WindowPtr /*pWin*/,
-    unsigned /*mode*/
-#endif
-);
-
-extern void DeleteWindowFromAnySaveSet(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-extern void BlockHandler(
-#if NeedFunctionPrototypes
-    pointer /*pTimeout*/,
-    pointer /*pReadmask*/
-#endif
-);
-
-extern void WakeupHandler(
-#if NeedFunctionPrototypes
-    int /*result*/,
-    pointer /*pReadmask*/
-#endif
-);
-
-typedef struct timeval ** OSTimePtr;
-
-typedef void (* BlockHandlerProcPtr)(
-#if NeedNestedPrototypes
-    pointer /* blockData */,
-    OSTimePtr /* pTimeout */,
-    pointer /* pReadmask */
-#endif
-);
-
-typedef void (* WakeupHandlerProcPtr)(
-#if NeedNestedPrototypes
-    pointer /* blockData */,
-    int /* result */,
-    pointer /* pReadmask */
-#endif
-);
-
-extern Bool RegisterBlockAndWakeupHandlers(
-#if NeedFunctionPrototypes
-    BlockHandlerProcPtr /*blockHandler*/,
-    WakeupHandlerProcPtr /*wakeupHandler*/,
-    pointer /*blockData*/
-#endif
-);
-
-extern void RemoveBlockAndWakeupHandlers(
-#if NeedFunctionPrototypes
-    BlockHandlerProcPtr /*blockHandler*/,
-    WakeupHandlerProcPtr /*wakeupHandler*/,
-    pointer /*blockData*/
-#endif
-);
-
-extern void InitBlockAndWakeupHandlers(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void ProcessWorkQueue(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern Bool QueueWorkProc(
-#if NeedFunctionPrototypes
-    Bool (* /*function*/)(
-#if NeedNestedPrototypes
-        ClientPtr /*clientUnused*/,
-        pointer /*closure*/
-#endif
-        ),
-    ClientPtr /*client*/,
-    pointer /*closure*/
-#endif
-);
-
-typedef Bool (* ClientSleepProcPtr)(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/,
-    pointer /*closure*/
-#endif
-);
-
-extern Bool ClientSleep(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/,
-    ClientSleepProcPtr /* function */,
-    pointer /*closure*/
-#endif
-);
-
-extern Bool ClientSignal(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern void ClientWakeup(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern Bool ClientIsAsleep(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-/* atom.c */
-
-extern Atom MakeAtom(
-#if NeedFunctionPrototypes
-    char * /*string*/,
-    unsigned /*len*/,
-    Bool /*makeit*/
-#endif
-);
-
-extern Bool ValidAtom(
-#if NeedFunctionPrototypes
-    Atom /*atom*/
-#endif
-);
-
-extern char *NameForAtom(
-#if NeedFunctionPrototypes
-    Atom /*atom*/
-#endif
-);
-
-extern void AtomError(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void FreeAllAtoms(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void InitAtoms(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-/* events.c */
-
-extern void SetMaskForEvent(
-#if NeedFunctionPrototypes
-    Mask /* mask */,
-    int /* event */
-#endif
-);
-
-extern Bool PointerConfinedToScreen(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern Bool IsParent(
-#if NeedFunctionPrototypes
-    X11WindowPtr /* maybeparent */,
-    X11WindowPtr /* child */
-#endif
-);
-
-extern X11WindowPtr GetCurrentRootWindow(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern X11WindowPtr GetSpriteWindow(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void GetSpritePosition(
-#if NeedFunctionPrototypes
-    int * /* px */,
-    int * /* py */
-#endif
-);
-
-extern void NoticeEventTime(
-#if NeedFunctionPrototypes
-    xEventPtr /* xE */
-#endif
-);
-
-extern void EnqueueEvent(
-#if NeedFunctionPrototypes
-    xEventPtr /* xE */,
-    DeviceIntPtr /* device */,
-    int /* count */
-#endif
-);
-
-extern void ComputeFreezes(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void CheckGrabForSyncs(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /* dev */,
-    Bool /* thisMode */,
-    Bool /* otherMode */
-#endif
-);
-
-extern void ActivatePointerGrab(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /* mouse */,
-    GrabPtr /* grab */,
-    TimeStamp /* time */,
-    Bool /* autoGrab */
-#endif
-);
-
-extern void DeactivatePointerGrab(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /* mouse */
-#endif
-);
-
-extern void ActivateKeyboardGrab(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /* keybd */,
-    GrabPtr /* grab */,
-    TimeStamp /* time */,
-    Bool /* passive */
-#endif
-);
-
-extern void DeactivateKeyboardGrab(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /* keybd */
-#endif
-);
-
-extern void AllowSome(
-#if NeedFunctionPrototypes
-    ClientPtr   /* client */,
-    TimeStamp /* time */,
-    DeviceIntPtr /* thisDev */,
-    int /* newState */
-#endif
-);
-
-extern void ReleaseActiveGrabs(
-#if NeedFunctionPrototypes
-ClientPtr client
-#endif
-);
-
-extern int DeliverEventsToWindow(
-#if NeedFunctionPrototypes
-    X11WindowPtr /* pWin */,
-    xEventPtr /* pEvents */,
-    int /* count */,
-    Mask /* filter */,
-    GrabPtr /* grab */,
-    int /* mskidx */
-#endif
-);
-
-extern int DeliverDeviceEvents(
-#if NeedFunctionPrototypes
-    X11WindowPtr /* pWin */,
-    xEventPtr /* xE */,
-    GrabPtr /* grab */,
-    X11WindowPtr /* stopAt */,
-    DeviceIntPtr /* dev */,
-    int /* count */
-#endif
-);
-
-extern void DefineInitialRootWindow(
-#if NeedFunctionPrototypes
-    X11WindowPtr /* win */
-#endif
-);
-
-extern void WindowHasNewCursor(
-#if NeedFunctionPrototypes
-    X11WindowPtr /* pWin */
-#endif
-);
-
-extern Bool CheckDeviceGrabs(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /* device */,
-    xEventPtr /* xE */,
-    int /* checkFirst */,
-    int /* count */
-#endif
-);
-
-extern void DeliverFocusedEvent(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /* keybd */,
-    xEventPtr /* xE */,
-    X11WindowPtr /* window */,
-    int /* count */
-#endif
-);
-
-extern void DeliverGrabbedEvent(
-#if NeedFunctionPrototypes
-    xEventPtr /* xE */,
-    DeviceIntPtr /* thisDev */,
-    Bool /* deactivateGrab */,
-    int /* count */
-#endif
-);
-
-extern void RecalculateDeliverableEvents(
-#if NeedFunctionPrototypes
-    X11WindowPtr /* pWin */
-#endif
-);
-
-extern int OtherClientGone(
-#if NeedFunctionPrototypes
-    pointer /* value */,
-    XID /* id */
-#endif
-);
-
-extern void DoFocusEvents(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /* dev */,
-    X11WindowPtr /* fromWin */,
-    X11WindowPtr /* toWin */,
-    int /* mode */
-#endif
-);
-
-extern int SetInputFocus(
-#if NeedFunctionPrototypes
-    ClientPtr /* client */,
-    DeviceIntPtr /* dev */,
-    Window /* focusID */,
-    CARD8 /* revertTo */,
-    Time /* ctime */,
-    Bool /* followOK */
-#endif
-);
-
-extern int GrabDevice(
-#if NeedFunctionPrototypes
-    ClientPtr /* client */,
-    DeviceIntPtr /* dev */,
-    unsigned /* this_mode */,
-    unsigned /* other_mode */,
-    Window /* grabWindow */,
-    unsigned /* ownerEvents */,
-    Time /* ctime */,
-    Mask /* mask */,
-    CARD8 * /* status */
-#endif
-);
-
-extern void InitEvents(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void DeleteWindowFromAnyEvents(
-#if NeedFunctionPrototypes
-    X11WindowPtr        /* pWin */,
-    Bool /* freeResources */
-#endif
-);
-
-extern void CheckCursorConfinement(
-#if NeedFunctionPrototypes
-    X11WindowPtr /* pWin */
-#endif
-);
-
-extern Mask EventMaskForClient(
-#if NeedFunctionPrototypes
-    X11WindowPtr /* pWin */,
-    ClientPtr /* client */
-#endif
-);
-
-
-
-extern int DeliverEvents(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    xEventPtr /*xE*/,
-    int /*count*/,
-    X11WindowPtr /*otherParent*/
-#endif
-);
-
-extern void WriteEventsToClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*pClient*/,
-    int      /*count*/,
-    xEventPtr /*events*/
-#endif
-);
-
-extern int TryClientEvents(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/,
-    xEventPtr /*pEvents*/,
-    int /*count*/,
-    Mask /*mask*/,
-    Mask /*filter*/,
-    GrabPtr /*grab*/
-#endif
-);
-
-extern int EventSelectForWindow(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    ClientPtr /*client*/,
-    Mask /*mask*/
-#endif
-);
-
-extern int EventSuppressForWindow(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    ClientPtr /*client*/,
-    Mask /*mask*/,
-    Bool * /*checkOptional*/
-#endif
-);
-
-extern int MaybeDeliverEventsToClient(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    xEventPtr /*pEvents*/,
-    int /*count*/,
-    Mask /*filter*/,
-    ClientPtr /*dontClient*/
-#endif
-);
-
-extern void WindowsRestructured(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void ResetClientPrivates(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int AllocateClientPrivateIndex(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern Bool AllocateClientPrivate(
-#if NeedFunctionPrototypes
-    int /*index*/,
-    unsigned /*amount*/
-#endif
-);
-
-/*
- *  callback manager stuff
- */
-
-#ifndef _XTYPEDEF_CALLBACKLISTPTR
-typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */
-#define _XTYPEDEF_CALLBACKLISTPTR
-#endif
-
-typedef void (*CallbackProcPtr) (
-#if NeedNestedPrototypes
-    CallbackListPtr *, pointer, pointer
-#endif
-);
-
-typedef Bool (*AddCallbackProcPtr) (
-#if NeedNestedPrototypes
-    CallbackListPtr *, CallbackProcPtr, pointer
-#endif
-);
-
-typedef Bool (*DeleteCallbackProcPtr) (
-#if NeedNestedPrototypes
-    CallbackListPtr *, CallbackProcPtr, pointer
-#endif
-);
-
-typedef void (*CallCallbacksProcPtr) (
-#if NeedNestedPrototypes
-    CallbackListPtr *, pointer
-#endif
-);
-
-typedef void (*DeleteCallbackListProcPtr) (
-#if NeedNestedPrototypes
-    CallbackListPtr *
-#endif
-);
-
-typedef struct _CallbackProcs {
-    AddCallbackProcPtr          AddCallback;
-    DeleteCallbackProcPtr       DeleteCallback;
-    CallCallbacksProcPtr        CallCallbacks;
-    DeleteCallbackListProcPtr   DeleteCallbackList;
-} CallbackFuncsRec, *CallbackFuncsPtr;
-
-extern Bool CreateCallbackList(
-#if NeedFunctionPrototypes
-    CallbackListPtr * /*pcbl*/,
-    CallbackFuncsPtr /*cbfuncs*/
-#endif
-);
-
-extern Bool AddCallback(
-#if NeedFunctionPrototypes
-    CallbackListPtr * /*pcbl*/,
-    CallbackProcPtr /*callback*/,
-    pointer /*data*/
-#endif
-);
-
-extern Bool DeleteCallback(
-#if NeedFunctionPrototypes
-    CallbackListPtr * /*pcbl*/,
-    CallbackProcPtr /*callback*/,
-    pointer /*data*/
-#endif
-);
-
-extern void CallCallbacks(
-#if NeedFunctionPrototypes
-    CallbackListPtr * /*pcbl*/,
-    pointer /*call_data*/
-#endif
-);
-
-extern void DeleteCallbackList(
-#if NeedFunctionPrototypes
-    CallbackListPtr * /*pcbl*/
-#endif
-);
-
-extern void InitCallbackManager(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-/*
- *  ServerGrabCallback stuff
- */
-
-extern CallbackListPtr ServerGrabCallback;
-
-typedef enum {SERVER_GRABBED, SERVER_UNGRABBED,
-              CLIENT_PERVIOUS, CLIENT_IMPERVIOUS } ServerGrabState;
-
-typedef struct {
-    ClientPtr client;
-    ServerGrabState grabstate;
-} ServerGrabInfoRec;
-
-/*
- *  EventCallback stuff
- */
-
-extern CallbackListPtr EventCallback;
-
-typedef struct {
-    ClientPtr client;
-    xEventPtr events;
-    int count;
-} EventInfoRec;
-
-/*
- *  DeviceEventCallback stuff
- */
-
-extern CallbackListPtr DeviceEventCallback;
-
-typedef struct {
-    xEventPtr events;
-    int count;
-} DeviceEventInfoRec;
-
-#endif /* DIX_H */
diff --git a/include/Xserver/gc.h b/include/Xserver/gc.h
deleted file mode 100755
index 37e362d..0000000
--- a/include/Xserver/gc.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/***********************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XConsortium: gc.h /main/16 1996/08/01 19:18:17 dpw $ */
-
-#ifndef GC_H
-#define GC_H 
-
-#include "misc.h"	/* for Bool */
-#include "X11/X.h"	/* for GContext, Mask */
-#include "X11/Xproto.h"
-#include "screenint.h"	/* for ScreenPtr */
-#include "pixmap.h"	/* for DrawablePtr */
-
-/* clientClipType field in GC */
-#define CT_NONE			0
-#define CT_PIXMAP		1
-#define CT_REGION		2
-#define CT_UNSORTED		6
-#define CT_YSORTED		10
-#define CT_YXSORTED		14
-#define CT_YXBANDED		18
-
-#define GCQREASON_VALIDATE	1
-#define GCQREASON_CHANGE	2
-#define GCQREASON_COPY_SRC	3
-#define GCQREASON_COPY_DST	4
-#define GCQREASON_DESTROY	5
-
-#define GC_CHANGE_SERIAL_BIT        (((unsigned long)1)<<31)
-#define GC_CALL_VALIDATE_BIT        (1L<<30)
-#define GCExtensionInterest   (1L<<29)
-
-#define DRAWABLE_SERIAL_BITS        (~(GC_CHANGE_SERIAL_BIT))
-
-#define MAX_SERIAL_NUM     (1L<<28)
-
-#define NEXT_SERIAL_NUMBER ((++globalSerialNumber) > MAX_SERIAL_NUM ? \
-	    (globalSerialNumber  = 1): globalSerialNumber)
-
-typedef struct _GCInterest *GCInterestPtr;
-typedef struct _GC    *GCPtr;
-typedef struct _GCOps *GCOpsPtr;
-
-extern void ValidateGC(
-#if NeedFunctionPrototypes
-    DrawablePtr /*pDraw*/,
-    GCPtr /*pGC*/
-#endif
-);
-
-extern int ChangeGC(
-#if NeedFunctionPrototypes
-    GCPtr/*pGC*/,
-    BITS32 /*mask*/,
-    XID* /*pval*/
-#endif
-);
-
-extern int DoChangeGC(
-#if NeedFunctionPrototypes
-    GCPtr/*pGC*/,
-    BITS32 /*mask*/,
-    XID* /*pval*/,
-    int /*fPointer*/
-#endif
-);
-
-typedef union {
-    CARD32 val;
-    pointer ptr;
-} ChangeGCVal, *ChangeGCValPtr;
-
-extern int dixChangeGC(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/,
-    GCPtr /*pGC*/,
-    BITS32 /*mask*/,
-    CARD32 * /*pval*/,
-    ChangeGCValPtr /*pCGCV*/
-#endif
-);
-
-extern GCPtr CreateGC(
-#if NeedFunctionPrototypes
-    DrawablePtr /*pDrawable*/,
-    BITS32 /*mask*/,
-    XID* /*pval*/,
-    int* /*pStatus*/
-#endif
-);
-
-extern int CopyGC(
-#if NeedFunctionPrototypes
-    GCPtr/*pgcSrc*/,
-    GCPtr/*pgcDst*/,
-    BITS32 /*mask*/
-#endif
-);
-
-extern int FreeGC(
-#if NeedFunctionPrototypes
-    pointer /*pGC*/,
-    XID /*gid*/
-#endif
-);
-
-extern void SetGCMask(
-#if NeedFunctionPrototypes
-    GCPtr /*pGC*/,
-    Mask /*selectMask*/,
-    Mask /*newDataMask*/
-#endif
-);
-
-extern GCPtr CreateScratchGC(
-#if NeedFunctionPrototypes
-    ScreenPtr /*pScreen*/,
-    unsigned /*depth*/
-#endif
-);
-
-extern void FreeGCperDepth(
-#if NeedFunctionPrototypes
-    int /*screenNum*/
-#endif
-);
-
-extern Bool CreateGCperDepth(
-#if NeedFunctionPrototypes
-    int /*screenNum*/
-#endif
-);
-
-extern Bool CreateDefaultStipple(
-#if NeedFunctionPrototypes
-    int /*screenNum*/
-#endif
-);
-
-extern void FreeDefaultStipple(
-#if NeedFunctionPrototypes
-    int /*screenNum*/
-#endif
-);
-
-extern int SetDashes(
-#if NeedFunctionPrototypes
-    GCPtr /*pGC*/,
-    unsigned /*offset*/,
-    unsigned /*ndash*/,
-    unsigned char* /*pdash*/
-#endif
-);
-
-extern int VerifyRectOrder(
-#if NeedFunctionPrototypes
-    int /*nrects*/,
-    xRectangle* /*prects*/,
-    int /*ordering*/
-#endif
-);
-
-extern int SetClipRects(
-#if NeedFunctionPrototypes
-    GCPtr /*pGC*/,
-    int /*xOrigin*/,
-    int /*yOrigin*/,
-    int /*nrects*/,
-    xRectangle* /*prects*/,
-    int /*ordering*/
-#endif
-);
-
-extern GCPtr GetScratchGC(
-#if NeedFunctionPrototypes
-    unsigned /*depth*/,
-    ScreenPtr /*pScreen*/
-#endif
-);
-
-extern void FreeScratchGC(
-#if NeedFunctionPrototypes
-    GCPtr /*pGC*/
-#endif
-);
-
-#endif /* GC_H */
diff --git a/include/Xserver/input.h b/include/Xserver/input.h
deleted file mode 100755
index 63421de..0000000
--- a/include/Xserver/input.h
+++ /dev/null
@@ -1,535 +0,0 @@
-/* $XConsortium: input.h /main/22 1996/09/25 00:50:39 dpw $ */
-/* $XFree86: xc/programs/Xserver/include/input.h,v 3.4 1996/12/23 07:09:28 dawes Exp $ */
-/************************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-********************************************************/
-#ifndef INPUT_H
-#define INPUT_H
-
-#include "misc.h"
-#include "screenint.h"
-#include "X11/Xmd.h"
-#include "X11/Xproto.h"
-#include "window.h"     /* for WindowPtr */
-
-#define DEVICE_INIT	0
-#define DEVICE_ON	1
-#define DEVICE_OFF	2
-#define DEVICE_CLOSE	3
-
-#define MAP_LENGTH	256
-#define DOWN_LENGTH	32	/* 256/8 => number of bytes to hold 256 bits */
-#define NullGrab ((GrabPtr)NULL)
-#define PointerRootWin ((WindowPtr)PointerRoot)
-#define NoneWin ((WindowPtr)None)
-#define NullDevice ((DevicePtr)NULL)
-
-#ifndef FollowKeyboard
-#define FollowKeyboard 		3
-#endif
-#ifndef FollowKeyboardWin
-#define FollowKeyboardWin  ((WindowPtr) FollowKeyboard)
-#endif
-#ifndef RevertToFollowKeyboard
-#define RevertToFollowKeyboard	3
-#endif
-
-typedef unsigned long Leds;
-typedef struct _OtherClients *OtherClientsPtr;
-typedef struct _InputClients *InputClientsPtr;
-typedef struct _DeviceIntRec *DeviceIntPtr;
-
-typedef int (*DeviceProc)(
-#if NeedNestedPrototypes
-    DeviceIntPtr /*device*/,
-    int /*what*/
-#endif
-);
-
-typedef void (*ProcessInputProc)(
-#if NeedNestedPrototypes
-    xEventPtr /*events*/,
-    DeviceIntPtr /*device*/,
-    int /*count*/
-#endif
-);
-
-typedef struct _DeviceRec {
-    pointer	devicePrivate;
-    ProcessInputProc processInputProc;	/* current */
-    ProcessInputProc realInputProc;	/* deliver */
-    ProcessInputProc enqueueInputProc;	/* enqueue */
-    Bool	on;			/* used by DDX to keep state */
-} DeviceRec, *DevicePtr;
-
-typedef struct {
-    int			click, bell, bell_pitch, bell_duration;
-    Bool		autoRepeat;
-    unsigned char	autoRepeats[32];
-    Leds		leds;
-    unsigned char	id;
-} KeybdCtrl;
-
-typedef struct {
-    KeySym  *map;
-    KeyCode minKeyCode,
-	    maxKeyCode;
-    int     mapWidth;
-} KeySymsRec, *KeySymsPtr;
-
-typedef struct {
-    int		num, den, threshold;
-    unsigned char id;
-} PtrCtrl;
-
-typedef struct {
-    int         resolution, min_value, max_value;
-    int         integer_displayed;
-    unsigned char id;
-} IntegerCtrl;
-
-typedef struct {
-    int         max_symbols, num_symbols_supported;
-    int         num_symbols_displayed;
-    KeySym      *symbols_supported;
-    KeySym      *symbols_displayed;
-    unsigned char id;
-} StringCtrl;
-
-typedef struct {
-    int         percent, pitch, duration;
-    unsigned char id;
-} BellCtrl;
-
-typedef struct {
-    Leds        led_values;
-    Mask        led_mask;
-    unsigned char id;
-} LedCtrl;
-
-extern KeybdCtrl	defaultKeyboardControl;
-extern PtrCtrl		defaultPointerControl;
-
-#undef  AddInputDevice
-extern DevicePtr AddInputDevice(
-#if NeedFunctionPrototypes
-    DeviceProc /*deviceProc*/,
-    Bool /*autoStart*/
-#endif
-);
-
-#define AddInputDevice(deviceProc, autoStart) \
-       _AddInputDevice(deviceProc, autoStart)
-
-extern DeviceIntPtr _AddInputDevice(
-#if NeedFunctionPrototypes
-    DeviceProc /*deviceProc*/,
-    Bool /*autoStart*/
-#endif
-);
-
-extern Bool EnableDevice(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/
-#endif
-);
-
-extern Bool DisableDevice(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/
-#endif
-);
-
-extern int InitAndStartDevices(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void CloseDownDevices(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void RemoveDevice(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*dev*/
-#endif
-);
-
-extern int NumMotionEvents(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-#undef  RegisterPointerDevice
-extern void RegisterPointerDevice(
-#if NeedFunctionPrototypes
-    DevicePtr /*device*/
-#endif
-);
-
-#define RegisterPointerDevice(device) \
-       _RegisterPointerDevice(device)
-
-extern void _RegisterPointerDevice(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/
-#endif
-);
-
-#undef  RegisterKeyboardDevice
-extern void RegisterKeyboardDevice(
-#if NeedFunctionPrototypes
-    DevicePtr /*device*/
-#endif
-);
-
-#define RegisterKeyboardDevice(device) \
-       _RegisterKeyboardDevice(device)
-
-extern void _RegisterKeyboardDevice(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/
-#endif
-);
-
-extern DevicePtr LookupKeyboardDevice(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern DevicePtr LookupPointerDevice(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern DevicePtr LookupDevice(
-#if NeedFunctionPrototypes
-    int /* id */
-#endif
-);
-
-extern void QueryMinMaxKeyCodes(
-#if NeedFunctionPrototypes
-    KeyCode* /*minCode*/,
-    KeyCode* /*maxCode*/
-#endif
-);
-
-extern Bool SetKeySymsMap(
-#if NeedFunctionPrototypes
-    KeySymsPtr /*dst*/,
-    KeySymsPtr /*src*/
-#endif
-);
-
-extern Bool InitKeyClassDeviceStruct(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/,
-    KeySymsPtr /*pKeySyms*/,
-    CARD8 /*pModifiers*/[]
-#endif
-);
-
-extern Bool InitButtonClassDeviceStruct(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/,
-    int /*numButtons*/,
-    CARD8* /*map*/
-#endif
-);
-
-typedef int (*ValuatorMotionProcPtr)(
-#if NeedNestedPrototypes
-		DeviceIntPtr /*pdevice*/,
-		xTimecoord * /*coords*/,
-		unsigned long /*start*/,
-		unsigned long /*stop*/,
-		ScreenPtr /*pScreen*/
-#endif
-);
-
-extern Bool InitValuatorClassDeviceStruct(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/,
-    int /*numAxes*/,
-    ValuatorMotionProcPtr /* motionProc */,
-    int /*numMotionEvents*/,
-    int /*mode*/
-#endif
-);
-
-extern Bool InitFocusClassDeviceStruct(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/
-#endif
-);
-
-typedef void (*BellProcPtr)(
-#if NeedNestedPrototypes
-    int /*percent*/,
-    DeviceIntPtr /*device*/,
-    pointer /*ctrl*/,
-    int
-#endif
-);
-
-typedef void (*KbdCtrlProcPtr)(
-#if NeedNestedPrototypes
-    DeviceIntPtr /*device*/,
-    KeybdCtrl * /*ctrl*/
-#endif				     
-);
-
-extern Bool InitKbdFeedbackClassDeviceStruct(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/,
-    BellProcPtr /*bellProc*/,
-    KbdCtrlProcPtr /*controlProc*/
-#endif
-);
-
-typedef void (*PtrCtrlProcPtr)(
-#if NeedNestedPrototypes
-    DeviceIntPtr /*device*/,
-    PtrCtrl * /*ctrl*/
-#endif				     
-);
-
-extern Bool InitPtrFeedbackClassDeviceStruct(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/,
-    PtrCtrlProcPtr /*controlProc*/
-#endif
-);
-
-typedef void (*StringCtrlProcPtr)(
-#if NeedNestedPrototypes
-    DeviceIntPtr /*device*/,
-    StringCtrl * /*ctrl*/
-#endif				     
-);
-
-extern Bool InitStringFeedbackClassDeviceStruct(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/,
-    StringCtrlProcPtr /*controlProc*/,
-    int /*max_symbols*/,
-    int /*num_symbols_supported*/,
-    KeySym* /*symbols*/
-#endif
-);
-
-typedef void (*BellCtrlProcPtr)(
-#if NeedNestedPrototypes
-    DeviceIntPtr /*device*/,
-    BellCtrl * /*ctrl*/
-#endif				     
-);
-
-extern Bool InitBellFeedbackClassDeviceStruct(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/,
-    BellProcPtr /*bellProc*/,
-    BellCtrlProcPtr /*controlProc*/
-#endif
-);
-
-typedef void (*LedCtrlProcPtr)(
-#if NeedNestedPrototypes
-    DeviceIntPtr /*device*/,
-    LedCtrl * /*ctrl*/
-#endif				     
-);
-
-extern Bool InitLedFeedbackClassDeviceStruct(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/,
-    LedCtrlProcPtr /*controlProc*/
-#endif
-);
-
-typedef void (*IntegerCtrlProcPtr)(
-#if NeedNestedPrototypes
-    DeviceIntPtr /*device*/,
-    IntegerCtrl * /*ctrl*/
-#endif
-);
-
-
-extern Bool InitIntegerFeedbackClassDeviceStruct(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/,
-    IntegerCtrlProcPtr /*controlProc*/
-#endif
-);
-
-extern Bool InitPointerDeviceStruct(
-#if NeedFunctionPrototypes
-    DevicePtr /*device*/,
-    CARD8* /*map*/,
-    int /*numButtons*/,
-    ValuatorMotionProcPtr /*motionProc*/,
-    PtrCtrlProcPtr /*controlProc*/,
-    int /*numMotionEvents*/
-#endif
-);
-
-extern Bool InitKeyboardDeviceStruct(
-#if NeedFunctionPrototypes
-    DevicePtr /*device*/,
-    KeySymsPtr /*pKeySyms*/,
-    CARD8 /*pModifiers*/[],
-    BellProcPtr /*bellProc*/,
-    KbdCtrlProcPtr /*controlProc*/
-#endif
-);
-
-extern void SendMappingNotify(
-#if NeedFunctionPrototypes
-    unsigned int /*request*/,
-    unsigned int /*firstKeyCode*/,
-    unsigned int /*count*/,
-    ClientPtr	/* client */
-#endif
-);
-
-extern Bool BadDeviceMap(
-#if NeedFunctionPrototypes
-    BYTE* /*buff*/,
-    int /*length*/,
-    unsigned /*low*/,
-    unsigned /*high*/,
-    XID* /*errval*/
-#endif
-);
-
-extern Bool AllModifierKeysAreUp(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/,
-    CARD8* /*map1*/,
-    int /*per1*/,
-    CARD8* /*map2*/,
-    int /*per2*/
-#endif
-);
-
-extern void NoteLedState(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*keybd*/,
-    int /*led*/,
-    Bool /*on*/
-#endif
-);
-
-extern void MaybeStopHint(
-#if NeedFunctionPrototypes
-    DeviceIntPtr /*device*/,
-    ClientPtr /*client*/
-#endif
-);
-
-extern void ProcessPointerEvent(
-#if NeedFunctionPrototypes
-    xEventPtr /*xE*/,
-    DeviceIntPtr /*mouse*/,
-    int /*count*/
-#endif
-);
-
-extern void ProcessKeyboardEvent(
-#if NeedFunctionPrototypes
-    xEventPtr /*xE*/,
-    DeviceIntPtr /*keybd*/,
-    int /*count*/
-#endif
-);
-
-#ifdef XKB
-extern void CoreProcessPointerEvent(
-#if NeedFunctionPrototypes
-    xEventPtr /*xE*/,
-    DeviceIntPtr /*mouse*/,
-    int /*count*/
-#endif
-);
-
-extern void CoreProcessKeyboardEvent(
-#if NeedFunctionPrototypes
-    xEventPtr /*xE*/,
-    DeviceIntPtr /*keybd*/,
-    int /*count*/
-#endif
-);
-#endif
-
-extern Bool LegalModifier(
-#if NeedFunctionPrototypes
-    unsigned int /*key*/, 
-    DevicePtr /*pDev*/
-#endif
-);
-
-extern void ProcessInputEvents(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void InitInput(
-#if NeedFunctionPrototypes
-    int  /*argc*/,
-    char ** /*argv*/
-#endif
-);
-
-#endif /* INPUT_H */
diff --git a/include/Xserver/misc.h b/include/Xserver/misc.h
deleted file mode 100755
index f01f3e9..0000000
--- a/include/Xserver/misc.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/***********************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-Copyright 1992, 1993 Data General Corporation;
-Copyright 1992, 1993 OMRON Corporation  
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and that
-neither the name OMRON or DATA GENERAL be used in advertising or publicity
-pertaining to distribution of the software without specific, written prior
-permission of the party whose name is to be used.  Neither OMRON or 
-DATA GENERAL make any representation about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied warranty.  
-
-OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
-
-******************************************************************/
-/* $XConsortium: misc.h /main/28 1996/12/02 10:22:01 lehors $ */
-/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.5 1996/12/23 07:09:29 dawes Exp $ */
-#ifndef MISC_H
-#define MISC_H 1
-/*
- *  X internal definitions 
- *
- */
-
-extern unsigned long globalSerialNumber;
-extern unsigned long serverGeneration;
-
-#include <X11/Xosdefs.h>
-#include <X11/Xfuncproto.h>
-#include <X11/Xmd.h>
-#include <X11/X.h>
-
-#ifndef NULL
-#ifndef X_NOT_STDC_ENV
-#include <stddef.h>
-#else
-#define NULL            0
-#endif
-#endif
-
-#ifndef MAXSCREENS
-#define MAXSCREENS	3
-#endif
-#define MAXCLIENTS	128
-#define MAXDITS		1
-#define MAXEXTENSIONS	128
-#define MAXFORMATS	8
-#define MAXVISUALS_PER_SCREEN 50
-
-#if NeedFunctionPrototypes
-typedef void *pointer;
-#else
-typedef unsigned char *pointer;
-#endif
-typedef int Bool;
-typedef unsigned long PIXEL;
-typedef unsigned long ATOM;
-
-
-#ifndef TRUE
-#define TRUE 1
-#define FALSE 0
-#endif
-
-#ifndef _XTYPEDEF_FONTPTR
-typedef struct _Font *FontPtr; /* also in fonts/include/font.h */
-#define _XTYPEDEF_FONTPTR
-#endif
-
-#ifndef _XTYPEDEF_CLIENTPTR
-typedef struct _Client *ClientPtr; /* also in dix.h */
-#define _XTYPEDEF_CLIENTPTR
-#endif
-
-#ifndef _XTYPEDEF_CALLBACKLISTPTR
-typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */
-#define _XTYPEDEF_CALLBACKLISTPTR
-#endif
-
-typedef struct _xReq *xReqPtr;
-
-#include "os.h" 	/* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */
-#include <X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */
-
-#define NullBox ((BoxPtr)0)
-#define MILLI_PER_MIN (1000 * 60)
-#define MILLI_PER_SECOND (1000)
-
-    /* this next is used with None and ParentRelative to tell
-       PaintWin() what to use to paint the background. Also used
-       in the macro IS_VALID_PIXMAP */
-
-#define USE_BACKGROUND_PIXEL 3
-#define USE_BORDER_PIXEL 3
-
-
-/* byte swap a 32-bit literal */
-#define lswapl(x) ((((x) & 0xff) << 24) |\
-		   (((x) & 0xff00) << 8) |\
-		   (((x) & 0xff0000) >> 8) |\
-		   (((x) >> 24) & 0xff))
-
-/* byte swap a short literal */
-#define lswaps(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff))
-
-#define min(a, b) (((a) < (b)) ? (a) : (b))
-#define max(a, b) (((a) > (b)) ? (a) : (b))
-#if !defined(AMOEBA) && !defined(__EMX__)
-#ifndef abs
-#define abs(a) ((a) > 0 ? (a) : -(a))
-#endif
-#else /* AMOEBA || __EMX__ */
-/* abs() is a function, not a macro; include the file declaring
- * it in case we haven't done that yet.
- */  
-#include <stdlib.h>
-#endif /* AMOEBA */
-#ifndef Fabs
-#define Fabs(a) ((a) > 0.0 ? (a) : -(a))	/* floating absolute value */
-#endif
-#define sign(x) ((x) < 0 ? -1 : ((x) > 0 ? 1 : 0))
-/* this assumes b > 0 */
-#define modulus(a, b, d)    if (((d) = (a) % (b)) < 0) (d) += (b)
-/*
- * return the least significant bit in x which is set
- *
- * This works on 1's complement and 2's complement machines.
- * If you care about the extra instruction on 2's complement
- * machines, change to ((x) & (-(x)))
- */
-#define lowbit(x) ((x) & (~(x) + 1))
-
-#ifndef MAXSHORT
-#define MAXSHORT 32767
-#endif
-#ifndef MINSHORT
-#define MINSHORT -MAXSHORT 
-#endif
-
-
-/* some macros to help swap requests, replies, and events */
-
-#define LengthRestB(stuff) \
-    ((client->req_len << 2) - sizeof(*stuff))
-
-#define LengthRestS(stuff) \
-    ((client->req_len << 1) - (sizeof(*stuff) >> 1))
-
-#define LengthRestL(stuff) \
-    (client->req_len - (sizeof(*stuff) >> 2))
-
-#define SwapRestS(stuff) \
-    SwapShorts((short *)(stuff + 1), LengthRestS(stuff))
-
-#define SwapRestL(stuff) \
-    SwapLongs((CARD32 *)(stuff + 1), LengthRestL(stuff))
-
-/* byte swap a 32-bit value */
-#define swapl(x, n) { \
-		 n = ((char *) (x))[0];\
-		 ((char *) (x))[0] = ((char *) (x))[3];\
-		 ((char *) (x))[3] = n;\
-		 n = ((char *) (x))[1];\
-		 ((char *) (x))[1] = ((char *) (x))[2];\
-		 ((char *) (x))[2] = n; }
-
-/* byte swap a short */
-#define swaps(x, n) { \
-		 n = ((char *) (x))[0];\
-		 ((char *) (x))[0] = ((char *) (x))[1];\
-		 ((char *) (x))[1] = n; }
-
-/* copy 32-bit value from src to dst byteswapping on the way */
-#define cpswapl(src, dst) { \
-                 ((char *)&(dst))[0] = ((char *) &(src))[3];\
-                 ((char *)&(dst))[1] = ((char *) &(src))[2];\
-                 ((char *)&(dst))[2] = ((char *) &(src))[1];\
-                 ((char *)&(dst))[3] = ((char *) &(src))[0]; }
-
-/* copy short from src to dst byteswapping on the way */
-#define cpswaps(src, dst) { \
-		 ((char *) &(dst))[0] = ((char *) &(src))[1];\
-		 ((char *) &(dst))[1] = ((char *) &(src))[0]; }
-
-extern void SwapLongs(
-#if NeedFunctionPrototypes
-    CARD32 *list,
-    unsigned long count
-#endif
-);
-
-extern void SwapShorts(
-#if NeedFunctionPrototypes
-    short *list,
-    unsigned long count
-#endif
-);
-
-extern void MakePredeclaredAtoms(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int Ones(
-#if NeedFunctionPrototypes
-    unsigned long /*mask*/
-#endif
-);
-
-typedef struct _xPoint *DDXPointPtr;
-typedef struct _Box *BoxPtr;
-typedef struct _xEvent *xEventPtr;
-typedef struct _xRectangle *xRectanglePtr;
-typedef struct _GrabRec *GrabPtr;
-
-/*  typedefs from other places - duplicated here to minimize the amount
- *  of unnecessary junk that one would normally have to include to get
- *  these symbols defined
- */
-
-#ifndef _XTYPEDEF_CHARINFOPTR
-typedef struct _CharInfo *CharInfoPtr; /* also in fonts/include/font.h */
-#define _XTYPEDEF_CHARINFOPTR
-#endif
-
-#endif /* MISC_H */
diff --git a/include/Xserver/miscstruct.h b/include/Xserver/miscstruct.h
deleted file mode 100755
index d99595f..0000000
--- a/include/Xserver/miscstruct.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $XConsortium: miscstruct.h,v 5.5 94/04/17 20:25:50 dpw Exp $ */
-/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.0 1996/02/18 03:45:10 dawes Exp $ */
-/***********************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-#ifndef MISCSTRUCT_H
-#define MISCSTRUCT_H 1
-
-#include "misc.h"
-#include "X11/Xprotostr.h"
-
-typedef xPoint DDXPointRec;
-
-typedef struct _Box {
-    short x1, y1, x2, y2;
-} BoxRec;
-
-typedef union _DevUnion {
-    pointer		ptr;
-    long		val;
-    unsigned long	uval;
-    pointer		(*fptr)(
-#if NeedFunctionPrototypes
-                        void
-#endif
-                        );
-} DevUnion;
-
-#endif /* MISCSTRUCT_H */
diff --git a/include/Xserver/opaque.h b/include/Xserver/opaque.h
deleted file mode 100755
index 7de1ad3..0000000
--- a/include/Xserver/opaque.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $XConsortium: opaque.h,v 1.19 94/04/17 20:25:51 dpw Exp $ */
-/*
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
-
-*/
-/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.2.2.1 1997/06/01 12:33:43 dawes Exp $ */
-
-#ifndef OPAQUE_H
-#define OPAQUE_H
-
-#include <X11/Xmd.h>
-
-extern char *defaultFontPath;
-extern char *defaultTextFont;
-extern char *defaultCursorFont;
-extern char *rgbPath;
-extern int MaxClients;
-extern char isItTimeToYield;
-extern char dispatchException;
-
-/* bit values for dispatchException */
-#define DE_RESET     1
-#define DE_TERMINATE 2
-#define DE_PRIORITYCHANGE 4  /* set when a client's priority changes */
-
-extern CARD32 TimeOutValue;
-extern CARD32 ScreenSaverTime;
-extern CARD32 ScreenSaverInterval;
-extern int  ScreenSaverBlanking;
-extern int  ScreenSaverAllowExposures;
-extern int argcGlobal;
-extern char **argvGlobal;
-
-#if DPMSExtension
-extern CARD32 defaultDPMSStandbyTime;
-extern CARD32 defaultDPMSSuspendTime;
-extern CARD32 defaultDPMSOffTime;
-extern CARD32 DPMSStandbyTime;
-extern CARD32 DPMSSuspendTime;
-extern CARD32 DPMSOffTime;
-extern CARD16 DPMSPowerLevel;
-extern Bool defaultDPMSEnabled;
-extern Bool DPMSEnabled;
-extern Bool DPMSEnabledSwitch;
-extern Bool DPMSDisabledSwitch;
-extern Bool DPMSCapableFlag;
-#endif
-
-#endif /* OPAQUE_H */
diff --git a/include/Xserver/os.h b/include/Xserver/os.h
deleted file mode 100755
index 1af252d..0000000
--- a/include/Xserver/os.h
+++ /dev/null
@@ -1,776 +0,0 @@
-/***********************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/* $XConsortium: os.h /main/60 1996/12/15 21:25:13 rws $ */
-/* $XFree86: xc/programs/Xserver/include/os.h,v 3.16.2.1 1998/01/22 10:47:13 dawes Exp $ */
-
-#ifndef OS_H
-#define OS_H
-#include "Xserver/misc.h"
-#define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size))
-#define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr))
-#include "X11/Xalloca.h"
-
-#define NullFID ((FID) 0)
-
-#define SCREEN_SAVER_ON   0
-#define SCREEN_SAVER_OFF  1
-#define SCREEN_SAVER_FORCER 2
-#define SCREEN_SAVER_CYCLE  3
-
-#ifndef MAX_REQUEST_SIZE
-#define MAX_REQUEST_SIZE 65535
-#endif
-#ifndef MAX_BIG_REQUEST_SIZE
-#define MAX_BIG_REQUEST_SIZE 1048575
-#endif
-
-typedef pointer	FID;
-typedef struct _FontPathRec *FontPathPtr;
-typedef struct _NewClientRec *NewClientPtr;
-
-#define xnfalloc(size) XNFalloc((unsigned long)(size))
-#define xnfrealloc(ptr, size) XNFrealloc((pointer)(ptr), (unsigned long)(size))
-
-#define xalloc(size) Xalloc((unsigned long)(size))
-#define xnfalloc(size) XNFalloc((unsigned long)(size))
-#define xcalloc(_num, _size) Xcalloc((unsigned long)(_num)*(unsigned long)(_size))
-#define xrealloc(ptr, size) Xrealloc((pointer)(ptr), (unsigned long)(size))
-#define xnfrealloc(ptr, size) XNFrealloc((pointer)(ptr), (unsigned long)(size))
-#define xfree(ptr) Xfree((pointer)(ptr))
-
-#ifdef SCO
-#include <stdio.h>
-#endif
-#ifndef X_NOT_STDC_ENV
-#include <string.h>
-#else
-#ifdef SYSV
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#endif
-
-/* have to put $(SIGNAL_DEFINES) in DEFINES in Imakefile to get this right */
-#ifdef SIGNALRETURNSINT
-#define SIGVAL int
-#else
-#define SIGVAL void
-#endif
-
-extern Bool OsDelayInitColors;
-
-extern int WaitForSomething(
-#if NeedFunctionPrototypes
-    int* /*pClientsReady*/
-#endif
-);
-
-#ifdef LBX
-#define ReadRequestFromClient(client)   ((client)->readRequest(client))
-extern int StandardReadRequestFromClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-#else
-extern int ReadRequestFromClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-#endif /* LBX */
-
-extern Bool InsertFakeRequest(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/,
-    char* /*data*/,
-    int /*count*/
-#endif
-);
-
-extern int ResetCurrentRequest(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern void FlushAllOutput(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void FlushIfCriticalOutputPending(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void SetCriticalOutputPending(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int WriteToClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*who*/,
-    int /*count*/,
-    char* /*buf*/
-#endif
-);
-
-extern void ResetOsBuffers(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void CreateWellKnownSockets(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void ResetWellKnownSockets(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern XID
-AuthorizationIDOfClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern char *ClientAuthorized(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/,
-    unsigned int /*proto_n*/,
-    char* /*auth_proto*/,
-    unsigned int /*string_n*/,
-    char* /*auth_string*/
-#endif
-);
-
-extern Bool EstablishNewConnections(
-#if NeedFunctionPrototypes
-    ClientPtr /*clientUnused*/,
-    pointer /*closure*/
-#endif
-);
-
-extern void CheckConnections(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void CloseDownConnection(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern int AddEnabledDevice(
-#if NeedFunctionPrototypes
-    int /*fd*/
-#endif
-);
-
-extern int RemoveEnabledDevice(
-#if NeedFunctionPrototypes
-    int /*fd*/
-#endif
-);
-
-extern int OnlyListenToOneClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern int ListenToAllClients(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int IgnoreClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern int AttendClient(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern int MakeClientGrabImpervious(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern int MakeClientGrabPervious(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern void Error(
-#if NeedFunctionPrototypes
-    char* /*str*/
-#endif
-);
-
-extern CARD32 GetTimeInMillis(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int AdjustWaitForDelay(
-#if NeedFunctionPrototypes
-    pointer /*waitTime*/,
-    unsigned long /*newdelay*/
-#endif
-);
-
-typedef	struct _OsTimerRec *OsTimerPtr;
-
-typedef CARD32 (*OsTimerCallback)(
-#if NeedFunctionPrototypes
-    OsTimerPtr /* timer */,
-    CARD32 /* time */,
-    pointer /* arg */
-#endif
-);
-
-extern void TimerInit(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern Bool TimerForce(
-#if NeedFunctionPrototypes
-    OsTimerPtr /* timer */
-#endif
-);
-
-#define TimerAbsolute (1<<0)
-#define TimerForceOld (1<<1)
-
-extern OsTimerPtr TimerSet(
-#if NeedFunctionPrototypes
-    OsTimerPtr /* timer */,
-    int /* flags */,
-    CARD32 /* millis */,
-    OsTimerCallback /* func */,
-    pointer /* arg */
-#endif
-);
-
-extern void TimerCheck(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void TimerCancel(
-#if NeedFunctionPrototypes
-    OsTimerPtr /* pTimer */
-#endif
-);
-
-extern void TimerFree(
-#if NeedFunctionPrototypes
-    OsTimerPtr /* pTimer */
-#endif
-);
-
-extern SIGVAL AutoResetServer(
-#if NeedFunctionPrototypes
-    int /*sig*/
-#endif
-);
-
-extern SIGVAL GiveUp(
-#if NeedFunctionPrototypes
-    int /*sig*/
-#endif
-);
-
-extern void UseMsg(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void ProcessCommandLine(
-#if NeedFunctionPrototypes
-    int /*argc*/,
-    char* /*argv*/[]
-#endif
-);
-
-extern unsigned long *Xalloc(
-#if NeedFunctionPrototypes
-    unsigned long /*amount*/
-#endif
-);
-
-extern unsigned long *XNFalloc(
-#if NeedFunctionPrototypes
-    unsigned long /*amount*/
-#endif
-);
-
-extern unsigned long *Xcalloc(
-#if NeedFunctionPrototypes
-    unsigned long /*amount*/
-#endif
-);
-
-extern unsigned long *Xrealloc(
-#if NeedFunctionPrototypes
-    pointer /*ptr*/,
-    unsigned long /*amount*/
-#endif
-);
-
-extern unsigned long *XNFrealloc(
-#if NeedFunctionPrototypes
-    pointer /*ptr*/,
-    unsigned long /*amount*/
-#endif
-);
-
-extern void Xfree(
-#if NeedFunctionPrototypes
-    pointer /*ptr*/
-#endif
-);
-
-extern void OsInitAllocator(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-typedef SIGVAL (*OsSigHandlerPtr)(
-#if NeedFunctionPrototypes
-    int /* sig */
-#endif
-);
-
-extern OsSigHandlerPtr OsSignal(
-#if NeedFunctionPrototypes
-    int /* sig */,
-    OsSigHandlerPtr /* handler */
-#endif
-);
-
-extern int auditTrailLevel;
-
-extern void AuditF(
-#if NeedVarargsPrototypes
-    char* /*f*/,
-    ...
-#endif
-);
-
-extern void FatalError(
-#if NeedVarargsPrototypes
-    char* /*f*/,
-    ...
-#endif
-)
-#if __GNUC__ == 2 && __GNUC_MINOR__ > 4 
-__attribute((noreturn))
-#endif
-;
-
-extern void ErrorF(
-#if NeedVarargsPrototypes
-    char* /*f*/,
-    ...
-#endif
-);
-
-#ifdef SERVER_LOCK
-extern void LockServer(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void UnlockServer(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-#endif
-
-extern int OsLookupColor(
-#if NeedFunctionPrototypes
-    int	/*screen*/,
-    char * /*name*/,
-    unsigned /*len*/,
-    unsigned short * /*pred*/,
-    unsigned short * /*pgreen*/,
-    unsigned short * /*pblue*/
-#endif
-);
-
-extern void OsInit(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void OsCleanup(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void OsVendorFatalError(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void OsVendorInit(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int OsInitColors(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-#if !defined(WIN32) && !defined(__EMX__)
-extern int System(
-#if NeedFunctionPrototypes
-    char *
-#endif
-);
-
-extern pointer Popen(
-#if NeedFunctionPrototypes
-    char *,
-    char *
-#endif
-);
-
-extern int Pclose(
-#if NeedFunctionPrototypes
-    pointer
-#endif
-);
-#else
-#define System(a) system(a)
-#define Popen(a,b) popen(a,b)
-#define Pclose(a) pclose(a)
-#endif
-
-extern int AddHost(
-#if NeedFunctionPrototypes
-    ClientPtr	/*client*/,
-    int         /*family*/,
-    unsigned    /*length*/,
-    pointer     /*pAddr*/
-#endif
-);
-
-extern Bool ForEachHostInFamily (
-#if NeedFunctionPrototypes
-    int	    /*family*/,
-    Bool    (* /*func*/ )(
-#if NeedNestedPrototypes
-            unsigned char * /* addr */,
-            short           /* len */,
-            pointer         /* closure */
-#endif
-            ),
-    pointer /*closure*/
-#endif
-);
-
-extern int RemoveHost(
-#if NeedFunctionPrototypes
-    ClientPtr	/*client*/,
-    int         /*family*/,
-    unsigned    /*length*/,
-    pointer     /*pAddr*/
-#endif
-);
-
-extern int GetHosts(
-#if NeedFunctionPrototypes
-    pointer * /*data*/,
-    int	    * /*pnHosts*/,
-    int	    * /*pLen*/,
-    BOOL    * /*pEnabled*/
-#endif
-);
-
-typedef struct sockaddr * sockaddrPtr;
-
-extern int InvalidHost(
-#if NeedFunctionPrototypes
-    sockaddrPtr /*saddr*/,
-    int		/*len*/
-#endif
-);
-
-extern int LocalClient(
-#if NeedFunctionPrototypes
-    ClientPtr /* client */
-#endif
-);
-
-extern int ChangeAccessControl(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/,
-    int /*fEnabled*/
-#endif
-);
-
-extern int GetAccessControl(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-
-extern void AddLocalHosts(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void ResetHosts(
-#if NeedFunctionPrototypes
-    char *display
-#endif
-);
-
-extern void EnableLocalHost(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void DisableLocalHost(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void AccessUsingXdmcp(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void DefineSelf(
-#if NeedFunctionPrototypes
-    int /*fd*/
-#endif
-);
-
-extern void AugmentSelf(
-#if NeedFunctionPrototypes
-    pointer /*from*/,
-    int /*len*/
-#endif
-);
-
-extern void InitAuthorization(
-#if NeedFunctionPrototypes
-    char * /*filename*/
-#endif
-);
-
-extern int LoadAuthorization(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void RegisterAuthorizations(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern XID CheckAuthorization(
-#if NeedFunctionPrototypes
-    unsigned int /*namelength*/,
-    char * /*name*/,
-    unsigned int /*datalength*/,
-    char * /*data*/,
-    ClientPtr /*client*/,
-    char ** /*reason*/
-#endif
-);
-
-extern void ResetAuthorization(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int AddAuthorization(
-#if NeedFunctionPrototypes
-    unsigned int /*name_length*/,
-    char * /*name*/,
-    unsigned int /*data_length*/,
-    char * /*data*/
-#endif
-);
-
-extern XID GenerateAuthorization(
-#if NeedFunctionPrototypes
-    unsigned int   /* name_length */,
-    char	*  /* name */,
-    unsigned int   /* data_length */,
-    char	*  /* data */,
-    unsigned int * /* data_length_return */,
-    char	** /* data_return */
-#endif
-);
-
-extern void ExpandCommandLine(
-#if NeedFunctionPrototypes
-    int * /*pargc*/,
-    char *** /*pargv*/
-#endif
-);
-
-extern int ddxProcessArgument(
-#if NeedFunctionPrototypes
-    int /*argc*/,
-    char * /*argv*/ [],
-    int /*i*/
-#endif
-);
-
-/*
- *  idiom processing stuff
- */
-
-xReqPtr PeekNextRequest(
-#if NeedFunctionPrototypes
-    xReqPtr req, ClientPtr client, Bool readmore
-#endif
-);
-
-void SkipRequests(
-#if NeedFunctionPrototypes
-    xReqPtr req, ClientPtr client, int numskipped
-#endif
-);
-
-/* int ReqLen(xReq *req, ClientPtr client)
- * Given a pointer to a *complete* request, return its length in bytes.
- * Note that if the request is a big request (as defined in the Big
- * Requests extension), the macro lies by returning 4 less than the
- * length that it actually occupies in the request buffer.  This is so you
- * can blindly compare the length with the various sz_<request> constants
- * in Xproto.h without having to know/care about big requests.
- */
-#define ReqLen(_pxReq, _client) \
- ((_pxReq->length ? \
-     (_client->swapped ? lswaps(_pxReq->length) : _pxReq->length) \
-  : ((_client->swapped ? \
-	lswapl(((CARD32*)_pxReq)[1]) : ((CARD32*)_pxReq)[1])-1) \
-  ) << 2)
-
-/* otherReqTypePtr CastxReq(xReq *req, otherReqTypePtr)
- * Cast the given request to one of type otherReqTypePtr to access
- * fields beyond the length field.
- */
-#define CastxReq(_pxReq, otherReqTypePtr) \
-    (_pxReq->length ? (otherReqTypePtr)_pxReq \
-		    : (otherReqTypePtr)(((CARD32*)_pxReq)+1))
-
-/* stuff for SkippedRequestsCallback */
-extern CallbackListPtr SkippedRequestsCallback;
-typedef struct {
-    xReqPtr req;
-    ClientPtr client;
-    int numskipped;
-} SkippedRequestInfoRec;
-
-/* stuff for ReplyCallback */
-extern CallbackListPtr ReplyCallback;
-typedef struct {
-    ClientPtr client;
-    pointer replyData;
-    unsigned long dataLenBytes;
-    unsigned long bytesRemaining;
-    Bool startOfReply;
-} ReplyInfoRec;
-
-/* stuff for FlushCallback */
-extern CallbackListPtr FlushCallback;
-
-#endif /* OS_H */
diff --git a/include/Xserver/pixmap.h b/include/Xserver/pixmap.h
deleted file mode 100755
index 5fdc2d0..0000000
--- a/include/Xserver/pixmap.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* $XConsortium: pixmap.h,v 5.6 94/04/17 20:25:53 dpw Exp $ */
-/***********************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-#ifndef PIXMAP_H
-#define PIXMAP_H
-
-#include "misc.h"
-#include "screenint.h"
-
-/* types for Drawable */
-#define DRAWABLE_WINDOW 0
-#define DRAWABLE_PIXMAP 1
-#define UNDRAWABLE_WINDOW 2
-#define DRAWABLE_BUFFER 3
-
-/* flags to PaintWindow() */
-#define PW_BACKGROUND 0
-#define PW_BORDER 1
-
-#define NullPixmap ((PixmapPtr)0)
-
-typedef struct _Drawable *DrawablePtr;	
-typedef struct _Pixmap *PixmapPtr;
-
-typedef union _PixUnion {
-    PixmapPtr		pixmap;
-    unsigned long	pixel;
-} PixUnion;
-
-#define SamePixUnion(a,b,isPixel)\
-    ((isPixel) ? (a).pixel == (b).pixel : (a).pixmap == (b).pixmap)
-
-#define EqualPixUnion(as, a, bs, b)				\
-    ((as) == (bs) && (SamePixUnion (a, b, as)))
-
-#define OnScreenDrawable(type) \
-	((type == DRAWABLE_WINDOW) || (type == DRAWABLE_BUFFER))
-
-#define WindowDrawable(type) \
-	((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW))
-
-extern PixmapPtr GetScratchPixmapHeader(
-#if NeedFunctionPrototypes
-    ScreenPtr /*pScreen*/,
-    int /*width*/,
-    int /*height*/,
-    int /*depth*/,
-    int /*bitsPerPixel*/,
-    int /*devKind*/,
-    pointer /*pPixData*/
-#endif
-);
-
-extern void FreeScratchPixmapHeader(
-#if NeedFunctionPrototypes
-    PixmapPtr /*pPixmap*/
-#endif
-);
-
-extern Bool CreateScratchPixmapsForScreen(
-#if NeedFunctionPrototypes
-    int /*scrnum*/
-#endif
-);
-
-extern void FreeScratchPixmapsForScreen(
-#if NeedFunctionPrototypes
-    int /*scrnum*/
-#endif
-);
-
-extern PixmapPtr AllocatePixmap(
-#if NeedFunctionPrototypes
-    ScreenPtr /*pScreen*/,
-    int /*pixDataSize*/
-#endif
-);
-
-#endif /* PIXMAP_H */
diff --git a/include/Xserver/region.h b/include/Xserver/region.h
deleted file mode 100755
index b12de29..0000000
--- a/include/Xserver/region.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $XConsortium: region.h,v 1.5 94/04/17 20:25:59 dpw Exp $ */
-/***********************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-#ifndef REGION_H
-#define REGION_H
-
-#include "regionstr.h"
-
-#endif /* REGION_H */
diff --git a/include/Xserver/regionstr.h b/include/Xserver/regionstr.h
deleted file mode 100755
index 0efd965..0000000
--- a/include/Xserver/regionstr.h
+++ /dev/null
@@ -1,409 +0,0 @@
-/* $XConsortium: regionstr.h,v 1.8 94/04/17 20:26:01 dpw Exp $ */
-/***********************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-#ifndef REGIONSTRUCT_H
-#define REGIONSTRUCT_H
-
-#include "miscstruct.h"
-
-/* Return values from RectIn() */
-
-#define rgnOUT 0
-#define rgnIN  1
-#define rgnPART 2
-
-#define NullRegion ((RegionPtr)0)
-
-/* 
- *   clip region
- */
-
-typedef struct _RegData {
-    long	size;
-    long 	numRects;
-/*  BoxRec	rects[size];   in memory but not explicitly declared */
-} RegDataRec, *RegDataPtr;
-
-typedef struct _Region {
-    BoxRec 	extents;
-    RegDataPtr	data;
-} RegionRec, *RegionPtr;
-
-extern BoxRec miEmptyBox;
-extern RegDataRec miEmptyData;
-
-#define REGION_NIL(reg) ((reg)->data && !(reg)->data->numRects)
-#define REGION_NUM_RECTS(reg) ((reg)->data ? (reg)->data->numRects : 1)
-#define REGION_SIZE(reg) ((reg)->data ? (reg)->data->size : 0)
-#define REGION_RECTS(reg) ((reg)->data ? (BoxPtr)((reg)->data + 1) \
-			               : &(reg)->extents)
-#define REGION_BOXPTR(reg) ((BoxPtr)((reg)->data + 1))
-#define REGION_BOX(reg,i) (&REGION_BOXPTR(reg)[i])
-#define REGION_TOP(reg) REGION_BOX(reg, (reg)->data->numRects)
-#define REGION_END(reg) REGION_BOX(reg, (reg)->data->numRects - 1)
-#define REGION_SZOF(n) (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)))
-
-#ifdef NEED_SCREEN_REGIONS
-
-#define REGION_CREATE(_pScreen, _rect, _size) \
-    (*(_pScreen)->RegionCreate)(_rect, _size)
-
-#define REGION_INIT(_pScreen, _pReg, _rect, _size) \
-    (*(_pScreen)->RegionInit)(_pReg, _rect, _size)
-
-#define REGION_COPY(_pScreen, dst, src) \
-    (*(_pScreen)->RegionCopy)(dst, src)
-
-#define REGION_DESTROY(_pScreen, _pReg) \
-    (*(_pScreen)->RegionDestroy)(_pReg)
-
-#define REGION_UNINIT(_pScreen, _pReg) \
-    (*(_pScreen)->RegionUninit)(_pReg)
-
-#define REGION_INTERSECT(_pScreen, newReg, reg1, reg2) \
-    (*(_pScreen)->Intersect)(newReg, reg1, reg2)
-
-#define REGION_UNION(_pScreen, newReg, reg1, reg2) \
-    (*(_pScreen)->Union)(newReg, reg1, reg2)
-
-#define REGION_SUBTRACT(_pScreen, newReg, reg1, reg2) \
-    (*(_pScreen)->Subtract)(newReg, reg1, reg2)
-
-#define REGION_INVERSE(_pScreen, newReg, reg1, invRect) \
-    (*(_pScreen)->Inverse)(newReg, reg1, invRect)
-
-#define REGION_RESET(_pScreen, _pReg, _pBox) \
-    (*(_pScreen)->RegionReset)(_pReg, _pBox)
-
-#define REGION_TRANSLATE(_pScreen, _pReg, _x, _y) \
-    (*(_pScreen)->TranslateRegion)(_pReg, _x, _y)
-
-#define RECT_IN_REGION(_pScreen, _pReg, prect) \
-    (*(_pScreen)->RectIn)(_pReg, prect)
-
-#define POINT_IN_REGION(_pScreen, _pReg, _x, _y, prect) \
-    (*(_pScreen)->PointInRegion)(_pReg, _x, _y, prect)
-
-#define REGION_NOTEMPTY(_pScreen, _pReg) \
-    (*(_pScreen)->RegionNotEmpty)(_pReg)
-
-#define REGION_EMPTY(_pScreen, _pReg) \
-    (*(_pScreen)->RegionEmpty)(_pReg)
-
-#define REGION_EXTENTS(_pScreen, _pReg) \
-    (*(_pScreen)->RegionExtents)(_pReg)
-
-#define REGION_APPEND(_pScreen, dstrgn, rgn) \
-    (*(_pScreen)->RegionAppend)(dstrgn, rgn)
-
-#define REGION_VALIDATE(_pScreen, badreg, pOverlap) \
-    (*(_pScreen)->RegionValidate)(badreg, pOverlap)
-
-#define BITMAP_TO_REGION(_pScreen, pPix) \
-    (*(_pScreen)->BitmapToRegion)(pPix)
-
-#define RECTS_TO_REGION(_pScreen, nrects, prect, ctype) \
-    (*(_pScreen)->RectsToRegion)(nrects, prect, ctype)
-
-#else /* !NEED_SCREEN_REGIONS */
-
-#define REGION_CREATE(_pScreen, _rect, _size) \
-    miRegionCreate(_rect, _size)
-
-#define REGION_COPY(_pScreen, dst, src) \
-    miRegionCopy(dst, src)
-
-#define REGION_DESTROY(_pScreen, _pReg) \
-    miRegionDestroy(_pReg)
-
-#define REGION_INTERSECT(_pScreen, newReg, reg1, reg2) \
-    miIntersect(newReg, reg1, reg2)
-
-#define REGION_UNION(_pScreen, newReg, reg1, reg2) \
-    miUnion(newReg, reg1, reg2)
-
-#define REGION_SUBTRACT(_pScreen, newReg, reg1, reg2) \
-    miSubtract(newReg, reg1, reg2)
-
-#define REGION_INVERSE(_pScreen, newReg, reg1, invRect) \
-    miInverse(newReg, reg1, invRect)
-
-#define REGION_TRANSLATE(_pScreen, _pReg, _x, _y) \
-    miTranslateRegion(_pReg, _x, _y)
-
-#define RECT_IN_REGION(_pScreen, _pReg, prect) \
-    miRectIn(_pReg, prect)
-
-#define POINT_IN_REGION(_pScreen, _pReg, _x, _y, prect) \
-    miPointInRegion(_pReg, _x, _y, prect)
-
-#define REGION_APPEND(_pScreen, dstrgn, rgn) \
-    miRegionAppend(dstrgn, rgn)
-
-#define REGION_VALIDATE(_pScreen, badreg, pOverlap) \
-    miRegionValidate(badreg, pOverlap)
-
-#define BITMAP_TO_REGION(_pScreen, pPix) \
-    (*(_pScreen)->BitmapToRegion)(pPix) /* no mi version?! */
-
-#define RECTS_TO_REGION(_pScreen, nrects, prect, ctype) \
-    miRectsToRegion(nrects, prect, ctype)
-
-#ifdef DONT_INLINE_REGION_OPS
-
-#define REGION_INIT(_pScreen, _pReg, _rect, _size) \
-    miRegionInit(_pReg, _rect, _size)
-
-#define REGION_UNINIT(_pScreen, _pReg) \
-    miRegionUninit(_pReg)
-
-#define REGION_RESET(_pScreen, _pReg, _pBox) \
-    miRegionReset(_pReg, _pBox)
-
-#define REGION_NOTEMPTY(_pScreen, _pReg) \
-    miRegionNotEmpty(_pReg)
-
-#define REGION_EMPTY(_pScreen, _pReg) \
-    miRegionEmpty(_pReg)
-
-#define REGION_EXTENTS(_pScreen, _pReg) \
-    miRegionExtents(_pReg)
-
-#else /* inline certain simple region ops for performance */
-
-#define REGION_INIT(_pScreen, _pReg, _rect, _size) \
-{ \
-    if (_rect) \
-    { \
-	(_pReg)->extents = *(_rect); \
-	(_pReg)->data = (RegDataPtr)NULL; \
-    } \
-    else \
-    { \
-	(_pReg)->extents = miEmptyBox; \
-	if (((_size) > 1) && ((_pReg)->data = \
-			     (RegDataPtr)xalloc(REGION_SZOF(_size)))) \
-	{ \
-	    (_pReg)->data->size = (_size); \
-	    (_pReg)->data->numRects = 0; \
-	} \
-	else \
-	    (_pReg)->data = &miEmptyData; \
-    } \
-}
-
-#define REGION_UNINIT(_pScreen, _pReg) \
-{ \
-    if ((_pReg)->data && (_pReg)->data->size) xfree((_pReg)->data); \
-}
-
-#define REGION_RESET(_pScreen, _pReg, _pBox) \
-{ \
-    (_pReg)->extents = *(_pBox); \
-    REGION_UNINIT(_pScreen, _pReg); \
-    (_pReg)->data = (RegDataPtr)NULL; \
-}
-
-#define REGION_NOTEMPTY(_pScreen, _pReg) \
-    !REGION_NIL(_pReg)
-
-#define REGION_EMPTY(_pScreen, _pReg) \
-{ \
-    REGION_UNINIT(_pScreen, _pReg); \
-    (_pReg)->extents.x2 = (_pReg)->extents.x1; \
-    (_pReg)->extents.y2 = (_pReg)->extents.y1; \
-    (_pReg)->data = &miEmptyData; \
-}
-
-#define REGION_EXTENTS(_pScreen, _pReg) \
-    &(_pReg)->extents
-
-#endif /* DONT_INLINE_REGION_OPS */
-
-#endif /* NEED_SCREEN_REGIONS */
-
-/* moved from mi.h */
-
-extern RegionPtr miRegionCreate(
-#if NeedFunctionPrototypes
-    BoxPtr /*rect*/,
-    int /*size*/
-#endif
-);
-
-extern void miRegionInit(
-#if NeedFunctionPrototypes
-    RegionPtr /*pReg*/,
-    BoxPtr /*rect*/,
-    int /*size*/
-#endif
-);
-
-extern void miRegionDestroy(
-#if NeedFunctionPrototypes
-    RegionPtr /*pReg*/
-#endif
-);
-
-extern void miRegionUninit(
-#if NeedFunctionPrototypes
-    RegionPtr /*pReg*/
-#endif
-);
-
-extern Bool miRegionCopy(
-#if NeedFunctionPrototypes
-    RegionPtr /*dst*/,
-    RegionPtr /*src*/
-#endif
-);
-
-extern Bool miIntersect(
-#if NeedFunctionPrototypes
-    RegionPtr /*newReg*/,
-    RegionPtr /*reg1*/,
-    RegionPtr /*reg2*/
-#endif
-);
-
-extern Bool miUnion(
-#if NeedFunctionPrototypes
-    RegionPtr /*newReg*/,
-    RegionPtr /*reg1*/,
-    RegionPtr /*reg2*/
-#endif
-);
-
-extern Bool miRegionAppend(
-#if NeedFunctionPrototypes
-    RegionPtr /*dstrgn*/,
-    RegionPtr /*rgn*/
-#endif
-);
-
-extern Bool miRegionValidate(
-#if NeedFunctionPrototypes
-    RegionPtr /*badreg*/,
-    Bool * /*pOverlap*/
-#endif
-);
-
-extern RegionPtr miRectsToRegion(
-#if NeedFunctionPrototypes
-    int /*nrects*/,
-    xRectanglePtr /*prect*/,
-    int /*ctype*/
-#endif
-);
-
-extern Bool miSubtract(
-#if NeedFunctionPrototypes
-    RegionPtr /*regD*/,
-    RegionPtr /*regM*/,
-    RegionPtr /*regS*/
-#endif
-);
-
-extern Bool miInverse(
-#if NeedFunctionPrototypes
-    RegionPtr /*newReg*/,
-    RegionPtr /*reg1*/,
-    BoxPtr /*invRect*/
-#endif
-);
-
-extern int miRectIn(
-#if NeedFunctionPrototypes
-    RegionPtr /*region*/,
-    BoxPtr /*prect*/
-#endif
-);
-
-extern void miTranslateRegion(
-#if NeedFunctionPrototypes
-    RegionPtr /*pReg*/,
-    int /*x*/,
-    int /*y*/
-#endif
-);
-
-extern void miRegionReset(
-#if NeedFunctionPrototypes
-    RegionPtr /*pReg*/,
-    BoxPtr /*pBox*/
-#endif
-);
-
-extern Bool miPointInRegion(
-#if NeedFunctionPrototypes
-    RegionPtr /*pReg*/,
-    int /*x*/,
-    int /*y*/,
-    BoxPtr /*box*/
-#endif
-);
-
-extern Bool miRegionNotEmpty(
-#if NeedFunctionPrototypes
-    RegionPtr /*pReg*/
-#endif
-);
-
-extern void miRegionEmpty(
-#if NeedFunctionPrototypes
-    RegionPtr /*pReg*/
-#endif
-);
-
-extern BoxPtr miRegionExtents(
-#if NeedFunctionPrototypes
-    RegionPtr /*pReg*/
-#endif
-);
-
-#endif /* REGIONSTRUCT_H */
diff --git a/include/Xserver/screenint.h b/include/Xserver/screenint.h
deleted file mode 100755
index ebeac39..0000000
--- a/include/Xserver/screenint.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* $XConsortium: screenint.h /main/6 1996/06/17 10:55:15 mor $ */
-/***********************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.2 1997/01/14 22:22:40 dawes Exp $ */
-#ifndef SCREENINT_H
-#define SCREENINT_H
-
-#include "misc.h"
-
-typedef struct _PixmapFormat *PixmapFormatPtr;
-typedef struct _Visual *VisualPtr;
-typedef struct _Depth  *DepthPtr;
-typedef struct _Screen *ScreenPtr;
-
-extern void ResetScreenPrivates(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int AllocateScreenPrivateIndex(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern void ResetWindowPrivates(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int AllocateWindowPrivateIndex(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern Bool AllocateWindowPrivate(
-#if NeedFunctionPrototypes
-    ScreenPtr /* pScreen */,
-    int /* index */,
-    unsigned /* amount */
-#endif
-);
-
-extern void ResetGCPrivates(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int AllocateGCPrivateIndex(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern Bool AllocateGCPrivate(
-#if NeedFunctionPrototypes
-    ScreenPtr /* pScreen */,
-    int /* index */,
-    unsigned /* amount */
-#endif
-);
-
-extern int AddScreen(
-#if NeedFunctionPrototypes
-    Bool (* /*pfnInit*/)(
-#if NeedNestedPrototypes
-	int /*index*/,
-	ScreenPtr /*pScreen*/,
-	int /*argc*/,
-	char ** /*argv*/
-#endif
-    ),
-    int /*argc*/,
-    char** /*argv*/
-#endif
-);
-
-#ifdef PIXPRIV
-
-extern void ResetPixmapPrivates(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern int AllocatePixmapPrivateIndex(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-extern Bool AllocatePixmapPrivate(
-#if NeedFunctionPrototypes
-    ScreenPtr /* pScreen */,
-    int /* index */,
-    unsigned /* amount */
-#endif
-);
-
-#endif /* PIXPRIV */
-
-extern void ResetColormapPrivates(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
-
-
-typedef struct _ColormapRec *ColormapPtr;
-typedef int (*InitCmapPrivFunc)(
-#if NeedNestedPrototypes
-	ColormapPtr
-#endif
-);
-
-extern int AllocateColormapPrivateIndex(
-#if NeedFunctionPrototypes
-    InitCmapPrivFunc /* initPrivFunc */
-#endif
-);
-
-#endif /* SCREENINT_H */
diff --git a/include/Xserver/scrnintstr.h b/include/Xserver/scrnintstr.h
deleted file mode 100755
index c770ecf..0000000
--- a/include/Xserver/scrnintstr.h
+++ /dev/null
@@ -1,934 +0,0 @@
-/* $XConsortium: scrnintstr.h /main/32 1996/09/28 17:14:32 rws $ */
-/***********************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-#ifndef SCREENINTSTRUCT_H
-#define SCREENINTSTRUCT_H
-
-#include "screenint.h"
-#include "miscstruct.h"
-#include "region.h"
-#include "pixmap.h"
-#include "gc.h"
-#include "colormap.h"
-#include "cursor.h"
-#include "validate.h"
-#include "window.h"
-#include "X11/Xproto.h"
-#include "dix.h"
-
-typedef struct _PixmapFormat {
-    unsigned char       depth;
-    unsigned char       bitsPerPixel;
-    unsigned char       scanlinePad;
-    } PixmapFormatRec;
-    
-typedef struct _Visual {
-    VisualID            vid;
-    short               class;
-    short               bitsPerRGBValue;
-    short               ColormapEntries;
-    short               nplanes;/* = log2 (ColormapEntries). This does not
-                                 * imply that the screen has this many planes.
-                                 * it may have more or fewer */
-    unsigned long       redMask, greenMask, blueMask;
-    int                 offsetRed, offsetGreen, offsetBlue;
-  } VisualRec;
-
-typedef struct _Depth {
-    unsigned char       depth;
-    short               numVids;
-    VisualID            *vids;    /* block of visual ids for this depth */
-  } DepthRec;
-
-
-/*
- *  There is a typedef for each screen function pointer so that code that
- *  needs to declare a screen function pointer (e.g. in a screen private
- *  or as a local variable) can easily do so and retain full type checking.
- */
-
-typedef    Bool (* CloseScreenProcPtr)(
-#if NeedNestedPrototypes
-        int /*index*/,
-        ScreenPtr /*pScreen*/
-#endif
-);
-
-typedef    void (* QueryBestSizeProcPtr)(
-#if NeedNestedPrototypes
-        int /*class*/,
-        unsigned short * /*pwidth*/,
-        unsigned short * /*pheight*/,
-        ScreenPtr /*pScreen*/
-#endif
-);
-
-typedef    Bool (* SaveScreenProcPtr)(
-#if NeedNestedPrototypes
-         ScreenPtr /*pScreen*/,
-         int /*on*/
-#endif
-);
-
-typedef    void (* GetImageProcPtr)(
-#if NeedNestedPrototypes
-        DrawablePtr /*pDrawable*/,
-        int /*sx*/,
-        int /*sy*/,
-        int /*w*/,
-        int /*h*/,
-        unsigned int /*format*/,
-        unsigned long /*planeMask*/,
-        char * /*pdstLine*/
-#endif
-);
-
-typedef    void (* GetSpansProcPtr)(
-#if NeedNestedPrototypes
-        DrawablePtr /*pDrawable*/,
-        int /*wMax*/,
-        DDXPointPtr /*ppt*/,
-        int* /*pwidth*/,
-        int /*nspans*/,
-        char * /*pdstStart*/
-#endif
-);
-
-typedef    void (* PointerNonInterestBoxProcPtr)(
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/,
-        BoxPtr /*pBox*/
-#endif
-);
-
-typedef    void (* SourceValidateProcPtr)(
-#if NeedNestedPrototypes
-        DrawablePtr /*pDrawable*/,
-        int /*x*/,
-        int /*y*/,
-        int /*width*/,
-        int /*height*/
-#endif
-);
-
-typedef    Bool (* CreateWindowProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/
-#endif
-);
-
-typedef    Bool (* DestroyWindowProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/
-#endif
-);
-
-typedef    Bool (* PositionWindowProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        int /*x*/,
-        int /*y*/
-#endif
-);
-
-typedef    Bool (* ChangeWindowAttributesProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        unsigned long /*mask*/
-#endif
-);
-
-typedef    Bool (* RealizeWindowProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/
-#endif
-);
-
-typedef    Bool (* UnrealizeWindowProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/
-#endif
-);
-
-typedef    int  (* ValidateTreeProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pParent*/,
-        X11WindowPtr /*pChild*/,
-        VTKind /*kind*/
-#endif
-);
-
-typedef    void (* PostValidateTreeProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pParent*/,
-        X11WindowPtr /*pChild*/,
-        VTKind /*kind*/
-#endif
-);
-
-typedef    void (* WindowExposuresProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        RegionPtr /*prgn*/,
-        RegionPtr /*other_exposed*/
-#endif
-);
-
-typedef    void (* PaintWindowBackgroundProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        RegionPtr /*pRegion*/,
-        int /*what*/
-#endif
-);
-
-typedef    void (* PaintWindowBorderProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        RegionPtr /*pRegion*/,
-        int /*what*/
-#endif
-);
-
-typedef    void (* CopyWindowProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        DDXPointRec /*ptOldOrg*/,
-        RegionPtr /*prgnSrc*/
-#endif
-);
-
-typedef    void (* ClearToBackgroundProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        int /*x*/,
-        int /*y*/,
-        int /*w*/,
-        int /*h*/,
-        Bool /*generateExposures*/
-#endif
-);
-
-typedef    void (* ClipNotifyProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        int /*dx*/,
-        int /*dy*/
-#endif
-);
-
-typedef    PixmapPtr (* CreatePixmapProcPtr)(
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/,
-        int /*width*/,
-        int /*height*/,
-        int /*depth*/
-#endif
-);
-
-typedef    Bool (* DestroyPixmapProcPtr)(
-#if NeedNestedPrototypes
-        PixmapPtr /*pPixmap*/
-#endif
-);
-
-typedef    void (* SaveDoomedAreasProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        RegionPtr /*prgnSave*/,
-        int /*xorg*/,
-        int /*yorg*/
-#endif
-);
-
-typedef    RegionPtr (* RestoreAreasProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        RegionPtr /*prgnRestore*/
-#endif
-);
-
-typedef    void (* ExposeCopyProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pSrc*/,
-        DrawablePtr /*pDst*/,
-        GCPtr /*pGC*/,
-        RegionPtr /*prgnExposed*/,
-        int /*srcx*/,
-        int /*srcy*/,
-        int /*dstx*/,
-        int /*dsty*/,
-        unsigned long /*plane*/
-#endif
-);
-
-typedef    RegionPtr (* TranslateBackingStoreProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        int /*windx*/,
-        int /*windy*/,
-        RegionPtr /*oldClip*/,
-        int /*oldx*/,
-        int /*oldy*/
-#endif
-);
-
-typedef    RegionPtr (* ClearBackingStoreProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        int /*x*/,
-        int /*y*/,
-        int /*w*/,
-        int /*h*/,
-        Bool /*generateExposures*/
-#endif
-);
-
-typedef    void (* DrawGuaranteeProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWindow*/,
-        GCPtr /*pGC*/,
-        int /*guarantee*/
-#endif
-);
-    
-typedef    Bool (* RealizeFontProcPtr)(
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/,
-        FontPtr /*pFont*/
-#endif
-);
-
-typedef    Bool (* UnrealizeFontProcPtr)(
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/,
-        FontPtr /*pFont*/
-#endif
-);
-
-typedef    void (* ConstrainCursorProcPtr)(
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/,
-        BoxPtr /*pBox*/
-#endif
-);
-
-typedef    void (* CursorLimitsProcPtr)(
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/,
-        CursorPtr /*pCursor*/,
-        BoxPtr /*pHotBox*/,
-        BoxPtr /*pTopLeftBox*/
-#endif
-);
-
-typedef    Bool (* DisplayCursorProcPtr)(
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/,
-        CursorPtr /*pCursor*/
-#endif
-);
-
-typedef    Bool (* RealizeCursorProcPtr)(
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/,
-        CursorPtr /*pCursor*/
-#endif
-);
-
-typedef    Bool (* UnrealizeCursorProcPtr)(
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/,
-        CursorPtr /*pCursor*/
-#endif
-);
-
-typedef    void (* RecolorCursorProcPtr)(
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/,
-        CursorPtr /*pCursor*/,
-        Bool /*displayed*/
-#endif
-);
-
-typedef    Bool (* SetCursorPositionProcPtr)(
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/,
-        int /*x*/,
-        int /*y*/,
-        Bool /*generateEvent*/
-#endif
-);
-
-typedef    Bool (* CreateGCProcPtr)(
-#if NeedNestedPrototypes
-        GCPtr /*pGC*/
-#endif
-);
-
-typedef    Bool (* CreateColormapProcPtr)(
-#if NeedNestedPrototypes
-        ColormapPtr /*pColormap*/
-#endif
-);
-
-typedef    void (* DestroyColormapProcPtr)(
-#if NeedNestedPrototypes
-        ColormapPtr /*pColormap*/
-#endif
-);
-
-typedef    void (* InstallColormapProcPtr)(
-#if NeedNestedPrototypes
-        ColormapPtr /*pColormap*/
-#endif
-);
-
-typedef    void (* UninstallColormapProcPtr)(
-#if NeedNestedPrototypes
-        ColormapPtr /*pColormap*/
-#endif
-);
-
-typedef    int (* ListInstalledColormapsProcPtr) (
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/,
-        XID* /*pmaps */
-#endif
-);
-
-typedef    void (* StoreColorsProcPtr)(
-#if NeedNestedPrototypes
-        ColormapPtr /*pColormap*/,
-        int /*ndef*/,
-        xColorItem * /*pdef*/
-#endif
-);
-
-typedef    void (* ResolveColorProcPtr)(
-#if NeedNestedPrototypes
-        unsigned short* /*pred*/,
-        unsigned short* /*pgreen*/,
-        unsigned short* /*pblue*/,
-        VisualPtr /*pVisual*/
-#endif
-);
-
-typedef    RegionPtr (* RegionCreateProcPtr)(
-#if NeedNestedPrototypes
-        BoxPtr /*rect*/,
-        int /*size*/
-#endif
-);
-
-typedef    void (* RegionInitProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*pReg*/,
-        BoxPtr /*rect*/,
-        int /*size*/
-#endif
-);
-
-typedef    Bool (* RegionCopyProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*dst*/,
-        RegionPtr /*src*/
-#endif
-);
-
-typedef    void (* RegionDestroyProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*pReg*/
-#endif
-);
-
-typedef    void (* RegionUninitProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*pReg*/
-#endif
-);
-
-typedef    Bool (* IntersectProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*newReg*/,
-        RegionPtr /*reg1*/,
-        RegionPtr /*reg2*/
-#endif
-);
-
-typedef    Bool (* UnionProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*newReg*/,
-        RegionPtr /*reg1*/,
-        RegionPtr /*reg2*/
-#endif
-);
-
-typedef    Bool (* SubtractProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*regD*/,
-        RegionPtr /*regM*/,
-        RegionPtr /*regS*/
-#endif
-);
-
-typedef    Bool (* InverseProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*newReg*/,
-        RegionPtr /*reg1*/,
-        BoxPtr /*invRect*/
-#endif
-);
-
-typedef    void (* RegionResetProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*pReg*/,
-        BoxPtr /*pBox*/
-#endif
-);
-
-typedef    void (* TranslateRegionProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*pReg*/,
-        int /*x*/,
-        int /*y*/
-#endif
-);
-
-typedef    int (* RectInProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*region*/,
-        BoxPtr /*prect*/
-#endif
-);
-
-typedef    Bool (* PointInRegionProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*pReg*/,
-        int /*x*/,
-        int /*y*/,
-        BoxPtr /*box*/
-#endif
-);
-
-typedef    Bool (* RegionNotEmptyProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*pReg*/
-#endif
-);
-
-typedef    void (* RegionEmptyProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*pReg*/
-#endif
-);
-
-typedef    BoxPtr (* RegionExtentsProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*pReg*/
-#endif
-);
-
-typedef    Bool (* RegionAppendProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*dstrgn*/,
-        RegionPtr /*rgn*/
-#endif
-);
-
-typedef    Bool (* RegionValidateProcPtr)(
-#if NeedNestedPrototypes
-        RegionPtr /*badreg*/,
-        Bool* /*pOverlap*/
-#endif
-);
-
-typedef    RegionPtr (* BitmapToRegionProcPtr)(
-#if NeedNestedPrototypes
-        PixmapPtr /*pPix*/
-#endif
-);
-
-typedef    RegionPtr (* RectsToRegionProcPtr)(
-#if NeedNestedPrototypes
-        int /*nrects*/,
-        xRectangle* /*prect*/,
-        int /*ctype*/
-#endif
-);
-
-typedef    void (* SendGraphicsExposeProcPtr)(
-#if NeedNestedPrototypes
-        ClientPtr /*client*/,
-        RegionPtr /*pRgn*/,
-        XID /*drawable*/,
-        int /*major*/,
-        int /*minor*/
-#endif
-);
-
-typedef    void (* ScreenBlockHandlerProcPtr)(
-#if NeedNestedPrototypes
-        int /*screenNum*/,
-        pointer /*blockData*/,
-        struct timeval ** /*pTimeout*/,
-        pointer /*pReadmask*/
-#endif
-);
-
-typedef    void (* ScreenWakeupHandlerProcPtr)(
-#if NeedNestedPrototypes
-         int /*screenNum*/,
-         pointer /*wakeupData*/,
-         unsigned long /*result*/,
-         pointer /*pReadMask*/
-#endif
-);
-
-typedef    Bool (* CreateScreenResourcesProcPtr)(
-#if NeedNestedPrototypes
-        ScreenPtr /*pScreen*/
-#endif
-);
-
-typedef    Bool (* ModifyPixmapHeaderProcPtr)(
-#if NeedNestedPrototypes
-        PixmapPtr /*pPixmap*/,
-        int /*width*/,
-        int /*height*/,
-        int /*depth*/,
-        int /*bitsPerPixel*/,
-        int /*devKind*/,
-        pointer /*pPixData*/
-#endif
-);
-
-typedef    void (* MarkWindowProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWin*/
-#endif
-);
-
-typedef    Bool (* MarkOverlappedWindowsProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*parent*/,
-        X11WindowPtr /*firstChild*/,
-        X11WindowPtr * /*pLayerWin*/
-#endif
-);
-
-typedef    Bool (* ChangeSaveUnderProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pLayerWin*/,
-        X11WindowPtr /*firstChild*/
-#endif
-);
-
-typedef    void (* PostChangeSaveUnderProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pLayerWin*/,
-        X11WindowPtr /*firstChild*/
-#endif
-);
-
-typedef    void (* MoveWindowProcPtr)(
-#if NeedNestedPrototypes
-        X11WindowPtr /*pWin*/,
-        int /*x*/,
-        int /*y*/,
-        X11WindowPtr /*pSib*/,
-        VTKind /*kind*/
-#endif
-);
-
-typedef    void (* ResizeWindowProcPtr)(
-#if NeedNestedPrototypes
-    X11WindowPtr /*pWin*/,
-    int /*x*/,
-    int /*y*/, 
-    unsigned int /*w*/,
-    unsigned int /*h*/,
-    X11WindowPtr /*pSib*/
-#endif
-);
-
-typedef    X11WindowPtr (* GetLayerWindowProcPtr)(
-#if NeedNestedPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-typedef    void (* HandleExposuresProcPtr)(
-#if NeedNestedPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-typedef    void (* ReparentWindowProcPtr)(
-#if NeedNestedPrototypes
-    X11WindowPtr /*pWin*/,
-    X11WindowPtr /*pPriorParent*/
-#endif
-);
-
-#ifdef SHAPE
-typedef    void (* SetShapeProcPtr)(
-#if NeedFunctionPrototypes
-        X11WindowPtr /*pWin*/
-#endif
-);
-#endif /* SHAPE */
-
-typedef    void (* ChangeBorderWidthProcPtr)(
-#if NeedFunctionPrototypes
-        X11WindowPtr /*pWin*/,
-        unsigned int /*width*/
-#endif
-);
-
-typedef    void (* MarkUnrealizedWindowProcPtr)(
-#if NeedFunctionPrototypes
-        X11WindowPtr /*pChild*/,
-        X11WindowPtr /*pWin*/,
-        Bool /*fromConfigure*/
-#endif
-);
-
-typedef struct _Screen {
-    int                 myNum;  /* index of this instance in Screens[] */
-    ATOM                id;
-    short               width, height;
-    short               mmWidth, mmHeight;
-    short               numDepths;
-    unsigned char       rootDepth;
-    DepthPtr            allowedDepths;
-    unsigned long       rootVisual;
-    unsigned long       defColormap;
-    short               minInstalledCmaps, maxInstalledCmaps;
-    char                backingStoreSupport, saveUnderSupport;
-    unsigned long       whitePixel, blackPixel;
-    unsigned long       rgf;    /* array of flags; she's -- HUNGARIAN */
-    GCPtr               GCperDepth[MAXFORMATS+1];
-                        /* next field is a stipple to use as default in
-                           a GC.  we don't build default tiles of all depths
-                           because they are likely to be of a color
-                           different from the default fg pixel, so
-                           we don't win anything by building
-                           a standard one.
-                        */
-    PixmapPtr           PixmapPerDepth[1];
-    pointer             devPrivate;
-    short               numVisuals;
-    VisualPtr           visuals;
-    int                 WindowPrivateLen;
-    unsigned            *WindowPrivateSizes;
-    unsigned            totalWindowSize;
-    int                 GCPrivateLen;
-    unsigned            *GCPrivateSizes;
-    unsigned            totalGCSize;
-
-    /* Random screen procedures */
-
-    CloseScreenProcPtr          CloseScreen;
-    QueryBestSizeProcPtr        QueryBestSize;
-    SaveScreenProcPtr           SaveScreen;
-    GetImageProcPtr             GetImage;
-    GetSpansProcPtr             GetSpans;
-    PointerNonInterestBoxProcPtr PointerNonInterestBox;
-    SourceValidateProcPtr       SourceValidate;
-
-    /* Window Procedures */
-
-    CreateWindowProcPtr         CreateWindow;
-    DestroyWindowProcPtr        DestroyWindow;
-    PositionWindowProcPtr       PositionWindow;
-    ChangeWindowAttributesProcPtr ChangeWindowAttributes;
-    RealizeWindowProcPtr        RealizeWindow;
-    UnrealizeWindowProcPtr      UnrealizeWindow;
-    ValidateTreeProcPtr         ValidateTree;
-    PostValidateTreeProcPtr     PostValidateTree;
-    WindowExposuresProcPtr      WindowExposures;
-    PaintWindowBackgroundProcPtr PaintWindowBackground;
-    PaintWindowBorderProcPtr    PaintWindowBorder;
-    CopyWindowProcPtr           CopyWindow;
-    ClearToBackgroundProcPtr    ClearToBackground;
-    ClipNotifyProcPtr           ClipNotify;
-
-    /* Pixmap procedures */
-
-    CreatePixmapProcPtr         CreatePixmap;
-    DestroyPixmapProcPtr        DestroyPixmap;
-
-    /* Backing store procedures */
-
-    SaveDoomedAreasProcPtr      SaveDoomedAreas;
-    RestoreAreasProcPtr         RestoreAreas;
-    ExposeCopyProcPtr           ExposeCopy;
-    TranslateBackingStoreProcPtr TranslateBackingStore;
-    ClearBackingStoreProcPtr    ClearBackingStore;
-    DrawGuaranteeProcPtr        DrawGuarantee;
-    
-    /* Font procedures */
-
-    RealizeFontProcPtr          RealizeFont;
-    UnrealizeFontProcPtr        UnrealizeFont;
-
-    /* Cursor Procedures */
-
-    ConstrainCursorProcPtr      ConstrainCursor;
-    CursorLimitsProcPtr         CursorLimits;
-    DisplayCursorProcPtr        DisplayCursor;
-    RealizeCursorProcPtr        RealizeCursor;
-    UnrealizeCursorProcPtr      UnrealizeCursor;
-    RecolorCursorProcPtr        RecolorCursor;
-    SetCursorPositionProcPtr    SetCursorPosition;
-
-    /* GC procedures */
-
-    CreateGCProcPtr             CreateGC;
-
-    /* Colormap procedures */
-
-    CreateColormapProcPtr       CreateColormap;
-    DestroyColormapProcPtr      DestroyColormap;
-    InstallColormapProcPtr      InstallColormap;
-    UninstallColormapProcPtr    UninstallColormap;
-    ListInstalledColormapsProcPtr ListInstalledColormaps;
-    StoreColorsProcPtr          StoreColors;
-    ResolveColorProcPtr         ResolveColor;
-
-    /* Region procedures */
-
-    RegionCreateProcPtr         RegionCreate;
-    RegionInitProcPtr           RegionInit;
-    RegionCopyProcPtr           RegionCopy;
-    RegionDestroyProcPtr        RegionDestroy;
-    RegionUninitProcPtr         RegionUninit;
-    IntersectProcPtr            Intersect;
-    UnionProcPtr                Union;
-    SubtractProcPtr             Subtract;
-    InverseProcPtr              Inverse;
-    RegionResetProcPtr          RegionReset;
-    TranslateRegionProcPtr      TranslateRegion;
-    RectInProcPtr               RectIn;
-    PointInRegionProcPtr        PointInRegion;
-    RegionNotEmptyProcPtr       RegionNotEmpty;
-    RegionEmptyProcPtr          RegionEmpty;
-    RegionExtentsProcPtr        RegionExtents;
-    RegionAppendProcPtr         RegionAppend;
-    RegionValidateProcPtr       RegionValidate;
-    BitmapToRegionProcPtr       BitmapToRegion;
-    RectsToRegionProcPtr        RectsToRegion;
-    SendGraphicsExposeProcPtr   SendGraphicsExpose;
-
-    /* os layer procedures */
-
-    ScreenBlockHandlerProcPtr   BlockHandler;
-    ScreenWakeupHandlerProcPtr  WakeupHandler;
-
-    pointer blockData;
-    pointer wakeupData;
-
-    /* anybody can get a piece of this array */
-    DevUnion    *devPrivates;
-
-    CreateScreenResourcesProcPtr CreateScreenResources;
-    ModifyPixmapHeaderProcPtr   ModifyPixmapHeader;
-
-    PixmapPtr pScratchPixmap;           /* scratch pixmap "pool" */
-
-#ifdef PIXPRIV
-    int                 PixmapPrivateLen;
-    unsigned            *PixmapPrivateSizes;
-    unsigned            totalPixmapSize;
-#endif
-
-    MarkWindowProcPtr           MarkWindow;
-    MarkOverlappedWindowsProcPtr MarkOverlappedWindows;
-    ChangeSaveUnderProcPtr      ChangeSaveUnder;
-    PostChangeSaveUnderProcPtr  PostChangeSaveUnder;
-    MoveWindowProcPtr           MoveWindow;
-    ResizeWindowProcPtr         ResizeWindow;
-    GetLayerWindowProcPtr       GetLayerWindow;
-    HandleExposuresProcPtr      HandleExposures;
-    ReparentWindowProcPtr       ReparentWindow;
-
-#ifdef SHAPE
-    SetShapeProcPtr             SetShape;
-#endif /* SHAPE */
-
-    ChangeBorderWidthProcPtr    ChangeBorderWidth;
-    MarkUnrealizedWindowProcPtr MarkUnrealizedWindow;
-
-} ScreenRec;
-
-typedef struct _ScreenInfo {
-    int         imageByteOrder;
-    int         bitmapScanlineUnit;
-    int         bitmapScanlinePad;
-    int         bitmapBitOrder;
-    int         numPixmapFormats;
-    PixmapFormatRec
-                formats[MAXFORMATS];
-    int         arraySize;
-    int         numScreens;
-    ScreenPtr   screens[MAXSCREENS];
-    int         numVideoScreens;
-} ScreenInfo;
-
-extern ScreenInfo screenInfo;
-
-extern void InitOutput(
-#if NeedFunctionPrototypes
-    ScreenInfo  * /*pScreenInfo*/,
-    int         /*argc*/,
-    char        ** /*argv*/
-#endif
-);
-
-#endif /* SCREENINTSTRUCT_H */
diff --git a/include/Xserver/validate.h b/include/Xserver/validate.h
deleted file mode 100755
index 756ad89..0000000
--- a/include/Xserver/validate.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $XConsortium: validate.h,v 5.4 94/04/17 20:26:11 dpw Exp $ */
-
-/*
-
-Copyright (c) 1989  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-*/
-
-#ifndef VALIDATE_H
-#define VALIDATE_H
-
-#include "miscstruct.h"
-#include "regionstr.h"
-
-typedef enum { VTOther, VTStack, VTMove, VTUnmap, VTMap } VTKind;
-
-/* union _Validate is now device dependent; see mivalidate.h for an example */
-typedef union _Validate *ValidatePtr;
-
-#define UnmapValData ((ValidatePtr)1)
-
-#endif /* VALIDATE_H */
diff --git a/include/Xserver/window.h b/include/Xserver/window.h
deleted file mode 100755
index 2919e23..0000000
--- a/include/Xserver/window.h
+++ /dev/null
@@ -1,351 +0,0 @@
-/* $XConsortium: window.h /main/8 1996/03/21 13:35:33 mor $ */
-/***********************************************************
-
-Copyright (c) 1987  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef WINDOW_H
-#define WINDOW_H
-
-#include "misc.h"
-#include "region.h"
-#include "screenint.h"
-#include "X11/Xproto.h"
-
-#define TOTALLY_OBSCURED 0
-#define UNOBSCURED 1
-#define OBSCURED 2
-
-#define VisibilityNotViewable   3
-
-/* return values for tree-walking callback procedures */
-#define WT_STOPWALKING          0
-#define WT_WALKCHILDREN         1
-#define WT_DONTWALKCHILDREN     2
-#define WT_NOMATCH 3
-#define NullWindow ((X11WindowPtr) 0)
-
-typedef struct _BackingStore *BackingStorePtr;
-typedef struct _Window *X11WindowPtr;   /* conflict with CoreGraphics */
-
-typedef int (*VisitWindowProcPtr)(
-#if NeedNestedPrototypes
-    X11WindowPtr /*pWin*/,
-    pointer /*data*/
-#endif
-);
-
-extern int TraverseTree(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    VisitWindowProcPtr /*func*/,
-    pointer /*data*/
-#endif
-);
-
-extern int WalkTree(
-#if NeedFunctionPrototypes
-    ScreenPtr /*pScreen*/,
-    VisitWindowProcPtr /*func*/,
-    pointer /*data*/
-#endif
-);
-
-extern X11WindowPtr AllocateWindow(
-#if NeedFunctionPrototypes
-    ScreenPtr /*pScreen*/
-#endif
-);
-
-extern Bool CreateRootWindow(
-#if NeedFunctionPrototypes
-    ScreenPtr /*pScreen*/
-#endif
-);
-
-extern void InitRootWindow(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-extern void ClippedRegionFromBox(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    RegionPtr /*Rgn*/,
-    int /*x*/,
-    int /*y*/,
-    int /*w*/,
-    int /*h*/
-#endif
-);
-
-extern X11WindowPtr RealChildHead(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-extern X11WindowPtr CreateWindow(
-#if NeedFunctionPrototypes
-    Window /*wid*/,
-    X11WindowPtr /*pParent*/,
-    int /*x*/,
-    int /*y*/,
-    unsigned int /*w*/,
-    unsigned int /*h*/,
-    unsigned int /*bw*/,
-    unsigned int /*class*/,
-    Mask /*vmask*/,
-    XID* /*vlist*/,
-    int /*depth*/,
-    ClientPtr /*client*/,
-    VisualID /*visual*/,
-    int* /*error*/
-#endif
-);
-
-extern int DeleteWindow(
-#if NeedFunctionPrototypes
-    pointer /*pWin*/,
-    XID /*wid*/
-#endif
-);
-
-extern void DestroySubwindows(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    ClientPtr /*client*/
-#endif
-);
-
-extern int X11ChangeWindowAttributes(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    Mask /*vmask*/,
-    XID* /*vlist*/,
-    ClientPtr /*client*/
-#endif
-);
-
-extern void X11GetWindowAttributes(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    ClientPtr /*client*/,
-    xGetWindowAttributesReply* /* wa */
-#endif
-);
-
-extern RegionPtr CreateUnclippedWinSize(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-extern void GravityTranslate(
-#if NeedFunctionPrototypes
-    int /*x*/,
-    int /*y*/,
-    int /*oldx*/,
-    int /*oldy*/,
-    int /*dw*/,
-    int /*dh*/,
-    unsigned /*gravity*/,
-    int* /*destx*/,
-    int* /*desty*/
-#endif
-);
-
-extern int ConfigureWindow(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    Mask /*mask*/,
-    XID* /*vlist*/,
-    ClientPtr /*client*/
-#endif
-);
-
-extern int CirculateWindow(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pParent*/,
-    int /*direction*/,
-    ClientPtr /*client*/
-#endif
-);
-
-extern int ReparentWindow(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    X11WindowPtr /*pParent*/,
-    int /*x*/,
-    int /*y*/,
-    ClientPtr /*client*/
-#endif
-);
-
-extern int MapWindow(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    ClientPtr /*client*/
-#endif
-);
-
-extern void MapSubwindows(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pParent*/,
-    ClientPtr /*client*/
-#endif
-);
-
-extern int UnmapWindow(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    Bool /*fromConfigure*/
-#endif
-);
-
-extern void UnmapSubwindows(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-extern void HandleSaveSet(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
-
-extern Bool VisibleBoundingBoxFromPoint(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    int /*x*/,
-    int /*y*/,
-    BoxPtr /*box*/
-#endif
-);
-
-extern Bool PointInWindowIsVisible(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    int /*x*/,
-    int /*y*/
-#endif
-);
-
-extern RegionPtr NotClippedByChildren(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-extern void SendVisibilityNotify(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-extern void SaveScreens(
-#if NeedFunctionPrototypes
-    int /*on*/,
-    int /*mode*/
-#endif
-);
-
-extern X11WindowPtr FindWindowWithOptional(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*w*/
-#endif
-);
-
-extern void CheckWindowOptionalNeed(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*w*/
-#endif
-);
-
-extern Bool MakeWindowOptional(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-extern void DisposeWindowOptional(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-extern X11WindowPtr MoveWindowInStack(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    X11WindowPtr /*pNextSib*/
-#endif
-);
-
-void SetWinSize(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-void SetBorderSize(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/
-#endif
-);
-
-void ResizeChildrenWinSize(
-#if NeedFunctionPrototypes
-    X11WindowPtr /*pWin*/,
-    int /*dx*/,
-    int /*dy*/,
-    int /*dw*/,
-    int /*dh*/
-#endif
-);
-
-#endif /* WINDOW_H */