diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannel.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannel.java
index 7e17e4798c..c2573e03df 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannel.java
@@ -288,7 +288,7 @@ public class HttpTunnelClientChannel extends AbstractChannel implements
         Channels.fireChannelInterestChanged(this);
     }
 
-    private class ConsolidatingFutureListener implements ChannelFutureListener {
+    private static class ConsolidatingFutureListener implements ChannelFutureListener {
 
         private final ChannelFuture completionFuture;
 
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelSink.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelSink.java
index 95d5853f13..aad8dcfc56 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelSink.java
@@ -61,7 +61,7 @@ class HttpTunnelServerChannelSink extends AbstractChannelSink {
         }
     }
 
-    private final class ChannelFutureProxy implements ChannelFutureListener {
+    private static final class ChannelFutureProxy implements ChannelFutureListener {
         private final ChannelFuture upstreamFuture;
 
         ChannelFutureProxy(ChannelFuture upstreamFuture) {
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitch.java b/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitch.java
index ee2938b3a6..64cf9cbe08 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitch.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitch.java
@@ -238,7 +238,7 @@ class ServerMessageSwitch implements ServerMessageSwitchUpstreamInterface,
     /**
      * Used to pass the result received from one ChannelFutureListener to another verbatim.
      */
-    private final class RelayedChannelFutureListener implements
+    private static final class RelayedChannelFutureListener implements
             ChannelFutureListener {
         private final ChannelFuture originalFuture;
 
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java b/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java
index ac1d4e742c..ee45e856dd 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java
@@ -147,7 +147,7 @@ final class SocketSendBufferPool {
         return q << ALIGN_SHIFT;
     }
 
-    private final class Preallocation {
+    private static final class Preallocation {
         final ByteBuffer buffer;
         int refCnt;
 
@@ -176,7 +176,7 @@ final class SocketSendBufferPool {
         void release();
     }
 
-    class UnpooledSendBuffer implements SendBuffer {
+    static class UnpooledSendBuffer implements SendBuffer {
 
         final ByteBuffer buffer;
         final int initialPos;
@@ -266,7 +266,7 @@ final class SocketSendBufferPool {
         }
     }
 
-    final class FileSendBuffer implements SendBuffer {
+    static final class FileSendBuffer implements SendBuffer {
 
         private final FileRegion file;
         private long writtenBytes;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaderDateFormat.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaderDateFormat.java
index 421a33c07e..3a90733f31 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaderDateFormat.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaderDateFormat.java
@@ -67,7 +67,7 @@ final class HttpHeaderDateFormat extends SimpleDateFormat {
      * First obsolete format<p>
      * Sunday, 06-Nov-94 08:49:37 GMT -> E, d-MMM-y HH:mm:ss z
      */
-    private final class HttpHeaderDateFormatObsolete1 extends SimpleDateFormat {
+    private static final class HttpHeaderDateFormatObsolete1 extends SimpleDateFormat {
         private static final long serialVersionUID = -3178072504225114298L;
 
         HttpHeaderDateFormatObsolete1() {
@@ -81,7 +81,7 @@ final class HttpHeaderDateFormat extends SimpleDateFormat {
      * <p>
      * Sun Nov 6 08:49:37 1994 -> EEE, MMM d HH:mm:ss yyyy
      */
-    private final class HttpHeaderDateFormatObsolete2 extends SimpleDateFormat {
+    private static final class HttpHeaderDateFormatObsolete2 extends SimpleDateFormat {
         private static final long serialVersionUID = 3010674519968303714L;
 
         HttpHeaderDateFormatObsolete2() {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java
index 3a59251941..521ce9d662 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java
@@ -1485,7 +1485,7 @@ public class HttpPostRequestDecoder {
      * @author frederic bregier
      *
      */
-    public class IncompatibleDataDecoderException extends Exception {
+    public static class IncompatibleDataDecoderException extends Exception {
         /**
          *
          */
diff --git a/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java
index d3630750ee..da0040889f 100644
--- a/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java
@@ -147,7 +147,7 @@ public abstract class AbstractSocketEchoTest {
         }
     }
 
-    private class EchoHandler extends SimpleChannelUpstreamHandler {
+    private static class EchoHandler extends SimpleChannelUpstreamHandler {
         volatile Channel channel;
         final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
         volatile int counter;
diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java
index cdec5abda3..cca5dfd8f5 100644
--- a/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java
@@ -149,7 +149,7 @@ public abstract class AbstractSocketFixedLengthEchoTest {
         }
     }
 
-    private class EchoHandler extends SimpleChannelUpstreamHandler {
+    private static class EchoHandler extends SimpleChannelUpstreamHandler {
         volatile Channel channel;
         final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
         volatile int counter;
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java
index 313c6d8a42..0aa8717dbf 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java
@@ -157,7 +157,7 @@ public abstract class AbstractSocketCompatibleObjectStreamEchoTest {
         }
     }
 
-    private class EchoHandler extends SimpleChannelUpstreamHandler {
+    private static class EchoHandler extends SimpleChannelUpstreamHandler {
         volatile Channel channel;
         final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
         volatile int counter;
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java
index a77b999cf7..32c511d1b2 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java
@@ -156,7 +156,7 @@ public abstract class AbstractSocketObjectStreamEchoTest {
         }
     }
 
-    private class EchoHandler extends SimpleChannelUpstreamHandler {
+    private static class EchoHandler extends SimpleChannelUpstreamHandler {
         volatile Channel channel;
         final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
         volatile int counter;
diff --git a/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java
index 720c4ef71b..786200804a 100644
--- a/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java
@@ -162,7 +162,7 @@ public abstract class AbstractSocketStringEchoTest {
         }
     }
 
-    private class EchoHandler extends SimpleChannelUpstreamHandler {
+    private static class EchoHandler extends SimpleChannelUpstreamHandler {
         volatile Channel channel;
         final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
         volatile int counter;
diff --git a/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java b/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java
index fedf9b29c7..34aa06644c 100644
--- a/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java
@@ -194,7 +194,7 @@ public abstract class AbstractSocketSslEchoTest {
         }
     }
 
-    private class EchoHandler extends SimpleChannelUpstreamHandler {
+    private static class EchoHandler extends SimpleChannelUpstreamHandler {
         volatile Channel channel;
         final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
         volatile int counter;