6 files changed, 7 insertions, 9 deletions
diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg
index 0ba7d63bc..d4ca642bf 100644
--- a/make/config/nativewindow/win32-lib.cfg
+++ b/make/config/nativewindow/win32-lib.cfg
@@ -22,8 +22,6 @@ Opaque long void **
 
 Import javax.media.nativewindow.util.Point
 Import javax.media.nativewindow.NativeWindowException
-Import javax.media.nativewindow.windows.RegisteredClass
-Import javax.media.nativewindow.windows.RegisteredClassFactory
 Import com.jogamp.nativewindow.impl.NWJNILibLoader
 import com.jogamp.nativewindow.impl.Debug
 
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
index eb6db0a50..3defe5d53 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
@@ -63,6 +63,7 @@ import com.jogamp.common.JogampRuntimeException;
 import com.jogamp.common.util.ReflectionUtil;
 import com.jogamp.nativewindow.impl.ProxySurface;
 import com.jogamp.nativewindow.impl.windows.GDI;
+import com.jogamp.nativewindow.impl.windows.RegisteredClassFactory;
 import com.jogamp.opengl.impl.DesktopGLDynamicLookupHelper;
 import com.jogamp.opengl.impl.GLContextImpl;
 import com.jogamp.opengl.impl.GLDrawableFactoryImpl;
@@ -70,7 +71,6 @@ import com.jogamp.opengl.impl.GLDrawableImpl;
 import com.jogamp.opengl.impl.GLDynamicLookupHelper;
 import com.jogamp.opengl.impl.SharedResourceRunner;
 import javax.media.nativewindow.AbstractGraphicsConfiguration;
-import javax.media.nativewindow.windows.RegisteredClassFactory;
 import javax.media.opengl.GLCapabilitiesImmutable;
 
 public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl {
diff --git a/src/nativewindow/classes/javax/media/nativewindow/windows/RegisteredClass.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/windows/RegisteredClass.java
index f42c2cbc0..a30a81948 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/windows/RegisteredClass.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/windows/RegisteredClass.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.nativewindow.windows;
+package com.jogamp.nativewindow.impl.windows;
 
 public class RegisteredClass {
     long hInstance;
diff --git a/src/nativewindow/classes/javax/media/nativewindow/windows/RegisteredClassFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/impl/windows/RegisteredClassFactory.java
index 2378bb9a8..d04640747 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/windows/RegisteredClassFactory.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/impl/windows/RegisteredClassFactory.java
@@ -26,10 +26,9 @@
  * or implied, of JogAmp Community.
  */
 
-package javax.media.nativewindow.windows;
+package com.jogamp.nativewindow.impl.windows;
 
 import com.jogamp.nativewindow.impl.Debug;
-import com.jogamp.nativewindow.impl.windows.GDI;
 import java.util.ArrayList;
 import javax.media.nativewindow.NativeWindowException;
 
diff --git a/src/newt/classes/com/jogamp/newt/impl/windows/WindowsDisplay.java b/src/newt/classes/com/jogamp/newt/impl/windows/WindowsDisplay.java
index 0556fe792..af32d1693 100644
--- a/src/newt/classes/com/jogamp/newt/impl/windows/WindowsDisplay.java
+++ b/src/newt/classes/com/jogamp/newt/impl/windows/WindowsDisplay.java
@@ -34,12 +34,12 @@
 
 package com.jogamp.newt.impl.windows;
 
+import com.jogamp.nativewindow.impl.windows.RegisteredClass;
+import com.jogamp.nativewindow.impl.windows.RegisteredClassFactory;
 import com.jogamp.newt.impl.DisplayImpl;
 import com.jogamp.newt.impl.NEWTJNILibLoader;
 import javax.media.nativewindow.AbstractGraphicsDevice;
 import javax.media.nativewindow.NativeWindowException;
-import javax.media.nativewindow.windows.RegisteredClassFactory;
-import javax.media.nativewindow.windows.RegisteredClass;
 import javax.media.nativewindow.windows.WindowsGraphicsDevice;
 
 public class WindowsDisplay extends DisplayImpl {
diff --git a/src/newt/classes/com/jogamp/newt/impl/windows/WindowsWindow.java b/src/newt/classes/com/jogamp/newt/impl/windows/WindowsWindow.java
index eb6539c06..9bc4667c5 100644
--- a/src/newt/classes/com/jogamp/newt/impl/windows/WindowsWindow.java
+++ b/src/newt/classes/com/jogamp/newt/impl/windows/WindowsWindow.java
@@ -35,8 +35,9 @@
 package com.jogamp.newt.impl.windows;
 
 import com.jogamp.nativewindow.impl.windows.GDI;
-import javax.media.nativewindow.*;
 import com.jogamp.newt.impl.WindowImpl;
+import javax.media.nativewindow.GraphicsConfigurationFactory;
+import javax.media.nativewindow.NativeWindowException;
 import javax.media.nativewindow.util.Insets;
 import javax.media.nativewindow.util.Point;