diff --git a/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h b/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h
index 15edb9076a..afa5b3e087 100644
--- a/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h
+++ b/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIODATACONVERTERS_JUCEHEADER__
-#define __JUCE_AUDIODATACONVERTERS_JUCEHEADER__
+#ifndef JUCE_AUDIODATACONVERTERS_H_INCLUDED
+#define JUCE_AUDIODATACONVERTERS_H_INCLUDED
 
 
 //==============================================================================
@@ -688,4 +688,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIODATACONVERTERS_JUCEHEADER__
+#endif   // JUCE_AUDIODATACONVERTERS_H_INCLUDED
diff --git a/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h b/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h
index 39ee8960ec..33312912bb 100644
--- a/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h
+++ b/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOSAMPLEBUFFER_JUCEHEADER__
-#define __JUCE_AUDIOSAMPLEBUFFER_JUCEHEADER__
+#ifndef JUCE_AUDIOSAMPLEBUFFER_H_INCLUDED
+#define JUCE_AUDIOSAMPLEBUFFER_H_INCLUDED
 
 
 //==============================================================================
@@ -443,4 +443,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOSAMPLEBUFFER_JUCEHEADER__
+#endif   // JUCE_AUDIOSAMPLEBUFFER_H_INCLUDED
diff --git a/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.h b/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.h
index 7b42514756..79b54b0205 100644
--- a/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.h
+++ b/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FLOATVECTOROPERATIONS_JUCEHEADER__
-#define __JUCE_FLOATVECTOROPERATIONS_JUCEHEADER__
+#ifndef JUCE_FLOATVECTOROPERATIONS_H_INCLUDED
+#define JUCE_FLOATVECTOROPERATIONS_H_INCLUDED
 
 
 //==============================================================================
@@ -76,4 +76,4 @@ public:
 };
 
 
-#endif   // __JUCE_FLOATVECTOROPERATIONS_JUCEHEADER__
+#endif   // JUCE_FLOATVECTOROPERATIONS_H_INCLUDED
diff --git a/modules/juce_audio_basics/effects/juce_Decibels.h b/modules/juce_audio_basics/effects/juce_Decibels.h
index 4fad09dc17..2ea42a45ef 100644
--- a/modules/juce_audio_basics/effects/juce_Decibels.h
+++ b/modules/juce_audio_basics/effects/juce_Decibels.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DECIBELS_JUCEHEADER__
-#define __JUCE_DECIBELS_JUCEHEADER__
+#ifndef JUCE_DECIBELS_H_INCLUDED
+#define JUCE_DECIBELS_H_INCLUDED
 
 //==============================================================================
 /**
@@ -100,4 +100,4 @@ private:
 };
 
 
-#endif   // __JUCE_DECIBELS_JUCEHEADER__
+#endif   // JUCE_DECIBELS_H_INCLUDED
diff --git a/modules/juce_audio_basics/effects/juce_IIRFilter.h b/modules/juce_audio_basics/effects/juce_IIRFilter.h
index 47b3f3529b..c7a029ea2f 100644
--- a/modules/juce_audio_basics/effects/juce_IIRFilter.h
+++ b/modules/juce_audio_basics/effects/juce_IIRFilter.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IIRFILTER_JUCEHEADER__
-#define __JUCE_IIRFILTER_JUCEHEADER__
+#ifndef JUCE_IIRFILTER_H_INCLUDED
+#define JUCE_IIRFILTER_H_INCLUDED
 
 class IIRFilter;
 
@@ -169,4 +169,4 @@ protected:
 };
 
 
-#endif   // __JUCE_IIRFILTER_JUCEHEADER__
+#endif   // JUCE_IIRFILTER_H_INCLUDED
diff --git a/modules/juce_audio_basics/effects/juce_LagrangeInterpolator.h b/modules/juce_audio_basics/effects/juce_LagrangeInterpolator.h
index 9ae6262915..c43525dc80 100644
--- a/modules/juce_audio_basics/effects/juce_LagrangeInterpolator.h
+++ b/modules/juce_audio_basics/effects/juce_LagrangeInterpolator.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LAGRANGEINTERPOLATOR_JUCEHEADER__
-#define __JUCE_LAGRANGEINTERPOLATOR_JUCEHEADER__
+#ifndef JUCE_LAGRANGEINTERPOLATOR_H_INCLUDED
+#define JUCE_LAGRANGEINTERPOLATOR_H_INCLUDED
 
 //==============================================================================
 /**
@@ -90,4 +90,4 @@ private:
 };
 
 
-#endif   // __JUCE_LAGRANGEINTERPOLATOR_JUCEHEADER__
+#endif   // JUCE_LAGRANGEINTERPOLATOR_H_INCLUDED
diff --git a/modules/juce_audio_basics/effects/juce_Reverb.h b/modules/juce_audio_basics/effects/juce_Reverb.h
index d50d4790ec..fceb0a00ca 100644
--- a/modules/juce_audio_basics/effects/juce_Reverb.h
+++ b/modules/juce_audio_basics/effects/juce_Reverb.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_REVERB_JUCEHEADER__
-#define __JUCE_REVERB_JUCEHEADER__
+#ifndef JUCE_REVERB_H_INCLUDED
+#define JUCE_REVERB_H_INCLUDED
 
 
 //==============================================================================
@@ -320,4 +320,4 @@ private:
 };
 
 
-#endif   // __JUCE_REVERB_JUCEHEADER__
+#endif   // JUCE_REVERB_H_INCLUDED
diff --git a/modules/juce_audio_basics/juce_audio_basics.cpp b/modules/juce_audio_basics/juce_audio_basics.cpp
index a9a4ce8291..0726b6e8b2 100644
--- a/modules/juce_audio_basics/juce_audio_basics.cpp
+++ b/modules/juce_audio_basics/juce_audio_basics.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_BASICS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_AUDIO_BASICS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_audio_basics/juce_audio_basics.h b/modules/juce_audio_basics/juce_audio_basics.h
index 489b82cb43..ddd0421865 100644
--- a/modules/juce_audio_basics/juce_audio_basics.h
+++ b/modules/juce_audio_basics/juce_audio_basics.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIO_BASICS_JUCEHEADER__
-#define __JUCE_AUDIO_BASICS_JUCEHEADER__
+#ifndef JUCE_AUDIO_BASICS_H_INCLUDED
+#define JUCE_AUDIO_BASICS_H_INCLUDED
 
 #include "../juce_core/juce_core.h"
 
@@ -32,74 +32,30 @@ namespace juce
 {
 
 // START_AUTOINCLUDE buffers, effects, midi, sources, synthesisers
-#ifndef __JUCE_AUDIODATACONVERTERS_JUCEHEADER__
- #include "buffers/juce_AudioDataConverters.h"
-#endif
-#ifndef __JUCE_AUDIOSAMPLEBUFFER_JUCEHEADER__
- #include "buffers/juce_AudioSampleBuffer.h"
-#endif
-#ifndef __JUCE_FLOATVECTOROPERATIONS_JUCEHEADER__
- #include "buffers/juce_FloatVectorOperations.h"
-#endif
-#ifndef __JUCE_DECIBELS_JUCEHEADER__
- #include "effects/juce_Decibels.h"
-#endif
-#ifndef __JUCE_IIRFILTER_JUCEHEADER__
- #include "effects/juce_IIRFilter.h"
-#endif
-#ifndef __JUCE_LAGRANGEINTERPOLATOR_JUCEHEADER__
- #include "effects/juce_LagrangeInterpolator.h"
-#endif
-#ifndef __JUCE_REVERB_JUCEHEADER__
- #include "effects/juce_Reverb.h"
-#endif
-#ifndef __JUCE_MIDIBUFFER_JUCEHEADER__
- #include "midi/juce_MidiBuffer.h"
-#endif
-#ifndef __JUCE_MIDIFILE_JUCEHEADER__
- #include "midi/juce_MidiFile.h"
-#endif
-#ifndef __JUCE_MIDIKEYBOARDSTATE_JUCEHEADER__
- #include "midi/juce_MidiKeyboardState.h"
-#endif
-#ifndef __JUCE_MIDIMESSAGE_JUCEHEADER__
- #include "midi/juce_MidiMessage.h"
-#endif
-#ifndef __JUCE_MIDIMESSAGESEQUENCE_JUCEHEADER__
- #include "midi/juce_MidiMessageSequence.h"
-#endif
-#ifndef __JUCE_AUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_AudioSource.h"
-#endif
-#ifndef __JUCE_BUFFERINGAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_BufferingAudioSource.h"
-#endif
-#ifndef __JUCE_CHANNELREMAPPINGAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_ChannelRemappingAudioSource.h"
-#endif
-#ifndef __JUCE_IIRFILTERAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_IIRFilterAudioSource.h"
-#endif
-#ifndef __JUCE_MIXERAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_MixerAudioSource.h"
-#endif
-#ifndef __JUCE_POSITIONABLEAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_PositionableAudioSource.h"
-#endif
-#ifndef __JUCE_RESAMPLINGAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_ResamplingAudioSource.h"
-#endif
-#ifndef __JUCE_REVERBAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_ReverbAudioSource.h"
-#endif
-#ifndef __JUCE_TONEGENERATORAUDIOSOURCE_JUCEHEADER__
- #include "sources/juce_ToneGeneratorAudioSource.h"
-#endif
-#ifndef __JUCE_SYNTHESISER_JUCEHEADER__
- #include "synthesisers/juce_Synthesiser.h"
-#endif
+#include "buffers/juce_AudioDataConverters.h"
+#include "buffers/juce_AudioSampleBuffer.h"
+#include "buffers/juce_FloatVectorOperations.h"
+#include "effects/juce_Decibels.h"
+#include "effects/juce_IIRFilter.h"
+#include "effects/juce_LagrangeInterpolator.h"
+#include "effects/juce_Reverb.h"
+#include "midi/juce_MidiBuffer.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_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
 
 }
 
-#endif   // __JUCE_AUDIO_BASICS_JUCEHEADER__
+#endif   // JUCE_AUDIO_BASICS_H_INCLUDED
diff --git a/modules/juce_audio_basics/midi/juce_MidiBuffer.h b/modules/juce_audio_basics/midi/juce_MidiBuffer.h
index 7cc8e118a8..3275cf243f 100644
--- a/modules/juce_audio_basics/midi/juce_MidiBuffer.h
+++ b/modules/juce_audio_basics/midi/juce_MidiBuffer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIBUFFER_JUCEHEADER__
-#define __JUCE_MIDIBUFFER_JUCEHEADER__
+#ifndef JUCE_MIDIBUFFER_H_INCLUDED
+#define JUCE_MIDIBUFFER_H_INCLUDED
 
 #include "juce_MidiMessage.h"
 
@@ -237,4 +237,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIBUFFER_JUCEHEADER__
+#endif   // JUCE_MIDIBUFFER_H_INCLUDED
diff --git a/modules/juce_audio_basics/midi/juce_MidiFile.h b/modules/juce_audio_basics/midi/juce_MidiFile.h
index cfe8570977..716bec8a67 100644
--- a/modules/juce_audio_basics/midi/juce_MidiFile.h
+++ b/modules/juce_audio_basics/midi/juce_MidiFile.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIFILE_JUCEHEADER__
-#define __JUCE_MIDIFILE_JUCEHEADER__
+#ifndef JUCE_MIDIFILE_H_INCLUDED
+#define JUCE_MIDIFILE_H_INCLUDED
 
 #include "juce_MidiMessageSequence.h"
 
@@ -183,4 +183,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIFILE_JUCEHEADER__
+#endif   // JUCE_MIDIFILE_H_INCLUDED
diff --git a/modules/juce_audio_basics/midi/juce_MidiKeyboardState.h b/modules/juce_audio_basics/midi/juce_MidiKeyboardState.h
index 229a72fa4e..4fde455d1e 100644
--- a/modules/juce_audio_basics/midi/juce_MidiKeyboardState.h
+++ b/modules/juce_audio_basics/midi/juce_MidiKeyboardState.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIKEYBOARDSTATE_JUCEHEADER__
-#define __JUCE_MIDIKEYBOARDSTATE_JUCEHEADER__
+#ifndef JUCE_MIDIKEYBOARDSTATE_H_INCLUDED
+#define JUCE_MIDIKEYBOARDSTATE_H_INCLUDED
 
 #include "juce_MidiBuffer.h"
 class MidiKeyboardState;
@@ -203,4 +203,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIKEYBOARDSTATE_JUCEHEADER__
+#endif   // JUCE_MIDIKEYBOARDSTATE_H_INCLUDED
diff --git a/modules/juce_audio_basics/midi/juce_MidiMessage.h b/modules/juce_audio_basics/midi/juce_MidiMessage.h
index 2d2066df93..40bce10c75 100644
--- a/modules/juce_audio_basics/midi/juce_MidiMessage.h
+++ b/modules/juce_audio_basics/midi/juce_MidiMessage.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIMESSAGE_JUCEHEADER__
-#define __JUCE_MIDIMESSAGE_JUCEHEADER__
+#ifndef JUCE_MIDIMESSAGE_H_INCLUDED
+#define JUCE_MIDIMESSAGE_H_INCLUDED
 
 
 //==============================================================================
@@ -936,4 +936,4 @@ private:
     bool usesAllocatedData() const noexcept;
 };
 
-#endif   // __JUCE_MIDIMESSAGE_JUCEHEADER__
+#endif   // JUCE_MIDIMESSAGE_H_INCLUDED
diff --git a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h
index a7fa3ffb53..8b52a6259b 100644
--- a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h
+++ b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIMESSAGESEQUENCE_JUCEHEADER__
-#define __JUCE_MIDIMESSAGESEQUENCE_JUCEHEADER__
+#ifndef JUCE_MIDIMESSAGESEQUENCE_H_INCLUDED
+#define JUCE_MIDIMESSAGESEQUENCE_H_INCLUDED
 
 #include "juce_MidiMessage.h"
 
@@ -277,4 +277,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIMESSAGESEQUENCE_JUCEHEADER__
+#endif   // JUCE_MIDIMESSAGESEQUENCE_H_INCLUDED
diff --git a/modules/juce_audio_basics/sources/juce_AudioSource.h b/modules/juce_audio_basics/sources/juce_AudioSource.h
index cf6ea1b86a..92c2eb88fa 100644
--- a/modules/juce_audio_basics/sources/juce_AudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_AudioSource.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOSOURCE_JUCEHEADER__
-#define __JUCE_AUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_AUDIOSOURCE_H_INCLUDED
+#define JUCE_AUDIOSOURCE_H_INCLUDED
 
 #include "../buffers/juce_AudioSampleBuffer.h"
 
@@ -180,4 +180,4 @@ public:
 };
 
 
-#endif   // __JUCE_AUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_AUDIOSOURCE_H_INCLUDED
diff --git a/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h b/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h
index 1fe4b80166..78b891c648 100644
--- a/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BUFFERINGAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_BUFFERINGAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_BUFFERINGAUDIOSOURCE_H_INCLUDED
+#define JUCE_BUFFERINGAUDIOSOURCE_H_INCLUDED
 
 #include "juce_PositionableAudioSource.h"
 
@@ -110,4 +110,4 @@ private:
 };
 
 
-#endif   // __JUCE_BUFFERINGAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_BUFFERINGAUDIOSOURCE_H_INCLUDED
diff --git a/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h b/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h
index 8c3da8674f..a26fa98cc9 100644
--- a/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CHANNELREMAPPINGAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_CHANNELREMAPPINGAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_CHANNELREMAPPINGAUDIOSOURCE_H_INCLUDED
+#define JUCE_CHANNELREMAPPINGAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 
@@ -145,4 +145,4 @@ private:
 };
 
 
-#endif   // __JUCE_CHANNELREMAPPINGAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_CHANNELREMAPPINGAUDIOSOURCE_H_INCLUDED
diff --git a/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h b/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h
index 04a8bf2b3a..5c34c8dc5f 100644
--- a/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IIRFILTERAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_IIRFILTERAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_IIRFILTERAUDIOSOURCE_H_INCLUDED
+#define JUCE_IIRFILTERAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 #include "../effects/juce_IIRFilter.h"
@@ -70,4 +70,4 @@ private:
 };
 
 
-#endif   // __JUCE_IIRFILTERAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_IIRFILTERAUDIOSOURCE_H_INCLUDED
diff --git a/modules/juce_audio_basics/sources/juce_MixerAudioSource.h b/modules/juce_audio_basics/sources/juce_MixerAudioSource.h
index 1cdb48410c..2cb68fde3e 100644
--- a/modules/juce_audio_basics/sources/juce_MixerAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_MixerAudioSource.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIXERAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_MIXERAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_MIXERAUDIOSOURCE_H_INCLUDED
+#define JUCE_MIXERAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 
@@ -100,4 +100,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIXERAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_MIXERAUDIOSOURCE_H_INCLUDED
diff --git a/modules/juce_audio_basics/sources/juce_PositionableAudioSource.h b/modules/juce_audio_basics/sources/juce_PositionableAudioSource.h
index 755c0ede8b..066ab99025 100644
--- a/modules/juce_audio_basics/sources/juce_PositionableAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_PositionableAudioSource.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_POSITIONABLEAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_POSITIONABLEAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_POSITIONABLEAUDIOSOURCE_H_INCLUDED
+#define JUCE_POSITIONABLEAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 
@@ -77,4 +77,4 @@ public:
 };
 
 
-#endif   // __JUCE_POSITIONABLEAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_POSITIONABLEAUDIOSOURCE_H_INCLUDED
diff --git a/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h b/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h
index cb5bc3258a..a4dadab9b5 100644
--- a/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RESAMPLINGAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_RESAMPLINGAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_RESAMPLINGAUDIOSOURCE_H_INCLUDED
+#define JUCE_RESAMPLINGAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 
@@ -102,4 +102,4 @@ private:
 };
 
 
-#endif   // __JUCE_RESAMPLINGAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_RESAMPLINGAUDIOSOURCE_H_INCLUDED
diff --git a/modules/juce_audio_basics/sources/juce_ReverbAudioSource.h b/modules/juce_audio_basics/sources/juce_ReverbAudioSource.h
index 11c286ae02..dab1f0eed1 100644
--- a/modules/juce_audio_basics/sources/juce_ReverbAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_ReverbAudioSource.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_REVERBAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_REVERBAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_REVERBAUDIOSOURCE_H_INCLUDED
+#define JUCE_REVERBAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 #include "../effects/juce_Reverb.h"
@@ -76,4 +76,4 @@ private:
 };
 
 
-#endif   // __JUCE_REVERBAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_REVERBAUDIOSOURCE_H_INCLUDED
diff --git a/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h b/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h
index 0bbd5c8ade..2f04290521 100644
--- a/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h
+++ b/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TONEGENERATORAUDIOSOURCE_JUCEHEADER__
-#define __JUCE_TONEGENERATORAUDIOSOURCE_JUCEHEADER__
+#ifndef JUCE_TONEGENERATORAUDIOSOURCE_H_INCLUDED
+#define JUCE_TONEGENERATORAUDIOSOURCE_H_INCLUDED
 
 #include "juce_AudioSource.h"
 
@@ -72,4 +72,4 @@ private:
 };
 
 
-#endif   // __JUCE_TONEGENERATORAUDIOSOURCE_JUCEHEADER__
+#endif   // JUCE_TONEGENERATORAUDIOSOURCE_H_INCLUDED
diff --git a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h
index 0fe263cb88..5f0d450f71 100644
--- a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h
+++ b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SYNTHESISER_JUCEHEADER__
-#define __JUCE_SYNTHESISER_JUCEHEADER__
+#ifndef JUCE_SYNTHESISER_H_INCLUDED
+#define JUCE_SYNTHESISER_H_INCLUDED
 
 #include "../buffers/juce_AudioSampleBuffer.h"
 #include "../midi/juce_MidiBuffer.h"
@@ -490,4 +490,4 @@ private:
 };
 
 
-#endif   // __JUCE_SYNTHESISER_JUCEHEADER__
+#endif   // JUCE_SYNTHESISER_H_INCLUDED
diff --git a/modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h b/modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h
index 2768bc716c..ff6f4811bd 100644
--- a/modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h
+++ b/modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOCDBURNER_JUCEHEADER__
-#define __JUCE_AUDIOCDBURNER_JUCEHEADER__
+#ifndef JUCE_AUDIOCDBURNER_H_INCLUDED
+#define JUCE_AUDIOCDBURNER_H_INCLUDED
 
 #if JUCE_USE_CDBURNER || DOXYGEN
 
@@ -166,4 +166,4 @@ private:
 
 
 #endif
-#endif   // __JUCE_AUDIOCDBURNER_JUCEHEADER__
+#endif   // JUCE_AUDIOCDBURNER_H_INCLUDED
diff --git a/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h b/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h
index ca703616fa..0e868dba62 100644
--- a/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h
+++ b/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOCDREADER_JUCEHEADER__
-#define __JUCE_AUDIOCDREADER_JUCEHEADER__
+#ifndef JUCE_AUDIOCDREADER_H_INCLUDED
+#define JUCE_AUDIOCDREADER_H_INCLUDED
 
 #if JUCE_USE_CDREADER || DOXYGEN
 
@@ -171,4 +171,4 @@ private:
 };
 
 #endif
-#endif   // __JUCE_AUDIOCDREADER_JUCEHEADER__
+#endif   // JUCE_AUDIOCDREADER_H_INCLUDED
diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
index e6cb4cfafb..6748628214 100644
--- a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
+++ b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIODEVICEMANAGER_JUCEHEADER__
-#define __JUCE_AUDIODEVICEMANAGER_JUCEHEADER__
+#ifndef JUCE_AUDIODEVICEMANAGER_H_INCLUDED
+#define JUCE_AUDIODEVICEMANAGER_H_INCLUDED
 
 #include "juce_AudioIODeviceType.h"
 #include "../midi_io/juce_MidiInput.h"
@@ -511,4 +511,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioDeviceManager)
 };
 
-#endif   // __JUCE_AUDIODEVICEMANAGER_JUCEHEADER__
+#endif   // JUCE_AUDIODEVICEMANAGER_H_INCLUDED
diff --git a/modules/juce_audio_devices/audio_io/juce_AudioIODevice.h b/modules/juce_audio_devices/audio_io/juce_AudioIODevice.h
index 01c0350daf..7028072373 100644
--- a/modules/juce_audio_devices/audio_io/juce_AudioIODevice.h
+++ b/modules/juce_audio_devices/audio_io/juce_AudioIODevice.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOIODEVICE_JUCEHEADER__
-#define __JUCE_AUDIOIODEVICE_JUCEHEADER__
+#ifndef JUCE_AUDIOIODEVICE_H_INCLUDED
+#define JUCE_AUDIOIODEVICE_H_INCLUDED
 
 class AudioIODevice;
 
@@ -329,4 +329,4 @@ protected:
 };
 
 
-#endif   // __JUCE_AUDIOIODEVICE_JUCEHEADER__
+#endif   // JUCE_AUDIOIODEVICE_H_INCLUDED
diff --git a/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h b/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h
index c61505144c..532304de2a 100644
--- a/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h
+++ b/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOIODEVICETYPE_JUCEHEADER__
-#define __JUCE_AUDIOIODEVICETYPE_JUCEHEADER__
+#ifndef JUCE_AUDIOIODEVICETYPE_H_INCLUDED
+#define JUCE_AUDIOIODEVICETYPE_H_INCLUDED
 
 #include "juce_AudioIODevice.h"
 class AudioDeviceManager;
@@ -182,4 +182,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOIODEVICETYPE_JUCEHEADER__
+#endif   // JUCE_AUDIOIODEVICETYPE_H_INCLUDED
diff --git a/modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h b/modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h
index 946b381150..d777249d5a 100644
--- a/modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h
+++ b/modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SYSTEMAUDIOVOLUME_JUCEHEADER__
-#define __JUCE_SYSTEMAUDIOVOLUME_JUCEHEADER__
+#ifndef JUCE_SYSTEMAUDIOVOLUME_H_INCLUDED
+#define JUCE_SYSTEMAUDIOVOLUME_H_INCLUDED
 
 //==============================================================================
 /**
@@ -57,4 +57,4 @@ private:
 };
 
 
-#endif   // __JUCE_SYSTEMAUDIOVOLUME_JUCEHEADER__
+#endif   // JUCE_SYSTEMAUDIOVOLUME_H_INCLUDED
diff --git a/modules/juce_audio_devices/juce_audio_devices.cpp b/modules/juce_audio_devices/juce_audio_devices.cpp
index 114f24a118..b0e65223bf 100644
--- a/modules/juce_audio_devices/juce_audio_devices.cpp
+++ b/modules/juce_audio_devices/juce_audio_devices.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_DEVICES_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_AUDIO_DEVICES_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_audio_devices/juce_audio_devices.h b/modules/juce_audio_devices/juce_audio_devices.h
index f68a4f0b53..91cd3fbf37 100644
--- a/modules/juce_audio_devices/juce_audio_devices.h
+++ b/modules/juce_audio_devices/juce_audio_devices.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIO_DEVICES_JUCEHEADER__
-#define __JUCE_AUDIO_DEVICES_JUCEHEADER__
+#ifndef JUCE_AUDIO_DEVICES_H_INCLUDED
+#define JUCE_AUDIO_DEVICES_H_INCLUDED
 
 #include "../juce_events/juce_events.h"
 #include "../juce_audio_basics/juce_audio_basics.h"
@@ -101,41 +101,19 @@ namespace juce
 {
 
 // START_AUTOINCLUDE audio_io, midi_io, sources, audio_cd
-#ifndef __JUCE_AUDIODEVICEMANAGER_JUCEHEADER__
- #include "audio_io/juce_AudioDeviceManager.h"
-#endif
-#ifndef __JUCE_AUDIOIODEVICE_JUCEHEADER__
- #include "audio_io/juce_AudioIODevice.h"
-#endif
-#ifndef __JUCE_AUDIOIODEVICETYPE_JUCEHEADER__
- #include "audio_io/juce_AudioIODeviceType.h"
-#endif
-#ifndef __JUCE_SYSTEMAUDIOVOLUME_JUCEHEADER__
- #include "audio_io/juce_SystemAudioVolume.h"
-#endif
-#ifndef __JUCE_MIDIINPUT_JUCEHEADER__
- #include "midi_io/juce_MidiInput.h"
-#endif
-#ifndef __JUCE_MIDIMESSAGECOLLECTOR_JUCEHEADER__
- #include "midi_io/juce_MidiMessageCollector.h"
-#endif
-#ifndef __JUCE_MIDIOUTPUT_JUCEHEADER__
- #include "midi_io/juce_MidiOutput.h"
-#endif
-#ifndef __JUCE_AUDIOSOURCEPLAYER_JUCEHEADER__
- #include "sources/juce_AudioSourcePlayer.h"
-#endif
-#ifndef __JUCE_AUDIOTRANSPORTSOURCE_JUCEHEADER__
- #include "sources/juce_AudioTransportSource.h"
-#endif
-#ifndef __JUCE_AUDIOCDBURNER_JUCEHEADER__
- #include "audio_cd/juce_AudioCDBurner.h"
-#endif
-#ifndef __JUCE_AUDIOCDREADER_JUCEHEADER__
- #include "audio_cd/juce_AudioCDReader.h"
-#endif
+#include "audio_io/juce_AudioDeviceManager.h"
+#include "audio_io/juce_AudioIODevice.h"
+#include "audio_io/juce_AudioIODeviceType.h"
+#include "audio_io/juce_SystemAudioVolume.h"
+#include "midi_io/juce_MidiInput.h"
+#include "midi_io/juce_MidiMessageCollector.h"
+#include "midi_io/juce_MidiOutput.h"
+#include "sources/juce_AudioSourcePlayer.h"
+#include "sources/juce_AudioTransportSource.h"
+#include "audio_cd/juce_AudioCDBurner.h"
+#include "audio_cd/juce_AudioCDReader.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_AUDIO_DEVICES_JUCEHEADER__
+#endif   // JUCE_AUDIO_DEVICES_H_INCLUDED
diff --git a/modules/juce_audio_devices/midi_io/juce_MidiInput.h b/modules/juce_audio_devices/midi_io/juce_MidiInput.h
index 674640a55a..630802085b 100644
--- a/modules/juce_audio_devices/midi_io/juce_MidiInput.h
+++ b/modules/juce_audio_devices/midi_io/juce_MidiInput.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIINPUT_JUCEHEADER__
-#define __JUCE_MIDIINPUT_JUCEHEADER__
+#ifndef JUCE_MIDIINPUT_H_INCLUDED
+#define JUCE_MIDIINPUT_H_INCLUDED
 
 class MidiInput;
 
@@ -179,4 +179,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIINPUT_JUCEHEADER__
+#endif   // JUCE_MIDIINPUT_H_INCLUDED
diff --git a/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h b/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h
index 26e1a332e9..4d8ac8fae7 100644
--- a/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h
+++ b/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIMESSAGECOLLECTOR_JUCEHEADER__
-#define __JUCE_MIDIMESSAGECOLLECTOR_JUCEHEADER__
+#ifndef JUCE_MIDIMESSAGECOLLECTOR_H_INCLUDED
+#define JUCE_MIDIMESSAGECOLLECTOR_H_INCLUDED
 
 #include "juce_MidiInput.h"
 
@@ -103,4 +103,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIMESSAGECOLLECTOR_JUCEHEADER__
+#endif   // JUCE_MIDIMESSAGECOLLECTOR_H_INCLUDED
diff --git a/modules/juce_audio_devices/midi_io/juce_MidiOutput.h b/modules/juce_audio_devices/midi_io/juce_MidiOutput.h
index 1f979d3823..c668f8ab22 100644
--- a/modules/juce_audio_devices/midi_io/juce_MidiOutput.h
+++ b/modules/juce_audio_devices/midi_io/juce_MidiOutput.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIOUTPUT_JUCEHEADER__
-#define __JUCE_MIDIOUTPUT_JUCEHEADER__
+#ifndef JUCE_MIDIOUTPUT_H_INCLUDED
+#define JUCE_MIDIOUTPUT_H_INCLUDED
 
 
 //==============================================================================
@@ -144,4 +144,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIOUTPUT_JUCEHEADER__
+#endif   // JUCE_MIDIOUTPUT_H_INCLUDED
diff --git a/modules/juce_audio_devices/native/juce_MidiDataConcatenator.h b/modules/juce_audio_devices/native/juce_MidiDataConcatenator.h
index 1c310d5f72..435e30c4b2 100644
--- a/modules/juce_audio_devices/native/juce_MidiDataConcatenator.h
+++ b/modules/juce_audio_devices/native/juce_MidiDataConcatenator.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIDATACONCATENATOR_JUCEHEADER__
-#define __JUCE_MIDIDATACONCATENATOR_JUCEHEADER__
+#ifndef JUCE_MIDIDATACONCATENATOR_H_INCLUDED
+#define JUCE_MIDIDATACONCATENATOR_H_INCLUDED
 
 //==============================================================================
 /**
@@ -172,4 +172,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE (MidiDataConcatenator)
 };
 
-#endif   // __JUCE_MIDIDATACONCATENATOR_JUCEHEADER__
+#endif   // JUCE_MIDIDATACONCATENATOR_H_INCLUDED
diff --git a/modules/juce_audio_devices/sources/juce_AudioSourcePlayer.h b/modules/juce_audio_devices/sources/juce_AudioSourcePlayer.h
index 8d8be3c7c8..badd6519a5 100644
--- a/modules/juce_audio_devices/sources/juce_AudioSourcePlayer.h
+++ b/modules/juce_audio_devices/sources/juce_AudioSourcePlayer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOSOURCEPLAYER_JUCEHEADER__
-#define __JUCE_AUDIOSOURCEPLAYER_JUCEHEADER__
+#ifndef JUCE_AUDIOSOURCEPLAYER_H_INCLUDED
+#define JUCE_AUDIOSOURCEPLAYER_H_INCLUDED
 
 
 //==============================================================================
@@ -113,4 +113,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOSOURCEPLAYER_JUCEHEADER__
+#endif   // JUCE_AUDIOSOURCEPLAYER_H_INCLUDED
diff --git a/modules/juce_audio_devices/sources/juce_AudioTransportSource.h b/modules/juce_audio_devices/sources/juce_AudioTransportSource.h
index 2af1f7b1a4..316cf2d001 100644
--- a/modules/juce_audio_devices/sources/juce_AudioTransportSource.h
+++ b/modules/juce_audio_devices/sources/juce_AudioTransportSource.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOTRANSPORTSOURCE_JUCEHEADER__
-#define __JUCE_AUDIOTRANSPORTSOURCE_JUCEHEADER__
+#ifndef JUCE_AUDIOTRANSPORTSOURCE_H_INCLUDED
+#define JUCE_AUDIOTRANSPORTSOURCE_H_INCLUDED
 
 
 //==============================================================================
@@ -183,4 +183,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOTRANSPORTSOURCE_JUCEHEADER__
+#endif   // JUCE_AUDIOTRANSPORTSOURCE_H_INCLUDED
diff --git a/modules/juce_audio_formats/format/juce_AudioFormat.h b/modules/juce_audio_formats/format/juce_AudioFormat.h
index 6c801460cb..88fec791da 100644
--- a/modules/juce_audio_formats/format/juce_AudioFormat.h
+++ b/modules/juce_audio_formats/format/juce_AudioFormat.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOFORMAT_JUCEHEADER__
-#define __JUCE_AUDIOFORMAT_JUCEHEADER__
+#ifndef JUCE_AUDIOFORMAT_H_INCLUDED
+#define JUCE_AUDIOFORMAT_H_INCLUDED
 
 #include "juce_AudioFormatReader.h"
 #include "juce_AudioFormatWriter.h"
@@ -175,4 +175,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOFORMAT_JUCEHEADER__
+#endif   // JUCE_AUDIOFORMAT_H_INCLUDED
diff --git a/modules/juce_audio_formats/format/juce_AudioFormatManager.h b/modules/juce_audio_formats/format/juce_AudioFormatManager.h
index fa15564879..3a9d58b086 100644
--- a/modules/juce_audio_formats/format/juce_AudioFormatManager.h
+++ b/modules/juce_audio_formats/format/juce_AudioFormatManager.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOFORMATMANAGER_JUCEHEADER__
-#define __JUCE_AUDIOFORMATMANAGER_JUCEHEADER__
+#ifndef JUCE_AUDIOFORMATMANAGER_H_INCLUDED
+#define JUCE_AUDIOFORMATMANAGER_H_INCLUDED
 
 #include "juce_AudioFormat.h"
 
@@ -142,4 +142,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOFORMATMANAGER_JUCEHEADER__
+#endif   // JUCE_AUDIOFORMATMANAGER_H_INCLUDED
diff --git a/modules/juce_audio_formats/format/juce_AudioFormatReader.h b/modules/juce_audio_formats/format/juce_AudioFormatReader.h
index 9b186487d2..4031c8cc45 100644
--- a/modules/juce_audio_formats/format/juce_AudioFormatReader.h
+++ b/modules/juce_audio_formats/format/juce_AudioFormatReader.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOFORMATREADER_JUCEHEADER__
-#define __JUCE_AUDIOFORMATREADER_JUCEHEADER__
+#ifndef JUCE_AUDIOFORMATREADER_H_INCLUDED
+#define JUCE_AUDIOFORMATREADER_H_INCLUDED
 
 class AudioFormat;
 
@@ -283,4 +283,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOFORMATREADER_JUCEHEADER__
+#endif   // JUCE_AUDIOFORMATREADER_H_INCLUDED
diff --git a/modules/juce_audio_formats/format/juce_AudioFormatReaderSource.h b/modules/juce_audio_formats/format/juce_AudioFormatReaderSource.h
index 8b77718375..0334350888 100644
--- a/modules/juce_audio_formats/format/juce_AudioFormatReaderSource.h
+++ b/modules/juce_audio_formats/format/juce_AudioFormatReaderSource.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOFORMATREADERSOURCE_JUCEHEADER__
-#define __JUCE_AUDIOFORMATREADERSOURCE_JUCEHEADER__
+#ifndef JUCE_AUDIOFORMATREADERSOURCE_H_INCLUDED
+#define JUCE_AUDIOFORMATREADERSOURCE_H_INCLUDED
 
 
 //==============================================================================
@@ -97,4 +97,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOFORMATREADERSOURCE_JUCEHEADER__
+#endif   // JUCE_AUDIOFORMATREADERSOURCE_H_INCLUDED
diff --git a/modules/juce_audio_formats/format/juce_AudioFormatWriter.h b/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
index c7a2e9cb45..3d4594ddaa 100644
--- a/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
+++ b/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOFORMATWRITER_JUCEHEADER__
-#define __JUCE_AUDIOFORMATWRITER_JUCEHEADER__
+#ifndef JUCE_AUDIOFORMATWRITER_H_INCLUDED
+#define JUCE_AUDIOFORMATWRITER_H_INCLUDED
 
 #include "juce_AudioFormatReader.h"
 
@@ -258,4 +258,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioFormatWriter)
 };
 
-#endif   // __JUCE_AUDIOFORMATWRITER_JUCEHEADER__
+#endif   // JUCE_AUDIOFORMATWRITER_H_INCLUDED
diff --git a/modules/juce_audio_formats/format/juce_AudioSubsectionReader.h b/modules/juce_audio_formats/format/juce_AudioSubsectionReader.h
index 668dc73f5a..b1f8d9ab4a 100644
--- a/modules/juce_audio_formats/format/juce_AudioSubsectionReader.h
+++ b/modules/juce_audio_formats/format/juce_AudioSubsectionReader.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOSUBSECTIONREADER_JUCEHEADER__
-#define __JUCE_AUDIOSUBSECTIONREADER_JUCEHEADER__
+#ifndef JUCE_AUDIOSUBSECTIONREADER_H_INCLUDED
+#define JUCE_AUDIOSUBSECTIONREADER_H_INCLUDED
 
 #include "juce_AudioFormatReader.h"
 
@@ -86,4 +86,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioSubsectionReader)
 };
 
-#endif   // __JUCE_AUDIOSUBSECTIONREADER_JUCEHEADER__
+#endif   // JUCE_AUDIOSUBSECTIONREADER_H_INCLUDED
diff --git a/modules/juce_audio_formats/format/juce_BufferingAudioFormatReader.h b/modules/juce_audio_formats/format/juce_BufferingAudioFormatReader.h
index fba01e86ed..5f66c037ca 100644
--- a/modules/juce_audio_formats/format/juce_BufferingAudioFormatReader.h
+++ b/modules/juce_audio_formats/format/juce_BufferingAudioFormatReader.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BUFFERINGAUDIOFORMATREADER_JUCEHEADER__
-#define __JUCE_BUFFERINGAUDIOFORMATREADER_JUCEHEADER__
+#ifndef JUCE_BUFFERINGAUDIOFORMATREADER_H_INCLUDED
+#define JUCE_BUFFERINGAUDIOFORMATREADER_H_INCLUDED
 
 //==============================================================================
 /**
@@ -90,4 +90,4 @@ private:
 };
 
 
-#endif   // __JUCE_BUFFERINGAUDIOFORMATREADER_JUCEHEADER__
+#endif   // JUCE_BUFFERINGAUDIOFORMATREADER_H_INCLUDED
diff --git a/modules/juce_audio_formats/format/juce_MemoryMappedAudioFormatReader.h b/modules/juce_audio_formats/format/juce_MemoryMappedAudioFormatReader.h
index d7b9ad3900..37103daed6 100644
--- a/modules/juce_audio_formats/format/juce_MemoryMappedAudioFormatReader.h
+++ b/modules/juce_audio_formats/format/juce_MemoryMappedAudioFormatReader.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MEMORYMAPPEDAUDIOFORMATREADER_JUCEHEADER__
-#define __JUCE_MEMORYMAPPEDAUDIOFORMATREADER_JUCEHEADER__
+#ifndef JUCE_MEMORYMAPPEDAUDIOFORMATREADER_H_INCLUDED
+#define JUCE_MEMORYMAPPEDAUDIOFORMATREADER_H_INCLUDED
 
 //==============================================================================
 /**
@@ -102,4 +102,4 @@ protected:
 };
 
 
-#endif   // __JUCE_MEMORYMAPPEDAUDIOFORMATREADER_JUCEHEADER__
+#endif   // JUCE_MEMORYMAPPEDAUDIOFORMATREADER_H_INCLUDED
diff --git a/modules/juce_audio_formats/juce_audio_formats.cpp b/modules/juce_audio_formats/juce_audio_formats.cpp
index b78d381d32..b68042ff6e 100644
--- a/modules/juce_audio_formats/juce_audio_formats.cpp
+++ b/modules/juce_audio_formats/juce_audio_formats.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_FORMATS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_AUDIO_FORMATS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_audio_formats/juce_audio_formats.h b/modules/juce_audio_formats/juce_audio_formats.h
index 18dbe801c9..40e979e142 100644
--- a/modules/juce_audio_formats/juce_audio_formats.h
+++ b/modules/juce_audio_formats/juce_audio_formats.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIO_FORMATS_JUCEHEADER__
-#define __JUCE_AUDIO_FORMATS_JUCEHEADER__
+#ifndef JUCE_AUDIO_FORMATS_H_INCLUDED
+#define JUCE_AUDIO_FORMATS_H_INCLUDED
 
 #include "../juce_audio_basics/juce_audio_basics.h"
 
@@ -86,30 +86,14 @@ namespace juce
 {
 
 // START_AUTOINCLUDE format, codecs, sampler
-#ifndef __JUCE_AUDIOFORMAT_JUCEHEADER__
- #include "format/juce_AudioFormat.h"
-#endif
-#ifndef __JUCE_AUDIOFORMATMANAGER_JUCEHEADER__
- #include "format/juce_AudioFormatManager.h"
-#endif
-#ifndef __JUCE_AUDIOFORMATREADER_JUCEHEADER__
- #include "format/juce_AudioFormatReader.h"
-#endif
-#ifndef __JUCE_AUDIOFORMATREADERSOURCE_JUCEHEADER__
- #include "format/juce_AudioFormatReaderSource.h"
-#endif
-#ifndef __JUCE_AUDIOFORMATWRITER_JUCEHEADER__
- #include "format/juce_AudioFormatWriter.h"
-#endif
-#ifndef __JUCE_AUDIOSUBSECTIONREADER_JUCEHEADER__
- #include "format/juce_AudioSubsectionReader.h"
-#endif
-#ifndef __JUCE_BUFFERINGAUDIOFORMATREADER_JUCEHEADER__
- #include "format/juce_BufferingAudioFormatReader.h"
-#endif
-#ifndef __JUCE_MEMORYMAPPEDAUDIOFORMATREADER_JUCEHEADER__
- #include "format/juce_MemoryMappedAudioFormatReader.h"
-#endif
+#include "format/juce_AudioFormat.h"
+#include "format/juce_AudioFormatManager.h"
+#include "format/juce_AudioFormatReader.h"
+#include "format/juce_AudioFormatReaderSource.h"
+#include "format/juce_AudioFormatWriter.h"
+#include "format/juce_AudioSubsectionReader.h"
+#include "format/juce_BufferingAudioFormatReader.h"
+#include "format/juce_MemoryMappedAudioFormatReader.h"
 #include "codecs/juce_AiffAudioFormat.h"
 #include "codecs/juce_CoreAudioFormat.h"
 #include "codecs/juce_FlacAudioFormat.h"
@@ -119,11 +103,9 @@ namespace juce
 #include "codecs/juce_QuickTimeAudioFormat.h"
 #include "codecs/juce_WavAudioFormat.h"
 #include "codecs/juce_WindowsMediaAudioFormat.h"
-#ifndef __JUCE_SAMPLER_JUCEHEADER__
- #include "sampler/juce_Sampler.h"
-#endif
+#include "sampler/juce_Sampler.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_AUDIO_FORMATS_JUCEHEADER__
+#endif   // JUCE_AUDIO_FORMATS_H_INCLUDED
diff --git a/modules/juce_audio_formats/sampler/juce_Sampler.h b/modules/juce_audio_formats/sampler/juce_Sampler.h
index f51f01f4df..9a981fd590 100644
--- a/modules/juce_audio_formats/sampler/juce_Sampler.h
+++ b/modules/juce_audio_formats/sampler/juce_Sampler.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SAMPLER_JUCEHEADER__
-#define __JUCE_SAMPLER_JUCEHEADER__
+#ifndef JUCE_SAMPLER_H_INCLUDED
+#define JUCE_SAMPLER_H_INCLUDED
 
 
 //==============================================================================
@@ -150,4 +150,4 @@ private:
 };
 
 
-#endif   // __JUCE_SAMPLER_JUCEHEADER__
+#endif   // JUCE_SAMPLER_H_INCLUDED
diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h
index 83a22a747d..2fe0e202ff 100644
--- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h
+++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RTAS_DIGICODE_HEADER_JUCEHEADER__
-#define __JUCE_RTAS_DIGICODE_HEADER_JUCEHEADER__
+#ifndef JUCE_RTAS_DIGICODE_HEADER_H_INCLUDED
+#define JUCE_RTAS_DIGICODE_HEADER_H_INCLUDED
 
 #if JucePlugin_Build_RTAS
 
@@ -70,4 +70,4 @@
 #endif
 #endif
 
-#endif   // __JUCE_RTAS_DIGICODE_HEADER_JUCEHEADER__
+#endif   // JUCE_RTAS_DIGICODE_HEADER_H_INCLUDED
diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h
index ffb2165c5d..87bc9a99fb 100644
--- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h
+++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_STANDALONEFILTERWINDOW_JUCEHEADER__
-#define __JUCE_STANDALONEFILTERWINDOW_JUCEHEADER__
+#ifndef JUCE_STANDALONEFILTERWINDOW_H_INCLUDED
+#define JUCE_STANDALONEFILTERWINDOW_H_INCLUDED
 
 extern AudioProcessor* JUCE_CALLTYPE createPluginFilter();
 
@@ -301,4 +301,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (StandaloneFilterWindow)
 };
 
-#endif   // __JUCE_STANDALONEFILTERWINDOW_JUCEHEADER__
+#endif   // JUCE_STANDALONEFILTERWINDOW_H_INCLUDED
diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client.h b/modules/juce_audio_plugin_client/juce_audio_plugin_client.h
index 9c90f6fcf7..c9901b76b6 100644
--- a/modules/juce_audio_plugin_client/juce_audio_plugin_client.h
+++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client.h
@@ -22,12 +22,12 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIO_PLUGIN_CLIENT_JUCEHEADER__
-#define __JUCE_AUDIO_PLUGIN_CLIENT_JUCEHEADER__
+#ifndef JUCE_AUDIO_PLUGIN_CLIENT_H_INCLUDED
+#define JUCE_AUDIO_PLUGIN_CLIENT_H_INCLUDED
 
 #include "../juce_gui_basics/juce_gui_basics.h"
 #include "../juce_audio_basics/juce_audio_basics.h"
 #include "../juce_audio_processors/juce_audio_processors.h"
 #include "utility/juce_CheckSettingMacros.h"
 
-#endif   // __JUCE_AUDIO_PLUGIN_CLIENT_JUCEHEADER__
+#endif   // JUCE_AUDIO_PLUGIN_CLIENT_H_INCLUDED
diff --git a/modules/juce_audio_plugin_client/utility/juce_CarbonVisibility.h b/modules/juce_audio_plugin_client/utility/juce_CarbonVisibility.h
index 5bf37d538f..cef7e6035b 100644
--- a/modules/juce_audio_plugin_client/utility/juce_CarbonVisibility.h
+++ b/modules/juce_audio_plugin_client/utility/juce_CarbonVisibility.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CARBONVISIBILITY_JUCEHEADER__
-#define __JUCE_CARBONVISIBILITY_JUCEHEADER__
+#ifndef JUCE_CARBONVISIBILITY_H_INCLUDED
+#define JUCE_CARBONVISIBILITY_H_INCLUDED
 
 //==============================================================================
 #if JUCE_SUPPORT_CARBON && JUCE_MAC_WINDOW_VISIBITY_BODGE
@@ -76,4 +76,4 @@ static void removeWindowHidingHooks (Component* comp)
  static void removeWindowHidingHooks (void*) {}
 #endif
 
-#endif   // __JUCE_CARBONVISIBILITY_JUCEHEADER__
+#endif   // JUCE_CARBONVISIBILITY_H_INCLUDED
diff --git a/modules/juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h b/modules/juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h
index b2cae5e09d..4b374cd6b4 100644
--- a/modules/juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h
+++ b/modules/juce_audio_plugin_client/utility/juce_FakeMouseMoveGenerator.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FAKEMOUSEMOVEGENERATOR_JUCEHEADER__
-#define __JUCE_FAKEMOUSEMOVEGENERATOR_JUCEHEADER__
+#ifndef JUCE_FAKEMOUSEMOVEGENERATOR_H_INCLUDED
+#define JUCE_FAKEMOUSEMOVEGENERATOR_H_INCLUDED
 
 #if JUCE_MAC && JUCE_SUPPORT_CARBON
 
@@ -63,4 +63,4 @@ private:
 struct FakeMouseMoveGenerator {};
 #endif
 
-#endif   // __JUCE_FAKEMOUSEMOVEGENERATOR_JUCEHEADER__
+#endif   // JUCE_FAKEMOUSEMOVEGENERATOR_H_INCLUDED
diff --git a/modules/juce_audio_processors/format/juce_AudioPluginFormat.h b/modules/juce_audio_processors/format/juce_AudioPluginFormat.h
index 2b14d36140..478715a1f3 100644
--- a/modules/juce_audio_processors/format/juce_AudioPluginFormat.h
+++ b/modules/juce_audio_processors/format/juce_AudioPluginFormat.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPLUGINFORMAT_JUCEHEADER__
-#define __JUCE_AUDIOPLUGINFORMAT_JUCEHEADER__
+#ifndef JUCE_AUDIOPLUGINFORMAT_H_INCLUDED
+#define JUCE_AUDIOPLUGINFORMAT_H_INCLUDED
 
 #include "../processors/juce_AudioPluginInstance.h"
 class PluginDescription;
@@ -110,4 +110,4 @@ protected:
 };
 
 
-#endif   // __JUCE_AUDIOPLUGINFORMAT_JUCEHEADER__
+#endif   // JUCE_AUDIOPLUGINFORMAT_H_INCLUDED
diff --git a/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.h b/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.h
index d500133d5d..b62b2ef559 100644
--- a/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.h
+++ b/modules/juce_audio_processors/format/juce_AudioPluginFormatManager.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPLUGINFORMATMANAGER_JUCEHEADER__
-#define __JUCE_AUDIOPLUGINFORMATMANAGER_JUCEHEADER__
+#ifndef JUCE_AUDIOPLUGINFORMATMANAGER_H_INCLUDED
+#define JUCE_AUDIOPLUGINFORMATMANAGER_H_INCLUDED
 
 #include "juce_AudioPluginFormat.h"
 
@@ -96,4 +96,4 @@ private:
 
 
 
-#endif   // __JUCE_AUDIOPLUGINFORMATMANAGER_JUCEHEADER__
+#endif   // JUCE_AUDIOPLUGINFORMATMANAGER_H_INCLUDED
diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h
index 2a45ba89cb..a7e57f74aa 100644
--- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h
+++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOUNITPLUGINFORMAT_JUCEHEADER__
-#define __JUCE_AUDIOUNITPLUGINFORMAT_JUCEHEADER__
+#ifndef JUCE_AUDIOUNITPLUGINFORMAT_H_INCLUDED
+#define JUCE_AUDIOUNITPLUGINFORMAT_H_INCLUDED
 
 #include "../format/juce_AudioPluginFormat.h"
 
@@ -59,4 +59,4 @@ private:
 
 #endif
 
-#endif   // __JUCE_AUDIOUNITPLUGINFORMAT_JUCEHEADER__
+#endif   // JUCE_AUDIOUNITPLUGINFORMAT_H_INCLUDED
diff --git a/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.h b/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.h
index 9da1450cdd..99dbf53e9c 100644
--- a/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.h
+++ b/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LADSPAPLUGINFORMAT_JUCEHEADER__
-#define __JUCE_LADSPAPLUGINFORMAT_JUCEHEADER__
+#ifndef JUCE_LADSPAPLUGINFORMAT_H_INCLUDED
+#define JUCE_LADSPAPLUGINFORMAT_H_INCLUDED
 
 #include "../format/juce_AudioPluginFormat.h"
 
@@ -61,4 +61,4 @@ private:
 
 #endif
 
-#endif   // __JUCE_LADSPAPLUGINFORMAT_JUCEHEADER__
+#endif   // JUCE_LADSPAPLUGINFORMAT_H_INCLUDED
diff --git a/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h b/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h
index 219764b2cd..33372726bc 100644
--- a/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h
+++ b/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h
@@ -24,8 +24,8 @@
 
 #ifdef __aeffect__
 
-#ifndef __JUCE_VSTMIDIEVENTLIST_JUCEHEADER__
-#define __JUCE_VSTMIDIEVENTLIST_JUCEHEADER__
+#ifndef JUCE_VSTMIDIEVENTLIST_H_INCLUDED
+#define JUCE_VSTMIDIEVENTLIST_H_INCLUDED
 
 
 //==============================================================================
@@ -185,5 +185,5 @@ private:
 };
 
 
-#endif   // __JUCE_VSTMIDIEVENTLIST_JUCEHEADER__
-#endif   // __JUCE_VSTMIDIEVENTLIST_JUCEHEADER__
+#endif   // JUCE_VSTMIDIEVENTLIST_H_INCLUDED
+#endif
diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.h b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.h
index 40136381e7..d248eb029f 100644
--- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.h
+++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_VSTPLUGINFORMAT_JUCEHEADER__
-#define __JUCE_VSTPLUGINFORMAT_JUCEHEADER__
+#ifndef JUCE_VSTPLUGINFORMAT_H_INCLUDED
+#define JUCE_VSTPLUGINFORMAT_H_INCLUDED
 
 #include "../format/juce_AudioPluginFormat.h"
 
@@ -99,4 +99,4 @@ private:
 
 
 #endif
-#endif   // __JUCE_VSTPLUGINFORMAT_JUCEHEADER__
+#endif   // JUCE_VSTPLUGINFORMAT_H_INCLUDED
diff --git a/modules/juce_audio_processors/juce_audio_processors.cpp b/modules/juce_audio_processors/juce_audio_processors.cpp
index ad9b0639c6..293c231fa4 100644
--- a/modules/juce_audio_processors/juce_audio_processors.cpp
+++ b/modules/juce_audio_processors/juce_audio_processors.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_PROCESSORS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_AUDIO_PROCESSORS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_audio_processors/juce_audio_processors.h b/modules/juce_audio_processors/juce_audio_processors.h
index ed68be7f69..7efc3617c3 100644
--- a/modules/juce_audio_processors/juce_audio_processors.h
+++ b/modules/juce_audio_processors/juce_audio_processors.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIO_PROCESSORS_JUCEHEADER__
-#define __JUCE_AUDIO_PROCESSORS_JUCEHEADER__
+#ifndef JUCE_AUDIO_PROCESSORS_H_INCLUDED
+#define JUCE_AUDIO_PROCESSORS_H_INCLUDED
 
 #include "../juce_gui_basics/juce_gui_basics.h"
 #include "../juce_audio_basics/juce_audio_basics.h"
@@ -65,57 +65,25 @@ namespace juce
 {
 
 // START_AUTOINCLUDE processors, format, format_types, scanning
-#ifndef __JUCE_AUDIOPLAYHEAD_JUCEHEADER__
- #include "processors/juce_AudioPlayHead.h"
-#endif
-#ifndef __JUCE_AUDIOPLUGININSTANCE_JUCEHEADER__
- #include "processors/juce_AudioPluginInstance.h"
-#endif
-#ifndef __JUCE_AUDIOPROCESSOR_JUCEHEADER__
- #include "processors/juce_AudioProcessor.h"
-#endif
-#ifndef __JUCE_AUDIOPROCESSOREDITOR_JUCEHEADER__
- #include "processors/juce_AudioProcessorEditor.h"
-#endif
-#ifndef __JUCE_AUDIOPROCESSORGRAPH_JUCEHEADER__
- #include "processors/juce_AudioProcessorGraph.h"
-#endif
-#ifndef __JUCE_AUDIOPROCESSORLISTENER_JUCEHEADER__
- #include "processors/juce_AudioProcessorListener.h"
-#endif
-#ifndef __JUCE_GENERICAUDIOPROCESSOREDITOR_JUCEHEADER__
- #include "processors/juce_GenericAudioProcessorEditor.h"
-#endif
-#ifndef __JUCE_PLUGINDESCRIPTION_JUCEHEADER__
- #include "processors/juce_PluginDescription.h"
-#endif
-#ifndef __JUCE_AUDIOPLUGINFORMAT_JUCEHEADER__
- #include "format/juce_AudioPluginFormat.h"
-#endif
-#ifndef __JUCE_AUDIOPLUGINFORMATMANAGER_JUCEHEADER__
- #include "format/juce_AudioPluginFormatManager.h"
-#endif
-#ifndef __JUCE_AUDIOUNITPLUGINFORMAT_JUCEHEADER__
- #include "format_types/juce_AudioUnitPluginFormat.h"
-#endif
-#ifndef __JUCE_LADSPAPLUGINFORMAT_JUCEHEADER__
- #include "format_types/juce_LADSPAPluginFormat.h"
-#endif
+#include "processors/juce_AudioPlayHead.h"
+#include "processors/juce_AudioPluginInstance.h"
+#include "processors/juce_AudioProcessor.h"
+#include "processors/juce_AudioProcessorEditor.h"
+#include "processors/juce_AudioProcessorGraph.h"
+#include "processors/juce_AudioProcessorListener.h"
+#include "processors/juce_GenericAudioProcessorEditor.h"
+#include "processors/juce_PluginDescription.h"
+#include "format/juce_AudioPluginFormat.h"
+#include "format/juce_AudioPluginFormatManager.h"
+#include "format_types/juce_AudioUnitPluginFormat.h"
+#include "format_types/juce_LADSPAPluginFormat.h"
 #include "format_types/juce_VSTMidiEventList.h"
-#ifndef __JUCE_VSTPLUGINFORMAT_JUCEHEADER__
- #include "format_types/juce_VSTPluginFormat.h"
-#endif
-#ifndef __JUCE_KNOWNPLUGINLIST_JUCEHEADER__
- #include "scanning/juce_KnownPluginList.h"
-#endif
-#ifndef __JUCE_PLUGINDIRECTORYSCANNER_JUCEHEADER__
- #include "scanning/juce_PluginDirectoryScanner.h"
-#endif
-#ifndef __JUCE_PLUGINLISTCOMPONENT_JUCEHEADER__
- #include "scanning/juce_PluginListComponent.h"
-#endif
+#include "format_types/juce_VSTPluginFormat.h"
+#include "scanning/juce_KnownPluginList.h"
+#include "scanning/juce_PluginDirectoryScanner.h"
+#include "scanning/juce_PluginListComponent.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_AUDIO_PROCESSORS_JUCEHEADER__
+#endif   // JUCE_AUDIO_PROCESSORS_H_INCLUDED
diff --git a/modules/juce_audio_processors/processors/juce_AudioPlayHead.h b/modules/juce_audio_processors/processors/juce_AudioPlayHead.h
index 17af3cf0d9..b92b802f92 100644
--- a/modules/juce_audio_processors/processors/juce_AudioPlayHead.h
+++ b/modules/juce_audio_processors/processors/juce_AudioPlayHead.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPLAYHEAD_JUCEHEADER__
-#define __JUCE_AUDIOPLAYHEAD_JUCEHEADER__
+#ifndef JUCE_AUDIOPLAYHEAD_H_INCLUDED
+#define JUCE_AUDIOPLAYHEAD_H_INCLUDED
 
 
 //==============================================================================
@@ -137,4 +137,4 @@ public:
 };
 
 
-#endif   // __JUCE_AUDIOPLAYHEAD_JUCEHEADER__
+#endif   // JUCE_AUDIOPLAYHEAD_H_INCLUDED
diff --git a/modules/juce_audio_processors/processors/juce_AudioPluginInstance.h b/modules/juce_audio_processors/processors/juce_AudioPluginInstance.h
index 67d64731db..b5e8466489 100644
--- a/modules/juce_audio_processors/processors/juce_AudioPluginInstance.h
+++ b/modules/juce_audio_processors/processors/juce_AudioPluginInstance.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPLUGININSTANCE_JUCEHEADER__
-#define __JUCE_AUDIOPLUGININSTANCE_JUCEHEADER__
+#ifndef JUCE_AUDIOPLUGININSTANCE_H_INCLUDED
+#define JUCE_AUDIOPLUGININSTANCE_H_INCLUDED
 
 #include "../processors/juce_AudioProcessor.h"
 #include "juce_PluginDescription.h"
@@ -72,4 +72,4 @@ protected:
 };
 
 
-#endif   // __JUCE_AUDIOPLUGININSTANCE_JUCEHEADER__
+#endif   // JUCE_AUDIOPLUGININSTANCE_H_INCLUDED
diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h
index 748c5cdeab..b4b39b7757 100644
--- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h
+++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPROCESSOR_JUCEHEADER__
-#define __JUCE_AUDIOPROCESSOR_JUCEHEADER__
+#ifndef JUCE_AUDIOPROCESSOR_H_INCLUDED
+#define JUCE_AUDIOPROCESSOR_H_INCLUDED
 
 #include "juce_AudioProcessorEditor.h"
 #include "juce_AudioProcessorListener.h"
@@ -641,4 +641,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOPROCESSOR_JUCEHEADER__
+#endif   // JUCE_AUDIOPROCESSOR_H_INCLUDED
diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
index d021fc52bf..8064110dd0 100644
--- a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
+++ b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPROCESSOREDITOR_JUCEHEADER__
-#define __JUCE_AUDIOPROCESSOREDITOR_JUCEHEADER__
+#ifndef JUCE_AUDIOPROCESSOREDITOR_H_INCLUDED
+#define JUCE_AUDIOPROCESSOREDITOR_H_INCLUDED
 
 class AudioProcessor;
 
@@ -63,4 +63,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOPROCESSOREDITOR_JUCEHEADER__
+#endif   // JUCE_AUDIOPROCESSOREDITOR_H_INCLUDED
diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h
index f0cf0c4ded..c04017e17d 100644
--- a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h
+++ b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPROCESSORGRAPH_JUCEHEADER__
-#define __JUCE_AUDIOPROCESSORGRAPH_JUCEHEADER__
+#ifndef JUCE_AUDIOPROCESSORGRAPH_H_INCLUDED
+#define JUCE_AUDIOPROCESSORGRAPH_H_INCLUDED
 
 #include "juce_AudioProcessor.h"
 #include "../format/juce_AudioPluginFormatManager.h"
@@ -414,4 +414,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOPROCESSORGRAPH_JUCEHEADER__
+#endif   // JUCE_AUDIOPROCESSORGRAPH_H_INCLUDED
diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorListener.h b/modules/juce_audio_processors/processors/juce_AudioProcessorListener.h
index d24c2819b3..a7d019c098 100644
--- a/modules/juce_audio_processors/processors/juce_AudioProcessorListener.h
+++ b/modules/juce_audio_processors/processors/juce_AudioProcessorListener.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPROCESSORLISTENER_JUCEHEADER__
-#define __JUCE_AUDIOPROCESSORLISTENER_JUCEHEADER__
+#ifndef JUCE_AUDIOPROCESSORLISTENER_H_INCLUDED
+#define JUCE_AUDIOPROCESSORLISTENER_H_INCLUDED
 
 class AudioProcessor;
 
@@ -104,4 +104,4 @@ public:
                                                           int parameterIndex);
 };
 
-#endif   // __JUCE_AUDIOPROCESSORLISTENER_JUCEHEADER__
+#endif   // JUCE_AUDIOPROCESSORLISTENER_H_INCLUDED
diff --git a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h
index 4c3f8be0d1..2506ac41d3 100644
--- a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h
+++ b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_GENERICAUDIOPROCESSOREDITOR_JUCEHEADER__
-#define __JUCE_GENERICAUDIOPROCESSOREDITOR_JUCEHEADER__
+#ifndef JUCE_GENERICAUDIOPROCESSOREDITOR_H_INCLUDED
+#define JUCE_GENERICAUDIOPROCESSOREDITOR_H_INCLUDED
 
 #include "juce_AudioProcessorEditor.h"
 
@@ -57,4 +57,4 @@ private:
 };
 
 
-#endif   // __JUCE_GENERICAUDIOPROCESSOREDITOR_JUCEHEADER__
+#endif   // JUCE_GENERICAUDIOPROCESSOREDITOR_H_INCLUDED
diff --git a/modules/juce_audio_processors/processors/juce_PluginDescription.h b/modules/juce_audio_processors/processors/juce_PluginDescription.h
index 257bbd79e8..8d6c7e47bc 100644
--- a/modules/juce_audio_processors/processors/juce_PluginDescription.h
+++ b/modules/juce_audio_processors/processors/juce_PluginDescription.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PLUGINDESCRIPTION_JUCEHEADER__
-#define __JUCE_PLUGINDESCRIPTION_JUCEHEADER__
+#ifndef JUCE_PLUGINDESCRIPTION_H_INCLUDED
+#define JUCE_PLUGINDESCRIPTION_H_INCLUDED
 
 
 //==============================================================================
@@ -139,4 +139,4 @@ private:
 };
 
 
-#endif   // __JUCE_PLUGINDESCRIPTION_JUCEHEADER__
+#endif   // JUCE_PLUGINDESCRIPTION_H_INCLUDED
diff --git a/modules/juce_audio_processors/scanning/juce_KnownPluginList.h b/modules/juce_audio_processors/scanning/juce_KnownPluginList.h
index 5ea4d2587e..db4966a3e6 100644
--- a/modules/juce_audio_processors/scanning/juce_KnownPluginList.h
+++ b/modules/juce_audio_processors/scanning/juce_KnownPluginList.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_KNOWNPLUGINLIST_JUCEHEADER__
-#define __JUCE_KNOWNPLUGINLIST_JUCEHEADER__
+#ifndef JUCE_KNOWNPLUGINLIST_H_INCLUDED
+#define JUCE_KNOWNPLUGINLIST_H_INCLUDED
 
 #include "../processors/juce_PluginDescription.h"
 #include "../format/juce_AudioPluginFormat.h"
@@ -207,4 +207,4 @@ private:
 };
 
 
-#endif   // __JUCE_KNOWNPLUGINLIST_JUCEHEADER__
+#endif   // JUCE_KNOWNPLUGINLIST_H_INCLUDED
diff --git a/modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.h b/modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.h
index 2e06cb7a22..e271e2eb99 100644
--- a/modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.h
+++ b/modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PLUGINDIRECTORYSCANNER_JUCEHEADER__
-#define __JUCE_PLUGINDIRECTORYSCANNER_JUCEHEADER__
+#ifndef JUCE_PLUGINDIRECTORYSCANNER_H_INCLUDED
+#define JUCE_PLUGINDIRECTORYSCANNER_H_INCLUDED
 
 #include "juce_KnownPluginList.h"
 #include "../format/juce_AudioPluginFormatManager.h"
@@ -127,4 +127,4 @@ private:
 };
 
 
-#endif   // __JUCE_PLUGINDIRECTORYSCANNER_JUCEHEADER__
+#endif   // JUCE_PLUGINDIRECTORYSCANNER_H_INCLUDED
diff --git a/modules/juce_audio_processors/scanning/juce_PluginListComponent.h b/modules/juce_audio_processors/scanning/juce_PluginListComponent.h
index a1c8eeb136..8c4322a0e3 100644
--- a/modules/juce_audio_processors/scanning/juce_PluginListComponent.h
+++ b/modules/juce_audio_processors/scanning/juce_PluginListComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PLUGINLISTCOMPONENT_JUCEHEADER__
-#define __JUCE_PLUGINLISTCOMPONENT_JUCEHEADER__
+#ifndef JUCE_PLUGINLISTCOMPONENT_H_INCLUDED
+#define JUCE_PLUGINLISTCOMPONENT_H_INCLUDED
 
 #include "juce_KnownPluginList.h"
 #include "../format/juce_AudioPluginFormat.h"
@@ -122,4 +122,4 @@ private:
 };
 
 
-#endif   // __JUCE_PLUGINLISTCOMPONENT_JUCEHEADER__
+#endif   // JUCE_PLUGINLISTCOMPONENT_H_INCLUDED
diff --git a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h
index 51989d339b..8a6eb88063 100644
--- a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h
+++ b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIODEVICESELECTORCOMPONENT_JUCEHEADER__
-#define __JUCE_AUDIODEVICESELECTORCOMPONENT_JUCEHEADER__
+#ifndef JUCE_AUDIODEVICESELECTORCOMPONENT_H_INCLUDED
+#define JUCE_AUDIODEVICESELECTORCOMPONENT_H_INCLUDED
 
 
 //==============================================================================
@@ -105,4 +105,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIODEVICESELECTORCOMPONENT_JUCEHEADER__
+#endif   // JUCE_AUDIODEVICESELECTORCOMPONENT_H_INCLUDED
diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnail.h b/modules/juce_audio_utils/gui/juce_AudioThumbnail.h
index 63aa8103a5..4042a39752 100644
--- a/modules/juce_audio_utils/gui/juce_AudioThumbnail.h
+++ b/modules/juce_audio_utils/gui/juce_AudioThumbnail.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOTHUMBNAIL_JUCEHEADER__
-#define __JUCE_AUDIOTHUMBNAIL_JUCEHEADER__
+#ifndef JUCE_AUDIOTHUMBNAIL_H_INCLUDED
+#define JUCE_AUDIOTHUMBNAIL_H_INCLUDED
 
 class AudioThumbnailCache;
 
@@ -226,4 +226,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOTHUMBNAIL_JUCEHEADER__
+#endif   // JUCE_AUDIOTHUMBNAIL_H_INCLUDED
diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnailBase.h b/modules/juce_audio_utils/gui/juce_AudioThumbnailBase.h
index 4fe5db4ad9..9145fb1b11 100644
--- a/modules/juce_audio_utils/gui/juce_AudioThumbnailBase.h
+++ b/modules/juce_audio_utils/gui/juce_AudioThumbnailBase.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOTHUMBNAILBASE_JUCEHEADER__
-#define __JUCE_AUDIOTHUMBNAILBASE_JUCEHEADER__
+#ifndef JUCE_AUDIOTHUMBNAILBASE_H_INCLUDED
+#define JUCE_AUDIOTHUMBNAILBASE_H_INCLUDED
 
 class AudioThumbnailCache;
 
@@ -152,4 +152,4 @@ public:
     virtual int64 getHashCode() const = 0;
 };
 
-#endif   // __JUCE_AUDIOTHUMBNAILBASE_JUCEHEADER__
+#endif   // JUCE_AUDIOTHUMBNAILBASE_H_INCLUDED
diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h b/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h
index 3d51d30bca..de7fe87a5d 100644
--- a/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h
+++ b/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOTHUMBNAILCACHE_JUCEHEADER__
-#define __JUCE_AUDIOTHUMBNAILCACHE_JUCEHEADER__
+#ifndef JUCE_AUDIOTHUMBNAILCACHE_H_INCLUDED
+#define JUCE_AUDIOTHUMBNAILCACHE_H_INCLUDED
 
 #include "juce_AudioThumbnailBase.h"
 
@@ -117,4 +117,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOTHUMBNAILCACHE_JUCEHEADER__
+#endif   // JUCE_AUDIOTHUMBNAILCACHE_H_INCLUDED
diff --git a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h
index 5e1dc29447..7bbe5dfa92 100644
--- a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h
+++ b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MIDIKEYBOARDCOMPONENT_JUCEHEADER__
-#define __JUCE_MIDIKEYBOARDCOMPONENT_JUCEHEADER__
+#ifndef JUCE_MIDIKEYBOARDCOMPONENT_H_INCLUDED
+#define JUCE_MIDIKEYBOARDCOMPONENT_H_INCLUDED
 
 
 //==============================================================================
@@ -408,4 +408,4 @@ private:
 };
 
 
-#endif   // __JUCE_MIDIKEYBOARDCOMPONENT_JUCEHEADER__
+#endif   // JUCE_MIDIKEYBOARDCOMPONENT_H_INCLUDED
diff --git a/modules/juce_audio_utils/juce_audio_utils.cpp b/modules/juce_audio_utils/juce_audio_utils.cpp
index b5f8f7024e..71651f3d74 100644
--- a/modules/juce_audio_utils/juce_audio_utils.cpp
+++ b/modules/juce_audio_utils/juce_audio_utils.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_UTILS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_AUDIO_UTILS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_audio_utils/juce_audio_utils.h b/modules/juce_audio_utils/juce_audio_utils.h
index 8b481b71d1..22b9496705 100644
--- a/modules/juce_audio_utils/juce_audio_utils.h
+++ b/modules/juce_audio_utils/juce_audio_utils.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIO_UTILS_JUCEHEADER__
-#define __JUCE_AUDIO_UTILS_JUCEHEADER__
+#ifndef JUCE_AUDIO_UTILS_H_INCLUDED
+#define JUCE_AUDIO_UTILS_H_INCLUDED
 
 #include "../juce_gui_basics/juce_gui_basics.h"
 #include "../juce_audio_devices/juce_audio_devices.h"
@@ -33,26 +33,12 @@
 //=============================================================================
 namespace juce
 {
-
-#ifndef __JUCE_AUDIODEVICESELECTORCOMPONENT_JUCEHEADER__
  #include "gui/juce_AudioDeviceSelectorComponent.h"
-#endif
-#ifndef __JUCE_AUDIOTHUMBNAILBASE_JUCEHEADER__
  #include "gui/juce_AudioThumbnailBase.h"
-#endif
-#ifndef __JUCE_AUDIOTHUMBNAIL_JUCEHEADER__
  #include "gui/juce_AudioThumbnail.h"
-#endif
-#ifndef __JUCE_AUDIOTHUMBNAILCACHE_JUCEHEADER__
  #include "gui/juce_AudioThumbnailCache.h"
-#endif
-#ifndef __JUCE_MIDIKEYBOARDCOMPONENT_JUCEHEADER__
  #include "gui/juce_MidiKeyboardComponent.h"
-#endif
-#ifndef __JUCE_AUDIOPROCESSORPLAYER_JUCEHEADER__
  #include "players/juce_AudioProcessorPlayer.h"
-#endif
-
 }
 
-#endif   // __JUCE_AUDIO_UTILS_JUCEHEADER__
+#endif   // JUCE_AUDIO_UTILS_H_INCLUDED
diff --git a/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h b/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h
index 12b14f60f3..fc11faaac2 100644
--- a/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h
+++ b/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AUDIOPROCESSORPLAYER_JUCEHEADER__
-#define __JUCE_AUDIOPROCESSORPLAYER_JUCEHEADER__
+#ifndef JUCE_AUDIOPROCESSORPLAYER_H_INCLUDED
+#define JUCE_AUDIOPROCESSORPLAYER_H_INCLUDED
 
 #include "../../juce_audio_processors/processors/juce_AudioProcessor.h"
 
@@ -101,4 +101,4 @@ private:
 };
 
 
-#endif   // __JUCE_AUDIOPROCESSORPLAYER_JUCEHEADER__
+#endif   // JUCE_AUDIOPROCESSORPLAYER_H_INCLUDED
diff --git a/modules/juce_box2d/juce_box2d.cpp b/modules/juce_box2d/juce_box2d.cpp
index 23ccc35df6..bb9c056db7 100644
--- a/modules/juce_box2d/juce_box2d.cpp
+++ b/modules/juce_box2d/juce_box2d.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_BOX2D_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_BOX2D_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_box2d/juce_box2d.h b/modules/juce_box2d/juce_box2d.h
index 9bbb696277..8c220a1dc1 100644
--- a/modules/juce_box2d/juce_box2d.h
+++ b/modules/juce_box2d/juce_box2d.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BOX2D_JUCEHEADER__
-#define __JUCE_BOX2D_JUCEHEADER__
+#ifndef JUCE_BOX2D_H_INCLUDED
+#define JUCE_BOX2D_H_INCLUDED
 
 //=============================================================================
 #include "../juce_graphics/juce_graphics.h"
@@ -35,4 +35,4 @@ namespace juce
   #include "utils/juce_Box2DRenderer.h"
 }
 
-#endif   // __JUCE_BOX2D_JUCEHEADER__
+#endif   // JUCE_BOX2D_H_INCLUDED
diff --git a/modules/juce_box2d/utils/juce_Box2DRenderer.h b/modules/juce_box2d/utils/juce_Box2DRenderer.h
index 5f639d6bb6..3390ac37e3 100644
--- a/modules/juce_box2d/utils/juce_Box2DRenderer.h
+++ b/modules/juce_box2d/utils/juce_Box2DRenderer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BOX2DRENDERER_JUCEHEADER__
-#define __JUCE_BOX2DRENDERER_JUCEHEADER__
+#ifndef JUCE_BOX2DRENDERER_H_INCLUDED
+#define JUCE_BOX2DRENDERER_H_INCLUDED
 
 //=============================================================================
 /** A simple implementation of the b2Draw class, used to draw a Box2D world.
@@ -74,4 +74,4 @@ protected:
 };
 
 
-#endif   // __JUCE_BOX2DRENDERER_JUCEHEADER__
+#endif   // JUCE_BOX2DRENDERER_H_INCLUDED
diff --git a/modules/juce_browser_plugin/juce_browser_plugin.cpp b/modules/juce_browser_plugin/juce_browser_plugin.cpp
index 38402600ca..60dd8e3d66 100644
--- a/modules/juce_browser_plugin/juce_browser_plugin.cpp
+++ b/modules/juce_browser_plugin/juce_browser_plugin.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_BROWSER_PLUGIN_CLIENT_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_BROWSER_PLUGIN_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_browser_plugin/juce_browser_plugin.h b/modules/juce_browser_plugin/juce_browser_plugin.h
index 0f3ed3a002..01b01870bd 100644
--- a/modules/juce_browser_plugin/juce_browser_plugin.h
+++ b/modules/juce_browser_plugin/juce_browser_plugin.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BROWSER_PLUGIN_JUCEHEADER__
-#define __JUCE_BROWSER_PLUGIN_JUCEHEADER__
+#ifndef JUCE_BROWSER_PLUGIN_H_INCLUDED
+#define JUCE_BROWSER_PLUGIN_H_INCLUDED
 
 #include "../juce_gui_basics/juce_gui_basics.h"
 
@@ -143,4 +143,4 @@ namespace juce
 juce::BrowserPluginComponent* JUCE_CALLTYPE createBrowserPlugin();
 
 
-#endif   // __JUCE_BROWSER_PLUGIN_JUCEHEADER__
+#endif   // JUCE_BROWSER_PLUGIN_H_INCLUDED
diff --git a/modules/juce_browser_plugin/wrapper/juce_BrowserPluginComponent.h b/modules/juce_browser_plugin/wrapper/juce_BrowserPluginComponent.h
index 93546a2841..314af118aa 100644
--- a/modules/juce_browser_plugin/wrapper/juce_BrowserPluginComponent.h
+++ b/modules/juce_browser_plugin/wrapper/juce_BrowserPluginComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BROWSERPLUGINCOMPONENT_JUCEHEADER__
-#define __JUCE_BROWSERPLUGINCOMPONENT_JUCEHEADER__
+#ifndef JUCE_BROWSERPLUGINCOMPONENT_H_INCLUDED
+#define JUCE_BROWSERPLUGINCOMPONENT_H_INCLUDED
 
 //==============================================================================
 /**
@@ -69,4 +69,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (BrowserPluginComponent)
 };
 
-#endif   // __JUCE_BROWSERPLUGINCOMPONENT_JUCEHEADER__
+#endif   // JUCE_BROWSERPLUGINCOMPONENT_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_AbstractFifo.h b/modules/juce_core/containers/juce_AbstractFifo.h
index 6e74fc8023..f656a107dc 100644
--- a/modules/juce_core/containers/juce_AbstractFifo.h
+++ b/modules/juce_core/containers/juce_AbstractFifo.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ABSTRACTFIFO_JUCEHEADER__
-#define __JUCE_ABSTRACTFIFO_JUCEHEADER__
+#ifndef JUCE_ABSTRACTFIFO_H_INCLUDED
+#define JUCE_ABSTRACTFIFO_H_INCLUDED
 
 #include "../memory/juce_Atomic.h"
 
@@ -219,4 +219,4 @@ private:
 };
 
 
-#endif   // __JUCE_ABSTRACTFIFO_JUCEHEADER__
+#endif   // JUCE_ABSTRACTFIFO_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_Array.h b/modules/juce_core/containers/juce_Array.h
index df2b5a82f8..fe6af14b45 100644
--- a/modules/juce_core/containers/juce_Array.h
+++ b/modules/juce_core/containers/juce_Array.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ARRAY_JUCEHEADER__
-#define __JUCE_ARRAY_JUCEHEADER__
+#ifndef JUCE_ARRAY_H_INCLUDED
+#define JUCE_ARRAY_H_INCLUDED
 
 #include "juce_ArrayAllocationBase.h"
 #include "juce_ElementComparator.h"
@@ -1057,4 +1057,4 @@ private:
 };
 
 
-#endif   // __JUCE_ARRAY_JUCEHEADER__
+#endif   // JUCE_ARRAY_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_ArrayAllocationBase.h b/modules/juce_core/containers/juce_ArrayAllocationBase.h
index 1499564eb5..31aa256a64 100644
--- a/modules/juce_core/containers/juce_ArrayAllocationBase.h
+++ b/modules/juce_core/containers/juce_ArrayAllocationBase.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
-#define __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
+#ifndef JUCE_ARRAYALLOCATIONBASE_H_INCLUDED
+#define JUCE_ARRAYALLOCATIONBASE_H_INCLUDED
 
 #include "../memory/juce_HeapBlock.h"
 
@@ -137,4 +137,4 @@ private:
 };
 
 
-#endif   // __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
+#endif   // JUCE_ARRAYALLOCATIONBASE_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_DynamicObject.h b/modules/juce_core/containers/juce_DynamicObject.h
index f2cfefa1af..2b14aa587b 100644
--- a/modules/juce_core/containers/juce_DynamicObject.h
+++ b/modules/juce_core/containers/juce_DynamicObject.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DYNAMICOBJECT_JUCEHEADER__
-#define __JUCE_DYNAMICOBJECT_JUCEHEADER__
+#ifndef JUCE_DYNAMICOBJECT_H_INCLUDED
+#define JUCE_DYNAMICOBJECT_H_INCLUDED
 
 #include "juce_NamedValueSet.h"
 #include "../memory/juce_ReferenceCountedObject.h"
@@ -123,4 +123,4 @@ private:
 
 
 
-#endif   // __JUCE_DYNAMICOBJECT_JUCEHEADER__
+#endif   // JUCE_DYNAMICOBJECT_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_ElementComparator.h b/modules/juce_core/containers/juce_ElementComparator.h
index dc7b81c0e8..f2b0b55c49 100644
--- a/modules/juce_core/containers/juce_ElementComparator.h
+++ b/modules/juce_core/containers/juce_ElementComparator.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ELEMENTCOMPARATOR_JUCEHEADER__
-#define __JUCE_ELEMENTCOMPARATOR_JUCEHEADER__
+#ifndef JUCE_ELEMENTCOMPARATOR_H_INCLUDED
+#define JUCE_ELEMENTCOMPARATOR_H_INCLUDED
 
 
 //==============================================================================
@@ -276,4 +276,4 @@ public:
 };
 
 
-#endif   // __JUCE_ELEMENTCOMPARATOR_JUCEHEADER__
+#endif   // JUCE_ELEMENTCOMPARATOR_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_HashMap.h b/modules/juce_core/containers/juce_HashMap.h
index 86d6691ca3..4e66f8abec 100644
--- a/modules/juce_core/containers/juce_HashMap.h
+++ b/modules/juce_core/containers/juce_HashMap.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_HASHMAP_JUCEHEADER__
-#define __JUCE_HASHMAP_JUCEHEADER__
+#ifndef JUCE_HASHMAP_H_INCLUDED
+#define JUCE_HASHMAP_H_INCLUDED
 
 #include "juce_OwnedArray.h"
 #include "juce_LinkedListPointer.h"
@@ -449,4 +449,4 @@ private:
 };
 
 
-#endif   // __JUCE_HASHMAP_JUCEHEADER__
+#endif   // JUCE_HASHMAP_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_LinkedListPointer.h b/modules/juce_core/containers/juce_LinkedListPointer.h
index 705d0cbe23..a27e521834 100644
--- a/modules/juce_core/containers/juce_LinkedListPointer.h
+++ b/modules/juce_core/containers/juce_LinkedListPointer.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LINKEDLISTPOINTER_JUCEHEADER__
-#define __JUCE_LINKEDLISTPOINTER_JUCEHEADER__
+#ifndef JUCE_LINKEDLISTPOINTER_H_INCLUDED
+#define JUCE_LINKEDLISTPOINTER_H_INCLUDED
 
 
 //==============================================================================
@@ -368,4 +368,4 @@ private:
 };
 
 
-#endif   // __JUCE_LINKEDLISTPOINTER_JUCEHEADER__
+#endif   // JUCE_LINKEDLISTPOINTER_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_NamedValueSet.h b/modules/juce_core/containers/juce_NamedValueSet.h
index 745fdf1400..f1c4c35c99 100644
--- a/modules/juce_core/containers/juce_NamedValueSet.h
+++ b/modules/juce_core/containers/juce_NamedValueSet.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_NAMEDVALUESET_JUCEHEADER__
-#define __JUCE_NAMEDVALUESET_JUCEHEADER__
+#ifndef JUCE_NAMEDVALUESET_H_INCLUDED
+#define JUCE_NAMEDVALUESET_H_INCLUDED
 
 #include "juce_Variant.h"
 #include "../containers/juce_LinkedListPointer.h"
@@ -166,4 +166,4 @@ private:
 };
 
 
-#endif   // __JUCE_NAMEDVALUESET_JUCEHEADER__
+#endif   // JUCE_NAMEDVALUESET_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_OwnedArray.h b/modules/juce_core/containers/juce_OwnedArray.h
index 9b2fb595b1..d00148c6db 100644
--- a/modules/juce_core/containers/juce_OwnedArray.h
+++ b/modules/juce_core/containers/juce_OwnedArray.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OWNEDARRAY_JUCEHEADER__
-#define __JUCE_OWNEDARRAY_JUCEHEADER__
+#ifndef JUCE_OWNEDARRAY_H_INCLUDED
+#define JUCE_OWNEDARRAY_H_INCLUDED
 
 #include "juce_ArrayAllocationBase.h"
 #include "juce_ElementComparator.h"
@@ -877,4 +877,4 @@ private:
 };
 
 
-#endif   // __JUCE_OWNEDARRAY_JUCEHEADER__
+#endif   // JUCE_OWNEDARRAY_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_PropertySet.h b/modules/juce_core/containers/juce_PropertySet.h
index 2333c244c9..20ea4a160c 100644
--- a/modules/juce_core/containers/juce_PropertySet.h
+++ b/modules/juce_core/containers/juce_PropertySet.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PROPERTYSET_JUCEHEADER__
-#define __JUCE_PROPERTYSET_JUCEHEADER__
+#ifndef JUCE_PROPERTYSET_H_INCLUDED
+#define JUCE_PROPERTYSET_H_INCLUDED
 
 #include "../text/juce_StringPairArray.h"
 #include "../xml/juce_XmlElement.h"
@@ -216,4 +216,4 @@ private:
 };
 
 
-#endif   // __JUCE_PROPERTYSET_JUCEHEADER__
+#endif   // JUCE_PROPERTYSET_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_ReferenceCountedArray.h b/modules/juce_core/containers/juce_ReferenceCountedArray.h
index 59a3bcb63a..3f2a34b970 100644
--- a/modules/juce_core/containers/juce_ReferenceCountedArray.h
+++ b/modules/juce_core/containers/juce_ReferenceCountedArray.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_REFERENCECOUNTEDARRAY_JUCEHEADER__
-#define __JUCE_REFERENCECOUNTEDARRAY_JUCEHEADER__
+#ifndef JUCE_REFERENCECOUNTEDARRAY_H_INCLUDED
+#define JUCE_REFERENCECOUNTEDARRAY_H_INCLUDED
 
 #include "../memory/juce_ReferenceCountedObject.h"
 #include "juce_ArrayAllocationBase.h"
@@ -864,4 +864,4 @@ private:
 };
 
 
-#endif   // __JUCE_REFERENCECOUNTEDARRAY_JUCEHEADER__
+#endif   // JUCE_REFERENCECOUNTEDARRAY_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_ScopedValueSetter.h b/modules/juce_core/containers/juce_ScopedValueSetter.h
index 45836a5d25..13b871ef24 100644
--- a/modules/juce_core/containers/juce_ScopedValueSetter.h
+++ b/modules/juce_core/containers/juce_ScopedValueSetter.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SCOPEDVALUESETTER_JUCEHEADER__
-#define __JUCE_SCOPEDVALUESETTER_JUCEHEADER__
+#ifndef JUCE_SCOPEDVALUESETTER_H_INCLUDED
+#define JUCE_SCOPEDVALUESETTER_H_INCLUDED
 
 
 //==============================================================================
@@ -97,4 +97,4 @@ private:
 };
 
 
-#endif   // __JUCE_SCOPEDVALUESETTER_JUCEHEADER__
+#endif   // JUCE_SCOPEDVALUESETTER_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_SortedSet.h b/modules/juce_core/containers/juce_SortedSet.h
index d51fd472e2..5836ed1965 100644
--- a/modules/juce_core/containers/juce_SortedSet.h
+++ b/modules/juce_core/containers/juce_SortedSet.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SORTEDSET_JUCEHEADER__
-#define __JUCE_SORTEDSET_JUCEHEADER__
+#ifndef JUCE_SORTEDSET_H_INCLUDED
+#define JUCE_SORTEDSET_H_INCLUDED
 
 #include "juce_ArrayAllocationBase.h"
 #include "../threads/juce_CriticalSection.h"
@@ -496,4 +496,4 @@ private:
   #pragma warning (pop)
 #endif
 
-#endif   // __JUCE_SORTEDSET_JUCEHEADER__
+#endif   // JUCE_SORTEDSET_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_SparseSet.h b/modules/juce_core/containers/juce_SparseSet.h
index 366084e7cc..5064ae0cc9 100644
--- a/modules/juce_core/containers/juce_SparseSet.h
+++ b/modules/juce_core/containers/juce_SparseSet.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SPARSESET_JUCEHEADER__
-#define __JUCE_SPARSESET_JUCEHEADER__
+#ifndef JUCE_SPARSESET_H_INCLUDED
+#define JUCE_SPARSESET_H_INCLUDED
 
 #include "../maths/juce_Range.h"
 #include "../threads/juce_CriticalSection.h"
@@ -298,4 +298,4 @@ private:
 
 
 
-#endif   // __JUCE_SPARSESET_JUCEHEADER__
+#endif   // JUCE_SPARSESET_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_Variant.h b/modules/juce_core/containers/juce_Variant.h
index f11bf608c0..92a75b9dc1 100644
--- a/modules/juce_core/containers/juce_Variant.h
+++ b/modules/juce_core/containers/juce_Variant.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_VARIANT_JUCEHEADER__
-#define __JUCE_VARIANT_JUCEHEADER__
+#ifndef JUCE_VARIANT_H_INCLUDED
+#define JUCE_VARIANT_H_INCLUDED
 
 #include "../text/juce_Identifier.h"
 #include "../streams/juce_OutputStream.h"
@@ -304,4 +304,4 @@ bool operator== (const var& v1, const char* v2);
 bool operator!= (const var& v1, const char* v2);
 
 
-#endif   // __JUCE_VARIANT_JUCEHEADER__
+#endif   // JUCE_VARIANT_H_INCLUDED
diff --git a/modules/juce_core/files/juce_DirectoryIterator.h b/modules/juce_core/files/juce_DirectoryIterator.h
index 6dad1be464..fcc50569c0 100644
--- a/modules/juce_core/files/juce_DirectoryIterator.h
+++ b/modules/juce_core/files/juce_DirectoryIterator.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DIRECTORYITERATOR_JUCEHEADER__
-#define __JUCE_DIRECTORYITERATOR_JUCEHEADER__
+#ifndef JUCE_DIRECTORYITERATOR_H_INCLUDED
+#define JUCE_DIRECTORYITERATOR_H_INCLUDED
 
 #include "juce_File.h"
 #include "../memory/juce_ScopedPointer.h"
@@ -159,4 +159,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DirectoryIterator)
 };
 
-#endif   // __JUCE_DIRECTORYITERATOR_JUCEHEADER__
+#endif   // JUCE_DIRECTORYITERATOR_H_INCLUDED
diff --git a/modules/juce_core/files/juce_File.h b/modules/juce_core/files/juce_File.h
index 6164f65e34..ad3cb19fbd 100644
--- a/modules/juce_core/files/juce_File.h
+++ b/modules/juce_core/files/juce_File.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILE_JUCEHEADER__
-#define __JUCE_FILE_JUCEHEADER__
+#ifndef JUCE_FILE_H_INCLUDED
+#define JUCE_FILE_H_INCLUDED
 
 #include "../containers/juce_Array.h"
 #include "../time/juce_Time.h"
@@ -956,4 +956,4 @@ private:
     bool setFileReadOnlyInternal (bool) const;
 };
 
-#endif   // __JUCE_FILE_JUCEHEADER__
+#endif   // JUCE_FILE_H_INCLUDED
diff --git a/modules/juce_core/files/juce_FileInputStream.h b/modules/juce_core/files/juce_FileInputStream.h
index ee9b624deb..6a452f71c2 100644
--- a/modules/juce_core/files/juce_FileInputStream.h
+++ b/modules/juce_core/files/juce_FileInputStream.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILEINPUTSTREAM_JUCEHEADER__
-#define __JUCE_FILEINPUTSTREAM_JUCEHEADER__
+#ifndef JUCE_FILEINPUTSTREAM_H_INCLUDED
+#define JUCE_FILEINPUTSTREAM_H_INCLUDED
 
 #include "juce_File.h"
 #include "../streams/juce_InputStream.h"
@@ -96,4 +96,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FileInputStream)
 };
 
-#endif   // __JUCE_FILEINPUTSTREAM_JUCEHEADER__
+#endif   // JUCE_FILEINPUTSTREAM_H_INCLUDED
diff --git a/modules/juce_core/files/juce_FileOutputStream.h b/modules/juce_core/files/juce_FileOutputStream.h
index acc0ac3d41..73ad20d497 100644
--- a/modules/juce_core/files/juce_FileOutputStream.h
+++ b/modules/juce_core/files/juce_FileOutputStream.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILEOUTPUTSTREAM_JUCEHEADER__
-#define __JUCE_FILEOUTPUTSTREAM_JUCEHEADER__
+#ifndef JUCE_FILEOUTPUTSTREAM_H_INCLUDED
+#define JUCE_FILEOUTPUTSTREAM_H_INCLUDED
 
 #include "juce_File.h"
 #include "../streams/juce_OutputStream.h"
@@ -116,4 +116,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FileOutputStream)
 };
 
-#endif   // __JUCE_FILEOUTPUTSTREAM_JUCEHEADER__
+#endif   // JUCE_FILEOUTPUTSTREAM_H_INCLUDED
diff --git a/modules/juce_core/files/juce_FileSearchPath.h b/modules/juce_core/files/juce_FileSearchPath.h
index c1f9a5af0d..a35f5aed47 100644
--- a/modules/juce_core/files/juce_FileSearchPath.h
+++ b/modules/juce_core/files/juce_FileSearchPath.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILESEARCHPATH_JUCEHEADER__
-#define __JUCE_FILESEARCHPATH_JUCEHEADER__
+#ifndef JUCE_FILESEARCHPATH_H_INCLUDED
+#define JUCE_FILESEARCHPATH_H_INCLUDED
 
 #include "juce_File.h"
 #include "../text/juce_StringArray.h"
@@ -166,4 +166,4 @@ private:
     JUCE_LEAK_DETECTOR (FileSearchPath)
 };
 
-#endif   // __JUCE_FILESEARCHPATH_JUCEHEADER__
+#endif   // JUCE_FILESEARCHPATH_H_INCLUDED
diff --git a/modules/juce_core/files/juce_MemoryMappedFile.h b/modules/juce_core/files/juce_MemoryMappedFile.h
index f1aaa56ae3..943edb63d4 100644
--- a/modules/juce_core/files/juce_MemoryMappedFile.h
+++ b/modules/juce_core/files/juce_MemoryMappedFile.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MEMORYMAPPEDFILE_JUCEHEADER__
-#define __JUCE_MEMORYMAPPEDFILE_JUCEHEADER__
+#ifndef JUCE_MEMORYMAPPEDFILE_H_INCLUDED
+#define JUCE_MEMORYMAPPEDFILE_H_INCLUDED
 
 #include "juce_File.h"
 
@@ -113,4 +113,4 @@ private:
 };
 
 
-#endif   // __JUCE_MEMORYMAPPEDFILE_JUCEHEADER__
+#endif   // JUCE_MEMORYMAPPEDFILE_H_INCLUDED
diff --git a/modules/juce_core/files/juce_TemporaryFile.h b/modules/juce_core/files/juce_TemporaryFile.h
index 477ff161aa..d33dc36a21 100644
--- a/modules/juce_core/files/juce_TemporaryFile.h
+++ b/modules/juce_core/files/juce_TemporaryFile.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TEMPORARYFILE_JUCEHEADER__
-#define __JUCE_TEMPORARYFILE_JUCEHEADER__
+#ifndef JUCE_TEMPORARYFILE_H_INCLUDED
+#define JUCE_TEMPORARYFILE_H_INCLUDED
 
 #include "juce_File.h"
 
@@ -168,4 +168,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TemporaryFile)
 };
 
-#endif   // __JUCE_TEMPORARYFILE_JUCEHEADER__
+#endif   // JUCE_TEMPORARYFILE_H_INCLUDED
diff --git a/modules/juce_core/json/juce_JSON.h b/modules/juce_core/json/juce_JSON.h
index dc5b8366df..a443c7a960 100644
--- a/modules/juce_core/json/juce_JSON.h
+++ b/modules/juce_core/json/juce_JSON.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_JSON_JUCEHEADER__
-#define __JUCE_JSON_JUCEHEADER__
+#ifndef JUCE_JSON_H_INCLUDED
+#define JUCE_JSON_H_INCLUDED
 
 #include "../misc/juce_Result.h"
 #include "../containers/juce_Variant.h"
@@ -115,4 +115,4 @@ private:
 };
 
 
-#endif   // __JUCE_JSON_JUCEHEADER__
+#endif   // JUCE_JSON_H_INCLUDED
diff --git a/modules/juce_core/juce_core.cpp b/modules/juce_core/juce_core.cpp
index a5d5227614..1e6c132c2a 100644
--- a/modules/juce_core/juce_core.cpp
+++ b/modules/juce_core/juce_core.cpp
@@ -26,7 +26,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_CORE_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_CORE_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h
index dca951d7b6..f7af33bbec 100644
--- a/modules/juce_core/juce_core.h
+++ b/modules/juce_core/juce_core.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CORE_JUCEHEADER__
-#define __JUCE_CORE_JUCEHEADER__
+#ifndef JUCE_CORE_H_INCLUDED
+#define JUCE_CORE_H_INCLUDED
 
 #ifndef JUCE_MODULE_AVAILABLE_juce_core
  /* If you fail to make sure that all your compile units are building JUCE with the same set of
@@ -143,303 +143,105 @@ namespace juce
 
 // START_AUTOINCLUDE containers, files, json, logging, maths, memory, misc, network,
 // streams, system, text, threads, time, unit_tests, xml, zip
-#ifndef __JUCE_ABSTRACTFIFO_JUCEHEADER__
- #include "containers/juce_AbstractFifo.h"
-#endif
-#ifndef __JUCE_ARRAY_JUCEHEADER__
- #include "containers/juce_Array.h"
-#endif
-#ifndef __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
- #include "containers/juce_ArrayAllocationBase.h"
-#endif
-#ifndef __JUCE_DYNAMICOBJECT_JUCEHEADER__
- #include "containers/juce_DynamicObject.h"
-#endif
-#ifndef __JUCE_ELEMENTCOMPARATOR_JUCEHEADER__
- #include "containers/juce_ElementComparator.h"
-#endif
-#ifndef __JUCE_HASHMAP_JUCEHEADER__
- #include "containers/juce_HashMap.h"
-#endif
-#ifndef __JUCE_LINKEDLISTPOINTER_JUCEHEADER__
- #include "containers/juce_LinkedListPointer.h"
-#endif
-#ifndef __JUCE_NAMEDVALUESET_JUCEHEADER__
- #include "containers/juce_NamedValueSet.h"
-#endif
-#ifndef __JUCE_OWNEDARRAY_JUCEHEADER__
- #include "containers/juce_OwnedArray.h"
-#endif
-#ifndef __JUCE_PROPERTYSET_JUCEHEADER__
- #include "containers/juce_PropertySet.h"
-#endif
-#ifndef __JUCE_REFERENCECOUNTEDARRAY_JUCEHEADER__
- #include "containers/juce_ReferenceCountedArray.h"
-#endif
-#ifndef __JUCE_SCOPEDVALUESETTER_JUCEHEADER__
- #include "containers/juce_ScopedValueSetter.h"
-#endif
-#ifndef __JUCE_SORTEDSET_JUCEHEADER__
- #include "containers/juce_SortedSet.h"
-#endif
-#ifndef __JUCE_SPARSESET_JUCEHEADER__
- #include "containers/juce_SparseSet.h"
-#endif
-#ifndef __JUCE_VARIANT_JUCEHEADER__
- #include "containers/juce_Variant.h"
-#endif
-#ifndef __JUCE_DIRECTORYITERATOR_JUCEHEADER__
- #include "files/juce_DirectoryIterator.h"
-#endif
-#ifndef __JUCE_FILE_JUCEHEADER__
- #include "files/juce_File.h"
-#endif
-#ifndef __JUCE_FILEINPUTSTREAM_JUCEHEADER__
- #include "files/juce_FileInputStream.h"
-#endif
-#ifndef __JUCE_FILEOUTPUTSTREAM_JUCEHEADER__
- #include "files/juce_FileOutputStream.h"
-#endif
-#ifndef __JUCE_FILESEARCHPATH_JUCEHEADER__
- #include "files/juce_FileSearchPath.h"
-#endif
-#ifndef __JUCE_MEMORYMAPPEDFILE_JUCEHEADER__
- #include "files/juce_MemoryMappedFile.h"
-#endif
-#ifndef __JUCE_TEMPORARYFILE_JUCEHEADER__
- #include "files/juce_TemporaryFile.h"
-#endif
-#ifndef __JUCE_JSON_JUCEHEADER__
- #include "json/juce_JSON.h"
-#endif
-#ifndef __JUCE_FILELOGGER_JUCEHEADER__
- #include "logging/juce_FileLogger.h"
-#endif
-#ifndef __JUCE_LOGGER_JUCEHEADER__
- #include "logging/juce_Logger.h"
-#endif
-#ifndef __JUCE_BIGINTEGER_JUCEHEADER__
- #include "maths/juce_BigInteger.h"
-#endif
-#ifndef __JUCE_EXPRESSION_JUCEHEADER__
- #include "maths/juce_Expression.h"
-#endif
-#ifndef __JUCE_MATHSFUNCTIONS_JUCEHEADER__
- #include "maths/juce_MathsFunctions.h"
-#endif
-#ifndef __JUCE_RANDOM_JUCEHEADER__
- #include "maths/juce_Random.h"
-#endif
-#ifndef __JUCE_RANGE_JUCEHEADER__
- #include "maths/juce_Range.h"
-#endif
-#ifndef __JUCE_ATOMIC_JUCEHEADER__
- #include "memory/juce_Atomic.h"
-#endif
-#ifndef __JUCE_BYTEORDER_JUCEHEADER__
- #include "memory/juce_ByteOrder.h"
-#endif
-#ifndef __JUCE_HEAPBLOCK_JUCEHEADER__
- #include "memory/juce_HeapBlock.h"
-#endif
-#ifndef __JUCE_LEAKEDOBJECTDETECTOR_JUCEHEADER__
- #include "memory/juce_LeakedObjectDetector.h"
-#endif
-#ifndef __JUCE_MEMORY_JUCEHEADER__
- #include "memory/juce_Memory.h"
-#endif
-#ifndef __JUCE_MEMORYBLOCK_JUCEHEADER__
- #include "memory/juce_MemoryBlock.h"
-#endif
-#ifndef __JUCE_OPTIONALSCOPEDPOINTER_JUCEHEADER__
- #include "memory/juce_OptionalScopedPointer.h"
-#endif
-#ifndef __JUCE_REFERENCECOUNTEDOBJECT_JUCEHEADER__
- #include "memory/juce_ReferenceCountedObject.h"
-#endif
-#ifndef __JUCE_SCOPEDPOINTER_JUCEHEADER__
- #include "memory/juce_ScopedPointer.h"
-#endif
-#ifndef __JUCE_SINGLETON_JUCEHEADER__
- #include "memory/juce_Singleton.h"
-#endif
-#ifndef __JUCE_WEAKREFERENCE_JUCEHEADER__
- #include "memory/juce_WeakReference.h"
-#endif
-#ifndef __JUCE_RESULT_JUCEHEADER__
- #include "misc/juce_Result.h"
-#endif
-#ifndef __JUCE_UUID_JUCEHEADER__
- #include "misc/juce_Uuid.h"
-#endif
-#ifndef __JUCE_WINDOWSREGISTRY_JUCEHEADER__
- #include "misc/juce_WindowsRegistry.h"
-#endif
-#ifndef __JUCE_IPADDRESS_JUCEHEADER__
- #include "network/juce_IPAddress.h"
-#endif
-#ifndef __JUCE_MACADDRESS_JUCEHEADER__
- #include "network/juce_MACAddress.h"
-#endif
-#ifndef __JUCE_NAMEDPIPE_JUCEHEADER__
- #include "network/juce_NamedPipe.h"
-#endif
-#ifndef __JUCE_SOCKET_JUCEHEADER__
- #include "network/juce_Socket.h"
-#endif
-#ifndef __JUCE_URL_JUCEHEADER__
- #include "network/juce_URL.h"
-#endif
-#ifndef __JUCE_BUFFEREDINPUTSTREAM_JUCEHEADER__
- #include "streams/juce_BufferedInputStream.h"
-#endif
-#ifndef __JUCE_FILEINPUTSOURCE_JUCEHEADER__
- #include "streams/juce_FileInputSource.h"
-#endif
-#ifndef __JUCE_INPUTSOURCE_JUCEHEADER__
- #include "streams/juce_InputSource.h"
-#endif
-#ifndef __JUCE_INPUTSTREAM_JUCEHEADER__
- #include "streams/juce_InputStream.h"
-#endif
-#ifndef __JUCE_MEMORYINPUTSTREAM_JUCEHEADER__
- #include "streams/juce_MemoryInputStream.h"
-#endif
-#ifndef __JUCE_MEMORYOUTPUTSTREAM_JUCEHEADER__
- #include "streams/juce_MemoryOutputStream.h"
-#endif
-#ifndef __JUCE_OUTPUTSTREAM_JUCEHEADER__
- #include "streams/juce_OutputStream.h"
-#endif
-#ifndef __JUCE_SUBREGIONSTREAM_JUCEHEADER__
- #include "streams/juce_SubregionStream.h"
-#endif
-#ifndef __JUCE_PLATFORMDEFS_JUCEHEADER__
- #include "system/juce_PlatformDefs.h"
-#endif
-#ifndef __JUCE_STANDARDHEADER_JUCEHEADER__
- #include "system/juce_StandardHeader.h"
-#endif
-#ifndef __JUCE_SYSTEMSTATS_JUCEHEADER__
- #include "system/juce_SystemStats.h"
-#endif
-#ifndef __JUCE_TARGETPLATFORM_JUCEHEADER__
- #include "system/juce_TargetPlatform.h"
-#endif
-#ifndef __JUCE_CHARACTERFUNCTIONS_JUCEHEADER__
- #include "text/juce_CharacterFunctions.h"
-#endif
-#ifndef __JUCE_CHARPOINTER_ASCII_JUCEHEADER__
- #include "text/juce_CharPointer_ASCII.h"
-#endif
-#ifndef __JUCE_CHARPOINTER_UTF16_JUCEHEADER__
- #include "text/juce_CharPointer_UTF16.h"
-#endif
-#ifndef __JUCE_CHARPOINTER_UTF32_JUCEHEADER__
- #include "text/juce_CharPointer_UTF32.h"
-#endif
-#ifndef __JUCE_CHARPOINTER_UTF8_JUCEHEADER__
- #include "text/juce_CharPointer_UTF8.h"
-#endif
-#ifndef __JUCE_IDENTIFIER_JUCEHEADER__
- #include "text/juce_Identifier.h"
-#endif
-#ifndef __JUCE_LOCALISEDSTRINGS_JUCEHEADER__
- #include "text/juce_LocalisedStrings.h"
-#endif
-#ifndef __JUCE_NEWLINE_JUCEHEADER__
- #include "text/juce_NewLine.h"
-#endif
-#ifndef __JUCE_STRING_JUCEHEADER__
- #include "text/juce_String.h"
-#endif
-#ifndef __JUCE_STRINGARRAY_JUCEHEADER__
- #include "text/juce_StringArray.h"
-#endif
-#ifndef __JUCE_STRINGPAIRARRAY_JUCEHEADER__
- #include "text/juce_StringPairArray.h"
-#endif
-#ifndef __JUCE_STRINGPOOL_JUCEHEADER__
- #include "text/juce_StringPool.h"
-#endif
-#ifndef __JUCE_TEXTDIFF_JUCEHEADER__
- #include "text/juce_TextDiff.h"
-#endif
-#ifndef __JUCE_CHILDPROCESS_JUCEHEADER__
- #include "threads/juce_ChildProcess.h"
-#endif
-#ifndef __JUCE_CRITICALSECTION_JUCEHEADER__
- #include "threads/juce_CriticalSection.h"
-#endif
-#ifndef __JUCE_DYNAMICLIBRARY_JUCEHEADER__
- #include "threads/juce_DynamicLibrary.h"
-#endif
-#ifndef __JUCE_HIGHRESOLUTIONTIMER_JUCEHEADER__
- #include "threads/juce_HighResolutionTimer.h"
-#endif
-#ifndef __JUCE_INTERPROCESSLOCK_JUCEHEADER__
- #include "threads/juce_InterProcessLock.h"
-#endif
-#ifndef __JUCE_PROCESS_JUCEHEADER__
- #include "threads/juce_Process.h"
-#endif
-#ifndef __JUCE_READWRITELOCK_JUCEHEADER__
- #include "threads/juce_ReadWriteLock.h"
-#endif
-#ifndef __JUCE_SCOPEDLOCK_JUCEHEADER__
- #include "threads/juce_ScopedLock.h"
-#endif
-#ifndef __JUCE_SCOPEDREADLOCK_JUCEHEADER__
- #include "threads/juce_ScopedReadLock.h"
-#endif
-#ifndef __JUCE_SCOPEDWRITELOCK_JUCEHEADER__
- #include "threads/juce_ScopedWriteLock.h"
-#endif
-#ifndef __JUCE_SPINLOCK_JUCEHEADER__
- #include "threads/juce_SpinLock.h"
-#endif
-#ifndef __JUCE_THREAD_JUCEHEADER__
- #include "threads/juce_Thread.h"
-#endif
-#ifndef __JUCE_THREADLOCALVALUE_JUCEHEADER__
- #include "threads/juce_ThreadLocalValue.h"
-#endif
-#ifndef __JUCE_THREADPOOL_JUCEHEADER__
- #include "threads/juce_ThreadPool.h"
-#endif
-#ifndef __JUCE_TIMESLICETHREAD_JUCEHEADER__
- #include "threads/juce_TimeSliceThread.h"
-#endif
-#ifndef __JUCE_WAITABLEEVENT_JUCEHEADER__
- #include "threads/juce_WaitableEvent.h"
-#endif
-#ifndef __JUCE_PERFORMANCECOUNTER_JUCEHEADER__
- #include "time/juce_PerformanceCounter.h"
-#endif
-#ifndef __JUCE_RELATIVETIME_JUCEHEADER__
- #include "time/juce_RelativeTime.h"
-#endif
-#ifndef __JUCE_TIME_JUCEHEADER__
- #include "time/juce_Time.h"
-#endif
-#ifndef __JUCE_UNITTEST_JUCEHEADER__
- #include "unit_tests/juce_UnitTest.h"
-#endif
-#ifndef __JUCE_XMLDOCUMENT_JUCEHEADER__
- #include "xml/juce_XmlDocument.h"
-#endif
-#ifndef __JUCE_XMLELEMENT_JUCEHEADER__
- #include "xml/juce_XmlElement.h"
-#endif
-#ifndef __JUCE_GZIPCOMPRESSOROUTPUTSTREAM_JUCEHEADER__
- #include "zip/juce_GZIPCompressorOutputStream.h"
-#endif
-#ifndef __JUCE_GZIPDECOMPRESSORINPUTSTREAM_JUCEHEADER__
- #include "zip/juce_GZIPDecompressorInputStream.h"
-#endif
-#ifndef __JUCE_ZIPFILE_JUCEHEADER__
- #include "zip/juce_ZipFile.h"
-#endif
+#include "containers/juce_AbstractFifo.h"
+#include "containers/juce_Array.h"
+#include "containers/juce_ArrayAllocationBase.h"
+#include "containers/juce_DynamicObject.h"
+#include "containers/juce_ElementComparator.h"
+#include "containers/juce_HashMap.h"
+#include "containers/juce_LinkedListPointer.h"
+#include "containers/juce_NamedValueSet.h"
+#include "containers/juce_OwnedArray.h"
+#include "containers/juce_PropertySet.h"
+#include "containers/juce_ReferenceCountedArray.h"
+#include "containers/juce_ScopedValueSetter.h"
+#include "containers/juce_SortedSet.h"
+#include "containers/juce_SparseSet.h"
+#include "containers/juce_Variant.h"
+#include "files/juce_DirectoryIterator.h"
+#include "files/juce_File.h"
+#include "files/juce_FileInputStream.h"
+#include "files/juce_FileOutputStream.h"
+#include "files/juce_FileSearchPath.h"
+#include "files/juce_MemoryMappedFile.h"
+#include "files/juce_TemporaryFile.h"
+#include "json/juce_JSON.h"
+#include "logging/juce_FileLogger.h"
+#include "logging/juce_Logger.h"
+#include "maths/juce_BigInteger.h"
+#include "maths/juce_Expression.h"
+#include "maths/juce_MathsFunctions.h"
+#include "maths/juce_Random.h"
+#include "maths/juce_Range.h"
+#include "memory/juce_Atomic.h"
+#include "memory/juce_ByteOrder.h"
+#include "memory/juce_HeapBlock.h"
+#include "memory/juce_LeakedObjectDetector.h"
+#include "memory/juce_Memory.h"
+#include "memory/juce_MemoryBlock.h"
+#include "memory/juce_OptionalScopedPointer.h"
+#include "memory/juce_ReferenceCountedObject.h"
+#include "memory/juce_ScopedPointer.h"
+#include "memory/juce_Singleton.h"
+#include "memory/juce_WeakReference.h"
+#include "misc/juce_Result.h"
+#include "misc/juce_Uuid.h"
+#include "misc/juce_WindowsRegistry.h"
+#include "network/juce_IPAddress.h"
+#include "network/juce_MACAddress.h"
+#include "network/juce_NamedPipe.h"
+#include "network/juce_Socket.h"
+#include "network/juce_URL.h"
+#include "streams/juce_BufferedInputStream.h"
+#include "streams/juce_FileInputSource.h"
+#include "streams/juce_InputSource.h"
+#include "streams/juce_InputStream.h"
+#include "streams/juce_MemoryInputStream.h"
+#include "streams/juce_MemoryOutputStream.h"
+#include "streams/juce_OutputStream.h"
+#include "streams/juce_SubregionStream.h"
+#include "system/juce_PlatformDefs.h"
+#include "system/juce_StandardHeader.h"
+#include "system/juce_SystemStats.h"
+#include "system/juce_TargetPlatform.h"
+#include "text/juce_CharacterFunctions.h"
+#include "text/juce_CharPointer_ASCII.h"
+#include "text/juce_CharPointer_UTF16.h"
+#include "text/juce_CharPointer_UTF32.h"
+#include "text/juce_CharPointer_UTF8.h"
+#include "text/juce_Identifier.h"
+#include "text/juce_LocalisedStrings.h"
+#include "text/juce_NewLine.h"
+#include "text/juce_String.h"
+#include "text/juce_StringArray.h"
+#include "text/juce_StringPairArray.h"
+#include "text/juce_StringPool.h"
+#include "text/juce_TextDiff.h"
+#include "threads/juce_ChildProcess.h"
+#include "threads/juce_CriticalSection.h"
+#include "threads/juce_DynamicLibrary.h"
+#include "threads/juce_HighResolutionTimer.h"
+#include "threads/juce_InterProcessLock.h"
+#include "threads/juce_Process.h"
+#include "threads/juce_ReadWriteLock.h"
+#include "threads/juce_ScopedLock.h"
+#include "threads/juce_ScopedReadLock.h"
+#include "threads/juce_ScopedWriteLock.h"
+#include "threads/juce_SpinLock.h"
+#include "threads/juce_Thread.h"
+#include "threads/juce_ThreadLocalValue.h"
+#include "threads/juce_ThreadPool.h"
+#include "threads/juce_TimeSliceThread.h"
+#include "threads/juce_WaitableEvent.h"
+#include "time/juce_PerformanceCounter.h"
+#include "time/juce_RelativeTime.h"
+#include "time/juce_Time.h"
+#include "unit_tests/juce_UnitTest.h"
+#include "xml/juce_XmlDocument.h"
+#include "xml/juce_XmlElement.h"
+#include "zip/juce_GZIPCompressorOutputStream.h"
+#include "zip/juce_GZIPDecompressorInputStream.h"
+#include "zip/juce_ZipFile.h"
 // END_AUTOINCLUDE
 
 }
@@ -448,4 +250,4 @@ namespace juce
  #pragma warning (pop)
 #endif
 
-#endif   // __JUCE_CORE_JUCEHEADER__
+#endif   // JUCE_CORE_H_INCLUDED
diff --git a/modules/juce_core/logging/juce_FileLogger.h b/modules/juce_core/logging/juce_FileLogger.h
index 4436cbf08b..87cb7cdfc1 100644
--- a/modules/juce_core/logging/juce_FileLogger.h
+++ b/modules/juce_core/logging/juce_FileLogger.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILELOGGER_JUCEHEADER__
-#define __JUCE_FILELOGGER_JUCEHEADER__
+#ifndef JUCE_FILELOGGER_H_INCLUDED
+#define JUCE_FILELOGGER_H_INCLUDED
 
 #include "juce_Logger.h"
 #include "../files/juce_File.h"
@@ -136,4 +136,4 @@ private:
 };
 
 
-#endif   // __JUCE_FILELOGGER_JUCEHEADER__
+#endif   // JUCE_FILELOGGER_H_INCLUDED
diff --git a/modules/juce_core/logging/juce_Logger.h b/modules/juce_core/logging/juce_Logger.h
index c9f2f3d848..142ed338cf 100644
--- a/modules/juce_core/logging/juce_Logger.h
+++ b/modules/juce_core/logging/juce_Logger.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LOGGER_JUCEHEADER__
-#define __JUCE_LOGGER_JUCEHEADER__
+#ifndef JUCE_LOGGER_H_INCLUDED
+#define JUCE_LOGGER_H_INCLUDED
 
 #include "../text/juce_String.h"
 
@@ -96,4 +96,4 @@ private:
 };
 
 
-#endif   // __JUCE_LOGGER_JUCEHEADER__
+#endif   // JUCE_LOGGER_H_INCLUDED
diff --git a/modules/juce_core/maths/juce_BigInteger.h b/modules/juce_core/maths/juce_BigInteger.h
index 94c5a34bbc..abf48a2241 100644
--- a/modules/juce_core/maths/juce_BigInteger.h
+++ b/modules/juce_core/maths/juce_BigInteger.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BIGINTEGER_JUCEHEADER__
-#define __JUCE_BIGINTEGER_JUCEHEADER__
+#ifndef JUCE_BIGINTEGER_H_INCLUDED
+#define JUCE_BIGINTEGER_H_INCLUDED
 
 #include "../text/juce_String.h"
 #include "../memory/juce_HeapBlock.h"
@@ -331,4 +331,4 @@ OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const BigInteger&
 #endif
 
 
-#endif   // __JUCE_BIGINTEGER_JUCEHEADER__
+#endif   // JUCE_BIGINTEGER_H_INCLUDED
diff --git a/modules/juce_core/maths/juce_Expression.h b/modules/juce_core/maths/juce_Expression.h
index d7c1ff346c..3b08bef627 100644
--- a/modules/juce_core/maths/juce_Expression.h
+++ b/modules/juce_core/maths/juce_Expression.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_EXPRESSION_JUCEHEADER__
-#define __JUCE_EXPRESSION_JUCEHEADER__
+#ifndef JUCE_EXPRESSION_H_INCLUDED
+#define JUCE_EXPRESSION_H_INCLUDED
 
 #include "../memory/juce_ReferenceCountedObject.h"
 #include "../containers/juce_Array.h"
@@ -271,4 +271,4 @@ private:
     explicit Expression (Term*);
 };
 
-#endif   // __JUCE_EXPRESSION_JUCEHEADER__
+#endif   // JUCE_EXPRESSION_H_INCLUDED
diff --git a/modules/juce_core/maths/juce_MathsFunctions.h b/modules/juce_core/maths/juce_MathsFunctions.h
index 34d2f07f40..2e008170ad 100644
--- a/modules/juce_core/maths/juce_MathsFunctions.h
+++ b/modules/juce_core/maths/juce_MathsFunctions.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MATHSFUNCTIONS_JUCEHEADER__
-#define __JUCE_MATHSFUNCTIONS_JUCEHEADER__
+#ifndef JUCE_MATHSFUNCTIONS_H_INCLUDED
+#define JUCE_MATHSFUNCTIONS_H_INCLUDED
 
 //==============================================================================
 /*
@@ -511,4 +511,4 @@ namespace TypeHelpers
 
 //==============================================================================
 
-#endif   // __JUCE_MATHSFUNCTIONS_JUCEHEADER__
+#endif   // JUCE_MATHSFUNCTIONS_H_INCLUDED
diff --git a/modules/juce_core/maths/juce_Random.h b/modules/juce_core/maths/juce_Random.h
index d9296987bb..2abf721c5c 100644
--- a/modules/juce_core/maths/juce_Random.h
+++ b/modules/juce_core/maths/juce_Random.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RANDOM_JUCEHEADER__
-#define __JUCE_RANDOM_JUCEHEADER__
+#ifndef JUCE_RANDOM_H_INCLUDED
+#define JUCE_RANDOM_H_INCLUDED
 
 #include "juce_BigInteger.h"
 
@@ -137,4 +137,4 @@ private:
 };
 
 
-#endif   // __JUCE_RANDOM_JUCEHEADER__
+#endif   // JUCE_RANDOM_H_INCLUDED
diff --git a/modules/juce_core/maths/juce_Range.h b/modules/juce_core/maths/juce_Range.h
index 1e05624b34..56678c1b96 100644
--- a/modules/juce_core/maths/juce_Range.h
+++ b/modules/juce_core/maths/juce_Range.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RANGE_JUCEHEADER__
-#define __JUCE_RANGE_JUCEHEADER__
+#ifndef JUCE_RANGE_H_INCLUDED
+#define JUCE_RANGE_H_INCLUDED
 
 
 //==============================================================================
@@ -261,4 +261,4 @@ private:
 };
 
 
-#endif   // __JUCE_RANGE_JUCEHEADER__
+#endif   // JUCE_RANGE_H_INCLUDED
diff --git a/modules/juce_core/memory/juce_Atomic.h b/modules/juce_core/memory/juce_Atomic.h
index b7d364a9d0..1de4237435 100644
--- a/modules/juce_core/memory/juce_Atomic.h
+++ b/modules/juce_core/memory/juce_Atomic.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ATOMIC_JUCEHEADER__
-#define __JUCE_ATOMIC_JUCEHEADER__
+#ifndef JUCE_ATOMIC_H_INCLUDED
+#define JUCE_ATOMIC_H_INCLUDED
 
 
 //==============================================================================
@@ -393,4 +393,4 @@ inline void Atomic<Type>::memoryBarrier() noexcept
   #pragma warning (pop)
 #endif
 
-#endif   // __JUCE_ATOMIC_JUCEHEADER__
+#endif   // JUCE_ATOMIC_H_INCLUDED
diff --git a/modules/juce_core/memory/juce_ByteOrder.h b/modules/juce_core/memory/juce_ByteOrder.h
index 1c8827dd8a..fedbeac7b4 100644
--- a/modules/juce_core/memory/juce_ByteOrder.h
+++ b/modules/juce_core/memory/juce_ByteOrder.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BYTEORDER_JUCEHEADER__
-#define __JUCE_BYTEORDER_JUCEHEADER__
+#ifndef JUCE_BYTEORDER_H_INCLUDED
+#define JUCE_BYTEORDER_H_INCLUDED
 
 
 //==============================================================================
@@ -183,4 +183,4 @@ inline void ByteOrder::littleEndian24BitToChars (const int value, char* const de
 inline void ByteOrder::bigEndian24BitToChars (const int value, char* const destBytes)       { destBytes[0] = (char)((value >> 16) & 0xff); destBytes[1] = (char)((value >> 8) & 0xff); destBytes[2] = (char)(value & 0xff); }
 
 
-#endif   // __JUCE_BYTEORDER_JUCEHEADER__
+#endif   // JUCE_BYTEORDER_H_INCLUDED
diff --git a/modules/juce_core/memory/juce_HeapBlock.h b/modules/juce_core/memory/juce_HeapBlock.h
index 5f8dfc7b77..3731f0b302 100644
--- a/modules/juce_core/memory/juce_HeapBlock.h
+++ b/modules/juce_core/memory/juce_HeapBlock.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_HEAPBLOCK_JUCEHEADER__
-#define __JUCE_HEAPBLOCK_JUCEHEADER__
+#ifndef JUCE_HEAPBLOCK_H_INCLUDED
+#define JUCE_HEAPBLOCK_H_INCLUDED
 
 #ifndef DOXYGEN
 namespace HeapBlockHelper
@@ -305,4 +305,4 @@ private:
 };
 
 
-#endif   // __JUCE_HEAPBLOCK_JUCEHEADER__
+#endif   // JUCE_HEAPBLOCK_H_INCLUDED
diff --git a/modules/juce_core/memory/juce_LeakedObjectDetector.h b/modules/juce_core/memory/juce_LeakedObjectDetector.h
index 7c0eb57af8..56e4a670c3 100644
--- a/modules/juce_core/memory/juce_LeakedObjectDetector.h
+++ b/modules/juce_core/memory/juce_LeakedObjectDetector.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LEAKEDOBJECTDETECTOR_JUCEHEADER__
-#define __JUCE_LEAKEDOBJECTDETECTOR_JUCEHEADER__
+#ifndef JUCE_LEAKEDOBJECTDETECTOR_H_INCLUDED
+#define JUCE_LEAKEDOBJECTDETECTOR_H_INCLUDED
 
 #include "../text/juce_String.h"
 #include "juce_Atomic.h"
@@ -146,4 +146,4 @@ private:
 #endif
 
 
-#endif   // __JUCE_LEAKEDOBJECTDETECTOR_JUCEHEADER__
+#endif   // JUCE_LEAKEDOBJECTDETECTOR_H_INCLUDED
diff --git a/modules/juce_core/memory/juce_Memory.h b/modules/juce_core/memory/juce_Memory.h
index d13774de34..57d1644dc0 100644
--- a/modules/juce_core/memory/juce_Memory.h
+++ b/modules/juce_core/memory/juce_Memory.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MEMORY_JUCEHEADER__
-#define __JUCE_MEMORY_JUCEHEADER__
+#ifndef JUCE_MEMORY_H_INCLUDED
+#define JUCE_MEMORY_H_INCLUDED
 
 //==============================================================================
 /** Fills a block of memory with zeros. */
@@ -123,4 +123,4 @@ inline Type* createCopyIfNotNull (const Type* pointer)     { return pointer != n
 #endif
 
 
-#endif   // __JUCE_MEMORY_JUCEHEADER__
+#endif   // JUCE_MEMORY_H_INCLUDED
diff --git a/modules/juce_core/memory/juce_MemoryBlock.h b/modules/juce_core/memory/juce_MemoryBlock.h
index 74d10b48aa..b5adcab946 100644
--- a/modules/juce_core/memory/juce_MemoryBlock.h
+++ b/modules/juce_core/memory/juce_MemoryBlock.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MEMORYBLOCK_JUCEHEADER__
-#define __JUCE_MEMORYBLOCK_JUCEHEADER__
+#ifndef JUCE_MEMORYBLOCK_H_INCLUDED
+#define JUCE_MEMORYBLOCK_H_INCLUDED
 
 #include "../text/juce_String.h"
 #include "../memory/juce_HeapBlock.h"
@@ -257,4 +257,4 @@ private:
 };
 
 
-#endif   // __JUCE_MEMORYBLOCK_JUCEHEADER__
+#endif   // JUCE_MEMORYBLOCK_H_INCLUDED
diff --git a/modules/juce_core/memory/juce_OptionalScopedPointer.h b/modules/juce_core/memory/juce_OptionalScopedPointer.h
index 37110134a9..cc5531ea0e 100644
--- a/modules/juce_core/memory/juce_OptionalScopedPointer.h
+++ b/modules/juce_core/memory/juce_OptionalScopedPointer.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OPTIONALSCOPEDPOINTER_JUCEHEADER__
-#define __JUCE_OPTIONALSCOPEDPOINTER_JUCEHEADER__
+#ifndef JUCE_OPTIONALSCOPEDPOINTER_H_INCLUDED
+#define JUCE_OPTIONALSCOPEDPOINTER_H_INCLUDED
 
 #include "juce_ScopedPointer.h"
 
@@ -185,4 +185,4 @@ private:
 };
 
 
-#endif   // __JUCE_OPTIONALSCOPEDPOINTER_JUCEHEADER__
+#endif   // JUCE_OPTIONALSCOPEDPOINTER_H_INCLUDED
diff --git a/modules/juce_core/memory/juce_ReferenceCountedObject.h b/modules/juce_core/memory/juce_ReferenceCountedObject.h
index 34d8a0d304..751a45fee6 100644
--- a/modules/juce_core/memory/juce_ReferenceCountedObject.h
+++ b/modules/juce_core/memory/juce_ReferenceCountedObject.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_REFERENCECOUNTEDOBJECT_JUCEHEADER__
-#define __JUCE_REFERENCECOUNTEDOBJECT_JUCEHEADER__
+#ifndef JUCE_REFERENCECOUNTEDOBJECT_H_INCLUDED
+#define JUCE_REFERENCECOUNTEDOBJECT_H_INCLUDED
 
 #include "juce_Atomic.h"
 
@@ -397,4 +397,4 @@ bool operator!= (ReferenceCountedObjectClass* object1, ReferenceCountedObjectPtr
 }
 
 
-#endif   // __JUCE_REFERENCECOUNTEDOBJECT_JUCEHEADER__
+#endif   // JUCE_REFERENCECOUNTEDOBJECT_H_INCLUDED
diff --git a/modules/juce_core/memory/juce_ScopedPointer.h b/modules/juce_core/memory/juce_ScopedPointer.h
index 7fe2161417..7f95804114 100644
--- a/modules/juce_core/memory/juce_ScopedPointer.h
+++ b/modules/juce_core/memory/juce_ScopedPointer.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SCOPEDPOINTER_JUCEHEADER__
-#define __JUCE_SCOPEDPOINTER_JUCEHEADER__
+#ifndef JUCE_SCOPEDPOINTER_H_INCLUDED
+#define JUCE_SCOPEDPOINTER_H_INCLUDED
 
 //==============================================================================
 /**
@@ -250,4 +250,4 @@ template <typename Type>
 void deleteAndZero (ScopedPointer<Type>&)  { static_jassert (sizeof (Type) == 12345); }
 #endif
 
-#endif   // __JUCE_SCOPEDPOINTER_JUCEHEADER__
+#endif   // JUCE_SCOPEDPOINTER_H_INCLUDED
diff --git a/modules/juce_core/memory/juce_Singleton.h b/modules/juce_core/memory/juce_Singleton.h
index 0935b742ee..00ea0afe09 100644
--- a/modules/juce_core/memory/juce_Singleton.h
+++ b/modules/juce_core/memory/juce_Singleton.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SINGLETON_JUCEHEADER__
-#define __JUCE_SINGLETON_JUCEHEADER__
+#ifndef JUCE_SINGLETON_H_INCLUDED
+#define JUCE_SINGLETON_H_INCLUDED
 
 
 //==============================================================================
@@ -289,4 +289,4 @@
 
 
 
-#endif   // __JUCE_SINGLETON_JUCEHEADER__
+#endif   // JUCE_SINGLETON_H_INCLUDED
diff --git a/modules/juce_core/memory/juce_WeakReference.h b/modules/juce_core/memory/juce_WeakReference.h
index 7d3ccc6cdf..ac2048a071 100644
--- a/modules/juce_core/memory/juce_WeakReference.h
+++ b/modules/juce_core/memory/juce_WeakReference.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_WEAKREFERENCE_JUCEHEADER__
-#define __JUCE_WEAKREFERENCE_JUCEHEADER__
+#ifndef JUCE_WEAKREFERENCE_H_INCLUDED
+#define JUCE_WEAKREFERENCE_H_INCLUDED
 
 #include "juce_ReferenceCountedObject.h"
 
@@ -211,4 +211,4 @@ private:
 };
 
 
-#endif   // __JUCE_WEAKREFERENCE_JUCEHEADER__
+#endif   // JUCE_WEAKREFERENCE_H_INCLUDED
diff --git a/modules/juce_core/misc/juce_Result.h b/modules/juce_core/misc/juce_Result.h
index 701059556f..4c066ebc1b 100644
--- a/modules/juce_core/misc/juce_Result.h
+++ b/modules/juce_core/misc/juce_Result.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RESULT_JUCEHEADER__
-#define __JUCE_RESULT_JUCEHEADER__
+#ifndef JUCE_RESULT_H_INCLUDED
+#define JUCE_RESULT_H_INCLUDED
 
 #include "../text/juce_String.h"
 
@@ -121,4 +121,4 @@ private:
 };
 
 
-#endif   // __JUCE_RESULT_JUCEHEADER__
+#endif   // JUCE_RESULT_H_INCLUDED
diff --git a/modules/juce_core/misc/juce_Uuid.h b/modules/juce_core/misc/juce_Uuid.h
index 878804f718..9358de008b 100644
--- a/modules/juce_core/misc/juce_Uuid.h
+++ b/modules/juce_core/misc/juce_Uuid.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_UUID_JUCEHEADER__
-#define __JUCE_UUID_JUCEHEADER__
+#ifndef JUCE_UUID_H_INCLUDED
+#define JUCE_UUID_H_INCLUDED
 
 #include "../text/juce_String.h"
 
@@ -111,4 +111,4 @@ private:
 };
 
 
-#endif   // __JUCE_UUID_JUCEHEADER__
+#endif   // JUCE_UUID_H_INCLUDED
diff --git a/modules/juce_core/misc/juce_WindowsRegistry.h b/modules/juce_core/misc/juce_WindowsRegistry.h
index e542d5fb4b..0644ce6ee7 100644
--- a/modules/juce_core/misc/juce_WindowsRegistry.h
+++ b/modules/juce_core/misc/juce_WindowsRegistry.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_WINDOWSREGISTRY_JUCEHEADER__
-#define __JUCE_WINDOWSREGISTRY_JUCEHEADER__
+#ifndef JUCE_WINDOWSREGISTRY_H_INCLUDED
+#define JUCE_WINDOWSREGISTRY_H_INCLUDED
 
 #if JUCE_WINDOWS || DOXYGEN
 
@@ -121,4 +121,4 @@ private:
 };
 
 #endif
-#endif   // __JUCE_WINDOWSREGISTRY_JUCEHEADER__
+#endif   // JUCE_WINDOWSREGISTRY_H_INCLUDED
diff --git a/modules/juce_core/native/juce_BasicNativeHeaders.h b/modules/juce_core/native/juce_BasicNativeHeaders.h
index a76b0ac490..aecfc40427 100644
--- a/modules/juce_core/native/juce_BasicNativeHeaders.h
+++ b/modules/juce_core/native/juce_BasicNativeHeaders.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BASICNATIVEHEADERS_JUCEHEADER__
-#define __JUCE_BASICNATIVEHEADERS_JUCEHEADER__
+#ifndef JUCE_BASICNATIVEHEADERS_H_INCLUDED
+#define JUCE_BASICNATIVEHEADERS_H_INCLUDED
 
 #include "../system/juce_TargetPlatform.h"
 #undef T
@@ -220,4 +220,4 @@
 #undef direct
 #undef check
 
-#endif   // __JUCE_BASICNATIVEHEADERS_JUCEHEADER__
+#endif   // JUCE_BASICNATIVEHEADERS_H_INCLUDED
diff --git a/modules/juce_core/native/juce_android_JNIHelpers.h b/modules/juce_core/native/juce_android_JNIHelpers.h
index a6bdc94e84..5c3ee0eea4 100644
--- a/modules/juce_core/native/juce_android_JNIHelpers.h
+++ b/modules/juce_core/native/juce_android_JNIHelpers.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ANDROID_JNIHELPERS_JUCEHEADER__
-#define __JUCE_ANDROID_JNIHELPERS_JUCEHEADER__
+#ifndef JUCE_ANDROID_JNIHELPERS_H_INCLUDED
+#define JUCE_ANDROID_JNIHELPERS_H_INCLUDED
 
 #if ! (defined (JUCE_ANDROID_ACTIVITY_CLASSNAME) && defined (JUCE_ANDROID_ACTIVITY_CLASSPATH))
  #error "The JUCE_ANDROID_ACTIVITY_CLASSNAME and JUCE_ANDROID_ACTIVITY_CLASSPATH macros must be set!"
@@ -404,4 +404,4 @@ DECLARE_JNI_CLASS (Matrix, "android/graphics/Matrix");
 DECLARE_JNI_CLASS (RectClass, "android/graphics/Rect");
 #undef JNI_CLASS_MEMBERS
 
-#endif   // __JUCE_ANDROID_JNIHELPERS_JUCEHEADER__
+#endif   // JUCE_ANDROID_JNIHELPERS_H_INCLUDED
diff --git a/modules/juce_core/native/juce_osx_ObjCHelpers.h b/modules/juce_core/native/juce_osx_ObjCHelpers.h
index 590a84d9f0..aa0a2be087 100644
--- a/modules/juce_core/native/juce_osx_ObjCHelpers.h
+++ b/modules/juce_core/native/juce_osx_ObjCHelpers.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OSX_OBJCHELPERS_JUCEHEADER__
-#define __JUCE_OSX_OBJCHELPERS_JUCEHEADER__
+#ifndef JUCE_OSX_OBJCHELPERS_H_INCLUDED
+#define JUCE_OSX_OBJCHELPERS_H_INCLUDED
 
 
 /* This file contains a few helper functions that are used internally but which
@@ -155,4 +155,4 @@ private:
 };
 
 
-#endif   // __JUCE_OSX_OBJCHELPERS_JUCEHEADER__
+#endif   // JUCE_OSX_OBJCHELPERS_H_INCLUDED
diff --git a/modules/juce_core/native/juce_win32_ComSmartPtr.h b/modules/juce_core/native/juce_win32_ComSmartPtr.h
index f361c2dae8..8d7c912f91 100644
--- a/modules/juce_core/native/juce_win32_ComSmartPtr.h
+++ b/modules/juce_core/native/juce_win32_ComSmartPtr.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_WIN32_COMSMARTPTR_JUCEHEADER__
-#define __JUCE_WIN32_COMSMARTPTR_JUCEHEADER__
+#ifndef JUCE_WIN32_COMSMARTPTR_H_INCLUDED
+#define JUCE_WIN32_COMSMARTPTR_H_INCLUDED
 
 #ifndef _MSC_VER
 template<typename Type> struct UUIDGetter { static CLSID get() { jassertfalse; return CLSID(); } };
@@ -167,4 +167,4 @@ public:
     }
 };
 
-#endif   // __JUCE_WIN32_COMSMARTPTR_JUCEHEADER__
+#endif   // JUCE_WIN32_COMSMARTPTR_H_INCLUDED
diff --git a/modules/juce_core/network/juce_IPAddress.h b/modules/juce_core/network/juce_IPAddress.h
index 92f8819fca..1f2f0e8101 100644
--- a/modules/juce_core/network/juce_IPAddress.h
+++ b/modules/juce_core/network/juce_IPAddress.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IPADDRESS_JUCEHEADER__
-#define __JUCE_IPADDRESS_JUCEHEADER__
+#ifndef JUCE_IPADDRESS_H_INCLUDED
+#define JUCE_IPADDRESS_H_INCLUDED
 
 
 //==============================================================================
@@ -79,4 +79,4 @@ public:
 };
 
 
-#endif   // __JUCE_IPADDRESS_JUCEHEADER__
+#endif   // JUCE_IPADDRESS_H_INCLUDED
diff --git a/modules/juce_core/network/juce_MACAddress.h b/modules/juce_core/network/juce_MACAddress.h
index 4f09c1be51..c07e1d2cf0 100644
--- a/modules/juce_core/network/juce_MACAddress.h
+++ b/modules/juce_core/network/juce_MACAddress.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MACADDRESS_JUCEHEADER__
-#define __JUCE_MACADDRESS_JUCEHEADER__
+#ifndef JUCE_MACADDRESS_H_INCLUDED
+#define JUCE_MACADDRESS_H_INCLUDED
 
 #include "../containers/juce_Array.h"
 
@@ -86,4 +86,4 @@ private:
 };
 
 
-#endif   // __JUCE_MACADDRESS_JUCEHEADER__
+#endif   // JUCE_MACADDRESS_H_INCLUDED
diff --git a/modules/juce_core/network/juce_NamedPipe.h b/modules/juce_core/network/juce_NamedPipe.h
index 7bc848998e..961b2157f2 100644
--- a/modules/juce_core/network/juce_NamedPipe.h
+++ b/modules/juce_core/network/juce_NamedPipe.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_NAMEDPIPE_JUCEHEADER__
-#define __JUCE_NAMEDPIPE_JUCEHEADER__
+#ifndef JUCE_NAMEDPIPE_H_INCLUDED
+#define JUCE_NAMEDPIPE_H_INCLUDED
 
 #include "../threads/juce_ReadWriteLock.h"
 
@@ -102,4 +102,4 @@ private:
 };
 
 
-#endif   // __JUCE_NAMEDPIPE_JUCEHEADER__
+#endif   // JUCE_NAMEDPIPE_H_INCLUDED
diff --git a/modules/juce_core/network/juce_Socket.h b/modules/juce_core/network/juce_Socket.h
index 6fb708de25..0780a1b83d 100644
--- a/modules/juce_core/network/juce_Socket.h
+++ b/modules/juce_core/network/juce_Socket.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SOCKET_JUCEHEADER__
-#define __JUCE_SOCKET_JUCEHEADER__
+#ifndef JUCE_SOCKET_H_INCLUDED
+#define JUCE_SOCKET_H_INCLUDED
 
 #include "../text/juce_String.h"
 
@@ -304,4 +304,4 @@ private:
 };
 
 
-#endif   // __JUCE_SOCKET_JUCEHEADER__
+#endif   // JUCE_SOCKET_H_INCLUDED
diff --git a/modules/juce_core/network/juce_URL.h b/modules/juce_core/network/juce_URL.h
index c4fec726bf..5578a439ed 100644
--- a/modules/juce_core/network/juce_URL.h
+++ b/modules/juce_core/network/juce_URL.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_URL_JUCEHEADER__
-#define __JUCE_URL_JUCEHEADER__
+#ifndef JUCE_URL_H_INCLUDED
+#define JUCE_URL_H_INCLUDED
 
 #include "../text/juce_StringPairArray.h"
 #include "../files/juce_File.h"
@@ -347,4 +347,4 @@ private:
 };
 
 
-#endif   // __JUCE_URL_JUCEHEADER__
+#endif   // JUCE_URL_H_INCLUDED
diff --git a/modules/juce_core/streams/juce_BufferedInputStream.h b/modules/juce_core/streams/juce_BufferedInputStream.h
index c9d581f024..47035a85f3 100644
--- a/modules/juce_core/streams/juce_BufferedInputStream.h
+++ b/modules/juce_core/streams/juce_BufferedInputStream.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BUFFEREDINPUTSTREAM_JUCEHEADER__
-#define __JUCE_BUFFEREDINPUTSTREAM_JUCEHEADER__
+#ifndef JUCE_BUFFEREDINPUTSTREAM_H_INCLUDED
+#define JUCE_BUFFEREDINPUTSTREAM_H_INCLUDED
 
 #include "juce_InputStream.h"
 #include "../memory/juce_OptionalScopedPointer.h"
@@ -93,4 +93,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (BufferedInputStream)
 };
 
-#endif   // __JUCE_BUFFEREDINPUTSTREAM_JUCEHEADER__
+#endif   // JUCE_BUFFEREDINPUTSTREAM_H_INCLUDED
diff --git a/modules/juce_core/streams/juce_FileInputSource.h b/modules/juce_core/streams/juce_FileInputSource.h
index a32dcf4152..7ce8ae9cb5 100644
--- a/modules/juce_core/streams/juce_FileInputSource.h
+++ b/modules/juce_core/streams/juce_FileInputSource.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILEINPUTSOURCE_JUCEHEADER__
-#define __JUCE_FILEINPUTSOURCE_JUCEHEADER__
+#ifndef JUCE_FILEINPUTSOURCE_H_INCLUDED
+#define JUCE_FILEINPUTSOURCE_H_INCLUDED
 
 #include "juce_InputSource.h"
 #include "../files/juce_File.h"
@@ -66,4 +66,4 @@ private:
 };
 
 
-#endif   // __JUCE_FILEINPUTSOURCE_JUCEHEADER__
+#endif   // JUCE_FILEINPUTSOURCE_H_INCLUDED
diff --git a/modules/juce_core/streams/juce_InputSource.h b/modules/juce_core/streams/juce_InputSource.h
index bd68df3f2f..8e214c4876 100644
--- a/modules/juce_core/streams/juce_InputSource.h
+++ b/modules/juce_core/streams/juce_InputSource.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_INPUTSOURCE_JUCEHEADER__
-#define __JUCE_INPUTSOURCE_JUCEHEADER__
+#ifndef JUCE_INPUTSOURCE_H_INCLUDED
+#define JUCE_INPUTSOURCE_H_INCLUDED
 
 #include "juce_InputStream.h"
 
@@ -76,4 +76,4 @@ private:
 };
 
 
-#endif   // __JUCE_INPUTSOURCE_JUCEHEADER__
+#endif   // JUCE_INPUTSOURCE_H_INCLUDED
diff --git a/modules/juce_core/streams/juce_InputStream.h b/modules/juce_core/streams/juce_InputStream.h
index fb0f43e747..26cae01ab2 100644
--- a/modules/juce_core/streams/juce_InputStream.h
+++ b/modules/juce_core/streams/juce_InputStream.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_INPUTSTREAM_JUCEHEADER__
-#define __JUCE_INPUTSTREAM_JUCEHEADER__
+#ifndef JUCE_INPUTSTREAM_H_INCLUDED
+#define JUCE_INPUTSTREAM_H_INCLUDED
 
 #include "../text/juce_String.h"
 class MemoryBlock;
@@ -295,4 +295,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (InputStream)
 };
 
-#endif   // __JUCE_INPUTSTREAM_JUCEHEADER__
+#endif   // JUCE_INPUTSTREAM_H_INCLUDED
diff --git a/modules/juce_core/streams/juce_MemoryInputStream.h b/modules/juce_core/streams/juce_MemoryInputStream.h
index 8282a74e81..509c3eb290 100644
--- a/modules/juce_core/streams/juce_MemoryInputStream.h
+++ b/modules/juce_core/streams/juce_MemoryInputStream.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MEMORYINPUTSTREAM_JUCEHEADER__
-#define __JUCE_MEMORYINPUTSTREAM_JUCEHEADER__
+#ifndef JUCE_MEMORYINPUTSTREAM_H_INCLUDED
+#define JUCE_MEMORYINPUTSTREAM_H_INCLUDED
 
 #include "juce_InputStream.h"
 #include "../memory/juce_HeapBlock.h"
@@ -97,4 +97,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MemoryInputStream)
 };
 
-#endif   // __JUCE_MEMORYINPUTSTREAM_JUCEHEADER__
+#endif   // JUCE_MEMORYINPUTSTREAM_H_INCLUDED
diff --git a/modules/juce_core/streams/juce_MemoryOutputStream.h b/modules/juce_core/streams/juce_MemoryOutputStream.h
index f101543a96..56f732e23c 100644
--- a/modules/juce_core/streams/juce_MemoryOutputStream.h
+++ b/modules/juce_core/streams/juce_MemoryOutputStream.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MEMORYOUTPUTSTREAM_JUCEHEADER__
-#define __JUCE_MEMORYOUTPUTSTREAM_JUCEHEADER__
+#ifndef JUCE_MEMORYOUTPUTSTREAM_H_INCLUDED
+#define JUCE_MEMORYOUTPUTSTREAM_H_INCLUDED
 
 #include "juce_OutputStream.h"
 #include "../memory/juce_MemoryBlock.h"
@@ -133,4 +133,4 @@ private:
 OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const MemoryOutputStream& streamToRead);
 
 
-#endif   // __JUCE_MEMORYOUTPUTSTREAM_JUCEHEADER__
+#endif   // JUCE_MEMORYOUTPUTSTREAM_H_INCLUDED
diff --git a/modules/juce_core/streams/juce_OutputStream.h b/modules/juce_core/streams/juce_OutputStream.h
index 00a0a6c826..beb7d3b909 100644
--- a/modules/juce_core/streams/juce_OutputStream.h
+++ b/modules/juce_core/streams/juce_OutputStream.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OUTPUTSTREAM_JUCEHEADER__
-#define __JUCE_OUTPUTSTREAM_JUCEHEADER__
+#ifndef JUCE_OUTPUTSTREAM_H_INCLUDED
+#define JUCE_OUTPUTSTREAM_H_INCLUDED
 
 #include "../text/juce_String.h"
 #include "../text/juce_NewLine.h"
@@ -281,4 +281,4 @@ JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, InputStre
 JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const NewLine&);
 
 
-#endif   // __JUCE_OUTPUTSTREAM_JUCEHEADER__
+#endif   // JUCE_OUTPUTSTREAM_H_INCLUDED
diff --git a/modules/juce_core/streams/juce_SubregionStream.h b/modules/juce_core/streams/juce_SubregionStream.h
index e92b6e1187..323c249217 100644
--- a/modules/juce_core/streams/juce_SubregionStream.h
+++ b/modules/juce_core/streams/juce_SubregionStream.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SUBREGIONSTREAM_JUCEHEADER__
-#define __JUCE_SUBREGIONSTREAM_JUCEHEADER__
+#ifndef JUCE_SUBREGIONSTREAM_H_INCLUDED
+#define JUCE_SUBREGIONSTREAM_H_INCLUDED
 
 #include "juce_InputStream.h"
 #include "../memory/juce_OptionalScopedPointer.h"
@@ -88,4 +88,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SubregionStream)
 };
 
-#endif   // __JUCE_SUBREGIONSTREAM_JUCEHEADER__
+#endif   // JUCE_SUBREGIONSTREAM_H_INCLUDED
diff --git a/modules/juce_core/system/juce_PlatformDefs.h b/modules/juce_core/system/juce_PlatformDefs.h
index a5abe4165c..3d2c34c86e 100644
--- a/modules/juce_core/system/juce_PlatformDefs.h
+++ b/modules/juce_core/system/juce_PlatformDefs.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PLATFORMDEFS_JUCEHEADER__
-#define __JUCE_PLATFORMDEFS_JUCEHEADER__
+#ifndef JUCE_PLATFORMDEFS_H_INCLUDED
+#define JUCE_PLATFORMDEFS_H_INCLUDED
 
 //==============================================================================
 /*  This file defines miscellaneous macros for debugging, assertions, etc.
@@ -366,4 +366,4 @@ namespace juce
  #define override
 #endif
 
-#endif   // __JUCE_PLATFORMDEFS_JUCEHEADER__
+#endif   // JUCE_PLATFORMDEFS_H_INCLUDED
diff --git a/modules/juce_core/system/juce_StandardHeader.h b/modules/juce_core/system/juce_StandardHeader.h
index 5fa3c0750f..6262f64a7c 100644
--- a/modules/juce_core/system/juce_StandardHeader.h
+++ b/modules/juce_core/system/juce_StandardHeader.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_STANDARDHEADER_JUCEHEADER__
-#define __JUCE_STANDARDHEADER_JUCEHEADER__
+#ifndef JUCE_STANDARDHEADER_H_INCLUDED
+#define JUCE_STANDARDHEADER_H_INCLUDED
 
 //==============================================================================
 /** Current JUCE version number.
@@ -168,4 +168,4 @@ namespace juce
     #include "../memory/juce_LeakedObjectDetector.h"
 }
 
-#endif   // __JUCE_STANDARDHEADER_JUCEHEADER__
+#endif   // JUCE_STANDARDHEADER_H_INCLUDED
diff --git a/modules/juce_core/system/juce_SystemStats.h b/modules/juce_core/system/juce_SystemStats.h
index 60c7788f02..951c89a437 100644
--- a/modules/juce_core/system/juce_SystemStats.h
+++ b/modules/juce_core/system/juce_SystemStats.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SYSTEMSTATS_JUCEHEADER__
-#define __JUCE_SYSTEMSTATS_JUCEHEADER__
+#ifndef JUCE_SYSTEMSTATS_H_INCLUDED
+#define JUCE_SYSTEMSTATS_H_INCLUDED
 
 #include "../text/juce_StringArray.h"
 
@@ -203,4 +203,4 @@ private:
 };
 
 
-#endif   // __JUCE_SYSTEMSTATS_JUCEHEADER__
+#endif   // JUCE_SYSTEMSTATS_H_INCLUDED
diff --git a/modules/juce_core/system/juce_TargetPlatform.h b/modules/juce_core/system/juce_TargetPlatform.h
index 79d9fe1be6..f6169dd82a 100644
--- a/modules/juce_core/system/juce_TargetPlatform.h
+++ b/modules/juce_core/system/juce_TargetPlatform.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TARGETPLATFORM_JUCEHEADER__
-#define __JUCE_TARGETPLATFORM_JUCEHEADER__
+#ifndef JUCE_TARGETPLATFORM_H_INCLUDED
+#define JUCE_TARGETPLATFORM_H_INCLUDED
 
 //==============================================================================
 /*  This file figures out which platform is being built, and defines some macros
@@ -202,4 +202,4 @@
   #error unknown compiler
 #endif
 
-#endif   // __JUCE_TARGETPLATFORM_JUCEHEADER__
+#endif   // JUCE_TARGETPLATFORM_H_INCLUDED
diff --git a/modules/juce_core/text/juce_CharPointer_ASCII.h b/modules/juce_core/text/juce_CharPointer_ASCII.h
index ed9fd0360d..a966543b56 100644
--- a/modules/juce_core/text/juce_CharPointer_ASCII.h
+++ b/modules/juce_core/text/juce_CharPointer_ASCII.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CHARPOINTER_ASCII_JUCEHEADER__
-#define __JUCE_CHARPOINTER_ASCII_JUCEHEADER__
+#ifndef JUCE_CHARPOINTER_ASCII_H_INCLUDED
+#define JUCE_CHARPOINTER_ASCII_H_INCLUDED
 
 
 //==============================================================================
@@ -384,4 +384,4 @@ private:
 };
 
 
-#endif   // __JUCE_CHARPOINTER_ASCII_JUCEHEADER__
+#endif   // JUCE_CHARPOINTER_ASCII_H_INCLUDED
diff --git a/modules/juce_core/text/juce_CharPointer_UTF16.h b/modules/juce_core/text/juce_CharPointer_UTF16.h
index eacbb9932f..c4de13bc92 100644
--- a/modules/juce_core/text/juce_CharPointer_UTF16.h
+++ b/modules/juce_core/text/juce_CharPointer_UTF16.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CHARPOINTER_UTF16_JUCEHEADER__
-#define __JUCE_CHARPOINTER_UTF16_JUCEHEADER__
+#ifndef JUCE_CHARPOINTER_UTF16_H_INCLUDED
+#define JUCE_CHARPOINTER_UTF16_H_INCLUDED
 
 
 //==============================================================================
@@ -498,4 +498,4 @@ private:
 };
 
 
-#endif   // __JUCE_CHARPOINTER_UTF16_JUCEHEADER__
+#endif   // JUCE_CHARPOINTER_UTF16_H_INCLUDED
diff --git a/modules/juce_core/text/juce_CharPointer_UTF32.h b/modules/juce_core/text/juce_CharPointer_UTF32.h
index daed787f15..7a24b96447 100644
--- a/modules/juce_core/text/juce_CharPointer_UTF32.h
+++ b/modules/juce_core/text/juce_CharPointer_UTF32.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CHARPOINTER_UTF32_JUCEHEADER__
-#define __JUCE_CHARPOINTER_UTF32_JUCEHEADER__
+#ifndef JUCE_CHARPOINTER_UTF32_H_INCLUDED
+#define JUCE_CHARPOINTER_UTF32_H_INCLUDED
 
 
 //==============================================================================
@@ -375,4 +375,4 @@ private:
 };
 
 
-#endif   // __JUCE_CHARPOINTER_UTF32_JUCEHEADER__
+#endif   // JUCE_CHARPOINTER_UTF32_H_INCLUDED
diff --git a/modules/juce_core/text/juce_CharPointer_UTF8.h b/modules/juce_core/text/juce_CharPointer_UTF8.h
index 3113b36547..25d0040770 100644
--- a/modules/juce_core/text/juce_CharPointer_UTF8.h
+++ b/modules/juce_core/text/juce_CharPointer_UTF8.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CHARPOINTER_UTF8_JUCEHEADER__
-#define __JUCE_CHARPOINTER_UTF8_JUCEHEADER__
+#ifndef JUCE_CHARPOINTER_UTF8_H_INCLUDED
+#define JUCE_CHARPOINTER_UTF8_H_INCLUDED
 
 //==============================================================================
 /**
@@ -562,4 +562,4 @@ private:
     CharType* data;
 };
 
-#endif   // __JUCE_CHARPOINTER_UTF8_JUCEHEADER__
+#endif   // JUCE_CHARPOINTER_UTF8_H_INCLUDED
diff --git a/modules/juce_core/text/juce_CharacterFunctions.h b/modules/juce_core/text/juce_CharacterFunctions.h
index 8381d6e733..d2cdc1208c 100644
--- a/modules/juce_core/text/juce_CharacterFunctions.h
+++ b/modules/juce_core/text/juce_CharacterFunctions.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CHARACTERFUNCTIONS_JUCEHEADER__
-#define __JUCE_CHARACTERFUNCTIONS_JUCEHEADER__
+#ifndef JUCE_CHARACTERFUNCTIONS_H_INCLUDED
+#define JUCE_CHARACTERFUNCTIONS_H_INCLUDED
 
 
 //==============================================================================
@@ -584,4 +584,4 @@ private:
 };
 
 
-#endif   // __JUCE_CHARACTERFUNCTIONS_JUCEHEADER__
+#endif   // JUCE_CHARACTERFUNCTIONS_H_INCLUDED
diff --git a/modules/juce_core/text/juce_Identifier.h b/modules/juce_core/text/juce_Identifier.h
index 943261b544..8ab1fd81f5 100644
--- a/modules/juce_core/text/juce_Identifier.h
+++ b/modules/juce_core/text/juce_Identifier.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IDENTIFIER_JUCEHEADER__
-#define __JUCE_IDENTIFIER_JUCEHEADER__
+#ifndef JUCE_IDENTIFIER_H_INCLUDED
+#define JUCE_IDENTIFIER_H_INCLUDED
 
 class StringPool;
 
@@ -108,4 +108,4 @@ private:
 };
 
 
-#endif   // __JUCE_IDENTIFIER_JUCEHEADER__
+#endif   // JUCE_IDENTIFIER_H_INCLUDED
diff --git a/modules/juce_core/text/juce_LocalisedStrings.h b/modules/juce_core/text/juce_LocalisedStrings.h
index e063be6329..0781a8a918 100644
--- a/modules/juce_core/text/juce_LocalisedStrings.h
+++ b/modules/juce_core/text/juce_LocalisedStrings.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LOCALISEDSTRINGS_JUCEHEADER__
-#define __JUCE_LOCALISEDSTRINGS_JUCEHEADER__
+#ifndef JUCE_LOCALISEDSTRINGS_H_INCLUDED
+#define JUCE_LOCALISEDSTRINGS_H_INCLUDED
 
 #include "juce_StringPairArray.h"
 #include "../files/juce_File.h"
@@ -221,4 +221,4 @@ String translate (const char* stringLiteral);
 String translate (const String& stringLiteral, const String& resultIfNotFound);
 
 
-#endif   // __JUCE_LOCALISEDSTRINGS_JUCEHEADER__
+#endif   // JUCE_LOCALISEDSTRINGS_H_INCLUDED
diff --git a/modules/juce_core/text/juce_NewLine.h b/modules/juce_core/text/juce_NewLine.h
index 878b1a3d62..7dcb6ab6cd 100644
--- a/modules/juce_core/text/juce_NewLine.h
+++ b/modules/juce_core/text/juce_NewLine.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_NEWLINE_JUCEHEADER__
-#define __JUCE_NEWLINE_JUCEHEADER__
+#ifndef JUCE_NEWLINE_H_INCLUDED
+#define JUCE_NEWLINE_H_INCLUDED
 
 
 //==============================================================================
@@ -75,4 +75,4 @@ extern NewLine newLine;
 JUCE_API String& JUCE_CALLTYPE operator<< (String& string1, const NewLine&);
 
 
-#endif   // __JUCE_NEWLINE_JUCEHEADER__
+#endif   // JUCE_NEWLINE_H_INCLUDED
diff --git a/modules/juce_core/text/juce_String.h b/modules/juce_core/text/juce_String.h
index b5183d4eb0..e1012a5c80 100644
--- a/modules/juce_core/text/juce_String.h
+++ b/modules/juce_core/text/juce_String.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_STRING_JUCEHEADER__
-#define __JUCE_STRING_JUCEHEADER__
+#ifndef JUCE_STRING_H_INCLUDED
+#define JUCE_STRING_H_INCLUDED
 
 #include "juce_CharacterFunctions.h"
 
@@ -1348,4 +1348,4 @@ std::basic_ostream <wchar_t, traits>& JUCE_CALLTYPE operator<< (std::basic_ostre
 JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const String& stringToWrite);
 
 
-#endif   // __JUCE_STRING_JUCEHEADER__
+#endif   // JUCE_STRING_H_INCLUDED
diff --git a/modules/juce_core/text/juce_StringArray.h b/modules/juce_core/text/juce_StringArray.h
index b14f63f7f0..cc11a4fbcb 100644
--- a/modules/juce_core/text/juce_StringArray.h
+++ b/modules/juce_core/text/juce_StringArray.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_STRINGARRAY_JUCEHEADER__
-#define __JUCE_STRINGARRAY_JUCEHEADER__
+#ifndef JUCE_STRINGARRAY_H_INCLUDED
+#define JUCE_STRINGARRAY_H_INCLUDED
 
 #include "juce_String.h"
 #include "../containers/juce_Array.h"
@@ -416,4 +416,4 @@ private:
 };
 
 
-#endif   // __JUCE_STRINGARRAY_JUCEHEADER__
+#endif   // JUCE_STRINGARRAY_H_INCLUDED
diff --git a/modules/juce_core/text/juce_StringPairArray.h b/modules/juce_core/text/juce_StringPairArray.h
index 360a018fad..b6ace332b7 100644
--- a/modules/juce_core/text/juce_StringPairArray.h
+++ b/modules/juce_core/text/juce_StringPairArray.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_STRINGPAIRARRAY_JUCEHEADER__
-#define __JUCE_STRINGPAIRARRAY_JUCEHEADER__
+#ifndef JUCE_STRINGPAIRARRAY_H_INCLUDED
+#define JUCE_STRINGPAIRARRAY_H_INCLUDED
 
 #include "juce_StringArray.h"
 
@@ -160,4 +160,4 @@ private:
 };
 
 
-#endif   // __JUCE_STRINGPAIRARRAY_JUCEHEADER__
+#endif   // JUCE_STRINGPAIRARRAY_H_INCLUDED
diff --git a/modules/juce_core/text/juce_StringPool.h b/modules/juce_core/text/juce_StringPool.h
index dfc77441ee..d4aa05823e 100644
--- a/modules/juce_core/text/juce_StringPool.h
+++ b/modules/juce_core/text/juce_StringPool.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_STRINGPOOL_JUCEHEADER__
-#define __JUCE_STRINGPOOL_JUCEHEADER__
+#ifndef JUCE_STRINGPOOL_H_INCLUDED
+#define JUCE_STRINGPOOL_H_INCLUDED
 
 #include "juce_String.h"
 #include "../containers/juce_Array.h"
@@ -92,4 +92,4 @@ private:
 };
 
 
-#endif   // __JUCE_STRINGPOOL_JUCEHEADER__
+#endif   // JUCE_STRINGPOOL_H_INCLUDED
diff --git a/modules/juce_core/text/juce_TextDiff.h b/modules/juce_core/text/juce_TextDiff.h
index deee9b1421..d420c3d859 100644
--- a/modules/juce_core/text/juce_TextDiff.h
+++ b/modules/juce_core/text/juce_TextDiff.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TEXTDIFF_JUCEHEADER__
-#define __JUCE_TEXTDIFF_JUCEHEADER__
+#ifndef JUCE_TEXTDIFF_H_INCLUDED
+#define JUCE_TEXTDIFF_H_INCLUDED
 
 
 /**
@@ -77,4 +77,4 @@ public:
 };
 
 
-#endif   // __JUCE_TEXTDIFF_JUCEHEADER__
+#endif   // JUCE_TEXTDIFF_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_ChildProcess.h b/modules/juce_core/threads/juce_ChildProcess.h
index 4f1442f72e..574ac9fa6a 100644
--- a/modules/juce_core/threads/juce_ChildProcess.h
+++ b/modules/juce_core/threads/juce_ChildProcess.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CHILDPROCESS_JUCEHEADER__
-#define __JUCE_CHILDPROCESS_JUCEHEADER__
+#ifndef JUCE_CHILDPROCESS_H_INCLUDED
+#define JUCE_CHILDPROCESS_H_INCLUDED
 
 
 //==============================================================================
@@ -102,4 +102,4 @@ private:
 };
 
 
-#endif   // __JUCE_CHILDPROCESS_JUCEHEADER__
+#endif   // JUCE_CHILDPROCESS_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_CriticalSection.h b/modules/juce_core/threads/juce_CriticalSection.h
index 38afac068f..8677f4e71b 100644
--- a/modules/juce_core/threads/juce_CriticalSection.h
+++ b/modules/juce_core/threads/juce_CriticalSection.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CRITICALSECTION_JUCEHEADER__
-#define __JUCE_CRITICALSECTION_JUCEHEADER__
+#ifndef JUCE_CRITICALSECTION_H_INCLUDED
+#define JUCE_CRITICALSECTION_H_INCLUDED
 
 #include "juce_ScopedLock.h"
 
@@ -254,4 +254,4 @@ typedef CriticalSection::ScopedUnlockType  ScopedUnlock;
 typedef CriticalSection::ScopedTryLockType  ScopedTryLock;
 
 
-#endif   // __JUCE_CRITICALSECTION_JUCEHEADER__
+#endif   // JUCE_CRITICALSECTION_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_DynamicLibrary.h b/modules/juce_core/threads/juce_DynamicLibrary.h
index 84d93e2702..df6625b540 100644
--- a/modules/juce_core/threads/juce_DynamicLibrary.h
+++ b/modules/juce_core/threads/juce_DynamicLibrary.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DYNAMICLIBRARY_JUCEHEADER__
-#define __JUCE_DYNAMICLIBRARY_JUCEHEADER__
+#ifndef JUCE_DYNAMICLIBRARY_H_INCLUDED
+#define JUCE_DYNAMICLIBRARY_H_INCLUDED
 
 /**
     Handles the opening and closing of DLLs.
@@ -82,4 +82,4 @@ private:
 };
 
 
-#endif   // __JUCE_DYNAMICLIBRARY_JUCEHEADER__
+#endif   // JUCE_DYNAMICLIBRARY_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_HighResolutionTimer.h b/modules/juce_core/threads/juce_HighResolutionTimer.h
index f102ffa104..aae8390f9b 100644
--- a/modules/juce_core/threads/juce_HighResolutionTimer.h
+++ b/modules/juce_core/threads/juce_HighResolutionTimer.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_HIGHRESOLUTIONTIMER_JUCEHEADER__
-#define __JUCE_HIGHRESOLUTIONTIMER_JUCEHEADER__
+#ifndef JUCE_HIGHRESOLUTIONTIMER_H_INCLUDED
+#define JUCE_HIGHRESOLUTIONTIMER_H_INCLUDED
 
 /**
     A high-resolution periodic timer.
@@ -106,4 +106,4 @@ private:
 };
 
 
-#endif   // __JUCE_HIGHRESOLUTIONTIMER_JUCEHEADER__
+#endif   // JUCE_HIGHRESOLUTIONTIMER_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_InterProcessLock.h b/modules/juce_core/threads/juce_InterProcessLock.h
index 2384bbdce2..654c2e8a55 100644
--- a/modules/juce_core/threads/juce_InterProcessLock.h
+++ b/modules/juce_core/threads/juce_InterProcessLock.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_INTERPROCESSLOCK_JUCEHEADER__
-#define __JUCE_INTERPROCESSLOCK_JUCEHEADER__
+#ifndef JUCE_INTERPROCESSLOCK_H_INCLUDED
+#define JUCE_INTERPROCESSLOCK_H_INCLUDED
 
 #include "../text/juce_String.h"
 #include "../memory/juce_ScopedPointer.h"
@@ -128,4 +128,4 @@ private:
 };
 
 
-#endif   // __JUCE_INTERPROCESSLOCK_JUCEHEADER__
+#endif   // JUCE_INTERPROCESSLOCK_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_Process.h b/modules/juce_core/threads/juce_Process.h
index 3eb787ab7b..27d2b7eeb1 100644
--- a/modules/juce_core/threads/juce_Process.h
+++ b/modules/juce_core/threads/juce_Process.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PROCESS_JUCEHEADER__
-#define __JUCE_PROCESS_JUCEHEADER__
+#ifndef JUCE_PROCESS_H_INCLUDED
+#define JUCE_PROCESS_H_INCLUDED
 
 #include "../text/juce_String.h"
 
@@ -149,4 +149,4 @@ private:
 };
 
 
-#endif   // __JUCE_PROCESS_JUCEHEADER__
+#endif   // JUCE_PROCESS_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_ReadWriteLock.h b/modules/juce_core/threads/juce_ReadWriteLock.h
index d5c1041670..c5be7c77a6 100644
--- a/modules/juce_core/threads/juce_ReadWriteLock.h
+++ b/modules/juce_core/threads/juce_ReadWriteLock.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_READWRITELOCK_JUCEHEADER__
-#define __JUCE_READWRITELOCK_JUCEHEADER__
+#ifndef JUCE_READWRITELOCK_H_INCLUDED
+#define JUCE_READWRITELOCK_H_INCLUDED
 
 #include "juce_CriticalSection.h"
 #include "juce_SpinLock.h"
@@ -156,4 +156,4 @@ private:
 };
 
 
-#endif   // __JUCE_READWRITELOCK_JUCEHEADER__
+#endif   // JUCE_READWRITELOCK_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_ScopedLock.h b/modules/juce_core/threads/juce_ScopedLock.h
index 889e7f6610..442551add9 100644
--- a/modules/juce_core/threads/juce_ScopedLock.h
+++ b/modules/juce_core/threads/juce_ScopedLock.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SCOPEDLOCK_JUCEHEADER__
-#define __JUCE_SCOPEDLOCK_JUCEHEADER__
+#ifndef JUCE_SCOPEDLOCK_H_INCLUDED
+#define JUCE_SCOPEDLOCK_H_INCLUDED
 
 
 //==============================================================================
@@ -234,4 +234,4 @@ private:
 };
 
 
-#endif   // __JUCE_SCOPEDLOCK_JUCEHEADER__
+#endif   // JUCE_SCOPEDLOCK_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_ScopedReadLock.h b/modules/juce_core/threads/juce_ScopedReadLock.h
index 084775c10d..874195be42 100644
--- a/modules/juce_core/threads/juce_ScopedReadLock.h
+++ b/modules/juce_core/threads/juce_ScopedReadLock.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SCOPEDREADLOCK_JUCEHEADER__
-#define __JUCE_SCOPEDREADLOCK_JUCEHEADER__
+#ifndef JUCE_SCOPEDREADLOCK_H_INCLUDED
+#define JUCE_SCOPEDREADLOCK_H_INCLUDED
 
 #include "juce_ReadWriteLock.h"
 
@@ -89,4 +89,4 @@ private:
 };
 
 
-#endif   // __JUCE_SCOPEDREADLOCK_JUCEHEADER__
+#endif   // JUCE_SCOPEDREADLOCK_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_ScopedWriteLock.h b/modules/juce_core/threads/juce_ScopedWriteLock.h
index 332314a442..f4a8e329a9 100644
--- a/modules/juce_core/threads/juce_ScopedWriteLock.h
+++ b/modules/juce_core/threads/juce_ScopedWriteLock.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SCOPEDWRITELOCK_JUCEHEADER__
-#define __JUCE_SCOPEDWRITELOCK_JUCEHEADER__
+#ifndef JUCE_SCOPEDWRITELOCK_H_INCLUDED
+#define JUCE_SCOPEDWRITELOCK_H_INCLUDED
 
 #include "juce_ReadWriteLock.h"
 
@@ -89,4 +89,4 @@ private:
 };
 
 
-#endif   // __JUCE_SCOPEDWRITELOCK_JUCEHEADER__
+#endif   // JUCE_SCOPEDWRITELOCK_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_SpinLock.h b/modules/juce_core/threads/juce_SpinLock.h
index 910bded8e6..e7a450560a 100644
--- a/modules/juce_core/threads/juce_SpinLock.h
+++ b/modules/juce_core/threads/juce_SpinLock.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SPINLOCK_JUCEHEADER__
-#define __JUCE_SPINLOCK_JUCEHEADER__
+#ifndef JUCE_SPINLOCK_H_INCLUDED
+#define JUCE_SPINLOCK_H_INCLUDED
 
 #include "juce_ScopedLock.h"
 
@@ -90,4 +90,4 @@ private:
 };
 
 
-#endif   // __JUCE_SPINLOCK_JUCEHEADER__
+#endif   // JUCE_SPINLOCK_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_Thread.h b/modules/juce_core/threads/juce_Thread.h
index c2d240dbd4..1f6cff3043 100644
--- a/modules/juce_core/threads/juce_Thread.h
+++ b/modules/juce_core/threads/juce_Thread.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_THREAD_JUCEHEADER__
-#define __JUCE_THREAD_JUCEHEADER__
+#ifndef JUCE_THREAD_H_INCLUDED
+#define JUCE_THREAD_H_INCLUDED
 
 #include "juce_WaitableEvent.h"
 #include "juce_CriticalSection.h"
@@ -289,4 +289,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Thread)
 };
 
-#endif   // __JUCE_THREAD_JUCEHEADER__
+#endif   // JUCE_THREAD_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_ThreadLocalValue.h b/modules/juce_core/threads/juce_ThreadLocalValue.h
index 22525c0751..5cb13672ed 100644
--- a/modules/juce_core/threads/juce_ThreadLocalValue.h
+++ b/modules/juce_core/threads/juce_ThreadLocalValue.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_THREADLOCALVALUE_JUCEHEADER__
-#define __JUCE_THREADLOCALVALUE_JUCEHEADER__
+#ifndef JUCE_THREADLOCALVALUE_H_INCLUDED
+#define JUCE_THREADLOCALVALUE_H_INCLUDED
 
 // (NB: on win32, native thread-locals aren't possible in a dynamically loaded DLL in XP).
 #if ! ((JUCE_MSVC && (JUCE_64BIT || ! defined (JucePlugin_PluginCode))) \
@@ -196,4 +196,4 @@ private:
 };
 
 
-#endif   // __JUCE_THREADLOCALVALUE_JUCEHEADER__
+#endif   // JUCE_THREADLOCALVALUE_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_ThreadPool.h b/modules/juce_core/threads/juce_ThreadPool.h
index 4a0c208445..f91bb54923 100644
--- a/modules/juce_core/threads/juce_ThreadPool.h
+++ b/modules/juce_core/threads/juce_ThreadPool.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_THREADPOOL_JUCEHEADER__
-#define __JUCE_THREADPOOL_JUCEHEADER__
+#ifndef JUCE_THREADPOOL_H_INCLUDED
+#define JUCE_THREADPOOL_H_INCLUDED
 
 #include "juce_Thread.h"
 #include "../text/juce_StringArray.h"
@@ -315,4 +315,4 @@ private:
 };
 
 
-#endif   // __JUCE_THREADPOOL_JUCEHEADER__
+#endif   // JUCE_THREADPOOL_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_TimeSliceThread.h b/modules/juce_core/threads/juce_TimeSliceThread.h
index 314a019d6b..b98fb33610 100644
--- a/modules/juce_core/threads/juce_TimeSliceThread.h
+++ b/modules/juce_core/threads/juce_TimeSliceThread.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TIMESLICETHREAD_JUCEHEADER__
-#define __JUCE_TIMESLICETHREAD_JUCEHEADER__
+#ifndef JUCE_TIMESLICETHREAD_H_INCLUDED
+#define JUCE_TIMESLICETHREAD_H_INCLUDED
 
 #include "juce_Thread.h"
 #include "../containers/juce_Array.h"
@@ -149,4 +149,4 @@ private:
 };
 
 
-#endif   // __JUCE_TIMESLICETHREAD_JUCEHEADER__
+#endif   // JUCE_TIMESLICETHREAD_H_INCLUDED
diff --git a/modules/juce_core/threads/juce_WaitableEvent.h b/modules/juce_core/threads/juce_WaitableEvent.h
index 94197d3ebc..47843b5022 100644
--- a/modules/juce_core/threads/juce_WaitableEvent.h
+++ b/modules/juce_core/threads/juce_WaitableEvent.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_WAITABLEEVENT_JUCEHEADER__
-#define __JUCE_WAITABLEEVENT_JUCEHEADER__
+#ifndef JUCE_WAITABLEEVENT_H_INCLUDED
+#define JUCE_WAITABLEEVENT_H_INCLUDED
 
 #include "../text/juce_String.h"
 
@@ -116,4 +116,4 @@ private:
 };
 
 
-#endif   // __JUCE_WAITABLEEVENT_JUCEHEADER__
+#endif   // JUCE_WAITABLEEVENT_H_INCLUDED
diff --git a/modules/juce_core/time/juce_PerformanceCounter.h b/modules/juce_core/time/juce_PerformanceCounter.h
index ff2822afed..d4088a24c0 100644
--- a/modules/juce_core/time/juce_PerformanceCounter.h
+++ b/modules/juce_core/time/juce_PerformanceCounter.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PERFORMANCECOUNTER_JUCEHEADER__
-#define __JUCE_PERFORMANCECOUNTER_JUCEHEADER__
+#ifndef JUCE_PERFORMANCECOUNTER_H_INCLUDED
+#define JUCE_PERFORMANCECOUNTER_H_INCLUDED
 
 #include "../files/juce_File.h"
 
@@ -105,4 +105,4 @@ private:
     File outputFile;
 };
 
-#endif   // __JUCE_PERFORMANCECOUNTER_JUCEHEADER__
+#endif   // JUCE_PERFORMANCECOUNTER_H_INCLUDED
diff --git a/modules/juce_core/time/juce_RelativeTime.h b/modules/juce_core/time/juce_RelativeTime.h
index 7e3c8090fd..7116230bd2 100644
--- a/modules/juce_core/time/juce_RelativeTime.h
+++ b/modules/juce_core/time/juce_RelativeTime.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RELATIVETIME_JUCEHEADER__
-#define __JUCE_RELATIVETIME_JUCEHEADER__
+#ifndef JUCE_RELATIVETIME_H_INCLUDED
+#define JUCE_RELATIVETIME_H_INCLUDED
 
 #include "../text/juce_String.h"
 
@@ -178,4 +178,4 @@ RelativeTime  operator-  (RelativeTime t1, RelativeTime t2) noexcept;
 
 
 
-#endif   // __JUCE_RELATIVETIME_JUCEHEADER__
+#endif   // JUCE_RELATIVETIME_H_INCLUDED
diff --git a/modules/juce_core/time/juce_Time.h b/modules/juce_core/time/juce_Time.h
index 2971aafe65..5fa7cee475 100644
--- a/modules/juce_core/time/juce_Time.h
+++ b/modules/juce_core/time/juce_Time.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TIME_JUCEHEADER__
-#define __JUCE_TIME_JUCEHEADER__
+#ifndef JUCE_TIME_H_INCLUDED
+#define JUCE_TIME_H_INCLUDED
 
 #include "juce_RelativeTime.h"
 
@@ -403,4 +403,4 @@ JUCE_API bool operator>  (Time time1, Time time2);
 JUCE_API bool operator>= (Time time1, Time time2);
 
 
-#endif   // __JUCE_TIME_JUCEHEADER__
+#endif   // JUCE_TIME_H_INCLUDED
diff --git a/modules/juce_core/unit_tests/juce_UnitTest.h b/modules/juce_core/unit_tests/juce_UnitTest.h
index 0de339ff82..522c8f9b88 100644
--- a/modules/juce_core/unit_tests/juce_UnitTest.h
+++ b/modules/juce_core/unit_tests/juce_UnitTest.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_UNITTEST_JUCEHEADER__
-#define __JUCE_UNITTEST_JUCEHEADER__
+#ifndef JUCE_UNITTEST_H_INCLUDED
+#define JUCE_UNITTEST_H_INCLUDED
 
 #include "../text/juce_StringArray.h"
 #include "../containers/juce_OwnedArray.h"
@@ -287,4 +287,4 @@ private:
 };
 
 
-#endif   // __JUCE_UNITTEST_JUCEHEADER__
+#endif   // JUCE_UNITTEST_H_INCLUDED
diff --git a/modules/juce_core/xml/juce_XmlDocument.h b/modules/juce_core/xml/juce_XmlDocument.h
index db9c31d0b9..48a6c3f5fc 100644
--- a/modules/juce_core/xml/juce_XmlDocument.h
+++ b/modules/juce_core/xml/juce_XmlDocument.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_XMLDOCUMENT_JUCEHEADER__
-#define __JUCE_XMLDOCUMENT_JUCEHEADER__
+#ifndef JUCE_XMLDOCUMENT_H_INCLUDED
+#define JUCE_XMLDOCUMENT_H_INCLUDED
 
 #include "juce_XmlElement.h"
 #include "../text/juce_StringArray.h"
@@ -183,4 +183,4 @@ private:
 };
 
 
-#endif   // __JUCE_XMLDOCUMENT_JUCEHEADER__
+#endif   // JUCE_XMLDOCUMENT_H_INCLUDED
diff --git a/modules/juce_core/xml/juce_XmlElement.h b/modules/juce_core/xml/juce_XmlElement.h
index a7f3e7cdb9..89c97c1788 100644
--- a/modules/juce_core/xml/juce_XmlElement.h
+++ b/modules/juce_core/xml/juce_XmlElement.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_XMLELEMENT_JUCEHEADER__
-#define __JUCE_XMLELEMENT_JUCEHEADER__
+#ifndef JUCE_XMLELEMENT_H_INCLUDED
+#define JUCE_XMLELEMENT_H_INCLUDED
 
 #include "../text/juce_String.h"
 #include "../streams/juce_OutputStream.h"
@@ -736,4 +736,4 @@ private:
 };
 
 
-#endif   // __JUCE_XMLELEMENT_JUCEHEADER__
+#endif   // JUCE_XMLELEMENT_H_INCLUDED
diff --git a/modules/juce_core/zip/juce_GZIPCompressorOutputStream.h b/modules/juce_core/zip/juce_GZIPCompressorOutputStream.h
index ca3bcc0a3b..9a2b936811 100644
--- a/modules/juce_core/zip/juce_GZIPCompressorOutputStream.h
+++ b/modules/juce_core/zip/juce_GZIPCompressorOutputStream.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_GZIPCOMPRESSOROUTPUTSTREAM_JUCEHEADER__
-#define __JUCE_GZIPCOMPRESSOROUTPUTSTREAM_JUCEHEADER__
+#ifndef JUCE_GZIPCOMPRESSOROUTPUTSTREAM_H_INCLUDED
+#define JUCE_GZIPCOMPRESSOROUTPUTSTREAM_H_INCLUDED
 
 #include "../streams/juce_OutputStream.h"
 #include "../memory/juce_OptionalScopedPointer.h"
@@ -102,4 +102,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GZIPCompressorOutputStream)
 };
 
-#endif   // __JUCE_GZIPCOMPRESSOROUTPUTSTREAM_JUCEHEADER__
+#endif   // JUCE_GZIPCOMPRESSOROUTPUTSTREAM_H_INCLUDED
diff --git a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h
index 391cac452f..bc859d4887 100644
--- a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h
+++ b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_GZIPDECOMPRESSORINPUTSTREAM_JUCEHEADER__
-#define __JUCE_GZIPDECOMPRESSORINPUTSTREAM_JUCEHEADER__
+#ifndef JUCE_GZIPDECOMPRESSORINPUTSTREAM_H_INCLUDED
+#define JUCE_GZIPDECOMPRESSORINPUTSTREAM_H_INCLUDED
 
 #include "../streams/juce_InputStream.h"
 #include "../memory/juce_OptionalScopedPointer.h"
@@ -98,4 +98,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GZIPDecompressorInputStream)
 };
 
-#endif   // __JUCE_GZIPDECOMPRESSORINPUTSTREAM_JUCEHEADER__
+#endif   // JUCE_GZIPDECOMPRESSORINPUTSTREAM_H_INCLUDED
diff --git a/modules/juce_core/zip/juce_ZipFile.h b/modules/juce_core/zip/juce_ZipFile.h
index a8ba3f5255..1b8f120e41 100644
--- a/modules/juce_core/zip/juce_ZipFile.h
+++ b/modules/juce_core/zip/juce_ZipFile.h
@@ -26,8 +26,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ZIPFILE_JUCEHEADER__
-#define __JUCE_ZIPFILE_JUCEHEADER__
+#ifndef JUCE_ZIPFILE_H_INCLUDED
+#define JUCE_ZIPFILE_H_INCLUDED
 
 #include "../files/juce_File.h"
 #include "../streams/juce_InputSource.h"
@@ -246,4 +246,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ZipFile)
 };
 
-#endif   // __JUCE_ZIPFILE_JUCEHEADER__
+#endif   // JUCE_ZIPFILE_H_INCLUDED
diff --git a/modules/juce_cryptography/encryption/juce_BlowFish.h b/modules/juce_cryptography/encryption/juce_BlowFish.h
index 1ad9eb4713..19c9bd4d35 100644
--- a/modules/juce_cryptography/encryption/juce_BlowFish.h
+++ b/modules/juce_cryptography/encryption/juce_BlowFish.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BLOWFISH_JUCEHEADER__
-#define __JUCE_BLOWFISH_JUCEHEADER__
+#ifndef JUCE_BLOWFISH_H_INCLUDED
+#define JUCE_BLOWFISH_H_INCLUDED
 
 
 //==============================================================================
@@ -69,4 +69,4 @@ private:
 };
 
 
-#endif   // __JUCE_BLOWFISH_JUCEHEADER__
+#endif   // JUCE_BLOWFISH_H_INCLUDED
diff --git a/modules/juce_cryptography/encryption/juce_Primes.h b/modules/juce_cryptography/encryption/juce_Primes.h
index 782dc7bb13..f8f47764d0 100644
--- a/modules/juce_cryptography/encryption/juce_Primes.h
+++ b/modules/juce_cryptography/encryption/juce_Primes.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PRIMES_JUCEHEADER__
-#define __JUCE_PRIMES_JUCEHEADER__
+#ifndef JUCE_PRIMES_H_INCLUDED
+#define JUCE_PRIMES_H_INCLUDED
 
 
 //==============================================================================
@@ -70,4 +70,4 @@ private:
 };
 
 
-#endif   // __JUCE_PRIMES_JUCEHEADER__
+#endif   // JUCE_PRIMES_H_INCLUDED
diff --git a/modules/juce_cryptography/encryption/juce_RSAKey.h b/modules/juce_cryptography/encryption/juce_RSAKey.h
index f622f631d5..2cf2ab89f1 100644
--- a/modules/juce_cryptography/encryption/juce_RSAKey.h
+++ b/modules/juce_cryptography/encryption/juce_RSAKey.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RSAKEY_JUCEHEADER__
-#define __JUCE_RSAKEY_JUCEHEADER__
+#ifndef JUCE_RSAKEY_H_INCLUDED
+#define JUCE_RSAKEY_H_INCLUDED
 
 
 //==============================================================================
@@ -111,4 +111,4 @@ private:
 };
 
 
-#endif   // __JUCE_RSAKEY_JUCEHEADER__
+#endif   // JUCE_RSAKEY_H_INCLUDED
diff --git a/modules/juce_cryptography/hashing/juce_MD5.h b/modules/juce_cryptography/hashing/juce_MD5.h
index 35e727866e..f74585b2d9 100644
--- a/modules/juce_cryptography/hashing/juce_MD5.h
+++ b/modules/juce_cryptography/hashing/juce_MD5.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MD5_JUCEHEADER__
-#define __JUCE_MD5_JUCEHEADER__
+#ifndef JUCE_MD5_H_INCLUDED
+#define JUCE_MD5_H_INCLUDED
 
 //==============================================================================
 /**
@@ -111,4 +111,4 @@ private:
 };
 
 
-#endif   // __JUCE_MD5_JUCEHEADER__
+#endif   // JUCE_MD5_H_INCLUDED
diff --git a/modules/juce_cryptography/hashing/juce_SHA256.h b/modules/juce_cryptography/hashing/juce_SHA256.h
index 71eb1eb7a1..d3d8e7f55d 100644
--- a/modules/juce_cryptography/hashing/juce_SHA256.h
+++ b/modules/juce_cryptography/hashing/juce_SHA256.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SHA256_JUCEHEADER__
-#define __JUCE_SHA256_JUCEHEADER__
+#ifndef JUCE_SHA256_H_INCLUDED
+#define JUCE_SHA256_H_INCLUDED
 
 
 //==============================================================================
@@ -104,4 +104,4 @@ private:
 };
 
 
-#endif   // __JUCE_SHA256_JUCEHEADER__
+#endif   // JUCE_SHA256_H_INCLUDED
diff --git a/modules/juce_cryptography/juce_cryptography.cpp b/modules/juce_cryptography/juce_cryptography.cpp
index 2f7acf62f9..2fb6d18d23 100644
--- a/modules/juce_cryptography/juce_cryptography.cpp
+++ b/modules/juce_cryptography/juce_cryptography.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_CRYPTOGRAPHY_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_CRYPTOGRAPHY_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_cryptography/juce_cryptography.h b/modules/juce_cryptography/juce_cryptography.h
index 344ad723ec..9eaa7fcdf1 100644
--- a/modules/juce_cryptography/juce_cryptography.h
+++ b/modules/juce_cryptography/juce_cryptography.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CRYPTOGRAPHY_JUCEHEADER__
-#define __JUCE_CRYPTOGRAPHY_JUCEHEADER__
+#ifndef JUCE_CRYPTOGRAPHY_H_INCLUDED
+#define JUCE_CRYPTOGRAPHY_H_INCLUDED
 
 //=============================================================================
 #include "../juce_core/juce_core.h"
@@ -32,23 +32,13 @@ namespace juce
 {
 
 // START_AUTOINCLUDE encryption, hashing
-#ifndef __JUCE_BLOWFISH_JUCEHEADER__
- #include "encryption/juce_BlowFish.h"
-#endif
-#ifndef __JUCE_PRIMES_JUCEHEADER__
- #include "encryption/juce_Primes.h"
-#endif
-#ifndef __JUCE_RSAKEY_JUCEHEADER__
- #include "encryption/juce_RSAKey.h"
-#endif
-#ifndef __JUCE_MD5_JUCEHEADER__
- #include "hashing/juce_MD5.h"
-#endif
-#ifndef __JUCE_SHA256_JUCEHEADER__
- #include "hashing/juce_SHA256.h"
-#endif
+#include "encryption/juce_BlowFish.h"
+#include "encryption/juce_Primes.h"
+#include "encryption/juce_RSAKey.h"
+#include "hashing/juce_MD5.h"
+#include "hashing/juce_SHA256.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_CRYPTOGRAPHY_JUCEHEADER__
+#endif   // JUCE_CRYPTOGRAPHY_H_INCLUDED
diff --git a/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h b/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h
index 7717bdf8b9..6c19d275cf 100644
--- a/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h
+++ b/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_APPLICATIONPROPERTIES_JUCEHEADER__
-#define __JUCE_APPLICATIONPROPERTIES_JUCEHEADER__
+#ifndef JUCE_APPLICATIONPROPERTIES_H_INCLUDED
+#define JUCE_APPLICATIONPROPERTIES_H_INCLUDED
 
 #include "juce_PropertiesFile.h"
 
@@ -125,4 +125,4 @@ private:
 };
 
 
-#endif   // __JUCE_APPLICATIONPROPERTIES_JUCEHEADER__
+#endif   // JUCE_APPLICATIONPROPERTIES_H_INCLUDED
diff --git a/modules/juce_data_structures/app_properties/juce_PropertiesFile.h b/modules/juce_data_structures/app_properties/juce_PropertiesFile.h
index d34231f8e1..08f42e7f4f 100644
--- a/modules/juce_data_structures/app_properties/juce_PropertiesFile.h
+++ b/modules/juce_data_structures/app_properties/juce_PropertiesFile.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PROPERTIESFILE_JUCEHEADER__
-#define __JUCE_PROPERTIESFILE_JUCEHEADER__
+#ifndef JUCE_PROPERTIESFILE_H_INCLUDED
+#define JUCE_PROPERTIESFILE_H_INCLUDED
 
 
 //==============================================================================
@@ -240,4 +240,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PropertiesFile)
 };
 
-#endif   // __JUCE_PROPERTIESFILE_JUCEHEADER__
+#endif   // JUCE_PROPERTIESFILE_H_INCLUDED
diff --git a/modules/juce_data_structures/juce_data_structures.cpp b/modules/juce_data_structures/juce_data_structures.cpp
index acff7644e5..0ead404125 100644
--- a/modules/juce_data_structures/juce_data_structures.cpp
+++ b/modules/juce_data_structures/juce_data_structures.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_DATA_STRUCTURES_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_DATA_STRUCTURES_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_data_structures/juce_data_structures.h b/modules/juce_data_structures/juce_data_structures.h
index 739b905d9a..130d775e4c 100644
--- a/modules/juce_data_structures/juce_data_structures.h
+++ b/modules/juce_data_structures/juce_data_structures.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DATA_STRUCTURES_JUCEHEADER__
-#define __JUCE_DATA_STRUCTURES_JUCEHEADER__
+#ifndef JUCE_DATA_STRUCTURES_H_INCLUDED
+#define JUCE_DATA_STRUCTURES_H_INCLUDED
 
 //=============================================================================
 #include "../juce_events/juce_events.h"
@@ -32,26 +32,14 @@ namespace juce
 {
 
 // START_AUTOINCLUDE values, undomanager, app_properties
-#ifndef __JUCE_VALUE_JUCEHEADER__
- #include "values/juce_Value.h"
-#endif
-#ifndef __JUCE_VALUETREE_JUCEHEADER__
- #include "values/juce_ValueTree.h"
-#endif
-#ifndef __JUCE_UNDOABLEACTION_JUCEHEADER__
- #include "undomanager/juce_UndoableAction.h"
-#endif
-#ifndef __JUCE_UNDOMANAGER_JUCEHEADER__
- #include "undomanager/juce_UndoManager.h"
-#endif
-#ifndef __JUCE_APPLICATIONPROPERTIES_JUCEHEADER__
- #include "app_properties/juce_ApplicationProperties.h"
-#endif
-#ifndef __JUCE_PROPERTIESFILE_JUCEHEADER__
- #include "app_properties/juce_PropertiesFile.h"
-#endif
+#include "values/juce_Value.h"
+#include "values/juce_ValueTree.h"
+#include "undomanager/juce_UndoableAction.h"
+#include "undomanager/juce_UndoManager.h"
+#include "app_properties/juce_ApplicationProperties.h"
+#include "app_properties/juce_PropertiesFile.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_DATA_STRUCTURES_JUCEHEADER__
+#endif   // JUCE_DATA_STRUCTURES_H_INCLUDED
diff --git a/modules/juce_data_structures/undomanager/juce_UndoManager.h b/modules/juce_data_structures/undomanager/juce_UndoManager.h
index efc54da15b..0307b238b9 100644
--- a/modules/juce_data_structures/undomanager/juce_UndoManager.h
+++ b/modules/juce_data_structures/undomanager/juce_UndoManager.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_UNDOMANAGER_JUCEHEADER__
-#define __JUCE_UNDOMANAGER_JUCEHEADER__
+#ifndef JUCE_UNDOMANAGER_H_INCLUDED
+#define JUCE_UNDOMANAGER_H_INCLUDED
 
 #include "juce_UndoableAction.h"
 
@@ -229,4 +229,4 @@ private:
 };
 
 
-#endif   // __JUCE_UNDOMANAGER_JUCEHEADER__
+#endif   // JUCE_UNDOMANAGER_H_INCLUDED
diff --git a/modules/juce_data_structures/undomanager/juce_UndoableAction.h b/modules/juce_data_structures/undomanager/juce_UndoableAction.h
index 6ff0d54b8a..866d48825f 100644
--- a/modules/juce_data_structures/undomanager/juce_UndoableAction.h
+++ b/modules/juce_data_structures/undomanager/juce_UndoableAction.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_UNDOABLEACTION_JUCEHEADER__
-#define __JUCE_UNDOABLEACTION_JUCEHEADER__
+#ifndef JUCE_UNDOABLEACTION_H_INCLUDED
+#define JUCE_UNDOABLEACTION_H_INCLUDED
 
 
 //==============================================================================
@@ -96,4 +96,4 @@ public:
 };
 
 
-#endif   // __JUCE_UNDOABLEACTION_JUCEHEADER__
+#endif   // JUCE_UNDOABLEACTION_H_INCLUDED
diff --git a/modules/juce_data_structures/values/juce_Value.h b/modules/juce_data_structures/values/juce_Value.h
index b7b806df56..efc05830aa 100644
--- a/modules/juce_data_structures/values/juce_Value.h
+++ b/modules/juce_data_structures/values/juce_Value.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_VALUE_JUCEHEADER__
-#define __JUCE_VALUE_JUCEHEADER__
+#ifndef JUCE_VALUE_H_INCLUDED
+#define JUCE_VALUE_H_INCLUDED
 
 
 //==============================================================================
@@ -227,4 +227,4 @@ OutputStream& JUCE_CALLTYPE operator<< (OutputStream&, const Value&);
 /** This typedef is just for compatibility with old code - newer code should use the Value::Listener class directly. */
 typedef Value::Listener ValueListener;
 
-#endif   // __JUCE_VALUE_JUCEHEADER__
+#endif   // JUCE_VALUE_H_INCLUDED
diff --git a/modules/juce_data_structures/values/juce_ValueTree.h b/modules/juce_data_structures/values/juce_ValueTree.h
index cfa87bf22a..262d02f853 100644
--- a/modules/juce_data_structures/values/juce_ValueTree.h
+++ b/modules/juce_data_structures/values/juce_ValueTree.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_VALUETREE_JUCEHEADER__
-#define __JUCE_VALUETREE_JUCEHEADER__
+#ifndef JUCE_VALUETREE_H_INCLUDED
+#define JUCE_VALUETREE_H_INCLUDED
 
 #include "juce_Value.h"
 #include "../undomanager/juce_UndoManager.h"
@@ -523,4 +523,4 @@ private:
 };
 
 
-#endif   // __JUCE_VALUETREE_JUCEHEADER__
+#endif   // JUCE_VALUETREE_H_INCLUDED
diff --git a/modules/juce_events/broadcasters/juce_ActionBroadcaster.h b/modules/juce_events/broadcasters/juce_ActionBroadcaster.h
index 813a3c286e..18ed717204 100644
--- a/modules/juce_events/broadcasters/juce_ActionBroadcaster.h
+++ b/modules/juce_events/broadcasters/juce_ActionBroadcaster.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ACTIONBROADCASTER_JUCEHEADER__
-#define __JUCE_ACTIONBROADCASTER_JUCEHEADER__
+#ifndef JUCE_ACTIONBROADCASTER_H_INCLUDED
+#define JUCE_ACTIONBROADCASTER_H_INCLUDED
 
 #include "juce_ActionListener.h"
 
@@ -82,4 +82,4 @@ private:
 };
 
 
-#endif   // __JUCE_ACTIONBROADCASTER_JUCEHEADER__
+#endif   // JUCE_ACTIONBROADCASTER_H_INCLUDED
diff --git a/modules/juce_events/broadcasters/juce_ActionListener.h b/modules/juce_events/broadcasters/juce_ActionListener.h
index c38c8700f1..200f60692d 100644
--- a/modules/juce_events/broadcasters/juce_ActionListener.h
+++ b/modules/juce_events/broadcasters/juce_ActionListener.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ACTIONLISTENER_JUCEHEADER__
-#define __JUCE_ACTIONLISTENER_JUCEHEADER__
+#ifndef JUCE_ACTIONLISTENER_H_INCLUDED
+#define JUCE_ACTIONLISTENER_H_INCLUDED
 
 
 //==============================================================================
@@ -50,4 +50,4 @@ public:
 };
 
 
-#endif   // __JUCE_ACTIONLISTENER_JUCEHEADER__
+#endif   // JUCE_ACTIONLISTENER_H_INCLUDED
diff --git a/modules/juce_events/broadcasters/juce_AsyncUpdater.h b/modules/juce_events/broadcasters/juce_AsyncUpdater.h
index 72ddd9ede0..202702f11f 100644
--- a/modules/juce_events/broadcasters/juce_AsyncUpdater.h
+++ b/modules/juce_events/broadcasters/juce_AsyncUpdater.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ASYNCUPDATER_JUCEHEADER__
-#define __JUCE_ASYNCUPDATER_JUCEHEADER__
+#ifndef JUCE_ASYNCUPDATER_H_INCLUDED
+#define JUCE_ASYNCUPDATER_H_INCLUDED
 
 
 //==============================================================================
@@ -106,4 +106,4 @@ private:
 };
 
 
-#endif   // __JUCE_ASYNCUPDATER_JUCEHEADER__
+#endif   // JUCE_ASYNCUPDATER_H_INCLUDED
diff --git a/modules/juce_events/broadcasters/juce_ChangeBroadcaster.h b/modules/juce_events/broadcasters/juce_ChangeBroadcaster.h
index ccca158b84..cccab253f4 100644
--- a/modules/juce_events/broadcasters/juce_ChangeBroadcaster.h
+++ b/modules/juce_events/broadcasters/juce_ChangeBroadcaster.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CHANGEBROADCASTER_JUCEHEADER__
-#define __JUCE_CHANGEBROADCASTER_JUCEHEADER__
+#ifndef JUCE_CHANGEBROADCASTER_H_INCLUDED
+#define JUCE_CHANGEBROADCASTER_H_INCLUDED
 
 #include "juce_ChangeListener.h"
 #include "juce_ListenerList.h"
@@ -106,4 +106,4 @@ private:
 };
 
 
-#endif   // __JUCE_CHANGEBROADCASTER_JUCEHEADER__
+#endif   // JUCE_CHANGEBROADCASTER_H_INCLUDED
diff --git a/modules/juce_events/broadcasters/juce_ChangeListener.h b/modules/juce_events/broadcasters/juce_ChangeListener.h
index 6b0133e4b3..59e3025bba 100644
--- a/modules/juce_events/broadcasters/juce_ChangeListener.h
+++ b/modules/juce_events/broadcasters/juce_ChangeListener.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CHANGELISTENER_JUCEHEADER__
-#define __JUCE_CHANGELISTENER_JUCEHEADER__
+#ifndef JUCE_CHANGELISTENER_H_INCLUDED
+#define JUCE_CHANGELISTENER_H_INCLUDED
 
 class ChangeBroadcaster;
 
@@ -61,4 +61,4 @@ public:
 };
 
 
-#endif   // __JUCE_CHANGELISTENER_JUCEHEADER__
+#endif   // JUCE_CHANGELISTENER_H_INCLUDED
diff --git a/modules/juce_events/broadcasters/juce_ListenerList.h b/modules/juce_events/broadcasters/juce_ListenerList.h
index 1a5165c1eb..e12b8506b8 100644
--- a/modules/juce_events/broadcasters/juce_ListenerList.h
+++ b/modules/juce_events/broadcasters/juce_ListenerList.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LISTENERLIST_JUCEHEADER__
-#define __JUCE_LISTENERLIST_JUCEHEADER__
+#ifndef JUCE_LISTENERLIST_H_INCLUDED
+#define JUCE_LISTENERLIST_H_INCLUDED
 
 
 //==============================================================================
@@ -356,4 +356,4 @@ private:
 };
 
 
-#endif   // __JUCE_LISTENERLIST_JUCEHEADER__
+#endif   // JUCE_LISTENERLIST_H_INCLUDED
diff --git a/modules/juce_events/interprocess/juce_InterprocessConnection.h b/modules/juce_events/interprocess/juce_InterprocessConnection.h
index 4ecf3daf85..d7247d8ac1 100644
--- a/modules/juce_events/interprocess/juce_InterprocessConnection.h
+++ b/modules/juce_events/interprocess/juce_InterprocessConnection.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_INTERPROCESSCONNECTION_JUCEHEADER__
-#define __JUCE_INTERPROCESSCONNECTION_JUCEHEADER__
+#ifndef JUCE_INTERPROCESSCONNECTION_H_INCLUDED
+#define JUCE_INTERPROCESSCONNECTION_H_INCLUDED
 
 class InterprocessConnectionServer;
 class MemoryBlock;
@@ -199,4 +199,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (InterprocessConnection)
 };
 
-#endif   // __JUCE_INTERPROCESSCONNECTION_JUCEHEADER__
+#endif   // JUCE_INTERPROCESSCONNECTION_H_INCLUDED
diff --git a/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h b/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h
index 40bb3759b5..57257d3758 100644
--- a/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h
+++ b/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_INTERPROCESSCONNECTIONSERVER_JUCEHEADER__
-#define __JUCE_INTERPROCESSCONNECTIONSERVER_JUCEHEADER__
+#ifndef JUCE_INTERPROCESSCONNECTIONSERVER_H_INCLUDED
+#define JUCE_INTERPROCESSCONNECTIONSERVER_H_INCLUDED
 
 #include "juce_InterprocessConnection.h"
 
@@ -92,4 +92,4 @@ private:
 };
 
 
-#endif   // __JUCE_INTERPROCESSCONNECTIONSERVER_JUCEHEADER__
+#endif   // JUCE_INTERPROCESSCONNECTIONSERVER_H_INCLUDED
diff --git a/modules/juce_events/juce_events.cpp b/modules/juce_events/juce_events.cpp
index b70fd49b21..f70983499c 100644
--- a/modules/juce_events/juce_events.cpp
+++ b/modules/juce_events/juce_events.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_EVENTS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_EVENTS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_events/juce_events.h b/modules/juce_events/juce_events.h
index 8c4491d312..0d66317822 100644
--- a/modules/juce_events/juce_events.h
+++ b/modules/juce_events/juce_events.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_EVENTS_JUCEHEADER__
-#define __JUCE_EVENTS_JUCEHEADER__
+#ifndef JUCE_EVENTS_H_INCLUDED
+#define JUCE_EVENTS_H_INCLUDED
 
 //=============================================================================
 #include "../juce_core/juce_core.h"
@@ -33,62 +33,26 @@ namespace juce
 
 // START_AUTOINCLUDE messages, broadcasters, timers,
 // interprocess, native/juce_ScopedXLock*
-#ifndef __JUCE_APPLICATIONBASE_JUCEHEADER__
- #include "messages/juce_ApplicationBase.h"
-#endif
-#ifndef __JUCE_CALLBACKMESSAGE_JUCEHEADER__
- #include "messages/juce_CallbackMessage.h"
-#endif
-#ifndef __JUCE_DELETEDATSHUTDOWN_JUCEHEADER__
- #include "messages/juce_DeletedAtShutdown.h"
-#endif
-#ifndef __JUCE_MESSAGE_JUCEHEADER__
- #include "messages/juce_Message.h"
-#endif
-#ifndef __JUCE_MESSAGELISTENER_JUCEHEADER__
- #include "messages/juce_MessageListener.h"
-#endif
-#ifndef __JUCE_MESSAGEMANAGER_JUCEHEADER__
- #include "messages/juce_MessageManager.h"
-#endif
-#ifndef __JUCE_NOTIFICATIONTYPE_JUCEHEADER__
- #include "messages/juce_NotificationType.h"
-#endif
-#ifndef __JUCE_ACTIONBROADCASTER_JUCEHEADER__
- #include "broadcasters/juce_ActionBroadcaster.h"
-#endif
-#ifndef __JUCE_ACTIONLISTENER_JUCEHEADER__
- #include "broadcasters/juce_ActionListener.h"
-#endif
-#ifndef __JUCE_ASYNCUPDATER_JUCEHEADER__
- #include "broadcasters/juce_AsyncUpdater.h"
-#endif
-#ifndef __JUCE_CHANGEBROADCASTER_JUCEHEADER__
- #include "broadcasters/juce_ChangeBroadcaster.h"
-#endif
-#ifndef __JUCE_CHANGELISTENER_JUCEHEADER__
- #include "broadcasters/juce_ChangeListener.h"
-#endif
-#ifndef __JUCE_LISTENERLIST_JUCEHEADER__
- #include "broadcasters/juce_ListenerList.h"
-#endif
-#ifndef __JUCE_MULTITIMER_JUCEHEADER__
- #include "timers/juce_MultiTimer.h"
-#endif
-#ifndef __JUCE_TIMER_JUCEHEADER__
- #include "timers/juce_Timer.h"
-#endif
-#ifndef __JUCE_INTERPROCESSCONNECTION_JUCEHEADER__
- #include "interprocess/juce_InterprocessConnection.h"
-#endif
-#ifndef __JUCE_INTERPROCESSCONNECTIONSERVER_JUCEHEADER__
- #include "interprocess/juce_InterprocessConnectionServer.h"
-#endif
-#ifndef __JUCE_SCOPEDXLOCK_JUCEHEADER__
- #include "native/juce_ScopedXLock.h"
-#endif
+#include "messages/juce_ApplicationBase.h"
+#include "messages/juce_CallbackMessage.h"
+#include "messages/juce_DeletedAtShutdown.h"
+#include "messages/juce_Message.h"
+#include "messages/juce_MessageListener.h"
+#include "messages/juce_MessageManager.h"
+#include "messages/juce_NotificationType.h"
+#include "broadcasters/juce_ActionBroadcaster.h"
+#include "broadcasters/juce_ActionListener.h"
+#include "broadcasters/juce_AsyncUpdater.h"
+#include "broadcasters/juce_ChangeBroadcaster.h"
+#include "broadcasters/juce_ChangeListener.h"
+#include "broadcasters/juce_ListenerList.h"
+#include "timers/juce_MultiTimer.h"
+#include "timers/juce_Timer.h"
+#include "interprocess/juce_InterprocessConnection.h"
+#include "interprocess/juce_InterprocessConnectionServer.h"
+#include "native/juce_ScopedXLock.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_EVENTS_JUCEHEADER__
+#endif   // JUCE_EVENTS_H_INCLUDED
diff --git a/modules/juce_events/messages/juce_ApplicationBase.h b/modules/juce_events/messages/juce_ApplicationBase.h
index f6c34f0000..350441090e 100644
--- a/modules/juce_events/messages/juce_ApplicationBase.h
+++ b/modules/juce_events/messages/juce_ApplicationBase.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_APPLICATIONBASE_JUCEHEADER__
-#define __JUCE_APPLICATIONBASE_JUCEHEADER__
+#ifndef JUCE_APPLICATIONBASE_H_INCLUDED
+#define JUCE_APPLICATIONBASE_H_INCLUDED
 
 
 //==============================================================================
@@ -171,4 +171,4 @@ private:
 };
 
 
-#endif   // __JUCE_APPLICATIONBASE_JUCEHEADER__
+#endif   // JUCE_APPLICATIONBASE_H_INCLUDED
diff --git a/modules/juce_events/messages/juce_CallbackMessage.h b/modules/juce_events/messages/juce_CallbackMessage.h
index 8a9f061571..8f7e5bb5a0 100644
--- a/modules/juce_events/messages/juce_CallbackMessage.h
+++ b/modules/juce_events/messages/juce_CallbackMessage.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CALLBACKMESSAGE_JUCEHEADER__
-#define __JUCE_CALLBACKMESSAGE_JUCEHEADER__
+#ifndef JUCE_CALLBACKMESSAGE_H_INCLUDED
+#define JUCE_CALLBACKMESSAGE_H_INCLUDED
 
 #include "juce_MessageManager.h"
 
@@ -72,4 +72,4 @@ private:
 };
 
 
-#endif   // __JUCE_CALLBACKMESSAGE_JUCEHEADER__
+#endif   // JUCE_CALLBACKMESSAGE_H_INCLUDED
diff --git a/modules/juce_events/messages/juce_DeletedAtShutdown.h b/modules/juce_events/messages/juce_DeletedAtShutdown.h
index 2128585c0e..d454009613 100644
--- a/modules/juce_events/messages/juce_DeletedAtShutdown.h
+++ b/modules/juce_events/messages/juce_DeletedAtShutdown.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DELETEDATSHUTDOWN_JUCEHEADER__
-#define __JUCE_DELETEDATSHUTDOWN_JUCEHEADER__
+#ifndef JUCE_DELETEDATSHUTDOWN_H_INCLUDED
+#define JUCE_DELETEDATSHUTDOWN_H_INCLUDED
 
 
 //==============================================================================
@@ -65,4 +65,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE (DeletedAtShutdown)
 };
 
-#endif   // __JUCE_DELETEDATSHUTDOWN_JUCEHEADER__
+#endif   // JUCE_DELETEDATSHUTDOWN_H_INCLUDED
diff --git a/modules/juce_events/messages/juce_Message.h b/modules/juce_events/messages/juce_Message.h
index 8e5ec056c6..4ae55f6f1e 100644
--- a/modules/juce_events/messages/juce_Message.h
+++ b/modules/juce_events/messages/juce_Message.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MESSAGE_JUCEHEADER__
-#define __JUCE_MESSAGE_JUCEHEADER__
+#ifndef JUCE_MESSAGE_H_INCLUDED
+#define JUCE_MESSAGE_H_INCLUDED
 
 class MessageListener;
 
@@ -62,4 +62,4 @@ private:
 };
 
 
-#endif   // __JUCE_MESSAGE_JUCEHEADER__
+#endif   // JUCE_MESSAGE_H_INCLUDED
diff --git a/modules/juce_events/messages/juce_MessageListener.h b/modules/juce_events/messages/juce_MessageListener.h
index b9c7786a65..541c03fefb 100644
--- a/modules/juce_events/messages/juce_MessageListener.h
+++ b/modules/juce_events/messages/juce_MessageListener.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MESSAGELISTENER_JUCEHEADER__
-#define __JUCE_MESSAGELISTENER_JUCEHEADER__
+#ifndef JUCE_MESSAGELISTENER_H_INCLUDED
+#define JUCE_MESSAGELISTENER_H_INCLUDED
 
 #include "juce_MessageManager.h"
 
@@ -71,4 +71,4 @@ private:
 };
 
 
-#endif   // __JUCE_MESSAGELISTENER_JUCEHEADER__
+#endif   // JUCE_MESSAGELISTENER_H_INCLUDED
diff --git a/modules/juce_events/messages/juce_MessageManager.h b/modules/juce_events/messages/juce_MessageManager.h
index 2b21109fb0..37c00bbc47 100644
--- a/modules/juce_events/messages/juce_MessageManager.h
+++ b/modules/juce_events/messages/juce_MessageManager.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MESSAGEMANAGER_JUCEHEADER__
-#define __JUCE_MESSAGEMANAGER_JUCEHEADER__
+#ifndef JUCE_MESSAGEMANAGER_H_INCLUDED
+#define JUCE_MESSAGEMANAGER_H_INCLUDED
 
 class MessageManagerLock;
 class ThreadPoolJob;
@@ -325,4 +325,4 @@ private:
 };
 
 
-#endif   // __JUCE_MESSAGEMANAGER_JUCEHEADER__
+#endif   // JUCE_MESSAGEMANAGER_H_INCLUDED
diff --git a/modules/juce_events/messages/juce_NotificationType.h b/modules/juce_events/messages/juce_NotificationType.h
index 930c30c67f..1e23d8b1ca 100644
--- a/modules/juce_events/messages/juce_NotificationType.h
+++ b/modules/juce_events/messages/juce_NotificationType.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_NOTIFICATIONTYPE_JUCEHEADER__
-#define __JUCE_NOTIFICATIONTYPE_JUCEHEADER__
+#ifndef JUCE_NOTIFICATIONTYPE_H_INCLUDED
+#define JUCE_NOTIFICATIONTYPE_H_INCLUDED
 
 //==============================================================================
 /**
@@ -39,4 +39,4 @@ enum NotificationType
 };
 
 
-#endif   // __JUCE_NOTIFICATIONTYPE_JUCEHEADER__
+#endif   // JUCE_NOTIFICATIONTYPE_H_INCLUDED
diff --git a/modules/juce_events/native/juce_ScopedXLock.h b/modules/juce_events/native/juce_ScopedXLock.h
index 4a6bed713f..d2136c728e 100644
--- a/modules/juce_events/native/juce_ScopedXLock.h
+++ b/modules/juce_events/native/juce_ScopedXLock.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SCOPEDXLOCK_JUCEHEADER__
-#define __JUCE_SCOPEDXLOCK_JUCEHEADER__
+#ifndef JUCE_SCOPEDXLOCK_H_INCLUDED
+#define JUCE_SCOPEDXLOCK_H_INCLUDED
 
 
 //==============================================================================
@@ -47,4 +47,4 @@ public:
 };
 
 #endif
-#endif   // __JUCE_SCOPEDXLOCK_JUCEHEADER__
+#endif   // JUCE_SCOPEDXLOCK_H_INCLUDED
diff --git a/modules/juce_events/native/juce_osx_MessageQueue.h b/modules/juce_events/native/juce_osx_MessageQueue.h
index 5309787eb1..6ffbefe6bd 100644
--- a/modules/juce_events/native/juce_osx_MessageQueue.h
+++ b/modules/juce_events/native/juce_osx_MessageQueue.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OSX_MESSAGEQUEUE_JUCEHEADER__
-#define __JUCE_OSX_MESSAGEQUEUE_JUCEHEADER__
+#ifndef JUCE_OSX_MESSAGEQUEUE_H_INCLUDED
+#define JUCE_OSX_MESSAGEQUEUE_H_INCLUDED
 
 //==============================================================================
 /* An internal message pump class used in OSX and iOS. */
@@ -100,4 +100,4 @@ private:
     }
 };
 
-#endif   // __JUCE_OSX_MESSAGEQUEUE_JUCEHEADER__
+#endif   // JUCE_OSX_MESSAGEQUEUE_H_INCLUDED
diff --git a/modules/juce_events/native/juce_win32_HiddenMessageWindow.h b/modules/juce_events/native/juce_win32_HiddenMessageWindow.h
index c451231c4f..c4747ec13f 100644
--- a/modules/juce_events/native/juce_win32_HiddenMessageWindow.h
+++ b/modules/juce_events/native/juce_win32_HiddenMessageWindow.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_WIN32_HIDDENMESSAGEWINDOW_JUCEHEADER__
-#define __JUCE_WIN32_HIDDENMESSAGEWINDOW_JUCEHEADER__
+#ifndef JUCE_WIN32_HIDDENMESSAGEWINDOW_H_INCLUDED
+#define JUCE_WIN32_HIDDENMESSAGEWINDOW_H_INCLUDED
 
 //==============================================================================
 class HiddenMessageWindow
@@ -135,4 +135,4 @@ private:
     }
 };
 
-#endif   // __JUCE_WIN32_HIDDENMESSAGEWINDOW_JUCEHEADER__
+#endif   // JUCE_WIN32_HIDDENMESSAGEWINDOW_H_INCLUDED
diff --git a/modules/juce_events/timers/juce_MultiTimer.h b/modules/juce_events/timers/juce_MultiTimer.h
index da3225e1f8..59cd24dee2 100644
--- a/modules/juce_events/timers/juce_MultiTimer.h
+++ b/modules/juce_events/timers/juce_MultiTimer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MULTITIMER_JUCEHEADER__
-#define __JUCE_MULTITIMER_JUCEHEADER__
+#ifndef JUCE_MULTITIMER_H_INCLUDED
+#define JUCE_MULTITIMER_H_INCLUDED
 
 #include "juce_Timer.h"
 
@@ -126,4 +126,4 @@ private:
     MultiTimer& operator= (const MultiTimer&);
 };
 
-#endif   // __JUCE_MULTITIMER_JUCEHEADER__
+#endif   // JUCE_MULTITIMER_H_INCLUDED
diff --git a/modules/juce_events/timers/juce_Timer.h b/modules/juce_events/timers/juce_Timer.h
index 7401b83bfc..a2f823af24 100644
--- a/modules/juce_events/timers/juce_Timer.h
+++ b/modules/juce_events/timers/juce_Timer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TIMER_JUCEHEADER__
-#define __JUCE_TIMER_JUCEHEADER__
+#ifndef JUCE_TIMER_H_INCLUDED
+#define JUCE_TIMER_H_INCLUDED
 
 
 //==============================================================================
@@ -131,4 +131,4 @@ private:
     Timer& operator= (const Timer&);
 };
 
-#endif   // __JUCE_TIMER_JUCEHEADER__
+#endif   // JUCE_TIMER_H_INCLUDED
diff --git a/modules/juce_graphics/colour/juce_Colour.h b/modules/juce_graphics/colour/juce_Colour.h
index 27ab3bc021..3c773bc8bc 100644
--- a/modules/juce_graphics/colour/juce_Colour.h
+++ b/modules/juce_graphics/colour/juce_Colour.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COLOUR_JUCEHEADER__
-#define __JUCE_COLOUR_JUCEHEADER__
+#ifndef JUCE_COLOUR_H_INCLUDED
+#define JUCE_COLOUR_H_INCLUDED
 
 #include "../colour/juce_PixelFormats.h"
 
@@ -366,4 +366,4 @@ private:
 };
 
 
-#endif   // __JUCE_COLOUR_JUCEHEADER__
+#endif   // JUCE_COLOUR_H_INCLUDED
diff --git a/modules/juce_graphics/colour/juce_ColourGradient.h b/modules/juce_graphics/colour/juce_ColourGradient.h
index dde10de302..72f286e5fb 100644
--- a/modules/juce_graphics/colour/juce_ColourGradient.h
+++ b/modules/juce_graphics/colour/juce_ColourGradient.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COLOURGRADIENT_JUCEHEADER__
-#define __JUCE_COLOURGRADIENT_JUCEHEADER__
+#ifndef JUCE_COLOURGRADIENT_H_INCLUDED
+#define JUCE_COLOURGRADIENT_H_INCLUDED
 
 #include "juce_Colour.h"
 #include "../geometry/juce_Point.h"
@@ -181,4 +181,4 @@ private:
 };
 
 
-#endif   // __JUCE_COLOURGRADIENT_JUCEHEADER__
+#endif   // JUCE_COLOURGRADIENT_H_INCLUDED
diff --git a/modules/juce_graphics/colour/juce_Colours.h b/modules/juce_graphics/colour/juce_Colours.h
index d15dd6e3be..f8dda265e6 100644
--- a/modules/juce_graphics/colour/juce_Colours.h
+++ b/modules/juce_graphics/colour/juce_Colours.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COLOURS_JUCEHEADER__
-#define __JUCE_COLOURS_JUCEHEADER__
+#ifndef JUCE_COLOURS_H_INCLUDED
+#define JUCE_COLOURS_H_INCLUDED
 
 #include "juce_Colour.h"
 
@@ -106,4 +106,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE (Colours)
 };
 
-#endif   // __JUCE_COLOURS_JUCEHEADER__
+#endif   // JUCE_COLOURS_H_INCLUDED
diff --git a/modules/juce_graphics/colour/juce_FillType.h b/modules/juce_graphics/colour/juce_FillType.h
index 5906a77985..92386dfdd5 100644
--- a/modules/juce_graphics/colour/juce_FillType.h
+++ b/modules/juce_graphics/colour/juce_FillType.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILLTYPE_JUCEHEADER__
-#define __JUCE_FILLTYPE_JUCEHEADER__
+#ifndef JUCE_FILLTYPE_H_INCLUDED
+#define JUCE_FILLTYPE_H_INCLUDED
 
 #include "../colour/juce_ColourGradient.h"
 #include "../images/juce_Image.h"
@@ -149,4 +149,4 @@ private:
 };
 
 
-#endif   // __JUCE_FILLTYPE_JUCEHEADER__
+#endif   // JUCE_FILLTYPE_H_INCLUDED
diff --git a/modules/juce_graphics/colour/juce_PixelFormats.h b/modules/juce_graphics/colour/juce_PixelFormats.h
index 23afbad257..2715cb2edf 100644
--- a/modules/juce_graphics/colour/juce_PixelFormats.h
+++ b/modules/juce_graphics/colour/juce_PixelFormats.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PIXELFORMATS_JUCEHEADER__
-#define __JUCE_PIXELFORMATS_JUCEHEADER__
+#ifndef JUCE_PIXELFORMATS_H_INCLUDED
+#define JUCE_PIXELFORMATS_H_INCLUDED
 
 
 //==============================================================================
@@ -601,4 +601,4 @@ private:
  #pragma pack (pop)
 #endif
 
-#endif   // __JUCE_PIXELFORMATS_JUCEHEADER__
+#endif   // JUCE_PIXELFORMATS_H_INCLUDED
diff --git a/modules/juce_graphics/contexts/juce_GraphicsContext.h b/modules/juce_graphics/contexts/juce_GraphicsContext.h
index 4109716d67..58c1f9b456 100644
--- a/modules/juce_graphics/contexts/juce_GraphicsContext.h
+++ b/modules/juce_graphics/contexts/juce_GraphicsContext.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_GRAPHICSCONTEXT_JUCEHEADER__
-#define __JUCE_GRAPHICSCONTEXT_JUCEHEADER__
+#ifndef JUCE_GRAPHICSCONTEXT_H_INCLUDED
+#define JUCE_GRAPHICSCONTEXT_H_INCLUDED
 
 #include "../fonts/juce_Font.h"
 #include "../geometry/juce_Rectangle.h"
@@ -721,4 +721,4 @@ private:
 };
 
 
-#endif   // __JUCE_GRAPHICSCONTEXT_JUCEHEADER__
+#endif   // JUCE_GRAPHICSCONTEXT_H_INCLUDED
diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h b/modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h
index 5ed9e8195f..1877ab236a 100644
--- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h
+++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LOWLEVELGRAPHICSCONTEXT_JUCEHEADER__
-#define __JUCE_LOWLEVELGRAPHICSCONTEXT_JUCEHEADER__
+#ifndef JUCE_LOWLEVELGRAPHICSCONTEXT_H_INCLUDED
+#define JUCE_LOWLEVELGRAPHICSCONTEXT_H_INCLUDED
 
 #include "../images/juce_Image.h"
 #include "../geometry/juce_Path.h"
@@ -108,4 +108,4 @@ public:
 };
 
 
-#endif   // __JUCE_LOWLEVELGRAPHICSCONTEXT_JUCEHEADER__
+#endif   // JUCE_LOWLEVELGRAPHICSCONTEXT_H_INCLUDED
diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h b/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h
index 856ed518be..e09e84d6b3 100644
--- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h
+++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LOWLEVELGRAPHICSPOSTSCRIPTRENDERER_JUCEHEADER__
-#define __JUCE_LOWLEVELGRAPHICSPOSTSCRIPTRENDERER_JUCEHEADER__
+#ifndef JUCE_LOWLEVELGRAPHICSPOSTSCRIPTRENDERER_H_INCLUDED
+#define JUCE_LOWLEVELGRAPHICSPOSTSCRIPTRENDERER_H_INCLUDED
 
 #include "juce_LowLevelGraphicsContext.h"
 
@@ -123,4 +123,4 @@ protected:
 
 
 
-#endif   // __JUCE_LOWLEVELGRAPHICSPOSTSCRIPTRENDERER_JUCEHEADER__
+#endif   // JUCE_LOWLEVELGRAPHICSPOSTSCRIPTRENDERER_H_INCLUDED
diff --git a/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h b/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h
index f28701c681..5378e57277 100644
--- a/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h
+++ b/modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LOWLEVELGRAPHICSSOFTWARERENDERER_JUCEHEADER__
-#define __JUCE_LOWLEVELGRAPHICSSOFTWARERENDERER_JUCEHEADER__
+#ifndef JUCE_LOWLEVELGRAPHICSSOFTWARERENDERER_H_INCLUDED
+#define JUCE_LOWLEVELGRAPHICSSOFTWARERENDERER_H_INCLUDED
 
 #include "juce_LowLevelGraphicsContext.h"
 #include "../native/juce_RenderingHelpers.h"
@@ -91,4 +91,4 @@ protected:
 };
 
 
-#endif   // __JUCE_LOWLEVELGRAPHICSSOFTWARERENDERER_JUCEHEADER__
+#endif   // JUCE_LOWLEVELGRAPHICSSOFTWARERENDERER_H_INCLUDED
diff --git a/modules/juce_graphics/effects/juce_DropShadowEffect.h b/modules/juce_graphics/effects/juce_DropShadowEffect.h
index 7054b9242a..7a05dd7b11 100644
--- a/modules/juce_graphics/effects/juce_DropShadowEffect.h
+++ b/modules/juce_graphics/effects/juce_DropShadowEffect.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DROPSHADOWEFFECT_JUCEHEADER__
-#define __JUCE_DROPSHADOWEFFECT_JUCEHEADER__
+#ifndef JUCE_DROPSHADOWEFFECT_H_INCLUDED
+#define JUCE_DROPSHADOWEFFECT_H_INCLUDED
 
 #include "juce_ImageEffectFilter.h"
 
@@ -109,4 +109,4 @@ private:
 };
 
 
-#endif   // __JUCE_DROPSHADOWEFFECT_JUCEHEADER__
+#endif   // JUCE_DROPSHADOWEFFECT_H_INCLUDED
diff --git a/modules/juce_graphics/effects/juce_GlowEffect.h b/modules/juce_graphics/effects/juce_GlowEffect.h
index 191cfa8b98..d646b75c02 100644
--- a/modules/juce_graphics/effects/juce_GlowEffect.h
+++ b/modules/juce_graphics/effects/juce_GlowEffect.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_GLOWEFFECT_JUCEHEADER__
-#define __JUCE_GLOWEFFECT_JUCEHEADER__
+#ifndef JUCE_GLOWEFFECT_H_INCLUDED
+#define JUCE_GLOWEFFECT_H_INCLUDED
 
 #include "juce_ImageEffectFilter.h"
 
@@ -73,4 +73,4 @@ private:
 };
 
 
-#endif   // __JUCE_GLOWEFFECT_JUCEHEADER__
+#endif   // JUCE_GLOWEFFECT_H_INCLUDED
diff --git a/modules/juce_graphics/effects/juce_ImageEffectFilter.h b/modules/juce_graphics/effects/juce_ImageEffectFilter.h
index f1be23bcc3..5a057b2eea 100644
--- a/modules/juce_graphics/effects/juce_ImageEffectFilter.h
+++ b/modules/juce_graphics/effects/juce_ImageEffectFilter.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IMAGEEFFECTFILTER_JUCEHEADER__
-#define __JUCE_IMAGEEFFECTFILTER_JUCEHEADER__
+#ifndef JUCE_IMAGEEFFECTFILTER_H_INCLUDED
+#define JUCE_IMAGEEFFECTFILTER_H_INCLUDED
 
 #include "../contexts/juce_GraphicsContext.h"
 
@@ -68,4 +68,4 @@ public:
 
 };
 
-#endif   // __JUCE_IMAGEEFFECTFILTER_JUCEHEADER__
+#endif   // JUCE_IMAGEEFFECTFILTER_H_INCLUDED
diff --git a/modules/juce_graphics/fonts/juce_AttributedString.h b/modules/juce_graphics/fonts/juce_AttributedString.h
index 00f0c084da..8c33d75d38 100644
--- a/modules/juce_graphics/fonts/juce_AttributedString.h
+++ b/modules/juce_graphics/fonts/juce_AttributedString.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ATTRIBUTEDSTRING_JUCEHEADER__
-#define __JUCE_ATTRIBUTEDSTRING_JUCEHEADER__
+#ifndef JUCE_ATTRIBUTEDSTRING_H_INCLUDED
+#define JUCE_ATTRIBUTEDSTRING_H_INCLUDED
 
 
 //==============================================================================
@@ -215,4 +215,4 @@ private:
     JUCE_LEAK_DETECTOR (AttributedString)
 };
 
-#endif   // __JUCE_ATTRIBUTEDSTRING_JUCEHEADER__
+#endif   // JUCE_ATTRIBUTEDSTRING_H_INCLUDED
diff --git a/modules/juce_graphics/fonts/juce_CustomTypeface.h b/modules/juce_graphics/fonts/juce_CustomTypeface.h
index 4aa0409728..20144e507c 100644
--- a/modules/juce_graphics/fonts/juce_CustomTypeface.h
+++ b/modules/juce_graphics/fonts/juce_CustomTypeface.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CUSTOMTYPEFACE_JUCEHEADER__
-#define __JUCE_CUSTOMTYPEFACE_JUCEHEADER__
+#ifndef JUCE_CUSTOMTYPEFACE_H_INCLUDED
+#define JUCE_CUSTOMTYPEFACE_H_INCLUDED
 
 #include "juce_Typeface.h"
 class InputStream;
@@ -151,4 +151,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CustomTypeface)
 };
 
-#endif   // __JUCE_CUSTOMTYPEFACE_JUCEHEADER__
+#endif   // JUCE_CUSTOMTYPEFACE_H_INCLUDED
diff --git a/modules/juce_graphics/fonts/juce_Font.h b/modules/juce_graphics/fonts/juce_Font.h
index 06ff0560f5..8d32149b3e 100644
--- a/modules/juce_graphics/fonts/juce_Font.h
+++ b/modules/juce_graphics/fonts/juce_Font.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FONT_JUCEHEADER__
-#define __JUCE_FONT_JUCEHEADER__
+#ifndef JUCE_FONT_H_INCLUDED
+#define JUCE_FONT_H_INCLUDED
 
 #include "juce_Typeface.h"
 class LowLevelGraphicsContext;
@@ -460,4 +460,4 @@ private:
     JUCE_LEAK_DETECTOR (Font)
 };
 
-#endif   // __JUCE_FONT_JUCEHEADER__
+#endif   // JUCE_FONT_H_INCLUDED
diff --git a/modules/juce_graphics/fonts/juce_GlyphArrangement.h b/modules/juce_graphics/fonts/juce_GlyphArrangement.h
index 21b65d434c..ddefef4d84 100644
--- a/modules/juce_graphics/fonts/juce_GlyphArrangement.h
+++ b/modules/juce_graphics/fonts/juce_GlyphArrangement.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_GLYPHARRANGEMENT_JUCEHEADER__
-#define __JUCE_GLYPHARRANGEMENT_JUCEHEADER__
+#ifndef JUCE_GLYPHARRANGEMENT_H_INCLUDED
+#define JUCE_GLYPHARRANGEMENT_H_INCLUDED
 
 #include "juce_Font.h"
 #include "../contexts/juce_GraphicsContext.h"
@@ -313,4 +313,4 @@ private:
 };
 
 
-#endif   // __JUCE_GLYPHARRANGEMENT_JUCEHEADER__
+#endif   // JUCE_GLYPHARRANGEMENT_H_INCLUDED
diff --git a/modules/juce_graphics/fonts/juce_TextLayout.h b/modules/juce_graphics/fonts/juce_TextLayout.h
index 82bd2b4dc9..d3f4eab40c 100644
--- a/modules/juce_graphics/fonts/juce_TextLayout.h
+++ b/modules/juce_graphics/fonts/juce_TextLayout.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TEXTLAYOUT_JUCEHEADER__
-#define __JUCE_TEXTLAYOUT_JUCEHEADER__
+#ifndef JUCE_TEXTLAYOUT_H_INCLUDED
+#define JUCE_TEXTLAYOUT_H_INCLUDED
 
 #include "juce_Font.h"
 #include "../placement/juce_Justification.h"
@@ -177,4 +177,4 @@ private:
     JUCE_LEAK_DETECTOR (TextLayout)
 };
 
-#endif   // __JUCE_TEXTLAYOUT_JUCEHEADER__
+#endif   // JUCE_TEXTLAYOUT_H_INCLUDED
diff --git a/modules/juce_graphics/fonts/juce_Typeface.h b/modules/juce_graphics/fonts/juce_Typeface.h
index d1c7a46020..65abe4b7b5 100644
--- a/modules/juce_graphics/fonts/juce_Typeface.h
+++ b/modules/juce_graphics/fonts/juce_Typeface.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TYPEFACE_JUCEHEADER__
-#define __JUCE_TYPEFACE_JUCEHEADER__
+#ifndef JUCE_TYPEFACE_H_INCLUDED
+#define JUCE_TYPEFACE_H_INCLUDED
 
 class Path;
 class Font;
@@ -146,4 +146,4 @@ private:
 };
 
 
-#endif   // __JUCE_TYPEFACE_JUCEHEADER__
+#endif   // JUCE_TYPEFACE_H_INCLUDED
diff --git a/modules/juce_graphics/geometry/juce_AffineTransform.h b/modules/juce_graphics/geometry/juce_AffineTransform.h
index 7385b33c87..d84ade05e2 100644
--- a/modules/juce_graphics/geometry/juce_AffineTransform.h
+++ b/modules/juce_graphics/geometry/juce_AffineTransform.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_AFFINETRANSFORM_JUCEHEADER__
-#define __JUCE_AFFINETRANSFORM_JUCEHEADER__
+#ifndef JUCE_AFFINETRANSFORM_H_INCLUDED
+#define JUCE_AFFINETRANSFORM_H_INCLUDED
 
 
 //==============================================================================
@@ -265,4 +265,4 @@ private:
     JUCE_LEAK_DETECTOR (AffineTransform)
 };
 
-#endif   // __JUCE_AFFINETRANSFORM_JUCEHEADER__
+#endif   // JUCE_AFFINETRANSFORM_H_INCLUDED
diff --git a/modules/juce_graphics/geometry/juce_BorderSize.h b/modules/juce_graphics/geometry/juce_BorderSize.h
index ed03c07cf3..94647b248d 100644
--- a/modules/juce_graphics/geometry/juce_BorderSize.h
+++ b/modules/juce_graphics/geometry/juce_BorderSize.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BORDERSIZE_JUCEHEADER__
-#define __JUCE_BORDERSIZE_JUCEHEADER__
+#ifndef JUCE_BORDERSIZE_H_INCLUDED
+#define JUCE_BORDERSIZE_H_INCLUDED
 
 #include "juce_Rectangle.h"
 
@@ -152,4 +152,4 @@ private:
 };
 
 
-#endif   // __JUCE_BORDERSIZE_JUCEHEADER__
+#endif   // JUCE_BORDERSIZE_H_INCLUDED
diff --git a/modules/juce_graphics/geometry/juce_EdgeTable.h b/modules/juce_graphics/geometry/juce_EdgeTable.h
index d377b9519d..bcf6af5e7d 100644
--- a/modules/juce_graphics/geometry/juce_EdgeTable.h
+++ b/modules/juce_graphics/geometry/juce_EdgeTable.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_EDGETABLE_JUCEHEADER__
-#define __JUCE_EDGETABLE_JUCEHEADER__
+#ifndef JUCE_EDGETABLE_H_INCLUDED
+#define JUCE_EDGETABLE_H_INCLUDED
 
 #include "../geometry/juce_AffineTransform.h"
 #include "../geometry/juce_Rectangle.h"
@@ -207,4 +207,4 @@ private:
 };
 
 
-#endif   // __JUCE_EDGETABLE_JUCEHEADER__
+#endif   // JUCE_EDGETABLE_H_INCLUDED
diff --git a/modules/juce_graphics/geometry/juce_Line.h b/modules/juce_graphics/geometry/juce_Line.h
index 4fd5c096f1..b03b02b0b8 100644
--- a/modules/juce_graphics/geometry/juce_Line.h
+++ b/modules/juce_graphics/geometry/juce_Line.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LINE_JUCEHEADER__
-#define __JUCE_LINE_JUCEHEADER__
+#ifndef JUCE_LINE_H_INCLUDED
+#define JUCE_LINE_H_INCLUDED
 
 #include "juce_Point.h"
 
@@ -408,4 +408,4 @@ private:
 };
 
 
-#endif   // __JUCE_LINE_JUCEHEADER__
+#endif   // JUCE_LINE_H_INCLUDED
diff --git a/modules/juce_graphics/geometry/juce_Path.h b/modules/juce_graphics/geometry/juce_Path.h
index ba082327d2..9d466a6fcf 100644
--- a/modules/juce_graphics/geometry/juce_Path.h
+++ b/modules/juce_graphics/geometry/juce_Path.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PATH_JUCEHEADER__
-#define __JUCE_PATH_JUCEHEADER__
+#ifndef JUCE_PATH_H_INCLUDED
+#define JUCE_PATH_H_INCLUDED
 
 #include "juce_AffineTransform.h"
 #include "juce_Line.h"
@@ -782,4 +782,4 @@ private:
     JUCE_LEAK_DETECTOR (Path)
 };
 
-#endif   // __JUCE_PATH_JUCEHEADER__
+#endif   // JUCE_PATH_H_INCLUDED
diff --git a/modules/juce_graphics/geometry/juce_PathIterator.h b/modules/juce_graphics/geometry/juce_PathIterator.h
index 98f3bf0f20..1e27996c59 100644
--- a/modules/juce_graphics/geometry/juce_PathIterator.h
+++ b/modules/juce_graphics/geometry/juce_PathIterator.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PATHITERATOR_JUCEHEADER__
-#define __JUCE_PATHITERATOR_JUCEHEADER__
+#ifndef JUCE_PATHITERATOR_H_INCLUDED
+#define JUCE_PATHITERATOR_H_INCLUDED
 
 #include "juce_Path.h"
 
@@ -112,4 +112,4 @@ private:
 };
 
 
-#endif   // __JUCE_PATHITERATOR_JUCEHEADER__
+#endif   // JUCE_PATHITERATOR_H_INCLUDED
diff --git a/modules/juce_graphics/geometry/juce_PathStrokeType.h b/modules/juce_graphics/geometry/juce_PathStrokeType.h
index 3f6ca48db5..e3ddee670e 100644
--- a/modules/juce_graphics/geometry/juce_PathStrokeType.h
+++ b/modules/juce_graphics/geometry/juce_PathStrokeType.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PATHSTROKETYPE_JUCEHEADER__
-#define __JUCE_PATHSTROKETYPE_JUCEHEADER__
+#ifndef JUCE_PATHSTROKETYPE_H_INCLUDED
+#define JUCE_PATHSTROKETYPE_H_INCLUDED
 
 #include "juce_Path.h"
 
@@ -200,4 +200,4 @@ private:
     JUCE_LEAK_DETECTOR (PathStrokeType)
 };
 
-#endif   // __JUCE_PATHSTROKETYPE_JUCEHEADER__
+#endif   // JUCE_PATHSTROKETYPE_H_INCLUDED
diff --git a/modules/juce_graphics/geometry/juce_Point.h b/modules/juce_graphics/geometry/juce_Point.h
index 3c5498b556..be92aa9d28 100644
--- a/modules/juce_graphics/geometry/juce_Point.h
+++ b/modules/juce_graphics/geometry/juce_Point.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_POINT_JUCEHEADER__
-#define __JUCE_POINT_JUCEHEADER__
+#ifndef JUCE_POINT_H_INCLUDED
+#define JUCE_POINT_H_INCLUDED
 
 #include "juce_AffineTransform.h"
 
@@ -185,4 +185,4 @@ public:
 };
 
 
-#endif   // __JUCE_POINT_JUCEHEADER__
+#endif   // JUCE_POINT_H_INCLUDED
diff --git a/modules/juce_graphics/geometry/juce_Rectangle.h b/modules/juce_graphics/geometry/juce_Rectangle.h
index 0f53346e1b..64bdc75112 100644
--- a/modules/juce_graphics/geometry/juce_Rectangle.h
+++ b/modules/juce_graphics/geometry/juce_Rectangle.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RECTANGLE_JUCEHEADER__
-#define __JUCE_RECTANGLE_JUCEHEADER__
+#ifndef JUCE_RECTANGLE_H_INCLUDED
+#define JUCE_RECTANGLE_H_INCLUDED
 
 #include "juce_Point.h"
 class RectangleList;
@@ -799,4 +799,4 @@ private:
 };
 
 
-#endif   // __JUCE_RECTANGLE_JUCEHEADER__
+#endif   // JUCE_RECTANGLE_H_INCLUDED
diff --git a/modules/juce_graphics/geometry/juce_RectangleList.h b/modules/juce_graphics/geometry/juce_RectangleList.h
index 7f38b45c16..172483f8e5 100644
--- a/modules/juce_graphics/geometry/juce_RectangleList.h
+++ b/modules/juce_graphics/geometry/juce_RectangleList.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RECTANGLELIST_JUCEHEADER__
-#define __JUCE_RECTANGLELIST_JUCEHEADER__
+#ifndef JUCE_RECTANGLELIST_H_INCLUDED
+#define JUCE_RECTANGLELIST_H_INCLUDED
 
 #include "juce_Rectangle.h"
 #include "juce_Path.h"
@@ -268,4 +268,4 @@ private:
 };
 
 
-#endif   // __JUCE_RECTANGLELIST_JUCEHEADER__
+#endif   // JUCE_RECTANGLELIST_H_INCLUDED
diff --git a/modules/juce_graphics/images/juce_Image.h b/modules/juce_graphics/images/juce_Image.h
index 8987504607..4423c2fefe 100644
--- a/modules/juce_graphics/images/juce_Image.h
+++ b/modules/juce_graphics/images/juce_Image.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IMAGE_JUCEHEADER__
-#define __JUCE_IMAGE_JUCEHEADER__
+#ifndef JUCE_IMAGE_H_INCLUDED
+#define JUCE_IMAGE_H_INCLUDED
 
 #include "../colour/juce_Colour.h"
 #include "../contexts/juce_GraphicsContext.h"
@@ -520,4 +520,4 @@ public:
 };
 
 
-#endif   // __JUCE_IMAGE_JUCEHEADER__
+#endif   // JUCE_IMAGE_H_INCLUDED
diff --git a/modules/juce_graphics/images/juce_ImageCache.h b/modules/juce_graphics/images/juce_ImageCache.h
index 7bf9b7d476..f103a589d4 100644
--- a/modules/juce_graphics/images/juce_ImageCache.h
+++ b/modules/juce_graphics/images/juce_ImageCache.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IMAGECACHE_JUCEHEADER__
-#define __JUCE_IMAGECACHE_JUCEHEADER__
+#ifndef JUCE_IMAGECACHE_H_INCLUDED
+#define JUCE_IMAGECACHE_H_INCLUDED
 
 #include "juce_Image.h"
 
@@ -124,4 +124,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE (ImageCache)
 };
 
-#endif   // __JUCE_IMAGECACHE_JUCEHEADER__
+#endif   // JUCE_IMAGECACHE_H_INCLUDED
diff --git a/modules/juce_graphics/images/juce_ImageConvolutionKernel.h b/modules/juce_graphics/images/juce_ImageConvolutionKernel.h
index 25bf298630..a3c87a5572 100644
--- a/modules/juce_graphics/images/juce_ImageConvolutionKernel.h
+++ b/modules/juce_graphics/images/juce_ImageConvolutionKernel.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IMAGECONVOLUTIONKERNEL_JUCEHEADER__
-#define __JUCE_IMAGECONVOLUTIONKERNEL_JUCEHEADER__
+#ifndef JUCE_IMAGECONVOLUTIONKERNEL_H_INCLUDED
+#define JUCE_IMAGECONVOLUTIONKERNEL_H_INCLUDED
 
 #include "juce_Image.h"
 
@@ -110,4 +110,4 @@ private:
 };
 
 
-#endif   // __JUCE_IMAGECONVOLUTIONKERNEL_JUCEHEADER__
+#endif   // JUCE_IMAGECONVOLUTIONKERNEL_H_INCLUDED
diff --git a/modules/juce_graphics/images/juce_ImageFileFormat.h b/modules/juce_graphics/images/juce_ImageFileFormat.h
index 1ab4ddf057..565b951338 100644
--- a/modules/juce_graphics/images/juce_ImageFileFormat.h
+++ b/modules/juce_graphics/images/juce_ImageFileFormat.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IMAGEFILEFORMAT_JUCEHEADER__
-#define __JUCE_IMAGEFILEFORMAT_JUCEHEADER__
+#ifndef JUCE_IMAGEFILEFORMAT_H_INCLUDED
+#define JUCE_IMAGEFILEFORMAT_H_INCLUDED
 
 #include "juce_Image.h"
 
@@ -215,4 +215,4 @@ public:
 };
 
 
-#endif   // __JUCE_IMAGEFILEFORMAT_JUCEHEADER__
+#endif   // JUCE_IMAGEFILEFORMAT_H_INCLUDED
diff --git a/modules/juce_graphics/juce_graphics.cpp b/modules/juce_graphics/juce_graphics.cpp
index 7dc52527f0..3547b00d41 100644
--- a/modules/juce_graphics/juce_graphics.cpp
+++ b/modules/juce_graphics/juce_graphics.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_GRAPHICS_MODULE_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_GRAPHICS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_graphics/juce_graphics.h b/modules/juce_graphics/juce_graphics.h
index d219f470e8..cdf5f17c50 100644
--- a/modules/juce_graphics/juce_graphics.h
+++ b/modules/juce_graphics/juce_graphics.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_GRAPHICS_MODULE_JUCEHEADER__ // %%
-#define __JUCE_GRAPHICS_MODULE_JUCEHEADER__
+#ifndef JUCE_GRAPHICS_H_INCLUDED // %%
+#define JUCE_GRAPHICS_H_INCLUDED
 
 #include "../juce_core/juce_core.h"
 #include "../juce_events/juce_events.h"
@@ -66,110 +66,42 @@ namespace juce
 
 // START_AUTOINCLUDE colour, geometry, placement, contexts, images,
 // image_formats, fonts, effects
-#ifndef __JUCE_COLOUR_JUCEHEADER__
- #include "colour/juce_Colour.h"
-#endif
-#ifndef __JUCE_COLOURGRADIENT_JUCEHEADER__
- #include "colour/juce_ColourGradient.h"
-#endif
-#ifndef __JUCE_COLOURS_JUCEHEADER__
- #include "colour/juce_Colours.h"
-#endif
-#ifndef __JUCE_FILLTYPE_JUCEHEADER__
- #include "colour/juce_FillType.h"
-#endif
-#ifndef __JUCE_PIXELFORMATS_JUCEHEADER__
- #include "colour/juce_PixelFormats.h"
-#endif
-#ifndef __JUCE_AFFINETRANSFORM_JUCEHEADER__
- #include "geometry/juce_AffineTransform.h"
-#endif
-#ifndef __JUCE_BORDERSIZE_JUCEHEADER__
- #include "geometry/juce_BorderSize.h"
-#endif
-#ifndef __JUCE_EDGETABLE_JUCEHEADER__
- #include "geometry/juce_EdgeTable.h"
-#endif
-#ifndef __JUCE_LINE_JUCEHEADER__
- #include "geometry/juce_Line.h"
-#endif
-#ifndef __JUCE_PATH_JUCEHEADER__
- #include "geometry/juce_Path.h"
-#endif
-#ifndef __JUCE_PATHITERATOR_JUCEHEADER__
- #include "geometry/juce_PathIterator.h"
-#endif
-#ifndef __JUCE_PATHSTROKETYPE_JUCEHEADER__
- #include "geometry/juce_PathStrokeType.h"
-#endif
-#ifndef __JUCE_POINT_JUCEHEADER__
- #include "geometry/juce_Point.h"
-#endif
-#ifndef __JUCE_RECTANGLE_JUCEHEADER__
- #include "geometry/juce_Rectangle.h"
-#endif
-#ifndef __JUCE_RECTANGLELIST_JUCEHEADER__
- #include "geometry/juce_RectangleList.h"
-#endif
-#ifndef __JUCE_JUSTIFICATION_JUCEHEADER__
- #include "placement/juce_Justification.h"
-#endif
-#ifndef __JUCE_RECTANGLEPLACEMENT_JUCEHEADER__
- #include "placement/juce_RectanglePlacement.h"
-#endif
-#ifndef __JUCE_GRAPHICSCONTEXT_JUCEHEADER__
- #include "contexts/juce_GraphicsContext.h"
-#endif
-#ifndef __JUCE_LOWLEVELGRAPHICSCONTEXT_JUCEHEADER__
- #include "contexts/juce_LowLevelGraphicsContext.h"
-#endif
-#ifndef __JUCE_LOWLEVELGRAPHICSPOSTSCRIPTRENDERER_JUCEHEADER__
- #include "contexts/juce_LowLevelGraphicsPostScriptRenderer.h"
-#endif
-#ifndef __JUCE_LOWLEVELGRAPHICSSOFTWARERENDERER_JUCEHEADER__
- #include "contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
-#endif
-#ifndef __JUCE_IMAGE_JUCEHEADER__
- #include "images/juce_Image.h"
-#endif
-#ifndef __JUCE_IMAGECACHE_JUCEHEADER__
- #include "images/juce_ImageCache.h"
-#endif
-#ifndef __JUCE_IMAGECONVOLUTIONKERNEL_JUCEHEADER__
- #include "images/juce_ImageConvolutionKernel.h"
-#endif
-#ifndef __JUCE_IMAGEFILEFORMAT_JUCEHEADER__
- #include "images/juce_ImageFileFormat.h"
-#endif
-#ifndef __JUCE_ATTRIBUTEDSTRING_JUCEHEADER__
- #include "fonts/juce_AttributedString.h"
-#endif
-#ifndef __JUCE_CUSTOMTYPEFACE_JUCEHEADER__
- #include "fonts/juce_CustomTypeface.h"
-#endif
-#ifndef __JUCE_FONT_JUCEHEADER__
- #include "fonts/juce_Font.h"
-#endif
-#ifndef __JUCE_GLYPHARRANGEMENT_JUCEHEADER__
- #include "fonts/juce_GlyphArrangement.h"
-#endif
-#ifndef __JUCE_TEXTLAYOUT_JUCEHEADER__
- #include "fonts/juce_TextLayout.h"
-#endif
-#ifndef __JUCE_TYPEFACE_JUCEHEADER__
- #include "fonts/juce_Typeface.h"
-#endif
-#ifndef __JUCE_DROPSHADOWEFFECT_JUCEHEADER__
- #include "effects/juce_DropShadowEffect.h"
-#endif
-#ifndef __JUCE_GLOWEFFECT_JUCEHEADER__
- #include "effects/juce_GlowEffect.h"
-#endif
-#ifndef __JUCE_IMAGEEFFECTFILTER_JUCEHEADER__
- #include "effects/juce_ImageEffectFilter.h"
-#endif
+#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_Font.h"
+#include "fonts/juce_GlyphArrangement.h"
+#include "fonts/juce_TextLayout.h"
+#include "fonts/juce_Typeface.h"
+#include "effects/juce_DropShadowEffect.h"
+#include "effects/juce_GlowEffect.h"
+#include "effects/juce_ImageEffectFilter.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_GRAPHICS_MODULE_JUCEHEADER__
+#endif   // JUCE_GRAPHICS_H_INCLUDED
diff --git a/modules/juce_graphics/native/juce_RenderingHelpers.h b/modules/juce_graphics/native/juce_RenderingHelpers.h
index 5ee19f0748..777ae79137 100644
--- a/modules/juce_graphics/native/juce_RenderingHelpers.h
+++ b/modules/juce_graphics/native/juce_RenderingHelpers.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RENDERINGHELPERS_JUCEHEADER__
-#define __JUCE_RENDERINGHELPERS_JUCEHEADER__
+#ifndef JUCE_RENDERINGHELPERS_H_INCLUDED
+#define JUCE_RENDERINGHELPERS_H_INCLUDED
 
 #if JUCE_MSVC
  #pragma warning (push)
@@ -2491,4 +2491,4 @@ private:
  #pragma warning (pop)
 #endif
 
-#endif   // __JUCE_RENDERINGHELPERS_JUCEHEADER__
+#endif   // JUCE_RENDERINGHELPERS_H_INCLUDED
diff --git a/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.h b/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.h
index 7435f17bee..82ccb19a79 100644
--- a/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.h
+++ b/modules/juce_graphics/native/juce_mac_CoreGraphicsContext.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MAC_COREGRAPHICSCONTEXT_JUCEHEADER__
-#define __JUCE_MAC_COREGRAPHICSCONTEXT_JUCEHEADER__
+#ifndef JUCE_MAC_COREGRAPHICSCONTEXT_H_INCLUDED
+#define JUCE_MAC_COREGRAPHICSCONTEXT_H_INCLUDED
 
 //==============================================================================
 class CoreGraphicsContext   : public LowLevelGraphicsContext
@@ -119,4 +119,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CoreGraphicsContext)
 };
 
-#endif   // __JUCE_MAC_COREGRAPHICSCONTEXT_JUCEHEADER__
+#endif   // JUCE_MAC_COREGRAPHICSCONTEXT_H_INCLUDED
diff --git a/modules/juce_graphics/native/juce_mac_CoreGraphicsHelpers.h b/modules/juce_graphics/native/juce_mac_CoreGraphicsHelpers.h
index e0d07aad30..ca6f699268 100644
--- a/modules/juce_graphics/native/juce_mac_CoreGraphicsHelpers.h
+++ b/modules/juce_graphics/native/juce_mac_CoreGraphicsHelpers.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MAC_COREGRAPHICSHELPERS_JUCEHEADER__
-#define __JUCE_MAC_COREGRAPHICSHELPERS_JUCEHEADER__
+#ifndef JUCE_MAC_COREGRAPHICSHELPERS_H_INCLUDED
+#define JUCE_MAC_COREGRAPHICSHELPERS_H_INCLUDED
 
 
 //==============================================================================
@@ -57,4 +57,4 @@ namespace
 extern CGImageRef juce_createCoreGraphicsImage (const Image&, CGColorSpaceRef, bool mustOutliveSource);
 extern CGContextRef juce_getImageContext (const Image&);
 
-#endif   // __JUCE_MAC_COREGRAPHICSHELPERS_JUCEHEADER__
+#endif   // JUCE_MAC_COREGRAPHICSHELPERS_H_INCLUDED
diff --git a/modules/juce_graphics/placement/juce_Justification.h b/modules/juce_graphics/placement/juce_Justification.h
index 1373e31c50..e5512c3b58 100644
--- a/modules/juce_graphics/placement/juce_Justification.h
+++ b/modules/juce_graphics/placement/juce_Justification.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_JUSTIFICATION_JUCEHEADER__
-#define __JUCE_JUSTIFICATION_JUCEHEADER__
+#ifndef JUCE_JUSTIFICATION_H_INCLUDED
+#define JUCE_JUSTIFICATION_H_INCLUDED
 
 #include "../geometry/juce_Rectangle.h"
 
@@ -185,4 +185,4 @@ private:
     int flags;
 };
 
-#endif   // __JUCE_JUSTIFICATION_JUCEHEADER__
+#endif   // JUCE_JUSTIFICATION_H_INCLUDED
diff --git a/modules/juce_graphics/placement/juce_RectanglePlacement.h b/modules/juce_graphics/placement/juce_RectanglePlacement.h
index b356067541..d5abf35ff4 100644
--- a/modules/juce_graphics/placement/juce_RectanglePlacement.h
+++ b/modules/juce_graphics/placement/juce_RectanglePlacement.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RECTANGLEPLACEMENT_JUCEHEADER__
-#define __JUCE_RECTANGLEPLACEMENT_JUCEHEADER__
+#ifndef JUCE_RECTANGLEPLACEMENT_H_INCLUDED
+#define JUCE_RECTANGLEPLACEMENT_H_INCLUDED
 
 #include "../geometry/juce_AffineTransform.h"
 #include "../geometry/juce_Rectangle.h"
@@ -169,4 +169,4 @@ private:
     int flags;
 };
 
-#endif   // __JUCE_RECTANGLEPLACEMENT_JUCEHEADER__
+#endif   // JUCE_RECTANGLEPLACEMENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/application/juce_Application.h b/modules/juce_gui_basics/application/juce_Application.h
index 530123ab2c..d2394b4d62 100644
--- a/modules/juce_gui_basics/application/juce_Application.h
+++ b/modules/juce_gui_basics/application/juce_Application.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_APPLICATION_JUCEHEADER__
-#define __JUCE_APPLICATION_JUCEHEADER__
+#ifndef JUCE_APPLICATION_H_INCLUDED
+#define JUCE_APPLICATION_H_INCLUDED
 
 
 //==============================================================================
@@ -264,4 +264,4 @@ private:
 };
 
 
-#endif   // __JUCE_APPLICATION_JUCEHEADER__
+#endif   // JUCE_APPLICATION_H_INCLUDED
diff --git a/modules/juce_gui_basics/application/juce_Initialisation.h b/modules/juce_gui_basics/application/juce_Initialisation.h
index 3621d2dde8..46a39be504 100644
--- a/modules/juce_gui_basics/application/juce_Initialisation.h
+++ b/modules/juce_gui_basics/application/juce_Initialisation.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_INITIALISATION_JUCEHEADER__
-#define __JUCE_INITIALISATION_JUCEHEADER__
+#ifndef JUCE_INITIALISATION_H_INCLUDED
+#define JUCE_INITIALISATION_H_INCLUDED
 
 
 //==============================================================================
@@ -110,4 +110,4 @@ public:
     }
 #endif
 
-#endif   // __JUCE_INITIALISATION_JUCEHEADER__
+#endif   // JUCE_INITIALISATION_H_INCLUDED
diff --git a/modules/juce_gui_basics/buttons/juce_ArrowButton.h b/modules/juce_gui_basics/buttons/juce_ArrowButton.h
index c35fa726fa..ec1e3831a6 100644
--- a/modules/juce_gui_basics/buttons/juce_ArrowButton.h
+++ b/modules/juce_gui_basics/buttons/juce_ArrowButton.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ARROWBUTTON_JUCEHEADER__
-#define __JUCE_ARROWBUTTON_JUCEHEADER__
+#ifndef JUCE_ARROWBUTTON_H_INCLUDED
+#define JUCE_ARROWBUTTON_H_INCLUDED
 
 #include "juce_Button.h"
 
@@ -63,4 +63,4 @@ private:
 };
 
 
-#endif   // __JUCE_ARROWBUTTON_JUCEHEADER__
+#endif   // JUCE_ARROWBUTTON_H_INCLUDED
diff --git a/modules/juce_gui_basics/buttons/juce_Button.h b/modules/juce_gui_basics/buttons/juce_Button.h
index 021f244c90..7010fbedd6 100644
--- a/modules/juce_gui_basics/buttons/juce_Button.h
+++ b/modules/juce_gui_basics/buttons/juce_Button.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BUTTON_JUCEHEADER__
-#define __JUCE_BUTTON_JUCEHEADER__
+#ifndef JUCE_BUTTON_H_INCLUDED
+#define JUCE_BUTTON_H_INCLUDED
 
 #include "../components/juce_Component.h"
 #include "../keyboard/juce_KeyListener.h"
@@ -490,4 +490,4 @@ private:
  typedef Button::Listener ButtonListener;
 #endif
 
-#endif   // __JUCE_BUTTON_JUCEHEADER__
+#endif   // JUCE_BUTTON_H_INCLUDED
diff --git a/modules/juce_gui_basics/buttons/juce_DrawableButton.h b/modules/juce_gui_basics/buttons/juce_DrawableButton.h
index a0f9178342..a9187a8f73 100644
--- a/modules/juce_gui_basics/buttons/juce_DrawableButton.h
+++ b/modules/juce_gui_basics/buttons/juce_DrawableButton.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DRAWABLEBUTTON_JUCEHEADER__
-#define __JUCE_DRAWABLEBUTTON_JUCEHEADER__
+#ifndef JUCE_DRAWABLEBUTTON_H_INCLUDED
+#define JUCE_DRAWABLEBUTTON_H_INCLUDED
 
 #include "juce_Button.h"
 #include "../drawables/juce_Drawable.h"
@@ -182,4 +182,4 @@ private:
 };
 
 
-#endif   // __JUCE_DRAWABLEBUTTON_JUCEHEADER__
+#endif   // JUCE_DRAWABLEBUTTON_H_INCLUDED
diff --git a/modules/juce_gui_basics/buttons/juce_HyperlinkButton.h b/modules/juce_gui_basics/buttons/juce_HyperlinkButton.h
index e39aec79b6..263950f7d7 100644
--- a/modules/juce_gui_basics/buttons/juce_HyperlinkButton.h
+++ b/modules/juce_gui_basics/buttons/juce_HyperlinkButton.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_HYPERLINKBUTTON_JUCEHEADER__
-#define __JUCE_HYPERLINKBUTTON_JUCEHEADER__
+#ifndef JUCE_HYPERLINKBUTTON_H_INCLUDED
+#define JUCE_HYPERLINKBUTTON_H_INCLUDED
 
 #include "juce_Button.h"
 
@@ -113,4 +113,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (HyperlinkButton)
 };
 
-#endif   // __JUCE_HYPERLINKBUTTON_JUCEHEADER__
+#endif   // JUCE_HYPERLINKBUTTON_H_INCLUDED
diff --git a/modules/juce_gui_basics/buttons/juce_ImageButton.h b/modules/juce_gui_basics/buttons/juce_ImageButton.h
index b32c3fd6a8..7997249b52 100644
--- a/modules/juce_gui_basics/buttons/juce_ImageButton.h
+++ b/modules/juce_gui_basics/buttons/juce_ImageButton.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IMAGEBUTTON_JUCEHEADER__
-#define __JUCE_IMAGEBUTTON_JUCEHEADER__
+#ifndef JUCE_IMAGEBUTTON_H_INCLUDED
+#define JUCE_IMAGEBUTTON_H_INCLUDED
 
 #include "juce_Button.h"
 
@@ -148,4 +148,4 @@ private:
 };
 
 
-#endif   // __JUCE_IMAGEBUTTON_JUCEHEADER__
+#endif   // JUCE_IMAGEBUTTON_H_INCLUDED
diff --git a/modules/juce_gui_basics/buttons/juce_ShapeButton.h b/modules/juce_gui_basics/buttons/juce_ShapeButton.h
index 50dab91e87..7e3e12011e 100644
--- a/modules/juce_gui_basics/buttons/juce_ShapeButton.h
+++ b/modules/juce_gui_basics/buttons/juce_ShapeButton.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SHAPEBUTTON_JUCEHEADER__
-#define __JUCE_SHAPEBUTTON_JUCEHEADER__
+#ifndef JUCE_SHAPEBUTTON_H_INCLUDED
+#define JUCE_SHAPEBUTTON_H_INCLUDED
 
 #include "juce_Button.h"
 
@@ -100,4 +100,4 @@ private:
 };
 
 
-#endif   // __JUCE_SHAPEBUTTON_JUCEHEADER__
+#endif   // JUCE_SHAPEBUTTON_H_INCLUDED
diff --git a/modules/juce_gui_basics/buttons/juce_TextButton.h b/modules/juce_gui_basics/buttons/juce_TextButton.h
index 13357decb7..e0a9334ba5 100644
--- a/modules/juce_gui_basics/buttons/juce_TextButton.h
+++ b/modules/juce_gui_basics/buttons/juce_TextButton.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TEXTBUTTON_JUCEHEADER__
-#define __JUCE_TEXTBUTTON_JUCEHEADER__
+#ifndef JUCE_TEXTBUTTON_H_INCLUDED
+#define JUCE_TEXTBUTTON_H_INCLUDED
 
 #include "juce_Button.h"
 
@@ -99,4 +99,4 @@ private:
 };
 
 
-#endif   // __JUCE_TEXTBUTTON_JUCEHEADER__
+#endif   // JUCE_TEXTBUTTON_H_INCLUDED
diff --git a/modules/juce_gui_basics/buttons/juce_ToggleButton.h b/modules/juce_gui_basics/buttons/juce_ToggleButton.h
index b3fc9ffa8e..81c2c04a03 100644
--- a/modules/juce_gui_basics/buttons/juce_ToggleButton.h
+++ b/modules/juce_gui_basics/buttons/juce_ToggleButton.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TOGGLEBUTTON_JUCEHEADER__
-#define __JUCE_TOGGLEBUTTON_JUCEHEADER__
+#ifndef JUCE_TOGGLEBUTTON_H_INCLUDED
+#define JUCE_TOGGLEBUTTON_H_INCLUDED
 
 #include "juce_Button.h"
 
@@ -86,4 +86,4 @@ private:
 };
 
 
-#endif   // __JUCE_TOGGLEBUTTON_JUCEHEADER__
+#endif   // JUCE_TOGGLEBUTTON_H_INCLUDED
diff --git a/modules/juce_gui_basics/buttons/juce_ToolbarButton.h b/modules/juce_gui_basics/buttons/juce_ToolbarButton.h
index 210bd8e430..54efb87ef0 100644
--- a/modules/juce_gui_basics/buttons/juce_ToolbarButton.h
+++ b/modules/juce_gui_basics/buttons/juce_ToolbarButton.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TOOLBARBUTTON_JUCEHEADER__
-#define __JUCE_TOOLBARBUTTON_JUCEHEADER__
+#ifndef JUCE_TOOLBARBUTTON_H_INCLUDED
+#define JUCE_TOOLBARBUTTON_H_INCLUDED
 
 #include "../widgets/juce_ToolbarItemComponent.h"
 
@@ -96,4 +96,4 @@ private:
 };
 
 
-#endif   // __JUCE_TOOLBARBUTTON_JUCEHEADER__
+#endif   // JUCE_TOOLBARBUTTON_H_INCLUDED
diff --git a/modules/juce_gui_basics/commands/juce_ApplicationCommandID.h b/modules/juce_gui_basics/commands/juce_ApplicationCommandID.h
index dd864656e3..4e92952793 100644
--- a/modules/juce_gui_basics/commands/juce_ApplicationCommandID.h
+++ b/modules/juce_gui_basics/commands/juce_ApplicationCommandID.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_APPLICATIONCOMMANDID_JUCEHEADER__
-#define __JUCE_APPLICATIONCOMMANDID_JUCEHEADER__
+#ifndef JUCE_APPLICATIONCOMMANDID_H_INCLUDED
+#define JUCE_APPLICATIONCOMMANDID_H_INCLUDED
 
 
 //==============================================================================
@@ -85,4 +85,4 @@ namespace StandardApplicationCommandIDs
 }
 
 
-#endif   // __JUCE_APPLICATIONCOMMANDID_JUCEHEADER__
+#endif   // JUCE_APPLICATIONCOMMANDID_H_INCLUDED
diff --git a/modules/juce_gui_basics/commands/juce_ApplicationCommandInfo.h b/modules/juce_gui_basics/commands/juce_ApplicationCommandInfo.h
index 2b66db22f3..68bb39bca9 100644
--- a/modules/juce_gui_basics/commands/juce_ApplicationCommandInfo.h
+++ b/modules/juce_gui_basics/commands/juce_ApplicationCommandInfo.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_APPLICATIONCOMMANDINFO_JUCEHEADER__
-#define __JUCE_APPLICATIONCOMMANDINFO_JUCEHEADER__
+#ifndef JUCE_APPLICATIONCOMMANDINFO_H_INCLUDED
+#define JUCE_APPLICATIONCOMMANDINFO_H_INCLUDED
 
 #include "../keyboard/juce_KeyPress.h"
 #include "juce_ApplicationCommandID.h"
@@ -190,4 +190,4 @@ struct JUCE_API  ApplicationCommandInfo
 };
 
 
-#endif   // __JUCE_APPLICATIONCOMMANDINFO_JUCEHEADER__
+#endif   // JUCE_APPLICATIONCOMMANDINFO_H_INCLUDED
diff --git a/modules/juce_gui_basics/commands/juce_ApplicationCommandManager.h b/modules/juce_gui_basics/commands/juce_ApplicationCommandManager.h
index 5548323246..8f7af95815 100644
--- a/modules/juce_gui_basics/commands/juce_ApplicationCommandManager.h
+++ b/modules/juce_gui_basics/commands/juce_ApplicationCommandManager.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_APPLICATIONCOMMANDMANAGER_JUCEHEADER__
-#define __JUCE_APPLICATIONCOMMANDMANAGER_JUCEHEADER__
+#ifndef JUCE_APPLICATIONCOMMANDMANAGER_H_INCLUDED
+#define JUCE_APPLICATIONCOMMANDMANAGER_H_INCLUDED
 
 #include "juce_ApplicationCommandTarget.h"
 class KeyPressMappingSet;
@@ -354,4 +354,4 @@ public:
 
 
 
-#endif   // __JUCE_APPLICATIONCOMMANDMANAGER_JUCEHEADER__
+#endif   // JUCE_APPLICATIONCOMMANDMANAGER_H_INCLUDED
diff --git a/modules/juce_gui_basics/commands/juce_ApplicationCommandTarget.h b/modules/juce_gui_basics/commands/juce_ApplicationCommandTarget.h
index 4fe2c2cdf4..772bdcfcca 100644
--- a/modules/juce_gui_basics/commands/juce_ApplicationCommandTarget.h
+++ b/modules/juce_gui_basics/commands/juce_ApplicationCommandTarget.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_APPLICATIONCOMMANDTARGET_JUCEHEADER__
-#define __JUCE_APPLICATIONCOMMANDTARGET_JUCEHEADER__
+#ifndef JUCE_APPLICATIONCOMMANDTARGET_H_INCLUDED
+#define JUCE_APPLICATIONCOMMANDTARGET_H_INCLUDED
 
 #include "juce_ApplicationCommandInfo.h"
 class Component;
@@ -245,4 +245,4 @@ private:
 };
 
 
-#endif   // __JUCE_APPLICATIONCOMMANDTARGET_JUCEHEADER__
+#endif   // JUCE_APPLICATIONCOMMANDTARGET_H_INCLUDED
diff --git a/modules/juce_gui_basics/commands/juce_KeyPressMappingSet.h b/modules/juce_gui_basics/commands/juce_KeyPressMappingSet.h
index 274fc6aeee..6e8d9e5f82 100644
--- a/modules/juce_gui_basics/commands/juce_KeyPressMappingSet.h
+++ b/modules/juce_gui_basics/commands/juce_KeyPressMappingSet.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_KEYPRESSMAPPINGSET_JUCEHEADER__
-#define __JUCE_KEYPRESSMAPPINGSET_JUCEHEADER__
+#ifndef JUCE_KEYPRESSMAPPINGSET_H_INCLUDED
+#define JUCE_KEYPRESSMAPPINGSET_H_INCLUDED
 
 #include "../keyboard/juce_KeyListener.h"
 #include "../commands/juce_ApplicationCommandManager.h"
@@ -249,4 +249,4 @@ private:
 };
 
 
-#endif   // __JUCE_KEYPRESSMAPPINGSET_JUCEHEADER__
+#endif   // JUCE_KEYPRESSMAPPINGSET_H_INCLUDED
diff --git a/modules/juce_gui_basics/components/juce_CachedComponentImage.h b/modules/juce_gui_basics/components/juce_CachedComponentImage.h
index 112dc175d9..c508271003 100644
--- a/modules/juce_gui_basics/components/juce_CachedComponentImage.h
+++ b/modules/juce_gui_basics/components/juce_CachedComponentImage.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CACHEDCOMPONENTIMAGE_JUCEHEADER__
-#define __JUCE_CACHEDCOMPONENTIMAGE_JUCEHEADER__
+#ifndef JUCE_CACHEDCOMPONENTIMAGE_H_INCLUDED
+#define JUCE_CACHEDCOMPONENTIMAGE_H_INCLUDED
 
 class Component;
 
@@ -63,4 +63,4 @@ public:
     virtual void releaseResources() = 0;
 };
 
-#endif   // __JUCE_CACHEDCOMPONENTIMAGE_JUCEHEADER__
+#endif   // JUCE_CACHEDCOMPONENTIMAGE_H_INCLUDED
diff --git a/modules/juce_gui_basics/components/juce_Component.h b/modules/juce_gui_basics/components/juce_Component.h
index b2fc9f75e0..ab4937b46e 100644
--- a/modules/juce_gui_basics/components/juce_Component.h
+++ b/modules/juce_gui_basics/components/juce_Component.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COMPONENT_JUCEHEADER__
-#define __JUCE_COMPONENT_JUCEHEADER__
+#ifndef JUCE_COMPONENT_H_INCLUDED
+#define JUCE_COMPONENT_H_INCLUDED
 
 #include "../mouse/juce_MouseCursor.h"
 #include "../mouse/juce_MouseListener.h"
@@ -2345,4 +2345,4 @@ protected:
 };
 
 
-#endif   // __JUCE_COMPONENT_JUCEHEADER__
+#endif   // JUCE_COMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/components/juce_ComponentListener.h b/modules/juce_gui_basics/components/juce_ComponentListener.h
index abdf1122fd..d3e548e9a1 100644
--- a/modules/juce_gui_basics/components/juce_ComponentListener.h
+++ b/modules/juce_gui_basics/components/juce_ComponentListener.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COMPONENTLISTENER_JUCEHEADER__
-#define __JUCE_COMPONENTLISTENER_JUCEHEADER__
+#ifndef JUCE_COMPONENTLISTENER_H_INCLUDED
+#define JUCE_COMPONENTLISTENER_H_INCLUDED
 
 class Component;
 
@@ -110,4 +110,4 @@ public:
 };
 
 
-#endif   // __JUCE_COMPONENTLISTENER_JUCEHEADER__
+#endif   // JUCE_COMPONENTLISTENER_H_INCLUDED
diff --git a/modules/juce_gui_basics/components/juce_Desktop.h b/modules/juce_gui_basics/components/juce_Desktop.h
index 8acd322b99..6e4d65c12d 100644
--- a/modules/juce_gui_basics/components/juce_Desktop.h
+++ b/modules/juce_gui_basics/components/juce_Desktop.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DESKTOP_JUCEHEADER__
-#define __JUCE_DESKTOP_JUCEHEADER__
+#ifndef JUCE_DESKTOP_H_INCLUDED
+#define JUCE_DESKTOP_H_INCLUDED
 
 #include "juce_Component.h"
 #include "../layout/juce_ComponentAnimator.h"
@@ -447,4 +447,4 @@ private:
 };
 
 
-#endif   // __JUCE_DESKTOP_JUCEHEADER__
+#endif   // JUCE_DESKTOP_H_INCLUDED
diff --git a/modules/juce_gui_basics/components/juce_ModalComponentManager.h b/modules/juce_gui_basics/components/juce_ModalComponentManager.h
index a4cad9385b..2beaf697e0 100644
--- a/modules/juce_gui_basics/components/juce_ModalComponentManager.h
+++ b/modules/juce_gui_basics/components/juce_ModalComponentManager.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MODALCOMPONENTMANAGER_JUCEHEADER__
-#define __JUCE_MODALCOMPONENTMANAGER_JUCEHEADER__
+#ifndef JUCE_MODALCOMPONENTMANAGER_H_INCLUDED
+#define JUCE_MODALCOMPONENTMANAGER_H_INCLUDED
 
 
 //==============================================================================
@@ -361,4 +361,4 @@ private:
 };
 
 
-#endif   // __JUCE_MODALCOMPONENTMANAGER_JUCEHEADER__
+#endif   // JUCE_MODALCOMPONENTMANAGER_H_INCLUDED
diff --git a/modules/juce_gui_basics/drawables/juce_Drawable.h b/modules/juce_gui_basics/drawables/juce_Drawable.h
index 2dc4ec68d2..a91a2fb5ef 100644
--- a/modules/juce_gui_basics/drawables/juce_Drawable.h
+++ b/modules/juce_gui_basics/drawables/juce_Drawable.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DRAWABLE_JUCEHEADER__
-#define __JUCE_DRAWABLE_JUCEHEADER__
+#ifndef JUCE_DRAWABLE_H_INCLUDED
+#define JUCE_DRAWABLE_H_INCLUDED
 
 #include "../components/juce_Component.h"
 #include "../positioning/juce_RelativeCoordinate.h"
@@ -257,4 +257,4 @@ private:
 };
 
 
-#endif   // __JUCE_DRAWABLE_JUCEHEADER__
+#endif   // JUCE_DRAWABLE_H_INCLUDED
diff --git a/modules/juce_gui_basics/drawables/juce_DrawableComposite.h b/modules/juce_gui_basics/drawables/juce_DrawableComposite.h
index b82c486c0b..786d23b10b 100644
--- a/modules/juce_gui_basics/drawables/juce_DrawableComposite.h
+++ b/modules/juce_gui_basics/drawables/juce_DrawableComposite.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DRAWABLECOMPOSITE_JUCEHEADER__
-#define __JUCE_DRAWABLECOMPOSITE_JUCEHEADER__
+#ifndef JUCE_DRAWABLECOMPOSITE_H_INCLUDED
+#define JUCE_DRAWABLECOMPOSITE_H_INCLUDED
 
 #include "juce_Drawable.h"
 #include "../positioning/juce_MarkerList.h"
@@ -158,4 +158,4 @@ private:
 };
 
 
-#endif   // __JUCE_DRAWABLECOMPOSITE_JUCEHEADER__
+#endif   // JUCE_DRAWABLECOMPOSITE_H_INCLUDED
diff --git a/modules/juce_gui_basics/drawables/juce_DrawableImage.h b/modules/juce_gui_basics/drawables/juce_DrawableImage.h
index 47d5d190c4..178f2454fe 100644
--- a/modules/juce_gui_basics/drawables/juce_DrawableImage.h
+++ b/modules/juce_gui_basics/drawables/juce_DrawableImage.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DRAWABLEIMAGE_JUCEHEADER__
-#define __JUCE_DRAWABLEIMAGE_JUCEHEADER__
+#ifndef JUCE_DRAWABLEIMAGE_H_INCLUDED
+#define JUCE_DRAWABLEIMAGE_H_INCLUDED
 
 #include "juce_Drawable.h"
 #include "../positioning/juce_RelativeParallelogram.h"
@@ -138,4 +138,4 @@ private:
 };
 
 
-#endif   // __JUCE_DRAWABLEIMAGE_JUCEHEADER__
+#endif   // JUCE_DRAWABLEIMAGE_H_INCLUDED
diff --git a/modules/juce_gui_basics/drawables/juce_DrawablePath.h b/modules/juce_gui_basics/drawables/juce_DrawablePath.h
index 8a22830f0a..826fb57edd 100644
--- a/modules/juce_gui_basics/drawables/juce_DrawablePath.h
+++ b/modules/juce_gui_basics/drawables/juce_DrawablePath.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DRAWABLEPATH_JUCEHEADER__
-#define __JUCE_DRAWABLEPATH_JUCEHEADER__
+#ifndef JUCE_DRAWABLEPATH_H_INCLUDED
+#define JUCE_DRAWABLEPATH_H_INCLUDED
 
 #include "juce_DrawableShape.h"
 #include "../positioning/juce_RelativePointPath.h"
@@ -145,4 +145,4 @@ private:
 };
 
 
-#endif   // __JUCE_DRAWABLEPATH_JUCEHEADER__
+#endif   // JUCE_DRAWABLEPATH_H_INCLUDED
diff --git a/modules/juce_gui_basics/drawables/juce_DrawableRectangle.h b/modules/juce_gui_basics/drawables/juce_DrawableRectangle.h
index 7a9dfd0380..87b63f6425 100644
--- a/modules/juce_gui_basics/drawables/juce_DrawableRectangle.h
+++ b/modules/juce_gui_basics/drawables/juce_DrawableRectangle.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DRAWABLERECTANGLE_JUCEHEADER__
-#define __JUCE_DRAWABLERECTANGLE_JUCEHEADER__
+#ifndef JUCE_DRAWABLERECTANGLE_H_INCLUDED
+#define JUCE_DRAWABLERECTANGLE_H_INCLUDED
 
 #include "juce_DrawableShape.h"
 #include "../positioning/juce_RelativeParallelogram.h"
@@ -103,4 +103,4 @@ private:
 };
 
 
-#endif   // __JUCE_DRAWABLERECTANGLE_JUCEHEADER__
+#endif   // JUCE_DRAWABLERECTANGLE_H_INCLUDED
diff --git a/modules/juce_gui_basics/drawables/juce_DrawableShape.h b/modules/juce_gui_basics/drawables/juce_DrawableShape.h
index cff3fc4575..3fe80cfe87 100644
--- a/modules/juce_gui_basics/drawables/juce_DrawableShape.h
+++ b/modules/juce_gui_basics/drawables/juce_DrawableShape.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DRAWABLESHAPE_JUCEHEADER__
-#define __JUCE_DRAWABLESHAPE_JUCEHEADER__
+#ifndef JUCE_DRAWABLESHAPE_H_INCLUDED
+#define JUCE_DRAWABLESHAPE_H_INCLUDED
 
 #include "juce_Drawable.h"
 #include "../positioning/juce_RelativeCoordinatePositioner.h"
@@ -180,4 +180,4 @@ private:
 };
 
 
-#endif   // __JUCE_DRAWABLESHAPE_JUCEHEADER__
+#endif   // JUCE_DRAWABLESHAPE_H_INCLUDED
diff --git a/modules/juce_gui_basics/drawables/juce_DrawableText.h b/modules/juce_gui_basics/drawables/juce_DrawableText.h
index 20e51a9046..7b442ae771 100644
--- a/modules/juce_gui_basics/drawables/juce_DrawableText.h
+++ b/modules/juce_gui_basics/drawables/juce_DrawableText.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DRAWABLETEXT_JUCEHEADER__
-#define __JUCE_DRAWABLETEXT_JUCEHEADER__
+#ifndef JUCE_DRAWABLETEXT_H_INCLUDED
+#define JUCE_DRAWABLETEXT_H_INCLUDED
 
 #include "juce_Drawable.h"
 #include "../positioning/juce_RelativeParallelogram.h"
@@ -155,4 +155,4 @@ private:
 };
 
 
-#endif   // __JUCE_DRAWABLETEXT_JUCEHEADER__
+#endif   // JUCE_DRAWABLETEXT_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.h b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.h
index 478d9594c3..6ec489d097 100644
--- a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.h
+++ b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DIRECTORYCONTENTSDISPLAYCOMPONENT_JUCEHEADER__
-#define __JUCE_DIRECTORYCONTENTSDISPLAYCOMPONENT_JUCEHEADER__
+#ifndef JUCE_DIRECTORYCONTENTSDISPLAYCOMPONENT_H_INCLUDED
+#define JUCE_DIRECTORYCONTENTSDISPLAYCOMPONENT_H_INCLUDED
 
 #include "../components/juce_Component.h"
 #include "juce_DirectoryContentsList.h"
@@ -112,4 +112,4 @@ private:
 };
 
 
-#endif   // __JUCE_DIRECTORYCONTENTSDISPLAYCOMPONENT_JUCEHEADER__
+#endif   // JUCE_DIRECTORYCONTENTSDISPLAYCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h
index 2c12fd61d7..eee01072b4 100644
--- a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h
+++ b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DIRECTORYCONTENTSLIST_JUCEHEADER__
-#define __JUCE_DIRECTORYCONTENTSLIST_JUCEHEADER__
+#ifndef JUCE_DIRECTORYCONTENTSLIST_H_INCLUDED
+#define JUCE_DIRECTORYCONTENTSLIST_H_INCLUDED
 
 #include "juce_FileFilter.h"
 
@@ -213,4 +213,4 @@ private:
 };
 
 
-#endif   // __JUCE_DIRECTORYCONTENTSLIST_JUCEHEADER__
+#endif   // JUCE_DIRECTORYCONTENTSLIST_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h b/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h
index bf938cedef..941c0fac5d 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILEBROWSERCOMPONENT_JUCEHEADER__
-#define __JUCE_FILEBROWSERCOMPONENT_JUCEHEADER__
+#ifndef JUCE_FILEBROWSERCOMPONENT_H_INCLUDED
+#define JUCE_FILEBROWSERCOMPONENT_H_INCLUDED
 
 #include "juce_DirectoryContentsDisplayComponent.h"
 #include "juce_FilePreviewComponent.h"
@@ -257,4 +257,4 @@ private:
 
 
 
-#endif   // __JUCE_FILEBROWSERCOMPONENT_JUCEHEADER__
+#endif   // JUCE_FILEBROWSERCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileBrowserListener.h b/modules/juce_gui_basics/filebrowser/juce_FileBrowserListener.h
index 1c83fbb635..1bd74167d2 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileBrowserListener.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FileBrowserListener.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILEBROWSERLISTENER_JUCEHEADER__
-#define __JUCE_FILEBROWSERLISTENER_JUCEHEADER__
+#ifndef JUCE_FILEBROWSERLISTENER_H_INCLUDED
+#define JUCE_FILEBROWSERLISTENER_H_INCLUDED
 
 #include "../mouse/juce_MouseEvent.h"
 
@@ -56,4 +56,4 @@ public:
 };
 
 
-#endif   // __JUCE_FILEBROWSERLISTENER_JUCEHEADER__
+#endif   // JUCE_FILEBROWSERLISTENER_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileChooser.h b/modules/juce_gui_basics/filebrowser/juce_FileChooser.h
index 0078f3af05..30cf910bbf 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileChooser.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FileChooser.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILECHOOSER_JUCEHEADER__
-#define __JUCE_FILECHOOSER_JUCEHEADER__
+#ifndef JUCE_FILECHOOSER_H_INCLUDED
+#define JUCE_FILECHOOSER_H_INCLUDED
 
 #include "juce_FilePreviewComponent.h"
 
@@ -196,4 +196,4 @@ private:
 };
 
 
-#endif   // __JUCE_FILECHOOSER_JUCEHEADER__
+#endif   // JUCE_FILECHOOSER_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.h b/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.h
index 0effab4594..018f6a7c84 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILECHOOSERDIALOGBOX_JUCEHEADER__
-#define __JUCE_FILECHOOSERDIALOGBOX_JUCEHEADER__
+#ifndef JUCE_FILECHOOSERDIALOGBOX_H_INCLUDED
+#define JUCE_FILECHOOSERDIALOGBOX_H_INCLUDED
 
 #include "juce_FileBrowserComponent.h"
 #include "../windows/juce_ResizableWindow.h"
@@ -158,4 +158,4 @@ private:
 };
 
 
-#endif   // __JUCE_FILECHOOSERDIALOGBOX_JUCEHEADER__
+#endif   // JUCE_FILECHOOSERDIALOGBOX_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileFilter.h b/modules/juce_gui_basics/filebrowser/juce_FileFilter.h
index 65a65c0088..8a87a42064 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileFilter.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FileFilter.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILEFILTER_JUCEHEADER__
-#define __JUCE_FILEFILTER_JUCEHEADER__
+#ifndef JUCE_FILEFILTER_H_INCLUDED
+#define JUCE_FILEFILTER_H_INCLUDED
 
 
 //==============================================================================
@@ -70,4 +70,4 @@ protected:
 };
 
 
-#endif   // __JUCE_FILEFILTER_JUCEHEADER__
+#endif   // JUCE_FILEFILTER_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileListComponent.h b/modules/juce_gui_basics/filebrowser/juce_FileListComponent.h
index a9d39f4c75..76ec88a1a9 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileListComponent.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FileListComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILELISTCOMPONENT_JUCEHEADER__
-#define __JUCE_FILELISTCOMPONENT_JUCEHEADER__
+#ifndef JUCE_FILELISTCOMPONENT_H_INCLUDED
+#define JUCE_FILELISTCOMPONENT_H_INCLUDED
 
 #include "juce_DirectoryContentsDisplayComponent.h"
 #include "juce_FileBrowserListener.h"
@@ -98,4 +98,4 @@ private:
 };
 
 
-#endif   // __JUCE_FILELISTCOMPONENT_JUCEHEADER__
+#endif   // JUCE_FILELISTCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_FilePreviewComponent.h b/modules/juce_gui_basics/filebrowser/juce_FilePreviewComponent.h
index 5525d732b5..befc127210 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FilePreviewComponent.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FilePreviewComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILEPREVIEWCOMPONENT_JUCEHEADER__
-#define __JUCE_FILEPREVIEWCOMPONENT_JUCEHEADER__
+#ifndef JUCE_FILEPREVIEWCOMPONENT_H_INCLUDED
+#define JUCE_FILEPREVIEWCOMPONENT_H_INCLUDED
 
 #include "../components/juce_Component.h"
 
@@ -64,4 +64,4 @@ private:
 };
 
 
-#endif   // __JUCE_FILEPREVIEWCOMPONENT_JUCEHEADER__
+#endif   // JUCE_FILEPREVIEWCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h b/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h
index b27c3ed5f8..6e4549b3f8 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILESEARCHPATHLISTCOMPONENT_JUCEHEADER__
-#define __JUCE_FILESEARCHPATHLISTCOMPONENT_JUCEHEADER__
+#ifndef JUCE_FILESEARCHPATHLISTCOMPONENT_H_INCLUDED
+#define JUCE_FILESEARCHPATHLISTCOMPONENT_H_INCLUDED
 
 #include "../widgets/juce_ListBox.h"
 #include "../buttons/juce_DrawableButton.h"
@@ -118,4 +118,4 @@ private:
 };
 
 
-#endif   // __JUCE_FILESEARCHPATHLISTCOMPONENT_JUCEHEADER__
+#endif   // JUCE_FILESEARCHPATHLISTCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.h b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.h
index 69f61c3768..7e999c79eb 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILETREECOMPONENT_JUCEHEADER__
-#define __JUCE_FILETREECOMPONENT_JUCEHEADER__
+#ifndef JUCE_FILETREECOMPONENT_H_INCLUDED
+#define JUCE_FILETREECOMPONENT_H_INCLUDED
 
 #include "juce_DirectoryContentsDisplayComponent.h"
 #include "../widgets/juce_TreeView.h"
@@ -97,4 +97,4 @@ private:
 };
 
 
-#endif   // __JUCE_FILETREECOMPONENT_JUCEHEADER__
+#endif   // JUCE_FILETREECOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h b/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h
index 50c6570615..6fd019c38f 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h
+++ b/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILENAMECOMPONENT_JUCEHEADER__
-#define __JUCE_FILENAMECOMPONENT_JUCEHEADER__
+#ifndef JUCE_FILENAMECOMPONENT_H_INCLUDED
+#define JUCE_FILENAMECOMPONENT_H_INCLUDED
 
 #include "../widgets/juce_ComboBox.h"
 #include "../buttons/juce_TextButton.h"
@@ -214,4 +214,4 @@ private:
 
 
 
-#endif   // __JUCE_FILENAMECOMPONENT_JUCEHEADER__
+#endif   // JUCE_FILENAMECOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.h b/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.h
index 025af11c2d..76c5505b83 100644
--- a/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.h
+++ b/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IMAGEPREVIEWCOMPONENT_JUCEHEADER__
-#define __JUCE_IMAGEPREVIEWCOMPONENT_JUCEHEADER__
+#ifndef JUCE_IMAGEPREVIEWCOMPONENT_H_INCLUDED
+#define JUCE_IMAGEPREVIEWCOMPONENT_H_INCLUDED
 
 #include "juce_FilePreviewComponent.h"
 
@@ -65,4 +65,4 @@ private:
 };
 
 
-#endif   // __JUCE_IMAGEPREVIEWCOMPONENT_JUCEHEADER__
+#endif   // JUCE_IMAGEPREVIEWCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/filebrowser/juce_WildcardFileFilter.h b/modules/juce_gui_basics/filebrowser/juce_WildcardFileFilter.h
index b51f84acc1..b13c608bfb 100644
--- a/modules/juce_gui_basics/filebrowser/juce_WildcardFileFilter.h
+++ b/modules/juce_gui_basics/filebrowser/juce_WildcardFileFilter.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_WILDCARDFILEFILTER_JUCEHEADER__
-#define __JUCE_WILDCARDFILEFILTER_JUCEHEADER__
+#ifndef JUCE_WILDCARDFILEFILTER_H_INCLUDED
+#define JUCE_WILDCARDFILEFILTER_H_INCLUDED
 
 #include "juce_FileFilter.h"
 
@@ -81,4 +81,4 @@ private:
 
 
 
-#endif   // __JUCE_WILDCARDFILEFILTER_JUCEHEADER__
+#endif   // JUCE_WILDCARDFILEFILTER_H_INCLUDED
diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp
index 31b430cd26..bd0a32f9e6 100644
--- a/modules/juce_gui_basics/juce_gui_basics.cpp
+++ b/modules/juce_gui_basics/juce_gui_basics.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_GUI_BASICS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_GUI_BASICS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_gui_basics/juce_gui_basics.h b/modules/juce_gui_basics/juce_gui_basics.h
index 6b5157630f..33540b332b 100644
--- a/modules/juce_gui_basics/juce_gui_basics.h
+++ b/modules/juce_gui_basics/juce_gui_basics.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_GUI_BASICS_JUCEHEADER__
-#define __JUCE_GUI_BASICS_JUCEHEADER__
+#ifndef JUCE_GUI_BASICS_H_INCLUDED
+#define JUCE_GUI_BASICS_H_INCLUDED
 
 #include "../juce_graphics/juce_graphics.h"
 #include "../juce_data_structures/juce_data_structures.h"
@@ -75,386 +75,134 @@ namespace juce
 // START_AUTOINCLUDE components, mouse, keyboard, buttons, drawables,
 // filebrowser, layout, lookandfeel, menus, positioning, properties,
 // widgets, windows, commands, application, misc
-#ifndef __JUCE_CACHEDCOMPONENTIMAGE_JUCEHEADER__
- #include "components/juce_CachedComponentImage.h"
-#endif
-#ifndef __JUCE_COMPONENT_JUCEHEADER__
- #include "components/juce_Component.h"
-#endif
-#ifndef __JUCE_COMPONENTLISTENER_JUCEHEADER__
- #include "components/juce_ComponentListener.h"
-#endif
-#ifndef __JUCE_DESKTOP_JUCEHEADER__
- #include "components/juce_Desktop.h"
-#endif
-#ifndef __JUCE_MODALCOMPONENTMANAGER_JUCEHEADER__
- #include "components/juce_ModalComponentManager.h"
-#endif
-#ifndef __JUCE_COMPONENTDRAGGER_JUCEHEADER__
- #include "mouse/juce_ComponentDragger.h"
-#endif
-#ifndef __JUCE_DRAGANDDROPCONTAINER_JUCEHEADER__
- #include "mouse/juce_DragAndDropContainer.h"
-#endif
-#ifndef __JUCE_DRAGANDDROPTARGET_JUCEHEADER__
- #include "mouse/juce_DragAndDropTarget.h"
-#endif
-#ifndef __JUCE_FILEDRAGANDDROPTARGET_JUCEHEADER__
- #include "mouse/juce_FileDragAndDropTarget.h"
-#endif
-#ifndef __JUCE_LASSOCOMPONENT_JUCEHEADER__
- #include "mouse/juce_LassoComponent.h"
-#endif
-#ifndef __JUCE_MOUSECURSOR_JUCEHEADER__
- #include "mouse/juce_MouseCursor.h"
-#endif
-#ifndef __JUCE_MOUSEEVENT_JUCEHEADER__
- #include "mouse/juce_MouseEvent.h"
-#endif
-#ifndef __JUCE_MOUSEINACTIVITYDETECTOR_JUCEHEADER__
- #include "mouse/juce_MouseInactivityDetector.h"
-#endif
-#ifndef __JUCE_MOUSEINPUTSOURCE_JUCEHEADER__
- #include "mouse/juce_MouseInputSource.h"
-#endif
-#ifndef __JUCE_MOUSELISTENER_JUCEHEADER__
- #include "mouse/juce_MouseListener.h"
-#endif
-#ifndef __JUCE_SELECTEDITEMSET_JUCEHEADER__
- #include "mouse/juce_SelectedItemSet.h"
-#endif
-#ifndef __JUCE_TEXTDRAGANDDROPTARGET_JUCEHEADER__
- #include "mouse/juce_TextDragAndDropTarget.h"
-#endif
-#ifndef __JUCE_TOOLTIPCLIENT_JUCEHEADER__
- #include "mouse/juce_TooltipClient.h"
-#endif
-#ifndef __JUCE_CARETCOMPONENT_JUCEHEADER__
- #include "keyboard/juce_CaretComponent.h"
-#endif
-#ifndef __JUCE_KEYBOARDFOCUSTRAVERSER_JUCEHEADER__
- #include "keyboard/juce_KeyboardFocusTraverser.h"
-#endif
-#ifndef __JUCE_KEYLISTENER_JUCEHEADER__
- #include "keyboard/juce_KeyListener.h"
-#endif
-#ifndef __JUCE_KEYPRESS_JUCEHEADER__
- #include "keyboard/juce_KeyPress.h"
-#endif
-#ifndef __JUCE_MODIFIERKEYS_JUCEHEADER__
- #include "keyboard/juce_ModifierKeys.h"
-#endif
-#ifndef __JUCE_SYSTEMCLIPBOARD_JUCEHEADER__
- #include "keyboard/juce_SystemClipboard.h"
-#endif
-#ifndef __JUCE_TEXTEDITORKEYMAPPER_JUCEHEADER__
- #include "keyboard/juce_TextEditorKeyMapper.h"
-#endif
-#ifndef __JUCE_TEXTINPUTTARGET_JUCEHEADER__
- #include "keyboard/juce_TextInputTarget.h"
-#endif
-#ifndef __JUCE_ARROWBUTTON_JUCEHEADER__
- #include "buttons/juce_ArrowButton.h"
-#endif
-#ifndef __JUCE_BUTTON_JUCEHEADER__
- #include "buttons/juce_Button.h"
-#endif
-#ifndef __JUCE_DRAWABLEBUTTON_JUCEHEADER__
- #include "buttons/juce_DrawableButton.h"
-#endif
-#ifndef __JUCE_HYPERLINKBUTTON_JUCEHEADER__
- #include "buttons/juce_HyperlinkButton.h"
-#endif
-#ifndef __JUCE_IMAGEBUTTON_JUCEHEADER__
- #include "buttons/juce_ImageButton.h"
-#endif
-#ifndef __JUCE_SHAPEBUTTON_JUCEHEADER__
- #include "buttons/juce_ShapeButton.h"
-#endif
-#ifndef __JUCE_TEXTBUTTON_JUCEHEADER__
- #include "buttons/juce_TextButton.h"
-#endif
-#ifndef __JUCE_TOGGLEBUTTON_JUCEHEADER__
- #include "buttons/juce_ToggleButton.h"
-#endif
-#ifndef __JUCE_TOOLBARBUTTON_JUCEHEADER__
- #include "buttons/juce_ToolbarButton.h"
-#endif
-#ifndef __JUCE_DRAWABLE_JUCEHEADER__
- #include "drawables/juce_Drawable.h"
-#endif
-#ifndef __JUCE_DRAWABLECOMPOSITE_JUCEHEADER__
- #include "drawables/juce_DrawableComposite.h"
-#endif
-#ifndef __JUCE_DRAWABLEIMAGE_JUCEHEADER__
- #include "drawables/juce_DrawableImage.h"
-#endif
-#ifndef __JUCE_DRAWABLEPATH_JUCEHEADER__
- #include "drawables/juce_DrawablePath.h"
-#endif
-#ifndef __JUCE_DRAWABLERECTANGLE_JUCEHEADER__
- #include "drawables/juce_DrawableRectangle.h"
-#endif
-#ifndef __JUCE_DRAWABLESHAPE_JUCEHEADER__
- #include "drawables/juce_DrawableShape.h"
-#endif
-#ifndef __JUCE_DRAWABLETEXT_JUCEHEADER__
- #include "drawables/juce_DrawableText.h"
-#endif
-#ifndef __JUCE_DIRECTORYCONTENTSDISPLAYCOMPONENT_JUCEHEADER__
- #include "filebrowser/juce_DirectoryContentsDisplayComponent.h"
-#endif
-#ifndef __JUCE_DIRECTORYCONTENTSLIST_JUCEHEADER__
- #include "filebrowser/juce_DirectoryContentsList.h"
-#endif
-#ifndef __JUCE_FILEBROWSERCOMPONENT_JUCEHEADER__
- #include "filebrowser/juce_FileBrowserComponent.h"
-#endif
-#ifndef __JUCE_FILEBROWSERLISTENER_JUCEHEADER__
- #include "filebrowser/juce_FileBrowserListener.h"
-#endif
-#ifndef __JUCE_FILECHOOSER_JUCEHEADER__
- #include "filebrowser/juce_FileChooser.h"
-#endif
-#ifndef __JUCE_FILECHOOSERDIALOGBOX_JUCEHEADER__
- #include "filebrowser/juce_FileChooserDialogBox.h"
-#endif
-#ifndef __JUCE_FILEFILTER_JUCEHEADER__
- #include "filebrowser/juce_FileFilter.h"
-#endif
-#ifndef __JUCE_FILELISTCOMPONENT_JUCEHEADER__
- #include "filebrowser/juce_FileListComponent.h"
-#endif
-#ifndef __JUCE_FILENAMECOMPONENT_JUCEHEADER__
- #include "filebrowser/juce_FilenameComponent.h"
-#endif
-#ifndef __JUCE_FILEPREVIEWCOMPONENT_JUCEHEADER__
- #include "filebrowser/juce_FilePreviewComponent.h"
-#endif
-#ifndef __JUCE_FILESEARCHPATHLISTCOMPONENT_JUCEHEADER__
- #include "filebrowser/juce_FileSearchPathListComponent.h"
-#endif
-#ifndef __JUCE_FILETREECOMPONENT_JUCEHEADER__
- #include "filebrowser/juce_FileTreeComponent.h"
-#endif
-#ifndef __JUCE_IMAGEPREVIEWCOMPONENT_JUCEHEADER__
- #include "filebrowser/juce_ImagePreviewComponent.h"
-#endif
-#ifndef __JUCE_WILDCARDFILEFILTER_JUCEHEADER__
- #include "filebrowser/juce_WildcardFileFilter.h"
-#endif
-#ifndef __JUCE_ANIMATEDPOSITION_JUCEHEADER__
- #include "layout/juce_AnimatedPosition.h"
-#endif
-#ifndef __JUCE_ANIMATEDPOSITIONBEHAVIOURS_JUCEHEADER__
- #include "layout/juce_AnimatedPositionBehaviours.h"
-#endif
-#ifndef __JUCE_COMPONENTANIMATOR_JUCEHEADER__
- #include "layout/juce_ComponentAnimator.h"
-#endif
-#ifndef __JUCE_COMPONENTBOUNDSCONSTRAINER_JUCEHEADER__
- #include "layout/juce_ComponentBoundsConstrainer.h"
-#endif
-#ifndef __JUCE_COMPONENTBUILDER_JUCEHEADER__
- #include "layout/juce_ComponentBuilder.h"
-#endif
-#ifndef __JUCE_COMPONENTMOVEMENTWATCHER_JUCEHEADER__
- #include "layout/juce_ComponentMovementWatcher.h"
-#endif
-#ifndef __JUCE_CONCERTINAPANEL_JUCEHEADER__
- #include "layout/juce_ConcertinaPanel.h"
-#endif
-#ifndef __JUCE_GROUPCOMPONENT_JUCEHEADER__
- #include "layout/juce_GroupComponent.h"
-#endif
-#ifndef __JUCE_MULTIDOCUMENTPANEL_JUCEHEADER__
- #include "layout/juce_MultiDocumentPanel.h"
-#endif
-#ifndef __JUCE_RESIZABLEBORDERCOMPONENT_JUCEHEADER__
- #include "layout/juce_ResizableBorderComponent.h"
-#endif
-#ifndef __JUCE_RESIZABLECORNERCOMPONENT_JUCEHEADER__
- #include "layout/juce_ResizableCornerComponent.h"
-#endif
-#ifndef __JUCE_RESIZABLEEDGECOMPONENT_JUCEHEADER__
- #include "layout/juce_ResizableEdgeComponent.h"
-#endif
-#ifndef __JUCE_SCROLLBAR_JUCEHEADER__
- #include "layout/juce_ScrollBar.h"
-#endif
-#ifndef __JUCE_STRETCHABLELAYOUTMANAGER_JUCEHEADER__
- #include "layout/juce_StretchableLayoutManager.h"
-#endif
-#ifndef __JUCE_STRETCHABLELAYOUTRESIZERBAR_JUCEHEADER__
- #include "layout/juce_StretchableLayoutResizerBar.h"
-#endif
-#ifndef __JUCE_STRETCHABLEOBJECTRESIZER_JUCEHEADER__
- #include "layout/juce_StretchableObjectResizer.h"
-#endif
-#ifndef __JUCE_TABBEDBUTTONBAR_JUCEHEADER__
- #include "layout/juce_TabbedButtonBar.h"
-#endif
-#ifndef __JUCE_TABBEDCOMPONENT_JUCEHEADER__
- #include "layout/juce_TabbedComponent.h"
-#endif
-#ifndef __JUCE_VIEWPORT_JUCEHEADER__
- #include "layout/juce_Viewport.h"
-#endif
-#ifndef __JUCE_LOOKANDFEEL_JUCEHEADER__
- #include "lookandfeel/juce_LookAndFeel.h"
-#endif
-#ifndef __JUCE_MENUBARCOMPONENT_JUCEHEADER__
- #include "menus/juce_MenuBarComponent.h"
-#endif
-#ifndef __JUCE_MENUBARMODEL_JUCEHEADER__
- #include "menus/juce_MenuBarModel.h"
-#endif
-#ifndef __JUCE_POPUPMENU_JUCEHEADER__
- #include "menus/juce_PopupMenu.h"
-#endif
-#ifndef __JUCE_MARKERLIST_JUCEHEADER__
- #include "positioning/juce_MarkerList.h"
-#endif
-#ifndef __JUCE_RELATIVECOORDINATE_JUCEHEADER__
- #include "positioning/juce_RelativeCoordinate.h"
-#endif
-#ifndef __JUCE_RELATIVECOORDINATEPOSITIONER_JUCEHEADER__
- #include "positioning/juce_RelativeCoordinatePositioner.h"
-#endif
-#ifndef __JUCE_RELATIVEPARALLELOGRAM_JUCEHEADER__
- #include "positioning/juce_RelativeParallelogram.h"
-#endif
-#ifndef __JUCE_RELATIVEPOINT_JUCEHEADER__
- #include "positioning/juce_RelativePoint.h"
-#endif
-#ifndef __JUCE_RELATIVEPOINTPATH_JUCEHEADER__
- #include "positioning/juce_RelativePointPath.h"
-#endif
-#ifndef __JUCE_RELATIVERECTANGLE_JUCEHEADER__
- #include "positioning/juce_RelativeRectangle.h"
-#endif
-#ifndef __JUCE_BOOLEANPROPERTYCOMPONENT_JUCEHEADER__
- #include "properties/juce_BooleanPropertyComponent.h"
-#endif
-#ifndef __JUCE_BUTTONPROPERTYCOMPONENT_JUCEHEADER__
- #include "properties/juce_ButtonPropertyComponent.h"
-#endif
-#ifndef __JUCE_CHOICEPROPERTYCOMPONENT_JUCEHEADER__
- #include "properties/juce_ChoicePropertyComponent.h"
-#endif
-#ifndef __JUCE_PROPERTYCOMPONENT_JUCEHEADER__
- #include "properties/juce_PropertyComponent.h"
-#endif
-#ifndef __JUCE_PROPERTYPANEL_JUCEHEADER__
- #include "properties/juce_PropertyPanel.h"
-#endif
-#ifndef __JUCE_SLIDERPROPERTYCOMPONENT_JUCEHEADER__
- #include "properties/juce_SliderPropertyComponent.h"
-#endif
-#ifndef __JUCE_TEXTPROPERTYCOMPONENT_JUCEHEADER__
- #include "properties/juce_TextPropertyComponent.h"
-#endif
-#ifndef __JUCE_COMBOBOX_JUCEHEADER__
- #include "widgets/juce_ComboBox.h"
-#endif
-#ifndef __JUCE_IMAGECOMPONENT_JUCEHEADER__
- #include "widgets/juce_ImageComponent.h"
-#endif
-#ifndef __JUCE_LABEL_JUCEHEADER__
- #include "widgets/juce_Label.h"
-#endif
-#ifndef __JUCE_LISTBOX_JUCEHEADER__
- #include "widgets/juce_ListBox.h"
-#endif
-#ifndef __JUCE_PROGRESSBAR_JUCEHEADER__
- #include "widgets/juce_ProgressBar.h"
-#endif
-#ifndef __JUCE_SLIDER_JUCEHEADER__
- #include "widgets/juce_Slider.h"
-#endif
-#ifndef __JUCE_TABLEHEADERCOMPONENT_JUCEHEADER__
- #include "widgets/juce_TableHeaderComponent.h"
-#endif
-#ifndef __JUCE_TABLELISTBOX_JUCEHEADER__
- #include "widgets/juce_TableListBox.h"
-#endif
-#ifndef __JUCE_TEXTEDITOR_JUCEHEADER__
- #include "widgets/juce_TextEditor.h"
-#endif
-#ifndef __JUCE_TOOLBAR_JUCEHEADER__
- #include "widgets/juce_Toolbar.h"
-#endif
-#ifndef __JUCE_TOOLBARITEMCOMPONENT_JUCEHEADER__
- #include "widgets/juce_ToolbarItemComponent.h"
-#endif
-#ifndef __JUCE_TOOLBARITEMFACTORY_JUCEHEADER__
- #include "widgets/juce_ToolbarItemFactory.h"
-#endif
-#ifndef __JUCE_TOOLBARITEMPALETTE_JUCEHEADER__
- #include "widgets/juce_ToolbarItemPalette.h"
-#endif
-#ifndef __JUCE_TREEVIEW_JUCEHEADER__
- #include "widgets/juce_TreeView.h"
-#endif
-#ifndef __JUCE_ALERTWINDOW_JUCEHEADER__
- #include "windows/juce_AlertWindow.h"
-#endif
-#ifndef __JUCE_CALLOUTBOX_JUCEHEADER__
- #include "windows/juce_CallOutBox.h"
-#endif
-#ifndef __JUCE_COMPONENTPEER_JUCEHEADER__
- #include "windows/juce_ComponentPeer.h"
-#endif
-#ifndef __JUCE_DIALOGWINDOW_JUCEHEADER__
- #include "windows/juce_DialogWindow.h"
-#endif
-#ifndef __JUCE_DOCUMENTWINDOW_JUCEHEADER__
- #include "windows/juce_DocumentWindow.h"
-#endif
-#ifndef __JUCE_NATIVEMESSAGEBOX_JUCEHEADER__
- #include "windows/juce_NativeMessageBox.h"
-#endif
-#ifndef __JUCE_RESIZABLEWINDOW_JUCEHEADER__
- #include "windows/juce_ResizableWindow.h"
-#endif
-#ifndef __JUCE_THREADWITHPROGRESSWINDOW_JUCEHEADER__
- #include "windows/juce_ThreadWithProgressWindow.h"
-#endif
-#ifndef __JUCE_TOOLTIPWINDOW_JUCEHEADER__
- #include "windows/juce_TooltipWindow.h"
-#endif
-#ifndef __JUCE_TOPLEVELWINDOW_JUCEHEADER__
- #include "windows/juce_TopLevelWindow.h"
-#endif
-#ifndef __JUCE_APPLICATIONCOMMANDID_JUCEHEADER__
- #include "commands/juce_ApplicationCommandID.h"
-#endif
-#ifndef __JUCE_APPLICATIONCOMMANDINFO_JUCEHEADER__
- #include "commands/juce_ApplicationCommandInfo.h"
-#endif
-#ifndef __JUCE_APPLICATIONCOMMANDMANAGER_JUCEHEADER__
- #include "commands/juce_ApplicationCommandManager.h"
-#endif
-#ifndef __JUCE_APPLICATIONCOMMANDTARGET_JUCEHEADER__
- #include "commands/juce_ApplicationCommandTarget.h"
-#endif
-#ifndef __JUCE_KEYPRESSMAPPINGSET_JUCEHEADER__
- #include "commands/juce_KeyPressMappingSet.h"
-#endif
-#ifndef __JUCE_APPLICATION_JUCEHEADER__
- #include "application/juce_Application.h"
-#endif
-#ifndef __JUCE_INITIALISATION_JUCEHEADER__
- #include "application/juce_Initialisation.h"
-#endif
-#ifndef __JUCE_BUBBLECOMPONENT_JUCEHEADER__
- #include "misc/juce_BubbleComponent.h"
-#endif
-#ifndef __JUCE_DROPSHADOWER_JUCEHEADER__
- #include "misc/juce_DropShadower.h"
-#endif
+#include "components/juce_CachedComponentImage.h"
+#include "components/juce_Component.h"
+#include "components/juce_ComponentListener.h"
+#include "components/juce_Desktop.h"
+#include "components/juce_ModalComponentManager.h"
+#include "mouse/juce_ComponentDragger.h"
+#include "mouse/juce_DragAndDropContainer.h"
+#include "mouse/juce_DragAndDropTarget.h"
+#include "mouse/juce_FileDragAndDropTarget.h"
+#include "mouse/juce_LassoComponent.h"
+#include "mouse/juce_MouseCursor.h"
+#include "mouse/juce_MouseEvent.h"
+#include "mouse/juce_MouseInactivityDetector.h"
+#include "mouse/juce_MouseInputSource.h"
+#include "mouse/juce_MouseListener.h"
+#include "mouse/juce_SelectedItemSet.h"
+#include "mouse/juce_TextDragAndDropTarget.h"
+#include "mouse/juce_TooltipClient.h"
+#include "keyboard/juce_CaretComponent.h"
+#include "keyboard/juce_KeyboardFocusTraverser.h"
+#include "keyboard/juce_KeyListener.h"
+#include "keyboard/juce_KeyPress.h"
+#include "keyboard/juce_ModifierKeys.h"
+#include "keyboard/juce_SystemClipboard.h"
+#include "keyboard/juce_TextEditorKeyMapper.h"
+#include "keyboard/juce_TextInputTarget.h"
+#include "buttons/juce_ArrowButton.h"
+#include "buttons/juce_Button.h"
+#include "buttons/juce_DrawableButton.h"
+#include "buttons/juce_HyperlinkButton.h"
+#include "buttons/juce_ImageButton.h"
+#include "buttons/juce_ShapeButton.h"
+#include "buttons/juce_TextButton.h"
+#include "buttons/juce_ToggleButton.h"
+#include "buttons/juce_ToolbarButton.h"
+#include "drawables/juce_Drawable.h"
+#include "drawables/juce_DrawableComposite.h"
+#include "drawables/juce_DrawableImage.h"
+#include "drawables/juce_DrawablePath.h"
+#include "drawables/juce_DrawableRectangle.h"
+#include "drawables/juce_DrawableShape.h"
+#include "drawables/juce_DrawableText.h"
+#include "filebrowser/juce_DirectoryContentsDisplayComponent.h"
+#include "filebrowser/juce_DirectoryContentsList.h"
+#include "filebrowser/juce_FileBrowserComponent.h"
+#include "filebrowser/juce_FileBrowserListener.h"
+#include "filebrowser/juce_FileChooser.h"
+#include "filebrowser/juce_FileChooserDialogBox.h"
+#include "filebrowser/juce_FileFilter.h"
+#include "filebrowser/juce_FileListComponent.h"
+#include "filebrowser/juce_FilenameComponent.h"
+#include "filebrowser/juce_FilePreviewComponent.h"
+#include "filebrowser/juce_FileSearchPathListComponent.h"
+#include "filebrowser/juce_FileTreeComponent.h"
+#include "filebrowser/juce_ImagePreviewComponent.h"
+#include "filebrowser/juce_WildcardFileFilter.h"
+#include "layout/juce_AnimatedPosition.h"
+#include "layout/juce_AnimatedPositionBehaviours.h"
+#include "layout/juce_ComponentAnimator.h"
+#include "layout/juce_ComponentBoundsConstrainer.h"
+#include "layout/juce_ComponentBuilder.h"
+#include "layout/juce_ComponentMovementWatcher.h"
+#include "layout/juce_ConcertinaPanel.h"
+#include "layout/juce_GroupComponent.h"
+#include "layout/juce_MultiDocumentPanel.h"
+#include "layout/juce_ResizableBorderComponent.h"
+#include "layout/juce_ResizableCornerComponent.h"
+#include "layout/juce_ResizableEdgeComponent.h"
+#include "layout/juce_ScrollBar.h"
+#include "layout/juce_StretchableLayoutManager.h"
+#include "layout/juce_StretchableLayoutResizerBar.h"
+#include "layout/juce_StretchableObjectResizer.h"
+#include "layout/juce_TabbedButtonBar.h"
+#include "layout/juce_TabbedComponent.h"
+#include "layout/juce_Viewport.h"
+#include "lookandfeel/juce_LookAndFeel.h"
+#include "menus/juce_MenuBarComponent.h"
+#include "menus/juce_MenuBarModel.h"
+#include "menus/juce_PopupMenu.h"
+#include "positioning/juce_MarkerList.h"
+#include "positioning/juce_RelativeCoordinate.h"
+#include "positioning/juce_RelativeCoordinatePositioner.h"
+#include "positioning/juce_RelativeParallelogram.h"
+#include "positioning/juce_RelativePoint.h"
+#include "positioning/juce_RelativePointPath.h"
+#include "positioning/juce_RelativeRectangle.h"
+#include "properties/juce_BooleanPropertyComponent.h"
+#include "properties/juce_ButtonPropertyComponent.h"
+#include "properties/juce_ChoicePropertyComponent.h"
+#include "properties/juce_PropertyComponent.h"
+#include "properties/juce_PropertyPanel.h"
+#include "properties/juce_SliderPropertyComponent.h"
+#include "properties/juce_TextPropertyComponent.h"
+#include "widgets/juce_ComboBox.h"
+#include "widgets/juce_ImageComponent.h"
+#include "widgets/juce_Label.h"
+#include "widgets/juce_ListBox.h"
+#include "widgets/juce_ProgressBar.h"
+#include "widgets/juce_Slider.h"
+#include "widgets/juce_TableHeaderComponent.h"
+#include "widgets/juce_TableListBox.h"
+#include "widgets/juce_TextEditor.h"
+#include "widgets/juce_Toolbar.h"
+#include "widgets/juce_ToolbarItemComponent.h"
+#include "widgets/juce_ToolbarItemFactory.h"
+#include "widgets/juce_ToolbarItemPalette.h"
+#include "widgets/juce_TreeView.h"
+#include "windows/juce_AlertWindow.h"
+#include "windows/juce_CallOutBox.h"
+#include "windows/juce_ComponentPeer.h"
+#include "windows/juce_DialogWindow.h"
+#include "windows/juce_DocumentWindow.h"
+#include "windows/juce_NativeMessageBox.h"
+#include "windows/juce_ResizableWindow.h"
+#include "windows/juce_ThreadWithProgressWindow.h"
+#include "windows/juce_TooltipWindow.h"
+#include "windows/juce_TopLevelWindow.h"
+#include "commands/juce_ApplicationCommandID.h"
+#include "commands/juce_ApplicationCommandInfo.h"
+#include "commands/juce_ApplicationCommandManager.h"
+#include "commands/juce_ApplicationCommandTarget.h"
+#include "commands/juce_KeyPressMappingSet.h"
+#include "application/juce_Application.h"
+#include "application/juce_Initialisation.h"
+#include "misc/juce_BubbleComponent.h"
+#include "misc/juce_DropShadower.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_GUI_BASICS_JUCEHEADER__
+#endif   // JUCE_GUI_BASICS_H_INCLUDED
diff --git a/modules/juce_gui_basics/keyboard/juce_CaretComponent.h b/modules/juce_gui_basics/keyboard/juce_CaretComponent.h
index 1018d494b3..08512c421e 100644
--- a/modules/juce_gui_basics/keyboard/juce_CaretComponent.h
+++ b/modules/juce_gui_basics/keyboard/juce_CaretComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CARETCOMPONENT_JUCEHEADER__
-#define __JUCE_CARETCOMPONENT_JUCEHEADER__
+#ifndef JUCE_CARETCOMPONENT_H_INCLUDED
+#define JUCE_CARETCOMPONENT_H_INCLUDED
 
 #include "../components/juce_Component.h"
 
@@ -79,4 +79,4 @@ private:
 };
 
 
-#endif   // __JUCE_CARETCOMPONENT_JUCEHEADER__
+#endif   // JUCE_CARETCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/keyboard/juce_KeyListener.h b/modules/juce_gui_basics/keyboard/juce_KeyListener.h
index 25e4d614ca..7fb39ca44b 100644
--- a/modules/juce_gui_basics/keyboard/juce_KeyListener.h
+++ b/modules/juce_gui_basics/keyboard/juce_KeyListener.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_KEYLISTENER_JUCEHEADER__
-#define __JUCE_KEYLISTENER_JUCEHEADER__
+#ifndef JUCE_KEYLISTENER_H_INCLUDED
+#define JUCE_KEYLISTENER_H_INCLUDED
 
 #include "juce_KeyPress.h"
 class Component;
@@ -76,4 +76,4 @@ public:
 };
 
 
-#endif   // __JUCE_KEYLISTENER_JUCEHEADER__
+#endif   // JUCE_KEYLISTENER_H_INCLUDED
diff --git a/modules/juce_gui_basics/keyboard/juce_KeyPress.h b/modules/juce_gui_basics/keyboard/juce_KeyPress.h
index 91c6c954b6..acc4f80690 100644
--- a/modules/juce_gui_basics/keyboard/juce_KeyPress.h
+++ b/modules/juce_gui_basics/keyboard/juce_KeyPress.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_KEYPRESS_JUCEHEADER__
-#define __JUCE_KEYPRESS_JUCEHEADER__
+#ifndef JUCE_KEYPRESS_H_INCLUDED
+#define JUCE_KEYPRESS_H_INCLUDED
 
 #include "juce_ModifierKeys.h"
 
@@ -253,4 +253,4 @@ private:
 };
 
 
-#endif   // __JUCE_KEYPRESS_JUCEHEADER__
+#endif   // JUCE_KEYPRESS_H_INCLUDED
diff --git a/modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.h b/modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.h
index e477ab01b5..dad642a331 100644
--- a/modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.h
+++ b/modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_KEYBOARDFOCUSTRAVERSER_JUCEHEADER__
-#define __JUCE_KEYBOARDFOCUSTRAVERSER_JUCEHEADER__
+#ifndef JUCE_KEYBOARDFOCUSTRAVERSER_H_INCLUDED
+#define JUCE_KEYBOARDFOCUSTRAVERSER_H_INCLUDED
 
 class Component;
 
@@ -88,4 +88,4 @@ public:
 };
 
 
-#endif   // __JUCE_KEYBOARDFOCUSTRAVERSER_JUCEHEADER__
+#endif   // JUCE_KEYBOARDFOCUSTRAVERSER_H_INCLUDED
diff --git a/modules/juce_gui_basics/keyboard/juce_ModifierKeys.h b/modules/juce_gui_basics/keyboard/juce_ModifierKeys.h
index c7b21fb9cd..eb81aba129 100644
--- a/modules/juce_gui_basics/keyboard/juce_ModifierKeys.h
+++ b/modules/juce_gui_basics/keyboard/juce_ModifierKeys.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MODIFIERKEYS_JUCEHEADER__
-#define __JUCE_MODIFIERKEYS_JUCEHEADER__
+#ifndef JUCE_MODIFIERKEYS_H_INCLUDED
+#define JUCE_MODIFIERKEYS_H_INCLUDED
 
 
 //==============================================================================
@@ -220,4 +220,4 @@ private:
 };
 
 
-#endif   // __JUCE_MODIFIERKEYS_JUCEHEADER__
+#endif   // JUCE_MODIFIERKEYS_H_INCLUDED
diff --git a/modules/juce_gui_basics/keyboard/juce_SystemClipboard.h b/modules/juce_gui_basics/keyboard/juce_SystemClipboard.h
index aa6e006a50..29e323b754 100644
--- a/modules/juce_gui_basics/keyboard/juce_SystemClipboard.h
+++ b/modules/juce_gui_basics/keyboard/juce_SystemClipboard.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SYSTEMCLIPBOARD_JUCEHEADER__
-#define __JUCE_SYSTEMCLIPBOARD_JUCEHEADER__
+#ifndef JUCE_SYSTEMCLIPBOARD_H_INCLUDED
+#define JUCE_SYSTEMCLIPBOARD_H_INCLUDED
 
 
 //==============================================================================
@@ -44,4 +44,4 @@ public:
     static String getTextFromClipboard();
 };
 
-#endif   // __JUCE_SYSTEMCLIPBOARD_JUCEHEADER__
+#endif   // JUCE_SYSTEMCLIPBOARD_H_INCLUDED
diff --git a/modules/juce_gui_basics/keyboard/juce_TextEditorKeyMapper.h b/modules/juce_gui_basics/keyboard/juce_TextEditorKeyMapper.h
index fad5bac61f..9588a87ed6 100644
--- a/modules/juce_gui_basics/keyboard/juce_TextEditorKeyMapper.h
+++ b/modules/juce_gui_basics/keyboard/juce_TextEditorKeyMapper.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TEXTEDITORKEYMAPPER_JUCEHEADER__
-#define __JUCE_TEXTEDITORKEYMAPPER_JUCEHEADER__
+#ifndef JUCE_TEXTEDITORKEYMAPPER_H_INCLUDED
+#define JUCE_TEXTEDITORKEYMAPPER_H_INCLUDED
 
 #include "juce_KeyPress.h"
 
@@ -120,4 +120,4 @@ struct TextEditorKeyMapper
 };
 
 
-#endif   // __JUCE_TEXTEDITORKEYMAPPER_JUCEHEADER__
+#endif   // JUCE_TEXTEDITORKEYMAPPER_H_INCLUDED
diff --git a/modules/juce_gui_basics/keyboard/juce_TextInputTarget.h b/modules/juce_gui_basics/keyboard/juce_TextInputTarget.h
index b277d45f25..eaf4bb0421 100644
--- a/modules/juce_gui_basics/keyboard/juce_TextInputTarget.h
+++ b/modules/juce_gui_basics/keyboard/juce_TextInputTarget.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TEXTINPUTTARGET_JUCEHEADER__
-#define __JUCE_TEXTINPUTTARGET_JUCEHEADER__
+#ifndef JUCE_TEXTINPUTTARGET_H_INCLUDED
+#define JUCE_TEXTINPUTTARGET_H_INCLUDED
 
 
 //==============================================================================
@@ -74,4 +74,4 @@ public:
 };
 
 
-#endif   // __JUCE_TEXTINPUTTARGET_JUCEHEADER__
+#endif   // JUCE_TEXTINPUTTARGET_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_AnimatedPosition.h b/modules/juce_gui_basics/layout/juce_AnimatedPosition.h
index 2dcfeb34ac..1335c19b51 100644
--- a/modules/juce_gui_basics/layout/juce_AnimatedPosition.h
+++ b/modules/juce_gui_basics/layout/juce_AnimatedPosition.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ANIMATEDPOSITION_JUCEHEADER__
-#define __JUCE_ANIMATEDPOSITION_JUCEHEADER__
+#ifndef JUCE_ANIMATEDPOSITION_H_INCLUDED
+#define JUCE_ANIMATEDPOSITION_H_INCLUDED
 
 //==============================================================================
 /**
@@ -205,4 +205,4 @@ private:
 };
 
 
-#endif   // __JUCE_ANIMATEDPOSITION_JUCEHEADER__
+#endif   // JUCE_ANIMATEDPOSITION_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_AnimatedPositionBehaviours.h b/modules/juce_gui_basics/layout/juce_AnimatedPositionBehaviours.h
index 41309437c7..503944e0d6 100644
--- a/modules/juce_gui_basics/layout/juce_AnimatedPositionBehaviours.h
+++ b/modules/juce_gui_basics/layout/juce_AnimatedPositionBehaviours.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ANIMATEDPOSITIONBEHAVIOURS_JUCEHEADER__
-#define __JUCE_ANIMATEDPOSITIONBEHAVIOURS_JUCEHEADER__
+#ifndef JUCE_ANIMATEDPOSITIONBEHAVIOURS_H_INCLUDED
+#define JUCE_ANIMATEDPOSITIONBEHAVIOURS_H_INCLUDED
 
 
 //==============================================================================
@@ -146,4 +146,4 @@ namespace AnimatedPositionBehaviours
 };
 
 
-#endif   // __JUCE_ANIMATEDPOSITIONBEHAVIOURS_JUCEHEADER__
+#endif   // JUCE_ANIMATEDPOSITIONBEHAVIOURS_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_ComponentAnimator.h b/modules/juce_gui_basics/layout/juce_ComponentAnimator.h
index ea00ca92f2..660f533ce9 100644
--- a/modules/juce_gui_basics/layout/juce_ComponentAnimator.h
+++ b/modules/juce_gui_basics/layout/juce_ComponentAnimator.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COMPONENTANIMATOR_JUCEHEADER__
-#define __JUCE_COMPONENTANIMATOR_JUCEHEADER__
+#ifndef JUCE_COMPONENTANIMATOR_H_INCLUDED
+#define JUCE_COMPONENTANIMATOR_H_INCLUDED
 
 #include "../components/juce_Component.h"
 
@@ -160,4 +160,4 @@ private:
 };
 
 
-#endif   // __JUCE_COMPONENTANIMATOR_JUCEHEADER__
+#endif   // JUCE_COMPONENTANIMATOR_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.h b/modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.h
index 4317e7ff9c..91062a3320 100644
--- a/modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.h
+++ b/modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COMPONENTBOUNDSCONSTRAINER_JUCEHEADER__
-#define __JUCE_COMPONENTBOUNDSCONSTRAINER_JUCEHEADER__
+#ifndef JUCE_COMPONENTBOUNDSCONSTRAINER_H_INCLUDED
+#define JUCE_COMPONENTBOUNDSCONSTRAINER_H_INCLUDED
 
 #include "../components/juce_Component.h"
 
@@ -196,4 +196,4 @@ private:
 };
 
 
-#endif   // __JUCE_COMPONENTBOUNDSCONSTRAINER_JUCEHEADER__
+#endif   // JUCE_COMPONENTBOUNDSCONSTRAINER_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_ComponentBuilder.h b/modules/juce_gui_basics/layout/juce_ComponentBuilder.h
index ed97a6cf1b..11b11de6de 100644
--- a/modules/juce_gui_basics/layout/juce_ComponentBuilder.h
+++ b/modules/juce_gui_basics/layout/juce_ComponentBuilder.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COMPONENTBUILDER_JUCEHEADER__
-#define __JUCE_COMPONENTBUILDER_JUCEHEADER__
+#ifndef JUCE_COMPONENTBUILDER_H_INCLUDED
+#define JUCE_COMPONENTBUILDER_H_INCLUDED
 
 #include "../components/juce_Component.h"
 
@@ -244,4 +244,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ComponentBuilder)
 };
 
-#endif   // __JUCE_COMPONENTBUILDER_JUCEHEADER__
+#endif   // JUCE_COMPONENTBUILDER_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.h b/modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.h
index 35eed40c9e..9fd7b7cf11 100644
--- a/modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.h
+++ b/modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COMPONENTMOVEMENTWATCHER_JUCEHEADER__
-#define __JUCE_COMPONENTMOVEMENTWATCHER_JUCEHEADER__
+#ifndef JUCE_COMPONENTMOVEMENTWATCHER_H_INCLUDED
+#define JUCE_COMPONENTMOVEMENTWATCHER_H_INCLUDED
 
 #include "../components/juce_Component.h"
 
@@ -94,4 +94,4 @@ private:
 };
 
 
-#endif   // __JUCE_COMPONENTMOVEMENTWATCHER_JUCEHEADER__
+#endif   // JUCE_COMPONENTMOVEMENTWATCHER_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h b/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h
index b53ede90e3..a636472212 100644
--- a/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h
+++ b/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CONCERTINAPANEL_JUCEHEADER__
-#define __JUCE_CONCERTINAPANEL_JUCEHEADER__
+#ifndef JUCE_CONCERTINAPANEL_H_INCLUDED
+#define JUCE_CONCERTINAPANEL_H_INCLUDED
 
 //==============================================================================
 /**
@@ -117,4 +117,4 @@ private:
 };
 
 
-#endif   // __JUCE_CONCERTINAPANEL_JUCEHEADER__
+#endif   // JUCE_CONCERTINAPANEL_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_GroupComponent.h b/modules/juce_gui_basics/layout/juce_GroupComponent.h
index 251d3a7566..83147960f7 100644
--- a/modules/juce_gui_basics/layout/juce_GroupComponent.h
+++ b/modules/juce_gui_basics/layout/juce_GroupComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_GROUPCOMPONENT_JUCEHEADER__
-#define __JUCE_GROUPCOMPONENT_JUCEHEADER__
+#ifndef JUCE_GROUPCOMPONENT_H_INCLUDED
+#define JUCE_GROUPCOMPONENT_H_INCLUDED
 
 #include "../components/juce_Component.h"
 
@@ -100,4 +100,4 @@ private:
 };
 
 
-#endif   // __JUCE_GROUPCOMPONENT_JUCEHEADER__
+#endif   // JUCE_GROUPCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.h b/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.h
index d59e50fd41..1559debaa3 100644
--- a/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.h
+++ b/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MULTIDOCUMENTPANEL_JUCEHEADER__
-#define __JUCE_MULTIDOCUMENTPANEL_JUCEHEADER__
+#ifndef JUCE_MULTIDOCUMENTPANEL_H_INCLUDED
+#define JUCE_MULTIDOCUMENTPANEL_H_INCLUDED
 
 #include "juce_TabbedComponent.h"
 #include "../windows/juce_DocumentWindow.h"
@@ -303,4 +303,4 @@ private:
 };
 
 
-#endif   // __JUCE_MULTIDOCUMENTPANEL_JUCEHEADER__
+#endif   // JUCE_MULTIDOCUMENTPANEL_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h b/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h
index 4288b200c4..61636d10ab 100644
--- a/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h
+++ b/modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RESIZABLEBORDERCOMPONENT_JUCEHEADER__
-#define __JUCE_RESIZABLEBORDERCOMPONENT_JUCEHEADER__
+#ifndef JUCE_RESIZABLEBORDERCOMPONENT_H_INCLUDED
+#define JUCE_RESIZABLEBORDERCOMPONENT_H_INCLUDED
 
 #include "juce_ComponentBoundsConstrainer.h"
 
@@ -194,4 +194,4 @@ private:
 };
 
 
-#endif   // __JUCE_RESIZABLEBORDERCOMPONENT_JUCEHEADER__
+#endif   // JUCE_RESIZABLEBORDERCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_ResizableCornerComponent.h b/modules/juce_gui_basics/layout/juce_ResizableCornerComponent.h
index 0aed7e6ae9..b01fde27f5 100644
--- a/modules/juce_gui_basics/layout/juce_ResizableCornerComponent.h
+++ b/modules/juce_gui_basics/layout/juce_ResizableCornerComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RESIZABLECORNERCOMPONENT_JUCEHEADER__
-#define __JUCE_RESIZABLECORNERCOMPONENT_JUCEHEADER__
+#ifndef JUCE_RESIZABLECORNERCOMPONENT_H_INCLUDED
+#define JUCE_RESIZABLECORNERCOMPONENT_H_INCLUDED
 
 #include "juce_ComponentBoundsConstrainer.h"
 
@@ -90,4 +90,4 @@ private:
 };
 
 
-#endif   // __JUCE_RESIZABLECORNERCOMPONENT_JUCEHEADER__
+#endif   // JUCE_RESIZABLECORNERCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.h b/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.h
index 0dbf907096..57769ab6b6 100644
--- a/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.h
+++ b/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RESIZABLEEDGECOMPONENT_JUCEHEADER__
-#define __JUCE_RESIZABLEEDGECOMPONENT_JUCEHEADER__
+#ifndef JUCE_RESIZABLEEDGECOMPONENT_H_INCLUDED
+#define JUCE_RESIZABLEEDGECOMPONENT_H_INCLUDED
 
 #include "juce_ComponentBoundsConstrainer.h"
 
@@ -98,4 +98,4 @@ private:
 };
 
 
-#endif   // __JUCE_RESIZABLEEDGECOMPONENT_JUCEHEADER__
+#endif   // JUCE_RESIZABLEEDGECOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_ScrollBar.h b/modules/juce_gui_basics/layout/juce_ScrollBar.h
index a4cc6a38be..c6aa8a9d96 100644
--- a/modules/juce_gui_basics/layout/juce_ScrollBar.h
+++ b/modules/juce_gui_basics/layout/juce_ScrollBar.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SCROLLBAR_JUCEHEADER__
-#define __JUCE_SCROLLBAR_JUCEHEADER__
+#ifndef JUCE_SCROLLBAR_H_INCLUDED
+#define JUCE_SCROLLBAR_H_INCLUDED
 
 #include "../buttons/juce_Button.h"
 class Viewport;
@@ -336,4 +336,4 @@ private:
 typedef ScrollBar::Listener ScrollBarListener;
 
 
-#endif   // __JUCE_SCROLLBAR_JUCEHEADER__
+#endif   // JUCE_SCROLLBAR_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_StretchableLayoutManager.h b/modules/juce_gui_basics/layout/juce_StretchableLayoutManager.h
index 862256ead9..fca671f7b1 100644
--- a/modules/juce_gui_basics/layout/juce_StretchableLayoutManager.h
+++ b/modules/juce_gui_basics/layout/juce_StretchableLayoutManager.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_STRETCHABLELAYOUTMANAGER_JUCEHEADER__
-#define __JUCE_STRETCHABLELAYOUTMANAGER_JUCEHEADER__
+#ifndef JUCE_STRETCHABLELAYOUTMANAGER_H_INCLUDED
+#define JUCE_STRETCHABLELAYOUTMANAGER_H_INCLUDED
 
 #include "../components/juce_Component.h"
 
@@ -259,4 +259,4 @@ private:
 };
 
 
-#endif   // __JUCE_STRETCHABLELAYOUTMANAGER_JUCEHEADER__
+#endif   // JUCE_STRETCHABLELAYOUTMANAGER_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h b/modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h
index 6735212b75..180ae8fd99 100644
--- a/modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h
+++ b/modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_STRETCHABLELAYOUTRESIZERBAR_JUCEHEADER__
-#define __JUCE_STRETCHABLELAYOUTRESIZERBAR_JUCEHEADER__
+#ifndef JUCE_STRETCHABLELAYOUTRESIZERBAR_H_INCLUDED
+#define JUCE_STRETCHABLELAYOUTRESIZERBAR_H_INCLUDED
 
 #include "../components/juce_Component.h"
 #include "juce_StretchableLayoutManager.h"
@@ -94,4 +94,4 @@ private:
 };
 
 
-#endif   // __JUCE_STRETCHABLELAYOUTRESIZERBAR_JUCEHEADER__
+#endif   // JUCE_STRETCHABLELAYOUTRESIZERBAR_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_StretchableObjectResizer.h b/modules/juce_gui_basics/layout/juce_StretchableObjectResizer.h
index e8bcb864ad..f4cf399023 100644
--- a/modules/juce_gui_basics/layout/juce_StretchableObjectResizer.h
+++ b/modules/juce_gui_basics/layout/juce_StretchableObjectResizer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_STRETCHABLEOBJECTRESIZER_JUCEHEADER__
-#define __JUCE_STRETCHABLEOBJECTRESIZER_JUCEHEADER__
+#ifndef JUCE_STRETCHABLEOBJECTRESIZER_H_INCLUDED
+#define JUCE_STRETCHABLEOBJECTRESIZER_H_INCLUDED
 
 
 //==============================================================================
@@ -98,4 +98,4 @@ private:
 };
 
 
-#endif   // __JUCE_STRETCHABLEOBJECTRESIZER_JUCEHEADER__
+#endif   // JUCE_STRETCHABLEOBJECTRESIZER_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_TabbedButtonBar.h b/modules/juce_gui_basics/layout/juce_TabbedButtonBar.h
index 6daf7e4434..3fe68b5399 100644
--- a/modules/juce_gui_basics/layout/juce_TabbedButtonBar.h
+++ b/modules/juce_gui_basics/layout/juce_TabbedButtonBar.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TABBEDBUTTONBAR_JUCEHEADER__
-#define __JUCE_TABBEDBUTTONBAR_JUCEHEADER__
+#ifndef JUCE_TABBEDBUTTONBAR_H_INCLUDED
+#define JUCE_TABBEDBUTTONBAR_H_INCLUDED
 
 #include "../buttons/juce_Button.h"
 class TabbedButtonBar;
@@ -337,4 +337,4 @@ private:
 };
 
 
-#endif   // __JUCE_TABBEDBUTTONBAR_JUCEHEADER__
+#endif   // JUCE_TABBEDBUTTONBAR_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_TabbedComponent.h b/modules/juce_gui_basics/layout/juce_TabbedComponent.h
index 2278352609..a909bf9c8c 100644
--- a/modules/juce_gui_basics/layout/juce_TabbedComponent.h
+++ b/modules/juce_gui_basics/layout/juce_TabbedComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TABBEDCOMPONENT_JUCEHEADER__
-#define __JUCE_TABBEDCOMPONENT_JUCEHEADER__
+#ifndef JUCE_TABBEDCOMPONENT_H_INCLUDED
+#define JUCE_TABBEDCOMPONENT_H_INCLUDED
 
 #include "juce_TabbedButtonBar.h"
 
@@ -219,4 +219,4 @@ private:
 };
 
 
-#endif   // __JUCE_TABBEDCOMPONENT_JUCEHEADER__
+#endif   // JUCE_TABBEDCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/layout/juce_Viewport.h b/modules/juce_gui_basics/layout/juce_Viewport.h
index 2ed2d7ad73..ccd393bf15 100644
--- a/modules/juce_gui_basics/layout/juce_Viewport.h
+++ b/modules/juce_gui_basics/layout/juce_Viewport.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_VIEWPORT_JUCEHEADER__
-#define __JUCE_VIEWPORT_JUCEHEADER__
+#ifndef JUCE_VIEWPORT_H_INCLUDED
+#define JUCE_VIEWPORT_H_INCLUDED
 
 #include "juce_ScrollBar.h"
 
@@ -273,4 +273,4 @@ private:
 };
 
 
-#endif   // __JUCE_VIEWPORT_JUCEHEADER__
+#endif   // JUCE_VIEWPORT_H_INCLUDED
diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h
index a2b793ef62..66a1d4fd64 100644
--- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h
+++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LOOKANDFEEL_JUCEHEADER__
-#define __JUCE_LOOKANDFEEL_JUCEHEADER__
+#ifndef JUCE_LOOKANDFEEL_H_INCLUDED
+#define JUCE_LOOKANDFEEL_H_INCLUDED
 
 #include "../widgets/juce_Slider.h"
 #include "../layout/juce_TabbedComponent.h"
@@ -684,4 +684,4 @@ private:
 };
 
 
-#endif   // __JUCE_LOOKANDFEEL_JUCEHEADER__
+#endif   // JUCE_LOOKANDFEEL_H_INCLUDED
diff --git a/modules/juce_gui_basics/menus/juce_MenuBarComponent.h b/modules/juce_gui_basics/menus/juce_MenuBarComponent.h
index 96aa645996..88eb744744 100644
--- a/modules/juce_gui_basics/menus/juce_MenuBarComponent.h
+++ b/modules/juce_gui_basics/menus/juce_MenuBarComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MENUBARCOMPONENT_JUCEHEADER__
-#define __JUCE_MENUBARCOMPONENT_JUCEHEADER__
+#ifndef JUCE_MENUBARCOMPONENT_H_INCLUDED
+#define JUCE_MENUBARCOMPONENT_H_INCLUDED
 
 #include "juce_MenuBarModel.h"
 
@@ -118,4 +118,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MenuBarComponent)
 };
 
-#endif   // __JUCE_MENUBARCOMPONENT_JUCEHEADER__
+#endif   // JUCE_MENUBARCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/menus/juce_MenuBarModel.h b/modules/juce_gui_basics/menus/juce_MenuBarModel.h
index de6681bd47..fe7b48e1f6 100644
--- a/modules/juce_gui_basics/menus/juce_MenuBarModel.h
+++ b/modules/juce_gui_basics/menus/juce_MenuBarModel.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MENUBARMODEL_JUCEHEADER__
-#define __JUCE_MENUBARMODEL_JUCEHEADER__
+#ifndef JUCE_MENUBARMODEL_H_INCLUDED
+#define JUCE_MENUBARMODEL_H_INCLUDED
 
 #include "juce_PopupMenu.h"
 
@@ -183,4 +183,4 @@ private:
 typedef MenuBarModel::Listener MenuBarModelListener;
 
 
-#endif   // __JUCE_MENUBARMODEL_JUCEHEADER__
+#endif   // JUCE_MENUBARMODEL_H_INCLUDED
diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.h b/modules/juce_gui_basics/menus/juce_PopupMenu.h
index 60dda320ba..f342f38e71 100644
--- a/modules/juce_gui_basics/menus/juce_PopupMenu.h
+++ b/modules/juce_gui_basics/menus/juce_PopupMenu.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_POPUPMENU_JUCEHEADER__
-#define __JUCE_POPUPMENU_JUCEHEADER__
+#ifndef JUCE_POPUPMENU_H_INCLUDED
+#define JUCE_POPUPMENU_H_INCLUDED
 
 
 //==============================================================================
@@ -505,4 +505,4 @@ private:
     JUCE_LEAK_DETECTOR (PopupMenu)
 };
 
-#endif   // __JUCE_POPUPMENU_JUCEHEADER__
+#endif   // JUCE_POPUPMENU_H_INCLUDED
diff --git a/modules/juce_gui_basics/misc/juce_BubbleComponent.h b/modules/juce_gui_basics/misc/juce_BubbleComponent.h
index 1cc98f80d3..ff20ef2b0f 100644
--- a/modules/juce_gui_basics/misc/juce_BubbleComponent.h
+++ b/modules/juce_gui_basics/misc/juce_BubbleComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BUBBLECOMPONENT_JUCEHEADER__
-#define __JUCE_BUBBLECOMPONENT_JUCEHEADER__
+#ifndef JUCE_BUBBLECOMPONENT_H_INCLUDED
+#define JUCE_BUBBLECOMPONENT_H_INCLUDED
 
 
 //==============================================================================
@@ -164,4 +164,4 @@ private:
 };
 
 
-#endif   // __JUCE_BUBBLECOMPONENT_JUCEHEADER__
+#endif   // JUCE_BUBBLECOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/misc/juce_DropShadower.h b/modules/juce_gui_basics/misc/juce_DropShadower.h
index 00cd107532..e50f83124b 100644
--- a/modules/juce_gui_basics/misc/juce_DropShadower.h
+++ b/modules/juce_gui_basics/misc/juce_DropShadower.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DROPSHADOWER_JUCEHEADER__
-#define __JUCE_DROPSHADOWER_JUCEHEADER__
+#ifndef JUCE_DROPSHADOWER_H_INCLUDED
+#define JUCE_DROPSHADOWER_H_INCLUDED
 
 #include "../components/juce_Component.h"
 
@@ -79,4 +79,4 @@ private:
 };
 
 
-#endif   // __JUCE_DROPSHADOWER_JUCEHEADER__
+#endif   // JUCE_DROPSHADOWER_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_ComponentDragger.h b/modules/juce_gui_basics/mouse/juce_ComponentDragger.h
index 006182defd..5ab022da73 100644
--- a/modules/juce_gui_basics/mouse/juce_ComponentDragger.h
+++ b/modules/juce_gui_basics/mouse/juce_ComponentDragger.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COMPONENTDRAGGER_JUCEHEADER__
-#define __JUCE_COMPONENTDRAGGER_JUCEHEADER__
+#ifndef JUCE_COMPONENTDRAGGER_H_INCLUDED
+#define JUCE_COMPONENTDRAGGER_H_INCLUDED
 
 #include "juce_MouseEvent.h"
 #include "../layout/juce_ComponentBoundsConstrainer.h"
@@ -101,4 +101,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ComponentDragger)
 };
 
-#endif   // __JUCE_COMPONENTDRAGGER_JUCEHEADER__
+#endif   // JUCE_COMPONENTDRAGGER_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h
index cd10fcc830..c028d745d5 100644
--- a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h
+++ b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DRAGANDDROPCONTAINER_JUCEHEADER__
-#define __JUCE_DRAGANDDROPCONTAINER_JUCEHEADER__
+#ifndef JUCE_DRAGANDDROPCONTAINER_H_INCLUDED
+#define JUCE_DRAGANDDROPCONTAINER_H_INCLUDED
 
 #include "juce_DragAndDropTarget.h"
 
@@ -180,4 +180,4 @@ private:
 };
 
 
-#endif   // __JUCE_DRAGANDDROPCONTAINER_JUCEHEADER__
+#endif   // JUCE_DRAGANDDROPCONTAINER_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_DragAndDropTarget.h b/modules/juce_gui_basics/mouse/juce_DragAndDropTarget.h
index 1409126a53..7f702bc203 100644
--- a/modules/juce_gui_basics/mouse/juce_DragAndDropTarget.h
+++ b/modules/juce_gui_basics/mouse/juce_DragAndDropTarget.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DRAGANDDROPTARGET_JUCEHEADER__
-#define __JUCE_DRAGANDDROPTARGET_JUCEHEADER__
+#ifndef JUCE_DRAGANDDROPTARGET_H_INCLUDED
+#define JUCE_DRAGANDDROPTARGET_H_INCLUDED
 
 #include "../components/juce_Component.h"
 
@@ -151,4 +151,4 @@ private:
    #endif
 };
 
-#endif   // __JUCE_DRAGANDDROPTARGET_JUCEHEADER__
+#endif   // JUCE_DRAGANDDROPTARGET_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_FileDragAndDropTarget.h b/modules/juce_gui_basics/mouse/juce_FileDragAndDropTarget.h
index 9beda95d3b..0e3fadf921 100644
--- a/modules/juce_gui_basics/mouse/juce_FileDragAndDropTarget.h
+++ b/modules/juce_gui_basics/mouse/juce_FileDragAndDropTarget.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILEDRAGANDDROPTARGET_JUCEHEADER__
-#define __JUCE_FILEDRAGANDDROPTARGET_JUCEHEADER__
+#ifndef JUCE_FILEDRAGANDDROPTARGET_H_INCLUDED
+#define JUCE_FILEDRAGANDDROPTARGET_H_INCLUDED
 
 /**
     Components derived from this class can have files dropped onto them by an external application.
@@ -101,4 +101,4 @@ public:
 };
 
 
-#endif   // __JUCE_FILEDRAGANDDROPTARGET_JUCEHEADER__
+#endif   // JUCE_FILEDRAGANDDROPTARGET_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_LassoComponent.h b/modules/juce_gui_basics/mouse/juce_LassoComponent.h
index d9f3da2fc8..a7371a55f7 100644
--- a/modules/juce_gui_basics/mouse/juce_LassoComponent.h
+++ b/modules/juce_gui_basics/mouse/juce_LassoComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LASSOCOMPONENT_JUCEHEADER__
-#define __JUCE_LASSOCOMPONENT_JUCEHEADER__
+#ifndef JUCE_LASSOCOMPONENT_H_INCLUDED
+#define JUCE_LASSOCOMPONENT_H_INCLUDED
 
 #include "../components/juce_Component.h"
 #include "juce_SelectedItemSet.h"
@@ -230,4 +230,4 @@ private:
 };
 
 
-#endif   // __JUCE_LASSOCOMPONENT_JUCEHEADER__
+#endif   // JUCE_LASSOCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_MouseCursor.h b/modules/juce_gui_basics/mouse/juce_MouseCursor.h
index 95eb30e9fe..7365e246f2 100644
--- a/modules/juce_gui_basics/mouse/juce_MouseCursor.h
+++ b/modules/juce_gui_basics/mouse/juce_MouseCursor.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MOUSECURSOR_JUCEHEADER__
-#define __JUCE_MOUSECURSOR_JUCEHEADER__
+#ifndef JUCE_MOUSECURSOR_H_INCLUDED
+#define JUCE_MOUSECURSOR_H_INCLUDED
 
 class Image;
 class ComponentPeer;
@@ -183,4 +183,4 @@ private:
     JUCE_LEAK_DETECTOR (MouseCursor)
 };
 
-#endif   // __JUCE_MOUSECURSOR_JUCEHEADER__
+#endif   // JUCE_MOUSECURSOR_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_MouseEvent.h b/modules/juce_gui_basics/mouse/juce_MouseEvent.h
index 4b5e829ab8..d47ba565b0 100644
--- a/modules/juce_gui_basics/mouse/juce_MouseEvent.h
+++ b/modules/juce_gui_basics/mouse/juce_MouseEvent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MOUSEEVENT_JUCEHEADER__
-#define __JUCE_MOUSEEVENT_JUCEHEADER__
+#ifndef JUCE_MOUSEEVENT_H_INCLUDED
+#define JUCE_MOUSEEVENT_H_INCLUDED
 
 class Component;
 class MouseInputSource;
@@ -357,4 +357,4 @@ struct MouseWheelDetails
 };
 
 
-#endif   // __JUCE_MOUSEEVENT_JUCEHEADER__
+#endif   // JUCE_MOUSEEVENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_MouseInactivityDetector.h b/modules/juce_gui_basics/mouse/juce_MouseInactivityDetector.h
index fec6ad8a1c..9817959610 100644
--- a/modules/juce_gui_basics/mouse/juce_MouseInactivityDetector.h
+++ b/modules/juce_gui_basics/mouse/juce_MouseInactivityDetector.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MOUSEINACTIVITYDETECTOR_JUCEHEADER__
-#define __JUCE_MOUSEINACTIVITYDETECTOR_JUCEHEADER__
+#ifndef JUCE_MOUSEINACTIVITYDETECTOR_H_INCLUDED
+#define JUCE_MOUSEINACTIVITYDETECTOR_H_INCLUDED
 
 //==============================================================================
 /**
@@ -102,4 +102,4 @@ private:
 };
 
 
-#endif   // __JUCE_MOUSEINACTIVITYDETECTOR_JUCEHEADER__
+#endif   // JUCE_MOUSEINACTIVITYDETECTOR_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_MouseInputSource.h b/modules/juce_gui_basics/mouse/juce_MouseInputSource.h
index 84901e63dc..c00a2ec629 100644
--- a/modules/juce_gui_basics/mouse/juce_MouseInputSource.h
+++ b/modules/juce_gui_basics/mouse/juce_MouseInputSource.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MOUSEINPUTSOURCE_JUCEHEADER__
-#define __JUCE_MOUSEINPUTSOURCE_JUCEHEADER__
+#ifndef JUCE_MOUSEINPUTSOURCE_H_INCLUDED
+#define JUCE_MOUSEINPUTSOURCE_H_INCLUDED
 
 #include "../keyboard/juce_ModifierKeys.h"
 #include "../components/juce_Desktop.h"
@@ -183,4 +183,4 @@ private:
 };
 
 
-#endif   // __JUCE_MOUSEINPUTSOURCE_JUCEHEADER__
+#endif   // JUCE_MOUSEINPUTSOURCE_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_MouseListener.h b/modules/juce_gui_basics/mouse/juce_MouseListener.h
index cecefc6212..06835aa1e2 100644
--- a/modules/juce_gui_basics/mouse/juce_MouseListener.h
+++ b/modules/juce_gui_basics/mouse/juce_MouseListener.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MOUSELISTENER_JUCEHEADER__
-#define __JUCE_MOUSELISTENER_JUCEHEADER__
+#ifndef JUCE_MOUSELISTENER_H_INCLUDED
+#define JUCE_MOUSELISTENER_H_INCLUDED
 
 class MouseEvent;
 struct MouseWheelDetails;
@@ -164,4 +164,4 @@ private:
 };
 
 
-#endif   // __JUCE_MOUSELISTENER_JUCEHEADER__
+#endif   // JUCE_MOUSELISTENER_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_SelectedItemSet.h b/modules/juce_gui_basics/mouse/juce_SelectedItemSet.h
index f254d331dd..6d2ac14d6d 100644
--- a/modules/juce_gui_basics/mouse/juce_SelectedItemSet.h
+++ b/modules/juce_gui_basics/mouse/juce_SelectedItemSet.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SELECTEDITEMSET_JUCEHEADER__
-#define __JUCE_SELECTEDITEMSET_JUCEHEADER__
+#ifndef JUCE_SELECTEDITEMSET_H_INCLUDED
+#define JUCE_SELECTEDITEMSET_H_INCLUDED
 
 
 //==============================================================================
@@ -304,4 +304,4 @@ private:
 };
 
 
-#endif   // __JUCE_SELECTEDITEMSET_JUCEHEADER__
+#endif   // JUCE_SELECTEDITEMSET_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_TextDragAndDropTarget.h b/modules/juce_gui_basics/mouse/juce_TextDragAndDropTarget.h
index 33d0ee2b92..21f75a00f8 100644
--- a/modules/juce_gui_basics/mouse/juce_TextDragAndDropTarget.h
+++ b/modules/juce_gui_basics/mouse/juce_TextDragAndDropTarget.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TEXTDRAGANDDROPTARGET_JUCEHEADER__
-#define __JUCE_TEXTDRAGANDDROPTARGET_JUCEHEADER__
+#ifndef JUCE_TEXTDRAGANDDROPTARGET_H_INCLUDED
+#define JUCE_TEXTDRAGANDDROPTARGET_H_INCLUDED
 
 /**
     Components derived from this class can have text dropped onto them by an external application.
@@ -100,4 +100,4 @@ public:
 };
 
 
-#endif   // __JUCE_TEXTDRAGANDDROPTARGET_JUCEHEADER__
+#endif   // JUCE_TEXTDRAGANDDROPTARGET_H_INCLUDED
diff --git a/modules/juce_gui_basics/mouse/juce_TooltipClient.h b/modules/juce_gui_basics/mouse/juce_TooltipClient.h
index 5bafd362d0..9fc0118165 100644
--- a/modules/juce_gui_basics/mouse/juce_TooltipClient.h
+++ b/modules/juce_gui_basics/mouse/juce_TooltipClient.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TOOLTIPCLIENT_JUCEHEADER__
-#define __JUCE_TOOLTIPCLIENT_JUCEHEADER__
+#ifndef JUCE_TOOLTIPCLIENT_H_INCLUDED
+#define JUCE_TOOLTIPCLIENT_H_INCLUDED
 
 
 //==============================================================================
@@ -82,4 +82,4 @@ private:
 };
 
 
-#endif   // __JUCE_TOOLTIPCLIENT_JUCEHEADER__
+#endif   // JUCE_TOOLTIPCLIENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/native/juce_MultiTouchMapper.h b/modules/juce_gui_basics/native/juce_MultiTouchMapper.h
index 1b3e1d6e7b..66187e9b3a 100644
--- a/modules/juce_gui_basics/native/juce_MultiTouchMapper.h
+++ b/modules/juce_gui_basics/native/juce_MultiTouchMapper.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MULTITOUCHMAPPER_JUCEHEADER__
-#define __JUCE_MULTITOUCHMAPPER_JUCEHEADER__
+#ifndef JUCE_MULTITOUCHMAPPER_H_INCLUDED
+#define JUCE_MULTITOUCHMAPPER_H_INCLUDED
 
 template <typename IDType>
 class MultiTouchMapper
@@ -74,4 +74,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MultiTouchMapper)
 };
 
-#endif   // __JUCE_MULTITOUCHMAPPER_JUCEHEADER__
+#endif   // JUCE_MULTITOUCHMAPPER_H_INCLUDED
diff --git a/modules/juce_gui_basics/positioning/juce_MarkerList.h b/modules/juce_gui_basics/positioning/juce_MarkerList.h
index 369534764f..a33dc90e73 100644
--- a/modules/juce_gui_basics/positioning/juce_MarkerList.h
+++ b/modules/juce_gui_basics/positioning/juce_MarkerList.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MARKERLIST_JUCEHEADER__
-#define __JUCE_MARKERLIST_JUCEHEADER__
+#ifndef JUCE_MARKERLIST_H_INCLUDED
+#define JUCE_MARKERLIST_H_INCLUDED
 
 #include "../positioning/juce_RelativeCoordinate.h"
 class Component;
@@ -184,4 +184,4 @@ private:
 };
 
 
-#endif   // __JUCE_MARKERLIST_JUCEHEADER__
+#endif   // JUCE_MARKERLIST_H_INCLUDED
diff --git a/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.h b/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.h
index 7d74f44b4e..2e62fb0276 100644
--- a/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.h
+++ b/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RELATIVECOORDINATE_JUCEHEADER__
-#define __JUCE_RELATIVECOORDINATE_JUCEHEADER__
+#ifndef JUCE_RELATIVECOORDINATE_H_INCLUDED
+#define JUCE_RELATIVECOORDINATE_H_INCLUDED
 
 
 //==============================================================================
@@ -144,4 +144,4 @@ private:
 };
 
 
-#endif   // __JUCE_RELATIVECOORDINATE_JUCEHEADER__
+#endif   // JUCE_RELATIVECOORDINATE_H_INCLUDED
diff --git a/modules/juce_gui_basics/positioning/juce_RelativeCoordinatePositioner.h b/modules/juce_gui_basics/positioning/juce_RelativeCoordinatePositioner.h
index 466b121384..af5ca92e4c 100644
--- a/modules/juce_gui_basics/positioning/juce_RelativeCoordinatePositioner.h
+++ b/modules/juce_gui_basics/positioning/juce_RelativeCoordinatePositioner.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RELATIVECOORDINATEPOSITIONER_JUCEHEADER__
-#define __JUCE_RELATIVECOORDINATEPOSITIONER_JUCEHEADER__
+#ifndef JUCE_RELATIVECOORDINATEPOSITIONER_H_INCLUDED
+#define JUCE_RELATIVECOORDINATEPOSITIONER_H_INCLUDED
 
 #include "juce_RelativePoint.h"
 #include "juce_MarkerList.h"
@@ -93,4 +93,4 @@ private:
 };
 
 
-#endif   // __JUCE_RELATIVECOORDINATEPOSITIONER_JUCEHEADER__
+#endif   // JUCE_RELATIVECOORDINATEPOSITIONER_H_INCLUDED
diff --git a/modules/juce_gui_basics/positioning/juce_RelativeParallelogram.h b/modules/juce_gui_basics/positioning/juce_RelativeParallelogram.h
index f8304d69d9..f4445b7b59 100644
--- a/modules/juce_gui_basics/positioning/juce_RelativeParallelogram.h
+++ b/modules/juce_gui_basics/positioning/juce_RelativeParallelogram.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RELATIVEPARALLELOGRAM_JUCEHEADER__
-#define __JUCE_RELATIVEPARALLELOGRAM_JUCEHEADER__
+#ifndef JUCE_RELATIVEPARALLELOGRAM_H_INCLUDED
+#define JUCE_RELATIVEPARALLELOGRAM_H_INCLUDED
 
 #include "juce_RelativePoint.h"
 
@@ -64,4 +64,4 @@ public:
 };
 
 
-#endif   // __JUCE_RELATIVEPARALLELOGRAM_JUCEHEADER__
+#endif   // JUCE_RELATIVEPARALLELOGRAM_H_INCLUDED
diff --git a/modules/juce_gui_basics/positioning/juce_RelativePoint.h b/modules/juce_gui_basics/positioning/juce_RelativePoint.h
index e09b531efa..1d8b49bb67 100644
--- a/modules/juce_gui_basics/positioning/juce_RelativePoint.h
+++ b/modules/juce_gui_basics/positioning/juce_RelativePoint.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RELATIVEPOINT_JUCEHEADER__
-#define __JUCE_RELATIVEPOINT_JUCEHEADER__
+#ifndef JUCE_RELATIVEPOINT_H_INCLUDED
+#define JUCE_RELATIVEPOINT_H_INCLUDED
 
 #include "juce_RelativeCoordinate.h"
 
@@ -89,4 +89,4 @@ public:
 };
 
 
-#endif   // __JUCE_RELATIVEPOINT_JUCEHEADER__
+#endif   // JUCE_RELATIVEPOINT_H_INCLUDED
diff --git a/modules/juce_gui_basics/positioning/juce_RelativePointPath.h b/modules/juce_gui_basics/positioning/juce_RelativePointPath.h
index 0c1f5cb09c..c30f0643bd 100644
--- a/modules/juce_gui_basics/positioning/juce_RelativePointPath.h
+++ b/modules/juce_gui_basics/positioning/juce_RelativePointPath.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RELATIVEPOINTPATH_JUCEHEADER__
-#define __JUCE_RELATIVEPOINTPATH_JUCEHEADER__
+#ifndef JUCE_RELATIVEPOINTPATH_H_INCLUDED
+#define JUCE_RELATIVEPOINTPATH_H_INCLUDED
 
 #include "juce_RelativePoint.h"
 class DrawablePath;
@@ -190,4 +190,4 @@ private:
 };
 
 
-#endif   // __JUCE_RELATIVEPOINTPATH_JUCEHEADER__
+#endif   // JUCE_RELATIVEPOINTPATH_H_INCLUDED
diff --git a/modules/juce_gui_basics/positioning/juce_RelativeRectangle.h b/modules/juce_gui_basics/positioning/juce_RelativeRectangle.h
index be88d61b7e..5d6dbcca16 100644
--- a/modules/juce_gui_basics/positioning/juce_RelativeRectangle.h
+++ b/modules/juce_gui_basics/positioning/juce_RelativeRectangle.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RELATIVERECTANGLE_JUCEHEADER__
-#define __JUCE_RELATIVERECTANGLE_JUCEHEADER__
+#ifndef JUCE_RELATIVERECTANGLE_H_INCLUDED
+#define JUCE_RELATIVERECTANGLE_H_INCLUDED
 
 #include "juce_RelativeCoordinate.h"
 class Component;
@@ -105,4 +105,4 @@ public:
 };
 
 
-#endif   // __JUCE_RELATIVERECTANGLE_JUCEHEADER__
+#endif   // JUCE_RELATIVERECTANGLE_H_INCLUDED
diff --git a/modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h b/modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h
index 74ba287519..3c636f87d0 100644
--- a/modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h
+++ b/modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BOOLEANPROPERTYCOMPONENT_JUCEHEADER__
-#define __JUCE_BOOLEANPROPERTYCOMPONENT_JUCEHEADER__
+#ifndef JUCE_BOOLEANPROPERTYCOMPONENT_H_INCLUDED
+#define JUCE_BOOLEANPROPERTYCOMPONENT_H_INCLUDED
 
 #include "juce_PropertyComponent.h"
 #include "../buttons/juce_ToggleButton.h"
@@ -93,4 +93,4 @@ private:
 };
 
 
-#endif   // __JUCE_BOOLEANPROPERTYCOMPONENT_JUCEHEADER__
+#endif   // JUCE_BOOLEANPROPERTYCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h b/modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h
index 8e4e2a0232..90d5926c35 100644
--- a/modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h
+++ b/modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BUTTONPROPERTYCOMPONENT_JUCEHEADER__
-#define __JUCE_BUTTONPROPERTYCOMPONENT_JUCEHEADER__
+#ifndef JUCE_BUTTONPROPERTYCOMPONENT_H_INCLUDED
+#define JUCE_BUTTONPROPERTYCOMPONENT_H_INCLUDED
 
 #include "juce_PropertyComponent.h"
 #include "../buttons/juce_TextButton.h"
@@ -78,4 +78,4 @@ private:
 };
 
 
-#endif   // __JUCE_BUTTONPROPERTYCOMPONENT_JUCEHEADER__
+#endif   // JUCE_BUTTONPROPERTYCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.h b/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.h
index 8a407488c9..81fdc10ccb 100644
--- a/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.h
+++ b/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CHOICEPROPERTYCOMPONENT_JUCEHEADER__
-#define __JUCE_CHOICEPROPERTYCOMPONENT_JUCEHEADER__
+#ifndef JUCE_CHOICEPROPERTYCOMPONENT_H_INCLUDED
+#define JUCE_CHOICEPROPERTYCOMPONENT_H_INCLUDED
 
 #include "juce_PropertyComponent.h"
 #include "../widgets/juce_ComboBox.h"
@@ -123,4 +123,4 @@ private:
 
 
 
-#endif   // __JUCE_CHOICEPROPERTYCOMPONENT_JUCEHEADER__
+#endif   // JUCE_CHOICEPROPERTYCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/properties/juce_PropertyComponent.h b/modules/juce_gui_basics/properties/juce_PropertyComponent.h
index c880e8bdfc..2aee7401d4 100644
--- a/modules/juce_gui_basics/properties/juce_PropertyComponent.h
+++ b/modules/juce_gui_basics/properties/juce_PropertyComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PROPERTYCOMPONENT_JUCEHEADER__
-#define __JUCE_PROPERTYCOMPONENT_JUCEHEADER__
+#ifndef JUCE_PROPERTYCOMPONENT_H_INCLUDED
+#define JUCE_PROPERTYCOMPONENT_H_INCLUDED
 
 class EditableProperty;
 
@@ -118,4 +118,4 @@ private:
 };
 
 
-#endif   // __JUCE_PROPERTYCOMPONENT_JUCEHEADER__
+#endif   // JUCE_PROPERTYCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/properties/juce_PropertyPanel.h b/modules/juce_gui_basics/properties/juce_PropertyPanel.h
index 883bcbae03..6a5d81b04f 100644
--- a/modules/juce_gui_basics/properties/juce_PropertyPanel.h
+++ b/modules/juce_gui_basics/properties/juce_PropertyPanel.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PROPERTYPANEL_JUCEHEADER__
-#define __JUCE_PROPERTYPANEL_JUCEHEADER__
+#ifndef JUCE_PROPERTYPANEL_H_INCLUDED
+#define JUCE_PROPERTYPANEL_H_INCLUDED
 
 #include "juce_PropertyComponent.h"
 #include "../layout/juce_Viewport.h"
@@ -163,4 +163,4 @@ private:
 };
 
 
-#endif   // __JUCE_PROPERTYPANEL_JUCEHEADER__
+#endif   // JUCE_PROPERTYPANEL_H_INCLUDED
diff --git a/modules/juce_gui_basics/properties/juce_SliderPropertyComponent.h b/modules/juce_gui_basics/properties/juce_SliderPropertyComponent.h
index cab9572599..53adbb64cf 100644
--- a/modules/juce_gui_basics/properties/juce_SliderPropertyComponent.h
+++ b/modules/juce_gui_basics/properties/juce_SliderPropertyComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SLIDERPROPERTYCOMPONENT_JUCEHEADER__
-#define __JUCE_SLIDERPROPERTYCOMPONENT_JUCEHEADER__
+#ifndef JUCE_SLIDERPROPERTYCOMPONENT_H_INCLUDED
+#define JUCE_SLIDERPROPERTYCOMPONENT_H_INCLUDED
 
 #include "juce_PropertyComponent.h"
 #include "../widgets/juce_Slider.h"
@@ -103,4 +103,4 @@ private:
 };
 
 
-#endif   // __JUCE_SLIDERPROPERTYCOMPONENT_JUCEHEADER__
+#endif   // JUCE_SLIDERPROPERTYCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.h b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.h
index 17bc16f11b..4c57348d5c 100644
--- a/modules/juce_gui_basics/properties/juce_TextPropertyComponent.h
+++ b/modules/juce_gui_basics/properties/juce_TextPropertyComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TEXTPROPERTYCOMPONENT_JUCEHEADER__
-#define __JUCE_TEXTPROPERTYCOMPONENT_JUCEHEADER__
+#ifndef JUCE_TEXTPROPERTYCOMPONENT_H_INCLUDED
+#define JUCE_TEXTPROPERTYCOMPONENT_H_INCLUDED
 
 #include "juce_PropertyComponent.h"
 #include "../widgets/juce_Label.h"
@@ -109,4 +109,4 @@ private:
 };
 
 
-#endif   // __JUCE_TEXTPROPERTYCOMPONENT_JUCEHEADER__
+#endif   // JUCE_TEXTPROPERTYCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_ComboBox.h b/modules/juce_gui_basics/widgets/juce_ComboBox.h
index 07aeeb2a04..c1de11184e 100644
--- a/modules/juce_gui_basics/widgets/juce_ComboBox.h
+++ b/modules/juce_gui_basics/widgets/juce_ComboBox.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COMBOBOX_JUCEHEADER__
-#define __JUCE_COMBOBOX_JUCEHEADER__
+#ifndef JUCE_COMBOBOX_H_INCLUDED
+#define JUCE_COMBOBOX_H_INCLUDED
 
 #include "juce_Label.h"
 
@@ -413,4 +413,4 @@ private:
 /** This typedef is just for compatibility with old code - newer code should use the ComboBox::Listener class directly. */
 typedef ComboBox::Listener ComboBoxListener;
 
-#endif   // __JUCE_COMBOBOX_JUCEHEADER__
+#endif   // JUCE_COMBOBOX_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_ImageComponent.h b/modules/juce_gui_basics/widgets/juce_ImageComponent.h
index f4df479c49..c6221fb63f 100644
--- a/modules/juce_gui_basics/widgets/juce_ImageComponent.h
+++ b/modules/juce_gui_basics/widgets/juce_ImageComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_IMAGECOMPONENT_JUCEHEADER__
-#define __JUCE_IMAGECOMPONENT_JUCEHEADER__
+#ifndef JUCE_IMAGECOMPONENT_H_INCLUDED
+#define JUCE_IMAGECOMPONENT_H_INCLUDED
 
 #include "../components/juce_Component.h"
 #include "../mouse/juce_TooltipClient.h"
@@ -78,4 +78,4 @@ private:
 };
 
 
-#endif   // __JUCE_IMAGECOMPONENT_JUCEHEADER__
+#endif   // JUCE_IMAGECOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_Label.h b/modules/juce_gui_basics/widgets/juce_Label.h
index 09271f6a06..c0394424d1 100644
--- a/modules/juce_gui_basics/widgets/juce_Label.h
+++ b/modules/juce_gui_basics/widgets/juce_Label.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LABEL_JUCEHEADER__
-#define __JUCE_LABEL_JUCEHEADER__
+#ifndef JUCE_LABEL_H_INCLUDED
+#define JUCE_LABEL_H_INCLUDED
 
 #include "juce_TextEditor.h"
 
@@ -334,4 +334,4 @@ private:
 /** This typedef is just for compatibility with old code - newer code should use the Label::Listener class directly. */
 typedef Label::Listener LabelListener;
 
-#endif   // __JUCE_LABEL_JUCEHEADER__
+#endif   // JUCE_LABEL_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_ListBox.h b/modules/juce_gui_basics/widgets/juce_ListBox.h
index 5803e17465..7d532cb0a2 100644
--- a/modules/juce_gui_basics/widgets/juce_ListBox.h
+++ b/modules/juce_gui_basics/widgets/juce_ListBox.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_LISTBOX_JUCEHEADER__
-#define __JUCE_LISTBOX_JUCEHEADER__
+#ifndef JUCE_LISTBOX_H_INCLUDED
+#define JUCE_LISTBOX_H_INCLUDED
 
 #include "../layout/juce_Viewport.h"
 
@@ -574,4 +574,4 @@ private:
 };
 
 
-#endif   // __JUCE_LISTBOX_JUCEHEADER__
+#endif   // JUCE_LISTBOX_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_ProgressBar.h b/modules/juce_gui_basics/widgets/juce_ProgressBar.h
index 5535775ff6..73d824099d 100644
--- a/modules/juce_gui_basics/widgets/juce_ProgressBar.h
+++ b/modules/juce_gui_basics/widgets/juce_ProgressBar.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PROGRESSBAR_JUCEHEADER__
-#define __JUCE_PROGRESSBAR_JUCEHEADER__
+#ifndef JUCE_PROGRESSBAR_H_INCLUDED
+#define JUCE_PROGRESSBAR_H_INCLUDED
 
 #include "../components/juce_Component.h"
 #include "../mouse/juce_TooltipClient.h"
@@ -116,4 +116,4 @@ private:
 };
 
 
-#endif   // __JUCE_PROGRESSBAR_JUCEHEADER__
+#endif   // JUCE_PROGRESSBAR_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_Slider.h b/modules/juce_gui_basics/widgets/juce_Slider.h
index 0054dc3b97..6a90c62876 100644
--- a/modules/juce_gui_basics/widgets/juce_Slider.h
+++ b/modules/juce_gui_basics/widgets/juce_Slider.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SLIDER_JUCEHEADER__
-#define __JUCE_SLIDER_JUCEHEADER__
+#ifndef JUCE_SLIDER_H_INCLUDED
+#define JUCE_SLIDER_H_INCLUDED
 
 #include "juce_Label.h"
 #include "../buttons/juce_Button.h"
@@ -830,4 +830,4 @@ private:
 /** This typedef is just for compatibility with old code - newer code should use the Slider::Listener class directly. */
 typedef Slider::Listener SliderListener;
 
-#endif   // __JUCE_SLIDER_JUCEHEADER__
+#endif   // JUCE_SLIDER_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h
index 472d73cb7d..7834cc2c31 100644
--- a/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h
+++ b/modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TABLEHEADERCOMPONENT_JUCEHEADER__
-#define __JUCE_TABLEHEADERCOMPONENT_JUCEHEADER__
+#ifndef JUCE_TABLEHEADERCOMPONENT_H_INCLUDED
+#define JUCE_TABLEHEADERCOMPONENT_H_INCLUDED
 
 #include "../menus/juce_PopupMenu.h"
 
@@ -430,4 +430,4 @@ private:
 typedef TableHeaderComponent::Listener TableHeaderListener;
 
 
-#endif   // __JUCE_TABLEHEADERCOMPONENT_JUCEHEADER__
+#endif   // JUCE_TABLEHEADERCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_TableListBox.h b/modules/juce_gui_basics/widgets/juce_TableListBox.h
index b7ef648f3a..e893437c60 100644
--- a/modules/juce_gui_basics/widgets/juce_TableListBox.h
+++ b/modules/juce_gui_basics/widgets/juce_TableListBox.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TABLELISTBOX_JUCEHEADER__
-#define __JUCE_TABLELISTBOX_JUCEHEADER__
+#ifndef JUCE_TABLELISTBOX_H_INCLUDED
+#define JUCE_TABLELISTBOX_H_INCLUDED
 
 #include "juce_TableHeaderComponent.h"
 #include "juce_ListBox.h"
@@ -337,4 +337,4 @@ private:
 };
 
 
-#endif   // __JUCE_TABLELISTBOX_JUCEHEADER__
+#endif   // JUCE_TABLELISTBOX_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.h b/modules/juce_gui_basics/widgets/juce_TextEditor.h
index 3ae71a37e0..2e3d5dd7e4 100644
--- a/modules/juce_gui_basics/widgets/juce_TextEditor.h
+++ b/modules/juce_gui_basics/widgets/juce_TextEditor.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TEXTEDITOR_JUCEHEADER__
-#define __JUCE_TEXTEDITOR_JUCEHEADER__
+#ifndef JUCE_TEXTEDITOR_H_INCLUDED
+#define JUCE_TEXTEDITOR_H_INCLUDED
 
 #include "../components/juce_Component.h"
 #include "../layout/juce_Viewport.h"
@@ -727,4 +727,4 @@ private:
 typedef TextEditor::Listener TextEditorListener;
 
 
-#endif   // __JUCE_TEXTEDITOR_JUCEHEADER__
+#endif   // JUCE_TEXTEDITOR_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_Toolbar.h b/modules/juce_gui_basics/widgets/juce_Toolbar.h
index 83638f6776..ac8c2108c6 100644
--- a/modules/juce_gui_basics/widgets/juce_Toolbar.h
+++ b/modules/juce_gui_basics/widgets/juce_Toolbar.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TOOLBAR_JUCEHEADER__
-#define __JUCE_TOOLBAR_JUCEHEADER__
+#ifndef JUCE_TOOLBAR_H_INCLUDED
+#define JUCE_TOOLBAR_H_INCLUDED
 
 #include "../mouse/juce_DragAndDropContainer.h"
 #include "../layout/juce_ComponentAnimator.h"
@@ -310,4 +310,4 @@ private:
 };
 
 
-#endif   // __JUCE_TOOLBAR_JUCEHEADER__
+#endif   // JUCE_TOOLBAR_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h
index a01b20104f..cc6ed73d75 100644
--- a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h
+++ b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TOOLBARITEMCOMPONENT_JUCEHEADER__
-#define __JUCE_TOOLBARITEMCOMPONENT_JUCEHEADER__
+#ifndef JUCE_TOOLBARITEMCOMPONENT_H_INCLUDED
+#define JUCE_TOOLBARITEMCOMPONENT_H_INCLUDED
 
 #include "../buttons/juce_Button.h"
 #include "../drawables/juce_Drawable.h"
@@ -207,4 +207,4 @@ private:
 };
 
 
-#endif   // __JUCE_TOOLBARITEMCOMPONENT_JUCEHEADER__
+#endif   // JUCE_TOOLBARITEMCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_ToolbarItemFactory.h b/modules/juce_gui_basics/widgets/juce_ToolbarItemFactory.h
index d519fac731..738613b350 100644
--- a/modules/juce_gui_basics/widgets/juce_ToolbarItemFactory.h
+++ b/modules/juce_gui_basics/widgets/juce_ToolbarItemFactory.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TOOLBARITEMFACTORY_JUCEHEADER__
-#define __JUCE_TOOLBARITEMFACTORY_JUCEHEADER__
+#ifndef JUCE_TOOLBARITEMFACTORY_H_INCLUDED
+#define JUCE_TOOLBARITEMFACTORY_H_INCLUDED
 
 #include "juce_ToolbarItemComponent.h"
 
@@ -107,4 +107,4 @@ public:
 };
 
 
-#endif   // __JUCE_TOOLBARITEMFACTORY_JUCEHEADER__
+#endif   // JUCE_TOOLBARITEMFACTORY_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_ToolbarItemPalette.h b/modules/juce_gui_basics/widgets/juce_ToolbarItemPalette.h
index 9d7451c477..1be3c548f7 100644
--- a/modules/juce_gui_basics/widgets/juce_ToolbarItemPalette.h
+++ b/modules/juce_gui_basics/widgets/juce_ToolbarItemPalette.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TOOLBARITEMPALETTE_JUCEHEADER__
-#define __JUCE_TOOLBARITEMPALETTE_JUCEHEADER__
+#ifndef JUCE_TOOLBARITEMPALETTE_H_INCLUDED
+#define JUCE_TOOLBARITEMPALETTE_H_INCLUDED
 
 #include "juce_Toolbar.h"
 #include "../layout/juce_Viewport.h"
@@ -76,4 +76,4 @@ private:
 };
 
 
-#endif   // __JUCE_TOOLBARITEMPALETTE_JUCEHEADER__
+#endif   // JUCE_TOOLBARITEMPALETTE_H_INCLUDED
diff --git a/modules/juce_gui_basics/widgets/juce_TreeView.h b/modules/juce_gui_basics/widgets/juce_TreeView.h
index 98e9a13373..0087c190c2 100644
--- a/modules/juce_gui_basics/widgets/juce_TreeView.h
+++ b/modules/juce_gui_basics/widgets/juce_TreeView.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TREEVIEW_JUCEHEADER__
-#define __JUCE_TREEVIEW_JUCEHEADER__
+#ifndef JUCE_TREEVIEW_H_INCLUDED
+#define JUCE_TREEVIEW_H_INCLUDED
 
 #include "../layout/juce_Viewport.h"
 #include "../mouse/juce_FileDragAndDropTarget.h"
@@ -858,4 +858,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TreeView)
 };
 
-#endif   // __JUCE_TREEVIEW_JUCEHEADER__
+#endif   // JUCE_TREEVIEW_H_INCLUDED
diff --git a/modules/juce_gui_basics/windows/juce_AlertWindow.h b/modules/juce_gui_basics/windows/juce_AlertWindow.h
index 75eb6fac7b..2deae9c051 100644
--- a/modules/juce_gui_basics/windows/juce_AlertWindow.h
+++ b/modules/juce_gui_basics/windows/juce_AlertWindow.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ALERTWINDOW_JUCEHEADER__
-#define __JUCE_ALERTWINDOW_JUCEHEADER__
+#ifndef JUCE_ALERTWINDOW_H_INCLUDED
+#define JUCE_ALERTWINDOW_H_INCLUDED
 
 #include "juce_TopLevelWindow.h"
 #include "../buttons/juce_TextButton.h"
@@ -467,4 +467,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AlertWindow)
 };
 
-#endif   // __JUCE_ALERTWINDOW_JUCEHEADER__
+#endif   // JUCE_ALERTWINDOW_H_INCLUDED
diff --git a/modules/juce_gui_basics/windows/juce_CallOutBox.h b/modules/juce_gui_basics/windows/juce_CallOutBox.h
index 895b2f9b92..f68d5e0b9f 100644
--- a/modules/juce_gui_basics/windows/juce_CallOutBox.h
+++ b/modules/juce_gui_basics/windows/juce_CallOutBox.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CALLOUTBOX_JUCEHEADER__
-#define __JUCE_CALLOUTBOX_JUCEHEADER__
+#ifndef JUCE_CALLOUTBOX_H_INCLUDED
+#define JUCE_CALLOUTBOX_H_INCLUDED
 
 #include "../components/juce_Component.h"
 
@@ -154,4 +154,4 @@ private:
 };
 
 
-#endif   // __JUCE_CALLOUTBOX_JUCEHEADER__
+#endif   // JUCE_CALLOUTBOX_H_INCLUDED
diff --git a/modules/juce_gui_basics/windows/juce_ComponentPeer.h b/modules/juce_gui_basics/windows/juce_ComponentPeer.h
index c3b3cf5058..202c18e192 100644
--- a/modules/juce_gui_basics/windows/juce_ComponentPeer.h
+++ b/modules/juce_gui_basics/windows/juce_ComponentPeer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COMPONENTPEER_JUCEHEADER__
-#define __JUCE_COMPONENTPEER_JUCEHEADER__
+#ifndef JUCE_COMPONENTPEER_H_INCLUDED
+#define JUCE_COMPONENTPEER_H_INCLUDED
 
 #include "../components/juce_Component.h"
 #include "../mouse/juce_MouseCursor.h"
@@ -377,4 +377,4 @@ private:
 };
 
 
-#endif   // __JUCE_COMPONENTPEER_JUCEHEADER__
+#endif   // JUCE_COMPONENTPEER_H_INCLUDED
diff --git a/modules/juce_gui_basics/windows/juce_DialogWindow.h b/modules/juce_gui_basics/windows/juce_DialogWindow.h
index 4ecaf5d27b..35cff5392b 100644
--- a/modules/juce_gui_basics/windows/juce_DialogWindow.h
+++ b/modules/juce_gui_basics/windows/juce_DialogWindow.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DIALOGWINDOW_JUCEHEADER__
-#define __JUCE_DIALOGWINDOW_JUCEHEADER__
+#ifndef JUCE_DIALOGWINDOW_H_INCLUDED
+#define JUCE_DIALOGWINDOW_H_INCLUDED
 
 #include "juce_DocumentWindow.h"
 
@@ -260,4 +260,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DialogWindow)
 };
 
-#endif   // __JUCE_DIALOGWINDOW_JUCEHEADER__
+#endif   // JUCE_DIALOGWINDOW_H_INCLUDED
diff --git a/modules/juce_gui_basics/windows/juce_DocumentWindow.h b/modules/juce_gui_basics/windows/juce_DocumentWindow.h
index 6bc0108f19..f4c0615b1f 100644
--- a/modules/juce_gui_basics/windows/juce_DocumentWindow.h
+++ b/modules/juce_gui_basics/windows/juce_DocumentWindow.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DOCUMENTWINDOW_JUCEHEADER__
-#define __JUCE_DOCUMENTWINDOW_JUCEHEADER__
+#ifndef JUCE_DOCUMENTWINDOW_H_INCLUDED
+#define JUCE_DOCUMENTWINDOW_H_INCLUDED
 
 #include "juce_ResizableWindow.h"
 #include "../buttons/juce_Button.h"
@@ -272,4 +272,4 @@ private:
 };
 
 
-#endif   // __JUCE_DOCUMENTWINDOW_JUCEHEADER__
+#endif   // JUCE_DOCUMENTWINDOW_H_INCLUDED
diff --git a/modules/juce_gui_basics/windows/juce_NativeMessageBox.h b/modules/juce_gui_basics/windows/juce_NativeMessageBox.h
index 4243330f09..51eecfc9e5 100644
--- a/modules/juce_gui_basics/windows/juce_NativeMessageBox.h
+++ b/modules/juce_gui_basics/windows/juce_NativeMessageBox.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_NATIVEMESSAGEBOX_JUCEHEADER__
-#define __JUCE_NATIVEMESSAGEBOX_JUCEHEADER__
+#ifndef JUCE_NATIVEMESSAGEBOX_H_INCLUDED
+#define JUCE_NATIVEMESSAGEBOX_H_INCLUDED
 
 /**
     This class contains some static methods for showing native alert windows.
@@ -156,4 +156,4 @@ public:
                                                #endif
 };
 
-#endif   // __JUCE_NATIVEMESSAGEBOX_JUCEHEADER__
+#endif   // JUCE_NATIVEMESSAGEBOX_H_INCLUDED
diff --git a/modules/juce_gui_basics/windows/juce_ResizableWindow.h b/modules/juce_gui_basics/windows/juce_ResizableWindow.h
index be8e58e4f7..964d68ed9a 100644
--- a/modules/juce_gui_basics/windows/juce_ResizableWindow.h
+++ b/modules/juce_gui_basics/windows/juce_ResizableWindow.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RESIZABLEWINDOW_JUCEHEADER__
-#define __JUCE_RESIZABLEWINDOW_JUCEHEADER__
+#ifndef JUCE_RESIZABLEWINDOW_H_INCLUDED
+#define JUCE_RESIZABLEWINDOW_H_INCLUDED
 
 #include "juce_TopLevelWindow.h"
 #include "../mouse/juce_ComponentDragger.h"
@@ -389,4 +389,4 @@ private:
 };
 
 
-#endif   // __JUCE_RESIZABLEWINDOW_JUCEHEADER__
+#endif   // JUCE_RESIZABLEWINDOW_H_INCLUDED
diff --git a/modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h b/modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h
index 40c734e227..8897a67de7 100644
--- a/modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h
+++ b/modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_THREADWITHPROGRESSWINDOW_JUCEHEADER__
-#define __JUCE_THREADWITHPROGRESSWINDOW_JUCEHEADER__
+#ifndef JUCE_THREADWITHPROGRESSWINDOW_H_INCLUDED
+#define JUCE_THREADWITHPROGRESSWINDOW_H_INCLUDED
 
 #include "../windows/juce_AlertWindow.h"
 
@@ -152,4 +152,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ThreadWithProgressWindow)
 };
 
-#endif   // __JUCE_THREADWITHPROGRESSWINDOW_JUCEHEADER__
+#endif   // JUCE_THREADWITHPROGRESSWINDOW_H_INCLUDED
diff --git a/modules/juce_gui_basics/windows/juce_TooltipWindow.h b/modules/juce_gui_basics/windows/juce_TooltipWindow.h
index 3faa98a2d6..8ca635eb34 100644
--- a/modules/juce_gui_basics/windows/juce_TooltipWindow.h
+++ b/modules/juce_gui_basics/windows/juce_TooltipWindow.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TOOLTIPWINDOW_JUCEHEADER__
-#define __JUCE_TOOLTIPWINDOW_JUCEHEADER__
+#ifndef JUCE_TOOLTIPWINDOW_H_INCLUDED
+#define JUCE_TOOLTIPWINDOW_H_INCLUDED
 
 #include "../components/juce_Component.h"
 #include "../mouse/juce_TooltipClient.h"
@@ -116,4 +116,4 @@ private:
 };
 
 
-#endif   // __JUCE_TOOLTIPWINDOW_JUCEHEADER__
+#endif   // JUCE_TOOLTIPWINDOW_H_INCLUDED
diff --git a/modules/juce_gui_basics/windows/juce_TopLevelWindow.h b/modules/juce_gui_basics/windows/juce_TopLevelWindow.h
index 5c9880d76c..b6e2320b02 100644
--- a/modules/juce_gui_basics/windows/juce_TopLevelWindow.h
+++ b/modules/juce_gui_basics/windows/juce_TopLevelWindow.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_TOPLEVELWINDOW_JUCEHEADER__
-#define __JUCE_TOPLEVELWINDOW_JUCEHEADER__
+#ifndef JUCE_TOPLEVELWINDOW_H_INCLUDED
+#define JUCE_TOPLEVELWINDOW_H_INCLUDED
 
 #include "../components/juce_Component.h"
 #include "../misc/juce_DropShadower.h"
@@ -161,4 +161,4 @@ private:
 };
 
 
-#endif   // __JUCE_TOPLEVELWINDOW_JUCEHEADER__
+#endif   // JUCE_TOPLEVELWINDOW_H_INCLUDED
diff --git a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h
index 41de1a6e98..d93cb11a73 100644
--- a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h
+++ b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CPLUSPLUSCODETOKENISER_JUCEHEADER__
-#define __JUCE_CPLUSPLUSCODETOKENISER_JUCEHEADER__
+#ifndef JUCE_CPLUSPLUSCODETOKENISER_H_INCLUDED
+#define JUCE_CPLUSPLUSCODETOKENISER_H_INCLUDED
 
 #include "juce_CodeTokeniser.h"
 
@@ -70,4 +70,4 @@ private:
 };
 
 
-#endif   // __JUCE_CPLUSPLUSCODETOKENISER_JUCEHEADER__
+#endif   // JUCE_CPLUSPLUSCODETOKENISER_H_INCLUDED
diff --git a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h
index 796042d0af..ec18615cd5 100644
--- a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h
+++ b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CPLUSPLUSCODETOKENISERFUNCTIONS_JUCEHEADER__
-#define __JUCE_CPLUSPLUSCODETOKENISERFUNCTIONS_JUCEHEADER__
+#ifndef JUCE_CPLUSPLUSCODETOKENISERFUNCTIONS_H_INCLUDED
+#define JUCE_CPLUSPLUSCODETOKENISERFUNCTIONS_H_INCLUDED
 
 
 //==============================================================================
@@ -557,4 +557,4 @@ struct CppTokeniserFunctions
 };
 
 
-#endif   // __JUCE_CPLUSPLUSCODETOKENISERFUNCTIONS_JUCEHEADER__
+#endif   // JUCE_CPLUSPLUSCODETOKENISERFUNCTIONS_H_INCLUDED
diff --git a/modules/juce_gui_extra/code_editor/juce_CodeDocument.h b/modules/juce_gui_extra/code_editor/juce_CodeDocument.h
index 5303d72571..eb4b1c4bd7 100644
--- a/modules/juce_gui_extra/code_editor/juce_CodeDocument.h
+++ b/modules/juce_gui_extra/code_editor/juce_CodeDocument.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CODEDOCUMENT_JUCEHEADER__
-#define __JUCE_CODEDOCUMENT_JUCEHEADER__
+#ifndef JUCE_CODEDOCUMENT_H_INCLUDED
+#define JUCE_CODEDOCUMENT_H_INCLUDED
 
 class CodeDocumentLine;
 
@@ -414,4 +414,4 @@ private:
 };
 
 
-#endif   // __JUCE_CODEDOCUMENT_JUCEHEADER__
+#endif   // JUCE_CODEDOCUMENT_H_INCLUDED
diff --git a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
index 6a92be8e3f..c85f00573e 100644
--- a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
+++ b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CODEEDITORCOMPONENT_JUCEHEADER__
-#define __JUCE_CODEEDITORCOMPONENT_JUCEHEADER__
+#ifndef JUCE_CODEEDITORCOMPONENT_H_INCLUDED
+#define JUCE_CODEEDITORCOMPONENT_H_INCLUDED
 
 #include "juce_CodeDocument.h"
 class CodeTokeniser;
@@ -417,4 +417,4 @@ private:
 };
 
 
-#endif   // __JUCE_CODEEDITORCOMPONENT_JUCEHEADER__
+#endif   // JUCE_CODEEDITORCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h b/modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h
index 339b4a06f2..50d78cb872 100644
--- a/modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h
+++ b/modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CODETOKENISER_JUCEHEADER__
-#define __JUCE_CODETOKENISER_JUCEHEADER__
+#ifndef JUCE_CODETOKENISER_H_INCLUDED
+#define JUCE_CODETOKENISER_H_INCLUDED
 
 #include "juce_CodeDocument.h"
 #include "juce_CodeEditorComponent.h"
@@ -58,4 +58,4 @@ private:
 };
 
 
-#endif   // __JUCE_CODETOKENISER_JUCEHEADER__
+#endif   // JUCE_CODETOKENISER_H_INCLUDED
diff --git a/modules/juce_gui_extra/documents/juce_FileBasedDocument.h b/modules/juce_gui_extra/documents/juce_FileBasedDocument.h
index 8c96ed5be8..9d77d6845b 100644
--- a/modules/juce_gui_extra/documents/juce_FileBasedDocument.h
+++ b/modules/juce_gui_extra/documents/juce_FileBasedDocument.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_FILEBASEDDOCUMENT_JUCEHEADER__
-#define __JUCE_FILEBASEDDOCUMENT_JUCEHEADER__
+#ifndef JUCE_FILEBASEDDOCUMENT_H_INCLUDED
+#define JUCE_FILEBASEDDOCUMENT_H_INCLUDED
 
 
 //==============================================================================
@@ -290,4 +290,4 @@ private:
 };
 
 
-#endif   // __JUCE_FILEBASEDDOCUMENT_JUCEHEADER__
+#endif   // JUCE_FILEBASEDDOCUMENT_H_INCLUDED
diff --git a/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h b/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h
index 3acd16df75..27d06ef201 100644
--- a/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h
+++ b/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_ACTIVEXCONTROLCOMPONENT_JUCEHEADER__
-#define __JUCE_ACTIVEXCONTROLCOMPONENT_JUCEHEADER__
+#ifndef JUCE_ACTIVEXCONTROLCOMPONENT_H_INCLUDED
+#define JUCE_ACTIVEXCONTROLCOMPONENT_H_INCLUDED
 
 #if JUCE_WINDOWS || DOXYGEN
 
@@ -119,4 +119,4 @@ private:
 
 #endif
 
-#endif   // __JUCE_ACTIVEXCONTROLCOMPONENT_JUCEHEADER__
+#endif   // JUCE_ACTIVEXCONTROLCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_extra/embedding/juce_NSViewComponent.h b/modules/juce_gui_extra/embedding/juce_NSViewComponent.h
index 95657285e5..cd2ced5d9f 100644
--- a/modules/juce_gui_extra/embedding/juce_NSViewComponent.h
+++ b/modules/juce_gui_extra/embedding/juce_NSViewComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_NSVIEWCOMPONENT_JUCEHEADER__
-#define __JUCE_NSVIEWCOMPONENT_JUCEHEADER__
+#ifndef JUCE_NSVIEWCOMPONENT_H_INCLUDED
+#define JUCE_NSVIEWCOMPONENT_H_INCLUDED
 
 #if JUCE_MAC || DOXYGEN
 
@@ -82,4 +82,4 @@ private:
 };
 
 #endif
-#endif   // __JUCE_NSVIEWCOMPONENT_JUCEHEADER__
+#endif   // JUCE_NSVIEWCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_extra/embedding/juce_UIViewComponent.h b/modules/juce_gui_extra/embedding/juce_UIViewComponent.h
index 85fd9fb74c..80d47ea122 100644
--- a/modules/juce_gui_extra/embedding/juce_UIViewComponent.h
+++ b/modules/juce_gui_extra/embedding/juce_UIViewComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_UIVIEWCOMPONENT_JUCEHEADER__
-#define __JUCE_UIVIEWCOMPONENT_JUCEHEADER__
+#ifndef JUCE_UIVIEWCOMPONENT_H_INCLUDED
+#define JUCE_UIVIEWCOMPONENT_H_INCLUDED
 
 #if JUCE_IOS || DOXYGEN
 
@@ -83,4 +83,4 @@ private:
 };
 
 #endif
-#endif   // __JUCE_UIVIEWCOMPONENT_JUCEHEADER__
+#endif   // JUCE_UIVIEWCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_extra/juce_gui_extra.cpp b/modules/juce_gui_extra/juce_gui_extra.cpp
index e80e7419d8..52f2d09619 100644
--- a/modules/juce_gui_extra/juce_gui_extra.cpp
+++ b/modules/juce_gui_extra/juce_gui_extra.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_GUI_EXTRA_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_GUI_EXTRA_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_gui_extra/juce_gui_extra.h b/modules/juce_gui_extra/juce_gui_extra.h
index ee25a9aeaf..b9bde00fb9 100644
--- a/modules/juce_gui_extra/juce_gui_extra.h
+++ b/modules/juce_gui_extra/juce_gui_extra.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_GUI_EXTRA_JUCEHEADER__
-#define __JUCE_GUI_EXTRA_JUCEHEADER__
+#ifndef JUCE_GUI_EXTRA_H_INCLUDED
+#define JUCE_GUI_EXTRA_H_INCLUDED
 
 #include "../juce_gui_basics/juce_gui_basics.h"
 
@@ -42,65 +42,27 @@ namespace juce
 {
 
 // START_AUTOINCLUDE documents, code_editor, embedding, lookandfeel, misc
-#ifndef __JUCE_FILEBASEDDOCUMENT_JUCEHEADER__
- #include "documents/juce_FileBasedDocument.h"
-#endif
-#ifndef __JUCE_CODEDOCUMENT_JUCEHEADER__
- #include "code_editor/juce_CodeDocument.h"
-#endif
-#ifndef __JUCE_CODEEDITORCOMPONENT_JUCEHEADER__
- #include "code_editor/juce_CodeEditorComponent.h"
-#endif
-#ifndef __JUCE_CODETOKENISER_JUCEHEADER__
- #include "code_editor/juce_CodeTokeniser.h"
-#endif
-#ifndef __JUCE_CPLUSPLUSCODETOKENISER_JUCEHEADER__
- #include "code_editor/juce_CPlusPlusCodeTokeniser.h"
-#endif
-#ifndef __JUCE_CPLUSPLUSCODETOKENISERFUNCTIONS_JUCEHEADER__
- #include "code_editor/juce_CPlusPlusCodeTokeniserFunctions.h"
-#endif
-#ifndef __JUCE_ACTIVEXCONTROLCOMPONENT_JUCEHEADER__
- #include "embedding/juce_ActiveXControlComponent.h"
-#endif
-#ifndef __JUCE_NSVIEWCOMPONENT_JUCEHEADER__
- #include "embedding/juce_NSViewComponent.h"
-#endif
-#ifndef __JUCE_UIVIEWCOMPONENT_JUCEHEADER__
- #include "embedding/juce_UIViewComponent.h"
-#endif
-#ifndef __JUCE_OLDSCHOOLLOOKANDFEEL_JUCEHEADER__
- #include "lookandfeel/juce_OldSchoolLookAndFeel.h"
-#endif
-#ifndef __JUCE_APPLEREMOTE_JUCEHEADER__
- #include "misc/juce_AppleRemote.h"
-#endif
-#ifndef __JUCE_BUBBLEMESSAGECOMPONENT_JUCEHEADER__
- #include "misc/juce_BubbleMessageComponent.h"
-#endif
-#ifndef __JUCE_COLOURSELECTOR_JUCEHEADER__
- #include "misc/juce_ColourSelector.h"
-#endif
-#ifndef __JUCE_KEYMAPPINGEDITORCOMPONENT_JUCEHEADER__
- #include "misc/juce_KeyMappingEditorComponent.h"
-#endif
-#ifndef __JUCE_PREFERENCESPANEL_JUCEHEADER__
- #include "misc/juce_PreferencesPanel.h"
-#endif
-#ifndef __JUCE_RECENTLYOPENEDFILESLIST_JUCEHEADER__
- #include "misc/juce_RecentlyOpenedFilesList.h"
-#endif
-#ifndef __JUCE_SPLASHSCREEN_JUCEHEADER__
- #include "misc/juce_SplashScreen.h"
-#endif
-#ifndef __JUCE_SYSTEMTRAYICONCOMPONENT_JUCEHEADER__
- #include "misc/juce_SystemTrayIconComponent.h"
-#endif
-#ifndef __JUCE_WEBBROWSERCOMPONENT_JUCEHEADER__
- #include "misc/juce_WebBrowserComponent.h"
-#endif
+#include "documents/juce_FileBasedDocument.h"
+#include "code_editor/juce_CodeDocument.h"
+#include "code_editor/juce_CodeEditorComponent.h"
+#include "code_editor/juce_CodeTokeniser.h"
+#include "code_editor/juce_CPlusPlusCodeTokeniser.h"
+#include "code_editor/juce_CPlusPlusCodeTokeniserFunctions.h"
+#include "embedding/juce_ActiveXControlComponent.h"
+#include "embedding/juce_NSViewComponent.h"
+#include "embedding/juce_UIViewComponent.h"
+#include "lookandfeel/juce_OldSchoolLookAndFeel.h"
+#include "misc/juce_AppleRemote.h"
+#include "misc/juce_BubbleMessageComponent.h"
+#include "misc/juce_ColourSelector.h"
+#include "misc/juce_KeyMappingEditorComponent.h"
+#include "misc/juce_PreferencesPanel.h"
+#include "misc/juce_RecentlyOpenedFilesList.h"
+#include "misc/juce_SplashScreen.h"
+#include "misc/juce_SystemTrayIconComponent.h"
+#include "misc/juce_WebBrowserComponent.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_GUI_EXTRA_JUCEHEADER__
+#endif   // JUCE_GUI_EXTRA_H_INCLUDED
diff --git a/modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h b/modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h
index 16fc9cbc55..c483afdb9d 100644
--- a/modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h
+++ b/modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OLDSCHOOLLOOKANDFEEL_JUCEHEADER__
-#define __JUCE_OLDSCHOOLLOOKANDFEEL_JUCEHEADER__
+#ifndef JUCE_OLDSCHOOLLOOKANDFEEL_H_INCLUDED
+#define JUCE_OLDSCHOOLLOOKANDFEEL_H_INCLUDED
 
 
 //==============================================================================
@@ -153,4 +153,4 @@ private:
 };
 
 
-#endif   // __JUCE_OLDSCHOOLLOOKANDFEEL_JUCEHEADER__
+#endif   // JUCE_OLDSCHOOLLOOKANDFEEL_H_INCLUDED
diff --git a/modules/juce_gui_extra/misc/juce_AppleRemote.h b/modules/juce_gui_extra/misc/juce_AppleRemote.h
index 6145af3e00..c8dfb77144 100644
--- a/modules/juce_gui_extra/misc/juce_AppleRemote.h
+++ b/modules/juce_gui_extra/misc/juce_AppleRemote.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_APPLEREMOTE_JUCEHEADER__
-#define __JUCE_APPLEREMOTE_JUCEHEADER__
+#ifndef JUCE_APPLEREMOTE_H_INCLUDED
+#define JUCE_APPLEREMOTE_H_INCLUDED
 
 
 //==============================================================================
@@ -111,4 +111,4 @@ private:
 };
 
 #endif
-#endif   // __JUCE_APPLEREMOTE_JUCEHEADER__
+#endif   // JUCE_APPLEREMOTE_H_INCLUDED
diff --git a/modules/juce_gui_extra/misc/juce_BubbleMessageComponent.h b/modules/juce_gui_extra/misc/juce_BubbleMessageComponent.h
index 229e19546d..08751a28e4 100644
--- a/modules/juce_gui_extra/misc/juce_BubbleMessageComponent.h
+++ b/modules/juce_gui_extra/misc/juce_BubbleMessageComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BUBBLEMESSAGECOMPONENT_JUCEHEADER__
-#define __JUCE_BUBBLEMESSAGECOMPONENT_JUCEHEADER__
+#ifndef JUCE_BUBBLEMESSAGECOMPONENT_H_INCLUDED
+#define JUCE_BUBBLEMESSAGECOMPONENT_H_INCLUDED
 
 
 //==============================================================================
@@ -129,4 +129,4 @@ private:
 };
 
 
-#endif   // __JUCE_BUBBLEMESSAGECOMPONENT_JUCEHEADER__
+#endif   // JUCE_BUBBLEMESSAGECOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_extra/misc/juce_ColourSelector.h b/modules/juce_gui_extra/misc/juce_ColourSelector.h
index 0677c31410..b41cdb1af4 100644
--- a/modules/juce_gui_extra/misc/juce_ColourSelector.h
+++ b/modules/juce_gui_extra/misc/juce_ColourSelector.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_COLOURSELECTOR_JUCEHEADER__
-#define __JUCE_COLOURSELECTOR_JUCEHEADER__
+#ifndef JUCE_COLOURSELECTOR_H_INCLUDED
+#define JUCE_COLOURSELECTOR_H_INCLUDED
 
 
 //==============================================================================
@@ -169,4 +169,4 @@ private:
 };
 
 
-#endif   // __JUCE_COLOURSELECTOR_JUCEHEADER__
+#endif   // JUCE_COLOURSELECTOR_H_INCLUDED
diff --git a/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h b/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h
index 5b9ba39ef7..f693235c9f 100644
--- a/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h
+++ b/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_KEYMAPPINGEDITORCOMPONENT_JUCEHEADER__
-#define __JUCE_KEYMAPPINGEDITORCOMPONENT_JUCEHEADER__
+#ifndef JUCE_KEYMAPPINGEDITORCOMPONENT_H_INCLUDED
+#define JUCE_KEYMAPPINGEDITORCOMPONENT_H_INCLUDED
 
 
 //==============================================================================
@@ -133,4 +133,4 @@ private:
 };
 
 
-#endif   // __JUCE_KEYMAPPINGEDITORCOMPONENT_JUCEHEADER__
+#endif   // JUCE_KEYMAPPINGEDITORCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_extra/misc/juce_PreferencesPanel.h b/modules/juce_gui_extra/misc/juce_PreferencesPanel.h
index 6852bb39aa..1d798027c5 100644
--- a/modules/juce_gui_extra/misc/juce_PreferencesPanel.h
+++ b/modules/juce_gui_extra/misc/juce_PreferencesPanel.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_PREFERENCESPANEL_JUCEHEADER__
-#define __JUCE_PREFERENCESPANEL_JUCEHEADER__
+#ifndef JUCE_PREFERENCESPANEL_H_INCLUDED
+#define JUCE_PREFERENCESPANEL_H_INCLUDED
 
 
 //==============================================================================
@@ -145,4 +145,4 @@ private:
 
 
 
-#endif   // __JUCE_PREFERENCESPANEL_JUCEHEADER__
+#endif   // JUCE_PREFERENCESPANEL_H_INCLUDED
diff --git a/modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.h b/modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.h
index e97e843d53..b78e840ff2 100644
--- a/modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.h
+++ b/modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_RECENTLYOPENEDFILESLIST_JUCEHEADER__
-#define __JUCE_RECENTLYOPENEDFILESLIST_JUCEHEADER__
+#ifndef JUCE_RECENTLYOPENEDFILESLIST_H_INCLUDED
+#define JUCE_RECENTLYOPENEDFILESLIST_H_INCLUDED
 
 
 //==============================================================================
@@ -161,4 +161,4 @@ private:
 };
 
 
-#endif   // __JUCE_RECENTLYOPENEDFILESLIST_JUCEHEADER__
+#endif   // JUCE_RECENTLYOPENEDFILESLIST_H_INCLUDED
diff --git a/modules/juce_gui_extra/misc/juce_SplashScreen.h b/modules/juce_gui_extra/misc/juce_SplashScreen.h
index 6d2973e910..7063836c7e 100644
--- a/modules/juce_gui_extra/misc/juce_SplashScreen.h
+++ b/modules/juce_gui_extra/misc/juce_SplashScreen.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SPLASHSCREEN_JUCEHEADER__
-#define __JUCE_SPLASHSCREEN_JUCEHEADER__
+#ifndef JUCE_SPLASHSCREEN_H_INCLUDED
+#define JUCE_SPLASHSCREEN_H_INCLUDED
 
 
 //==============================================================================
@@ -142,4 +142,4 @@ private:
 };
 
 
-#endif   // __JUCE_SPLASHSCREEN_JUCEHEADER__
+#endif   // JUCE_SPLASHSCREEN_H_INCLUDED
diff --git a/modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h b/modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h
index 1d3ee3fdd4..d1de9436c3 100644
--- a/modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h
+++ b/modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_SYSTEMTRAYICONCOMPONENT_JUCEHEADER__
-#define __JUCE_SYSTEMTRAYICONCOMPONENT_JUCEHEADER__
+#ifndef JUCE_SYSTEMTRAYICONCOMPONENT_H_INCLUDED
+#define JUCE_SYSTEMTRAYICONCOMPONENT_H_INCLUDED
 
 #if JUCE_WINDOWS || JUCE_LINUX || JUCE_MAC || DOXYGEN
 
@@ -77,4 +77,4 @@ private:
 
 
 #endif
-#endif   // __JUCE_SYSTEMTRAYICONCOMPONENT_JUCEHEADER__
+#endif   // JUCE_SYSTEMTRAYICONCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h b/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h
index 34f140c6a8..a284802873 100644
--- a/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h
+++ b/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_WEBBROWSERCOMPONENT_JUCEHEADER__
-#define __JUCE_WEBBROWSERCOMPONENT_JUCEHEADER__
+#ifndef JUCE_WEBBROWSERCOMPONENT_H_INCLUDED
+#define JUCE_WEBBROWSERCOMPONENT_H_INCLUDED
 
 #if JUCE_WEB_BROWSER || DOXYGEN
 
@@ -124,4 +124,4 @@ private:
 
 
 #endif
-#endif   // __JUCE_WEBBROWSERCOMPONENT_JUCEHEADER__
+#endif   // JUCE_WEBBROWSERCOMPONENT_H_INCLUDED
diff --git a/modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h b/modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h
index eb53bf3a85..ed29d26bb9 100644
--- a/modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h
+++ b/modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MAC_CARBONVIEWWRAPPERCOMPONENT_JUCEHEADER__
-#define __JUCE_MAC_CARBONVIEWWRAPPERCOMPONENT_JUCEHEADER__
+#ifndef JUCE_MAC_CARBONVIEWWRAPPERCOMPONENT_H_INCLUDED
+#define JUCE_MAC_CARBONVIEWWRAPPERCOMPONENT_H_INCLUDED
 
 
 //==============================================================================
@@ -317,4 +317,4 @@ protected:
     NSWindow* getOwnerWindow() const    { return [((NSView*) getWindowHandle()) window]; }
 };
 
-#endif   // __JUCE_MAC_CARBONVIEWWRAPPERCOMPONENT_JUCEHEADER__
+#endif   // JUCE_MAC_CARBONVIEWWRAPPERCOMPONENT_H_INCLUDED
diff --git a/modules/juce_opengl/juce_opengl.cpp b/modules/juce_opengl/juce_opengl.cpp
index 5e8042006b..3fa31d0846 100644
--- a/modules/juce_opengl/juce_opengl.cpp
+++ b/modules/juce_opengl/juce_opengl.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_OPENGL_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_OPENGL_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_opengl/juce_opengl.h b/modules/juce_opengl/juce_opengl.h
index c32598254c..6ad4b8ec63 100644
--- a/modules/juce_opengl/juce_opengl.h
+++ b/modules/juce_opengl/juce_opengl.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OPENGL_JUCEHEADER__
-#define __JUCE_OPENGL_JUCEHEADER__
+#ifndef JUCE_OPENGL_H_INCLUDED
+#define JUCE_OPENGL_H_INCLUDED
 
 #include "../juce_gui_extra/juce_gui_extra.h"
 
@@ -80,47 +80,21 @@ namespace juce
 #include "opengl/juce_OpenGLHelpers.h"
 
 // START_AUTOINCLUDE opengl
-#ifndef __JUCE_DRAGGABLE3DORIENTATION_JUCEHEADER__
- #include "opengl/juce_Draggable3DOrientation.h"
-#endif
-#ifndef __JUCE_MATRIX3D_JUCEHEADER__
- #include "opengl/juce_Matrix3D.h"
-#endif
-#ifndef __JUCE_OPENGLCONTEXT_JUCEHEADER__
- #include "opengl/juce_OpenGLContext.h"
-#endif
-#ifndef __JUCE_OPENGLFRAMEBUFFER_JUCEHEADER__
- #include "opengl/juce_OpenGLFrameBuffer.h"
-#endif
-#ifndef __JUCE_OPENGLGRAPHICSCONTEXT_JUCEHEADER__
- #include "opengl/juce_OpenGLGraphicsContext.h"
-#endif
-#ifndef __JUCE_OPENGLHELPERS_JUCEHEADER__
- #include "opengl/juce_OpenGLHelpers.h"
-#endif
-#ifndef __JUCE_OPENGLIMAGE_JUCEHEADER__
- #include "opengl/juce_OpenGLImage.h"
-#endif
-#ifndef __JUCE_OPENGLPIXELFORMAT_JUCEHEADER__
- #include "opengl/juce_OpenGLPixelFormat.h"
-#endif
-#ifndef __JUCE_OPENGLRENDERER_JUCEHEADER__
- #include "opengl/juce_OpenGLRenderer.h"
-#endif
-#ifndef __JUCE_OPENGLSHADERPROGRAM_JUCEHEADER__
- #include "opengl/juce_OpenGLShaderProgram.h"
-#endif
-#ifndef __JUCE_OPENGLTEXTURE_JUCEHEADER__
- #include "opengl/juce_OpenGLTexture.h"
-#endif
-#ifndef __JUCE_QUATERNION_JUCEHEADER__
- #include "opengl/juce_Quaternion.h"
-#endif
-#ifndef __JUCE_VECTOR3D_JUCEHEADER__
- #include "opengl/juce_Vector3D.h"
-#endif
+#include "opengl/juce_Draggable3DOrientation.h"
+#include "opengl/juce_Matrix3D.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
 
 }
 
-#endif   // __JUCE_OPENGL_JUCEHEADER__
+#endif   // JUCE_OPENGL_H_INCLUDED
diff --git a/modules/juce_opengl/native/juce_OpenGLExtensions.h b/modules/juce_opengl/native/juce_OpenGLExtensions.h
index e0cec4af98..d94c10608f 100644
--- a/modules/juce_opengl/native/juce_OpenGLExtensions.h
+++ b/modules/juce_opengl/native/juce_OpenGLExtensions.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OPENGLEXTENSIONS_JUCEHEADER__
-#define __JUCE_OPENGLEXTENSIONS_JUCEHEADER__
+#ifndef JUCE_OPENGLEXTENSIONS_H_INCLUDED
+#define JUCE_OPENGLEXTENSIONS_H_INCLUDED
 
 #if JUCE_MAC && (JUCE_PPC || ((! defined (MAC_OS_X_VERSION_10_6)) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6))
  #define JUCE_EXT(func) func ## EXT
@@ -134,4 +134,4 @@ struct OpenGLExtensionFunctions
     #undef JUCE_DECLARE_GL_FUNCTION
 };
 
-#endif   // __JUCE_OPENGLEXTENSIONS_JUCEHEADER__
+#endif   // JUCE_OPENGLEXTENSIONS_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_Draggable3DOrientation.h b/modules/juce_opengl/opengl/juce_Draggable3DOrientation.h
index d3c6872f9c..1c3bdb8de2 100644
--- a/modules/juce_opengl/opengl/juce_Draggable3DOrientation.h
+++ b/modules/juce_opengl/opengl/juce_Draggable3DOrientation.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DRAGGABLE3DORIENTATION_JUCEHEADER__
-#define __JUCE_DRAGGABLE3DORIENTATION_JUCEHEADER__
+#ifndef JUCE_DRAGGABLE3DORIENTATION_H_INCLUDED
+#define JUCE_DRAGGABLE3DORIENTATION_H_INCLUDED
 
 #include "juce_Quaternion.h"
 
@@ -150,4 +150,4 @@ private:
     }
 };
 
-#endif   // __JUCE_DRAGGABLE3DORIENTATION_JUCEHEADER__
+#endif   // JUCE_DRAGGABLE3DORIENTATION_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_Matrix3D.h b/modules/juce_opengl/opengl/juce_Matrix3D.h
index 8c86c16c49..647736fc23 100644
--- a/modules/juce_opengl/opengl/juce_Matrix3D.h
+++ b/modules/juce_opengl/opengl/juce_Matrix3D.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_MATRIX3D_JUCEHEADER__
-#define __JUCE_MATRIX3D_JUCEHEADER__
+#ifndef JUCE_MATRIX3D_H_INCLUDED
+#define JUCE_MATRIX3D_H_INCLUDED
 
 //==============================================================================
 /**
@@ -89,4 +89,4 @@ public:
 };
 
 
-#endif   // __JUCE_MATRIX3D_JUCEHEADER__
+#endif   // JUCE_MATRIX3D_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_OpenGLContext.h b/modules/juce_opengl/opengl/juce_OpenGLContext.h
index 8bf45bcc83..7cba146cb5 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLContext.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLContext.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OPENGLCONTEXT_JUCEHEADER__
-#define __JUCE_OPENGLCONTEXT_JUCEHEADER__
+#ifndef JUCE_OPENGLCONTEXT_H_INCLUDED
+#define JUCE_OPENGLCONTEXT_H_INCLUDED
 
 #include "juce_OpenGLPixelFormat.h"
 #include "../native/juce_OpenGLExtensions.h"
@@ -250,4 +250,4 @@ private:
 };
 
 
-#endif   // __JUCE_OPENGLCONTEXT_JUCEHEADER__
+#endif   // JUCE_OPENGLCONTEXT_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h b/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
index 699b60f6e3..3d17f6dd01 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OPENGLFRAMEBUFFER_JUCEHEADER__
-#define __JUCE_OPENGLFRAMEBUFFER_JUCEHEADER__
+#ifndef JUCE_OPENGLFRAMEBUFFER_H_INCLUDED
+#define JUCE_OPENGLFRAMEBUFFER_H_INCLUDED
 
 
 //==============================================================================
@@ -150,4 +150,4 @@ private:
 };
 
 
-#endif   // __JUCE_OPENGLFRAMEBUFFER_JUCEHEADER__
+#endif   // JUCE_OPENGLFRAMEBUFFER_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.h b/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.h
index a13cd62cfe..5f01bf9bd0 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OPENGLGRAPHICSCONTEXT_JUCEHEADER__
-#define __JUCE_OPENGLGRAPHICSCONTEXT_JUCEHEADER__
+#ifndef JUCE_OPENGLGRAPHICSCONTEXT_H_INCLUDED
+#define JUCE_OPENGLGRAPHICSCONTEXT_H_INCLUDED
 
 
 /** Creates a graphics context object that will render into the given OpenGL target.
@@ -46,4 +46,4 @@ LowLevelGraphicsContext* createOpenGLGraphicsContext (OpenGLContext& context,
                                                       int width, int height);
 
 
-#endif   // __JUCE_OPENGLGRAPHICSCONTEXT_JUCEHEADER__
+#endif   // JUCE_OPENGLGRAPHICSCONTEXT_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_OpenGLHelpers.h b/modules/juce_opengl/opengl/juce_OpenGLHelpers.h
index 29a80ff38f..c311ae7d33 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLHelpers.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLHelpers.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OPENGLHELPERS_JUCEHEADER__
-#define __JUCE_OPENGLHELPERS_JUCEHEADER__
+#ifndef JUCE_OPENGLHELPERS_H_INCLUDED
+#define JUCE_OPENGLHELPERS_H_INCLUDED
 
 class OpenGLTexture;
 class OpenGLFrameBuffer;
@@ -125,4 +125,4 @@ private:
 };
 
 
-#endif   // __JUCE_OPENGLHELPERS_JUCEHEADER__
+#endif   // JUCE_OPENGLHELPERS_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_OpenGLImage.h b/modules/juce_opengl/opengl/juce_OpenGLImage.h
index 5c998ee171..af88ff857b 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLImage.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLImage.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OPENGLIMAGE_JUCEHEADER__
-#define __JUCE_OPENGLIMAGE_JUCEHEADER__
+#ifndef JUCE_OPENGLIMAGE_H_INCLUDED
+#define JUCE_OPENGLIMAGE_H_INCLUDED
 
 
 //==============================================================================
@@ -49,4 +49,4 @@ public:
     static OpenGLFrameBuffer* getFrameBufferFrom (const Image&);
 };
 
-#endif   // __JUCE_OPENGLIMAGE_JUCEHEADER__
+#endif   // JUCE_OPENGLIMAGE_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_OpenGLPixelFormat.h b/modules/juce_opengl/opengl/juce_OpenGLPixelFormat.h
index 2af6bb68e2..69f5463a49 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLPixelFormat.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLPixelFormat.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OPENGLPIXELFORMAT_JUCEHEADER__
-#define __JUCE_OPENGLPIXELFORMAT_JUCEHEADER__
+#ifndef JUCE_OPENGLPIXELFORMAT_H_INCLUDED
+#define JUCE_OPENGLPIXELFORMAT_H_INCLUDED
 
 
 //==============================================================================
@@ -67,4 +67,4 @@ public:
 };
 
 
-#endif   // __JUCE_OPENGLPIXELFORMAT_JUCEHEADER__
+#endif   // JUCE_OPENGLPIXELFORMAT_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_OpenGLRenderer.h b/modules/juce_opengl/opengl/juce_OpenGLRenderer.h
index 1c740b3e87..0023289f60 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLRenderer.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLRenderer.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OPENGLRENDERER_JUCEHEADER__
-#define __JUCE_OPENGLRENDERER_JUCEHEADER__
+#ifndef JUCE_OPENGLRENDERER_H_INCLUDED
+#define JUCE_OPENGLRENDERER_H_INCLUDED
 
 //==============================================================================
 /**
@@ -66,4 +66,4 @@ public:
 };
 
 
-#endif   // __JUCE_OPENGLRENDERER_JUCEHEADER__
+#endif   // JUCE_OPENGLRENDERER_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.h b/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.h
index a20627c9ba..4e83532c2c 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OPENGLSHADERPROGRAM_JUCEHEADER__
-#define __JUCE_OPENGLSHADERPROGRAM_JUCEHEADER__
+#ifndef JUCE_OPENGLSHADERPROGRAM_H_INCLUDED
+#define JUCE_OPENGLSHADERPROGRAM_H_INCLUDED
 
 //==============================================================================
 /**
@@ -150,4 +150,4 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OpenGLShaderProgram)
 };
 
-#endif   // __JUCE_OPENGLSHADERPROGRAM_JUCEHEADER__
+#endif   // JUCE_OPENGLSHADERPROGRAM_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_OpenGLTexture.h b/modules/juce_opengl/opengl/juce_OpenGLTexture.h
index c59c66a55b..07c36d5fd1 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLTexture.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLTexture.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_OPENGLTEXTURE_JUCEHEADER__
-#define __JUCE_OPENGLTEXTURE_JUCEHEADER__
+#ifndef JUCE_OPENGLTEXTURE_H_INCLUDED
+#define JUCE_OPENGLTEXTURE_H_INCLUDED
 
 //==============================================================================
 /**
@@ -115,4 +115,4 @@ private:
 };
 
 
-#endif   // __JUCE_OPENGLTEXTURE_JUCEHEADER__
+#endif   // JUCE_OPENGLTEXTURE_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_Quaternion.h b/modules/juce_opengl/opengl/juce_Quaternion.h
index 9780c1753b..19553e48bf 100644
--- a/modules/juce_opengl/opengl/juce_Quaternion.h
+++ b/modules/juce_opengl/opengl/juce_Quaternion.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_QUATERNION_JUCEHEADER__
-#define __JUCE_QUATERNION_JUCEHEADER__
+#ifndef JUCE_QUATERNION_H_INCLUDED
+#define JUCE_QUATERNION_H_INCLUDED
 
 #include "juce_Matrix3D.h"
 #include "juce_Vector3D.h"
@@ -96,4 +96,4 @@ public:
 };
 
 
-#endif   // __JUCE_QUATERNION_JUCEHEADER__
+#endif   // JUCE_QUATERNION_H_INCLUDED
diff --git a/modules/juce_opengl/opengl/juce_Vector3D.h b/modules/juce_opengl/opengl/juce_Vector3D.h
index 0404f8ed9e..1f98135022 100644
--- a/modules/juce_opengl/opengl/juce_Vector3D.h
+++ b/modules/juce_opengl/opengl/juce_Vector3D.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_VECTOR3D_JUCEHEADER__
-#define __JUCE_VECTOR3D_JUCEHEADER__
+#ifndef JUCE_VECTOR3D_H_INCLUDED
+#define JUCE_VECTOR3D_H_INCLUDED
 
 //==============================================================================
 /**
@@ -78,4 +78,4 @@ public:
 };
 
 
-#endif   // __JUCE_VECTOR3D_JUCEHEADER__
+#endif   // JUCE_VECTOR3D_H_INCLUDED
diff --git a/modules/juce_video/capture/juce_CameraDevice.h b/modules/juce_video/capture/juce_CameraDevice.h
index 886487c658..ee8c7944b0 100644
--- a/modules/juce_video/capture/juce_CameraDevice.h
+++ b/modules/juce_video/capture/juce_CameraDevice.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_CAMERADEVICE_JUCEHEADER__
-#define __JUCE_CAMERADEVICE_JUCEHEADER__
+#ifndef JUCE_CAMERADEVICE_H_INCLUDED
+#define JUCE_CAMERADEVICE_H_INCLUDED
 
 #if JUCE_USE_CAMERA || DOXYGEN
 
@@ -156,4 +156,4 @@ typedef CameraDevice::Listener CameraImageListener;
 
 
 #endif
-#endif   // __JUCE_CAMERADEVICE_JUCEHEADER__
+#endif   // JUCE_CAMERADEVICE_H_INCLUDED
diff --git a/modules/juce_video/juce_video.cpp b/modules/juce_video/juce_video.cpp
index 423706b7df..2da967e85b 100644
--- a/modules/juce_video/juce_video.cpp
+++ b/modules/juce_video/juce_video.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_VIDEO_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
+#if defined (JUCE_VIDEO_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
diff --git a/modules/juce_video/juce_video.h b/modules/juce_video/juce_video.h
index e457dd846a..754d89d5d9 100644
--- a/modules/juce_video/juce_video.h
+++ b/modules/juce_video/juce_video.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_VIDEO_JUCEHEADER__
-#define __JUCE_VIDEO_JUCEHEADER__
+#ifndef JUCE_VIDEO_H_INCLUDED
+#define JUCE_VIDEO_H_INCLUDED
 
 //=============================================================================
 #include "../juce_gui_extra/juce_gui_extra.h"
@@ -74,17 +74,11 @@ namespace juce
 {
 
 // START_AUTOINCLUDE playback, capture
-#ifndef __JUCE_DIRECTSHOWCOMPONENT_JUCEHEADER__
- #include "playback/juce_DirectShowComponent.h"
-#endif
-#ifndef __JUCE_QUICKTIMEMOVIECOMPONENT_JUCEHEADER__
- #include "playback/juce_QuickTimeMovieComponent.h"
-#endif
-#ifndef __JUCE_CAMERADEVICE_JUCEHEADER__
- #include "capture/juce_CameraDevice.h"
-#endif
+#include "playback/juce_DirectShowComponent.h"
+#include "playback/juce_QuickTimeMovieComponent.h"
+#include "capture/juce_CameraDevice.h"
 // END_AUTOINCLUDE
 
 }
 
-#endif   // __JUCE_VIDEO_JUCEHEADER__
+#endif   // JUCE_VIDEO_H_INCLUDED
diff --git a/modules/juce_video/playback/juce_DirectShowComponent.h b/modules/juce_video/playback/juce_DirectShowComponent.h
index 5d537a134d..c2c783cb5e 100644
--- a/modules/juce_video/playback/juce_DirectShowComponent.h
+++ b/modules/juce_video/playback/juce_DirectShowComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_DIRECTSHOWCOMPONENT_JUCEHEADER__
-#define __JUCE_DIRECTSHOWCOMPONENT_JUCEHEADER__
+#ifndef JUCE_DIRECTSHOWCOMPONENT_H_INCLUDED
+#define JUCE_DIRECTSHOWCOMPONENT_H_INCLUDED
 
 #if JUCE_DIRECTSHOW || DOXYGEN
 
@@ -213,4 +213,4 @@ private:
 };
 
 #endif
-#endif   // __JUCE_DIRECTSHOWCOMPONENT_JUCEHEADER__
+#endif   // JUCE_DIRECTSHOWCOMPONENT_H_INCLUDED
diff --git a/modules/juce_video/playback/juce_QuickTimeMovieComponent.h b/modules/juce_video/playback/juce_QuickTimeMovieComponent.h
index 6c38808d45..1b1528161d 100644
--- a/modules/juce_video/playback/juce_QuickTimeMovieComponent.h
+++ b/modules/juce_video/playback/juce_QuickTimeMovieComponent.h
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_QUICKTIMEMOVIECOMPONENT_JUCEHEADER__
-#define __JUCE_QUICKTIMEMOVIECOMPONENT_JUCEHEADER__
+#ifndef JUCE_QUICKTIMEMOVIECOMPONENT_H_INCLUDED
+#define JUCE_QUICKTIMEMOVIECOMPONENT_H_INCLUDED
 
 // (NB: This stuff mustn't go inside the "#if QUICKTIME" block, or it'll break the
 // amalgamated build)
@@ -217,4 +217,4 @@ private:
 };
 
 #endif
-#endif   // __JUCE_QUICKTIMEMOVIECOMPONENT_JUCEHEADER__
+#endif   // JUCE_QUICKTIMEMOVIECOMPONENT_H_INCLUDED