diff --git a/src/java/org/lwjgl/opengl/GLWindow.java b/src/java/org/lwjgl/opengl/GLWindow.java
index 657fe67a..6723e478 100644
--- a/src/java/org/lwjgl/opengl/GLWindow.java
+++ b/src/java/org/lwjgl/opengl/GLWindow.java
@@ -170,6 +170,16 @@ public class GLWindow extends Window {
 	public boolean OpenGL13;
 	public boolean OpenGL14;
 
+	/*
+	 * Available WGL extensions
+	 */
+	public boolean WGL_ARB_buffer_region;
+	public boolean WGL_ARB_extensions_string;
+	public boolean WGL_ARB_pbuffer;
+	public boolean WGL_ARB_pixel_format;
+	public boolean WGL_ARB_render_texture;
+	public boolean WGL_EXT_extensions_string;
+	public boolean WGL_EXT_swap_control;
 		
 	/**
 	 * Determine which extensions are available
@@ -229,17 +239,6 @@ public class GLWindow extends Window {
 		}
 	}
 
-	/*
-	 * Available WGL extensions
-	 */
-	public static boolean WGL_ARB_buffer_region;
-	public static boolean WGL_ARB_extensions_string;
-	public static boolean WGL_ARB_pbuffer;
-	public static boolean WGL_ARB_pixel_format;
-	public static boolean WGL_ARB_render_texture;
-	public static boolean WGL_EXT_extensions_string;
-	public static boolean WGL_EXT_swap_control;
-
 	/**
 	 * Checks and sets WGL_EXT_extensions_string and WGL_ARB_extensions_string
 	 * if available.
@@ -301,7 +300,6 @@ public class GLWindow extends Window {
 		}
 	}
 
-
 	static {
 		System.loadLibrary(Sys.getLibraryName());
 	}
diff --git a/src/java/org/lwjgl/test/input/HWCursorTest.java b/src/java/org/lwjgl/test/input/HWCursorTest.java
index 0d9d4ede..8ebf4388 100644
--- a/src/java/org/lwjgl/test/input/HWCursorTest.java
+++ b/src/java/org/lwjgl/test/input/HWCursorTest.java
@@ -343,7 +343,7 @@ public class HWCursorTest {
     GL.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
     //sync frame (only works on windows)
-    if (GLWindow.WGL_EXT_swap_control) {
+    if (gl.WGL_EXT_swap_control) {
       GL.wglSwapIntervalEXT(1);
     }
   }
diff --git a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
index 6f2e30fd..dd3a6bbf 100644
--- a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
+++ b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
@@ -321,7 +321,7 @@ public class FullScreenWindowedTest {
     GL.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
     //sync frame (only works on windows)
-    if (GLWindow.WGL_EXT_swap_control) {
+    if (gl.WGL_EXT_swap_control) {
       GL.wglSwapIntervalEXT(1);
     }
   }
diff --git a/src/java/org/lwjgl/test/opengl/PbufferTest.java b/src/java/org/lwjgl/test/opengl/PbufferTest.java
index f0740a71..10cc046b 100644
--- a/src/java/org/lwjgl/test/opengl/PbufferTest.java
+++ b/src/java/org/lwjgl/test/opengl/PbufferTest.java
@@ -392,7 +392,7 @@ public class PbufferTest {
    */
   private void glInit() {
     //sync frame (only works on windows)
-    if (GLWindow.WGL_EXT_swap_control) {
+    if (gl.WGL_EXT_swap_control) {
       GL.wglSwapIntervalEXT(1);
     }
     GL.glTexEnvf(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_MODE, GL.GL_REPLACE);