--- ./xserver/hw/xwin/save_winclipboard.h	2005-04-20 13:25:42.000000000 +0100
+++ ./xserver/hw/xwin/winclipboard.h	2007-05-24 20:29:15.000000000 +0100
@@ -38,7 +38,7 @@
 #ifdef __CYGWIN__
 #include <sys/select.h>
 #else
-#include "Xwinsock.h"
+#include <X11/Xwinsock.h>
 #define HAS_WINSOCK
 #endif
 #include <fcntl.h>
@@ -53,8 +53,8 @@
  * are usually bad, so someone should investigate this.
  */
 #include <X11/Xproto.h>
-#include "X11/Xutil.h"
-#include "X11/Xlocale.h"
+#include <X11/Xutil.h>
+#include <X11/Xlocale.h>
 
 /* Fixups to prevent collisions between Windows and X headers */
 #define ATOM			DWORD
--- ./xserver/hw/xwin/save_winmultiwindowwindow.c	2005-08-07 15:17:37.000000000 +0100
+++ ./xserver/hw/xwin/winmultiwindowwindow.c	2005-08-07 15:19:06.000000000 +0100
@@ -66,7 +66,7 @@
  * Constant defines
  */
 
-#define MOUSE_POLLING_INTERVAL		500
+#define MOUSE_POLLING_INTERVAL		10
 
 
 /*
@@ -275,7 +275,6 @@
 {
   Bool			fResult = TRUE;
   ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
@@ -370,7 +369,6 @@
 winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent)
 {
   ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
@@ -394,12 +392,13 @@
 void
 winRestackWindowMultiWindow (WindowPtr pWin, WindowPtr pOldNextSib)
 {
+#if 0
   WindowPtr		pPrevWin;
   UINT			uFlags;
   HWND			hInsertAfter;
   HWND                  hWnd = NULL;
+#endif
   ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
@@ -856,7 +855,7 @@
   ErrorF ("winMinimizeWindow\n");
 #endif
 
-  pWin = LookupIDByType (id, RT_WINDOW);
+  pWin = (WindowPtr) LookupIDByType (id, RT_WINDOW);
   if (!pWin) 
   { 
       ErrorF("%s: NULL pWin. Leaving\n", __FUNCTION__); 
@@ -894,7 +893,6 @@
 			  RegionPtr oldRegion)
 {
   ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
 #if CYGWINDOWING_DEBUG
@@ -914,7 +912,6 @@
 			  WindowPtr pSib, VTKind kind)
 {
   ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
 #if CYGWINDOWING_DEBUG
@@ -935,7 +932,6 @@
 			    unsigned int h, WindowPtr pSib)
 {
   ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
 #if CYGWINDOWING_DEBUG
--- ./xserver/hw/xwin/save_winwin32rootlesswndproc.c	2007-05-11 11:07:53.000000000 +0100
+++ ./xserver/hw/xwin/winwin32rootlesswndproc.c	2007-05-24 21:39:46.000000000 +0100
@@ -35,7 +35,7 @@
 #include "win.h"
 #include <winuser.h>
 #define _WINDOWSWM_SERVER_
-#include "windowswmstr.h"
+#include <X11/extensions/windowswmstr.h>
 #include "dixevents.h"
 #include "propertyst.h"
 #include <X11/Xatom.h>
@@ -48,7 +48,7 @@
  * Constant defines
  */
 
-#define MOUSE_POLLING_INTERVAL		500
+#define MOUSE_POLLING_INTERVAL		10
 #define MOUSE_ACTIVATE_DEFAULT		TRUE
 #define RAISE_ON_CLICK_DEFAULT		FALSE
 
--- ./xserver/hw/xwin/save_winwindowswm.c	2006-12-16 08:54:26.000000000 +0000
+++ ./xserver/hw/xwin/winwindowswm.c	2007-05-24 21:45:20.000000000 +0100
@@ -42,7 +42,7 @@
 #include "servermd.h"
 #include "swaprep.h"
 #define _WINDOWSWM_SERVER_
-#include "windowswmstr.h"
+#include <X11/extensions/windowswmstr.h>
 
 static int WMErrorBase;
 
--- ./xserver/hw/xwin/save_winmultiwindowshape.c	2005-08-06 18:10:02.000000000 +0100
+++ ./xserver/hw/xwin/winmultiwindowshape.c	2005-08-06 18:07:59.000000000 +0100
@@ -45,7 +45,6 @@
 winSetShapeMultiWindow (WindowPtr pWin)
 {
   ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
--- ./xserver/hw/xwin/save_winwin32rootless.c	2005-07-04 23:10:43.000000000 +0100
+++ ./xserver/hw/xwin/winwin32rootless.c	2007-05-24 21:46:26.000000000 +0100
@@ -38,7 +38,7 @@
 #include "win.h"
 #include <winuser.h>
 #define _WINDOWSWM_SERVER_
-#include "windowswmstr.h"
+#include <X11/extensions/windowswmstr.h>
 #include "dixevents.h"
 #include "winmultiwindowclass.h"
 #include "winprefs.h"
@@ -49,11 +49,17 @@
  * Constant defines
  */
 
-#define MOUSE_POLLING_INTERVAL		500
+#define MOUSE_POLLING_INTERVAL		10
 
+#ifndef ULW_COLORKEY
 #define ULW_COLORKEY	0x00000001
+#endif
+#ifndef ULW_ALPHA
 #define ULW_ALPHA	0x00000002
+#endif
+#ifndef ULW_OPAQUE
 #define ULW_OPAQUE	0x00000004
+#endif
 #define AC_SRC_ALPHA	0x01
 
 /*
--- ./xserver/hw/xwin/save_winwindow.c	2005-08-05 09:40:33.000000000 +0100
+++ ./xserver/hw/xwin/winwindow.c	2005-08-05 09:41:09.000000000 +0100
@@ -352,7 +352,6 @@
 {
   Bool			fResult = FALSE;
   ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
 
@@ -378,7 +377,6 @@
 {
   Bool			fResult = FALSE;
   ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
 #if CYGDEBUG
@@ -436,7 +434,6 @@
 {
   Bool			fResult = FALSE;
   ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
 #if CYGDEBUG
@@ -462,7 +459,6 @@
 winSetShapeRootless (WindowPtr pWin)
 {
   ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
 #if CYGDEBUG