diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
index c68c082af..04971c6bb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
@@ -86,9 +86,9 @@ public class AntStructure extends Task {
 
     private final String lSep = System.getProperty("line.separator");
 
-    private final String BOOLEAN = "%boolean;";
-    private final String TASKS = "%tasks;";
-    private final String TYPES = "%types;";
+    private static final String BOOLEAN = "%boolean;";
+    private static final String TASKS = "%tasks;";
+    private static final String TYPES = "%types;";
 
     private Hashtable visited = new Hashtable();
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java
index 42572557e..216e0894a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Get.java
@@ -363,7 +363,7 @@ public class Get extends Task {
     *    <a HREF="gg@grtmail.com">Gautam Guliani</a>
     *********************************************************************/
 
-    class  Base64Converter {
+    private static class  Base64Converter {
 
         public final char [ ]  alphabet = {
             'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',   //  0 to  7
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
index 672b03d5b..a63f07a3b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1386,7 +1386,7 @@ public class IPlanetEjbc {
      *
      * @author Greg Nelson <a href="mailto:greg@netscape.com">greg@netscape.com</a>
      */
-    private class Classname {
+    private static class Classname {
         private String qualifiedName;  // Fully qualified name of the Java class
         private String packageName;    // Name of the package for this class
         private String className;      // Name of the class without the package
@@ -1488,7 +1488,7 @@ public class IPlanetEjbc {
      *
      * @author Greg Nelson <a href="mailto:greg@netscape.com">greg@netscape.com</a>
      */
-    private class RedirectOutput extends Thread {
+    private static class RedirectOutput extends Thread {
         InputStream stream;  // Stream to read and redirect to standard output
 
         /**
diff --git a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
index 63bc3eb7a..a117915fe 100644
--- a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
+++ b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1028,7 +1028,7 @@ public class CBZip2OutputStream extends OutputStream implements BZip2Constants {
         return b;
     }
 
-    private class StackElem {
+    private static class StackElem {
         int ll;
         int hh;
         int dd;