diff --git a/sqlj/src/org/compiere/sqlj/Account.java b/sqlj/src/org/compiere/sqlj/Account.java
index 991b610c93..91a59468f2 100644
--- a/sqlj/src/org/compiere/sqlj/Account.java
+++ b/sqlj/src/org/compiere/sqlj/Account.java
@@ -16,8 +16,10 @@
  *****************************************************************************/
 package org.compiere.sqlj;
 
-import java.math.*;
-import java.sql.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 
 /**
diff --git a/sqlj/src/org/compiere/sqlj/Adempiere.java b/sqlj/src/org/compiere/sqlj/Adempiere.java
index 3d29fed23d..7c75af8e27 100644
--- a/sqlj/src/org/compiere/sqlj/Adempiere.java
+++ b/sqlj/src/org/compiere/sqlj/Adempiere.java
@@ -16,10 +16,17 @@
  *****************************************************************************/
 package org.compiere.sqlj;
 
-import java.io.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Enumeration;
+import java.util.GregorianCalendar;
 
 
 /**
diff --git a/sqlj/src/org/compiere/sqlj/BPartner.java b/sqlj/src/org/compiere/sqlj/BPartner.java
index 370c105e35..a10f63f123 100644
--- a/sqlj/src/org/compiere/sqlj/BPartner.java
+++ b/sqlj/src/org/compiere/sqlj/BPartner.java
@@ -16,7 +16,9 @@
  *****************************************************************************/
 package org.compiere.sqlj;
 
-import java.sql.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 
 /**
diff --git a/sqlj/src/org/compiere/sqlj/Compiere.java b/sqlj/src/org/compiere/sqlj/Compiere.java
index c5ef7bf89e..c5e0af30c6 100755
--- a/sqlj/src/org/compiere/sqlj/Compiere.java
+++ b/sqlj/src/org/compiere/sqlj/Compiere.java
@@ -16,10 +16,17 @@
  *****************************************************************************/
 package org.compiere.sqlj;
 
-import java.io.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Enumeration;
+import java.util.GregorianCalendar;
 
 
 /**
diff --git a/sqlj/src/org/compiere/sqlj/Currency.java b/sqlj/src/org/compiere/sqlj/Currency.java
index 2e1a1e9d9d..9cb2e5f990 100644
--- a/sqlj/src/org/compiere/sqlj/Currency.java
+++ b/sqlj/src/org/compiere/sqlj/Currency.java
@@ -16,8 +16,11 @@
  *****************************************************************************/
 package org.compiere.sqlj;
 
-import java.math.*;
-import java.sql.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 
 
 /**
diff --git a/sqlj/src/org/compiere/sqlj/Invoice.java b/sqlj/src/org/compiere/sqlj/Invoice.java
index de31970771..0545a6969e 100644
--- a/sqlj/src/org/compiere/sqlj/Invoice.java
+++ b/sqlj/src/org/compiere/sqlj/Invoice.java
@@ -16,8 +16,11 @@
  *****************************************************************************/
 package org.compiere.sqlj;
 
-import java.math.*;
-import java.sql.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 
 
 /**
diff --git a/sqlj/src/org/compiere/sqlj/Payment.java b/sqlj/src/org/compiere/sqlj/Payment.java
index 195fea4d16..1acdad2314 100644
--- a/sqlj/src/org/compiere/sqlj/Payment.java
+++ b/sqlj/src/org/compiere/sqlj/Payment.java
@@ -16,8 +16,11 @@
  *****************************************************************************/
 package org.compiere.sqlj;
 
-import java.math.*;
-import java.sql.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 
 
 /**
diff --git a/sqlj/src/org/compiere/sqlj/PaymentTerm.java b/sqlj/src/org/compiere/sqlj/PaymentTerm.java
index 8d69a4e298..e0c18d69a4 100644
--- a/sqlj/src/org/compiere/sqlj/PaymentTerm.java
+++ b/sqlj/src/org/compiere/sqlj/PaymentTerm.java
@@ -16,9 +16,13 @@
  *****************************************************************************/
 package org.compiere.sqlj;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
 
 
 /**
diff --git a/sqlj/src/org/compiere/sqlj/Product.java b/sqlj/src/org/compiere/sqlj/Product.java
index 7cdf1bbaac..af1383a7de 100644
--- a/sqlj/src/org/compiere/sqlj/Product.java
+++ b/sqlj/src/org/compiere/sqlj/Product.java
@@ -16,8 +16,12 @@
  *****************************************************************************/
 package org.compiere.sqlj;
 
-import java.math.*;
-import java.sql.*;
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 
 
 /**