diff --git a/GL/windows/glwindows.h b/GL/windows/glwindows.h
index eff55ce51..ace7f711d 100644
--- a/GL/windows/glwindows.h
+++ b/GL/windows/glwindows.h
@@ -35,9 +35,12 @@ typedef struct {
 extern glWinDebugSettingsRec glWinDebugSettings;
 
 typedef struct {
+    /* from GetSystemMetrics */
     int sm_cx;
     int sm_cy;
+
     BOOL visible;
+    HCURSOR handle;
     QueryBestSizeProcPtr QueryBestSize;
     miPointerSpriteFuncPtr spriteFuncs;
 } glWinCursorRec;
@@ -60,5 +63,11 @@ extern glWinScreenRec glWinScreens[MAXSCREENS];
 #define glWinGetScreenPriv(pScreen)  &glWinScreens[pScreen->myNum]
 #define glWinScreenPriv(pScreen) glWinScreenRec *pScreenPriv = glWinGetScreenPriv(pScreen);
 
+#if 1
+#define GLWIN_DEBUG_MSG if (glWinDebugSettings.enableDebug) ErrorF
+#else
+#define GLWIN_DEBUG_MSG(a, ...)
+#endif
+
 extern Bool glWinInitCursor (ScreenPtr pScreen);
 
diff --git a/GL/windows/indirect.c b/GL/windows/indirect.c
index 08cb7b63b..dee3b6014 100755
--- a/GL/windows/indirect.c
+++ b/GL/windows/indirect.c
@@ -49,7 +49,7 @@
 /* ggs: needed to call back to glx with visual configs */
 extern void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs, void **configprivs);
 
-static glWinDebugSettingsRec glWinDebugSettings = { 1, 0, 0, 0};
+glWinDebugSettingsRec glWinDebugSettings = { 1, 0, 0, 0};
 
 static void glWinInitDebugSettings(void) 
 {
@@ -140,12 +140,6 @@ GLuint __glFloorLog2(GLuint val)
     return c;
 }
 
-#if 1
-#define GLWIN_DEBUG_MSG if (glWinDebugSettings.enableDebug) ErrorF
-#else
-#define GLWIN_DEBUG_MSG(a, ...)
-#endif
-
 /* some prototypes */
 static Bool glWinScreenProbe(int screen);
 static Bool glWinInitVisuals(VisualPtr *visualp, DepthPtr *depthp,