diff --git a/modules/juce_audio_basics/effects/juce_Decibels.h b/modules/juce_audio_basics/effects/juce_Decibels.h
index 2ea42a45ef..6f4d2ebe39 100644
--- a/modules/juce_audio_basics/effects/juce_Decibels.h
+++ b/modules/juce_audio_basics/effects/juce_Decibels.h
@@ -25,6 +25,7 @@
 #ifndef JUCE_DECIBELS_H_INCLUDED
 #define JUCE_DECIBELS_H_INCLUDED
 
+
 //==============================================================================
 /**
     This class contains some helpful static methods for dealing with decibel values.
diff --git a/modules/juce_audio_basics/effects/juce_LagrangeInterpolator.h b/modules/juce_audio_basics/effects/juce_LagrangeInterpolator.h
index c43525dc80..caa4802ecf 100644
--- a/modules/juce_audio_basics/effects/juce_LagrangeInterpolator.h
+++ b/modules/juce_audio_basics/effects/juce_LagrangeInterpolator.h
@@ -25,6 +25,7 @@
 #ifndef JUCE_LAGRANGEINTERPOLATOR_H_INCLUDED
 #define JUCE_LAGRANGEINTERPOLATOR_H_INCLUDED
 
+
 //==============================================================================
 /**
     Interpolator for resampling a stream of floats using 4-point lagrange interpolation.
diff --git a/modules/juce_audio_basics/juce_audio_basics.h b/modules/juce_audio_basics/juce_audio_basics.h
index ddd0421865..70c5432a7b 100644
--- a/modules/juce_audio_basics/juce_audio_basics.h
+++ b/modules/juce_audio_basics/juce_audio_basics.h
@@ -31,7 +31,6 @@
 namespace juce
 {
 
-// START_AUTOINCLUDE buffers, effects, midi, sources, synthesisers
 #include "buffers/juce_AudioDataConverters.h"
 #include "buffers/juce_AudioSampleBuffer.h"
 #include "buffers/juce_FloatVectorOperations.h"
@@ -39,22 +38,21 @@ namespace juce
 #include "effects/juce_IIRFilter.h"
 #include "effects/juce_LagrangeInterpolator.h"
 #include "effects/juce_Reverb.h"
+#include "midi/juce_MidiMessage.h"
 #include "midi/juce_MidiBuffer.h"
+#include "midi/juce_MidiMessageSequence.h"
 #include "midi/juce_MidiFile.h"
 #include "midi/juce_MidiKeyboardState.h"
-#include "midi/juce_MidiMessage.h"
-#include "midi/juce_MidiMessageSequence.h"
 #include "sources/juce_AudioSource.h"
+#include "sources/juce_PositionableAudioSource.h"
 #include "sources/juce_BufferingAudioSource.h"
 #include "sources/juce_ChannelRemappingAudioSource.h"
 #include "sources/juce_IIRFilterAudioSource.h"
 #include "sources/juce_MixerAudioSource.h"
-#include "sources/juce_PositionableAudioSource.h"
 #include "sources/juce_ResamplingAudioSource.h"
 #include "sources/juce_ReverbAudioSource.h"
 #include "sources/juce_ToneGeneratorAudioSource.h"
 #include "synthesisers/juce_Synthesiser.h"
-// END_AUTOINCLUDE
 
 }
 
diff --git a/modules/juce_audio_basics/midi/juce_MidiBuffer.h b/modules/juce_audio_basics/midi/juce_MidiBuffer.h
index 3275cf243f..7c8e51c733 100644
--- a/modules/juce_audio_basics/midi/juce_MidiBuffer.h
+++ b/modules/juce_audio_basics/midi/juce_MidiBuffer.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_MIDIBUFFER_H_INCLUDED
 #define JUCE_MIDIBUFFER_H_INCLUDED
 
-#include "juce_MidiMessage.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_basics/midi/juce_MidiFile.h b/modules/juce_audio_basics/midi/juce_MidiFile.h
index 716bec8a67..53476a87ed 100644
--- a/modules/juce_audio_basics/midi/juce_MidiFile.h
+++ b/modules/juce_audio_basics/midi/juce_MidiFile.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_MIDIFILE_H_INCLUDED
 #define JUCE_MIDIFILE_H_INCLUDED
 
-#include "juce_MidiMessageSequence.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_basics/midi/juce_MidiKeyboardState.h b/modules/juce_audio_basics/midi/juce_MidiKeyboardState.h
index 4fde455d1e..885b7d88f9 100644
--- a/modules/juce_audio_basics/midi/juce_MidiKeyboardState.h
+++ b/modules/juce_audio_basics/midi/juce_MidiKeyboardState.h
@@ -25,7 +25,6 @@
 #ifndef JUCE_MIDIKEYBOARDSTATE_H_INCLUDED
 #define JUCE_MIDIKEYBOARDSTATE_H_INCLUDED
 
-#include "juce_MidiBuffer.h"
 class MidiKeyboardState;
 
 
diff --git a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h
index 8b52a6259b..c44e448be5 100644
--- a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h
+++ b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_MIDIMESSAGESEQUENCE_H_INCLUDED
 #define JUCE_MIDIMESSAGESEQUENCE_H_INCLUDED
 
-#include "juce_MidiMessage.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_basics/sources/juce_AudioSource.h b/modules/juce_audio_basics/sources/juce_AudioSource.h
index 92c2eb88fa..e50b2acb62 100644
--- a/modules/juce_audio_basics/sources/juce_AudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_AudioSource.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_AUDIOSOURCE_H_INCLUDED
 #define JUCE_AUDIOSOURCE_H_INCLUDED
 
-#include "../buffers/juce_AudioSampleBuffer.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h b/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h
index f54451a15a..b0ab4d2f75 100644
--- a/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_BUFFERINGAUDIOSOURCE_H_INCLUDED
 #define JUCE_BUFFERINGAUDIOSOURCE_H_INCLUDED
 
-#include "juce_PositionableAudioSource.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h b/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h
index f6da255dfe..483fe99deb 100644
--- a/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_CHANNELREMAPPINGAUDIOSOURCE_H_INCLUDED
 #define JUCE_CHANNELREMAPPINGAUDIOSOURCE_H_INCLUDED
 
-#include "juce_AudioSource.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h b/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h
index b70b844ca6..40844c568d 100644
--- a/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_IIRFILTERAUDIOSOURCE_H_INCLUDED
 #define JUCE_IIRFILTERAUDIOSOURCE_H_INCLUDED
 
-#include "juce_AudioSource.h"
-#include "../effects/juce_IIRFilter.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_basics/sources/juce_MixerAudioSource.h b/modules/juce_audio_basics/sources/juce_MixerAudioSource.h
index 2eb9755789..f581ac31e1 100644
--- a/modules/juce_audio_basics/sources/juce_MixerAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_MixerAudioSource.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_MIXERAUDIOSOURCE_H_INCLUDED
 #define JUCE_MIXERAUDIOSOURCE_H_INCLUDED
 
-#include "juce_AudioSource.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_basics/sources/juce_PositionableAudioSource.h b/modules/juce_audio_basics/sources/juce_PositionableAudioSource.h
index 066ab99025..2213722bd7 100644
--- a/modules/juce_audio_basics/sources/juce_PositionableAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_PositionableAudioSource.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_POSITIONABLEAUDIOSOURCE_H_INCLUDED
 #define JUCE_POSITIONABLEAUDIOSOURCE_H_INCLUDED
 
-#include "juce_AudioSource.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h b/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h
index 7c78db8ff0..76e79ef156 100644
--- a/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_RESAMPLINGAUDIOSOURCE_H_INCLUDED
 #define JUCE_RESAMPLINGAUDIOSOURCE_H_INCLUDED
 
-#include "juce_AudioSource.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_basics/sources/juce_ReverbAudioSource.h b/modules/juce_audio_basics/sources/juce_ReverbAudioSource.h
index 1173cf6649..6b90e184a1 100644
--- a/modules/juce_audio_basics/sources/juce_ReverbAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_ReverbAudioSource.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_REVERBAUDIOSOURCE_H_INCLUDED
 #define JUCE_REVERBAUDIOSOURCE_H_INCLUDED
 
-#include "juce_AudioSource.h"
-#include "../effects/juce_Reverb.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h b/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h
index aa029704ff..5d09ad8ee9 100644
--- a/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_TONEGENERATORAUDIOSOURCE_H_INCLUDED
 #define JUCE_TONEGENERATORAUDIOSOURCE_H_INCLUDED
 
-#include "juce_AudioSource.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h
index 5044ef1600..eac8ddd086 100644
--- a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h
+++ b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_SYNTHESISER_H_INCLUDED
 #define JUCE_SYNTHESISER_H_INCLUDED
 
-#include "../buffers/juce_AudioSampleBuffer.h"
-#include "../midi/juce_MidiBuffer.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_formats/format/juce_AudioFormat.h b/modules/juce_audio_formats/format/juce_AudioFormat.h
index 88fec791da..fe308471bb 100644
--- a/modules/juce_audio_formats/format/juce_AudioFormat.h
+++ b/modules/juce_audio_formats/format/juce_AudioFormat.h
@@ -112,9 +112,7 @@ public:
     virtual AudioFormatReader* createReaderFor (InputStream* sourceStream,
                                                 bool deleteStreamIfOpeningFails) = 0;
 
-    /** Attempts to create a MemoryMappedAudioFormatReader, if possible for this
-        format.
-
+    /** Attempts to create a MemoryMappedAudioFormatReader, if possible for this format.
         If the format does not support this, the method will return nullptr;
     */
     virtual MemoryMappedAudioFormatReader* createMemoryMappedReader (const File& file);
diff --git a/modules/juce_audio_formats/format/juce_AudioFormatReader.cpp b/modules/juce_audio_formats/format/juce_AudioFormatReader.cpp
index 91572e2eef..eb569e14c5 100644
--- a/modules/juce_audio_formats/format/juce_AudioFormatReader.cpp
+++ b/modules/juce_audio_formats/format/juce_AudioFormatReader.cpp
@@ -415,15 +415,12 @@ bool MemoryMappedAudioFormatReader::mapSectionOfFile (Range<int64> samplesToMap)
     return map != nullptr;
 }
 
+static int memoryReadDummyVariable; // used to force the compiler not to optimise-away the read operation
+
 void MemoryMappedAudioFormatReader::touchSample (int64 sample) const noexcept
 {
     if (map != nullptr && mappedSection.contains (sample))
-    {
-        static int dummy = 0; // to force the compiler not to optimise this stuff away
-        dummy += *(int*) sampleToPointer (sample);
-    }
+        memoryReadDummyVariable += *(int*) sampleToPointer (sample);
     else
-    {
         jassertfalse; // you must make sure that the window contains all the samples you're going to attempt to read.
-    }
 }
diff --git a/modules/juce_audio_formats/format/juce_AudioFormatWriter.h b/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
index 989859a489..2862a8a600 100644
--- a/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
+++ b/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_AUDIOFORMATWRITER_H_INCLUDED
 #define JUCE_AUDIOFORMATWRITER_H_INCLUDED
 
-#include "juce_AudioFormatReader.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_formats/format/juce_AudioSubsectionReader.h b/modules/juce_audio_formats/format/juce_AudioSubsectionReader.h
index b1f8d9ab4a..59693ae004 100644
--- a/modules/juce_audio_formats/format/juce_AudioSubsectionReader.h
+++ b/modules/juce_audio_formats/format/juce_AudioSubsectionReader.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_AUDIOSUBSECTIONREADER_H_INCLUDED
 #define JUCE_AUDIOSUBSECTIONREADER_H_INCLUDED
 
-#include "juce_AudioFormatReader.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_audio_formats/format/juce_MemoryMappedAudioFormatReader.h b/modules/juce_audio_formats/format/juce_MemoryMappedAudioFormatReader.h
index 37103daed6..df2de70d61 100644
--- a/modules/juce_audio_formats/format/juce_MemoryMappedAudioFormatReader.h
+++ b/modules/juce_audio_formats/format/juce_MemoryMappedAudioFormatReader.h
@@ -25,6 +25,7 @@
 #ifndef JUCE_MEMORYMAPPEDAUDIOFORMATREADER_H_INCLUDED
 #define JUCE_MEMORYMAPPEDAUDIOFORMATREADER_H_INCLUDED
 
+
 //==============================================================================
 /**
     A specialised type of AudioFormatReader that uses a MemoryMappedFile to read
diff --git a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h
index d93cb11a73..56d520cc2d 100644
--- a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h
+++ b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_CPLUSPLUSCODETOKENISER_H_INCLUDED
 #define JUCE_CPLUSPLUSCODETOKENISER_H_INCLUDED
 
-#include "juce_CodeTokeniser.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
index 2ce59917df..3e2553de5f 100644
--- a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
+++ b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
@@ -25,9 +25,9 @@
 #ifndef JUCE_CODEEDITORCOMPONENT_H_INCLUDED
 #define JUCE_CODEEDITORCOMPONENT_H_INCLUDED
 
-#include "juce_CodeDocument.h"
 class CodeTokeniser;
 
+
 //==============================================================================
 /**
     A text editor component designed specifically for source code.
diff --git a/modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h b/modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h
index 50d78cb872..bf493c98de 100644
--- a/modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h
+++ b/modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_CODETOKENISER_H_INCLUDED
 #define JUCE_CODETOKENISER_H_INCLUDED
 
-#include "juce_CodeDocument.h"
-#include "juce_CodeEditorComponent.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_gui_extra/juce_gui_extra.h b/modules/juce_gui_extra/juce_gui_extra.h
index b9bde00fb9..9786520fa5 100644
--- a/modules/juce_gui_extra/juce_gui_extra.h
+++ b/modules/juce_gui_extra/juce_gui_extra.h
@@ -41,7 +41,6 @@
 namespace juce
 {
 
-// START_AUTOINCLUDE documents, code_editor, embedding, lookandfeel, misc
 #include "documents/juce_FileBasedDocument.h"
 #include "code_editor/juce_CodeDocument.h"
 #include "code_editor/juce_CodeEditorComponent.h"
@@ -61,7 +60,6 @@ namespace juce
 #include "misc/juce_SplashScreen.h"
 #include "misc/juce_SystemTrayIconComponent.h"
 #include "misc/juce_WebBrowserComponent.h"
-// END_AUTOINCLUDE
 
 }
 
diff --git a/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h b/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h
index a284802873..c6f5925866 100644
--- a/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h
+++ b/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h
@@ -68,20 +68,16 @@ public:
                   const StringArray* headers = nullptr,
                   const MemoryBlock* postData = nullptr);
 
-    /** Stops the current page loading.
-    */
+    /** Stops the current page loading. */
     void stop();
 
-    /** Sends the browser back one page.
-    */
+    /** Sends the browser back one page. */
     void goBack();
 
-    /** Sends the browser forward one page.
-    */
+    /** Sends the browser forward one page. */
     void goForward();
 
-    /** Refreshes the browser.
-    */
+    /** Refreshes the browser. */
     void refresh();
 
     //==============================================================================
diff --git a/modules/juce_opengl/juce_opengl.h b/modules/juce_opengl/juce_opengl.h
index 6ad4b8ec63..9de1f84eb1 100644
--- a/modules/juce_opengl/juce_opengl.h
+++ b/modules/juce_opengl/juce_opengl.h
@@ -77,23 +77,25 @@
 namespace juce
 {
 
-#include "opengl/juce_OpenGLHelpers.h"
+class OpenGLTexture;
+class OpenGLFrameBuffer;
 
-// START_AUTOINCLUDE opengl
-#include "opengl/juce_Draggable3DOrientation.h"
+#include "opengl/juce_OpenGLHelpers.h"
+#include "opengl/juce_Quaternion.h"
 #include "opengl/juce_Matrix3D.h"
+#include "opengl/juce_Draggable3DOrientation.h"
+#include "opengl/juce_OpenGLPixelFormat.h"
+#include "native/juce_OpenGLExtensions.h"
+#include "opengl/juce_OpenGLRenderer.h"
 #include "opengl/juce_OpenGLContext.h"
 #include "opengl/juce_OpenGLFrameBuffer.h"
 #include "opengl/juce_OpenGLGraphicsContext.h"
 #include "opengl/juce_OpenGLHelpers.h"
 #include "opengl/juce_OpenGLImage.h"
-#include "opengl/juce_OpenGLPixelFormat.h"
 #include "opengl/juce_OpenGLRenderer.h"
 #include "opengl/juce_OpenGLShaderProgram.h"
 #include "opengl/juce_OpenGLTexture.h"
-#include "opengl/juce_Quaternion.h"
 #include "opengl/juce_Vector3D.h"
-// END_AUTOINCLUDE
 
 }
 
diff --git a/modules/juce_opengl/opengl/juce_Draggable3DOrientation.h b/modules/juce_opengl/opengl/juce_Draggable3DOrientation.h
index 1c3bdb8de2..b4cc564492 100644
--- a/modules/juce_opengl/opengl/juce_Draggable3DOrientation.h
+++ b/modules/juce_opengl/opengl/juce_Draggable3DOrientation.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_DRAGGABLE3DORIENTATION_H_INCLUDED
 #define JUCE_DRAGGABLE3DORIENTATION_H_INCLUDED
 
-#include "juce_Quaternion.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_opengl/opengl/juce_OpenGLContext.h b/modules/juce_opengl/opengl/juce_OpenGLContext.h
index b9cd4ba770..e56b7f6263 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLContext.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLContext.h
@@ -25,10 +25,6 @@
 #ifndef JUCE_OPENGLCONTEXT_H_INCLUDED
 #define JUCE_OPENGLCONTEXT_H_INCLUDED
 
-#include "juce_OpenGLPixelFormat.h"
-#include "../native/juce_OpenGLExtensions.h"
-#include "juce_OpenGLRenderer.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_opengl/opengl/juce_OpenGLHelpers.h b/modules/juce_opengl/opengl/juce_OpenGLHelpers.h
index c311ae7d33..694c2c9304 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLHelpers.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLHelpers.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_OPENGLHELPERS_H_INCLUDED
 #define JUCE_OPENGLHELPERS_H_INCLUDED
 
-class OpenGLTexture;
-class OpenGLFrameBuffer;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_opengl/opengl/juce_OpenGLRenderer.h b/modules/juce_opengl/opengl/juce_OpenGLRenderer.h
index 0023289f60..3ad9087186 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLRenderer.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLRenderer.h
@@ -25,6 +25,7 @@
 #ifndef JUCE_OPENGLRENDERER_H_INCLUDED
 #define JUCE_OPENGLRENDERER_H_INCLUDED
 
+
 //==============================================================================
 /**
     A base class that should be implemented by classes which want to render openGL
diff --git a/modules/juce_video/capture/juce_CameraDevice.h b/modules/juce_video/capture/juce_CameraDevice.h
index ee8c7944b0..a5a6f05cf4 100644
--- a/modules/juce_video/capture/juce_CameraDevice.h
+++ b/modules/juce_video/capture/juce_CameraDevice.h
@@ -65,7 +65,7 @@ public:
 
     //==============================================================================
     /** Returns the name of this device */
-    String getName() const                { return name; }
+    const String& getName() const noexcept          { return name; }
 
     /** Creates a component that can be used to display a preview of the
         video from this camera.
@@ -89,8 +89,7 @@ public:
     */
     void startRecordingToFile (const File& file, int quality = 2);
 
-    /** Stops recording, after a call to startRecordingToFile().
-    */
+    /** Stops recording, after a call to startRecordingToFile(). */
     void stopRecording();
 
     /** Returns the file extension that should be used for the files
@@ -133,8 +132,7 @@ public:
     */
     void addListener (Listener* listenerToAdd);
 
-    /** Removes a listener that was previously added with addListener().
-    */
+    /** Removes a listener that was previously added with addListener(). */
     void removeListener (Listener* listenerToRemove);
 
 
@@ -151,9 +149,10 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CameraDevice)
 };
 
-/** This typedef is just for compatibility with old code - newer code should use the CameraDevice::Listener class directly. */
-typedef CameraDevice::Listener CameraImageListener;
-
+#ifndef DOXYGEN
+ /** This typedef is just for compatibility with VC6 - newer code should use the CameraDevice::Listener class directly. */
+ typedef CameraDevice::Listener CameraImageListener;
+#endif
 
 #endif
 #endif   // JUCE_CAMERADEVICE_H_INCLUDED