diff --git a/src/java/com/threerings/crowd/chat/data/ChatCodes.java b/src/java/com/threerings/crowd/chat/data/ChatCodes.java
index 44a71ddd0..23571d018 100644
--- a/src/java/com/threerings/crowd/chat/data/ChatCodes.java
+++ b/src/java/com/threerings/crowd/chat/data/ChatCodes.java
@@ -23,6 +23,8 @@ package com.threerings.crowd.chat.data;
 
 import com.threerings.presents.data.InvocationCodes;
 
+import com.threerings.crowd.data.BodyObject;
+
 import com.threerings.crowd.chat.client.ChatDirector;
 import com.threerings.crowd.chat.client.SpeakService;
 
diff --git a/src/java/com/threerings/media/image/AWTImageCreator.java b/src/java/com/threerings/media/image/AWTImageCreator.java
index da0978ee6..92cbfeb6a 100644
--- a/src/java/com/threerings/media/image/AWTImageCreator.java
+++ b/src/java/com/threerings/media/image/AWTImageCreator.java
@@ -23,6 +23,7 @@ package com.threerings.media.image;
 
 import java.awt.Component;
 import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
 import java.awt.Transparency;
 import java.awt.image.BufferedImage;
 
diff --git a/src/java/com/threerings/openal/Clip.java b/src/java/com/threerings/openal/Clip.java
index 3613bd1d0..bda9d8af9 100644
--- a/src/java/com/threerings/openal/Clip.java
+++ b/src/java/com/threerings/openal/Clip.java
@@ -23,6 +23,8 @@ package com.threerings.openal;
 
 import java.nio.ByteBuffer;
 
+import org.lwjgl.openal.AL10;
+
 /**
  * Contains data for a single sampled sound.
  */
diff --git a/src/java/com/threerings/parlor/card/server/CardGameManager.java b/src/java/com/threerings/parlor/card/server/CardGameManager.java
index b302ff99a..89adf5ef4 100644
--- a/src/java/com/threerings/parlor/card/server/CardGameManager.java
+++ b/src/java/com/threerings/parlor/card/server/CardGameManager.java
@@ -236,7 +236,7 @@ public class CardGameManager extends GameManager
      * Notifies everyone in the room (other than the sender and the receiver)
      * that a set of cards have been transferred.
      *
-     * @param playerIdx the index of the player sending the cards
+     * @param fromPlayerIdx the index of the player sending the cards
      * @param toPlayerIdx the index of the player receiving the cards
      * @param cards the number of cards sent
      */
diff --git a/src/java/com/threerings/parlor/server/ParlorProvider.java b/src/java/com/threerings/parlor/server/ParlorProvider.java
index a0ab2e30d..6bc13dac9 100644
--- a/src/java/com/threerings/parlor/server/ParlorProvider.java
+++ b/src/java/com/threerings/parlor/server/ParlorProvider.java
@@ -34,8 +34,7 @@ import com.threerings.crowd.server.CrowdServer;
 import com.threerings.crowd.server.PlaceManager;
 
 import com.threerings.parlor.Log;
-import com.threerings.parlor.client.ParlorService.InviteListener;
-import com.threerings.parlor.client.ParlorService.TableListener;
+import com.threerings.parlor.client.ParlorService;
 import com.threerings.parlor.data.ParlorCodes;
 import com.threerings.parlor.data.TableConfig;
 import com.threerings.parlor.game.data.GameConfig;
@@ -67,8 +66,8 @@ public class ParlorProvider
      * Processes a request from the client to invite another user to play
      * a game.
      */
-    public void invite (ClientObject caller, Name invitee,
-                        GameConfig config, InviteListener listener)
+    public void invite (ClientObject caller, Name invitee, GameConfig config,
+                        ParlorService.InviteListener listener)
         throws InvocationException
     {
 //          Log.info("Handling invite request [source=" + source +
@@ -113,8 +112,9 @@ public class ParlorProvider
     /**
      * Processes a request from the client to create a new table.
      */
-    public void createTable (ClientObject caller, int lobbyOid,
-            TableConfig tableConfig, GameConfig config, TableListener listener)
+    public void createTable (
+        ClientObject caller, int lobbyOid, TableConfig tableConfig,
+        GameConfig config, ParlorService.TableListener listener)
         throws InvocationException
     {
         Log.info("Handling create table request [caller=" + caller.who() +
diff --git a/src/java/com/threerings/presents/net/AuthResponse.java b/src/java/com/threerings/presents/net/AuthResponse.java
index 46d0a29da..148718e58 100644
--- a/src/java/com/threerings/presents/net/AuthResponse.java
+++ b/src/java/com/threerings/presents/net/AuthResponse.java
@@ -30,11 +30,11 @@ package com.threerings.presents.net;
  */
 public class AuthResponse extends DownstreamMessage
 {
-    /** Auxilliary authentication data to be communicated to the {@link
-     * PresentsClient} once a session is started. This is a means by which
-     * the <code>Authenticator</code> can pass information loaded from,
-     * say, an authentication database into the runtime system to be used,
-     * for example for permissions. */
+    /** Auxilliary authentication data to be communicated to the <code>
+     * PresentsClient</code> once a session is started. This is a means by
+     * which the <code>Authenticator</code> can pass information loaded from,
+     * say, an authentication database into the runtime system to be used, for
+     * example for permissions. */
     public transient Object authdata;
 
     /**
diff --git a/src/java/com/threerings/stage/client/StageScenePanel.java b/src/java/com/threerings/stage/client/StageScenePanel.java
index b6fa0cc5f..541f083ce 100644
--- a/src/java/com/threerings/stage/client/StageScenePanel.java
+++ b/src/java/com/threerings/stage/client/StageScenePanel.java
@@ -327,9 +327,7 @@ public class StageScenePanel extends MisoScenePanel
 
     /**
      * Adds or updates the specified cluster in the view. Metrics will be
-     * created that allow the cluster to be rendered and hovered over
-     * (which would make it the active cluster as indicated by {@link
-     * #getActiveCluster}).
+     * created that allow the cluster to be rendered and hovered over.
      *
      * @param cluster the cluster record to be added.
      * @param bounds the screen coordinates that bound the occupants of
diff --git a/src/java/com/threerings/stage/tools/editor/EditorScenePanel.java b/src/java/com/threerings/stage/tools/editor/EditorScenePanel.java
index 2ed42667d..a3b45f0d3 100644
--- a/src/java/com/threerings/stage/tools/editor/EditorScenePanel.java
+++ b/src/java/com/threerings/stage/tools/editor/EditorScenePanel.java
@@ -302,7 +302,7 @@ public class EditorScenePanel extends StageScenePanel
     }
 
     /**
-     * Called by the {@link ObjectEditorPanel} when it is dismissed.
+     * Called by the {@link ObjectEditorDialog} when it is dismissed.
      */
     protected void objectEditorDismissed ()
     {