diff --git a/src/java/org/lwjgl/opengl/CoreGL12.java b/src/java/org/lwjgl/opengl/CoreGL12.java
index b582c563..9d6a92ec 100644
--- a/src/java/org/lwjgl/opengl/CoreGL12.java
+++ b/src/java/org/lwjgl/opengl/CoreGL12.java
@@ -32,11 +32,8 @@
 
 package org.lwjgl.opengl;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.IntBuffer;
 import java.nio.FloatBuffer;
-import java.nio.DoubleBuffer;
 import java.nio.Buffer;
 
 /**
diff --git a/src/java/org/lwjgl/opengl/CoreGL13.java b/src/java/org/lwjgl/opengl/CoreGL13.java
index 6df3483c..124f44af 100644
--- a/src/java/org/lwjgl/opengl/CoreGL13.java
+++ b/src/java/org/lwjgl/opengl/CoreGL13.java
@@ -32,9 +32,6 @@
 
 package org.lwjgl.opengl;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.IntBuffer;
 import java.nio.FloatBuffer;
 import java.nio.DoubleBuffer;
 import java.nio.Buffer;
diff --git a/src/java/org/lwjgl/opengl/CoreGL14.java b/src/java/org/lwjgl/opengl/CoreGL14.java
index 8d935f6c..1b93191c 100644
--- a/src/java/org/lwjgl/opengl/CoreGL14.java
+++ b/src/java/org/lwjgl/opengl/CoreGL14.java
@@ -32,11 +32,8 @@
 
 package org.lwjgl.opengl;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.IntBuffer;
 import java.nio.FloatBuffer;
-import java.nio.DoubleBuffer;
 import java.nio.Buffer;
 
 /**
diff --git a/src/java/org/lwjgl/test/WindowCreationTest.java b/src/java/org/lwjgl/test/WindowCreationTest.java
index 87f55b39..30e0ee7b 100644
--- a/src/java/org/lwjgl/test/WindowCreationTest.java
+++ b/src/java/org/lwjgl/test/WindowCreationTest.java
@@ -7,7 +7,6 @@
 package org.lwjgl.test;
 
 import org.lwjgl.*;
-import org.lwjgl.opengl.GL;
 import org.lwjgl.opengl.GLWindow;
 
 /**
diff --git a/src/java/org/lwjgl/test/input/HWCursorTest.java b/src/java/org/lwjgl/test/input/HWCursorTest.java
index 8ebf4388..0d9d4ede 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 (gl.WGL_EXT_swap_control) {
+    if (GLWindow.WGL_EXT_swap_control) {
       GL.wglSwapIntervalEXT(1);
     }
   }
diff --git a/src/java/org/lwjgl/test/openal/MovingSoundTest.java b/src/java/org/lwjgl/test/openal/MovingSoundTest.java
index e56d1b72..3e4ffa78 100644
--- a/src/java/org/lwjgl/test/openal/MovingSoundTest.java
+++ b/src/java/org/lwjgl/test/openal/MovingSoundTest.java
@@ -34,7 +34,6 @@ package org.lwjgl.test.openal;
 import org.lwjgl.openal.AL;
 import org.lwjgl.openal.eax.*;
 import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL;
 import org.lwjgl.opengl.GLWindow;
 
 import java.nio.IntBuffer;
diff --git a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
index dd3a6bbf..6f2e30fd 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 (gl.WGL_EXT_swap_control) {
+    if (GLWindow.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 10cc046b..f0740a71 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 (gl.WGL_EXT_swap_control) {
+    if (GLWindow.WGL_EXT_swap_control) {
       GL.wglSwapIntervalEXT(1);
     }
     GL.glTexEnvf(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_MODE, GL.GL_REPLACE);