diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index 84dc1d3ed..f4219adaa 100644
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-22  Alexander Gottwald  <ago at freedesktop dot org>
+
+	* winmultiwindowwm.c: 
+	Fixes for building multiwindow and internalwm on mingw
+	* winwin32rootless.c:
+	Changed some debugging output
+
 2004-11-22  Alexander Gottwald  <ago at freedesktop dot org>
 
 	* InitOutput.c, winglobals.c, winprocarg.c:
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index 608cf361c..1ac99f958 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -33,7 +33,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#ifdef __CYGWIN__
 #include <sys/select.h>
+#endif
 #include <fcntl.h>
 #include <setjmp.h>
 #include <pthread.h>
@@ -44,11 +46,8 @@
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 
-/* Fixups to prevent collisions between Windows and X headers */
-#define ATOM DWORD
-
 /* Windows headers */
-#include <windows.h>
+#include <Xwindows.h>
 
 /* Local headers */
 #include "obj_base.h"
diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c
index ce0c2f948..8c4c617c6 100755
--- a/hw/xwin/winwin32rootless.c
+++ b/hw/xwin/winwin32rootless.c
@@ -694,7 +694,7 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
   Bool			fReturn = TRUE;
   HDC			hdcNew;
   HBITMAP		hbmpNew;
-#if CYGMULTIWINDOW_DEBUG && FALSE
+#if CYGMULTIWINDOW_DEBUG
   winDebug ("winMWExtWMStartDrawing (%08x) %08x\n", (int) pRLWinPriv, pRLWinPriv->fDestroyed);
 #endif
 
@@ -704,7 +704,7 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
       if (pScreen) pScreenPriv = winGetScreenPriv(pScreen);
       if (pScreenPriv) pScreenInfo = pScreenPriv->pScreenInfo;
       
-#if CYGMULTIWINDOW_DEBUG && FALSE
+#if CYGMULTIWINDOW_DEBUG
       winDebug ("\tpScreenPriv %08X\n", (int) pScreenPriv);
       winDebug ("\tpScreenInfo %08X\n", (int) pScreenInfo);
       winDebug ("\t(%d, %d)\n", (int)pRLWinPriv->pFrame->width,
@@ -805,11 +805,12 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
 	  pRLWinPriv->hbmpShadow = hbmpNew;
 	  
 	  pRLWinPriv->fResized = FALSE;
-	}
 #if CYGMULTIWINDOW_DEBUG && FALSE
-      winDebug ("winMWExtWMStartDrawing - 0x%08x %d\n",
-		(unsigned int)pRLWinPriv->pfb, (unsigned int)dibsection.dsBm.bmWidthBytes);
+	  winDebug ("winMWExtWMStartDrawing - 0x%08x %d\n",
+		(unsigned int)pRLWinPriv->pfb, 
+		(unsigned int)dibsection.dsBm.bmWidthBytes);
 #endif
+	}
     }
   else
     {