diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index 4f161e516..478ef8daa 100644
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-25  Alexander Gottwald  <ago at freedesktop dot org>
+
+	* win.h:
+	* winmultiwindowwm.c:
+	Workaround bug in pthread.h
+
 2005-05-08  Alexander Gottwald  <ago at freedesktop dot org>
 
 	* winmultiwindowwndproc.c:
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 8175081e5..eb97a78e9 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -141,8 +141,10 @@
 #include <stdio.h>
 
 #include <errno.h>
-#if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW) 
+#if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
+#define HANDLE void *
 #include <pthread.h>
+#undef HANDLE
 #endif
 
 #ifdef HAS_MMAP
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index 032835397..4fbedd00a 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -38,7 +38,9 @@
 #endif
 #include <fcntl.h>
 #include <setjmp.h>
+#define HANDLE void *
 #include <pthread.h>
+#undef HANDLE
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>