diff --git a/extend/src/compiere/model/CalloutUser.java b/extend/src/compiere/model/CalloutUser.java
index ed9459c986..9720813f7b 100644
--- a/extend/src/compiere/model/CalloutUser.java
+++ b/extend/src/compiere/model/CalloutUser.java
@@ -16,11 +16,17 @@
  *****************************************************************************/
 package compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.model.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.model.CalloutEngine;
+import org.compiere.model.GridField;
+import org.compiere.model.GridTab;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	User Callout Example.
diff --git a/extend/src/compiere/model/MyModelExample.java b/extend/src/compiere/model/MyModelExample.java
index 4ffc67cd89..07122d101e 100644
--- a/extend/src/compiere/model/MyModelExample.java
+++ b/extend/src/compiere/model/MyModelExample.java
@@ -16,10 +16,11 @@
  *****************************************************************************/
 package compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
-import org.compiere.model.*;
+import org.compiere.model.PO;
+import org.compiere.model.POInfo;
 
 
 /**
diff --git a/extend/src/compiere/model/MyValidator.java b/extend/src/compiere/model/MyValidator.java
index a3754f3d27..ee09625e2b 100644
--- a/extend/src/compiere/model/MyValidator.java
+++ b/extend/src/compiere/model/MyValidator.java
@@ -17,7 +17,6 @@
 package compiere.model;
 
 import java.math.BigDecimal;
-import java.sql.Timestamp;
 
 import org.compiere.model.MClient;
 import org.compiere.model.MOrder;
@@ -28,7 +27,6 @@ import org.compiere.model.ModelValidator;
 import org.compiere.model.PO;
 import org.compiere.util.CLogger;
 import org.compiere.util.Env;
-import org.compiere.util.Ini;
 
 
 /**
diff --git a/extend/src/org/adempiere/process/rpl/IExportProcessor.java b/extend/src/org/adempiere/process/rpl/IExportProcessor.java
index fcd3383c61..579dafacfb 100644
--- a/extend/src/org/adempiere/process/rpl/IExportProcessor.java
+++ b/extend/src/org/adempiere/process/rpl/IExportProcessor.java
@@ -31,8 +31,8 @@ package org.adempiere.process.rpl;
 
 import java.util.Properties;
 
-import org.eevolution.model.MEXPProcessor;
 import org.compiere.util.Trx;
+import org.eevolution.model.MEXPProcessor;
 import org.w3c.dom.Document;
 
 /**
diff --git a/extend/src/org/adempiere/process/rpl/exp/ExportHelper.java b/extend/src/org/adempiere/process/rpl/exp/ExportHelper.java
index f47bb55c39..fd93a66673 100644
--- a/extend/src/org/adempiere/process/rpl/exp/ExportHelper.java
+++ b/extend/src/org/adempiere/process/rpl/exp/ExportHelper.java
@@ -44,14 +44,9 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.adempiere.process.rpl.IExportProcessor;
 import org.compiere.model.MClient;
 import org.compiere.model.MColumn;
-import org.eevolution.model.MEXPFormat;
-import org.eevolution.model.MEXPFormatLine;
-import org.eevolution.model.MEXPProcessor;
-import org.eevolution.model.MEXPProcessorType;
 import org.compiere.model.MReplicationStrategy;
 import org.compiere.model.MTable;
 import org.compiere.model.PO;
-import org.eevolution.model.X_EXP_FormatLine;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
@@ -59,6 +54,11 @@ import org.compiere.util.Env;
 import org.compiere.util.Language;
 import org.compiere.util.Msg;
 import org.compiere.util.Trx;
+import org.eevolution.model.MEXPFormat;
+import org.eevolution.model.MEXPFormatLine;
+import org.eevolution.model.MEXPProcessor;
+import org.eevolution.model.MEXPProcessorType;
+import org.eevolution.model.X_EXP_FormatLine;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
diff --git a/extend/src/org/adempiere/process/rpl/exp/HDDExportProcessor.java b/extend/src/org/adempiere/process/rpl/exp/HDDExportProcessor.java
index e538c1fb07..3ca534974f 100644
--- a/extend/src/org/adempiere/process/rpl/exp/HDDExportProcessor.java
+++ b/extend/src/org/adempiere/process/rpl/exp/HDDExportProcessor.java
@@ -43,10 +43,10 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import org.adempiere.process.rpl.IExportProcessor;
-import org.eevolution.model.MEXPProcessor;
-import org.eevolution.model.X_EXP_ProcessorParameter;
 import org.compiere.util.CLogger;
 import org.compiere.util.Trx;
+import org.eevolution.model.MEXPProcessor;
+import org.eevolution.model.X_EXP_ProcessorParameter;
 import org.w3c.dom.Document;
 
 /**
diff --git a/extend/src/org/adempiere/process/rpl/exp/ModelExporter.java b/extend/src/org/adempiere/process/rpl/exp/ModelExporter.java
index e365ea1e64..d2e2c68426 100644
--- a/extend/src/org/adempiere/process/rpl/exp/ModelExporter.java
+++ b/extend/src/org/adempiere/process/rpl/exp/ModelExporter.java
@@ -16,7 +16,6 @@
 package org.adempiere.process.rpl.exp;
 
 import java.io.File;
-import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.logging.Level;
@@ -30,7 +29,6 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-//import org.adempiere.server.rpl.XMLHelper;
 import org.compiere.Adempiere;
 import org.compiere.model.MReplicationStrategy;
 import org.compiere.model.ModelValidator;
@@ -40,7 +38,6 @@ import org.compiere.process.ProcessInfoParameter;
 import org.compiere.process.SvrProcess;
 import org.compiere.util.CLogMgt;
 import org.compiere.util.Env;
-import org.compiere.util.Msg;
 import org.eevolution.model.MEXPFormat;
 import org.w3c.dom.Document;
 
diff --git a/extend/src/org/adempiere/process/rpl/exp/MultiplePublisher.java b/extend/src/org/adempiere/process/rpl/exp/MultiplePublisher.java
index 8d99a3771f..cef12d4164 100644
--- a/extend/src/org/adempiere/process/rpl/exp/MultiplePublisher.java
+++ b/extend/src/org/adempiere/process/rpl/exp/MultiplePublisher.java
@@ -2,8 +2,15 @@ package org.adempiere.process.rpl.exp;
 
 //MultiplePublisher.java
 
-import javax.jms.*;
-import javax.naming.*;
+import javax.jms.JMSException;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.jms.TopicConnection;
+import javax.jms.TopicConnectionFactory;
+import javax.jms.TopicPublisher;
+import javax.jms.TopicSession;
+import javax.naming.InitialContext;
 
 public class MultiplePublisher {
 	TopicConnection topicConnection = null;
diff --git a/extend/src/org/adempiere/process/rpl/exp/TopicExportProcessor.java b/extend/src/org/adempiere/process/rpl/exp/TopicExportProcessor.java
index 74cc73ad86..87d2b7a5c3 100644
--- a/extend/src/org/adempiere/process/rpl/exp/TopicExportProcessor.java
+++ b/extend/src/org/adempiere/process/rpl/exp/TopicExportProcessor.java
@@ -50,10 +50,10 @@ import javax.xml.transform.stream.StreamResult;
 
 import org.adempiere.process.rpl.IExportProcessor;
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.eevolution.model.MEXPProcessor;
-import org.eevolution.model.X_EXP_ProcessorParameter;
 import org.compiere.util.CLogger;
 import org.compiere.util.Trx;
+import org.eevolution.model.MEXPProcessor;
+import org.eevolution.model.X_EXP_ProcessorParameter;
 import org.w3c.dom.Document;
 
 /**
diff --git a/extend/src/org/compiere/test/OrderTest.java b/extend/src/org/compiere/test/OrderTest.java
index 9543fe0f0f..82481b94d2 100644
--- a/extend/src/org/compiere/test/OrderTest.java
+++ b/extend/src/org/compiere/test/OrderTest.java
@@ -16,13 +16,21 @@
  *****************************************************************************/
 package org.compiere.test;
 
-import java.math.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.*;
-import org.compiere.model.*;
-import org.compiere.process.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.util.Random;
+import java.util.logging.Level;
+
+import org.compiere.Adempiere;
+import org.compiere.model.MBPartner;
+import org.compiere.model.MOrder;
+import org.compiere.model.MOrderLine;
+import org.compiere.process.DocAction;
+import org.compiere.util.CLogMgt;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.Ini;
+import org.compiere.util.Login;
+import org.compiere.util.Trx;
 
 
 /**
diff --git a/extend/src/test/AdempiereTestCase.java b/extend/src/test/AdempiereTestCase.java
index 0b9a5edb50..f626c4abed 100644
--- a/extend/src/test/AdempiereTestCase.java
+++ b/extend/src/test/AdempiereTestCase.java
@@ -20,12 +20,12 @@ import java.util.logging.Level;
 
 import javax.swing.JFileChooser;
 
+import junit.framework.TestCase;
+
 import org.compiere.util.CLogMgt;
 import org.compiere.util.Ini;
 import org.compiere.util.Trx;
 
-import junit.framework.TestCase;
-
 /**
  * ADempiere Base Test Case
  * @author Teo Sarca
diff --git a/extend/src/test/functional/MBPGroupTest.java b/extend/src/test/functional/MBPGroupTest.java
index 0fb9b32d78..532d665243 100644
--- a/extend/src/test/functional/MBPGroupTest.java
+++ b/extend/src/test/functional/MBPGroupTest.java
@@ -1,14 +1,16 @@
 //MBPGroupTest.java
 package test.functional;
 
-import org.compiere.model.MLocation;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
 import org.compiere.model.MBPGroup;
+import org.compiere.model.MLocation;
 import org.compiere.util.DB;
 
 import test.AdempiereTestCase;
 
-import java.sql.*;
-
 public class MBPGroupTest extends AdempiereTestCase {
 	
 	// Variables needed for importing/migrating business partners
diff --git a/extend/src/test/functional/MBPartnerLocationTest.java b/extend/src/test/functional/MBPartnerLocationTest.java
index 64fa6bacca..0a2e9facb8 100644
--- a/extend/src/test/functional/MBPartnerLocationTest.java
+++ b/extend/src/test/functional/MBPartnerLocationTest.java
@@ -1,14 +1,19 @@
 //MBPartnerLocationTest.java
 package test.functional;
 
-import org.compiere.model.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.compiere.model.MBPGroup;
+import org.compiere.model.MBPartner;
+import org.compiere.model.MBPartnerLocation;
+import org.compiere.model.MLocation;
 import org.compiere.util.DB;
-import org.compiere.util.*;
+import org.compiere.util.Env;
 
 import test.AdempiereTestCase;
 
-import java.sql.*;
-
 public class MBPartnerLocationTest extends AdempiereTestCase {
 	
 	// Variables needed for importing/migrating business partners
diff --git a/extend/src/test/functional/MBPartnerTest.java b/extend/src/test/functional/MBPartnerTest.java
index 2094508713..ace13320ff 100644
--- a/extend/src/test/functional/MBPartnerTest.java
+++ b/extend/src/test/functional/MBPartnerTest.java
@@ -1,14 +1,18 @@
 //MBPartnerTest.java
 package test.functional;
 
-import org.compiere.model.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.compiere.model.MBPGroup;
+import org.compiere.model.MBPartner;
+import org.compiere.model.MLocation;
 import org.compiere.util.DB;
-import org.compiere.util.*;
+import org.compiere.util.Env;
 
 import test.AdempiereTestCase;
 
-import java.sql.*;
-
 public class MBPartnerTest extends AdempiereTestCase {
 	
 	// Variables needed for importing/migrating business partners
diff --git a/extend/src/test/functional/MUserTest.java b/extend/src/test/functional/MUserTest.java
index b6cad3d463..debf6fcacf 100644
--- a/extend/src/test/functional/MUserTest.java
+++ b/extend/src/test/functional/MUserTest.java
@@ -1,14 +1,19 @@
 //MUserTest.java
 package test.functional;
 
-import org.compiere.model.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.compiere.model.MBPGroup;
+import org.compiere.model.MBPartner;
+import org.compiere.model.MLocation;
+import org.compiere.model.MUser;
 import org.compiere.util.DB;
-import org.compiere.util.*;
+import org.compiere.util.Env;
 
 import test.AdempiereTestCase;
 
-import java.sql.*;
-
 public class MUserTest extends AdempiereTestCase {
 	
 	// Variables needed for importing/migrating business partners
diff --git a/extend/src/test/functional/PackOutTest.java b/extend/src/test/functional/PackOutTest.java
index 99214b0108..c9288d47e7 100644
--- a/extend/src/test/functional/PackOutTest.java
+++ b/extend/src/test/functional/PackOutTest.java
@@ -1,11 +1,14 @@
 //PackOutTest.java
 package test.functional;
 
-import org.compiere.model.*;
-import org.compiere.process.*;
-import org.compiere.util.*;
-
-import org.adempiere.pipo.*;
+import org.adempiere.pipo.IDFinder;
+import org.adempiere.pipo.PackInHandler;
+import org.adempiere.pipo.PackOut;
+import org.compiere.model.MLocation;
+import org.compiere.model.MPackageExp;
+import org.compiere.model.X_AD_Package_Exp_Detail;
+import org.compiere.process.ProcessInfo;
+import org.compiere.util.Trx;
 
 import test.AdempiereTestCase;