diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f05d3c21b67ec4b616277e00e4c042823ece05ba..68fd9dc9e7782baae9d4155595cf018565fa98c4 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-23  Dalibor Topic  <robilad@kaffe.org>
+
+	* javax/rmi/CORBA/PortableRemoteObjectDelegate.java,
+	javax/rmi/CORBA/Stub.java,
+	javax/rmi/CORBA/Util.java,
+	javax/rmi/CORBA/ValueHandler.java,
+	javax/rmi/CORBA/ValueHandler.java,
+	javax/rmi/PortableRemoteObject.java:
+	Cleaned up imports.
+
 2004-04-23 Dalibor Topic <robilad@kaffe.org>
 
 	* java/util/jar/JarFile.java,
diff --git a/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.java b/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
index a073cf4705cbb24359744878ea3055f6d1227c60..7798a46668c8995ce3beb0899f70fe81e4f4d86b 100644
--- a/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
+++ b/libjava/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
@@ -1,5 +1,5 @@
 /* PortableRemoteObjectDelegate.java -- Interface supporting PortableRemoteObject
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,9 @@ exception statement from your version. */
 
 package javax.rmi.CORBA;
 
-import java.rmi.*;
+import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 /**
  * A delegate is a singleton class that support delegation for method
diff --git a/libjava/javax/rmi/CORBA/Stub.java b/libjava/javax/rmi/CORBA/Stub.java
index c79b85cb46e5a1e274f22dd179c4193d03b172ad..0ea10c9ee32f16a1681c34e9c79ce6949c230daa 100644
--- a/libjava/javax/rmi/CORBA/Stub.java
+++ b/libjava/javax/rmi/CORBA/Stub.java
@@ -1,5 +1,5 @@
 /* Stub.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,16 +38,14 @@ exception statement from your version. */
 
 package javax.rmi.CORBA;
 
+import gnu.javax.rmi.CORBA.DelegateFactory;
+import gnu.javax.rmi.CORBA.GetDelegateInstanceException;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.rmi.RemoteException;
-//import org.omg.CORBA.ORB;
-//import org.omg.CORBA_2_3.portable.ObjectImpl;
-//import org.omg.CORBA.portable.ObjectImpl;
-import gnu.javax.rmi.CORBA.DelegateFactory;
-import gnu.javax.rmi.CORBA.GetDelegateInstanceException;
 
 public abstract class Stub extends ObjectImpl
   implements Serializable
diff --git a/libjava/javax/rmi/CORBA/Util.java b/libjava/javax/rmi/CORBA/Util.java
index 45a189d97c5d5899bccf3e22d8de5a463a174429..34e05dafda2dea7241dd85615b1a5bb9fc7817d2 100644
--- a/libjava/javax/rmi/CORBA/Util.java
+++ b/libjava/javax/rmi/CORBA/Util.java
@@ -1,5 +1,5 @@
 /* Util.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,16 +38,14 @@ exception statement from your version. */
 
 package javax.rmi.CORBA;
 
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.lang.Object;
-import java.io.*;
-//import org.omg.CORBA.*;
-//import org.omg.CORBA.portable.InputStream;
-//import org.omg.CORBA.portable.OutputStream;
 import gnu.javax.rmi.CORBA.DelegateFactory;
 import gnu.javax.rmi.CORBA.GetDelegateInstanceException;
 
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
 public class Util
 {
 
diff --git a/libjava/javax/rmi/CORBA/UtilDelegate.java b/libjava/javax/rmi/CORBA/UtilDelegate.java
index 4d611bc8bfb6e2f396992b0085c2ffe7b66fe1b4..fac60d54236a98054fa1f73520b2030486f7b867 100644
--- a/libjava/javax/rmi/CORBA/UtilDelegate.java
+++ b/libjava/javax/rmi/CORBA/UtilDelegate.java
@@ -38,9 +38,10 @@ exception statement from your version. */
 
 package javax.rmi.CORBA;
 
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import java.io.*;
 //import org.omg.CORBA.ORB;
 //import org.omg.CORBA.SystemException;
 //import org.omg.CORBA.portable.InputStream;
diff --git a/libjava/javax/rmi/CORBA/ValueHandler.java b/libjava/javax/rmi/CORBA/ValueHandler.java
index 3a008f18cca2d93112ec85aeee7c9e91e1411fb3..fe98002219100bf734f59e49ca1f162e975f10e9 100644
--- a/libjava/javax/rmi/CORBA/ValueHandler.java
+++ b/libjava/javax/rmi/CORBA/ValueHandler.java
@@ -1,5 +1,5 @@
 /* ValueHandler.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,9 @@ exception statement from your version. */
 
 package javax.rmi.CORBA;
 
-import java.io.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
 //import org.omg.CORBA.portable.InputStream;
 //import org.omg.CORBA.portable.OutputStream;
 //import org.omg.SendingContext.RunTime;
diff --git a/libjava/javax/rmi/PortableRemoteObject.java b/libjava/javax/rmi/PortableRemoteObject.java
index ee40d9c9e74e51ba252292f8b9e419536e442e4e..f95dafd6b839d47c4b7368541f9dd7c7679d2fc3 100644
--- a/libjava/javax/rmi/PortableRemoteObject.java
+++ b/libjava/javax/rmi/PortableRemoteObject.java
@@ -1,5 +1,5 @@
 /* PortableRemoteObject.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,13 +38,14 @@ exception statement from your version. */
 
 package javax.rmi;
 
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.NoSuchObjectException;
 import gnu.javax.rmi.CORBA.DelegateFactory;
 import gnu.javax.rmi.CORBA.GetDelegateInstanceException;
+
+import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
 import javax.rmi.CORBA.PortableRemoteObjectDelegate;
-import javax.rmi.CORBA.Util;
 
 public class PortableRemoteObject
   implements Remote /* why doc doesn't say should implement Remote */