dix: unexport some lookup functions

These aren't used by any drivers, so no need to export them.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1380>

Xext/panoramiX.c

@@ -31,6 +31,10 @@ Equipment Corporation.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xarch.h>
+#include <X11/extensions/panoramiXproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "cursor.h"
 #include "cursorstr.h"
@@ -43,7 +47,6 @@ Equipment Corporation.
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "panoramiX.h"
-#include <X11/extensions/panoramiXproto.h>
 #include "panoramiXsrv.h"
 #include "globals.h"
 #include "servermd.h"

Xext/panoramiXprocs.c

@@ -32,6 +32,9 @@ Equipment Corporation.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "windowstr.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"

Xext/saver.c

@@ -30,8 +30,13 @@ in this Software without prior written authorization from the X Consortium.
 #include <dix-config.h>
 #endif
 
+#include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/saverproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -41,7 +46,6 @@ in this Software without prior written authorization from the X Consortium.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-#include <X11/extensions/saverproto.h>
 #include "gcstruct.h"
 #include "cursorstr.h"
 #include "colormapst.h"
@@ -56,9 +60,6 @@ in this Software without prior written authorization from the X Consortium.
 #include "dpmsproc.h"
 #endif
 #include "protocol-versions.h"
-
-#include <stdio.h>
-
 #include "extinit.h"
 
 static int ScreenSaverEventBase = 0;

Xext/shape.c

@@ -29,11 +29,11 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #include <stdlib.h>
-
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/shapeproto.h>
 
+#include "dix/dix_priv.h"
 #include "dix/gc_priv.h"
 
 #include "misc.h"

Xext/shm.c

@@ -96,6 +96,8 @@ in this Software without prior written authorization from The Open Group.
 #include "panoramiXsrv.h"
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "extinit.h"
 
 typedef struct _ShmScrPrivateRec {

Xext/sync.c

@@ -54,10 +54,14 @@ PERFORMANCE OF THIS SOFTWARE.
 #endif
 
 #include <string.h>
-
+#include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xmd.h>
+#include <X11/extensions/syncproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "scrnintstr.h"
 #include "os.h"
 #include "extnsionst.h"
@@ -65,14 +69,12 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "pixmapstr.h"
 #include "resource.h"
 #include "opaque.h"
-#include <X11/extensions/syncproto.h>
 #include "syncsrv.h"
 #include "syncsdk.h"
 #include "protocol-versions.h"
 #include "inputstr.h"
 #include "misync_priv.h"
 
-#include <stdio.h>
 #if !defined(WIN32)
 #include <sys/time.h>
 #endif

Xext/xselinux_ext.c

@@ -21,6 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "selection.h"
 #include "inputstr.h"
 #include "windowstr.h"

Xext/xtest.c

@@ -33,6 +33,12 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
+#include <X11/extensions/xtestproto.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -45,16 +51,12 @@
 #include "mi.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
-#include <X11/extensions/xtestproto.h>
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
 #include "exglobals.h"
 #include "mipointer.h"
 #include "xserver-properties.h"
 #include "exevents.h"
 #include "eventstr.h"
 #include "inpututils.h"
-
 #include "extinit.h"
 
 /* XTest events are sent during request processing and may be interrupted by

Xext/xvdisp.c

@@ -29,6 +29,11 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
@@ -37,9 +42,6 @@ SOFTWARE.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
 #include "xvdix.h"
 #ifdef MITSHM
 #include <X11/extensions/shmproto.h>

Xi/chgprop.c

@@ -54,14 +54,15 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
-#include "windowstr.h"
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 
+#include "dix/dix_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"
 #include "exevents.h"
 #include "exglobals.h"
-
 #include "chgprop.h"
 #include "grabdev.h"
 

Xi/exevents.c

@@ -82,16 +82,18 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
 #include <X11/extensions/geproto.h>
+#include <X11/extensions/XKBproto.h>
 
+#include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 
+#include "inputstr.h"
 #include "windowstr.h"
 #include "miscstruct.h"
 #include "region.h"
@@ -108,8 +110,6 @@ SOFTWARE.
 #include "eventstr.h"
 #include "inpututils.h"
 #include "mi.h"
-
-#include <X11/extensions/XKBproto.h>
 #include "xkbsrv.h"
 
 #define WID(w) ((w) ? ((w)->drawable.id) : 0)

Xi/getprop.c

@@ -54,13 +54,15 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
-#include "windowstr.h"          /* window structs    */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structs    */
 #include "exglobals.h"
 #include "swaprep.h"
-
 #include "getprop.h"
 
 extern XExtEventInfo EventInfo[];

Xi/getselev.c

@@ -56,11 +56,13 @@ SOFTWARE.
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window struct     */
 #include "exglobals.h"
 #include "swaprep.h"
-
 #include "getprop.h"
 #include "getselev.h"
 

Xi/selectev.c

@@ -54,11 +54,14 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
-#include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structure  */
 #include "exevents.h"
 #include "exglobals.h"
 

Xi/ungrdevb.c

@@ -54,13 +54,15 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
-#include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structure  */
 #include "exglobals.h"
 #include "dixgrabs.h"
-
 #include "ungrdevb.h"
 
 #define AllModifiersMask ( \

Xi/ungrdevk.c

@@ -54,15 +54,17 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
-#include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structure  */
 #include "exglobals.h"
 #include "dixgrabs.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
-
 #include "ungrdevk.h"
 
 #define AllModifiersMask ( \

Xi/xiallowev.c

@@ -33,13 +33,15 @@
 #include <dix-config.h>
 #endif
 
+#include <X11/extensions/XI2.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "mi.h"
 #include "eventstr.h"
-#include <X11/extensions/XI2.h>
-#include <X11/extensions/XI2proto.h>
-
 #include "exglobals.h"          /* BadDevice */
 #include "exevents.h"
 #include "xiallowev.h"

Xi/xibarriers.c

@@ -45,6 +45,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "xibarriers.h"
 #include "scrnintstr.h"
 #include "cursorstr.h"

Xi/xichangecursor.c

@@ -35,16 +35,18 @@
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "scrnintstr.h"         /* screen structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
 #include "extnsionst.h"
 #include "exevents.h"
 #include "exglobals.h"
 #include "input.h"
-
 #include "xichangecursor.h"
 
 /***********************************************************************

Xi/xigetclientpointer.c

@@ -29,16 +29,18 @@
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "scrnintstr.h"         /* screen structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
 #include "extnsionst.h"
 #include "extinit.h"            /* LookupDeviceIntRec */
 #include "exevents.h"
 #include "exglobals.h"
-
 #include "xigetclientpointer.h"
 
 /***********************************************************************

Xi/xipassivegrab.c

@@ -33,12 +33,14 @@
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"           /* DeviceIntPtr      */
-#include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XI2proto.h>
-#include "swaprep.h"
 
+#include "dix/dix_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structure  */
+#include "swaprep.h"
 #include "exglobals.h"          /* BadDevice */
 #include "exevents.h"
 #include "xipassivegrab.h"

Xi/xiquerypointer.c

@@ -35,13 +35,14 @@
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
 
+#include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
 #include "extnsionst.h"
 #include "exevents.h"
 #include "exglobals.h"

Xi/xiselectev.c

@@ -27,13 +27,15 @@
 #include <dix-config.h>
 #endif
 
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
 #include "dixstruct.h"
 #include "windowstr.h"
 #include "exglobals.h"
 #include "exevents.h"
-#include <X11/extensions/XI2proto.h>
 #include "inpututils.h"
-
 #include "xiselectev.h"
 
 /**

Xi/xisetclientpointer.c

@@ -36,6 +36,9 @@
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
+
+#include "dix/dix_priv.h"
+
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "scrnintstr.h"         /* screen structure  */
@@ -44,7 +47,6 @@
 #include "extnsionst.h"
 #include "exevents.h"
 #include "exglobals.h"
-
 #include "xisetclientpointer.h"
 
 int _X_COLD

Xi/xiwarppointer.c

@@ -35,17 +35,20 @@
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include "scrnintstr.h"         /* screen structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
 #include "extnsionst.h"
 #include "exevents.h"
 #include "exglobals.h"
 #include "mipointer.h"          /* for miPointerUpdateSprite */
-
 #include "xiwarppointer.h"
+
 /***********************************************************************
  *
  * This procedure allows a client to warp the pointer of a device.

composite/compwindow.c

@@ -45,6 +45,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "compint.h"
 #include "compositeext_priv.h"
 

damageext/damageext.c

@@ -25,6 +25,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "damageextint.h"
 #include "damagestr.h"
 #include "protocol-versions.h"

dbe/dbe.c

@@ -40,6 +40,9 @@
 #include <stdint.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "scrnintstr.h"
 #include "extnsionst.h"
 #include "extinit.h"

dix/devices.c

@@ -49,13 +49,14 @@ SOFTWARE.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xatom.h>
 
+#include "dix/dix_priv.h"
 #include "dix/ptrveloc_priv.h"
 
 #include "misc.h"
 #include "resource.h"
-#include <X11/Xproto.h>
-#include <X11/Xatom.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"

dix/dix_priv.h

@@ -17,6 +17,7 @@
 #include <X11/Xfuncproto.h>
 
 #include "include/dix.h"
+#include "include/gc.h"
 #include "include/window.h"
 
 /* server setting: maximum size for big requests */
@@ -53,4 +54,28 @@ Bool dixLookupBuiltinColor(int screen,
 
 void DeleteWindowFromAnySaveSet(WindowPtr pWin);
 
+#define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, mode)                   \
+    do {                                                                \
+        int tmprc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY, mode); \
+        if (tmprc != Success)                                           \
+            return tmprc;                                               \
+        tmprc = dixLookupGC(&(pGC), stuff->gc, client, DixUseAccess);   \
+        if (tmprc != Success)                                           \
+            return tmprc;                                               \
+        if ((pGC->depth != pDraw->depth) || (pGC->pScreen != pDraw->pScreen)) \
+            return BadMatch;                                            \
+        if (pGC->serialNumber != pDraw->serialNumber)                   \
+            ValidateGC(pDraw, pGC);                                     \
+    } while (0)
+
+int dixLookupGC(GCPtr *result,
+                XID id,
+                ClientPtr client,
+                Mask access_mode);
+
+int dixLookupClient(ClientPtr *result,
+                    XID id,
+                    ClientPtr client,
+                    Mask access_mode);
+
 #endif /* _XSERVER_DIX_PRIV_H */

dix/dixfonts.c

@@ -52,10 +52,14 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
+#include <stddef.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
+#include <X11/fonts/fontstruct.h>
+#include <X11/fonts/libxfont2.h>
 
+#include "dix/dix_priv.h"
 #include "dix/gc_priv.h"
 #include "os/auth.h"
 
@@ -69,7 +73,6 @@ Equipment Corporation.
 #include "closestr.h"
 #include "dixfont.h"
 #include "xace.h"
-#include <X11/fonts/libxfont2.h>
 
 #ifdef XF86BIGFONT
 #include "xf86bigfontsrv.h"

dix/events.c

@@ -106,12 +106,13 @@ Equipment Corporation.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xproto.h>
 
+#include "dix/dix_priv.h"
 #include "dix/eventconvert.h"
 
 #include "misc.h"
 #include "resource.h"
-#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "inpututils.h"

dix/property.c

@@ -50,6 +50,9 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "windowstr.h"
 #include "propertyst.h"
 #include "dixstruct.h"

dix/selection.c

@@ -48,6 +48,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "windowstr.h"
 #include "dixstruct.h"
 #include "dispatch.h"

dri3/dri3_request.c

@@ -19,10 +19,14 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
+
+#include <unistd.h>
+
+#include "dix/dix_priv.h"
 
 #include "dri3_priv.h"
 #include <syncsrv.h>
-#include <unistd.h>
 #include <xace.h>
 #include "../Xext/syncsdk.h"
 #include <protocol-versions.h>

glx/glxcmds.c

@@ -34,10 +34,12 @@
 
 #include <string.h>
 #include <assert.h>
-
-#include "glxserver.h"
 #include <GL/glxtokens.h>
 #include <X11/extensions/presenttokens.h>
+
+#include "dix/dix_priv.h"
+
+#include "glxserver.h"
 #include <unpack.h>
 #include <pixmapstr.h>
 #include <windowstr.h>

glx/xfont.c

@@ -32,6 +32,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "glxserver.h"
 #include "glxutil.h"
 #include "unpack.h"

hw/xfree86/dri/dri.c

@@ -37,16 +37,18 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <xorg-config.h>
 #endif
 
-#include "xf86.h"
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "xf86.h"
 #include "xf86drm.h"
 #include "misc.h"
 #include "dixstruct.h"

hw/xfree86/dri/xf86dri.c

@@ -39,11 +39,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include <string.h>
-
-#include "xf86.h"
-
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "xf86.h"
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"

hw/xfree86/dri2/dri2ext.c

@@ -38,6 +38,9 @@
 #include <X11/Xproto.h>
 #include <X11/extensions/dri2proto.h>
 #include <X11/extensions/xfixeswire.h>
+
+#include "dix/dix_priv.h"
+
 #include "dixstruct.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

hw/xfree86/drivers/modesetting/dri2.c

@@ -39,6 +39,8 @@
 #include <errno.h>
 #include <time.h>
 
+#include "dix/dix_priv.h"
+
 #include "list.h"
 #include "xf86.h"
 #include "driver.h"

hw/xfree86/drivers/modesetting/driver.c

@@ -39,6 +39,10 @@
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <X11/extensions/randr.h>
+#include <X11/extensions/Xv.h>
+
+#include "dix/dix_priv.h"
 
 #include "xf86.h"
 #include "xf86Priv.h"
@@ -48,7 +52,6 @@
 #include "mipointer.h"
 #include "mipointrst.h"
 #include "micmap.h"
-#include <X11/extensions/randr.h>
 #include "fb.h"
 #include "edid.h"
 #include "xf86i2c.h"
@@ -56,7 +59,6 @@
 #include "miscstruct.h"
 #include "dixstruct.h"
 #include "xf86xv.h"
-#include <X11/extensions/Xv.h>
 #include <xorg-config.h>
 #ifdef XSERVER_PLATFORM_BUS
 #include "xf86platformBus.h"

include/dix.h

@@ -101,20 +101,6 @@ SOFTWARE.
         }                                       \
     } while (0)
 
-#define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, mode)                   \
-    do {                                                                \
-        int tmprc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY, mode); \
-        if (tmprc != Success)                                           \
-            return tmprc;                                               \
-        tmprc = dixLookupGC(&(pGC), stuff->gc, client, DixUseAccess);   \
-        if (tmprc != Success)                                           \
-            return tmprc;                                               \
-        if ((pGC->depth != pDraw->depth) || (pGC->pScreen != pDraw->pScreen)) \
-            return BadMatch;                                            \
-        if (pGC->serialNumber != pDraw->serialNumber)                   \
-            ValidateGC(pDraw, pGC);                                     \
-    } while (0)
-
 #define WriteReplyToClient(pClient, size, pReply)                       \
     do {                                                                \
         if ((pClient)->swapped)                                         \
@@ -188,17 +174,10 @@ extern _X_EXPORT int dixLookupDrawable(DrawablePtr *result,
                                        ClientPtr client,
                                        Mask type_mask, Mask access_mode);
 
-extern _X_EXPORT int dixLookupGC(GCPtr *result,
-                                 XID id, ClientPtr client, Mask access_mode);
-
 extern _X_EXPORT int dixLookupFontable(FontPtr *result,
                                        XID id,
                                        ClientPtr client, Mask access_mode);
 
-extern _X_EXPORT int dixLookupClient(ClientPtr *result,
-                                     XID id,
-                                     ClientPtr client, Mask access_mode);
-
 extern _X_EXPORT void NoopDDA(void);
 
 extern _X_EXPORT int AlterSaveSetForClient(ClientPtr /*client */ ,

mi/miexpose.c

@@ -79,6 +79,8 @@ Equipment Corporation.
 #include <X11/Xproto.h>
 #include <X11/Xprotostr.h>
 
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "regionstr.h"
 #include "scrnintstr.h"

present/present_notify.c

@@ -19,8 +19,10 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
-#include "present_priv.h"
+#include "dix/dix_priv.h"
+#include "present/present_priv.h"
 
 /*
  * Mark all pending notifies for 'window' as invalid when

present/present_request.c

@@ -19,6 +19,9 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
+
+#include "dix/dix_priv.h"
 
 #include "present_priv.h"
 #include "randrstr_priv.h"

randr/rrdispatch.c

@@ -19,8 +19,11 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
+
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
 
-#include "randrstr_priv.h"
 #include "protocol-versions.h"
 
 Bool

randr/rrlease.c

@@ -19,11 +19,15 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
-#include "randrstr_priv.h"
-#include "swaprep.h"
 #include <unistd.h>
 
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
+
+#include "swaprep.h"
+
 RESTYPE RRLeaseType;
 
 /*

randr/rrmode.c

@@ -19,8 +19,10 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
-#include "randrstr_priv.h"
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
 
 RESTYPE RRModeType;
 

randr/rrmonitor.c

@@ -19,8 +19,11 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
+
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
 
-#include "randrstr_priv.h"
 #include "swaprep.h"
 
 static Atom

randr/rroutput.c

@@ -20,10 +20,13 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
-#include "randrstr_priv.h"
 #include <X11/Xatom.h>
 
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
+
 RESTYPE RROutputType;
 
 /*

randr/rrprovider.c

@@ -22,12 +22,15 @@
  *
  * Authors: Dave Airlie
  */
-
+#include <dix-config.h>
-#include "randrstr_priv.h"
-#include "swaprep.h"
 
 #include <X11/Xatom.h>
 
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
+
+#include "swaprep.h"
+
 RESTYPE RRProviderType = 0;
 
 /*

randr/rrscreen.c

@@ -19,8 +19,10 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
-#include "randrstr_priv.h"
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
 
 static CARD16
  RR10CurrentSizeID(ScreenPtr pScreen);

randr/rrxinerama.c

@@ -67,10 +67,15 @@
  *           Mitani Hiroshi <hmitani@drl.mei.co.jp>,
  *           David Thomas <davtom@dream.org.uk>.
  */
+#include <dix-config.h>
 
-#include "randrstr_priv.h"
+#include <X11/Xmd.h>
-#include "swaprep.h"
 #include <X11/extensions/panoramiXproto.h>
+
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
+
+#include "swaprep.h"
 #include "protocol-versions.h"
 
 /* Xinerama is not multi-screen capable; just report about screen 0 */

render/render.c

@@ -28,6 +28,12 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/render.h>
+#include <X11/extensions/renderproto.h>
+#include <X11/Xfuncproto.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -39,11 +45,8 @@
 #include "extnsionst.h"
 #include "extinit.h"
 #include "servermd.h"
-#include <X11/extensions/render.h>
-#include <X11/extensions/renderproto.h>
 #include "picturestr_priv.h"
 #include "glyphstr_priv.h"
-#include <X11/Xfuncproto.h>
 #include "cursorstr.h"
 #include "xace.h"
 #include "protocol-versions.h"

xfixes/cursor.c

@@ -46,6 +46,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "xfixesint.h"
 #include "scrnintstr.h"
 #include "cursorstr.h"

xfixes/region.c

@@ -24,9 +24,11 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+#include "render/picturestr_priv.h"
+
 #include "xfixesint.h"
 #include "scrnintstr.h"
-#include "picturestr_priv.h"
 
 #include <regionstr.h>
 #include <gcstruct.h>

xfixes/saveset.c

@@ -24,6 +24,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "xfixesint.h"
 
 int

xfixes/select.c

@@ -24,6 +24,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
+
 #include "xfixesint.h"
 #include "xace.h"
 

xkb/xkb.c

@@ -31,6 +31,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XKMformat.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "inputstr.h"
 #include <xkbsrv.h>
@@ -40,8 +45,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "xkb-procs.h"
 #include "protocol-versions.h"
 
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XKMformat.h>
 
 int XkbEventBase;
 static int XkbErrorBase;