diff --git a/base/src/org/compiere/wf/MWFBlock.java b/base/src/org/compiere/wf/MWFBlock.java
index 0f0b08ab7a..96f7ee2d18 100644
--- a/base/src/org/compiere/wf/MWFBlock.java
+++ b/base/src/org/compiere/wf/MWFBlock.java
@@ -16,10 +16,11 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.model.X_AD_WF_Block;
+import org.compiere.util.CCache;
 
 
 /**
diff --git a/base/src/org/compiere/wf/MWFEventAudit.java b/base/src/org/compiere/wf/MWFEventAudit.java
index b071184271..f65f6d4729 100644
--- a/base/src/org/compiere/wf/MWFEventAudit.java
+++ b/base/src/org/compiere/wf/MWFEventAudit.java
@@ -16,11 +16,16 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.model.X_AD_WF_EventAudit;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	Workflow Event Audit
diff --git a/base/src/org/compiere/wf/MWFNextCondition.java b/base/src/org/compiere/wf/MWFNextCondition.java
index cc158c4b6c..1c8ebe6812 100644
--- a/base/src/org/compiere/wf/MWFNextCondition.java
+++ b/base/src/org/compiere/wf/MWFNextCondition.java
@@ -16,11 +16,12 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.sql.*;
-import java.util.*;
-import java.math.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.Properties;
 
-import org.compiere.model.*;
+import org.compiere.model.PO;
+import org.compiere.model.X_AD_WF_NextCondition;
 
 /**
  *	Workflow Transition Condition
diff --git a/base/src/org/compiere/wf/MWFNode.java b/base/src/org/compiere/wf/MWFNode.java
index 4c8dca6bd7..ba6e540bb6 100644
--- a/base/src/org/compiere/wf/MWFNode.java
+++ b/base/src/org/compiere/wf/MWFNode.java
@@ -16,15 +16,22 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.awt.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.awt.Point;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-import org.compiere.process.DocAction;
-import org.compiere.util.*;
+import org.compiere.model.MColumn;
+import org.compiere.model.X_AD_WF_Node;
+import org.compiere.util.CCache;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  *	Workflow Node Model
diff --git a/base/src/org/compiere/wf/MWFNodeNext.java b/base/src/org/compiere/wf/MWFNodeNext.java
index b0c74e8bc7..0274c24f51 100644
--- a/base/src/org/compiere/wf/MWFNodeNext.java
+++ b/base/src/org/compiere/wf/MWFNodeNext.java
@@ -16,13 +16,16 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-import org.compiere.process.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.model.PO;
+import org.compiere.model.X_AD_WF_NodeNext;
+import org.compiere.process.DocAction;
+import org.compiere.util.DB;
 
 /**
  *	Workflow Node Next - Transition
diff --git a/base/src/org/compiere/wf/MWFNodePara.java b/base/src/org/compiere/wf/MWFNodePara.java
index 26747b4ffa..bf95fe6f8f 100644
--- a/base/src/org/compiere/wf/MWFNodePara.java
+++ b/base/src/org/compiere/wf/MWFNodePara.java
@@ -16,12 +16,16 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.model.MProcessPara;
+import org.compiere.model.X_AD_WF_Node_Para;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 
 /**
diff --git a/base/src/org/compiere/wf/MWFResponsible.java b/base/src/org/compiere/wf/MWFResponsible.java
index a4026d128b..aa5cde0f40 100644
--- a/base/src/org/compiere/wf/MWFResponsible.java
+++ b/base/src/org/compiere/wf/MWFResponsible.java
@@ -16,10 +16,13 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.model.MRole;
+import org.compiere.model.X_AD_WF_Responsible;
+import org.compiere.util.CCache;
+import org.compiere.util.Msg;
 
 
 /**
diff --git a/base/src/org/compiere/wf/MWorkflowAccess.java b/base/src/org/compiere/wf/MWorkflowAccess.java
index 7bff8dea6f..7e264a08b8 100644
--- a/base/src/org/compiere/wf/MWorkflowAccess.java
+++ b/base/src/org/compiere/wf/MWorkflowAccess.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.model.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.model.X_AD_Workflow_Access;
 
 
 /**
diff --git a/base/src/org/compiere/wf/MWorkflowProcessorLog.java b/base/src/org/compiere/wf/MWorkflowProcessorLog.java
index be039c3c97..1455ac2c75 100644
--- a/base/src/org/compiere/wf/MWorkflowProcessorLog.java
+++ b/base/src/org/compiere/wf/MWorkflowProcessorLog.java
@@ -16,10 +16,11 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
-import org.compiere.model.*;
+import org.compiere.model.AdempiereProcessorLog;
+import org.compiere.model.X_AD_WorkflowProcessorLog;
 
 
 /**
diff --git a/base/src/org/compiere/wf/WFActivityManage.java b/base/src/org/compiere/wf/WFActivityManage.java
index 3233fa7911..8b0c6d033f 100644
--- a/base/src/org/compiere/wf/WFActivityManage.java
+++ b/base/src/org/compiere/wf/WFActivityManage.java
@@ -16,9 +16,12 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.process.*;
+import java.util.logging.Level;
+
+import org.compiere.model.MUser;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.StateEngine;
+import org.compiere.process.SvrProcess;
 
 /**
  *	Manage Workflow Activity
diff --git a/base/src/org/compiere/wf/WFProcessManage.java b/base/src/org/compiere/wf/WFProcessManage.java
index 3a370256dd..01ce1081c1 100644
--- a/base/src/org/compiere/wf/WFProcessManage.java
+++ b/base/src/org/compiere/wf/WFProcessManage.java
@@ -16,9 +16,12 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.process.*;
+import java.util.logging.Level;
+
+import org.compiere.model.MUser;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.StateEngine;
+import org.compiere.process.SvrProcess;
 
 /**
  *	Manage Workflow Process
diff --git a/base/src/org/compiere/wf/WorkflowMoveToClient.java b/base/src/org/compiere/wf/WorkflowMoveToClient.java
index 1513913bfa..fe84d5f6b8 100644
--- a/base/src/org/compiere/wf/WorkflowMoveToClient.java
+++ b/base/src/org/compiere/wf/WorkflowMoveToClient.java
@@ -16,9 +16,12 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.util.logging.*;
-import org.compiere.util.*;
-import org.compiere.process.*;
+import java.util.logging.Level;
+
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+import org.compiere.util.AdempiereSystemError;
+import org.compiere.util.DB;
 
 /**
  *	Move Workflow Customizations to Client
diff --git a/base/src/org/compiere/wf/WorkflowValidate.java b/base/src/org/compiere/wf/WorkflowValidate.java
index 5b5cb8306e..3363edb6ef 100644
--- a/base/src/org/compiere/wf/WorkflowValidate.java
+++ b/base/src/org/compiere/wf/WorkflowValidate.java
@@ -16,8 +16,9 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import org.compiere.process.*;
-import org.compiere.util.*;
+import org.compiere.process.SvrProcess;
+import org.compiere.util.AdempiereUserError;
+import org.compiere.util.Msg;
 
 
 /**