diff --git a/app/src/processing/app/ColorChooser.java b/app/src/processing/app/ColorChooser.java
index d9eac717f..b76925d5a 100644
--- a/app/src/processing/app/ColorChooser.java
+++ b/app/src/processing/app/ColorChooser.java
@@ -639,7 +639,7 @@ public class ColorChooser {  //extends JFrame implements DocumentListener {
   /**
    * Extension of JTextField that only allows numbers
    */
-  class NumberField extends JTextField {
+  static class NumberField extends JTextField {
 
     public boolean allowHex;
 
@@ -672,7 +672,7 @@ public class ColorChooser {  //extends JFrame implements DocumentListener {
   /**
    * Document model to go with JTextField that only allows numbers.
    */
-  class NumberDocument extends PlainDocument {
+  static class NumberDocument extends PlainDocument {
 
     NumberField parentField;
 
diff --git a/app/src/processing/app/EditorHeader.java b/app/src/processing/app/EditorHeader.java
index be1cfbebc..b49be2cd5 100644
--- a/app/src/processing/app/EditorHeader.java
+++ b/app/src/processing/app/EditorHeader.java
@@ -626,7 +626,7 @@ public class EditorHeader extends JComponent {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  class Tab implements Comparable {
+  static class Tab implements Comparable {
     int index;
     int left;
     int right;
diff --git a/app/src/processing/app/Language.java b/app/src/processing/app/Language.java
index 483ad765a..c7a183ac9 100644
--- a/app/src/processing/app/Language.java
+++ b/app/src/processing/app/Language.java
@@ -221,7 +221,7 @@ public class Language {
    * Custom 'Control' class for consistent encoding.
    * http://stackoverflow.com/questions/4659929/how-to-use-utf-8-in-resource-properties-with-resourcebundle
    */
-  class UTF8Control extends ResourceBundle.Control {
+  static class UTF8Control extends ResourceBundle.Control {
     public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload) throws IllegalAccessException, InstantiationException,IOException {
       // The below is a copy of the default implementation.
       String bundleName = toBundleName(baseName, locale);
diff --git a/app/src/processing/app/PreferencesFrame.java b/app/src/processing/app/PreferencesFrame.java
index 5aa95cd6d..39e0095a3 100644
--- a/app/src/processing/app/PreferencesFrame.java
+++ b/app/src/processing/app/PreferencesFrame.java
@@ -832,7 +832,7 @@ public class PreferencesFrame {
    * most basic usage scenarios. Is there someone on the team I can contact?
    * Oracle, are you listening?
    */
-  class FontNamer extends JLabel implements ListCellRenderer<Font> {
+  static class FontNamer extends JLabel implements ListCellRenderer<Font> {
     public Component getListCellRendererComponent(JList<? extends Font> list,
                                                   Font value, int index,
                                                   boolean isSelected,
diff --git a/app/src/processing/app/Recent.java b/app/src/processing/app/Recent.java
index 326cbc96c..fc97183a9 100644
--- a/app/src/processing/app/Recent.java
+++ b/app/src/processing/app/Recent.java
@@ -310,7 +310,7 @@ public class Recent {
 //  }
 
 
-  class Record {
+  static class Record {
     String path;  // if not loaded, this is non-null
 //    EditorState state;  // if not loaded, this is non-null
 
@@ -376,4 +376,4 @@ public class Recent {
 //      return getPath().equals(r.getPath());
 //    }
   }
-}
\ No newline at end of file
+}
diff --git a/core/src/processing/core/PGraphicsJava2D.java b/core/src/processing/core/PGraphicsJava2D.java
index f86d4130d..60781be10 100644
--- a/core/src/processing/core/PGraphicsJava2D.java
+++ b/core/src/processing/core/PGraphicsJava2D.java
@@ -1450,7 +1450,7 @@ public class PGraphicsJava2D extends PGraphics {
   }
 
 
-  class ImageCache {
+  static class ImageCache {
     boolean tinted;
     int tintedColor;
     int[] tintedTemp;  // one row of tinted pixels
diff --git a/core/src/processing/core/PShapeSVG.java b/core/src/processing/core/PShapeSVG.java
index aa18b6ed0..111a0f483 100644
--- a/core/src/processing/core/PShapeSVG.java
+++ b/core/src/processing/core/PShapeSVG.java
@@ -1431,7 +1431,7 @@ public class PShapeSVG extends PShape {
   }
 
 
-  class LinearGradient extends Gradient {
+  static class LinearGradient extends Gradient {
     float x1, y1, x2, y2;
 
     public LinearGradient(PShapeSVG parent, XML properties) {
@@ -1461,7 +1461,7 @@ public class PShapeSVG extends PShape {
   }
 
 
-  class RadialGradient extends Gradient {
+  static class RadialGradient extends Gradient {
     float cx, cy, r;
 
     public RadialGradient(PShapeSVG parent, XML properties) {
@@ -1490,7 +1490,7 @@ public class PShapeSVG extends PShape {
 
 
 
-  class LinearGradientPaint implements Paint {
+  static class LinearGradientPaint implements Paint {
     float x1, y1, x2, y2;
     float[] offset;
     int[] color;
@@ -1615,7 +1615,7 @@ public class PShapeSVG extends PShape {
   }
 
 
-  class RadialGradientPaint implements Paint {
+  static class RadialGradientPaint implements Paint {
     float cx, cy, radius;
     float[] offset;
     int[] color;
@@ -1773,7 +1773,7 @@ public class PShapeSVG extends PShape {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  public class Font extends PShapeSVG {
+  public static class Font extends PShapeSVG {
     public FontFace face;
 
     public HashMap<String,FontGlyph> namedGlyphs;
@@ -1887,7 +1887,7 @@ public class PShapeSVG extends PShape {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  class FontFace extends PShapeSVG {
+  static class FontFace extends PShapeSVG {
     int horizOriginX;  // dflt 0
     int horizOriginY;  // dflt 0
 //    int horizAdvX;     // no dflt?
@@ -1924,7 +1924,7 @@ public class PShapeSVG extends PShape {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  public class FontGlyph extends PShapeSVG {  // extends Path
+  public static class FontGlyph extends PShapeSVG {  // extends Path
     public String name;
     char unicode;
     int horizAdvX;
diff --git a/core/src/processing/opengl/FontTexture.java b/core/src/processing/opengl/FontTexture.java
index 8c1c66f5d..066583f7f 100644
--- a/core/src/processing/opengl/FontTexture.java
+++ b/core/src/processing/opengl/FontTexture.java
@@ -390,4 +390,4 @@ class FontTexture implements PConstants {
                                            crop[2] + 2, -crop[3] + 2);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
index c36c9c5b1..5a32fcc23 100644
--- a/core/src/processing/opengl/PGraphicsOpenGL.java
+++ b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -2527,7 +2527,7 @@ public class PGraphicsOpenGL extends PGraphics {
   }
 
 
-  class Triangle {
+  static class Triangle {
     int i0, i1, i2;
     PImage tex;
     float dist;