diff --git a/base/src/org/compiere/print/ArchiveEngine.java b/base/src/org/compiere/print/ArchiveEngine.java
index fd4e042679..0688fa4f92 100644
--- a/base/src/org/compiere/print/ArchiveEngine.java
+++ b/base/src/org/compiere/print/ArchiveEngine.java
@@ -16,11 +16,14 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.awt.print.*;
-import org.compiere.model.*;
-import org.compiere.print.layout.*;
-import org.compiere.util.*;
-import org.adempiere.pdf.*;
+import java.awt.print.Pageable;
+
+import org.adempiere.pdf.Document;
+import org.compiere.model.MArchive;
+import org.compiere.model.MClient;
+import org.compiere.model.PrintInfo;
+import org.compiere.print.layout.LayoutEngine;
+import org.compiere.util.CLogger;
 
 
 /**
diff --git a/base/src/org/compiere/print/CPaper.java b/base/src/org/compiere/print/CPaper.java
index 09cfebe03b..e601b8e925 100644
--- a/base/src/org/compiere/print/CPaper.java
+++ b/base/src/org/compiere/print/CPaper.java
@@ -16,12 +16,23 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.awt.*;
-import java.awt.print.*;
-import java.util.*;
-import javax.print.attribute.*;
-import javax.print.attribute.standard.*;
-import org.compiere.util.*;
+import java.awt.Insets;
+import java.awt.print.PageFormat;
+import java.awt.print.Paper;
+import java.awt.print.PrinterJob;
+import java.util.Properties;
+
+import javax.print.attribute.Attribute;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.standard.MediaPrintableArea;
+import javax.print.attribute.standard.MediaSize;
+import javax.print.attribute.standard.MediaSizeName;
+import javax.print.attribute.standard.OrientationRequested;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.Language;
+import org.compiere.util.Msg;
 
 /**
  *	Adempiere Paper
diff --git a/base/src/org/compiere/print/CPrinter.java b/base/src/org/compiere/print/CPrinter.java
index fd85b7fc21..ac24eb5dad 100644
--- a/base/src/org/compiere/print/CPrinter.java
+++ b/base/src/org/compiere/print/CPrinter.java
@@ -16,13 +16,17 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.awt.event.*;
-import java.awt.print.*;
-import javax.print.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.print.PrinterJob;
+
+import javax.print.PrintService;
+import javax.print.PrintServiceLookup;
 import javax.swing.DefaultComboBoxModel;
 
-import org.compiere.swing.*;
-import org.compiere.util.*;
+import org.compiere.swing.CComboBox;
+import org.compiere.util.CLogger;
+import org.compiere.util.Ini;
 
 /**
  *  Adempiere Printer Selection
diff --git a/base/src/org/compiere/print/MPrintColor.java b/base/src/org/compiere/print/MPrintColor.java
index 91736ab7bb..0e8a664653 100644
--- a/base/src/org/compiere/print/MPrintColor.java
+++ b/base/src/org/compiere/print/MPrintColor.java
@@ -16,11 +16,17 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.awt.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.awt.Color;
+import java.awt.SystemColor;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.model.PO;
+import org.compiere.model.X_AD_PrintColor;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.Util;
 
 /**
  *	AD_PrintColor Print Color Model
diff --git a/base/src/org/compiere/print/MPrintFont.java b/base/src/org/compiere/print/MPrintFont.java
index f24d34db9f..9d2a31bcc6 100644
--- a/base/src/org/compiere/print/MPrintFont.java
+++ b/base/src/org/compiere/print/MPrintFont.java
@@ -16,11 +16,17 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.awt.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.model.PO;
+import org.compiere.model.X_AD_PrintFont;
+import org.compiere.util.CCache;
+import org.compiere.util.Env;
 
 /**
  *	AD_PrintFont Print Font Model
diff --git a/base/src/org/compiere/print/MPrintFormatItem.java b/base/src/org/compiere/print/MPrintFormatItem.java
index 116faab278..4bdd093c29 100644
--- a/base/src/org/compiere/print/MPrintFormatItem.java
+++ b/base/src/org/compiere/print/MPrintFormatItem.java
@@ -16,11 +16,20 @@
  *****************************************************************************/
 package org.compiere.print;
 
-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.sql.SQLException;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.model.X_AD_PrintFormatItem;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Language;
 
 /**
  *	Print Format Item Model.
diff --git a/base/src/org/compiere/print/MPrintFormatProcess.java b/base/src/org/compiere/print/MPrintFormatProcess.java
index 89d8aaff82..a15d200e24 100644
--- a/base/src/org/compiere/print/MPrintFormatProcess.java
+++ b/base/src/org/compiere/print/MPrintFormatProcess.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.math.*;
+import java.math.BigDecimal;
 
-import org.compiere.process.*;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
 
 /**
  *	MPrintFormat Process.
diff --git a/base/src/org/compiere/print/MPrintGraph.java b/base/src/org/compiere/print/MPrintGraph.java
index 6ad4e7389e..9bdef3a7de 100644
--- a/base/src/org/compiere/print/MPrintGraph.java
+++ b/base/src/org/compiere/print/MPrintGraph.java
@@ -16,10 +16,10 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
-import org.compiere.model.*;
+import org.compiere.model.X_AD_PrintGraph;
 
 /**
  *	Graph Model
diff --git a/base/src/org/compiere/print/MPrintPaper.java b/base/src/org/compiere/print/MPrintPaper.java
index a2cf05fb98..d3c58510ac 100644
--- a/base/src/org/compiere/print/MPrintPaper.java
+++ b/base/src/org/compiere/print/MPrintPaper.java
@@ -16,12 +16,20 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.sql.*;
-import java.util.*;
-import javax.print.attribute.*;
-import javax.print.attribute.standard.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.Size2DSyntax;
+import javax.print.attribute.standard.MediaSize;
+import javax.print.attribute.standard.MediaSizeName;
+
+import org.compiere.model.PO;
+import org.compiere.model.X_AD_PrintPaper;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.compiere.util.Language;
 
 /**
  *	AD_PrintPaper Print Paper Model
diff --git a/base/src/org/compiere/print/MPrintTableFormat.java b/base/src/org/compiere/print/MPrintTableFormat.java
index 8378e4463d..5555f44453 100644
--- a/base/src/org/compiere/print/MPrintTableFormat.java
+++ b/base/src/org/compiere/print/MPrintTableFormat.java
@@ -16,18 +16,27 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.awt.*;
-import java.math.*;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Image;
+import java.awt.Stroke;
+import java.awt.Toolkit;
+import java.math.BigDecimal;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+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.MAttachment;
+import org.compiere.model.MImage;
+import org.compiere.model.X_AD_PrintTableFormat;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	Table Print Format
diff --git a/base/src/org/compiere/print/PrintData.java b/base/src/org/compiere/print/PrintData.java
index a0e6c4bca2..0ad785de18 100644
--- a/base/src/org/compiere/print/PrintData.java
+++ b/base/src/org/compiere/print/PrintData.java
@@ -16,16 +16,27 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
-import org.compiere.*;
-import org.compiere.util.*;
-import org.w3c.dom.*;
+import java.io.File;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.compiere.Adempiere;
+import org.compiere.util.CLogger;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Trace;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
 /**
  *	Print Data Structure.
diff --git a/base/src/org/compiere/print/PrintDataElement.java b/base/src/org/compiere/print/PrintDataElement.java
index 85393cd674..d4db995c72 100644
--- a/base/src/org/compiere/print/PrintDataElement.java
+++ b/base/src/org/compiere/print/PrintDataElement.java
@@ -16,14 +16,15 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.math.*;
-import java.sql.*;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.util.Locale;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.compiere.model.MLocation;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Language;
+import org.compiere.util.NamePair;
 
 /**
  *	Print Data Element
diff --git a/base/src/org/compiere/print/PrintDataFunction.java b/base/src/org/compiere/print/PrintDataFunction.java
index 1f7d181789..7eee8ca2d4 100644
--- a/base/src/org/compiere/print/PrintDataFunction.java
+++ b/base/src/org/compiere/print/PrintDataFunction.java
@@ -16,8 +16,10 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.math.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
 
 /**
  * Print Data Function
diff --git a/base/src/org/compiere/print/PrintDataGroup.java b/base/src/org/compiere/print/PrintDataGroup.java
index 6ccc04487f..daa3d7f0e8 100644
--- a/base/src/org/compiere/print/PrintDataGroup.java
+++ b/base/src/org/compiere/print/PrintDataGroup.java
@@ -16,8 +16,10 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.util.*;
-import java.math.*;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 
 /**
  *	Group By Management
diff --git a/base/src/org/compiere/print/PrintDataHandler.java b/base/src/org/compiere/print/PrintDataHandler.java
index d2efd7fafa..2b14439020 100644
--- a/base/src/org/compiere/print/PrintDataHandler.java
+++ b/base/src/org/compiere/print/PrintDataHandler.java
@@ -16,10 +16,12 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Properties;
 
-import org.xml.sax.helpers.*;
-import org.xml.sax.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
 
 /**
  *	SAX Handler for parsing PrintData
diff --git a/base/src/org/compiere/print/PrintFormatUtil.java b/base/src/org/compiere/print/PrintFormatUtil.java
index be21832bc9..9c0a75fe64 100644
--- a/base/src/org/compiere/print/PrintFormatUtil.java
+++ b/base/src/org/compiere/print/PrintFormatUtil.java
@@ -16,10 +16,14 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	Print Format Utilities.
diff --git a/base/src/org/compiere/print/PrintUtil.java b/base/src/org/compiere/print/PrintUtil.java
index 936b1c24f3..bfecaf7e6d 100644
--- a/base/src/org/compiere/print/PrintUtil.java
+++ b/base/src/org/compiere/print/PrintUtil.java
@@ -16,14 +16,35 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.awt.print.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.print.*;
-import javax.print.attribute.*;
-import javax.print.attribute.standard.*;
-import javax.swing.*;
-import org.compiere.util.*;
+import java.awt.print.PageFormat;
+import java.awt.print.Pageable;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import javax.print.DocFlavor;
+import javax.print.PrintService;
+import javax.print.PrintServiceLookup;
+import javax.print.ServiceUIFactory;
+import javax.print.StreamPrintServiceFactory;
+import javax.print.attribute.Attribute;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.PrintServiceAttributeSet;
+import javax.print.attribute.standard.Copies;
+import javax.print.attribute.standard.JobName;
+import javax.print.attribute.standard.JobPriority;
+import javax.print.attribute.standard.OrientationRequested;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+
+import org.compiere.util.CLogMgt;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Language;
+import org.compiere.util.Msg;
 
 /**
  *  Print Utilities
diff --git a/base/src/org/compiere/print/View.java b/base/src/org/compiere/print/View.java
index af2747e0b9..fba60fa978 100644
--- a/base/src/org/compiere/print/View.java
+++ b/base/src/org/compiere/print/View.java
@@ -16,11 +16,18 @@
  *****************************************************************************/
 package org.compiere.print;
 
-import java.awt.*;
-import org.compiere.model.*;
-import org.compiere.print.layout.*;
-import org.compiere.swing.*;
-import org.compiere.util.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+
+import org.compiere.model.MQuery;
+import org.compiere.print.layout.LayoutEngine;
+import org.compiere.print.layout.Page;
+import org.compiere.swing.CPanel;
+import org.compiere.util.CLogger;
 
 /**
  *	View Panel
diff --git a/base/src/org/compiere/print/layout/BoxElement.java b/base/src/org/compiere/print/layout/BoxElement.java
index 356149c937..433e7f24dc 100644
--- a/base/src/org/compiere/print/layout/BoxElement.java
+++ b/base/src/org/compiere/print/layout/BoxElement.java
@@ -16,10 +16,13 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import org.compiere.print.*;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.geom.Point2D;
+import java.util.Properties;
+
+import org.compiere.print.MPrintFormatItem;
 
 
 /**
diff --git a/base/src/org/compiere/print/layout/Dimension2DImpl.java b/base/src/org/compiere/print/layout/Dimension2DImpl.java
index 86109b611d..3e142e0b25 100644
--- a/base/src/org/compiere/print/layout/Dimension2DImpl.java
+++ b/base/src/org/compiere/print/layout/Dimension2DImpl.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.awt.*;
-import java.awt.geom.*;
+import java.awt.Dimension;
+import java.awt.geom.Dimension2D;
 
 /**
  *	2D Dimesnion Implementation
diff --git a/base/src/org/compiere/print/layout/GraphElement.java b/base/src/org/compiere/print/layout/GraphElement.java
index 83796d1dd0..5311ab5a4d 100644
--- a/base/src/org/compiere/print/layout/GraphElement.java
+++ b/base/src/org/compiere/print/layout/GraphElement.java
@@ -16,10 +16,11 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import org.compiere.print.*;
+import java.awt.Graphics2D;
+import java.awt.geom.Point2D;
+import java.util.Properties;
+
+import org.compiere.print.MPrintGraph;
 
 /**
  *	Graphic Element
diff --git a/base/src/org/compiere/print/layout/GridElement.java b/base/src/org/compiere/print/layout/GridElement.java
index acb7a7bcec..197b55c65f 100644
--- a/base/src/org/compiere/print/layout/GridElement.java
+++ b/base/src/org/compiere/print/layout/GridElement.java
@@ -16,11 +16,16 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.awt.*;
-import java.awt.font.*;
-import java.awt.geom.*;
-import java.text.*;
-import java.util.*;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.font.FontRenderContext;
+import java.awt.font.TextAttribute;
+import java.awt.font.TextLayout;
+import java.awt.geom.Point2D;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+import java.util.Properties;
 
 /**
  *	Grid Element.
diff --git a/base/src/org/compiere/print/layout/HTMLElement.java b/base/src/org/compiere/print/layout/HTMLElement.java
index 685721d0ff..d1d33f7149 100644
--- a/base/src/org/compiere/print/layout/HTMLElement.java
+++ b/base/src/org/compiere/print/layout/HTMLElement.java
@@ -16,10 +16,10 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-//import org.compiere.model.*;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.geom.Point2D;
+import java.util.Properties;
 
 /**
  *	HTML Form Print ELement.
diff --git a/base/src/org/compiere/print/layout/HTMLRenderer.java b/base/src/org/compiere/print/layout/HTMLRenderer.java
index f449dffb75..016d8617e0 100644
--- a/base/src/org/compiere/print/layout/HTMLRenderer.java
+++ b/base/src/org/compiere/print/layout/HTMLRenderer.java
@@ -16,12 +16,24 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.awt.*;
-import java.io.*;
-import javax.swing.text.*;
-import javax.swing.text.html.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.logging.Level;
+
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
+import javax.swing.text.Position;
+import javax.swing.text.View;
+import javax.swing.text.ViewFactory;
+import javax.swing.text.html.HTMLDocument;
+import javax.swing.text.html.HTMLEditorKit;
+
+import org.compiere.util.CLogger;
 
 /**
  *	HTML Renderer View
diff --git a/base/src/org/compiere/print/layout/HeaderFooter.java b/base/src/org/compiere/print/layout/HeaderFooter.java
index 075730fdf1..67ba2a4d5f 100644
--- a/base/src/org/compiere/print/layout/HeaderFooter.java
+++ b/base/src/org/compiere/print/layout/HeaderFooter.java
@@ -16,9 +16,13 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.awt.*;
-import java.util.*;
-import org.compiere.model.*;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import org.compiere.model.MQuery;
 
 /**
  *	Header Footer
diff --git a/base/src/org/compiere/print/layout/ImageElement.java b/base/src/org/compiere/print/layout/ImageElement.java
index 3cfd9dd09c..cf769586eb 100644
--- a/base/src/org/compiere/print/layout/ImageElement.java
+++ b/base/src/org/compiere/print/layout/ImageElement.java
@@ -16,15 +16,23 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.awt.*;
-import java.awt.geom.*;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Toolkit;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
 import java.math.BigDecimal;
-import java.net.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.print.*;
-import org.compiere.util.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.model.MAttachment;
+import org.compiere.model.MImage;
+import org.compiere.print.MPrintFormatItem;
+import org.compiere.print.PrintDataElement;
+import org.compiere.util.CCache;
+import org.compiere.util.Env;
 
 /**
  *	Image Element
diff --git a/base/src/org/compiere/print/layout/LocationElement.java b/base/src/org/compiere/print/layout/LocationElement.java
index 27e49909d9..d3f13370c6 100644
--- a/base/src/org/compiere/print/layout/LocationElement.java
+++ b/base/src/org/compiere/print/layout/LocationElement.java
@@ -16,11 +16,12 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.awt.*;
-import java.util.*;
-import java.util.regex.*;
+import java.awt.Font;
+import java.awt.Paint;
+import java.util.Properties;
+import java.util.regex.Pattern;
 
-import org.compiere.model.*;
+import org.compiere.model.MLocation;
 
 /**
  *	Location/Address Element.
diff --git a/base/src/org/compiere/print/layout/Page.java b/base/src/org/compiere/print/layout/Page.java
index 9b78bda8cc..9654c9dc9e 100644
--- a/base/src/org/compiere/print/layout/Page.java
+++ b/base/src/org/compiere/print/layout/Page.java
@@ -16,10 +16,16 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.awt.*;
-import java.util.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import org.compiere.model.MQuery;
+import org.compiere.util.Msg;
 
 /**
  *	Layout Page
diff --git a/base/src/org/compiere/print/layout/ParameterElement.java b/base/src/org/compiere/print/layout/ParameterElement.java
index 9245e658a8..033ca9ae01 100644
--- a/base/src/org/compiere/print/layout/ParameterElement.java
+++ b/base/src/org/compiere/print/layout/ParameterElement.java
@@ -16,10 +16,11 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.util.*;
-import org.compiere.model.*;
-import org.compiere.print.*;
-import org.compiere.util.*;
+import java.util.Properties;
+
+import org.compiere.model.MQuery;
+import org.compiere.print.MPrintTableFormat;
+import org.compiere.util.Msg;
 
 /**
  *	Parameter Table
diff --git a/base/src/org/compiere/print/layout/PrintElement.java b/base/src/org/compiere/print/layout/PrintElement.java
index 1465b5d620..85b8037af0 100644
--- a/base/src/org/compiere/print/layout/PrintElement.java
+++ b/base/src/org/compiere/print/layout/PrintElement.java
@@ -16,14 +16,21 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.image.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.print.*;
-import org.compiere.util.*;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.geom.Point2D;
+import java.awt.image.ImageObserver;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.model.MQuery;
+import org.compiere.print.MPrintFormatItem;
+import org.compiere.util.CLogMgt;
+import org.compiere.util.CLogger;
 
 /**
  *  Print Element
diff --git a/base/src/org/compiere/print/layout/StringElement.java b/base/src/org/compiere/print/layout/StringElement.java
index 2c381e128e..bf38e5d376 100644
--- a/base/src/org/compiere/print/layout/StringElement.java
+++ b/base/src/org/compiere/print/layout/StringElement.java
@@ -16,15 +16,28 @@
  *****************************************************************************/
 package org.compiere.print.layout;
 
-import java.awt.*;
-import java.awt.font.*;
-import java.awt.geom.*;
-import java.text.*;
-import java.util.*;
-import java.util.regex.*;
-import org.compiere.model.*;
-import org.compiere.print.*;
-import org.compiere.util.*;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.Point;
+import java.awt.font.FontRenderContext;
+import java.awt.font.LineBreakMeasurer;
+import java.awt.font.TextAttribute;
+import java.awt.font.TextLayout;
+import java.awt.geom.Point2D;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+import java.text.CharacterIterator;
+import java.util.Properties;
+import java.util.regex.Pattern;
+
+import org.compiere.model.MQuery;
+import org.compiere.print.MPrintFormatItem;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Msg;
+import org.compiere.util.NamePair;
+import org.compiere.util.Util;
 
 /**
  *	String Form Print ELement.