Index: lib/GL/glx/compsize.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/glx/compsize.c,v
retrieving revision 1.3
diff -u -r1.3 compsize.c
--- lib/GL/glx/compsize.c	16 Jun 2004 09:35:43 -0000	1.3
+++ lib/GL/glx/compsize.c	2 Feb 2005 14:59:06 -0000
@@ -34,6 +34,9 @@
 **
 */
 
+#ifdef WIN32
+#include <Xwindows.h>
+#endif
 #include <GL/gl.h>
 #include "glxclient.h"
 #include "size.h"
Index: programs/Xserver/GL/windows/glwrap.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/windows/glwrap.c,v
retrieving revision 1.3
diff -u -r1.3 glwrap.c
--- programs/Xserver/GL/windows/glwrap.c	27 Jan 2005 20:33:34 -0000	1.3
+++ programs/Xserver/GL/windows/glwrap.c	2 Feb 2005 14:59:06 -0000
@@ -5,15 +5,12 @@
  * Authors: Alexander Gottwald
  */
 
+#include <Xwindows.h>
 #include <GL/gl.h>
 #include <GL/glext.h>
 #include <glxserver.h>
 #include <glxext.h>
 
-#define WINDOWS_LEAN_AND_CLEAN
-#include <windows.h>
-
-
 #define RESOLVE_RET(procname, symbol, retval) \
     static Bool init = TRUE; \
     static procname proc = NULL; \
Index: programs/Xserver/GL/windows/glwindows.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/windows/glwindows.h,v
retrieving revision 1.3
diff -u -r1.3 glwindows.h
--- programs/Xserver/GL/windows/glwindows.h	13 Aug 2004 19:18:29 -0000	1.3
+++ programs/Xserver/GL/windows/glwindows.h	2 Feb 2005 14:59:06 -0000
@@ -1,3 +1,4 @@
+#include <Xwindows.h>
 #include <GL/gl.h>
 #include <GL/glext.h>
 
@@ -19,9 +20,6 @@
 #include <GL/internal/glcore.h>
 #include <stdlib.h>
 
-#define WINDOWS_LEAN_AND_CLEAN
-#include <windows.h>
-
 
 typedef struct {
     unsigned enableDebug : 1;