Index: lib/Xext/XAppgroup.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xext/XAppgroup.c,v
--- lib/Xext/XAppgroup.c	24 Sep 2004 03:46:28 -0000	1.3
+++ lib/Xext/XAppgroup.c	18 Feb 2005 12:10:41 -0000
@@ -27,13 +27,7 @@
 /* $Xorg: XAppgroup.c,v 1.5 2001/02/09 02:03:49 xorgcvs Exp $ */
 
 #ifdef WIN32
-#define BOOL wBOOL
-#undef Status
-#define Status wStatus
-#include <windows.h>
-#undef Status
-#define Status int
-#undef BOOL
+#include <X11/Xwindows.h>
 #endif
 
 #define NEED_EVENTS
Index: lib/Xext/Xcup.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xext/Xcup.c,v
--- lib/Xext/Xcup.c	24 Sep 2004 03:46:28 -0000	1.3
+++ lib/Xext/Xcup.c	18 Feb 2005 12:10:41 -0000
@@ -27,13 +27,7 @@
 /* $Xorg: Xcup.c,v 1.5 2001/02/09 02:03:49 xorgcvs Exp $ */
 
 #ifdef WIN32
-#define BOOL wBOOL
-#undef Status
-#define Status wStatus
-#include <windows.h>
-#undef Status
-#define Status int
-#undef BOOL
+#include <X11/Xwindows.h>
 #endif
 
 #define NEED_EVENTS