diff --git a/modules/juce_graphics/colour/juce_Colour.h b/modules/juce_graphics/colour/juce_Colour.h
index 3c773bc8bc..6e08e0c7bd 100644
--- a/modules/juce_graphics/colour/juce_Colour.h
+++ b/modules/juce_graphics/colour/juce_Colour.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_COLOUR_H_INCLUDED
 #define JUCE_COLOUR_H_INCLUDED
 
-#include "../colour/juce_PixelFormats.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/colour/juce_ColourGradient.h b/modules/juce_graphics/colour/juce_ColourGradient.h
index 72f286e5fb..ad499ce9b1 100644
--- a/modules/juce_graphics/colour/juce_ColourGradient.h
+++ b/modules/juce_graphics/colour/juce_ColourGradient.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_COLOURGRADIENT_H_INCLUDED
 #define JUCE_COLOURGRADIENT_H_INCLUDED
 
-#include "juce_Colour.h"
-#include "../geometry/juce_Point.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/colour/juce_Colours.h b/modules/juce_graphics/colour/juce_Colours.h
index f8dda265e6..90e4aa5555 100644
--- a/modules/juce_graphics/colour/juce_Colours.h
+++ b/modules/juce_graphics/colour/juce_Colours.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_COLOURS_H_INCLUDED
 #define JUCE_COLOURS_H_INCLUDED
 
-#include "juce_Colour.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/colour/juce_FillType.h b/modules/juce_graphics/colour/juce_FillType.h
index 92386dfdd5..714b20425d 100644
--- a/modules/juce_graphics/colour/juce_FillType.h
+++ b/modules/juce_graphics/colour/juce_FillType.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_FILLTYPE_H_INCLUDED
 #define JUCE_FILLTYPE_H_INCLUDED
 
-#include "../colour/juce_ColourGradient.h"
-#include "../images/juce_Image.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/contexts/juce_GraphicsContext.h b/modules/juce_graphics/contexts/juce_GraphicsContext.h
index 54e0c5e8e9..40fd42a9e9 100644
--- a/modules/juce_graphics/contexts/juce_GraphicsContext.h
+++ b/modules/juce_graphics/contexts/juce_GraphicsContext.h
@@ -25,17 +25,6 @@
 #ifndef JUCE_GRAPHICSCONTEXT_H_INCLUDED
 #define JUCE_GRAPHICSCONTEXT_H_INCLUDED
 
-#include "../fonts/juce_Font.h"
-#include "../geometry/juce_RectangleList.h"
-#include "../geometry/juce_PathStrokeType.h"
-#include "../geometry/juce_Line.h"
-#include "../colour/juce_Colours.h"
-#include "../colour/juce_ColourGradient.h"
-#include "../placement/juce_RectanglePlacement.h"
-class LowLevelGraphicsContext;
-class Image;
-class FillType;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h b/modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h
index 183318073e..a5cbea5634 100644
--- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h
+++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h
@@ -25,12 +25,6 @@
 #ifndef JUCE_LOWLEVELGRAPHICSCONTEXT_H_INCLUDED
 #define JUCE_LOWLEVELGRAPHICSCONTEXT_H_INCLUDED
 
-#include "../images/juce_Image.h"
-#include "../geometry/juce_Path.h"
-#include "../geometry/juce_RectangleList.h"
-#include "../colour/juce_ColourGradient.h"
-#include "../colour/juce_FillType.h"
-class AttributedString;
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h b/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h
index ba11805889..9b60b36a3e 100644
--- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h
+++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_LOWLEVELGRAPHICSPOSTSCRIPTRENDERER_H_INCLUDED
 #define JUCE_LOWLEVELGRAPHICSPOSTSCRIPTRENDERER_H_INCLUDED
 
-#include "juce_LowLevelGraphicsContext.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h b/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h
index b05aba719b..9928092cab 100644
--- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h
+++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_LOWLEVELGRAPHICSSOFTWARERENDERER_H_INCLUDED
 #define JUCE_LOWLEVELGRAPHICSSOFTWARERENDERER_H_INCLUDED
 
-#include "juce_LowLevelGraphicsContext.h"
-#include "../native/juce_RenderingHelpers.h"
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/effects/juce_DropShadowEffect.h b/modules/juce_graphics/effects/juce_DropShadowEffect.h
index 7a05dd7b11..1f9362a0b8 100644
--- a/modules/juce_graphics/effects/juce_DropShadowEffect.h
+++ b/modules/juce_graphics/effects/juce_DropShadowEffect.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_DROPSHADOWEFFECT_H_INCLUDED
 #define JUCE_DROPSHADOWEFFECT_H_INCLUDED
 
-#include "juce_ImageEffectFilter.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/effects/juce_GlowEffect.h b/modules/juce_graphics/effects/juce_GlowEffect.h
index d646b75c02..ab9ce3b026 100644
--- a/modules/juce_graphics/effects/juce_GlowEffect.h
+++ b/modules/juce_graphics/effects/juce_GlowEffect.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_GLOWEFFECT_H_INCLUDED
 #define JUCE_GLOWEFFECT_H_INCLUDED
 
-#include "juce_ImageEffectFilter.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/effects/juce_ImageEffectFilter.h b/modules/juce_graphics/effects/juce_ImageEffectFilter.h
index 5a057b2eea..84d6b0b93a 100644
--- a/modules/juce_graphics/effects/juce_ImageEffectFilter.h
+++ b/modules/juce_graphics/effects/juce_ImageEffectFilter.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_IMAGEEFFECTFILTER_H_INCLUDED
 #define JUCE_IMAGEEFFECTFILTER_H_INCLUDED
 
-#include "../contexts/juce_GraphicsContext.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/fonts/juce_Font.h b/modules/juce_graphics/fonts/juce_Font.h
index 8d32149b3e..85cac64d66 100644
--- a/modules/juce_graphics/fonts/juce_Font.h
+++ b/modules/juce_graphics/fonts/juce_Font.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_FONT_H_INCLUDED
 #define JUCE_FONT_H_INCLUDED
 
-#include "juce_Typeface.h"
-class LowLevelGraphicsContext;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/fonts/juce_GlyphArrangement.h b/modules/juce_graphics/fonts/juce_GlyphArrangement.h
index d214bff32e..62b40b99b2 100644
--- a/modules/juce_graphics/fonts/juce_GlyphArrangement.h
+++ b/modules/juce_graphics/fonts/juce_GlyphArrangement.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_GLYPHARRANGEMENT_H_INCLUDED
 #define JUCE_GLYPHARRANGEMENT_H_INCLUDED
 
-#include "juce_Font.h"
-#include "../contexts/juce_GraphicsContext.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/fonts/juce_TextLayout.h b/modules/juce_graphics/fonts/juce_TextLayout.h
index d3f4eab40c..b5f9eeadd1 100644
--- a/modules/juce_graphics/fonts/juce_TextLayout.h
+++ b/modules/juce_graphics/fonts/juce_TextLayout.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_TEXTLAYOUT_H_INCLUDED
 #define JUCE_TEXTLAYOUT_H_INCLUDED
 
-#include "juce_Font.h"
-#include "../placement/juce_Justification.h"
-class Graphics;
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/fonts/juce_Typeface.h b/modules/juce_graphics/fonts/juce_Typeface.h
index 65abe4b7b5..4560bb3346 100644
--- a/modules/juce_graphics/fonts/juce_Typeface.h
+++ b/modules/juce_graphics/fonts/juce_Typeface.h
@@ -25,11 +25,6 @@
 #ifndef JUCE_TYPEFACE_H_INCLUDED
 #define JUCE_TYPEFACE_H_INCLUDED
 
-class Path;
-class Font;
-class EdgeTable;
-class AffineTransform;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/geometry/juce_BorderSize.h b/modules/juce_graphics/geometry/juce_BorderSize.h
index 94647b248d..b6a6686a76 100644
--- a/modules/juce_graphics/geometry/juce_BorderSize.h
+++ b/modules/juce_graphics/geometry/juce_BorderSize.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_BORDERSIZE_H_INCLUDED
 #define JUCE_BORDERSIZE_H_INCLUDED
 
-#include "juce_Rectangle.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/geometry/juce_EdgeTable.h b/modules/juce_graphics/geometry/juce_EdgeTable.h
index 0b479b64b8..40cea224d5 100644
--- a/modules/juce_graphics/geometry/juce_EdgeTable.h
+++ b/modules/juce_graphics/geometry/juce_EdgeTable.h
@@ -25,12 +25,6 @@
 #ifndef JUCE_EDGETABLE_H_INCLUDED
 #define JUCE_EDGETABLE_H_INCLUDED
 
-#include "../geometry/juce_AffineTransform.h"
-#include "../geometry/juce_Rectangle.h"
-#include "../geometry/juce_RectangleList.h"
-class Path;
-class Image;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/geometry/juce_Line.h b/modules/juce_graphics/geometry/juce_Line.h
index d947c2393d..cf1b9646a3 100644
--- a/modules/juce_graphics/geometry/juce_Line.h
+++ b/modules/juce_graphics/geometry/juce_Line.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_LINE_H_INCLUDED
 #define JUCE_LINE_H_INCLUDED
 
-#include "juce_Point.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/geometry/juce_Path.h b/modules/juce_graphics/geometry/juce_Path.h
index 04aa8dee08..42637db015 100644
--- a/modules/juce_graphics/geometry/juce_Path.h
+++ b/modules/juce_graphics/geometry/juce_Path.h
@@ -25,12 +25,6 @@
 #ifndef JUCE_PATH_H_INCLUDED
 #define JUCE_PATH_H_INCLUDED
 
-#include "juce_AffineTransform.h"
-#include "juce_Line.h"
-#include "juce_Rectangle.h"
-#include "../placement/juce_Justification.h"
-class Image;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/geometry/juce_PathIterator.h b/modules/juce_graphics/geometry/juce_PathIterator.h
index 1e27996c59..dcb8b90319 100644
--- a/modules/juce_graphics/geometry/juce_PathIterator.h
+++ b/modules/juce_graphics/geometry/juce_PathIterator.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_PATHITERATOR_H_INCLUDED
 #define JUCE_PATHITERATOR_H_INCLUDED
 
-#include "juce_Path.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/geometry/juce_PathStrokeType.h b/modules/juce_graphics/geometry/juce_PathStrokeType.h
index e3ddee670e..60bb4641d2 100644
--- a/modules/juce_graphics/geometry/juce_PathStrokeType.h
+++ b/modules/juce_graphics/geometry/juce_PathStrokeType.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_PATHSTROKETYPE_H_INCLUDED
 #define JUCE_PATHSTROKETYPE_H_INCLUDED
 
-#include "juce_Path.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/geometry/juce_Point.h b/modules/juce_graphics/geometry/juce_Point.h
index 1a21454d17..829f5cea50 100644
--- a/modules/juce_graphics/geometry/juce_Point.h
+++ b/modules/juce_graphics/geometry/juce_Point.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_POINT_H_INCLUDED
 #define JUCE_POINT_H_INCLUDED
 
-#include "juce_AffineTransform.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/geometry/juce_Rectangle.h b/modules/juce_graphics/geometry/juce_Rectangle.h
index 5541e3f5ea..238d5f94a6 100644
--- a/modules/juce_graphics/geometry/juce_Rectangle.h
+++ b/modules/juce_graphics/geometry/juce_Rectangle.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_RECTANGLE_H_INCLUDED
 #define JUCE_RECTANGLE_H_INCLUDED
 
-#include "juce_Point.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/geometry/juce_RectangleList.h b/modules/juce_graphics/geometry/juce_RectangleList.h
index 92c183cf64..42a2e0ac84 100644
--- a/modules/juce_graphics/geometry/juce_RectangleList.h
+++ b/modules/juce_graphics/geometry/juce_RectangleList.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_RECTANGLELIST_H_INCLUDED
 #define JUCE_RECTANGLELIST_H_INCLUDED
 
-#include "juce_Rectangle.h"
-#include "juce_Path.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/images/juce_Image.h b/modules/juce_graphics/images/juce_Image.h
index 5ce0bab37f..fdd376e0d1 100644
--- a/modules/juce_graphics/images/juce_Image.h
+++ b/modules/juce_graphics/images/juce_Image.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_IMAGE_H_INCLUDED
 #define JUCE_IMAGE_H_INCLUDED
 
-#include "../colour/juce_Colour.h"
-#include "../contexts/juce_GraphicsContext.h"
-
 class ImageType;
 class ImagePixelData;
 
diff --git a/modules/juce_graphics/images/juce_ImageCache.h b/modules/juce_graphics/images/juce_ImageCache.h
index f103a589d4..c4243952b6 100644
--- a/modules/juce_graphics/images/juce_ImageCache.h
+++ b/modules/juce_graphics/images/juce_ImageCache.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_IMAGECACHE_H_INCLUDED
 #define JUCE_IMAGECACHE_H_INCLUDED
 
-#include "juce_Image.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/images/juce_ImageConvolutionKernel.h b/modules/juce_graphics/images/juce_ImageConvolutionKernel.h
index a3c87a5572..885dc6bf3d 100644
--- a/modules/juce_graphics/images/juce_ImageConvolutionKernel.h
+++ b/modules/juce_graphics/images/juce_ImageConvolutionKernel.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_IMAGECONVOLUTIONKERNEL_H_INCLUDED
 #define JUCE_IMAGECONVOLUTIONKERNEL_H_INCLUDED
 
-#include "juce_Image.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/images/juce_ImageFileFormat.h b/modules/juce_graphics/images/juce_ImageFileFormat.h
index 565b951338..76a13d25a3 100644
--- a/modules/juce_graphics/images/juce_ImageFileFormat.h
+++ b/modules/juce_graphics/images/juce_ImageFileFormat.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_IMAGEFILEFORMAT_H_INCLUDED
 #define JUCE_IMAGEFILEFORMAT_H_INCLUDED
 
-#include "juce_Image.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/juce_graphics.h b/modules/juce_graphics/juce_graphics.h
index cdf5f17c50..9a5a0150f4 100644
--- a/modules/juce_graphics/juce_graphics.h
+++ b/modules/juce_graphics/juce_graphics.h
@@ -64,43 +64,49 @@
 namespace juce
 {
 
-// START_AUTOINCLUDE colour, geometry, placement, contexts, images,
-// image_formats, fonts, effects
+class Image;
+class AffineTransform;
+class Path;
+class Font;
+class Graphics;
+class FillType;
+class LowLevelGraphicsContext;
+
+#include "geometry/juce_AffineTransform.h"
+#include "geometry/juce_Point.h"
+#include "geometry/juce_Line.h"
+#include "geometry/juce_Rectangle.h"
+#include "placement/juce_Justification.h"
+#include "geometry/juce_Path.h"
+#include "geometry/juce_RectangleList.h"
+#include "colour/juce_PixelFormats.h"
 #include "colour/juce_Colour.h"
 #include "colour/juce_ColourGradient.h"
 #include "colour/juce_Colours.h"
-#include "colour/juce_FillType.h"
-#include "colour/juce_PixelFormats.h"
-#include "geometry/juce_AffineTransform.h"
 #include "geometry/juce_BorderSize.h"
 #include "geometry/juce_EdgeTable.h"
-#include "geometry/juce_Line.h"
-#include "geometry/juce_Path.h"
 #include "geometry/juce_PathIterator.h"
 #include "geometry/juce_PathStrokeType.h"
-#include "geometry/juce_Point.h"
-#include "geometry/juce_Rectangle.h"
-#include "geometry/juce_RectangleList.h"
-#include "placement/juce_Justification.h"
 #include "placement/juce_RectanglePlacement.h"
-#include "contexts/juce_GraphicsContext.h"
-#include "contexts/juce_LowLevelGraphicsContext.h"
-#include "contexts/juce_LowLevelGraphicsPostScriptRenderer.h"
-#include "contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
-#include "images/juce_Image.h"
 #include "images/juce_ImageCache.h"
 #include "images/juce_ImageConvolutionKernel.h"
 #include "images/juce_ImageFileFormat.h"
 #include "fonts/juce_AttributedString.h"
-#include "fonts/juce_CustomTypeface.h"
+#include "fonts/juce_Typeface.h"
 #include "fonts/juce_Font.h"
 #include "fonts/juce_GlyphArrangement.h"
 #include "fonts/juce_TextLayout.h"
-#include "fonts/juce_Typeface.h"
+#include "fonts/juce_CustomTypeface.h"
+#include "contexts/juce_GraphicsContext.h"
+#include "contexts/juce_LowLevelGraphicsContext.h"
+#include "images/juce_Image.h"
+#include "colour/juce_FillType.h"
+#include "native/juce_RenderingHelpers.h"
+#include "contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
+#include "contexts/juce_LowLevelGraphicsPostScriptRenderer.h"
+#include "effects/juce_ImageEffectFilter.h"
 #include "effects/juce_DropShadowEffect.h"
 #include "effects/juce_GlowEffect.h"
-#include "effects/juce_ImageEffectFilter.h"
-// END_AUTOINCLUDE
 
 }
 
diff --git a/modules/juce_graphics/placement/juce_Justification.h b/modules/juce_graphics/placement/juce_Justification.h
index b87d58e00a..f80fa217dd 100644
--- a/modules/juce_graphics/placement/juce_Justification.h
+++ b/modules/juce_graphics/placement/juce_Justification.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_JUSTIFICATION_H_INCLUDED
 #define JUCE_JUSTIFICATION_H_INCLUDED
 
-#include "../geometry/juce_Rectangle.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_graphics/placement/juce_RectanglePlacement.h b/modules/juce_graphics/placement/juce_RectanglePlacement.h
index 27083e94bc..2c607b8b23 100644
--- a/modules/juce_graphics/placement/juce_RectanglePlacement.h
+++ b/modules/juce_graphics/placement/juce_RectanglePlacement.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_RECTANGLEPLACEMENT_H_INCLUDED
 #define JUCE_RECTANGLEPLACEMENT_H_INCLUDED
 
-#include "../geometry/juce_AffineTransform.h"
-#include "../geometry/juce_Rectangle.h"
-
 
 //==============================================================================
 /**