summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2005-02-12 14:26:01 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2005-02-12 14:26:01 +0000
commit229536652a1c80839e45f1540869a1e2ea715081 (patch)
treebad1f9238e6c80f6a9fa1337739937f98455bb48
parentfe215e9d5a2d2cc49c4945d62bf101f1b1e2a1c5 (diff)
downloadclasspath-229536652a1c80839e45f1540869a1e2ea715081.tar.gz
2005-02-11 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/awt/color/ClutProfileConverter.java, gnu/java/awt/peer/ClasspathTextLayoutPeer.java, gnu/java/awt/peer/gtk/GdkFontPeer.java, gnu/java/awt/peer/gtk/GdkGlyphVector.java, gnu/java/awt/peer/gtk/GdkGraphics2D.java, gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java, gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, gnu/java/awt/peer/gtk/GdkRobotPeer.java, gnu/java/awt/peer/gtk/GdkTextLayout.java, gnu/java/awt/peer/gtk/GtkButtonPeer.java, gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkCheckboxPeer.java, gnu/java/awt/peer/gtk/GtkChoicePeer.java, gnu/java/awt/peer/gtk/GtkComponentPeer.java, gnu/java/awt/peer/gtk/GtkContainerPeer.java, gnu/java/awt/peer/gtk/GtkDialogPeer.java, gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, gnu/java/awt/peer/gtk/GtkFontPeer.java, gnu/java/awt/peer/gtk/GtkFramePeer.java, gnu/java/awt/peer/gtk/GtkLabelPeer.java, gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java, gnu/java/awt/peer/gtk/GtkMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkScrollPanePeer.java, gnu/java/awt/peer/gtk/GtkTextComponentPeer.java, gnu/java/awt/peer/gtk/GtkToolkit.java, gnu/java/awt/peer/gtk/GtkWindowPeer.java, gnu/java/io/EncodingManager.java, gnu/java/io/decode/DecoderUTF8.java, gnu/java/net/protocol/file/Connection.java, gnu/java/net/protocol/ftp/ActiveModeDTP.java, gnu/java/net/protocol/ftp/BlockInputStream.java, gnu/java/net/protocol/ftp/BlockOutputStream.java, gnu/java/net/protocol/ftp/CompressedOutputStream.java, gnu/java/net/protocol/ftp/StreamInputStream.java, gnu/java/net/protocol/ftp/StreamOutputStream.java, gnu/java/net/protocol/http/Cookie.java, gnu/java/net/protocol/http/HTTPConnection.java, gnu/java/net/protocol/http/HTTPDateFormat.java, gnu/java/net/protocol/http/Request.java, gnu/java/nio/SelectorImpl.java, gnu/java/rmi/dgc/DGCImpl.java, gnu/java/rmi/server/UnicastConnectionManager.java, gnu/java/security/pkcs/SignerInfo.java, gnu/java/security/provider/EncodedKeyFactory.java, gnu/java/security/provider/GnuDHPublicKey.java, gnu/java/security/provider/PKIXCertPathValidatorImpl.java, gnu/java/security/x509/X500DistinguishedName.java, gnu/java/security/x509/X509CRL.java, gnu/java/security/x509/X509CRLEntry.java, gnu/java/security/x509/X509Certificate.java, gnu/java/security/x509/ext/AuthorityKeyIdentifier.java, gnu/java/security/x509/ext/CertificatePolicies.java, gnu/java/security/x509/ext/PolicyConstraint.java, gnu/xml/aelfred2/SAXDriver.java, gnu/xml/dom/Consumer.java, gnu/xml/dom/DomCharacterData.java, gnu/xml/dom/DomDocument.java, gnu/xml/dom/DomDocumentBuilder.java, gnu/xml/dom/DomIterator.java, gnu/xml/dom/DomNode.java, gnu/xml/dom/DomXPathExpression.java, gnu/xml/dom/DomXPathResult.java, gnu/xml/dom/JAXPFactory.java, gnu/xml/dom/ls/DomLSException.java, gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java, gnu/xml/libxmlj/dom/GnomeXPathNodeList.java, gnu/xml/libxmlj/sax/GnomeXMLReader.java, gnu/xml/libxmlj/transform/GnomeTransformer.java, gnu/xml/libxmlj/transform/GnomeTransformerFactory.java, gnu/xml/libxmlj/util/XMLJ.java, gnu/xml/pipeline/CallFilter.java, gnu/xml/pipeline/DomConsumer.java, gnu/xml/pipeline/LinkFilter.java, gnu/xml/pipeline/NSFilter.java, gnu/xml/pipeline/TeeConsumer.java, gnu/xml/pipeline/ValidationConsumer.java, gnu/xml/pipeline/WellFormednessFilter.java, gnu/xml/pipeline/XIncludeFilter.java, gnu/xml/pipeline/XsltFilter.java, gnu/xml/transform/ApplyImportsNode.java, gnu/xml/transform/Bindings.java, gnu/xml/transform/DocumentFunction.java, gnu/xml/transform/FormatNumberFunction.java, gnu/xml/transform/NodeNumberNode.java, gnu/xml/transform/NumberNode.java, gnu/xml/transform/Stylesheet.java, gnu/xml/transform/SystemPropertyFunction.java, gnu/xml/transform/Template.java, gnu/xml/transform/TemplatesImpl.java, gnu/xml/transform/TransformerImpl.java, gnu/xml/transform/ValueOfNode.java, gnu/xml/transform/XSLURIResolver.java, gnu/xml/util/DoParse.java, gnu/xml/util/Resolver.java, gnu/xml/xpath/Expr.java, gnu/xml/xpath/FunctionCall.java, gnu/xml/xpath/RelationalExpr.java, gnu/xml/xpath/Selector.java, gnu/xml/xpath/XPathParser.java, java/beans/XMLDecoder.java, java/text/SimpleDateFormat.java, javax/swing/JPopupMenu.java, javax/swing/JSpinner.java, javax/swing/SortingFocusTraversalPolicy.java, javax/swing/SwingUtilities.java, javax/swing/plaf/basic/BasicComboBoxEditor.java, javax/swing/plaf/basic/BasicComboBoxRenderer.java, javax/swing/tree/DefaultMutableTreeNode.java, javax/xml/parsers/DocumentBuilder.java, javax/xml/parsers/DocumentBuilderFactory.java, javax/xml/transform/sax/SAXTransformerFactory.java, vm/reference/java/lang/VMClassLoader.java, vm/reference/java/lang/VMProcess.java, vm/reference/java/lang/VMRuntime.java, vm/reference/java/lang/VMSystem.java, vm/reference/java/security/VMAccessController.java: Removed unused imports and expanded starred imports.
-rw-r--r--ChangeLog121
-rw-r--r--gnu/java/awt/color/ClutProfileConverter.java1
-rw-r--r--gnu/java/awt/peer/ClasspathTextLayoutPeer.java7
-rw-r--r--gnu/java/awt/peer/gtk/GdkFontPeer.java18
-rw-r--r--gnu/java/awt/peer/gtk/GdkGlyphVector.java2
-rw-r--r--gnu/java/awt/peer/gtk/GdkGraphics2D.java4
-rw-r--r--gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java2
-rw-r--r--gnu/java/awt/peer/gtk/GdkPixbufDecoder.java4
-rw-r--r--gnu/java/awt/peer/gtk/GdkRobotPeer.java1
-rw-r--r--gnu/java/awt/peer/gtk/GdkTextLayout.java1
-rw-r--r--gnu/java/awt/peer/gtk/GtkButtonPeer.java1
-rw-r--r--gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java1
-rw-r--r--gnu/java/awt/peer/gtk/GtkCheckboxPeer.java2
-rw-r--r--gnu/java/awt/peer/gtk/GtkChoicePeer.java1
-rw-r--r--gnu/java/awt/peer/gtk/GtkComponentPeer.java2
-rw-r--r--gnu/java/awt/peer/gtk/GtkContainerPeer.java2
-rw-r--r--gnu/java/awt/peer/gtk/GtkDialogPeer.java2
-rw-r--r--gnu/java/awt/peer/gtk/GtkFileDialogPeer.java2
-rw-r--r--gnu/java/awt/peer/gtk/GtkFontPeer.java1
-rw-r--r--gnu/java/awt/peer/gtk/GtkFramePeer.java3
-rw-r--r--gnu/java/awt/peer/gtk/GtkLabelPeer.java2
-rw-r--r--gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java2
-rw-r--r--gnu/java/awt/peer/gtk/GtkMenuItemPeer.java2
-rw-r--r--gnu/java/awt/peer/gtk/GtkScrollPanePeer.java1
-rw-r--r--gnu/java/awt/peer/gtk/GtkTextComponentPeer.java3
-rw-r--r--gnu/java/awt/peer/gtk/GtkToolkit.java2
-rw-r--r--gnu/java/awt/peer/gtk/GtkWindowPeer.java1
-rw-r--r--gnu/java/io/EncodingManager.java1
-rw-r--r--gnu/java/io/decode/DecoderUTF8.java1
-rw-r--r--gnu/java/net/protocol/file/Connection.java1
-rw-r--r--gnu/java/net/protocol/ftp/ActiveModeDTP.java1
-rw-r--r--gnu/java/net/protocol/ftp/BlockInputStream.java1
-rw-r--r--gnu/java/net/protocol/ftp/BlockOutputStream.java1
-rw-r--r--gnu/java/net/protocol/ftp/CompressedOutputStream.java1
-rw-r--r--gnu/java/net/protocol/ftp/StreamInputStream.java1
-rw-r--r--gnu/java/net/protocol/ftp/StreamOutputStream.java1
-rw-r--r--gnu/java/net/protocol/http/Cookie.java1
-rw-r--r--gnu/java/net/protocol/http/HTTPConnection.java2
-rw-r--r--gnu/java/net/protocol/http/HTTPDateFormat.java12
-rw-r--r--gnu/java/net/protocol/http/Request.java1
-rw-r--r--gnu/java/nio/SelectorImpl.java2
-rw-r--r--gnu/java/rmi/dgc/DGCImpl.java1
-rw-r--r--gnu/java/rmi/server/UnicastConnectionManager.java1
-rw-r--r--gnu/java/security/pkcs/SignerInfo.java2
-rw-r--r--gnu/java/security/provider/EncodedKeyFactory.java14
-rw-r--r--gnu/java/security/provider/GnuDHPublicKey.java1
-rw-r--r--gnu/java/security/provider/PKIXCertPathValidatorImpl.java37
-rw-r--r--gnu/java/security/x509/X500DistinguishedName.java1
-rw-r--r--gnu/java/security/x509/X509CRL.java1
-rw-r--r--gnu/java/security/x509/X509CRLEntry.java1
-rw-r--r--gnu/java/security/x509/X509Certificate.java5
-rw-r--r--gnu/java/security/x509/ext/AuthorityKeyIdentifier.java1
-rw-r--r--gnu/java/security/x509/ext/CertificatePolicies.java1
-rw-r--r--gnu/java/security/x509/ext/PolicyConstraint.java2
-rw-r--r--gnu/xml/aelfred2/SAXDriver.java2
-rw-r--r--gnu/xml/dom/Consumer.java5
-rw-r--r--gnu/xml/dom/DomCharacterData.java2
-rw-r--r--gnu/xml/dom/DomDocument.java1
-rw-r--r--gnu/xml/dom/DomDocumentBuilder.java1
-rw-r--r--gnu/xml/dom/DomIterator.java2
-rw-r--r--gnu/xml/dom/DomNode.java2
-rw-r--r--gnu/xml/dom/DomXPathExpression.java1
-rw-r--r--gnu/xml/dom/DomXPathResult.java2
-rw-r--r--gnu/xml/dom/JAXPFactory.java1
-rw-r--r--gnu/xml/dom/ls/DomLSException.java2
-rw-r--r--gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java4
-rw-r--r--gnu/xml/libxmlj/dom/GnomeXPathNodeList.java1
-rw-r--r--gnu/xml/libxmlj/sax/GnomeXMLReader.java4
-rwxr-xr-xgnu/xml/libxmlj/transform/GnomeTransformer.java6
-rwxr-xr-xgnu/xml/libxmlj/transform/GnomeTransformerFactory.java1
-rw-r--r--gnu/xml/libxmlj/util/XMLJ.java1
-rw-r--r--gnu/xml/pipeline/CallFilter.java17
-rw-r--r--gnu/xml/pipeline/DomConsumer.java27
-rw-r--r--gnu/xml/pipeline/LinkFilter.java1
-rw-r--r--gnu/xml/pipeline/NSFilter.java9
-rw-r--r--gnu/xml/pipeline/TeeConsumer.java14
-rw-r--r--gnu/xml/pipeline/ValidationConsumer.java16
-rw-r--r--gnu/xml/pipeline/WellFormednessFilter.java9
-rw-r--r--gnu/xml/pipeline/XIncludeFilter.java1
-rw-r--r--gnu/xml/pipeline/XsltFilter.java1
-rw-r--r--gnu/xml/transform/ApplyImportsNode.java6
-rw-r--r--gnu/xml/transform/Bindings.java4
-rw-r--r--gnu/xml/transform/DocumentFunction.java6
-rw-r--r--gnu/xml/transform/FormatNumberFunction.java1
-rw-r--r--gnu/xml/transform/NodeNumberNode.java3
-rw-r--r--gnu/xml/transform/NumberNode.java1
-rw-r--r--gnu/xml/transform/Stylesheet.java2
-rw-r--r--gnu/xml/transform/SystemPropertyFunction.java1
-rw-r--r--gnu/xml/transform/Template.java2
-rw-r--r--gnu/xml/transform/TemplatesImpl.java3
-rw-r--r--gnu/xml/transform/TransformerImpl.java6
-rw-r--r--gnu/xml/transform/ValueOfNode.java3
-rw-r--r--gnu/xml/transform/XSLURIResolver.java1
-rw-r--r--gnu/xml/util/DoParse.java18
-rw-r--r--gnu/xml/util/Resolver.java10
-rw-r--r--gnu/xml/xpath/Expr.java2
-rw-r--r--gnu/xml/xpath/FunctionCall.java1
-rw-r--r--gnu/xml/xpath/RelationalExpr.java1
-rw-r--r--gnu/xml/xpath/Selector.java2
-rw-r--r--gnu/xml/xpath/XPathParser.java1
-rw-r--r--java/beans/XMLDecoder.java1
-rw-r--r--java/text/SimpleDateFormat.java1
-rw-r--r--javax/swing/JPopupMenu.java1
-rw-r--r--javax/swing/JSpinner.java1
-rw-r--r--javax/swing/SortingFocusTraversalPolicy.java1
-rw-r--r--javax/swing/SwingUtilities.java2
-rw-r--r--javax/swing/plaf/basic/BasicComboBoxEditor.java1
-rw-r--r--javax/swing/plaf/basic/BasicComboBoxRenderer.java1
-rw-r--r--javax/swing/tree/DefaultMutableTreeNode.java1
-rw-r--r--javax/xml/parsers/DocumentBuilder.java1
-rw-r--r--javax/xml/parsers/DocumentBuilderFactory.java3
-rw-r--r--javax/xml/transform/sax/SAXTransformerFactory.java3
-rw-r--r--vm/reference/java/lang/VMClassLoader.java3
-rw-r--r--vm/reference/java/lang/VMProcess.java2
-rw-r--r--vm/reference/java/lang/VMRuntime.java1
-rw-r--r--vm/reference/java/lang/VMSystem.java10
-rw-r--r--vm/reference/java/security/VMAccessController.java6
117 files changed, 251 insertions, 281 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fedd5707..77d6de2ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,124 @@
+2005-02-11 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * gnu/java/awt/color/ClutProfileConverter.java,
+ gnu/java/awt/peer/ClasspathTextLayoutPeer.java,
+ gnu/java/awt/peer/gtk/GdkFontPeer.java,
+ gnu/java/awt/peer/gtk/GdkGlyphVector.java,
+ gnu/java/awt/peer/gtk/GdkGraphics2D.java,
+ gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java,
+ gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,
+ gnu/java/awt/peer/gtk/GdkRobotPeer.java,
+ gnu/java/awt/peer/gtk/GdkTextLayout.java,
+ gnu/java/awt/peer/gtk/GtkButtonPeer.java,
+ gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java,
+ gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
+ gnu/java/awt/peer/gtk/GtkChoicePeer.java,
+ gnu/java/awt/peer/gtk/GtkComponentPeer.java,
+ gnu/java/awt/peer/gtk/GtkContainerPeer.java,
+ gnu/java/awt/peer/gtk/GtkDialogPeer.java,
+ gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
+ gnu/java/awt/peer/gtk/GtkFontPeer.java,
+ gnu/java/awt/peer/gtk/GtkFramePeer.java,
+ gnu/java/awt/peer/gtk/GtkLabelPeer.java,
+ gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
+ gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,
+ gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
+ gnu/java/awt/peer/gtk/GtkTextComponentPeer.java,
+ gnu/java/awt/peer/gtk/GtkToolkit.java,
+ gnu/java/awt/peer/gtk/GtkWindowPeer.java,
+ gnu/java/io/EncodingManager.java,
+ gnu/java/io/decode/DecoderUTF8.java,
+ gnu/java/net/protocol/file/Connection.java,
+ gnu/java/net/protocol/ftp/ActiveModeDTP.java,
+ gnu/java/net/protocol/ftp/BlockInputStream.java,
+ gnu/java/net/protocol/ftp/BlockOutputStream.java,
+ gnu/java/net/protocol/ftp/CompressedOutputStream.java,
+ gnu/java/net/protocol/ftp/StreamInputStream.java,
+ gnu/java/net/protocol/ftp/StreamOutputStream.java,
+ gnu/java/net/protocol/http/Cookie.java,
+ gnu/java/net/protocol/http/HTTPConnection.java,
+ gnu/java/net/protocol/http/HTTPDateFormat.java,
+ gnu/java/net/protocol/http/Request.java,
+ gnu/java/nio/SelectorImpl.java,
+ gnu/java/rmi/dgc/DGCImpl.java,
+ gnu/java/rmi/server/UnicastConnectionManager.java,
+ gnu/java/security/pkcs/SignerInfo.java,
+ gnu/java/security/provider/EncodedKeyFactory.java,
+ gnu/java/security/provider/GnuDHPublicKey.java,
+ gnu/java/security/provider/PKIXCertPathValidatorImpl.java,
+ gnu/java/security/x509/X500DistinguishedName.java,
+ gnu/java/security/x509/X509CRL.java,
+ gnu/java/security/x509/X509CRLEntry.java,
+ gnu/java/security/x509/X509Certificate.java,
+ gnu/java/security/x509/ext/AuthorityKeyIdentifier.java,
+ gnu/java/security/x509/ext/CertificatePolicies.java,
+ gnu/java/security/x509/ext/PolicyConstraint.java,
+ gnu/xml/aelfred2/SAXDriver.java,
+ gnu/xml/dom/Consumer.java,
+ gnu/xml/dom/DomCharacterData.java,
+ gnu/xml/dom/DomDocument.java,
+ gnu/xml/dom/DomDocumentBuilder.java,
+ gnu/xml/dom/DomIterator.java,
+ gnu/xml/dom/DomNode.java,
+ gnu/xml/dom/DomXPathExpression.java,
+ gnu/xml/dom/DomXPathResult.java,
+ gnu/xml/dom/JAXPFactory.java,
+ gnu/xml/dom/ls/DomLSException.java,
+ gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java,
+ gnu/xml/libxmlj/dom/GnomeXPathNodeList.java,
+ gnu/xml/libxmlj/sax/GnomeXMLReader.java,
+ gnu/xml/libxmlj/transform/GnomeTransformer.java,
+ gnu/xml/libxmlj/transform/GnomeTransformerFactory.java,
+ gnu/xml/libxmlj/util/XMLJ.java,
+ gnu/xml/pipeline/CallFilter.java,
+ gnu/xml/pipeline/DomConsumer.java,
+ gnu/xml/pipeline/LinkFilter.java,
+ gnu/xml/pipeline/NSFilter.java,
+ gnu/xml/pipeline/TeeConsumer.java,
+ gnu/xml/pipeline/ValidationConsumer.java,
+ gnu/xml/pipeline/WellFormednessFilter.java,
+ gnu/xml/pipeline/XIncludeFilter.java,
+ gnu/xml/pipeline/XsltFilter.java,
+ gnu/xml/transform/ApplyImportsNode.java,
+ gnu/xml/transform/Bindings.java,
+ gnu/xml/transform/DocumentFunction.java,
+ gnu/xml/transform/FormatNumberFunction.java,
+ gnu/xml/transform/NodeNumberNode.java,
+ gnu/xml/transform/NumberNode.java,
+ gnu/xml/transform/Stylesheet.java,
+ gnu/xml/transform/SystemPropertyFunction.java,
+ gnu/xml/transform/Template.java,
+ gnu/xml/transform/TemplatesImpl.java,
+ gnu/xml/transform/TransformerImpl.java,
+ gnu/xml/transform/ValueOfNode.java,
+ gnu/xml/transform/XSLURIResolver.java,
+ gnu/xml/util/DoParse.java,
+ gnu/xml/util/Resolver.java,
+ gnu/xml/xpath/Expr.java,
+ gnu/xml/xpath/FunctionCall.java,
+ gnu/xml/xpath/RelationalExpr.java,
+ gnu/xml/xpath/Selector.java,
+ gnu/xml/xpath/XPathParser.java,
+ java/beans/XMLDecoder.java,
+ java/text/SimpleDateFormat.java,
+ javax/swing/JPopupMenu.java,
+ javax/swing/JSpinner.java,
+ javax/swing/SortingFocusTraversalPolicy.java,
+ javax/swing/SwingUtilities.java,
+ javax/swing/plaf/basic/BasicComboBoxEditor.java,
+ javax/swing/plaf/basic/BasicComboBoxRenderer.java,
+ javax/swing/tree/DefaultMutableTreeNode.java,
+ javax/xml/parsers/DocumentBuilder.java,
+ javax/xml/parsers/DocumentBuilderFactory.java,
+ javax/xml/transform/sax/SAXTransformerFactory.java,
+ vm/reference/java/lang/VMClassLoader.java,
+ vm/reference/java/lang/VMProcess.java,
+ vm/reference/java/lang/VMRuntime.java,
+ vm/reference/java/lang/VMSystem.java,
+ vm/reference/java/security/VMAccessController.java:
+ Removed unused imports and expanded starred
+ imports.
+
2005-02-12 Michael Koch <konqueror@gmx.de>
* include/gnu_java_awt_peer_gtk_GdkFontPeer.h,
diff --git a/gnu/java/awt/color/ClutProfileConverter.java b/gnu/java/awt/color/ClutProfileConverter.java
index d33a6887e..5b06f48ee 100644
--- a/gnu/java/awt/color/ClutProfileConverter.java
+++ b/gnu/java/awt/color/ClutProfileConverter.java
@@ -38,7 +38,6 @@
package gnu.java.awt.color;
-import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
diff --git a/gnu/java/awt/peer/ClasspathTextLayoutPeer.java b/gnu/java/awt/peer/ClasspathTextLayoutPeer.java
index 143412caf..07b4b3eb4 100644
--- a/gnu/java/awt/peer/ClasspathTextLayoutPeer.java
+++ b/gnu/java/awt/peer/ClasspathTextLayoutPeer.java
@@ -38,19 +38,12 @@ exception statement from your version. */
package gnu.java.awt.peer;
-import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.Shape;
import java.awt.font.TextHitInfo;
import java.awt.font.TextLayout;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
-import java.text.CharacterIterator;
-import java.text.AttributedCharacterIterator;
-import java.text.AttributedString;
-import java.util.Map;
-import java.awt.font.TextAttribute;
-
/**
* @author Graydon Hoare
diff --git a/gnu/java/awt/peer/gtk/GdkFontPeer.java b/gnu/java/awt/peer/gtk/GdkFontPeer.java
index 5a42e8b99..5573a1b4d 100644
--- a/gnu/java/awt/peer/gtk/GdkFontPeer.java
+++ b/gnu/java/awt/peer/gtk/GdkFontPeer.java
@@ -37,19 +37,21 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
-import java.awt.peer.FontPeer;
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.font.*;
+
+import gnu.classpath.Configuration;
+import gnu.java.awt.peer.ClasspathFontPeer;
+
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.awt.font.LineMetrics;
+import java.awt.geom.Rectangle2D;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
-import java.util.MissingResourceException;
import java.text.CharacterIterator;
-import java.text.AttributedCharacterIterator;
import java.text.StringCharacterIterator;
-import gnu.classpath.Configuration;
-import gnu.java.awt.peer.ClasspathFontPeer;
public class GdkFontPeer extends ClasspathFontPeer
{
diff --git a/gnu/java/awt/peer/gtk/GdkGlyphVector.java b/gnu/java/awt/peer/gtk/GdkGlyphVector.java
index 325dd598c..4e66a86eb 100644
--- a/gnu/java/awt/peer/gtk/GdkGlyphVector.java
+++ b/gnu/java/awt/peer/gtk/GdkGlyphVector.java
@@ -38,8 +38,6 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
-import gnu.classpath.Configuration;
-
import java.awt.Font;
import java.awt.Rectangle;
import java.awt.Shape;
diff --git a/gnu/java/awt/peer/gtk/GdkGraphics2D.java b/gnu/java/awt/peer/gtk/GdkGraphics2D.java
index 8e39dce3c..00713a591 100644
--- a/gnu/java/awt/peer/gtk/GdkGraphics2D.java
+++ b/gnu/java/awt/peer/gtk/GdkGraphics2D.java
@@ -40,7 +40,6 @@ package gnu.java.awt.peer.gtk;
import gnu.classpath.Configuration;
import gnu.java.awt.ClasspathToolkit;
-import gnu.java.awt.peer.ClasspathFontPeer;
import java.awt.AlphaComposite;
import java.awt.BasicStroke;
@@ -60,9 +59,7 @@ import java.awt.Shape;
import java.awt.Stroke;
import java.awt.TexturePaint;
import java.awt.Toolkit;
-import java.awt.color.ColorSpace;
import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphJustificationInfo;
import java.awt.font.GlyphVector;
import java.awt.geom.AffineTransform;
import java.awt.geom.Arc2D;
@@ -80,7 +77,6 @@ import java.awt.image.DataBuffer;
import java.awt.image.DataBufferInt;
import java.awt.image.DirectColorModel;
import java.awt.image.FilteredImageSource;
-import java.awt.image.ImageConsumer;
import java.awt.image.ImageObserver;
import java.awt.image.ImagingOpException;
import java.awt.image.MultiPixelPackedSampleModel;
diff --git a/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java b/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
index 9557b80fa..1f10c4869 100644
--- a/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
+++ b/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
@@ -43,8 +43,6 @@ import java.awt.Graphics2D;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
-import java.awt.Rectangle;
-import java.awt.Shape;
import java.awt.image.BufferedImage;
import java.util.Locale;
diff --git a/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java b/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
index 01f4e2911..a9c1fb9db 100644
--- a/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
+++ b/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
@@ -42,16 +42,12 @@ import gnu.classpath.Configuration;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
-import java.awt.image.DataBufferInt;
import java.awt.image.DirectColorModel;
import java.awt.image.ImageConsumer;
import java.awt.image.ImageProducer;
import java.awt.image.Raster;
import java.awt.image.RenderedImage;
-import java.awt.image.WritableRaster;
import java.io.DataOutput;
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
diff --git a/gnu/java/awt/peer/gtk/GdkRobotPeer.java b/gnu/java/awt/peer/gtk/GdkRobotPeer.java
index 71e11730e..2438b6850 100644
--- a/gnu/java/awt/peer/gtk/GdkRobotPeer.java
+++ b/gnu/java/awt/peer/gtk/GdkRobotPeer.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
import java.awt.AWTException;
-import java.awt.Color;
import java.awt.GraphicsDevice;
import java.awt.image.ColorModel;
import java.awt.image.DirectColorModel;
diff --git a/gnu/java/awt/peer/gtk/GdkTextLayout.java b/gnu/java/awt/peer/gtk/GdkTextLayout.java
index 26cfc16f0..b5548a837 100644
--- a/gnu/java/awt/peer/gtk/GdkTextLayout.java
+++ b/gnu/java/awt/peer/gtk/GdkTextLayout.java
@@ -52,7 +52,6 @@ import java.awt.geom.Rectangle2D;
import java.text.CharacterIterator;
import java.text.AttributedCharacterIterator;
import java.text.AttributedString;
-import java.util.Map;
import java.awt.font.TextAttribute;
import gnu.classpath.Configuration;
diff --git a/gnu/java/awt/peer/gtk/GtkButtonPeer.java b/gnu/java/awt/peer/gtk/GtkButtonPeer.java
index 9fba828b7..1ef992f02 100644
--- a/gnu/java/awt/peer/gtk/GtkButtonPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkButtonPeer.java
@@ -41,7 +41,6 @@ package gnu.java.awt.peer.gtk;
import java.awt.AWTEvent;
import java.awt.Button;
import java.awt.Component;
-import java.awt.Font;
import java.awt.Point;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
diff --git a/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java b/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java
index 2d1f65008..39f8a7a74 100644
--- a/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java
@@ -42,7 +42,6 @@ import java.awt.ItemSelectable;
import java.awt.event.ItemEvent;
import java.awt.CheckboxMenuItem;
import java.awt.peer.CheckboxMenuItemPeer;
-import java.awt.peer.MenuItemPeer;
public class GtkCheckboxMenuItemPeer extends GtkMenuItemPeer
implements CheckboxMenuItemPeer
diff --git a/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java b/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
index a6fd1bac1..4af88f533 100644
--- a/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
@@ -40,8 +40,6 @@ package gnu.java.awt.peer.gtk;
import java.awt.Checkbox;
import java.awt.CheckboxGroup;
-import java.awt.Component;
-import java.awt.Font;
import java.awt.peer.CheckboxPeer;
public class GtkCheckboxPeer extends GtkComponentPeer
diff --git a/gnu/java/awt/peer/gtk/GtkChoicePeer.java b/gnu/java/awt/peer/gtk/GtkChoicePeer.java
index 05464143d..a065e13ab 100644
--- a/gnu/java/awt/peer/gtk/GtkChoicePeer.java
+++ b/gnu/java/awt/peer/gtk/GtkChoicePeer.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
-import java.awt.AWTEvent;
import java.awt.Choice;
import java.awt.event.ItemEvent;
import java.awt.peer.ChoicePeer;
diff --git a/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
index bd7396e0a..d9d9907e9 100644
--- a/gnu/java/awt/peer/gtk/GtkComponentPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
@@ -47,14 +47,12 @@ import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
-import java.awt.Frame;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.Image;
import java.awt.Insets;
import java.awt.ItemSelectable;
-import java.awt.KeyboardFocusManager;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Toolkit;
diff --git a/gnu/java/awt/peer/gtk/GtkContainerPeer.java b/gnu/java/awt/peer/gtk/GtkContainerPeer.java
index 7fddd5661..61551835e 100644
--- a/gnu/java/awt/peer/gtk/GtkContainerPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkContainerPeer.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
-import java.awt.AWTEvent;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
@@ -46,7 +45,6 @@ import java.awt.Font;
import java.awt.Graphics;
import java.awt.Insets;
import java.awt.Window;
-import java.awt.event.PaintEvent;
import java.awt.peer.ComponentPeer;
import java.awt.peer.ContainerPeer;
diff --git a/gnu/java/awt/peer/gtk/GtkDialogPeer.java b/gnu/java/awt/peer/gtk/GtkDialogPeer.java
index e45303dfe..9bf234404 100644
--- a/gnu/java/awt/peer/gtk/GtkDialogPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkDialogPeer.java
@@ -38,8 +38,6 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
-import java.awt.AWTEvent;
-import java.awt.Component;
import java.awt.Dialog;
import java.awt.Graphics;
import java.awt.Rectangle;
diff --git a/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java b/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
index a92b1ed9f..fd9c155d2 100644
--- a/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
@@ -38,12 +38,10 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
-import java.awt.AWTEvent;
import java.awt.Dialog;
import java.awt.FileDialog;
import java.awt.Graphics;
import java.awt.Window;
-import java.awt.event.WindowEvent;
import java.awt.peer.FileDialogPeer;
import java.io.File;
import java.io.FilenameFilter;
diff --git a/gnu/java/awt/peer/gtk/GtkFontPeer.java b/gnu/java/awt/peer/gtk/GtkFontPeer.java
index 605d738a1..1369657a8 100644
--- a/gnu/java/awt/peer/gtk/GtkFontPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkFontPeer.java
@@ -46,7 +46,6 @@ import java.awt.font.FontRenderContext;
import java.awt.font.GlyphVector;
import java.awt.font.LineMetrics;
import java.awt.geom.Rectangle2D;
-import java.awt.peer.FontPeer;
import java.text.CharacterIterator;
import java.util.Locale;
import java.util.MissingResourceException;
diff --git a/gnu/java/awt/peer/gtk/GtkFramePeer.java b/gnu/java/awt/peer/gtk/GtkFramePeer.java
index 5b0f03bb1..b22a25e88 100644
--- a/gnu/java/awt/peer/gtk/GtkFramePeer.java
+++ b/gnu/java/awt/peer/gtk/GtkFramePeer.java
@@ -38,11 +38,8 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
-import java.awt.Component;
-import java.awt.Container;
import java.awt.Frame;
import java.awt.Graphics;
-import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.MenuBar;
import java.awt.Rectangle;
diff --git a/gnu/java/awt/peer/gtk/GtkLabelPeer.java b/gnu/java/awt/peer/gtk/GtkLabelPeer.java
index 25473d78e..3e3e2e3f1 100644
--- a/gnu/java/awt/peer/gtk/GtkLabelPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkLabelPeer.java
@@ -38,8 +38,6 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
-import java.awt.Component;
-import java.awt.Font;
import java.awt.Label;
import java.awt.peer.LabelPeer;
diff --git a/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java b/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
index dd061ed37..cd7ca8ac7 100644
--- a/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
@@ -38,8 +38,6 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
-import java.awt.Font;
-import java.awt.MenuComponent;
import java.awt.peer.MenuComponentPeer;
public class GtkMenuComponentPeer extends GtkGenericPeer
diff --git a/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java b/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
index 81da90df0..33242f69c 100644
--- a/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
@@ -43,8 +43,6 @@ import java.awt.Menu;
import java.awt.MenuComponent;
import java.awt.MenuBar;
import java.awt.MenuItem;
-import java.awt.peer.MenuBarPeer;
-import java.awt.peer.MenuComponentPeer;
import java.awt.peer.MenuItemPeer;
import java.awt.peer.MenuPeer;
diff --git a/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java b/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java
index 233bed75a..b99ef24c8 100644
--- a/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java
+++ b/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java
@@ -41,7 +41,6 @@ package gnu.java.awt.peer.gtk;
import java.awt.Adjustable;
import java.awt.Dimension;
import java.awt.ScrollPane;
-import java.awt.peer.ComponentPeer;
import java.awt.peer.ScrollPanePeer;
public class GtkScrollPanePeer extends GtkContainerPeer
diff --git a/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java b/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java
index 538abdb85..3051ecfcf 100644
--- a/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java
@@ -38,11 +38,8 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
-import java.awt.AWTEvent;
-import java.awt.Component;
import java.awt.Rectangle;
import java.awt.TextComponent;
-import java.awt.event.KeyEvent;
import java.awt.event.TextEvent;
import java.awt.peer.TextComponentPeer;
diff --git a/gnu/java/awt/peer/gtk/GtkToolkit.java b/gnu/java/awt/peer/gtk/GtkToolkit.java
index dadb65b81..f57f53a17 100644
--- a/gnu/java/awt/peer/gtk/GtkToolkit.java
+++ b/gnu/java/awt/peer/gtk/GtkToolkit.java
@@ -51,7 +51,6 @@ import java.awt.datatransfer.Clipboard;
import java.awt.dnd.DragGestureEvent;
import java.awt.dnd.peer.DragSourceContextPeer;
import java.awt.font.FontRenderContext;
-import java.awt.font.TextAttribute;
import java.awt.im.InputMethodHighlight;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
@@ -68,7 +67,6 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.MissingResourceException;
import java.util.Properties;
import javax.imageio.spi.IIORegistry;
diff --git a/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/gnu/java/awt/peer/gtk/GtkWindowPeer.java
index 2bde81104..1d6e253b0 100644
--- a/gnu/java/awt/peer/gtk/GtkWindowPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkWindowPeer.java
@@ -39,7 +39,6 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
import java.awt.Component;
-import java.awt.Dimension;
import java.awt.Frame;
import java.awt.Window;
import java.awt.event.WindowEvent;
diff --git a/gnu/java/io/EncodingManager.java b/gnu/java/io/EncodingManager.java
index 6a20e53b3..0b56ac0b2 100644
--- a/gnu/java/io/EncodingManager.java
+++ b/gnu/java/io/EncodingManager.java
@@ -46,7 +46,6 @@ import java.lang.reflect.Constructor;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
-import java.security.AccessController;
import java.util.Hashtable;
import java.util.StringTokenizer;
diff --git a/gnu/java/io/decode/DecoderUTF8.java b/gnu/java/io/decode/DecoderUTF8.java
index e44937fcd..b4f7c25df 100644
--- a/gnu/java/io/decode/DecoderUTF8.java
+++ b/gnu/java/io/decode/DecoderUTF8.java
@@ -39,7 +39,6 @@ exception statement from your version. */
package gnu.java.io.decode;
import java.io.InputStream;
-import java.io.CharConversionException;
import java.io.IOException;
/**
diff --git a/gnu/java/net/protocol/file/Connection.java b/gnu/java/net/protocol/file/Connection.java
index a2b569623..3a37def99 100644
--- a/gnu/java/net/protocol/file/Connection.java
+++ b/gnu/java/net/protocol/file/Connection.java
@@ -53,7 +53,6 @@ import java.net.ProtocolException;
import java.net.URL;
import java.net.URLConnection;
import java.security.Permission;
-import java.security.AccessController;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
diff --git a/gnu/java/net/protocol/ftp/ActiveModeDTP.java b/gnu/java/net/protocol/ftp/ActiveModeDTP.java
index bd0fc2820..ab387e4a9 100644
--- a/gnu/java/net/protocol/ftp/ActiveModeDTP.java
+++ b/gnu/java/net/protocol/ftp/ActiveModeDTP.java
@@ -42,7 +42,6 @@ import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.InetAddress;
-import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
diff --git a/gnu/java/net/protocol/ftp/BlockInputStream.java b/gnu/java/net/protocol/ftp/BlockInputStream.java
index 778b3363d..f72d8df25 100644
--- a/gnu/java/net/protocol/ftp/BlockInputStream.java
+++ b/gnu/java/net/protocol/ftp/BlockInputStream.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.java.net.protocol.ftp;
-import java.io.FilterInputStream;
import java.io.InputStream;
import java.io.IOException;
diff --git a/gnu/java/net/protocol/ftp/BlockOutputStream.java b/gnu/java/net/protocol/ftp/BlockOutputStream.java
index 997561a6f..15ee95679 100644
--- a/gnu/java/net/protocol/ftp/BlockOutputStream.java
+++ b/gnu/java/net/protocol/ftp/BlockOutputStream.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.java.net.protocol.ftp;
-import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/gnu/java/net/protocol/ftp/CompressedOutputStream.java b/gnu/java/net/protocol/ftp/CompressedOutputStream.java
index 06366d912..136d8b635 100644
--- a/gnu/java/net/protocol/ftp/CompressedOutputStream.java
+++ b/gnu/java/net/protocol/ftp/CompressedOutputStream.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.java.net.protocol.ftp;
-import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/gnu/java/net/protocol/ftp/StreamInputStream.java b/gnu/java/net/protocol/ftp/StreamInputStream.java
index abe1d5173..0ee8857f8 100644
--- a/gnu/java/net/protocol/ftp/StreamInputStream.java
+++ b/gnu/java/net/protocol/ftp/StreamInputStream.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.java.net.protocol.ftp;
-import java.io.FilterInputStream;
import java.io.InputStream;
import java.io.IOException;
diff --git a/gnu/java/net/protocol/ftp/StreamOutputStream.java b/gnu/java/net/protocol/ftp/StreamOutputStream.java
index ff669e220..67fd4f3b8 100644
--- a/gnu/java/net/protocol/ftp/StreamOutputStream.java
+++ b/gnu/java/net/protocol/ftp/StreamOutputStream.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.java.net.protocol.ftp;
-import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/gnu/java/net/protocol/http/Cookie.java b/gnu/java/net/protocol/http/Cookie.java
index fc4fde4f0..452ca0f7a 100644
--- a/gnu/java/net/protocol/http/Cookie.java
+++ b/gnu/java/net/protocol/http/Cookie.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.java.net.protocol.http;
-import java.text.ParseException;
import java.util.Date;
/**
diff --git a/gnu/java/net/protocol/http/HTTPConnection.java b/gnu/java/net/protocol/http/HTTPConnection.java
index 9029ca835..4dee4a226 100644
--- a/gnu/java/net/protocol/http/HTTPConnection.java
+++ b/gnu/java/net/protocol/http/HTTPConnection.java
@@ -54,12 +54,10 @@ import java.net.InetSocketAddress;
import java.net.Socket;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.net.SocketFactory;
import javax.net.ssl.HandshakeCompletedListener;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
diff --git a/gnu/java/net/protocol/http/HTTPDateFormat.java b/gnu/java/net/protocol/http/HTTPDateFormat.java
index 22ef05631..0137596aa 100644
--- a/gnu/java/net/protocol/http/HTTPDateFormat.java
+++ b/gnu/java/net/protocol/http/HTTPDateFormat.java
@@ -38,9 +38,15 @@ exception statement from your version. */
package gnu.java.net.protocol.http;
-import java.io.PrintStream;
-import java.text.*;
-import java.util.*;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.FieldPosition;
+import java.text.NumberFormat;
+import java.text.ParsePosition;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
/**
* HTTP date formatter and parser.
diff --git a/gnu/java/net/protocol/http/Request.java b/gnu/java/net/protocol/http/Request.java
index 123e889c0..62a1a535a 100644
--- a/gnu/java/net/protocol/http/Request.java
+++ b/gnu/java/net/protocol/http/Request.java
@@ -46,7 +46,6 @@ import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.ProtocolException;
-import java.net.Socket;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.DateFormat;
diff --git a/gnu/java/nio/SelectorImpl.java b/gnu/java/nio/SelectorImpl.java
index c30c3e2cd..f64c86d1f 100644
--- a/gnu/java/nio/SelectorImpl.java
+++ b/gnu/java/nio/SelectorImpl.java
@@ -38,8 +38,6 @@ exception statement from your version. */
package gnu.java.nio;
-import gnu.classpath.Configuration;
-
import java.io.IOException;
import java.nio.channels.ClosedSelectorException;
import java.nio.channels.SelectableChannel;
diff --git a/gnu/java/rmi/dgc/DGCImpl.java b/gnu/java/rmi/dgc/DGCImpl.java
index 4216b6466..483ac54f1 100644
--- a/gnu/java/rmi/dgc/DGCImpl.java
+++ b/gnu/java/rmi/dgc/DGCImpl.java
@@ -42,7 +42,6 @@ import java.rmi.dgc.Lease;
import java.rmi.dgc.VMID;
import java.rmi.server.ObjID;
import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
import java.rmi.server.RMISocketFactory;
import gnu.java.rmi.server.UnicastServerRef;
diff --git a/gnu/java/rmi/server/UnicastConnectionManager.java b/gnu/java/rmi/server/UnicastConnectionManager.java
index cf08a08ab..ef01c8264 100644
--- a/gnu/java/rmi/server/UnicastConnectionManager.java
+++ b/gnu/java/rmi/server/UnicastConnectionManager.java
@@ -55,7 +55,6 @@ import java.rmi.server.RMIServerSocketFactory;
import java.rmi.server.RMIClientSocketFactory;
import java.util.ArrayList;
import java.util.ConcurrentModificationException;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
diff --git a/gnu/java/security/pkcs/SignerInfo.java b/gnu/java/security/pkcs/SignerInfo.java
index 444429493..15fe9f9f8 100644
--- a/gnu/java/security/pkcs/SignerInfo.java
+++ b/gnu/java/security/pkcs/SignerInfo.java
@@ -41,11 +41,9 @@ import gnu.java.security.ber.BER;
import gnu.java.security.ber.BEREncodingException;
import gnu.java.security.ber.BERReader;
import gnu.java.security.ber.BERValue;
-import gnu.java.security.der.BitString;
import gnu.java.security.der.DERValue;
import java.io.IOException;
-import java.io.InputStream;
import java.math.BigInteger;
diff --git a/gnu/java/security/provider/EncodedKeyFactory.java b/gnu/java/security/provider/EncodedKeyFactory.java
index e308d443f..7dc5ee933 100644
--- a/gnu/java/security/provider/EncodedKeyFactory.java
+++ b/gnu/java/security/provider/EncodedKeyFactory.java
@@ -38,6 +38,11 @@ exception statement from your version. */
package gnu.java.security.provider;
+import gnu.java.security.OID;
+import gnu.java.security.der.BitString;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+
import java.io.IOException;
import java.math.BigInteger;
@@ -45,15 +50,12 @@ import java.math.BigInteger;
import java.security.AlgorithmParameters;
import java.security.InvalidKeyException;
import java.security.Key;
-import java.security.KeyFactory;
import java.security.KeyFactorySpi;
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.spec.DSAParameterSpec;
-import java.security.spec.DSAPrivateKeySpec;
-import java.security.spec.DSAPublicKeySpec;
import java.security.spec.InvalidParameterSpecException;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
@@ -64,12 +66,6 @@ import java.security.spec.X509EncodedKeySpec;
import javax.crypto.spec.DHParameterSpec;
-import gnu.java.security.OID;
-import gnu.java.security.der.BitString;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERReader;
-import gnu.java.security.der.DERValue;
-
/**
* A factory for keys encoded in either the X.509 format (for public
* keys) or the PKCS#8 format (for private keys).
diff --git a/gnu/java/security/provider/GnuDHPublicKey.java b/gnu/java/security/provider/GnuDHPublicKey.java
index a650761dc..fbf9d9f86 100644
--- a/gnu/java/security/provider/GnuDHPublicKey.java
+++ b/gnu/java/security/provider/GnuDHPublicKey.java
@@ -49,7 +49,6 @@ import gnu.java.security.OID;
import gnu.java.security.der.BitString;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERValue;
-import gnu.java.security.der.DERWriter;
public class GnuDHPublicKey implements DHPublicKey
{
diff --git a/gnu/java/security/provider/PKIXCertPathValidatorImpl.java b/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
index 7d1d857a0..7bba50213 100644
--- a/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
+++ b/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
@@ -38,18 +38,40 @@ exception statement from your version. */
package gnu.java.security.provider;
+import gnu.java.security.OID;
+import gnu.java.security.x509.GnuPKIExtension;
+import gnu.java.security.x509.PolicyNodeImpl;
+import gnu.java.security.x509.X509CertSelectorImpl;
+import gnu.java.security.x509.X509CRLSelectorImpl;
+import gnu.java.security.x509.ext.BasicConstraints;
+import gnu.java.security.x509.ext.CertificatePolicies;
+import gnu.java.security.x509.ext.Extension;
+import gnu.java.security.x509.ext.KeyUsage;
+import gnu.java.security.x509.ext.PolicyConstraint;
+
import java.io.IOException;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
-import java.security.Principal;
import java.security.PublicKey;
-import java.security.cert.*;
-
+import java.security.cert.CertificateException;
+import java.security.cert.CertPath;
+import java.security.cert.CertPathParameters;
+import java.security.cert.CertPathValidatorException;
+import java.security.cert.CertPathValidatorResult;
+import java.security.cert.CertPathValidatorSpi;
+import java.security.cert.CertStore;
+import java.security.cert.CertStoreException;
+import java.security.cert.CRL;
+import java.security.cert.PKIXCertPathChecker;
+import java.security.cert.PKIXCertPathValidatorResult;
+import java.security.cert.PKIXParameters;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509Certificate;
+import java.security.cert.X509CRL;
import java.security.interfaces.DSAParams;
import java.security.interfaces.DSAPublicKey;
-import java.security.spec.DSAParameterSpec;
import java.util.Arrays;
import java.util.Collection;
@@ -61,13 +83,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import gnu.java.security.x509.GnuPKIExtension;
-import gnu.java.security.x509.PolicyNodeImpl;
-import gnu.java.security.x509.X509CertSelectorImpl;
-import gnu.java.security.x509.X509CRLSelectorImpl;
-import gnu.java.security.x509.ext.*;
-import gnu.java.security.OID;
-
/**
* An implementation of the Public Key Infrastructure's X.509
* certificate path validation algorithm.
diff --git a/gnu/java/security/x509/X500DistinguishedName.java b/gnu/java/security/x509/X500DistinguishedName.java
index 64e320bef..daf76a22d 100644
--- a/gnu/java/security/x509/X500DistinguishedName.java
+++ b/gnu/java/security/x509/X500DistinguishedName.java
@@ -55,7 +55,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader;
diff --git a/gnu/java/security/x509/X509CRL.java b/gnu/java/security/x509/X509CRL.java
index adaa003f3..33263af43 100644
--- a/gnu/java/security/x509/X509CRL.java
+++ b/gnu/java/security/x509/X509CRL.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.java.security.x509;
-import gnu.java.io.ASN1ParsingException;
import gnu.java.security.OID;
import gnu.java.security.der.BitString;
import gnu.java.security.der.DER;
diff --git a/gnu/java/security/x509/X509CRLEntry.java b/gnu/java/security/x509/X509CRLEntry.java
index 252737c0e..da161153c 100644
--- a/gnu/java/security/x509/X509CRLEntry.java
+++ b/gnu/java/security/x509/X509CRLEntry.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.java.security.x509;
-import java.io.InputStream;
import java.io.IOException;
import java.math.BigInteger;
diff --git a/gnu/java/security/x509/X509Certificate.java b/gnu/java/security/x509/X509Certificate.java
index 98de42b0c..7009be423 100644
--- a/gnu/java/security/x509/X509Certificate.java
+++ b/gnu/java/security/x509/X509Certificate.java
@@ -38,18 +38,14 @@ exception statement from your version. */
package gnu.java.security.x509;
-import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.IOException;
-import java.io.ObjectStreamException;
import java.io.PrintWriter;
import java.io.Serializable;
import java.io.StringWriter;
import java.math.BigInteger;
-import java.net.InetAddress;
-
import java.security.AlgorithmParameters;
import java.security.InvalidKeyException;
import java.security.KeyFactory;
@@ -79,7 +75,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
diff --git a/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java b/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java
index 6f4e00b3f..544152199 100644
--- a/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java
+++ b/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java
@@ -40,7 +40,6 @@ package gnu.java.security.x509.ext;
import java.io.IOException;
import java.math.BigInteger;
-import java.util.List;
import gnu.java.security.OID;
import gnu.java.security.der.DER;
diff --git a/gnu/java/security/x509/ext/CertificatePolicies.java b/gnu/java/security/x509/ext/CertificatePolicies.java
index 206fa7efa..9c14dc96e 100644
--- a/gnu/java/security/x509/ext/CertificatePolicies.java
+++ b/gnu/java/security/x509/ext/CertificatePolicies.java
@@ -39,7 +39,6 @@ exception statement from your version. */
package gnu.java.security.x509.ext;
import java.io.IOException;
-import java.math.BigInteger;
import java.security.cert.PolicyQualifierInfo;
import java.util.ArrayList;
diff --git a/gnu/java/security/x509/ext/PolicyConstraint.java b/gnu/java/security/x509/ext/PolicyConstraint.java
index 0949b5000..e33f960b3 100644
--- a/gnu/java/security/x509/ext/PolicyConstraint.java
+++ b/gnu/java/security/x509/ext/PolicyConstraint.java
@@ -42,10 +42,8 @@ import java.io.IOException;
import java.math.BigInteger;
import gnu.java.security.OID;
-import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader;
import gnu.java.security.der.DERValue;
-import gnu.java.security.x509.Util;
public class PolicyConstraint extends Extension.Value
{
diff --git a/gnu/xml/aelfred2/SAXDriver.java b/gnu/xml/aelfred2/SAXDriver.java
index bf3d7476f..e3e0968dd 100644
--- a/gnu/xml/aelfred2/SAXDriver.java
+++ b/gnu/xml/aelfred2/SAXDriver.java
@@ -65,10 +65,8 @@ import java.util.Stack;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
-import java.util.Vector;
import org.xml.sax.*;
import org.xml.sax.ext.*;
diff --git a/gnu/xml/dom/Consumer.java b/gnu/xml/dom/Consumer.java
index 1aad5be92..426b1e5da 100644
--- a/gnu/xml/dom/Consumer.java
+++ b/gnu/xml/dom/Consumer.java
@@ -38,16 +38,11 @@ exception statement from your version. */
package gnu.xml.dom;
-import java.io.IOException;
-
-import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
-import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
import org.xml.sax.Attributes;
-import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ext.Attributes2;
diff --git a/gnu/xml/dom/DomCharacterData.java b/gnu/xml/dom/DomCharacterData.java
index fc4313e5f..e5cc23189 100644
--- a/gnu/xml/dom/DomCharacterData.java
+++ b/gnu/xml/dom/DomCharacterData.java
@@ -39,8 +39,6 @@ package gnu.xml.dom;
import org.w3c.dom.CharacterData;
import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.w3c.dom.events.MutationEvent;
diff --git a/gnu/xml/dom/DomDocument.java b/gnu/xml/dom/DomDocument.java
index 908857168..d8ccc9d82 100644
--- a/gnu/xml/dom/DomDocument.java
+++ b/gnu/xml/dom/DomDocument.java
@@ -54,7 +54,6 @@ import org.w3c.dom.Entity;
import org.w3c.dom.EntityReference;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.w3c.dom.Notation;
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
diff --git a/gnu/xml/dom/DomDocumentBuilder.java b/gnu/xml/dom/DomDocumentBuilder.java
index 16ea2ae5d..d321653ed 100644
--- a/gnu/xml/dom/DomDocumentBuilder.java
+++ b/gnu/xml/dom/DomDocumentBuilder.java
@@ -40,7 +40,6 @@ package gnu.xml.dom;
import java.io.InputStream;
import java.io.IOException;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
import org.w3c.dom.Document;
import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.DOMImplementation;
diff --git a/gnu/xml/dom/DomIterator.java b/gnu/xml/dom/DomIterator.java
index fb05d9308..bb1f2cff2 100644
--- a/gnu/xml/dom/DomIterator.java
+++ b/gnu/xml/dom/DomIterator.java
@@ -37,8 +37,6 @@ exception statement from your version. */
package gnu.xml.dom;
-import java.util.Vector;
-
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.events.Event;
diff --git a/gnu/xml/dom/DomNode.java b/gnu/xml/dom/DomNode.java
index 74535eef6..20a62c53b 100644
--- a/gnu/xml/dom/DomNode.java
+++ b/gnu/xml/dom/DomNode.java
@@ -40,7 +40,6 @@ package gnu.xml.dom;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import javax.xml.XMLConstants;
import org.w3c.dom.Document;
import org.w3c.dom.DOMException;
@@ -58,7 +57,6 @@ import org.w3c.dom.events.EventTarget;
import org.w3c.dom.events.MutationEvent;
import org.w3c.dom.traversal.NodeFilter;
import org.w3c.dom.traversal.NodeIterator;
-import org.w3c.dom.traversal.TreeWalker;
/**
* <p> "Node", "EventTarget", and "DocumentEvent" implementation.
diff --git a/gnu/xml/dom/DomXPathExpression.java b/gnu/xml/dom/DomXPathExpression.java
index d92670d7e..c22f29413 100644
--- a/gnu/xml/dom/DomXPathExpression.java
+++ b/gnu/xml/dom/DomXPathExpression.java
@@ -37,7 +37,6 @@ exception statement from your version. */
package gnu.xml.dom;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
diff --git a/gnu/xml/dom/DomXPathResult.java b/gnu/xml/dom/DomXPathResult.java
index 1cc49d8f7..5c57e25e2 100644
--- a/gnu/xml/dom/DomXPathResult.java
+++ b/gnu/xml/dom/DomXPathResult.java
@@ -39,10 +39,8 @@ package gnu.xml.dom;
import java.util.Collection;
import java.util.Iterator;
-import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.xpath.XPathException;
-import org.w3c.dom.xpath.XPathNSResolver;
import org.w3c.dom.xpath.XPathResult;
/**
diff --git a/gnu/xml/dom/JAXPFactory.java b/gnu/xml/dom/JAXPFactory.java
index 427120810..3602ef6b9 100644
--- a/gnu/xml/dom/JAXPFactory.java
+++ b/gnu/xml/dom/JAXPFactory.java
@@ -40,7 +40,6 @@ package gnu.xml.dom;
import java.io.IOException;
import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
import org.w3c.dom.DOMImplementation;
import org.xml.sax.EntityResolver;
diff --git a/gnu/xml/dom/ls/DomLSException.java b/gnu/xml/dom/ls/DomLSException.java
index 7b9d13e5b..6701b3e49 100644
--- a/gnu/xml/dom/ls/DomLSException.java
+++ b/gnu/xml/dom/ls/DomLSException.java
@@ -37,8 +37,6 @@ exception statement from your version. */
package gnu.xml.dom.ls;
-import java.io.PrintStream;
-import java.io.PrintWriter;
import org.w3c.dom.ls.LSException;
/**
diff --git a/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java b/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java
index 6030dc7c8..e46cc5389 100644
--- a/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java
+++ b/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java
@@ -37,12 +37,8 @@ exception statement from your version. */
package gnu.xml.libxmlj.dom;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.IOException;
-import java.io.PushbackInputStream;
-import java.net.MalformedURLException;
import java.net.URL;
import javax.xml.parsers.DocumentBuilder;
diff --git a/gnu/xml/libxmlj/dom/GnomeXPathNodeList.java b/gnu/xml/libxmlj/dom/GnomeXPathNodeList.java
index ea387174d..b38a7d6eb 100644
--- a/gnu/xml/libxmlj/dom/GnomeXPathNodeList.java
+++ b/gnu/xml/libxmlj/dom/GnomeXPathNodeList.java
@@ -37,7 +37,6 @@ exception statement from your version. */
package gnu.xml.libxmlj.dom;
-import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
diff --git a/gnu/xml/libxmlj/sax/GnomeXMLReader.java b/gnu/xml/libxmlj/sax/GnomeXMLReader.java
index 9dd808a61..66da030f1 100644
--- a/gnu/xml/libxmlj/sax/GnomeXMLReader.java
+++ b/gnu/xml/libxmlj/sax/GnomeXMLReader.java
@@ -38,19 +38,15 @@ exception statement from your version. */
package gnu.xml.libxmlj.sax;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.IOException;
-import java.io.PushbackInputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Arrays;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
diff --git a/gnu/xml/libxmlj/transform/GnomeTransformer.java b/gnu/xml/libxmlj/transform/GnomeTransformer.java
index 30055b4da..c153cdae6 100755
--- a/gnu/xml/libxmlj/transform/GnomeTransformer.java
+++ b/gnu/xml/libxmlj/transform/GnomeTransformer.java
@@ -37,14 +37,9 @@ exception statement from your version. */
package gnu.xml.libxmlj.transform;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.PushbackInputStream;
import java.net.URL;
@@ -65,7 +60,6 @@ import javax.xml.transform.URIResolver;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.stream.StreamResult;
diff --git a/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java b/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java
index 742a6fbf9..cd3fd5beb 100755
--- a/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java
+++ b/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java
@@ -51,7 +51,6 @@ import javax.xml.transform.ErrorListener;
import javax.xml.transform.Source;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.URIResolver;
diff --git a/gnu/xml/libxmlj/util/XMLJ.java b/gnu/xml/libxmlj/util/XMLJ.java
index 27f3325ad..c01bd5bc6 100644
--- a/gnu/xml/libxmlj/util/XMLJ.java
+++ b/gnu/xml/libxmlj/util/XMLJ.java
@@ -42,7 +42,6 @@ import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.PushbackInputStream;
import java.io.Reader;
import java.io.Writer;
import java.net.MalformedURLException;
diff --git a/gnu/xml/pipeline/CallFilter.java b/gnu/xml/pipeline/CallFilter.java
index 0d8585991..da1a2e9c1 100644
--- a/gnu/xml/pipeline/CallFilter.java
+++ b/gnu/xml/pipeline/CallFilter.java
@@ -37,11 +37,18 @@ exception statement from your version. */
package gnu.xml.pipeline;
-import java.io.*;
-import java.net.*;
-
-import org.xml.sax.*;
-import org.xml.sax.ext.*;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import java.io.Writer;
+
+import org.xml.sax.DTDHandler;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
import gnu.xml.util.Resolver;
diff --git a/gnu/xml/pipeline/DomConsumer.java b/gnu/xml/pipeline/DomConsumer.java
index 17fdeeb34..e3136093c 100644
--- a/gnu/xml/pipeline/DomConsumer.java
+++ b/gnu/xml/pipeline/DomConsumer.java
@@ -37,17 +37,30 @@ exception statement from your version. */
package gnu.xml.pipeline;
-import java.util.Hashtable;
+import gnu.xml.aelfred2.ContentHandler2;
+import gnu.xml.util.DomParser;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.ext.DeclHandler;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
-
-import gnu.xml.aelfred2.ContentHandler2;
-import gnu.xml.util.DomParser;
-
+import org.w3c.dom.Attr;
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.CharacterData;
+import org.w3c.dom.Document;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Element;
+import org.w3c.dom.EntityReference;
+import org.w3c.dom.Node;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
/**
* This consumer builds a DOM Document from its input, acting either as a
diff --git a/gnu/xml/pipeline/LinkFilter.java b/gnu/xml/pipeline/LinkFilter.java
index 28a450170..465103b22 100644
--- a/gnu/xml/pipeline/LinkFilter.java
+++ b/gnu/xml/pipeline/LinkFilter.java
@@ -43,7 +43,6 @@ import java.util.Enumeration;
import java.util.Vector;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
import org.xml.sax.SAXException;
diff --git a/gnu/xml/pipeline/NSFilter.java b/gnu/xml/pipeline/NSFilter.java
index 9e8a64365..63e167361 100644
--- a/gnu/xml/pipeline/NSFilter.java
+++ b/gnu/xml/pipeline/NSFilter.java
@@ -37,16 +37,17 @@ exception statement from your version. */
package gnu.xml.pipeline;
-import java.util.EmptyStackException;
import java.util.Enumeration;
import java.util.Stack;
-import org.xml.sax.*;
-import org.xml.sax.ext.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.helpers.NamespaceSupport;
-
/**
* This filter ensures that element and attribute names are properly prefixed,
* and that such prefixes are declared. Such data is critical for operations
diff --git a/gnu/xml/pipeline/TeeConsumer.java b/gnu/xml/pipeline/TeeConsumer.java
index 6d3227eda..922e79cf2 100644
--- a/gnu/xml/pipeline/TeeConsumer.java
+++ b/gnu/xml/pipeline/TeeConsumer.java
@@ -37,11 +37,15 @@ exception statement from your version. */
package gnu.xml.pipeline;
-import java.io.IOException;
-import org.xml.sax.*;
-import org.xml.sax.ext.*;
-//import gnu.xml.util;
-
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.ext.DeclHandler;
+import org.xml.sax.ext.LexicalHandler;
/**
* Fans its events out to two other consumers, a "tee" filter stage in an
diff --git a/gnu/xml/pipeline/ValidationConsumer.java b/gnu/xml/pipeline/ValidationConsumer.java
index e73c0ffe2..719270e07 100644
--- a/gnu/xml/pipeline/ValidationConsumer.java
+++ b/gnu/xml/pipeline/ValidationConsumer.java
@@ -37,8 +37,9 @@ exception statement from your version. */
package gnu.xml.pipeline;
-import java.io.*;
-
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
import java.util.EmptyStackException;
import java.util.Enumeration;
import java.util.Hashtable;
@@ -46,11 +47,16 @@ import java.util.Stack;
import java.util.StringTokenizer;
import java.util.Vector;
-import org.xml.sax.*;
-import org.xml.sax.ext.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
-
/**
* This class checks SAX2 events to report validity errors; it works as
* both a filter and a terminus on an event pipeline. It relies on the
diff --git a/gnu/xml/pipeline/WellFormednessFilter.java b/gnu/xml/pipeline/WellFormednessFilter.java
index 3047ae356..4f3f200c0 100644
--- a/gnu/xml/pipeline/WellFormednessFilter.java
+++ b/gnu/xml/pipeline/WellFormednessFilter.java
@@ -40,10 +40,11 @@ package gnu.xml.pipeline;
import java.util.EmptyStackException;
import java.util.Stack;
-import gnu.xml.aelfred2.SAXDriver;
-import org.xml.sax.*;
-import org.xml.sax.ext.*;
-
+import org.xml.sax.Attributes;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
/**
* This filter reports fatal exceptions in the case of event streams that
diff --git a/gnu/xml/pipeline/XIncludeFilter.java b/gnu/xml/pipeline/XIncludeFilter.java
index efa05d942..042cadda6 100644
--- a/gnu/xml/pipeline/XIncludeFilter.java
+++ b/gnu/xml/pipeline/XIncludeFilter.java
@@ -42,7 +42,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Stack;
import java.util.Vector;
diff --git a/gnu/xml/pipeline/XsltFilter.java b/gnu/xml/pipeline/XsltFilter.java
index b1bebbe98..9f77f9937 100644
--- a/gnu/xml/pipeline/XsltFilter.java
+++ b/gnu/xml/pipeline/XsltFilter.java
@@ -44,7 +44,6 @@ import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.sax.*;
import javax.xml.transform.stream.StreamSource;
-import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
diff --git a/gnu/xml/transform/ApplyImportsNode.java b/gnu/xml/transform/ApplyImportsNode.java
index 2b2865504..39d9dea9a 100644
--- a/gnu/xml/transform/ApplyImportsNode.java
+++ b/gnu/xml/transform/ApplyImportsNode.java
@@ -37,15 +37,9 @@ exception statement from your version. */
package gnu.xml.transform;
-import java.util.Collection;
-import java.util.Iterator;
-import java.text.DecimalFormat;
import javax.xml.namespace.QName;
import javax.xml.transform.TransformerException;
-import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-import gnu.xml.xpath.Expr;
/**
* A template node representing an XSLT <code>apply-imports</code> instruction.
diff --git a/gnu/xml/transform/Bindings.java b/gnu/xml/transform/Bindings.java
index f898a7288..75a8a1651 100644
--- a/gnu/xml/transform/Bindings.java
+++ b/gnu/xml/transform/Bindings.java
@@ -45,12 +45,8 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
import javax.xml.namespace.QName;
-import javax.xml.transform.TransformerException;
import javax.xml.xpath.XPathVariableResolver;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
-import gnu.xml.xpath.Expr;
/**
* The set of variable bindings in effect for a stylesheet.
diff --git a/gnu/xml/transform/DocumentFunction.java b/gnu/xml/transform/DocumentFunction.java
index 03f22b4ce..78862dc9e 100644
--- a/gnu/xml/transform/DocumentFunction.java
+++ b/gnu/xml/transform/DocumentFunction.java
@@ -37,22 +37,16 @@ exception statement from your version. */
package gnu.xml.transform;
-import java.io.InputStream;
-import java.io.IOException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.TreeSet;
-import javax.xml.transform.ErrorListener;
import javax.xml.transform.TransformerException;
-import javax.xml.transform.URIResolver;
import javax.xml.transform.dom.DOMSource;
import javax.xml.xpath.XPathFunction;
import javax.xml.xpath.XPathFunctionException;
-import org.w3c.dom.Document;
import org.w3c.dom.Node;
import gnu.xml.xpath.Constant;
import gnu.xml.xpath.Expr;
diff --git a/gnu/xml/transform/FormatNumberFunction.java b/gnu/xml/transform/FormatNumberFunction.java
index 73c5af43a..393cb99ff 100644
--- a/gnu/xml/transform/FormatNumberFunction.java
+++ b/gnu/xml/transform/FormatNumberFunction.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.xml.transform;
import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
diff --git a/gnu/xml/transform/NodeNumberNode.java b/gnu/xml/transform/NodeNumberNode.java
index 76f8d7eea..aae86c6f2 100644
--- a/gnu/xml/transform/NodeNumberNode.java
+++ b/gnu/xml/transform/NodeNumberNode.java
@@ -43,13 +43,10 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import javax.xml.transform.TransformerException;
-import org.w3c.dom.Document;
import org.w3c.dom.Node;
import gnu.xml.xpath.Expr;
-import gnu.xml.xpath.NodeTypeTest;
import gnu.xml.xpath.Pattern;
import gnu.xml.xpath.Selector;
-import gnu.xml.xpath.Test;
import gnu.xml.xpath.UnionExpr;
/**
diff --git a/gnu/xml/transform/NumberNode.java b/gnu/xml/transform/NumberNode.java
index 0970ac973..b01b983df 100644
--- a/gnu/xml/transform/NumberNode.java
+++ b/gnu/xml/transform/NumberNode.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.xml.transform;
import javax.xml.transform.TransformerException;
-import org.w3c.dom.Document;
import org.w3c.dom.Node;
import gnu.xml.xpath.Expr;
diff --git a/gnu/xml/transform/Stylesheet.java b/gnu/xml/transform/Stylesheet.java
index 80f5781e2..6250fd542 100644
--- a/gnu/xml/transform/Stylesheet.java
+++ b/gnu/xml/transform/Stylesheet.java
@@ -58,7 +58,6 @@ import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
-import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFunction;
import javax.xml.xpath.XPathFunctionResolver;
import javax.xml.xpath.XPathExpressionException;
@@ -68,7 +67,6 @@ import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.w3c.dom.UserDataHandler;
import gnu.xml.xpath.Expr;
diff --git a/gnu/xml/transform/SystemPropertyFunction.java b/gnu/xml/transform/SystemPropertyFunction.java
index 3d95d21d5..03518e9cb 100644
--- a/gnu/xml/transform/SystemPropertyFunction.java
+++ b/gnu/xml/transform/SystemPropertyFunction.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.xml.transform;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.xpath.XPathFunction;
diff --git a/gnu/xml/transform/Template.java b/gnu/xml/transform/Template.java
index 6aaa4c1c6..0e7c67a7e 100644
--- a/gnu/xml/transform/Template.java
+++ b/gnu/xml/transform/Template.java
@@ -39,9 +39,7 @@ package gnu.xml.transform;
import java.io.PrintStream;
import javax.xml.namespace.QName;
-import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
-import javax.xml.xpath.XPathExpressionException;
import org.w3c.dom.Node;
import gnu.xml.xpath.Expr;
import gnu.xml.xpath.NameTest;
diff --git a/gnu/xml/transform/TemplatesImpl.java b/gnu/xml/transform/TemplatesImpl.java
index a7403e9ee..173fb036f 100644
--- a/gnu/xml/transform/TemplatesImpl.java
+++ b/gnu/xml/transform/TemplatesImpl.java
@@ -38,12 +38,9 @@ exception statement from your version. */
package gnu.xml.transform;
import java.util.Properties;
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.Source;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.URIResolver;
/**
* GNU precompiled stylesheet implementation.
diff --git a/gnu/xml/transform/TransformerImpl.java b/gnu/xml/transform/TransformerImpl.java
index fb4632e3f..c0af0fca4 100644
--- a/gnu/xml/transform/TransformerImpl.java
+++ b/gnu/xml/transform/TransformerImpl.java
@@ -48,9 +48,6 @@ import java.net.UnknownServiceException;
import java.net.URL;
import java.net.URLConnection;
import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
import java.util.Properties;
import javax.xml.transform.ErrorListener;
import javax.xml.transform.OutputKeys;
@@ -67,7 +64,6 @@ import javax.xml.transform.stream.StreamResult;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
import org.xml.sax.ContentHandler;
@@ -76,8 +72,6 @@ import org.xml.sax.ext.LexicalHandler;
import gnu.xml.dom.DomDoctype;
import gnu.xml.dom.DomDocument;
import gnu.xml.dom.ls.WriterOutputStream;
-import gnu.xml.xpath.Expr;
-import gnu.xml.xpath.Root;
/**
* The transformation process for a given stylesheet.
diff --git a/gnu/xml/transform/ValueOfNode.java b/gnu/xml/transform/ValueOfNode.java
index 6027052e9..9eb2fde5d 100644
--- a/gnu/xml/transform/ValueOfNode.java
+++ b/gnu/xml/transform/ValueOfNode.java
@@ -37,9 +37,6 @@ exception statement from your version. */
package gnu.xml.transform;
-import java.util.Collection;
-import java.util.Iterator;
-import java.text.DecimalFormat;
import javax.xml.namespace.QName;
import javax.xml.transform.TransformerException;
import org.w3c.dom.Document;
diff --git a/gnu/xml/transform/XSLURIResolver.java b/gnu/xml/transform/XSLURIResolver.java
index 2603cdd83..f0f417202 100644
--- a/gnu/xml/transform/XSLURIResolver.java
+++ b/gnu/xml/transform/XSLURIResolver.java
@@ -41,7 +41,6 @@ import java.io.File;
import java.io.InputStream;
import java.io.IOException;
import java.io.Reader;
-import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
diff --git a/gnu/xml/util/DoParse.java b/gnu/xml/util/DoParse.java
index 23721de76..6f255c804 100644
--- a/gnu/xml/util/DoParse.java
+++ b/gnu/xml/util/DoParse.java
@@ -37,28 +37,22 @@ exception statement from your version. */
package gnu.xml.util;
-import java.io.*;
+import java.io.IOException;
-import org.xml.sax.*;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
-import org.xml.sax.ext.*;
-// import gnu.xml.pipeline.*;
-// Added imports directly to fix a GCJ problem.
-import gnu.xml.pipeline.CallFilter;
-import gnu.xml.pipeline.DomConsumer;
import gnu.xml.pipeline.EventConsumer;
import gnu.xml.pipeline.EventFilter;
-import gnu.xml.pipeline.LinkFilter;
import gnu.xml.pipeline.NSFilter;
import gnu.xml.pipeline.PipelineFactory;
import gnu.xml.pipeline.TeeConsumer;
-import gnu.xml.pipeline.TextConsumer;
import gnu.xml.pipeline.ValidationConsumer;
import gnu.xml.pipeline.WellFormednessFilter;
-import gnu.xml.pipeline.XIncludeFilter;
-import gnu.xml.pipeline.XsltFilter;
-
/**
* This class provides a driver which may be invoked from the command line
diff --git a/gnu/xml/util/Resolver.java b/gnu/xml/util/Resolver.java
index 4ca078774..97256c3c8 100644
--- a/gnu/xml/util/Resolver.java
+++ b/gnu/xml/util/Resolver.java
@@ -37,13 +37,13 @@ exception statement from your version. */
package gnu.xml.util;
-import java.io.*;
-
+import java.io.File;
+import java.io.IOException;
import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.xml.sax.*;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/**
* Utility implementation of a SAX resolver, which can be used to improve
diff --git a/gnu/xml/xpath/Expr.java b/gnu/xml/xpath/Expr.java
index 6a933c8c5..fcfae52ad 100644
--- a/gnu/xml/xpath/Expr.java
+++ b/gnu/xml/xpath/Expr.java
@@ -58,9 +58,7 @@ import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathExpressionException;
import org.w3c.dom.Document;
-import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/gnu/xml/xpath/FunctionCall.java b/gnu/xml/xpath/FunctionCall.java
index 2c77b5869..35eacb516 100644
--- a/gnu/xml/xpath/FunctionCall.java
+++ b/gnu/xml/xpath/FunctionCall.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package gnu.xml.xpath;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
import javax.xml.namespace.QName;
diff --git a/gnu/xml/xpath/RelationalExpr.java b/gnu/xml/xpath/RelationalExpr.java
index e039cc1c6..fcdc932ab 100644
--- a/gnu/xml/xpath/RelationalExpr.java
+++ b/gnu/xml/xpath/RelationalExpr.java
@@ -37,7 +37,6 @@ exception statement from your version. */
package gnu.xml.xpath;
-import java.util.Collection;
import org.w3c.dom.Node;
/**
diff --git a/gnu/xml/xpath/Selector.java b/gnu/xml/xpath/Selector.java
index 5431cbe1f..5fd45b911 100644
--- a/gnu/xml/xpath/Selector.java
+++ b/gnu/xml/xpath/Selector.java
@@ -39,7 +39,6 @@ package gnu.xml.xpath;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
@@ -48,7 +47,6 @@ import javax.xml.XMLConstants;
import org.w3c.dom.Attr;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* A single component of a location path.
diff --git a/gnu/xml/xpath/XPathParser.java b/gnu/xml/xpath/XPathParser.java
index 973919bae..188cfb5bf 100644
--- a/gnu/xml/xpath/XPathParser.java
+++ b/gnu/xml/xpath/XPathParser.java
@@ -43,7 +43,6 @@ package gnu.xml.xpath;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
import javax.xml.xpath.XPathFunctionResolver;
diff --git a/java/beans/XMLDecoder.java b/java/beans/XMLDecoder.java
index 1e2f20097..877033522 100644
--- a/java/beans/XMLDecoder.java
+++ b/java/beans/XMLDecoder.java
@@ -38,7 +38,6 @@ exception statement from your version. */
package java.beans;
-import gnu.java.beans.decoder.DecoderContext;
import gnu.java.beans.decoder.DefaultExceptionListener;
import gnu.java.beans.decoder.PersistenceParser;
diff --git a/java/text/SimpleDateFormat.java b/java/text/SimpleDateFormat.java
index 388043bfb..0642d9a6b 100644
--- a/java/text/SimpleDateFormat.java
+++ b/java/text/SimpleDateFormat.java
@@ -54,7 +54,6 @@ import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Iterator;
import java.util.Locale;
-import java.util.SimpleTimeZone;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/javax/swing/JPopupMenu.java b/javax/swing/JPopupMenu.java
index ba358a310..00998b81a 100644
--- a/javax/swing/JPopupMenu.java
+++ b/javax/swing/JPopupMenu.java
@@ -41,7 +41,6 @@ package javax.swing;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
-import java.awt.Graphics;
import java.awt.GridBagConstraints;
import java.awt.Insets;
import java.awt.Panel;
diff --git a/javax/swing/JSpinner.java b/javax/swing/JSpinner.java
index ddb990d41..fbf2bbf5f 100644
--- a/javax/swing/JSpinner.java
+++ b/javax/swing/JSpinner.java
@@ -50,7 +50,6 @@ import java.text.ParseException;
import javax.swing.border.EtchedBorder;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
import javax.swing.plaf.SpinnerUI;
diff --git a/javax/swing/SortingFocusTraversalPolicy.java b/javax/swing/SortingFocusTraversalPolicy.java
index df369c61a..07a4e6561 100644
--- a/javax/swing/SortingFocusTraversalPolicy.java
+++ b/javax/swing/SortingFocusTraversalPolicy.java
@@ -40,7 +40,6 @@ package javax.swing;
import java.awt.Component;
import java.awt.Container;
-import java.awt.FocusTraversalPolicy;
import java.util.Comparator;
import java.util.Iterator;
import java.util.TreeSet;
diff --git a/javax/swing/SwingUtilities.java b/javax/swing/SwingUtilities.java
index 924a9d092..8e987425f 100644
--- a/javax/swing/SwingUtilities.java
+++ b/javax/swing/SwingUtilities.java
@@ -42,7 +42,6 @@ import java.applet.Applet;
import java.awt.Component;
import java.awt.ComponentOrientation;
import java.awt.Container;
-import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Frame;
import java.awt.Graphics;
@@ -51,7 +50,6 @@ import java.awt.KeyboardFocusManager;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Shape;
-import java.awt.Toolkit;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.InputEvent;
diff --git a/javax/swing/plaf/basic/BasicComboBoxEditor.java b/javax/swing/plaf/basic/BasicComboBoxEditor.java
index b306af71d..a55e13c95 100644
--- a/javax/swing/plaf/basic/BasicComboBoxEditor.java
+++ b/javax/swing/plaf/basic/BasicComboBoxEditor.java
@@ -46,7 +46,6 @@ import java.awt.event.FocusListener;
import javax.swing.ComboBoxEditor;
import javax.swing.JTextField;
import javax.swing.border.EmptyBorder;
-import javax.swing.plaf.UIResource;
/**
* This is a component that is responsible for displaying/editting selected
diff --git a/javax/swing/plaf/basic/BasicComboBoxRenderer.java b/javax/swing/plaf/basic/BasicComboBoxRenderer.java
index 5dc0f489e..9f61e0d18 100644
--- a/javax/swing/plaf/basic/BasicComboBoxRenderer.java
+++ b/javax/swing/plaf/basic/BasicComboBoxRenderer.java
@@ -50,7 +50,6 @@ import javax.swing.UIDefaults;
import javax.swing.UIManager;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
-import javax.swing.plaf.UIResource;
/**
* This class is renderer for the combo box.
diff --git a/javax/swing/tree/DefaultMutableTreeNode.java b/javax/swing/tree/DefaultMutableTreeNode.java
index 2b3e2c56e..de34ee072 100644
--- a/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/javax/swing/tree/DefaultMutableTreeNode.java
@@ -46,7 +46,6 @@ import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.Random;
import java.util.Stack;
import java.util.Vector;
diff --git a/javax/xml/parsers/DocumentBuilder.java b/javax/xml/parsers/DocumentBuilder.java
index 13d7658de..f5ff52d89 100644
--- a/javax/xml/parsers/DocumentBuilder.java
+++ b/javax/xml/parsers/DocumentBuilder.java
@@ -47,7 +47,6 @@ import org.w3c.dom.DOMImplementation;
import org.xml.sax.InputSource;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
diff --git a/javax/xml/parsers/DocumentBuilderFactory.java b/javax/xml/parsers/DocumentBuilderFactory.java
index c53100516..889797ad6 100644
--- a/javax/xml/parsers/DocumentBuilderFactory.java
+++ b/javax/xml/parsers/DocumentBuilderFactory.java
@@ -45,9 +45,6 @@ import java.io.InputStreamReader;
import java.io.IOException;
import java.util.Properties;
import javax.xml.validation.Schema;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
/**
* Factory for obtaining document builders.
diff --git a/javax/xml/transform/sax/SAXTransformerFactory.java b/javax/xml/transform/sax/SAXTransformerFactory.java
index 66d51979b..7423b273d 100644
--- a/javax/xml/transform/sax/SAXTransformerFactory.java
+++ b/javax/xml/transform/sax/SAXTransformerFactory.java
@@ -37,13 +37,10 @@ exception statement from your version. */
package javax.xml.transform.sax;
-import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerFactory;
-import org.xml.sax.InputSource;
import org.xml.sax.XMLFilter;
/**
diff --git a/vm/reference/java/lang/VMClassLoader.java b/vm/reference/java/lang/VMClassLoader.java
index 5872bd2b1..a3058e5a4 100644
--- a/vm/reference/java/lang/VMClassLoader.java
+++ b/vm/reference/java/lang/VMClassLoader.java
@@ -40,11 +40,8 @@ exception statement from your version. */
package java.lang;
import gnu.classpath.SystemProperties;
-import gnu.java.util.EmptyEnumeration;
import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.ProtectionDomain;
diff --git a/vm/reference/java/lang/VMProcess.java b/vm/reference/java/lang/VMProcess.java
index 498b605e3..8059454da 100644
--- a/vm/reference/java/lang/VMProcess.java
+++ b/vm/reference/java/lang/VMProcess.java
@@ -38,8 +38,6 @@ exception statement from your version. */
package java.lang;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/vm/reference/java/lang/VMRuntime.java b/vm/reference/java/lang/VMRuntime.java
index 8da217f15..596111543 100644
--- a/vm/reference/java/lang/VMRuntime.java
+++ b/vm/reference/java/lang/VMRuntime.java
@@ -39,7 +39,6 @@ package java.lang;
import java.io.File;
import java.io.IOException;
-import java.util.Properties;
/**
* VMRuntime represents the interface to the Virtual Machine.
diff --git a/vm/reference/java/lang/VMSystem.java b/vm/reference/java/lang/VMSystem.java
index 51d6c370d..b203454e6 100644
--- a/vm/reference/java/lang/VMSystem.java
+++ b/vm/reference/java/lang/VMSystem.java
@@ -37,9 +37,13 @@ exception statement from your version. */
package java.lang;
-import java.util.Properties;
-
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.PrintStream;
/**
* VMSystem is a package-private helper class for System that the
diff --git a/vm/reference/java/security/VMAccessController.java b/vm/reference/java/security/VMAccessController.java
index fc2410ac8..80798117d 100644
--- a/vm/reference/java/security/VMAccessController.java
+++ b/vm/reference/java/security/VMAccessController.java
@@ -36,14 +36,8 @@ exception statement from your version. */
package java.security;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
final class VMAccessController
{