2004-10-15 Michael Koch <konqueror@gmx.de>

	* java/rmi/MarshalledObject.java,
	java/rmi/Naming.java,
	java/rmi/RMISecurityManager.java,
	java/rmi/Remote.java,
	java/rmi/activation/Activatable.java,
	java/rmi/activation/ActivationDesc.java,
	java/rmi/activation/ActivationGroup.java,
	java/rmi/activation/ActivationGroupDesc.java,
	java/rmi/activation/ActivationGroupID.java,
	java/rmi/activation/ActivationID.java,
	java/rmi/activation/ActivationInstantiator.java,
	java/rmi/activation/ActivationMonitor.java,
	java/rmi/activation/ActivationSystem.java,
	java/rmi/activation/Activator.java,
	java/rmi/dgc/DGC.java,
	java/rmi/dgc/Lease.java,
	java/rmi/dgc/VMID.java,
	java/rmi/registry/LocateRegistry.java,
	java/rmi/registry/Registry.java,
	java/rmi/registry/RegistryHandler.java,
	java/rmi/server/LoaderHandler.java,
	java/rmi/server/LogStream.java,
	java/rmi/server/ObjID.java,
	java/rmi/server/Operation.java,
	java/rmi/server/RMIClassLoader.java,
	java/rmi/server/RMIClassLoaderSpi.java,
	java/rmi/server/RMIClientSocketFactory.java,
	java/rmi/server/RMIFailureHandler.java,
	java/rmi/server/RMIServerSocketFactory.java,
	java/rmi/server/RMISocketFactory.java,
	java/rmi/server/RemoteCall.java,
	java/rmi/server/RemoteObject.java,
	java/rmi/server/RemoteRef.java,
	java/rmi/server/RemoteServer.java,
	java/rmi/server/RemoteStub.java,
	java/rmi/server/ServerRef.java,
	java/rmi/server/Skeleton.java,
	java/rmi/server/SkeletonMismatchException.java,
	java/rmi/server/UID.java,
	java/rmi/server/UnicastRemoteObject.java,
	java/rmi/server/Unreferenced.java:
	Fixed file headers and import statements.

41 files changed, 99 insertions, 120 deletions

diff --git a/java/rmi/MarshalledObject.java b/java/rmi/MarshalledObject.java
index ef22310c7..d6c594b8b 100644
--- a/java/rmi/MarshalledObject.java
+++ b/java/rmi/MarshalledObject.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
+/* MarshalledObject.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,18 +37,16 @@ exception statement from your version. */
 
 package java.rmi;
 
-import java.io.Serializable;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import gnu.java.rmi.RMIMarshalledObjectInputStream;
 import gnu.java.rmi.RMIMarshalledObjectOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Serializable;
 
 /**
  * FIXME - doc missing
  */
 public final class MarshalledObject implements Serializable 
 {
-  
   //The following fields are from Java API Documentation "Serialized form"
   private static final long serialVersionUID = 8988374069173025854L;
   byte[] objBytes;
diff --git a/java/rmi/Naming.java b/java/rmi/Naming.java
index 1a30c1f2c..3b9202019 100644
--- a/java/rmi/Naming.java
+++ b/java/rmi/Naming.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Naming.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/RMISecurityManager.java b/java/rmi/RMISecurityManager.java
index 5ec70f70a..1ddaa04e2 100644
--- a/java/rmi/RMISecurityManager.java
+++ b/java/rmi/RMISecurityManager.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2003 Free Software Foundation, Inc.
+/* RMISecurityManager.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/Remote.java b/java/rmi/Remote.java
index 2b1b9634c..77bdf3f50 100644
--- a/java/rmi/Remote.java
+++ b/java/rmi/Remote.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Remote.java
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/activation/Activatable.java b/java/rmi/activation/Activatable.java
index 95913199f..b237e69a4 100644
--- a/java/rmi/activation/Activatable.java
+++ b/java/rmi/activation/Activatable.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Activatable.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/activation/ActivationDesc.java b/java/rmi/activation/ActivationDesc.java
index b0f22aae7..b8f14baa7 100644
--- a/java/rmi/activation/ActivationDesc.java
+++ b/java/rmi/activation/ActivationDesc.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationDecc.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/activation/ActivationGroup.java b/java/rmi/activation/ActivationGroup.java
index e9cd47211..69f9d1d09 100644
--- a/java/rmi/activation/ActivationGroup.java
+++ b/java/rmi/activation/ActivationGroup.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationGroup.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/activation/ActivationGroupDesc.java b/java/rmi/activation/ActivationGroupDesc.java
index 2afb8440b..67d971137 100644
--- a/java/rmi/activation/ActivationGroupDesc.java
+++ b/java/rmi/activation/ActivationGroupDesc.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationGroupDesc.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/activation/ActivationGroupID.java b/java/rmi/activation/ActivationGroupID.java
index 9fff53bb7..bf889be11 100644
--- a/java/rmi/activation/ActivationGroupID.java
+++ b/java/rmi/activation/ActivationGroupID.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationGroupID.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/activation/ActivationID.java b/java/rmi/activation/ActivationID.java
index 62bd7763b..cc32349bd 100644
--- a/java/rmi/activation/ActivationID.java
+++ b/java/rmi/activation/ActivationID.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationID.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/activation/ActivationInstantiator.java b/java/rmi/activation/ActivationInstantiator.java
index d47071a22..7fbcee5b9 100644
--- a/java/rmi/activation/ActivationInstantiator.java
+++ b/java/rmi/activation/ActivationInstantiator.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationInstantiator.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/activation/ActivationMonitor.java b/java/rmi/activation/ActivationMonitor.java
index 67b775553..6ce01f116 100644
--- a/java/rmi/activation/ActivationMonitor.java
+++ b/java/rmi/activation/ActivationMonitor.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationMonitor.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/activation/ActivationSystem.java b/java/rmi/activation/ActivationSystem.java
index a4b9a054d..fd8a9aa78 100644
--- a/java/rmi/activation/ActivationSystem.java
+++ b/java/rmi/activation/ActivationSystem.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ActivationSystem.java --
+i  Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/activation/Activator.java b/java/rmi/activation/Activator.java
index 834f68e28..c9e6ef75b 100644
--- a/java/rmi/activation/Activator.java
+++ b/java/rmi/activation/Activator.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Activator.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/dgc/DGC.java b/java/rmi/dgc/DGC.java
index b62c7fdbd..08563a678 100644
--- a/java/rmi/dgc/DGC.java
+++ b/java/rmi/dgc/DGC.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* DGC.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/dgc/Lease.java b/java/rmi/dgc/Lease.java
index 14c8fd764..febe80aec 100644
--- a/java/rmi/dgc/Lease.java
+++ b/java/rmi/dgc/Lease.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Lease.java
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 package java.rmi.dgc;
 
 import java.io.Serializable;
-import java.rmi.dgc.VMID;
 
 public final class Lease
 	implements Serializable {
diff --git a/java/rmi/dgc/VMID.java b/java/rmi/dgc/VMID.java
index a29a02836..7cdfe1c69 100644
--- a/java/rmi/dgc/VMID.java
+++ b/java/rmi/dgc/VMID.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* VMID.java
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/registry/LocateRegistry.java b/java/rmi/registry/LocateRegistry.java
index 508596377..d3ccd8313 100644
--- a/java/rmi/registry/LocateRegistry.java
+++ b/java/rmi/registry/LocateRegistry.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* LocateRegistry.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,17 +37,14 @@ exception statement from your version. */
 
 package java.rmi.registry;
 
-import java.io.IOException;
 import java.rmi.RemoteException;
 import java.rmi.server.RMIClientSocketFactory;
 import java.rmi.server.RMIServerSocketFactory;
 import java.rmi.server.RMISocketFactory;
 import java.rmi.server.RemoteRef;
 import java.rmi.server.ObjID;
-import java.net.Socket;
 
 import gnu.java.rmi.server.UnicastRef;
-import gnu.java.rmi.server.UnicastServerRef;
 import gnu.java.rmi.registry.RegistryImpl;
 import gnu.java.rmi.registry.RegistryImpl_Stub;
 
diff --git a/java/rmi/registry/Registry.java b/java/rmi/registry/Registry.java
index cbab4e725..eaf2be997 100644
--- a/java/rmi/registry/Registry.java
+++ b/java/rmi/registry/Registry.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Registry.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/registry/RegistryHandler.java b/java/rmi/registry/RegistryHandler.java
index 27cedfb54..fc9c3375a 100644
--- a/java/rmi/registry/RegistryHandler.java
+++ b/java/rmi/registry/RegistryHandler.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RegistryHandler.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/server/LoaderHandler.java b/java/rmi/server/LoaderHandler.java
index 3f44142ce..8ebb56f46 100644
--- a/java/rmi/server/LoaderHandler.java
+++ b/java/rmi/server/LoaderHandler.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* LoaderHandler.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/server/LogStream.java b/java/rmi/server/LogStream.java
index 5bf068941..3a58f2dd8 100644
--- a/java/rmi/server/LogStream.java
+++ b/java/rmi/server/LogStream.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* LogStream.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,7 +39,6 @@ package java.rmi.server;
 
 import java.io.PrintStream;
 import java.io.OutputStream;
-import java.io.IOException;
 
 /**
  * @deprecated
diff --git a/java/rmi/server/ObjID.java b/java/rmi/server/ObjID.java
index 3693bfe6e..6f24057fc 100644
--- a/java/rmi/server/ObjID.java
+++ b/java/rmi/server/ObjID.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ObjID.java
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,10 +41,8 @@ import java.io.Serializable;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
-import java.lang.Math;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.util.Random;
 
 public final class ObjID
 	implements Serializable {
diff --git a/java/rmi/server/Operation.java b/java/rmi/server/Operation.java
index 477446cbb..3f855dbca 100644
--- a/java/rmi/server/Operation.java
+++ b/java/rmi/server/Operation.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Operation.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/server/RMIClassLoader.java b/java/rmi/server/RMIClassLoader.java
index e6af682a4..4e36bf72c 100644
--- a/java/rmi/server/RMIClassLoader.java
+++ b/java/rmi/server/RMIClassLoader.java
@@ -1,6 +1,6 @@
-/* RMIClassLoader.java
-  Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003
-  Free Software Foundation, Inc.
+/* RMIClassLoader.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/server/RMIClassLoaderSpi.java b/java/rmi/server/RMIClassLoaderSpi.java
index 2dbb3849c..ba3bef6b0 100644
--- a/java/rmi/server/RMIClassLoaderSpi.java
+++ b/java/rmi/server/RMIClassLoaderSpi.java
@@ -1,5 +1,5 @@
-/* RMIClassLoaderSpi.java
-  Copyright (c) 2002 Free Software Foundation, Inc.
+/* RMIClassLoaderSpi.java --
+   Copyright (c) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/server/RMIClientSocketFactory.java b/java/rmi/server/RMIClientSocketFactory.java
index cbb8dba7b..6c3c4a1d3 100644
--- a/java/rmi/server/RMIClientSocketFactory.java
+++ b/java/rmi/server/RMIClientSocketFactory.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RMIClientSocketFactory.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/server/RMIFailureHandler.java b/java/rmi/server/RMIFailureHandler.java
index c48f250aa..f87321d20 100644
--- a/java/rmi/server/RMIFailureHandler.java
+++ b/java/rmi/server/RMIFailureHandler.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RMIFailureHandler.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/server/RMIServerSocketFactory.java b/java/rmi/server/RMIServerSocketFactory.java
index a5c52ffb6..f0fa59f50 100644
--- a/java/rmi/server/RMIServerSocketFactory.java
+++ b/java/rmi/server/RMIServerSocketFactory.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RMIServerSocketFactory.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/server/RMISocketFactory.java b/java/rmi/server/RMISocketFactory.java
index 544b12506..3b068db86 100644
--- a/java/rmi/server/RMISocketFactory.java
+++ b/java/rmi/server/RMISocketFactory.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RMISocketFactory.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/server/RemoteCall.java b/java/rmi/server/RemoteCall.java
index c244d6e94..6596eb3e5 100644
--- a/java/rmi/server/RemoteCall.java
+++ b/java/rmi/server/RemoteCall.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RemoteCall.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,7 +37,6 @@ exception statement from your version. */
 
 package java.rmi.server;
 
-import java.lang.Exception;
 import java.io.IOException;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
diff --git a/java/rmi/server/RemoteObject.java b/java/rmi/server/RemoteObject.java
index a1febf2dd..1bc7648c8 100644
--- a/java/rmi/server/RemoteObject.java
+++ b/java/rmi/server/RemoteObject.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RemoteObject.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,18 +37,14 @@ exception statement from your version. */
 
 package java.rmi.server;
 
-import java.io.Serializable;
-import java.rmi.Remote;
-import java.rmi.NoSuchObjectException;
-import java.rmi.UnmarshalException;
-import java.rmi.server.RemoteRef;
+import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.IOException;
-import java.lang.ClassNotFoundException;
-import java.lang.InstantiationException;
-import java.lang.IllegalAccessException;
+import java.io.Serializable;
 import java.lang.reflect.Constructor;
+import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
+import java.rmi.UnmarshalException;
 
 public abstract class RemoteObject
 	implements Remote, Serializable {
diff --git a/java/rmi/server/RemoteRef.java b/java/rmi/server/RemoteRef.java
index 10168690d..89cee1256 100644
--- a/java/rmi/server/RemoteRef.java
+++ b/java/rmi/server/RemoteRef.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RemoteRef.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,17 +35,18 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package java.rmi.server;
 
-import java.lang.reflect.Method;
 import java.io.Externalizable;
+import java.io.ObjectOutput;
+import java.lang.reflect.Method;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import java.io.ObjectOutput;
 
 public interface RemoteRef extends Externalizable
 {
-  long serialVersionUID = 0;
+  long serialVersionUID = 3632638527362204081L;
   
   String packagePrefix = "gnu.java.rmi.server";
 
diff --git a/java/rmi/server/RemoteServer.java b/java/rmi/server/RemoteServer.java
index 85a2d9551..5eef3c8d8 100644
--- a/java/rmi/server/RemoteServer.java
+++ b/java/rmi/server/RemoteServer.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RemoteServer.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/server/RemoteStub.java b/java/rmi/server/RemoteStub.java
index 07b61d64a..0266aceb8 100644
--- a/java/rmi/server/RemoteStub.java
+++ b/java/rmi/server/RemoteStub.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+/* RemoteStub.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/server/ServerRef.java b/java/rmi/server/ServerRef.java
index e347de974..664899c50 100644
--- a/java/rmi/server/ServerRef.java
+++ b/java/rmi/server/ServerRef.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* ServerRef.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,7 @@ import java.rmi.server.ServerNotActiveException;
 
 public interface ServerRef extends RemoteRef
 {
-  long serialVersionUID = 0;
+  long serialVersionUID = -4557750989390278438L;
 
   RemoteStub exportObject(Remote obj, Object data) throws RemoteException;
 
diff --git a/java/rmi/server/Skeleton.java b/java/rmi/server/Skeleton.java
index 96c421456..3d4455cac 100644
--- a/java/rmi/server/Skeleton.java
+++ b/java/rmi/server/Skeleton.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Skeleton.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@ exception statement from your version. */
 package java.rmi.server;
 
 import java.rmi.Remote;
-import java.rmi.server.RemoteCall;
 
 /**
  * @deprecated
diff --git a/java/rmi/server/SkeletonMismatchException.java b/java/rmi/server/SkeletonMismatchException.java
index 5a4b6ae96..dc0fcf87d 100644
--- a/java/rmi/server/SkeletonMismatchException.java
+++ b/java/rmi/server/SkeletonMismatchException.java
@@ -1,5 +1,5 @@
 /* SkeletonMismatchException.java -- thrown when stub class versions mismatch
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/java/rmi/server/UID.java b/java/rmi/server/UID.java
index 4c8a04110..40ff3770b 100644
--- a/java/rmi/server/UID.java
+++ b/java/rmi/server/UID.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
+/* UID.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,17 +37,13 @@ exception statement from your version. */
 
 package java.rmi.server;
 
-import java.io.Serializable;
 import java.io.DataOutput;
 import java.io.DataInput;
 import java.io.IOException;
-import java.util.Random;
-import java.lang.Thread;
-import java.lang.InterruptedException;
-
-public final class UID
-	implements Serializable {
+import java.io.Serializable;
 
+public final class UID implements Serializable
+{
 public static final long serialVersionUID = 1086053664494604050L;
 
 private static final Object lock = UID.class;
diff --git a/java/rmi/server/UnicastRemoteObject.java b/java/rmi/server/UnicastRemoteObject.java
index 8e010e7e5..d8e1a0227 100644
--- a/java/rmi/server/UnicastRemoteObject.java
+++ b/java/rmi/server/UnicastRemoteObject.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
+/* UnicastRemoteObject.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,14 +40,11 @@ package java.rmi.server;
 
 import java.rmi.RemoteException;
 import java.rmi.Remote;
-import java.rmi.server.RemoteRef;
 import java.rmi.NoSuchObjectException;
 import gnu.java.rmi.server.UnicastServerRef;
-import gnu.java.rmi.server.UnicastServer;
-
-public class UnicastRemoteObject
-	extends RemoteServer {
 
+public class UnicastRemoteObject extends RemoteServer
+{
 private static final long serialVersionUID = 4974527148936298033L;
 //The following serialized fields are from Java API Documentation "Serialized form"
 private int port = 0;
diff --git a/java/rmi/server/Unreferenced.java b/java/rmi/server/Unreferenced.java
index 8602ce16e..057a8b2da 100644
--- a/java/rmi/server/Unreferenced.java
+++ b/java/rmi/server/Unreferenced.java
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Unreferenced.java --
+   Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.