diff --git a/modules/juce_audio_basics/juce_audio_basics.cpp b/modules/juce_audio_basics/juce_audio_basics.cpp
index 6dbf9b7062..0c17578794 100644
--- a/modules/juce_audio_basics/juce_audio_basics.cpp
+++ b/modules/juce_audio_basics/juce_audio_basics.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_AUDIO_BASICS_JUCEHEADER__
+#if defined (__JUCE_AUDIO_BASICS_JUCEHEADER__) && ! 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.cpp b/modules/juce_audio_devices/juce_audio_devices.cpp
index 487cc4203e..9cf509e2f4 100644
--- a/modules/juce_audio_devices/juce_audio_devices.cpp
+++ b/modules/juce_audio_devices/juce_audio_devices.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_DEVICES_JUCEHEADER__) && ! defined (JUCE_AMALGAMATED_INCLUDE)
+#if defined (__JUCE_AUDIO_DEVICES_JUCEHEADER__) && ! 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.cpp b/modules/juce_audio_formats/juce_audio_formats.cpp
index 7e6031472e..ebfbef1560 100644
--- a/modules/juce_audio_formats/juce_audio_formats.cpp
+++ b/modules/juce_audio_formats/juce_audio_formats.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_AUDIO_FORMATS_JUCEHEADER__
+#if defined (__JUCE_AUDIO_FORMATS_JUCEHEADER__) && ! 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.cpp b/modules/juce_audio_processors/juce_audio_processors.cpp
index 10d98ed21c..fd3269c57f 100644
--- a/modules/juce_audio_processors/juce_audio_processors.cpp
+++ b/modules/juce_audio_processors/juce_audio_processors.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_AUDIO_PROCESSORS_JUCEHEADER__
+#if defined (__JUCE_AUDIO_PROCESSORS_JUCEHEADER__) && ! 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.cpp b/modules/juce_audio_utils/juce_audio_utils.cpp
index 9941ca0d18..218789fac7 100644
--- a/modules/juce_audio_utils/juce_audio_utils.cpp
+++ b/modules/juce_audio_utils/juce_audio_utils.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_UTILS_JUCEHEADER__) && ! defined (JUCE_AMALGAMATED_INCLUDE)
+#if defined (__JUCE_AUDIO_UTILS_JUCEHEADER__) && ! 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.cpp b/modules/juce_browser_plugin/juce_browser_plugin.cpp
index 878c3e53ef..cf9461aa6a 100644
--- a/modules/juce_browser_plugin/juce_browser_plugin.cpp
+++ b/modules/juce_browser_plugin/juce_browser_plugin.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_BROWSER_PLUGIN_CLIENT_JUCEHEADER__) && ! defined (JUCE_AMALGAMATED_INCLUDE)
+#if defined (__JUCE_BROWSER_PLUGIN_CLIENT_JUCEHEADER__) && ! 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.cpp b/modules/juce_core/juce_core.cpp
index 8c091d960d..a57fdadf4f 100644
--- a/modules/juce_core/juce_core.cpp
+++ b/modules/juce_core/juce_core.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_CORE_JUCEHEADER__
+#if defined (__JUCE_CORE_JUCEHEADER__) && ! 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.cpp b/modules/juce_cryptography/juce_cryptography.cpp
index eaac9d6469..44654956cf 100644
--- a/modules/juce_cryptography/juce_cryptography.cpp
+++ b/modules/juce_cryptography/juce_cryptography.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_CRYPTOGRAPHY_JUCEHEADER__
+#if defined (__JUCE_CRYPTOGRAPHY_JUCEHEADER__) && ! 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.cpp b/modules/juce_data_structures/juce_data_structures.cpp
index c8b5189f21..f59335ee18 100644
--- a/modules/juce_data_structures/juce_data_structures.cpp
+++ b/modules/juce_data_structures/juce_data_structures.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_DATA_STRUCTURES_JUCEHEADER__
+#if defined (__JUCE_DATA_STRUCTURES_JUCEHEADER__) && ! 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.cpp b/modules/juce_events/juce_events.cpp
index abcb892e93..89645f267f 100644
--- a/modules/juce_events/juce_events.cpp
+++ b/modules/juce_events/juce_events.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_EVENTS_JUCEHEADER__) && ! defined (JUCE_AMALGAMATED_INCLUDE)
+#if defined (__JUCE_EVENTS_JUCEHEADER__) && ! 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.cpp b/modules/juce_graphics/juce_graphics.cpp
index c0c7c7ceab..e5d7646ce9 100644
--- a/modules/juce_graphics/juce_graphics.cpp
+++ b/modules/juce_graphics/juce_graphics.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_GRAPHICS_MODULE_JUCEHEADER__
+#if defined (__JUCE_GRAPHICS_MODULE_JUCEHEADER__) && ! 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.cpp b/modules/juce_opengl/juce_opengl.cpp
index ad1e04cac0..dc1f3d112e 100644
--- a/modules/juce_opengl/juce_opengl.cpp
+++ b/modules/juce_opengl/juce_opengl.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_OPENGL_JUCEHEADER__
+#if defined (__JUCE_OPENGL_JUCEHEADER__) && ! 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.cpp b/modules/juce_video/juce_video.cpp
index f0a5704143..1f05f38732 100644
--- a/modules/juce_video/juce_video.cpp
+++ b/modules/juce_video/juce_video.cpp
@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_VIDEO_JUCEHEADER__
+#if defined (__JUCE_VIDEO_JUCEHEADER__) && ! 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