Include xwin-config.h if HAVE_XWIN_CONFIG is defined Cleanup X11 includes

    handling Warning fixes

69 files changed, 258 insertions, 15 deletions

diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index 993313fa0..b9f521cb3 100644
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-05  Alexander Gottwald  <ago at freedesktop dot org>
+
+	* *.c:
+	Include xwin-config.h if HAVE_XWIN_CONFIG is defined
+	Cleanup X11 includes handling
+	Warning fixes
+	
 2005-06-30  Alexander Gottwald  <ago at freedesktop dot org>
 
 	* winmultiwindowwndproc.c:
diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index e2277e45f..8b72416ab 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -28,6 +28,9 @@
 */
 /* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.11 2002/07/05 09:19:25 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #ifdef XWIN_CLIPBOARD
 # include "../../Xext/xf86miscproc.h"
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 69bdbdc6a..ffa3e8596 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -28,6 +28,9 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.34 2003/10/02 13:30:09 eich Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 #include "winconfig.h"
@@ -35,6 +38,9 @@ from The Open Group.
 #ifdef XWIN_CLIPBOARD
 #include "X11/Xlocale.h"
 #endif
+#ifdef DPMSExtension
+#include "dpmsproc.h"
+#endif
 #ifdef __CYGWIN__
 #include <mntent.h>
 #endif
@@ -123,7 +129,6 @@ winLogVersionInfo (void);
 Bool
 winValidateArgs (void);
 
-
 /*
  * For the depth 24 pixmap we default to 32 bits per pixel, but
  * we change this pixmap format later if we detect that the display
@@ -285,7 +290,7 @@ AbortDDX (void)
 
 #ifdef __CYGWIN__
 /* hasmntopt is currently not implemented for cygwin */
-const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)
+static const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)
 {
     const char *s;
     size_t len;
@@ -305,7 +310,7 @@ const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)
     return NULL;
 }
 
-void
+static void
 winCheckMount(void)
 {
   FILE *mnt;
@@ -367,13 +372,14 @@ winCheckMount(void)
    winMsg(X_WARNING, "/tmp mounted int textmode\n"); 
 }
 #else
-void
+static void
 winCheckMount(void) 
 {
 }
 #endif
 
-const char * 
+#ifdef RELOCATE_PROJECTROOT
+static const char * 
 winGetBaseDir(void)
 {
     static BOOL inited = FALSE;
@@ -400,6 +406,7 @@ winGetBaseDir(void)
     }
     return buffer;
 }
+#endif
 
 static void
 winFixupPaths (void)
@@ -749,7 +756,7 @@ OsVendorInit (void)
 }
 
 
-void
+static void
 winUseMsg (void)
 {
   ErrorF ("-depth bits_per_pixel\n"
@@ -1141,3 +1148,20 @@ winCheckDisplayNumber ()
 
   return TRUE;
 }
+
+#ifdef DPMSExtension
+Bool DPMSSupported(void)
+{
+  return FALSE;
+}
+
+void DPMSSet(int level)
+{
+  return;
+}
+
+int DPMSGet(int *plevel)
+{
+  return 0;
+}
+#endif
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index eb97a78e9..9baee9b05 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -963,10 +963,10 @@ winSendKeyEvent (DWORD dwKey, Bool fDown);
  */
 
 Bool
-winInstallKeyboardHookLL ();
+winInstallKeyboardHookLL (void);
 
 void
-winRemoveKeyboardHookLL ();
+winRemoveKeyboardHookLL (void);
 
 
 /*
diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c
index 2c85645c7..7b4814b9b 100644
--- a/hw/xwin/winallpriv.c
+++ b/hw/xwin/winallpriv.c
@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.11 2002/10/17 08:18:21 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winauth.c b/hw/xwin/winauth.c
index 596c08eb4..3d24ef426 100644
--- a/hw/xwin/winauth.c
+++ b/hw/xwin/winauth.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #if defined(XCSECURITY)
 /*
  *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.
diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c
index 1d21faf46..abea60e0f 100644
--- a/hw/xwin/winblock.c
+++ b/hw/xwin/winblock.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 
diff --git a/hw/xwin/winclip.c b/hw/xwin/winclip.c
index f7de6265f..aab7d632d 100644
--- a/hw/xwin/winclip.c
+++ b/hw/xwin/winclip.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 /* Look at mfb/mfbclip.c for sample implementation */
diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c
index 01a56cdf0..6a0cbaf2c 100644
--- a/hw/xwin/winclipboardinit.c
+++ b/hw/xwin/winclipboardinit.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "dixstruct.h"
 #include "winclipboard.h"
 
diff --git a/hw/xwin/winclipboardtextconv.c b/hw/xwin/winclipboardtextconv.c
index c657428f8..fd2e696c3 100644
--- a/hw/xwin/winclipboardtextconv.c
+++ b/hw/xwin/winclipboardtextconv.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c
index a1f73ed82..081abd5e7 100644
--- a/hw/xwin/winclipboardthread.c
+++ b/hw/xwin/winclipboardthread.c
@@ -28,6 +28,10 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include <sys/types.h>
 #include "winclipboard.h"
 #ifdef __CYGWIN__
 #include <errno.h>
diff --git a/hw/xwin/winclipboardunicode.c b/hw/xwin/winclipboardunicode.c
index 48a10fdba..ba86915a4 100644
--- a/hw/xwin/winclipboardunicode.c
+++ b/hw/xwin/winclipboardunicode.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "winclipboard.h"
 
 
diff --git a/hw/xwin/winclipboardwndproc.c b/hw/xwin/winclipboardwndproc.c
index 249f64b59..a006b46d3 100644
--- a/hw/xwin/winclipboardwndproc.c
+++ b/hw/xwin/winclipboardwndproc.c
@@ -28,6 +28,11 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include <sys/types.h>
+#include <sys/time.h>
 #include "winclipboard.h"
 
 
diff --git a/hw/xwin/winclipboardwrappers.c b/hw/xwin/winclipboardwrappers.c
index c990e7ec7..8801f6c42 100755
--- a/hw/xwin/winclipboardwrappers.c
+++ b/hw/xwin/winclipboardwrappers.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "dixstruct.h"
 #include <X11/Xatom.h>
diff --git a/hw/xwin/winclipboardxevents.c b/hw/xwin/winclipboardxevents.c
index 6a6d8ad2e..d4c617bec 100644
--- a/hw/xwin/winclipboardxevents.c
+++ b/hw/xwin/winclipboardxevents.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "winclipboard.h"
 
 
diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c
index 3dd5b9d3f..b3b99b1b5 100644
--- a/hw/xwin/wincmap.c
+++ b/hw/xwin/wincmap.c
@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.9 2002/07/05 09:19:26 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c
index 1764dd3d5..917ce08c0 100644
--- a/hw/xwin/winconfig.c
+++ b/hw/xwin/winconfig.c
@@ -29,13 +29,18 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winconfig.h"
 #include "winmsg.h"
 #include "globals.h"
 
 #ifdef XKB
+#ifndef XKB_IN_SERVER
 #define XKB_IN_SERVER
+#endif
 #include <X11/extensions/XKBsrv.h>
 #endif
 
diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c
index 613111d1c..7c93e4063 100644
--- a/hw/xwin/wincreatewnd.c
+++ b/hw/xwin/wincreatewnd.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "shellapi.h"
 
diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c
index 40ffe7364..5a619922a 100644
--- a/hw/xwin/wincursor.c
+++ b/hw/xwin/wincursor.c
@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.5 2002/07/05 09:19:26 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 #include <cursorstr.h>
diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c
index 676b2dfd7..ab06b0d00 100755
--- a/hw/xwin/windialogs.c
+++ b/hw/xwin/windialogs.c
@@ -29,6 +29,9 @@
  *              Earle F. Philhower III
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #ifdef __CYGWIN__
 #include <sys/cygwin.h>
diff --git a/hw/xwin/winengine.c b/hw/xwin/winengine.c
index c7eb1285b..f0bc671e2 100644
--- a/hw/xwin/winengine.c
+++ b/hw/xwin/winengine.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 
diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c
index 696142ed2..7d292134f 100644
--- a/hw/xwin/winerror.c
+++ b/hw/xwin/winerror.c
@@ -28,6 +28,15 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#ifdef XVENDORNAME
+#define VENDOR_STRING XVENDORNAME
+#define VERSION_STRING XORG_RELEASE
+#define VENDOR_CONTACT BUILDERADDR
+#endif
+
 #include "win.h"
 
 /* References to external symbols */
diff --git a/hw/xwin/winfillsp.c b/hw/xwin/winfillsp.c
index b0633fa7a..43ccde67c 100644
--- a/hw/xwin/winfillsp.c
+++ b/hw/xwin/winfillsp.c
@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.9 2001/11/01 12:19:40 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winfont.c b/hw/xwin/winfont.c
index 64c6cd233..af3e90da5 100644
--- a/hw/xwin/winfont.c
+++ b/hw/xwin/winfont.c
@@ -28,8 +28,12 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
+#ifdef XWIN_NATIVEGDI
 /* See Porting Layer Definition - p. 32 */
 /* See mfb/mfbfont.c - mfbRealizeFont() - which is empty :) */
 Bool
@@ -73,3 +77,4 @@ winUnrealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont)
 #endif
   return TRUE;
 }
+#endif
diff --git a/hw/xwin/wingc.c b/hw/xwin/wingc.c
index e664da1bc..3f661d520 100644
--- a/hw/xwin/wingc.c
+++ b/hw/xwin/wingc.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 void
@@ -230,7 +233,6 @@ winDestroyGCNativeGDI (GCPtr pGC)
   winSetGCPriv (pGC, NULL);
 }
 
-
 #if 0
 /* See Porting Layer Definition - p. 46 */
 static void
diff --git a/hw/xwin/wingetsp.c b/hw/xwin/wingetsp.c
index 79dc5eb53..ec9d51a17 100644
--- a/hw/xwin/wingetsp.c
+++ b/hw/xwin/wingetsp.c
@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.7 2001/11/01 12:19:40 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 /* See Porting Layer Definition - p. 55 */
diff --git a/hw/xwin/winglobals.c b/hw/xwin/winglobals.c
index 53fc02fa5..af8190d3f 100644
--- a/hw/xwin/winglobals.c
+++ b/hw/xwin/winglobals.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c
index bdd48c83f..4b87340bc 100644
--- a/hw/xwin/winkeybd.c
+++ b/hw/xwin/winkeybd.c
@@ -33,13 +33,18 @@
 /* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.12 2002/10/17 08:18:22 alanh Exp $ */
 
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winkeybd.h"
 #include "winconfig.h"
 #include "winmsg.h"
 
 #ifdef XKB
+#ifndef XKB_IN_SERVER
 #define XKB_IN_SERVER
+#endif
 #include <X11/extensions/XKBsrv.h>
 #endif
 
diff --git a/hw/xwin/winkeyhook.c b/hw/xwin/winkeyhook.c
index cd54af23b..53d91e6ee 100755
--- a/hw/xwin/winkeyhook.c
+++ b/hw/xwin/winkeyhook.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winkeynames.h b/hw/xwin/winkeynames.h
index ed075dea5..f3af1907e 100755
--- a/hw/xwin/winkeynames.h
+++ b/hw/xwin/winkeynames.h
@@ -27,7 +27,7 @@
 
 #define XK_TECHNICAL
 #define	XK_KATAKANA
-#include "keysym.h"
+#include <X11/keysym.h>
 
 #define GLYPHS_PER_KEY	4
 #define NUM_KEYCODES	248
diff --git a/hw/xwin/winmisc.c b/hw/xwin/winmisc.c
index a116043a8..8e6698118 100644
--- a/hw/xwin/winmisc.c
+++ b/hw/xwin/winmisc.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 #ifdef XWIN_NATIVEGDI
diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c
index 93b38acd4..818652da6 100644
--- a/hw/xwin/winmouse.c
+++ b/hw/xwin/winmouse.c
@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.3 2001/05/08 08:14:09 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 #if defined(XFree86Server) && defined(XINPUT)
diff --git a/hw/xwin/winms.h b/hw/xwin/winms.h
index f3efecd5d..1ad30dc0b 100644
--- a/hw/xwin/winms.h
+++ b/hw/xwin/winms.h
@@ -36,7 +36,7 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-#include <Xwindows.h>
+#include <X11/Xwindows.h>
 #include <windowsx.h>
 
 #include "ddraw.h"
diff --git a/hw/xwin/winmsg.c b/hw/xwin/winmsg.c
index 8b62d861d..53974101e 100644
--- a/hw/xwin/winmsg.c
+++ b/hw/xwin/winmsg.c
@@ -29,6 +29,9 @@
  */
 /* $XFree86$ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 #if CYGDEBUG
diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c
index 96dc26f0e..d8909f0e5 100755
--- a/hw/xwin/winmultiwindowclass.c
+++ b/hw/xwin/winmultiwindowclass.c
@@ -29,6 +29,9 @@
  */
 /* $XFree86$ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include <X11/Xatom.h>
 #include "propertyst.h"
 #include "windowstr.h"
diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c
index e57755f35..2121e998f 100755
--- a/hw/xwin/winmultiwindowicons.c
+++ b/hw/xwin/winmultiwindowicons.c
@@ -29,6 +29,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "dixevents.h"
 #include "winmultiwindowclass.h"
diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c
index e2996a81e..7cb6a2cb9 100755
--- a/hw/xwin/winmultiwindowshape.c
+++ b/hw/xwin/winmultiwindowshape.c
@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #ifdef SHAPE
 
 #include "win.h"
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index b6df0f863..f1ab55252 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -31,6 +31,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "dixevents.h"
 #include "winmultiwindowclass.h"
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index 4fbedd00a..217603dc9 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -30,6 +30,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */
 
 /* X headers */
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -63,7 +66,9 @@
 #include "objbase.h"
 #include "ddraw.h"
 #include "winwindow.h"
+#ifdef XWIN_MULTIWINDOWEXTWM
 #include "windowswmstr.h"
+#endif
 
 extern void winDebug(const char *format, ...);
 
@@ -1236,9 +1241,11 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
   pWMInfo->atmWmDelete = XInternAtom (pWMInfo->pDisplay,
 				      "WM_DELETE_WINDOW",
 				      False);
+#ifdef WIN_MULTIWINDOWEXTWM
   pWMInfo->atmPrivMap  = XInternAtom (pWMInfo->pDisplay,
 				      WINDOWSWM_NATIVE_HWND,
 				      False);
+#endif
 
 
   if (1) {
diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index b4f53dc2e..59f562cb3 100755
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -31,6 +31,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "dixevents.h"
 #include "winmultiwindowclass.h"
diff --git a/hw/xwin/winnativegdi.c b/hw/xwin/winnativegdi.c
index dbee9d285..c67f1c7e5 100644
--- a/hw/xwin/winnativegdi.c
+++ b/hw/xwin/winnativegdi.c
@@ -29,6 +29,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.14 2003/07/29 21:25:18 dawes Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winpfbdd.c b/hw/xwin/winpfbdd.c
index 9a34cfb33..d9d69039d 100644
--- a/hw/xwin/winpfbdd.c
+++ b/hw/xwin/winpfbdd.c
@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.17 2002/10/17 08:18:22 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c
index e1fa34f0c..2780a3921 100644
--- a/hw/xwin/winpixmap.c
+++ b/hw/xwin/winpixmap.c
@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.10 2002/10/17 08:18:24 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winpntwin.c b/hw/xwin/winpntwin.c
index 034ac9362..caee712c9 100644
--- a/hw/xwin/winpntwin.c
+++ b/hw/xwin/winpntwin.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 /* See Porting Layer Definition - p. 39
diff --git a/hw/xwin/winpolyline.c b/hw/xwin/winpolyline.c
index c94ba06c5..db9dd345b 100644
--- a/hw/xwin/winpolyline.c
+++ b/hw/xwin/winpolyline.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 /* See Porting Layer Definition - p. 50 */
diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
index 35a1a9fa5..bbe04bd7b 100644
--- a/hw/xwin/winprefs.c
+++ b/hw/xwin/winprefs.c
@@ -29,6 +29,9 @@
  */
 /* $XFree86: $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef __CYGWIN__
@@ -36,7 +39,7 @@
 #endif
 #include "win.h"
 
-#include <Xwindows.h>
+#include <X11/Xwindows.h>
 #include <shellapi.h>
 
 #include "winprefs.h"
diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h
index 5230b16e0..2e58e5e9d 100644
--- a/hw/xwin/winprefs.h
+++ b/hw/xwin/winprefs.h
@@ -39,7 +39,7 @@
 /* Need to know how long paths can be... */
 #include <limits.h>
 /* Xwindows redefines PATH_MAX to at least 1024 */
-#include <Xwindows.h>
+#include <X11/Xwindows.h>
 
 #ifndef NAME_MAX
 #define NAME_MAX PATH_MAX
diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y
index debfe0c01..2a54ff28f 100644
--- a/hw/xwin/winprefsyacc.y
+++ b/hw/xwin/winprefsyacc.y
@@ -30,6 +30,9 @@
  */
 /* $XFree86: $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/hw/xwin/winpriv.c b/hw/xwin/winpriv.c
index 20b0840f8..29221cf2b 100644
--- a/hw/xwin/winpriv.c
+++ b/hw/xwin/winpriv.c
@@ -4,6 +4,9 @@
  * Authors: Alexander Gottwald
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winpriv.h"
 #include "winwindow.h"
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index 9bd51fa6b..bd0b99977 100755
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -26,6 +26,14 @@ from The Open Group.
 
 */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#ifdef XVENDORNAME
+#define VENDOR_STRING XVENDORNAME
+#define VERSION_STRING XORG_RELEASE
+#define VENDOR_CONTACT BUILDERADDR
+#endif
 #include "win.h"
 #include "winconfig.h"
 #include "winprefs.h"
@@ -72,7 +80,7 @@ ENUMDISPLAYMONITORSPROC _EnumDisplayMonitors;
 
 wBOOL CALLBACK getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data);
 
-Bool QueryMonitor(int index, struct GetMonitorInfoData *data)
+static Bool QueryMonitor(int index, struct GetMonitorInfoData *data)
 {
     /* Load EnumDisplayMonitors from DLL */
     HMODULE user32;
diff --git a/hw/xwin/winpushpxl.c b/hw/xwin/winpushpxl.c
index e73cecbd2..594933986 100644
--- a/hw/xwin/winpushpxl.c
+++ b/hw/xwin/winpushpxl.c
@@ -45,6 +45,9 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include <X11/X.h>
 #include "gcstruct.h"
 #include "scrnintstr.h"
diff --git a/hw/xwin/winrandr.c b/hw/xwin/winrandr.c
index 590b3f40c..7b5b1359c 100755
--- a/hw/xwin/winrandr.c
+++ b/hw/xwin/winrandr.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winregistry.c b/hw/xwin/winregistry.c
index a39428d3e..3571b14d7 100644
--- a/hw/xwin/winregistry.c
+++ b/hw/xwin/winregistry.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 /* Prototypes */
diff --git a/hw/xwin/winrop.c b/hw/xwin/winrop.c
index ca78ee72e..110292989 100644
--- a/hw/xwin/winrop.c
+++ b/hw/xwin/winrop.c
@@ -32,6 +32,9 @@
 /*
  * Raster operations used by Windows translated to X's 16 rop codes...
  */
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 void
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index f97539b6f..d5117513e 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -33,6 +33,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.27 2003/07/29 21:25:18 dawes Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 #include "safeAlpha.h"	
diff --git a/hw/xwin/winsetsp.c b/hw/xwin/winsetsp.c
index e41d794c5..65b90ea39 100644
--- a/hw/xwin/winsetsp.c
+++ b/hw/xwin/winsetsp.c
@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.7 2001/11/01 12:19:42 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c
index fce0c2b06..607a0674a 100644
--- a/hw/xwin/winshaddd.c
+++ b/hw/xwin/winshaddd.c
@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.22 2002/10/17 08:18:24 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c
index 17b78fec5..960cd2d70 100644
--- a/hw/xwin/winshadddnl.c
+++ b/hw/xwin/winshadddnl.c
@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c
index 0f56538ed..ba9819298 100644
--- a/hw/xwin/winshadgdi.c
+++ b/hw/xwin/winshadgdi.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c
index 538510291..bf7305c9c 100755
--- a/hw/xwin/wintrayicon.c
+++ b/hw/xwin/wintrayicon.c
@@ -30,6 +30,9 @@
  */
 /* $XFree86: $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include <shellapi.h>
 #include "winprefs.h"
@@ -111,7 +114,7 @@ winHandleIconMessage (HWND hwnd, UINT message,
 		      WPARAM wParam, LPARAM lParam,
 		      winPrivScreenPtr pScreenPriv)
 {
-#ifdef XWIN_MULTIWINDOWEXTWM
+#if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_MULTIWINDOW)
   winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
 #endif
 
diff --git a/hw/xwin/winvalargs.c b/hw/xwin/winvalargs.c
index 0932644bb..038e097a5 100755
--- a/hw/xwin/winvalargs.c
+++ b/hw/xwin/winvalargs.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winmsg.h"
 
diff --git a/hw/xwin/winvideo.c b/hw/xwin/winvideo.c
index 4e1b65979..529ca76d3 100755
--- a/hw/xwin/winvideo.c
+++ b/hw/xwin/winvideo.c
@@ -28,6 +28,9 @@
  * Authors:	Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvproto.h>
diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c
index 0411d7c1a..c0200ab53 100644
--- a/hw/xwin/winwakeup.c
+++ b/hw/xwin/winwakeup.c
@@ -32,6 +32,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.6 2002/10/17 08:18:25 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c
index 1fa77b208..832e36d44 100755
--- a/hw/xwin/winwin32rootless.c
+++ b/hw/xwin/winwin32rootless.c
@@ -32,6 +32,9 @@
 /*
  * Look at hw/darwin/quartz/xpr/xprFrame.c and hw/darwin/quartz/cr/crFrame.c
  */
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include <winuser.h>
 #define _WINDOWSWM_SERVER_
diff --git a/hw/xwin/winwin32rootlesswindow.c b/hw/xwin/winwin32rootlesswindow.c
index 8c34343ce..693d5cd09 100755
--- a/hw/xwin/winwin32rootlesswindow.c
+++ b/hw/xwin/winwin32rootlesswindow.c
@@ -30,6 +30,9 @@
  *		Harold L Hunt II
  */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include "winprefs.h"
 
diff --git a/hw/xwin/winwin32rootlesswndproc.c b/hw/xwin/winwin32rootlesswndproc.c
index 4a59aef8c..ffa84938f 100755
--- a/hw/xwin/winwin32rootlesswndproc.c
+++ b/hw/xwin/winwin32rootlesswndproc.c
@@ -29,6 +29,9 @@
  *		Earle F. Philhower, III
  *		Harold L Hunt II
  */
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include <winuser.h>
 #define _WINDOWSWM_SERVER_
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index 8d3d6e525..be160196a 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.9 2003/11/10 18:22:44 tsi Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 
diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c
index a63c09210..81a161041 100755
--- a/hw/xwin/winwindowswm.c
+++ b/hw/xwin/winwindowswm.c
@@ -26,6 +26,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 
 #define NEED_REPLIES
diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c
index 771de0cb6..5d9fe14c9 100644
--- a/hw/xwin/winwndproc.c
+++ b/hw/xwin/winwndproc.c
@@ -33,6 +33,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */
 
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
 #include "win.h"
 #include <commctrl.h>
 #include "winprefs.h"