diff --git a/modules/juce_audio_basics/juce_audio_basics.cpp b/modules/juce_audio_basics/juce_audio_basics.cpp
index 210cbfd0a9..06ed681d41 100644
--- a/modules/juce_audio_basics/juce_audio_basics.cpp
+++ b/modules/juce_audio_basics/juce_audio_basics.cpp
@@ -61,7 +61,6 @@
 namespace juce
 {
 
-// START_AUTOINCLUDE buffers/*.cpp, effects/*.cpp, midi/*.cpp, sources/*.cpp, synthesisers/*.cpp
 #include "buffers/juce_AudioDataConverters.cpp"
 #include "buffers/juce_AudioSampleBuffer.cpp"
 #include "buffers/juce_FloatVectorOperations.cpp"
@@ -80,6 +79,5 @@ namespace juce
 #include "sources/juce_ReverbAudioSource.cpp"
 #include "sources/juce_ToneGeneratorAudioSource.cpp"
 #include "synthesisers/juce_Synthesiser.cpp"
-// END_AUTOINCLUDE
 
 }
diff --git a/modules/juce_audio_devices/juce_audio_devices.cpp b/modules/juce_audio_devices/juce_audio_devices.cpp
index b0e65223bf..cd91ecf603 100644
--- a/modules/juce_audio_devices/juce_audio_devices.cpp
+++ b/modules/juce_audio_devices/juce_audio_devices.cpp
@@ -132,7 +132,6 @@
 namespace juce
 {
 
-// START_AUTOINCLUDE audio_io/*.cpp, midi_io/*.cpp, audio_cd/*.cpp, sources/*.cpp
 #include "audio_io/juce_AudioDeviceManager.cpp"
 #include "audio_io/juce_AudioIODevice.cpp"
 #include "audio_io/juce_AudioIODeviceType.cpp"
@@ -141,16 +140,7 @@ namespace juce
 #include "audio_cd/juce_AudioCDReader.cpp"
 #include "sources/juce_AudioSourcePlayer.cpp"
 #include "sources/juce_AudioTransportSource.cpp"
-// END_AUTOINCLUDE
-
-}
-
-//==============================================================================
-using namespace juce;
-
-namespace juce
-{
- #include "native/juce_MidiDataConcatenator.h"
+#include "native/juce_MidiDataConcatenator.h"
 
 //==============================================================================
 #if JUCE_MAC
diff --git a/modules/juce_audio_processors/juce_audio_processors.cpp b/modules/juce_audio_processors/juce_audio_processors.cpp
index 293c231fa4..955d770c3e 100644
--- a/modules/juce_audio_processors/juce_audio_processors.cpp
+++ b/modules/juce_audio_processors/juce_audio_processors.cpp
@@ -71,8 +71,6 @@ static inline bool arrayContainsPlugin (const OwnedArray<PluginDescription>& lis
     return false;
 }
 
-// START_AUTOINCLUDE format/*.cpp, processors/*.cpp, format_types/*.cpp,
-// format_types/*.mm, scanning/*.cpp
 #include "format/juce_AudioPluginFormat.cpp"
 #include "format/juce_AudioPluginFormatManager.cpp"
 #include "processors/juce_AudioProcessor.cpp"
@@ -86,6 +84,5 @@ static inline bool arrayContainsPlugin (const OwnedArray<PluginDescription>& lis
 #include "scanning/juce_KnownPluginList.cpp"
 #include "scanning/juce_PluginDirectoryScanner.cpp"
 #include "scanning/juce_PluginListComponent.cpp"
-// END_AUTOINCLUDE
 
 }
diff --git a/modules/juce_audio_utils/juce_audio_utils.cpp b/modules/juce_audio_utils/juce_audio_utils.cpp
index 71651f3d74..f63682bab2 100644
--- a/modules/juce_audio_utils/juce_audio_utils.cpp
+++ b/modules/juce_audio_utils/juce_audio_utils.cpp
@@ -41,12 +41,10 @@
 namespace juce
 {
 
-// START_AUTOINCLUDE gui/*.cpp, players/*.cpp
 #include "gui/juce_AudioDeviceSelectorComponent.cpp"
 #include "gui/juce_AudioThumbnail.cpp"
 #include "gui/juce_AudioThumbnailCache.cpp"
 #include "gui/juce_MidiKeyboardComponent.cpp"
 #include "players/juce_AudioProcessorPlayer.cpp"
-// END_AUTOINCLUDE
 
 }
diff --git a/modules/juce_cryptography/juce_cryptography.cpp b/modules/juce_cryptography/juce_cryptography.cpp
index 2fb6d18d23..63e37a8cea 100644
--- a/modules/juce_cryptography/juce_cryptography.cpp
+++ b/modules/juce_cryptography/juce_cryptography.cpp
@@ -40,12 +40,10 @@
 namespace juce
 {
 
-// START_AUTOINCLUDE encryption/*.cpp, hashing/*.cpp
 #include "encryption/juce_BlowFish.cpp"
 #include "encryption/juce_Primes.cpp"
 #include "encryption/juce_RSAKey.cpp"
 #include "hashing/juce_MD5.cpp"
 #include "hashing/juce_SHA256.cpp"
-// END_AUTOINCLUDE
 
 }
diff --git a/modules/juce_data_structures/juce_data_structures.cpp b/modules/juce_data_structures/juce_data_structures.cpp
index 0ead404125..fd1d12aaca 100644
--- a/modules/juce_data_structures/juce_data_structures.cpp
+++ b/modules/juce_data_structures/juce_data_structures.cpp
@@ -40,12 +40,10 @@
 namespace juce
 {
 
-// START_AUTOINCLUDE values/*.cpp, undomanager/*.cpp, app_properties/*.cpp
 #include "values/juce_Value.cpp"
 #include "values/juce_ValueTree.cpp"
 #include "undomanager/juce_UndoManager.cpp"
 #include "app_properties/juce_ApplicationProperties.cpp"
 #include "app_properties/juce_PropertiesFile.cpp"
-// END_AUTOINCLUDE
 
 }
diff --git a/modules/juce_events/juce_events.cpp b/modules/juce_events/juce_events.cpp
index f70983499c..aa11627a53 100644
--- a/modules/juce_events/juce_events.cpp
+++ b/modules/juce_events/juce_events.cpp
@@ -62,8 +62,6 @@
 namespace juce
 {
 
-// START_AUTOINCLUDE messages/*.cpp, broadcasters/*.cpp,
-// timers/*.cpp, interprocess/*.cpp
 #include "messages/juce_ApplicationBase.cpp"
 #include "messages/juce_DeletedAtShutdown.cpp"
 #include "messages/juce_MessageListener.cpp"
@@ -75,7 +73,6 @@ namespace juce
 #include "timers/juce_Timer.cpp"
 #include "interprocess/juce_InterprocessConnection.cpp"
 #include "interprocess/juce_InterprocessConnectionServer.cpp"
-// END_AUTOINCLUDE
 
 //==============================================================================
 #if JUCE_MAC
diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp
index e8388a8c21..f35a5e8b7e 100644
--- a/modules/juce_gui_basics/juce_gui_basics.cpp
+++ b/modules/juce_gui_basics/juce_gui_basics.cpp
@@ -132,13 +132,9 @@
 //==============================================================================
 namespace juce
 {
-    extern bool juce_areThereAnyAlwaysOnTopWindows();
 
+extern bool juce_areThereAnyAlwaysOnTopWindows();
 
-// START_AUTOINCLUDE components/*.cpp, mouse/*.cpp, keyboard/*.cpp, buttons/*.cpp,
-// drawables/*.cpp, filebrowser/*.cpp, layout/*.cpp, lookandfeel/*.cpp,
-// menus/*.cpp, positioning/*.cpp, properties/*.cpp, widgets/*.cpp,
-// windows/*.cpp, commands/*.cpp, application/*.cpp, misc/*.cpp
 #include "components/juce_Component.cpp"
 #include "components/juce_ComponentListener.cpp"
 #include "components/juce_Desktop.cpp"
@@ -248,15 +244,7 @@ namespace juce
 #include "application/juce_Application.cpp"
 #include "misc/juce_BubbleComponent.cpp"
 #include "misc/juce_DropShadower.cpp"
-// END_AUTOINCLUDE
 
-}
-
-using namespace juce;
-
-//==============================================================================
-namespace juce
-{
 #if JUCE_IOS || JUCE_WINDOWS
  #include "native/juce_MultiTouchMapper.h"
 #endif