diff --git a/src/java/com/samskivert/net/cddb/CDDB.java b/src/java/com/samskivert/net/cddb/CDDB.java
index 6bc7fa4b..7bde980d 100644
--- a/src/java/com/samskivert/net/cddb/CDDB.java
+++ b/src/java/com/samskivert/net/cddb/CDDB.java
@@ -460,7 +460,7 @@ public class CDDB
     /**
      * A simple class to encapsulate the response from the CDDB server.
      */
-    protected class Response
+    protected static class Response
     {
         public int code;
         public String message;
diff --git a/src/java/com/samskivert/swing/TableSorter.java b/src/java/com/samskivert/swing/TableSorter.java
index e4a68e6e..931cae52 100644
--- a/src/java/com/samskivert/swing/TableSorter.java
+++ b/src/java/com/samskivert/swing/TableSorter.java
@@ -336,7 +336,7 @@ public class TableSorter extends AbstractTableModel {
 
     // Helper classes
 
-    protected class Row {
+    protected static class Row {
         public final int modelIndex;
         public Row (int index) {
             this.modelIndex = index;
diff --git a/src/java/com/samskivert/util/IntIntMap.java b/src/java/com/samskivert/util/IntIntMap.java
index 43e4daee..a8a339cb 100644
--- a/src/java/com/samskivert/util/IntIntMap.java
+++ b/src/java/com/samskivert/util/IntIntMap.java
@@ -443,7 +443,7 @@ public class IntIntMap
         }
     }
 
-    class Record implements IntIntEntry
+    protected static class Record implements IntIntEntry
     {
 	public Record next;
 	public int key;
@@ -550,7 +550,7 @@ public class IntIntMap
         private int _modCount;
     }
 
-    protected class KeyValueInterator extends AbstractInterator
+    protected static class KeyValueInterator extends AbstractInterator
     {
         public KeyValueInterator (boolean keys, IntEntryIterator eiter) {
             _keys = keys;