3 files changed, 9 insertions, 8 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLDrawableUtil.java b/src/jogl/classes/com/jogamp/opengl/util/GLDrawableUtil.java
index 83414ddb0..1d68a402a 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLDrawableUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLDrawableUtil.java
@@ -34,7 +34,6 @@ import javax.media.opengl.GLDrawable;
 import javax.media.opengl.GLEventListener;
 
 import jogamp.opengl.Debug;
-import jogamp.opengl.GLEventListenerState;
 
 /**
  * Providing utility functions dealing w/ {@link GLDrawable}s, {@link GLAutoDrawable} and their {@link GLEventListener}.
diff --git a/src/jogl/classes/jogamp/opengl/GLEventListenerState.java b/src/jogl/classes/com/jogamp/opengl/util/GLEventListenerState.java
index 2385460fe..ff250d27f 100644
--- a/src/jogl/classes/jogamp/opengl/GLEventListenerState.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLEventListenerState.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package jogamp.opengl;
+package com.jogamp.opengl.util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,6 +45,8 @@ import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLException;
 import javax.media.opengl.GLRunnable;
 
+import jogamp.opengl.Debug;
+
 import com.jogamp.nativewindow.MutableGraphicsConfiguration;
 
 /**
@@ -52,12 +54,11 @@ import com.jogamp.nativewindow.MutableGraphicsConfiguration;
  * to relocating all its {@link GLEventListener} w/ their operating {@link GLContext}, etc.
  * The components are:
  * <ul>
- *   <li>{@link AbstractGraphicsScreen}</li>
- *   <li>{@link GLCapabilitiesImmutable}</li>
- *   <li>{@link GLContext} operating all {@link GLEventListener}</li>
- *   <li>All {@link GLEventListener}</li>
- *   <li>All {@link GLEventListener}'s init state</li>
+ *   <li>{@link GLContext}</li>
+ *   <li>All {@link GLEventListener}, incl. their init state</li>
  *   <li>{@link GLAnimatorControl}</li>
+ *   <li>{@link GLCapabilitiesImmutable} for compatibility check</li>
+ *   <li>{@link AbstractGraphicsScreen} for compatibility check and preserving the {@link AbstractGraphicsDevice}</li>
  * </ul>
  * <p>
  * A GLEventListenerState instance can be created while components are {@link #moveFrom(GLAutoDrawable) moved from} a {@link GLAutoDrawable}
@@ -70,7 +71,7 @@ import com.jogamp.nativewindow.MutableGraphicsConfiguration;
  * <p>
  */
 public class GLEventListenerState {
-    private static final boolean DEBUG = GLDrawableImpl.DEBUG;
+    private static final boolean DEBUG = Debug.debug("GLDrawable");
     
     private GLEventListenerState(AbstractGraphicsScreen upstreamScreen, boolean proxyOwnsUpstreamDevice, AbstractGraphicsScreen screen, GLCapabilitiesImmutable caps, 
                                  GLContext context, int count, GLAnimatorControl anim) {
diff --git a/src/jogl/classes/jogamp/opengl/GLAutoDrawableBase.java b/src/jogl/classes/jogamp/opengl/GLAutoDrawableBase.java
index cab768e3a..e6652cfac 100644
--- a/src/jogl/classes/jogamp/opengl/GLAutoDrawableBase.java
+++ b/src/jogl/classes/jogamp/opengl/GLAutoDrawableBase.java
@@ -50,6 +50,7 @@ import javax.media.opengl.GLRunnable;
 
 import com.jogamp.common.util.locks.RecursiveLock;
 import com.jogamp.opengl.GLAutoDrawableDelegate;
+import com.jogamp.opengl.util.GLEventListenerState;
 
 
 /**