2007-09-18 Dalibor Topic <robilad@kaffe.org>

* examples/gnu/classpath/examples/management/TestMemoryPool.java, examples/gnu/classpath/examples/swing/DocumentFilterDemo.java, examples/gnu/classpath/examples/swing/TableDemo.java, gnu/CORBA/BigDecimalHelper.java, gnu/CORBA/ByteArrayComparator.java, gnu/CORBA/CollocatedOrbs.java, gnu/CORBA/EmptyExceptionHolder.java, gnu/CORBA/IorDelegate.java, gnu/CORBA/OrbRestricted.java, gnu/CORBA/ServiceRequestAdapter.java, gnu/CORBA/gnuContextList.java, gnu/CORBA/gnuExceptionList.java, gnu/CORBA/gnuRequest.java, gnu/CORBA/CDR/LittleEndianInputStream.java, gnu/CORBA/DynAn/DivideableAny.java, gnu/CORBA/DynAn/gnuDynArray.java, gnu/CORBA/GIOP/CodeSetServiceContext.java, gnu/CORBA/Interceptor/IORInterceptors.java, gnu/CORBA/NamingService/NameParser.java, gnu/CORBA/Poa/gnuPOAManager.java, gnu/classpath/jdwp/event/filters/StepFilter.java, gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java, gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java, gnu/java/awt/ClasspathToolkit.java, gnu/java/awt/EmbeddedWindow.java, gnu/java/awt/peer/KDEDesktopPeer.java, gnu/java/awt/peer/gtk/CairoSurface.java, gnu/java/awt/peer/swing/SwingCheckboxPeer.java, gnu/java/awt/peer/swing/SwingTextAreaPeer.java, gnu/java/awt/peer/swing/SwingTextFieldPeer.java, gnu/java/awt/print/PostScriptGraphics2D.java, gnu/java/awt/print/SpooledDocument.java, gnu/java/io/PlatformHelper.java, gnu/java/lang/management/BeanImpl.java, gnu/java/locale/LocaleHelper.java, gnu/java/net/protocol/http/Request.java, gnu/java/nio/DatagramChannelImpl.java, gnu/java/nio/KqueueSelectionKeyImpl.java, gnu/java/nio/NIOSocket.java, gnu/java/nio/ServerSocketChannelImpl.java, gnu/java/nio/SocketChannelImpl.java, gnu/java/rmi/server/RMIObjectInputStream.java, gnu/java/util/regex/RE.java, gnu/javax/imageio/bmp/DecodeBF16.java, gnu/javax/imageio/bmp/EncodeRGB32.java, gnu/javax/imageio/jpeg/JPEGDecoder.java, gnu/javax/imageio/jpeg/JPEGException.java, gnu/javax/imageio/jpeg/JPEGImageInputStream.java, gnu/javax/imageio/png/PNGChunk.java, gnu/javax/imageio/png/PNGEncoder.java, gnu/javax/imageio/png/PNGFile.java, gnu/javax/imageio/png/PNGGamma.java, gnu/javax/net/ssl/SSLRecordHandler.java, gnu/javax/net/ssl/StaticTrustAnchors.java, gnu/javax/net/ssl/provider/CertificateRequestBuilder.java, gnu/javax/net/ssl/provider/ClientHandshake.java, gnu/javax/net/ssl/provider/ClientPSKParameters.java, gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java, gnu/javax/net/ssl/provider/ContentType.java, gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java, gnu/javax/net/ssl/provider/Handshake.java, gnu/javax/net/ssl/provider/InputSecurityParameters.java, gnu/javax/net/ssl/provider/OutputSecurityParameters.java, gnu/javax/net/ssl/provider/ProtocolVersion.java, gnu/javax/net/ssl/provider/Random.java, gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java, gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java, gnu/javax/net/ssl/provider/SessionImpl.java, gnu/javax/net/ssl/provider/Signature.java, gnu/javax/net/ssl/provider/SimpleSessionContext.java, gnu/javax/net/ssl/provider/TLSHMac.java, gnu/javax/net/ssl/provider/TrustedAuthorities.java, gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java, gnu/javax/net/ssl/provider/X509KeyManagerFactory.java, gnu/javax/security/auth/Password.java, gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java, gnu/javax/sound/midi/file/MidiFileWriter.java, gnu/javax/sound/sampled/AU/AUReader.java, gnu/jav gnu/javax/sound/sampled/gstreamer/io/G gnu/xml/dom/html2/DomHTMLButtonElement.java, gnu/xml/dom/html2/DomHTMLCollection.java, gnu/xml/dom/html2/DomHTMLParser.java, gnu/xml/stream/EndDocumentImpl.java, gnu/xml/stream/SAXParser.java, gnu/xml/stream/XIncludeFilter.java, gnu/xml/stream/XMLEventImpl.java, gnu/xml/transform/StreamSerializer.java, gnu/xml/transform/Stylesheet.java, gnu/xml/validation/datatype/Ba gnu/xml/validation/datatype/BooleanTy gnu/xml/validation/datatype/De gnu/xml/validation/datatype/Doub gnu/xml/validation/datatyp gnu/xml/validation/datatype/HexBinaryType.j gnu/xml/validation/datatype/Notatio gnu/xml/validation/datatype/Simpl gnu/xml/validation/datatype/StringType.jav gnu/xml/validation/datatype/Type.java, gnu/xml/validation/datatype/TypeBuilder.java, gnu/xml/validation/relaxng/FullSy gnu/xml/validation/xmlschema/XMLSchemaAttributeTy gnu/xml/validation/xmlschema/XMLSchemaBuilder.java, gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java, gnu/xml/xpath/XPathParser.java, java/awt/MenuShortcut.java, java/awt/font/LineBreakMeasurer.java, java/awt/font/TextMeasurer.java, java/awt/image/BufferedImage.java, java/beans/beancontext/BeanContextServicesSupport.java, java/security/SecureClassLoader.java, java/security/cert/CertificateFactory.java, javax/imageio/metadata/IIOMetadataFormatImpl.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/management/ObjectName.java, javax/management/openmbean/ArrayType.java, javax/net/ssl/HttpsURLConnection.java, javax/print/attribute/standard/JobStateReasons.java javax/swing/RepaintManager.java, javax/swing/plaf/basic/BasicDirectory javax/swing/plaf/basic/BasicFileChooserUI. javax/swing/plaf/basic/BasicLabelUI. javax/swing/plaf/metal/MetalScrollButton.java, javax/swing/table/DefaultTableCellRenderer.java, javax/swing/text/ParagraphView.java, javax/swing/text/html/ResetableToggleButtonModel.java, javax/swing/text/html/parser/Entity.java, javax/swing/tree/DefaultTreeCellRenderer.java, javax/xml/datatype/DatatypeFactory.java, javax/xml/stream/XMLEventFactory.java, javax/xml/stream/XMLInputFactory.java, org/omg/IOP/TaggedComponentHelper.java, sun/reflect/annotation/ExceptionProxy.java, tools/gnu/classpath/tools/appletviewer/Main.java, tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java, tools/gnu/classpath/tools/orbd/Main.java, tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java, tools/gnu/classpath/tools/rmic/Main.java, tools/gnu/classpath/tools/rmid/Main.java, tools/gnu/classpath/tools/tnameserv/Main.java, vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java, vm/reference/java/lang/VMClass.java, vm/reference/java/security/VMSecureRandom.java: Removed unused imports.
author: Dalibor Topic <robilad@yahoo.com> 2007-09-18 21:52:24 +0000
committer: Dalibor Topic <robilad@yahoo.com> 2007-09-18 21:52:24 +0000
commit: c7aff15b771c7a684cd555dbd616a86016da2bb3 (patch)
tree: 94bf7635a77d40a272144bfc115950830e058bca
parent: 8d0a43ae34cb8c98a6bfc7bd151b727e170a46ff (diff)
download: classpath-c7aff15b771c7a684cd555dbd616a86016da2bb3.tar.gz
145 files changed, 148 insertions, 330 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ab54fe9e..e5734cebf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,153 @@
 2007-09-18  Dalibor Topic  <robilad@kaffe.org>
 
+	* examples/gnu/classpath/examples/management/TestMemoryPool.java,
+	examples/gnu/classpath/examples/swing/DocumentFilterDemo.java,
+	examples/gnu/classpath/examples/swing/TableDemo.java,
+	gnu/CORBA/BigDecimalHelper.java,
+	gnu/CORBA/ByteArrayComparator.java,
+	gnu/CORBA/CollocatedOrbs.java,
+	gnu/CORBA/EmptyExceptionHolder.java,
+	gnu/CORBA/IorDelegate.java,
+	gnu/CORBA/OrbRestricted.java,
+	gnu/CORBA/ServiceRequestAdapter.java,
+	gnu/CORBA/gnuContextList.java,
+	gnu/CORBA/gnuExceptionList.java,
+	gnu/CORBA/gnuRequest.java,
+	gnu/CORBA/CDR/LittleEndianInputStream.java,
+	gnu/CORBA/DynAn/DivideableAny.java,
+	gnu/CORBA/DynAn/gnuDynArray.java,
+	gnu/CORBA/GIOP/CodeSetServiceContext.java,
+	gnu/CORBA/Interceptor/IORInterceptors.java,
+	gnu/CORBA/NamingService/NameParser.java,
+	gnu/CORBA/Poa/gnuPOAManager.java,
+	gnu/classpath/jdwp/event/filters/StepFilter.java,
+	gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java,
+	gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java,
+	gnu/java/awt/ClasspathToolkit.java,
+	gnu/java/awt/EmbeddedWindow.java,
+	gnu/java/awt/peer/KDEDesktopPeer.java,
+	gnu/java/awt/peer/gtk/CairoSurface.java,
+	gnu/java/awt/peer/swing/SwingCheckboxPeer.java,
+	gnu/java/awt/peer/swing/SwingTextAreaPeer.java,
+	gnu/java/awt/peer/swing/SwingTextFieldPeer.java,
+	gnu/java/awt/print/PostScriptGraphics2D.java,
+	gnu/java/awt/print/SpooledDocument.java,
+	gnu/java/io/PlatformHelper.java,
+	gnu/java/lang/management/BeanImpl.java,
+	gnu/java/locale/LocaleHelper.java,
+	gnu/java/net/protocol/http/Request.java,
+	gnu/java/nio/DatagramChannelImpl.java,
+	gnu/java/nio/KqueueSelectionKeyImpl.java,
+	gnu/java/nio/NIOSocket.java,
+	gnu/java/nio/ServerSocketChannelImpl.java,
+	gnu/java/nio/SocketChannelImpl.java,
+	gnu/java/rmi/server/RMIObjectInputStream.java,
+	gnu/java/util/regex/RE.java,
+	gnu/javax/imageio/bmp/DecodeBF16.java,
+	gnu/javax/imageio/bmp/EncodeRGB32.java,
+	gnu/javax/imageio/jpeg/JPEGDecoder.java,
+	gnu/javax/imageio/jpeg/JPEGException.java,
+	gnu/javax/imageio/jpeg/JPEGImageInputStream.java,
+	gnu/javax/imageio/png/PNGChunk.java,
+	gnu/javax/imageio/png/PNGEncoder.java,
+	gnu/javax/imageio/png/PNGFile.java,
+	gnu/javax/imageio/png/PNGGamma.java,
+	gnu/javax/net/ssl/SSLRecordHandler.java,
+	gnu/javax/net/ssl/StaticTrustAnchors.java,
+	gnu/javax/net/ssl/provider/CertificateRequestBuilder.java,
+	gnu/javax/net/ssl/provider/ClientHandshake.java,
+	gnu/javax/net/ssl/provider/ClientPSKParameters.java,
+	gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java,
+	gnu/javax/net/ssl/provider/ContentType.java,
+	gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java,
+	gnu/javax/net/ssl/provider/Handshake.java,
+	gnu/javax/net/ssl/provider/InputSecurityParameters.java,
+	gnu/javax/net/ssl/provider/OutputSecurityParameters.java,
+	gnu/javax/net/ssl/provider/ProtocolVersion.java,
+	gnu/javax/net/ssl/provider/Random.java,
+	gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java,
+	gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java,
+	gnu/javax/net/ssl/provider/SessionImpl.java,
+	gnu/javax/net/ssl/provider/Signature.java,
+	gnu/javax/net/ssl/provider/SimpleSessionContext.java,
+	gnu/javax/net/ssl/provider/TLSHMac.java,
+	gnu/javax/net/ssl/provider/TrustedAuthorities.java,
+	gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java,
+	gnu/javax/net/ssl/provider/X509KeyManagerFactory.java,
+	gnu/javax/security/auth/Password.java,
+	gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java,
+	gnu/javax/sound/midi/file/MidiFileWriter.java,
+	gnu/javax/sound/sampled/AU/AUReader.java,
+	gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java,
+	gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java,
+	gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.java,
+	gnu/xml/dom/html2/DomHTMLButtonElement.java,
+	gnu/xml/dom/html2/DomHTMLCollection.java,
+	gnu/xml/dom/html2/DomHTMLParser.java,
+	gnu/xml/stream/EndDocumentImpl.java,
+	gnu/xml/stream/SAXParser.java,
+	gnu/xml/stream/XIncludeFilter.java,
+	gnu/xml/stream/XMLEventImpl.java,
+	gnu/xml/transform/StreamSerializer.java,
+	gnu/xml/transform/Stylesheet.java,
+	gnu/xml/validation/datatype/Base64BinaryType.java,
+	gnu/xml/validation/datatype/BooleanType.java,
+	gnu/xml/validation/datatype/DecimalType.java,
+	gnu/xml/validation/datatype/DoubleType.java,
+	gnu/xml/validation/datatype/FloatType.java,
+	gnu/xml/validation/datatype/HexBinaryType.java,
+	gnu/xml/validation/datatype/NotationType.java,
+	gnu/xml/validation/datatype/SimpleType.java,
+	gnu/xml/validation/datatype/StringType.java,
+	gnu/xml/validation/datatype/Type.java,
+	gnu/xml/validation/datatype/TypeBuilder.java,
+	gnu/xml/validation/relaxng/FullSyntaxBuilder.java,
+	gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java,
+	gnu/xml/validation/xmlschema/XMLSchemaBuilder.java,
+	gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java,
+	gnu/xml/xpath/XPathParser.java,
+	java/awt/MenuShortcut.java,
+	java/awt/font/LineBreakMeasurer.java,
+	java/awt/font/TextMeasurer.java,
+	java/awt/image/BufferedImage.java,
+	java/beans/beancontext/BeanContextServicesSupport.java,
+	java/security/SecureClassLoader.java,
+	java/security/cert/CertificateFactory.java,
+	javax/imageio/metadata/IIOMetadataFormatImpl.java,
+	javax/imageio/stream/MemoryCacheImageInputStream.java,
+	javax/management/ObjectName.java,
+	javax/management/openmbean/ArrayType.java,
+	javax/net/ssl/HttpsURLConnection.java,
+	javax/print/attribute/standard/JobStateReasons.java,
+	javax/swing/RepaintManager.java,
+	javax/swing/plaf/basic/BasicDirectoryModel.java,
+	javax/swing/plaf/basic/BasicFileChooserUI.java,
+	javax/swing/plaf/basic/BasicLabelUI.java,
+	javax/swing/plaf/metal/MetalScrollButton.java,
+	javax/swing/table/DefaultTableCellRenderer.java,
+	javax/swing/text/ParagraphView.java,
+	javax/swing/text/html/ResetableToggleButtonModel.java,
+	javax/swing/text/html/parser/Entity.java,
+	javax/swing/tree/DefaultTreeCellRenderer.java,
+	javax/xml/datatype/DatatypeFactory.java,
+	javax/xml/stream/XMLEventFactory.java,
+	javax/xml/stream/XMLInputFactory.java,
+	org/omg/IOP/TaggedComponentHelper.java,
+	sun/reflect/annotation/ExceptionProxy.java,
+	tools/gnu/classpath/tools/appletviewer/Main.java,
+	tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java,
+	tools/gnu/classpath/tools/orbd/Main.java,
+	tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java,
+	tools/gnu/classpath/tools/rmic/Main.java,
+	tools/gnu/classpath/tools/rmid/Main.java,
+	tools/gnu/classpath/tools/tnameserv/Main.java,
+	vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java,
+	vm/reference/java/lang/VMClass.java,
+	vm/reference/java/security/VMSecureRandom.java:
+	Removed unused imports.
+
+2007-09-18  Dalibor Topic  <robilad@kaffe.org>
+
 	* examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPassHelper.java,
 	examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturnHelper.java, 
 	examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNodeHelper.java,
diff --git a/examples/gnu/classpath/examples/management/TestMemoryPool.java b/examples/gnu/classpath/examples/management/TestMemoryPool.java
index 2476ed76f..1836c3025 100644
--- a/examples/gnu/classpath/examples/management/TestMemoryPool.java
+++ b/examples/gnu/classpath/examples/management/TestMemoryPool.java
@@ -22,8 +22,6 @@ package gnu.classpath.examples.management;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryPoolMXBean;
-import java.lang.management.MemoryUsage;
-
 import java.util.Arrays;
 import java.util.Iterator;
 
diff --git a/examples/gnu/classpath/examples/swing/DocumentFilterDemo.java b/examples/gnu/classpath/examples/swing/DocumentFilterDemo.java
index 28dce1c34..b338e4380 100644
--- a/examples/gnu/classpath/examples/swing/DocumentFilterDemo.java
+++ b/examples/gnu/classpath/examples/swing/DocumentFilterDemo.java
@@ -44,7 +44,6 @@ import javax.swing.text.AbstractDocument;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DocumentFilter;
-import javax.swing.text.TextAction;
 
 /**
  * A demonstration of the <code>javax.swing.text.DocumentFilter</code> class.
diff --git a/examples/gnu/classpath/examples/swing/TableDemo.java b/examples/gnu/classpath/examples/swing/TableDemo.java
index d4a97b3ef..9f8e3e7d5 100644
--- a/examples/gnu/classpath/examples/swing/TableDemo.java
+++ b/examples/gnu/classpath/examples/swing/TableDemo.java
@@ -41,25 +41,18 @@ package gnu.classpath.examples.swing;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.text.DateFormat;
-import java.util.Date;
-
 import javax.swing.AbstractCellEditor;
 import javax.swing.BorderFactory;
 import javax.swing.DefaultCellEditor;
-import javax.swing.DefaultListCellRenderer;
 import javax.swing.Icon;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
-import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollBar;
 import javax.swing.JScrollPane;
 import javax.swing.JSlider;
 import javax.swing.JTable;
-import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 import javax.swing.border.Border;
 import javax.swing.plaf.metal.MetalIconFactory;
diff --git a/gnu/CORBA/BigDecimalHelper.java b/gnu/CORBA/BigDecimalHelper.java
index f1e1dd6b4..430908d09 100644
--- a/gnu/CORBA/BigDecimalHelper.java
+++ b/gnu/CORBA/BigDecimalHelper.java
@@ -45,7 +45,6 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.TypeCodePackage.BadKind;
 
 /**
diff --git a/gnu/CORBA/ByteArrayComparator.java b/gnu/CORBA/ByteArrayComparator.java
index 849115463..e601399df 100644
--- a/gnu/CORBA/ByteArrayComparator.java
+++ b/gnu/CORBA/ByteArrayComparator.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package gnu.CORBA;
 
-import java.util.Arrays;
 import java.util.Comparator;
 
 /**
diff --git a/gnu/CORBA/CDR/LittleEndianInputStream.java b/gnu/CORBA/CDR/LittleEndianInputStream.java
index 02cfa08ae..a439b658b 100644
--- a/gnu/CORBA/CDR/LittleEndianInputStream.java
+++ b/gnu/CORBA/CDR/LittleEndianInputStream.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package gnu.CORBA.CDR;
 
-import java.io.DataInput;
 import java.io.EOFException;
 import java.io.FilterInputStream;
 import java.io.IOException;
diff --git a/gnu/CORBA/CollocatedOrbs.java b/gnu/CORBA/CollocatedOrbs.java
index fc1e513ef..51ad83623 100644
--- a/gnu/CORBA/CollocatedOrbs.java
+++ b/gnu/CORBA/CollocatedOrbs.java
@@ -44,10 +44,6 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 
-import org.omg.CORBA.LocalObject;
-import org.omg.CORBA.portable.Delegate;
-import org.omg.CORBA.portable.ObjectImpl;
-
 /**
  * This class provides support for the direct method invocations without
  * involving the network in the case when both ORBs run on the same java
diff --git a/gnu/CORBA/DynAn/DivideableAny.java b/gnu/CORBA/DynAn/DivideableAny.java
index c96cbedc7..63fe117f4 100644
--- a/gnu/CORBA/DynAn/DivideableAny.java
+++ b/gnu/CORBA/DynAn/DivideableAny.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package gnu.CORBA.DynAn;
 
-import gnu.CORBA.TypeKindNamer;
-
 import org.omg.CORBA.Any;
 import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.ORB;
diff --git a/gnu/CORBA/DynAn/gnuDynArray.java b/gnu/CORBA/DynAn/gnuDynArray.java
index 825cd0a56..dc056adff 100644
--- a/gnu/CORBA/DynAn/gnuDynArray.java
+++ b/gnu/CORBA/DynAn/gnuDynArray.java
@@ -46,7 +46,6 @@ import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.Streamable;
 import org.omg.DynamicAny.DynAny;
 import org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode;
diff --git a/gnu/CORBA/EmptyExceptionHolder.java b/gnu/CORBA/EmptyExceptionHolder.java
index 8fc8697a4..6f84da8e5 100644
--- a/gnu/CORBA/EmptyExceptionHolder.java
+++ b/gnu/CORBA/EmptyExceptionHolder.java
@@ -39,10 +39,8 @@ exception statement from your version. */
 package gnu.CORBA;
 
 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.NO_IMPLEMENT;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.UNKNOWN;
-import org.omg.CORBA.UnknownUserException;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.Streamable;
diff --git a/gnu/CORBA/GIOP/CodeSetServiceContext.java b/gnu/CORBA/GIOP/CodeSetServiceContext.java
index ab565db37..81412e029 100644
--- a/gnu/CORBA/GIOP/CodeSetServiceContext.java
+++ b/gnu/CORBA/GIOP/CodeSetServiceContext.java
@@ -41,8 +41,6 @@ package gnu.CORBA.GIOP;
 import gnu.CORBA.CDR.AbstractCdrInput;
 import gnu.CORBA.CDR.AbstractCdrOutput;
 import gnu.CORBA.IOR;
-import gnu.CORBA.IOR.CodeSets_profile;
-
 import java.io.IOException;
 
 /**
diff --git a/gnu/CORBA/Interceptor/IORInterceptors.java b/gnu/CORBA/Interceptor/IORInterceptors.java
index 2b77de58e..d8dcabf12 100644
--- a/gnu/CORBA/Interceptor/IORInterceptors.java
+++ b/gnu/CORBA/Interceptor/IORInterceptors.java
@@ -42,7 +42,6 @@ import org.omg.CORBA.OBJ_ADAPTER;
 import org.omg.CORBA.OMGVMCID;
 import org.omg.PortableInterceptor.IORInfo;
 import org.omg.PortableInterceptor.IORInterceptor;
-import org.omg.PortableInterceptor.IORInterceptorOperations;
 import org.omg.PortableInterceptor.IORInterceptor_3_0Operations;
 import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 
diff --git a/gnu/CORBA/IorDelegate.java b/gnu/CORBA/IorDelegate.java
index 8eb43aa7d..4a83adc30 100644
--- a/gnu/CORBA/IorDelegate.java
+++ b/gnu/CORBA/IorDelegate.java
@@ -58,8 +58,6 @@ import org.omg.PortableInterceptor.ForwardRequest;
 
 import java.io.IOException;
 
-import java.net.Socket;
-
 /**
  * The Classpath implementation of the {@link Delegate} functionality in the
  * case, when the object was constructed from an IOR object. The IOR can be
diff --git a/gnu/CORBA/NamingService/NameParser.java b/gnu/CORBA/NamingService/NameParser.java
index aa922b96a..205ad8bec 100644
--- a/gnu/CORBA/NamingService/NameParser.java
+++ b/gnu/CORBA/NamingService/NameParser.java
@@ -62,7 +62,6 @@ import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.util.ArrayList;
 import java.util.StringTokenizer;
 
 /**
diff --git a/gnu/CORBA/OrbRestricted.java b/gnu/CORBA/OrbRestricted.java
index c34584995..4ae50b1a3 100644
--- a/gnu/CORBA/OrbRestricted.java
+++ b/gnu/CORBA/OrbRestricted.java
@@ -65,7 +65,6 @@ import org.omg.CORBA.UnionMember;
 import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.ValueFactory;
 import org.omg.PortableInterceptor.ClientRequestInterceptorOperations;
-import org.omg.PortableInterceptor.IORInterceptorOperations;
 import org.omg.PortableInterceptor.IORInterceptor_3_0Operations;
 import org.omg.PortableInterceptor.ServerRequestInterceptorOperations;
 
diff --git a/gnu/CORBA/Poa/gnuPOAManager.java b/gnu/CORBA/Poa/gnuPOAManager.java
index 7710306b7..e025290db 100644
--- a/gnu/CORBA/Poa/gnuPOAManager.java
+++ b/gnu/CORBA/Poa/gnuPOAManager.java
@@ -41,7 +41,6 @@ package gnu.CORBA.Poa;
 import org.omg.CORBA.BAD_INV_ORDER;
 import org.omg.CORBA.LocalObject;
 import org.omg.PortableInterceptor.NON_EXISTENT;
-import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 import org.omg.PortableServer.POAManager;
 import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
 import org.omg.PortableServer.POAManagerPackage.State;
diff --git a/gnu/CORBA/ServiceRequestAdapter.java b/gnu/CORBA/ServiceRequestAdapter.java
index a6f7aa52b..c55405ced 100644
--- a/gnu/CORBA/ServiceRequestAdapter.java
+++ b/gnu/CORBA/ServiceRequestAdapter.java
@@ -41,7 +41,6 @@ package gnu.CORBA;
 import gnu.CORBA.CDR.BufferedCdrOutput;
 
 import org.omg.CORBA.ARG_IN;
-import org.omg.CORBA.ARG_INOUT;
 import org.omg.CORBA.ARG_OUT;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.Bounds;
diff --git a/gnu/CORBA/gnuContextList.java b/gnu/CORBA/gnuContextList.java
index 68584c389..592eb2c2c 100644
--- a/gnu/CORBA/gnuContextList.java
+++ b/gnu/CORBA/gnuContextList.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package gnu.CORBA;
 
-import java.util.ArrayList;
-
 import org.omg.CORBA.Bounds;
 import org.omg.CORBA.ContextList;
 
diff --git a/gnu/CORBA/gnuExceptionList.java b/gnu/CORBA/gnuExceptionList.java
index 5f0c0c9f5..06ddf8d71 100644
--- a/gnu/CORBA/gnuExceptionList.java
+++ b/gnu/CORBA/gnuExceptionList.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package gnu.CORBA;
 
-import java.util.ArrayList;
-
 import org.omg.CORBA.Bounds;
 import org.omg.CORBA.ExceptionList;
 import org.omg.CORBA.TypeCode;
diff --git a/gnu/CORBA/gnuRequest.java b/gnu/CORBA/gnuRequest.java
index 0b3338d34..3ec2a797f 100644
--- a/gnu/CORBA/gnuRequest.java
+++ b/gnu/CORBA/gnuRequest.java
@@ -83,12 +83,10 @@ import org.omg.PortableInterceptor.ClientRequestInterceptorOperations;
 import org.omg.PortableInterceptor.ForwardRequest;
 import org.omg.PortableInterceptor.InvalidSlot;
 
-import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import java.net.BindException;
 import java.net.Socket;
 
 import java.util.ArrayList;
diff --git a/gnu/classpath/jdwp/event/filters/StepFilter.java b/gnu/classpath/jdwp/event/filters/StepFilter.java
index d18f6975e..fd412716c 100644
--- a/gnu/classpath/jdwp/event/filters/StepFilter.java
+++ b/gnu/classpath/jdwp/event/filters/StepFilter.java
@@ -39,7 +39,6 @@ exception statement from your version. */
 
 package gnu.classpath.jdwp.event.filters;
 
-import gnu.classpath.jdwp.JdwpConstants;
 import gnu.classpath.jdwp.event.Event;
 import gnu.classpath.jdwp.exception.InvalidThreadException;
 import gnu.classpath.jdwp.id.ThreadId;
diff --git a/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java b/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java
index 49b3f0d1b..1a70b9c09 100644
--- a/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java
+++ b/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java
@@ -56,7 +56,6 @@ import gnu.classpath.jdwp.value.ValueFactory;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 
 /**
diff --git a/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java b/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java
index c9b329869..cde3fc24c 100644
--- a/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java
+++ b/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java
@@ -46,7 +46,6 @@ import gnu.classpath.jdwp.exception.InvalidFieldException;
 import gnu.classpath.jdwp.exception.JdwpException;
 import gnu.classpath.jdwp.exception.JdwpInternalErrorException;
 import gnu.classpath.jdwp.exception.NotImplementedException;
-import gnu.classpath.jdwp.id.ClassReferenceTypeId;
 import gnu.classpath.jdwp.id.ObjectId;
 import gnu.classpath.jdwp.id.ReferenceTypeId;
 import gnu.classpath.jdwp.util.JdwpString;
diff --git a/gnu/java/awt/ClasspathToolkit.java b/gnu/java/awt/ClasspathToolkit.java
index d78fbab4e..7bbc70ccb 100644
--- a/gnu/java/awt/ClasspathToolkit.java
+++ b/gnu/java/awt/ClasspathToolkit.java
@@ -51,7 +51,6 @@ import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.HeadlessException;
 import java.awt.Toolkit;
-import java.awt.font.TextAttribute;
 import java.awt.peer.DesktopPeer;
 import java.awt.peer.RobotPeer;
 import java.io.IOException;
diff --git a/gnu/java/awt/EmbeddedWindow.java b/gnu/java/awt/EmbeddedWindow.java
index 99f90c9f8..7c04e7daf 100644
--- a/gnu/java/awt/EmbeddedWindow.java
+++ b/gnu/java/awt/EmbeddedWindow.java
@@ -43,7 +43,6 @@ import gnu.java.security.action.SetAccessibleAction;
 
 import java.awt.Component;
 import java.awt.Frame;
-import java.awt.Toolkit;
 import java.lang.reflect.Field;
 import java.security.AccessController;
 
diff --git a/gnu/java/awt/peer/KDEDesktopPeer.java b/gnu/java/awt/peer/KDEDesktopPeer.java
index 676bd8917..30dd89ba7 100644
--- a/gnu/java/awt/peer/KDEDesktopPeer.java
+++ b/gnu/java/awt/peer/KDEDesktopPeer.java
@@ -37,10 +37,8 @@
 
 package gnu.java.awt.peer;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
 
 /**
  * @author Mario Torre <neugens@limasoftware.net>
diff --git a/gnu/java/awt/peer/gtk/CairoSurface.java b/gnu/java/awt/peer/gtk/CairoSurface.java
index b45a79fd6..804f7aff0 100644
--- a/gnu/java/awt/peer/gtk/CairoSurface.java
+++ b/gnu/java/awt/peer/gtk/CairoSurface.java
@@ -43,9 +43,7 @@ import gnu.java.awt.Buffers;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.Shape;
 import java.awt.color.ColorSpace;
-import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
 import java.awt.image.DataBuffer;
diff --git a/gnu/java/awt/peer/swing/SwingCheckboxPeer.java b/gnu/java/awt/peer/swing/SwingCheckboxPeer.java
index a8e3cb01b..03d6388e9 100755
--- a/gnu/java/awt/peer/swing/SwingCheckboxPeer.java
+++ b/gnu/java/awt/peer/swing/SwingCheckboxPeer.java
@@ -37,16 +37,12 @@ exception statement from your version. */
 
 package gnu.java.awt.peer.swing;
 
-import java.awt.Button;
 import java.awt.Checkbox;
 import java.awt.CheckboxGroup;
 import java.awt.Container;
 import java.awt.Graphics;
 import java.awt.Image;
-import java.awt.Label;
 import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -56,7 +52,6 @@ import java.awt.peer.CheckboxPeer;
 
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;
-import javax.swing.JLabel;
 import javax.swing.JToggleButton;
 
 /**
diff --git a/gnu/java/awt/peer/swing/SwingTextAreaPeer.java b/gnu/java/awt/peer/swing/SwingTextAreaPeer.java
index 2c438a1cc..5be82f695 100644
--- a/gnu/java/awt/peer/swing/SwingTextAreaPeer.java
+++ b/gnu/java/awt/peer/swing/SwingTextAreaPeer.java
@@ -37,7 +37,6 @@ exception statement from your version. */
 
 package gnu.java.awt.peer.swing;
 
-import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Graphics;
diff --git a/gnu/java/awt/peer/swing/SwingTextFieldPeer.java b/gnu/java/awt/peer/swing/SwingTextFieldPeer.java
index 29a689da4..49989a574 100644
--- a/gnu/java/awt/peer/swing/SwingTextFieldPeer.java
+++ b/gnu/java/awt/peer/swing/SwingTextFieldPeer.java
@@ -36,7 +36,6 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 package gnu.java.awt.peer.swing;
 
-import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Graphics;
diff --git a/gnu/java/awt/print/PostScriptGraphics2D.java b/gnu/java/awt/print/PostScriptGraphics2D.java
index 4e052a1d3..01894e5a4 100644
--- a/gnu/java/awt/print/PostScriptGraphics2D.java
+++ b/gnu/java/awt/print/PostScriptGraphics2D.java
@@ -74,7 +74,6 @@ import java.awt.print.Pageable;
 import java.awt.print.Paper;
 import java.awt.print.Printable;
 import java.awt.print.PrinterException;
-import java.awt.print.PrinterGraphics;
 import java.awt.print.PrinterJob;
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/gnu/java/awt/print/SpooledDocument.java b/gnu/java/awt/print/SpooledDocument.java
index b606a2ef6..812906b18 100644
--- a/gnu/java/awt/print/SpooledDocument.java
+++ b/gnu/java/awt/print/SpooledDocument.java
@@ -41,7 +41,6 @@ import javax.print.Doc;
 import javax.print.DocFlavor;
 import javax.print.attribute.DocAttributeSet;
 import java.io.File;
-import java.io.IOException;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.Reader;
diff --git a/gnu/java/io/PlatformHelper.java b/gnu/java/io/PlatformHelper.java
index e54c56da9..96231e1be 100644
--- a/gnu/java/io/PlatformHelper.java
+++ b/gnu/java/io/PlatformHelper.java
@@ -37,8 +37,6 @@ exception statement from your version. */
 
 package gnu.java.io;
 
-import java.util.StringTokenizer;
-
 /**
  * We had many changes in File.java, URLStreamHandler.java etc. to handle
  * path representations on different platforms (Windows/Unix-family).
diff --git a/gnu/java/lang/management/BeanImpl.java b/gnu/java/lang/management/BeanImpl.java
index 59e79a550..f751d0ce6 100644
--- a/gnu/java/lang/management/BeanImpl.java
+++ b/gnu/java/lang/management/BeanImpl.java
@@ -44,8 +44,6 @@ import java.lang.management.ManagementPermission;
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.TypeVariable;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -59,13 +57,11 @@ import javax.management.MBeanException;
 import javax.management.MBeanInfo;
 import javax.management.MBeanOperationInfo;
 import javax.management.MBeanParameterInfo;
-import javax.management.MBeanInfo;
 import javax.management.NotCompliantMBeanException;
 import javax.management.ReflectionException;
 import javax.management.StandardMBean;
 
 import javax.management.openmbean.ArrayType;
-import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.CompositeDataSupport;
 import javax.management.openmbean.CompositeType;
 import javax.management.openmbean.OpenDataException;
@@ -80,7 +76,6 @@ import javax.management.openmbean.OpenMBeanOperationInfoSupport;
 import javax.management.openmbean.OpenMBeanParameterInfo;
 import javax.management.openmbean.OpenMBeanParameterInfoSupport;
 import javax.management.openmbean.OpenType;
-import javax.management.openmbean.SimpleType;
 import javax.management.openmbean.TabularData;
 import javax.management.openmbean.TabularDataSupport;
 import javax.management.openmbean.TabularType;
diff --git a/gnu/java/locale/LocaleHelper.java b/gnu/java/locale/LocaleHelper.java
index 4fefd1639..f3aabbdd9 100644
--- a/gnu/java/locale/LocaleHelper.java
+++ b/gnu/java/locale/LocaleHelper.java
@@ -40,8 +40,6 @@ package gnu.java.locale;
 
 import java.text.Collator;
 import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
 
 /**
  * This class provides common helper methods
diff --git a/gnu/java/net/protocol/http/Request.java b/gnu/java/net/protocol/http/Request.java
index 06a779f33..90e3b7a0d 100644
--- a/gnu/java/net/protocol/http/Request.java
+++ b/gnu/java/net/protocol/http/Request.java
@@ -52,7 +52,6 @@ import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 import java.util.zip.GZIPInputStream;
diff --git a/gnu/java/nio/DatagramChannelImpl.java b/gnu/java/nio/DatagramChannelImpl.java
index 268ee0a8a..ea8c863e3 100644
--- a/gnu/java/nio/DatagramChannelImpl.java
+++ b/gnu/java/nio/DatagramChannelImpl.java
@@ -40,11 +40,9 @@ package gnu.java.nio;
 
 import gnu.java.net.PlainDatagramSocketImpl;
 import java.io.IOException;
-import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.DatagramChannel;
diff --git a/gnu/java/nio/KqueueSelectionKeyImpl.java b/gnu/java/nio/KqueueSelectionKeyImpl.java
index 2f93c50cc..11b37cadb 100644
--- a/gnu/java/nio/KqueueSelectionKeyImpl.java
+++ b/gnu/java/nio/KqueueSelectionKeyImpl.java
@@ -39,8 +39,6 @@ exception statement from your version. */
 package gnu.java.nio;
 
 
-import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
diff --git a/gnu/java/nio/NIOSocket.java b/gnu/java/nio/NIOSocket.java
index 060a3a89c..87574e491 100644
--- a/gnu/java/nio/NIOSocket.java
+++ b/gnu/java/nio/NIOSocket.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package gnu.java.nio;
 
-import gnu.java.net.PlainSocketImpl;
 import java.io.IOException;
 import java.net.Socket;
 import java.nio.channels.SocketChannel;
diff --git a/gnu/java/nio/ServerSocketChannelImpl.java b/gnu/java/nio/ServerSocketChannelImpl.java
index 1e8e0901d..0128661e5 100644
--- a/gnu/java/nio/ServerSocketChannelImpl.java
+++ b/gnu/java/nio/ServerSocketChannelImpl.java
@@ -40,7 +40,6 @@ package gnu.java.nio;
 
 import java.io.IOException;
 import java.net.ServerSocket;
-import java.net.SocketTimeoutException;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.NotYetBoundException;
 import java.nio.channels.ServerSocketChannel;
diff --git a/gnu/java/nio/SocketChannelImpl.java b/gnu/java/nio/SocketChannelImpl.java
index 1c563ac09..9564592e0 100644
--- a/gnu/java/nio/SocketChannelImpl.java
+++ b/gnu/java/nio/SocketChannelImpl.java
@@ -38,28 +38,16 @@ exception statement from your version. */
 
 package gnu.java.nio;
 
-import gnu.java.net.PlainSocketImpl;
-import gnu.java.net.VMPlainSocketImpl;
-
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
-import java.nio.ReadOnlyBufferException;
 import java.nio.channels.AlreadyConnectedException;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.ConnectionPendingException;
 import java.nio.channels.NoConnectionPendingException;
 import java.nio.channels.NotYetConnectedException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
 import java.nio.channels.UnresolvedAddressException;
 import java.nio.channels.UnsupportedAddressTypeException;
diff --git a/gnu/java/rmi/server/RMIObjectInputStream.java b/gnu/java/rmi/server/RMIObjectInputStream.java
index 75f4f1202..65a13f991 100644
--- a/gnu/java/rmi/server/RMIObjectInputStream.java
+++ b/gnu/java/rmi/server/RMIObjectInputStream.java
@@ -46,7 +46,6 @@ import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 import java.net.MalformedURLException;
 import java.rmi.server.RMIClassLoader;
-import java.util.ArrayList;
 
 public class RMIObjectInputStream
 	extends ObjectInputStream {
diff --git a/gnu/java/util/regex/RE.java b/gnu/java/util/regex/RE.java
index 09ff74b90..421640ff2 100644
--- a/gnu/java/util/regex/RE.java
+++ b/gnu/java/util/regex/RE.java
@@ -41,7 +41,6 @@ import java.io.Serializable;
 import java.util.Locale;
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
-import java.util.Stack;
 import java.util.Vector;
 
 /**
diff --git a/gnu/javax/imageio/bmp/DecodeBF16.java b/gnu/javax/imageio/bmp/DecodeBF16.java
index 702c93ab3..397b857aa 100644
--- a/gnu/javax/imageio/bmp/DecodeBF16.java
+++ b/gnu/javax/imageio/bmp/DecodeBF16.java
@@ -39,8 +39,6 @@ package gnu.javax.imageio.bmp;
 
 import java.io.IOException;
 import javax.imageio.stream.ImageInputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
 import java.awt.image.DirectColorModel;
diff --git a/gnu/javax/imageio/bmp/EncodeRGB32.java b/gnu/javax/imageio/bmp/EncodeRGB32.java
index d653bbf9f..4aa1cd5d2 100644
--- a/gnu/javax/imageio/bmp/EncodeRGB32.java
+++ b/gnu/javax/imageio/bmp/EncodeRGB32.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package gnu.javax.imageio.bmp;
 
-import java.awt.Dimension;
 import java.awt.image.BufferedImage;
 import java.awt.image.PixelGrabber;
 import java.io.IOException;
diff --git a/gnu/javax/imageio/jpeg/JPEGDecoder.java b/gnu/javax/imageio/jpeg/JPEGDecoder.java
index 3610ebe87..ef1f80e87 100644
--- a/gnu/javax/imageio/jpeg/JPEGDecoder.java
+++ b/gnu/javax/imageio/jpeg/JPEGDecoder.java
@@ -40,16 +40,12 @@ package gnu.javax.imageio.jpeg;
 import java.io.IOException;
 import java.nio.ByteOrder;
 
-import javax.imageio.*;
 import javax.imageio.plugins.jpeg.JPEGHuffmanTable;
 import javax.imageio.plugins.jpeg.JPEGQTable;
-import javax.imageio.spi.*;
-import javax.imageio.metadata.*;
 import javax.imageio.stream.ImageInputStream;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.awt.Point;
 import java.awt.Transparency;
 import java.awt.color.ColorSpace;
diff --git a/gnu/javax/imageio/jpeg/JPEGException.java b/gnu/javax/imageio/jpeg/JPEGException.java
index b684069cc..a2c06e27e 100644
--- a/gnu/javax/imageio/jpeg/JPEGException.java
+++ b/gnu/javax/imageio/jpeg/JPEGException.java
@@ -37,14 +37,7 @@ exception statement from your version. */
 
 package gnu.javax.imageio.jpeg;
 
-// FIXME: change to IIOException
-import java.io.IOException;
 import javax.imageio.*;
-import javax.imageio.spi.*;
-import javax.imageio.metadata.*;
-import javax.imageio.stream.ImageInputStream;
-import java.util.Iterator;
-import java.awt.image.BufferedImage;
 
 public class JPEGException extends IIOException
 {
diff --git a/gnu/javax/imageio/jpeg/JPEGImageInputStream.java b/gnu/javax/imageio/jpeg/JPEGImageInputStream.java
index 4ae909baf..29a12f346 100644
--- a/gnu/javax/imageio/jpeg/JPEGImageInputStream.java
+++ b/gnu/javax/imageio/jpeg/JPEGImageInputStream.java
@@ -37,17 +37,10 @@ exception statement from your version. */
 
 package gnu.javax.imageio.jpeg;
 
-import java.io.EOFException;
 import java.io.IOException;
-import javax.imageio.*;
-import javax.imageio.spi.*;
-import javax.imageio.metadata.*;
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.ImageInputStreamImpl;
 
-import java.util.Iterator;
-import java.awt.image.BufferedImage;
-
 public class JPEGImageInputStream
   extends ImageInputStreamImpl
 {
diff --git a/gnu/javax/imageio/png/PNGChunk.java b/gnu/javax/imageio/png/PNGChunk.java
index 6b53810c8..8efbeea72 100644
--- a/gnu/javax/imageio/png/PNGChunk.java
+++ b/gnu/javax/imageio/png/PNGChunk.java
@@ -40,7 +40,6 @@ package gnu.javax.imageio.png;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 
 /**
  * Class to load and validate a generic PNG chunk.
diff --git a/gnu/javax/imageio/png/PNGEncoder.java b/gnu/javax/imageio/png/PNGEncoder.java
index c0a30a7ba..b8441c4e3 100644
--- a/gnu/javax/imageio/png/PNGEncoder.java
+++ b/gnu/javax/imageio/png/PNGEncoder.java
@@ -40,7 +40,6 @@ package gnu.javax.imageio.png;
 import java.util.Vector;
 import java.util.zip.Deflater;
 import java.awt.color.ColorSpace;
-import java.awt.color.ICC_Profile;
 import java.awt.color.ICC_ColorSpace;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
@@ -48,7 +47,6 @@ import java.awt.image.DataBuffer;
 import java.awt.image.DataBufferByte;
 import java.awt.image.DataBufferUShort;
 import java.awt.image.IndexColorModel;
-import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 
 public class PNGEncoder 
diff --git a/gnu/javax/imageio/png/PNGFile.java b/gnu/javax/imageio/png/PNGFile.java
index cc0ca297f..96e8f9ce7 100644
--- a/gnu/javax/imageio/png/PNGFile.java
+++ b/gnu/javax/imageio/png/PNGFile.java
@@ -44,7 +44,6 @@ import java.util.Vector;
 import java.awt.image.BufferedImage;
 import java.awt.image.WritableRaster;
 import java.awt.image.ColorModel;
-import java.awt.image.IndexColorModel;
 import java.awt.color.ColorSpace;
 
 public class PNGFile 
diff --git a/gnu/javax/imageio/png/PNGGamma.java b/gnu/javax/imageio/png/PNGGamma.java
index af777d9b4..d9cacea46 100644
--- a/gnu/javax/imageio/png/PNGGamma.java
+++ b/gnu/javax/imageio/png/PNGGamma.java
@@ -37,10 +37,6 @@ exception statement from your version. */
 
 package gnu.javax.imageio.png;
 
-import java.awt.color.ICC_ProfileGray;
-import java.awt.color.ICC_ProfileRGB;
-import java.awt.color.ICC_Profile;
-import java.awt.color.ICC_ColorSpace;
 import java.awt.color.ColorSpace;
 
 /**
diff --git a/gnu/javax/net/ssl/SSLRecordHandler.java b/gnu/javax/net/ssl/SSLRecordHandler.java
index 3147415fe..3ce56eab5 100644
--- a/gnu/javax/net/ssl/SSLRecordHandler.java
+++ b/gnu/javax/net/ssl/SSLRecordHandler.java
@@ -39,7 +39,6 @@ exception statement from your version.  */
 package gnu.javax.net.ssl;
 
 import java.nio.ByteBuffer;
-import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLException;
 
 public abstract class SSLRecordHandler
diff --git a/gnu/javax/net/ssl/StaticTrustAnchors.java b/gnu/javax/net/ssl/StaticTrustAnchors.java
index 0c2c3cca8..480f1c754 100644
--- a/gnu/javax/net/ssl/StaticTrustAnchors.java
+++ b/gnu/javax/net/ssl/StaticTrustAnchors.java
@@ -39,8 +39,6 @@ exception statement from your version.  */
 package gnu.javax.net.ssl;
 
 import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
diff --git a/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java b/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java
index 9beab473c..8c059854e 100644
--- a/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java
+++ b/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package gnu.javax.net.ssl.provider;
 
-import static gnu.javax.net.ssl.provider.CertificateRequest.ClientCertificateType;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/gnu/javax/net/ssl/provider/ClientHandshake.java b/gnu/javax/net/ssl/provider/ClientHandshake.java
index a87800845..fdbf26212 100644
--- a/gnu/javax/net/ssl/provider/ClientHandshake.java
+++ b/gnu/javax/net/ssl/provider/ClientHandshake.java
@@ -56,7 +56,6 @@ import java.nio.ByteBuffer;
 import java.security.AccessController;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
-import java.security.KeyManagementException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.MessageDigest;
@@ -65,7 +64,6 @@ import java.security.PrivateKey;
 import java.security.SignatureException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPublicKey;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -77,7 +75,6 @@ import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
 import javax.crypto.interfaces.DHPrivateKey;
 import javax.crypto.interfaces.DHPublicKey;
 import javax.crypto.spec.DHParameterSpec;
diff --git a/gnu/javax/net/ssl/provider/ClientPSKParameters.java b/gnu/javax/net/ssl/provider/ClientPSKParameters.java
index 676a872f9..f08ec7f90 100644
--- a/gnu/javax/net/ssl/provider/ClientPSKParameters.java
+++ b/gnu/javax/net/ssl/provider/ClientPSKParameters.java
@@ -38,13 +38,9 @@ exception statement from your version. */
 
 package gnu.javax.net.ssl.provider;
 
-import gnu.classpath.debug.Component;
-import gnu.classpath.debug.SystemLogger;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 
diff --git a/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java b/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java
index f7483a94c..860cc731f 100644
--- a/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java
+++ b/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java
@@ -38,13 +38,9 @@ exception statement from your version. */
 
 package gnu.javax.net.ssl.provider;
 
-import gnu.classpath.debug.Component;
-import gnu.classpath.debug.SystemLogger;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.nio.charset.Charset;
 
 /**
diff --git a/gnu/javax/net/ssl/provider/ContentType.java b/gnu/javax/net/ssl/provider/ContentType.java
index f7165a2d7..eaebebf4b 100644
--- a/gnu/javax/net/ssl/provider/ContentType.java
+++ b/gnu/javax/net/ssl/provider/ContentType.java
@@ -38,10 +38,6 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import java.io.EOFException;
-import java.io.InputStream;
-import java.io.IOException;
-
 /**
  * The content type enumeration, which marks packets in the record layer.
  *
diff --git a/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java b/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java
index ea7439bd2..85769cffc 100644
--- a/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java
+++ b/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java
@@ -38,9 +38,6 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import gnu.classpath.debug.Component;
-import gnu.classpath.debug.SystemLogger;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
diff --git a/gnu/javax/net/ssl/provider/Handshake.java b/gnu/javax/net/ssl/provider/Handshake.java
index 52f61424e..dd36f2b3f 100644
--- a/gnu/javax/net/ssl/provider/Handshake.java
+++ b/gnu/javax/net/ssl/provider/Handshake.java
@@ -38,26 +38,11 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.EOFException;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.io.StringReader;
 import java.io.StringWriter;
 
 import java.nio.ByteBuffer;
 
-import java.security.PublicKey;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-import javax.net.ssl.SSLProtocolException;
-
 /**
  * An SSL handshake message. SSL handshake messages have the following
  * form:
diff --git a/gnu/javax/net/ssl/provider/InputSecurityParameters.java b/gnu/javax/net/ssl/provider/InputSecurityParameters.java
index 13a3ef814..cf5ca6099 100644
--- a/gnu/javax/net/ssl/provider/InputSecurityParameters.java
+++ b/gnu/javax/net/ssl/provider/InputSecurityParameters.java
@@ -47,11 +47,9 @@ import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import java.util.Arrays;
-import java.util.logging.Level;
 import java.util.zip.DataFormatException;
 import java.util.zip.Inflater;
 
-import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.Mac;
diff --git a/gnu/javax/net/ssl/provider/OutputSecurityParameters.java b/gnu/javax/net/ssl/provider/OutputSecurityParameters.java
index 6da0d0667..228071a39 100644
--- a/gnu/javax/net/ssl/provider/OutputSecurityParameters.java
+++ b/gnu/javax/net/ssl/provider/OutputSecurityParameters.java
@@ -40,16 +40,13 @@ package gnu.javax.net.ssl.provider;
 
 import gnu.classpath.debug.Component;
 import gnu.classpath.debug.SystemLogger;
-import gnu.java.security.util.ByteArray;
 import gnu.java.security.util.ByteBufferOutputStream;
 
 import java.nio.ByteBuffer;
 
-import java.util.logging.Level;
 import java.util.zip.DataFormatException;
 import java.util.zip.Deflater;
 
-import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.Mac;
diff --git a/gnu/javax/net/ssl/provider/ProtocolVersion.java b/gnu/javax/net/ssl/provider/ProtocolVersion.java
index ca62054a8..3c3f29a21 100644
--- a/gnu/javax/net/ssl/provider/ProtocolVersion.java
+++ b/gnu/javax/net/ssl/provider/ProtocolVersion.java
@@ -40,7 +40,6 @@ package gnu.javax.net.ssl.provider;
 
 import java.io.InputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 
 public final class ProtocolVersion
   implements Comparable<ProtocolVersion>, Constructed
diff --git a/gnu/javax/net/ssl/provider/Random.java b/gnu/javax/net/ssl/provider/Random.java
index e68159309..f89acc1f8 100644
--- a/gnu/javax/net/ssl/provider/Random.java
+++ b/gnu/javax/net/ssl/provider/Random.java
@@ -38,10 +38,6 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
diff --git a/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java b/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java
index 5822afe05..c5422871d 100644
--- a/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java
+++ b/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java
@@ -44,8 +44,6 @@ import java.math.BigInteger;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyPair;
 import java.security.KeyStore;
-import java.security.Security;
-
 import java.util.HashMap;
 
 import javax.net.ssl.ManagerFactoryParameters;
diff --git a/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java b/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java
index edc3ac259..2d21d9d45 100644
--- a/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java
+++ b/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java
@@ -38,9 +38,6 @@ exception statement from your version. */
 
 package gnu.javax.net.ssl.provider;
 
-import gnu.classpath.debug.Component;
-import gnu.classpath.debug.SystemLogger;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.ByteBuffer;
diff --git a/gnu/javax/net/ssl/provider/SessionImpl.java b/gnu/javax/net/ssl/provider/SessionImpl.java
index 86dcb4915..6a4020117 100644
--- a/gnu/javax/net/ssl/provider/SessionImpl.java
+++ b/gnu/javax/net/ssl/provider/SessionImpl.java
@@ -40,22 +40,16 @@ package gnu.javax.net.ssl.provider;
 
 import gnu.javax.crypto.key.GnuPBEKey;
 import gnu.javax.net.ssl.Session;
-import gnu.javax.net.ssl.Session.ID;
-
 import java.io.IOException;
 import java.io.Serializable;
 
-import java.security.Certificate;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SealedObject;
-import javax.crypto.spec.PBEKeySpec;
 import javax.net.ssl.SSLException;
 
 public class SessionImpl extends Session
diff --git a/gnu/javax/net/ssl/provider/Signature.java b/gnu/javax/net/ssl/provider/Signature.java
index 8c6cfadc7..d95e18137 100644
--- a/gnu/javax/net/ssl/provider/Signature.java
+++ b/gnu/javax/net/ssl/provider/Signature.java
@@ -38,26 +38,11 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import java.math.BigInteger;
-
 import java.nio.ByteBuffer;
 
-import java.security.PublicKey;
-import java.security.interfaces.RSAKey;
-
-import java.util.Arrays;
-
-import gnu.java.security.der.*;
-
 /**
  * The signature structure.
  *
diff --git a/gnu/javax/net/ssl/provider/SimpleSessionContext.java b/gnu/javax/net/ssl/provider/SimpleSessionContext.java
index b9d0f9551..20503d3ca 100644
--- a/gnu/javax/net/ssl/provider/SimpleSessionContext.java
+++ b/gnu/javax/net/ssl/provider/SimpleSessionContext.java
@@ -41,8 +41,6 @@ package gnu.javax.net.ssl.provider;
 import gnu.javax.net.ssl.AbstractSessionContext;
 import gnu.javax.net.ssl.Session;
 import gnu.javax.net.ssl.SessionStoreException;
-import gnu.javax.net.ssl.Session.ID;
-
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/gnu/javax/net/ssl/provider/TLSHMac.java b/gnu/javax/net/ssl/provider/TLSHMac.java
index 18aa8f5f4..8bdda930b 100644
--- a/gnu/javax/net/ssl/provider/TLSHMac.java
+++ b/gnu/javax/net/ssl/provider/TLSHMac.java
@@ -39,7 +39,6 @@ exception statement from your version.  */
 package gnu.javax.net.ssl.provider;
 
 import java.security.InvalidKeyException;
-import java.util.HashMap;
 import java.util.Map;
 
 import gnu.java.security.hash.IMessageDigest;
diff --git a/gnu/javax/net/ssl/provider/TrustedAuthorities.java b/gnu/javax/net/ssl/provider/TrustedAuthorities.java
index 1e4b17359..85e359675 100644
--- a/gnu/javax/net/ssl/provider/TrustedAuthorities.java
+++ b/gnu/javax/net/ssl/provider/TrustedAuthorities.java
@@ -38,7 +38,6 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import gnu.java.security.x509.X500DistinguishedName;
 import gnu.javax.net.ssl.provider.Extension.Value;
 
 import java.io.PrintWriter;
diff --git a/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java b/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java
index 2094daf90..f54dda5bc 100644
--- a/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java
+++ b/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java
@@ -40,8 +40,6 @@ package gnu.javax.net.ssl.provider;
 
 import gnu.javax.net.ssl.provider.Extension.Value;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.nio.ByteBuffer;
 
 public class UnresolvedExtensionValue extends Value
diff --git a/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java b/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java
index dc7728866..c3b7e5f4b 100644
--- a/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java
+++ b/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java
@@ -64,8 +64,6 @@ import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.List;
 
@@ -77,8 +75,6 @@ import javax.net.ssl.KeyManagerFactorySpi;
 import javax.net.ssl.ManagerFactoryParameters;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.X509ExtendedKeyManager;
-import javax.net.ssl.X509KeyManager;
-
 import gnu.javax.net.ssl.NullManagerParameters;
 import gnu.javax.net.ssl.PrivateCredentials;
 
diff --git a/gnu/javax/security/auth/Password.java b/gnu/javax/security/auth/Password.java
index 7284b7d68..c55f4a51c 100644
--- a/gnu/javax/security/auth/Password.java
+++ b/gnu/javax/security/auth/Password.java
@@ -40,8 +40,6 @@ package gnu.javax.security.auth;
 
 import gnu.java.security.util.ExpirableObject;
 
-import javax.security.auth.DestroyFailedException;
-
 /**
  * Immutible, though destroyable, password class.
  *
diff --git a/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java b/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
index baf61732d..740b124eb 100644
--- a/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
+++ b/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
@@ -44,8 +44,6 @@ import java.io.File;
 import java.io.FilenameFilter;
 
 import gnu.classpath.Configuration;
-import gnu.javax.sound.midi.alsa.AlsaMidiSequencerDevice;
-
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiDevice.Info;
 import javax.sound.midi.spi.MidiDeviceProvider;
diff --git a/gnu/javax/sound/midi/file/MidiFileWriter.java b/gnu/javax/sound/midi/file/MidiFileWriter.java
index 71970d5ba..b9b6fe87a 100644
--- a/gnu/javax/sound/midi/file/MidiFileWriter.java
+++ b/gnu/javax/sound/midi/file/MidiFileWriter.java
@@ -38,10 +38,8 @@ exception statement from your version. */
 package gnu.javax.sound.midi.file;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 
 import javax.sound.midi.MetaMessage;
diff --git a/gnu/javax/sound/sampled/AU/AUReader.java b/gnu/javax/sound/sampled/AU/AUReader.java
index c9035df73..ed5852e6c 100644
--- a/gnu/javax/sound/sampled/AU/AUReader.java
+++ b/gnu/javax/sound/sampled/AU/AUReader.java
@@ -47,7 +47,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.BufferedInputStream;
 import java.io.InputStream;
-import java.io.DataInputStream;
 import java.io.FileInputStream;
 import java.net.URL;
 import java.nio.ByteBuffer;
diff --git a/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java b/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
index 7f2e8b014..aa42a4c3d 100644
--- a/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
+++ b/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
@@ -40,8 +40,6 @@ package gnu.javax.sound.sampled.gstreamer;
 import gnu.javax.sound.sampled.gstreamer.lines.GstSourceDataLine;
 
 import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioPermission;
-import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.Control;
 import javax.sound.sampled.DataLine;
 import javax.sound.sampled.Line;
@@ -50,7 +48,6 @@ import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.Mixer;
 import javax.sound.sampled.SourceDataLine;
 import javax.sound.sampled.Control.Type;
-import javax.sound.sampled.Line.Info;
 
 /**
  * @author Mario Torre <neugens@limasoftware.net>
diff --git a/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java b/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
index 2299d5b7c..b90caef24 100644
--- a/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
+++ b/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
@@ -45,8 +45,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.Map;
-
 import javax.sound.sampled.AudioFileFormat;
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioInputStream;
diff --git a/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.java b/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.java
index cef1e0f12..9b395dca2 100644
--- a/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.java
+++ b/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.java
@@ -36,8 +36,6 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 package gnu.javax.sound.sampled.gstreamer.io;
 
-import gnu.javax.sound.sampled.gstreamer.GStreamerMixer;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/gnu/xml/dom/html2/DomHTMLButtonElement.java b/gnu/xml/dom/html2/DomHTMLButtonElement.java
index 5aff5f8c1..3bca44c09 100644
--- a/gnu/xml/dom/html2/DomHTMLButtonElement.java
+++ b/gnu/xml/dom/html2/DomHTMLButtonElement.java
@@ -37,7 +37,6 @@ exception statement from your version. */
 
 package gnu.xml.dom.html2;
 
-import org.w3c.dom.Node;
 import org.w3c.dom.html2.HTMLButtonElement;
 import org.w3c.dom.html2.HTMLFormElement;
 
diff --git a/gnu/xml/dom/html2/DomHTMLCollection.java b/gnu/xml/dom/html2/DomHTMLCollection.java
index 577337a3c..c63620087 100644
--- a/gnu/xml/dom/html2/DomHTMLCollection.java
+++ b/gnu/xml/dom/html2/DomHTMLCollection.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 package gnu.xml.dom.html2;
 
 import gnu.xml.dom.DomDOMException;
-import gnu.xml.dom.DomElement;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/gnu/xml/dom/html2/DomHTMLParser.java b/gnu/xml/dom/html2/DomHTMLParser.java
index 2d329fd4c..c6d8c4c5c 100644
--- a/gnu/xml/dom/html2/DomHTMLParser.java
+++ b/gnu/xml/dom/html2/DomHTMLParser.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package gnu.xml.dom.html2;
 
-import gnu.javax.swing.text.html.parser.support.Parser;
-
 import java.io.IOException;
 import java.io.Reader;
 
diff --git a/gnu/xml/stream/EndDocumentImpl.java b/gnu/xml/stream/EndDocumentImpl.java
index 7a5e2049e..0e3ed9630 100644
--- a/gnu/xml/stream/EndDocumentImpl.java
+++ b/gnu/xml/stream/EndDocumentImpl.java
@@ -37,7 +37,6 @@ exception statement from your version. */
 
 package gnu.xml.stream;
 
-import java.io.IOException;
 import java.io.Writer;
 import javax.xml.stream.Location;
 import javax.xml.stream.XMLStreamException;
diff --git a/gnu/xml/stream/SAXParser.java b/gnu/xml/stream/SAXParser.java
index af4a6af42..02f636a65 100644
--- a/gnu/xml/stream/SAXParser.java
+++ b/gnu/xml/stream/SAXParser.java
@@ -66,7 +66,6 @@ import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.ext.Attributes2;
 import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.ext.EntityResolver2;
 import org.xml.sax.ext.LexicalHandler;
 import org.xml.sax.ext.Locator2;
 
diff --git a/gnu/xml/stream/XIncludeFilter.java b/gnu/xml/stream/XIncludeFilter.java
index 86961faea..2b27b947d 100644
--- a/gnu/xml/stream/XIncludeFilter.java
+++ b/gnu/xml/stream/XIncludeFilter.java
@@ -51,7 +51,6 @@ import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
diff --git a/gnu/xml/stream/XMLEventImpl.java b/gnu/xml/stream/XMLEventImpl.java
index 9f57d89d8..de2fccb7a 100644
--- a/gnu/xml/stream/XMLEventImpl.java
+++ b/gnu/xml/stream/XMLEventImpl.java
@@ -40,7 +40,6 @@ package gnu.xml.stream;
 import java.io.Writer;
 import javax.xml.namespace.QName;
 import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.Characters;
 import javax.xml.stream.events.EndElement;
diff --git a/gnu/xml/transform/StreamSerializer.java b/gnu/xml/transform/StreamSerializer.java
index 26bdda8b3..35323e735 100644
--- a/gnu/xml/transform/StreamSerializer.java
+++ b/gnu/xml/transform/StreamSerializer.java
@@ -40,7 +40,6 @@ package gnu.xml.transform;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
diff --git a/gnu/xml/transform/Stylesheet.java b/gnu/xml/transform/Stylesheet.java
index 73b229691..41562c3c6 100644
--- a/gnu/xml/transform/Stylesheet.java
+++ b/gnu/xml/transform/Stylesheet.java
@@ -51,7 +51,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
-import java.util.TreeSet;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
diff --git a/gnu/xml/validation/datatype/Base64BinaryType.java b/gnu/xml/validation/datatype/Base64BinaryType.java
index 5a72a280d..2fc4c33b9 100644
--- a/gnu/xml/validation/datatype/Base64BinaryType.java
+++ b/gnu/xml/validation/datatype/Base64BinaryType.java
@@ -37,8 +37,6 @@ exception statement from your version. */
 
 package gnu.xml.validation.datatype;
 
-import java.util.Collections;
-import java.util.Set;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import org.relaxng.datatype.DatatypeException;
diff --git a/gnu/xml/validation/datatype/BooleanType.java b/gnu/xml/validation/datatype/BooleanType.java
index 5a2d9ecfa..25e488a05 100644
--- a/gnu/xml/validation/datatype/BooleanType.java
+++ b/gnu/xml/validation/datatype/BooleanType.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 package gnu.xml.validation.datatype;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Set;
 import java.util.TreeSet;
 import javax.xml.XMLConstants;
diff --git a/gnu/xml/validation/datatype/DecimalType.java b/gnu/xml/validation/datatype/DecimalType.java
index 08fe3304c..b895c44b2 100644
--- a/gnu/xml/validation/datatype/DecimalType.java
+++ b/gnu/xml/validation/datatype/DecimalType.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 package gnu.xml.validation.datatype;
 
 import java.math.BigDecimal;
-import java.util.Collections;
-import java.util.Set;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import org.relaxng.datatype.DatatypeException;
diff --git a/gnu/xml/validation/datatype/DoubleType.java b/gnu/xml/validation/datatype/DoubleType.java
index e25d060fa..5d2d8662d 100644
--- a/gnu/xml/validation/datatype/DoubleType.java
+++ b/gnu/xml/validation/datatype/DoubleType.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 package gnu.xml.validation.datatype;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Set;
 import java.util.TreeSet;
 import javax.xml.XMLConstants;
diff --git a/gnu/xml/validation/datatype/FloatType.java b/gnu/xml/validation/datatype/FloatType.java
index a81a56c1a..372e38871 100644
--- a/gnu/xml/validation/datatype/FloatType.java
+++ b/gnu/xml/validation/datatype/FloatType.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 package gnu.xml.validation.datatype;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Set;
 import java.util.TreeSet;
 import javax.xml.XMLConstants;
diff --git a/gnu/xml/validation/datatype/HexBinaryType.java b/gnu/xml/validation/datatype/HexBinaryType.java
index 686e09d98..8a92b15f6 100644
--- a/gnu/xml/validation/datatype/HexBinaryType.java
+++ b/gnu/xml/validation/datatype/HexBinaryType.java
@@ -37,8 +37,6 @@ exception statement from your version. */
 
 package gnu.xml.validation.datatype;
 
-import java.util.Collections;
-import java.util.Set;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import org.relaxng.datatype.DatatypeException;
diff --git a/gnu/xml/validation/datatype/NotationType.java b/gnu/xml/validation/datatype/NotationType.java
index 59c7f25e5..e9d7c9fda 100644
--- a/gnu/xml/validation/datatype/NotationType.java
+++ b/gnu/xml/validation/datatype/NotationType.java
@@ -37,8 +37,6 @@ exception statement from your version. */
 
 package gnu.xml.validation.datatype;
 
-import java.util.Collections;
-import java.util.Set;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import org.relaxng.datatype.DatatypeException;
diff --git a/gnu/xml/validation/datatype/SimpleType.java b/gnu/xml/validation/datatype/SimpleType.java
index 6554f2fe0..1b8479922 100644
--- a/gnu/xml/validation/datatype/SimpleType.java
+++ b/gnu/xml/validation/datatype/SimpleType.java
@@ -40,7 +40,6 @@ package gnu.xml.validation.datatype;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.regex.Matcher;
-import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import org.relaxng.datatype.Datatype;
 import org.relaxng.datatype.DatatypeException;
diff --git a/gnu/xml/validation/datatype/StringType.java b/gnu/xml/validation/datatype/StringType.java
index a2235f2df..593c265dc 100644
--- a/gnu/xml/validation/datatype/StringType.java
+++ b/gnu/xml/validation/datatype/StringType.java
@@ -37,12 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.validation.datatype;
 
-import java.util.Collections;
-import java.util.Set;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
-import org.relaxng.datatype.DatatypeException;
-import org.relaxng.datatype.ValidationContext;
 
 /**
  * The XML Schema string type.
diff --git a/gnu/xml/validation/datatype/Type.java b/gnu/xml/validation/datatype/Type.java
index e0662761f..be6f0a0b4 100644
--- a/gnu/xml/validation/datatype/Type.java
+++ b/gnu/xml/validation/datatype/Type.java
@@ -37,8 +37,6 @@ exception statement from your version. */
 
 package gnu.xml.validation.datatype;
 
-import java.util.HashMap;
-import java.util.Map;
 import javax.xml.namespace.QName;
 /**
  * Abstract base class for XML Schema datatypes.
diff --git a/gnu/xml/validation/datatype/TypeBuilder.java b/gnu/xml/validation/datatype/TypeBuilder.java
index 606fd0e62..054eb8a55 100644
--- a/gnu/xml/validation/datatype/TypeBuilder.java
+++ b/gnu/xml/validation/datatype/TypeBuilder.java
@@ -39,7 +39,6 @@ package gnu.xml.validation.datatype;
 
 import java.util.LinkedHashSet;
 import java.util.regex.Pattern;
-import javax.xml.namespace.QName;
 import org.relaxng.datatype.Datatype;
 import org.relaxng.datatype.DatatypeBuilder;
 import org.relaxng.datatype.DatatypeException;
diff --git a/gnu/xml/validation/relaxng/FullSyntaxBuilder.java b/gnu/xml/validation/relaxng/FullSyntaxBuilder.java
index 2a6833737..78e9f8533 100644
--- a/gnu/xml/validation/relaxng/FullSyntaxBuilder.java
+++ b/gnu/xml/validation/relaxng/FullSyntaxBuilder.java
@@ -51,7 +51,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.xml.XMLConstants;
-import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
diff --git a/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java b/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java
index 758bc94cd..45064075a 100644
--- a/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java
+++ b/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java
@@ -37,7 +37,6 @@ exception statement from your version. */
 
 package gnu.xml.validation.xmlschema;
 
-import org.w3c.dom.TypeInfo;
 import gnu.xml.validation.datatype.SimpleType;
 
 /**
diff --git a/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java b/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java
index ddf91409d..ecf3ad3b8 100644
--- a/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java
+++ b/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 package gnu.xml.validation.xmlschema;
 
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;
 import javax.xml.XMLConstants;
@@ -49,11 +48,8 @@ import org.relaxng.datatype.helpers.DatatypeLibraryLoader;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import gnu.xml.validation.datatype.Annotation;
-import gnu.xml.validation.datatype.AtomicSimpleType;
-import gnu.xml.validation.datatype.ListSimpleType;
 import gnu.xml.validation.datatype.SimpleType;
 import gnu.xml.validation.datatype.Type;
-import gnu.xml.validation.datatype.UnionSimpleType;
 
 /**
  * Parses an XML Schema DOM tree, constructing a compiled internal
diff --git a/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java b/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java
index 98a5fb759..a65133c20 100644
--- a/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java
+++ b/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java
@@ -37,7 +37,6 @@ exception statement from your version. */
 
 package gnu.xml.validation.xmlschema;
 
-import org.w3c.dom.TypeInfo;
 import gnu.xml.validation.datatype.SimpleType;
 import gnu.xml.validation.datatype.Type;
 
diff --git a/gnu/xml/xpath/XPathParser.java b/gnu/xml/xpath/XPathParser.java
index 03066fbfc..9b7540a4a 100644
--- a/gnu/xml/xpath/XPathParser.java
+++ b/gnu/xml/xpath/XPathParser.java
@@ -44,7 +44,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/awt/MenuShortcut.java b/java/awt/MenuShortcut.java
index 259cbf1ae..5216d3474 100644
--- a/java/awt/MenuShortcut.java
+++ b/java/awt/MenuShortcut.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package java.awt;
 
-import java.awt.event.KeyEvent;
-
 /**
   * This class implements a keyboard accelerator for a menu item.
   *
diff --git a/java/awt/font/LineBreakMeasurer.java b/java/awt/font/LineBreakMeasurer.java
index 816c7745c..278bc8476 100644
--- a/java/awt/font/LineBreakMeasurer.java
+++ b/java/awt/font/LineBreakMeasurer.java
@@ -39,9 +39,7 @@ exception statement from your version. */
 package java.awt.font;
 
 import java.text.AttributedCharacterIterator;
-import java.text.AttributedString;
 import java.text.BreakIterator;
-import java.awt.Shape;
 
 public final class LineBreakMeasurer
 {
diff --git a/java/awt/font/TextMeasurer.java b/java/awt/font/TextMeasurer.java
index 00cab8a87..f4430bf6d 100644
--- a/java/awt/font/TextMeasurer.java
+++ b/java/awt/font/TextMeasurer.java
@@ -39,7 +39,6 @@ exception statement from your version. */
 package java.awt.font;
 
 import java.text.AttributedCharacterIterator;
-import java.text.AttributedString;
 import java.awt.Shape;
 
 /**
diff --git a/java/awt/image/BufferedImage.java b/java/awt/image/BufferedImage.java
index c9879461c..78623ccd9 100644
--- a/java/awt/image/BufferedImage.java
+++ b/java/awt/image/BufferedImage.java
@@ -41,8 +41,6 @@ package java.awt.image;
 import gnu.java.awt.Buffers;
 import gnu.java.awt.ClasspathGraphicsEnvironment;
 import gnu.java.awt.ComponentDataBlitOp;
-import gnu.java.awt.peer.gtk.CairoSurface;
-
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.GraphicsEnvironment;
diff --git a/java/beans/beancontext/BeanContextServicesSupport.java b/java/beans/beancontext/BeanContextServicesSupport.java
index f354ff474..be7365b1e 100644
--- a/java/beans/beancontext/BeanContextServicesSupport.java
+++ b/java/beans/beancontext/BeanContextServicesSupport.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package java.beans.beancontext;
 
-import gnu.classpath.NotImplementedException;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
diff --git a/java/security/SecureClassLoader.java b/java/security/SecureClassLoader.java
index f683f9a70..87dacf3b7 100644
--- a/java/security/SecureClassLoader.java
+++ b/java/security/SecureClassLoader.java
@@ -37,8 +37,6 @@ exception statement from your version. */
 
 package java.security;
 
-import java.util.WeakHashMap;
-
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 
diff --git a/java/security/cert/CertificateFactory.java b/java/security/cert/CertificateFactory.java
index 8139c6ec5..d83b8160e 100644
--- a/java/security/cert/CertificateFactory.java
+++ b/java/security/cert/CertificateFactory.java
@@ -42,7 +42,6 @@ import gnu.java.security.Engine;
 
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
-import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.Provider;
diff --git a/javax/imageio/metadata/IIOMetadataFormatImpl.java b/javax/imageio/metadata/IIOMetadataFormatImpl.java
index 78fad1a15..444497d7d 100644
--- a/javax/imageio/metadata/IIOMetadataFormatImpl.java
+++ b/javax/imageio/metadata/IIOMetadataFormatImpl.java
@@ -39,18 +39,13 @@ exception statement from your version. */
 package javax.imageio.metadata;
 
 import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
diff --git a/javax/imageio/stream/MemoryCacheImageInputStream.java b/javax/imageio/stream/MemoryCacheImageInputStream.java
index da8a958bb..72aa5e8d5 100644
--- a/javax/imageio/stream/MemoryCacheImageInputStream.java
+++ b/javax/imageio/stream/MemoryCacheImageInputStream.java
@@ -39,10 +39,8 @@ exception statement from your version. */
 package javax.imageio.stream;
 
 import java.io.BufferedInputStream;
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 
 /**
  * @author Michael Koch (konqueror@gmx.de)
diff --git a/javax/management/ObjectName.java b/javax/management/ObjectName.java
index 4ea21cdc7..1fb51506f 100644
--- a/javax/management/ObjectName.java
+++ b/javax/management/ObjectName.java
@@ -39,7 +39,6 @@ package javax.management;
 
 import java.io.Serializable;
 
-import java.util.Collections;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
diff --git a/javax/management/openmbean/ArrayType.java b/javax/management/openmbean/ArrayType.java
index 42f80623d..e6cf5261a 100644
--- a/javax/management/openmbean/ArrayType.java
+++ b/javax/management/openmbean/ArrayType.java
@@ -39,7 +39,6 @@ package javax.management.openmbean;
 
 import java.lang.reflect.Array;
 
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/javax/net/ssl/HttpsURLConnection.java b/javax/net/ssl/HttpsURLConnection.java
index 7d68162c9..c02cb9e7b 100644
--- a/javax/net/ssl/HttpsURLConnection.java
+++ b/javax/net/ssl/HttpsURLConnection.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.net.ssl;
 
-import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.security.Principal;
diff --git a/javax/print/attribute/standard/JobStateReasons.java b/javax/print/attribute/standard/JobStateReasons.java
index 997dcbc37..503c06c02 100644
--- a/javax/print/attribute/standard/JobStateReasons.java
+++ b/javax/print/attribute/standard/JobStateReasons.java
@@ -40,8 +40,6 @@ package javax.print.attribute.standard;
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
-
 import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintJobAttribute;
 
diff --git a/javax/swing/RepaintManager.java b/javax/swing/RepaintManager.java
index 773371489..bb88ebfcd 100644
--- a/javax/swing/RepaintManager.java
+++ b/javax/swing/RepaintManager.java
@@ -59,8 +59,6 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.WeakHashMap;
 
-import javax.swing.text.JTextComponent;
-
 /**
  * <p>The repaint manager holds a set of dirty regions, invalid components,
  * and a double buffer surface.  The dirty regions and invalid components
diff --git a/javax/swing/plaf/basic/BasicDirectoryModel.java b/javax/swing/plaf/basic/BasicDirectoryModel.java
index de82bd47b..b1fb727fe 100644
--- a/javax/swing/plaf/basic/BasicDirectoryModel.java
+++ b/javax/swing/plaf/basic/BasicDirectoryModel.java
@@ -40,10 +40,8 @@ package javax.swing.plaf.basic;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
diff --git a/javax/swing/plaf/basic/BasicFileChooserUI.java b/javax/swing/plaf/basic/BasicFileChooserUI.java
index e1f8e4b28..4b6e2f798 100644
--- a/javax/swing/plaf/basic/BasicFileChooserUI.java
+++ b/javax/swing/plaf/basic/BasicFileChooserUI.java
@@ -42,7 +42,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.IOException;
diff --git a/javax/swing/plaf/basic/BasicLabelUI.java b/javax/swing/plaf/basic/BasicLabelUI.java
index ae992594d..045740df6 100644
--- a/javax/swing/plaf/basic/BasicLabelUI.java
+++ b/javax/swing/plaf/basic/BasicLabelUI.java
@@ -59,7 +59,6 @@ import javax.swing.JLabel;
 import javax.swing.KeyStroke;
 import javax.swing.LookAndFeel;
 import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.LabelUI;
 import javax.swing.text.View;
diff --git a/javax/swing/plaf/metal/MetalScrollButton.java b/javax/swing/plaf/metal/MetalScrollButton.java
index a55dc0916..8678f680d 100644
--- a/javax/swing/plaf/metal/MetalScrollButton.java
+++ b/javax/swing/plaf/metal/MetalScrollButton.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.swing.plaf.metal;
 
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Rectangle;
diff --git a/javax/swing/table/DefaultTableCellRenderer.java b/javax/swing/table/DefaultTableCellRenderer.java
index a9bbe9a78..7fecefe0b 100644
--- a/javax/swing/table/DefaultTableCellRenderer.java
+++ b/javax/swing/table/DefaultTableCellRenderer.java
@@ -43,7 +43,6 @@ import java.awt.Component;
 import java.awt.Rectangle;
 import java.io.Serializable;
 
-import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.UIManager;
diff --git a/javax/swing/text/ParagraphView.java b/javax/swing/text/ParagraphView.java
index fb4ac65d8..f2795e2c3 100644
--- a/javax/swing/text/ParagraphView.java
+++ b/javax/swing/text/ParagraphView.java
@@ -38,9 +38,6 @@ exception statement from your version. */
 
 package javax.swing.text;
 
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Rectangle;
 import java.awt.Shape;
 
 import javax.swing.SizeRequirements;
diff --git a/javax/swing/text/html/ResetableToggleButtonModel.java b/javax/swing/text/html/ResetableToggleButtonModel.java
index 619c24e47..637ece151 100644
--- a/javax/swing/text/html/ResetableToggleButtonModel.java
+++ b/javax/swing/text/html/ResetableToggleButtonModel.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.swing.text.html;
 
-import javax.swing.ButtonGroup;
 import javax.swing.JToggleButton.ToggleButtonModel;
 
 class ResetableToggleButtonModel
diff --git a/javax/swing/text/html/parser/Entity.java b/javax/swing/text/html/parser/Entity.java
index cf294c748..1d59df237 100644
--- a/javax/swing/text/html/parser/Entity.java
+++ b/javax/swing/text/html/parser/Entity.java
@@ -41,8 +41,6 @@ package javax.swing.text.html.parser;
 
 import gnu.javax.swing.text.html.parser.support.gnuStringIntMapper;
 
-import java.io.Serializable;
-
 /**
  * <p>Stores information, obtained by parsing SGML DTL
  * &lt;!ENTITY % .. &gt; tag.</p>
diff --git a/javax/swing/tree/DefaultTreeCellRenderer.java b/javax/swing/tree/DefaultTreeCellRenderer.java
index 3766485ab..f8084ad82 100644
--- a/javax/swing/tree/DefaultTreeCellRenderer.java
+++ b/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -42,18 +42,14 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Font;
-import java.awt.FontMetrics;
 import java.awt.Graphics;
-import java.awt.Insets;
 import java.awt.Rectangle;
 
 import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JTree;
 import javax.swing.LookAndFeel;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
-import javax.swing.border.Border;
 import javax.swing.plaf.UIResource;
 
 /**
diff --git a/javax/xml/datatype/DatatypeFactory.java b/javax/xml/datatype/DatatypeFactory.java
index 14f507416..06f465c35 100644
--- a/javax/xml/datatype/DatatypeFactory.java
+++ b/javax/xml/datatype/DatatypeFactory.java
@@ -37,11 +37,8 @@ exception statement from your version. */
 
 package javax.xml.datatype;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.GregorianCalendar;
diff --git a/javax/xml/stream/XMLEventFactory.java b/javax/xml/stream/XMLEventFactory.java
index ee47af2a9..cb850baae 100644
--- a/javax/xml/stream/XMLEventFactory.java
+++ b/javax/xml/stream/XMLEventFactory.java
@@ -43,7 +43,6 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.IOException;
-import java.io.Reader;
 import java.util.Iterator;
 import java.util.Properties;
 import javax.xml.namespace.NamespaceContext;
diff --git a/javax/xml/stream/XMLInputFactory.java b/javax/xml/stream/XMLInputFactory.java
index 4dfd1203a..f88451e54 100644
--- a/javax/xml/stream/XMLInputFactory.java
+++ b/javax/xml/stream/XMLInputFactory.java
@@ -44,7 +44,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.IOException;
 import java.io.Reader;
-import java.io.Writer;
 import java.util.Properties;
 import javax.xml.stream.util.XMLEventAllocator;
 import javax.xml.transform.Source;
diff --git a/org/omg/IOP/TaggedComponentHelper.java b/org/omg/IOP/TaggedComponentHelper.java
index 55090c746..bc4445fcd 100644
--- a/org/omg/IOP/TaggedComponentHelper.java
+++ b/org/omg/IOP/TaggedComponentHelper.java
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.MARSHAL;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.StructMember;
 import org.omg.CORBA.TCKind;
@@ -51,8 +50,6 @@ import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
-import java.io.IOException;
-
 /**
  * A helper operations for the {@link TaggedComponent}.
  *
diff --git a/sun/reflect/annotation/ExceptionProxy.java b/sun/reflect/annotation/ExceptionProxy.java
index 8edb36153..97556c710 100644
--- a/sun/reflect/annotation/ExceptionProxy.java
+++ b/sun/reflect/annotation/ExceptionProxy.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package sun.reflect.annotation;
 
-import gnu.classpath.NotImplementedException;
-
 public class ExceptionProxy
 {
 
diff --git a/tools/gnu/classpath/tools/appletviewer/Main.java b/tools/gnu/classpath/tools/appletviewer/Main.java
index a10b889bc..4eff8f53e 100644
--- a/tools/gnu/classpath/tools/appletviewer/Main.java
+++ b/tools/gnu/classpath/tools/appletviewer/Main.java
@@ -55,7 +55,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ResourceBundle;
 
 
 class Main
diff --git a/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java b/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java
index 283d547b8..796528365 100644
--- a/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java
+++ b/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java
@@ -61,8 +61,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import javax.swing.JOptionPane;
-
 
 class PluginAppletWindow
     extends EmbeddedWindow
diff --git a/tools/gnu/classpath/tools/orbd/Main.java b/tools/gnu/classpath/tools/orbd/Main.java
index 91c50d7f8..571a0bed2 100644
--- a/tools/gnu/classpath/tools/orbd/Main.java
+++ b/tools/gnu/classpath/tools/orbd/Main.java
@@ -41,10 +41,8 @@ import gnu.CORBA.OrbFunctional;
 import gnu.CORBA.IOR;
 import gnu.CORBA.NamingService.Ext;
 import gnu.classpath.tools.common.ClasspathToolParser;
-import gnu.classpath.tools.getopt.FileArgumentCallback;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
-import gnu.classpath.tools.getopt.OptionGroup;
 import gnu.classpath.tools.getopt.Parser;
 
 import org.omg.CosNaming.NamingContextExt;
diff --git a/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java b/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java
index 9c50efa8f..e853a5a1b 100644
--- a/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java
+++ b/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java
@@ -22,15 +22,11 @@ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 package gnu.classpath.tools.rmic;
 
 import gnu.java.rmi.server.RMIHashes;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.PrintWriter;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -46,13 +42,10 @@ import java.rmi.server.RemoteRef;
 import java.rmi.server.RemoteStub;
 import java.rmi.server.Skeleton;
 import java.rmi.server.SkeletonMismatchException;
-import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 import java.util.StringTokenizer;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
diff --git a/tools/gnu/classpath/tools/rmic/Main.java b/tools/gnu/classpath/tools/rmic/Main.java
index 12d1fa20e..28f4d1931 100644
--- a/tools/gnu/classpath/tools/rmic/Main.java
+++ b/tools/gnu/classpath/tools/rmic/Main.java
@@ -22,16 +22,10 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 package gnu.classpath.tools.rmic;
 
 import gnu.classpath.tools.common.ClasspathToolParser;
-import gnu.classpath.tools.getopt.FileArgumentCallback;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
-import gnu.classpath.tools.getopt.OptionGroup;
 import gnu.classpath.tools.getopt.Parser;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.util.ArrayList;
 
 /**
diff --git a/tools/gnu/classpath/tools/rmid/Main.java b/tools/gnu/classpath/tools/rmid/Main.java
index d601b13f1..4ee079c1e 100644
--- a/tools/gnu/classpath/tools/rmid/Main.java
+++ b/tools/gnu/classpath/tools/rmid/Main.java
@@ -39,7 +39,6 @@ package gnu.classpath.tools.rmid;
 
 import gnu.classpath.tools.rmid.ActivationSystemImpl;
 import gnu.classpath.tools.common.ClasspathToolParser;
-import gnu.classpath.tools.getopt.FileArgumentCallback;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
 import gnu.classpath.tools.getopt.OptionGroup;
diff --git a/tools/gnu/classpath/tools/tnameserv/Main.java b/tools/gnu/classpath/tools/tnameserv/Main.java
index 460b78185..78a8f98c4 100644
--- a/tools/gnu/classpath/tools/tnameserv/Main.java
+++ b/tools/gnu/classpath/tools/tnameserv/Main.java
@@ -39,10 +39,8 @@ package gnu.classpath.tools.tnameserv;
 
 import gnu.CORBA.NamingService.NamingServiceTransient;
 import gnu.classpath.tools.common.ClasspathToolParser;
-import gnu.classpath.tools.getopt.FileArgumentCallback;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
-import gnu.classpath.tools.getopt.OptionGroup;
 import gnu.classpath.tools.getopt.Parser;
 
 /**
diff --git a/vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java b/vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java
index 7b1ba9f64..a780913cf 100644
--- a/vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java
+++ b/vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java
@@ -48,7 +48,6 @@ import gnu.classpath.jdwp.util.MethodResult;
 import gnu.classpath.jdwp.util.MonitorInfo;
 import gnu.classpath.jdwp.value.Value;
 
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collection;
 
diff --git a/vm/reference/java/lang/VMClass.java b/vm/reference/java/lang/VMClass.java
index 66a1e53d2..7e9620b4b 100644
--- a/vm/reference/java/lang/VMClass.java
+++ b/vm/reference/java/lang/VMClass.java
@@ -43,8 +43,6 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
 
 /*
  * This class is a reference version, mainly for compiling a class library
diff --git a/vm/reference/java/security/VMSecureRandom.java b/vm/reference/java/security/VMSecureRandom.java
index dc67d8719..5eeb158bc 100644
--- a/vm/reference/java/security/VMSecureRandom.java
+++ b/vm/reference/java/security/VMSecureRandom.java
@@ -38,11 +38,6 @@ exception statement from your version.  */
 
 package java.security;
 
-import gnu.classpath.SystemProperties;
-import gnu.java.security.action.GetSecurityPropertyAction;
-
-import java.net.URL;
-
 /**
  * VM-specific methods for generating real (or almost real) random
  * seeds. VM implementors should write a version of this class that
author	Dalibor Topic <robilad@yahoo.com>	2007-09-18 21:52:24 +0000
committer	Dalibor Topic <robilad@yahoo.com>	2007-09-18 21:52:24 +0000
commit	c7aff15b771c7a684cd555dbd616a86016da2bb3 (patch)
tree	94bf7635a77d40a272144bfc115950830e058bca
parent	8d0a43ae34cb8c98a6bfc7bd151b727e170a46ff (diff)
download	classpath-c7aff15b771c7a684cd555dbd616a86016da2bb3.tar.gz