7 files changed, 7 insertions, 7 deletions
diff --git a/make/build.xml b/make/build.xml
index f4fcdc8..c96e835 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -656,6 +656,7 @@
       <fileset dir="${classes}">
         <include name="com/jogamp/gluegen/runtime/*.class" />
         <include name="com/jogamp/common/**" />
+        <include name="jogamp/common/**" />
       </fileset>
     </jar>
     <jar destfile="${build}/gluegen-rt-natives-${os.and.arch}.jar" manifest="${build}/Manifest-rt.temp">
@@ -743,7 +744,6 @@
              maxmemory="256m" >
         <classpath path="${classes}"/>
         <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
-        <excludepackage name="com.jogamp.common.impl"/>
     </javadoc>
     <zip destfile="${build}/javadoc.zip"
          basedir="${javadoc.root.path}"
diff --git a/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java b/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java
index e80c225..cbc5959 100644
--- a/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java
+++ b/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java
@@ -46,7 +46,7 @@ import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.security.AccessControlContext;
 import java.util.HashSet;
-import com.jogamp.common.impl.Debug;
+import jogamp.common.Debug;
 
 public class JNILibLoaderBase {
   public static final boolean DEBUG = Debug.debug("JNILibLoader");
diff --git a/src/java/com/jogamp/common/jvm/JVMUtil.java b/src/java/com/jogamp/common/jvm/JVMUtil.java
index 833e907..fda7f74 100644
--- a/src/java/com/jogamp/common/jvm/JVMUtil.java
+++ b/src/java/com/jogamp/common/jvm/JVMUtil.java
@@ -34,7 +34,7 @@ package com.jogamp.common.jvm;
 
 import java.nio.ByteBuffer;
 import com.jogamp.common.nio.Buffers;
-import com.jogamp.common.impl.Debug;
+import jogamp.common.Debug;
 import com.jogamp.gluegen.runtime.NativeLibLoader;
 
 /**
diff --git a/src/java/com/jogamp/common/util/ReflectionUtil.java b/src/java/com/jogamp/common/util/ReflectionUtil.java
index a04a160..c6b1b88 100644
--- a/src/java/com/jogamp/common/util/ReflectionUtil.java
+++ b/src/java/com/jogamp/common/util/ReflectionUtil.java
@@ -39,7 +39,7 @@ package com.jogamp.common.util;
 
 import java.lang.reflect.*;
 import com.jogamp.common.JogampRuntimeException;
-import com.jogamp.common.impl.Debug;
+import jogamp.common.Debug;
 
 public final class ReflectionUtil {
     
diff --git a/src/java/com/jogamp/common/util/locks/Lock.java b/src/java/com/jogamp/common/util/locks/Lock.java
index 7065ff8..4ea8bf4 100644
--- a/src/java/com/jogamp/common/util/locks/Lock.java
+++ b/src/java/com/jogamp/common/util/locks/Lock.java
@@ -28,7 +28,7 @@
 
 package com.jogamp.common.util.locks;
 
-import com.jogamp.common.impl.Debug;
+import jogamp.common.Debug;
 import java.security.AccessController;
 
 /**
diff --git a/src/java/com/jogamp/common/util/locks/RecursiveLock.java b/src/java/com/jogamp/common/util/locks/RecursiveLock.java
index de61451..4f8415e 100644
--- a/src/java/com/jogamp/common/util/locks/RecursiveLock.java
+++ b/src/java/com/jogamp/common/util/locks/RecursiveLock.java
@@ -28,7 +28,7 @@
 
 package com.jogamp.common.util.locks;
 
-import com.jogamp.common.impl.Debug;
+import jogamp.common.Debug;
 import java.security.AccessController;
 
 import java.util.LinkedList;
diff --git a/src/java/com/jogamp/common/impl/Debug.java b/src/java/jogamp/common/Debug.java
index d8412ae..e425e9c 100644
--- a/src/java/com/jogamp/common/impl/Debug.java
+++ b/src/java/jogamp/common/Debug.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.common.impl;
+package jogamp.common;
 
 import java.security.*;