diff --git a/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h b/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h
index 6c19d275cf..29708ad9bd 100644
--- a/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h
+++ b/modules/juce_data_structures/app_properties/juce_ApplicationProperties.h
@@ -25,7 +25,6 @@
 #ifndef JUCE_APPLICATIONPROPERTIES_H_INCLUDED
 #define JUCE_APPLICATIONPROPERTIES_H_INCLUDED
 
-#include "juce_PropertiesFile.h"
 
 //==============================================================================
 /**
diff --git a/modules/juce_data_structures/juce_data_structures.h b/modules/juce_data_structures/juce_data_structures.h
index 130d775e4c..629b88ddf6 100644
--- a/modules/juce_data_structures/juce_data_structures.h
+++ b/modules/juce_data_structures/juce_data_structures.h
@@ -31,14 +31,12 @@
 namespace juce
 {
 
-// START_AUTOINCLUDE values, undomanager, app_properties
-#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 "values/juce_Value.h"
+#include "values/juce_ValueTree.h"
 #include "app_properties/juce_PropertiesFile.h"
-// END_AUTOINCLUDE
+#include "app_properties/juce_ApplicationProperties.h"
 
 }
 
diff --git a/modules/juce_data_structures/undomanager/juce_UndoManager.h b/modules/juce_data_structures/undomanager/juce_UndoManager.h
index 1ae85a7942..6948263ef3 100644
--- a/modules/juce_data_structures/undomanager/juce_UndoManager.h
+++ b/modules/juce_data_structures/undomanager/juce_UndoManager.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_UNDOMANAGER_H_INCLUDED
 #define JUCE_UNDOMANAGER_H_INCLUDED
 
-#include "juce_UndoableAction.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_data_structures/values/juce_ValueTree.h b/modules/juce_data_structures/values/juce_ValueTree.h
index 262d02f853..a87815b5ac 100644
--- a/modules/juce_data_structures/values/juce_ValueTree.h
+++ b/modules/juce_data_structures/values/juce_ValueTree.h
@@ -25,9 +25,6 @@
 #ifndef JUCE_VALUETREE_H_INCLUDED
 #define JUCE_VALUETREE_H_INCLUDED
 
-#include "juce_Value.h"
-#include "../undomanager/juce_UndoManager.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_events/broadcasters/juce_ActionBroadcaster.h b/modules/juce_events/broadcasters/juce_ActionBroadcaster.h
index 18ed717204..ec727337d1 100644
--- a/modules/juce_events/broadcasters/juce_ActionBroadcaster.h
+++ b/modules/juce_events/broadcasters/juce_ActionBroadcaster.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_ACTIONBROADCASTER_H_INCLUDED
 #define JUCE_ACTIONBROADCASTER_H_INCLUDED
 
-#include "juce_ActionListener.h"
-
 
 //==============================================================================
 /** Manages a list of ActionListeners, and can send them messages.
diff --git a/modules/juce_events/broadcasters/juce_ChangeBroadcaster.h b/modules/juce_events/broadcasters/juce_ChangeBroadcaster.h
index cccab253f4..8d9aca9d05 100644
--- a/modules/juce_events/broadcasters/juce_ChangeBroadcaster.h
+++ b/modules/juce_events/broadcasters/juce_ChangeBroadcaster.h
@@ -25,10 +25,6 @@
 #ifndef JUCE_CHANGEBROADCASTER_H_INCLUDED
 #define JUCE_CHANGEBROADCASTER_H_INCLUDED
 
-#include "juce_ChangeListener.h"
-#include "juce_ListenerList.h"
-#include "juce_AsyncUpdater.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h b/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h
index 57257d3758..8de7b8f288 100644
--- a/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h
+++ b/modules/juce_events/interprocess/juce_InterprocessConnectionServer.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_INTERPROCESSCONNECTIONSERVER_H_INCLUDED
 #define JUCE_INTERPROCESSCONNECTIONSERVER_H_INCLUDED
 
-#include "juce_InterprocessConnection.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_events/juce_events.h b/modules/juce_events/juce_events.h
index 0d66317822..d58d8a280a 100644
--- a/modules/juce_events/juce_events.h
+++ b/modules/juce_events/juce_events.h
@@ -31,27 +31,24 @@
 namespace juce
 {
 
-// START_AUTOINCLUDE messages, broadcasters, timers,
-// interprocess, native/juce_ScopedXLock*
-#include "messages/juce_ApplicationBase.h"
-#include "messages/juce_CallbackMessage.h"
-#include "messages/juce_DeletedAtShutdown.h"
+#include "messages/juce_MessageManager.h"
 #include "messages/juce_Message.h"
 #include "messages/juce_MessageListener.h"
-#include "messages/juce_MessageManager.h"
+#include "messages/juce_CallbackMessage.h"
+#include "messages/juce_DeletedAtShutdown.h"
 #include "messages/juce_NotificationType.h"
+#include "messages/juce_ApplicationBase.h"
+#include "broadcasters/juce_ListenerList.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 "broadcasters/juce_ChangeBroadcaster.h"
 #include "timers/juce_Timer.h"
+#include "timers/juce_MultiTimer.h"
 #include "interprocess/juce_InterprocessConnection.h"
 #include "interprocess/juce_InterprocessConnectionServer.h"
 #include "native/juce_ScopedXLock.h"
-// END_AUTOINCLUDE
 
 }
 
diff --git a/modules/juce_events/messages/juce_CallbackMessage.h b/modules/juce_events/messages/juce_CallbackMessage.h
index 8f7e5bb5a0..799defdfec 100644
--- a/modules/juce_events/messages/juce_CallbackMessage.h
+++ b/modules/juce_events/messages/juce_CallbackMessage.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_CALLBACKMESSAGE_H_INCLUDED
 #define JUCE_CALLBACKMESSAGE_H_INCLUDED
 
-#include "juce_MessageManager.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_events/messages/juce_MessageListener.h b/modules/juce_events/messages/juce_MessageListener.h
index 541c03fefb..ddd51e23b5 100644
--- a/modules/juce_events/messages/juce_MessageListener.h
+++ b/modules/juce_events/messages/juce_MessageListener.h
@@ -25,8 +25,6 @@
 #ifndef JUCE_MESSAGELISTENER_H_INCLUDED
 #define JUCE_MESSAGELISTENER_H_INCLUDED
 
-#include "juce_MessageManager.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_events/timers/juce_MultiTimer.h b/modules/juce_events/timers/juce_MultiTimer.h
index 59cd24dee2..7c8a6e923d 100644
--- a/modules/juce_events/timers/juce_MultiTimer.h
+++ b/modules/juce_events/timers/juce_MultiTimer.h
@@ -25,7 +25,6 @@
 #ifndef JUCE_MULTITIMER_H_INCLUDED
 #define JUCE_MULTITIMER_H_INCLUDED
 
-#include "juce_Timer.h"
 
 //==============================================================================
 /**