Reversed Type relocation ; Minor fix

Reversed Type relocation (commit 92d6c9dc5fa72b01703456452c60822f36c14fff)
from com.jogamp.gluegen.runtime.types back to com.jogamp.gluegen.cgram.types

Enabled MemoryLayoutType.setLayouted(), avoiding double layout

36 files changed, 28 insertions, 60 deletions

diff --git a/src/java/com/jogamp/gluegen/CMethodBindingEmitter.java b/src/java/com/jogamp/gluegen/CMethodBindingEmitter.java
index 1087d15..5d0124c 100644
--- a/src/java/com/jogamp/gluegen/CMethodBindingEmitter.java
+++ b/src/java/com/jogamp/gluegen/CMethodBindingEmitter.java
@@ -45,9 +45,6 @@ import java.text.MessageFormat;
 
 import com.jogamp.common.os.MachineDescription;
 import com.jogamp.gluegen.cgram.types.*;
-import com.jogamp.gluegen.runtime.types.ArrayType;
-import com.jogamp.gluegen.runtime.types.PointerType;
-import com.jogamp.gluegen.runtime.types.Type;
 
 import java.util.logging.Logger;
 
diff --git a/src/java/com/jogamp/gluegen/DebugEmitter.java b/src/java/com/jogamp/gluegen/DebugEmitter.java
index ce6ae69..336cc8b 100644
--- a/src/java/com/jogamp/gluegen/DebugEmitter.java
+++ b/src/java/com/jogamp/gluegen/DebugEmitter.java
@@ -43,8 +43,6 @@ import java.util.*;
 
 import com.jogamp.common.os.MachineDescription;
 import com.jogamp.gluegen.cgram.types.*;
-import com.jogamp.gluegen.runtime.types.CompoundType;
-import com.jogamp.gluegen.runtime.types.Type;
 
 /** Debug emitter which prints the parsing results to standard output. */
 
diff --git a/src/java/com/jogamp/gluegen/GlueEmitter.java b/src/java/com/jogamp/gluegen/GlueEmitter.java
index 99bf31d..c574d2e 100644
--- a/src/java/com/jogamp/gluegen/GlueEmitter.java
+++ b/src/java/com/jogamp/gluegen/GlueEmitter.java
@@ -43,8 +43,6 @@ import java.util.*;
 
 import com.jogamp.common.os.MachineDescription;
 import com.jogamp.gluegen.cgram.types.*;
-import com.jogamp.gluegen.runtime.types.CompoundType;
-import com.jogamp.gluegen.runtime.types.Type;
 
 /** Specifies the interface by which GlueGen requests glue code to be
     generated. Can be replaced to generate glue code for other
diff --git a/src/java/com/jogamp/gluegen/GlueGen.java b/src/java/com/jogamp/gluegen/GlueGen.java
index 744d526..a633e52 100644
--- a/src/java/com/jogamp/gluegen/GlueGen.java
+++ b/src/java/com/jogamp/gluegen/GlueGen.java
@@ -49,10 +49,6 @@ import antlr.*;
 import com.jogamp.gluegen.cgram.*;
 import com.jogamp.gluegen.cgram.types.*;
 import com.jogamp.gluegen.pcpp.*;
-import com.jogamp.gluegen.runtime.types.CompoundType;
-import com.jogamp.gluegen.runtime.types.EnumType;
-import com.jogamp.gluegen.runtime.types.PointerType;
-import com.jogamp.gluegen.runtime.types.Type;
 
 import static java.lang.System.*;
 
diff --git a/src/java/com/jogamp/gluegen/JavaConfiguration.java b/src/java/com/jogamp/gluegen/JavaConfiguration.java
index 90160f6..5c1121b 100644
--- a/src/java/com/jogamp/gluegen/JavaConfiguration.java
+++ b/src/java/com/jogamp/gluegen/JavaConfiguration.java
@@ -49,7 +49,6 @@ import java.util.Map.Entry;
 import java.util.regex.*;
 
 import com.jogamp.gluegen.jgram.*;
-import com.jogamp.gluegen.runtime.types.Type;
 import com.jogamp.gluegen.cgram.types.*;
 
 import java.util.logging.Logger;
diff --git a/src/java/com/jogamp/gluegen/JavaEmitter.java b/src/java/com/jogamp/gluegen/JavaEmitter.java
index c68fae8..18cb5b1 100644
--- a/src/java/com/jogamp/gluegen/JavaEmitter.java
+++ b/src/java/com/jogamp/gluegen/JavaEmitter.java
@@ -49,13 +49,6 @@ import java.util.*;
 import java.text.MessageFormat;
 
 import com.jogamp.gluegen.cgram.types.*;
-import com.jogamp.gluegen.runtime.types.CompoundType;
-import com.jogamp.gluegen.runtime.types.Field;
-import com.jogamp.gluegen.runtime.types.FunctionType;
-import com.jogamp.gluegen.runtime.types.PointerType;
-import com.jogamp.gluegen.runtime.types.SizeThunk;
-import com.jogamp.gluegen.runtime.types.StructLayout;
-import com.jogamp.gluegen.runtime.types.Type;
 
 import java.nio.Buffer;
 import java.util.logging.Logger;
diff --git a/src/java/com/jogamp/gluegen/JavaMethodBindingEmitter.java b/src/java/com/jogamp/gluegen/JavaMethodBindingEmitter.java
index b1512e3..f7b1466 100644
--- a/src/java/com/jogamp/gluegen/JavaMethodBindingEmitter.java
+++ b/src/java/com/jogamp/gluegen/JavaMethodBindingEmitter.java
@@ -40,11 +40,11 @@
 package com.jogamp.gluegen;
 
 import com.jogamp.gluegen.cgram.HeaderParser;
-import com.jogamp.gluegen.runtime.types.ArrayType;
-import com.jogamp.gluegen.runtime.types.CompoundType;
-import com.jogamp.gluegen.runtime.types.EnumType;
-import com.jogamp.gluegen.runtime.types.PointerType;
-import com.jogamp.gluegen.runtime.types.Type;
+import com.jogamp.gluegen.cgram.types.ArrayType;
+import com.jogamp.gluegen.cgram.types.CompoundType;
+import com.jogamp.gluegen.cgram.types.EnumType;
+import com.jogamp.gluegen.cgram.types.PointerType;
+import com.jogamp.gluegen.cgram.types.Type;
 
 import java.io.PrintWriter;
 import java.text.MessageFormat;
diff --git a/src/java/com/jogamp/gluegen/JavaType.java b/src/java/com/jogamp/gluegen/JavaType.java
index 1c1213e..04d14de 100644
--- a/src/java/com/jogamp/gluegen/JavaType.java
+++ b/src/java/com/jogamp/gluegen/JavaType.java
@@ -43,7 +43,6 @@ package com.jogamp.gluegen;
 import java.nio.*;
 
 import com.jogamp.gluegen.cgram.types.*;
-import com.jogamp.gluegen.runtime.types.Type;
 
 /**
  * Describes a java-side representation of a type that is used to represent
diff --git a/src/java/com/jogamp/gluegen/MethodBinding.java b/src/java/com/jogamp/gluegen/MethodBinding.java
index 22625a1..a8d4b30 100644
--- a/src/java/com/jogamp/gluegen/MethodBinding.java
+++ b/src/java/com/jogamp/gluegen/MethodBinding.java
@@ -40,7 +40,7 @@
 package com.jogamp.gluegen;
 
 import com.jogamp.gluegen.cgram.types.FunctionSymbol;
-import com.jogamp.gluegen.runtime.types.Type;
+import com.jogamp.gluegen.cgram.types.Type;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/java/com/jogamp/gluegen/ReferencedStructs.java b/src/java/com/jogamp/gluegen/ReferencedStructs.java
index c00653d..b8a176f 100644
--- a/src/java/com/jogamp/gluegen/ReferencedStructs.java
+++ b/src/java/com/jogamp/gluegen/ReferencedStructs.java
@@ -41,10 +41,6 @@ package com.jogamp.gluegen;
 
 import java.util.*;
 import com.jogamp.gluegen.cgram.types.*;
-import com.jogamp.gluegen.runtime.types.CompoundType;
-import com.jogamp.gluegen.runtime.types.PointerType;
-import com.jogamp.gluegen.runtime.types.Type;
-import com.jogamp.gluegen.runtime.types.TypeVisitor;
 
 public class ReferencedStructs implements TypeVisitor {
 
diff --git a/src/java/com/jogamp/gluegen/cgram/HeaderParser.g b/src/java/com/jogamp/gluegen/cgram/HeaderParser.g
index 6a78e91..33ee06a 100644
--- a/src/java/com/jogamp/gluegen/cgram/HeaderParser.g
+++ b/src/java/com/jogamp/gluegen/cgram/HeaderParser.g
@@ -46,7 +46,6 @@ header {
 
         import antlr.CommonAST;
         import com.jogamp.gluegen.cgram.types.*;
-        import com.jogamp.gluegen.runtime.types.*;
 }
 
 class HeaderParser extends GnuCTreeParser;
diff --git a/src/java/com/jogamp/gluegen/runtime/types/ArrayType.java b/src/java/com/jogamp/gluegen/cgram/types/ArrayType.java
index ace3ff0..4ede5aa 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/ArrayType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/ArrayType.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 /** Represents an array type. This differs from a pointer type in C
     syntax by the use of "[]" rather than "*". The length may or may
diff --git a/src/java/com/jogamp/gluegen/runtime/types/BitType.java b/src/java/com/jogamp/gluegen/cgram/types/BitType.java
index 78290d8..a7a1f55 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/BitType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/BitType.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 /** Represents a bitfield in a struct. */
 
diff --git a/src/java/com/jogamp/gluegen/runtime/types/CVAttributes.java b/src/java/com/jogamp/gluegen/cgram/types/CVAttributes.java
index f55f817..34b703e 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/CVAttributes.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/CVAttributes.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 /** Enumeration for const/volatile attributes. These are passed in to
     the constructor of the type. */
diff --git a/src/java/com/jogamp/gluegen/runtime/types/CompoundType.java b/src/java/com/jogamp/gluegen/cgram/types/CompoundType.java
index 3e93fcf..7a4b45d 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/CompoundType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/CompoundType.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 import java.util.*;
 
diff --git a/src/java/com/jogamp/gluegen/runtime/types/CompoundTypeKind.java b/src/java/com/jogamp/gluegen/cgram/types/CompoundTypeKind.java
index 96a07ae..37b813c 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/CompoundTypeKind.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/CompoundTypeKind.java
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
 
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 /** Type-safe enum for discriminating between structs and unions
     represented as compound types. Used while syntax parsing. */
diff --git a/src/java/com/jogamp/gluegen/runtime/types/DoubleType.java b/src/java/com/jogamp/gluegen/cgram/types/DoubleType.java
index a18e4cc..280485a 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/DoubleType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/DoubleType.java
@@ -37,7 +37,7 @@
  * Sun gratefully acknowledges that this software was originally authored
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 /** Represents a double-word floating-point type (C type "double".) */
 public class DoubleType extends PrimitiveType implements Cloneable {
diff --git a/src/java/com/jogamp/gluegen/runtime/types/EnumType.java b/src/java/com/jogamp/gluegen/cgram/types/EnumType.java
index 9bff00e..7967ba0 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/EnumType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/EnumType.java
@@ -37,7 +37,7 @@
  * Sun gratefully acknowledges that this software was originally authored
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 import java.util.ArrayList;
 import java.util.NoSuchElementException;
diff --git a/src/java/com/jogamp/gluegen/runtime/types/Field.java b/src/java/com/jogamp/gluegen/cgram/types/Field.java
index 0613b5f..891bb27 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/Field.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/Field.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 import com.jogamp.common.os.MachineDescription;
 
diff --git a/src/java/com/jogamp/gluegen/runtime/types/FloatType.java b/src/java/com/jogamp/gluegen/cgram/types/FloatType.java
index 4a10210..7766b8c 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/FloatType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/FloatType.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 /** Represents a single-word floating-point type (C type "float".) */
 
diff --git a/src/java/com/jogamp/gluegen/cgram/types/FunctionSymbol.java b/src/java/com/jogamp/gluegen/cgram/types/FunctionSymbol.java
index 2bfc859..4abbfbd 100644
--- a/src/java/com/jogamp/gluegen/cgram/types/FunctionSymbol.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/FunctionSymbol.java
@@ -38,8 +38,6 @@
  */
 package com.jogamp.gluegen.cgram.types;
 
-import com.jogamp.gluegen.runtime.types.FunctionType;
-import com.jogamp.gluegen.runtime.types.Type;
 
 /** Describes a function symbol, which includes the name and
 type. Since we are currently only concerned with processing
diff --git a/src/java/com/jogamp/gluegen/runtime/types/FunctionType.java b/src/java/com/jogamp/gluegen/cgram/types/FunctionType.java
index bfe0275..cb430db 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/FunctionType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/FunctionType.java
@@ -37,7 +37,7 @@
  * Sun gratefully acknowledges that this software was originally authored
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 import java.util.*;
 
diff --git a/src/java/com/jogamp/gluegen/runtime/types/IntType.java b/src/java/com/jogamp/gluegen/cgram/types/IntType.java
index 02ab530..b85c7fc 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/IntType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/IntType.java
@@ -37,7 +37,7 @@
  * Sun gratefully acknowledges that this software was originally authored
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 public class IntType extends PrimitiveType implements Cloneable {
 
diff --git a/src/java/com/jogamp/gluegen/runtime/types/MemoryLayoutType.java b/src/java/com/jogamp/gluegen/cgram/types/MemoryLayoutType.java
index 3473d95..f8f83d3 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/MemoryLayoutType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/MemoryLayoutType.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 public abstract class MemoryLayoutType extends Type {
   private boolean isLayouted;
@@ -36,6 +36,6 @@ public abstract class MemoryLayoutType extends Type {
   }
 
   public boolean isLayouted() { return isLayouted; }
-  public void setLayouted() { /* FIXME JAU isLayouted = true; */ }
+  public void setLayouted() { isLayouted = true; }
     
 }
diff --git a/src/java/com/jogamp/gluegen/runtime/types/PointerType.java b/src/java/com/jogamp/gluegen/cgram/types/PointerType.java
index e45b9ff..4666e48 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/PointerType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/PointerType.java
@@ -37,7 +37,7 @@
  * Sun gratefully acknowledges that this software was originally authored
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 public class PointerType extends Type implements Cloneable {
 
diff --git a/src/java/com/jogamp/gluegen/runtime/types/PrimitiveType.java b/src/java/com/jogamp/gluegen/cgram/types/PrimitiveType.java
index b2e6fc0..1eea9a4 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/PrimitiveType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/PrimitiveType.java
@@ -37,7 +37,7 @@
  * Sun gratefully acknowledges that this software was originally authored
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 public abstract class PrimitiveType extends Type implements Cloneable {
 
diff --git a/src/java/com/jogamp/gluegen/runtime/types/SizeThunk.java b/src/java/com/jogamp/gluegen/cgram/types/SizeThunk.java
index 3b36957..33b17cc 100755
--- a/src/java/com/jogamp/gluegen/runtime/types/SizeThunk.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/SizeThunk.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 import com.jogamp.common.os.MachineDescription;
 
diff --git a/src/java/com/jogamp/gluegen/runtime/types/StructLayout.java b/src/java/com/jogamp/gluegen/cgram/types/StructLayout.java
index e4a95d4..60284b9 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/StructLayout.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/StructLayout.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 /** Encapsulates algorithm for laying out data structures. Note that
     this ends up embedding code in various places via SizeThunks. If
diff --git a/src/java/com/jogamp/gluegen/runtime/types/StructType.java b/src/java/com/jogamp/gluegen/cgram/types/StructType.java
index 2c0a589..cade91c 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/StructType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/StructType.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 public class StructType extends CompoundType {
 
diff --git a/src/java/com/jogamp/gluegen/runtime/types/Type.java b/src/java/com/jogamp/gluegen/cgram/types/Type.java
index ebedfcb..b59ba2c 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/Type.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/Type.java
@@ -38,7 +38,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 import java.util.List;
 
diff --git a/src/java/com/jogamp/gluegen/cgram/types/TypeDictionary.java b/src/java/com/jogamp/gluegen/cgram/types/TypeDictionary.java
index 2e2caba..be2adb4 100644
--- a/src/java/com/jogamp/gluegen/cgram/types/TypeDictionary.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/TypeDictionary.java
@@ -41,7 +41,6 @@ package com.jogamp.gluegen.cgram.types;
 
 import java.util.*;
 
-import com.jogamp.gluegen.runtime.types.Type;
 
 /** Utility class for recording names of typedefs and structs. */
 
diff --git a/src/java/com/jogamp/gluegen/runtime/types/TypeVisitor.java b/src/java/com/jogamp/gluegen/cgram/types/TypeVisitor.java
index 0d7f63d..0889681 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/TypeVisitor.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/TypeVisitor.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 public interface TypeVisitor {
   public void visitType(Type t);
diff --git a/src/java/com/jogamp/gluegen/runtime/types/UnionType.java b/src/java/com/jogamp/gluegen/cgram/types/UnionType.java
index 5aee3f1..4de10da 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/UnionType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/UnionType.java
@@ -25,7 +25,7 @@
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 public class UnionType extends CompoundType {
 
diff --git a/src/java/com/jogamp/gluegen/runtime/types/VoidType.java b/src/java/com/jogamp/gluegen/cgram/types/VoidType.java
index 07b3ec3..fa098e7 100644
--- a/src/java/com/jogamp/gluegen/runtime/types/VoidType.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/VoidType.java
@@ -37,7 +37,7 @@
  * Sun gratefully acknowledges that this software was originally authored
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
-package com.jogamp.gluegen.runtime.types;
+package com.jogamp.gluegen.cgram.types;
 
 public class VoidType extends Type implements Cloneable {
 
diff --git a/src/java/com/jogamp/gluegen/procaddress/ProcAddressCMethodBindingEmitter.java b/src/java/com/jogamp/gluegen/procaddress/ProcAddressCMethodBindingEmitter.java
index cdc15d0..fedb1e6 100755
--- a/src/java/com/jogamp/gluegen/procaddress/ProcAddressCMethodBindingEmitter.java
+++ b/src/java/com/jogamp/gluegen/procaddress/ProcAddressCMethodBindingEmitter.java
@@ -45,8 +45,6 @@ import com.jogamp.gluegen.JavaType;
 import java.io.*;
 import com.jogamp.gluegen.*;
 import com.jogamp.gluegen.cgram.types.*;
-import com.jogamp.gluegen.runtime.types.PointerType;
-import com.jogamp.gluegen.runtime.types.Type;
 
 public class ProcAddressCMethodBindingEmitter extends CMethodBindingEmitter {
 
diff --git a/src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java b/src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java
index 6e15f8d..c07dab7 100755
--- a/src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java
+++ b/src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java
@@ -51,8 +51,6 @@ import java.util.*;
 import com.jogamp.gluegen.*;
 import com.jogamp.gluegen.cgram.types.*;
 import com.jogamp.gluegen.runtime.*;
-import com.jogamp.gluegen.runtime.types.FunctionType;
-import com.jogamp.gluegen.runtime.types.Type;
 
 /**
  * A subclass of JavaEmitter that modifies the normal emission of C