diff --git a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java b/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
index 802cff61d..afd5945b1 100644
--- a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
+++ b/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
@@ -1,11 +1,12 @@
 //
-// $Id: SpeakMarshaller.java,v 1.4 2004/02/25 14:41:47 mdb Exp $
+// $Id: SpeakMarshaller.java,v 1.5 2004/06/22 13:55:25 mdb Exp $
 
 package com.threerings.crowd.chat.data;
 
 import com.threerings.crowd.chat.client.SpeakService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
+import com.threerings.presents.dobj.InvocationResponseEvent;
 
 /**
  * Provides the implementation of the {@link SpeakService} interface
diff --git a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
index 8c0cb64f4..35fc0e98d 100644
--- a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
+++ b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
@@ -1,9 +1,11 @@
 //
-// $Id: SpeakDispatcher.java,v 1.4 2004/02/25 14:41:47 mdb Exp $
+// $Id: SpeakDispatcher.java,v 1.5 2004/06/22 13:55:25 mdb Exp $
 
 package com.threerings.crowd.chat.server;
 
+import com.threerings.crowd.chat.client.SpeakService;
 import com.threerings.crowd.chat.data.SpeakMarshaller;
+import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
diff --git a/src/java/com/threerings/crowd/data/BodyMarshaller.java b/src/java/com/threerings/crowd/data/BodyMarshaller.java
index 08a211e98..47462f553 100644
--- a/src/java/com/threerings/crowd/data/BodyMarshaller.java
+++ b/src/java/com/threerings/crowd/data/BodyMarshaller.java
@@ -1,11 +1,12 @@
 //
-// $Id: BodyMarshaller.java,v 1.3 2004/02/25 14:41:47 mdb Exp $
+// $Id: BodyMarshaller.java,v 1.4 2004/06/22 13:57:44 mdb Exp $
 
 package com.threerings.crowd.data;
 
 import com.threerings.crowd.client.BodyService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
+import com.threerings.presents.dobj.InvocationResponseEvent;
 
 /**
  * Provides the implementation of the {@link BodyService} interface
diff --git a/src/java/com/threerings/crowd/server/BodyDispatcher.java b/src/java/com/threerings/crowd/server/BodyDispatcher.java
index 6eebe9dab..2df61fe71 100644
--- a/src/java/com/threerings/crowd/server/BodyDispatcher.java
+++ b/src/java/com/threerings/crowd/server/BodyDispatcher.java
@@ -1,9 +1,11 @@
 //
-// $Id: BodyDispatcher.java,v 1.3 2004/02/25 14:41:47 mdb Exp $
+// $Id: BodyDispatcher.java,v 1.4 2004/06/22 13:57:44 mdb Exp $
 
 package com.threerings.crowd.server;
 
+import com.threerings.crowd.client.BodyService;
 import com.threerings.crowd.data.BodyMarshaller;
+import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
diff --git a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
index bca2cf4ab..e0cc34814 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
@@ -1,22 +1,21 @@
 //
-// $Id: LobbyDispatcher.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
+// $Id: LobbyDispatcher.java,v 1.4 2004/06/22 13:55:25 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
+import com.threerings.micasa.lobby.LobbyMarshaller;
+import com.threerings.micasa.lobby.LobbyService;
 import com.threerings.micasa.lobby.LobbyService.CategoriesListener;
 import com.threerings.micasa.lobby.LobbyService.LobbiesListener;
-
+import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
+import java.util.List;
 
 /**
  * Dispatches requests to the {@link LobbyProvider}.
- *
- * <p> Generated from <code>
- * $Id: LobbyDispatcher.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
- * </code>
  */
 public class LobbyDispatcher extends InvocationDispatcher
 {
diff --git a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
index 60645d6a3..64a56b35c 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
@@ -1,9 +1,11 @@
 //
-// $Id: LobbyMarshaller.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
+// $Id: LobbyMarshaller.java,v 1.4 2004/06/22 13:55:25 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
 import com.threerings.micasa.lobby.LobbyService;
+import com.threerings.micasa.lobby.LobbyService.CategoriesListener;
+import com.threerings.micasa.lobby.LobbyService.LobbiesListener;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
@@ -15,10 +17,6 @@ import java.util.List;
  * on the server. Also provides an implementation of the response listener
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
- *
- * <p> Generated from <code>
- * $Id: LobbyMarshaller.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
- * </code>
  */
 public class LobbyMarshaller extends InvocationMarshaller
     implements LobbyService
@@ -111,5 +109,4 @@ public class LobbyMarshaller extends InvocationMarshaller
         });
     }
 
-    // Class file generated on 12:33:03 08/20/02.
 }
diff --git a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
index 96414a36b..02f4a7135 100644
--- a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
+++ b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
@@ -1,5 +1,5 @@
 //
-// $Id: SimulatorMarshaller.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
+// $Id: SimulatorMarshaller.java,v 1.4 2004/06/22 13:55:25 mdb Exp $
 
 package com.threerings.micasa.simulator.data;
 
@@ -7,6 +7,7 @@ import com.threerings.micasa.simulator.client.SimulatorService;
 import com.threerings.parlor.game.GameConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
+import com.threerings.presents.dobj.InvocationResponseEvent;
 
 /**
  * Provides the implementation of the {@link SimulatorService} interface
@@ -14,10 +15,6 @@ import com.threerings.presents.data.InvocationMarshaller;
  * on the server. Also provides an implementation of the response listener
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
- *
- * <p> Generated from <code>
- * $Id: SimulatorMarshaller.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
- * </code>
  */
 public class SimulatorMarshaller extends InvocationMarshaller
     implements SimulatorService
@@ -33,5 +30,4 @@ public class SimulatorMarshaller extends InvocationMarshaller
         });
     }
 
-    // Class file generated on 12:33:03 08/20/02.
 }
diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
index c609ca26e..01e7e9bd3 100644
--- a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
+++ b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
@@ -1,10 +1,12 @@
 //
-// $Id: SimulatorDispatcher.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
+// $Id: SimulatorDispatcher.java,v 1.4 2004/06/22 13:55:25 mdb Exp $
 
 package com.threerings.micasa.simulator.server;
 
+import com.threerings.micasa.simulator.client.SimulatorService;
 import com.threerings.micasa.simulator.data.SimulatorMarshaller;
 import com.threerings.parlor.game.GameConfig;
+import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
@@ -12,10 +14,6 @@ import com.threerings.presents.server.InvocationException;
 
 /**
  * Dispatches requests to the {@link SimulatorProvider}.
- *
- * <p> Generated from <code>
- * $Id: SimulatorDispatcher.java,v 1.3 2004/02/25 14:43:37 mdb Exp $
- * </code>
  */
 public class SimulatorDispatcher extends InvocationDispatcher
 {
diff --git a/src/java/com/threerings/parlor/game/GameDispatcher.java b/src/java/com/threerings/parlor/game/GameDispatcher.java
index 3ccd8a282..4ebad4715 100644
--- a/src/java/com/threerings/parlor/game/GameDispatcher.java
+++ b/src/java/com/threerings/parlor/game/GameDispatcher.java
@@ -1,5 +1,5 @@
 //
-// $Id: GameDispatcher.java,v 1.3 2002/09/06 22:52:27 shaper Exp $
+// $Id: GameDispatcher.java,v 1.4 2004/06/22 13:55:25 mdb Exp $
 
 package com.threerings.parlor.game;
 
@@ -55,6 +55,4 @@ public class GameDispatcher extends InvocationDispatcher
             super.dispatchRequest(source, methodId, args);
         }
     }
-
-    // Generated on 12:49:14 09/06/02.
 }
diff --git a/src/java/com/threerings/parlor/game/GameMarshaller.java b/src/java/com/threerings/parlor/game/GameMarshaller.java
index 1caaabc3b..255457628 100644
--- a/src/java/com/threerings/parlor/game/GameMarshaller.java
+++ b/src/java/com/threerings/parlor/game/GameMarshaller.java
@@ -1,11 +1,12 @@
 //
-// $Id: GameMarshaller.java,v 1.4 2004/02/25 14:44:54 mdb Exp $
+// $Id: GameMarshaller.java,v 1.5 2004/06/22 13:55:25 mdb Exp $
 
 package com.threerings.parlor.game;
 
 import com.threerings.parlor.game.GameService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
+import com.threerings.presents.dobj.InvocationResponseEvent;
 
 /**
  * Provides the implementation of the {@link GameService} interface
@@ -39,5 +40,4 @@ public class GameMarshaller extends InvocationMarshaller
         });
     }
 
-    // Generated on 12:49:14 09/06/02.
 }
diff --git a/src/java/com/threerings/presents/data/TimeBaseMarshaller.java b/src/java/com/threerings/presents/data/TimeBaseMarshaller.java
index 8449e06d1..5de434745 100644
--- a/src/java/com/threerings/presents/data/TimeBaseMarshaller.java
+++ b/src/java/com/threerings/presents/data/TimeBaseMarshaller.java
@@ -1,5 +1,5 @@
 //
-// $Id: TimeBaseMarshaller.java,v 1.2 2002/08/20 19:38:14 mdb Exp $
+// $Id: TimeBaseMarshaller.java,v 1.3 2004/06/22 13:55:25 mdb Exp $
 
 package com.threerings.presents.data;
 
@@ -15,10 +15,6 @@ import com.threerings.presents.dobj.InvocationResponseEvent;
  * on the server. Also provides an implementation of the response listener
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
- *
- * <p> Generated from <code>
- * $Id: TimeBaseMarshaller.java,v 1.2 2002/08/20 19:38:14 mdb Exp $
- * </code>
  */
 public class TimeBaseMarshaller extends InvocationMarshaller
     implements TimeBaseService
@@ -67,5 +63,4 @@ public class TimeBaseMarshaller extends InvocationMarshaller
         });
     }
 
-    // Class file generated on 12:33:05 08/20/02.
 }
diff --git a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java
index a909c242a..e02ae4bea 100644
--- a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java
+++ b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java
@@ -1,5 +1,5 @@
 //
-// $Id: TimeBaseDispatcher.java,v 1.2 2002/08/20 19:38:14 mdb Exp $
+// $Id: TimeBaseDispatcher.java,v 1.3 2004/06/22 13:55:25 mdb Exp $
 
 package com.threerings.presents.server;
 
@@ -14,10 +14,6 @@ import com.threerings.presents.server.InvocationException;
 
 /**
  * Dispatches requests to the {@link TimeBaseProvider}.
- *
- * <p> Generated from <code>
- * $Id: TimeBaseDispatcher.java,v 1.2 2002/08/20 19:38:14 mdb Exp $
- * </code>
  */
 public class TimeBaseDispatcher extends InvocationDispatcher
 {