Prepare Xdmx and Xvfb for modularization by adding appropriate #include

<{dix,dmx}-config.h> to the source files.

hw/dmx/config/dmxcompat.c

@@ -39,6 +39,10 @@
  * This file is not used by the DMX server.
  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmxconfig.h"
 #include "dmxparse.h"
 #include "dmxcompat.h"

hw/dmx/config/dmxconfig.c

@@ -37,6 +37,10 @@
  * combining that information with command-line configuration parameters. */
     
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxinput.h"
 #include "dmxconfig.h"

hw/dmx/config/dmxparse.c

@@ -41,6 +41,10 @@
  * used in a stand-alone fashion (i.e., independent from the DMX server
  * source tree), no dependencies on other DMX routines are made. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

hw/dmx/config/dmxprint.c

@@ -41,6 +41,10 @@
  * used in a stand-alone fashion (i.e., independent from the DMX server
  * source tree), no dependencies on other DMX routines are made. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmxconfig.h"
 #include "dmxparse.h"
 #include "dmxprint.h"

hw/dmx/config/parser.y

@@ -33,6 +33,10 @@
  */
 
 %{
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmxparse.h"
 #include <string.h>
 #include <stdlib.h>

hw/dmx/config/scanner.l

@@ -33,6 +33,10 @@
  */
 
 %{
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmxparse.h"
 #include "parser.h"
 #include <string.h>

hw/dmx/dmx_glxvisuals.c

@@ -33,6 +33,10 @@
 **
 */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include <GL/glx.h>
 #include <GL/glxproto.h>

hw/dmx/dmxcb.c

@@ -35,6 +35,10 @@
 /** \file
  * This code queries and modifies the connection block. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxcb.h"
 #include "dmxinput.h"

hw/dmx/dmxclient.h

@@ -141,7 +141,9 @@ extern int ChangeDeviceNotify;
 #include <X11/XKBlib.h>
 #ifdef XKB
 #include <X11/extensions/XKBproto.h>
+#ifndef XKB_IN_SERVER
 #define XKB_IN_SERVER
+#endif
 #include <X11/extensions/XKBsrv.h>
 #undef XPointer
 #endif

hw/dmx/dmxcmap.c

@@ -35,6 +35,10 @@
 /** \file
  * Colormap support. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxsync.h"
 #include "dmxcmap.h"

hw/dmx/dmxcursor.c

@@ -73,6 +73,10 @@
  * maintainability for efficiency does not seem justified in this case.
  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #define DMX_CURSOR_DEBUG 0
 
 #include "dmx.h"

hw/dmx/dmxdpms.c

@@ -40,6 +40,10 @@
  * (and restored at Xdmx server shutdown time).
  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxdpms.h"
 #include "dmxlog.h"

hw/dmx/dmxextension.c

@@ -38,6 +38,10 @@
  * in programs/Xserver/Xext.  Those programs should only include dmxext.h
  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxinit.h"
 #include "dmxextension.h"
@@ -57,8 +61,8 @@
 #include "input/dmxinputinit.h"
 
 #include "windowstr.h"
-#include "inputstr.h"           /* For DeviceIntRec */
-#include "dmxproto.h"           /* For DMX_BAD_* */
+#include "inputstr.h"                 /* For DeviceIntRec */
+#include <X11/extensions/dmxproto.h>  /* For DMX_BAD_* */
 #include "cursorstr.h"
 
 /* The default font is declared in dix/globals.c, but is not included in

hw/dmx/dmxfont.c

@@ -35,6 +35,10 @@
 /** \file
  * This file provides support for fonts. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #define DMX_FONTPATH_DEBUG 0
 
 #include "dmx.h"

hw/dmx/dmxgc.c

@@ -35,6 +35,10 @@
 /** \file
  * This file provides support for GCs. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxsync.h"
 #include "dmxgc.h"

hw/dmx/dmxgcops.c

@@ -35,6 +35,10 @@
 /** \file
  * This file provides support for GC operations. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxsync.h"
 #include "dmxgc.h"

hw/dmx/dmxinit.c

@@ -38,6 +38,10 @@
  * Provide expected functions for initialization from the ddx layer and
  * global variables for the DMX server. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxinit.h"
 #include "dmxsync.h"

hw/dmx/dmxinput.c

@@ -39,6 +39,10 @@
  * that arequired by the dix layer.
  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxlog.h"
 #include "dmxinput.h"

hw/dmx/dmxlog.c

@@ -36,6 +36,10 @@
  * This file encapsulated all of the logging functions that are used by
  * DMX for informational, warning, and error messages. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxlog.h"
 #include "dmxinput.h"

hw/dmx/dmxpict.c

@@ -36,6 +36,10 @@
  *  Provide support for the RENDER extension (version 0.8).
  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxsync.h"
 #include "dmxpict.h"

hw/dmx/dmxpixmap.c

@@ -35,6 +35,10 @@
 /** \file
  * Provides pixmap support. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxsync.h"
 #include "dmxpixmap.h"

hw/dmx/dmxprop.c

@@ -56,6 +56,10 @@
  *
  * The routines in this file handle the property management. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxprop.h"
 #include "dmxlog.h"

hw/dmx/dmxscrinit.c

@@ -36,6 +36,10 @@
 /** \file
  * This file provides support for screen initialization. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxsync.h"
 #include "dmxshadow.h"

hw/dmx/dmxshadow.c

@@ -33,6 +33,10 @@
  *
  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxsync.h"
 #include "dmxshadow.h"

hw/dmx/dmxstat.c

@@ -43,6 +43,10 @@
  * calls and monitoring their latency.  This functionality can be turned
  * on using the -stat command-line parameter. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxstat.h"
 #include "dmxlog.h"

hw/dmx/dmxsync.c

@@ -47,6 +47,10 @@
  * times faster, with 68 more than 50X faster, 114 more than 10X faster,
  * and 181 more than 2X faster. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxsync.h"
 #include "dmxstat.h"

hw/dmx/dmxvisual.c

@@ -35,6 +35,10 @@
 /** \file
  * This file provides support for visuals. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxvisual.h"
 

hw/dmx/dmxwindow.c

@@ -35,6 +35,10 @@
 /** \file
  * This file provides support for window-related functions. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxsync.h"
 #include "dmxwindow.h"

hw/dmx/input/ChkNotMaskEv.c

@@ -55,6 +55,10 @@
  * This file provides a #XCheckNotMaskEvent function that is derived
  * from the standard Xlib XCheckMaskEvent function. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #define NEED_EVENTS
 #include "dmx.h"
 #include "ChkNotMaskEv.h"

hw/dmx/input/dmxarg.c

@@ -35,6 +35,10 @@
 /** \file
  * Generic comma-delimited argument processing. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #define DMX_ARG_TEST 0
 
 #include "dmx.h"

hw/dmx/input/dmxbackend.c

@@ -37,6 +37,10 @@
  * These routines support taking input from devices on the backend
  * (output) displays.  \see dmxcommon.c. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #define DMX_BACKEND_DEBUG 0
 
 #include "dmxinputinit.h"
@@ -52,7 +56,7 @@
 
 #include "inputstr.h"
 #include "input.h"
-#include "keysym.h"
+#include <X11/keysym.h>
 #include "mipointer.h"
 #include "scrnintstr.h"
 #include "windowstr.h"

hw/dmx/input/dmxcommon.c

@@ -39,6 +39,10 @@
  * input devices.
  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #define DMX_STATE_DEBUG 0
 
 #include "dmxinputinit.h"
@@ -50,7 +54,7 @@
 
 #include "inputstr.h"
 #include "input.h"
-#include "keysym.h"
+#include <X11/keysym.h>
 #include "mipointer.h"
 #include "scrnintstr.h"
 

hw/dmx/input/dmxconsole.c

@@ -39,6 +39,10 @@
  * This file implements the console input devices.
  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #define DMX_CONSOLE_DEBUG 0
 #define DMX_WINDOW_DEBUG  0
 

hw/dmx/input/dmxdetach.c

@@ -35,6 +35,10 @@
 /** \file
  * Provide support and helper functions for input detach and attach. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmxinputinit.h"
 #include "dmxextension.h"       /* For dmxInputCount */
 

hw/dmx/input/dmxdummy.c

@@ -37,6 +37,10 @@
  * server, but that don't actually provide any events.  This is useful
  * for testing. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmx.h"
 #include "dmxinputinit.h"
 #include "dmxdummy.h"

hw/dmx/input/dmxeq.c

@@ -66,6 +66,10 @@
  * Consortium).  (Another example of similar code is provided in
  * hw/xfree86/common/xf86Xinput.c.) */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #define DMX_EQ_DEBUG 0
 
 #include "dmx.h"

hw/dmx/input/dmxevents.c

@@ -36,6 +36,10 @@
  * Provide support and helper functions for enqueing events received by
  * the low-level input drivers. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #define DMX_EVENTS_DEBUG 0
 
 #include "dmxinputinit.h"
@@ -48,7 +52,7 @@
 #include "dmxsigio.h"
 #include "dmxmap.h"
 
-#include "keysym.h"
+#include <X11/keysym.h>
 #include "opaque.h"
 #include "inputstr.h"
 #include "mipointer.h"

hw/dmx/input/dmxinputinit.c

@@ -37,6 +37,10 @@
  * input and lead to the calling of low-level device drivers for
  * input. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #define DMX_WINDOW_DEBUG 0
 
 #include "dmxinputinit.h"

hw/dmx/input/dmxmap.c

@@ -49,6 +49,10 @@
  * XI_Device* names for these routines.
  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "dmxinputinit.h"
 #include "dmxmap.h"
 

hw/dmx/input/dmxmotion.c

@@ -39,6 +39,10 @@
  * for motion buffers for extension devices, and are \a not compatible
  * replacements for the mi routines.  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "inputstr.h"
 #include "dmxinputinit.h"
 #include "dmxcommon.h"

hw/dmx/input/dmxsigio.c

@@ -36,6 +36,10 @@
  *
  * Provides an interface for handling SIGIO signals for input devices. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "inputstr.h"
 #include "dmxinputinit.h"
 #include "dmxsigio.h"

hw/dmx/input/dmxxinput.c

@@ -37,6 +37,10 @@
  * This file implements support required by the XINPUT extension.
  */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #define	 NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>

hw/dmx/input/lnx-keyboard.c

@@ -123,6 +123,10 @@
  * Zborowski, and David Dawes (see the source code for complete
  * references). */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 /*****************************************************************************/
 /* Define some macros to make it easier to move this file to another
  * part of the Xserver tree.  All calls to the dmx* layer are #defined

hw/dmx/input/lnx-ms.c

@@ -69,6 +69,10 @@
  * The code is derived from code by Juliusz Chroboczek and Keith Packard
  * (see the source code for complete references). */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "inputstr.h"
 #include <X11/Xos.h>
 #include <errno.h>

hw/dmx/input/lnx-ps2.c

@@ -66,6 +66,10 @@
  * The code is derived from code by Keith Packard (see the source code
  * for complete references). */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "inputstr.h"
 #include <X11/Xos.h>
 #include <errno.h>

hw/dmx/input/usb-common.c

@@ -37,6 +37,10 @@
  * Routines that are common between #usb-keyboard.c, #usb-mouse.c, and
  * #usb-other.c */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "usb-private.h"
 
 #define USB_COMMON_DEBUG 1

hw/dmx/input/usb-keyboard.c

@@ -72,6 +72,10 @@
  * under Linux.  The keymap description is derived from code by Thomas
  * Roell, Orest Zborowski. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "atKeynames.h"
 #include "usb-private.h"
 

hw/dmx/input/usb-mouse.c

@@ -36,6 +36,10 @@
  *
  * This code implements a low-level device driver for a USB mouse. */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "usb-private.h"
 
 /*****************************************************************************/

hw/dmx/input/usb-other.c

@@ -37,6 +37,10 @@
  * This code implements a low-level device driver for a non-keyboard,
  * non-mouse USB device (e.g., a joystick or gamepad). */
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "usb-private.h"
 
 /*****************************************************************************/

hw/vfb/InitInput.c

@@ -28,6 +28,10 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.9 2001/12/14 19:59:45 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #define NEED_EVENTS
 #include "mi.h"
@@ -38,7 +42,7 @@ from The Open Group.
 #include "mibstore.h"
 #include "mipointer.h"
 #include "lk201kbd.h"
-#include "keysym.h"
+#include <X11/keysym.h>
 
 Bool
 LegalModifier(unsigned int key, DevicePtr pDev)

hw/vfb/InitOutput.c

@@ -28,6 +28,10 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.25 2003/11/15 04:01:56 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #if defined(WIN32)
 #include <X11/Xwinsock.h>
 #endif

mi/miinitext.c

@@ -52,6 +52,10 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
 #include "misc.h"
 #include "extension.h"
 #include "micmap.h"