diff --git a/src/java/org/lwjgl/test/WindowCreationTest.java b/src/java/org/lwjgl/test/WindowCreationTest.java
index 43308df7..16035e8a 100644
--- a/src/java/org/lwjgl/test/WindowCreationTest.java
+++ b/src/java/org/lwjgl/test/WindowCreationTest.java
@@ -31,7 +31,7 @@ public class WindowCreationTest {
     System.out.println("Display created");
 
     while(!Window.isCloseRequested()) {    
-      Window.update();
+      Window.updateState();
       try {
         Thread.sleep(100);
       } catch (Exception e) {
diff --git a/src/java/org/lwjgl/test/input/ControllerCreationTest.java b/src/java/org/lwjgl/test/input/ControllerCreationTest.java
index 5b34201d..fb44bbed 100644
--- a/src/java/org/lwjgl/test/input/ControllerCreationTest.java
+++ b/src/java/org/lwjgl/test/input/ControllerCreationTest.java
@@ -160,7 +160,7 @@ public class ControllerCreationTest {
 
     while (Sys.getTime() < endtime) {
 
-      Window.update();
+      Window.updateState();
       
       Controller.poll();
 
diff --git a/src/java/org/lwjgl/test/input/ControllerTest.java b/src/java/org/lwjgl/test/input/ControllerTest.java
index 42758274..6ce1d408 100644
--- a/src/java/org/lwjgl/test/input/ControllerTest.java
+++ b/src/java/org/lwjgl/test/input/ControllerTest.java
@@ -113,7 +113,7 @@ public class ControllerTest {
 
   private void wiggleController() {
     while (!Window.isCloseRequested()) {
-      Window.update();
+      Window.updateState();
       
       if(Window.isMinimized()) {
         try {
diff --git a/src/java/org/lwjgl/test/input/HWCursorTest.java b/src/java/org/lwjgl/test/input/HWCursorTest.java
index 23f5835c..58a67f33 100644
--- a/src/java/org/lwjgl/test/input/HWCursorTest.java
+++ b/src/java/org/lwjgl/test/input/HWCursorTest.java
@@ -149,7 +149,7 @@ public class HWCursorTest {
     while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)
       && !Window.isCloseRequested()) {
       // allow subsystem to get a chance to run too
-      Window.update();
+      Window.updateState();
 
       if (!Window.isMinimized()) {
         // check keyboard input
diff --git a/src/java/org/lwjgl/test/input/KeyboardTest.java b/src/java/org/lwjgl/test/input/KeyboardTest.java
index a085cfba..a066afee 100644
--- a/src/java/org/lwjgl/test/input/KeyboardTest.java
+++ b/src/java/org/lwjgl/test/input/KeyboardTest.java
@@ -118,7 +118,7 @@ public class KeyboardTest {
     Keyboard.enableTranslation();
 
     while (!Window.isCloseRequested()) {
-      Window.update();
+      Window.updateState();
       
       if(Window.isMinimized()) {
         try {
diff --git a/src/java/org/lwjgl/test/input/MouseCreationTest.java b/src/java/org/lwjgl/test/input/MouseCreationTest.java
index 04d304d2..7248a55d 100644
--- a/src/java/org/lwjgl/test/input/MouseCreationTest.java
+++ b/src/java/org/lwjgl/test/input/MouseCreationTest.java
@@ -162,7 +162,7 @@ public class MouseCreationTest {
 		long endtime = Sys.getTime() + Sys.getTimerResolution() * 5;
 
 		while (Sys.getTime() < endtime) {
-      Window.update();
+      Window.updateState();
 
 			Mouse.poll();
 
diff --git a/src/java/org/lwjgl/test/input/MouseTest.java b/src/java/org/lwjgl/test/input/MouseTest.java
index b6436f0a..230cf196 100644
--- a/src/java/org/lwjgl/test/input/MouseTest.java
+++ b/src/java/org/lwjgl/test/input/MouseTest.java
@@ -113,7 +113,7 @@ public class MouseTest {
 
   private void wiggleMouse() {
     while (!Window.isCloseRequested()) {
-      Window.update();
+      Window.updateState();
       
       if(Window.isMinimized()) {
         try {
diff --git a/src/java/org/lwjgl/test/openal/MovingSoundTest.java b/src/java/org/lwjgl/test/openal/MovingSoundTest.java
index e5d751b7..598d00d5 100644
--- a/src/java/org/lwjgl/test/openal/MovingSoundTest.java
+++ b/src/java/org/lwjgl/test/openal/MovingSoundTest.java
@@ -156,7 +156,7 @@ public class MovingSoundTest extends BasicTest {
     System.out.println("Move source with arrow keys\nMove listener with right shift and arrowkeys\nEnable EAX effect by pressing e (if available)\nExit with ESC");
 
 		while(!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) {
-      Window.update();
+      Window.updateState();
       
       Keyboard.poll();
       if(Keyboard.isKeyDown(Keyboard.KEY_LEFT)) {
diff --git a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
index 2ba18607..0f72363c 100644
--- a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
+++ b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
@@ -113,7 +113,7 @@ public class FullScreenWindowedTest {
     while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)
       && !Window.isCloseRequested()) {
       // allow subsystem to get a chance to run too
-      Window.update();
+      Window.updateState();
 
       if (!Window.isMinimized()) {
         // check keyboard input
diff --git a/src/java/org/lwjgl/test/opengl/Game.java b/src/java/org/lwjgl/test/opengl/Game.java
index 20598f63..328d2c31 100644
--- a/src/java/org/lwjgl/test/opengl/Game.java
+++ b/src/java/org/lwjgl/test/opengl/Game.java
@@ -98,7 +98,7 @@ public final class Game {
          try {
              init();
              while (!finished) {
-             	 Window.update();
+             	 Window.updateState();
              	 
              	 if (Window.isMinimized())
              	 	Thread.sleep(200);
diff --git a/src/java/org/lwjgl/test/opengl/PbufferTest.java b/src/java/org/lwjgl/test/opengl/PbufferTest.java
index 63d26833..d5731bc9 100644
--- a/src/java/org/lwjgl/test/opengl/PbufferTest.java
+++ b/src/java/org/lwjgl/test/opengl/PbufferTest.java
@@ -122,7 +122,7 @@ public class PbufferTest {
     while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)
       && !Window.isCloseRequested()) {
       // allow subsystem to get a chance to run too
-      Window.update();
+      Window.updateState();
 
       if (!Window.isMinimized()) {
         // check keyboard input
diff --git a/src/java/org/lwjgl/test/opengl/VBOIndexTest.java b/src/java/org/lwjgl/test/opengl/VBOIndexTest.java
index de47453e..4a423111 100644
--- a/src/java/org/lwjgl/test/opengl/VBOIndexTest.java
+++ b/src/java/org/lwjgl/test/opengl/VBOIndexTest.java
@@ -100,7 +100,7 @@ public final class VBOIndexTest {
          try {
              init();
              while (!finished) {
-             	 Window.update();
+             	 Window.updateState();
              	 
              	 if (Window.isMinimized())
              	 	Thread.sleep(200);
diff --git a/src/java/org/lwjgl/test/opengl/VBOTest.java b/src/java/org/lwjgl/test/opengl/VBOTest.java
index 87ebe85d..ad001f78 100644
--- a/src/java/org/lwjgl/test/opengl/VBOTest.java
+++ b/src/java/org/lwjgl/test/opengl/VBOTest.java
@@ -96,7 +96,7 @@ public final class VBOTest {
          try {
              init();
              while (!finished) {
-             	 Window.update();
+             	 Window.updateState();
              	 
              	 if (Window.isMinimized())
              	 	Thread.sleep(200);
diff --git a/src/native/configure.in b/src/native/configure.in
index 014c92f5..c2f1bb91 100644
--- a/src/native/configure.in
+++ b/src/native/configure.in
@@ -51,8 +51,8 @@ if test "x$JAVA_HOME" = x; then
 else
   AC_MSG_RESULT($JAVA_HOME)
   JAVA_HOME="$JAVA_HOME"
-  CPPFLAGS="$CPPFLAGS -fno-rtti -fno-exceptions -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
-  CFLAGS="$CFLAGS -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
+  CPPFLAGS="$CPPFLAGS -D_DEBUG -fno-rtti -fno-exceptions -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
+  CFLAGS="$CFLAGS -D_DEBUG -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 fi
 
 dnl Checks for libraries.