diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
index 252d4e1aa8e3b55ff6228e473829a9fdc15dfb7c..38c50f2661fdfa57ee0b3eb519c88a1a7abcb445 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
@@ -361,24 +361,24 @@ public class SOCKS5Server extends SOCKSServer {
     /*
      * Some namespaces to enclose SOCKS protocol codes
      */
-    private class Method {
+    private static class Method {
         private static final int NO_AUTH_REQUIRED = 0x00;
         private static final int NO_ACCEPTABLE_METHODS = 0xff;
     }
 
-    private class AddressType {
+    private static class AddressType {
         private static final int IPV4 = 0x01;
         private static final int DOMAINNAME = 0x03;
         private static final int IPV6 = 0x04;
     }
 
-    private class Command {
+    private static class Command {
         private static final int CONNECT = 0x01;
         private static final int BIND = 0x02;
         private static final int UDP_ASSOCIATE = 0x03;
     }
 
-    private class Reply {
+    private static class Reply {
         private static final int SUCCEEDED = 0x00;
         private static final int GENERAL_SOCKS_SERVER_FAILURE = 0x01;
         private static final int CONNECTION_NOT_ALLOWED_BY_RULESET = 0x02;
diff --git a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java
index 2cd630db618c166c95afa4c2db5254953d7b765c..b5fca013d78cb4c8c22e31225666228843b8ad9c 100644
--- a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java
@@ -156,7 +156,7 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
         return buf.toString();
     }
 
-    private class TunnelEndpoint {
+    private static class TunnelEndpoint {
         private Hash _router;
         private TunnelId _tunnelId;
 
@@ -186,4 +186,4 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
             _tunnelId = tunnelId;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java
index 5f686c19230f5f0b82bc837e80761b6f723c77f8..1c50eaa65ff0245aeb1fa37cc0a7afde14646717 100644
--- a/router/java/src/net/i2p/router/Blocklist.java
+++ b/router/java/src/net/i2p/router/Blocklist.java
@@ -256,7 +256,7 @@ public class Blocklist {
         }
     }
 
-    private class Entry {
+    private static class Entry {
         String comment;
         byte ip1[];
         byte ip2[];
diff --git a/router/java/src/net/i2p/router/Shitlist.java b/router/java/src/net/i2p/router/Shitlist.java
index 7d86926cfabaaa4c741795c04ab07c323fc2a1bd..2005366c26356b2455a33f6ffd56ae35b77c7e7d 100644
--- a/router/java/src/net/i2p/router/Shitlist.java
+++ b/router/java/src/net/i2p/router/Shitlist.java
@@ -36,7 +36,7 @@ public class Shitlist {
     private RouterContext _context;
     private Map _entries;
     
-    private class Entry {
+    private static class Entry {
         /** when it should expire, per the i2p clock */
         long expireOn;
         /** why they were shitlisted */
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
index 43120d0b08039616e0485c3a856e17c100ef166b..c6b1f5b9a9925e356e0ac713e6e3bea14780d7d5 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
@@ -376,7 +376,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
         _context.jobQueue().addJob(new BootstrapPool(_context, _outboundExploratory));
     }
     
-    private class BootstrapPool extends JobImpl {
+    private static class BootstrapPool extends JobImpl {
         private TunnelPool _pool;
         public BootstrapPool(RouterContext ctx, TunnelPool pool) {
             super(ctx);