diff --git a/src/java/com/threerings/jme/model/Model.java b/src/java/com/threerings/jme/model/Model.java
index 397e38ec..b9375622 100644
--- a/src/java/com/threerings/jme/model/Model.java
+++ b/src/java/com/threerings/jme/model/Model.java
@@ -36,6 +36,7 @@ import java.util.Map;
 import java.util.Properties;
 
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 
 import com.jme.bounding.BoundingVolume;
 import com.jme.math.Quaternion;
diff --git a/src/java/com/threerings/jme/model/ModelController.java b/src/java/com/threerings/jme/model/ModelController.java
index 31b7ba8c..379cf51c 100644
--- a/src/java/com/threerings/jme/model/ModelController.java
+++ b/src/java/com/threerings/jme/model/ModelController.java
@@ -27,6 +27,8 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Properties;
 
+import com.google.common.collect.Sets;
+
 import com.jme.scene.Controller;
 import com.jme.scene.Spatial;
 import com.jme.util.export.JMEExporter;
diff --git a/src/java/com/threerings/jme/model/ModelMesh.java b/src/java/com/threerings/jme/model/ModelMesh.java
index 95afac29..a30c3773 100644
--- a/src/java/com/threerings/jme/model/ModelMesh.java
+++ b/src/java/com/threerings/jme/model/ModelMesh.java
@@ -28,6 +28,8 @@ import java.nio.IntBuffer;
 import java.util.ArrayList;
 import java.util.Properties;
 
+import com.google.common.collect.Lists;
+
 import com.jme.bounding.BoundingBox;
 import com.jme.bounding.BoundingSphere;
 import com.jme.bounding.BoundingVolume;
diff --git a/src/java/com/threerings/jme/model/SkinMesh.java b/src/java/com/threerings/jme/model/SkinMesh.java
index 791e53a7..401b5e08 100644
--- a/src/java/com/threerings/jme/model/SkinMesh.java
+++ b/src/java/com/threerings/jme/model/SkinMesh.java
@@ -33,6 +33,10 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
 import org.lwjgl.opengl.GLContext;
 
 import com.jme.bounding.BoundingVolume;
diff --git a/src/java/com/threerings/jme/model/TextureController.java b/src/java/com/threerings/jme/model/TextureController.java
index 60521ed9..dd9103be 100644
--- a/src/java/com/threerings/jme/model/TextureController.java
+++ b/src/java/com/threerings/jme/model/TextureController.java
@@ -23,6 +23,8 @@ package com.threerings.jme.model;
 
 import java.util.HashMap;
 
+import com.google.common.collect.Maps;
+
 import com.jme.image.Texture;
 import com.jme.scene.state.RenderState;
 import com.jme.scene.state.TextureState;
diff --git a/src/java/com/threerings/jme/tools/AnimationDef.java b/src/java/com/threerings/jme/tools/AnimationDef.java
index be237a12..3c5e5841 100644
--- a/src/java/com/threerings/jme/tools/AnimationDef.java
+++ b/src/java/com/threerings/jme/tools/AnimationDef.java
@@ -27,6 +27,9 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Properties;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
 import com.jme.math.Matrix4f;
 import com.jme.math.Quaternion;
 import com.jme.math.Vector3f;
diff --git a/src/java/com/threerings/jme/tools/CompileModel.java b/src/java/com/threerings/jme/tools/CompileModel.java
index 9e4b95b0..84bc93bb 100644
--- a/src/java/com/threerings/jme/tools/CompileModel.java
+++ b/src/java/com/threerings/jme/tools/CompileModel.java
@@ -28,6 +28,8 @@ import java.util.HashMap;
 import java.util.Properties;
 import java.util.logging.Level;
 
+import com.google.common.collect.Maps;
+
 import com.jme.scene.Node;
 import com.jme.scene.Spatial;
 import com.jme.util.LoggingSystem;
diff --git a/src/java/com/threerings/jme/tools/CompileModelTask.java b/src/java/com/threerings/jme/tools/CompileModelTask.java
index 91bf091d..b341e61b 100644
--- a/src/java/com/threerings/jme/tools/CompileModelTask.java
+++ b/src/java/com/threerings/jme/tools/CompileModelTask.java
@@ -31,6 +31,8 @@ import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
 
+import com.google.common.collect.Lists;
+
 import com.jme.util.LoggingSystem;
 import com.jmex.model.XMLparser.Converters.DummyDisplaySystem;
 
diff --git a/src/java/com/threerings/jme/tools/ConvertModelTask.java b/src/java/com/threerings/jme/tools/ConvertModelTask.java
index 6241218e..92e915a1 100644
--- a/src/java/com/threerings/jme/tools/ConvertModelTask.java
+++ b/src/java/com/threerings/jme/tools/ConvertModelTask.java
@@ -36,6 +36,8 @@ import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
 
+import com.google.common.collect.Lists;
+
 import com.jme.util.LoggingSystem;
 import com.jmex.model.XMLparser.Converters.AseToJme;
 import com.jmex.model.XMLparser.Converters.DummyDisplaySystem;
diff --git a/src/java/com/threerings/jme/tools/ModelDef.java b/src/java/com/threerings/jme/tools/ModelDef.java
index 743f76c5..20e94169 100644
--- a/src/java/com/threerings/jme/tools/ModelDef.java
+++ b/src/java/com/threerings/jme/tools/ModelDef.java
@@ -34,6 +34,10 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
 import com.jme.bounding.BoundingBox;
 import com.jme.bounding.BoundingSphere;
 import com.jme.math.FastMath;
diff --git a/src/java/com/threerings/jme/tools/ModelViewer.java b/src/java/com/threerings/jme/tools/ModelViewer.java
index 0d7101f2..9364cf4b 100644
--- a/src/java/com/threerings/jme/tools/ModelViewer.java
+++ b/src/java/com/threerings/jme/tools/ModelViewer.java
@@ -69,6 +69,8 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.filechooser.FileFilter;
 
+import com.google.common.collect.Maps;
+
 import com.jme.bounding.BoundingBox;
 import com.jme.bounding.BoundingVolume;
 import com.jme.image.Texture;
diff --git a/src/java/com/threerings/jme/util/ImageCache.java b/src/java/com/threerings/jme/util/ImageCache.java
index f2962be5..aeeaad1c 100644
--- a/src/java/com/threerings/jme/util/ImageCache.java
+++ b/src/java/com/threerings/jme/util/ImageCache.java
@@ -37,6 +37,8 @@ import java.awt.image.DataBuffer;
 import java.awt.image.DataBufferByte;
 import java.awt.image.Raster;
 
+import com.google.common.collect.Maps;
+
 import com.jme.image.Image;
 import com.jmex.bui.BImage;
 
diff --git a/src/java/com/threerings/jme/util/ShaderCache.java b/src/java/com/threerings/jme/util/ShaderCache.java
index c04e5be4..8132984e 100644
--- a/src/java/com/threerings/jme/util/ShaderCache.java
+++ b/src/java/com/threerings/jme/util/ShaderCache.java
@@ -35,6 +35,9 @@ import java.util.HashSet;
 
 import org.lwjgl.opengl.ARBShaderObjects;
 
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
 import com.jme.scene.state.GLSLShaderObjectsState;
 import com.jme.system.DisplaySystem;
 import com.jme.util.ShaderAttribute;
diff --git a/src/java/com/threerings/jme/util/ShaderConfig.java b/src/java/com/threerings/jme/util/ShaderConfig.java
index f7f6421c..8145dcae 100644
--- a/src/java/com/threerings/jme/util/ShaderConfig.java
+++ b/src/java/com/threerings/jme/util/ShaderConfig.java
@@ -23,6 +23,8 @@ package com.threerings.jme.util;
 
 import java.util.ArrayList;
 
+import com.google.common.collect.Lists;
+
 import com.jme.image.Texture;
 import com.jme.light.Light;
 import com.jme.scene.state.FogState;