From 65c155e37287fc18ea09b8d60920db3af605202f Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Fri, 23 Aug 2013 12:08:31 +0100
Subject: [PATCH] Added a class ContainerDeletePolicy, to allow custom delete
 operations on objects held by ScopedPointers or OwnedArrays. Also cleaned
 away a lot of superfluous includes in juce_core files.

---
 .../Builds/CodeBlocks/The Introjucer.cbp      |   8 +-
 .../The Introjucer.xcodeproj/project.pbxproj  |   4 +-
 .../VisualStudio2005/The Introjucer.vcproj    |  11 +-
 .../VisualStudio2008/The Introjucer.vcproj    |  11 +-
 .../VisualStudio2010/The Introjucer.vcxproj   |   4 +-
 .../The Introjucer.vcxproj.filters            |   6 +-
 .../VisualStudio2012/The Introjucer.vcxproj   |   4 +-
 .../The Introjucer.vcxproj.filters            |   6 +-
 .../JuceDemo/Builds/CodeBlocks/Juce Demo.cbp  |   8 +-
 .../Juce Demo.xcodeproj/project.pbxproj       |  16 +-
 .../Builds/VisualStudio2005/Juce Demo.vcproj  |  11 +-
 .../Builds/VisualStudio2008/Juce Demo.vcproj  |  11 +-
 .../Builds/VisualStudio2010/Juce Demo.vcxproj |   4 +-
 .../Juce Demo.vcxproj.filters                 |   6 +-
 .../Builds/VisualStudio2012/Juce Demo.vcxproj |   4 +-
 .../Juce Demo.vcxproj.filters                 |   6 +-
 .../iOS/Juce Demo.xcodeproj/project.pbxproj   |   8 +-
 .../JuceDemoPlugin.xcodeproj/project.pbxproj  |  54 +++----
 .../VisualStudio2005/JuceDemoPlugin.vcproj    |  11 +-
 .../VisualStudio2008/JuceDemoPlugin.vcproj    |  11 +-
 .../Plugin Host.xcodeproj/project.pbxproj     |  10 +-
 .../VisualStudio2005/Plugin Host.vcproj       |  11 +-
 .../VisualStudio2008/Plugin Host.vcproj       |  11 +-
 .../BinaryBuilder.xcodeproj/project.pbxproj   |   8 +-
 .../VisualStudio2008/BinaryBuilder.vcproj     |   1 +
 .../HelloWorld.xcodeproj/project.pbxproj      |   4 +-
 .../Builds/VisualStudio2005/HelloWorld.vcproj |  11 +-
 .../Builds/VisualStudio2008/HelloWorld.vcproj |  11 +-
 .../iOS/HelloWorld.xcodeproj/project.pbxproj  |   4 +-
 .../audio_cd/juce_AudioCDBurner.h             |   2 +-
 .../audio_io/juce_AudioDeviceManager.h        |   2 +-
 .../format/juce_AudioFormatWriter.h           |   2 +-
 .../scanning/juce_PluginListComponent.cpp     |   4 +-
 .../scanning/juce_PluginListComponent.h       |   2 +-
 .../gui/juce_AudioDeviceSelectorComponent.h   |   2 +-
 .../gui/juce_AudioThumbnail.h                 |   6 +-
 .../gui/juce_AudioThumbnailCache.h            |   2 +-
 modules/juce_core/containers/juce_Array.h     |   4 -
 .../containers/juce_ArrayAllocationBase.h     |   2 -
 .../juce_core/containers/juce_DynamicObject.h |   3 -
 modules/juce_core/containers/juce_HashMap.h   |   4 -
 .../juce_core/containers/juce_NamedValueSet.h |   7 -
 .../juce_core/containers/juce_OwnedArray.h    |  22 +--
 .../juce_core/containers/juce_PropertySet.h   |   4 -
 .../containers/juce_ReferenceCountedArray.h   |   5 -
 modules/juce_core/containers/juce_SortedSet.h |  10 +-
 modules/juce_core/containers/juce_Variant.h   |   9 --
 .../juce_core/files/juce_DirectoryIterator.h  |   9 +-
 modules/juce_core/files/juce_File.h           |   9 --
 .../juce_core/files/juce_FileInputStream.h    |   3 -
 .../juce_core/files/juce_FileOutputStream.h   |   3 -
 .../juce_core/files/juce_FileSearchPath.cpp   |  11 +-
 modules/juce_core/files/juce_FileSearchPath.h |  16 +-
 .../juce_core/files/juce_MemoryMappedFile.h   |   1 -
 modules/juce_core/files/juce_TemporaryFile.h  |   2 -
 modules/juce_core/json/juce_JSON.h            |   6 -
 modules/juce_core/juce_core.h                 | 137 +++++++++---------
 modules/juce_core/logging/juce_FileLogger.h   |   4 -
 modules/juce_core/logging/juce_Logger.h       |   2 -
 modules/juce_core/maths/juce_BigInteger.h     |   4 -
 modules/juce_core/maths/juce_Expression.h     |   6 +-
 modules/juce_core/maths/juce_Random.h         |   2 -
 .../memory/juce_ContainerDeletePolicy.h       |  53 +++++++
 .../memory/juce_LeakedObjectDetector.h        |   3 -
 modules/juce_core/memory/juce_MemoryBlock.h   |   3 -
 .../memory/juce_OptionalScopedPointer.h       |   2 -
 modules/juce_core/memory/juce_ScopedPointer.h |   6 +-
 modules/juce_core/memory/juce_WeakReference.h |   2 -
 modules/juce_core/misc/juce_Result.h          |   2 -
 modules/juce_core/misc/juce_Uuid.h            |   2 -
 modules/juce_core/network/juce_MACAddress.h   |   2 -
 modules/juce_core/network/juce_NamedPipe.h    |   1 -
 modules/juce_core/network/juce_Socket.h       |   2 -
 modules/juce_core/network/juce_URL.h          |   5 -
 .../streams/juce_BufferedInputStream.h        |   4 -
 .../juce_core/streams/juce_FileInputSource.h  |   3 -
 modules/juce_core/streams/juce_InputSource.h  |   1 -
 modules/juce_core/streams/juce_InputStream.h  |   3 -
 .../streams/juce_MemoryInputStream.h          |   3 -
 .../streams/juce_MemoryOutputStream.h         |   4 -
 modules/juce_core/streams/juce_OutputStream.h |   6 -
 .../juce_core/streams/juce_SubregionStream.h  |   3 -
 .../juce_core/system/juce_StandardHeader.h    |   1 +
 modules/juce_core/system/juce_SystemStats.h   |   2 -
 modules/juce_core/text/juce_Identifier.h      |   2 -
 .../juce_core/text/juce_LocalisedStrings.h    |   2 -
 modules/juce_core/text/juce_String.cpp        |  62 ++++----
 modules/juce_core/text/juce_StringArray.h     |   3 -
 modules/juce_core/text/juce_StringPairArray.h |   2 -
 modules/juce_core/text/juce_StringPool.h      |   3 -
 modules/juce_core/threads/juce_ChildProcess.h |   2 +-
 .../threads/juce_HighResolutionTimer.h        |   2 +-
 .../juce_core/threads/juce_InterProcessLock.h |   7 +-
 modules/juce_core/threads/juce_Process.h      |   2 -
 .../juce_core/threads/juce_ReadWriteLock.h    |   6 -
 .../juce_core/threads/juce_ScopedReadLock.h   |   2 -
 .../juce_core/threads/juce_ScopedWriteLock.h  |   2 -
 modules/juce_core/threads/juce_SpinLock.h     |   2 -
 modules/juce_core/threads/juce_Thread.h       |   3 -
 modules/juce_core/threads/juce_ThreadPool.h   |   8 +-
 .../juce_core/threads/juce_TimeSliceThread.h  |   3 -
 .../juce_core/threads/juce_WaitableEvent.h    |   2 -
 .../juce_core/time/juce_PerformanceCounter.h  |   2 -
 modules/juce_core/time/juce_RelativeTime.h    |   2 -
 modules/juce_core/time/juce_Time.h            |   2 -
 modules/juce_core/unit_tests/juce_UnitTest.h  |   2 -
 modules/juce_core/xml/juce_XmlDocument.h      |   6 -
 modules/juce_core/xml/juce_XmlElement.h       |   5 -
 .../zip/juce_GZIPCompressorOutputStream.h     |   8 +-
 .../zip/juce_GZIPDecompressorInputStream.h    |   8 +-
 modules/juce_core/zip/juce_ZipFile.h          |   7 +-
 .../undomanager/juce_UndoManager.h            |   2 +-
 .../juce_graphics/fonts/juce_CustomTypeface.h |   8 +-
 modules/juce_graphics/geometry/juce_Path.h    |   2 -
 .../native/juce_RenderingHelpers.h            |   4 +-
 .../application/juce_Application.h            |   2 +-
 modules/juce_gui_basics/buttons/juce_Button.h |   4 +-
 .../components/juce_Component.h               |   2 +-
 .../juce_gui_basics/components/juce_Desktop.h |   2 +-
 .../components/juce_ModalComponentManager.h   |   4 +-
 .../layout/juce_ConcertinaPanel.h             |   4 +-
 .../layout/juce_MultiDocumentPanel.cpp        |   5 +-
 .../juce_gui_basics/layout/juce_ScrollBar.h   |   4 +-
 .../layout/juce_TabbedButtonBar.h             |   2 +-
 .../juce_gui_basics/menus/juce_PopupMenu.h    |   8 +-
 modules/juce_gui_basics/widgets/juce_Slider.h |   2 +-
 .../juce_gui_basics/widgets/juce_TreeView.h   |   6 +-
 .../windows/juce_DocumentWindow.h             |   4 +-
 .../code_editor/juce_CodeEditorComponent.h    |   4 +-
 .../embedding/juce_ActiveXControlComponent.h  |   4 +-
 .../juce_gui_extra/misc/juce_ColourSelector.h |   4 +-
 .../misc/juce_KeyMappingEditorComponent.h     |   4 +-
 .../opengl/juce_OpenGLFrameBuffer.h           |   4 +-
 .../playback/juce_DirectShowComponent.h       |   8 +-
 .../playback/juce_QuickTimeMovieComponent.h   |   4 +-
 135 files changed, 333 insertions(+), 616 deletions(-)
 create mode 100644 modules/juce_core/memory/juce_ContainerDeletePolicy.h

diff --git a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp
index 4a05407d9a..956ebc11ef 100644
--- a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp	
+++ b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp	
@@ -776,6 +776,10 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
+    <Unit filename="../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
     <Unit filename="../../../../modules/juce_core/memory/juce_HeapBlock.h">
       <Option compile="0"/>
       <Option link="0"/>
@@ -1800,10 +1804,6 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
-    <Unit filename="../../../../modules/juce_graphics/placement/juce_Justification.cpp">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
     <Unit filename="../../../../modules/juce_graphics/placement/juce_Justification.h">
       <Option compile="0"/>
       <Option link="0"/>
diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
index 7e30823d06..439413c14d 100644
--- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
+++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
@@ -280,7 +280,6 @@
 		422524EBD7DA6530970A7872 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DropShadower.h"; path = "../../../../modules/juce_gui_basics/misc/juce_DropShadower.h"; sourceTree = "SOURCE_ROOT"; };
 		42B5C970B8DCD08A864F2208 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_StretchableObjectResizer.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_StretchableObjectResizer.cpp"; sourceTree = "SOURCE_ROOT"; };
 		430239E0574C157689D83206 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CodeDocument.h"; path = "../../../../modules/juce_gui_extra/code_editor/juce_CodeDocument.h"; sourceTree = "SOURCE_ROOT"; };
-		43B98AB307841FAAB076B882 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Justification.cpp"; path = "../../../../modules/juce_graphics/placement/juce_Justification.cpp"; sourceTree = "SOURCE_ROOT"; };
 		441A0EA83E44264CB977F21B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_mac_CarbonViewWrapperComponent.h"; path = "../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		441CFEA771BAA50E187342E9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_AppearanceSettings.cpp"; path = "../../Source/Application/jucer_AppearanceSettings.cpp"; sourceTree = "SOURCE_ROOT"; };
 		442031AD0C8A280B68CE9EF0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ResizableCornerComponent.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_ResizableCornerComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -296,6 +295,7 @@
 		472F9A90F685220D730EBF6C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = BinaryData.cpp; path = ../../JuceLibraryCode/BinaryData.cpp; sourceTree = "SOURCE_ROOT"; };
 		47DD50A5A9091F9900E0EAD9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_JucerTreeViewBase.cpp"; path = "../../Source/Utility/jucer_JucerTreeViewBase.cpp"; sourceTree = "SOURCE_ROOT"; };
 		47F4C6341177140302CE802A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DragAndDropTarget.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_DragAndDropTarget.h"; sourceTree = "SOURCE_ROOT"; };
+		48A2FBB4CB48AC4FCA796F2F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ContainerDeletePolicy.h"; path = "../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h"; sourceTree = "SOURCE_ROOT"; };
 		4904357A3FFA61972A9E9D6F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PerformanceCounter.h"; path = "../../../../modules/juce_core/time/juce_PerformanceCounter.h"; sourceTree = "SOURCE_ROOT"; };
 		490FEE91E483534632094C67 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentAnimator.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentAnimator.h"; sourceTree = "SOURCE_ROOT"; };
 		4924392751ACE0C9F2076599 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentAnimator.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentAnimator.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1117,6 +1117,7 @@
 		01C121A5814A16A7CB907FB9 = { isa = PBXGroup; children = (
 				168F5F32F673036DDAEF1D8D,
 				1B1A4A48AF3898485E7B1618,
+				48A2FBB4CB48AC4FCA796F2F,
 				53CC682B805DD49B6E434A95,
 				A8F9DE55079FC7F6440CF678,
 				2BC28F37C470E4770E479BCD,
@@ -1434,7 +1435,6 @@
 				E27F0860F27023BAA9798B46,
 				F08EB921DB62255A4B6DE85A ); name = geometry; sourceTree = "<group>"; };
 		14995D34FE0826A52FA5262D = { isa = PBXGroup; children = (
-				43B98AB307841FAAB076B882,
 				1F7F2864FE54D79A0C42BE93,
 				DB20268A566DABEAE3F2CBEE,
 				93D165846B65A638F1C25C4C ); name = placement; sourceTree = "<group>"; };
diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
index 01a9296d5d..b2ec08fb5d 100644
--- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
@@ -662,6 +662,7 @@
         <Filter Name="memory">
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
@@ -1949,16 +1950,6 @@
           <File RelativePath="..\..\..\..\modules\juce_graphics\geometry\juce_RectangleList.h"/>
         </Filter>
         <Filter Name="placement">
-          <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.h"/>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
             <FileConfiguration Name="Debug|Win32"
diff --git a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
index 7af1eb0260..cf0da3f78b 100644
--- a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
@@ -662,6 +662,7 @@
         <Filter Name="memory">
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
@@ -1949,16 +1950,6 @@
           <File RelativePath="..\..\..\..\modules\juce_graphics\geometry\juce_RectangleList.h"/>
         </Filter>
         <Filter Name="placement">
-          <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.h"/>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
             <FileConfiguration Name="Debug|Win32"
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
index b170c899c5..c17580b7a1 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
@@ -541,9 +541,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_PathStrokeType.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1148,6 +1145,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\maths\juce_Range.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters
index 9d133f2fd3..9e4cc1e394 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
@@ -772,9 +772,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_PathStrokeType.cpp">
       <Filter>Juce Modules\juce_graphics\geometry</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-      <Filter>Juce Modules\juce_graphics\placement</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
       <Filter>Juce Modules\juce_graphics\placement</Filter>
     </ClCompile>
@@ -1704,6 +1701,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h">
       <Filter>Juce Modules\juce_core\memory</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h">
+      <Filter>Juce Modules\juce_core\memory</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h">
       <Filter>Juce Modules\juce_core\memory</Filter>
     </ClInclude>
diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj
index d49652f12f..3fe5c8f867 100644
--- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj	
@@ -547,9 +547,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_PathStrokeType.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1154,6 +1151,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\maths\juce_Range.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters
index 9d133f2fd3..9e4cc1e394 100644
--- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters	
@@ -772,9 +772,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_PathStrokeType.cpp">
       <Filter>Juce Modules\juce_graphics\geometry</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-      <Filter>Juce Modules\juce_graphics\placement</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
       <Filter>Juce Modules\juce_graphics\placement</Filter>
     </ClCompile>
@@ -1704,6 +1701,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h">
       <Filter>Juce Modules\juce_core\memory</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h">
+      <Filter>Juce Modules\juce_core\memory</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h">
       <Filter>Juce Modules\juce_core\memory</Filter>
     </ClInclude>
diff --git a/extras/JuceDemo/Builds/CodeBlocks/Juce Demo.cbp b/extras/JuceDemo/Builds/CodeBlocks/Juce Demo.cbp
index 89374069e5..3180f16785 100644
--- a/extras/JuceDemo/Builds/CodeBlocks/Juce Demo.cbp	
+++ b/extras/JuceDemo/Builds/CodeBlocks/Juce Demo.cbp	
@@ -953,6 +953,10 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
+    <Unit filename="../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
     <Unit filename="../../../../modules/juce_core/memory/juce_HeapBlock.h">
       <Option compile="0"/>
       <Option link="0"/>
@@ -1977,10 +1981,6 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
-    <Unit filename="../../../../modules/juce_graphics/placement/juce_Justification.cpp">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
     <Unit filename="../../../../modules/juce_graphics/placement/juce_Justification.h">
       <Option compile="0"/>
       <Option link="0"/>
diff --git a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj
index 42b1b4bf91..bdf589ac4d 100644
--- a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj	
+++ b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj	
@@ -841,6 +841,7 @@
 		D8081154AA3072D2F2C4B625 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_posix_SharedCode.h"; path = "../../../../modules/juce_core/native/juce_posix_SharedCode.h"; sourceTree = "SOURCE_ROOT"; };
 		D866C4735BF1EF0CA24FC1FB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Draggable3DOrientation.h"; path = "../../../../modules/juce_opengl/opengl/juce_Draggable3DOrientation.h"; sourceTree = "SOURCE_ROOT"; };
 		D8AFC87A918360FFC9D96BE5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Atomic.h"; path = "../../../../modules/juce_core/memory/juce_Atomic.h"; sourceTree = "SOURCE_ROOT"; };
+		D9282DF6556197822D2BD5D4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PropertySet.cpp"; path = "../../../../modules/juce_core/containers/juce_PropertySet.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DA0D464BE6E90C3668AD7C73 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_FileChooser.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_FileChooser.mm"; sourceTree = "SOURCE_ROOT"; };
 		DA2FCB30EE2A41085FF93B9B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Files.cpp"; path = "../../../../modules/juce_core/native/juce_win32_Files.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DD40A3E06CA320D95F3924BA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_StretchableLayoutResizerBar.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -848,29 +849,27 @@
 		DEA38275A65473112CD34252 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TreeView.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_TreeView.h"; sourceTree = "SOURCE_ROOT"; };
 		DEB23C98FEC261260F63B6A4 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		DED6D04CFED991C5924B78F0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MD5.h"; path = "../../../../modules/juce_cryptography/hashing/juce_MD5.h"; sourceTree = "SOURCE_ROOT"; };
+		DEE1FC30E2FBB97921616CA9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Font.cpp"; path = "../../../../modules/juce_graphics/fonts/juce_Font.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DF2D86EEA8031481C1FD08B2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileTreeComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
+		DF3B7E1BC0AF0C826C47745B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ResizableWindow.h"; path = "../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h"; sourceTree = "SOURCE_ROOT"; };
+		DF590CD70352A30FA3BD9835 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_SystemTrayIcon.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_SystemTrayIcon.cpp"; sourceTree = "SOURCE_ROOT"; };
+		DFEAB699C98B89FF0B85F557 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectWriteTypeLayout.cpp"; path = "../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DFF6BF0BB64714A494A25E93 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RSAKey.h"; path = "../../../../modules/juce_cryptography/encryption/juce_RSAKey.h"; sourceTree = "SOURCE_ROOT"; };
 		E0AE248F52C70AA1DEA1A5A1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiOutput.h"; path = "../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.h"; sourceTree = "SOURCE_ROOT"; };
 		E10CA355E85B468045CDCAC7 = { isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = RecentFilesMenuTemplate.nib; sourceTree = "SOURCE_ROOT"; };
 		E249D6583995E0E6D0B3EADF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioSourcePlayer.h"; path = "../../../../modules/juce_audio_devices/sources/juce_AudioSourcePlayer.h"; sourceTree = "SOURCE_ROOT"; };
+		E2732267CD7C0C3BDB17456A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BooleanPropertyComponent.h"; path = "../../../../modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		E34B2BCD14634ED3BC9F5431 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioProcessorGraph.h"; path = "../../../../modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h"; sourceTree = "SOURCE_ROOT"; };
 		E48615F1F7D8213F6DC24FC9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ThreadPool.h"; path = "../../../../modules/juce_core/threads/juce_ThreadPool.h"; sourceTree = "SOURCE_ROOT"; };
 		E6448B3F03DD2B41519DF93D = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; };
 		D119A3871626EC2B8EFCB0D4 = { isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JuceDemo.app; sourceTree = "BUILT_PRODUCTS_DIR"; };
-		D9282DF6556197822D2BD5D4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PropertySet.cpp"; path = "../../../../modules/juce_core/containers/juce_PropertySet.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D9AB5165697DB60BA305F414 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_OpenSL.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_android_OpenSL.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DB507A1F7BB7489344FF90A9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Range.h"; path = "../../../../modules/juce_core/maths/juce_Range.h"; sourceTree = "SOURCE_ROOT"; };
 		DCBC77E022F3282E7DC97642 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HighResolutionTimer.h"; path = "../../../../modules/juce_core/threads/juce_HighResolutionTimer.h"; sourceTree = "SOURCE_ROOT"; };
 		DDEC339D244553357E234C92 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectSound.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_win32_DirectSound.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DE80C724F35B1464853FDE9E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SubregionStream.h"; path = "../../../../modules/juce_core/streams/juce_SubregionStream.h"; sourceTree = "SOURCE_ROOT"; };
-		DEE1FC30E2FBB97921616CA9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Font.cpp"; path = "../../../../modules/juce_graphics/fonts/juce_Font.cpp"; sourceTree = "SOURCE_ROOT"; };
-		DF3B7E1BC0AF0C826C47745B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ResizableWindow.h"; path = "../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h"; sourceTree = "SOURCE_ROOT"; };
-		DF47E8197FF5A9309C062C61 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Justification.cpp"; path = "../../../../modules/juce_graphics/placement/juce_Justification.cpp"; sourceTree = "SOURCE_ROOT"; };
-		DF590CD70352A30FA3BD9835 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_SystemTrayIcon.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_SystemTrayIcon.cpp"; sourceTree = "SOURCE_ROOT"; };
-		DFEAB699C98B89FF0B85F557 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectWriteTypeLayout.cpp"; path = "../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E15F577E82B2E12597447472 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationBase.h"; path = "../../../../modules/juce_events/messages/juce_ApplicationBase.h"; sourceTree = "SOURCE_ROOT"; };
 		E26E3AC933F70B56B7B83EFA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MACAddress.cpp"; path = "../../../../modules/juce_core/network/juce_MACAddress.cpp"; sourceTree = "SOURCE_ROOT"; };
-		E2732267CD7C0C3BDB17456A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BooleanPropertyComponent.h"; path = "../../../../modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		E274BFB25D87D93EDBC23114 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OggVorbisAudioFormat.h"; path = "../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h"; sourceTree = "SOURCE_ROOT"; };
 		E38DE271B32DCC95E52C72DA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawableButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_DrawableButton.h"; sourceTree = "SOURCE_ROOT"; };
 		E3D24CD61D75922457DB9642 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Midi.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_win32_Midi.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -893,6 +892,7 @@
 		EACB4129861122ABC1A2BB37 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OutputStream.cpp"; path = "../../../../modules/juce_core/streams/juce_OutputStream.cpp"; sourceTree = "SOURCE_ROOT"; };
 		EADE149294A3A3509EC61E6B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_audio_formats.mm"; path = "../../../../modules/juce_audio_formats/juce_audio_formats.mm"; sourceTree = "SOURCE_ROOT"; };
 		EAE786E1125C492A7A8B1594 = { isa = PBXFileReference; lastKnownFileType = file.zip; name = icons.zip; path = "../../Binary Data/icons.zip"; sourceTree = "SOURCE_ROOT"; };
+		EB1E23E2BC3088FC5D32A7C5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ContainerDeletePolicy.h"; path = "../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h"; sourceTree = "SOURCE_ROOT"; };
 		EB902A37F3AA5BC62D523F5B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationCommandTarget.h"; path = "../../../../modules/juce_gui_basics/commands/juce_ApplicationCommandTarget.h"; sourceTree = "SOURCE_ROOT"; };
 		EB9E8921A8D36EDD7FF3245B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileFilter.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileFilter.h"; sourceTree = "SOURCE_ROOT"; };
 		EC180AD91D1B068D7A8F33BB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectoryContentsDisplayComponent.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1240,6 +1240,7 @@
 		8FF03782352807A3E6E6F611 = { isa = PBXGroup; children = (
 				D8AFC87A918360FFC9D96BE5,
 				16A6895439607DD8E651BA87,
+				EB1E23E2BC3088FC5D32A7C5,
 				C1A15473893B354642F7531A,
 				D57651845D6D9438DEA62F98,
 				737F8D074841EE88B24DC761,
@@ -1557,7 +1558,6 @@
 				1089C7A1FF43033FDA63F711,
 				38E0255E6BB9600DEECD39F8 ); name = geometry; sourceTree = "<group>"; };
 		BB4F117CD3A2EA9CE8390AD0 = { isa = PBXGroup; children = (
-				DF47E8197FF5A9309C062C61,
 				1375CAA34ECE0B3B292EEF0E,
 				C30EE4EFDB359E2A9D58F677,
 				989587AD131FF27180BEB3D1 ); name = placement; sourceTree = "<group>"; };
diff --git a/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj b/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj
index 928df05ac1..6bc6ff7f31 100644
--- a/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj	
+++ b/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj	
@@ -1292,6 +1292,7 @@
         <Filter Name="memory">
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
@@ -2579,16 +2580,6 @@
           <File RelativePath="..\..\..\..\modules\juce_graphics\geometry\juce_RectangleList.h"/>
         </Filter>
         <Filter Name="placement">
-          <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.h"/>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
             <FileConfiguration Name="Debug|Win32"
diff --git a/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj b/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj
index b4bab6709d..f432b9732d 100644
--- a/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj	
+++ b/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj	
@@ -1292,6 +1292,7 @@
         <Filter Name="memory">
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
@@ -2579,16 +2580,6 @@
           <File RelativePath="..\..\..\..\modules\juce_graphics\geometry\juce_RectangleList.h"/>
         </Filter>
         <Filter Name="placement">
-          <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.h"/>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
             <FileConfiguration Name="Debug|Win32"
diff --git a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj
index 18242c2fb9..6af3664b82 100644
--- a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj	
+++ b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj	
@@ -719,9 +719,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_PathStrokeType.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1343,6 +1340,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\maths\juce_Range.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
diff --git a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters
index b0780817b9..93e1e8322b 100644
--- a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters	
+++ b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters	
@@ -976,9 +976,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_PathStrokeType.cpp">
       <Filter>Juce Modules\juce_graphics\geometry</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-      <Filter>Juce Modules\juce_graphics\placement</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
       <Filter>Juce Modules\juce_graphics\placement</Filter>
     </ClCompile>
@@ -1893,6 +1890,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h">
       <Filter>Juce Modules\juce_core\memory</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h">
+      <Filter>Juce Modules\juce_core\memory</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h">
       <Filter>Juce Modules\juce_core\memory</Filter>
     </ClInclude>
diff --git a/extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj b/extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj
index d0641fc6c0..c0c7523cea 100644
--- a/extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj	
+++ b/extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj	
@@ -725,9 +725,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_PathStrokeType.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1349,6 +1346,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\maths\juce_Range.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
diff --git a/extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj.filters b/extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj.filters
index b0780817b9..93e1e8322b 100644
--- a/extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj.filters	
+++ b/extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj.filters	
@@ -976,9 +976,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_PathStrokeType.cpp">
       <Filter>Juce Modules\juce_graphics\geometry</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-      <Filter>Juce Modules\juce_graphics\placement</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
       <Filter>Juce Modules\juce_graphics\placement</Filter>
     </ClCompile>
@@ -1893,6 +1890,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h">
       <Filter>Juce Modules\juce_core\memory</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h">
+      <Filter>Juce Modules\juce_core\memory</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h">
       <Filter>Juce Modules\juce_core\memory</Filter>
     </ClInclude>
diff --git a/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj b/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj
index 085df7ab4d..a1445c949a 100644
--- a/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj	
+++ b/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj	
@@ -842,9 +842,7 @@
 		DE80C724F35B1464853FDE9E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SubregionStream.h"; path = "../../../../modules/juce_core/streams/juce_SubregionStream.h"; sourceTree = "SOURCE_ROOT"; };
 		DEA38275A65473112CD34252 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TreeView.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_TreeView.h"; sourceTree = "SOURCE_ROOT"; };
 		DEB23C98FEC261260F63B6A4 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
-		DEE1FC30E2FBB97921616CA9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Font.cpp"; path = "../../../../modules/juce_graphics/fonts/juce_Font.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DF2D86EEA8031481C1FD08B2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileTreeComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileTreeComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
-		DF3B7E1BC0AF0C826C47745B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ResizableWindow.h"; path = "../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h"; sourceTree = "SOURCE_ROOT"; };
 		DF590CD70352A30FA3BD9835 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_SystemTrayIcon.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_SystemTrayIcon.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E0AE248F52C70AA1DEA1A5A1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiOutput.h"; path = "../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.h"; sourceTree = "SOURCE_ROOT"; };
 		E249D6583995E0E6D0B3EADF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioSourcePlayer.h"; path = "../../../../modules/juce_audio_devices/sources/juce_AudioSourcePlayer.h"; sourceTree = "SOURCE_ROOT"; };
@@ -853,12 +851,14 @@
 		E34B2BCD14634ED3BC9F5431 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioProcessorGraph.h"; path = "../../../../modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h"; sourceTree = "SOURCE_ROOT"; };
 		E48615F1F7D8213F6DC24FC9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ThreadPool.h"; path = "../../../../modules/juce_core/threads/juce_ThreadPool.h"; sourceTree = "SOURCE_ROOT"; };
 		EA20E7FB414DD777C1618333 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioIODeviceType.h"; path = "../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h"; sourceTree = "SOURCE_ROOT"; };
+		EB1E23E2BC3088FC5D32A7C5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ContainerDeletePolicy.h"; path = "../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h"; sourceTree = "SOURCE_ROOT"; };
 		EE3E9902579904E57D1A5A18 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		D119A3871626EC2B8EFCB0D4 = { isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JuceDemo.app; sourceTree = "BUILT_PRODUCTS_DIR"; };
 		D9AB5165697DB60BA305F414 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_OpenSL.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_android_OpenSL.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DDEC339D244553357E234C92 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectSound.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_win32_DirectSound.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DED6D04CFED991C5924B78F0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MD5.h"; path = "../../../../modules/juce_cryptography/hashing/juce_MD5.h"; sourceTree = "SOURCE_ROOT"; };
-		DF47E8197FF5A9309C062C61 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Justification.cpp"; path = "../../../../modules/juce_graphics/placement/juce_Justification.cpp"; sourceTree = "SOURCE_ROOT"; };
+		DEE1FC30E2FBB97921616CA9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Font.cpp"; path = "../../../../modules/juce_graphics/fonts/juce_Font.cpp"; sourceTree = "SOURCE_ROOT"; };
+		DF3B7E1BC0AF0C826C47745B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ResizableWindow.h"; path = "../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h"; sourceTree = "SOURCE_ROOT"; };
 		DFEAB699C98B89FF0B85F557 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectWriteTypeLayout.cpp"; path = "../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DFF6BF0BB64714A494A25E93 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RSAKey.h"; path = "../../../../modules/juce_cryptography/encryption/juce_RSAKey.h"; sourceTree = "SOURCE_ROOT"; };
 		E15F577E82B2E12597447472 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationBase.h"; path = "../../../../modules/juce_events/messages/juce_ApplicationBase.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1230,6 +1230,7 @@
 		8FF03782352807A3E6E6F611 = { isa = PBXGroup; children = (
 				D8AFC87A918360FFC9D96BE5,
 				16A6895439607DD8E651BA87,
+				EB1E23E2BC3088FC5D32A7C5,
 				C1A15473893B354642F7531A,
 				D57651845D6D9438DEA62F98,
 				737F8D074841EE88B24DC761,
@@ -1547,7 +1548,6 @@
 				1089C7A1FF43033FDA63F711,
 				38E0255E6BB9600DEECD39F8 ); name = geometry; sourceTree = "<group>"; };
 		BB4F117CD3A2EA9CE8390AD0 = { isa = PBXGroup; children = (
-				DF47E8197FF5A9309C062C61,
 				1375CAA34ECE0B3B292EEF0E,
 				C30EE4EFDB359E2A9D58F677,
 				989587AD131FF27180BEB3D1 ); name = placement; sourceTree = "<group>"; };
diff --git a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj b/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj
index abcc348b06..59f52b159e 100644
--- a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj	
+++ b/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj	
@@ -359,7 +359,6 @@
 		534F8743733885F462809C8F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentPeer.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_ComponentPeer.cpp"; sourceTree = "SOURCE_ROOT"; };
 		537D65EF3BBBDFC4651D389D = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
 		538BF18F9D29A2A60EF6A6CE = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DirectoryContentsDisplayComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
-		53ADE0EF49550FB565B3A0A5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Justification.cpp"; path = "../../../../modules/juce_graphics/placement/juce_Justification.cpp"; sourceTree = "SOURCE_ROOT"; };
 		54DD8BD688BB54E3F94A19A3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiKeyboardComponent.h"; path = "../../../../modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		5535A6B1099BB113B17C42DF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AudioCDReader.mm"; path = "../../../../modules/juce_audio_devices/native/juce_mac_AudioCDReader.mm"; sourceTree = "SOURCE_ROOT"; };
 		55607B89BB15CE19B6E397E2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationProperties.h"; path = "../../../../modules/juce_data_structures/app_properties/juce_ApplicationProperties.h"; sourceTree = "SOURCE_ROOT"; };
@@ -635,82 +634,82 @@
 		A5985F8B03893AA7EFD0273A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CAAUParameter.cpp; path = Extras/CoreAudio/PublicUtility/CAAUParameter.cpp; sourceTree = "DEVELOPER_DIR"; };
 		A59A08DCC76EE0FC7EBE1203 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		A62DF2CD31D7890E1B54B18C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUScopeElement.h; path = Extras/CoreAudio/AudioUnits/AUPublic/AUBase/AUScopeElement.h; sourceTree = "DEVELOPER_DIR"; };
-		A7055681554844E4708E27A0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileSearchPath.cpp"; path = "../../../../modules/juce_core/files/juce_FileSearchPath.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A7A527D783D3B38F455964D4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InterprocessConnectionServer.h"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnectionServer.h"; sourceTree = "SOURCE_ROOT"; };
 		A7EE73FF3A5962BBF41DC2AB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Component.h"; path = "../../../../modules/juce_gui_basics/components/juce_Component.h"; sourceTree = "SOURCE_ROOT"; };
 		A7FD436305E19DF69A7AF446 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DragAndDrop.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp"; sourceTree = "SOURCE_ROOT"; };
-		A8F3FC233163016FE3B23543 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PathIterator.cpp"; path = "../../../../modules/juce_graphics/geometry/juce_PathIterator.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A90A45FB8790A91DF1A78BE7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentBuilder.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentBuilder.h"; sourceTree = "SOURCE_ROOT"; };
 		A90E41C0C52BDF0CC82161C9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AppleRemote.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm"; sourceTree = "SOURCE_ROOT"; };
-		A9133BF4A4E9DF3268BE0A5F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_HyperlinkButton.cpp"; path = "../../../../modules/juce_gui_basics/buttons/juce_HyperlinkButton.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A935F7A0CA0C3A7FE2607D0A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ResamplingAudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h"; sourceTree = "SOURCE_ROOT"; };
 		A9801DABE20B0BC1A3405EA0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_Network.cpp"; path = "../../../../modules/juce_core/native/juce_android_Network.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A9B46A5FF98D7B9DF8598C12 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_AudioUnitPluginFormat.mm"; path = "../../../../modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm"; sourceTree = "SOURCE_ROOT"; };
 		A9C466FBA4FCF6484BCF86A2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_VSTMidiEventList.h"; path = "../../../../modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h"; sourceTree = "SOURCE_ROOT"; };
 		AA29B047C1A1904618B410D5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StretchableObjectResizer.h"; path = "../../../../modules/juce_gui_basics/layout/juce_StretchableObjectResizer.h"; sourceTree = "SOURCE_ROOT"; };
 		AAA122282581E6425F5D9405 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OggVorbisAudioFormat.cpp"; path = "../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp"; sourceTree = "SOURCE_ROOT"; };
-		AAEC41BFA57E45EBF94ED3C1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableImage.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableImage.cpp"; sourceTree = "SOURCE_ROOT"; };
 		AB0E8347C9AC7E4A861C0252 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_IIRFilterAudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h"; sourceTree = "SOURCE_ROOT"; };
-		AB10327C69AAE4AACCFC81EB = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableText.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableText.cpp"; sourceTree = "SOURCE_ROOT"; };
 		AB7726FF34DB2E7FA75ECC19 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ToolbarItemComponent.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
-		AB7BCFBC4B2CB784F57A0FBC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUInputFormatConverter.h; path = Extras/CoreAudio/AudioUnits/AUPublic/Utility/AUInputFormatConverter.h; sourceTree = "DEVELOPER_DIR"; };
 		AB87317D90A518C8A886EE9D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioDeviceSelectorComponent.h"; path = "../../../../modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h"; sourceTree = "SOURCE_ROOT"; };
-		AB9AD07EF899B75AC4CF01DA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CAMutex.h; path = Extras/CoreAudio/PublicUtility/CAMutex.h; sourceTree = "DEVELOPER_DIR"; };
 		ABC394D5E03B690404E80E1E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MessageManager.mm"; path = "../../../../modules/juce_events/native/juce_mac_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
 		ABCB715245090A15092108D5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioDeviceManager.h"; path = "../../../../modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h"; sourceTree = "SOURCE_ROOT"; };
 		ABE98156B2F8FBDAE1B7CF88 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_QuickTimeAudioFormat.cpp"; path = "../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp"; sourceTree = "SOURCE_ROOT"; };
 		AC5452F5122E3A4B670B5185 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioThumbnail.h"; path = "../../../../modules/juce_audio_utils/gui/juce_AudioThumbnail.h"; sourceTree = "SOURCE_ROOT"; };
 		ACAD736DA78EA0A66BF1CE29 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TopLevelWindow.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
 		ACB591F236B9E8054BF9ECB9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DialogWindow.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_DialogWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
-		ACC4E765AD4BF1D025FB4E83 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Network.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Network.cpp"; sourceTree = "SOURCE_ROOT"; };
 		AD33682668F35136E9195684 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiMessage.h"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiMessage.h"; sourceTree = "SOURCE_ROOT"; };
-		AD4C568CF5706BEDBE181243 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ChangeBroadcaster.h"; path = "../../../../modules/juce_events/broadcasters/juce_ChangeBroadcaster.h"; sourceTree = "SOURCE_ROOT"; };
 		AD7E9320CE88BADD17DA949C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiOutput.cpp"; path = "../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp"; sourceTree = "SOURCE_ROOT"; };
-		AE3318FE584B5928D1F10897 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Threads.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Threads.cpp"; sourceTree = "SOURCE_ROOT"; };
-		AE3C497B58239EA75FD18AD9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_GlyphArrangement.h"; path = "../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.h"; sourceTree = "SOURCE_ROOT"; };
-		AF14FDB3693F569F275C1A8C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Files.mm"; path = "../../../../modules/juce_core/native/juce_mac_Files.mm"; sourceTree = "SOURCE_ROOT"; };
-		B1426528BB892D5736D80404 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeParallelogram.h"; path = "../../../../modules/juce_gui_basics/positioning/juce_RelativeParallelogram.h"; sourceTree = "SOURCE_ROOT"; };
 		B2686DED597A081F237B1B1D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioSampleBuffer.cpp"; path = "../../../../modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.cpp"; sourceTree = "SOURCE_ROOT"; };
-		B287E8FA86ED37F618F0ABC2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SubregionStream.cpp"; path = "../../../../modules/juce_core/streams/juce_SubregionStream.cpp"; sourceTree = "SOURCE_ROOT"; };
-		B2B54E113A80EC53D5D71A38 = { isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_gui_basics/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
-		B318D50696B303889BDCF072 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUMIDIEffectBase.h; path = Extras/CoreAudio/AudioUnits/AUPublic/OtherBases/AUMIDIEffectBase.h; sourceTree = "DEVELOPER_DIR"; };
-		B34E109560D77640B7648C4D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScopedWriteLock.h"; path = "../../../../modules/juce_core/threads/juce_ScopedWriteLock.h"; sourceTree = "SOURCE_ROOT"; };
 		B43E810ABF9939F0F6E76318 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NewLine.h"; path = "../../../../modules/juce_core/text/juce_NewLine.h"; sourceTree = "SOURCE_ROOT"; };
-		B532D9954FB106B6095AE0C8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FilenameComponent.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h"; sourceTree = "SOURCE_ROOT"; };
-		B57C430D154C1C86350F246A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_CustomTypeface.cpp"; path = "../../../../modules/juce_graphics/fonts/juce_CustomTypeface.cpp"; sourceTree = "SOURCE_ROOT"; };
-		B5FF7C5554FC26100CB08626 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FillType.h"; path = "../../../../modules/juce_graphics/colour/juce_FillType.h"; sourceTree = "SOURCE_ROOT"; };
-		B65F0500A687634E095C17E7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MouseInactivityDetector.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_MouseInactivityDetector.h"; sourceTree = "SOURCE_ROOT"; };
 		B7F3E4AF0F482E9F6EAF6C41 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiBuffer.h"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiBuffer.h"; sourceTree = "SOURCE_ROOT"; };
-		B8B25605AB1A04A8AE545227 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ImageCache.h"; path = "../../../../modules/juce_graphics/images/juce_ImageCache.h"; sourceTree = "SOURCE_ROOT"; };
-		B8B760CB559864834CC9AB32 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SubregionStream.h"; path = "../../../../modules/juce_core/streams/juce_SubregionStream.h"; sourceTree = "SOURCE_ROOT"; };
-		B9BDF0A1E699EA2D3549664E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ThreadLocalValue.h"; path = "../../../../modules/juce_core/threads/juce_ThreadLocalValue.h"; sourceTree = "SOURCE_ROOT"; };
 		BA98346EFD1037285E245CC9 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; };
+		BBECA9EB9DD3C9B6CB04B10A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Uuid.h"; path = "../../../../modules/juce_core/misc/juce_Uuid.h"; sourceTree = "SOURCE_ROOT"; };
 		BF9246177C0D98297F4228E1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiBuffer.cpp"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiBuffer.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C37123DA8D32C1B6FC09FFF2 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
 		63F8022F081E22DFFFCAC998 = { isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JuceDemoPlugin.component; sourceTree = "BUILT_PRODUCTS_DIR"; };
 		89943D4687B99B72C89496ED = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiDataConcatenator.h"; path = "../../../../modules/juce_audio_devices/native/juce_MidiDataConcatenator.h"; sourceTree = "SOURCE_ROOT"; };
 		95BE074C6E26D6E329D0DA5D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_ASIO.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_win32_ASIO.cpp"; sourceTree = "SOURCE_ROOT"; };
 		97B6D6C6FABF547674BD0F19 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioFormatReader.h"; path = "../../../../modules/juce_audio_formats/format/juce_AudioFormatReader.h"; sourceTree = "SOURCE_ROOT"; };
+		A7055681554844E4708E27A0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileSearchPath.cpp"; path = "../../../../modules/juce_core/files/juce_FileSearchPath.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A722B041FD2540D1380C4D02 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_AudioCDReader.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_linux_AudioCDReader.cpp"; sourceTree = "SOURCE_ROOT"; };
+		A8F3FC233163016FE3B23543 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PathIterator.cpp"; path = "../../../../modules/juce_graphics/geometry/juce_PathIterator.cpp"; sourceTree = "SOURCE_ROOT"; };
+		A9133BF4A4E9DF3268BE0A5F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_HyperlinkButton.cpp"; path = "../../../../modules/juce_gui_basics/buttons/juce_HyperlinkButton.cpp"; sourceTree = "SOURCE_ROOT"; };
 		AA012A21BE3049C205D4A44A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_AudioCDReader.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_win32_AudioCDReader.cpp"; sourceTree = "SOURCE_ROOT"; };
+		AAEC41BFA57E45EBF94ED3C1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableImage.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableImage.cpp"; sourceTree = "SOURCE_ROOT"; };
+		AB10327C69AAE4AACCFC81EB = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableText.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableText.cpp"; sourceTree = "SOURCE_ROOT"; };
+		AB7BCFBC4B2CB784F57A0FBC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUInputFormatConverter.h; path = Extras/CoreAudio/AudioUnits/AUPublic/Utility/AUInputFormatConverter.h; sourceTree = "DEVELOPER_DIR"; };
+		AB9AD07EF899B75AC4CF01DA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CAMutex.h; path = Extras/CoreAudio/PublicUtility/CAMutex.h; sourceTree = "DEVELOPER_DIR"; };
+		ACC4E765AD4BF1D025FB4E83 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Network.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Network.cpp"; sourceTree = "SOURCE_ROOT"; };
 		ACD46CD092A8EC640448BD70 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_BufferingAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_BufferingAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
 		ACDF0E99B316A7C266F6EFFD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LAMEEncoderAudioFormat.cpp"; path = "../../../../modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp"; sourceTree = "SOURCE_ROOT"; };
+		AD4C568CF5706BEDBE181243 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ChangeBroadcaster.h"; path = "../../../../modules/juce_events/broadcasters/juce_ChangeBroadcaster.h"; sourceTree = "SOURCE_ROOT"; };
+		AE3318FE584B5928D1F10897 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Threads.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Threads.cpp"; sourceTree = "SOURCE_ROOT"; };
+		AE3C497B58239EA75FD18AD9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_GlyphArrangement.h"; path = "../../../../modules/juce_graphics/fonts/juce_GlyphArrangement.h"; sourceTree = "SOURCE_ROOT"; };
 		AEE273E29C5B07B96BAFFA46 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ReferenceCountedArray.h"; path = "../../../../modules/juce_core/containers/juce_ReferenceCountedArray.h"; sourceTree = "SOURCE_ROOT"; };
+		AF14FDB3693F569F275C1A8C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Files.mm"; path = "../../../../modules/juce_core/native/juce_mac_Files.mm"; sourceTree = "SOURCE_ROOT"; };
 		B0381BEAE259ABDDE18A64B0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioFormat.cpp"; path = "../../../../modules/juce_audio_formats/format/juce_AudioFormat.cpp"; sourceTree = "SOURCE_ROOT"; };
+		B1426528BB892D5736D80404 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeParallelogram.h"; path = "../../../../modules/juce_gui_basics/positioning/juce_RelativeParallelogram.h"; sourceTree = "SOURCE_ROOT"; };
 		B2067C8614967BECF8B198D1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_gui_extra.mm"; path = "../../../../modules/juce_gui_extra/juce_gui_extra.mm"; sourceTree = "SOURCE_ROOT"; };
 		B23CBCBBD05E21AEA76FB9E8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PluginDirectoryScanner.h"; path = "../../../../modules/juce_audio_processors/scanning/juce_PluginDirectoryScanner.h"; sourceTree = "SOURCE_ROOT"; };
+		B287E8FA86ED37F618F0ABC2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SubregionStream.cpp"; path = "../../../../modules/juce_core/streams/juce_SubregionStream.cpp"; sourceTree = "SOURCE_ROOT"; };
+		B2B54E113A80EC53D5D71A38 = { isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_gui_basics/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
+		B318D50696B303889BDCF072 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUMIDIEffectBase.h; path = Extras/CoreAudio/AudioUnits/AUPublic/OtherBases/AUMIDIEffectBase.h; sourceTree = "DEVELOPER_DIR"; };
+		B34E109560D77640B7648C4D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScopedWriteLock.h"; path = "../../../../modules/juce_core/threads/juce_ScopedWriteLock.h"; sourceTree = "SOURCE_ROOT"; };
 		B45645B3B2E19FB1D72B91B6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AiffAudioFormat.h"; path = "../../../../modules/juce_audio_formats/codecs/juce_AiffAudioFormat.h"; sourceTree = "SOURCE_ROOT"; };
+		B532D9954FB106B6095AE0C8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FilenameComponent.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		B5406E636D4CF8285721DCF3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_ActiveXComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_win32_ActiveXComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
+		B57C430D154C1C86350F246A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_CustomTypeface.cpp"; path = "../../../../modules/juce_graphics/fonts/juce_CustomTypeface.cpp"; sourceTree = "SOURCE_ROOT"; };
 		B57D00796D30ECB2DE58035F = { isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_audio_utils/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
+		B5FF7C5554FC26100CB08626 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FillType.h"; path = "../../../../modules/juce_graphics/colour/juce_FillType.h"; sourceTree = "SOURCE_ROOT"; };
+		B65F0500A687634E095C17E7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MouseInactivityDetector.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_MouseInactivityDetector.h"; sourceTree = "SOURCE_ROOT"; };
 		B6938F0B102875B8B0BEBC44 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PreferencesPanel.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		B72762B6ACA5F73EF9F0A220 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_GenericAudioProcessorEditor.cpp"; path = "../../../../modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp"; sourceTree = "SOURCE_ROOT"; };
 		B829B4BAE71C6F09169542B8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_core.mm"; path = "../../../../modules/juce_core/juce_core.mm"; sourceTree = "SOURCE_ROOT"; };
+		B8B25605AB1A04A8AE545227 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ImageCache.h"; path = "../../../../modules/juce_graphics/images/juce_ImageCache.h"; sourceTree = "SOURCE_ROOT"; };
+		B8B760CB559864834CC9AB32 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SubregionStream.h"; path = "../../../../modules/juce_core/streams/juce_SubregionStream.h"; sourceTree = "SOURCE_ROOT"; };
+		B9BDF0A1E699EA2D3549664E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ThreadLocalValue.h"; path = "../../../../modules/juce_core/threads/juce_ThreadLocalValue.h"; sourceTree = "SOURCE_ROOT"; };
 		B9BE6469604B9D3252EFA7E7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AttributedString.h"; path = "../../../../modules/juce_graphics/fonts/juce_AttributedString.h"; sourceTree = "SOURCE_ROOT"; };
 		BAF34E1248A8D20DDA992AFD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentDragger.cpp"; path = "../../../../modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp"; sourceTree = "SOURCE_ROOT"; };
 		BB1148DE7477E7B58ABD2B95 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioSubsectionReader.h"; path = "../../../../modules/juce_audio_formats/format/juce_AudioSubsectionReader.h"; sourceTree = "SOURCE_ROOT"; };
 		BB84A0B296CFBF17FAF145B0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TemporaryFile.h"; path = "../../../../modules/juce_core/files/juce_TemporaryFile.h"; sourceTree = "SOURCE_ROOT"; };
 		BBBE74C4A9FA85B5F29FF346 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ButtonPropertyComponent.cpp"; path = "../../../../modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
-		BBECA9EB9DD3C9B6CB04B10A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Uuid.h"; path = "../../../../modules/juce_core/misc/juce_Uuid.h"; sourceTree = "SOURCE_ROOT"; };
 		BBF88983012D33EFEF11EA81 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Network.cpp"; path = "../../../../modules/juce_core/native/juce_win32_Network.cpp"; sourceTree = "SOURCE_ROOT"; };
 		BC369095BAEED8707D12F63B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CAStreamBasicDescription.cpp; path = Extras/CoreAudio/PublicUtility/CAStreamBasicDescription.cpp; sourceTree = "DEVELOPER_DIR"; };
 		BCB54D2E4C0C3357DACFD29B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NSViewComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_NSViewComponent.h"; sourceTree = "SOURCE_ROOT"; };
@@ -730,6 +729,7 @@
 		C0BC3E52B08C2805E9509E7E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Memory.h"; path = "../../../../modules/juce_core/memory/juce_Memory.h"; sourceTree = "SOURCE_ROOT"; };
 		C10968CE398AF92E9A5D68C4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileInputSource.cpp"; path = "../../../../modules/juce_core/streams/juce_FileInputSource.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C19323831CE86566D60C725E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LADSPAPluginFormat.cpp"; path = "../../../../modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp"; sourceTree = "SOURCE_ROOT"; };
+		C225F19773D773E87469FBF7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ContainerDeletePolicy.h"; path = "../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h"; sourceTree = "SOURCE_ROOT"; };
 		C2C92FCE31284C0292F55427 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_SystemTrayIcon.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_SystemTrayIcon.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C3053B347C5516757CE76653 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LocalisedStrings.cpp"; path = "../../../../modules/juce_core/text/juce_LocalisedStrings.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C3077A9A84263C3B2B230B0D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_KnownPluginList.h"; path = "../../../../modules/juce_audio_processors/scanning/juce_KnownPluginList.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1220,6 +1220,7 @@
 		4EA6FCA85C8A43A74F1ADAC4 = { isa = PBXGroup; children = (
 				45C2C296C9A745B292F49C65,
 				EA906B8480C7585912B627B1,
+				C225F19773D773E87469FBF7,
 				E17DC39B0FEF7C385323EF82,
 				1C7E45B063CBDED867290BE4,
 				C0BC3E52B08C2805E9509E7E,
@@ -1520,7 +1521,6 @@
 				5EE4BB25075E3ACDCFCE14D2,
 				A1A74C33F871DF7D5E3C4B65 ); name = geometry; sourceTree = "<group>"; };
 		81AE068FB11A7B2265764318 = { isa = PBXGroup; children = (
-				53ADE0EF49550FB565B3A0A5,
 				177932A52C416930EAB2A2F4,
 				EDD6B4608C8E4C7E7581489D,
 				E95E53ABEA2884BA27EF0545 ); name = placement; sourceTree = "<group>"; };
diff --git a/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj b/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj
index 813655fd13..dd21656bc3 100644
--- a/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj	
+++ b/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj	
@@ -1244,6 +1244,7 @@
         <Filter Name="memory">
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
@@ -2459,16 +2460,6 @@
           <File RelativePath="..\..\..\..\modules\juce_graphics\geometry\juce_RectangleList.h"/>
         </Filter>
         <Filter Name="placement">
-          <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.h"/>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
             <FileConfiguration Name="Debug|Win32"
diff --git a/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj b/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj
index 4e90fdcb54..2162ce5fe0 100644
--- a/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj	
+++ b/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj	
@@ -1244,6 +1244,7 @@
         <Filter Name="memory">
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
@@ -2459,16 +2460,6 @@
           <File RelativePath="..\..\..\..\modules\juce_graphics\geometry\juce_RectangleList.h"/>
         </Filter>
         <Filter Name="placement">
-          <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.h"/>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
             <FileConfiguration Name="Debug|Win32"
diff --git a/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj b/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj
index 7866ac0627..bf794bd8ef 100644
--- a/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj	
+++ b/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj	
@@ -745,6 +745,7 @@
 		CF0F1D933CE2A89A9D05FF38 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ColourGradient.h"; path = "../../../../modules/juce_graphics/colour/juce_ColourGradient.h"; sourceTree = "SOURCE_ROOT"; };
 		CF27DFD59466D38E34428405 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Typeface.h"; path = "../../../../modules/juce_graphics/fonts/juce_Typeface.h"; sourceTree = "SOURCE_ROOT"; };
 		CF299925A6A365E288DC206E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_android_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
+		D06DA3FA113EAB0CCF8D7A64 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Singleton.h"; path = "../../../../modules/juce_core/memory/juce_Singleton.h"; sourceTree = "SOURCE_ROOT"; };
 		D0A714338F6B7A47BA1F8F45 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectWriteTypeface.cpp"; path = "../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D104AE78E68E1C382F5F1A81 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
 		D313CF37B25D7FD313C4F336 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
@@ -762,7 +763,6 @@
 		D7433453EBB3700D2805FF42 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XmlDocument.h"; path = "../../../../modules/juce_core/xml/juce_XmlDocument.h"; sourceTree = "SOURCE_ROOT"; };
 		D795067D4EFB5A34BC383250 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ThreadPool.h"; path = "../../../../modules/juce_core/threads/juce_ThreadPool.h"; sourceTree = "SOURCE_ROOT"; };
 		D79E29A54AE62E03A533F436 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_StretchableLayoutResizerBar.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.cpp"; sourceTree = "SOURCE_ROOT"; };
-		D7C1255A555A016BA0D98228 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_cryptography.h"; path = "../../../../modules/juce_cryptography/juce_cryptography.h"; sourceTree = "SOURCE_ROOT"; };
 		D7D1FFD98DABD765479240E6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_EdgeTable.cpp"; path = "../../../../modules/juce_graphics/geometry/juce_EdgeTable.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D8101C0D25DF708FB2E446E5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_IPAddress.cpp"; path = "../../../../modules/juce_core/network/juce_IPAddress.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D8A3F086596562E081EB0F39 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioFormatManager.h"; path = "../../../../modules/juce_audio_formats/format/juce_AudioFormatManager.h"; sourceTree = "SOURCE_ROOT"; };
@@ -771,6 +771,7 @@
 		D92D579F2458F2426E5F828A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScopedWriteLock.h"; path = "../../../../modules/juce_core/threads/juce_ScopedWriteLock.h"; sourceTree = "SOURCE_ROOT"; };
 		D950776EDF9260DB0278C132 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SliderPropertyComponent.cpp"; path = "../../../../modules/juce_gui_basics/properties/juce_SliderPropertyComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D9857957A36A3081186D53FC = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_CameraDevice.cpp"; path = "../../../../modules/juce_video/native/juce_android_CameraDevice.cpp"; sourceTree = "SOURCE_ROOT"; };
+		DA9E577DC37123CEA41C4A71 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_WaitableEvent.h"; path = "../../../../modules/juce_core/threads/juce_WaitableEvent.h"; sourceTree = "SOURCE_ROOT"; };
 		DBD90FC88456B62308AD9AD0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_events.mm"; path = "../../../../modules/juce_events/juce_events.mm"; sourceTree = "SOURCE_ROOT"; };
 		DC30BDE9C4EE1FD059D06902 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioDataConverters.cpp"; path = "../../../../modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DCACD63912A2F68687ED06CF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MemoryInputStream.h"; path = "../../../../modules/juce_core/streams/juce_MemoryInputStream.h"; sourceTree = "SOURCE_ROOT"; };
@@ -785,11 +786,10 @@
 		CAEA69EBB9B2A4C60A991E80 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiKeyboardComponent.cpp"; path = "../../../../modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		CBE270C197A66B22EEE54D9C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PluginListComponent.cpp"; path = "../../../../modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		CF67033CFC21C0060B538042 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ReferenceCountedObject.h"; path = "../../../../modules/juce_core/memory/juce_ReferenceCountedObject.h"; sourceTree = "SOURCE_ROOT"; };
-		D06DA3FA113EAB0CCF8D7A64 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Singleton.h"; path = "../../../../modules/juce_core/memory/juce_Singleton.h"; sourceTree = "SOURCE_ROOT"; };
 		D52F4E0C637B4685217CBEB4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Decibels.h"; path = "../../../../modules/juce_audio_basics/effects/juce_Decibels.h"; sourceTree = "SOURCE_ROOT"; };
+		D7C1255A555A016BA0D98228 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_cryptography.h"; path = "../../../../modules/juce_cryptography/juce_cryptography.h"; sourceTree = "SOURCE_ROOT"; };
 		D9207F324519739FC25FFBDE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_core.h"; path = "../../../../modules/juce_core/juce_core.h"; sourceTree = "SOURCE_ROOT"; };
 		DA918320EF4057DF54FF8909 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ActionBroadcaster.h"; path = "../../../../modules/juce_events/broadcasters/juce_ActionBroadcaster.h"; sourceTree = "SOURCE_ROOT"; };
-		DA9E577DC37123CEA41C4A71 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_WaitableEvent.h"; path = "../../../../modules/juce_core/threads/juce_WaitableEvent.h"; sourceTree = "SOURCE_ROOT"; };
 		DAF7C72A4348C33364BB654C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CallbackMessage.h"; path = "../../../../modules/juce_events/messages/juce_CallbackMessage.h"; sourceTree = "SOURCE_ROOT"; };
 		DB246262CA669F13ABDDB33E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_InterprocessConnectionServer.cpp"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnectionServer.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DD68D7D44BC0B2CA5DCE8532 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ChangeBroadcaster.h"; path = "../../../../modules/juce_events/broadcasters/juce_ChangeBroadcaster.h"; sourceTree = "SOURCE_ROOT"; };
@@ -872,6 +872,7 @@
 		F47DB446F8985FABB23EA1C9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SparseSet.h"; path = "../../../../modules/juce_core/containers/juce_SparseSet.h"; sourceTree = "SOURCE_ROOT"; };
 		F4A18DD97A75845754C92C71 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Fonts.cpp"; path = "../../../../modules/juce_graphics/native/juce_linux_Fonts.cpp"; sourceTree = "SOURCE_ROOT"; };
 		F5067BCDD5659E790346ECC3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Font.h"; path = "../../../../modules/juce_graphics/fonts/juce_Font.h"; sourceTree = "SOURCE_ROOT"; };
+		F50F348D6727D72B32538B18 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ContainerDeletePolicy.h"; path = "../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h"; sourceTree = "SOURCE_ROOT"; };
 		F52176A07E24A5CC91D03A9F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_GraphicsContext.cpp"; path = "../../../../modules/juce_graphics/native/juce_android_GraphicsContext.cpp"; sourceTree = "SOURCE_ROOT"; };
 		F52AF269A66132FFEC566C7B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectShowComponent.h"; path = "../../../../modules/juce_video/playback/juce_DirectShowComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		F641B60F8AE931E3B660A842 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SortedSet.h"; path = "../../../../modules/juce_core/containers/juce_SortedSet.h"; sourceTree = "SOURCE_ROOT"; };
@@ -894,7 +895,6 @@
 		FAB21DB05497EED5CAC5125E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StretchableLayoutResizerBar.h"; path = "../../../../modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h"; sourceTree = "SOURCE_ROOT"; };
 		FB0069171AE5E73F9E1C5173 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_CameraDevice.cpp"; path = "../../../../modules/juce_video/native/juce_win32_CameraDevice.cpp"; sourceTree = "SOURCE_ROOT"; };
 		FB5238BF24C9B0E73B7D6688 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Message.h"; path = "../../../../modules/juce_events/messages/juce_Message.h"; sourceTree = "SOURCE_ROOT"; };
-		FBD139239758935DC4B678F1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Justification.cpp"; path = "../../../../modules/juce_graphics/placement/juce_Justification.cpp"; sourceTree = "SOURCE_ROOT"; };
 		FBEDB1BE1A3C3995C20A8A8A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileFilter.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileFilter.cpp"; sourceTree = "SOURCE_ROOT"; };
 		FC387D5ECE3620237397F0B5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_IIRFilterAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
 		FC99246683913F59070B7966 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CPlusPlusCodeTokeniser.h"; path = "../../../../modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniser.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1161,6 +1161,7 @@
 		ED01F8C5F7FD933BE10FE1CB = { isa = PBXGroup; children = (
 				B27CEFF5B55B38F2BEB141D1,
 				BA2BCD20921648A42CBF54CC,
+				F50F348D6727D72B32538B18,
 				3C927C2F9A7F27474B0F6F0A,
 				55C12E0D6CED99B76CAA7255,
 				8C45248B3DA51C23552039C7,
@@ -1478,7 +1479,6 @@
 				E7F0E3EF611F21E0B80C7216,
 				BC12698889AAD84B83FA7A21 ); name = geometry; sourceTree = "<group>"; };
 		9F3AAF568F1D887C6A73CC41 = { isa = PBXGroup; children = (
-				FBD139239758935DC4B678F1,
 				E29B93C0B9DC9CDD74245891,
 				6462581CC4840341D6E7903F,
 				5B4DD89CB29AEF782C6D878C ); name = placement; sourceTree = "<group>"; };
diff --git a/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj b/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj
index eade3b4e20..a0311f7641 100644
--- a/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj	
+++ b/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj	
@@ -1215,6 +1215,7 @@
         <Filter Name="memory">
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
@@ -2502,16 +2503,6 @@
           <File RelativePath="..\..\..\..\modules\juce_graphics\geometry\juce_RectangleList.h"/>
         </Filter>
         <Filter Name="placement">
-          <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.h"/>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
             <FileConfiguration Name="Debug|Win32"
diff --git a/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj b/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj
index 37c70301d4..b480bd101b 100644
--- a/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj	
+++ b/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj	
@@ -1215,6 +1215,7 @@
         <Filter Name="memory">
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
@@ -2502,16 +2503,6 @@
           <File RelativePath="..\..\..\..\modules\juce_graphics\geometry\juce_RectangleList.h"/>
         </Filter>
         <Filter Name="placement">
-          <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.h"/>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
             <FileConfiguration Name="Debug|Win32"
diff --git a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj
index a60896b077..9e47c9aae3 100644
--- a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj
+++ b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj
@@ -158,6 +158,7 @@
 		D382823C1F24883BFA9E466E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SpinLock.h"; path = "../../../../modules/juce_core/threads/juce_SpinLock.h"; sourceTree = "SOURCE_ROOT"; };
 		D59646C74585BB1F475BAF35 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StandardHeader.h"; path = "../../../../modules/juce_core/system/juce_StandardHeader.h"; sourceTree = "SOURCE_ROOT"; };
 		D6C3594C8BEC94040AF108FE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../JuceLibraryCode/JuceHeader.h; sourceTree = "SOURCE_ROOT"; };
+		D7794263F32CD165C4DE04C4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ContainerDeletePolicy.h"; path = "../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h"; sourceTree = "SOURCE_ROOT"; };
 		D79A68E72395918BE3184E18 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PlatformDefs.h"; path = "../../../../modules/juce_core/system/juce_PlatformDefs.h"; sourceTree = "SOURCE_ROOT"; };
 		D7AA82300629A1BED296F803 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringArray.h"; path = "../../../../modules/juce_core/text/juce_StringArray.h"; sourceTree = "SOURCE_ROOT"; };
 		D80D6FEE7D4BFF3981A82259 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileSearchPath.h"; path = "../../../../modules/juce_core/files/juce_FileSearchPath.h"; sourceTree = "SOURCE_ROOT"; };
@@ -191,11 +192,11 @@
 		ED8687869920F7A3CF92EBDA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CharacterFunctions.h"; path = "../../../../modules/juce_core/text/juce_CharacterFunctions.h"; sourceTree = "SOURCE_ROOT"; };
 		EE75C350983561C54AE46253 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LocalisedStrings.h"; path = "../../../../modules/juce_core/text/juce_LocalisedStrings.h"; sourceTree = "SOURCE_ROOT"; };
 		EF4E9D88AC6799B368A1BC80 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Identifier.cpp"; path = "../../../../modules/juce_core/text/juce_Identifier.cpp"; sourceTree = "SOURCE_ROOT"; };
-		EF63ACFF93BF8700E9A29A94 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OutputStream.cpp"; path = "../../../../modules/juce_core/streams/juce_OutputStream.cpp"; sourceTree = "SOURCE_ROOT"; };
-		F5C6C21A526B0FD8062B0266 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NamedPipe.h"; path = "../../../../modules/juce_core/network/juce_NamedPipe.h"; sourceTree = "SOURCE_ROOT"; };
+		EFAFEF9964F04D9D18BF7C32 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BasicNativeHeaders.h"; path = "../../../../modules/juce_core/native/juce_BasicNativeHeaders.h"; sourceTree = "SOURCE_ROOT"; };
 		F769CD634476C91F4C9D0596 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		E2EADDD364B6C6F37D8BBD7A = { isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = BinaryBuilder; sourceTree = "BUILT_PRODUCTS_DIR"; };
-		EFAFEF9964F04D9D18BF7C32 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BasicNativeHeaders.h"; path = "../../../../modules/juce_core/native/juce_BasicNativeHeaders.h"; sourceTree = "SOURCE_ROOT"; };
+		EF63ACFF93BF8700E9A29A94 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OutputStream.cpp"; path = "../../../../modules/juce_core/streams/juce_OutputStream.cpp"; sourceTree = "SOURCE_ROOT"; };
+		F5C6C21A526B0FD8062B0266 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NamedPipe.h"; path = "../../../../modules/juce_core/network/juce_NamedPipe.h"; sourceTree = "SOURCE_ROOT"; };
 		F65565FA48F58AB9FD423EAF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TimeSliceThread.h"; path = "../../../../modules/juce_core/threads/juce_TimeSliceThread.h"; sourceTree = "SOURCE_ROOT"; };
 		F83BBE2D7A4309D026790809 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ReadWriteLock.cpp"; path = "../../../../modules/juce_core/threads/juce_ReadWriteLock.cpp"; sourceTree = "SOURCE_ROOT"; };
 		FBC458E2609F85472ADE9473 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HighResolutionTimer.h"; path = "../../../../modules/juce_core/threads/juce_HighResolutionTimer.h"; sourceTree = "SOURCE_ROOT"; };
@@ -239,6 +240,7 @@
 		0A23F8FA8C7451D75FABC96F = { isa = PBXGroup; children = (
 				ECA68CE64EC790E2EED4D86E,
 				BD88E5FB088ED71A23952819,
+				D7794263F32CD165C4DE04C4,
 				767A373B42195AF805FD06CC,
 				099D0BF9AFB99C9F11AF6DAF,
 				C0AD6DEE5019B575256CC676,
diff --git a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj
index 1db29f161a..d12a75390e 100644
--- a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj
+++ b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj
@@ -268,6 +268,7 @@
         <Filter Name="memory">
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
diff --git a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj b/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj
index e7e483a5ef..4335227fbf 100644
--- a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj	
+++ b/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj	
@@ -323,7 +323,6 @@
 		789AF76E97BF2BA51A082381 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OldSchoolLookAndFeel.cpp"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		793CDD14387F49E8757B9042 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ValueTree.cpp"; path = "../../../../modules/juce_data_structures/values/juce_ValueTree.cpp"; sourceTree = "SOURCE_ROOT"; };
 		79A4F1CF3FB5D20104693598 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_WindowsRegistry.h"; path = "../../../../modules/juce_core/misc/juce_WindowsRegistry.h"; sourceTree = "SOURCE_ROOT"; };
-		79E7E37683CACE292A596CEA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Justification.cpp"; path = "../../../../modules/juce_graphics/placement/juce_Justification.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7A6E2A815D9AE276CF064A24 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SystemTrayIconComponent.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7A704BB75CD29EA20C349CDA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableImage.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableImage.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7A969F79FFA4031B868F9EED = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Variant.cpp"; path = "../../../../modules/juce_core/containers/juce_Variant.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -507,6 +506,7 @@
 		C40948D9BB7965E367551251 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Line.h"; path = "../../../../modules/juce_graphics/geometry/juce_Line.h"; sourceTree = "SOURCE_ROOT"; };
 		C4788802A0C1A2908645028B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ApplicationBase.cpp"; path = "../../../../modules/juce_events/messages/juce_ApplicationBase.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C511170BCB0784C896826010 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Label.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_Label.cpp"; sourceTree = "SOURCE_ROOT"; };
+		C5401AF900EB8056416C1294 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ContainerDeletePolicy.h"; path = "../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h"; sourceTree = "SOURCE_ROOT"; };
 		C626FA20C4D021076A4B943E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MainMenu.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_MainMenu.mm"; sourceTree = "SOURCE_ROOT"; };
 		C6313E766ECDCE48435BA5A0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AnimatedPositionBehaviours.h"; path = "../../../../modules/juce_gui_basics/layout/juce_AnimatedPositionBehaviours.h"; sourceTree = "SOURCE_ROOT"; };
 		C63DB03ADC0A6E3C45DD88C9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Image.h"; path = "../../../../modules/juce_graphics/images/juce_Image.h"; sourceTree = "SOURCE_ROOT"; };
@@ -688,6 +688,7 @@
 		283F53CC2F8E672B54F90A31 = { isa = PBXGroup; children = (
 				60DDA3B2D06C918647F0F2FF,
 				AA75E89A148ADF8C55671CA0,
+				C5401AF900EB8056416C1294,
 				1F16E8AF03971A15157AD981,
 				62733AC6CAD0F79BEAE0CF4F,
 				09A3E1630BFC67C63AFEDE3A,
@@ -988,7 +989,6 @@
 				189CC2967B6148BE990281E8,
 				9EF2F14290768DC26DBA6149 ); name = geometry; sourceTree = "<group>"; };
 		C8E76BBA092B9546D62BFFE4 = { isa = PBXGroup; children = (
-				79E7E37683CACE292A596CEA,
 				02FA201D32033D122C04A1B5,
 				7EE080AF681F1D927DF35B95,
 				C71BB293CEF65605741E0CDA ); name = placement; sourceTree = "<group>"; };
diff --git a/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj b/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj
index 02a3090036..2cb0abd7d7 100644
--- a/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj	
+++ b/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj	
@@ -270,6 +270,7 @@
         <Filter Name="memory">
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
@@ -1485,16 +1486,6 @@
           <File RelativePath="..\..\..\..\modules\juce_graphics\geometry\juce_RectangleList.h"/>
         </Filter>
         <Filter Name="placement">
-          <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.h"/>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
             <FileConfiguration Name="Debug|Win32"
diff --git a/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj b/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj
index df27f33c65..ff0b476347 100644
--- a/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj	
+++ b/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj	
@@ -270,6 +270,7 @@
         <Filter Name="memory">
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Atomic.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ByteOrder.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_ContainerDeletePolicy.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_HeapBlock.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_LeakedObjectDetector.h"/>
           <File RelativePath="..\..\..\..\modules\juce_core\memory\juce_Memory.h"/>
@@ -1485,16 +1486,6 @@
           <File RelativePath="..\..\..\..\modules\juce_graphics\geometry\juce_RectangleList.h"/>
         </Filter>
         <Filter Name="placement">
-          <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_Justification.h"/>
           <File RelativePath="..\..\..\..\modules\juce_graphics\placement\juce_RectanglePlacement.cpp">
             <FileConfiguration Name="Debug|Win32"
diff --git a/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj b/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj
index 83763c9860..5a3f295403 100644
--- a/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj	
+++ b/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj	
@@ -320,7 +320,6 @@
 		789AF76E97BF2BA51A082381 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OldSchoolLookAndFeel.cpp"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		793CDD14387F49E8757B9042 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ValueTree.cpp"; path = "../../../../modules/juce_data_structures/values/juce_ValueTree.cpp"; sourceTree = "SOURCE_ROOT"; };
 		79A4F1CF3FB5D20104693598 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_WindowsRegistry.h"; path = "../../../../modules/juce_core/misc/juce_WindowsRegistry.h"; sourceTree = "SOURCE_ROOT"; };
-		79E7E37683CACE292A596CEA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Justification.cpp"; path = "../../../../modules/juce_graphics/placement/juce_Justification.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7A6E2A815D9AE276CF064A24 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SystemTrayIconComponent.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7A704BB75CD29EA20C349CDA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableImage.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableImage.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7A969F79FFA4031B868F9EED = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Variant.cpp"; path = "../../../../modules/juce_core/containers/juce_Variant.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -504,6 +503,7 @@
 		C40948D9BB7965E367551251 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Line.h"; path = "../../../../modules/juce_graphics/geometry/juce_Line.h"; sourceTree = "SOURCE_ROOT"; };
 		C4788802A0C1A2908645028B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ApplicationBase.cpp"; path = "../../../../modules/juce_events/messages/juce_ApplicationBase.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C511170BCB0784C896826010 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Label.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_Label.cpp"; sourceTree = "SOURCE_ROOT"; };
+		C5401AF900EB8056416C1294 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ContainerDeletePolicy.h"; path = "../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h"; sourceTree = "SOURCE_ROOT"; };
 		C626FA20C4D021076A4B943E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MainMenu.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_MainMenu.mm"; sourceTree = "SOURCE_ROOT"; };
 		C6313E766ECDCE48435BA5A0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AnimatedPositionBehaviours.h"; path = "../../../../modules/juce_gui_basics/layout/juce_AnimatedPositionBehaviours.h"; sourceTree = "SOURCE_ROOT"; };
 		C63DB03ADC0A6E3C45DD88C9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Image.h"; path = "../../../../modules/juce_graphics/images/juce_Image.h"; sourceTree = "SOURCE_ROOT"; };
@@ -686,6 +686,7 @@
 		283F53CC2F8E672B54F90A31 = { isa = PBXGroup; children = (
 				60DDA3B2D06C918647F0F2FF,
 				AA75E89A148ADF8C55671CA0,
+				C5401AF900EB8056416C1294,
 				1F16E8AF03971A15157AD981,
 				62733AC6CAD0F79BEAE0CF4F,
 				09A3E1630BFC67C63AFEDE3A,
@@ -986,7 +987,6 @@
 				189CC2967B6148BE990281E8,
 				9EF2F14290768DC26DBA6149 ); name = geometry; sourceTree = "<group>"; };
 		C8E76BBA092B9546D62BFFE4 = { isa = PBXGroup; children = (
-				79E7E37683CACE292A596CEA,
 				02FA201D32033D122C04A1B5,
 				7EE080AF681F1D927DF35B95,
 				C71BB293CEF65605741E0CDA ); name = placement; sourceTree = "<group>"; };
diff --git a/modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h b/modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h
index ff6f4811bd..88b1ef2670 100644
--- a/modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h
+++ b/modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h
@@ -158,7 +158,7 @@ private:
     AudioCDBurner (const int deviceIndex);
 
     class Pimpl;
-    friend class ScopedPointer<Pimpl>;
+    friend struct ContainerDeletePolicy<Pimpl>;
     ScopedPointer<Pimpl> pimpl;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioCDBurner)
diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
index 6748628214..e9d1bc8b8a 100644
--- a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
+++ b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
@@ -481,7 +481,7 @@ private:
     //==============================================================================
     class CallbackHandler;
     friend class CallbackHandler;
-    friend class ScopedPointer<CallbackHandler>;
+    friend struct ContainerDeletePolicy<CallbackHandler>;
     ScopedPointer<CallbackHandler> callbackHandler;
 
     void audioDeviceIOCallbackInt (const float** inputChannelData, int totalNumInputChannels,
diff --git a/modules/juce_audio_formats/format/juce_AudioFormatWriter.h b/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
index 3d4594ddaa..989859a489 100644
--- a/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
+++ b/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
@@ -203,7 +203,7 @@ public:
 
     private:
         class Buffer;
-        friend class ScopedPointer<Buffer>;
+        friend struct ContainerDeletePolicy<Buffer>;
         ScopedPointer<Buffer> buffer;
     };
 
diff --git a/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp b/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp
index 93c113e02d..570263cd7c 100644
--- a/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp
+++ b/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp
@@ -248,8 +248,8 @@ void PluginListComponent::filesDropped (const StringArray& files, int, int)
 
 FileSearchPath PluginListComponent::getLastSearchPath (PropertiesFile& properties, AudioPluginFormat& format)
 {
-    return properties.getValue ("lastPluginScanPath_" + format.getName(),
-                                format.getDefaultLocationsToSearch().toString());
+    return FileSearchPath (properties.getValue ("lastPluginScanPath_" + format.getName(),
+                                                format.getDefaultLocationsToSearch().toString()));
 }
 
 void PluginListComponent::setLastSearchPath (PropertiesFile& properties, AudioPluginFormat& format,
diff --git a/modules/juce_audio_processors/scanning/juce_PluginListComponent.h b/modules/juce_audio_processors/scanning/juce_PluginListComponent.h
index 8c4322a0e3..2026323094 100644
--- a/modules/juce_audio_processors/scanning/juce_PluginListComponent.h
+++ b/modules/juce_audio_processors/scanning/juce_PluginListComponent.h
@@ -103,7 +103,7 @@ private:
 
     class Scanner;
     friend class Scanner;
-    friend class ScopedPointer<Scanner>;
+    friend struct ContainerDeletePolicy<Scanner>;
     ScopedPointer<Scanner> currentScanner;
 
     void scanFinished (const StringArray&);
diff --git a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h
index 8a6eb88063..89afbf2f4e 100644
--- a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h
+++ b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h
@@ -92,7 +92,7 @@ private:
     const bool hideAdvancedOptionsWithButton;
 
     class MidiInputSelectorComponentListBox;
-    friend class ScopedPointer<MidiInputSelectorComponentListBox>;
+    friend struct ContainerDeletePolicy<MidiInputSelectorComponentListBox>;
     ScopedPointer<MidiInputSelectorComponentListBox> midiInputsList;
     ScopedPointer<ComboBox> midiOutputSelector;
     ScopedPointer<Label> midiInputsLabel, midiOutputLabel;
diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnail.h b/modules/juce_audio_utils/gui/juce_AudioThumbnail.h
index 4042a39752..6a8b323ed4 100644
--- a/modules/juce_audio_utils/gui/juce_AudioThumbnail.h
+++ b/modules/juce_audio_utils/gui/juce_AudioThumbnail.h
@@ -201,11 +201,11 @@ private:
     class CachedWindow;
 
     friend class LevelDataSource;
-    friend class ScopedPointer<LevelDataSource>;
     friend class ThumbData;
-    friend class OwnedArray<ThumbData>;
     friend class CachedWindow;
-    friend class ScopedPointer<CachedWindow>;
+    friend struct ContainerDeletePolicy<LevelDataSource>;
+    friend struct ContainerDeletePolicy<ThumbData>;
+    friend struct ContainerDeletePolicy<CachedWindow>;
 
     ScopedPointer<LevelDataSource> source;
     ScopedPointer<CachedWindow> window;
diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h b/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h
index de7fe87a5d..e9a1a13b03 100644
--- a/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h
+++ b/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h
@@ -105,7 +105,7 @@ private:
     TimeSliceThread thread;
 
     class ThumbnailCacheEntry;
-    friend class OwnedArray<ThumbnailCacheEntry>;
+    friend struct ContainerDeletePolicy<ThumbnailCacheEntry>;
     OwnedArray<ThumbnailCacheEntry> thumbs;
     CriticalSection lock;
     int maxNumThumbsToStore;
diff --git a/modules/juce_core/containers/juce_Array.h b/modules/juce_core/containers/juce_Array.h
index d7f1808f99..21d3f86c2d 100644
--- a/modules/juce_core/containers/juce_Array.h
+++ b/modules/juce_core/containers/juce_Array.h
@@ -29,10 +29,6 @@
 #ifndef JUCE_ARRAY_H_INCLUDED
 #define JUCE_ARRAY_H_INCLUDED
 
-#include "juce_ArrayAllocationBase.h"
-#include "juce_ElementComparator.h"
-#include "../threads/juce_CriticalSection.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/containers/juce_ArrayAllocationBase.h b/modules/juce_core/containers/juce_ArrayAllocationBase.h
index 31aa256a64..cfbe464671 100644
--- a/modules/juce_core/containers/juce_ArrayAllocationBase.h
+++ b/modules/juce_core/containers/juce_ArrayAllocationBase.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_ARRAYALLOCATIONBASE_H_INCLUDED
 #define JUCE_ARRAYALLOCATIONBASE_H_INCLUDED
 
-#include "../memory/juce_HeapBlock.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/containers/juce_DynamicObject.h b/modules/juce_core/containers/juce_DynamicObject.h
index 2b14aa587b..38bc227e9d 100644
--- a/modules/juce_core/containers/juce_DynamicObject.h
+++ b/modules/juce_core/containers/juce_DynamicObject.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_DYNAMICOBJECT_H_INCLUDED
 #define JUCE_DYNAMICOBJECT_H_INCLUDED
 
-#include "juce_NamedValueSet.h"
-#include "../memory/juce_ReferenceCountedObject.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/containers/juce_HashMap.h b/modules/juce_core/containers/juce_HashMap.h
index da737fd9ab..a109421953 100644
--- a/modules/juce_core/containers/juce_HashMap.h
+++ b/modules/juce_core/containers/juce_HashMap.h
@@ -29,10 +29,6 @@
 #ifndef JUCE_HASHMAP_H_INCLUDED
 #define JUCE_HASHMAP_H_INCLUDED
 
-#include "juce_OwnedArray.h"
-#include "juce_LinkedListPointer.h"
-#include "../memory/juce_ScopedPointer.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/containers/juce_NamedValueSet.h b/modules/juce_core/containers/juce_NamedValueSet.h
index f1c4c35c99..699d2fef7d 100644
--- a/modules/juce_core/containers/juce_NamedValueSet.h
+++ b/modules/juce_core/containers/juce_NamedValueSet.h
@@ -29,13 +29,6 @@
 #ifndef JUCE_NAMEDVALUESET_H_INCLUDED
 #define JUCE_NAMEDVALUESET_H_INCLUDED
 
-#include "juce_Variant.h"
-#include "../containers/juce_LinkedListPointer.h"
-class XmlElement;
-#ifndef DOXYGEN
- class JSONFormatter;
-#endif
-
 
 //==============================================================================
 /** Holds a set of named var objects.
diff --git a/modules/juce_core/containers/juce_OwnedArray.h b/modules/juce_core/containers/juce_OwnedArray.h
index 7a70c95d79..5a29fa3c25 100644
--- a/modules/juce_core/containers/juce_OwnedArray.h
+++ b/modules/juce_core/containers/juce_OwnedArray.h
@@ -29,10 +29,6 @@
 #ifndef JUCE_OWNEDARRAY_H_INCLUDED
 #define JUCE_OWNEDARRAY_H_INCLUDED
 
-#include "juce_ArrayAllocationBase.h"
-#include "juce_ElementComparator.h"
-#include "../threads/juce_CriticalSection.h"
-
 
 //==============================================================================
 /** An array designed for holding objects.
@@ -389,7 +385,7 @@ public:
     {
         if (indexToChange >= 0)
         {
-            ObjectClass* toDelete = nullptr;
+            ScopedPointer<ObjectClass> toDelete;
 
             {
                 const ScopedLockType lock (getLock());
@@ -401,7 +397,7 @@ public:
                         toDelete = data.elements [indexToChange];
 
                         if (toDelete == newObject)
-                            toDelete = nullptr;
+                            toDelete.release();
                     }
 
                     data.elements [indexToChange] = const_cast <ObjectClass*> (newObject);
@@ -412,10 +408,6 @@ public:
                     data.elements [numUsed++] = const_cast <ObjectClass*> (newObject);
                 }
             }
-
-            delete toDelete; // don't want to use a ScopedPointer here because if the
-                             // object has a private destructor, both OwnedArray and
-                             // ScopedPointer would need to be friend classes..
         }
         else
         {
@@ -575,7 +567,7 @@ public:
     void remove (const int indexToRemove,
                  const bool deleteObject = true)
     {
-        ObjectClass* toDelete = nullptr;
+        ScopedPointer<ObjectClass> toDelete;
 
         {
             const ScopedLockType lock (getLock());
@@ -595,10 +587,6 @@ public:
             }
         }
 
-        delete toDelete; // don't want to use a ScopedPointer here because if the
-                         // object has a private destructor, both OwnedArray and
-                         // ScopedPointer would need to be friend classes..
-
         if ((numUsed << 1) < data.numAllocated)
             minimiseStorageOverheads();
     }
@@ -686,7 +674,7 @@ public:
             {
                 for (int i = startIndex; i < endIndex; ++i)
                 {
-                    delete data.elements [i];
+                    ContainerDeletePolicy<ObjectClass>::destroy (data.elements [i]);
                     data.elements [i] = nullptr; // (in case one of the destructors accesses this array and hits a dangling pointer)
                 }
             }
@@ -889,7 +877,7 @@ private:
     void deleteAllObjects()
     {
         while (numUsed > 0)
-            delete data.elements [--numUsed];
+            ContainerDeletePolicy<ObjectClass>::destroy (data.elements [--numUsed]);
     }
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OwnedArray)
diff --git a/modules/juce_core/containers/juce_PropertySet.h b/modules/juce_core/containers/juce_PropertySet.h
index 20ea4a160c..4ddf4d8173 100644
--- a/modules/juce_core/containers/juce_PropertySet.h
+++ b/modules/juce_core/containers/juce_PropertySet.h
@@ -29,10 +29,6 @@
 #ifndef JUCE_PROPERTYSET_H_INCLUDED
 #define JUCE_PROPERTYSET_H_INCLUDED
 
-#include "../text/juce_StringPairArray.h"
-#include "../xml/juce_XmlElement.h"
-#include "../containers/juce_Variant.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/containers/juce_ReferenceCountedArray.h b/modules/juce_core/containers/juce_ReferenceCountedArray.h
index c70320897e..bf88b4cbeb 100644
--- a/modules/juce_core/containers/juce_ReferenceCountedArray.h
+++ b/modules/juce_core/containers/juce_ReferenceCountedArray.h
@@ -29,11 +29,6 @@
 #ifndef JUCE_REFERENCECOUNTEDARRAY_H_INCLUDED
 #define JUCE_REFERENCECOUNTEDARRAY_H_INCLUDED
 
-#include "../memory/juce_ReferenceCountedObject.h"
-#include "juce_ArrayAllocationBase.h"
-#include "juce_ElementComparator.h"
-#include "../threads/juce_CriticalSection.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/containers/juce_SortedSet.h b/modules/juce_core/containers/juce_SortedSet.h
index b7fa061d59..c07201ce6c 100644
--- a/modules/juce_core/containers/juce_SortedSet.h
+++ b/modules/juce_core/containers/juce_SortedSet.h
@@ -29,15 +29,11 @@
 #ifndef JUCE_SORTEDSET_H_INCLUDED
 #define JUCE_SORTEDSET_H_INCLUDED
 
-#include "juce_ArrayAllocationBase.h"
-#include "../threads/juce_CriticalSection.h"
-
 #if JUCE_MSVC
-  #pragma warning (push)
-  #pragma warning (disable: 4512)
+ #pragma warning (push)
+ #pragma warning (disable: 4512)
 #endif
 
-
 //==============================================================================
 /**
     Holds a set of unique primitive objects, such as ints or doubles.
@@ -491,7 +487,7 @@ private:
 };
 
 #if JUCE_MSVC
-  #pragma warning (pop)
+ #pragma warning (pop)
 #endif
 
 #endif   // JUCE_SORTEDSET_H_INCLUDED
diff --git a/modules/juce_core/containers/juce_Variant.h b/modules/juce_core/containers/juce_Variant.h
index 92a75b9dc1..2651c95064 100644
--- a/modules/juce_core/containers/juce_Variant.h
+++ b/modules/juce_core/containers/juce_Variant.h
@@ -29,15 +29,6 @@
 #ifndef JUCE_VARIANT_H_INCLUDED
 #define JUCE_VARIANT_H_INCLUDED
 
-#include "../text/juce_Identifier.h"
-#include "../streams/juce_OutputStream.h"
-#include "../streams/juce_InputStream.h"
-#include "../containers/juce_Array.h"
-
-#ifndef DOXYGEN
- class ReferenceCountedObject;
- class DynamicObject;
-#endif
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/files/juce_DirectoryIterator.h b/modules/juce_core/files/juce_DirectoryIterator.h
index fcc50569c0..b297c5ebcc 100644
--- a/modules/juce_core/files/juce_DirectoryIterator.h
+++ b/modules/juce_core/files/juce_DirectoryIterator.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_DIRECTORYITERATOR_H_INCLUDED
 #define JUCE_DIRECTORYITERATOR_H_INCLUDED
 
-#include "juce_File.h"
-#include "../memory/juce_ScopedPointer.h"
-
 
 //==============================================================================
 /**
@@ -135,13 +132,13 @@ private:
 
     private:
         friend class DirectoryIterator;
-        friend class ScopedPointer<Pimpl>;
+        friend struct ContainerDeletePolicy<Pimpl>;
         ScopedPointer<Pimpl> pimpl;
 
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (NativeIterator)
     };
 
-    friend class ScopedPointer<NativeIterator::Pimpl>;
+    friend struct ContainerDeletePolicy<NativeIterator::Pimpl>;
     StringArray wildCards;
     NativeIterator fileFinder;
     String wildCard, path;
@@ -150,7 +147,7 @@ private:
     const int whatToLookFor;
     const bool isRecursive;
     bool hasBeenAdvanced;
-    ScopedPointer <DirectoryIterator> subIterator;
+    ScopedPointer<DirectoryIterator> subIterator;
     File currentFile;
 
     static StringArray parseWildcards (const String& pattern);
diff --git a/modules/juce_core/files/juce_File.h b/modules/juce_core/files/juce_File.h
index ad3cb19fbd..0fcc8ec614 100644
--- a/modules/juce_core/files/juce_File.h
+++ b/modules/juce_core/files/juce_File.h
@@ -29,15 +29,6 @@
 #ifndef JUCE_FILE_H_INCLUDED
 #define JUCE_FILE_H_INCLUDED
 
-#include "../containers/juce_Array.h"
-#include "../time/juce_Time.h"
-#include "../text/juce_StringArray.h"
-#include "../memory/juce_MemoryBlock.h"
-#include "../memory/juce_ScopedPointer.h"
-#include "../misc/juce_Result.h"
-class FileInputStream;
-class FileOutputStream;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/files/juce_FileInputStream.h b/modules/juce_core/files/juce_FileInputStream.h
index 6a452f71c2..fd5a5c6131 100644
--- a/modules/juce_core/files/juce_FileInputStream.h
+++ b/modules/juce_core/files/juce_FileInputStream.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_FILEINPUTSTREAM_H_INCLUDED
 #define JUCE_FILEINPUTSTREAM_H_INCLUDED
 
-#include "juce_File.h"
-#include "../streams/juce_InputStream.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/files/juce_FileOutputStream.h b/modules/juce_core/files/juce_FileOutputStream.h
index 73ad20d497..9d001ff52e 100644
--- a/modules/juce_core/files/juce_FileOutputStream.h
+++ b/modules/juce_core/files/juce_FileOutputStream.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_FILEOUTPUTSTREAM_H_INCLUDED
 #define JUCE_FILEOUTPUTSTREAM_H_INCLUDED
 
-#include "juce_File.h"
-#include "../streams/juce_OutputStream.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/files/juce_FileSearchPath.cpp b/modules/juce_core/files/juce_FileSearchPath.cpp
index 053e92a1af..ce0af7edaa 100644
--- a/modules/juce_core/files/juce_FileSearchPath.cpp
+++ b/modules/juce_core/files/juce_FileSearchPath.cpp
@@ -26,9 +26,8 @@
   ==============================================================================
 */
 
-FileSearchPath::FileSearchPath()
-{
-}
+FileSearchPath::FileSearchPath() {}
+FileSearchPath::~FileSearchPath() {}
 
 FileSearchPath::FileSearchPath (const String& path)
 {
@@ -36,12 +35,14 @@ FileSearchPath::FileSearchPath (const String& path)
 }
 
 FileSearchPath::FileSearchPath (const FileSearchPath& other)
-  : directories (other.directories)
+   : directories (other.directories)
 {
 }
 
-FileSearchPath::~FileSearchPath()
+FileSearchPath& FileSearchPath::operator= (const FileSearchPath& other)
 {
+    directories = other.directories;
+    return *this;
 }
 
 FileSearchPath& FileSearchPath::operator= (const String& path)
diff --git a/modules/juce_core/files/juce_FileSearchPath.h b/modules/juce_core/files/juce_FileSearchPath.h
index a35f5aed47..fcd069310c 100644
--- a/modules/juce_core/files/juce_FileSearchPath.h
+++ b/modules/juce_core/files/juce_FileSearchPath.h
@@ -29,13 +29,10 @@
 #ifndef JUCE_FILESEARCHPATH_H_INCLUDED
 #define JUCE_FILESEARCHPATH_H_INCLUDED
 
-#include "juce_File.h"
-#include "../text/juce_StringArray.h"
-
 
 //==============================================================================
 /**
-    Encapsulates a set of folders that make up a search path.
+    Represents a set of folders that make up a search path.
 
     @see File
 */
@@ -56,7 +53,10 @@ public:
     FileSearchPath (const String& path);
 
     /** Creates a copy of another search path. */
-    FileSearchPath (const FileSearchPath& other);
+    FileSearchPath (const FileSearchPath&);
+
+    /** Copies another search path. */
+    FileSearchPath& operator= (const FileSearchPath&);
 
     /** Destructor. */
     ~FileSearchPath();
@@ -70,15 +70,12 @@ public:
 
     //==============================================================================
     /** Returns the number of folders in this search path.
-
         @see operator[]
     */
     int getNumPaths() const;
 
     /** Returns one of the folders in this search path.
-
         The file returned isn't guaranteed to actually be a valid directory.
-
         @see getNumPaths
     */
     File operator[] (int index) const;
@@ -102,7 +99,6 @@ public:
     void remove (int indexToRemove);
 
     /** Merges another search path into this one.
-
         This will remove any duplicate directories.
     */
     void addPath (const FileSearchPath& other);
@@ -161,7 +157,7 @@ private:
     //==============================================================================
     StringArray directories;
 
-    void init (const String& path);
+    void init (const String&);
 
     JUCE_LEAK_DETECTOR (FileSearchPath)
 };
diff --git a/modules/juce_core/files/juce_MemoryMappedFile.h b/modules/juce_core/files/juce_MemoryMappedFile.h
index 943edb63d4..8a79185f49 100644
--- a/modules/juce_core/files/juce_MemoryMappedFile.h
+++ b/modules/juce_core/files/juce_MemoryMappedFile.h
@@ -29,7 +29,6 @@
 #ifndef JUCE_MEMORYMAPPEDFILE_H_INCLUDED
 #define JUCE_MEMORYMAPPEDFILE_H_INCLUDED
 
-#include "juce_File.h"
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/files/juce_TemporaryFile.h b/modules/juce_core/files/juce_TemporaryFile.h
index d33dc36a21..ef489039c2 100644
--- a/modules/juce_core/files/juce_TemporaryFile.h
+++ b/modules/juce_core/files/juce_TemporaryFile.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_TEMPORARYFILE_H_INCLUDED
 #define JUCE_TEMPORARYFILE_H_INCLUDED
 
-#include "juce_File.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/json/juce_JSON.h b/modules/juce_core/json/juce_JSON.h
index a443c7a960..ad1ced86d3 100644
--- a/modules/juce_core/json/juce_JSON.h
+++ b/modules/juce_core/json/juce_JSON.h
@@ -29,12 +29,6 @@
 #ifndef JUCE_JSON_H_INCLUDED
 #define JUCE_JSON_H_INCLUDED
 
-#include "../misc/juce_Result.h"
-#include "../containers/juce_Variant.h"
-class InputStream;
-class OutputStream;
-class File;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h
index f7af33bbec..3f25a431e5 100644
--- a/modules/juce_core/juce_core.h
+++ b/modules/juce_core/juce_core.h
@@ -141,108 +141,109 @@
 namespace juce
 {
 
-// START_AUTOINCLUDE containers, files, json, logging, maths, memory, misc, network,
-// streams, system, text, threads, time, unit_tests, xml, zip
-#include "containers/juce_AbstractFifo.h"
-#include "containers/juce_Array.h"
-#include "containers/juce_ArrayAllocationBase.h"
-#include "containers/juce_DynamicObject.h"
+class MemoryBlock;
+class File;
+class InputStream;
+class DynamicObject;
+class FileInputStream;
+class FileOutputStream;
+class XmlElement;
+class JSONFormatter;
+
+#include "memory/juce_Atomic.h"
+#include "memory/juce_ByteOrder.h"
+#include "memory/juce_ContainerDeletePolicy.h"
+#include "memory/juce_HeapBlock.h"
+#include "memory/juce_LeakedObjectDetector.h"
+#include "memory/juce_Memory.h"
+#include "memory/juce_MemoryBlock.h"
+#include "memory/juce_ReferenceCountedObject.h"
+#include "memory/juce_ScopedPointer.h"
+#include "memory/juce_OptionalScopedPointer.h"
+#include "memory/juce_Singleton.h"
+#include "memory/juce_WeakReference.h"
+#include "threads/juce_CriticalSection.h"
 #include "containers/juce_ElementComparator.h"
-#include "containers/juce_HashMap.h"
+#include "containers/juce_ArrayAllocationBase.h"
+#include "containers/juce_Array.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_AbstractFifo.h"
+#include "text/juce_NewLine.h"
+#include "text/juce_StringPool.h"
+#include "text/juce_Identifier.h"
+#include "text/juce_StringArray.h"
+#include "text/juce_StringPairArray.h"
+#include "text/juce_TextDiff.h"
+#include "text/juce_LocalisedStrings.h"
+#include "misc/juce_Result.h"
 #include "containers/juce_Variant.h"
-#include "files/juce_DirectoryIterator.h"
+#include "containers/juce_NamedValueSet.h"
+#include "containers/juce_DynamicObject.h"
+#include "containers/juce_HashMap.h"
+#include "time/juce_RelativeTime.h"
+#include "time/juce_Time.h"
+#include "streams/juce_InputStream.h"
+#include "streams/juce_OutputStream.h"
+#include "streams/juce_BufferedInputStream.h"
+#include "streams/juce_MemoryInputStream.h"
+#include "streams/juce_MemoryOutputStream.h"
+#include "streams/juce_SubregionStream.h"
+#include "streams/juce_InputSource.h"
 #include "files/juce_File.h"
+#include "files/juce_DirectoryIterator.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 "streams/juce_FileInputSource.h"
 #include "logging/juce_Logger.h"
+#include "logging/juce_FileLogger.h"
+#include "json/juce_JSON.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 "system/juce_PlatformDefs.h"
+#include "system/juce_StandardHeader.h"
+#include "system/juce_SystemStats.h"
+#include "system/juce_TargetPlatform.h"
+#include "threads/juce_ChildProcess.h"
+#include "threads/juce_DynamicLibrary.h"
+#include "threads/juce_HighResolutionTimer.h"
+#include "threads/juce_InterProcessLock.h"
+#include "threads/juce_Process.h"
+#include "threads/juce_ScopedLock.h"
+#include "threads/juce_SpinLock.h"
+#include "threads/juce_WaitableEvent.h"
+#include "threads/juce_Thread.h"
+#include "threads/juce_ThreadLocalValue.h"
+#include "threads/juce_ThreadPool.h"
+#include "threads/juce_TimeSliceThread.h"
+#include "threads/juce_ReadWriteLock.h"
+#include "threads/juce_ScopedReadLock.h"
+#include "threads/juce_ScopedWriteLock.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
+#include "containers/juce_PropertySet.h"
 
 }
 
diff --git a/modules/juce_core/logging/juce_FileLogger.h b/modules/juce_core/logging/juce_FileLogger.h
index 87cb7cdfc1..6be1668cb7 100644
--- a/modules/juce_core/logging/juce_FileLogger.h
+++ b/modules/juce_core/logging/juce_FileLogger.h
@@ -29,10 +29,6 @@
 #ifndef JUCE_FILELOGGER_H_INCLUDED
 #define JUCE_FILELOGGER_H_INCLUDED
 
-#include "juce_Logger.h"
-#include "../files/juce_File.h"
-#include "../memory/juce_ScopedPointer.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/logging/juce_Logger.h b/modules/juce_core/logging/juce_Logger.h
index 142ed338cf..d0d3af57ff 100644
--- a/modules/juce_core/logging/juce_Logger.h
+++ b/modules/juce_core/logging/juce_Logger.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_LOGGER_H_INCLUDED
 #define JUCE_LOGGER_H_INCLUDED
 
-#include "../text/juce_String.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/maths/juce_BigInteger.h b/modules/juce_core/maths/juce_BigInteger.h
index abf48a2241..e79182034b 100644
--- a/modules/juce_core/maths/juce_BigInteger.h
+++ b/modules/juce_core/maths/juce_BigInteger.h
@@ -29,10 +29,6 @@
 #ifndef JUCE_BIGINTEGER_H_INCLUDED
 #define JUCE_BIGINTEGER_H_INCLUDED
 
-#include "../text/juce_String.h"
-#include "../memory/juce_HeapBlock.h"
-class MemoryBlock;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/maths/juce_Expression.h b/modules/juce_core/maths/juce_Expression.h
index 3b08bef627..e6443c89a6 100644
--- a/modules/juce_core/maths/juce_Expression.h
+++ b/modules/juce_core/maths/juce_Expression.h
@@ -29,10 +29,6 @@
 #ifndef JUCE_EXPRESSION_H_INCLUDED
 #define JUCE_EXPRESSION_H_INCLUDED
 
-#include "../memory/juce_ReferenceCountedObject.h"
-#include "../containers/juce_Array.h"
-#include "../memory/juce_ScopedPointer.h"
-
 
 //==============================================================================
 /**
@@ -264,7 +260,7 @@ private:
     struct Helpers;
     friend class Term;
     friend struct Helpers;
-    friend class ScopedPointer<Term>;
+    friend struct ContainerDeletePolicy<Term>;
     friend class ReferenceCountedObjectPtr<Term>;
     ReferenceCountedObjectPtr<Term> term;
 
diff --git a/modules/juce_core/maths/juce_Random.h b/modules/juce_core/maths/juce_Random.h
index 67d6a59cdc..060b084721 100644
--- a/modules/juce_core/maths/juce_Random.h
+++ b/modules/juce_core/maths/juce_Random.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_RANDOM_H_INCLUDED
 #define JUCE_RANDOM_H_INCLUDED
 
-#include "juce_BigInteger.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/memory/juce_ContainerDeletePolicy.h b/modules/juce_core/memory/juce_ContainerDeletePolicy.h
new file mode 100644
index 0000000000..60cddaa75c
--- /dev/null
+++ b/modules/juce_core/memory/juce_ContainerDeletePolicy.h
@@ -0,0 +1,53 @@
+/*
+  ==============================================================================
+
+   This file is part of the juce_core module of the JUCE library.
+   Copyright (c) 2013 - Raw Material Software Ltd.
+
+   Permission to use, copy, modify, and/or distribute this software for any purpose with
+   or without fee is hereby granted, provided that the above copyright notice and this
+   permission notice appear in all copies.
+
+   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
+   TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
+   NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+   DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+   IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+   CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+   ------------------------------------------------------------------------------
+
+   NOTE! This permissive ISC license applies ONLY to files within the juce_core module!
+   All other JUCE modules are covered by a dual GPL/commercial license, so if you are
+   using any other modules, be sure to check that you also comply with their license.
+
+   For more details, visit www.juce.com
+
+  ==============================================================================
+*/
+
+#ifndef JUCE_CONTAINERDELETEPOLICY_H_INCLUDED
+#define JUCE_CONTAINERDELETEPOLICY_H_INCLUDED
+
+//==============================================================================
+/**
+    Used by container classes as an indirect way to delete an object of a
+    particular type.
+
+    The generic implementation of this class simply calls 'delete', but you can
+    create a specialised version of it for a particular class if you need to
+    delete that type of object in a more appropriate way.
+
+    @see ScopedPointer, OwnedArray
+*/
+template <typename ObjectType>
+struct ContainerDeletePolicy
+{
+    static void destroy (ObjectType* object)
+    {
+        delete object;
+    }
+};
+
+
+#endif   // JUCE_CONTAINERDELETEPOLICY_H_INCLUDED
diff --git a/modules/juce_core/memory/juce_LeakedObjectDetector.h b/modules/juce_core/memory/juce_LeakedObjectDetector.h
index 56e4a670c3..248e7bcfbd 100644
--- a/modules/juce_core/memory/juce_LeakedObjectDetector.h
+++ b/modules/juce_core/memory/juce_LeakedObjectDetector.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_LEAKEDOBJECTDETECTOR_H_INCLUDED
 #define JUCE_LEAKEDOBJECTDETECTOR_H_INCLUDED
 
-#include "../text/juce_String.h"
-#include "juce_Atomic.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/memory/juce_MemoryBlock.h b/modules/juce_core/memory/juce_MemoryBlock.h
index b5adcab946..650218b9bf 100644
--- a/modules/juce_core/memory/juce_MemoryBlock.h
+++ b/modules/juce_core/memory/juce_MemoryBlock.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_MEMORYBLOCK_H_INCLUDED
 #define JUCE_MEMORYBLOCK_H_INCLUDED
 
-#include "../text/juce_String.h"
-#include "../memory/juce_HeapBlock.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/memory/juce_OptionalScopedPointer.h b/modules/juce_core/memory/juce_OptionalScopedPointer.h
index cc5531ea0e..a633dca1b8 100644
--- a/modules/juce_core/memory/juce_OptionalScopedPointer.h
+++ b/modules/juce_core/memory/juce_OptionalScopedPointer.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_OPTIONALSCOPEDPOINTER_H_INCLUDED
 #define JUCE_OPTIONALSCOPEDPOINTER_H_INCLUDED
 
-#include "juce_ScopedPointer.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/memory/juce_ScopedPointer.h b/modules/juce_core/memory/juce_ScopedPointer.h
index 7f95804114..a7fcff0dd8 100644
--- a/modules/juce_core/memory/juce_ScopedPointer.h
+++ b/modules/juce_core/memory/juce_ScopedPointer.h
@@ -97,7 +97,7 @@ public:
     /** Destructor.
         This will delete the object that this ScopedPointer currently refers to.
     */
-    inline ~ScopedPointer()                                                         { delete object; }
+    inline ~ScopedPointer()                 { ContainerDeletePolicy<ObjectType>::destroy (object); }
 
     /** Changes this ScopedPointer to point to a new object.
 
@@ -119,7 +119,7 @@ public:
             ObjectType* const oldObject = object;
             object = objectToTransferFrom.object;
             objectToTransferFrom.object = nullptr;
-            delete oldObject;
+            ContainerDeletePolicy<ObjectType>::destroy (oldObject);
         }
 
         return *this;
@@ -138,7 +138,7 @@ public:
         {
             ObjectType* const oldObject = object;
             object = newObjectToTakePossessionOf;
-            delete oldObject;
+            ContainerDeletePolicy<ObjectType>::destroy (oldObject);
         }
 
         return *this;
diff --git a/modules/juce_core/memory/juce_WeakReference.h b/modules/juce_core/memory/juce_WeakReference.h
index ac2048a071..b56808ad64 100644
--- a/modules/juce_core/memory/juce_WeakReference.h
+++ b/modules/juce_core/memory/juce_WeakReference.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_WEAKREFERENCE_H_INCLUDED
 #define JUCE_WEAKREFERENCE_H_INCLUDED
 
-#include "juce_ReferenceCountedObject.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/misc/juce_Result.h b/modules/juce_core/misc/juce_Result.h
index be88580bfc..7c320ac336 100644
--- a/modules/juce_core/misc/juce_Result.h
+++ b/modules/juce_core/misc/juce_Result.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_RESULT_H_INCLUDED
 #define JUCE_RESULT_H_INCLUDED
 
-#include "../text/juce_String.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/misc/juce_Uuid.h b/modules/juce_core/misc/juce_Uuid.h
index 9358de008b..29974dec66 100644
--- a/modules/juce_core/misc/juce_Uuid.h
+++ b/modules/juce_core/misc/juce_Uuid.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_UUID_H_INCLUDED
 #define JUCE_UUID_H_INCLUDED
 
-#include "../text/juce_String.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/network/juce_MACAddress.h b/modules/juce_core/network/juce_MACAddress.h
index c07e1d2cf0..0fa9d9dd2f 100644
--- a/modules/juce_core/network/juce_MACAddress.h
+++ b/modules/juce_core/network/juce_MACAddress.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_MACADDRESS_H_INCLUDED
 #define JUCE_MACADDRESS_H_INCLUDED
 
-#include "../containers/juce_Array.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/network/juce_NamedPipe.h b/modules/juce_core/network/juce_NamedPipe.h
index 961b2157f2..d2029bd027 100644
--- a/modules/juce_core/network/juce_NamedPipe.h
+++ b/modules/juce_core/network/juce_NamedPipe.h
@@ -29,7 +29,6 @@
 #ifndef JUCE_NAMEDPIPE_H_INCLUDED
 #define JUCE_NAMEDPIPE_H_INCLUDED
 
-#include "../threads/juce_ReadWriteLock.h"
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/network/juce_Socket.h b/modules/juce_core/network/juce_Socket.h
index 0780a1b83d..616d2db095 100644
--- a/modules/juce_core/network/juce_Socket.h
+++ b/modules/juce_core/network/juce_Socket.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_SOCKET_H_INCLUDED
 #define JUCE_SOCKET_H_INCLUDED
 
-#include "../text/juce_String.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/network/juce_URL.h b/modules/juce_core/network/juce_URL.h
index 5578a439ed..9381fa6ecb 100644
--- a/modules/juce_core/network/juce_URL.h
+++ b/modules/juce_core/network/juce_URL.h
@@ -29,11 +29,6 @@
 #ifndef JUCE_URL_H_INCLUDED
 #define JUCE_URL_H_INCLUDED
 
-#include "../text/juce_StringPairArray.h"
-#include "../files/juce_File.h"
-class InputStream;
-class XmlElement;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/streams/juce_BufferedInputStream.h b/modules/juce_core/streams/juce_BufferedInputStream.h
index 47035a85f3..8f1e633bed 100644
--- a/modules/juce_core/streams/juce_BufferedInputStream.h
+++ b/modules/juce_core/streams/juce_BufferedInputStream.h
@@ -29,10 +29,6 @@
 #ifndef JUCE_BUFFEREDINPUTSTREAM_H_INCLUDED
 #define JUCE_BUFFEREDINPUTSTREAM_H_INCLUDED
 
-#include "juce_InputStream.h"
-#include "../memory/juce_OptionalScopedPointer.h"
-#include "../memory/juce_HeapBlock.h"
-
 
 //==============================================================================
 /** Wraps another input stream, and reads from it using an intermediate buffer
diff --git a/modules/juce_core/streams/juce_FileInputSource.h b/modules/juce_core/streams/juce_FileInputSource.h
index 7ce8ae9cb5..d2e6d862fe 100644
--- a/modules/juce_core/streams/juce_FileInputSource.h
+++ b/modules/juce_core/streams/juce_FileInputSource.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_FILEINPUTSOURCE_H_INCLUDED
 #define JUCE_FILEINPUTSOURCE_H_INCLUDED
 
-#include "juce_InputSource.h"
-#include "../files/juce_File.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/streams/juce_InputSource.h b/modules/juce_core/streams/juce_InputSource.h
index 8e214c4876..0e13ac520e 100644
--- a/modules/juce_core/streams/juce_InputSource.h
+++ b/modules/juce_core/streams/juce_InputSource.h
@@ -29,7 +29,6 @@
 #ifndef JUCE_INPUTSOURCE_H_INCLUDED
 #define JUCE_INPUTSOURCE_H_INCLUDED
 
-#include "juce_InputStream.h"
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/streams/juce_InputStream.h b/modules/juce_core/streams/juce_InputStream.h
index d29df065ad..0c7e2dc50c 100644
--- a/modules/juce_core/streams/juce_InputStream.h
+++ b/modules/juce_core/streams/juce_InputStream.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_INPUTSTREAM_H_INCLUDED
 #define JUCE_INPUTSTREAM_H_INCLUDED
 
-#include "../text/juce_String.h"
-class MemoryBlock;
-
 
 //==============================================================================
 /** The base class for streams that read data.
diff --git a/modules/juce_core/streams/juce_MemoryInputStream.h b/modules/juce_core/streams/juce_MemoryInputStream.h
index 509c3eb290..013bc39f66 100644
--- a/modules/juce_core/streams/juce_MemoryInputStream.h
+++ b/modules/juce_core/streams/juce_MemoryInputStream.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_MEMORYINPUTSTREAM_H_INCLUDED
 #define JUCE_MEMORYINPUTSTREAM_H_INCLUDED
 
-#include "juce_InputStream.h"
-#include "../memory/juce_HeapBlock.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/streams/juce_MemoryOutputStream.h b/modules/juce_core/streams/juce_MemoryOutputStream.h
index 06c08d6066..95d7be40ce 100644
--- a/modules/juce_core/streams/juce_MemoryOutputStream.h
+++ b/modules/juce_core/streams/juce_MemoryOutputStream.h
@@ -29,10 +29,6 @@
 #ifndef JUCE_MEMORYOUTPUTSTREAM_H_INCLUDED
 #define JUCE_MEMORYOUTPUTSTREAM_H_INCLUDED
 
-#include "juce_OutputStream.h"
-#include "../memory/juce_MemoryBlock.h"
-#include "../memory/juce_ScopedPointer.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/streams/juce_OutputStream.h b/modules/juce_core/streams/juce_OutputStream.h
index beb7d3b909..ead633b5a4 100644
--- a/modules/juce_core/streams/juce_OutputStream.h
+++ b/modules/juce_core/streams/juce_OutputStream.h
@@ -29,12 +29,6 @@
 #ifndef JUCE_OUTPUTSTREAM_H_INCLUDED
 #define JUCE_OUTPUTSTREAM_H_INCLUDED
 
-#include "../text/juce_String.h"
-#include "../text/juce_NewLine.h"
-class InputStream;
-class MemoryBlock;
-class File;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/streams/juce_SubregionStream.h b/modules/juce_core/streams/juce_SubregionStream.h
index 323c249217..d291a03c34 100644
--- a/modules/juce_core/streams/juce_SubregionStream.h
+++ b/modules/juce_core/streams/juce_SubregionStream.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_SUBREGIONSTREAM_H_INCLUDED
 #define JUCE_SUBREGIONSTREAM_H_INCLUDED
 
-#include "juce_InputStream.h"
-#include "../memory/juce_OptionalScopedPointer.h"
-
 
 //==============================================================================
 /** Wraps another input stream, and reads from a specific part of it.
diff --git a/modules/juce_core/system/juce_StandardHeader.h b/modules/juce_core/system/juce_StandardHeader.h
index d2c880e622..fe8642ed5b 100644
--- a/modules/juce_core/system/juce_StandardHeader.h
+++ b/modules/juce_core/system/juce_StandardHeader.h
@@ -164,6 +164,7 @@ namespace juce
     #include "../memory/juce_Memory.h"
     #include "../maths/juce_MathsFunctions.h"
     #include "../memory/juce_ByteOrder.h"
+    #include "../text/juce_String.h"
     #include "../logging/juce_Logger.h"
     #include "../memory/juce_LeakedObjectDetector.h"
 }
diff --git a/modules/juce_core/system/juce_SystemStats.h b/modules/juce_core/system/juce_SystemStats.h
index 838f68dfe8..dd40674d0c 100644
--- a/modules/juce_core/system/juce_SystemStats.h
+++ b/modules/juce_core/system/juce_SystemStats.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_SYSTEMSTATS_H_INCLUDED
 #define JUCE_SYSTEMSTATS_H_INCLUDED
 
-#include "../text/juce_StringArray.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/text/juce_Identifier.h b/modules/juce_core/text/juce_Identifier.h
index 8ab1fd81f5..74c6a74b2c 100644
--- a/modules/juce_core/text/juce_Identifier.h
+++ b/modules/juce_core/text/juce_Identifier.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_IDENTIFIER_H_INCLUDED
 #define JUCE_IDENTIFIER_H_INCLUDED
 
-class StringPool;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/text/juce_LocalisedStrings.h b/modules/juce_core/text/juce_LocalisedStrings.h
index 8a55e06576..b59f2f5fb1 100644
--- a/modules/juce_core/text/juce_LocalisedStrings.h
+++ b/modules/juce_core/text/juce_LocalisedStrings.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_LOCALISEDSTRINGS_H_INCLUDED
 #define JUCE_LOCALISEDSTRINGS_H_INCLUDED
 
-#include "juce_StringPairArray.h"
-#include "../files/juce_File.h"
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/text/juce_String.cpp b/modules/juce_core/text/juce_String.cpp
index 60a948cfb9..bcdd12dfd0 100644
--- a/modules/juce_core/text/juce_String.cpp
+++ b/modules/juce_core/text/juce_String.cpp
@@ -686,50 +686,38 @@ String& String::operator+= (const int number)
 }
 
 //==============================================================================
-JUCE_API String JUCE_CALLTYPE operator+ (const char* const string1, const String& string2)
-{
-    String s (string1);
-    return s += string2;
-}
+JUCE_API String JUCE_CALLTYPE operator+ (const char* const s1, const String& s2)    { String s (s1); return s += s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (const wchar_t* const s1, const String& s2) { String s (s1); return s += s2; }
 
-JUCE_API String JUCE_CALLTYPE operator+ (const wchar_t* const string1, const String& string2)
-{
-    String s (string1);
-    return s += string2;
-}
+JUCE_API String JUCE_CALLTYPE operator+ (const char s1, const String& s2)           { return String::charToString ((juce_wchar) (uint8) s1) + s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (const wchar_t s1, const String& s2)        { return String::charToString (s1) + s2; }
+
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, const String& s2)               { return s1 += s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, const char* const s2)           { return s1 += s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, const wchar_t* s2)              { return s1 += s2; }
+
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, const char s2)                  { return s1 += s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, const wchar_t s2)               { return s1 += s2; }
 
-JUCE_API String JUCE_CALLTYPE operator+ (const char s1, const String& s2)       { return String::charToString ((juce_wchar) (uint8) s1) + s2; }
-JUCE_API String JUCE_CALLTYPE operator+ (const wchar_t s1, const String& s2)    { return String::charToString (s1) + s2; }
 #if ! JUCE_NATIVE_WCHAR_IS_UTF32
-JUCE_API String JUCE_CALLTYPE operator+ (const juce_wchar s1, const String& s2) { return String::charToString (s1) + s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (const juce_wchar s1, const String& s2)     { return String::charToString (s1) + s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, const juce_wchar s2)            { return s1 += s2; }
+JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const juce_wchar s2)         { return s1 += s2; }
 #endif
 
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, const String& s2)       { return s1 += s2; }
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, const char* const s2)   { return s1 += s2; }
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, const wchar_t* s2)      { return s1 += s2; }
+JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const char s2)               { return s1 += s2; }
+JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const wchar_t s2)            { return s1 += s2; }
 
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, const char s2)          { return s1 += s2; }
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, const wchar_t s2)       { return s1 += s2; }
-#if ! JUCE_NATIVE_WCHAR_IS_UTF32
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, const juce_wchar s2)    { return s1 += s2; }
-#endif
+JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const char* const s2)        { return s1 += s2; }
+JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const wchar_t* const s2)     { return s1 += s2; }
+JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const String& s2)            { return s1 += s2; }
 
-JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const char s2)             { return s1 += s2; }
-JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const wchar_t s2)          { return s1 += s2; }
-#if ! JUCE_NATIVE_WCHAR_IS_UTF32
-JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const juce_wchar s2)       { return s1 += s2; }
-#endif
-
-JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const char* const s2)      { return s1 += s2; }
-JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const wchar_t* const s2)   { return s1 += s2; }
-JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const String& s2)          { return s1 += s2; }
-
-JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const short number)        { return s1 += (int) number; }
-JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const int number)          { return s1 += number; }
-JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const long number)         { return s1 += (int) number; }
-JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const int64 number)        { return s1 << String (number); }
-JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const float number)        { return s1 += String (number); }
-JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const double number)       { return s1 += String (number); }
+JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const int number)            { return s1 += number; }
+JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const short number)          { return s1 += (int) number; }
+JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const long number)           { return s1 += (int) number; }
+JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const int64 number)          { return s1 += String (number); }
+JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const float number)          { return s1 += String (number); }
+JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, const double number)         { return s1 += String (number); }
 
 JUCE_API OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const String& text)
 {
diff --git a/modules/juce_core/text/juce_StringArray.h b/modules/juce_core/text/juce_StringArray.h
index f39c9feecc..e3c0de66c3 100644
--- a/modules/juce_core/text/juce_StringArray.h
+++ b/modules/juce_core/text/juce_StringArray.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_STRINGARRAY_H_INCLUDED
 #define JUCE_STRINGARRAY_H_INCLUDED
 
-#include "juce_String.h"
-#include "../containers/juce_Array.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/text/juce_StringPairArray.h b/modules/juce_core/text/juce_StringPairArray.h
index b6ace332b7..f9c1bb1db4 100644
--- a/modules/juce_core/text/juce_StringPairArray.h
+++ b/modules/juce_core/text/juce_StringPairArray.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_STRINGPAIRARRAY_H_INCLUDED
 #define JUCE_STRINGPAIRARRAY_H_INCLUDED
 
-#include "juce_StringArray.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/text/juce_StringPool.h b/modules/juce_core/text/juce_StringPool.h
index d4aa05823e..fc4dde3275 100644
--- a/modules/juce_core/text/juce_StringPool.h
+++ b/modules/juce_core/text/juce_StringPool.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_STRINGPOOL_H_INCLUDED
 #define JUCE_STRINGPOOL_H_INCLUDED
 
-#include "juce_String.h"
-#include "../containers/juce_Array.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/threads/juce_ChildProcess.h b/modules/juce_core/threads/juce_ChildProcess.h
index 574ac9fa6a..f8522e7e79 100644
--- a/modules/juce_core/threads/juce_ChildProcess.h
+++ b/modules/juce_core/threads/juce_ChildProcess.h
@@ -95,7 +95,7 @@ public:
 private:
     //==============================================================================
     class ActiveProcess;
-    friend class ScopedPointer<ActiveProcess>;
+    friend struct ContainerDeletePolicy<ActiveProcess>;
     ScopedPointer<ActiveProcess> activeProcess;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ChildProcess)
diff --git a/modules/juce_core/threads/juce_HighResolutionTimer.h b/modules/juce_core/threads/juce_HighResolutionTimer.h
index aae8390f9b..21022adc69 100644
--- a/modules/juce_core/threads/juce_HighResolutionTimer.h
+++ b/modules/juce_core/threads/juce_HighResolutionTimer.h
@@ -99,7 +99,7 @@ public:
 private:
     struct Pimpl;
     friend struct Pimpl;
-    friend class ScopedPointer<Pimpl>;
+    friend struct ContainerDeletePolicy<Pimpl>;
     ScopedPointer<Pimpl> pimpl;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (HighResolutionTimer)
diff --git a/modules/juce_core/threads/juce_InterProcessLock.h b/modules/juce_core/threads/juce_InterProcessLock.h
index 654c2e8a55..dc903b02b9 100644
--- a/modules/juce_core/threads/juce_InterProcessLock.h
+++ b/modules/juce_core/threads/juce_InterProcessLock.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_INTERPROCESSLOCK_H_INCLUDED
 #define JUCE_INTERPROCESSLOCK_H_INCLUDED
 
-#include "../text/juce_String.h"
-#include "../memory/juce_ScopedPointer.h"
-
 
 //==============================================================================
 /**
@@ -118,8 +115,8 @@ public:
 private:
     //==============================================================================
     class Pimpl;
-    friend class ScopedPointer <Pimpl>;
-    ScopedPointer <Pimpl> pimpl;
+    friend struct ContainerDeletePolicy<Pimpl>;
+    ScopedPointer<Pimpl> pimpl;
 
     CriticalSection lock;
     String name;
diff --git a/modules/juce_core/threads/juce_Process.h b/modules/juce_core/threads/juce_Process.h
index f458ebf34f..20ad152c72 100644
--- a/modules/juce_core/threads/juce_Process.h
+++ b/modules/juce_core/threads/juce_Process.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_PROCESS_H_INCLUDED
 #define JUCE_PROCESS_H_INCLUDED
 
-#include "../text/juce_String.h"
-
 
 //==============================================================================
 /** Represents the current executable's process.
diff --git a/modules/juce_core/threads/juce_ReadWriteLock.h b/modules/juce_core/threads/juce_ReadWriteLock.h
index c5be7c77a6..ab05099606 100644
--- a/modules/juce_core/threads/juce_ReadWriteLock.h
+++ b/modules/juce_core/threads/juce_ReadWriteLock.h
@@ -29,12 +29,6 @@
 #ifndef JUCE_READWRITELOCK_H_INCLUDED
 #define JUCE_READWRITELOCK_H_INCLUDED
 
-#include "juce_CriticalSection.h"
-#include "juce_SpinLock.h"
-#include "juce_WaitableEvent.h"
-#include "juce_Thread.h"
-#include "../containers/juce_Array.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/threads/juce_ScopedReadLock.h b/modules/juce_core/threads/juce_ScopedReadLock.h
index 874195be42..107e838a50 100644
--- a/modules/juce_core/threads/juce_ScopedReadLock.h
+++ b/modules/juce_core/threads/juce_ScopedReadLock.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_SCOPEDREADLOCK_H_INCLUDED
 #define JUCE_SCOPEDREADLOCK_H_INCLUDED
 
-#include "juce_ReadWriteLock.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/threads/juce_ScopedWriteLock.h b/modules/juce_core/threads/juce_ScopedWriteLock.h
index f4a8e329a9..44e3198a58 100644
--- a/modules/juce_core/threads/juce_ScopedWriteLock.h
+++ b/modules/juce_core/threads/juce_ScopedWriteLock.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_SCOPEDWRITELOCK_H_INCLUDED
 #define JUCE_SCOPEDWRITELOCK_H_INCLUDED
 
-#include "juce_ReadWriteLock.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/threads/juce_SpinLock.h b/modules/juce_core/threads/juce_SpinLock.h
index e7a450560a..664cc3c0a0 100644
--- a/modules/juce_core/threads/juce_SpinLock.h
+++ b/modules/juce_core/threads/juce_SpinLock.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_SPINLOCK_H_INCLUDED
 #define JUCE_SPINLOCK_H_INCLUDED
 
-#include "juce_ScopedLock.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/threads/juce_Thread.h b/modules/juce_core/threads/juce_Thread.h
index 086eb7ef9c..aef96b7dc0 100644
--- a/modules/juce_core/threads/juce_Thread.h
+++ b/modules/juce_core/threads/juce_Thread.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_THREAD_H_INCLUDED
 #define JUCE_THREAD_H_INCLUDED
 
-#include "juce_WaitableEvent.h"
-#include "juce_CriticalSection.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/threads/juce_ThreadPool.h b/modules/juce_core/threads/juce_ThreadPool.h
index f91bb54923..566d19ea26 100644
--- a/modules/juce_core/threads/juce_ThreadPool.h
+++ b/modules/juce_core/threads/juce_ThreadPool.h
@@ -29,10 +29,6 @@
 #ifndef JUCE_THREADPOOL_H_INCLUDED
 #define JUCE_THREADPOOL_H_INCLUDED
 
-#include "juce_Thread.h"
-#include "../text/juce_StringArray.h"
-#include "../containers/juce_Array.h"
-#include "../containers/juce_OwnedArray.h"
 class ThreadPool;
 class ThreadPoolThread;
 
@@ -295,8 +291,8 @@ private:
 
     class ThreadPoolThread;
     friend class ThreadPoolThread;
-    friend class OwnedArray <ThreadPoolThread>;
-    OwnedArray <ThreadPoolThread> threads;
+    friend struct ContainerDeletePolicy<ThreadPoolThread>;
+    OwnedArray<ThreadPoolThread> threads;
 
     CriticalSection lock;
     WaitableEvent jobFinishedSignal;
diff --git a/modules/juce_core/threads/juce_TimeSliceThread.h b/modules/juce_core/threads/juce_TimeSliceThread.h
index b98fb33610..8c30567507 100644
--- a/modules/juce_core/threads/juce_TimeSliceThread.h
+++ b/modules/juce_core/threads/juce_TimeSliceThread.h
@@ -29,9 +29,6 @@
 #ifndef JUCE_TIMESLICETHREAD_H_INCLUDED
 #define JUCE_TIMESLICETHREAD_H_INCLUDED
 
-#include "juce_Thread.h"
-#include "../containers/juce_Array.h"
-#include "../time/juce_Time.h"
 class TimeSliceThread;
 
 
diff --git a/modules/juce_core/threads/juce_WaitableEvent.h b/modules/juce_core/threads/juce_WaitableEvent.h
index f0f1ad1058..cf41d92625 100644
--- a/modules/juce_core/threads/juce_WaitableEvent.h
+++ b/modules/juce_core/threads/juce_WaitableEvent.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_WAITABLEEVENT_H_INCLUDED
 #define JUCE_WAITABLEEVENT_H_INCLUDED
 
-#include "../text/juce_String.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/time/juce_PerformanceCounter.h b/modules/juce_core/time/juce_PerformanceCounter.h
index d4088a24c0..9d629ea2d3 100644
--- a/modules/juce_core/time/juce_PerformanceCounter.h
+++ b/modules/juce_core/time/juce_PerformanceCounter.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_PERFORMANCECOUNTER_H_INCLUDED
 #define JUCE_PERFORMANCECOUNTER_H_INCLUDED
 
-#include "../files/juce_File.h"
-
 
 //==============================================================================
 /** A timer for measuring performance of code and dumping the results to a file.
diff --git a/modules/juce_core/time/juce_RelativeTime.h b/modules/juce_core/time/juce_RelativeTime.h
index 3c6a58f9ea..7e39d21177 100644
--- a/modules/juce_core/time/juce_RelativeTime.h
+++ b/modules/juce_core/time/juce_RelativeTime.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_RELATIVETIME_H_INCLUDED
 #define JUCE_RELATIVETIME_H_INCLUDED
 
-#include "../text/juce_String.h"
-
 
 //==============================================================================
 /** A relative measure of time.
diff --git a/modules/juce_core/time/juce_Time.h b/modules/juce_core/time/juce_Time.h
index 5fa7cee475..f72fb2ce0f 100644
--- a/modules/juce_core/time/juce_Time.h
+++ b/modules/juce_core/time/juce_Time.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_TIME_H_INCLUDED
 #define JUCE_TIME_H_INCLUDED
 
-#include "juce_RelativeTime.h"
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/unit_tests/juce_UnitTest.h b/modules/juce_core/unit_tests/juce_UnitTest.h
index 522c8f9b88..cfbb77b8e3 100644
--- a/modules/juce_core/unit_tests/juce_UnitTest.h
+++ b/modules/juce_core/unit_tests/juce_UnitTest.h
@@ -29,8 +29,6 @@
 #ifndef JUCE_UNITTEST_H_INCLUDED
 #define JUCE_UNITTEST_H_INCLUDED
 
-#include "../text/juce_StringArray.h"
-#include "../containers/juce_OwnedArray.h"
 class UnitTestRunner;
 
 
diff --git a/modules/juce_core/xml/juce_XmlDocument.h b/modules/juce_core/xml/juce_XmlDocument.h
index 48a6c3f5fc..31f9963f29 100644
--- a/modules/juce_core/xml/juce_XmlDocument.h
+++ b/modules/juce_core/xml/juce_XmlDocument.h
@@ -29,12 +29,6 @@
 #ifndef JUCE_XMLDOCUMENT_H_INCLUDED
 #define JUCE_XMLDOCUMENT_H_INCLUDED
 
-#include "juce_XmlElement.h"
-#include "../text/juce_StringArray.h"
-#include "../files/juce_File.h"
-#include "../memory/juce_ScopedPointer.h"
-class InputSource;
-
 
 //==============================================================================
 /**
diff --git a/modules/juce_core/xml/juce_XmlElement.h b/modules/juce_core/xml/juce_XmlElement.h
index 89c97c1788..415308882b 100644
--- a/modules/juce_core/xml/juce_XmlElement.h
+++ b/modules/juce_core/xml/juce_XmlElement.h
@@ -29,11 +29,6 @@
 #ifndef JUCE_XMLELEMENT_H_INCLUDED
 #define JUCE_XMLELEMENT_H_INCLUDED
 
-#include "../text/juce_String.h"
-#include "../streams/juce_OutputStream.h"
-#include "../files/juce_File.h"
-#include "../containers/juce_LinkedListPointer.h"
-
 
 //==============================================================================
 /** A handy macro to make it easy to iterate all the child elements in an XmlElement.
diff --git a/modules/juce_core/zip/juce_GZIPCompressorOutputStream.h b/modules/juce_core/zip/juce_GZIPCompressorOutputStream.h
index 9a2b936811..fe484b08ee 100644
--- a/modules/juce_core/zip/juce_GZIPCompressorOutputStream.h
+++ b/modules/juce_core/zip/juce_GZIPCompressorOutputStream.h
@@ -29,10 +29,6 @@
 #ifndef JUCE_GZIPCOMPRESSOROUTPUTSTREAM_H_INCLUDED
 #define JUCE_GZIPCOMPRESSOROUTPUTSTREAM_H_INCLUDED
 
-#include "../streams/juce_OutputStream.h"
-#include "../memory/juce_OptionalScopedPointer.h"
-#include "../memory/juce_HeapBlock.h"
-
 
 //==============================================================================
 /**
@@ -96,8 +92,8 @@ private:
     OptionalScopedPointer<OutputStream> destStream;
 
     class GZIPCompressorHelper;
-    friend class ScopedPointer <GZIPCompressorHelper>;
-    ScopedPointer <GZIPCompressorHelper> helper;
+    friend struct ContainerDeletePolicy<GZIPCompressorHelper>;
+    ScopedPointer<GZIPCompressorHelper> helper;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GZIPCompressorOutputStream)
 };
diff --git a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h
index bc859d4887..78a0b77b7f 100644
--- a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h
+++ b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h
@@ -29,10 +29,6 @@
 #ifndef JUCE_GZIPDECOMPRESSORINPUTSTREAM_H_INCLUDED
 #define JUCE_GZIPDECOMPRESSORINPUTSTREAM_H_INCLUDED
 
-#include "../streams/juce_InputStream.h"
-#include "../memory/juce_OptionalScopedPointer.h"
-#include "../memory/juce_HeapBlock.h"
-
 
 //==============================================================================
 /**
@@ -92,8 +88,8 @@ private:
     HeapBlock <uint8> buffer;
 
     class GZIPDecompressHelper;
-    friend class ScopedPointer <GZIPDecompressHelper>;
-    ScopedPointer <GZIPDecompressHelper> helper;
+    friend struct ContainerDeletePolicy<GZIPDecompressHelper>;
+    ScopedPointer<GZIPDecompressHelper> helper;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GZIPDecompressorInputStream)
 };
diff --git a/modules/juce_core/zip/juce_ZipFile.h b/modules/juce_core/zip/juce_ZipFile.h
index 1b8f120e41..23f87d373c 100644
--- a/modules/juce_core/zip/juce_ZipFile.h
+++ b/modules/juce_core/zip/juce_ZipFile.h
@@ -29,11 +29,6 @@
 #ifndef JUCE_ZIPFILE_H_INCLUDED
 #define JUCE_ZIPFILE_H_INCLUDED
 
-#include "../files/juce_File.h"
-#include "../streams/juce_InputSource.h"
-#include "../threads/juce_CriticalSection.h"
-#include "../containers/juce_OwnedArray.h"
-
 
 //==============================================================================
 /**
@@ -210,7 +205,7 @@ public:
         //==============================================================================
     private:
         class Item;
-        friend class OwnedArray<Item>;
+        friend struct ContainerDeletePolicy<Item>;
         OwnedArray<Item> items;
 
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Builder)
diff --git a/modules/juce_data_structures/undomanager/juce_UndoManager.h b/modules/juce_data_structures/undomanager/juce_UndoManager.h
index 0307b238b9..1ae85a7942 100644
--- a/modules/juce_data_structures/undomanager/juce_UndoManager.h
+++ b/modules/juce_data_structures/undomanager/juce_UndoManager.h
@@ -216,7 +216,7 @@ public:
 private:
     //==============================================================================
     struct ActionSet;
-    friend class OwnedArray<ActionSet>;
+    friend struct ContainerDeletePolicy<ActionSet>;
     OwnedArray<ActionSet> transactions;
     String currentTransactionName;
     int totalUnitsStored, maxNumUnitsToKeep, minimumTransactionsToKeep, nextIndex;
diff --git a/modules/juce_graphics/fonts/juce_CustomTypeface.h b/modules/juce_graphics/fonts/juce_CustomTypeface.h
index 20144e507c..8e7e020dd5 100644
--- a/modules/juce_graphics/fonts/juce_CustomTypeface.h
+++ b/modules/juce_graphics/fonts/juce_CustomTypeface.h
@@ -25,10 +25,6 @@
 #ifndef JUCE_CUSTOMTYPEFACE_H_INCLUDED
 #define JUCE_CUSTOMTYPEFACE_H_INCLUDED
 
-#include "juce_Typeface.h"
-class InputStream;
-class OutputStream;
-
 
 //==============================================================================
 /**
@@ -142,8 +138,8 @@ protected:
 private:
     //==============================================================================
     class GlyphInfo;
-    friend class OwnedArray<GlyphInfo>;
-    OwnedArray <GlyphInfo> glyphs;
+    friend struct ContainerDeletePolicy<GlyphInfo>;
+    OwnedArray<GlyphInfo> glyphs;
     short lookupTable [128];
 
     GlyphInfo* findGlyph (const juce_wchar character, bool loadIfNeeded) noexcept;
diff --git a/modules/juce_graphics/geometry/juce_Path.h b/modules/juce_graphics/geometry/juce_Path.h
index 1097932c6d..04aa8dee08 100644
--- a/modules/juce_graphics/geometry/juce_Path.h
+++ b/modules/juce_graphics/geometry/juce_Path.h
@@ -30,8 +30,6 @@
 #include "juce_Rectangle.h"
 #include "../placement/juce_Justification.h"
 class Image;
-class InputStream;
-class OutputStream;
 
 
 //==============================================================================
diff --git a/modules/juce_graphics/native/juce_RenderingHelpers.h b/modules/juce_graphics/native/juce_RenderingHelpers.h
index 4bc58f171d..9decd68142 100644
--- a/modules/juce_graphics/native/juce_RenderingHelpers.h
+++ b/modules/juce_graphics/native/juce_RenderingHelpers.h
@@ -204,8 +204,8 @@ public:
     }
 
 private:
-    friend class OwnedArray <CachedGlyphType>;
-    OwnedArray <CachedGlyphType> glyphs;
+    friend struct ContainerDeletePolicy<CachedGlyphType>;
+    OwnedArray<CachedGlyphType> glyphs;
     Atomic<int> accessCounter, hits, misses;
     ReadWriteLock lock;
 
diff --git a/modules/juce_gui_basics/application/juce_Application.h b/modules/juce_gui_basics/application/juce_Application.h
index d2394b4d62..5b3d820b61 100644
--- a/modules/juce_gui_basics/application/juce_Application.h
+++ b/modules/juce_gui_basics/application/juce_Application.h
@@ -254,7 +254,7 @@ private:
     //==============================================================================
     struct MultipleInstanceHandler;
     friend struct MultipleInstanceHandler;
-    friend class ScopedPointer<MultipleInstanceHandler>;
+    friend struct ContainerDeletePolicy<MultipleInstanceHandler>;
     ScopedPointer<MultipleInstanceHandler> multipleInstanceHandler;
 
     int appReturnValue;
diff --git a/modules/juce_gui_basics/buttons/juce_Button.h b/modules/juce_gui_basics/buttons/juce_Button.h
index 2228881177..a8729b1598 100644
--- a/modules/juce_gui_basics/buttons/juce_Button.h
+++ b/modules/juce_gui_basics/buttons/juce_Button.h
@@ -453,8 +453,8 @@ private:
 
     class RepeatTimer;
     friend class RepeatTimer;
-    friend class ScopedPointer <RepeatTimer>;
-    ScopedPointer <RepeatTimer> repeatTimer;
+    friend struct ContainerDeletePolicy<RepeatTimer>;
+    ScopedPointer<RepeatTimer> repeatTimer;
     uint32 buttonPressTime, lastRepeatTime;
     ApplicationCommandManager* commandManagerToUse;
     int autoRepeatDelay, autoRepeatSpeed, autoRepeatMinimumDelay;
diff --git a/modules/juce_gui_basics/components/juce_Component.h b/modules/juce_gui_basics/components/juce_Component.h
index 2e50c61057..8205afd028 100644
--- a/modules/juce_gui_basics/components/juce_Component.h
+++ b/modules/juce_gui_basics/components/juce_Component.h
@@ -2254,7 +2254,7 @@ private:
 
     class MouseListenerList;
     friend class MouseListenerList;
-    friend class ScopedPointer <MouseListenerList>;
+    friend struct ContainerDeletePolicy<MouseListenerList>;
     ScopedPointer <MouseListenerList> mouseListeners;
     ScopedPointer <Array <KeyListener*> > keyListeners;
     ListenerList <ComponentListener> componentListeners;
diff --git a/modules/juce_gui_basics/components/juce_Desktop.h b/modules/juce_gui_basics/components/juce_Desktop.h
index b1f3475773..06407b2f49 100644
--- a/modules/juce_gui_basics/components/juce_Desktop.h
+++ b/modules/juce_gui_basics/components/juce_Desktop.h
@@ -367,7 +367,7 @@ public:
 
     private:
         friend class Desktop;
-        friend class ScopedPointer<Displays>;
+        friend struct ContainerDeletePolicy<Displays>;
         Displays (Desktop&);
         ~Displays();
 
diff --git a/modules/juce_gui_basics/components/juce_ModalComponentManager.h b/modules/juce_gui_basics/components/juce_ModalComponentManager.h
index 2beaf697e0..d927202eb6 100644
--- a/modules/juce_gui_basics/components/juce_ModalComponentManager.h
+++ b/modules/juce_gui_basics/components/juce_ModalComponentManager.h
@@ -135,8 +135,8 @@ private:
     class ReturnValueRetriever;
 
     friend class Component;
-    friend class OwnedArray <ModalItem>;
-    OwnedArray <ModalItem> stack;
+    friend struct ContainerDeletePolicy<ModalItem>;
+    OwnedArray<ModalItem> stack;
 
     void startModal (Component*, bool autoDelete);
     void endModal (Component*, int returnValue);
diff --git a/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h b/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h
index a636472212..d350b2706a 100644
--- a/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h
+++ b/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h
@@ -99,8 +99,8 @@ private:
     struct PanelSizes;
     friend class PanelHolder;
     friend struct PanelSizes;
-    friend class ScopedPointer<PanelSizes>;
-    friend class OwnedArray<PanelHolder>;
+    friend struct ContainerDeletePolicy<PanelSizes>;
+    friend struct ContainerDeletePolicy<PanelHolder>;
 
     ScopedPointer<PanelSizes> currentSizes;
     OwnedArray<PanelHolder> holders;
diff --git a/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp b/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp
index 56d4ccf232..01238d9cb8 100644
--- a/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp
+++ b/modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp
@@ -397,11 +397,12 @@ void MultiDocumentPanel::setLayoutMode (const LayoutMode newLayoutMode)
         {
             for (int i = getNumChildComponents(); --i >= 0;)
             {
-                if (MultiDocumentPanelWindow* const dw = dynamic_cast <MultiDocumentPanelWindow*> (getChildComponent (i)))
+                ScopedPointer<MultiDocumentPanelWindow> dw (dynamic_cast <MultiDocumentPanelWindow*> (getChildComponent (i)));
+
+                if (dw != nullptr)
                 {
                     dw->getContentComponent()->getProperties().set ("mdiDocumentPos_", dw->getWindowStateAsString());
                     dw->clearContentComponent();
-                    delete dw;
                 }
             }
         }
diff --git a/modules/juce_gui_basics/layout/juce_ScrollBar.h b/modules/juce_gui_basics/layout/juce_ScrollBar.h
index c6aa8a9d96..72fe5e7786 100644
--- a/modules/juce_gui_basics/layout/juce_ScrollBar.h
+++ b/modules/juce_gui_basics/layout/juce_ScrollBar.h
@@ -321,9 +321,9 @@ private:
     int initialDelayInMillisecs, repeatDelayInMillisecs, minimumDelayInMillisecs;
     bool vertical, isDraggingThumb, autohides;
     class ScrollbarButton;
-    friend class ScopedPointer<ScrollbarButton>;
+    friend struct ContainerDeletePolicy<ScrollbarButton>;
     ScopedPointer<ScrollbarButton> upButton, downButton;
-    ListenerList <Listener> listeners;
+    ListenerList<Listener> listeners;
 
     void handleAsyncUpdate() override;
     void updateThumbPosition();
diff --git a/modules/juce_gui_basics/layout/juce_TabbedButtonBar.h b/modules/juce_gui_basics/layout/juce_TabbedButtonBar.h
index 229f505fa8..52bcb2c88d 100644
--- a/modules/juce_gui_basics/layout/juce_TabbedButtonBar.h
+++ b/modules/juce_gui_basics/layout/juce_TabbedButtonBar.h
@@ -328,7 +328,7 @@ private:
 
     class BehindFrontTabComp;
     friend class BehindFrontTabComp;
-    friend class ScopedPointer<BehindFrontTabComp>;
+    friend struct ContainerDeletePolicy<BehindFrontTabComp>;
     ScopedPointer<BehindFrontTabComp> behindFrontTab;
     ScopedPointer<Button> extraTabsButton;
 
diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.h b/modules/juce_gui_basics/menus/juce_PopupMenu.h
index f2331da630..b6d2fe6700 100644
--- a/modules/juce_gui_basics/menus/juce_PopupMenu.h
+++ b/modules/juce_gui_basics/menus/juce_PopupMenu.h
@@ -492,11 +492,11 @@ private:
     friend class Window;
     friend class CustomComponent;
     friend class MenuBarComponent;
-    friend class OwnedArray <Item>;
-    friend class OwnedArray <ItemComponent>;
-    friend class ScopedPointer <Window>;
+    friend struct ContainerDeletePolicy<Item>;
+    friend struct ContainerDeletePolicy<ItemComponent>;
+    friend struct ContainerDeletePolicy<Window>;
 
-    OwnedArray <Item> items;
+    OwnedArray<Item> items;
     LookAndFeel* lookAndFeel;
 
     Component* createWindow (const Options&, ApplicationCommandManager**) const;
diff --git a/modules/juce_gui_basics/widgets/juce_Slider.h b/modules/juce_gui_basics/widgets/juce_Slider.h
index 6a90c62876..1ab952b069 100644
--- a/modules/juce_gui_basics/widgets/juce_Slider.h
+++ b/modules/juce_gui_basics/widgets/juce_Slider.h
@@ -805,7 +805,7 @@ private:
     //==============================================================================
     JUCE_PUBLIC_IN_DLL_BUILD (class Pimpl)
     friend class Pimpl;
-    friend class ScopedPointer<Pimpl>;
+    friend struct ContainerDeletePolicy<Pimpl>;
     ScopedPointer<Pimpl> pimpl;
 
     void init (SliderStyle, TextEntryBoxPosition);
diff --git a/modules/juce_gui_basics/widgets/juce_TreeView.h b/modules/juce_gui_basics/widgets/juce_TreeView.h
index 78963fd17e..07f737cdac 100644
--- a/modules/juce_gui_basics/widgets/juce_TreeView.h
+++ b/modules/juce_gui_basics/widgets/juce_TreeView.h
@@ -826,9 +826,9 @@ private:
     class TargetGroupHighlight;
     friend class TreeViewItem;
     friend class ContentComponent;
-    friend class ScopedPointer<TreeViewport>;
-    friend class ScopedPointer<InsertPointHighlight>;
-    friend class ScopedPointer<TargetGroupHighlight>;
+    friend struct ContainerDeletePolicy<TreeViewport>;
+    friend struct ContainerDeletePolicy<InsertPointHighlight>;
+    friend struct ContainerDeletePolicy<TargetGroupHighlight>;
 
     ScopedPointer<TreeViewport> viewport;
     CriticalSection nodeAlterationLock;
diff --git a/modules/juce_gui_basics/windows/juce_DocumentWindow.h b/modules/juce_gui_basics/windows/juce_DocumentWindow.h
index f4c0615b1f..a39a6720e0 100644
--- a/modules/juce_gui_basics/windows/juce_DocumentWindow.h
+++ b/modules/juce_gui_basics/windows/juce_DocumentWindow.h
@@ -263,8 +263,8 @@ private:
     MenuBarModel* menuBarModel;
 
     class ButtonListenerProxy;
-    friend class ScopedPointer <ButtonListenerProxy>;
-    ScopedPointer <ButtonListenerProxy> buttonListener;
+    friend struct ContainerDeletePolicy<ButtonListenerProxy>;
+    ScopedPointer<ButtonListenerProxy> buttonListener;
 
     void repaintTitleBar();
 
diff --git a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
index 16194b9793..2ce59917df 100644
--- a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
+++ b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
@@ -363,12 +363,12 @@ private:
 
     class Pimpl;
     friend class Pimpl;
-    friend class ScopedPointer<Pimpl>;
+    friend struct ContainerDeletePolicy<Pimpl>;
     ScopedPointer<Pimpl> pimpl;
 
     class GutterComponent;
     friend class GutterComponent;
-    friend class ScopedPointer<GutterComponent>;
+    friend struct ContainerDeletePolicy<GutterComponent>;
     ScopedPointer<GutterComponent> gutter;
 
     enum DragType
diff --git a/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h b/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h
index 27d06ef201..ff8af9042a 100644
--- a/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h
+++ b/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h
@@ -110,8 +110,8 @@ public:
 
 private:
     class Pimpl;
-    friend class ScopedPointer <Pimpl>;
-    ScopedPointer <Pimpl> control;
+    friend struct ContainerDeletePolicy<Pimpl>;
+    ScopedPointer<Pimpl> control;
     bool mouseEventsAllowed;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ActiveXControlComponent)
diff --git a/modules/juce_gui_extra/misc/juce_ColourSelector.h b/modules/juce_gui_extra/misc/juce_ColourSelector.h
index b41cdb1af4..a661801f15 100644
--- a/modules/juce_gui_extra/misc/juce_ColourSelector.h
+++ b/modules/juce_gui_extra/misc/juce_ColourSelector.h
@@ -137,9 +137,9 @@ private:
     class ColourSpaceMarker;
     class HueSelectorMarker;
     friend class ColourSpaceView;
-    friend class ScopedPointer<ColourSpaceView>;
+    friend struct ContainerDeletePolicy<ColourSpaceView>;
     friend class HueSelectorComp;
-    friend class ScopedPointer<HueSelectorComp>;
+    friend struct ContainerDeletePolicy<HueSelectorComp>;
 
     Colour colour;
     float h, s, v;
diff --git a/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h b/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h
index f693235c9f..a5b7991a52 100644
--- a/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h
+++ b/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h
@@ -125,8 +125,8 @@ private:
     class CategoryItem;
     class ItemComponent;
     friend class TopLevelItem;
-    friend class OwnedArray <ChangeKeyButton>;
-    friend class ScopedPointer<TopLevelItem>;
+    friend struct ContainerDeletePolicy<ChangeKeyButton>;
+    friend struct ContainerDeletePolicy<TopLevelItem>;
     ScopedPointer<TopLevelItem> treeItem;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (KeyMappingEditorComponent)
diff --git a/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h b/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
index 3d17f6dd01..dcc0b7970e 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
@@ -139,11 +139,11 @@ public:
 
 private:
     class Pimpl;
-    friend class ScopedPointer<Pimpl>;
+    friend struct ContainerDeletePolicy<Pimpl>;
     ScopedPointer<Pimpl> pimpl;
 
     class SavedState;
-    friend class ScopedPointer<SavedState>;
+    friend struct ContainerDeletePolicy<SavedState>;
     ScopedPointer<SavedState> savedState;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OpenGLFrameBuffer)
diff --git a/modules/juce_video/playback/juce_DirectShowComponent.h b/modules/juce_video/playback/juce_DirectShowComponent.h
index c2c783cb5e..df64e89815 100644
--- a/modules/juce_video/playback/juce_DirectShowComponent.h
+++ b/modules/juce_video/playback/juce_DirectShowComponent.h
@@ -195,13 +195,13 @@ private:
 
     class DirectShowContext;
     friend class DirectShowContext;
-    friend class ScopedPointer <DirectShowContext>;
-    ScopedPointer <DirectShowContext> context;
+    friend struct ContainerDeletePolicy<DirectShowContext>;
+    ScopedPointer<DirectShowContext> context;
 
     class DirectShowComponentWatcher;
     friend class DirectShowComponentWatcher;
-    friend class ScopedPointer <DirectShowComponentWatcher>;
-    ScopedPointer <DirectShowComponentWatcher> componentWatcher;
+    friend struct ContainerDeletePolicy<DirectShowComponentWatcher>;
+    ScopedPointer<DirectShowComponentWatcher> componentWatcher;
 
     //==============================================================================
     void updateContextPosition();
diff --git a/modules/juce_video/playback/juce_QuickTimeMovieComponent.h b/modules/juce_video/playback/juce_QuickTimeMovieComponent.h
index 1b1528161d..6275b1e965 100644
--- a/modules/juce_video/playback/juce_QuickTimeMovieComponent.h
+++ b/modules/juce_video/playback/juce_QuickTimeMovieComponent.h
@@ -207,8 +207,8 @@ private:
     bool isControlCreated() const;
 
     class Pimpl;
-    friend class ScopedPointer <Pimpl>;
-    ScopedPointer <Pimpl> pimpl;
+    friend struct ContainerDeletePolicy<Pimpl>;
+    ScopedPointer<Pimpl> pimpl;
    #else
     void* movie;
    #endif